Bumping to 5.1.14 and taking over package

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 i686

6 files changed, 151 insertions, 5 deletions

diff --git a/net-irc/ircservices/ChangeLog b/net-irc/ircservices/ChangeLog
index 4f9fe7733903..9fe5cd400cee 100644
--- a/net-irc/ircservices/ChangeLog
+++ b/net-irc/ircservices/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/ircservices
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.41 2007/12/13 20:42:34 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ChangeLog,v 1.42 2009/01/03 20:13:45 gurligebis Exp $
+
+*ircservices-5.1.14 (03 Jan 2009)
+
+  03 Jan 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  +files/ircservices-5.1.14-fPIC.patch,
+  +files/ircservices-5.1.14-fPIC-configure.patch, metadata.xml,
+  +ircservices-5.1.14.ebuild:
+  Bumping to 5.1.14 and taking over package
 
   13 Dec 2007; Raúl Porcel <armin76@gentoo.org> -ircservices-5.0.61.ebuild,
   -ircservices-5.0.62.ebuild:
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
index 4a7868ab778e..72a61c731517 100644
--- a/net-irc/ircservices/Manifest
+++ b/net-irc/ircservices/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.0.37-fPIC.patch 1172 RMD160 2fd0bbbb606ad26229c62ca64430cf1ebb0f8654 SHA1 15a1dba81a02681f1682efb8c007d2b51045e496 SHA256 a04e0ec338d84a1f1f64233af4aeeadd4f216032063347bec275b4e5ff5c9114
 AUX 5.0.53-fPIC-configure.patch 635 RMD160 c4bb6b707999dd9e9b85046898daa71f8b717f26 SHA1 82ce45099e1e5a557dbfb1587b88cef679dbaa53 SHA256 d74043c7c031d07f0435996b52176a769bb7f892d4921c5a528c3a2405256252
+AUX ircservices-5.1.14-fPIC-configure.patch 778 RMD160 c4e2132984dd63b31dbcecda7a9c527b39e474fc SHA1 4ac98c01a7824477916c86fd61a48b4a376de206 SHA256 b94e19034a85a96964ea659716278545dc77c7644e1c5a758dae66d5c9e538c2
+AUX ircservices-5.1.14-fPIC.patch 622 RMD160 b1a1064317da8c8ddcec8049963990dd34607f3e SHA1 8d86abb05c88cbbc8656c5384d6a7011dfd0f645 SHA256 af5f1472b5c9b1e9ff50f4ade87f6a8e8784addaeb356fddce81f74cffad0f91
 AUX ircservices.conf.d 327 RMD160 584b51f9cc583920cd12646cfa84489fae99fab5 SHA1 178a5649edcb3f3075b6d8c0e9192081e1d42276 SHA256 e6fd7cacb1b44e6ddbf7d1c9831480eeed4d0e4a6b2f21188327971a073240a0
 AUX ircservices.init.d 764 RMD160 e54f5a09c99c9aea230013afe01b02080aa793b4 SHA1 e86f4706db823029ba65954845d3d080034f2855 SHA256 9dacabf713916d88b6c03af21c0a449f527e9c19d1e9f1c56aeeeeb68586bdbd
 DIST ircservices-5.0.63.tar.gz 1167436 RMD160 d61d5bf3dc28ac38a391b3918289d74ce2106ace SHA1 5c08af0d56bc99f9dc8f331eae9963beb3e28dad SHA256 7cf68b2dc956c25da694e1650b3871a9a55feac191292062d3d568d377be6ce3
+DIST ircservices-5.1.14.tar.gz 1516465 RMD160 294f6edcb36baf733bee32dc08650302f1994dcd SHA1 15aba0d70b521d3c5afd84aaf31a4e4f2f2f4017 SHA256 73b013926aca72c65292644a08e1b79a3e3b3f3d8e701b168ef3ead5a7305b18
 EBUILD ircservices-5.0.63.ebuild 3360 RMD160 b1a3416e40bcf668cb334057cc61a91dc96197f5 SHA1 4d9ce33660a76b69f29a593ca2001016fc9ea1d6 SHA256 bd0ff72cc2d7fc89f414bbcf57435fe5e7762d927677a0cf136919960eeb1546
-MISC ChangeLog 6415 RMD160 fde2ecdea87a7cef0b5f296e9b953c1b16bec61c SHA1 7c8cb8de8fee948093a72b4c41933679d986f7c0 SHA256 79c267d2895d4cecc26dc305de390ffde43d1ae795f5e671d3edcd212eea49e2
-MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+EBUILD ircservices-5.1.14.ebuild 3352 RMD160 3babded58e45b9b1090cd41d80f56334ccd800e8 SHA1 06e3a4b3a790f1b4a8b6a1266ba09499a02355be SHA256 d2df018c788da3d7f76180d7643a8dbeb485ed2d2b81f4b0d63762c92db9adf8
+MISC ChangeLog 6694 RMD160 06706a4b7552cf1116b945b78ae0a7eb4bd0a6c8 SHA1 e09e0821370a0358289e0ff845da155dac51fdfb SHA256 e61303d7725819635e68917f710347ab2bc2f8b73ea5c3ff574f027f23addff9
+MISC metadata.xml 267 RMD160 6c1df58375f4a1410db23bc639e1d2a278edfeb8 SHA1 a9324f1d3ca9746fe1ab419901d9c6556803dc4b SHA256 e143475a8cdddede06c25d62f39b853951fe13af9739fae4969f2aec483256dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklf4wYACgkQsR7PQhRXYEkKfQCdG6jJZ8iyrRvBPv0vpAq+kdZe
+hwIAniaaEPa21qL9/NX7e8++4x/LFHUs
+=p8eE
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ircservices/files/ircservices-5.1.14-fPIC-configure.patch b/net-irc/ircservices/files/ircservices-5.1.14-fPIC-configure.patch
new file mode 100644
index 000000000000..8e279031b2e0
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.14-fPIC-configure.patch
@@ -0,0 +1,14 @@
+--- ircservices-5.1.12/configure	2008-09-22 17:35:52.000000000 +0000
++++ ircservices-5.1.12.orig/configure	2008-09-22 17:33:51.000000000 +0000
+@@ -1296,9 +1296,9 @@
+             fi
+             if [ "$OK" ] ; then
+                 if [ "x`uname -s`" = "xOSF1" ] ; then
+-                    CC_SHARED="$CC -shared -Wl,-expect_unresolved"
++                    CC_SHARED="$CC -shared -Wl,-expect_unresolved -fPIC"
+                 else
+-                    CC_SHARED="$CC -shared"
++                    CC_SHARED="$CC -shared -fPIC"
+                 fi
+                 if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so && run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib2.c -o $CONFTMP/test-lib2.so ; then
+                     log "-shared works"
diff --git a/net-irc/ircservices/files/ircservices-5.1.14-fPIC.patch b/net-irc/ircservices/files/ircservices-5.1.14-fPIC.patch
new file mode 100644
index 000000000000..788723c5be00
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.14-fPIC.patch
@@ -0,0 +1,12 @@
+diff -Nur ircservices-5.1.12/modules/Makerules ircservices-5.1.12.orig/modules/Makerules
+--- ircservices-5.1.12/modules/Makerules	2008-09-22 17:37:48.000000000 +0000
++++ ircservices-5.1.12.orig/modules/Makerules	2008-09-22 17:33:51.000000000 +0000
+@@ -172,7 +172,7 @@
+ $(TARGET).o: .compiled-$(TARGET).o FRC
+ 	@echo >/dev/null
+ .compiled-$(TARGET).o: $(TARGET).c $(DEPS) $(INCLUDES2)
+-	cd $(TOPDIR) && $(CC) $(CFLAGS) -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
++	cd $(TOPDIR) && $(CC) $(CFLAGS) -fPIC -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
+ 	@rm -f $@
+ 	@ln -s $(TARGET).o $@
+ 
diff --git a/net-irc/ircservices/ircservices-5.1.14.ebuild b/net-irc/ircservices/ircservices-5.1.14.ebuild
new file mode 100644
index 000000000000..ef024c91dd45
--- /dev/null
+++ b/net-irc/ircservices/ircservices-5.1.14.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircservices/ircservices-5.1.14.ebuild,v 1.1 2009/01/03 20:13:45 gurligebis 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="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+	# this is needed, because old ebuilds added the user with ircservices:users
+	usermod -g ircservices ircservices
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-fPIC.patch"
+	epatch "${FILESDIR}/${P}-fPIC-configure.patch"
+
+	ht_fix_file configure
+	sed -i \
+		-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 docs/Changes README docs/WhatsNew || die "dodoc failed"
+}
diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
index 6ef15e900f17..715b3c1f8069 100644
--- a/net-irc/ircservices/metadata.xml
+++ b/net-irc/ircservices/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-irc</herd>
+	<herd>net-irc</herd>
+	<maintainer>
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
 </pkgmetadata>