dev-libs/libtar: Fix implicit declarations; Fix install failure if app-portage/epkg is installed, #423195

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

5 files changed, 45 insertions, 9 deletions

diff --git a/dev-libs/libtar/ChangeLog b/dev-libs/libtar/ChangeLog
index 033590538682..5df7a719d026 100644
--- a/dev-libs/libtar/ChangeLog
+++ b/dev-libs/libtar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libtar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.26 2012/06/22 15:44:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/ChangeLog,v 1.27 2012/06/25 17:13:38 jlec Exp $
+
+  25 Jun 2012; Justin Lecher <jlec@gentoo.org> libtar-1.2.11-r5.ebuild,
+  +files/libtar-1.2.11-impl-dec.patch, metadata.xml:
+  Fix implicit declarations; Fix install failure if app-portage/epkg is
+  installed, #423195
 
   22 Jun 2012; Brent Baude <ranger@gentoo.org> libtar-1.2.11-r5.ebuild:
   Marking libtar-1.2.11-r5 ppc64 for bug 420935
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index f091d7d55261..6850cba2917a 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX libtar-1.2.11-fortify.patch 246 RMD160 eb4c7b7219b45748390d8aaa17f3cf6a6360e416 SHA1 6fa3e7ad1b40ff1d59e800692bff9fa9ae01c3ad SHA256 8faa386b4879b5e8855e69708fb77e779629b1d9162b06cc01095b38f187ea26
 AUX libtar-1.2.11-free.patch 337 RMD160 f934fbecd7f601724c59c9ecf621217d594dd247 SHA1 4201c44e53d31f72e8158371227692f42ecd8989 SHA256 ed7c9218c5f2b7f26f41d79ff7e2ede793816bfdeeffd0480ea90f2a818ca1ac
+AUX libtar-1.2.11-impl-dec.patch 332 RMD160 2ae554b2833de794077f78b503bb3568a35e8c79 SHA1 f619ab3c967206c9f53a55c3d64c70b192ac15ea SHA256 c9799e718142004b8653e5926347faf406509665b946fd8760049babff442612
 DIST libtar-1.2.11.tar.gz 145354 RMD160 205d1213ed32f9708fb2135010afdd9e184c430e SHA1 9611f23024b0e89aad1cfea301122186b3c160f8 SHA256 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
 DIST libtar_1.2.11-6.diff.gz 245511 RMD160 05a7bb41acd6d341b2e79ed6a699585089d3c3c3 SHA1 8ca2905f3f175fb0b15bb37a498ab5815891f50c SHA256 002d067499a94988dfa23a71e3f46d6b9af26fdce266870dc9b7c81d54fc820d
 DIST libtar_1.2.11-8.debian.tar.gz 10275 RMD160 af0838698bdab02b2d05e2754c202753192d876a SHA1 3506bac4a0fff61e8b92ff400f7771155dc834e0 SHA256 ab55b827ac0d60c4b17decdbab827b1e4c79ed75383133814e103b202cc4fbbe
 EBUILD libtar-1.2.11-r4.ebuild 1410 RMD160 4349ff13bee2951b8f8de1bf6422b0709d477d55 SHA1 771426c73a807b72fcf9482a897f8a9efd71acb0 SHA256 6dac6d71c9d1aa3836286020b877a3bbe43f469c22eef0e7c2031fc06ea3065a
-EBUILD libtar-1.2.11-r5.ebuild 1479 RMD160 d160dcfe0599290403a4545236cfe742837ea88a SHA1 ba0fd5301ed4931126cddffdad0a44c0f97c2b1a SHA256 a924c2a4bd8930f2c274e62fcd34312a81194f4d1c3aa5162089e19b7d45bfff
-MISC ChangeLog 3690 RMD160 614e6467b86c779435dec2f5a1851c2cc11692a5 SHA1 92bc332978d169061105d14ceef5a43617d352ed SHA256 50c9b88f613d1749fec21a157dca159871fd7c59f91c47415de49185b4fe285f
-MISC metadata.xml 218 RMD160 b8d59202c68b3f015db783c4b800120676c401e3 SHA1 6366b18a091033de638b10002f27fd5e9885720f SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b
+EBUILD libtar-1.2.11-r5.ebuild 1566 RMD160 43edf12a2b5c0140ebc99d0b85bae26495308331 SHA1 345907d4e0685a29ae93f956bcfca1a2c296c69f SHA256 33176dddb84dd6a276cdf8312258366d1fba14ecdb48f716a98661c441ab9503
+MISC ChangeLog 3907 RMD160 0631a468b77e9008c07353d7178a25c7f31b51d0 SHA1 7d7be0079ae744b18c4c3eee02ef9c5ae829c405 SHA256 e9c206980a806d1cdc39979cb14e509d3fcebc6e47ba7bba7e45eaffc86533a4
+MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/onEcACgkQgAnW8HDreRZ0OwCggSyx1oJDUxWduLQUg8c6TO+n
+VMgAoK1rzHYCtLHmrUAt9qAPC7Bm57U7
+=EvbZ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libtar/files/libtar-1.2.11-impl-dec.patch b/dev-libs/libtar/files/libtar-1.2.11-impl-dec.patch
new file mode 100644
index 000000000000..ee00f5c1c9f3
--- /dev/null
+++ b/dev-libs/libtar/files/libtar-1.2.11-impl-dec.patch
@@ -0,0 +1,15 @@
+ lib/extract.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/extract.c b/lib/extract.c
+index 6bbb801..3ef2fb8 100644
+--- a/lib/extract.c
++++ b/lib/extract.c
+@@ -18,6 +18,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <utime.h>
++#include <string.h>
+ 
+ #ifdef STDC_HEADERS
+ # include <stdlib.h>
diff --git a/dev-libs/libtar/libtar-1.2.11-r5.ebuild b/dev-libs/libtar/libtar-1.2.11-r5.ebuild
index 995827bb86c0..7e6cf00e7b23 100644
--- a/dev-libs/libtar/libtar-1.2.11-r5.ebuild
+++ b/dev-libs/libtar/libtar-1.2.11-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r5.ebuild,v 1.4 2012/06/22 15:44:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtar/libtar-1.2.11-r5.ebuild,v 1.5 2012/06/25 17:13:38 jlec Exp $
 
 EAPI=4
 inherit autotools eutils multilib
@@ -25,7 +25,9 @@ src_prepare() {
 	sed -i -e '/#/d' "${d}"/series || die
 	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
 
-	epatch "${FILESDIR}"/${P}-f{ree,ortify}.patch
+	epatch \
+		"${FILESDIR}"/${P}-f{ree,ortify}.patch \
+		"${FILESDIR}"/${P}-impl-dec.patch
 
 	sed -i \
 		-e '/INSTALL_PROGRAM/s:-s::' \
@@ -37,6 +39,8 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		--disable-encap \
+		--disable-epkg-install \
 		$(use_enable static-libs static) \
 		$(use_with zlib)
 }
diff --git a/dev-libs/libtar/metadata.xml b/dev-libs/libtar/metadata.xml
index 1470e032181b..91f4e72fb544 100644
--- a/dev-libs/libtar/metadata.xml
+++ b/dev-libs/libtar/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>