dev-libs/libspt: fix build with >=sys-libs/glibc-2.26

Closes: https://bugs.gentoo.org/630780
Package-Manager: Portage-2.3.13, Repoman-2.3.4

5 files changed, 76 insertions, 9 deletions

diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 77e4a20d9a49..ca801f97ad80 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -1 +1 @@
-DIST libspt-1.1.tar.bz2 165168 SHA256 fda34d08a8d167cdabd1d8645210b7ffc9e624e5accd37577f2bcb025830e22e SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9 WHIRLPOOL ed05a7cbbdcd420d811a13dfc29b712a6bd241b41740029b4b366907085f98f13d14a4012ea53d862f4780a3f070f9ea7cbd70bf8bff30c8aec87a3a2d7c0e95
+DIST libspt-1.1.tar.bz2 165168 BLAKE2B a21778ba8b3c22d7fa655460ede0d04efc98635b1be74575cbb996b33bdb27ed75479ae6a2d7bc38c1052ac23547483e9d93c03531cbfe236e1e07944bad1673 SHA512 5b2ec289ce51f1f2040b68c559ef6e1ea1e59f50c3d639a93176fa8a5f3f75481651c4d0acd393eac8d2193f2aae19f882897323caf344cbfde52e32cc3a02b9
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>