Bumping to 5.1.14 and taking over package

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 i686)

5 files changed, 135 insertions, 3 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/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>