Version bump.

Package-Manager: portage-2.1.2_rc1-r3

11 files changed, 248 insertions, 73 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/Manifest b/net-irc/ircservices/Manifest
index d49dffc633f2..b8ed13c4a4ef 100644
--- a/net-irc/ircservices/Manifest
+++ b/net-irc/ircservices/Manifest
@@ -1,36 +1,66 @@
-MD5 358002f36aeea1c3eead09cd67f6590b ChangeLog 4104
-RMD160 d6ba5ff69690a8ea99ec7c4401847e9cdf3d600f ChangeLog 4104
-SHA256 fd022e6e38b520e0c24e9c0f70fbf6030a89eb136f5fef5f31a945f3a2668a0d ChangeLog 4104
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 5.0.37-fPIC.patch 1172 RMD160 2fd0bbbb606ad26229c62ca64430cf1ebb0f8654 SHA1 15a1dba81a02681f1682efb8c007d2b51045e496 SHA256 a04e0ec338d84a1f1f64233af4aeeadd4f216032063347bec275b4e5ff5c9114
 MD5 0dc39b8e38a74a2fca213bf4e2f63d3e files/5.0.37-fPIC.patch 1172
 RMD160 2fd0bbbb606ad26229c62ca64430cf1ebb0f8654 files/5.0.37-fPIC.patch 1172
 SHA256 a04e0ec338d84a1f1f64233af4aeeadd4f216032063347bec275b4e5ff5c9114 files/5.0.37-fPIC.patch 1172
+AUX 5.0.53-fPIC-configure.patch 635 RMD160 c4bb6b707999dd9e9b85046898daa71f8b717f26 SHA1 82ce45099e1e5a557dbfb1587b88cef679dbaa53 SHA256 d74043c7c031d07f0435996b52176a769bb7f892d4921c5a528c3a2405256252
 MD5 4378abfaa42b42cf88d1448f7be7d5ce files/5.0.53-fPIC-configure.patch 635
 RMD160 c4bb6b707999dd9e9b85046898daa71f8b717f26 files/5.0.53-fPIC-configure.patch 635
 SHA256 d74043c7c031d07f0435996b52176a769bb7f892d4921c5a528c3a2405256252 files/5.0.53-fPIC-configure.patch 635
-MD5 29f1a5443fdb20cb212af83299e49fd8 files/digest-ircservices-5.0.53 71
-RMD160 7818a5e60d5bbb503ada714e61317393076f108c files/digest-ircservices-5.0.53 71
-SHA256 808859e5c6d19c8509f0e88900b28adc80cc1985f16d5262e630c004d3718d36 files/digest-ircservices-5.0.53 71
-MD5 8ca20f7c34571d05359169b1ce456e2a files/digest-ircservices-5.0.54 71
-RMD160 ba3f243bba03935c484768afaeded318f6879fc8 files/digest-ircservices-5.0.54 71
-SHA256 17a75b236b03ed0d1758032248ec5dd5dbf1db1330635e0356940afe168cd467 files/digest-ircservices-5.0.54 71
-MD5 9ba5bae54df7f535b2ab9f2f748748fc files/digest-ircservices-5.0.57 259
-RMD160 4b2c0e3a150dc4b1d4e8add4dc5312072710dc37 files/digest-ircservices-5.0.57 259
-SHA256 d26eb613e8153a4ca7ec78d8a405771cd2b6c406673e0c4917d6eab319bcd410 files/digest-ircservices-5.0.57 259
+AUX ircservices.conf.d 327 RMD160 584b51f9cc583920cd12646cfa84489fae99fab5 SHA1 178a5649edcb3f3075b6d8c0e9192081e1d42276 SHA256 e6fd7cacb1b44e6ddbf7d1c9831480eeed4d0e4a6b2f21188327971a073240a0
 MD5 53b4476f6787f6aa0072d2b7374ab4c2 files/ircservices.conf.d 327
 RMD160 584b51f9cc583920cd12646cfa84489fae99fab5 files/ircservices.conf.d 327
 SHA256 e6fd7cacb1b44e6ddbf7d1c9831480eeed4d0e4a6b2f21188327971a073240a0 files/ircservices.conf.d 327
-MD5 fd2df3bf979010c19ad2e4ec09853c7f files/ircservices.init.d 700
-RMD160 ae5a87ae2c719e864c55af4fcb794451528a6be2 files/ircservices.init.d 700
-SHA256 cf84f8890cf69f4ff97507b8c064402f25def038613161b6682dd1f2265fec47 files/ircservices.init.d 700
-MD5 67e2839da7b8960eec6cf1e208d57ef8 ircservices-5.0.53.ebuild 2991
-RMD160 a7d3462a16fee57651db55c48889b689c0d68c82 ircservices-5.0.53.ebuild 2991
-SHA256 34d093e18c0bc9bcb51b5d621fa5de8c909aafd832d54b5fa7ba3f029ac9354e ircservices-5.0.53.ebuild 2991
-MD5 52b060cfd91a6cd792e985a00e5fedbf ircservices-5.0.54.ebuild 2992
-RMD160 2a2a0cb0305471ececa8683d2ea2a750bd97ca96 ircservices-5.0.54.ebuild 2992
-SHA256 cf55cd17e8b6c88912777ede9cd6c6eae69e67ff86f68622e1fbc6583171e6db ircservices-5.0.54.ebuild 2992
-MD5 213150c8564e18b99d61f293ed599a1b ircservices-5.0.57.ebuild 2991
-RMD160 1f108c1a3122cfc8088d41f356d8d6411da2a9e0 ircservices-5.0.57.ebuild 2991
-SHA256 d3f01d1bfe8bea5ac47b86b8a482b753f6b6cbbf20709a582e3912575b487354 ircservices-5.0.57.ebuild 2991
+AUX ircservices.init.d 764 RMD160 e54f5a09c99c9aea230013afe01b02080aa793b4 SHA1 e86f4706db823029ba65954845d3d080034f2855 SHA256 9dacabf713916d88b6c03af21c0a449f527e9c19d1e9f1c56aeeeeb68586bdbd
+MD5 d01ec4bcde642d200705f60bdaa7ed2d files/ircservices.init.d 764
+RMD160 e54f5a09c99c9aea230013afe01b02080aa793b4 files/ircservices.init.d 764
+SHA256 9dacabf713916d88b6c03af21c0a449f527e9c19d1e9f1c56aeeeeb68586bdbd files/ircservices.init.d 764
+DIST ircservices-5.0.53.tar.gz 1150179 RMD160 37b39e15ce0c66a0308da8f8d4b6817d3ca304dc SHA1 972fc52bcd62dd842ed5a6d62805ec84dd080898 SHA256 5ad4a307346a0d002274000af67da2d0dd3b0a41fdc52f68bede196e65c2d2a9
+DIST ircservices-5.0.54.tar.gz 1151132 RMD160 9a105045c644f0f3329886e882947612fc285fdb SHA1 0274c68dc90805f75b57bbbc49465c604c632672 SHA256 068950e7b5f64bd42dbe9c4b4a46af1a15de71cf3dd6df6139aa7bc9c5cba68b
+DIST ircservices-5.0.57.tar.gz 1153565 RMD160 7458c3ba8ce0dc8eeab3add8c523444d5e684b0f SHA1 41bacc508a7c6a23ae6a3306fc189775a7c3d73d SHA256 79fed6555ebf91b4a5a5897b248920f3664e4c4df8f0e75092cdb6e80cf97369
+DIST ircservices-5.0.59.tar.gz 1156586 RMD160 e8972f503dadae3830c0ab43d261e8e8233db0d0 SHA1 896c1c1081fc07cf25dfb67c53840d1047fbeb94 SHA256 b56a76ad75f2de3a93a7913803b95d1f21e51ed38bd5c9f3de5edf7626ad5f55
+EBUILD ircservices-5.0.53.ebuild 3267 RMD160 71cc3c8566599dc1b2546ca20436a5bc9012455f SHA1 799bc87abc7a731e55b4cc2342f32073fcbb0e3b SHA256 80309d7ade29c82b19c86428be21e9a24673b552a7c0f059bea6ab624671d694
+MD5 661bfa20e35e90325c6c2914ecb19b40 ircservices-5.0.53.ebuild 3267
+RMD160 71cc3c8566599dc1b2546ca20436a5bc9012455f ircservices-5.0.53.ebuild 3267
+SHA256 80309d7ade29c82b19c86428be21e9a24673b552a7c0f059bea6ab624671d694 ircservices-5.0.53.ebuild 3267
+EBUILD ircservices-5.0.54.ebuild 3269 RMD160 835780c28caeab70e712ee12f07e6d833af18596 SHA1 002b239db42325590fe2856d9117738d192e0749 SHA256 151cf2e7e6c0afb7c0ef60bf4d7352d0eeaef7e078c16c60285a9ca8501f646b
+MD5 5f7b2e76b03f995f6ad99f68ecbc2d36 ircservices-5.0.54.ebuild 3269
+RMD160 835780c28caeab70e712ee12f07e6d833af18596 ircservices-5.0.54.ebuild 3269
+SHA256 151cf2e7e6c0afb7c0ef60bf4d7352d0eeaef7e078c16c60285a9ca8501f646b ircservices-5.0.54.ebuild 3269
+EBUILD ircservices-5.0.57.ebuild 3269 RMD160 cf1c0404cdc142a390bddc4d151ad7123e778844 SHA1 b2196cc4cdc25dd5b52704409ece7a11498634dc SHA256 359c566a9603d3d388ccc5f191d021b50221ad85f1043820fec2a2904d89edc6
+MD5 cc8ebe27cc5084a5cb32ff88325e978a ircservices-5.0.57.ebuild 3269
+RMD160 cf1c0404cdc142a390bddc4d151ad7123e778844 ircservices-5.0.57.ebuild 3269
+SHA256 359c566a9603d3d388ccc5f191d021b50221ad85f1043820fec2a2904d89edc6 ircservices-5.0.57.ebuild 3269
+EBUILD ircservices-5.0.59.ebuild 3269 RMD160 0932c97e20436b2c7ae91a444dc5bc193e72be8b SHA1 8c5dceb14953b8a60d9c96e8072056de5d6f028e SHA256 4c7e74484ed06b053241127a61d00c39840dea8bddbfd3aade7a47e921d94316
+MD5 aba8c785d777c68bd712d7f6d21b60ca ircservices-5.0.59.ebuild 3269
+RMD160 0932c97e20436b2c7ae91a444dc5bc193e72be8b ircservices-5.0.59.ebuild 3269
+SHA256 4c7e74484ed06b053241127a61d00c39840dea8bddbfd3aade7a47e921d94316 ircservices-5.0.59.ebuild 3269
+MISC ChangeLog 4346 RMD160 5256d8ebb5b7adea8a5aa12e5bdf33aa277c93c8 SHA1 f75ad7b556a2c5aa48147b737aadff14231e7bc0 SHA256 bfab91d6468387f63f8f3757435107b0325c57942729d259a5ca3ff8d8625f41
+MD5 dfec3452b2cae9d170b1dbf3e382f790 ChangeLog 4346
+RMD160 5256d8ebb5b7adea8a5aa12e5bdf33aa277c93c8 ChangeLog 4346
+SHA256 bfab91d6468387f63f8f3757435107b0325c57942729d259a5ca3ff8d8625f41 ChangeLog 4346
+MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
+MD5 38ceeb1f925e3b0f1e362f84684c9788 files/digest-ircservices-5.0.53 259
+RMD160 65f7e5a224178575d4abbb7f7c845dbaccde8a68 files/digest-ircservices-5.0.53 259
+SHA256 395c0f36f5c27e985870e05c01b252e7ef847d07fdae79a78cf281eb4a9f4895 files/digest-ircservices-5.0.53 259
+MD5 a3506e5a8605788b5116c9c7e407360c files/digest-ircservices-5.0.54 259
+RMD160 5277dbf9d93fa5bd73a1d2d2a83a3f84d523a813 files/digest-ircservices-5.0.54 259
+SHA256 c522c5ed666e643efd1a30ab091694051b9cb9c0e1b2f4c68fa8268c65975b1a files/digest-ircservices-5.0.54 259
+MD5 9ba5bae54df7f535b2ab9f2f748748fc files/digest-ircservices-5.0.57 259
+RMD160 4b2c0e3a150dc4b1d4e8add4dc5312072710dc37 files/digest-ircservices-5.0.57 259
+SHA256 d26eb613e8153a4ca7ec78d8a405771cd2b6c406673e0c4917d6eab319bcd410 files/digest-ircservices-5.0.57 259
+MD5 85339f8b2007f8662eec4e0cea58bda0 files/digest-ircservices-5.0.59 259
+RMD160 a911d030fd2a651448cc9157eed6ab7431d0dd5e files/digest-ircservices-5.0.59 259
+SHA256 c4db5b72d85647f4799dfe4ca3ce8550e45dfea5b3a716de74941d990689ce98 files/digest-ircservices-5.0.59 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTmReI1lqEGTUzyQRAlu2AKDIquwiPQBmHOsaGi1t/piSr3i+yQCggGoL
+BKxcfrm8GQLzM28sEvlgFsg=
+=6pBd
+-----END PGP SIGNATURE-----
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"
+}
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index c465fb3002a0..a57f154cd650 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -6,14 +6,19 @@ MD5 b1ea0b635587713b2f680d6bb6528069 files/0.11-libnotify-libsexy-configure.patc
 RMD160 b928e0d6d20a5dabf80f67f2b714aef8b29678a8 files/0.11-libnotify-libsexy-configure.patch 2400
 SHA256 cb713b86de4418a3bed1c86d54fdea6bdb519cb90519867dda3ce269a8ab0f00 files/0.11-libnotify-libsexy-configure.patch 2400
 DIST xchat-gnome-0.13.tar.bz2 1495400 RMD160 8dd134e8a10cb58e66744282504022b7013208e8 SHA1 c2d027db941b9c1455569d55675ffcb5401f5f7a SHA256 00ac36202b1b13f1022a33ab5a28fc0c5a75475a3ea4d512e46dc9c1007de2f9
-EBUILD xchat-gnome-0.13.ebuild 2111 RMD160 c26ea98ff1b2bb22efabb5a166bd59a71c3f75e5 SHA1 4a0a55feeb2d00074e937f9919ceba5f088f2fb6 SHA256 c8279d8ba99476a49b9c2e13e6920fba5a22f7b99b748cccde967a84850c69b2
-MD5 6f0a4b9157533d83ea13e0162d280f91 xchat-gnome-0.13.ebuild 2111
-RMD160 c26ea98ff1b2bb22efabb5a166bd59a71c3f75e5 xchat-gnome-0.13.ebuild 2111
-SHA256 c8279d8ba99476a49b9c2e13e6920fba5a22f7b99b748cccde967a84850c69b2 xchat-gnome-0.13.ebuild 2111
-MISC ChangeLog 4386 RMD160 ae989533b93581656ca69eb1d521d4db4d2c426f SHA1 9215724c9d0b9d916f834307f091005989727169 SHA256 f301b4195b8ddd549be7931a28fd383f25f5d3eed9b4601cf63f8069601a72b8
-MD5 d5dfe50ad30ddcad902efc0484101314 ChangeLog 4386
-RMD160 ae989533b93581656ca69eb1d521d4db4d2c426f ChangeLog 4386
-SHA256 f301b4195b8ddd549be7931a28fd383f25f5d3eed9b4601cf63f8069601a72b8 ChangeLog 4386
+DIST xchat-gnome-0.15.tar.bz2 1501197 RMD160 4df713582ce5638e4702060fc55408c9be956dff SHA1 9720c5f2ad71be5189293ae268a6d367df922d22 SHA256 1d066ee04e5ec2b2557e0e363078c4f38ec527522d958492c331facc24d2be57
+EBUILD xchat-gnome-0.13.ebuild 2110 RMD160 143546cbc9392b5842e172c96d7b24686e1d486c SHA1 92a509db67dffa4ade90b60c1763f76828081b2d SHA256 2ea631534e0c1d36ea76c12a06ff7e38c4d37146df42f9f02349be7de5e82b77
+MD5 42148a7c50eb9f3b8c4f18ed20dff089 xchat-gnome-0.13.ebuild 2110
+RMD160 143546cbc9392b5842e172c96d7b24686e1d486c xchat-gnome-0.13.ebuild 2110
+SHA256 2ea631534e0c1d36ea76c12a06ff7e38c4d37146df42f9f02349be7de5e82b77 xchat-gnome-0.13.ebuild 2110
+EBUILD xchat-gnome-0.15.ebuild 2110 RMD160 f56c07ad42d6dfe895ddca0819ee290ee6050997 SHA1 5d05aafb939b84bbfff3889e2ec2feb3bec27841 SHA256 25c2bc75a357c63be41295fbfdf330556a4819f6c5d850d2d406110565b4db37
+MD5 d198e098ae1bad31fc77780b56ffe182 xchat-gnome-0.15.ebuild 2110
+RMD160 f56c07ad42d6dfe895ddca0819ee290ee6050997 xchat-gnome-0.15.ebuild 2110
+SHA256 25c2bc75a357c63be41295fbfdf330556a4819f6c5d850d2d406110565b4db37 xchat-gnome-0.15.ebuild 2110
+MISC ChangeLog 4637 RMD160 e29c978621da72bd20a086541820459331b8342d SHA1 b6ce8c21bc376969ca2145153bc8dfaafaee924b SHA256 9d5df6edb5345ae7b9e4f4227b6aeee477eeb7ddd8fb70268404dbacdd92aa55
+MD5 51e21e123a68e7cb246721c20c364c57 ChangeLog 4637
+RMD160 e29c978621da72bd20a086541820459331b8342d ChangeLog 4637
+SHA256 9d5df6edb5345ae7b9e4f4227b6aeee477eeb7ddd8fb70268404dbacdd92aa55 ChangeLog 4637
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -21,10 +26,13 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 2aa09805aeabd4173d38bb1c2a1c3e2e files/digest-xchat-gnome-0.13 256
 RMD160 6b78070e1ef4ef046b00620d01a866cc9606a068 files/digest-xchat-gnome-0.13 256
 SHA256 7bbc6c745973d4dbbafd6bfb5c5ace6886b8fe1d05a8ec727b83a4aad9b2ffc6 files/digest-xchat-gnome-0.13 256
+MD5 b13deec4b7905486a2adbee24e5679f8 files/digest-xchat-gnome-0.15 256
+RMD160 32f88fe68394ab53fdf56723e1f06113b5953fea files/digest-xchat-gnome-0.15 256
+SHA256 992f93edfa281f7e3b42e9865bee019f6819f0e0dc4e38625f9ec7bd356a7c8e files/digest-xchat-gnome-0.15 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFL6JYI1lqEGTUzyQRAqIOAKC71yeBpjAPLsG7iHElgjxcv/NaPgCgywAR
-xc8z5jdFmdXNuODsSlAA+n4=
-=f+iU
+iD8DBQFFTmSJp5vW4rUFj5oRAnOTAJ9OPQTHaJvlE5WqLrgH2QGwffY2HwCfb696
++XZ3mElUcYVpZIOB75mQ93U=
+=R5Zv
 -----END PGP SIGNATURE-----