tamiko 14/10/17 08:30:50 Modified: cups-9999.ebuild cups-2.0.0-r2.ebuild ChangeLog Log: 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)
Revision Changes Path 1.67 net-print/cups/cups-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.67&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.67&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.66&r2=1.67 Index: cups-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- cups-9999.ebuild 16 Oct 2014 19:31:03 -0000 1.66 +++ cups-9999.ebuild 17 Oct 2014 08:30:50 -0000 1.67 @@ -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 @@ --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 @@ $(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 @@ # 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 1.3 net-print/cups/cups-2.0.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild?r1=1.2&r2=1.3 Index: cups-2.0.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-2.0.0-r2.ebuild 16 Oct 2014 22:39:19 -0000 1.2 +++ cups-2.0.0-r2.ebuild 17 Oct 2014 08:30:50 -0000 1.3 @@ -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 @@ --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 @@ $(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 @@ # 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 1.648 net-print/cups/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.648&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.648&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.647&r2=1.648 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v retrieving revision 1.647 retrieving revision 1.648 diff -u -r1.647 -r1.648 --- ChangeLog 16 Oct 2014 22:39:19 -0000 1.647 +++ ChangeLog 17 Oct 2014 08:30:50 -0000 1.648 @@ -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 <[email protected]> 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 <[email protected]> cups-1.7.5-r2.ebuild, cups-2.0.0-r2.ebuild:
