Version bump.

(Portage version: 2.0.51-r15)

10 files changed, 137 insertions, 26 deletions

diff --git a/net-irc/ultimate/ChangeLog b/net-irc/ultimate/ChangeLog
index 4e7eb986c947..d4fb3643e92a 100644
--- a/net-irc/ultimate/ChangeLog
+++ b/net-irc/ultimate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/ultimate
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.10 2004/10/09 20:39:09 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ChangeLog,v 1.11 2005/01/30 14:39:34 swegener Exp $
+
+*ultimate-3.0.0_rc2 (30 Jan 2005)
+
+  30 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/3.0.0_rc2-config.patch, +files/ultimateircd.rc-3.0.0,
+  +ultimate-3.0.0_rc2.ebuild:
+  Version bump.
 
   09 Oct 2004; Sven Wegener <swegener@gentoo.org> files/ultimateircd.rc:
   Modified to 'use net' not 'need net' in init script. Closes bug #66467.
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
index 96e49f171ed0..e982904f5354 100644
--- a/net-irc/ultimate/Manifest
+++ b/net-irc/ultimate/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 c74c4715aa43fb7091cd34373ae712ec ultimate-2.8.8.ebuild 2819
+MD5 f666709e3d422ecd94b573bcfdbf5aa2 ultimate-3.0.0_rc2.ebuild 2814
+MD5 b8419ce68ef8468fc0517c696bd72170 ultimate-2.8.7.ebuild 3213
 MD5 5d86c911254617654fcfbcfac7843bc4 ChangeLog 1458
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
-MD5 b8419ce68ef8468fc0517c696bd72170 ultimate-2.8.7.ebuild 3213
-MD5 c74c4715aa43fb7091cd34373ae712ec ultimate-2.8.8.ebuild 2819
-MD5 772b4c0818bb9082f29f266cb6c3c3ad files/Ultimate-2.8.7-gentoo.patch 434
-MD5 ce59cd0657a697f03f1798d4ab24192a files/digest-ultimate-2.8.7 65
-MD5 319444542064bf000cfd6490417ac8a0 files/digest-ultimate-2.8.8 65
+MD5 3cc78e4559af7c7a4c6c3c3e4c4e2163 files/digest-ultimate-3.0.0_rc2 70
+MD5 5e114cf2688a03536d038ea889e3a3be files/ultimateircd.rc 514
 MD5 8af0419297384fbb53922f83cc7d85df files/setup.h 483
 MD5 0bd236fc8707f0cc5db6dad26ea8707e files/ultimateircd.conf 283
-MD5 5e114cf2688a03536d038ea889e3a3be files/ultimateircd.rc 514
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBaEx0I1lqEGTUzyQRArUgAJ9tJqa9pBJr/ba28JBYBxbVBlmleQCgtv4h
-rJ62wpH4Dya6gRAklpCZaQU=
-=n9C7
------END PGP SIGNATURE-----
+MD5 ce59cd0657a697f03f1798d4ab24192a files/digest-ultimate-2.8.7 65
+MD5 319444542064bf000cfd6490417ac8a0 files/digest-ultimate-2.8.8 65
+MD5 772b4c0818bb9082f29f266cb6c3c3ad files/Ultimate-2.8.7-gentoo.patch 434
diff --git a/net-irc/ultimate/files/3.0.0_rc2-config.patch b/net-irc/ultimate/files/3.0.0_rc2-config.patch
new file mode 100644
index 000000000000..79d1af351bb1
--- /dev/null
+++ b/net-irc/ultimate/files/3.0.0_rc2-config.patch
@@ -0,0 +1,30 @@
+diff -Nur Ultimate3.0.0.rc2.orig/include/config.h Ultimate3.0.0.rc2/include/config.h
+--- Ultimate3.0.0.rc2.orig/include/config.h	2005-01-30 15:01:45.677952244 +0100
++++ Ultimate3.0.0.rc2/include/config.h	2005-01-30 15:02:43.353895511 +0100
+@@ -127,13 +127,13 @@
+ #endif
+ 
+ /* dirs */
+-#define DPATH		IRCD_PREFIX                                                     
++#define DPATH		IRCD_PREFIX
+ #define BINPATH		IRCD_PREFIX "/bin/"
+-#define ETCPATH		IRCD_PREFIX "/etc"
+-#define LOGPATH		IRCD_PREFIX "/logs"
++#define ETCPATH		"/etc/ultimateircd"
++#define LOGPATH		"/var/log/ultimateircd"
+ 
+ /* files */
+-#define SPATH		BINPATH "/ircd"			/* ircd executable */
++#define SPATH		BINPATH "/ultimateircd"			/* ircd executable */
+ 
+ #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
+ #define DCONF		ETCPATH "/ircd.ini"		/* Dynamic Configuration File */
+@@ -144,7 +144,7 @@
+ #define	SMPATH		ETCPATH "/ircd.smotd"		/* Short Message Of The Day */
+ #define OMPATH		ETCPATH "/ircd.opermotd"	/* Operator Message Of The Day */
+ #define RPATH		ETCPATH "/ircd.rules"		/* Rules File */
+-#define	PPATH		ETCPATH "/ircd.pid"		/* IRCd PID */
++#define	PPATH		"/var/run/ultimateircd/ircd.pid"		/* IRCd PID */
+ #define IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
+ #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
+ 
diff --git a/net-irc/ultimate/files/digest-ultimate-3.0.0_rc2 b/net-irc/ultimate/files/digest-ultimate-3.0.0_rc2
new file mode 100644
index 000000000000..fbc9d5a8599d
--- /dev/null
+++ b/net-irc/ultimate/files/digest-ultimate-3.0.0_rc2
@@ -0,0 +1 @@
+MD5 6f0356131d5a686d60b7b40dfcc2ac3f Ultimate3.0.0.rc2.tar.gz 1412008
diff --git a/net-irc/ultimate/files/ultimateircd.conf b/net-irc/ultimate/files/ultimateircd.conf
index d1eb2e95fcb6..1798944ce854 100644
--- a/net-irc/ultimate/files/ultimateircd.conf
+++ b/net-irc/ultimate/files/ultimateircd.conf
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf,v 1.5 2004/07/17 12:28:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.conf,v 1.6 2005/01/30 14:39:34 swegener Exp $
 
 # user to run ultimate-ircd as
 ULTIMATEIRCD_USER="nobody"
diff --git a/net-irc/ultimate/files/ultimateircd.rc b/net-irc/ultimate/files/ultimateircd.rc
index 8786644dddee..b2a3ee2064b3 100644
--- a/net-irc/ultimate/files/ultimateircd.rc
+++ b/net-irc/ultimate/files/ultimateircd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc,v 1.6 2004/10/09 20:39:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc,v 1.7 2005/01/30 14:39:34 swegener Exp $
 
 depend() {
 	use dns net
diff --git a/net-irc/ultimate/files/ultimateircd.rc-3.0.0 b/net-irc/ultimate/files/ultimateircd.rc-3.0.0
new file mode 100644
index 000000000000..140b97a412da
--- /dev/null
+++ b/net-irc/ultimate/files/ultimateircd.rc-3.0.0
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/files/ultimateircd.rc-3.0.0,v 1.1 2005/01/30 14:39:34 swegener Exp $
+
+depend() {
+	use dns net
+}
+
+start() {
+	ebegin "Starting ultimateircd"
+	start-stop-daemon --start --quiet --exec /usr/bin/ultimateircd \
+		--chuid ${ULTIMATEIRCD_USER} &>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down ultimateircd"
+	start-stop-daemon --stop --pidfile /var/run/ultimateircd/ircd.pid
+	eend $?
+}
diff --git a/net-irc/ultimate/ultimate-2.8.7.ebuild b/net-irc/ultimate/ultimate-2.8.7.ebuild
index 96f563aaf899..25cc95fee59d 100644
--- a/net-irc/ultimate/ultimate-2.8.7.ebuild
+++ b/net-irc/ultimate/ultimate-2.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.7.ebuild,v 1.9 2004/07/17 12:27:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.7.ebuild,v 1.10 2005/01/30 14:39:34 swegener Exp $
 
 inherit eutils
 
diff --git a/net-irc/ultimate/ultimate-2.8.8.ebuild b/net-irc/ultimate/ultimate-2.8.8.ebuild
index 85a7f103013f..a8213be5d57a 100644
--- a/net-irc/ultimate/ultimate-2.8.8.ebuild
+++ b/net-irc/ultimate/ultimate-2.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.8.ebuild,v 1.1 2004/07/17 12:27:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-2.8.8.ebuild,v 1.2 2005/01/30 14:39:34 swegener Exp $
 
 inherit eutils
 
diff --git a/net-irc/ultimate/ultimate-3.0.0_rc2.ebuild b/net-irc/ultimate/ultimate-3.0.0_rc2.ebuild
new file mode 100644
index 000000000000..26a22c510d0e
--- /dev/null
+++ b/net-irc/ultimate/ultimate-3.0.0_rc2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ultimate/ultimate-3.0.0_rc2.ebuild,v 1.1 2005/01/30 14:39:34 swegener Exp $
+
+inherit eutils fixheadtails
+
+MY_P="Ultimate${PV/_/.}"
+
+DESCRIPTION="And IRCd server based on DALnet's DreamForge IRCd."
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.shadow-realm.org/"
+
+KEYWORDS="~x86 ~sparc ~ppc"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="debug ssl"
+
+RDEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-config.patch
+
+	ht_fix_file configure
+}
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/ultimateircd \
+		--localstatedir=/var/lib/ultimateircd \
+		$(use_enable ssl openssl) \
+		|| die "econf failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	dodir /etc/ultimateircd
+	keepdir /var/log/ultimateircd /var/run/ultimateircd
+	fowners nobody /var/log/ultimateircd /var/run/ultimateircd
+
+	einstall \
+		sysconfdir=${D}/etc/ultimateircd \
+		localstatedir=${D}/var/lib/ultimateircd \
+		networksubdir=${D}/etc/ultimateircd/networks \
+		|| die "einstall failed"
+
+	rm -f ${D}/usr/{{ircd,kill,rehash},bin/{ircdchk,ssl-{cert,search}.sh}}
+	mv ${D}/usr/bin/ircd ${D}/usr/bin/ultimateircd
+	mv ${D}/usr/bin/mkpasswd ${D}/usr/bin/ultimateircd-mkpasswd
+
+	newinitd ${FILESDIR}/ultimateircd.rc-3.0.0 ultimateircd
+	newconfd ${FILESDIR}/ultimateircd.conf ultimateircd
+}