Pass correct parameters regarding libusb to configure, bug 513552

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 67 insertions, 24 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 64b735bd687e..b783a04938e5 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.627 2014/09/06 18:56:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.628 2014/09/06 19:30:17 dilfridge Exp $
+
+  06 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.5.ebuild,
+  cups-1.7.9999.ebuild, cups-9999.ebuild:
+  Pass correct parameters regarding libusb to configure, bug 513552
 
 *cups-1.7.9999 (06 Sep 2014)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index b60d3b44dfca..358e8a828fa6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,25 +16,25 @@ DIST cups-1.7.5-source.tar.bz2 8793338 SHA256 18cb4c6847dbaaaa05c8b35af787f19dd5
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
 EBUILD cups-1.7.3.ebuild 10426 SHA256 41b50bc7a3552e3332eb378729951ed7d8673770877187a15f353222c82bd81e SHA512 372cf265fe33e338f265b4c76ce4f58fa0cdb7ecbd3c2c163cb82c2fc1a1442e5675fc36ab20e8deafb0a78ddbfbd26a53dfd43a0b0c5dfb06a6d0f4fc2d98a5 WHIRLPOOL d73157275d75f29d77f608b5adb8d1f854c4ec201b7e621cdfa82ab53e08f6b2a1c9ce9dcd891d816ea7d98ac18cad0114bff948f6c6ee62283e06910f35fd4c
 EBUILD cups-1.7.4.ebuild 10376 SHA256 c3d1f6d145436b32a67e9d5db280e9664bdc169d73c6c5d3e305405d40561185 SHA512 580c05de3639e3800d5ec17c8219c5d4f0624e8e1db05ab547b0ac5153d24c01d2219a98fcdd62c57e147292d5e3a6f84e5b0ccfe7d687cb3139a877e08fd4af WHIRLPOOL 14d0a9a0b8fe916949d35aba46d35384d46154ce63307a5f784b40926af5db0a18de93e47907184d7d47c53b98d807f9285a6e41b9ae3b54938308372a90d866
-EBUILD cups-1.7.5.ebuild 10376 SHA256 0e678909b767b93189214c0e19a7224140591c652513267f0e0d22f4dec2d90f SHA512 bbee9469d97cc63be0794d531f27115f381a898e1d68e8f765b30d42987d5114b0262d17458b9d11331b272b99607ece3d20f9450daef8db723f4723ea4c4636 WHIRLPOOL dd3cbaa819d4d54824ea202be17a6c4126e7cc34f59886d0a0c5542deb4bdb5991383b6acef4284b5e2b5405268c18dd6f0d83e2cd6ee55049317f8224685b84
-EBUILD cups-1.7.9999.ebuild 10380 SHA256 4fd778c3c175079cf12ea03cc05e29544ddf4bc1eff6bc652e30980414cc0a4f SHA512 1adba706643292db1c6a1e8b7a931bba7f820905fc976b53ef8aa359161b9dd7d81bc4c4eaa27e9aecf6d4576438021dbc1146b2dafb487ffb7035d4e0200cc1 WHIRLPOOL a85214855425d7acc36190c833a21e00e2f958d56566b99c0726b5dacb3a84df2c5e197eded78d94c8c9714a9f017c87f7d56c69d06f5227a1d169818d4ea19a
-EBUILD cups-9999.ebuild 10377 SHA256 0bd88b110ec1b8bcd0356d5189c7c23d7a0faa8dc070f4ed88aa06e41c9f28dc SHA512 db33a347f853d0531277601c3d0ae61e6f4604fc997161f04a94818641bc5bb2cd4981888ed68cd9230fe24cd5f283c2d42734531cca65c01db31ba6e597eb34 WHIRLPOOL 8efb3ab78cb8acbf3988aec7bddad700826a42168db09b212a2851a2b2f6b761e25f85bc4c69be4422129e74df7ed77676d4fe589f86e6eaff44bdff20600216
-MISC ChangeLog 94779 SHA256 007cfe2d5eed80f74a6b5909e932eeb7b7275048352ff40d01b75289d27e8be6 SHA512 beca977fd78d8d652c3d441d4ff58fb0772923975d10c4b6be8ccffa4a55250be3c2f0d24fc96b306f0f91ab95917bba60090408e0eff9cc284ecfdfe8609160 WHIRLPOOL c8d058b687af393457e6246d413eedf82a09967a8cb4e5029bce4aeb2dc4eaf3f1f5632fc86d09eb084f052ddf5b1c9e195e11ed8f262dbbcc50a1852443ea76
+EBUILD cups-1.7.5.ebuild 10590 SHA256 9a0acd7701f161e194ba046f5dd183236c10ccce1e0f4076e924958e1e6f4376 SHA512 ba5c5b7aaa6b4b1f6108b168e71d1539410432889a03be4373d079a8b7ee450dac932b7e21fed0985860853db613919c73264df3c9e1817927adae04b0b37da7 WHIRLPOOL a45137d40bfce04df8b83678c4183875e8159e341f52a3d2e7a3f9a5047fcb6d8f6fc987fbfe8132158abfed5ccd4ef20515b60315bf1bcc24e01a96202c0b8e
+EBUILD cups-1.7.9999.ebuild 10594 SHA256 070be7b08f440a254eeadf4a02b9793cf11784af852cc544f81c927e8c7c2a32 SHA512 a0696719439dd987fea361b66926753f0385e42174bc854c0aafc31c0e340d13d7a25202fe5e77363e8439d29357344bdd0a283b6f6fe05c7d825d3db3a1bc77 WHIRLPOOL 9cdde5fdf498e8698c14f0e107cdfe4eb67be6e21b6d452e49c53a059abda50fff5fa0bd9c3183ec675c7d0eb90151739f6d59badd67057356be5aa0913c9507
+EBUILD cups-9999.ebuild 10591 SHA256 d58aa616e387b16637ebf21932143dc92fe3af9556fec712ea10f1a426ff1386 SHA512 cbb8d3204b655fd25e4ea674674ae49baa9b71985a191b333338a704bda53569c5012d3a5454c7d40c8e4fca4e56e0dfb1023d92ef965c8d585715e3f673926a WHIRLPOOL 5e9ebe3826e7ae1888ae7860121ee181ce83b78b206beb8c635a2331f6018ab64111bdcb3d688fc7f8641c0c867c220b311cc84256aee80fe8d1ee2fcb5e94c4
+MISC ChangeLog 94966 SHA256 a0e53c7544e5e58088cc571f3bdf37a8625ec5d50dd9d5f65299932d97e88e7b SHA512 59638256a904e3d44fe6a9458a9d2cfba3103318a89442e141f3265d9301266dff8a6c579abee3da48f1d10ee01946ee86263d491a054deba83295feb239e9ee WHIRLPOOL 3270c7dc0e077239f632d8c6438e78cabd2a7ed3a5c1ea84790279c645018cd6e5f939a981c3e795fe10ed3af0111ea2bac269abbd4a2dabcaf3b3295fe1c838
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUC1jHAAoJEJS/30SErRQvS7cQAI84gMYiFJmubDO6vFR8AUOv
-WwpUk+k+1loAvuIeeZVvc0W/N1/h8ayvaVugThRd/K+bpVgU5Z32t2woGPa9tdA4
-lvnXgtYtQR21FCJfMgu3QZJ/3j4BQnlmC7ji9MC3bwLUcfRmbY4sk4sjw1Wt77No
-vVBWY9hF2vvmPJlisDxS4iRFv4qAltk4HhNieiBNXiXIyFE/zYqm+Uq2OnOLKKIk
-+GQGbDJCnnHdN9nB6KQXFPiAr/cSE08CNF+1f6E/jQfOKXLslXbKLF78e9dqLDdI
-yE5hs+svUGjSfDYsheRfT6BFLknZjKd7tE4q01HNu4g96LL1Ogk9up2Dxp8DgNML
-TaXWdclk0GtqmJwYDbKPpQIuKeXOGVN0/dZSHGmAQCkf2xiJ13HrEKFnFm7V/I7d
-7q3IkHBwX73O3YfxTT/YMaHl0Syr8nROKBHYUxoMBF0oRZj+UPTGB/42UH3OYFkB
-I4P2gTf0R2j2ZmbkPlhnOMjvK65xjHrJ3SS2Tth9qHRZlmObrXD020W7GxNjJ3wd
-cM40/tH3xKXfOJzRj/0kNemK8x7ZJvn7oXyiifGOqOpbd/ZRCZY9dU0fgXDRKNNN
-ctCe2xJ3p+3JCF0IUNQ1kTcRpD5Uk4xWokoRFQ/SysPNH54t/OnU95CnTzhPLKzk
-exgc1k+I3slaLIFfxbul
-=pHH9
+iQIcBAEBCAAGBQJUC2DPAAoJEJS/30SErRQvoBUP/0y7f6njL2gNQq5GJuZGs6Un
+QWzBXF613hAWc+G2EfBxJAHqsQPPS/BCfa0f0/Wgxie28XicYirjM8RAr40L9/vX
+DVKK9eh1fjL59n8Sv/RhDgg95S9ylTy7oZ/K40aKtfVGw2AwYi/oKdTJpFeR+dFf
+fw6iLtwO52pzZ3aH4j82LC53YhnEZlQAga9Vq7Jb3HHH7QAgxWs5ubzncNE4P1e+
+kVEfR8/XTMNXsz0AhJTwNoogneC6SJ2TCMyQSuJ1ghD5gx8Ha+ejEtBtMn5TAlhc
+yDV1EYlgUVuzxxFo5yJbfIzx5R+p52Ui5141U6kkEDsSr+EUwyWuf6yOl61lXS4b
+4m0tLbOWuMvbYliyv7Fbd0TzvAYJK+vGs4Srw5ZqzoZOKKoemav4D9uLuuILcX1j
+72+7XJdhlX02PmGC9NQqrSBGv9und9FJTcKFGYV8vWKfwKizxAwUxIaQCdMq+sVt
+lmZa3LPH/RfvNxBuq+rEn0fnXg+uDK5rVkewJgmQxritfXoQraXpW/QUKTO689z6
+DOCxX0TTUHBPWt9qeBjfWTWYnQoG9y+BWKjE58kKByxXzudFhPq1cc9lqy4IiyTR
+GBD9vKXtJD54ARF9Zxh1BQFjzdJuqSkh0JSrWIUBmlF/r9fAy11KWiY3yUq62d8V
+yE423T+GqyVgGiyAHaK/
+=sZo1
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.5.ebuild b/net-print/cups/cups-1.7.5.ebuild
index 526a360a5116..9c80b660c447 100644
--- a/net-print/cups/cups-1.7.5.ebuild
+++ b/net-print/cups/cups-1.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v 1.1 2014/09/06 18:49:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v 1.2 2014/09/06 19:30:17 dilfridge Exp $
 
 EAPI=5
 
@@ -192,6 +192,20 @@ multilib_src_configure() {
 		)
 	fi
 
+	# the following is needed only because of bug 513552
+	# and replaces a simpler
+	# $(multilib_native_use_enable usb libusb)
+	#
+	if use usb && multilib_is_native_abi; then
+		myconf+=(
+			--enable-libusb=yes
+		)
+	else
+		myconf+=(
+			--enable-libusb=no
+		)
+	fi
+
 	# need to override KRB5CONFIG for proper flags
 	# https://www.cups.org/str.php?L4423
 	econf \
@@ -213,7 +227,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
-		$(multilib_native_use_enable usb libusb) \
 		--disable-dnssd \
 		$(multilib_native_use_with java) \
 		--without-perl \
diff --git a/net-print/cups/cups-1.7.9999.ebuild b/net-print/cups/cups-1.7.9999.ebuild
index 32446973ffdd..b6ba9f54dd67 100644
--- a/net-print/cups/cups-1.7.9999.ebuild
+++ b/net-print/cups/cups-1.7.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.1 2014/09/06 18:56:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.2 2014/09/06 19:30:17 dilfridge Exp $
 
 EAPI=5
 
@@ -192,6 +192,20 @@ multilib_src_configure() {
 		)
 	fi
 
+	# the following is needed only because of bug 513552
+	# and replaces a simpler
+	# $(multilib_native_use_enable usb libusb)
+	#
+	if use usb && multilib_is_native_abi; then
+		myconf+=(
+			--enable-libusb=yes
+		)
+	else
+		myconf+=(
+			--enable-libusb=no
+		)
+	fi
+
 	# need to override KRB5CONFIG for proper flags
 	# https://www.cups.org/str.php?L4423
 	econf \
@@ -213,7 +227,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
-		$(multilib_native_use_enable usb libusb) \
 		--disable-dnssd \
 		$(multilib_native_use_with java) \
 		--without-perl \
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 6bd2523e2586..1e8ca65b58f8 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.61 2014/09/06 18:56:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.62 2014/09/06 19:30:17 dilfridge Exp $
 
 EAPI=5
 
@@ -192,6 +192,20 @@ multilib_src_configure() {
 		)
 	fi
 
+	# the following is needed only because of bug 513552
+	# and replaces a simpler
+	# $(multilib_native_use_enable usb libusb)
+	#
+	if use usb && multilib_is_native_abi; then
+		myconf+=(
+			--enable-libusb=yes
+		)
+	else
+		myconf+=(
+			--enable-libusb=no
+		)
+	fi
+
 	# need to override KRB5CONFIG for proper flags
 	# https://www.cups.org/str.php?L4423
 	econf \
@@ -213,7 +227,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
-		$(multilib_native_use_enable usb libusb) \
 		--disable-dnssd \
 		$(multilib_native_use_with java) \
 		--without-perl \