Change file order in patch to match equivalent 1.6.13 patch.

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

3 files changed, 77 insertions, 72 deletions

diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 8ed91951c553..50e26479fe02 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,10 @@
 # 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.429 2013/01/30 04:07:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.430 2013/01/30 04:18:53 jer Exp $
+
+  30 Jan 2013; Jeroen Roovers <jer@gentoo.org>
+  files/wireshark-1.8.1-ldflags.patch:
+  Change file order in patch to match equivalent 1.6.13 patch.
 
   30 Jan 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.6.13.ebuild,
   wireshark-1.8.5.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 5b334c087431..059aec7539a9 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -3,7 +3,7 @@ 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 3574 SHA256 09bc9fcc99d8e46c3442c5364f41431ca9380c30986030466ca2e2705093f342 SHA512 5c095c23276dec8747178b034023d8869a401a821bf6add2d5c0753fdd4fa37a4f169f7ac27dbfb8ef777f24155467310a97b0e6a1053b7a8aa4df9853a02c85 WHIRLPOOL 783a0b8b47318357214275e265e8def55233f694849f15f2db8444d2f07dc5e800ad18fb4d42d2ef099a2162b349efcae0312beab5859573958f2a16e72a4f4f
+AUX wireshark-1.8.1-ldflags.patch 3575 SHA256 a3cee69c5e499e28a83b5d38c948f9024c119f93d77ddef7d74ade618a42051b SHA512 33ea7de69f3f6925cd9d5c7378975024a8582be25e66c93cacaf7651370f0862eb61ecca68e74fda556d25d394bf1d362a240aaee0e719069efa8541770b9b3f WHIRLPOOL a58a40ac296884edef69fec120676984fedaac6ad6b6fef21f5b4eff494e88ee89a628f0d4a85994a662223226cc4d39a8aec3f936e042a761a99336d8329f2b
 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
@@ -13,12 +13,12 @@ EBUILD wireshark-1.6.12.ebuild 6408 SHA256 67327344502561f78fa7e6fdedcb91bcf0b7c
 EBUILD wireshark-1.6.13.ebuild 6406 SHA256 168dfb147fdd3fad7556c6a9bdf452efd9641912fd3ddaea794470fa3eef3de2 SHA512 d45b2c3e0666387064d44ef6f400e9318c24f79a5c1be56f8fa1e8079ab7968b544608a29e1a16fc108e2e93a241b39d62ced8de51a38a88471bfe1f575f93c7 WHIRLPOOL 930eb225408abec641ef7aaaf6ab3513b48cb20f6c3864e35c0b82338a9668b9c7092c6c65e529ae6306043f054c65be8e60127736081ffb637aeed4a15e2ca9
 EBUILD wireshark-1.8.4.ebuild 6802 SHA256 be4c9ae0d9e7303329cce9ea786c20d99fcfd38b865ff1083ad59afab3dfd0b1 SHA512 1440c8b553e3728832ba98062727e0e1a71af3234fce421980d8282812b6c1dfe504e9d7ab711c982a2db131f04fb70e4871d24e9743a72957c747902a003ab0 WHIRLPOOL 8f8901096fe2c16b85686e6f223e3914f7d7d705d6c308f3a7b1d81e1a6c6e5da7f6dd18e35c01687f4aab08d5433bdc1d4b71f8c50fc05183af9c88b1092911
 EBUILD wireshark-1.8.5.ebuild 6796 SHA256 7609d84e1cad53d9bb24bc54b40a16e9e335efe18188db0a4af220341b7b1ffa SHA512 91c3565d61c7d5101d29ce63218c7dcf9ce0ed2fb865aab25a0d4dcddfefca700fee76394631ccb77ea7ee5f2e11a22f9a1f25cf946fa2cf95cb5440877e42aa WHIRLPOOL 0afdf6accf0292226713071cdc8a5a307b38e4c7f2da44959922d581c1761976b41774e32e08c36a35aa154bf9bee89d5badf140a882ce907e5682672c0dad2a
-MISC ChangeLog 62495 SHA256 262f8a332e1e51a6171e7a43407b2d4ff6607d61be6f5234f9fd13ae1ec41428 SHA512 3f16630ba77b40196955a4f8b896fa46d21705210cf10ff62fcaab1045bb03b53959e47bea03e07c5fa39160ecbf1af79ad03821bef21611dc5706dd98b50de5 WHIRLPOOL 4cea1e0c7f8aec633da96e534526196772670cf16f5a161d931dd6c35d59ce97d712f4b4c0d733ebdf99cc26b096ab7804ba4d53b6c20a6cf28b1b1d4c2a6b7b
+MISC ChangeLog 62645 SHA256 b14442622489ee67a24f8bddae73188d29aa4190d84f778fe89e0b7609e12b98 SHA512 8ddb8ca1a12d98fba884b291f4641329b9a3d8b8d70180e014b72d44c628ed53d05624c1d246afca0a1eb164900de9b3540a663d4d313eed9ddb14a602107b1f WHIRLPOOL 2332f2c68b7d81a190b696f7646ad42cc79b9d39dcd17bc08f523265247fe1d71821fddd8643b9db140f8ace0ed12e9c2a1859391bab4f1c8fad642fab37a5f9
 MISC metadata.xml 2589 SHA256 5a4eeb9572df6946a2b3ffbb5f5f4955cfd709ccb79cd23ec6aed41f49b60dab SHA512 bc027bd22193d1a613f26fe30265f5fac0f22cac0c1ed8cfa148fa6bf7c4a4777c76cbaeea5f5f19591d8c78695d13eb29cc00f225c2b44ad1d8a63a8881bafe WHIRLPOOL 5596bd3eb91bdbb1fd9ac2386d72e6a038c3966ad53a81889fc6d4bf32b2ffe75b8f55fdf84a7a84ff2b7b2dcddcaf0dc889ea6595537796ca30e7e5e11494bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEInI4ACgkQVWmRsqeSphN9ygCeLl/fVe95JDR3D/OoXEjKUVTs
-pZAAn1MNqq+CCk5fuGTLRoHQrVTUHx4O
-=yhsb
+iEYEAREIAAYFAlEIny4ACgkQVWmRsqeSphOIfwCfWCpTWyAAkEKVAJpbHx/GmxlU
+qdkAnjK3+WKf62wQpoNj+Ogc9LG8lNmN
+=kP2j
 -----END PGP SIGNATURE-----
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 ace5fd1db6c9..d854f549e525 100644
--- a/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
+++ b/net-analyzer/wireshark/files/wireshark-1.8.1-ldflags.patch
@@ -1,69 +1,3 @@
---- a/configure.in
-+++ b/configure.in
-@@ -652,7 +652,8 @@
- 		#
- 		# Arrange that we search for libraries in "$prefix/lib".
- 		#
--		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
-+# We do not need this - JeR (possibly bug #394479)
-+#		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
- 	else
- 		AC_MSG_RESULT(no)
- 	fi
-@@ -648,7 +648,7 @@
- 		#
- 		# 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)
- 	else
- 		AC_MSG_RESULT(no)
- 	fi
-@@ -1469,7 +1469,7 @@
- 	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)
- fi
- ])
- if test "x$with_libcap" = "xno" ; then
-@@ -1500,7 +1500,7 @@
- 	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)
- fi
- ],[
- 	want_ssl=no
-@@ -1565,7 +1565,7 @@
- 	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)
- fi
- ])
- if test "x$want_c_ares" = "xno" ; then
-@@ -1590,7 +1590,7 @@
- 	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)
- fi
- ])
- if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
-@@ -1615,7 +1615,7 @@
- 	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)
- fi
- ])
- if test "x$want_geoip" = "xno"; then
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -435,7 +435,7 @@
@@ -133,3 +67,70 @@
  			fi
  		fi
  	fi
+--- a/configure.in
++++ b/configure.in
+@@ -652,7 +652,8 @@
+ 		#
+ 		# Arrange that we search for libraries in "$prefix/lib".
+ 		#
+-		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
++# We do not need this - JeR (possibly bug #394479)
++#		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
+ 	else
+ 		AC_MSG_RESULT(no)
+ 	fi
+@@ -648,7 +648,7 @@
+ 		#
+ 		# 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)
+ 	else
+ 		AC_MSG_RESULT(no)
+ 	fi
+@@ -1469,7 +1469,7 @@
+ 	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)
+ fi
+ ])
+ if test "x$with_libcap" = "xno" ; then
+@@ -1500,7 +1500,7 @@
+ 	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)
+ fi
+ ],[
+ 	want_ssl=no
+@@ -1565,7 +1565,7 @@
+ 	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)
+ fi
+ ])
+ if test "x$want_c_ares" = "xno" ; then
+@@ -1590,7 +1590,7 @@
+ 	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)
+ fi
+ ])
+ if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
+@@ -1615,7 +1615,7 @@
+ 	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)
+ fi
+ ])
+ if test "x$want_geoip" = "xno"; then
+