Cleanup.

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

4 files changed, 9 insertions, 189 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index aa3593a5d6e3..5564d53ae843 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,10 @@
 # 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.158 2014/05/10 13:42:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.159 2014/05/10 18:11:13 graaff Exp $
+
+  10 May 2014; Hans de Graaff <graaff@gentoo.org> -gtk-gnutella-1.0.0.ebuild,
+  -gtk-gnutella-1.0.0-r1.ebuild:
+  Cleanup.
 
   10 May 2014; Agostino Sarubbo <ago@gentoo.org> gtk-gnutella-1.0.1.ebuild:
   Stable for ppc, wrt bug #500760
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 29ac4aa43c4d..9c7287c5c4e2 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -4,27 +4,14 @@ Hash: SHA256
 AUX gtk-gnutella-0.96.7-ldflags.patch 379 SHA256 65cd57a59ba8922714a3d8535b15e9e81e60133eb2bd0e4233500774885d53eb SHA512 84101d0acea3eba80bcf5cfc22d0c6399da086de30820bac0596292566b17b052f94d8dd599b4085e34bb5798a8ac2e226737fc03943099cb7195bc84f2b0957 WHIRLPOOL 03c2a42a4b78465c34822d26b9367ec608d0eb0af40d01f107d22d93afff0761aeccb2d1bc3d828e6296e7fc4704e6ea6ab23dc7a0b085f248f47a2ca5cd8ac5
 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.0.tar.bz2 18988804 SHA256 0c02add9819f8e47655083fddbecdaffb18d129e773c9e28eeeba7840789d986 SHA512 dda7687839bf2187129b3b16c82cea03f1124c2e2a355826edffaec90c72ff080ac7becaf1d0994f14e3ad717c55d2d84af33010d34d1487670ce6ceb5acdf41 WHIRLPOOL 1ec3dc330ff1a1b39635ba1d9336feef2415d1ad3a6ee9b00b92a6d4483d745af348e6d146f9907d7fe9b205d8dfd82c723fcb70f84aedbca5fa92c98908bea0
 DIST gtk-gnutella-1.0.1.tar.bz2 19010641 SHA256 0f54871782afac7f55f214597bf7162926081f12b3488b13187562dcc5fc0f04 SHA512 4722276f928baa7dec5e56de1b7d21b078f47637a68e60e60a572d49de0f17aabb23ae963a2059e2683c344fdb0c82600377e33da85a688b9df8da39e40bfbaf WHIRLPOOL f416d469ab97561808baea4a6a4106a8f89b8ac62bf64e8f99fbc5499d991cb5eb11fb7bedf3b42d4bf09940088705c1673bf7bf5d42e1ba51052a860ae37295
-EBUILD gtk-gnutella-1.0.0-r1.ebuild 2048 SHA256 c9b474fb71e2981078a3160922486810be2577f73ba47435abe63e859dcf25e7 SHA512 93ac0c5f6d0181e07675d587d55dde38657f0608aecc140ba44b8cbfe66f05c9278678b03e78ff9904395e2ce55c6f44b6c0171b9a90db1893063e1701b3e8a9 WHIRLPOOL 074a8a3c86b9e6879fcfcff1db61fde80ee03f5a3ebabddd3e3f6541126447f6e7e1dc0a6b992c881645dd2616bd457cb00cf6fe6f8252506b60a7eb242b0311
-EBUILD gtk-gnutella-1.0.0.ebuild 1993 SHA256 bbf2741d3f5a7526efcd56fddaae41bc1dd7f95070274290392fa203b1e6a36d SHA512 1b0870fa5a90285df2c455999993cb6c0700ef4272463a37fb32bc84ac062c745fe971190d247543f8d10e1e32e035a0b6041024210654113c336730dfff717a WHIRLPOOL edd1107ee224924c0df386d606f606b5872ff4ecc6a048bcad981f9f06bffef95a36902ff582ab13607720a81a3e18106c16074491cb138a8a3f8d1e543be550
 EBUILD gtk-gnutella-1.0.1.ebuild 2120 SHA256 bae15758a6b8e3abc122e76ecaddffbd19802c012fe0122f41f5cf4a9849ef46 SHA512 96012a2a10c82434f1883ccabb8945935a188596703d4769e58c0514f3cf14e3833c7402145eb1adc5c55adc1fcbec1511491e5b393749b7568442f3d20e0fb6 WHIRLPOOL 48fe1f123759118e01461859d8ab3938db3b7e5a794cdd6b950996d652706a3eb07c04aacedd2935361ede884cf0370bdcf444d51f24783425b57a3f03876540
-MISC ChangeLog 23343 SHA256 7044108d4d5f4fcdbc6658b3336d73945eabacd0191c3641a3b5775eeff0968d SHA512 48ad5bc837b5e69dc9c6dc44defd9910d7a03c1196c673b2f3d2d9401fa1a216da7748458421e20284b0473d2a70690c763e902c48ba403993836ff75870d89f WHIRLPOOL 3436466163920515da3fc7b70b00fb9612785994eafc4fc8467fe2170302b749d7c91b306f9a30ca5d38fba7ef3ed199be387983c98a7e93366b6935cedf8d4f
+MISC ChangeLog 23469 SHA256 e341c157e184f05cba128a2edd8abd4aa2bcf51cfb6bbd0d474c34049114d664 SHA512 f966eeb9067cc498d85661b832ac6d5a1c4b65880a8a58a53691f4eda0f849b95ac07fb2fbe2ae83b0b3b1f615e2c6ef3b070b215d9e4b54b5d205a1ed981a6b WHIRLPOOL a203c460676057aa7f68a6240ba3c34be7d2568fbd8d1223d118c53bb9206473b24a28ebdcbad25aa127b928fa8076f4a9f1bfd1b1d7da338044b049f9bf9044
 MISC metadata.xml 220 SHA256 d58e366dd43b562958c2857ad163829d8bc5061a7b855715ba07fa0edb1cd201 SHA512 aeb560115bbb1de6094c8637a6f6b6196a5a83d63670935236820580c6b36b5f41c7ac104ea8716bd25bc5daabfff6229e4117d280812fb63746aa371f30741d WHIRLPOOL 8510e0e6893b57af04c14659cb75799aa7452e06c10f64ac1b3c3ed55c23e8365b829872e9c60a230de64af728e4d11dfcedeaf325c05353e8f081c37d6ae728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTbizeAAoJELp701BxlEWfxwUP/1c0/bmU3d0rXYhQfFpAe5Tp
-YMQELEuCxTlbxsL09TPVYyFGIKT266ICJ6+ZGpJ17zas0gNzNu5ijAdwiBhIRITB
-C0Ksi2Mx+p65GibUQpJGzjz70CqB7rbWCg/dD8DW5NnNYKVZculktN407vIA+Ns1
-ATLEK8lcc1/O6gWxurzV+gBrm5njlnX4JEFZ6wGJaisSAEquumWLTZ4PHZMRrSYV
-oFUiV0dU4ySzPN6oLSeIkoXFSD004iSi8FZ1RSrygfKzZYJSoYYNlQtti26VJGOv
-ISvWeoDBGuGO1RwM6/dMsPs9S/ie57EbuLs95JcWEVzbpx3h55okcWodV6A0AT0q
-0N9wy4OSkqdyoOarv0ZFmpqcUadfACaC/+DM+OE5y4Nb6zzUXtLcQREaFPBi03J9
-8X8Ttk/U55d2tm/BMhyV1h3fILPhyiN/XS3lq2XifdrKG3OgDaEsJHev6Y1pX+Hk
-OwyJA+7FjELk8iIT3jHfW1EbxZ9o8yryM9FwPMOc+/8nypRodn8wIkxED0k+9/8t
-XxKDN43LGl432Tlnw/VChLsinY64moxxn2b5dl6sAns3c3dspiS702i2bZ8j9HnN
-jACfxoBOyW3BVutlvmU6DV5thYmLOq3rERbgPxBC3Sn1lznzz+OuvJ7ImQnOlZum
-hRodvX+vdMRyLyZRBoLh
-=95oS
+iF4EAREIAAYFAlNua8UACgkQiIP6VqMIqNf6yQD9Hq8q0WPKX0j1WN1UTQQjFC70
+XdXJ+iC+XemZTIm9WjYBAJCN7rOfLa5SpILr2tklnoE1txfr+H+i6zPNOpJYfAUU
+=9TBP
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild
deleted file mode 100644
index d9f7111ac394..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 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.0.0-r1.ebuild,v 1.1 2013/12/04 08:07:18 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
-
-	# Already fixed upstream but not released yet. Included as requested
-	# by upstream.
-	epatch "${FILESDIR}/${P}-bdf.patch"
-	epatch "${FILESDIR}/${P}-gtkg-hostile.patch"
-}
-
-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_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.0.0.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0.ebuild
deleted file mode 100644
index 1a804bdd4340..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.0.0.ebuild
+++ /dev/null
@@ -1,85 +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.0.0.ebuild,v 1.4 2014/02/02 10:55:45 ago 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
-
-	# Already fixed upstream but not released yet. Included as requested
-	# by upstream.
-	epatch "${FILESDIR}/${P}-bdf.patch"
-}
-
-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_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
-}