diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-10-17 08:30:50 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-10-17 08:30:50 +0000 |
| commit | 87ef707a8753a37fa4d6e83aae15524731226be0 (patch) | |
| tree | 0691723fe3bb022a340b0abf8ea976982a2ad192 /net-print | |
| parent | Non-maintainer commit: fix building, approved by Justin Lecher (diff) | |
| download | gentoo-2-87ef707a8753a37fa4d6e83aae15524731226be0.tar.gz gentoo-2-87ef707a8753a37fa4d6e83aae15524731226be0.tar.bz2 gentoo-2-87ef707a8753a37fa4d6e83aae15524731226be0.zip | |
do not install bogus xinetd files if USE=-xinetd; bug 525604
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-2.0.0-r2.ebuild | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index f3a4746a0a03..3be26d9cfd43 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.647 2014/10/16 22:39:19 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.648 2014/10/17 08:30:50 tamiko Exp $ + + 17 Oct 2014; Matthias Maier <tamiko@gentoo.org> cups-2.0.0-r2.ebuild, + cups-9999.ebuild: + do not install bogus xinetd files if USE=-xinetd; bug 525604 16 Oct 2014; Matthias Maier <tamiko@gentoo.org> cups-1.7.5-r2.ebuild, cups-2.0.0-r2.ebuild: diff --git a/net-print/cups/cups-2.0.0-r2.ebuild b/net-print/cups/cups-2.0.0-r2.ebuild index fbb9d7f46ad7..c121fe2f184d 100644 --- a/net-print/cups/cups-2.0.0-r2.ebuild +++ b/net-print/cups/cups-2.0.0-r2.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-2.0.0-r2.ebuild,v 1.2 2014/10/16 22:39:19 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.3 2014/10/17 08:30:50 tamiko Exp $ EAPI=5 @@ -191,6 +191,7 @@ multilib_src_configure() { --with-docdir="${EPREFIX}"/usr/share/cups/html \ --with-languages="${LINGUAS}" \ --with-system-groups=lpadmin \ + --with-xinetd=/etc/xinetd.d \ $(multilib_native_use_enable acl) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -204,7 +205,6 @@ multilib_src_configure() { $(use_enable ssl gnutls) \ $(use_enable systemd) \ $(multilib_native_use_enable usb libusb) \ - $(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \ $(use_enable zeroconf avahi) \ --disable-dnssd \ --without-perl \ @@ -275,6 +275,8 @@ multilib_src_install_all() { # write permission for file owner (root), bug #296221 fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" else + # always configure with --with-xinetd= and clean up later, + # bug #525604 rm -rf "${ED}"/etc/xinetd.d fi diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 35aa2652823f..67ffb5dd7b2b 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.66 2014/10/16 19:31:03 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.67 2014/10/17 08:30:50 tamiko Exp $ EAPI=5 @@ -191,6 +191,7 @@ multilib_src_configure() { --with-docdir="${EPREFIX}"/usr/share/cups/html \ --with-languages="${LINGUAS}" \ --with-system-groups=lpadmin \ + --with-xinetd=/etc/xinetd.d \ $(multilib_native_use_enable acl) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -204,7 +205,6 @@ multilib_src_configure() { $(use_enable ssl gnutls) \ $(use_enable systemd) \ $(multilib_native_use_enable usb libusb) \ - $(multilib_native_use_with xinetd xinetd /etc/xinetd.d) \ $(use_enable zeroconf avahi) \ --disable-dnssd \ --without-perl \ @@ -275,6 +275,8 @@ multilib_src_install_all() { # write permission for file owner (root), bug #296221 fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" else + # always configure with --with-xinetd= and clean up later, + # bug #525604 rm -rf "${ED}"/etc/xinetd.d fi |