gentoo resync : 18.08.2019

3 files changed, 2 insertions, 94 deletions

diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index da678af5ddf6..e3f258fe25fe 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,8 +1,6 @@
 AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
-DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
 DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
 DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
-EBUILD gtk-gnutella-1.1.13.ebuild 1917 BLAKE2B c01b96371f81b051fec6a14c8836f49f41a0da8a12da335e3eeb43af1ac314667a5ce64a5c51cc85e3762e8e0dee55d3eb4f749367418c7f937fa13f18546921 SHA512 72c1ef037bec822301daf3755658c82b62458127e571d4009fedafc68eef437b6dcad8a285a593bfa36cb670f74332c109f686f01349adc809c911cd77878b5f
 EBUILD gtk-gnutella-1.1.14.ebuild 1959 BLAKE2B 39df6cee0d80ec20d69ce782b47496490d3339998fa754557bb8ff749dec96f9ed4e9fcccfd36bbfc58993c93cea72b7149cda2084bbed0dc31d126e20737349 SHA512 9e44fcc69a2f05a40cba5a7650b96ec98a3451b78149ebb13a6382575710b18d32a3210ed5b198855c53b032118cda08a3b5414fa68eac61a7c8f2f9f1d7d6b7
-EBUILD gtk-gnutella-1.1.15.ebuild 1921 BLAKE2B 8093b30b3c477b4817de39427a2f4761b5dcb69da5b802e712ce1c3b889fdc474556ee45aea2bd5ebb0bd4aedad43305b526efa2a8feff1e5d4f4f9155af006a SHA512 e563e9b319af7942c0fd7ab887e139b9b37aa2a3894572c76e9af47f1d3569da203b29033931eaa62b323396a89c1973bf5709f8cd19dd2dca7ad2552f9b85b7
+EBUILD gtk-gnutella-1.1.15.ebuild 1918 BLAKE2B 444f5242ef782ff99964a971a8747ee4b8fda2d0f8a77f748f9200147f45d89c9e2f01957f7cd443a20d379ec7f103736f61064d1b366190a34b996281b1252c SHA512 7ba87429998165d5f1c6a72583f9da6c2146816b884ecb70a2d767568045aeac5ad7fa6e3436d3f8d326030dfecb606dcea4900ba808cf76dd18f2393c5a11ba
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
deleted file mode 100644
index 0d716e9f88df..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-1.1.14-statx.patch"
-
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc=$(tc-getCC) \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
index 05775beef84c..9bbefd21a8c7 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
 
 RDEPEND="
 	sys-libs/binutils-libs:=