Version bump. Use system libevent instead of bundled copy wrt #269082. Update init.d and conf.d files wrt #269655.

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

5 files changed, 302 insertions, 2 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index c573c13c4529..616f4db39c22 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.82 2009/05/14 18:40:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.83 2009/06/06 10:21:53 ssuominen Exp $
+
+*transmission-1.70 (06 Jun 2009)
+
+  06 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +transmission-1.70.ebuild, +files/transmission-daemon.confd.1,
+  +files/transmission-daemon.initd.1:
+  Version bump. Use system libevent instead of bundled copy wrt #269082.
+  Update init.d and conf.d files wrt #269655.
 
   14 May 2009; Joseph Jezak <josejx@gentoo.org> transmission-1.61.ebuild:
   Marked ppc stable for bug #269605.
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 1db3eb3de60d..aa9e680ad17f 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,7 +1,11 @@
 AUX transmission-daemon.confd 1288 RMD160 3b64339d9dad8455a6fb41c043af2e44692a5bbf SHA1 62bac2d0a690bf8e9f48f5030c3ac601446a73ca SHA256 76ce8bf0c029de4982e0a05d7172a719c7243fffcc85a0cb9a33e6771c069f18
+AUX transmission-daemon.confd.1 1519 RMD160 decaf106064e8c393fce35758d6dc63e8302cc5c SHA1 372fd7f999a1c2f14fb24a8fe40094013774f673 SHA256 45ed8e0b966267d671acaff7d130cd843ba7aeac6773db2564e2aa9b2cbc2149
 AUX transmission-daemon.initd 3473 RMD160 254cbea656ee1b0f41a3589cb8be5f592347b6f6 SHA1 72b0115d97ff0f6cbcfdc7b1b6e62ee9a144da31 SHA256 8e6fe0ebb4036e1f4d9dde1d981f76ebb5fea8f774b5eaf526ea50fa55ed16cb
+AUX transmission-daemon.initd.1 3953 RMD160 8463a9f1760d500e41890f592141e9cb9ac7d08e SHA1 5a2b77be6b6029ba8123ea349c671cfc1b601bb0 SHA256 f8bc632b5c95a7526025462fd6cf5eb7653d5cea4c57375c8a30f60beca21485
 DIST transmission-1.61.tar.bz2 4741686 RMD160 0648113edfc4f7869c1c75e6ed146e693f60b7a8 SHA1 68011e681f6c52370ea98b039874dc16655f68d5 SHA256 3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
+DIST transmission-1.70.tar.bz2 4596808 RMD160 2cea4a580175534dd81cc2f925ce3f832b3eba7a SHA1 19e82ae9cdab1f801d77ec704348239f02a1f7ae SHA256 79cc519a646da20b4e8062fd7fcff94b1e2fff9e798483cc41303bbba9f512e0
 EBUILD transmission-1.61-r1.ebuild 1821 RMD160 ab2e4d380aa1a43bf93b18700965ac1e63337802 SHA1 dc0b45bd0f1216c00d07b2a95a54a88dde813c1a SHA256 f9975e5afb9af597fe6dbc0919db76f433bed6fccb322c086cde233b1269c24b
 EBUILD transmission-1.61.ebuild 1699 RMD160 d3f0faafeaa84383c33a5c66c13880581f85f676 SHA1 a9cfd0a2a3d2c3c752cb76e768996d452d7e4a67 SHA256 0021fa0ff99f331d0841d525f7b701ed5275965a65e0d01ff0ac5fce7a239981
-MISC ChangeLog 12124 RMD160 2e0f0ac99ee6ae1d224d5185012c648d0e55dcda SHA1 fa717403519ca6faac8ab588d1feb99385030625 SHA256 c3d21e5aaa2f82a682bd392cfd6ced960f912bac1a1446df11f304d4a171388d
+EBUILD transmission-1.70.ebuild 1854 RMD160 1c58aac80e638acb7c6d12e601249fb8a9837a33 SHA1 6530485968c49936ced56590e36f82b77af43106 SHA256 0087bf160dde845e3c279c4bb05b605eec0b1918b170e515be378a75e744e2d7
+MISC ChangeLog 12438 RMD160 b23a51d397291da473b8a8ab6a75de582b457a1f SHA1 30ba345c940c38da9cc574a017e9d408abd8211a SHA256 49feb19f5c1ce2ec8afab486d1e5a70d9457958bda957b09742a3f6927b82ac6
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
diff --git a/net-p2p/transmission/files/transmission-daemon.confd.1 b/net-p2p/transmission/files/transmission-daemon.confd.1
new file mode 100644
index 000000000000..28674dd8f0f2
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.confd.1
@@ -0,0 +1,67 @@
+# This is the transmission-daemon config file
+# Default settings are commented, uncomment and adapt as needed
+
+# Allowed IP addresses.
+#allowed=127.0.0.1
+
+# Enable peer blocklists (yes or no)
+#blocklist=no
+
+# Directory to watch for new .torrent files (empty string to disable)
+#watch_dir=
+
+# Where to look for configuration files
+#config_dir=/var/transmission/config
+
+# RPC port
+#port=9091
+
+# Require authentication (yes or no)
+#auth=no
+
+# Set username for authentication (only used when auth=yes)
+#username=
+
+# Set password for authentication (only used when auth=yes)
+#password=
+
+# Where to save downloaded data
+#download_dir=/var/transmission/downloads
+
+# Port for incoming peers
+#peerport=51413
+
+# Enable portmapping via NAT-PMP or UPnP (yes or no)
+#portmap=no
+
+# Maximum overall number of peers
+#peerlimit_global=240
+
+# Maximum number of peers per torrent
+#peerlimit_torrent=60
+
+# How to encrypt peer connections (required, preferred, tolerated)
+#encryption=preferred
+
+# Where to listen for peer connections (ipv4 address)
+#bind_address_ipv4=
+
+# Where to listen for peer connections (ipv6 address)
+#bind_address_ipv6=
+
+# Where to listen for RPC connections
+#rpc_bind_address=
+
+# Misc. settings
+
+
+# Location of pidfile
+#pidfile=/var/run/transmission.pid
+
+# Location of logfile
+# (Note: works only on systems with sys-apps/openrc, leave unset otherwise)
+#logfile=
+
+# Run daemon as another user (username or username:groupname)
+# (Note: works only on systems with sys-apps/openrc, leave unset otherwise)
+#runas_user=
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.1 b/net-p2p/transmission/files/transmission-daemon.initd.1
new file mode 100644
index 000000000000..c98a73dfcdac
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.1
@@ -0,0 +1,136 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.1,v 1.1 2009/06/06 10:21:54 ssuominen Exp $
+
+# Read options from conf.d file, or set sensible defaults
+allowed=${allowed:-127.0.0.1}
+blocklist=${blocklist:-no}
+watch_dir=${watch_dir:-}
+config_dir=${config_dir:-/var/transmission/config}
+port=${port:-9091}
+auth=${auth:-no}
+username=${username:-}
+password=${password:-}
+download_dir=${download_dir:=/var/transmission/downloads}
+peerport=${peerport:-51413}
+portmap=${portmap:-no}
+peerlimit_global=${peerlimit_global:-240}
+peerlimit_torrent=${peerlimit_torrent:-60}
+encryption=${encryption:-preferred}
+bind_address_ipv4=${bind_address_ipv4:-}
+bind_address_ipv6=${bind_address_ipv6:-}
+rpc_bind_address=${rpc_bind_address:-}
+
+# Misc options
+pidfile=${pidfile:-/var/run/transmission.pid}
+logfile=${logfile:-}
+runas_user=${runas_user:-}
+
+
+# Convert settings into stuff that transmission-daemon can grok as arguments
+allowed_opt="--allowed ${allowed}"
+
+blocklist_opt="--no-blocklist"
+if [ "x${blocklist}" = "xyes" ]; then
+	blocklist_opt="--blocklist"
+fi
+
+watch_dir_opt="--no-watch-dir"
+if [ -n "${watch_dir}" ]; then
+	watch_dir_opt="--watch-dir ${watch_dir}"
+fi
+
+config_dir_opt="--config-dir ${config_dir}"
+
+port_opt="--port ${port}"
+
+auth_opt="--no-auth"
+username_opt=""
+password_opt=""
+if [ "x${auth}" = "xyes" ]; then
+	auth_opt="--auth"
+	# Set username and password also
+	username_opt="--username ${username}"
+	password_opt="--password ${password}"
+fi
+
+download_dir_opt="--download-dir ${download_dir}"
+
+peerport_opt="--peerport ${peerport}"
+
+portmap_opt="--no-portmap"
+if [ "x${portmap}" = "xyes" ]; then
+	portmap_opt="--portmap"
+fi
+
+peerlimit_global_opt="--peerlimit-global ${peerlimit_global}"
+
+peerlimit_torrent_opt="--peerlimit-torrent ${peerlimit_torrent}"
+
+case "${encryption}" in
+	'required') encryption_opt="--encryption-required" ;;
+	'tolerated') encryption_opt="--encryption-tolerated" ;;
+	*) encryption_opt="--encryption-preferred" ;;
+esac
+
+bind_address_ipv4_opt=""
+if [ -n "${bind_address_ipv4}" ]; then
+	bind_address_ipv4_opt="--bind-address-ipv4 ${bind_address_ipv4}"
+fi
+
+bind_address_ipv6_opt=""
+if [ -n "${bind_address_ipv6}" ]; then
+	bind_address_ipv6_opt="--bind-address-ipv6 ${bind_address_ipv6}"
+fi
+
+rpc_bind_address_opt=""
+if [ -n "${rpc_bind_address}" ]; then
+	rpc_bind_address_opt="--rpc_bind-address ${rpc_bind_address}"
+fi
+
+# Note: works only on systems with sys-apps/openrc
+logfile_opt=""
+if [ -n "${logfile}" ]; then
+	logfile_opt="--stdout ${logfile} --stderr ${logfile}"
+fi
+
+# Note: works only on systems with sys-apps/openrc
+# This could be done in baselayout-1 with --chuid, but since
+#   openrc detection is vague at best (b.g.o #270646), just ignore it.
+runas_user_opt=""
+if [ -n "${runas_user}" ]; then
+	runas_user_opt="--user ${runas_user}"
+fi
+
+# Actual init script stuff below this line
+
+opts="start stop"
+description="Transmission is a fast, easy and free bittorrent client"
+description_start="Start transmission-daemon server and web interface"
+description_stop="Stop transmission-daemon server and web interface"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting transmission daemon"
+	start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile ${pidfile} ${runas_user_opt} \
+		${logfile_opt} --exec \
+		/usr/bin/transmission-daemon -- --foreground ${allowed_opt} \
+		${blocklist_opt} ${watch_dir_opt} ${config_dir_opt} ${port_opt} \
+		${auth_opt} ${username_opt} ${password_opt} ${download_dir_opt} \
+		${peerport_opt} ${portmap_opt} ${peerlimit_global_opt} \
+		${peerlimit_torrent_opt} ${encryption_opt} \
+		${bind_address_ipv4_opt} ${bind_address_ipv6_opt} ${rpc_bind_address_opt}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping transmission daemon"
+	start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 \
+		--pidfile ${pidfile}
+	eend $?
+}
diff --git a/net-p2p/transmission/transmission-1.70.ebuild b/net-p2p/transmission/transmission-1.70.ebuild
new file mode 100644
index 000000000000..7bbde3939b24
--- /dev/null
+++ b/net-p2p/transmission/transmission-1.70.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-1.70.ebuild,v 1.1 2009/06/06 10:21:53 ssuominen Exp $
+
+EAPI=2
+inherit autotools fdo-mime gnome2-utils qt4
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com"
+SRC_URI="http://download.${PN}bt.com/${PN}/files/${P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk libnotify qt4"
+
+RDEPEND=">=dev-libs/libevent-1.4.11
+	>=dev-libs/openssl-0.9.4
+	|| ( >=net-misc/curl-7.16.3[ssl]
+		>=net-misc/curl-7.16.3[gnutls] )
+	gtk? ( >=dev-libs/glib-2.15.5:2
+		>=x11-libs/gtk+-2.6:2
+		>=dev-libs/dbus-glib-0.70
+		libnotify? ( >=x11-libs/libnotify-0.4.3 ) )
+	qt4? ( x11-libs/qt-gui:4 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+src_prepare() {
+	sed -e 's:-g -O0::g' -e 's:-g -O3::g' -i configure.ac || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable gtk) \
+		$(use_enable libnotify)
+
+	if use qt4; then
+		cd qt
+		eqmake4 qtr.pro
+	fi
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use qt4; then
+		cd qt
+		emake || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS NEWS
+	rm -f "${D}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.1 ${PN}-daemon
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon
+
+	if use qt4; then
+		cd qt
+		emake INSTALL_ROOT="${D}/usr" install || die "emake install failed"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}