From e3dcfd6ae15036ccef73622ea76793ff094569fc Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Wed, 30 May 2007 21:58:19 +0000 Subject: Fix --as-needed patch to use dependencies instead of just linking. Move WANT_AUTOMAKE placement so that autotools.eclass gets dependencies automatically. Add missing dep on media-libs/imlib, which gnome-libs used to pull in. (Portage version: 2.1.2.7) --- x11-libs/gtk-canvas/ChangeLog | 9 ++++++++- x11-libs/gtk-canvas/files/0.1.1-as-needed.patch | 17 +++-------------- x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild | 14 ++++++-------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/x11-libs/gtk-canvas/ChangeLog b/x11-libs/gtk-canvas/ChangeLog index f96f0ac2c0ca..ed2788a680fc 100644 --- a/x11-libs/gtk-canvas/ChangeLog +++ b/x11-libs/gtk-canvas/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/gtk-canvas # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-canvas/ChangeLog,v 1.8 2007/05/29 08:54:36 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-canvas/ChangeLog,v 1.9 2007/05/30 21:58:19 dberkholz Exp $ + + 30 May 2007; Donnie Berkholz ; + files/0.1.1-as-needed.patch, gtk-canvas-0.1.1-r2.ebuild: + Fix --as-needed patch to use dependencies instead of just linking. Move + WANT_AUTOMAKE placement so that autotools.eclass gets dependencies + automatically. Add missing dep on media-libs/imlib, which gnome-libs used to + pull in. *gtk-canvas-0.1.1-r2 (29 May 2007) diff --git a/x11-libs/gtk-canvas/files/0.1.1-as-needed.patch b/x11-libs/gtk-canvas/files/0.1.1-as-needed.patch index 61bbe766eb46..7dee6dd277d2 100644 --- a/x11-libs/gtk-canvas/files/0.1.1-as-needed.patch +++ b/x11-libs/gtk-canvas/files/0.1.1-as-needed.patch @@ -1,17 +1,6 @@ -diff -urN gtk-canvas-0.1.1.orig/configure.in gtk-canvas-0.1.1/configure.in ---- gtk-canvas-0.1.1.orig/configure.in 2007-05-28 23:15:22.000000000 -0700 -+++ gtk-canvas-0.1.1/configure.in 2007-05-29 00:15:22.000000000 -0700 -@@ -236,6 +236,7 @@ - dnl Substitutions - dnl - -+AC_SUBST(ART_LIBS) - AC_SUBST(GTK_LIBS) - AC_SUBST(GTK_CANVAS_LIBS) - AC_SUBST(GTK_CANVAS_LIBDIR) diff -urN gtk-canvas-0.1.1.orig/gtk-canvas/Makefile.am gtk-canvas-0.1.1/gtk-canvas/Makefile.am ---- gtk-canvas-0.1.1.orig/gtk-canvas/Makefile.am 2007-05-28 23:15:22.000000000 -0700 -+++ gtk-canvas-0.1.1/gtk-canvas/Makefile.am 2007-05-28 23:15:43.000000000 -0700 +--- gtk-canvas-0.1.1.orig/gtk-canvas/Makefile.am 2007-05-30 12:13:53.000000000 -0700 ++++ gtk-canvas-0.1.1/gtk-canvas/Makefile.am 2007-05-30 12:18:57.000000000 -0700 @@ -98,5 +98,5 @@ gtk-canvastypebuiltins_evals.c @@ -19,4 +8,4 @@ diff -urN gtk-canvas-0.1.1.orig/gtk-canvas/Makefile.am gtk-canvas-0.1.1/gtk-canv -libgtk_canvas_la_LIBADD = $(LIBGTK_CANVAS_LIBS) - +libgtk_canvas_la_LIBADD = $(LIBGTK_CANVAS_LIBS) \ -+ $(ART_LIBS) ++ ${top_builddir}/libart_lgpl/libart_lgpl.la diff --git a/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild b/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild index bff32521bcd9..903d343eb2dc 100644 --- a/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild +++ b/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.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/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild,v 1.1 2007/05/29 08:54:36 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk-canvas/gtk-canvas-0.1.1-r2.ebuild,v 1.2 2007/05/30 21:58:19 dberkholz Exp $ + +WANT_AUTOMAKE="1.4" inherit eutils autotools @@ -11,7 +13,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~ppc ~x86" IUSE="" -RDEPEND="=x11-libs/gtk+-1.2*" +RDEPEND="=x11-libs/gtk+-1.2* + media-libs/imlib" DEPEND="${RDEPEND}" src_unpack() { @@ -19,12 +22,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}-as-needed.patch - WANT_AUTOMAKE="1.4" \ - automake --add-missing --copy \ - || die "automake failed" - WANT_AUTOCONF="2.1" \ - autoconf \ - || die "autoconf failed" + automake --add-missing --copy || die "automake failed" } src_install() { -- cgit v1.2.3-65-gdbad