USE="ayatana" for libappindicator wrt #400815 by Luis Medinas. Remove USE="utp" because USE"-utp" fails to build wrt #400865 by Ben Kohler. Fix patch for building with USE=qt4 wrt #400923. Remove deprecated support for GTK+-2.x and enable GTK+-3.x with USE="gtk".

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 184 insertions, 8 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 8060c28dbbfa..e1c68e6a7acd 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.165 2012/01/26 00:11:32 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.166 2012/01/26 15:46:48 ssuominen Exp $
+
+*transmission-2.42-r1 (26 Jan 2012)
+
+  26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +transmission-2.42-r1.ebuild:
+  USE="ayatana" for libappindicator wrt #400815 by Luis Medinas. Remove
+  USE="utp" because USE"-utp" fails to build wrt #400865 by Ben Kohler. Fix
+  patch for building with USE=qt4 wrt #400923. Remove deprecated support for
+  GTK+-2.x and enable GTK+-3.x with USE="gtk".
 
   26 Jan 2012; Mike Gilbert <floppym@gentoo.org>
   +files/transmission-2.42-natpmp-system.patch:
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 9f728c0ba524..6a27a3613e8e 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX transmission-2.31-0001-configure.ac.patch 1513 RMD160 dc538328560cc1d470bdd33b5f26989b95b035e5 SHA1 26392849d5284a30174506d343f87f1404e4211b SHA256 d7cb0336a665d1ce1728cd07f6920e991eece9e6bc3eb7c84e1ae9209bd57d22
 AUX transmission-2.31-0002-config.in-4-qt.pro.patch 2434 RMD160 364eca9a6144e53a7208da1c0b17f11b13b7a27f SHA1 850eb2e80518be9b04312369980830f5635bcc34 SHA256 fca9ebed543990728b6884b9249ab86023bee7da4fe77d1b206d46413af54210
@@ -24,6 +24,7 @@ DIST transmission-2.22.tar.bz2 4802843 RMD160 e87b560f81fc8bc422dc7071a4b27bdcf2
 DIST transmission-2.31.tar.xz 2558880 RMD160 e777e32e5d02e8a93a64e4821ea0f9ccd8724f2c SHA1 84cfbc4e6a8db437d3c5b7eb983ce763b2879b62 SHA256 82cd04c93c65df818d38dcec154f5864520ab3147fac372e11d8e9d12506deba
 DIST transmission-2.33.tar.xz 2583032 RMD160 8b8228a2fad55a64d46314f1bf879a8b89fa150d SHA1 a5502723e9b8fdc982cc4d3c052e4839cb45b1a8 SHA256 c15a7f9d82743fb329ee12e41bf242070ddbaa8c6741da7ce0bb91d8d399a072
 DIST transmission-2.41.tar.xz 2623344 RMD160 a2c9c80cff444978dff305d573007473af5b3084 SHA1 dd9531587778dc46757b1520accacf6afa20c370 SHA256 f31bf798f620b436b2f5ed7047fa27fab78ce4b229d6d02f8c71f9867277685a
+DIST transmission-2.42-patchset-1.tar.xz 4624 RMD160 7755ac87fcb58ab2fddf9707c2f212ebd76ce751 SHA1 f53ce89356fb09545f86e75c9bdd4eebd8d784ab SHA256 07541b76d77459f099c389df4722ff7fd085142433601a871df1d08ac9fefc33
 DIST transmission-2.42.tar.xz 2629072 RMD160 c74688a61c2a8489f878363046ac705f1ce3f005 SHA1 78903095842fe1331c0b6ae214a9e99b0f112951 SHA256 ca94d8de5338178c2210e86e31aa522f559cac87da33a85199fbd81b7e8b04eb
 EBUILD transmission-2.22.ebuild 3905 RMD160 fa3fb412e80762df5ea9f586e306d3d78f7940a2 SHA1 c8abfcb6c950ebe7946b912fc5246d6f950f7bd1 SHA256 bc88d99b145cd04958b0b7c34533e2e730a247d3b87423010886178e542b0a4d
 EBUILD transmission-2.31-r1.ebuild 4186 RMD160 b73a2ad82fc17b03adf6f622cf984f0616d467f9 SHA1 34e11a0f03e0d1623f2e8d2a5ff1fd5d51f748fe SHA256 988da632a1b272360ba679091dc9b7764e8033cd4b765ae7fa36b6e17589c9c4
@@ -31,13 +32,18 @@ EBUILD transmission-2.31.ebuild 3614 RMD160 6aea3b61e03e52aa67dc93a3fad133e9b480
 EBUILD transmission-2.33-r1.ebuild 4360 RMD160 adde6fb9821b740584a38d2163be3318db8c1d5c SHA1 ce5bb8596dd783762e9534b7029d44e3408eae63 SHA256 e26d046d0076e792889702821c4ef06a6d00d5a5014c8c8613d67cd386238939
 EBUILD transmission-2.33.ebuild 4356 RMD160 f04825ed475243c6a5673ce8e0055665f5c083d3 SHA1 a02e5d5c44f08bbf4a31893a8f5b08516ea061b9 SHA256 30e201d4880d55e6562ed348b5a2a240b0387248a83ee4ee0ad90e62eac5909e
 EBUILD transmission-2.41.ebuild 4088 RMD160 acefdcf1f9cc71d3df8bbb9c33e4b9bee11b408f SHA1 a6eeaa8aa734d7fb9d0475dd44bd9d208874ebfb SHA256 500728a16fe5a8872d02015aea9e61608f7dfc501b1021180308e580d25da5d1
+EBUILD transmission-2.42-r1.ebuild 4013 RMD160 df955bcf89cab7eb2546d81127fdb91bfe2fceca SHA1 c758fd8153c9ff1c07e011061d9897ef7a67b931 SHA256 88e67cb32b927fff2ce07fdb96b5ed487d55cc1226acfb1986b3b33b6d4974d5
 EBUILD transmission-2.42.ebuild 4626 RMD160 0a13ca4e5b01f72c76fdfbd9213e97616f0d0b47 SHA1 7b8222ed6d28eba68ea09f02c009483e16d17714 SHA256 7db456457eada21868d9a3619a2107a0bfed0e3357364328d7927b8c497ee3cc
-MISC ChangeLog 28821 RMD160 291c1a075fa8cc8690b3672998313b1fab6382f1 SHA1 8f421d36918057cfa9e8533631db61973b24e83f SHA256 aa9d9c1ac65bc208fd3fa9bd2ce59163b0460d5c94bd3e4dd851e6259f1e815a
-MISC metadata.xml 511 RMD160 b11330845a7f696e355443d7d9bb98e96c12c1b7 SHA1 5fed92119a7effcdfc3705666ff47fbb321c4cc6 SHA256 769efb2c32743c91a234a50929d223b5831e5406d3ae1c624e4356f0218d01b3
+MISC ChangeLog 29219 RMD160 30d1d91f503c68c6f45721b92e626e216f258aa7 SHA1 f7067c8f962be63397077d5958399ad51df419a6 SHA256 264f6f2ebc8f698db88a65830c12c85e9d024adc675c897c9964f0f3000eb23a
+MISC metadata.xml 607 RMD160 9dc65867a8256242f05dd8e7c24ab4eafbf23ba1 SHA1 48cd1887ac53da61e6e33f5e0fd79e7a7362bb90 SHA256 53f1cef06446dbb3eaad39e15d5cf26fba11713f690285ddd11927bd9537e00d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8gmjoACgkQC77qH+pIQ6RzTQD/aV5OHqfh0z5UpDpYIHmIv80K
-NIL7D5HC64MZBOYfWHoA/RaLNqSM+M4W3M6bAvjl8B1soa7Ybj3pd3cfuhKVhAT6
-=eZec
+iQEcBAEBAgAGBQJPIXTqAAoJEEdUh39IaPFNP2QH/3XncbV+xHC73owIrPLxTJoM
+/38qZnEKqAR9VbJUVeocp2oOHHvZQTgK5qpjeKn7fdD2aceB7imMYIU28CIa9bfl
+GlGYQakWTIfXIvgpb2PpPKT8f1l7VvE4is8JHEUx1thYV3KaGnZmLRrBbe3jUysw
+zh7JyAavc2T7mv59Tw3nSNIVqLFSie0atbYRwA4hh4ph4Io8QFWZHGItTe8vglRH
+I1HEJohf958b36E/RXGjkYq88MCu7CfhlNWCNLTXG7welrJIIXk//emrQ1eIrF54
+enRW/7gy37dlLETKj1zB2ks7FU0WK5DaI2q6MUSXVklyi3WILYda56HOyI2lADM=
+=0VDe
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 7407c9c58a70..3675d5a48cce 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -7,6 +7,7 @@
 	<name>Peter Volkov</name>
   </maintainer>	
   <use>
+    <flag name="ayatana">Enable Ayatana support with <pkg>dev-libs/libappindicator</pkg></flag>
 	<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>
 	<flag name="gtk3">Enable gtk3 frontend instead of gtk2 one</flag>
diff --git a/net-p2p/transmission/transmission-2.42-r1.ebuild b/net-p2p/transmission/transmission-2.42-r1.ebuild
new file mode 100644
index 000000000000..753f3f6cdf51
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.42-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.42-r1.ebuild,v 1.1 2012/01/26 15:46:48 ssuominen Exp $
+
+EAPI=4
+inherit autotools 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.xz
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana gtk kde nls qt4"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0.10
+	dev-libs/openssl:0
+	>=net-misc/curl-7.16.3[ssl]
+	>=net-libs/miniupnpc-1.6
+	net-libs/libnatpmp
+	sys-libs/zlib
+	gtk? (
+		>=dev-libs/dbus-glib-0.98
+		>=dev-libs/glib-2.28
+		>=x11-libs/gtk+-3.2:3
+		ayatana? ( dev-libs/libappindicator:3 )
+		)
+	qt4? ( x11-libs/qt-gui:4[dbus] )"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-apps/sed
+	sys-devel/gettext
+	>=sys-devel/libtool-2.2.6b
+	nls? (
+		>=dev-util/intltool-0.40
+		sys-devel/gettext
+		)"
+# note: gettext is always a depend with eautoreconf
+
+REQUIRED_USE="
+	ayatana? ( gtk )
+	gtk? ( nls )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+pkg_setup() {
+	enewgroup transmission
+	enewuser transmission -1 -1 -1 transmission
+}
+
+src_prepare() {
+	# note: this patchset has useless bits for optionalizing UTP which can be
+	# dropped from next one	
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
+
+	# note: http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
+
+	if ! use ayatana; then
+		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
+	fi
+
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	eautoreconf
+
+	# note: 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() {
+	# note: cli and daemon doesn't have external deps and are enabled by default
+	econf \
+		$(use_enable nls) \
+		--enable-utp \
+		--enable-external-miniupnp \
+		--enable-external-natpmp \
+		$(use_with gtk)
+
+	use qt4 && cd qt && eqmake4 qtr.pro
+}
+
+src_compile() {
+	emake
+	use qt4 && cd qt && emake
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/usr/share/${PN}/web/LICENSE
+
+	newinitd "${FILESDIR}"/${PN}-daemon.initd.8 ${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 -vf 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
+
+	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."
+	elog
+	elog "To enable sound emerge media-libs/libcanberra and check that at least"
+	elog "some sound them is selected. For this go:"
+	elog "Gnome/system/preferences/sound themes tab and 'sound theme: default'"
+	elog
+	ewarn "Since uTP is enabled ${PN} needs large kernel buffers for the UDP socket."
+	ewarn "Please, add into /etc/sysctl.conf following lines:"
+	ewarn " net.core.rmem_max = 4194304"
+	ewarn " net.core.wmem_max = 1048576"
+	ewarn "and run sysctl -p"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}