Remove even more -L/usr/lib abuse.

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

6 files changed, 229 insertions, 13 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index a99e7fc47b74..b3b905faa750 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.427 2013/01/30 01:56:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.428 2013/01/30 03:40:50 jer Exp $
+
+  30 Jan 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.12.ebuild,
+  wireshark-1.6.13.ebuild, +files/wireshark-1.6.13-ldflags.patch,
+  files/wireshark-1.8.1-ldflags.patch:
+  Remove even more -L/usr/lib abuse.
 
 *wireshark-1.6.13 (30 Jan 2013)
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index e29b618694e3..2b50a3bd57b7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX wireshark-1.6.13-ldflags.patch 3571 SHA256 7502a04095ccf70eb80b42c9c966f189cb6ff07d1e8325a6643c7034fb3062e0 SHA512 3e5e15211d7084e5c8c35bd0b32cf5bcd6b79b7ac7e8882d3464598b22ea41e5b0ca3434b7a31a994b25e3ee24154d29bc9f8906d97efdb15b7e8c0cac96b100 WHIRLPOOL cbcc09fabd543a206ffab14f2a8185c293a3ab1a63c0968023f03706a68c7bd10a1bfc0c92006e3f8808785a488446d1f217fc45982336b11165aa89849e9047
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
-AUX wireshark-1.8.1-ldflags.patch 1735 SHA256 b23efa4604ba2b245ac7c76a50d558a00bc6fb41c648565ca909cf2ad6ebd090 SHA512 f6663ef36c7d110124f16b8b68212a43c33431a28b0f6546441eb27df79b231746b52543b6bd2d29a05aa0a29194f474875f6fcd70fcbef184053c4c93560f29 WHIRLPOOL f5da9b47dd1f89277d0ca1f0b3550107a6f8b43451fa3b1ab483797157610dc24e2a1bd889b22ca219b49a02cca2ee59991fd2b83030dde70eaf3bd382db4c7d
+AUX wireshark-1.8.1-ldflags.patch 3574 SHA256 09bc9fcc99d8e46c3442c5364f41431ca9380c30986030466ca2e2705093f342 SHA512 5c095c23276dec8747178b034023d8869a401a821bf6add2d5c0753fdd4fa37a4f169f7ac27dbfb8ef777f24155467310a97b0e6a1053b7a8aa4df9853a02c85 WHIRLPOOL 783a0b8b47318357214275e265e8def55233f694849f15f2db8444d2f07dc5e800ad18fb4d42d2ef099a2162b349efcae0312beab5859573958f2a16e72a4f4f
 AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
 DIST wireshark-1.6.12.tar.bz2 22052437 SHA256 03b84a1a6d46e53f2ae900237e0391281557297fa5c2b2093049c0fb418352fb SHA512 fa9ccc44840f372117da23770cc8438bceafa2e653ed884ed4c5f8a0624506d8778e3be54abb3c88e85564ff443be54b56db3621a6f8058fe8458b6efc5710f9 WHIRLPOOL cd7a3e7d03ee3c94fbc7784e4619ad3bf48700f86e4531cdf24fabf40d406613f6637957b0d66c182b07d3b340263c47cc73a093fd63f3d8f61a0c3250b09555
 DIST wireshark-1.6.13.tar.bz2 22077778 SHA256 32f4811bb7a259612aac04be5722da51f145fcf66fcf69f358e98d4cb78dd091 SHA512 addb42d7630c4c382099cad696581c73a43ebc31727d1838926cb306ff13641b6b586063fa9186a7c0f24522690fa8955844b228ea9b79b7a71ae893730dba45 WHIRLPOOL 72a91fb14529db5e737980b816bd70175b2b0245e387e0fb3d0e937bdddc46085f01bfab75c34663f768b119270bd676367ecc3b0ffa8872e43679bfeb05152f
 DIST wireshark-1.8.4.tar.bz2 24164286 SHA256 cae9ec0cb9fa0b732a76c0f72f8c15d763f8cdc2e389cda2da6c48c24559faac SHA512 4f0b7fd181eb74c5eb03e4b5e74546f9f02aa3d481faed2b08a84d98f4a61d808a86e5348046d66f8333ba8f8921db344c2187a1590117ae4bdc2ff85a96d305 WHIRLPOOL e2d1b7de34cc57342e645fbfa0175edcfc690d52f4ca579a931c4614ce97735ea190fa5e72ad6c9fb766f92ee701d6cf7cbd3c1f63ff8bba1f8b5d9265f2c31e
 DIST wireshark-1.8.5.tar.bz2 24196532 SHA256 d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372 SHA512 3378310870e2e11cd4caf91e0571e2a52bd81bc76f1715997338d867a4d98ad7bb34e0f4443220386b498aeebce15c02d9825e50cf587587f573a5a0c578b039 WHIRLPOOL a9ca0f7cf14efcc4c56f7a2ab16ed0962998bc1467602d3f201e569513b0dde1363a7507e7a3f53535b8878ed2fd4a469699c88dcc1a3c4ce90461ac2c7a3c00
-EBUILD wireshark-1.6.12.ebuild 6411 SHA256 688fdb4763b4465acf96bf49742308424da9bab545389d0e403d456e4fc690cd SHA512 34443cc359b94670a00223fb849af6c4d723c8951ce13927bcb7df766893a061e41733166cb4f85b2bc566d5d6c9151b4c3d9e1930a1e3241d6cba603a46bc54 WHIRLPOOL ef9f22e8ce299ada23abdf1b8615e485f7b4d083f0290a6adfbd3a63913ef6b9158eaf5fbd137eb20c52341115c9ffb2e0b2a6cec1a4ef11d2d7c1ee2a988971
-EBUILD wireshark-1.6.13.ebuild 6415 SHA256 b70b4491039fa2234f8fdec965a503a3c8351f7fd2bd7c241c573a99fcff983e SHA512 54fa663b82dd8c9d9df973cc391bfe9bcd85ebdf5c0533c2bd2f2509e7b32158e7822f8ef1a49796dadc2cbd8a37a10c01609c7d17d86e351c553abc4efe1db5 WHIRLPOOL 68fff43dbd281e4ce86ccc100ca448d6ada6cf92e79807dffa856e0d25de5af76432f71d3fade9cd4b376885e8f69103109ca3cac30f5b60cba59aaa5b82f6b2
+EBUILD wireshark-1.6.12.ebuild 6408 SHA256 67327344502561f78fa7e6fdedcb91bcf0b7c8ea5230c079e4a17f45ebc61809 SHA512 64c31a18e1266b4014becc209c7cc8d6e82dff3709e458ce669307cc04c156a8dc6a1bbf0aebf1825690ecf05b86f65faf304248cbcb7246d856164d1e0c6aaf WHIRLPOOL 258017e3678dac2b68efb81129e114e0a0bfba0d5ed97941d69c97588649821f884dd4caa0b724247fa387eafffc953f917a6d89daa8ff1b67ef58f2385d8983
+EBUILD wireshark-1.6.13.ebuild 6416 SHA256 78ef691b8ce9dedfb2ca01927839d0c58c32c7184bd4b30b3c5bcb0a6fba8425 SHA512 59d27b08b6a12a6728e08e7da9322a882fe0c2927454d05a7c9ff2f711ff834511bc3a583738aead46b9ca23d3b1747d9aa0ab313870e430b4aff766887d4ed9 WHIRLPOOL e1b936082af6987f14140d9e73b9913f36bd07fb722738afb7792bbfa6ad8b5b4d731756704c36507f25eaa5dfcc4b1f7dd253f21973332696123e95eaa928b9
 EBUILD wireshark-1.8.4.ebuild 6802 SHA256 be4c9ae0d9e7303329cce9ea786c20d99fcfd38b865ff1083ad59afab3dfd0b1 SHA512 1440c8b553e3728832ba98062727e0e1a71af3234fce421980d8282812b6c1dfe504e9d7ab711c982a2db131f04fb70e4871d24e9743a72957c747902a003ab0 WHIRLPOOL 8f8901096fe2c16b85686e6f223e3914f7d7d705d6c308f3a7b1d81e1a6c6e5da7f6dd18e35c01687f4aab08d5433bdc1d4b71f8c50fc05183af9c88b1092911
 EBUILD wireshark-1.8.5.ebuild 6812 SHA256 14222b9a8d80fabd2e9e500faa206ce2a9b244b6377d29216cecdceb8e42e1f0 SHA512 1a0443bd7cb98f6e7877a3562ac7c30ebf9957d6bd7973b9576561cae91d41890486088693d90a024ede993e242d3b5e5875c19477f125cd97ebb89f514dddca WHIRLPOOL 20a0706ce101718d549b80940ee81bab3b674525b35fdd85a5d34bf106c48ebcf3a44750963735475eb78eb72e96ee7ce24b7fe1ea80da76735ccaa7fa5494dd
-MISC ChangeLog 62130 SHA256 e20143a782a2e180ed6e90f683e77bab5a8c830991a9f6d81d40be93568bcd63 SHA512 7f4b2d8ee71987648e4a9e0800d32625bd8f411109697e0c66bac0c22dd53925b591e1c01e1a4fa9235cdccfb1125311e0fd0292fc5810c18e5b320cc234fd9d WHIRLPOOL e092cf740685c020adb37b359de9ca1e563ecda37afa3756e7a5248a0eef5c3f1c4c0ce011be12e7456ecd35f4ca65e7ad7b6ab713d2e15f776be839bc29adf8
+MISC ChangeLog 62345 SHA256 8f93c702705b198f50535fe676267c3590bb0796199066be6f1b674a458add4c SHA512 89d1303b7b5a70fbf92436464fa33537d99cab5f343fadba514c3a6074ce60c390d60075f7cf4dfeab4c49d25cb9dcd75be47af95b9988433953d47fe4b1f029 WHIRLPOOL 6fd09c38fd76cc16de568aca59e8b95046e6e3a0725a02bab12dec3128b340e7fe98bfd5ece952e40b54d9222cb34cd78daa40e013fb7c9647243dccb335c247
 MISC metadata.xml 2589 SHA256 5a4eeb9572df6946a2b3ffbb5f5f4955cfd709ccb79cd23ec6aed41f49b60dab SHA512 bc027bd22193d1a613f26fe30265f5fac0f22cac0c1ed8cfa148fa6bf7c4a4777c76cbaeea5f5f19591d8c78695d13eb29cc00f225c2b44ad1d8a63a8881bafe WHIRLPOOL 5596bd3eb91bdbb1fd9ac2386d72e6a038c3966ad53a81889fc6d4bf32b2ffe75b8f55fdf84a7a84ff2b7b2dcddcaf0dc889ea6595537796ca30e7e5e11494bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEIfckACgkQVWmRsqeSphMqmACdEjTII2MI3/Y68tiJBglnuXlc
-rxEAnRM1zwAgn6HsktEVMhXAWnhfysV9
-=irCN
+iEYEAREIAAYFAlEIlkUACgkQVWmRsqeSphMzSwCfZ4t7LP9CVcoiW2r4As66+YTF
+5sMAn1ve+OSfaCzOuRLgnSYeCwIBdXuR
+=F55q
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
new file mode 100644
index 000000000000..77e2af080953
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
@@ -0,0 +1,141 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -416,7 +416,7 @@
+ 	  #
+ 	  CFLAGS="$CFLAGS -I$pcap_dir/include"
+ 	  CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
+-	  AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
++dnl	  AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
+ 	fi
+ 
+ 	# Pcap header check
+@@ -642,7 +642,7 @@
+ 	  wireshark_save_CPPFLAGS="$CPPFLAGS"
+ 	  CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
+ 	  wireshark_save_LIBS="$LIBS"
+-	  AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
++dnl	  AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ 	fi
+ 
+ 	#
+@@ -695,7 +695,7 @@
+ 			# LIBS.
+ 			#
+ 			LIBS=""
+-			AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
++dnl			AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ 			LIBS="$LIBS -lz $wireshark_save_LIBS"
+ 		else
+ 			LIBS="-lz $LIBS"
+@@ -1268,7 +1268,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1299,7 +1300,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1330,7 +1332,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1619,7 +1622,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+--- a/configure.in
++++ b/configure.in
+@@ -616,7 +616,8 @@
+ 		#
+ 		# Arrange that we search for libraries in "$prefix/lib".
+ 		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
++#		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
++		true
+ 	else
+ 		AC_MSG_RESULT(no)
+ 	fi
+@@ -647,7 +648,8 @@
+ 		#
+ 		# Arrange that we search for libraries in "/usr/local/lib".
+ 		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
++#		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
++		true
+ 	else
+ 		AC_MSG_RESULT(no)
+ 	fi
+@@ -1468,7 +1470,8 @@
+ 	want_libcap=yes
+ elif test -d "$withval"; then
+ 	want_libcap=yes
+-	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++#	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++	true
+ fi
+ ])
+ if test "x$with_libcap" = "xno" ; then
+@@ -1499,7 +1502,8 @@
+ 	want_ssl=yes
+ elif test -d "$withval"; then
+ 	want_ssl=yes
+-	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++#	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++	true
+ fi
+ ],[
+ 	want_ssl=no
+@@ -1564,7 +1568,8 @@
+ 	want_c_ares=yes
+ elif test -d "$withval"; then
+ 	want_c_ares=yes
+-	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++#	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++	true
+ fi
+ ])
+ if test "x$want_c_ares" = "xno" ; then
+@@ -1589,7 +1594,8 @@
+ 	want_adns=yes
+ elif test -d "$withval"; then
+ 	want_adns=yes
+-	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++#	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++	true
+ fi
+ ])
+ if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
+@@ -1614,7 +1620,8 @@
+ 	want_geoip=yes
+ elif test -d "$withval"; then
+ 	want_geoip=yes
+-	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++#	AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++	true
+ fi
+ ])
+ if test "x$want_geoip" = "xno"; then
diff --git a/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
index 1f4a28ca406e..ace5fd1db6c9 100644
--- a/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
+++ b/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
@@ -64,3 +64,72 @@
  fi
  ])
  if test "x$want_geoip" = "xno"; then
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -435,7 +435,7 @@
+ 	  # searches the specified directory.
+ 	  #
+ 	  CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
+-	  AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
++dnl	  AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
+ 	fi
+ 
+ 	# Pcap header check
+@@ -659,7 +659,7 @@
+ 	  wireshark_save_CPPFLAGS="$CPPFLAGS"
+ 	  CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
+ 	  wireshark_save_LIBS="$LIBS"
+-	  AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
++dnl	  AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ 	fi
+ 
+ 	#
+@@ -711,7 +711,7 @@
+ 			# of LIBS.
+ 			#
+ 			LIBS=""
+-			AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
++dnl			AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ 			LIBS="$LIBS -lz $wireshark_save_LIBS"
+ 		else
+ 			LIBS="-lz $LIBS"
+@@ -1162,7 +1162,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1193,7 +1194,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1224,7 +1226,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
+@@ -1508,7 +1511,8 @@
+ 		if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ 			withval=/usr/local
+ 			if test -d "$withval"; then
+-				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++dnl				AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
++				true
+ 			fi
+ 		fi
+ 	fi
diff --git a/net-analyzer/wireshark/wireshark-1.6.12.ebuild b/net-analyzer/wireshark/wireshark-1.6.12.ebuild
index 970bfb6e294b..b2b33489f89c 100644
--- a/net-analyzer/wireshark/wireshark-1.6.12.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.12.ebuild,v 1.7 2012/12/15 17:44:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.12.ebuild,v 1.8 2013/01/30 03:40:50 jer Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -108,7 +108,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
 	eautoreconf
 }
diff --git a/net-analyzer/wireshark/wireshark-1.6.13.ebuild b/net-analyzer/wireshark/wireshark-1.6.13.ebuild
index de4a30f852d3..f6d5ba7069f8 100644
--- a/net-analyzer/wireshark/wireshark-1.6.13.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13.ebuild,v 1.1 2013/01/30 01:56:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.13.ebuild,v 1.2 2013/01/30 03:40:50 jer Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -108,7 +108,7 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.6.6-gtk-pcap.patch \
-		"${FILESDIR}"/${PN}-1.8.1-ldflags.patch
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 	sed -i -e 's|.png||g' ${PN}.desktop || die
 	eautoreconf
 }