Make CAN USB support optional by Alexander Zubkov (bug #434538).

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

5 files changed, 43 insertions, 10 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 6383e6eb17b3..ab9d2f11cd87 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.173 2012/09/07 23:52:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.174 2012/09/11 19:39:18 jer Exp $
+
+  11 Sep 2012; Jeroen Roovers <jer@gentoo.org> libpcap-1.3.0.ebuild,
+  +files/libpcap-1.3.0-canusb.patch, metadata.xml:
+  Make CAN USB support optional by Alexander Zubkov (bug #434538).
 
   07 Sep 2012; Agostino Sarubbo <ago@gentoo.org> libpcap-1.3.0.ebuild:
   Stable for amd64, wrt bug #433263
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 16f4cacc51e1..cfc88bb365b4 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libpcap-1.1-cross-linux.patch 1050 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a SHA512 15938d432fec9c6867e8a4c899b9ad413b08ecab939f0c6d5d8eeb00acbcf53d3a09377a2d3f1e8510dbc36078f32da97189d45af27da9a53c106d8313671819 WHIRLPOOL e373e5d8fcfa1fbb38fe8c9058361db91848cc805d0d198ca793d3591d78d3c8d94029d7598f660b17ec527d9e8e7ef8687a8ea400186c4b8b2833cec0ab92c0
 AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c SHA512 3fb928ed0fead6a91585823d22fe3295ec190cd41671c62662c4a900ea077949a77b5df2bc7c1abb081117c78539ddfdc273bead5f9bc3228c258b27e759200e WHIRLPOOL ab67cd9f41a4b6e7185aece951daa70f3ba54582ea4339bfc12f45f94ca66be371500793c148c833a7e47812e3ac53c898118a3ecead929181542ac25ee04cb1
 AUX libpcap-1.2.0-cross-linux.patch 583 SHA256 89344641676edfd9dc70b05569ac26a8ac79815fa5df0cf8e2ee77b3f9c5877f SHA512 4249129122f8ae382e086820ac4852d1413e3a7dd1f8db370aace1e94a1b0cf40d5f6d97213ca52e224e02472fed60b03c7f89d0ccd45e44ef0039a432595adb WHIRLPOOL 47598355e51ca3a15f1f817927aa73481c9a02ca15ca57ea487e1b42918a85b53aaa311be991dfc3362a2df3dd9ecee3059738e08760af8d6d9e4770578db3e3
+AUX libpcap-1.3.0-canusb.patch 290 SHA256 3518dc59be25c3092df6e133694b4d4372552ff8d25e2371f3fc0f587de83054 SHA512 c3d6138d58c268fcf0799bf74c65ff648f2f7c6e46d3534d3941b9ae678510463388518db3b688ca85e89d79e31dedb147a8cbc9710b8ca0ca4a766913ba8fbf WHIRLPOOL 33225aa8eea3eb74b4d81c6746034d7cf88a0b2fad352888362cf87e565935b326b5a2aa6c4f857c21c44971a0b6b616e33130dd906511ef874e16b2872c8dd1
 DIST libpcap-1.1.1.tar.gz 581984 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85 SHA512 eecdde95815575857a722176d6caf26b8e7cf6886435fa2a4bc652d83b54a1d0fcfa7f4f87075448e83874d6340619d722b49c139a61c37f2284d890789165ac WHIRLPOOL 86f49406b15bad8799302f7653b28da70dd00bbb1243d87e7843d6dd121f4bd729379d6178a2f463b78104202c852d83d772274cf999519bbb7ac9d95419af6e
 DIST libpcap-1.3.0.tar.gz 608967 SHA256 41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9 SHA512 c023abb3da7b9f62835fa04ca43b50203d7e3da7b624d09a693c8b02fd531c3845e1c86cbc587ae02816614133f5342585f6a2985fdaf92889fcfaca7bfb8908 WHIRLPOOL 774897ce4dcd1655945313a145399da9db0063967ce246e1c7beb21f038ee4c5bcfe2b4ec7b08316a013fdb33b50781f5195bf169a2ca6f84ddc2bf5bca78f15
 EBUILD libpcap-1.1.1-r1.ebuild 1521 SHA256 93673c49162ba3723aa4217a01c6a890d28791311096a8161bd95c2e9532b764 SHA512 d0e60691f4fab29ce256ad53d4e30a05bcfc9aa934244b45ca3888fe19ca38a9084131d0bd6cf24572fd835c646b7446546a641791d6ca3cca25dc02db286a59 WHIRLPOOL 8ff93463ca08ff460d7a84b66666f58fa76efd32cecb6be61b875b5b17fc7d69e8a4d1ef6c7c9850f8a3d43c98242da1e9e19819d6286bda31e226795b2d46d5
-EBUILD libpcap-1.3.0.ebuild 1594 SHA256 cf0713cca99c4e2ebdaad359218c23f6b8f0310b99634527f8910d32f8bca325 SHA512 8a5529a49ab8434aadda5b6bdb0675dc9b1834ee6b70848984fd1c7cd99284b822b79c84cc6f1fe3eeed7539a4296b7e36a8c40f56ed933768c49bf1e32c0423 WHIRLPOOL 9a8bb13d5ad63262c786e076ed90c0c10e2e74139f8c82b6c29614789f24a625a68e6aba25fd1b93f422994718240382eae15ef6d3ac07c95f5c603f2a9e247a
-MISC ChangeLog 23702 SHA256 70490f71921f76ae4ef2c085b71efc8bfefe55ab2d95b5dce962b970ebab3aac SHA512 e8d3631c8f5eed64af3e3163af75b20c87a5b4cfb0e8322e702f3afb13f9741aed382dad9c2aede34a88b397b9f039ae2fd9a7e4756230758aca2e20b501d515 WHIRLPOOL b614d9a0b5e87f12192db1c479a9cdbe2cd22760e5b686fac22c6616d48d2e43f283b029266eda74a1f8a32f5adb8f75c00ff4bbc3e90ff718375db109ae5b95
-MISC metadata.xml 400 SHA256 b7e2799afef193562fe29d8eb0cf8ac52af4f28bd02079ad56ec0e139596f2ba SHA512 5fe3cb8ab5a89287b571ffb268ef3a7386c7e16f6ca84ac68d5017d0fca8673028c603e1077febf9ca7e164e27ee48a7e1446b0cc5f325bd7450eb7d16767a78 WHIRLPOOL 58b8166ae70f1e1570a37bfe56ef3c871c98b396d1057fa7dc7e86c08a3e4560832197c03fd4947863a01a2bd5f63272fa9257d13ffecb2f4d121db04139ee74
+EBUILD libpcap-1.3.0.ebuild 1701 SHA256 3f542a7798569e216aa2cd1067f47935b204f2117ad87af87a211cadc650fc34 SHA512 245c0026df6a184d60b1bdbc5768aae694ed1a0f2afc293e3ffcad47cb043d3abe2b135beecac7998fb73e4a0442e915209139c4fbec5ba363d032118ba8ca49 WHIRLPOOL d1cbd2b526378c4977cb35992b1119c5d09a63c92d3c800cbf9f5c6ed56eac61f40d2cc45954c9e6ea4d084d2fd6cb03bf7d0b158ff62785c96fa1a79e3c58c2
+MISC ChangeLog 23890 SHA256 1eae5afcd0b8ce80bd78b2d93ba7725c02627d70119f30356d59ea4b166cba8d SHA512 fad7a9c0fc64f366d92aafa096dcd8dafb2bc386a151da58b30b08063a57e4853d4b1d94e6ac2c280732f0d397c473c1dae9d7904593b80e7f74f7c4edc284fd WHIRLPOOL e085a8004c4859c9a97c8da1b8383193083fbeb08d26feb5d580d89188728af55767b271150e3dc345343f4cc37a9e22e9fb359b2cab4f4be26890cc45892417
+MISC metadata.xml 527 SHA256 ae854bbce8236ebb2fa71609841d13824535ac9effc54bafd87935b7169c05df SHA512 71e2833754bc14961297bf0fbe11d747eb663f1bb735bd0d1354db729ee989f05f47dab4acf03380f6e1490cc49f473e755ce4bf3950d109a48d1f3714dc94c7 WHIRLPOOL c54582b13fe76a3344b2a5f8d13be9b2ef25c02afc26ca01293392ae80a8346c8a238c66e0e0c13a584c904cdbd1945979e8b2c6257f01fdd05742ef5d4b21fc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBPk2sACgkQVWmRsqeSphNUjgCbBabkmDDN67IDSTvBsg9dvFwg
+SREAn2MirER7zwGi3g85e5gsIZ1uOy6q
+=JVJg
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.3.0-canusb.patch b/net-libs/libpcap/files/libpcap-1.3.0-canusb.patch
new file mode 100644
index 000000000000..52dc17ed4357
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.3.0-canusb.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1396,7 +1401,7 @@
+ 
+ AC_ARG_ENABLE([canusb],
+ [AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])]
+-,enable_canusb=yes)
++)
+ 
+ if test "x$enable_canusb" != "xno" ; then
+ 	dnl check for canusb support
diff --git a/net-libs/libpcap/libpcap-1.3.0.ebuild b/net-libs/libpcap/libpcap-1.3.0.ebuild
index 9af3f246b4ab..ab33c0deb59b 100644
--- a/net-libs/libpcap/libpcap-1.3.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.3.0.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/net-libs/libpcap/libpcap-1.3.0.ebuild,v 1.6 2012/09/07 23:52:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.3.0.ebuild,v 1.7 2012/09/11 19:39:18 jer Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -13,10 +13,11 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="bluetooth ipv6 netlink static-libs"
+IUSE="bluetooth ipv6 netlink static-libs canusb"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
-	netlink? ( dev-libs/libnl:1.1 )"
+	netlink? ( dev-libs/libnl:1.1 )
+	canusb? ( virtual/libusb )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc"
@@ -24,7 +25,9 @@ DEPEND="${RDEPEND}
 DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cross-linux.patch
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.0-cross-linux.patch \
+		"${FILESDIR}"/${PN}-1.3.0-canusb.patch
 	# Prefix' Solaris uses GNU ld
 	sed -i -e 's/freebsd\*/freebsd*|solaris*/' \
 		-e 's/sparc64\*/sparc64*|sparcv9*/'  aclocal.m4 || die
@@ -33,9 +36,10 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable bluetooth) \
 		$(use_enable ipv6) \
-		$(use_with netlink libnl) \
-		$(use_enable bluetooth)
+		$(use_enable canusb) \
+		$(use_with netlink libnl)
 }
 
 src_compile() {
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index cdd3235f03e9..0d5a883a0160 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -7,5 +7,8 @@
     <flag name='netlink'>
       Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
     </flag>
+    <flag name='canusb'>
+      Use <pkg>virtual/libusb</pkg> to support Controller Area Network over USB (CAN USB)
+    </flag>
   </use>
 </pkgmetadata>