diff options
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.5.ebuild | 17 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.9999.ebuild | 17 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 17 |
4 files changed, 11 insertions, 46 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index b783a04938e5..c40db13392a0 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.628 2014/09/06 19:30:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.629 2014/09/07 20:48:21 dilfridge Exp $ + + 07 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.5.ebuild, + cups-1.7.9999.ebuild, cups-9999.ebuild: + Undo the last change; as correctly pointed out by Arfrever it makes no sense. 06 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.7.5.ebuild, cups-1.7.9999.ebuild, cups-9999.ebuild: diff --git a/net-print/cups/cups-1.7.5.ebuild b/net-print/cups/cups-1.7.5.ebuild index 9c80b660c447..da2e59e1d817 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.2 2014/09/06 19:30:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v 1.3 2014/09/07 20:48:21 dilfridge Exp $ EAPI=5 @@ -192,20 +192,6 @@ 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 \ @@ -227,6 +213,7 @@ 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 b6ba9f54dd67..d9ab5d33eafd 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.2 2014/09/06 19:30:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.3 2014/09/07 20:48:21 dilfridge Exp $ EAPI=5 @@ -192,20 +192,6 @@ 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 \ @@ -227,6 +213,7 @@ 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 1e8ca65b58f8..539412df53e8 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.62 2014/09/06 19:30:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.63 2014/09/07 20:48:21 dilfridge Exp $ EAPI=5 @@ -192,20 +192,6 @@ 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 \ @@ -227,6 +213,7 @@ 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 \ |