Fix driftnet to build with the latest stable libpng, update EAPI

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

3 files changed, 20 insertions, 12 deletions

diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index 98dfcd1ff77d..273382f8504b 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/driftnet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.42 2012/05/04 06:08:09 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.43 2014/01/06 02:21:09 steev Exp $
+
+  06 Jan 2014; Steev Klimaszewski <steev@gentoo.org>
+  driftnet-0.1.6_p20090401.ebuild:
+  Fix driftnet to build with the latest stable libpng, update eapi
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> driftnet-0.1.6-r4.ebuild,
   driftnet-0.1.6_p20090401.ebuild:
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index 0a9049685170..9cf3bbd5ea47 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -1,7 +1,7 @@
-DIST driftnet-0.1.6_p20090401.tar.gz 43683 RMD160 5a564b37f1e95e26224ed698f1afab5046eae08d SHA1 b0b984624b9053c1ebb12cf36928c89ac1492253 SHA256 6ed5d66ddc219a9e98a3879aa1317a9437dc7fc97b7a2bf538a0cb8bb32f4dca
-DIST driftnet_0.1.6-8.diff.gz 6343 RMD160 86efe61f62c727ea1cceaabfdd7ec5aaf9f4a28a SHA1 a8c79bed181549a06c5e2f13e1e4dab2d698332f SHA256 16b2ad387d3a06f2a00699b66e99de4b9c4a8636127d303d1f148862a1d65215
-DIST driftnet_0.1.6.orig.tar.gz 36700 RMD160 d33e8538b9cc985cbf90e92d4000b77b51d1ec87 SHA1 eaf1501e85b010e1f4600e2b0a173ff509df0e68 SHA256 d3cb92ce27e36c3bd7225f01e893f51a6deb04ad3235d79f5e92e17941d7511b
-EBUILD driftnet-0.1.6-r4.ebuild 1695 RMD160 e625717b0bcc96230c67dbb7def8b94d364dad05 SHA1 679d4c83de54d4a2c578ad4fbd8049fb76054b1b SHA256 492df8cddb742a339fe4384dc4b7ee555e7dfaf8157c39f621635a211e265536
-EBUILD driftnet-0.1.6_p20090401.ebuild 1628 RMD160 7e1b28fedf859ea0e8efe3cf1450684fe36d5077 SHA1 0cce0d3d40916ba236a0d5d891d09c4680dd99c3 SHA256 5ad7d13470a5f0590c363d2e4986cef49a8f64a10a9abe52f7e2d862b50f63ad
-MISC ChangeLog 5603 RMD160 f4bd16088d97ab0d63ebf7eb5c2111949a45ec04 SHA1 479a1d72af7267e5d4f13f3b206b85423818db63 SHA256 c63f34f3261cd98d0234690e09d1c1ecbb541cee19c9c3cafd56782cbfe5a601
-MISC metadata.xml 287 RMD160 f5a05509893b609f9bc3c7b0ccc73d037656b15b SHA1 d13e9a26c5d26ded3f1e936b99bf37b912a184b4 SHA256 0132f6f9154547c2766f5ad9598aeed4c9ddddd70acf9ba1b333dda556a2f994
+DIST driftnet-0.1.6_p20090401.tar.gz 43683 SHA256 6ed5d66ddc219a9e98a3879aa1317a9437dc7fc97b7a2bf538a0cb8bb32f4dca SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa WHIRLPOOL 2523114d08ee789cf0194fafb3cf1886b1173d1106091cd73973f9a213656a94fa721ef08c1037d1f5efa488caa79c936df527e9463414445ea8c0c4a87333a7
+DIST driftnet_0.1.6-8.diff.gz 6343 SHA256 16b2ad387d3a06f2a00699b66e99de4b9c4a8636127d303d1f148862a1d65215
+DIST driftnet_0.1.6.orig.tar.gz 36700 SHA256 d3cb92ce27e36c3bd7225f01e893f51a6deb04ad3235d79f5e92e17941d7511b
+EBUILD driftnet-0.1.6-r4.ebuild 1695 SHA256 492df8cddb742a339fe4384dc4b7ee555e7dfaf8157c39f621635a211e265536 SHA512 f4e9f870e0d77a0842a98b01a9322f06f8895eb217205f3593971bbffa31711b7f653bd9fb9453d4591588c88ff99b4f7fd2e9f31c041677404bb1ff00377087 WHIRLPOOL 7a67b30c473f4b3b37198850811ca167c41d5124458d1e48a248b971a4cef1c6942bd0b1b62c13959eb42416e2b277e107dac678ad9255f0e9943d5a63fe17cd
+EBUILD driftnet-0.1.6_p20090401.ebuild 1773 SHA256 69b4a425d2b68e40d98ede1a1d7e3a9b959608bdff52d880a60f66dc71e289b4 SHA512 b4555cc2f70dc1d6cd4e07d1398e660196b645095f7fb07d92639eb611f27a65c49d51a11adb3f7d4074c3d1094b917fcebd3075687eb592910529b33b97164f WHIRLPOOL 029e7e7c9cbc68c4082d13585e979af2aa9873fecdf801d055fd96f50aca95bfda11314fe052928f8a3cb6cd28c29c1e1343d035086037586a4832a8dc930c35
+MISC ChangeLog 5758 SHA256 0b93fcbe092fe3934956d9bf2378909750593f44fec28fbb326819a70aa46d7e SHA512 bc7bcfadee4d5afd0d32e9cbc941b68ec84cb48b179b8833e4a4cbfbcfc461adde697ee0f17fe1bd3af1f7909a3984edbe11f3e99b75c7e9c0fd7c9b3e7c377a WHIRLPOOL 543c4485db190dbd26f85cf1f3d9ca9579beceb5b9fae4ac566cee207796e7bec7b239b8604c6f55074867f108b7df9a1a741a772ce94a78ab5bc61df2bd571e
+MISC metadata.xml 287 SHA256 0132f6f9154547c2766f5ad9598aeed4c9ddddd70acf9ba1b333dda556a2f994 SHA512 3accb56aa14af50af1b2835662e4e3c6cf203e060722b277421f1bf0678b900201a566c92186031e1976b74e26093306fee245967db9eb7b63a57aa58c14705f WHIRLPOOL 0cb46a4fc7f7661ce9f47ba3099c8ccb7caf335b78e23ab0a46cdb77b9e3d50e5b7fe80001f814201b396f03366b159ca192449f63461635cf88f4133744b1f1
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
index 01557a03153e..9fd5daddea2e 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild,v 1.8 2012/05/04 06:08:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild,v 1.9 2014/01/06 02:21:09 steev Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
@@ -29,6 +29,10 @@ src_prepare() {
 	sed -i \
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
 		png.c || die
+	# With newer libpng, --cflags causes build failures.
+	sed -i \
+		-e 's:pkg-config --cflags libpng:pkg-config --libs libpng:' \
+		Makefile || die
 }
 
 src_compile() {