summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2007-11-10 03:53:32 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2007-11-10 03:53:32 +0000
commit0e6fbee751415a9de310dc5916d7770286f8c47d (patch)
tree7170f42742d21e062b2a06fe66dd0497ac4456d2 /net-p2p/transmission
parentemul-linux-x86-baselibs mask for internal testing (diff)
downloadgentoo-2-0e6fbee751415a9de310dc5916d7770286f8c47d.tar.gz
gentoo-2-0e6fbee751415a9de310dc5916d7770286f8c47d.tar.bz2
gentoo-2-0e6fbee751415a9de310dc5916d7770286f8c47d.zip
fix builds for non-gtk builds (bug #198225)
(Portage version: 2.1.3.16)
Diffstat (limited to 'net-p2p/transmission')
-rw-r--r--net-p2p/transmission/ChangeLog6
-rw-r--r--net-p2p/transmission/files/transmission-0.91-potfiles-fix.patch39
-rw-r--r--net-p2p/transmission/transmission-0.91.ebuild15
3 files changed, 58 insertions, 2 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/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"