clean up

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 17 insertions, 193 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 12669867c6cb..1ffd92d17ad6 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.230 2009/03/18 22:26:32 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.231 2009/11/09 18:34:32 fauli Exp $
+
+  09 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  -mldonkey-2.9.6.ebuild:
+  clean up
 
   18 Mar 2009; Brent Baude <ranger@gentoo.org> mldonkey-3.0.0.ebuild:
   Marking mldonkey-3.0.0 ppc for bug 260072
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 561db715df59..f953ebc11049 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.9.5-execstacks.patch 1542 RMD160 cfada9b8a9f88f813e2946448a8199617f4dbe61 SHA1 4eab04e17f6884e56a43344e863d345a4d591c6e SHA256 b93ee5199c1ecc943abad4de69079280a2292ab437e155384eb0e06a76c44544
 AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1 28000a260fe9b7c216112ba877f55835a09aabd7 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e
 AUX mldonkey.initd 3516 RMD160 87962db06a64a64f052f1c9d00f93990136f70f7 SHA1 70368d67b319aff533f649af11b3f62b7a389dd6 SHA256 1df5a055e83af8003a01b7de5deacf8ab248483e8663799deca2dd4750de6e9e
-DIST mldonkey-2.9.6.tar.bz2 2718844 RMD160 f88ca0224e484be67d836038683bcf5c2bb5bac6 SHA1 3c52b11e906aa08d1c4132e3bb23756d447f20f9 SHA256 27cc8ae95aa7a2934b6cc9b077d10ca6a776496c051d8f35d60f1e73d38fd505
 DIST mldonkey-3.0.0.tar.bz2 2723830 RMD160 c53efda6b513bbfd2dcd71804600b0906252e463 SHA1 8d3f1808578bb145655050c0224f512afe0266b5 SHA256 27235f1e3aeae7ddb392b2d9b0963d464f21539bcb15c85c576876b8ac63fb7f
-EBUILD mldonkey-2.9.6.ebuild 5433 RMD160 007831d805a0a525c838cdc4471e61bc3a041ab5 SHA1 e8a6c4a9f342b8b81e42a68c2ded0ee12c0424b1 SHA256 4064482530c338a0c832144646c23dec46a745092ee2221069b54b006f7c757e
 EBUILD mldonkey-3.0.0.ebuild 4675 RMD160 ccef98522e658eddfa5eb4e60e1252d5c10d76ac SHA1 62a3e581e12df95bac0ccb2e5237528c9bbb367f SHA256 67e13240f74f496e4fc46f5c3d8065a2bc91fc3998d1390b81a26f70495a4c0c
-MISC ChangeLog 33835 RMD160 8d8be5a11377ab38035b7dde557e39f88498e338 SHA1 fb51222532ba8f6575204cca4cdb4e53a17a1efc SHA256 648bd2bfe477a9137c195b5dab696f3464fe022659fc9a4fb745553d99c1c812
+MISC ChangeLog 33927 RMD160 8f3a2f221e89ff7b88e03b5ff8d1dbb0b4110ae1 SHA1 58bb46a6ce8e45a8121638573f627d8559bfc44e SHA256 13588e9347cfc577fdc5b4578ea651749b484e91ad58a82dd85afc837e5784cc
 MISC metadata.xml 503 RMD160 044c4aaffa74dbb41eda58eb511c84e7a83c9925 SHA1 bedbf550e3835d0c723ee3ea03db560fe6b45508 SHA256 666afce1ad16b273e77fe5f7c2dcba916b7876dc5c99337b832738ab60f1ce9e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkr4YL4ACgkQNQqtfCuFneNVYACfcwVbU2IjC9zmZWyPIJTIJFQQ
+hFoAn3C0nRLagDdZaHypMGI1Tq0S+qgE
+=T9nI
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/mldonkey-2.9.6.ebuild b/net-p2p/mldonkey/mldonkey-2.9.6.ebuild
deleted file mode 100644
index dffbd63e018b..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.9.6.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.6.ebuild,v 1.5 2008/11/30 17:08:22 maekke Exp $
-
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic eutils autotools toolchain-funcs
-
-EAPI="1"
-
-IUSE="doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
-
-DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
-HOMEPAGE="http://mldonkey.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~sparc x86 ~x86-fbsd"
-
-RDEPEND="dev-lang/perl
-	guionly? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gtk? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gd? ( >=media-libs/gd-2.0.28 )
-	magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.08.3
-	sys-apps/sed"
-
-MLUSER="p2p"
-
-pkg_setup() {
-	if use gtk; then
-		echo ""
-		einfo "If the compile with gui fails, and you have updated Ocaml"
-		einfo "recently, you may have forgotten that you need to run"
-		einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
-		einfo "to learn which ebuilds you need to recompile"
-		einfo "each time you update Ocaml to a different version"
-		einfo "see the Ocaml ebuild for details"
-		echo ""
-	fi
-
-	if use gtk && ! built_with_use dev-ml/lablgtk svg; then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-
-	if use gd && ! built_with_use media-libs/gd truetype; then
-		eerror "media-libs/gd must be built with 'truetype' to compile"
-		eerror "MLDonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	cd "${S}"/config
-	eautoconf
-	cd "${S}"
-	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
-}
-
-src_compile() {
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-
-	# onlygui	Disable all nets support, build only chosen GUI
-
-	if use gtk || use guionly; then
-		myconf="--enable-gui=newgui2"
-	else
-		myconf="--disable-gui"
-	fi
-
-	if use guionly; then
-		myconf="${myconf} --disable-multinet --disable-donkey"
-	fi
-
-	cd "${S}"
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-checks \
-		--disable-batch \
-		$(use_enable fasttrack) \
-		$(use_enable gnutella) \
-		$(use_enable gnutella gnutella2) \
-		$(use_enable gd) \
-		$(use_enable magic) \
-		--enable-ocamlver=3.10 \
-		${myconf} || die "econf failed"
-
-	export OCAMLRUNPARAM="l=256M"
-	emake || die "emake failed"
-
-	if ! use guionly; then
-		emake utils || die "emake utils failed"
-	fi;
-}
-
-src_install() {
-	local myext=""
-	use ocamlopt || myext=".byte"
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-	if ! use guionly; then
-		for i in mlnet mld_hash get_range copysources make_torrent subconv; do
-			newbin $i$myext $i || die "failed to install $i"
-		done
-
-		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
-		fperms 600 /etc/conf.d/mldonkey
-		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
-	fi
-
-	if use gtk; then
-		for i in mlgui mlguistarter; do
-			newbin $i$myext $i || die "failed to install $i"
-		done
-		make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
-		newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${PN}.png
-	fi
-
-	if use doc ; then
-		cd "${S}"/distrib
-		dodoc ChangeLog *.txt
-		dohtml *.html
-
-		insinto /usr/share/doc/${PF}/scripts
-		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
-
-		cd "${S}"/docs
-		dodoc *.txt *.tex *.pdf
-		dohtml *.html
-
-		cd "${S}"/docs/developers
-		dodoc *.txt *.tex
-
-		cd "${S}"/docs/images
-		insinto /usr/share/doc/${PF}/html/images
-		doins *
-	fi
-}
-
-pkg_preinst() {
-	if ! use guionly; then
-		enewuser ${MLUSER} -1 -1 /home/p2p users
-	fi
-}
-
-pkg_postinst() {
-	if ! use guionly; then
-		echo
-		einfo "If you want to start MLDonkey as a system service, use"
-		einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-		einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-		einfo "/etc/conf.d/mldonkey also."
-		echo
-		einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
-		einfo "will be problematic."
-		einfo "User settings (admin) are transferred to users.ini from "
-		einfo "downloads.ini"
-		einfo "Old ini files are automatically converted to the new format"
-		echo
-	else
-		echo
-		einfo "Simply run mlgui to start the chosen MLDonkey gui."
-		einfo "It puts its config files into ~/.mldonkey"
-	fi
-}