From a1bbe702551a7bb29a1a85e5a1f2f8e1b1a04beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 20 Apr 2012 15:22:39 +0200
Subject: [PATCH] Introduce USE=systemd for systemd socket activation.

This fixes automagic dependency on libsystemd-daemon and installing
systemd unit files in root directory (bug #407975).
---
 cups-1.5.2-r2.ebuild |   12 ++++++++++--
 metadata.xml         |    3 +++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cups-1.5.2-r2.ebuild b/cups-1.5.2-r2.ebuild
index 57ca125..a7d1338 100644
--- a/cups-1.5.2-r2.ebuild
+++ b/cups-1.5.2-r2.ebuild
@@ -21,7 +21,8 @@ SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd"
+IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl
+	+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -52,6 +53,7 @@ RDEPEND="
 		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
+	systemd? ( sys-apps/systemd )
 	tiff? ( >=media-libs/tiff-3.5.5:0 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
@@ -199,7 +201,7 @@ src_configure() {
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
 		--disable-dnssd \
-		$(systemd_with_unitdir) \
+		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
 		${myconf}
 
 	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
@@ -269,6 +271,12 @@ src_install() {
 
 	# create /etc/cups/client.conf, bug #196967 and #266678
 	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
+
+	# With USE=systemd, the unit files are installed by autotools.
+	# Without it, non-socket service files are still useful.
+	if ! use systemd; then
+		systemd_dounit data/cups.path data/cups.service
+	fi
 }
 
 pkg_preinst() {
diff --git a/metadata.xml b/metadata.xml
index e209898..3beaf28 100644
--- a/metadata.xml
+++ b/metadata.xml
@@ -18,5 +18,8 @@
     <flag name='java'>
       Add support for the Java interpeter in the web server CGIs.
     </flag>
+    <flag name='systemd'>
+      Add support for systemd socket activation.
+    </flag>
   </use>
 </pkgmetadata>
-- 
1.7.10