Cleanup.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

3 files changed, 8 insertions, 93 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index bf3b32935b10..0abce031dbd1 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/gtk-gnutella
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.161 2014/09/03 05:53:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.162 2014/10/04 07:20:11 graaff Exp $
+
+  04 Oct 2014; Hans de Graaff <graaff@gentoo.org> -gtk-gnutella-1.1.0.ebuild:
+  Cleanup.
 
 *gtk-gnutella-1.1.1 (03 Sep 2014)
 
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 682f6a7785b7..3294e63e522e 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -5,17 +5,15 @@ AUX gtk-gnutella-0.96.7-ldflags.patch 379 SHA256 65cd57a59ba8922714a3d8535b15e9e
 AUX gtk-gnutella-1.0.0-bdf.patch 3299 SHA256 d70c417075271e7455ff9f632ec027acda2e2c9baaab18d560c2a163a29a4cc7 SHA512 96e017227db560c95a9352439fdc6cb6bd2775cc9f3a437e214323f397aa3c7cd139d308419b1d0e3b975e23dd1872e647f9db6a78e810b57af3401427cd5a3c WHIRLPOOL f8420440776009cbe55a3eb0cc3e5d7c8574fb1c15d13aca522bfbd1db53c2ab6aedfeece4c150cf908ff75e70012ce734530b563d86edfa1fd1b4d935bc3ea6
 AUX gtk-gnutella-1.0.0-gtkg-hostile.patch 658 SHA256 b915d8e8644156fec5668b9787c6929877cd00202057af5f5e341bab4d4fe354 SHA512 cfaef346827f7483cfe5e27a8ddb7441417b177bdf7bfa9eb7d80f4ae6c92d74b71405b7dffbe251754f14f9699104edd277d575c75af658c1de08f78125dc0e WHIRLPOOL 2f5146937fd9dea9385d64146e29972e5da6ee76a70e88881f1e772ef5a8b353e767eb6832c2a3462fbb0c989cec1b3a578305db72492901942353034f159668
 DIST gtk-gnutella-1.0.1.tar.bz2 19010641 SHA256 0f54871782afac7f55f214597bf7162926081f12b3488b13187562dcc5fc0f04 SHA512 4722276f928baa7dec5e56de1b7d21b078f47637a68e60e60a572d49de0f17aabb23ae963a2059e2683c344fdb0c82600377e33da85a688b9df8da39e40bfbaf WHIRLPOOL f416d469ab97561808baea4a6a4106a8f89b8ac62bf64e8f99fbc5499d991cb5eb11fb7bedf3b42d4bf09940088705c1673bf7bf5d42e1ba51052a860ae37295
-DIST gtk-gnutella-1.1.0.tar.bz2 19399321 SHA256 cb033d14b647c3a45c6731b94aaa8ed32729ff6aa31f82e372397cd75869f9e9 SHA512 2d461e91e4d9da109dcc3fe388c048d87dae892fa86a4c09bfb9b2e86aef0051d83e4e338b579e2cf0c98a7175308269d465f431e9959675eb2973cd810cc9cf WHIRLPOOL 61293fe431de2ad09bdcb5bff1a6f4113a4af2a7a40394d1ff72ef1ba3c50cba8a94d65524611fb94f3764fddc7baba1d67a201b6bc7e29b3fa7c3198adb65d1
 DIST gtk-gnutella-1.1.1.tar.bz2 35342037 SHA256 6e077204ddc23d0b8a044c3d7f12f40e8876b523f12a90c00b6725170611b501 SHA512 c8226f74bbbc901a608aa59544ba5d7f924f5bcef0e98ba16145c4ae07a93dc710376201cf46bedaddcefb4438e18c259ce06be076a5f365a80b445cf788ec02 WHIRLPOOL 19e41cea5dfbfc27d21c7a5ed7ea69a14ef4fb4c0285eedd218d2506a6a133bb9f81462e4396bc936528618216d419f1ac38e53ff887c9e640cd51264727d824
 EBUILD gtk-gnutella-1.0.1.ebuild 2120 SHA256 bae15758a6b8e3abc122e76ecaddffbd19802c012fe0122f41f5cf4a9849ef46 SHA512 96012a2a10c82434f1883ccabb8945935a188596703d4769e58c0514f3cf14e3833c7402145eb1adc5c55adc1fcbec1511491e5b393749b7568442f3d20e0fb6 WHIRLPOOL 48fe1f123759118e01461859d8ab3938db3b7e5a794cdd6b950996d652706a3eb07c04aacedd2935361ede884cf0370bdcf444d51f24783425b57a3f03876540
-EBUILD gtk-gnutella-1.1.0.ebuild 1954 SHA256 02029f4d6fecff819700f9a6f19d087f702608b4610f04b558d1f9b10acbc5fe SHA512 d2e0f33eacd5aca2b53811daea6008ed888902bebff30256390ce551c57d5ecad1014524b5795957428d29a43c1f28165b28757c8f9d82a10f4de9d7a78330fc WHIRLPOOL f4bded86f83f87420ab02856e985260e3ab4e948bfe0b6e112fc725e5949f4ea6e7f48a9027e6cb9cdd571f542723c017be8d514682b979dff8739994c5f2852
 EBUILD gtk-gnutella-1.1.1.ebuild 1954 SHA256 5f5b2120c113de0353213dcb73ac022fb19116cc75f07e84b4b1ce7cbde14a7a SHA512 577c32c5639d4ddc501eff93fe6a9358e9b18a8ce9847d2d306cb9d6a65c79f7d53abb3a755e61edb7851e8f79cb9c4a3170da48ea22a390d1a1660af00e38d5 WHIRLPOOL 68fa583a1757e79a1b0501baf12f31d2ceef0a9cfda6b19d44dcd0c7dddb583ea48636559e9d0dc8d330c8228f8451fa71c9750fa1abf799660eb4d6379c8eaf
-MISC ChangeLog 23729 SHA256 fae63c0194657259b46b887e127aa878db2cc6de9db023251d459d5bab3811ef SHA512 cc3db463b395c4479fc4f0bd73026a6052c5172ec765da25725374c953a68e8f16ea3d16bbbd49d4ab01d5eb86ef3e9a362053fd3e34dc4fd7ec311d3f55dbfd WHIRLPOOL 78a715c968cfce581e6428485416bb3652de76012d757c3b3d1d4f55d6f3aeaaeb02917a77f00b544aaeaeacd9e8c323aafe3a16cff69ecdee069e1b1b7e994a
+MISC ChangeLog 23819 SHA256 8f9b6686efec18444f82fc9ba5041096ae03e34966a62c257da4f1e896b62ebc SHA512 7671ee5fb8dc42438db3f2407b00e2a0d5987fcc4c42fad76ae3b8a526f8bae7498c7e32fd28475b55351992c69ee05ba733cfb6a6d2b411bd4ef3c053da0b85 WHIRLPOOL 29c1b93e7b2a9e2db77963b3becbc266b80a0620e33e1fe19e2e0a54d4bc4a6e6e187664bf606acedff2dde62f486ffc796092ccada5e601c9f5df513117cf0f
 MISC metadata.xml 220 SHA256 d58e366dd43b562958c2857ad163829d8bc5061a7b855715ba07fa0edb1cd201 SHA512 aeb560115bbb1de6094c8637a6f6b6196a5a83d63670935236820580c6b36b5f41c7ac104ea8716bd25bc5daabfff6229e4117d280812fb63746aa371f30741d WHIRLPOOL 8510e0e6893b57af04c14659cb75799aa7452e06c10f64ac1b3c3ed55c23e8365b829872e9c60a230de64af728e4d11dfcedeaf325c05353e8f081c37d6ae728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQGrOQACgkQiIP6VqMIqNfouQD8DyfpuIj9Zvs3h/dex6gpg0l2
-TpvaRRJuE+D26nJZWN0A/0c6GOxEmH20qsrt10NdfCGZSOG14wkkNuPOsm7ToAWv
-=jya0
+iF4EAREIAAYFAlQvn6wACgkQiIP6VqMIqNc8zgD8Dw7AfAAXHt5C8SZEO+Hk8FaI
+SiKBX/k1v0GC55bwfsUA/iMWZ1vppIQPMHx2x0HXWqfNFgO74Nz/cuy6pWQxFVy7
+=tyut
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.0.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.0.ebuild
deleted file mode 100644
index f5e7dddf1900..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-1.1.0.ebuild,v 1.1 2014/07/05 07:28:37 graaff Exp $
-
-EAPI=5
-
-inherit eutils
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-	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() {
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-}
-
-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
-}