Version bump, remove old

Package-Manager: portage-2.1.10.11/cvs/Linux ia64

4 files changed, 15 insertions, 183 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 248aa499986b..0f778ef27385 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.247 2011/08/07 15:11:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.248 2011/09/17 18:02:22 armin76 Exp $
+
+*mldonkey-3.1.0 (17 Sep 2011)
+
+  17 Sep 2011; Raúl Porcel <armin76@gentoo.org> -mldonkey-3.0.0.ebuild,
+  -mldonkey-3.0.6.ebuild, +mldonkey-3.1.0.ebuild:
+  Version bump, remove old
 
   07 Aug 2011; Jeroen Roovers <jer@gentoo.org> mldonkey-3.0.7.ebuild:
   Stable for HPPA (bug #376509).
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 176cce0e2696..08d6d8730bab 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -4,20 +4,18 @@ 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 3515 RMD160 212c5d9311cb21467ccbc105a399aff0186a064b SHA1 1d5403a3ce204c4030d1a9ab8592596543d6f8c8 SHA256 1d57558067a84122b45bfec6539bae5abdaf36cf5e9fda38ade80495b8b1349f
-DIST mldonkey-3.0.0.tar.bz2 2723830 RMD160 c53efda6b513bbfd2dcd71804600b0906252e463 SHA1 8d3f1808578bb145655050c0224f512afe0266b5 SHA256 27235f1e3aeae7ddb392b2d9b0963d464f21539bcb15c85c576876b8ac63fb7f
 DIST mldonkey-3.0.5.tar.bz2 2780580 RMD160 242e5ff14e592f06f89a4066bb821ad3229ec6b3 SHA1 1cd1b1ad9f7b49d7171ab300a38c9539a53901a5 SHA256 de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
-DIST mldonkey-3.0.6.tar.bz2 2797869 RMD160 03946aea01fba9c50bf18bbe4ebabb151e7b15f7 SHA1 bcd9ff725ff4dcd42410bd88797d7ce73e8a3c8a SHA256 6de10af253cd5d742959152a908a0199e4a1e9ee762dc5f1a3adc9c17dd65e04
 DIST mldonkey-3.0.7.tar.bz2 2799555 RMD160 37adfaf8012772c2df8f588169501f0515ae1d75 SHA1 5d703f4a35650a8e8512acf44730653faebf843c SHA256 5630c399d492a4d48e7a90461956f833f3ba02c334a1d3d748d547994e77acd4
-EBUILD mldonkey-3.0.0.ebuild 4675 RMD160 ccef98522e658eddfa5eb4e60e1252d5c10d76ac SHA1 62a3e581e12df95bac0ccb2e5237528c9bbb367f SHA256 67e13240f74f496e4fc46f5c3d8065a2bc91fc3998d1390b81a26f70495a4c0c
+DIST mldonkey-3.1.0.tar.bz2 2820081 RMD160 69c2bf1937bb2a782166a3b08d87e4537ec03eea SHA1 9479c61ab067b01c76cbc11e41477f00a17f5d41 SHA256 fd0f132a1bea96c9dfa2f7837278c8ccbbb703efc2c7ac48386b5103a1450308
 EBUILD mldonkey-3.0.5.ebuild 4339 RMD160 2a5f717a192d3cd024db653ec0fc816928d37b30 SHA1 b4f6ea7924d4819804e40802a8784a22d33cb5c0 SHA256 82f5ef564b782884d79b682f36b6cc6537e7e4194b2af312bfd8bf5cfcfb738d
-EBUILD mldonkey-3.0.6.ebuild 4425 RMD160 103a797d6ded80865a45d19e36f8cb5e386f96ec SHA1 d654d0c01eb6a747b19b15c807dcc9bddb79bf3e SHA256 6d736bdda64c189439f06d1f45b8b5e06faea8b51bd380c046b389b54aab3787
 EBUILD mldonkey-3.0.7.ebuild 4405 RMD160 25cfe56610f2d2c98f68ff88f4c4e3e703f2e28a SHA1 7d3439d755787e84f841e3c2679a10dd1eb54ad1 SHA256 5cbe7abd5ae4fed1b0f80c7da8e78adb0c70385235ad575f2f83b9fcea495ae7
-MISC ChangeLog 35735 RMD160 8b199cd181eb5d6fd222f1410a51ca0a186a8957 SHA1 9dac63764df962c32fff9a1f1708310a7692ce22 SHA256 b3f47efe08d8a652c1c59bacfae0ef1682f87d329028a7716c2ddf29b07ae1b7
+EBUILD mldonkey-3.1.0.ebuild 4412 RMD160 66bbfe1fb110d5f7c1dd82c8fb7bbcc242f4463d SHA1 a428cd0e086ddbadf5b5f022f1b8904239641de7 SHA256 a2743154eb5aea1dba6cb98dcd66e64f776c1371139ffa5fc823cee1cdd55528
+MISC ChangeLog 35921 RMD160 feeff00ed3c9e782b1f326545ef84905dc9c0407 SHA1 4b77ee8f42a1b9c4363733a4b92c271781dd1f19 SHA256 8581a2d73edddcc15c5c4828980761e88812a2bf8fec56957056fd6d13cb0117
 MISC metadata.xml 564 RMD160 3824893627f0886df31af808d0e3787aef125ebc SHA1 c9d05ddf0fe5e5b32e24ab6d6178bd19137fa3cc SHA256 06a76f0d96cc3e02c4b139a71b27860ce5b7dfff39e4aadcb2fb1d633028d2c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4+qy4ACgkQVWmRsqeSphOKYgCff4NRj/U3KIBhogWOkpZitVgS
-5SsAn0lLPrG7/OPJqhSd+lffRaVuJxgf
-=QMk9
+iEYEARECAAYFAk504LQACgkQuQc30/atMkAsiACfbwIyURGKV7/wjgoVlQ9yuvTI
+T0IAoKJNrzkik9jV0NB2xz6Tur5sFjH9
+=XfZV
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/mldonkey-3.0.0.ebuild b/net-p2p/mldonkey/mldonkey-3.0.0.ebuild
deleted file mode 100644
index 4d6d0bb22ed2..000000000000
--- a/net-p2p/mldonkey/mldonkey-3.0.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.0.0.ebuild,v 1.7 2009/03/18 22:26:32 ranger Exp $
-
-EAPI="2"
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic eutils autotools toolchain-funcs
-
-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[svg] )
-	gd? ( >=media-libs/gd-2.0.28[truetype] )
-	magic? ( sys-apps/file )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]
-	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
-
-	# 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_prepare() {
-	cd "${S}"/config
-	eautoconf
-	cd "${S}"
-	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
-}
-
-src_configure() {
-	# 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"
-}
-
-src_compile() {
-	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
-}
diff --git a/net-p2p/mldonkey/mldonkey-3.0.6.ebuild b/net-p2p/mldonkey/mldonkey-3.1.0.ebuild
index 47e51e991409..96c8622fb4da 100644
--- a/net-p2p/mldonkey/mldonkey-3.0.6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.0.6.ebuild,v 1.5 2011/05/11 19:54:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.0.ebuild,v 1.1 2011/09/17 18:02:22 armin76 Exp $
 
 EAPI="2"
 WANT_AUTOCONF=2.5
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="dev-lang/perl
 	guionly? ( >=gnome-base/librsvg-2.4.0
@@ -125,7 +125,6 @@ src_install() {
 	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