Run intltoolize because tarball was generated with broken 0.40.6 wrt #276053. Restore Qt4 version wrt #275130 and execute make_desktop_entry for it.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 32 insertions, 35 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 79851e35e338..5f80693cf3a8 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.86 2009/06/21 10:46:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.87 2009/07/12 16:12:46 ssuominen Exp $
+
+  12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  transmission-1.72.ebuild:
+  Run intltoolize because tarball was generated with broken 0.40.6 wrt
+  #276053. Restore Qt4 version wrt #275130 and execute make_desktop_entry
+  for it.
 
   21 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> ChangeLog:
   Force signing.
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 454358ff15ce..26fb255b0e44 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX transmission-daemon.confd.1 1519 RMD160 decaf106064e8c393fce35758d6dc63e8302cc5c SHA1 372fd7f999a1c2f14fb24a8fe40094013774f673 SHA256 45ed8e0b966267d671acaff7d130cd843ba7aeac6773db2564e2aa9b2cbc2149
 AUX transmission-daemon.initd.2 3953 RMD160 f78589fe9de1db4160aa7c6333cef1fc835c0888 SHA1 7ca57cd2135688d27401441667cc373e22434bd1 SHA256 0266ecb32e9a359b078a61c8ba40413d9d222b6622b6f7d5e8fc0a4e2ed7587d
 DIST transmission-1.61.tar.bz2 4741686 RMD160 0648113edfc4f7869c1c75e6ed146e693f60b7a8 SHA1 68011e681f6c52370ea98b039874dc16655f68d5 SHA256 3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
 DIST transmission-1.72.tar.bz2 4810233 RMD160 eeb5e68d328c8e0e15a2f8ffeea38040d2be84f8 SHA1 18d25c031d4aaf3b8ae546d5b4b492672214ef0a SHA256 71fa9f8a8c946111a991b7bc7ccc5182578dfc77a301b7e801791cc4b3c15353
 EBUILD transmission-1.61.ebuild 1699 RMD160 d3f0faafeaa84383c33a5c66c13880581f85f676 SHA1 a9cfd0a2a3d2c3c752cb76e768996d452d7e4a67 SHA256 0021fa0ff99f331d0841d525f7b701ed5275965a65e0d01ff0ac5fce7a239981
-EBUILD transmission-1.72.ebuild 2111 RMD160 51a4ed43bdee96ccc303db63d3046d8234288345 SHA1 f269fc96ed90cbdc06e627617c186daaa43dc257 SHA256 7b7b8bae1eb6c943a6d91d13b5198ee51c73ba57f8f22996bd7dc054028b2c96
-MISC ChangeLog 13270 RMD160 4b8ae43bc26175b019e0be4b7c1f7e14f23daaa7 SHA1 a31dfcfa1f54f76d1a12b0696fb65bc52dbab120 SHA256 0657f72802248994ea338186019bf3237420f4c976422d1888614c90ecd9b56d
+EBUILD transmission-1.72.ebuild 2199 RMD160 c55a6c85e586ce5c36caae56e4a783ad2b42a642 SHA1 1b1c65ea1c6d415bbdf93307cc1cddb94a2f5bbb SHA256 4078fa6a19e63ad567cb613548810a91e782a32b85d803ad29759cdfeefbe684
+MISC ChangeLog 13508 RMD160 581461d33b1473af8295a1a8124339c899daf4dc SHA1 f5367627b9dd8b9060dbe111b37d68656ce3b47d SHA256 5511571640c8f041e9c50a098b74dc36160eb6d5b8960be5f0ff25a02e5c87d2
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
-
-iEYEARECAAYFAko+D4QACgkQAiZjviIA2XinWwCffD0Iany65hLEFdjyIcdPJLKj
-a9QAoM/mcqvsqvkHn9Ce7lXC2dYwKgLK
-=LcIO
------END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/transmission-1.72.ebuild b/net-p2p/transmission/transmission-1.72.ebuild
index 3ef2ce496b7a..51f48a33a112 100644
--- a/net-p2p/transmission/transmission-1.72.ebuild
+++ b/net-p2p/transmission/transmission-1.72.ebuild
@@ -1,13 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-1.72.ebuild,v 1.2 2009/06/21 10:45:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-1.72.ebuild,v 1.3 2009/07/12 16:12:46 ssuominen Exp $
 
-# qt4 client is disabled because of upstream regression in bug
-# http://trac.transmissionbt.com/ticket/2169, but you can uncomment
-# it here unless you don't provide a patch for the .pro file.
 EAPI=2
-inherit autotools fdo-mime gnome2-utils
-# qt4
+inherit autotools eutils fdo-mime gnome2-utils qt4
 
 DESCRIPTION="A Fast, Easy and Free BitTorrent client"
 HOMEPAGE="http://www.transmissionbt.com"
@@ -16,8 +12,7 @@ SRC_URI="http://download.${PN}bt.com/${PN}/files/${P}.tar.bz2"
 LICENSE="MIT GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="gtk libnotify"
-# qt4
+IUSE="gtk libnotify qt4"
 
 RDEPEND=">=dev-libs/libevent-1.4.11
 	<dev-libs/libevent-2
@@ -27,8 +22,8 @@ RDEPEND=">=dev-libs/libevent-1.4.11
 	gtk? ( >=dev-libs/glib-2.15.5:2
 		>=x11-libs/gtk+-2.6:2
 		>=dev-libs/dbus-glib-0.70
-		libnotify? ( >=x11-libs/libnotify-0.4.3 ) )"
-#	qt4? ( x11-libs/qt-gui:4 )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 ) )
+	qt4? ( x11-libs/qt-gui:4 )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
 	sys-devel/gettext
@@ -38,6 +33,10 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	sed -e 's:-g -O0::g' -e 's:-g -O3::g' -i configure.ac || die "sed failed"
+	sed -e \
+		's:$${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a:-levent:' \
+		-i qt/qtr.pro || die "sed failed"
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
@@ -47,19 +46,19 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable libnotify)
 
-#	if use qt4; then
-#		cd qt
-#		eqmake4 qtr.pro
-#	fi
+	if use qt4; then
+		cd qt
+		eqmake4 qtr.pro
+	fi
 }
 
 src_compile() {
 	emake || die "emake failed"
 
-#	if use qt4; then
-#		cd qt
-#		emake || die "emake failed"
-#	fi
+	if use qt4; then
+		cd qt
+		emake || die "emake failed"
+	fi
 }
 
 src_install() {
@@ -71,10 +70,12 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}-daemon.initd.2 ${PN}-daemon
 	newconfd "${FILESDIR}"/${PN}-daemon.confd.1 ${PN}-daemon
 
-#	if use qt4; then
-#		cd qt
-#		emake INSTALL_ROOT="${D}/usr" install || die "emake install failed"
-#	fi
+	if use qt4; then
+		cd qt
+		emake INSTALL_ROOT="${D}/usr" install || die "emake install failed"
+		make_desktop_entry qtr "Transmission Qt BitTorrent Client" ${PN} \
+			"Network;FileTransfer;P2P;Qt"
+	fi
 }
 
 pkg_preinst() {