dilfridge 14/09/06 19:30:17
Modified: cups-9999.ebuild ChangeLog cups-1.7.5.ebuild
cups-1.7.9999.ebuild
Log:
Pass correct parameters regarding libusb to configure, bug 513552
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
84AD142F)
Revision Changes Path
1.62 net-print/cups/cups-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.62&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.62&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.61&r2=1.62
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- cups-9999.ebuild 6 Sep 2014 18:56:00 -0000 1.61
+++ cups-9999.ebuild 6 Sep 2014 19:30:17 -0000 1.62
@@ -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 @@
)
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_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 \
1.628 net-print/cups/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.628&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.628&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.627&r2=1.628
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- ChangeLog 6 Sep 2014 18:56:00 -0000 1.627
+++ ChangeLog 6 Sep 2014 19:30:17 -0000 1.628
@@ -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 <[email protected]> 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)
1.2 net-print/cups/cups-1.7.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.5.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.5.ebuild 6 Sep 2014 18:49:59 -0000 1.1
+++ cups-1.7.5.ebuild 6 Sep 2014 19:30:17 -0000 1.2
@@ -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 @@
)
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_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 \
1.2 net-print/cups/cups-1.7.9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.9999.ebuild 6 Sep 2014 18:56:00 -0000 1.1
+++ cups-1.7.9999.ebuild 6 Sep 2014 19:30:17 -0000 1.2
@@ -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 @@
)
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_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 \
