Version bump.

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

4 files changed, 210 insertions, 18 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 8a4870d40ef2..3ef723b001bf 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,12 @@
 # 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.200 2012/07/10 19:19:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.201 2012/07/25 08:58:37 ssuominen Exp $
+
+*transmission-2.61 (25 Jul 2012)
+
+  25 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +transmission-2.61.ebuild, transmission-9999.ebuild:
+  Version bump.
 
 *transmission-2.60 (10 Jul 2012)
 
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 5a0116bf2fdd..e246563a87ce 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -7,20 +7,22 @@ AUX transmission-daemon.initd.8 2247 SHA256 c4383a3380c7dac82941d073a3d52451ed6e
 DIST transmission-2.51.tar.xz 2784036 SHA256 1c9a54864acf8fd0c7aa4132e9e69b454a7c72c305c96016a38551157af8858b SHA512 effa41be9e14bdecfb397d3803e415b1a6c572c0a3266a3400ca76d66da5d75c93f42cf381b1efce02cebb81e4296e527f8d9c8eb049feba0c94d5514a41ea12 WHIRLPOOL ebd9d3702074c3e5eb8ffb68278b4fca29c051154087932294af469fc92c8ba076933c5e3f431273ac04d9586cd4305a7c1d22ae0b7d5de676b6889a82ba5fd8
 DIST transmission-2.52.tar.xz 2784408 SHA256 bcddfb7be014bc2765775a25217203d327bd1ec121971954623d8c3360c14e17 SHA512 87dc16c3ec1f2ca991657881f2f69f952d65f6636be74bfd78aa01fd331aaab67f8d0518f157514a31019908b157f89d5ec2a60a72baa85e57f7734a9eb50668 WHIRLPOOL 2a6246de2c7b85c7c636e3564a3df9a2d21483d6d00b294337556bf368cb448453db36bf101bee617bb8f81de7d6b8cd6aaa2502e4f50a27c527aaa7efb46bac
 DIST transmission-2.60.tar.xz 2905156 SHA256 e46540c5e9098eecc2d00c1b0c1defd687a01a1dc4bc3e2fc64722ef236d55e5 SHA512 0aea93263ce0bfb11629486a6f9d0ed9a5b0ec85cc15933271c073f73bb55f31ae6a32804b528093b2e435143ce3d6a25625bfb0411c75aaaf3832a7ffa26f34 WHIRLPOOL 72152f966b5f1971bfd2f2aaf9a1395718033a7e83c932d86c49a998f03e537070988580fa930f9525af7c4aac4d0ba7f55ee1fdfc0af59c7587590258e07cd8
+DIST transmission-2.61.tar.xz 2876648 SHA256 1c4ccbf5d7dc7bb9615005f9db7bb0612c95ac908c6cf5d519e6f0126588765c SHA512 a34efd36b3520c8c0d6d7be65ee7b5019892ec9ee66c1c91d041aba24324da246f925cc00d0426e42b6157d0519811ba7259b167583b5c6758b35605878cc4ec WHIRLPOOL 03496ce3abaefcdaaf70d5864678bc1cc63cde4d86a7dccf6465d53346117c3ebb7f4f3c3fe04037168510a0dc5fccca829e1a375f3186e209da4d489d8772c2
 EBUILD transmission-2.51.ebuild 4138 SHA256 91b9d36a0a7f5eed1f9072583afaed33cd377e55154f14403633318a82d38aad SHA512 72952cce38eaa13c587dddd96abfef0e4fe67beea1596df1b02f0b8479f054d2bf86a8ec1f7269e43307b0d8e9eaac71e96362ee18aa4a39815b38a4104a6417 WHIRLPOOL 5776c762526fc4ac61f810dacfe8d7c21fbc7c02748df8b34605f03288b2d9412f68645709acaf0165d09f50becc441db2df8402d6d9427188deb79175421423
 EBUILD transmission-2.52.ebuild 4314 SHA256 d0c993e24685e5f20542742c714d06827c7a4cae1a9b3163a4297bef23054a98 SHA512 914850eafa4df1f2c8c95a9684c1055562b91a10bbdaa20a20d7caf4dd85975fc7e6ab4c22db2cb3edc5a7499245d883d999122afdf56e25b2b7c083997d33eb WHIRLPOOL 4df6ee137118949865f2e5456741fe65cc0293fd5c4350f0e3336131322942b2fe87b8bc412e2d02850038bbcd38db57322866a60698266ff23fb9a5f0fd841d
 EBUILD transmission-2.60.ebuild 4323 SHA256 1676e09e7f8b6c098ee23ae8d1fc16a8249f60e92b577922c3a7c3bad721fbb3 SHA512 66c370083153c11de650f8fe572468a0db4e828c16d5da231031c256216ebd429fc405ea28508a86053f1788c95685b39f6763141b657913c9483d1624eb8f72 WHIRLPOOL 6514232f0a24f58cbb4f23a4a351e8758090fc3c1f428f53f02febba16c1660bfb22a58d0b3d0f371c02a5e70b0845d725f9786342efb937bd7a138543056fdd
-EBUILD transmission-9999.ebuild 4323 SHA256 55f62a224995a217ddaf639c82dd23e259a759a53d305609058da5ee9a43c857 SHA512 dd238a56e93bfa1ed1ae072b53a8dc90c948ea410e899f3306b603cbf78495cd34d5b7094c68d3500f4e6e8ce4a47dd2440b35227ada7145a51178fcf4fe555e WHIRLPOOL 25d0368936d3917bf882f5f177f969592bda8385b4403a0eedecd5457566d2040fad4ed47b201a89df7ccbd3c061f6c9f3f4e9a6736047e43b45c429ed398d6d
-MISC ChangeLog 35352 SHA256 8d1dc2298060d737afc3d07c4d5f7caca018d775228019c2d9f1109d7d96dad1 SHA512 422460c3a8b55adb09f8ad77775891ace13bae97ea1674f6989a49493d01e2525a66e1f0024b5bc538877907860f390491a5c56b7870304dfe52bb2983e3617d WHIRLPOOL 843962867a9d32815c8579588b1deb76af59d5a5441459788380c57db08ad9931a66d765386bee1c6e7afe53d028fa4d17fc670c23568646ab48c186e97cf044
+EBUILD transmission-2.61.ebuild 4070 SHA256 2c9dee28bc2555c2137e65c0d9641eb924059a78c630634c1e71330cb0458a8b SHA512 4069865524a0c6b4fa690fa603e36b2db095dafa16840ded650cb7aede4e8725e24d16f290a9e0ef5f50c85ae7a9ce6b98e0d1287564f4fd7f73b149bf11433f WHIRLPOOL 016fe756928f6f3f9a6cb8d18551151d6684d1a23338844919e41370c519197310081df11dca4eeebe679ff91d1e9074fde9e6d310a78e0334b55a1c164f3a40
+EBUILD transmission-9999.ebuild 4071 SHA256 724c1244ae62fdc2e3f95990157a2d348c35fe9e8d6950fd34629424639631f3 SHA512 13c15573aa395e3e5121d244fca954f60d25377e867930507228e4767b8f23c013ec8b906a06c19d52a0d19149154d1cb7e46d3d27439f58e26eba7a3e6ee2cd WHIRLPOOL 883808703ae1ac9151a437c74886c6aa95c162afb273f782ac1cff484969cdfb8a83d4038aa29406f7a91aa4ac0e47e0d0ebcb8c97cc7ce79805668114a7ef3f
+MISC ChangeLog 35512 SHA256 87b853bf78778420626cc20dae68ec5cee6a97ba0c82d89ac52fd5b5e52d04de SHA512 c959fe8acfba0b6301b0728382e1c76837cde7bd69fa99f49d65e7958322d1d7c0b7064b0160d95cf21a03617c0235a1c947d686eea32a02720fe5753cd67207 WHIRLPOOL 58330b6c646e649fe767142d31f84d81bba06a328e8a872206ea4b58ceddef074830a79a1586a3c4d17ec145342aec1473a1c7dc04cba245baf6be02f120795f
 MISC metadata.xml 661 SHA256 5dadc7aff55c289bc229fdaeb2bf63475ad8c7ff8a523d7fdc4096e0755f2cff SHA512 239d8bfc15bc6d52c079f437f01cfec4ea23022e92a333f2758249644ed5327ec941a27110ce43b1fb2f80208a473c396f24215f1c8b18716dc4fd64427472f8 WHIRLPOOL 5099446a448ad86d10d456f23e08b0a09e8c76670641565f718b8f18cf0cf8eb1b916f71e52dbc58f36b4d4522c891009e37e0eef080817db5761c6d0ecf2816
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP/H7WAAoJEEdUh39IaPFN0rQIAIS1thPdNZzC6msP9wrNLLZc
-J+dmLbxeWPMQRqo5ENQpeIlHVlJpt9gmgrzhEIjIm0Hm0I4W/fAtH2Xnf+O//lEz
-EFKp/IaH0jx0Jym1Y2h2lCRrI10s07hTH2Sld2jmoNaSHCNv2MDAQRGWB0LzixIX
-nFpd1WTJ6YRcc+38IOUyeYtyV815e7N58/TIoGlYQVp66TqawrcAJ2+MW+Qr8CC0
-ew4GpUWkNONsee/q5wu/fKF6qsbFv+v21dxH9jQ4Aj65QbUVKRyKiplNQvOUDL9C
-Gsv+oYZ4rim7K740uMkD+Kk/qkjiUaQG5Pu8r8rNUHJFwBwwUKa/m8nDDNFxxFA=
-=iW7v
+iQEcBAEBAgAGBQJQD7UzAAoJEEdUh39IaPFNR/cH/iYjepaerdiXxJmzSmwNud5s
+XrGh/DTdp225r39oXPCa/ceg6dYW8B4aYbvUQwrAhvFSkskJ6P86kaawOwi4MI19
++ztNHfjAgXMkNoUAH9aEA6IEh83CJZhjPVVYk5L41qq5qHh0uCOrM2xqOp6FXVay
+rp7UborHiyqC+hZFX57K9oSR8FgA2TRKx3svjdTcd95XCYh3anSEcaFLI5piYJMn
+2rjyYzPeZTIULS1vnUE8mqt+7fgUEuccRq6l4erHQ2L2G4SdeyZxqlF3+/hyU+4/
+L5kjIom6ptRosFYGZ0vHeHnfogxk8Hxoo3QWmIJFrlwDMVqxGdFGGYi2YTWZgGs=
+=YIC5
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/transmission-2.61.ebuild b/net-p2p/transmission/transmission-2.61.ebuild
new file mode 100644
index 000000000000..a33b38272e59
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.61.ebuild
@@ -0,0 +1,191 @@
+# 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.61.ebuild,v 1.1 2012/07/25 08:58:37 ssuominen Exp $
+
+EAPI=4
+LANGS="en es eu kk lt pt_BR ru"
+
+inherit autotools eutils fdo-mime gnome2-utils qt4-r2 user
+
+if [[ ${PV} == *9999* ]]; then
+	ESVN_REPO_URI="svn://svn.transmissionbt.com/Transmission/trunk"
+	inherit subversion
+else
+	SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+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
+
+	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 746b0fdd4d58..e4a8a061dd52 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.9 2012/07/10 19:19:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-9999.ebuild,v 1.10 2012/07/25 08:58:37 ssuominen Exp $
 
 EAPI=4
 LANGS="en es eu kk lt pt_BR ru"
@@ -76,13 +76,6 @@ src_prepare() {
 	# 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