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.

Package-Manager: portage-2.1.2.7

4 files changed, 29 insertions, 35 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 <dberkholz@gentoo.org>;
+  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/Manifest b/x11-libs/gtk-canvas/Manifest
index eca258a6a0ec..8a8daa9111fc 100644
--- a/x11-libs/gtk-canvas/Manifest
+++ b/x11-libs/gtk-canvas/Manifest
@@ -1,20 +1,20 @@
-AUX 0.1.1-as-needed.patch 856 RMD160 4742396640b6945cf0ccbadda756a0e9f65c608e SHA1 c4e2218255feedeb00e1d7f7efa0227e9a9849d9 SHA256 ada161a47316e733fd78e916fcaf371b4cb8585fd8b6da2c78aa0389a698ae4c
-MD5 5a9a598a78657a5f3e20469bfe57db32 files/0.1.1-as-needed.patch 856
-RMD160 4742396640b6945cf0ccbadda756a0e9f65c608e files/0.1.1-as-needed.patch 856
-SHA256 ada161a47316e733fd78e916fcaf371b4cb8585fd8b6da2c78aa0389a698ae4c files/0.1.1-as-needed.patch 856
+AUX 0.1.1-as-needed.patch 525 RMD160 4e64d02831f3098333341f1bd3f438dac7b5122d SHA1 d070a88255bc10fd6a658eaba82a84a5af48c37a SHA256 5930c0456642b08c3f1a1590e71c356b90c4726b6836204d5a32b91dcb090d73
+MD5 31784b5bac63982e8631be9e5958f610 files/0.1.1-as-needed.patch 525
+RMD160 4e64d02831f3098333341f1bd3f438dac7b5122d files/0.1.1-as-needed.patch 525
+SHA256 5930c0456642b08c3f1a1590e71c356b90c4726b6836204d5a32b91dcb090d73 files/0.1.1-as-needed.patch 525
 DIST gtk-canvas-0.1.1.tar.gz 657955 RMD160 31051d69b4bbc43bb2f515179fae09327e7864a1 SHA1 5089f481dbd795e164078cf3f48f2d6bd4a0ab69 SHA256 67d33da4129b5ca75fd1b59a62458dacfaad4e0251528294b8ebcfb148afd331
 EBUILD gtk-canvas-0.1.1-r1.ebuild 686 RMD160 358e713a1c3666583ff032cf93f6116a6d46b528 SHA1 691e7f90e77a40b66a2978d27deb59ef59b5f38e SHA256 d58c16db36f0c5be15a6602a28e28034f7033f0ba5a6590da91bcd07a4bcb271
 MD5 be61b8b568f7a72ee6726e216137631b gtk-canvas-0.1.1-r1.ebuild 686
 RMD160 358e713a1c3666583ff032cf93f6116a6d46b528 gtk-canvas-0.1.1-r1.ebuild 686
 SHA256 d58c16db36f0c5be15a6602a28e28034f7033f0ba5a6590da91bcd07a4bcb271 gtk-canvas-0.1.1-r1.ebuild 686
-EBUILD gtk-canvas-0.1.1-r2.ebuild 822 RMD160 3a52d1bf9c1d07dee32c988e2c8140af6a9c9310 SHA1 0a0496cd50ce0deeacc2f0e991ef9cb8c3a654cd SHA256 0630fd07097447ac634adcaafc19e7fd43a4c6c856ea22de973c27a9c23d2b03
-MD5 6c0412f12d602811e1d2db0cd88cd039 gtk-canvas-0.1.1-r2.ebuild 822
-RMD160 3a52d1bf9c1d07dee32c988e2c8140af6a9c9310 gtk-canvas-0.1.1-r2.ebuild 822
-SHA256 0630fd07097447ac634adcaafc19e7fd43a4c6c856ea22de973c27a9c23d2b03 gtk-canvas-0.1.1-r2.ebuild 822
-MISC ChangeLog 1512 RMD160 b10f22d9fd2076a7730e0fd3d18bd69e942a660a SHA1 9e086bb50a59c6a7d231869a2a4c305aed8735ee SHA256 2e0343601cd6e87b8385a9c43906d76963d00e5c8c5f38c1dc35a89edb44ab34
-MD5 acdd259d3fe09196c69b65c43b5abcec ChangeLog 1512
-RMD160 b10f22d9fd2076a7730e0fd3d18bd69e942a660a ChangeLog 1512
-SHA256 2e0343601cd6e87b8385a9c43906d76963d00e5c8c5f38c1dc35a89edb44ab34 ChangeLog 1512
+EBUILD gtk-canvas-0.1.1-r2.ebuild 770 RMD160 a683d508238536b0f55f5a22ac045971cbfdfe53 SHA1 1156e36623580093af2b96d0ce161cb85edce2f3 SHA256 22ba5579cac32ce3d894d4465f6e66f367d8df3627fe166b8ddc4add25ca3476
+MD5 b94b5968250295956490fd2d49ef624b gtk-canvas-0.1.1-r2.ebuild 770
+RMD160 a683d508238536b0f55f5a22ac045971cbfdfe53 gtk-canvas-0.1.1-r2.ebuild 770
+SHA256 22ba5579cac32ce3d894d4465f6e66f367d8df3627fe166b8ddc4add25ca3476 gtk-canvas-0.1.1-r2.ebuild 770
+MISC ChangeLog 1860 RMD160 cbfe4df15aad16c812742f749e7895189eb6e05b SHA1 43cc0ecfe746852ba86fe2266f8e96b32fae296a SHA256 4206a2e5c14bd09531aec62d09ac147ed2d1803d51ed97ccc51ab6a25492c9ce
+MD5 464bd76696658d77c395fad3e6079cec ChangeLog 1860
+RMD160 cbfe4df15aad16c812742f749e7895189eb6e05b ChangeLog 1860
+SHA256 4206a2e5c14bd09531aec62d09ac147ed2d1803d51ed97ccc51ab6a25492c9ce ChangeLog 1860
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166
 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166
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() {