diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2013-04-11 11:05:05 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2013-04-11 11:05:05 +0000 |
| commit | 225030921403e8cb70d7180bac01729b862375c7 (patch) | |
| tree | dbcfe61298bbe132946eb25a821b0204fb722052 /net-print | |
| parent | Removing ghelm from metadata (diff) | |
| download | gentoo-2-225030921403e8cb70d7180bac01729b862375c7.tar.gz gentoo-2-225030921403e8cb70d7180bac01729b862375c7.tar.bz2 gentoo-2-225030921403e8cb70d7180bac01729b862375c7.zip | |
fix systemd units path variable setup, see bug #465474
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 9 | ||||
| -rw-r--r-- | net-print/cups/cups-1.6.2-r3.ebuild (renamed from net-print/cups/cups-1.6.2-r2.ebuild) | 2 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.5.0-systemd-socket-2.patch | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 9fae62a32b35..d750f85613a2 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-print/cups # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.530 2013/04/10 16:39:19 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.531 2013/04/11 11:05:05 lxnay Exp $ + +*cups-1.6.2-r3 (11 Apr 2013) + + 11 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> + files/cups-1.5.0-systemd-socket-2.patch, -cups-1.6.2-r2.ebuild, + +cups-1.6.2-r3.ebuild: + fix systemd units path variable setup, see bug #465474 *cups-1.6.2-r2 (10 Apr 2013) diff --git a/net-print/cups/cups-1.6.2-r2.ebuild b/net-print/cups/cups-1.6.2-r3.ebuild index c9daaf21c99b..0d5a7486407d 100644 --- a/net-print/cups/cups-1.6.2-r2.ebuild +++ b/net-print/cups/cups-1.6.2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r2.ebuild,v 1.1 2013/04/10 16:39:19 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r3.ebuild,v 1.1 2013/04/11 11:05:05 lxnay Exp $ EAPI=5 diff --git a/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch b/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch index d24489f0a0d5..dfd5190cf4c9 100644 --- a/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch +++ b/net-print/cups/files/cups-1.5.0-systemd-socket-2.patch @@ -20,7 +20,7 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con +++ cups-1.5.0/config-scripts/cups-systemd.m4 2011-10-18 15:33:16.861989058 +0100 @@ -0,0 +1,36 @@ +dnl -+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.1 2013/04/10 16:39:19 lxnay Exp $" ++dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $" +dnl +dnl systemd stuff for CUPS. + @@ -32,11 +32,11 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con + [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then + AC_MSG_CHECKING(for libsystemd-daemon) ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) + if $PKGCONFIG --exists libsystemd-daemon; then + AC_MSG_RESULT(yes) + SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` + SDLIBS=`$PKGCONFIG --libs libsystemd-daemon` -+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) + AC_DEFINE(HAVE_SYSTEMD) + else + AC_MSG_RESULT(no) @@ -53,7 +53,7 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con +AC_SUBST(SDLIBS) + +dnl -+dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.1 2013/04/10 16:39:19 lxnay Exp $" ++dnl "$Id: cups-1.5.0-systemd-socket-2.patch,v 1.2 2013/04/11 11:05:05 lxnay Exp $" +dnl diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in --- cups-1.5.0/configure.in.systemd-socket 2010-11-20 01:03:46.000000000 +0000 |