summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2006-05-06 19:54:36 +0000
committerJory Pratt <anarchy@gentoo.org>2006-05-06 19:54:36 +0000
commit9eac4e173ccd04e5423fd696360692b721f9c9b3 (patch)
treeb5059e9fd68437602c64cc0cdf6fd4a9621db427 /net-im
parentAdd jingle useflag, many thanks go to Erdroh Moshan <ErDroh@gmx.de> for bug 1... (diff)
downloadhistorical-9eac4e173ccd04e5423fd696360692b721f9c9b3.tar.gz
historical-9eac4e173ccd04e5423fd696360692b721f9c9b3.tar.bz2
historical-9eac4e173ccd04e5423fd696360692b721f9c9b3.zip
as-needed patch changed out with patch I sent upstream that has been accepted
Package-Manager: portage-2.1_pre10-r3
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog7
-rw-r--r--net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch11
-rw-r--r--net-im/gaim/gaim-2.0.0_beta3.ebuild8
3 files changed, 22 insertions, 4 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 77be17117e05..4bcea95764a1 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/gaim
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.388 2006/04/30 02:26:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.389 2006/05/06 19:54:35 anarchy Exp $
+
+ 06 May 2006; Jory A. Pratt <anarchy@gentoo.org>
+ -files/gaim-2.0.0-as-needed.patch,
+ +files/gaim-2.0.0_beta3-as-needed.patch, gaim-2.0.0_beta3.ebuild:
+ patch for as-needed changed out, as it has been accpeted upstream
30 Apr 2006; Jory A. Pratt <anarchy@gentoo.org>
+files/gaim-2.0.0-as-needed.patch, gaim-2.0.0_beta3.ebuild:
diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch b/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch
new file mode 100644
index 000000000000..066e2c5e4ffe
--- /dev/null
+++ b/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am.org 2006-05-05 19:09:26.785534520 -0500
++++ src/Makefile.am 2006-05-05 19:09:38.371773144 -0500
+@@ -199,6 +199,8 @@
+
+ libgaim_client_la_SOURCES = gaim-client.c gaim-client.h
+
++libgaim_client_la_LIBADD = $(DBUS_LIBS)
++
+ gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
+ cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
+
diff --git a/net-im/gaim/gaim-2.0.0_beta3.ebuild b/net-im/gaim/gaim-2.0.0_beta3.ebuild
index e23d25b2b763..0fdcc0596077 100644
--- a/net-im/gaim/gaim-2.0.0_beta3.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.4 2006/04/30 02:26:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.5 2006/05/06 19:54:35 anarchy Exp $
-inherit flag-o-matic eutils toolchain-funcs debug multilib mono
+inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools
MY_PV=${PV/_beta/beta}
MY_P="${PN}-${MY_PV}"
@@ -112,7 +112,9 @@ src_unpack() {
unpack ${A}
cd ${S}
- epatch ${FILESDIR}/${PN}-2.0.0-as-needed.patch
+ epatch ${FILESDIR}/${P}-as-needed.patch
+
+ eautomake || die "Failed running eautomake"
}
src_compile() {