--- /usr/portage/net-nds/rpcbind/rpcbind-0.2.0.ebuild	2012-05-21 15:31:22.000000000 -0400
+++ rpcbind-0.2.0-r1.ebuild	2012-10-30 11:01:32.260104425 -0400
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/rpcbind/rpcbind-0.2.0.ebuild,v 1.15 2012/05/21 19:18:08 xarthisius Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="4"
 
-inherit autotools eutils
+inherit autotools eutils systemd
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.infradead.org/~steved/rpcbind.git"
@@ -21,10 +21,11 @@
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="selinux tcpd"
+IUSE="selinux tcpd warmstarts systemd"
 
 RDEPEND="net-libs/libtirpc
 	selinux? ( sec-policy/selinux-rpcbind )
+	systemd? ( >=sys-apps/systemd-189-r3 )
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -36,18 +37,28 @@
 		epatch "${FILESDIR}"/${P}-pkgconfig.patch
 		eautoreconf
 	fi
+
+	use warmstarts || epatch "${FILESDIR}"/${P}-dont-advertize-warmstart.patch
 }
 
 src_configure() {
+	local myconf
+
+	use warmstarts && myconf+=" --with-statedir=${EPREFIX}/run/${PN}"
+	
 	econf \
-		--bindir=/sbin \
-		$(use_enable tcpd libwrap)
+		--bindir="${EPREFIX}"/sbin \
+		$(use_enable tcpd libwrap) \
+		$(use_enable warmstarts) \
+		${myconf}
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	doman man/rpc{bind,info}.8
 	dodoc AUTHORS ChangeLog NEWS README
-	newinitd "${FILESDIR}"/rpcbind.initd rpcbind || die
-	newconfd "${FILESDIR}"/rpcbind.confd rpcbind || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
+
+	systemd_dounit "${FILESDIR}"/${PN}.{service,socket} || die
 }