--- official/net-print/cups/cups-1.4.6-r21.ebuild	2011-06-06 18:01:21.000000000 -0400
+++ local/net-print/cups/cups-1.4.6-r21.ebuild	2011-07-22 13:03:41.737954726 -0400
@@ -6,7 +6,7 @@
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python systemd versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
@@ -17,7 +17,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
+IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba 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
@@ -142,6 +142,10 @@
 	# interface hangs using some browsers, bug #325871
 	epatch "${FILESDIR}/${PN}-1.4.6-web-hang.patch"
 
+	if use systemd; then
+		epatch "${FILESDIR}/${PN}-1.4.6-systemd.patch"||die
+	fi
+
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
 }
@@ -178,6 +182,10 @@
 		myconf+=" --disable-threads "
 	fi
 
+	if use systemd ; then
+		myconf+=$(systemd_with_unitdir)
+	fi
+
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--localstatedir=/var \