new init script, stable x86 version bump, move to net-p2p herd (#55954)

9 files changed, 130 insertions, 7 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index 46cd7fafba13..d432c9e2bb36 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/bittorrent 
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.30 2004/07/03 12:04:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.31 2004/07/17 15:04:15 squinky86 Exp $
+
+*bittorrent-3.4.2-r1 (17 Jul 2004)
+
+  17 Jul 2004; Jon Hood <squinky86@gentoo.org> metadata.xml,
+  +files/bttrack.conf, +files/bttrack.rc, +files/favicon.ico,
+  +bittorrent-3.4.2-r1.ebuild, bittorrent-3.4.2.ebuild:
+  new init script, stable x86 version bump, move to net-p2p herd (#55954)
 
   03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> bittorrent-3.3.0.ebuild,
   bittorrent-3.4.1.ebuild, bittorrent-3.4.1a.ebuild, bittorrent-3.4.2.ebuild:
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index 428ab6a5ac27..046a016ca511 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -1,10 +1,15 @@
 MD5 1bf39d5d4008accad1bc32b07ae4db66 bittorrent-3.4.1a.ebuild 1718
 MD5 1ac89c05ddc5c4945b131b779b2d7a0b bittorrent-3.4.1.ebuild 1717
 MD5 0e53b4ca07dbf10552f2f4769eb642e5 bittorrent-3.3.0.ebuild 1704
-MD5 872f50d92fcdf165a560fcf48177f071 ChangeLog 4577
-MD5 4acfa073f4c03f1ba68c1a64ac39c312 bittorrent-3.4.2.ebuild 1684
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 5277bca0f23594cba7fc7957c69cfc80 bittorrent-3.4.2-r1.ebuild 1878
+MD5 5ad355dafde7b1fbf1343dd8e5121566 ChangeLog 4870
+MD5 b3ecc1d2ec954d27c36e0aea1dd3ef4a bittorrent-3.4.2.ebuild 1686
+MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+MD5 7779a7eaf51eb9f84da8a588050f53fa files/favicon.ico 1406
 MD5 041cb026a6f1c38c3ceef68e3a3001de files/digest-bittorrent-3.4.1a 66
+MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2-r1 65
+MD5 8254615ee527cd608123c83de2616ede files/bttrack.rc 631
+MD5 a94d4e97cceef0143a1a5c8784b6f70c files/bttrack.conf 728
 MD5 5552dfd01545331cd268d47a8a18165e files/digest-bittorrent-3.3.0 66
 MD5 55203bedc153a58daef48bc35451abd6 files/digest-bittorrent-3.4.1 65
 MD5 13f6b888eed806a8d4ce9cea22a7bacc files/digest-bittorrent-3.4.2 65
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..e1ba50e19d1d
--- /dev/null
+++ b/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/07/17 15:04:15 squinky86 Exp $
+
+inherit distutils
+
+MY_P="${P/bittorrent/BitTorrent}"
+MY_P="${MY_P/\.0/}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="tool for distributing files via a distributed network of nodes"
+HOMEPAGE="http://bitconjurer.org/BitTorrent"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64"
+IUSE="X"
+
+RDEPEND="X? ( >=dev-python/wxpython-2.2 )
+	>=dev-lang/python-2.1
+	!virtual/bittorrent"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=sys-apps/sed-4.0.5"
+PROVIDE="virtual/bittorrent"
+
+DOCS="credits.txt"
+
+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 "unofficial feature additions. If you would like statistics, please"
+	einfo "install net-p2p/bittorrent-stats."
+}
diff --git a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2.ebuild
index cecc556d8da4..61845b9bab3c 100644
--- a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild
+++ b/net-p2p/bittorrent/bittorrent-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.4 2004/07/03 12:04:30 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2.ebuild,v 1.5 2004/07/17 15:04:15 squinky86 Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha arm ~amd64"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
diff --git a/net-p2p/bittorrent/files/bttrack.conf b/net-p2p/bittorrent/files/bttrack.conf
new file mode 100644
index 000000000000..abf6ac5ba84e
--- /dev/null
+++ b/net-p2p/bittorrent/files/bttrack.conf
@@ -0,0 +1,18 @@
+# /etc/conf.d/bttrack
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.conf,v 1.1 2004/07/17 15:04:15 squinky86 Exp $
+
+# Change this to this to the port you would like to connect to for the tracker.
+# It is accessible at http://localhost:PORT/ from any web browser.
+PORT=8082
+
+# where to store recent downloader info
+DFILE=/usr/share/bittorrent/tracker.dfile
+
+# path to favicon.ico which many popular web browsers can use
+FAVICON=/usr/share/bittorrent/favicon.ico
+
+# Connection logs are sent to stdout by default, so they should be sent to a
+# file when using this script.
+LOGFILE=/var/log/bttrack.log
diff --git a/net-p2p/bittorrent/files/bttrack.rc b/net-p2p/bittorrent/files/bttrack.rc
new file mode 100644
index 000000000000..37617f7af58b
--- /dev/null
+++ b/net-p2p/bittorrent/files/bttrack.rc
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/files/bttrack.rc,v 1.1 2004/07/17 15:04:15 squinky86 Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting bttrack"
+	start-stop-daemon --start --quiet --background --make-pidfile \
+	--pidfile /var/run/bttrack.pid \
+	--exec /usr/bin/bttrack.py -- --port ${PORT} \
+	--dfile ${DFILE} --favicon ${FAVICON} --logfile ${LOGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bttrack"
+	start-stop-daemon --stop --quiet --pidfile /var/run/bttrack.pid
+	eend $?
+}
diff --git a/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1 b/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1
new file mode 100644
index 000000000000..3ea4d81b56f2
--- /dev/null
+++ b/net-p2p/bittorrent/files/digest-bittorrent-3.4.2-r1
@@ -0,0 +1 @@
+MD5 6ad4e128ddc82f8ebef6fbef59872f0d BitTorrent-3.4.2.zip 244989
diff --git a/net-p2p/bittorrent/files/favicon.ico b/net-p2p/bittorrent/files/favicon.ico
new file mode 100644
index 000000000000..0e6136254aa5
--- /dev/null
+++ b/net-p2p/bittorrent/files/favicon.ico
diff --git a/net-p2p/bittorrent/metadata.xml b/net-p2p/bittorrent/metadata.xml
index de483c53568f..aa0f3664825f 100644
--- a/net-p2p/bittorrent/metadata.xml
+++ b/net-p2p/bittorrent/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+<herd>net-p2p</herd>
 </pkgmetadata>