14 files changed, 20 insertions, 323 deletions
diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 03a788b76c4f..854fea98b0fe 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.54 2005/08/24 13:21:40 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.55 2005/08/24 14:55:41 sekretarz Exp $
+
+  24 Aug 2005; <sekretarz@gentoo.org> bittorrent-3.4.2-r2.ebuild,
+  -bittorrent-4.0.1.ebuild, bittorrent-4.0.2.ebuild,
+  bittorrent-4.0.4.ebuild, -bittorrent-4.1.0.ebuild,
+  -bittorrent-4.1.1.ebuild, -bittorrent-4.1.2.ebuild,
+  bittorrent-4.1.3.ebuild, bittorrent-4.1.4.ebuild:
+  Ebuild clean up. Using -pPR instead -a option in cp, bug #103487
 
 *bittorrent-4.1.4 (24 Aug 2005)
 
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
index 010412238c47..afd4f5a6e053 100644
--- a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild,v 1.8 2005/06/02 17:19:21 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild,v 1.9 2005/08/24 14:55:41 sekretarz Exp $
 
 inherit distutils
 
@@ -35,7 +35,7 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
+	cp -pPR /etc/mailcap ${D}/etc/
 
 	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
 
diff --git a/net-p2p/bittorrent/bittorrent-4.0.1.ebuild b/net-p2p/bittorrent/bittorrent-4.0.1.ebuild
deleted file mode 100644
index 4b230e68bff1..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.0.1.ebuild
+++ /dev/null
@@ -1,75 +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/bittorrent/bittorrent-4.0.1.ebuild,v 1.4 2005/06/02 17:19:21 sekretarz Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~sparc ~alpha"
-IUSE="X"
-
-RDEPEND="X? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		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
-	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
-}
-
-pkg_postinst() {
-	einfo "BitTorrent has changed to the BitTorrent Open Source License"
-	einfo ">> http://www.bittorrent.com/license/"
-	distutils_pkg_postinst
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
index c1f343faebc9..0eed370e2703 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.2.ebuild,v 1.2 2005/06/02 17:19:21 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.2.ebuild,v 1.3 2005/08/24 14:55:41 sekretarz Exp $
 
 inherit distutils
 
@@ -39,7 +39,7 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
+	cp -pPR /etc/mailcap ${D}/etc/
 
 	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
 
diff --git a/net-p2p/bittorrent/bittorrent-4.0.4.ebuild b/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
index abb9ae132f88..b4684cf78b6c 100644
--- a/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.4.ebuild,v 1.1 2005/08/24 12:59:41 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.0.4.ebuild,v 1.2 2005/08/24 14:55:41 sekretarz Exp $
 
 inherit distutils
 
@@ -39,7 +39,7 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
+	cp -pPR /etc/mailcap ${D}/etc/
 
 	# bug #86707
 	dodoc LICENSE.txt
diff --git a/net-p2p/bittorrent/bittorrent-4.1.0.ebuild b/net-p2p/bittorrent/bittorrent-4.1.0.ebuild
deleted file mode 100644
index b3c5b0429f1a..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.1.0.ebuild
+++ /dev/null
@@ -1,82 +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/bittorrent/bittorrent-4.1.0.ebuild,v 1.2 2005/06/02 17:19:21 sekretarz Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
-IUSE="X"
-
-RDEPEND="X? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-fix-all.patch
-}
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		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
-	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
-}
-
-pkg_postinst() {
-	einfo "BitTorrent has changed to the BitTorrent Open Source License"
-	einfo ">> http://www.bittorrent.com/license/"
-	distutils_pkg_postinst
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.1.1.ebuild b/net-p2p/bittorrent/bittorrent-4.1.1.ebuild
deleted file mode 100644
index 1141993c31da..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.1.1.ebuild
+++ /dev/null
@@ -1,75 +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/bittorrent/bittorrent-4.1.1.ebuild,v 1.3 2005/06/02 17:19:21 sekretarz Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
-IUSE="X"
-
-RDEPEND="X? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		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
-	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
-}
-
-pkg_postinst() {
-	einfo "BitTorrent has changed to the BitTorrent Open Source License"
-	einfo ">> http://www.bittorrent.com/license/"
-	distutils_pkg_postinst
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.1.2.ebuild b/net-p2p/bittorrent/bittorrent-4.1.2.ebuild
deleted file mode 100644
index 0d70aebee714..000000000000
--- a/net-p2p/bittorrent/bittorrent-4.1.2.ebuild
+++ /dev/null
@@ -1,75 +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/bittorrent/bittorrent-4.1.2.ebuild,v 1.1 2005/06/14 21:18:10 sekretarz Exp $
-
-inherit distutils
-
-MY_P="${P/bittorrent/BitTorrent}"
-#MY_P="${MY_P/}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="tool for distributing files via a distributed network of nodes"
-HOMEPAGE="http://www.bittorrent.com/"
-SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
-
-LICENSE="BitTorrent"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~sparc ~alpha"
-IUSE="X"
-
-RDEPEND="X? (
-		>=x11-libs/gtk+-2.4
-		>=dev-python/pygtk-2.4
-	)
-	>=dev-lang/python-2.3
-	!virtual/bittorrent"
-DEPEND="${RDEPEND}
-	app-arch/gzip
-	>=sys-apps/sed-4.0.5
-	dev-python/dnspython"
-PROVIDE="virtual/bittorrent"
-
-DOCS="credits.txt"
-PYTHON_MODNAME="BitTorrent"
-
-src_install() {
-	distutils_src_install
-	if ! use X; then
-		rm ${D}/usr/bin/*gui.py
-	fi
-	dohtml redirdonate.html
-	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
-
-	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
-
-	if use X; then
-		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
-	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
-}
-
-pkg_postinst() {
-	einfo "BitTorrent has changed to the BitTorrent Open Source License"
-	einfo ">> http://www.bittorrent.com/license/"
-	distutils_pkg_postinst
-}
diff --git a/net-p2p/bittorrent/bittorrent-4.1.3.ebuild b/net-p2p/bittorrent/bittorrent-4.1.3.ebuild
index 0b78f699800f..37a934e883b6 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.3.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.3.ebuild,v 1.3 2005/08/16 04:51:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.3.ebuild,v 1.4 2005/08/24 14:55:41 sekretarz Exp $
 
 inherit distutils fdo-mime
 
@@ -39,7 +39,7 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
+	cp -pPR /etc/mailcap ${D}/etc/
 
 	MAILCAP_STRING="application/x-bittorrent; /usr/bin/btdownloadgui.py '%s'; test=test -n \"\$DISPLAY\""
 
diff --git a/net-p2p/bittorrent/bittorrent-4.1.4.ebuild b/net-p2p/bittorrent/bittorrent-4.1.4.ebuild
index 353d61dbeb8f..85df13242472 100644
--- a/net-p2p/bittorrent/bittorrent-4.1.4.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.4.ebuild,v 1.1 2005/08/24 13:21:40 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.1.4.ebuild,v 1.2 2005/08/24 14:55:41 sekretarz Exp $
 
 inherit distutils fdo-mime
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.bittorrent.com/dl/${MY_P}.tar.gz"
 
 LICENSE="BitTorrent"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
 RDEPEND="X? (
@@ -22,6 +22,7 @@ RDEPEND="X? (
 		>=dev-python/pygtk-2.4
 	)
 	>=dev-lang/python-2.3
+	>=dev-python/pycrypto-2.0
 	!virtual/bittorrent"
 DEPEND="${RDEPEND}
 	app-arch/gzip
@@ -39,7 +40,7 @@ src_install() {
 	fi
 	dohtml redirdonate.html
 	dodir etc
-	cp -a /etc/mailcap ${D}/etc/
+	cp -pPR /etc/mailcap ${D}/etc/
 
 	mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${P}/
 	rm -fr ${D}/usr/share/doc/${MY_P}
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.0.1 b/net-p2p/bittorrent/files/digest-bittorrent-4.0.1
deleted file mode 100644
index fa89579baaaa..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e890d856d43b3d0af14b28714bc5801a BitTorrent-4.0.1.tar.gz 154427
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.1.0 b/net-p2p/bittorrent/files/digest-bittorrent-4.1.0
deleted file mode 100644
index 82ffe4f60c2d..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49b0dac6f9b3aedcb75302c049c5bba6 BitTorrent-4.1.0.tar.gz 181269
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.1.1 b/net-p2p/bittorrent/files/digest-bittorrent-4.1.1
deleted file mode 100644
index 5d9ebcdb9ca0..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57381176882184ad8f539c473ad9bce5 BitTorrent-4.1.1.tar.gz 237743
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-4.1.2 b/net-p2p/bittorrent/files/digest-bittorrent-4.1.2
deleted file mode 100644
index e86c783978bb..000000000000
--- a/net-p2p/bittorrent/files/digest-bittorrent-4.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2a4d97bbfef1e105be5a128732ed3f8 BitTorrent-4.1.2.tar.gz 340624