Version bump. Remove call to intltoolize --force --copy --automake because autotools.eclass runs it on it's own. Require more recent net-libs/miniupnpc and dev-libs/libappindicator.

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

4 files changed, 231 insertions, 15 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 08db38890275..d446355c55ee 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,14 @@
 # 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.193 2012/05/20 21:06:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.194 2012/05/24 01:55:29 ssuominen Exp $
+
+*transmission-2.52 (24 May 2012)
+
+  24 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +transmission-2.52.ebuild, transmission-9999.ebuild:
+  Version bump. Remove call to intltoolize --force --copy --automake because
+  autotools.eclass runs it on it's own. Require more recent net-libs/miniupnpc
+  and dev-libs/libappindicator.
 
   20 May 2012; Samuli Suominen <ssuominen@gentoo.org> transmission-2.51.ebuild,
   +files/transmission-2.51-fbsd.patch:
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index fb846b47340d..a3cca9cebeeb 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -5,18 +5,20 @@ AUX transmission-2.51-fbsd.patch 321 RMD160 486fe5c5ea0542018c2dfc34efe7925ea8f8
 AUX transmission-daemon.confd.3 703 RMD160 482953d2bd8e9c69300af3389615764649954a63 SHA1 a4d16dde4e2408b48620cc89c4a8759b042797f2 SHA256 4b47acf195a14a322550cfcaa735a59aac38410d1c2c63ffa824ff131c55ca70
 AUX transmission-daemon.initd.8 2247 RMD160 aed10ce23fa58a624d15abbff56c8db37a9e6117 SHA1 d92068b481f40ee520b5f76263ed80c5bc8fe9f5 SHA256 c4383a3380c7dac82941d073a3d52451ed6e1d6bf0969ea0fe3e86aa4b8cbe2e
 DIST transmission-2.51.tar.xz 2784036 RMD160 f6e89c5d158733f24804a31c8e2f9367bcc0d823 SHA1 3d8396365bb6c325c1140567f9a7d38a5898bb54 SHA256 1c9a54864acf8fd0c7aa4132e9e69b454a7c72c305c96016a38551157af8858b
+DIST transmission-2.52.tar.xz 2784408 RMD160 ad54164864b88476d412573e89a0540524022c26 SHA1 71c42738aa86b360cb527ec796d562f12f86a84c SHA256 bcddfb7be014bc2765775a25217203d327bd1ec121971954623d8c3360c14e17
 EBUILD transmission-2.51.ebuild 4182 RMD160 ee56080f22a803fb295f96d4df43434fed415a89 SHA1 037f213233babeabea69fc26d825b14eebd6f9e1 SHA256 1be2ac3b7f127dcc04cd1782bf9503263e764ad19558e371f822c68f1bc132a2
-EBUILD transmission-9999.ebuild 4136 RMD160 c7f5c4b33f25666045533a0581623c3b6f2b07ac SHA1 1877e2f158f7d5899928fff0fcd530ade9511dec SHA256 e0bdc181e489c6c818a71f48834f363da45793d8fbc31bdeb6b26464d1782b84
-MISC ChangeLog 34303 RMD160 97c9181cf28f0b70ab21052c8d0244d3a72a33f8 SHA1 efdf87cd01f9144713748af82e9092e1b0e84f6b SHA256 d6108b7cdf8605897b5aa0227c7b71006e14ff4c4e709651324d1841e2dda213
+EBUILD transmission-2.52.ebuild 4362 RMD160 f068f16299d96a761b4296f42da63b9b8fd5fc2e SHA1 8382a110bb051c539b9ce8497c3434b41616cd2c SHA256 442cbd7a6bf691302d929ce9ecdf4543a326a43e1172c37a1d152d1558cc326c
+EBUILD transmission-9999.ebuild 4362 RMD160 447f81bed6c91aeed48ef8f2ca2c116dcc01f2fb SHA1 dc45eb1e33c64607780f532853477fa0637d97e7 SHA256 88624cf35d75e3a419f603ed6c5162ab948271bc03fbd4573999623dc1fb6039
+MISC ChangeLog 34635 RMD160 eca6ff497f48cf14f1d3bc64c989cf1192d2749e SHA1 eea033e77a004bb53ecfc1b2d649b58d98ff4afa SHA256 5c3ab06ca53efe8c7706c8c381b6839a592b6499d42401a816a7f879f0410c42
 MISC metadata.xml 661 RMD160 8414fd564a443a98be5ae6c3bcb032c26f1ac4a7 SHA1 f216cbcb15dc9c211a946dfab3597851fd1995a8 SHA256 5dadc7aff55c289bc229fdaeb2bf63475ad8c7ff8a523d7fdc4096e0755f2cff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPucxkAAoJEEdUh39IaPFNYvIH/iTsz80mnA8TE9/j4eUabcA3
-xBDteoqtQImT56LsOuS5coEHIO7EJc5izrswfc+dWqqG24X3uAkwwS7F0XctJvBs
-bgQ3X/1v4Nw1kXV33dZXlIKSKcgm2Yzg9YzMoBoQPpTw+FwB1QNDDTWM5h8EX1QN
-xbAZuSDjoIVSbh1XLPjbZu+qqk+ThmIzJk3vIQb+sKXIb9dPUwFfqpmVDbIxOzl7
-m4FG5vuD/Rx+6E/9Ha8T1Ft7SN9nxAtd8VTJboVrU+BJPb95YHh2OSKNYLpnatiG
-EXzfk5dTH00JOU/wtofDCWAINalSg4kY/IEMbGYyRsO7hqdSvXp+FGYoWwG1Xto=
-=Q/yM
+iQEcBAEBAgAGBQJPvZRQAAoJEEdUh39IaPFNwGAH/3tqkBvwOXOMiKgaTGjo1OrF
+M2irh2gr9B/5h4efEgK9ujC56QBjktexR1p687ZzjInPknlOEHYPI86qvJ82+qC2
+fyc2g3wVS8Y9ZMZ/CuXlL03ftqTJzkOtcwdZszjJV5H5LpYkidsw1jRilQQKDzBs
+cEgLw5hKHPYF20ccb1lSG87RN9WgpYkiWkoXUxsi1ZwFEBy/1qN1DHKA5+dtAYix
+6EABgAxO2Ed0PNzuEWudbDWbCNDFgpQd9uU9/FhZnwkrbJBDLAxPq5n7Lpii43My
+QCS8Xwdqvn4Kx0kQ6js3ivXkKxO6vz+7CwGcmMPogD4i8+YN6DazoA6xvlh/hMM=
+=PD6T
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/transmission-2.52.ebuild b/net-p2p/transmission/transmission-2.52.ebuild
new file mode 100644
index 000000000000..35499ed1694d
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.52.ebuild
@@ -0,0 +1,200 @@
+# 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.52.ebuild,v 1.1 2012/05/24 01:55:29 ssuominen Exp $
+
+EAPI=4
+LANGS="en es kk lt pt_BR ru"
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
+	_live_inherits=subversion
+else
+	SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 ${_live_inherits}
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+
+LICENSE="GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk lightweight qt4 xfs"
+
+RDEPEND="
+	>=dev-libs/libevent-2.0.10
+	dev-libs/openssl:0
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-1.6.20120509
+	>=net-misc/curl-7.16.3[ssl]
+	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-0.4.90:3 )
+		)
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4[dbus]
+		)"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	virtual/os-headers
+	xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk )"
+
+DOCS="AUTHORS NEWS qt/README.txt"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		subversion_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		subversion_src_prepare
+		./update-version-h.sh
+	fi
+
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac
+	use ayatana || sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
+
+	# http://bugs.gentoo.org/400929 ->
+	# http://trac.transmissionbt.com/ticket/4915 ->
+	# http://github.com/bittorrent/libutp/issues/35
+	if ! grep -qs include.*netinet.*in.h third-party/libutp/utp.h; then
+		epatch "${FILESDIR}"/${PN}-2.51-fbsd.patch
+	fi
+
+	eautoreconf
+
+	if use qt4; then
+		cat <<-EOF > "${T}"/${PN}-magnet.protocol
+		[Protocol]
+		exec=${PN}-qt '%u'
+		protocol=magnet
+		Icon=${PN}
+		input=none
+		output=none
+		helper=true
+		listing=
+		reading=false
+		writing=false
+		makedir=false
+		deleting=false
+		EOF
+	fi
+}
+
+src_configure() {
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	econf \
+		--enable-external-natpmp \
+		$(use_enable lightweight) \
+		$(use_with gtk)
+
+	if use qt4; then
+		pushd qt >/dev/null
+		eqmake4 qtr.pro
+		popd >/dev/null
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt4; then
+		pushd qt >/dev/null
+		emake
+
+		local l
+		for l in ${LANGS}; do
+			if use linguas_${l}; then
+				lrelease translations/${PN}_${l}.ts
+			fi
+		done
+		popd >/dev/null
+	fi
+}
+
+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/{${PN}/{config,downloads},log/${PN}}
+	fowners -R ${PN}:${PN} /var/{${PN}/{,config,downloads},log/${PN}}
+
+	if use qt4; then
+		pushd qt >/dev/null
+		emake INSTALL_ROOT="${D}"/usr install
+
+		domenu ${PN}-qt.desktop
+
+		local res
+		for res in 16 22 24 32 48; do
+			insinto /usr/share/icons/hicolor/${res}x${res}/apps
+			newins icons/hicolor_apps_${res}x${res}_${PN}.png ${PN}-qt.png
+		done
+
+		insinto /usr/share/kde4/services
+		doins "${T}"/${PN}-magnet.protocol
+
+		insinto /usr/share/qt4/translations
+		local l
+		for l in ${LANGS}; do
+			if use linguas_${l}; then
+				doins translations/${PN}_${l}.qm
+			fi
+		done
+		popd >/dev/null
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "If you use ${PN}-daemon, please, set 'rpc-username' and"
+	elog "'rpc-password' (in plain text, ${PN}-daemon will hash it on"
+	elog "start) in settings.json file located at /var/${PN}/config or"
+	elog "any other appropriate config directory."
+	elog
+	elog "Since µTP is enabled by default, ${PN} needs large kernel buffers for"
+	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+	elog " net.core.rmem_max = 4194304"
+	elog " net.core.wmem_max = 1048576"
+	elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index 5fce0e366f04..3d8aaa747483 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.6 2012/05/04 06:33:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.7 2012/05/24 01:55:29 ssuominen Exp $
 
 EAPI=4
 LANGS="en es kk lt pt_BR ru"
@@ -21,21 +21,21 @@ DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com/"
 
 LICENSE="GPL-2 MIT"
-SLOT="0"
+SLOT=0
 IUSE="ayatana gtk lightweight qt4 xfs"
 
 RDEPEND="
 	>=dev-libs/libevent-2.0.10
 	dev-libs/openssl:0
 	net-libs/libnatpmp
-	>=net-libs/miniupnpc-1.6
+	>=net-libs/miniupnpc-1.6.20120509
 	>=net-misc/curl-7.16.3[ssl]
 	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 )
+		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
 		)
 	qt4? (
 		x11-libs/qt-core:4
@@ -78,7 +78,13 @@ src_prepare() {
 	# http://trac.transmissionbt.com/ticket/4324
 	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' lib${PN}/Makefile.am || die
 
-	intltoolize --copy --force --automake || die
+	# http://bugs.gentoo.org/400929 ->
+	# http://trac.transmissionbt.com/ticket/4915 ->
+	# http://github.com/bittorrent/libutp/issues/35
+	if ! grep -qs include.*netinet.*in.h third-party/libutp/utp.h; then
+		epatch "${FILESDIR}"/${PN}-2.51-fbsd.patch
+	fi
+
 	eautoreconf
 
 	if use qt4; then