Version bump, bug #362009 by Alphat-PC. Dropped --background option for s-s-d in init script, bug #358635 wrt to Leho Kraav

(Portage version: 2.1.9.45/cvs/Linux x86_64)

4 files changed, 215 insertions, 1 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index db0aff33e880..b77ce4565e35 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.143 2011/03/30 16:30:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.144 2011/04/06 16:29:15 pva Exp $
+
+*transmission-2.30_beta1 (06 Apr 2011)
+
+  06 Apr 2011; Peter Volkov <pva@gentoo.org> +transmission-2.30_beta1.ebuild,
+  +files/transmission-daemon.initd.7:
+  Version bump, bug #362009 by Alphat-PC. Dropped --background option for s-s-d
+  in init script, bug #358635 wrt to Leho Kraav
 
   30 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> transmission-2.13.ebuild:
   amd64 stable wrt #361305
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.7 b/net-p2p/transmission/files/transmission-daemon.initd.7
new file mode 100644
index 000000000000..0fa98a6a5936
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.7
@@ -0,0 +1,72 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.7,v 1.1 2011/04/06 16:29:15 pva Exp $
+
+opts="start stop reload"
+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"
+description_reload="Reload transmission-daemon settings"
+
+pidfile=/var/run/transmission/transmission.pid
+config_dir=/var/transmission/config
+download_dir=/var/transmission/downloads
+logfile=${logfile:-/var/log/transmission/transmission.log}
+runas_user=${runas_user:-transmission:transmission}
+
+SSD_OPTIONS=""
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [ ! -d /var/run/transmission/ ]; then
+		mkdir /var/run/transmission/
+		if [ -n "${runas_user}" ]; then
+			chown -R ${runas_user} /var/run/transmission/
+		fi
+	fi
+
+	# In case no config directory option passed use default
+	if ! $(echo ${TRANSMISSION_OPTIONS} | grep -q -e '\B-g' -e '\B--config-dir'); then
+		TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --config-dir ${config_dir}"
+		# put download dir location on first run (and take it from config later)
+		if [ ! -f ${config_dir}/settings.json ]; then
+			TRANSMISSION_OPTIONS="${TRANSMISSION_OPTIONS} --download-dir ${download_dir}"
+		fi
+	fi
+
+	if [ -n "${runas_user}" ]; then
+		if [ -f /etc/init.d/sysfs ]; then
+			SSD_OPTIONS="${SSD_OPTIONS} --user ${runas_user}"
+		else
+			SSD_OPTIONS="${SSD_OPTIONS} --chuid ${runas_user}"
+		fi
+	fi
+}
+
+start() {
+	check_config
+
+	ebegin "Starting transmission daemon"
+	start-stop-daemon --start --quiet --pidfile ${pidfile} ${SSD_OPTIONS} \
+		--exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} \
+		$(test ${logfile} != "syslog" && echo --logfile ${logfile}) \
+		${TRANSMISSION_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping transmission daemon"
+	start-stop-daemon --stop --quiet --retry TERM/45/QUIT/15 --pidfile ${pidfile}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading transmission configuration"
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
+	eend $?
+}
+
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 042129aa2e90..f937a8550640 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>	
   <use>
 	<flag name="libcanberra">Enable sound event support with <pkg>media-libs/libcanberra</pkg></flag>
+	<flag name="utp">Adds support for µTP (Micro Transport Protocol)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-p2p/transmission/transmission-2.30_beta1.ebuild b/net-p2p/transmission/transmission-2.30_beta1.ebuild
new file mode 100644
index 000000000000..2c3e8d515e06
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.30_beta1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.30_beta1.ebuild,v 1.1 2011/04/06 16:29:15 pva Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+MY_P="${P/_beta/b}"
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${MY_P}.tar.xz"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gnome gtk kde libnotify libcanberra qt4 utp"
+
+RDEPEND="
+	sys-libs/zlib
+	>=dev-libs/libevent-2.0.10
+	>=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.12:2
+		>=dev-libs/dbus-glib-0.70
+		gnome? ( >=gnome-base/gconf-2.20.0 )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		libcanberra? ( >=media-libs/libcanberra-0.10 ) )
+	qt4? ( x11-libs/qt-gui:4[dbus] )"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2.6b
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup transmission
+	enewuser transmission -1 -1 -1 transmission
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb3::g' configure || die
+	# Magnet link support
+	if use kde; then
+		cat > qt/transmission-magnet.protocol <<-EOF
+		[Protocol]
+		exec=transmission-qt '%u'
+		protocol=magnet
+		Icon=transmission
+		input=none
+		output=none
+		helper=true
+		listing=
+		reading=false
+		writing=false
+		makedir=false
+		deleting=false
+		EOF
+	fi
+}
+
+src_configure() {
+	# cli and daemon doesn't have external deps and are enabled by default
+	econf \
+		$(use_enable gtk) \
+		$(use_enable utp) \
+		$(use gtk && use_enable libnotify) \
+		$(use gtk && use_enable libcanberra) \
+		$(use gtk && use_enable gnome gconf2)
+
+	use qt4 && cd qt && eqmake4 qtr.pro
+}
+
+src_compile() {
+	emake
+	use qt4 && cd qt && emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS NEWS qt/README.txt
+	rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.7 ${PN}-daemon
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.3 ${PN}-daemon
+
+	keepdir /var/{transmission/{config,downloads},log/transmission}
+	fowners -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+
+	if use qt4; then
+		cd qt
+		emake INSTALL_ROOT="${D}/usr" install
+		insinto /usr/share/applications/
+		doins transmission-qt.desktop
+		mv icons/transmission{,-qt}.png
+		doicon icons/transmission-qt.png
+		if use kde; then
+			insinto /usr/share/kde4/services/
+			doins transmission-magnet.protocol
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# Keep default permissions on default dirs
+	einfo "Seting owners of /var/{transmission/{,config,downloads},log/transmission}"
+	chown -R transmission:transmission /var/{transmission/{,config,downloads},log/transmission}
+
+	ewarn "If you use transmission-daemon, please, set 'rpc-username' and"
+	ewarn "'rpc-password' (in plain text, transmission-daemon will hash it on"
+	ewarn "start) in settings.json file located at /var/transmission/config or"
+	ewarn "any other appropriate config directory."
+	ewarn
+	ewarn "You must change download location after you change a user daemon"
+	ewarn "starts as, or it'll refuse to start, see bug #349867 for details."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}