Make it build on my system - add intltool/gettext to hard deps, fixes bug #379887. Reorder deps alphabetically. Depend on any ssl provided by curl.

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

3 files changed, 29 insertions, 26 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index eb38c84c4d41..656155d0b09a 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/transmission
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.160 2011/12/04 10:35:07 swegener Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.161 2012/01/02 21:41:29 scarabeus Exp $
+
+  02 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  transmission-2.41.ebuild:
+  Make it build on my system - add intltool/gettext to hard deps, fixes bug
+  #379887. Reorder deps alphabetically. Depend on any ssl provided by curl.
 
   04 Dec 2011; Sven Wegener <swegener@gentoo.org>
   files/transmission-daemon.initd.6, files/transmission-daemon.initd.7,
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 1a7c923ffded..ed427f1207b4 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 AUX transmission-2.31-0003-system-miniupnpc.patch 22326 RMD160 9042f531db97c5caec503ef8a560ad172d0fb922 SHA1 7fd5b162da193a1b4abd029756c676a40bd9c66d SHA256 79c2128a2e399d8cad19a885a7cc3c12b09d9cd3cdbff83c2aa07eb1d3e8ce10
@@ -24,13 +21,6 @@ EBUILD transmission-2.31-r1.ebuild 4186 RMD160 b73a2ad82fc17b03adf6f622cf984f061
 EBUILD transmission-2.31.ebuild 3614 RMD160 6aea3b61e03e52aa67dc93a3fad133e9b4804aa1 SHA1 1efec7a48458a81996572e4e18eb9c336a37b66f SHA256 46928432ead81af791d9f5f258d34ec8cfbc767f91dd7b6e458713dfa765fd2f
 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 3953 RMD160 8f8ef7aa147d04654413ce4fc62ecddfa53b4de7 SHA1 e4d032dfaf618d6abaf33abb53faf514bb3bcaf3 SHA256 94e57f6e87bec5ba578cda3cbc408d6069a1414218da8fc6ab01ee66e0ee2511
-MISC ChangeLog 27710 RMD160 2ba021ce974646b4bc4cdfe23bcda8f967a4b59b SHA1 f41fe94f8a931594aafb1d50506d92dafceff49c SHA256 4c9f6447a05d2508201c3fddcee31760019a764af9b295cdad2afc138f8e8184
+EBUILD transmission-2.41.ebuild 4087 RMD160 fceeea76e6c1ea692ff9b20862c7758b89af4c6e SHA1 3d0741993c3a6720e688884a67aef38d816ab225 SHA256 d0e285af773cb32efcd3f082888cde153b29ed53c7c28fbebb5550bd11fcde48
+MISC ChangeLog 27947 RMD160 0d47314cf7cb1b15cb07249f8e0df276cb5ad155 SHA1 93ef1eab8db9cf672bd5a4ca6e8a9c8335067ff2 SHA256 c25feb58567fcadf7e3e89019c8563c310f1a6945ed8d9256acc0e463c6d68d8
 MISC metadata.xml 444 RMD160 eb5aae9bdea645819e40b675f8372ded120d5783 SHA1 4b0f30908cea35a0fc8aca9cbe29599a0f833ab4 SHA256 ae66598063f3fa803005a3daf431d4dc4171e6988c38c128e6565910855dfaa9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7bTOAACgkQI1lqEGTUzyS6/ACfRR/QbjWPx7EeODQd5MOp8j01
-N60AoNSJrEj2aPMgpB1TG9p63K7fWPxs
-=3oqS
------END PGP SIGNATURE-----
diff --git a/net-p2p/transmission/transmission-2.41.ebuild b/net-p2p/transmission/transmission-2.41.ebuild
index 701596fc6545..f56af9e3ec58 100644
--- a/net-p2p/transmission/transmission-2.41.ebuild
+++ b/net-p2p/transmission/transmission-2.41.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.41.ebuild,v 1.3 2011/11/26 22:41:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-2.41.ebuild,v 1.4 2012/01/02 21:41:29 scarabeus Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils qt4-r2 autotools
@@ -17,22 +17,30 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gtk kde nls qt4 utp"
 
 RDEPEND="
-	sys-libs/zlib
 	>=dev-libs/libevent-2.0.10
 	>=dev-libs/openssl-0.9.4
-	|| ( >=net-misc/curl-7.16.3[ssl]
-		>=net-misc/curl-7.16.3[gnutls] )
+	>=net-misc/curl-7.16.3[ssl]
 	>=net-libs/miniupnpc-1.6
-	gtk? ( >=dev-libs/glib-2.28:2
+	sys-libs/zlib
+	gtk? (
+		>=dev-libs/dbus-glib-0.70
+		>=dev-libs/glib-2.28:2
 		>=x11-libs/gtk+-2.22:2
-		>=dev-libs/dbus-glib-0.70 )
+	)
 	qt4? ( x11-libs/qt-gui:4[dbus] )"
 DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.40 )
+	dev-util/intltool
 	dev-util/pkgconfig
-	sys-apps/sed"
+	sys-apps/sed
+	sys-devel/gettext
+	>=sys-devel/libtool-2.2.6b
+	nls? (
+		>=dev-util/intltool-0.40
+		sys-devel/gettext
+	)"
+# Intltool/gettext are required as far as we eautoreconf for
+# its autotools macros.
+# If the source is not eautoreconfed we can keep it in nls.
 
 S="${WORKDIR}/${MY_P}"
 
@@ -94,7 +102,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	dodoc AUTHORS NEWS qt/README.txt
 	rm -f "${ED}"/usr/share/${PN}/web/LICENSE