[patch] patch to unify ssl and gcrypt flags

wireshark-gcrypt-is-ssl.patch (text/plain), 5.78 KB, created by Olivier Crete (RETIRED) on 2011-09-13 07:17:36 UTC

? wireshark-gcrypt-is-ssl.patch
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/Manifest,v
retrieving revision 1.320
diff -u -p -r1.320 Manifest
--- Manifest	12 Sep 2011 18:56:01 -0000	1.320
+++ Manifest	13 Sep 2011 07:15:44 -0000
@@ -10,7 +10,7 @@ AUX wireshark-except-double-free.diff 66
 DIST wireshark-1.4.8.tar.bz2 20505798 RMD160 970ada8ccbbca17695038faf4c0bca83d126d9a4 SHA1 8f9d0a920d00ac22ae0b2fa5844adbadc7e2de1e SHA256 fb393a9e6f8873de8dff5dca6f0c35a0e505eab954ef6aaeec3cecb0a4eef0da
 DIST wireshark-1.4.9.tar.bz2 20604645 RMD160 e8f6d68b5b49607fa337ef05ff6bd6c5acdb2e60 SHA1 242e8faf76ec219ddc28688517865ce19c611cd6 SHA256 e554f855cba4091779feb3d9d452716a8f87a549d8c27a4e2c700b0cb12dc984
 DIST wireshark-1.6.2.tar.bz2 21408664 RMD160 e343d9bb5600b236dea708bb68ecad805a9ee20a SHA1 a18d4e8eaf56fe0214b19d7fde0eb91a06817a49 SHA256 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f
-EBUILD wireshark-1.4.8.ebuild 6305 RMD160 8eebc2bb0bd78f3c90be6376deeabd6f6960a3f2 SHA1 6e6d361ddd121dbff10428fa19a839e52f916f11 SHA256 c18da7b2acf40155d49286c797473091701c6235123a008818dadcf8f2de0da8
+EBUILD wireshark-1.4.8.ebuild 6291 RMD160 1971f4e97a3ebe92f10a078c10f30ef090af04ba SHA1 71c31337f8d4e078c622a3dff2309d522e67c021 SHA256 47e59afd6fd6c95651d6785ce47c5d2febef7f10ced1cac2dd2a0e75570be19c
 EBUILD wireshark-1.4.9.ebuild 6309 RMD160 afaa6d85bab752ba8a5d966b6caa70eb4ff80429 SHA1 444a55fe3715d4733f7ecb3a84c0f0fe57862281 SHA256 f8e79638ea57a15c1646568fafcb301111d19ce917579bd333c8ba2e6fbe0b3c
 EBUILD wireshark-1.6.2.ebuild 6315 RMD160 7bd88e4d7009dee6cc65d2e2a0ccb7411804f49e SHA1 c24b9b04671fb26c508185997ff11ca2a10ac4b4 SHA256 1eee0327c11708795aaac2af165f31bb0ee8039a1698b58ecf07f421f6551a1d
 MISC ChangeLog 45279 RMD160 85d9f4b4acdc842da15a27ff24a62a6cfe151075 SHA1 262305801522011416b55a05735aee7cd931657d SHA256 9d2838c419948f5df8881fd512302db9102b0cdc208414ad7bcf80c1e0db4ab5
Index: wireshark-1.4.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.8.ebuild,v
retrieving revision 1.6
diff -u -p -r1.6 wireshark-1.4.8.ebuild
--- wireshark-1.4.8.ebuild	7 Aug 2011 16:48:43 -0000	1.6
+++ wireshark-1.4.8.ebuild	13 Sep 2011 07:15:44 -0000
@@ -14,7 +14,7 @@ SRC_URI="http://www.wireshark.org/downlo
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
+IUSE="adns ares doc doc-pdf gtk ipv6 lua geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
 RDEPEND=">=dev-libs/glib-2.14:2
@@ -25,8 +25,8 @@ RDEPEND=">=dev-libs/glib-2.14:2
 		x11-libs/pango
 		dev-libs/atk
 		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
+	ssl? ( net-libs/gnutls
+		dev-libs/libgcrypt )
 	pcap? ( net-libs/libpcap )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
@@ -147,7 +147,7 @@ src_configure() {
 	econf $(use_enable gtk wireshark) \
 		$(use_enable profile profile-build) \
 		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
+		$(use_with ssl gcrypt) \
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_with lua) \
Index: wireshark-1.4.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.4.9.ebuild,v
retrieving revision 1.1
diff -u -p -r1.1 wireshark-1.4.9.ebuild
--- wireshark-1.4.9.ebuild	12 Sep 2011 18:55:52 -0000	1.1
+++ wireshark-1.4.9.ebuild	13 Sep 2011 07:15:44 -0000
@@ -14,7 +14,7 @@ SRC_URI="http://www.wireshark.org/downlo
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
+IUSE="adns ares doc doc-pdf gtk ipv6 lua geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
 RDEPEND=">=dev-libs/glib-2.14:2
@@ -25,8 +25,8 @@ RDEPEND=">=dev-libs/glib-2.14:2
 		x11-libs/pango
 		dev-libs/atk
 		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
+	ssl? ( net-libs/gnutls
+		dev-libs/libgcrypt )
 	pcap? ( net-libs/libpcap )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
@@ -147,7 +147,7 @@ src_configure() {
 	econf $(use_enable gtk wireshark) \
 		$(use_enable profile profile-build) \
 		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
+		$(use_with ssl gcrypt) \
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_with lua) \
Index: wireshark-1.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.2.ebuild,v
retrieving revision 1.1
diff -u -p -r1.1 wireshark-1.6.2.ebuild
--- wireshark-1.6.2.ebuild	12 Sep 2011 18:55:52 -0000	1.1
+++ wireshark-1.6.2.ebuild	13 Sep 2011 07:15:44 -0000
@@ -14,7 +14,7 @@ SRC_URI="http://www.wireshark.org/downlo
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="adns ares doc doc-pdf gtk ipv6 lua gcrypt geoip kerberos
+IUSE="adns ares doc doc-pdf gtk ipv6 lua geoip kerberos
 profile +pcap portaudio python +caps selinux smi ssl threads zlib"
 
 RDEPEND=">=dev-libs/glib-2.14:2
@@ -25,8 +25,8 @@ RDEPEND=">=dev-libs/glib-2.14:2
 		x11-libs/pango
 		dev-libs/atk
 		x11-misc/xdg-utils )
-	ssl? ( net-libs/gnutls )
-	gcrypt? ( dev-libs/libgcrypt )
+	ssl? ( net-libs/gnutls
+		dev-libs/libgcrypt )
 	pcap? ( net-libs/libpcap )
 	caps? ( sys-libs/libcap )
 	kerberos? ( virtual/krb5 )
@@ -147,7 +147,7 @@ src_configure() {
 	econf $(use_enable gtk wireshark) \
 		$(use_enable profile profile-build) \
 		$(use_with ssl gnutls) \
-		$(use_with gcrypt) \
+		$(use_with ssl gcrypt) \
 		$(use_enable ipv6) \
 		$(use_enable threads) \
 		$(use_with lua) \