gentoo resync : 03.11.2019

5 files changed, 22 insertions, 56 deletions

diff --git a/dev-libs/libspt/Manifest b/dev-libs/libspt/Manifest
index 23f5971d3c15..ec461f0f8972 100644
--- a/dev-libs/libspt/Manifest
+++ b/dev-libs/libspt/Manifest
@@ -1,7 +1,7 @@
 AUX libspt-gentoo.patch 727 BLAKE2B a98df11f3789d5e8c2aabfd538210db025a59567286df8153cc3912a7df414ad8328ba4de04cd558e3c7884102d4b431bc3c584a6f0c883a663f681fbf96bf90 SHA512 9c73f4b3eae1af1bd26d4c08eb926847fb7d8f26cb3e472afa940d12b086f5a142e9f918cab1beeebfc45e2893480a185180cc9b4bfe5930bb0cafe6b66098d0
+AUX libspt-glibc-2.30.patch 233 BLAKE2B 4cc03c14f2d879566987f56e91c3f467120a7e49648c0814535c02b129e49f4d7185edac370f17e58428e180056dce31844a1accfa6503f0ebfde32c53571f0c SHA512 8f064315215fb99d7302b544b7a3da1c239bba21e8ffdc21b0bd05e496bb0ddd54ae5ed55c36b9fc0386026d007f19082d1eee95264edda1a124e9629c5093c9
 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 872 BLAKE2B 3a749b0fc4afe3a796cd2c512bdd8ec61616e909da187e852a1fecbd129fafe99c6dcc8177b1eea05ced2ba059d2af29c49d942b8398eabe278103e7a77b4e2e SHA512 0f6f502171794eb8c3a983b2549ac0cb3bd0b2fd00abc06f67db292347b53d8a16d25ad67fa5e611105d4da4c7cc7f2efb4cc692b554f564ef0f2e5221e6bbbb
-EBUILD libspt-1.1-r4.ebuild 787 BLAKE2B adf3acd0c3f5f806647194eaf173fde247bd9abde50cff92c6d9b2428aa2c16c97abbbfa13071940e9e8cdfe243627055baf3ac1028b5a3f73b080f359d35948 SHA512 695a9e205985711608c84b0c557c7ee1b1ff58815201396f6470166b3bb806784fa1397b6c436cb48dc4d5e596c4e7e02cb5f513862dfd6dc6de4a295a3cf078
+EBUILD libspt-1.1-r2.ebuild 722 BLAKE2B 6cc6605f6371007890cea96193166233a58de89e6465045f919be3e3d78927c7a483c7fdf9363845b9de884a9d56b732b46ac307aaba3776c15aac56eaa2df72 SHA512 9d5b8c0e54db911d474f461a9a000793afc5867e45677c7d2944f6f752196ee14341c4e8402f29ae86098d1ada364c362886b50607fb9d0e26d99570baa8dba4
+EBUILD libspt-1.1-r4.ebuild 772 BLAKE2B 26baacbe890186df7441fa3b74f7a2a54c1038358ed2c9a7dbc65c76509354fe27e31d9e029e2315a4b7c7421ccf5ec038eea3c49d3fb2af7f57be5f9acd5aa5 SHA512 97eb80fb1a122982cf83233c463d68ec5c5c1990d6ffddc7d65701686b10ad5e1e7bf3e6a7746301c5e7589af92c0ea60b27f1ed2f8f5bb95a7f9bb5e541964b
 MISC metadata.xml 338 BLAKE2B b0d2cf2b1009aaab90ed70d7804808dc0da5b868905de880bf120a6b6b00ea79c0256f483dad6f3e3610bec57156e4fde3b54790dcc01c77848e62ad43a4e451 SHA512 4432f92e77ea7bd20aed61d72505de530920cc8f0d06e4e5e4e9a25a11494ca809c6662b073f05c4726a942371b678d32ece0d4e665c2bf0c66f12f57b3044e9
diff --git a/dev-libs/libspt/files/libspt-glibc-2.30.patch b/dev-libs/libspt/files/libspt-glibc-2.30.patch
new file mode 100644
index 000000000000..1ebb9b969b24
--- /dev/null
+++ b/dev-libs/libspt/files/libspt-glibc-2.30.patch
@@ -0,0 +1,12 @@
+--- a/libspt.c
++++ b/libspt.c
+@@ -7,9 +7,6 @@
+ #include <time.h>
+ #include <stdio.h>  /* for perror() */
+ #include <signal.h>
+-#ifdef HAVE_PTY_SVR4
+-#include <sys/stropts.h>
+-#endif
+ 
+ struct spt_handle_tag {
+     connection *pconn;
diff --git a/dev-libs/libspt/libspt-1.1-r2.ebuild b/dev-libs/libspt/libspt-1.1-r2.ebuild
index cf5d08f80b28..a2bbec0ed4d9 100644
--- a/dev-libs/libspt/libspt-1.1-r2.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,9 +6,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"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.j10n.org/libspt/"
+SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -23,6 +22,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
 	"${FILESDIR}/${PN}-rpc.patch"
 )
 
diff --git a/dev-libs/libspt/libspt-1.1-r3.ebuild b/dev-libs/libspt/libspt-1.1-r3.ebuild
deleted file mode 100644
index 402e4599e1e2..000000000000
--- a/dev-libs/libspt/libspt-1.1-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+libtirpc suid"
-RESTRICT="test"
-
-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
-
-	if use suid; then
-		fperms 4755 /usr/libexec/sptagent
-	fi
-}
diff --git a/dev-libs/libspt/libspt-1.1-r4.ebuild b/dev-libs/libspt/libspt-1.1-r4.ebuild
index bb37bffe21cf..4679b16bc3ff 100644
--- a/dev-libs/libspt/libspt-1.1-r4.ebuild
+++ b/dev-libs/libspt/libspt-1.1-r4.ebuild
@@ -6,9 +6,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"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.j10n.org/libspt/"
+SRC_URI="http://www.j10n.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -22,6 +21,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-gentoo.patch"
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
 	"${FILESDIR}/${PN}-rpc.patch"
 )