Update regex to match beginning of the word, bug #342849 thank Sok Ann Yap for report and fix.

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

4 files changed, 216 insertions, 2 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 348a67a4c6d0..30251b1dad72 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.131 2010/10/26 07:23:28 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.132 2010/11/10 12:53:30 pva Exp $
+
+*transmission-2.11-r2 (10 Nov 2010)
+
+  10 Nov 2010; Peter Volkov <pva@gentoo.org> +transmission-2.11-r2.ebuild,
+  +files/transmission-daemon.initd.5:
+  Update regex to match beginning of the word, bug #342849 thank Sok Ann Yap
+  for report and fix.
 
 *transmission-2.11-r1 (26 Oct 2010)
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 0ada98939f5d..74052040ea37 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -2,9 +2,11 @@ AUX transmission-daemon.confd.1 1519 RMD160 decaf106064e8c393fce35758d6dc63e8302
 AUX transmission-daemon.confd.2 656 RMD160 1d3a773fe7d8fc22ccda8737f70c677029484380 SHA1 8bb0ce3e739ec68e8f0b77ef341d25787e314efc SHA256 cc59f72d0048467aeac9199f1cc6a771a45176b65bc2e374bc9e1980faf3dcb8
 AUX transmission-daemon.initd.2 3953 RMD160 f78589fe9de1db4160aa7c6333cef1fc835c0888 SHA1 7ca57cd2135688d27401441667cc373e22434bd1 SHA256 0266ecb32e9a359b078a61c8ba40413d9d222b6622b6f7d5e8fc0a4e2ed7587d
 AUX transmission-daemon.initd.4 2164 RMD160 133f8c06f120bc1a715fe21c6d88dc97a82b8d12 SHA1 3d774381369ea61d3b981e79ed8afb778fcfa6e8 SHA256 5d2c50fce9957935484eab02074731a0aa784d42bd5fb9dae988d31117cbf5b5
+AUX transmission-daemon.initd.5 2166 RMD160 6ae3a95d7e7841305a63186bf74d19d766d0d001 SHA1 85b2edca7d2f0bd1a725b3999cdb0082036d31df SHA256 5eedf6d8243d8a6a204aa1037a7b4226a320df5423cf9e471b260ae1d85e9ba7
 DIST transmission-2.04.tar.bz2 4264035 RMD160 977ff093125dbc692af1fa73c3a0729e0ed10d54 SHA1 301e22eeeb985782b61202deb1c36a883357fcc6 SHA256 c0010ee3f4d93d737da732bceb4e640dc404b0e7659980fb10dafb5bb0a83b4f
 DIST transmission-2.11.tar.bz2 4088630 RMD160 115ad575f1594291296b0ae6dfcc9adabcbfd6c9 SHA1 e4396d15d00bfae21ae711085d9e1deb37754a2f SHA256 035dab5fba1586931ee85ce11c48efdc7be5ecc82a3ff3538aac7fab749c2785
 EBUILD transmission-2.04-r1.ebuild 2301 RMD160 f20cf81c208c71ef638314e3a703cfab9695bed7 SHA1 699db7000faa7793193d12e3be5f52e715d03628 SHA256 5c19d06825fd88233e864a6cf25adf0d1812d447f0b2b88a5235c9169728e934
 EBUILD transmission-2.11-r1.ebuild 3688 RMD160 53772b0423aaaff40d43ce69fdb3be33676643b0 SHA1 d50b98cf31f330515e23b1d3a5ccb6c54003940f SHA256 63d30aa8a50ed61f0fbe6871d6a9dc67d37bac10427d57b741c435f50e0dce39
-MISC ChangeLog 20985 RMD160 f5b9a892d61d3d9ba059e627f8a28de2ce3988eb SHA1 e62ab2503a480928815d31f8957f709522ca3705 SHA256 a81a8db867277031d7fb95bcc5d8a8e656bd83541d4697000c3ba29b83364e42
+EBUILD transmission-2.11-r2.ebuild 3688 RMD160 88fe38f01dbfe37472db93237d77ec1efbd86ae7 SHA1 51bfddd6504250ceaa0e57818cb262d52ffbde17 SHA256 256f78b8eb3133e702db8c67535e8e1c21c1fcaa56eaa7b7d7a86843d231c3e4
+MISC ChangeLog 21235 RMD160 692f5df766c726085e72e0e71a5b1c0eae768730 SHA1 f34773b0cdec6c021116f35da70322813fcf8566 SHA256 c144c0d1703c35d13a335a1e41394200491a0f2d01993dafb9d110397eb78a13
 MISC metadata.xml 364 RMD160 be00dd8262b7de7ff847c0b8924ad0187cdcfc77 SHA1 86255961e5a1afb9a40ee375d8e942925c472b67 SHA256 e50226e57b5eeb05c307c7fb9f728881f28241696ca8d0b1d42bc1faadde5e23
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.5 b/net-p2p/transmission/files/transmission-daemon.initd.5
new file mode 100644
index 000000000000..e2ee41ee29a8
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-daemon.initd.5
@@ -0,0 +1,71 @@
+#!/sbin/runscript
+# Copyright 1999-2010 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.5,v 1.1 2010/11/10 12:53:30 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 --background --pidfile ${pidfile} ${SSD_OPTIONS} \
+		--exec /usr/bin/transmission-daemon -- --pid-file ${pidfile} --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/transmission-2.11-r2.ebuild b/net-p2p/transmission/transmission-2.11-r2.ebuild
new file mode 100644
index 000000000000..e7bbcc261d67
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.11-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.11-r2.ebuild,v 1.1 2010/11/10 12:53:30 pva Exp $
+
+EAPI=2
+inherit eutils fdo-mime gnome2-utils qt4-r2
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.bz2"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="gnome gtk kde libnotify sound qt4"
+
+RDEPEND="
+	sys-libs/zlib
+	>=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.12:2
+		>=dev-libs/dbus-glib-0.70
+		gnome? ( >=gnome-base/gconf-2.20.0 )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		sound? ( >=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"
+
+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 \
+		--disable-dependency-tracking \
+		$(use_enable gtk) \
+		$(use gtk && use_enable libnotify) \
+		$(use gtk && use_enable sound libcanberra) \
+		$(use gtk && use_enable gnome gconf2)
+
+	use qt4 && cd qt && eqmake4 qtr.pro
+}
+
+src_compile() {
+	emake || die
+	use qt4 && cd qt && { emake || die; }
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS NEWS qt/README.txt
+	rm -f "${D}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.5 ${PN}-daemon || die
+	newconfd "${FILESDIR}"/${PN}-daemon.confd.2 ${PN}-daemon || die
+
+	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 || die
+		insinto /usr/share/applications/
+		doins transmission-qt.desktop || die
+		mv icons/transmission{,-qt}.png
+		doicon icons/transmission-qt.png || die
+		if use kde; then
+			insinto /usr/share/kde4/services/
+			doins transmission-magnet.protocol || die
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# Keep default permissions on default dirs
+	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."
+
+	if use gtk; then
+		elog 'If you want magnet link support in gnome run this commands:'
+		elog 'gconftool-2 -t string -s /desktop/gnome/url-handlers/magnet/command "/usr/bin/transmission-gtk %s"'
+		elog 'gconftool-2 -s /desktop/gnome/url-handlers/magnet/needs_terminal false -t bool'
+		elog 'gconftool-2 -t bool -s /desktop/gnome/url-handlers/magnet/enabled true'
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}