dilfridge 14/04/15 21:05:29 Modified: ChangeLog cups-1.7.2.ebuild cups-9999.ebuild Log: systemd support was added to net-print/cups with the understanding that the systemd team takes care of relevant bugs as long as the patches are not upstreamed. Unfortunately noone of them cares, which is why we will only conditionally apply the patch now. See bug 450282, bug 494582, bug 500300. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Revision Changes Path 1.600 net-print/cups/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.600&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.600&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.599&r2=1.600 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v retrieving revision 1.599 retrieving revision 1.600 diff -u -r1.599 -r1.600 --- ChangeLog 15 Apr 2014 11:34:09 -0000 1.599 +++ ChangeLog 15 Apr 2014 21:05:29 -0000 1.600 @@ -1,6 +1,13 @@ # 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.599 2014/04/15 11:34:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.600 2014/04/15 21:05:29 dilfridge Exp $ + + 15 Apr 2014; Andreas K. Huettel <dilfri...@gentoo.org> cups-1.7.2.ebuild, + cups-9999.ebuild: + systemd support was added to net-print/cups with the understanding that the + systemd team takes care of relevant bugs as long as the patches are not + upstreamed. Unfortunately noone of them cares, which is why we will only + conditionally apply the patch now. See bug 450282, bug 494582, bug 500300. *cups-1.7.2 (15 Apr 2014) 1.2 net-print/cups/cups-1.7.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2.ebuild?r1=1.1&r2=1.2 Index: cups-1.7.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-1.7.2.ebuild 15 Apr 2014 11:34:09 -0000 1.1 +++ cups-1.7.2.ebuild 15 Apr 2014 21:05:29 -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.2.ebuild,v 1.1 2014/04/15 11:34:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2.ebuild,v 1.2 2014/04/15 21:05:29 dilfridge Exp $ EAPI=5 @@ -34,7 +34,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="acl dbus debug gnutls java kerberos lprng-compat pam - python selinux +ssl static-libs +threads usb X xinetd zeroconf" + python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" LANGS="ca es fr it ja ru" for X in ${LANGS} ; do @@ -94,7 +94,6 @@ "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch" # systemd support ) pkg_setup() { @@ -143,6 +142,8 @@ src_prepare() { base_src_prepare + use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch" + AT_M4DIR=config-scripts eaclocal eautoconf } @@ -172,6 +173,12 @@ " fi + if use systemd; then + myconf+=" + --with-systemdsystemunitdir="$(systemd_get_unitdir)" + " + fi + econf \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --localstatedir="${EPREFIX}"/var \ @@ -198,7 +205,6 @@ $(use_with python python "${PYTHON}") \ $(use_with xinetd xinetd /etc/xinetd.d) \ --enable-libpaper \ - --with-systemdsystemunitdir="$(systemd_get_unitdir)" \ ${myconf} # install in /usr/libexec always, instead of using /usr/lib/cups, as that 1.53 net-print/cups/cups-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.53&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.53&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.52&r2=1.53 Index: cups-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- cups-9999.ebuild 1 Mar 2014 22:33:47 -0000 1.52 +++ cups-9999.ebuild 15 Apr 2014 21:05:29 -0000 1.53 @@ -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.52 2014/03/01 22:33:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.53 2014/04/15 21:05:29 dilfridge Exp $ EAPI=5 @@ -33,7 +33,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="acl dbus debug gnutls java kerberos lprng-compat pam - python selinux +ssl static-libs +threads usb X xinetd zeroconf" + python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" LANGS="ca es fr it ja ru" for X in ${LANGS} ; do @@ -93,7 +93,6 @@ "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch" # systemd support ) pkg_setup() { @@ -142,6 +141,8 @@ src_prepare() { base_src_prepare + use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch" + AT_M4DIR=config-scripts eaclocal eautoconf } @@ -171,6 +172,12 @@ " fi + if use systemd; then + myconf+=" + --with-systemdsystemunitdir="$(systemd_get_unitdir)" + " + fi + econf \ --libdir="${EPREFIX}"/usr/$(get_libdir) \ --localstatedir="${EPREFIX}"/var \ @@ -197,7 +204,6 @@ $(use_with python python "${PYTHON}") \ $(use_with xinetd xinetd /etc/xinetd.d) \ --enable-libpaper \ - --with-systemdsystemunitdir="$(systemd_get_unitdir)" \ ${myconf} # install in /usr/libexec always, instead of using /usr/lib/cups, as that
