Fix Manifest/WORKDIR for upstream repackaging. Clean up.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 60 insertions, 21 deletions

diff --git a/net-misc/netpipes/ChangeLog b/net-misc/netpipes/ChangeLog
index bf41c0d37056..a1df6f1fa564 100644
--- a/net-misc/netpipes/ChangeLog
+++ b/net-misc/netpipes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/netpipes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/ChangeLog,v 1.10 2011/12/19 19:38:17 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/ChangeLog,v 1.11 2013/11/29 16:34:26 jer Exp $
+
+*netpipes-4.2-r2 (29 Nov 2013)
+
+  29 Nov 2013; Jeroen Roovers <jer@gentoo.org> netpipes-4.2-r1.ebuild,
+  +netpipes-4.2-r2.ebuild, files/netpipes-4.2-string.patch:
+  Fix Manifest/WORKDIR for upstream repackaging. Clean up.
 
   19 Dec 2011; Tim Harder <radhermit@gentoo.org> -netpipes-4.2.ebuild:
   Remove old.
diff --git a/net-misc/netpipes/Manifest b/net-misc/netpipes/Manifest
index 847bba3839cc..2129fe1b8f09 100644
--- a/net-misc/netpipes/Manifest
+++ b/net-misc/netpipes/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX netpipes-4.2-string.patch 248 RMD160 b2d6aebd515e6135ea3525d5d2f7012500002f39 SHA1 64e329433a3ddfafdc3ea1e170b4f5fadbd538e8 SHA256 5907d764f9ee7d5a14f8dc61af3a42c6d9e3b5ad1334670b8ce8da848df1d1b0
-DIST netpipes-4.2-export.tar.gz 74977 RMD160 26c982c0b9e4382d96335f10a5e54813f776db29 SHA1 e8a52168b2893a12d943cc31e5d3a7f0bb3502b0 SHA256 6eed89b661ae9f2ac0d383414ca964abea8a115f8fba0f7ab37b49b565ffb2a8
-EBUILD netpipes-4.2-r1.ebuild 888 RMD160 75a929da684c8911d774d7ff3819bc68a8181e53 SHA1 00a5f1eab4532c1fbef56ac911accfe1cf823f77 SHA256 b3a10d3ca7cbd72f935778fd450c81fbfe090c69f9576f743db372a222004463
-MISC ChangeLog 1476 RMD160 e4b81a270360260e1a2e4c7c1efaa675081fe375 SHA1 dc0c4ebc1267506ebee88d03f4f1240547329c97 SHA256 1553441b27c4759b500dd74493775d129482cb4a4305c7a7cbcfd6ed63575008
-MISC metadata.xml 341 RMD160 a807548a84538459cebc1484fa72f10c361b3dd8 SHA1 333f851dace3cf3f11f33ed13446a6f604a3dd32 SHA256 e899d33904755e15af8caada4ed3bbbd7e590520f7e943cc183b5b3a85f8f3e3
+AUX netpipes-4.2-string.patch 179 SHA256 ebf50461f9c8d47dc17e938b2b40db75a8f00420633fe68fb55d26c571802806 SHA512 5eedd31bf184dd28b85dbfac07ba008e36d12419339181ad04f427d062f99d6be886720d212fe9f4f612988647be8c4f35e977bb0023f6c20e718da01bdbf9de WHIRLPOOL 25e0583738c516bed584d52312e8d340989083cfbb8b53699fca8f1191d7033c4c566e34c0261aed64bdea7c00787414e74ea6c430b75a50c7cfc0ca328efbfe
+DIST netpipes-4.2-export.tar.gz 75276 SHA256 0712b2cd55ad78084385d215f8037aad3c53b06a6fd8c9bda83ec23afd440a27 SHA512 a875922d179b98d5d663825cb83dc92b515ca3fa77e44ce05941a0de58951840626836b597ea244a660be637d61be3428de7dab413a1c439e4673c82dae02531 WHIRLPOOL 555850c5ff14be9b7517782dc855683c5b7bc4921d81c4c6ec091cde1a18a8ca89844214dff2eb2fb04f2165fbd3929ae2be6d7a9407fccfd4f9e48b53f0c523
+EBUILD netpipes-4.2-r1.ebuild 900 SHA256 a02702610bb5a9be3372dd581fc31784aeeca667fedcbd0cd39ae823d173ad9a SHA512 7f1e5b48da23062f7d058affb71be4a2d7896c31083184a17c545a42394a1716c30b61b80b80bf48e7ba175925ae6d9f72f7a4fb4b6531852e6a3d39c93fe517 WHIRLPOOL eb59848c398826968014a6abb58e6be0ecd2ceb3c50e05614f3352b00ba325654dd4ba7f55809a2593ed73e4380df5915f941691d43e19b7de366778b13cad0f
+EBUILD netpipes-4.2-r2.ebuild 881 SHA256 f44f33980e5cf143b464883a9953e75c43cb412dc0481350af4a046dcb1486e1 SHA512 0e5ec3ecc306273a538846f790085b49e5e0811762d640ec3ea7070697826952f7889452b2b19d8572657a45fa4d92cd37a518e872a9ed5254b372baf4349ff6 WHIRLPOOL 165946c7ee18861d6bbdfa72aca45696949dacbca073718e1bed46df1d6bcd168286fefab95b595939828b7f5f00de91a001641222bba2d83916b8b54e1e1668
+MISC ChangeLog 1693 SHA256 a300045746936be09c2cc9c8c7fb55d8f8136ae5239bb465e1afe4f88dc3e593 SHA512 03824525866114a14d2c2357f25e56baa5d6edd09119d9c305577eb610a0b4f60edc6441d83e9b05897a73e7e859c85fbea41e26904d5c5d5f17a4fa666b5018 WHIRLPOOL e890d5b5b87c64340e7cd6a86198bb857361285b2561aed5a3aeb6d643f937dc38f0cbce43198cfbf9bb1cd145da8c81b91b433de24dd02de0205333261a6a5a
+MISC metadata.xml 341 SHA256 e899d33904755e15af8caada4ed3bbbd7e590520f7e943cc183b5b3a85f8f3e3 SHA512 da73123c9637da7cd72e3dab1b184dbe1e7861571856bdc117a63e90805f5a1a892aaaa5bdfb05facbd2d6450057f368fb16b4b809867c4e82f7fd9273ba9ce0 WHIRLPOOL d3c0ec271cf74dcb17da5a14ee888a73e416148e28947c237e2661163539151b42f45432e8e7dccd512427800850154923725de2ef6bd05655cc321c31b98b5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO75KyAAoJEEqz6FtPBkyjKYkH/inO0d14O6AfexD49T3TXktv
-yQm945FFQXLOjwRf+Yya/hfUNKNrZSxAEoVz045IUTzukYWwW9B4MLF+Hga1X5RN
-JdPEWv8FWbvEziXDJ5Yaxa4/09ZEH184fw2FpeZkEfngOwCvqd8cyjzS0myeJdcL
-pGLayXRMohvt2oxRv4aiI3kK17QCVkgO3F32imwkl7zxQ1C0XIAgla3ckX05wTlt
-+efjyo8MMNkX5BLTLon4+fFBbIaDD8ODML4rAup0kvC38Et3UwPJp5Fe1AvJxzsv
-mFLY4+GWEnClBLsyk5RMyqGVMWnSgFqk405uYLJJ+NEjD/8hLAPx5k5lZi3866s=
-=lFH+
+iEYEAREIAAYFAlKYwhQACgkQVWmRsqeSphMNdwCeJPBWuiMfE9F1EjOo+f+Gq9Lx
+EgcAnieYNhGoqI5WHBgfU263Mw/0c8iH
+=BtpL
 -----END PGP SIGNATURE-----
diff --git a/net-misc/netpipes/files/netpipes-4.2-string.patch b/net-misc/netpipes/files/netpipes-4.2-string.patch
index a0f5f8ea9fb2..8dfc3cdcd137 100644
--- a/net-misc/netpipes/files/netpipes-4.2-string.patch
+++ b/net-misc/netpipes/files/netpipes-4.2-string.patch
@@ -1,5 +1,5 @@
---- timelimit.c~	2008-11-08 14:05:28.000000000 +0100
-+++ timelimit.c	2008-11-08 14:05:48.000000000 +0100
+--- a/timelimit.c
++++ b/timelimit.c
 @@ -30,6 +30,7 @@
  #include <unistd.h>
  #include <stdlib.h>
diff --git a/net-misc/netpipes/netpipes-4.2-r1.ebuild b/net-misc/netpipes/netpipes-4.2-r1.ebuild
index 5267f6c49565..537205b888d9 100644
--- a/net-misc/netpipes/netpipes-4.2-r1.ebuild
+++ b/net-misc/netpipes/netpipes-4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r1.ebuild,v 1.3 2011/12/15 14:37:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r1.ebuild,v 1.4 2013/11/29 16:34:26 jer Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-S="${WORKDIR}"
+S="${WORKDIR}/${P}-export"
 
 src_prepare() {
 	sed -i \
diff --git a/net-misc/netpipes/netpipes-4.2-r2.ebuild b/net-misc/netpipes/netpipes-4.2-r2.ebuild
new file mode 100644
index 000000000000..45b4de18c628
--- /dev/null
+++ b/net-misc/netpipes/netpipes-4.2-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netpipes/netpipes-4.2-r2.ebuild,v 1.1 2013/11/29 16:34:26 jer Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="netpipes - a package to manipulate BSD TCP/IP stream sockets"
+HOMEPAGE="http://web.purplefrog.com/~thoth/netpipes/"
+SRC_URI="http://web.purplefrog.com/~thoth/netpipes/ftp/${P}-export.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-export"
+
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS =:CFLAGS +=:' \
+		-e '/ -o /s:${CFLAGS}:$(CFLAGS) $(LDFLAGS):g' \
+		Makefile || die
+
+	epatch "${FILESDIR}/${P}-string.patch"
+}
+
+src_compile () {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	mkdir -p "${D}"/usr/share/man || die
+	emake INSTROOT="${D}"/usr INSTMAN="${D}"/usr/share/man install
+}