diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-06 21:54:07 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-06 21:54:07 +0000 |
| commit | 10ef3c199f2283658bc9676eab4260f175e38203 (patch) | |
| tree | 4a4a5c44b16b59d68c69fe84684e3a9b7c9db3d6 /net-print/cups | |
| parent | Goodbye kdeprefix (for >= 4.6.4) (diff) | |
| download | gentoo-2-10ef3c199f2283658bc9676eab4260f175e38203.tar.gz gentoo-2-10ef3c199f2283658bc9676eab4260f175e38203.tar.bz2 gentoo-2-10ef3c199f2283658bc9676eab4260f175e38203.zip | |
Force-enable threads whenever we use gnutls, bug 352252
(Portage version: 2.1.10/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.6-r2.ebuild | 13 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.6-r21.ebuild | 13 |
3 files changed, 27 insertions, 5 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/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) \ |