Version bump.

(Portage version: 2.1.2_rc1-r3)

9 files changed, 174 insertions, 37 deletions

diff --git a/net-irc/ircservices/ChangeLog b/net-irc/ircservices/ChangeLog
index ab5e5d701a5e..9d9ab86e8efb 100644
--- a/net-irc/ircservices/ChangeLog
+++ b/net-irc/ircservices/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/ircservices
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.24 2006/03/10 05:10:08 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.25 2006/11/05 22:23:07 swegener Exp $
+
+*ircservices-5.0.59 (05 Nov 2006)
+
+  05 Nov 2006; Sven Wegener <swegener@gentoo.org> files/ircservices.init.d,
+  ircservices-5.0.53.ebuild, ircservices-5.0.54.ebuild,
+  ircservices-5.0.57.ebuild, +ircservices-5.0.59.ebuild:
+  Version bump.
 
 *ircservices-5.0.57 (10 Mar 2006)
 
diff --git a/net-irc/ircservices/files/digest-ircservices-5.0.53 b/net-irc/ircservices/files/digest-ircservices-5.0.53
index 9d84ccc45876..7070e286f78c 100644
--- a/net-irc/ircservices/files/digest-ircservices-5.0.53
+++ b/net-irc/ircservices/files/digest-ircservices-5.0.53
@@ -1 +1,3 @@
 MD5 dd3e6204ba301ec1d9879b19e8572173 ircservices-5.0.53.tar.gz 1150179
+RMD160 37b39e15ce0c66a0308da8f8d4b6817d3ca304dc ircservices-5.0.53.tar.gz 1150179
+SHA256 5ad4a307346a0d002274000af67da2d0dd3b0a41fdc52f68bede196e65c2d2a9 ircservices-5.0.53.tar.gz 1150179
diff --git a/net-irc/ircservices/files/digest-ircservices-5.0.54 b/net-irc/ircservices/files/digest-ircservices-5.0.54
index 36997bf51578..92e054583822 100644
--- a/net-irc/ircservices/files/digest-ircservices-5.0.54
+++ b/net-irc/ircservices/files/digest-ircservices-5.0.54
@@ -1 +1,3 @@
 MD5 589bf39dd5d702d5f9d5da1fe404d6b1 ircservices-5.0.54.tar.gz 1151132
+RMD160 9a105045c644f0f3329886e882947612fc285fdb ircservices-5.0.54.tar.gz 1151132
+SHA256 068950e7b5f64bd42dbe9c4b4a46af1a15de71cf3dd6df6139aa7bc9c5cba68b ircservices-5.0.54.tar.gz 1151132
diff --git a/net-irc/ircservices/files/digest-ircservices-5.0.59 b/net-irc/ircservices/files/digest-ircservices-5.0.59
new file mode 100644
index 000000000000..b948277a46e6
--- /dev/null
+++ b/net-irc/ircservices/files/digest-ircservices-5.0.59
@@ -0,0 +1,3 @@
+MD5 58b080e6f783b7e0cb5f3b82621d9a69 ircservices-5.0.59.tar.gz 1156586
+RMD160 e8972f503dadae3830c0ab43d261e8e8233db0d0 ircservices-5.0.59.tar.gz 1156586
+SHA256 b56a76ad75f2de3a93a7913803b95d1f21e51ed38bd5c9f3de5edf7626ad5f55 ircservices-5.0.59.tar.gz 1156586
diff --git a/net-irc/ircservices/files/ircservices.init.d b/net-irc/ircservices/files/ircservices.init.d
index 0f39fe58adaf..4eddbf16360f 100644
--- a/net-irc/ircservices/files/ircservices.init.d
+++ b/net-irc/ircservices/files/ircservices.init.d
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.4 2005/05/16 15:36:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/files/ircservices.init.d,v 1.5 2006/11/05 22:23:08 swegener Exp $
 
 depend() {
-	if [ "${LOCALIRCD}" = true ]
+	if [[ ${LOCALIRCD} = true ]]
 	then
 		need net ircd
 	else
@@ -15,7 +15,7 @@ depend() {
 
 start() {
 	ebegin "Starting IRC Services"
-	/usr/bin/ircservices \
+	start-stop-daemon --start --quiet --chuid ircservices --exec /usr/bin/ircservices -- \
 		-dir=/var/lib/ircservices \
 		-log=/var/log/ircservices/ircservices.log \
 		&>/dev/null
diff --git a/net-irc/ircservices/ircservices-5.0.53.ebuild b/net-irc/ircservices/ircservices-5.0.53.ebuild
index 2c9c8ccd45fc..236a30e16588 100644
--- a/net-irc/ircservices/ircservices-5.0.53.ebuild
+++ b/net-irc/ircservices/ircservices-5.0.53.ebuild
@@ -1,19 +1,26 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.53.ebuild,v 1.5 2005/08/11 14:48:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.53.ebuild,v 1.6 2006/11/05 22:23:07 swegener Exp $
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
 DESCRIPTION="ChanServ, NickServ & MemoServ with support for several IRC daemons"
 HOMEPAGE="http://www.ircservices.za.net/"
-SRC_URI="ftp://ftp.esper.net/${PN}/${P}.tar.gz
+SRC_URI="http://www.ircservices.za.net/download/${P}.tar.gz
+	ftp://ftp.esper.net/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+}
 
 src_unpack() {
 	unpack ${A}
@@ -23,7 +30,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/5.0.53-fPIC-configure.patch
 
 	ht_fix_file configure
-	sed -i -e "s/HEAD -1/HEAD -n 1/" configure
+	sed -i \
+		-e "s/HEAD -1/HEAD -n 1/" \
+		-e "s/-m 750/-m 755/" \
+		-e "s/-m 640/-m 644/" \
+		configure
 }
 
 src_compile() {
@@ -31,6 +42,7 @@ src_compile() {
 	# configure fails with -O higher than 2
 	replace-flags "-O[3-9s]" "-O2"
 
+	RUNGROUP="ircservices" \
 	./configure \
 		-cc "$(tc-getCC)" \
 		-cflags "${CFLAGS}" \
@@ -43,7 +55,6 @@ src_compile() {
 src_install() {
 	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices || die "dodir failed"
 	keepdir /var/log/ircservices || die "keepdir failed"
-	fperms 700 /{etc,var/lib}/ircservices || die "fperms failed"
 
 	make \
 		BINDEST="${D}"/usr/bin \
@@ -67,6 +78,11 @@ src_install() {
 	dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles || die "mv failed"
 	dosym /usr/share/ircservices/languages /var/lib/ircservices/languages || die "dosym failed"
 
+	fperms 750 /var/{lib,log}/ircservices /etc/ircservices
+	fperms 640 /etc/ircservices/{ircservices,modules}.conf
+	fowners ircservices:ircservices /var/{lib,log}/ircservices
+	fowners root:ircservices /etc/ircservices{,/{ircservices,modules}}.conf
+
 	newinitd "${FILESDIR}"/ircservices.init.d ircservices || die "newinitd failed"
 	newconfd "${FILESDIR}"/ircservices.conf.d ircservices || die "newconfd failed"
 
@@ -75,9 +91,3 @@ src_install() {
 	dohtml docs/*.html || die "dohtml failed"
 	dodoc KnownBugs Changes README TODO WhatsNew || die "dodoc failed"
 }
-
-pkg_postinst() {
-	enewuser ircservices
-	chown ircservices "${ROOT}"/var/lib/ircservices
-	chown -R ircservices "${ROOT}"/etc/ircservices
-}
diff --git a/net-irc/ircservices/ircservices-5.0.54.ebuild b/net-irc/ircservices/ircservices-5.0.54.ebuild
index 46f775fac4c0..656ef05f30f3 100644
--- a/net-irc/ircservices/ircservices-5.0.54.ebuild
+++ b/net-irc/ircservices/ircservices-5.0.54.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.54.ebuild,v 1.1 2005/08/31 17:31:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.54.ebuild,v 1.2 2006/11/05 22:23:07 swegener Exp $
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
 DESCRIPTION="ChanServ, NickServ & MemoServ with support for several IRC daemons"
 HOMEPAGE="http://www.ircservices.za.net/"
-SRC_URI="ftp://ftp.esper.net/${PN}/${P}.tar.gz
+SRC_URI="http://www.ircservices.za.net/download/${P}.tar.gz
+	ftp://ftp.esper.net/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,6 +15,12 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+}
 
 src_unpack() {
 	unpack ${A}
@@ -23,7 +30,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/5.0.53-fPIC-configure.patch
 
 	ht_fix_file configure
-	sed -i -e "s/HEAD -1/HEAD -n 1/" configure
+	sed -i \
+		-e "s/HEAD -1/HEAD -n 1/" \
+		-e "s/-m 750/-m 755/" \
+		-e "s/-m 640/-m 644/" \
+		configure
 }
 
 src_compile() {
@@ -31,6 +42,7 @@ src_compile() {
 	# configure fails with -O higher than 2
 	replace-flags "-O[3-9s]" "-O2"
 
+	RUNGROUP="ircservices" \
 	./configure \
 		-cc "$(tc-getCC)" \
 		-cflags "${CFLAGS}" \
@@ -43,7 +55,6 @@ src_compile() {
 src_install() {
 	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices || die "dodir failed"
 	keepdir /var/log/ircservices || die "keepdir failed"
-	fperms 700 /{etc,var/lib}/ircservices || die "fperms failed"
 
 	make \
 		BINDEST="${D}"/usr/bin \
@@ -67,6 +78,11 @@ src_install() {
 	dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles || die "mv failed"
 	dosym /usr/share/ircservices/languages /var/lib/ircservices/languages || die "dosym failed"
 
+	fperms 750 /var/{lib,log}/ircservices /etc/ircservices
+	fperms 640 /etc/ircservices/{ircservices,modules}.conf
+	fowners ircservices:ircservices /var/{lib,log}/ircservices
+	fowners root:ircservices /etc/ircservices{,/{ircservices,modules}}.conf
+
 	newinitd "${FILESDIR}"/ircservices.init.d ircservices || die "newinitd failed"
 	newconfd "${FILESDIR}"/ircservices.conf.d ircservices || die "newconfd failed"
 
@@ -75,9 +91,3 @@ src_install() {
 	dohtml docs/*.html || die "dohtml failed"
 	dodoc KnownBugs Changes README TODO WhatsNew || die "dodoc failed"
 }
-
-pkg_postinst() {
-	enewuser ircservices
-	chown ircservices "${ROOT}"/var/lib/ircservices
-	chown -R ircservices "${ROOT}"/etc/ircservices
-}
diff --git a/net-irc/ircservices/ircservices-5.0.57.ebuild b/net-irc/ircservices/ircservices-5.0.57.ebuild
index 7c0a4066ebdc..f9b0d9e53af6 100644
--- a/net-irc/ircservices/ircservices-5.0.57.ebuild
+++ b/net-irc/ircservices/ircservices-5.0.57.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.57.ebuild,v 1.1 2006/03/10 05:10:08 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.57.ebuild,v 1.2 2006/11/05 22:23:08 swegener Exp $
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
 DESCRIPTION="ChanServ, NickServ & MemoServ with support for several IRC daemons"
 HOMEPAGE="http://www.ircservices.za.net/"
-SRC_URI="ftp://ftp.esper.net/${PN}/${P}.tar.gz
+SRC_URI="http://www.ircservices.za.net/download/${P}.tar.gz
+	ftp://ftp.esper.net/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,6 +15,12 @@ KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+}
 
 src_unpack() {
 	unpack ${A}
@@ -23,7 +30,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/5.0.53-fPIC-configure.patch
 
 	ht_fix_file configure
-	sed -i -e "s/HEAD -1/HEAD -n 1/" configure
+	sed -i \
+		-e "s/HEAD -1/HEAD -n 1/" \
+		-e "s/-m 750/-m 755/" \
+		-e "s/-m 640/-m 644/" \
+		configure
 }
 
 src_compile() {
@@ -31,6 +42,7 @@ src_compile() {
 	# configure fails with -O higher than 2
 	replace-flags "-O[3-9s]" "-O2"
 
+	RUNGROUP="ircservices" \
 	./configure \
 		-cc "$(tc-getCC)" \
 		-cflags "${CFLAGS}" \
@@ -43,7 +55,6 @@ src_compile() {
 src_install() {
 	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices || die "dodir failed"
 	keepdir /var/log/ircservices || die "keepdir failed"
-	fperms 700 /{etc,var/lib}/ircservices || die "fperms failed"
 
 	make \
 		BINDEST="${D}"/usr/bin \
@@ -67,6 +78,11 @@ src_install() {
 	dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles || die "mv failed"
 	dosym /usr/share/ircservices/languages /var/lib/ircservices/languages || die "dosym failed"
 
+	fperms 750 /var/{lib,log}/ircservices /etc/ircservices
+	fperms 640 /etc/ircservices/{ircservices,modules}.conf
+	fowners ircservices:ircservices /var/{lib,log}/ircservices
+	fowners root:ircservices /etc/ircservices{,/{ircservices,modules}}.conf
+
 	newinitd "${FILESDIR}"/ircservices.init.d ircservices || die "newinitd failed"
 	newconfd "${FILESDIR}"/ircservices.conf.d ircservices || die "newconfd failed"
 
@@ -75,9 +91,3 @@ src_install() {
 	dohtml docs/*.html || die "dohtml failed"
 	dodoc KnownBugs Changes README TODO WhatsNew || die "dodoc failed"
 }
-
-pkg_postinst() {
-	enewuser ircservices
-	chown ircservices "${ROOT}"/var/lib/ircservices
-	chown -R ircservices "${ROOT}"/etc/ircservices
-}
diff --git a/net-irc/ircservices/ircservices-5.0.59.ebuild b/net-irc/ircservices/ircservices-5.0.59.ebuild
new file mode 100644
index 000000000000..9be33f06848d
--- /dev/null
+++ b/net-irc/ircservices/ircservices-5.0.59.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.0.59.ebuild,v 1.1 2006/11/05 22:23:08 swegener Exp $
+
+inherit eutils fixheadtails flag-o-matic toolchain-funcs
+
+DESCRIPTION="ChanServ, NickServ & MemoServ with support for several IRC daemons"
+HOMEPAGE="http://www.ircservices.za.net/"
+SRC_URI="http://www.ircservices.za.net/download/${P}.tar.gz
+	ftp://ftp.esper.net/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/5.0.37-fPIC.patch
+	epatch "${FILESDIR}"/5.0.53-fPIC-configure.patch
+
+	ht_fix_file configure
+	sed -i \
+		-e "s/HEAD -1/HEAD -n 1/" \
+		-e "s/-m 750/-m 755/" \
+		-e "s/-m 640/-m 644/" \
+		configure
+}
+
+src_compile() {
+	append-flags -fno-stack-protector
+	# configure fails with -O higher than 2
+	replace-flags "-O[3-9s]" "-O2"
+
+	RUNGROUP="ircservices" \
+	./configure \
+		-cc "$(tc-getCC)" \
+		-cflags "${CFLAGS}" \
+		-bindest /usr/bin \
+		-datdest /var/lib/ircservices \
+		|| die "./configure failed"
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices || die "dodir failed"
+	keepdir /var/log/ircservices || die "keepdir failed"
+
+	make \
+		BINDEST="${D}"/usr/bin \
+		DATDEST="${D}"/var/lib/ircservices \
+		install \
+		|| die "make install failed"
+
+	mv "${D}"/var/lib/ircservices/convert-db "${D}"/usr/bin/ircservices-convert-db || die "mv failed"
+
+	# Now we move some files around to make it FHS conform
+	mv "${D}"/var/lib/ircservices/example-ircservices.conf "${D}"/etc/ircservices/ircservices.conf || die "mv failed"
+	dosym /etc/ircservices/ircservices.conf /var/lib/ircservices/ircservices.conf || die "dosym failed"
+
+	mv "${D}"/var/lib/ircservices/example-modules.conf "${D}"/etc/ircservices/modules.conf || die "mv failed"
+	dosym /etc/ircservices/modules.conf /var/lib/ircservices/modules.conf || die "dosym failed"
+
+	mv "${D}"/var/lib/ircservices/modules "${D}"/usr/$(get_libdir)/ircservices || die "mv failed"
+	dosym /usr/$(get_libdir)/ircservices/modules /var/lib/ircservices/modules || die "dosym failed"
+
+	mv "${D}"/var/lib/ircservices/{helpfiles,languages} "${D}"/usr/share/ircservices  || die "mv failed"
+	dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles || die "mv failed"
+	dosym /usr/share/ircservices/languages /var/lib/ircservices/languages || die "dosym failed"
+
+	fperms 750 /var/{lib,log}/ircservices /etc/ircservices
+	fperms 640 /etc/ircservices/{ircservices,modules}.conf
+	fowners ircservices:ircservices /var/{lib,log}/ircservices
+	fowners root:ircservices /etc/ircservices{,/{ircservices,modules}}.conf
+
+	newinitd "${FILESDIR}"/ircservices.init.d ircservices || die "newinitd failed"
+	newconfd "${FILESDIR}"/ircservices.conf.d ircservices || die "newconfd failed"
+
+	doman docs/ircservices.8 || die "doman failed"
+	newman docs/convert-db.8 ircservices-convert-db.8 || die "newman failed"
+	dohtml docs/*.html || die "dohtml failed"
+	dodoc KnownBugs Changes README TODO WhatsNew || die "dodoc failed"
+}