Fix all transmission bugs, see ChangeLog for details.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 39 insertions, 286 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 616f4db39c22..7a6d40848853 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,18 @@
 # 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.83 2009/06/06 10:21:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.84 2009/06/20 12:55:38 ssuominen Exp $
+
+*transmission-1.72 (20 Jun 2009)
+
+  20 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -transmission-1.61-r1.ebuild, -transmission-1.70.ebuild,
+  +transmission-1.72.ebuild, -files/transmission-daemon.confd,
+  -files/transmission-daemon.initd, -files/transmission-daemon.initd.1,
+  +files/transmission-daemon.initd.2:
+  Version bump wrt #274663, but with disabled Qt4 client because it seems to
+  be using the bundled copy of libevent instead of the system library like
+  it does for GTK+ client. Fix typo in init.d file wrt #274800, thanks to
+  Pavel Labushev. Adjust libevent depend wrt #274125.
 
 *transmission-1.70 (06 Jun 2009)
 
diff --git a/net-p2p/transmission/files/transmission-daemon.confd b/net-p2p/transmission/files/transmission-daemon.confd
deleted file mode 100644
index bb3e8edd4d8f..000000000000
--- a/net-p2p/transmission/files/transmission-daemon.confd
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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)
-#bind_address_ipv4=
-
-# Where to listen for peer connections (ipv6)
-#bind_address_ipv6=
-
-# Where to listen for RPC connections
-#rpc_bind_address=
-
-# Misc. settings
-
-# Location of pidfile
-#pidfile=/var/run/transmission.pid
-
-# Run daemon as another user
-#runas_user=root
diff --git a/net-p2p/transmission/files/transmission-daemon.initd b/net-p2p/transmission/files/transmission-daemon.initd
deleted file mode 100644
index 09631c57911a..000000000000
--- a/net-p2p/transmission/files/transmission-daemon.initd
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/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,v 1.1 2009/05/12 23:21:40 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}
-runas_user=${runas_user:-root}
-
-
-# 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
-
-
-# Actual init script stuff below this line
-
-description="Transmission is a fast, easy and free bittorrent client"
-description_start="Start transmission-daemon server and web interface"
-description_start="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} --user ${runas_user} --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/files/transmission-daemon.initd.1 b/net-p2p/transmission/files/transmission-daemon.initd.2
index c98a73dfcdac..f68c3f6e51b0 100644
--- a/net-p2p/transmission/files/transmission-daemon.initd.1
+++ b/net-p2p/transmission/files/transmission-daemon.initd.2
@@ -1,7 +1,7 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/files/transmission-daemon.initd.2,v 1.1 2009/06/20 12:55:37 ssuominen Exp $
 
 # Read options from conf.d file, or set sensible defaults
 allowed=${allowed:-127.0.0.1}
@@ -86,7 +86,7 @@ fi
 
 rpc_bind_address_opt=""
 if [ -n "${rpc_bind_address}" ]; then
-	rpc_bind_address_opt="--rpc_bind-address ${rpc_bind_address}"
+	rpc_bind_address_opt="--rpc-bind-address ${rpc_bind_address}"
 fi
 
 # Note: works only on systems with sys-apps/openrc
diff --git a/net-p2p/transmission/transmission-1.61-r1.ebuild b/net-p2p/transmission/transmission-1.61-r1.ebuild
deleted file mode 100644
index f8b843d69233..000000000000
--- a/net-p2p/transmission/transmission-1.61-r1.ebuild
+++ /dev/null
@@ -1,83 +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/transmission/transmission-1.61-r1.ebuild,v 1.1 2009/05/12 23:21:40 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/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 -i -e 's:-g -O3 -funroll-loops::g' 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 ${PN}-daemon
-	newconfd "${FILESDIR}"/${PN}-daemon.confd ${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
-}
diff --git a/net-p2p/transmission/transmission-1.70.ebuild b/net-p2p/transmission/transmission-1.72.ebuild
index 7bbde3939b24..ad93d412b541 100644
--- a/net-p2p/transmission/transmission-1.70.ebuild
+++ b/net-p2p/transmission/transmission-1.72.ebuild
@@ -1,9 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-1.72.ebuild,v 1.1 2009/06/20 12:55:38 ssuominen Exp $
 
+# qt4 client is disabled because of upstream regression in bug
+# http://trac.transmissionbt.com/ticket/2169, but you can uncomment
+# it here unless you don't provide a patch for the .pro file.
 EAPI=2
-inherit autotools fdo-mime gnome2-utils qt4
+inherit autotools fdo-mime gnome2-utils
+# qt4
 
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com"
@@ -12,17 +16,19 @@ 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"
+IUSE="gtk libnotify"
+# qt4
 
 RDEPEND=">=dev-libs/libevent-1.4.11
+	<dev-libs/libevent-2
 	>=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 )"
+		libnotify? ( >=x11-libs/libnotify-0.4.3 ) )"
+#	qt4? ( x11-libs/qt-gui:4 )
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/intltool
@@ -40,19 +46,19 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable libnotify)
 
-	if use qt4; then
-		cd qt
-		eqmake4 qtr.pro
-	fi
+#	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
+#	if use qt4; then
+#		cd qt
+#		emake || die "emake failed"
+#	fi
 }
 
 src_install() {
@@ -61,13 +67,13 @@ src_install() {
 	dodoc AUTHORS NEWS
 	rm -f "${D}"/usr/share/${PN}/web/LICENSE
 
-	newinitd "${FILESDIR}"/${PN}-daemon.initd.1 ${PN}-daemon
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${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
+#	if use qt4; then
+#		cd qt
+#		emake INSTALL_ROOT="${D}/usr" install || die "emake install failed"
+#	fi
 }
 
 pkg_preinst() {