1 |
commit: e44afca9ac30684eed624e7c2f3d0406a4fc0dd7 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 29 20:10:58 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 29 20:10:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44afca9 |
7 |
|
8 |
net-print/cups: Removed unrecognized configure options. |
9 |
|
10 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
11 |
|
12 |
net-print/cups/cups-2.3_beta4.ebuild | 9 ++------- |
13 |
net-print/cups/cups-9999.ebuild | 9 ++------- |
14 |
2 files changed, 4 insertions(+), 14 deletions(-) |
15 |
|
16 |
diff --git a/net-print/cups/cups-2.3_beta4.ebuild b/net-print/cups/cups-2.3_beta4.ebuild |
17 |
index b971a2a2cdc..5a4700f5087 100644 |
18 |
--- a/net-print/cups/cups-2.3_beta4.ebuild |
19 |
+++ b/net-print/cups/cups-2.3_beta4.ebuild |
20 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) |
21 |
|
22 |
inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \ |
23 |
multilib multilib-minimal pam python-single-r1 user versionator \ |
24 |
- java-pkg-opt-2 systemd toolchain-funcs |
25 |
+ systemd toolchain-funcs |
26 |
|
27 |
MY_PV="${PV/_rc/rc}" |
28 |
MY_PV="${MY_PV/_beta/b}" |
29 |
@@ -32,8 +32,7 @@ HOMEPAGE="https://www.cups.org/" |
30 |
|
31 |
LICENSE="Apache-2.0" |
32 |
SLOT="0" |
33 |
-IUSE="acl dbus debug java kerberos lprng-compat pam |
34 |
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
35 |
+IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
36 |
|
37 |
CDEPEND=" |
38 |
app-text/libpaper |
39 |
@@ -45,7 +44,6 @@ CDEPEND=" |
40 |
) |
41 |
) |
42 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
43 |
- java? ( >=virtual/jre-1.6:* ) |
44 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
45 |
!lprng-compat? ( !net-print/lprng ) |
46 |
pam? ( virtual/pam ) |
47 |
@@ -176,7 +174,6 @@ multilib_src_configure() { |
48 |
$(use_enable debug) |
49 |
$(use_enable debug debug-guards) |
50 |
$(use_enable debug debug-printfs) |
51 |
- $(multilib_native_use_with java) |
52 |
$(use_enable kerberos gssapi) |
53 |
$(multilib_native_use_enable pam) |
54 |
$(multilib_native_use_with python python "${PYTHON}") |
55 |
@@ -187,8 +184,6 @@ multilib_src_configure() { |
56 |
$(multilib_native_use_enable usb libusb) |
57 |
$(use_enable zeroconf avahi) |
58 |
--disable-dnssd |
59 |
- --without-perl |
60 |
- --without-php |
61 |
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) |
62 |
) |
63 |
|
64 |
|
65 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
66 |
index b971a2a2cdc..5a4700f5087 100644 |
67 |
--- a/net-print/cups/cups-9999.ebuild |
68 |
+++ b/net-print/cups/cups-9999.ebuild |
69 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) |
70 |
|
71 |
inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \ |
72 |
multilib multilib-minimal pam python-single-r1 user versionator \ |
73 |
- java-pkg-opt-2 systemd toolchain-funcs |
74 |
+ systemd toolchain-funcs |
75 |
|
76 |
MY_PV="${PV/_rc/rc}" |
77 |
MY_PV="${MY_PV/_beta/b}" |
78 |
@@ -32,8 +32,7 @@ HOMEPAGE="https://www.cups.org/" |
79 |
|
80 |
LICENSE="Apache-2.0" |
81 |
SLOT="0" |
82 |
-IUSE="acl dbus debug java kerberos lprng-compat pam |
83 |
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
84 |
+IUSE="acl dbus debug kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
85 |
|
86 |
CDEPEND=" |
87 |
app-text/libpaper |
88 |
@@ -45,7 +44,6 @@ CDEPEND=" |
89 |
) |
90 |
) |
91 |
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
92 |
- java? ( >=virtual/jre-1.6:* ) |
93 |
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
94 |
!lprng-compat? ( !net-print/lprng ) |
95 |
pam? ( virtual/pam ) |
96 |
@@ -176,7 +174,6 @@ multilib_src_configure() { |
97 |
$(use_enable debug) |
98 |
$(use_enable debug debug-guards) |
99 |
$(use_enable debug debug-printfs) |
100 |
- $(multilib_native_use_with java) |
101 |
$(use_enable kerberos gssapi) |
102 |
$(multilib_native_use_enable pam) |
103 |
$(multilib_native_use_with python python "${PYTHON}") |
104 |
@@ -187,8 +184,6 @@ multilib_src_configure() { |
105 |
$(multilib_native_use_enable usb libusb) |
106 |
$(use_enable zeroconf avahi) |
107 |
--disable-dnssd |
108 |
- --without-perl |
109 |
- --without-php |
110 |
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) |
111 |
) |