Use libtirpc for USE=rpc support #370995 by Diego Elio Pettenò. Migrate away from --oknodo with newer openrc #377775 by Michael Mair-Keimberger. Convert opts to extra_started_commands #385633 by Martin von Gagern.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

5 files changed, 74 insertions, 13 deletions

diff --git a/sys-apps/xinetd/ChangeLog b/sys-apps/xinetd/ChangeLog
index ce7ab14a5596..133804fbe9a0 100644
--- a/sys-apps/xinetd/ChangeLog
+++ b/sys-apps/xinetd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/xinetd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.51 2011/04/16 19:16:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/ChangeLog,v 1.52 2011/10/11 01:26:08 vapier Exp $
+
+*xinetd-2.3.14-r1 (11 Oct 2011)
+
+  11 Oct 2011; Mike Frysinger <vapier@gentoo.org> +xinetd-2.3.14-r1.ebuild,
+  files/xinetd.rc6, metadata.xml:
+  Use libtirpc for USE=rpc support #370995 by Diego Elio Pettenò. Migrate away
+  from --oknodo with newer openrc #377775 by Michael Mair-Keimberger. Convert
+  opts to extra_started_commands #385633 by Martin von Gagern.
 
   16 Apr 2011; Ulrich Mueller <ulm@gentoo.org> xinetd-2.3.14.ebuild:
   Don't PROVIDE virtual/inetd, bug 358831.
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index d88b356a74f5..f1b41fab1302 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX xinetd-2.3.14-DESTDIR.patch 1725 RMD160 db439670f48e887cb79574507eba85a1b3fc7e35 SHA1 783b5259cb774d74e71a7d3bb3c5569e325afc67 SHA256 928e078070c2b662cd53808c16c5217a9f7f46e31132254bbf19f5efc39b0bc4
 AUX xinetd-2.3.14-config.patch 154 RMD160 2bc92051859da103070d3b26a2922b2fb3eacbe1 SHA1 e07d8aca9684d5c525a7485eb7f43a7df2cb88b3 SHA256 9aa8641d7462a2566770ad93efe13004c5b8c02374221f7b7bd1382c805ffc2e
 AUX xinetd-2.3.14-install-contrib.patch 728 RMD160 85f9ed2fd5c932ee5a63e02218242a6f84dbd5ee SHA1 64eecf162ba3f1d80959644ab79806f313fe7aa3 SHA256 e76479ccf5f5763a1365f3ad59edf30f20e77147b8e012d2cee179fc72298d8a
 AUX xinetd.confd 90 RMD160 e06f0c374f4a3f05f9509d9aa3571692a0e4e783 SHA1 90628a05cccfff4c85d9cb05c77a0a12c8dfff6c SHA256 e401e2cf7c0180a170d3dc3e91d7e98002bae7b013df72813b7bcf89b864fb3a
-AUX xinetd.rc6 844 RMD160 1257bf780e3cca5f5c63f01b34efac41b0a9f8ea SHA1 ab8dfe551420aa346203603e3128b578062c1dbb SHA256 1b5d0ec0d77b553034135289f2776a3abaa4582f97f5de4ca278c4319ae21ec8
+AUX xinetd.rc6 846 RMD160 27aacf939b7a06330a7435e6b8a211d53205393d SHA1 7494410de35a565cd605a03c45585900298aa55e SHA256 6aeb4ec9b8ccc062b5ee8c609830c05cee3ed790fa90d7b2d8cf82a09e317c5c
 DIST xinetd-2.3.14.tar.gz 301703 RMD160 03d59f99b7818f2e6c4ca50fe13a092c82d010be SHA1 6e9f0e0b0e04328f106851682ec707c61448ee69 SHA256 760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f
+EBUILD xinetd-2.3.14-r1.ebuild 1378 RMD160 2f6a464d3bd001c1e3f99e1933f6268431eb4a21 SHA1 684a07c37dcc15a1c7f92fbfc381b44597e6eee2 SHA256 b38596c85770048a3f363ced9179807f1f860d18d3428b0bbb2b66ffbb5c5c3c
 EBUILD xinetd-2.3.14.ebuild 1227 RMD160 c2581d70a3fbd973483e3233376308d32091d7b2 SHA1 a053933984b1a0ebe78f050536efdb0842c402b5 SHA256 f50f4fe402cfcff34ed1023b986f91867c00e45f14da48e1aa0d30485b9c8d72
-MISC ChangeLog 7315 RMD160 e364858bdee6d67ac52122d5c2538b75cbacf186 SHA1 8d4ba53965f1a50f0c15b0095fab3d90b2ae0191 SHA256 425bca979974c7ef0f3b23f23027676a0a93dfd0e7a2c178a6253bc50f229b63
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+MISC ChangeLog 7683 RMD160 64e130eeae980c555f6f3d7f88fd7cb337e2224d SHA1 ccc10abfc4c4498d8d0a9fc97c624258084e44f6 SHA256 e948c84e4ced6094675bd478a9c35fc5d4c5ec3f4d9e8a8f67dfda8b457e13df
+MISC metadata.xml 223 RMD160 97fe706904ae8d1191b0aaf396675ddacafa65c9 SHA1 85de653258e30ee6ed00e4b319ec2b8fc77f2774 SHA256 4e43d08b836aef8907db5fad1cbc4209be6052ca799d7bc23777057a04856d5b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2p628ACgkQOeoy/oIi7uyJSACgpYFugLtGVkkItgqhFhRZcJag
-mNAAnjykC54kSpK+Dv3gRIm8BcbGzR9X
-=iQOk
+iF4EAREIAAYFAk6TmzgACgkQaC/OocHi7Jb18AEAk6thPWpQh6xi00NLC/ff/gfp
++em6PGBMqPqgKy3e+qoA/2bgRdeA7jAm0dTRBU/mVpUD4SvZC4RsD7yMUl/yDgli
+=dUb3
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
index 07a2a85ab014..2f90775c06db 100644
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ b/sys-apps/xinetd/files/xinetd.rc6
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.23 2009/10/11 00:45:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.24 2011/10/11 01:26:08 vapier Exp $
 
-opts="reload dump check"
+extra_started_commands="reload dump check"
 
 depend() {
 	use net
@@ -25,7 +25,7 @@ stop() {
 do_sig() {
 	local sig=$1 ; shift
 	ebegin "$*"
-	start-stop-daemon --oknodo --stop --signal ${sig} --pidfile /var/run/xinetd.pid
+	start-stop-daemon --signal ${sig} --pidfile /var/run/xinetd.pid
 	eend $?
 }
 reload() { do_sig HUP  "Reloading configuration" ; }
diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 96a2d586367d..ec64a3227cf0 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name='rpc'>support RPC services</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild
new file mode 100644
index 000000000000..54ab7192d313
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.14-r1.ebuild,v 1.1 2011/10/11 01:26:08 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="powerful replacement for inetd"
+HOMEPAGE="http://www.xinetd.org/"
+SRC_URI="http://www.xinetd.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="perl rpc tcpd"
+
+DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	rpc? ( net-libs/libtirpc )"
+RDEPEND="${DEPEND}
+	perl? ( dev-lang/perl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-DESTDIR.patch
+	epatch "${FILESDIR}"/${P}-install-contrib.patch
+	epatch "${FILESDIR}"/${P}-config.patch
+}
+
+src_configure() {
+	if ! use rpc ; then
+		append-cppflags -DNO_RPC
+		export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
+	fi
+	LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc) \
+	econf \
+		$(use_with tcpd libwrap) \
+		--with-loadavg
+}
+
+src_install() {
+	emake install install-contrib DESTDIR="${D}" || die
+	use perl || rm -f "${D}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd || die
+	newconfd "${FILESDIR}"/xinetd.confd xinetd || die
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc AUDIT INSTALL README TODO CHANGELOG
+}