gentoo resync : 10.12.2017

6 files changed, 80 insertions, 34 deletions

diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 25f0120a1e3d..35828d99ab3a 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -1,6 +1,6 @@
-AUX libspt-1.1-gentoo.patch 613 BLAKE2B f1a8173108ccda1031978aa84c90dee85b7dc50bef3d12be7dc837ddd350bea779609a818c30049660bcf9a21c3d32be0ce66cc2ba7eef73f7b43668e8ee2547 SHA512 67689a7260687f5499270474fdc9772acf95fadf746723e9a26e33812491952aa3f5cbf572949c854d7514ab1b81a6074c2fde2ad1da3f57ea4835727732d5aa
 AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286df8153cc3912a7df414ad8328ba4de04cd558e3c7884102d4b431bc3c584a6f0c883a663f681fbf96bf90 SHA512 9c73f4b3eae1af1bd26d4c08eb926847fb7d8f26cb3e472afa940d12b086f5a142e9f918cab1beeebfc45e2893480a185180cc9b4bfe5930bb0cafe6b66098d0
-DIST libspt-1.1.tar.bz2 165168 SHA256 fda34d08a8d167cdabd1d8645210b7ffc9e624e5accd37577f2bcb025830e22e SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 WHIRLPOOL ed05a7cbbdcd420d811a13dfc29b712a6bd241b41740029b4b366907085f98f13d14a4012ea53d862f4780a3f070f9ea7cbd70bf8bff30c8aec87a3a2d7c0e95
-EBUILD libspt-1.1-r2.ebuild 436 BLAKE2B 4028855bc6c0eeb1dc10d2a855477cfeb962c2794ead1ba21d20b48c51c4b4af0bd9127e52f3c403c9bb2b3102371386472fc2332f1c70b9af78b5decc500e29 SHA512 1889b53723fb35c7929d26fa943feb1032c1d3324b53f7569b0cd577836a2f16b7d227c3475a1f9d020718e6405f344c34bd1a0a2cb660e259904ec4e13ec52d
-EBUILD libspt-1.1-r3.ebuild 557 BLAKE2B 1336d929182bb84fe4d7a155e0e0b88a139d56d13b90f1e6dc49b3d360d92ee830d12a0d36d15617d9f3d7a9ad4b24e1840cd58ec5b0c6f52e10c01519872b08 SHA512 06bea16dd1edb93ca541e82a2921861f077f2438d11f1b5e4f82a5caef953dfaa2e75a4594f1d706095e71107739b73343434fe7b1caac2413430e57883b8029
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
+AUX libspt-rpc.patch 848 BLAKE2B 982a1b8d88e2a28cb6529dd4a6c2e15c42aa7f0b0bbe34d40d91a6bb45ee2667253cabb06f31bdb757dcec7d4daf066f1271aa33edebeadfda2ba341bdd39dde SHA512 ad703547047949aa338bea0bd211a7daa3448ce728cf754be6ba4c0a058e0ab631beceb044bcce0eba9fe606b741f530fb88909891b0e86ff8898cfcf04d6cd1
+DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
+EBUILD libspt-1.1-r2.ebuild 740 BLAKE2B 515ea54db749d792a2340498ec075764ad3d79f5c6257b05ae3fe462fd81fc09ec35981a7f03d92ca0e2184b303203cfc5ab4fd76f8da36917a3c8ff2f938b33 SHA512 de6b47b133772e8fd2ac2b237c17296d3ec112cc5ea64515d217bb5f04f1d214d118d79637fd27ca2c71383df6b5964d079ce6a3ea71cb576c568fc61d7cedcc
+EBUILD libspt-1.1-r3.ebuild 862 BLAKE2B 6e42d0831e46f2a7f0d5f8ae5c6f0d0bb0c9cec06346b65415d6f186bebf4c0ab939b266d9743a3475512412321739a3ed2b54f10b7cb21c6f3301cef6c14673 SHA512 57b6ee8be9ab80a25dcc11fa97efc1c87d571afdef665270dbe5a915f6275c3f74054c9433387f32398dc952ff2a8209812f3d77fce85cc691c5a4b68a72ef60
+MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/files/libspt-1.1-gentoo.patch b/dev-libs/libspt/files/libspt-1.1-gentoo.patch
deleted file mode 100644
index 992273142061..000000000000
--- a/dev-libs/libspt/files/libspt-1.1-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libspt-1.1.orig/Makefile.in libspt-1.1/Makefile.in
---- libspt-1.1.orig/Makefile.in	2003-12-07 15:42:15.000000000 +0900
-+++ libspt-1.1/Makefile.in	2009-09-15 00:16:50.000000000 +0900
-@@ -9,7 +9,7 @@
- libexecdir = @libexecdir@
- includedir = @includedir@
- #docdir = $(prefix)/doc
--mandir = $(prefix)/man
-+mandir = @mandir@
- 
- EXEEXT = @EXEEXT@
- 
-@@ -48,7 +48,7 @@
- AGENTOBJS = sptagent.o sptconn.$lo cfuncs.$lo
- LIBOBJS = libspt.$lo sptconn.$lo cfuncs.$lo error.$lo utilapi.$lo termios.$lo
- OBJS = test.o $(LIBOBJS)
--AGENT_MODE = -m 4755 -o root -g wheel
-+AGENT_MODE =
- 
- .SUFFIXES: .c .o .cc .lo
- .c.lo:
diff --git a/dev-libs/libspt/files/libspt-rpc.patch b/dev-libs/libspt/files/libspt-rpc.patch
new file mode 100644
index 000000000000..79b545ace4fa
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-rpc.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,7 +55,18 @@
+ AC_CHECK_FUNCS([dup2 ftruncate gettimeofday select strcspn strstr]dnl
+ [ strchr memcpy bzero setutent setutxent updwtmp updwtmpx _openpty revoke getsid]dnl
+ [ setsid setpgrp snprintf sigaction cfmakeraw])
++AC_ARG_WITH([libtirpc],
++  [AS_HELP_STRING([--with-libtirpc],[Use libtirpc as RPC implementation (instead of sunrpc)])])
++AS_IF([test "x$with_libtirpc" = xyes], 
++  [PKG_CHECK_MODULES([TIRPC], 
++    [libtirpc], 
++    [CFLAGS="$CFLAGS $TIRPC_CFLAGS"; LIBS="$LIBS $TIRPC_LIBS";],
++    [AC_MSG_ERROR([libtirpc requested, but library not found.])]
++  )], 
++  [AC_CHECK_HEADER(rpc/rpc.h, 
++    [],
++    [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
++)])
+-AC_SEARCH_LIBS([xdr_free],[nsl rpclib])
+ AC_SEARCH_LIBS([socket],[socket])
+ AC_SEARCH_LIBS([nanosleep],[posix4])
+ 
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index 55536d07fd32..cf5d08f80b28 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="6"
 
+inherit autotools
+
 DESCRIPTION="Library for handling root privilege"
 #HOMEPAGE="http://www.j10n.org/libspt/index.html"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,7 +13,26 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
+IUSE="+libtirpc"
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	libtirpc? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-rpc.patch"
+)
+
+src_prepare() {
+	rm aclocal.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libtirpc)
+}
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
index 028608c7a2d0..d922b8c99194 100644
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="6"
 
+inherit autotools
+
 DESCRIPTION="Library for handling root privilege"
 #HOMEPAGE="http://www.j10n.org/libspt/index.html"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,10 +13,29 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="suid"
+IUSE="+libtirpc suid"
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-gentoo.patch" )
+RDEPEND="!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	libtirpc? ( net-libs/libtirpc )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-rpc.patch"
+)
+
+src_prepare() {
+	rm aclocal.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libtirpc)
+}
 
 src_install() {
 	default
diff --git a/dev-libs/libspt/metadata.xml b/dev-libs/libspt/metadata.xml
index c921b96adf6c..4b6896b6c4a2 100644
--- a/dev-libs/libspt/metadata.xml
+++ b/dev-libs/libspt/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="libtirpc">Build against net-libs/libtirpc for RPC support</flag>
+  </use>
 </pkgmetadata>