Mark amd64, fix mailcap copying, remove old versions.

Package-Manager: portage-2.1_rc4-r5

5 files changed, 16 insertions, 186 deletions

diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 21cf7ebd196a..517bf655580d 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,56 +1,40 @@
-AUX bittornado-wxpython-pre2.5-fix.patch 297 RMD160 d3087426e7e8133742e98ecdb14a03bcdeff2fe5 SHA1 4ef6a769627f730a77a92cc50b3a93f4c31785f2 SHA256 552a994fe350110e33bc45a9258bfc4c3fbed8a8ed8154445f08bdc3aa15790e size 297
+AUX bittornado-wxpython-pre2.5-fix.patch 297 RMD160 d3087426e7e8133742e98ecdb14a03bcdeff2fe5 SHA1 4ef6a769627f730a77a92cc50b3a93f4c31785f2 SHA256 552a994fe350110e33bc45a9258bfc4c3fbed8a8ed8154445f08bdc3aa15790e
 MD5 c7977a11c1bf8a5d7afb8772202af87d files/bittornado-wxpython-pre2.5-fix.patch 297
 RMD160 d3087426e7e8133742e98ecdb14a03bcdeff2fe5 files/bittornado-wxpython-pre2.5-fix.patch 297
 SHA256 552a994fe350110e33bc45a9258bfc4c3fbed8a8ed8154445f08bdc3aa15790e files/bittornado-wxpython-pre2.5-fix.patch 297
-AUX bttrack.conf 728 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb SHA1 fbc4cf7a9b227cf267b6f7e166696010e3cd29ee SHA256 2f40a8334dde5a951c79018476e9ab1380cb382f403068c906427f2b4b435d73 size 728
+AUX bttrack.conf 728 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb SHA1 fbc4cf7a9b227cf267b6f7e166696010e3cd29ee SHA256 2f40a8334dde5a951c79018476e9ab1380cb382f403068c906427f2b4b435d73
 MD5 5e0dbf4ae726b145dcec6fb57526e4c5 files/bttrack.conf 728
 RMD160 c5c7438e64e335d40a33d685e9b0ee0824577ceb files/bttrack.conf 728
 SHA256 2f40a8334dde5a951c79018476e9ab1380cb382f403068c906427f2b4b435d73 files/bttrack.conf 728
-AUX bttrack.rc 631 RMD160 72d3594c01896167e70f568710cf076d2c469979 SHA1 5a4c2b0e95bb6a2c0b73dedf68456ce3bd21d6c6 SHA256 a28cb3b55c7acc0a4f9c0ce0802eb5d579eb5c0f8ddc028fbad380bc5f89f6ae size 631
+AUX bttrack.rc 631 RMD160 72d3594c01896167e70f568710cf076d2c469979 SHA1 5a4c2b0e95bb6a2c0b73dedf68456ce3bd21d6c6 SHA256 a28cb3b55c7acc0a4f9c0ce0802eb5d579eb5c0f8ddc028fbad380bc5f89f6ae
 MD5 a706406b4513eb97a4715be7a4b3cfd7 files/bttrack.rc 631
 RMD160 72d3594c01896167e70f568710cf076d2c469979 files/bttrack.rc 631
 SHA256 a28cb3b55c7acc0a4f9c0ce0802eb5d579eb5c0f8ddc028fbad380bc5f89f6ae files/bttrack.rc 631
-AUX favicon.ico 1406 RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 SHA1 3fade857763dd8b603c32080c2a29542973c0dd7 SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22 size 1406
+AUX favicon.ico 1406 RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 SHA1 3fade857763dd8b603c32080c2a29542973c0dd7 SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22
 MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
 RMD160 735b7ee87f222400b294866e323b281b4e9cdd70 files/favicon.ico 1406
 SHA256 ae5728b520add5961a8b7f8300058bf9571b9b14dba96dfaf64520d089e56c22 files/favicon.ico 1406
-DIST BitTornado-0.3.12.tar.gz 189208 RMD160 1296ff9bc7a5baea5ad25fb0cd4b1e170bb4c1d4 SHA256 deed411f1418c2a9f1f1292b4396217362020e2f49789c117eef03eeb3663246 size 189208
-DIST BitTornado-0.3.13.tar.gz 197366 RMD160 5c0b4884d0648bb65ad76b38214ef406d97a1e07 SHA256 44052d03264fce284bde4ebca90248b846bfe461c43fecb087286fa65390449d size 197366
-DIST BitTornado-0.3.14.tar.gz 188058 RMD160 b4e9610bcb1630a523bfc1512e89a81feade638c SHA256 08d57e1cca265e811f7f1dbcf41321b0f604a1659d946aab20a14918a9268856 size 188058
-DIST BitTornado-0.3.15.tar.gz 189992 RMD160 1967e1ec545f1c1dfa11d7525acb0abbdc2cedd2 SHA256 829b7876a0951fa6ba7af0a6d42e0c6d9ec8b42239ad06885e5b270c5efab060 size 189992
-EBUILD bittornado-0.3.12.ebuild 2064 RMD160 4b7252dd7760dc46d8031c7462d86b2292bccea5 SHA1 9940b36fecbd6978272818999d4309dbc323dcdb SHA256 5c3374b101e749b7962f7f95161db944a77501ce26da784e5961b55912f066e1 size 2064
+DIST BitTornado-0.3.12.tar.gz 189208 RMD160 1296ff9bc7a5baea5ad25fb0cd4b1e170bb4c1d4 SHA256 deed411f1418c2a9f1f1292b4396217362020e2f49789c117eef03eeb3663246
+DIST BitTornado-0.3.15.tar.gz 189992 RMD160 1967e1ec545f1c1dfa11d7525acb0abbdc2cedd2 SHA1 a9a40ada7227aab0b495afafa9c9a76e47740942 SHA256 829b7876a0951fa6ba7af0a6d42e0c6d9ec8b42239ad06885e5b270c5efab060
+EBUILD bittornado-0.3.12.ebuild 2064 RMD160 4b7252dd7760dc46d8031c7462d86b2292bccea5 SHA1 9940b36fecbd6978272818999d4309dbc323dcdb SHA256 5c3374b101e749b7962f7f95161db944a77501ce26da784e5961b55912f066e1
 MD5 ce904358a52fe29a30ac03b0d22300c2 bittornado-0.3.12.ebuild 2064
 RMD160 4b7252dd7760dc46d8031c7462d86b2292bccea5 bittornado-0.3.12.ebuild 2064
 SHA256 5c3374b101e749b7962f7f95161db944a77501ce26da784e5961b55912f066e1 bittornado-0.3.12.ebuild 2064
-EBUILD bittornado-0.3.13.ebuild 2081 RMD160 f7e5e3c4874fa7444fac59587ca95a1e7389d77f SHA1 b8a1c333566d592334a3131b4608ec6714efaf93 SHA256 4bbe948c3cefe187664bb80bbdae492e63db1fed184f87748d0f74656033ebf2 size 2081
-MD5 5310490008ac12d6d4f855546b6f706b bittornado-0.3.13.ebuild 2081
-RMD160 f7e5e3c4874fa7444fac59587ca95a1e7389d77f bittornado-0.3.13.ebuild 2081
-SHA256 4bbe948c3cefe187664bb80bbdae492e63db1fed184f87748d0f74656033ebf2 bittornado-0.3.13.ebuild 2081
-EBUILD bittornado-0.3.14.ebuild 2084 RMD160 035573f1fa7d2d108fd5e76705ae4788dc1257f9 SHA1 441ba993c19c935f09d63f375aea4a090e3ba6ec SHA256 9d2ff62a2c8c253699c1f578b057bcbb66a2218a70188704c291cb1e3df17c73 size 2084
-MD5 d9ceb96d02086289e525ab5fda8fa4e7 bittornado-0.3.14.ebuild 2084
-RMD160 035573f1fa7d2d108fd5e76705ae4788dc1257f9 bittornado-0.3.14.ebuild 2084
-SHA256 9d2ff62a2c8c253699c1f578b057bcbb66a2218a70188704c291cb1e3df17c73 bittornado-0.3.14.ebuild 2084
-EBUILD bittornado-0.3.15.ebuild 2096 RMD160 39e721162244c309f4bc00d28a6e9c66c9139d68 SHA1 4b220aede3b1de47e6cacc48fcd603284c999cfa SHA256 7027b1dcd728b7649f30bfed65d39870b36f2d94af6c03eb99966145ba2a7a52 size 2096
-MD5 b1df759e1d156ee795704a9d6cbd4341 bittornado-0.3.15.ebuild 2096
-RMD160 39e721162244c309f4bc00d28a6e9c66c9139d68 bittornado-0.3.15.ebuild 2096
-SHA256 7027b1dcd728b7649f30bfed65d39870b36f2d94af6c03eb99966145ba2a7a52 bittornado-0.3.15.ebuild 2096
-MISC ChangeLog 6582 RMD160 088a6e9c3ae00c0f7a70bd51c1bcc084c7096efd SHA1 c2067a0f409455a56702c97c2e73822d52fe13eb SHA256 c66b6ad34371b5042a4788a3c41f75bb8a043124c24c17d7243a9ba4e7d123c0 size 6582
-MD5 9b218066774f308af905ef40af2f4e03 ChangeLog 6582
-RMD160 088a6e9c3ae00c0f7a70bd51c1bcc084c7096efd ChangeLog 6582
-SHA256 c66b6ad34371b5042a4788a3c41f75bb8a043124c24c17d7243a9ba4e7d123c0 ChangeLog 6582
-MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f size 160
+EBUILD bittornado-0.3.15.ebuild 2096 RMD160 6559af4b7b71c11e80c663885913253f09f1db3d SHA1 24ca5b11a3487ecbee4f84d74eea617cfc097aef SHA256 7cc4f7fe1cb8780340a7b6b1974c10a98fbb4c348c11165ab25962350ccc7faf
+MD5 cef2518d1423531af701c316e5b4e121 bittornado-0.3.15.ebuild 2096
+RMD160 6559af4b7b71c11e80c663885913253f09f1db3d bittornado-0.3.15.ebuild 2096
+SHA256 7cc4f7fe1cb8780340a7b6b1974c10a98fbb4c348c11165ab25962350ccc7faf bittornado-0.3.15.ebuild 2096
+MISC ChangeLog 6770 RMD160 84ec404892741f6ffd532206b36951ccab00dab2 SHA1 d4d1fe5db46acd00b1fcf5fa9f054eaf71cdc9ed SHA256 1b057cf5f167a70f75cc55388c2d9f08c7c1e6c1a0206e3db1c8a053d2c93aad
+MD5 61bb91a2330bd9f697c9aa0745be43e6 ChangeLog 6770
+RMD160 84ec404892741f6ffd532206b36951ccab00dab2 ChangeLog 6770
+SHA256 1b057cf5f167a70f75cc55388c2d9f08c7c1e6c1a0206e3db1c8a053d2c93aad ChangeLog 6770
+MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
 MD5 a9d0fc5bb015dea4d0110d38aa3be5e2 files/digest-bittornado-0.3.12 253
 RMD160 f8c3afa5b6a592c10c961c8e9ec0a89b62a04cb8 files/digest-bittornado-0.3.12 253
 SHA256 b9b1fefe83e453a4ccd0b29bfded035d5745dfdc3276b66f422317f5934fcffa files/digest-bittornado-0.3.12 253
-MD5 3fb69290d52e4213ff6c18ad6e78fa07 files/digest-bittornado-0.3.13 253
-RMD160 8387bb2dbbe77fa891e35cee93b52603d178004c files/digest-bittornado-0.3.13 253
-SHA256 57c07b5751a46f0ac5e8068d693e33127c5cb495142019ebd62f0acfb7a76e03 files/digest-bittornado-0.3.13 253
-MD5 4abb547ecb170007a84d0bad4183ae5b files/digest-bittornado-0.3.14 253
-RMD160 004e922bf155042a3420087b42d66b02970735ca files/digest-bittornado-0.3.14 253
-SHA256 52698db5ffcb012050c8d4ab0580662e2da1f2b1bcf88fbed1e668c614dcb6ee files/digest-bittornado-0.3.14 253
 MD5 0d2492ef0af5bd12ba4c5c55b3cc220a files/digest-bittornado-0.3.15 253
 RMD160 5a7612cd49d4902e014870ee7c6b5dce37ef7599 files/digest-bittornado-0.3.15 253
 SHA256 945e05057654448ebb8e939e9e43ba0e6479f920a080fa67b94359cd38f31a77 files/digest-bittornado-0.3.15 253
diff --git a/net-p2p/bittornado/bittornado-0.3.13.ebuild b/net-p2p/bittornado/bittornado-0.3.13.ebuild
deleted file mode 100644
index 87bdfd9358ee..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.13.ebuild,v 1.1 2005/10/03 00:13:07 mkay Exp $
-
-inherit distutils eutils
-
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://bittornado.com/download/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? ( >=dev-python/wxpython-2.4 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittornado"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-	# fixes a bug with < wxpython-2.5 which is not yet available in portage
-	epatch ${FILESDIR}/${PN}-wxpython-pre2.5-fix.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir etc
-	cp -pPR /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use gtk; then
-		dodir ${PIXMAPLOC}
-		insinto ${PIXMAPLOC}
-		doins icons/*.ico icons/*.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
-	else
-		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
-		rm ${D}/usr/bin/*gui.py
-	fi
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
-}
-
diff --git a/net-p2p/bittornado/bittornado-0.3.14.ebuild b/net-p2p/bittornado/bittornado-0.3.14.ebuild
deleted file mode 100644
index ccbcbd4ecb2b..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.14.ebuild,v 1.1 2005/11/01 17:26:56 mholzer Exp $
-
-inherit distutils eutils
-
-MY_PN="BitTornado"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://bittornado.com/download/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? ( >=dev-python/wxpython-2.4 )
-	>=dev-lang/python-2.1
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-PROVIDE="virtual/bittorrent"
-
-S="${WORKDIR}/${MY_PN}-CVS"
-PIXMAPLOC="/usr/share/pixmaps/bittornado"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-	# fixes a bug with < wxpython-2.5 which is not yet available in portage
-	epatch ${FILESDIR}/${PN}-wxpython-pre2.5-fix.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	dodir etc
-	cp -pPR /etc/mailcap ${D}/etc/
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use gtk; then
-		dodir ${PIXMAPLOC}
-		insinto ${PIXMAPLOC}
-		doins icons/*.ico icons/*.gif
-		if [ -n "`grep 'application/x-bittorrent' ${D}/etc/mailcap`" ]; then
-			# replace bittorrent entry if it already exists
-			einfo "updating bittorrent mime info"
-			sed -i "s,application/x-bittorrent;.*,${MAILCAP_STRING}," ${D}/etc/mailcap
-		else
-			# add bittorrent entry if it doesn't exist
-			einfo "adding bittorrent mime info"
-			echo "${MAILCAP_STRING}" >> ${D}/etc/mailcap
-		fi
-	else
-		# get rid of any reference to the not-installed gui version
-		sed -i '/btdownloadgui/d' ${D}/etc/mailcap
-		rm ${D}/usr/bin/*gui.py
-	fi
-	insinto /usr/share/bittorrent
-	doins ${FILESDIR}/favicon.ico
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/bttrack.conf bttrack
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bttrack.rc bttrack
-}
-
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.3.13 b/net-p2p/bittornado/files/digest-bittornado-0.3.13
deleted file mode 100644
index c97e9575ab2b..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.3.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ad36b3437778ecb635d02a35f3bfca9 BitTornado-0.3.13.tar.gz 197366
-RMD160 5c0b4884d0648bb65ad76b38214ef406d97a1e07 BitTornado-0.3.13.tar.gz 197366
-SHA256 44052d03264fce284bde4ebca90248b846bfe461c43fecb087286fa65390449d BitTornado-0.3.13.tar.gz 197366
diff --git a/net-p2p/bittornado/files/digest-bittornado-0.3.14 b/net-p2p/bittornado/files/digest-bittornado-0.3.14
deleted file mode 100644
index 7ebbd5d5cc23..000000000000
--- a/net-p2p/bittornado/files/digest-bittornado-0.3.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ddccbbe466bb9cd90080a23be73248e BitTornado-0.3.14.tar.gz 188058
-RMD160 b4e9610bcb1630a523bfc1512e89a81feade638c BitTornado-0.3.14.tar.gz 188058
-SHA256 08d57e1cca265e811f7f1dbcf41321b0f604a1659d946aab20a14918a9268856 BitTornado-0.3.14.tar.gz 188058