fix builds for non-gtk builds (bug #198225)

Package-Manager: portage-2.1.3.16

4 files changed, 70 insertions, 10 deletions

diff --git a/net-p2p/transmission/ChangeLog b/net-p2p/transmission/ChangeLog
index 71c78e233d57..64e741c1d195 100644
--- a/net-p2p/transmission/ChangeLog
+++ b/net-p2p/transmission/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/transmission
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.38 2007/11/09 22:08:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/ChangeLog,v 1.39 2007/11/10 03:53:32 compnerd Exp $
+
+  10 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/transmission-0.91-potfiles-fix.patch, transmission-0.91.ebuild:
+  Add patch from upstream to fix po/Makefile generation on !gtk
 
   09 Nov 2007; nixnut <nixnut@gentoo.org> ChangeLog:
   Added ~ppc wrt bug 198114
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 7909d88257ed..6a499957c64e 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,3 +1,7 @@
+AUX transmission-0.91-potfiles-fix.patch 1417 RMD160 6eb8d715571adade650f15fc161a37a4f37cf5a3 SHA1 0588488ece8d98528f13e6c2684eb8ce6acdcf96 SHA256 427a3bdff649cde3cd4b88cd351b216d89d1e5f8229460cd9c829117d0019d3d
+MD5 281d0c985cda7357786af2ae6c36515a files/transmission-0.91-potfiles-fix.patch 1417
+RMD160 6eb8d715571adade650f15fc161a37a4f37cf5a3 files/transmission-0.91-potfiles-fix.patch 1417
+SHA256 427a3bdff649cde3cd4b88cd351b216d89d1e5f8229460cd9c829117d0019d3d files/transmission-0.91-potfiles-fix.patch 1417
 AUX transmission.png 5240 RMD160 b51eb46cbc4655d650108af694c2150de4861e6f SHA1 f6b704231147eb3918a7113c1155eaffca981b5c SHA256 a7191f0388ae29307934fe99d4cf298aac7f0edc6aac4a1ee518910267a76bf2
 MD5 7aad93e74f8a72ccc79bdd1f64655e65 files/transmission.png 5240
 RMD160 b51eb46cbc4655d650108af694c2150de4861e6f files/transmission.png 5240
@@ -17,14 +21,14 @@ EBUILD transmission-0.82.ebuild 1109 RMD160 03de08e83cc7369bedf4f2eb686ee4ba09c1
 MD5 228120d268dd929316458efcbb96c42a transmission-0.82.ebuild 1109
 RMD160 03de08e83cc7369bedf4f2eb686ee4ba09c18599 transmission-0.82.ebuild 1109
 SHA256 3fcfe961576989149bdb076ce71f452fe24aa4833645821aa079a9299f6af755 transmission-0.82.ebuild 1109
-EBUILD transmission-0.91.ebuild 906 RMD160 486c72e7cfa7143b5858db70af079051291d58d9 SHA1 0e5606dfe31484ba9253bb5ab9f72ab7ad920a1a SHA256 6bc0023668877a1334f7e555f378dd0b6e463145177f380de08f318831546683
-MD5 be5b732eecc817411358b042b6398fec transmission-0.91.ebuild 906
-RMD160 486c72e7cfa7143b5858db70af079051291d58d9 transmission-0.91.ebuild 906
-SHA256 6bc0023668877a1334f7e555f378dd0b6e463145177f380de08f318831546683 transmission-0.91.ebuild 906
-MISC ChangeLog 5701 RMD160 13bba198d29e48d464bd849573d5930c0e2d4fc1 SHA1 b134805144f7449ddcb8be44cd99c006ea25f858 SHA256 047d08cc75d8065e889f1242ddfa55735548180fc599a58f6d3d407b2267d0be
-MD5 8a93e77f4d3640079320279d7f958dac ChangeLog 5701
-RMD160 13bba198d29e48d464bd849573d5930c0e2d4fc1 ChangeLog 5701
-SHA256 047d08cc75d8065e889f1242ddfa55735548180fc599a58f6d3d407b2267d0be ChangeLog 5701
+EBUILD transmission-0.91.ebuild 1104 RMD160 4d33a26f252bdf3519ef83cbb8874bbc6417b644 SHA1 57d05be13482359dfa909f0fb0c698cc63cb17d8 SHA256 3597e9ff0281ac57987bf4814e9c3d617efdbbbf4956181dba50fc4cf58e6007
+MD5 4b77b9ab952a31256a144ba4dd4645d7 transmission-0.91.ebuild 1104
+RMD160 4d33a26f252bdf3519ef83cbb8874bbc6417b644 transmission-0.91.ebuild 1104
+SHA256 3597e9ff0281ac57987bf4814e9c3d617efdbbbf4956181dba50fc4cf58e6007 transmission-0.91.ebuild 1104
+MISC ChangeLog 5897 RMD160 32f88a2afc24e47bd9cb63f9b18963fccc2f8259 SHA1 aac3ba2b8db42a5bfef64375b597e7c60af82726 SHA256 82d5573afae920d5d7ccdc13efa68d52179ad0aede0fc5b34c2c07f6f6c90c2f
+MD5 e002d1c7158ea3d42c36eb5972a6ebba ChangeLog 5897
+RMD160 32f88a2afc24e47bd9cb63f9b18963fccc2f8259 ChangeLog 5897
+SHA256 82d5573afae920d5d7ccdc13efa68d52179ad0aede0fc5b34c2c07f6f6c90c2f ChangeLog 5897
 MISC metadata.xml 256 RMD160 1e8f3909f98a75028074f104668403133ae0a9dd SHA1 f14bee3db63cce2f7cbed2481752d574a1de2270 SHA256 5ae8d1889a4d63677b13e2ab9d2a436c102ab8c6139edc1ad68058241a882700
 MD5 fec9ad855eb2ec07ed1b51155349a873 metadata.xml 256
 RMD160 1e8f3909f98a75028074f104668403133ae0a9dd metadata.xml 256
diff --git a/net-p2p/transmission/files/transmission-0.91-potfiles-fix.patch b/net-p2p/transmission/files/transmission-0.91-potfiles-fix.patch
new file mode 100644
index 000000000000..8eb19a29e5e9
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-0.91-potfiles-fix.patch
@@ -0,0 +1,39 @@
+Index: /branches/0.9x/configure.ac

+===================================================================

+--- /branches/0.9x/configure.ac (revision 3665)

++++ /branches/0.9x/configure.ac (revision 3686)

+@@ -93,13 +93,11 @@

+ AC_SUBST(GTK_CFLAGS)

+ 

+-if test "x$use_gtk" = "xyes"; then

+-    IT_PROG_INTLTOOL([0.23],[no-xml])

+-    GETTEXT_PACKAGE=transmission

+-    AC_SUBST(GETTEXT_PACKAGE)

+-    AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])

+-    AM_GLIB_GNU_GETTEXT

+-    transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'

+-    AC_SUBST(transmissionlocaledir)

+-fi

++IT_PROG_INTLTOOL([0.23],[no-xml])

++GETTEXT_PACKAGE=transmission

++AC_SUBST(GETTEXT_PACKAGE)

++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])

++AM_GLIB_GNU_GETTEXT

++transmissionlocaledir='${prefix}/${DATADIRNAME}/locale'

++AC_SUBST(transmissionlocaledir)

+ 

+ dnl ----------------------------------------------------------------------------

+@@ -215,10 +213,7 @@

+                  macosx/Makefile

+                  wx/Makefile

+-                 wx/images/Makefile])

+-

+-if test "x$use_gtk" = "xyes"; then

+-    AC_CONFIG_FILES([gtk/Makefile

+-                     po/Makefile.in])

+-fi

++                 wx/images/Makefile

++                 gtk/Makefile

++                 po/Makefile.in])

+ 

+ ac_configure_args="$ac_configure_args --enable-static --disable-shared -q"

diff --git a/net-p2p/transmission/transmission-0.91.ebuild b/net-p2p/transmission/transmission-0.91.ebuild
index 51a2710ee98d..77944909c53f 100644
--- a/net-p2p/transmission/transmission-0.91.ebuild
+++ b/net-p2p/transmission/transmission-0.91.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-0.91.ebuild,v 1.1 2007/11/05 00:10:22 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/transmission/transmission-0.91.ebuild,v 1.2 2007/11/10 03:53:32 compnerd Exp $
+
+inherit autotools
 
 DESCRIPTION="Simple BitTorrent client"
 HOMEPAGE="http://transmission.m0k.org/"
@@ -20,6 +22,17 @@ DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.19
 		gtk? ( >=dev-util/intltool-0.35 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix po/Makefile generation (bug #198225)
+	if ! use gtk ; then
+		epatch "${FILESDIR}/${PN}-0.91-potfiles-fix.patch"
+		eautoreconf
+	fi
+}
+
 src_compile() {
 	econf $(use_with gtk) $(use_with wxwindows wx) || die "configure failed"
 	emake || die "build failed"