Force-enable threads whenever we use gnutls, bug 352252

Package-Manager: portage-2.1.10/cvs/Linux x86_64

4 files changed, 43 insertions, 21 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index c8f3ced469d5..36e5b3f24dd7 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.415 2011/06/05 20:44:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.416 2011/06/06 21:54:07 dilfridge Exp $
+
+  06 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.6-r2.ebuild,
+  cups-1.4.6-r21.ebuild:
+  Force-enable threads whenever we use gnutls, bug 352252
 
 *cups-1.4.6-r21 (05 Jun 2011)
 *cups-1.4.6-r2 (05 Jun 2011)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 3a8920607d92..dfb1f7a94dae 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -24,24 +24,24 @@ DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a0
 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
 EBUILD cups-1.4.6-r1.ebuild 8233 RMD160 c1e54729f812ef12b1327ae16ca5e73eb7af28b1 SHA1 fcb7e620b53ba1f05e16de310470372e6611516d SHA256 d916d0d01bb3e6c88029d8a0ecd783df0c6f542e00162087e9766ef20138ad42
-EBUILD cups-1.4.6-r2.ebuild 6970 RMD160 50faffec80d7d1bb3059a19f51a80dc1d0c8ec9a SHA1 7b87f24fa7690b255c5f913cb4a3f4bc38a4660a SHA256 6045c1e701c22957ef881d56f457e0011b2bb0d726066e0f4b72fa6d3050b12c
-EBUILD cups-1.4.6-r21.ebuild 8234 RMD160 c3de3d805c58a0ae26457613b025daeeedc9319e SHA1 0fae62e19c2f464580084dafb36cb3693a27fa98 SHA256 19aa13c3c585c126aa2bdf52504bb7b9920af813c8d36691543b2323dc27ec0e
-MISC ChangeLog 62446 RMD160 a88a1ddaa846c98779f5accba4dfdc9fe7ed08f6 SHA1 f52a51231f798c0e90a0d6b0ff056c31c9d8ecb0 SHA256 df2877863db7c0b4c902753cb72f06e6aed68ed4ea6f45097d91a28bf2bdf5ae
+EBUILD cups-1.4.6-r2.ebuild 7245 RMD160 04bf307a83d612abd5cdd5d5f10ebfada65f177b SHA1 dd05adb03749785cc5ebb394e13ee1ffe832b339 SHA256 6dc69874374a5a7c827a2979f62e457f704bc03be988b6eaebaa22b78843d671
+EBUILD cups-1.4.6-r21.ebuild 8509 RMD160 6178c8831132937a82ab0c5452c6f46e3b3d1879 SHA1 3f51dd19726a31c71c3fda6def94c112974434b9 SHA256 a10216bb3af633739ac6aefa06d4e89aa88690f774768bdf66a03b7569a09b16
+MISC ChangeLog 62609 RMD160 404e438b6ebc3c327e433cec770b5b1897b8425c SHA1 4b0502c06544dae737ffb99403fff7a9971959c3 SHA256 8675296f742b7927c697dee8e01f94a9b55b563a0e3907fd033b7f45898abfd5
 MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN6+qlAAoJENwGBM22xffewKkP/0pRpwTYesJTkdde3DxNKdZ3
-lhwtcukyLLvNW8EpzSXPrrSW2nv1P4hfe7p1yRdd69VZoBeHGTeH+pb50+CikUwB
-xPwYZxcIQQgH+4ChMhgYqGP6Wqnpu5u4X5b8aK1h8zV0fnW/rr113AyeWNwvFwQH
-9AcJNpnu12A8rG768MjIlUdVkbUhbQIndkmIa9Ghvapu9Uol4Qqb71BC304egJrt
-N5eJ5678YtYaozxcMWdy/vgN/Ds+rgwMSrSCpxUrwABFwa1ky5nSPxGitZ4+SkP0
-psruY5IpCMhncPUAg5MgYdklVObvQ3qQXwsDzw9fV74AsRUtyj+1TVZe1wZsMndk
-u/rtXIn64O3ky9McsHsq0T7MDExa7RmmjocYVoCqzTeFsc30cFrKooJ6YZRJfdS/
-sqEksX2bQXblXssteKBOHeHW2ti4W0+QhtqnMvYRO0B+MdmgtjAKXEiWhq1k20Ep
-EB3DrcOF7r/DGj7Lo4e0Z3BUVO5zIvP9qk8LC2Xfo15Jv2BJk05ZLptQhT9BYqm8
-AyZKgPl+Mx9mVurQHBwGFiKcZphc5iMwVTX1qZsfCJiBthD+xvefwGq5G/X/1fpT
-8frSU5s3zubXJmxVI41QzOHx471jr4QHIj8a3UY4Zg7Tb1mJaEqCJved+8/ONZ7q
-00gLbAyOa0IcUg5OkSM+
-=gIAy
+iQIcBAEBCgAGBQJN7UyFAAoJENwGBM22xffe+ScP+QGNz99GFexEWxC6ZUvUFIXM
+tGZWNO+gfnxmTpC18+m0mUwqNY/PmObcnOi79KCgjD67jc5FNp3iixhXmozNWWFv
+YMknrElOYUZjqKg2G8q6RvxsGAqlCYUjEMjLwaS1KnqyxxTUlVo2oyhV5z1e3Glw
+yko+Vdw5VyaNiuAJ+vRh/4V/AEzJBvbA/5KYLUmX4gEdUreQIVQDK8etGxtTrFtG
+OQKYssUwMoezYaRxW0q/HmXnWA1UwdC1kuOPeO3RSVQiXY5nc8U7jL/H8TjnAJ1n
+4K4NEv+yxH8SdnbBzCaCqzEurRJBKH9alvjkbyU67GvVNfZycdr63osVUWX6HRCt
+Rwv3W6JrFv/Q8Yfe4WY2nCUZ98Kc2eH7lCQl1PajnNWMG4Tlt3bANVfdssOyCBgy
+D3NI7ti4QDyGuNmH8gV6QIK3Gsq/bTPHxK9ooAU6ZVdYk8Vydm6rz9/odnSzh6+C
+2q0kEq091bVGlZdOgMWQuVg+Otz6BHbj4eDSc+5ZZNYIfFcy0TLmCBuus4wcLmYn
+Zobzv0HiN613xSoaSQ0hnDI9R1YajIf17Xw7yy5tUncQz/JdROdShHRtaFfQHjtn
+mL9GjBRN3Bao9BUBcXLsm4SmNVjuLwxdFePm35tBC9K5ySD0wMrSTpJ8AyHYc87o
+HrPoyN+yiUAzAhcNik/U
+=fxJs
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.6-r2.ebuild b/net-print/cups/cups-1.4.6-r2.ebuild
index 98247393f4da..53a25e466044 100644
--- a/net-print/cups/cups-1.4.6-r2.ebuild
+++ b/net-print/cups/cups-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r2.ebuild,v 1.1 2011/06/05 20:44:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r2.ebuild,v 1.2 2011/06/06 21:54:07 dilfridge Exp $
 
 EAPI=3
 
@@ -139,6 +139,16 @@ src_configure() {
 		"
 	fi
 
+	# bug 352252, recheck for later versions if still necessary....
+	if use gnutls && ! use threads ; then
+		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
+	fi
+	if use gnutls || use threads ; then
+		myconf+=" --enable-threads "
+	else
+		myconf+=" --disable-threads "
+	fi
+
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
@@ -159,7 +169,6 @@ src_configure() {
 		$(use_enable png) \
 		$(use_enable slp) \
 		$(use_enable static-libs static) \
-		$(use_enable threads) \
 		$(use_enable tiff) \
 		--disable-libusb \
 		$(use_with java) \
diff --git a/net-print/cups/cups-1.4.6-r21.ebuild b/net-print/cups/cups-1.4.6-r21.ebuild
index 8af708f3b425..6d4343ac78cf 100644
--- a/net-print/cups/cups-1.4.6-r21.ebuild
+++ b/net-print/cups/cups-1.4.6-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r21.ebuild,v 1.1 2011/06/05 20:44:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r21.ebuild,v 1.2 2011/06/06 21:54:07 dilfridge Exp $
 
 EAPI=3
 
@@ -168,6 +168,16 @@ src_configure() {
 		"
 	fi
 
+	# bug 352252, recheck for later versions if still necessary....
+	if use gnutls && ! use threads ; then
+		ewarn "The useflag gnutls requires also threads enabled. Switching on threads."
+	fi
+	if use gnutls || use threads ; then
+		myconf+=" --enable-threads "
+	else
+		myconf+=" --disable-threads "
+	fi
+
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \
@@ -188,7 +198,6 @@ src_configure() {
 		$(use_enable png) \
 		$(use_enable slp) \
 		$(use_enable static-libs static) \
-		$(use_enable threads) \
 		$(use_enable tiff) \
 		$(use_enable usb libusb) \
 		$(use_with java) \