Update to EAPI 4, add ~amd64 keyword, respect CFLAGS (bug #241092), respect LDFLAGS (bug #337884), fix qa warnings (bug #386917 by Michael), and fix parallel make issues.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

5 files changed, 122 insertions, 17 deletions

diff --git a/net-nntp/sn/ChangeLog b/net-nntp/sn/ChangeLog
index 556668e64017..99b5d7c27d20 100644
--- a/net-nntp/sn/ChangeLog
+++ b/net-nntp/sn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/sn
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sn/ChangeLog,v 1.5 2009/09/23 19:45:43 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sn/ChangeLog,v 1.6 2011/11/22 01:39:53 radhermit Exp $
+
+  22 Nov 2011; Tim Harder <radhermit@gentoo.org> sn-0.3.8.ebuild,
+  +files/sn-0.3.8-parallel-make.patch, +files/sn-0.3.8-qa.patch:
+  Update to EAPI 4, add ~amd64 keyword, respect CFLAGS (bug #241092), respect
+  LDFLAGS (bug #337884), fix qa warnings (bug #386917 by Michael), and fix
+  parallel make issues.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> sn-0.3.8.ebuild:
   Remove virtual/libc
diff --git a/net-nntp/sn/Manifest b/net-nntp/sn/Manifest
index 61082b235c22..5d81db0ac624 100644
--- a/net-nntp/sn/Manifest
+++ b/net-nntp/sn/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX sn-0.3.8-parallel-make.patch 1809 RMD160 02d1e85f4d8d3ed3db8ade395fb4771bea06815f SHA1 13eb5d366b5ec214656a8b2aa880e1b43feaeeb1 SHA256 140962c36198fbd46bfd54282f1332851341d4ee2b57cef450377f9b67fb4bca
+AUX sn-0.3.8-qa.patch 325 RMD160 2acb432a09c90fd546445ae5d994f9ede2d5c7e3 SHA1 7f8a1b317287ba30b33b9078aebb130a932e39c2 SHA256 67d9931cdbaac729ea4c8f70e01484f7ec0dcf198c36b64ee3a5ff00af2ed97b
 DIST sn-0.3.8.tar.bz2 97751 RMD160 63c6d492104447dfaeb7f15569c50080ef0276f4 SHA1 854a7422e0d37e0e9f1891e663efadc196e08661 SHA256 8ce7c77d587814993ca27d5bbf2bb8b2ad13111995b6113dc917484596dbddf0
-EBUILD sn-0.3.8.ebuild 1135 RMD160 b502ff527ae5b08b1c2bef8287b5ff76ca409d74 SHA1 e306abb7c40d188816dd71b931b4fe121dc4c1ee SHA256 dff8ede100ae42d17b365d7c4064dfd793a429d2cf02ad305e2cf364adbde390
-MISC ChangeLog 1832 RMD160 ceca976a7611182750ca61b9771cc4331a5f1118 SHA1 73262eb9dac2880a9b5554f8152025762c95d51f SHA256 e8608786f0d23d94e37ccbb868fbbe9b180be26fbf79367a481148124bdbab88
+EBUILD sn-0.3.8.ebuild 1226 RMD160 5345722caa6e5315e371c07365600f472b764e88 SHA1 7adb08ede0c8ace32e393b9b8b476bb30e738ac5 SHA256 072294aa3b4a4cf13fa47453b1fd50e158fbd10e6eb69e1ff8f4f4b9f8b4040c
+MISC ChangeLog 2143 RMD160 488e33ec56db506e44c3d55a6a988fdb5208ae5a SHA1 059c2dcb3dbf65eb10279c99546ced892e18c92b SHA256 046095740bd255fc82e9cf3abcfb1b6c45804aadd046915bcbe5136466d94df2
 MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOyv1yAAoJEEqz6FtPBkyjAIgH/jfR+9Z6pXWxvgirWjfQM8eA
+nGSO94v7LwNQUrLJ70xCDoK1mhA/7Uo4SwBd30aocKRKz0km2xgOhDKNPH37K5v2
+/F2jwKVUFXETMIzNYEHtYNMC15jFWm6z3+bJg0eOxusHBVwKytP3ia0Bt3who5c+
+K3LajL883J+0n7gKPeXTwcBoV2oHxl/SCTzHE5VQx9dRGhXmht/BLaa3nvwQZp7S
+hW4I6jZQBX6R1pviqd+tJfoCnCLMBIPEHXYz4Novmq7ruNr+Qjn4R1eqaw0WmpND
+MqUTEEbjSuW2LG227dpjgNt+Mic5W3CEIFzzGsyoEX9Q2z02OouBMVNvpje6zU4=
+=prx3
+-----END PGP SIGNATURE-----
diff --git a/net-nntp/sn/files/sn-0.3.8-parallel-make.patch b/net-nntp/sn/files/sn-0.3.8-parallel-make.patch
new file mode 100644
index 000000000000..d94e21897781
--- /dev/null
+++ b/net-nntp/sn/files/sn-0.3.8-parallel-make.patch
@@ -0,0 +1,56 @@
+--- sn-0.3.8/Makefile.orig
++++ sn-0.3.8/Makefile
+@@ -94,39 +94,39 @@
+ 	ar rc $@ $^
+ 	ranlib $@
+ 
+-snsplit: snsplit.o sn.a
++snsplit: snsplit.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snscan: snscan.o sn.a
++snscan: snscan.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
+ sncat: snscan
+ 	ln -s snscan sncat
+ sncancel: snscan
+ 	ln -s snscan sncancel
+-snprimedb: snprimedb.o sn.a
++snprimedb: snprimedb.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-sndumpdb: sndumpdb.o sn.a
++sndumpdb: sndumpdb.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snntpd: snntpd.o post.o commands.o list.o sn.a
++snntpd: snntpd.o post.o commands.o list.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
+-snsend: snsend.o sn.a
++snsend: snsend.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
+ snstore: snsend
+ 	ln -s snsend snstore
+-snfetch: snfetch.o sn.a
++snfetch: snfetch.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snexpire: snexpire.o sn.a
++snexpire: snexpire.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snmail: snmail.o sn.a
++snmail: snmail.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snget: snget.o get.o sn.a
++snget: snget.o get.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-sngetd: sngetd.o get.o sn.a
++sngetd: sngetd.o get.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snnewgroup: snnewgroup.o sn.a
++snnewgroup: snnewgroup.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-sndelgroup: sndelgroup.o sn.a
++sndelgroup: sndelgroup.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+-snlockf: snlockf.o
++snlockf: snlockf.o sn.a lib/libstuff.a
+ 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
+ 
+ %: %.in sed-cmd
diff --git a/net-nntp/sn/files/sn-0.3.8-qa.patch b/net-nntp/sn/files/sn-0.3.8-qa.patch
new file mode 100644
index 000000000000..52a25ebcd83e
--- /dev/null
+++ b/net-nntp/sn/files/sn-0.3.8-qa.patch
@@ -0,0 +1,21 @@
+--- lib/readln.c
++++ lib/readln.c
+@@ -9,6 +9,7 @@
+  * Get a single line from an fd.
+  */
+ 
++#include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+
+--- lib/cmdopen.c
++++ lib/cmdopen.c
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/wait.h>
+ 
diff --git a/net-nntp/sn/sn-0.3.8.ebuild b/net-nntp/sn/sn-0.3.8.ebuild
index a30650814a1c..5f9ad3490dd2 100644
--- a/net-nntp/sn/sn-0.3.8.ebuild
+++ b/net-nntp/sn/sn-0.3.8.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sn/sn-0.3.8.ebuild,v 1.3 2009/09/23 19:45:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sn/sn-0.3.8.ebuild,v 1.4 2011/11/22 01:39:53 radhermit Exp $
 
-inherit toolchain-funcs
+EAPI=4
+
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Hassle-free Usenet news system for small sites"
 SRC_URI="http://infa.abo.fi/~patrik/sn/files/${P}.tar.bz2"
 HOMEPAGE="http://infa.abo.fi/~patrik/sn/"
 
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
@@ -17,26 +19,30 @@ RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qa.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	sed -i -e 's/-g -Wall -pedantic -O/-Wall -pedantic/' Makefile || die
+}
+
 src_compile() {
-	make cc-flags || die "make cc-flags failed"
+	emake cc-flags
 	echo ${CFLAGS} >>cc-flags
 
-	emake -j1 \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
 		SNROOT=/var/spool/news \
 		BINDIR=/usr/sbin \
-		MANDIR=/usr/share/man \
-		|| die "emake failed"
+		MANDIR=/usr/share/man
 }
 
 src_install() {
 	dodir /var/spool/news /usr/sbin /usr/share/man/man8
 	mknod -m 600 "${D}"/var/spool/news/.fifo p
-	make install \
+	emake install \
 		SNROOT="${D}"/var/spool/news \
 		BINDIR="${D}"/usr/sbin \
-		MANDIR="${D}"/usr/share/man \
-		|| die "make install failed"
-	dodoc CHANGES FAQ INSTALL* INTERNALS README* THANKS TODO || die "dodoc failed"
+		MANDIR="${D}"/usr/share/man
+	dodoc CHANGES FAQ INSTALL* INTERNALS README* THANKS TODO
 	fowners news:news /var/spool/news{,/.fifo}
 }