Fix broken autotools handling.

Package-Manager: portage-2.1.2_rc4-r5

5 files changed, 45 insertions, 34 deletions

diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 534d005a5008..972767e49c8c 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/inkscape
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.55 2006/10/11 20:28:43 hanno Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.56 2007/01/04 15:05:18 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> inkscape-0.44.ebuild:
+  Fix broken autotools handling.
 
 *inkscape-0.44.1 (11 Oct 2006)
 
diff --git a/media-gfx/inkscape/inkscape-0.44.ebuild b/media-gfx/inkscape/inkscape-0.44.ebuild
index 2d4c69478446..cfb816e86de4 100644
--- a/media-gfx/inkscape/inkscape-0.44.ebuild
+++ b/media-gfx/inkscape/inkscape-0.44.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.44.ebuild,v 1.7 2006/09/07 14:31:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.44.ebuild,v 1.8 2007/01/04 15:05:18 flameeyes Exp $
 
-inherit gnome2 eutils
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+
+inherit gnome2 eutils autotools
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="http://www.inkscape.org/"
@@ -36,7 +39,7 @@ RDEPEND=">=x11-libs/gtk+-2.4.1
 	lcms? ( >=media-libs/lcms-1.14 )
 	boost? ( dev-libs/boost )
 	plugin? ( >=media-gfx/pstoedit-3.33
-	          >=media-gfx/skencil-0.6.16
+			  >=media-gfx/skencil-0.6.16
 		  media-libs/libwmf
 		  app-office/dia )
 	spell? ( app-text/gtkspell )"
@@ -62,8 +65,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/inkscape-gcc42.diff
 
-	autoconf || die
-	libtoolize --copy --force || die
+	eautoreconf
 }
 
 DOCS="AUTHORS COPYING ChangeLog HACKING NEWS README"
diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index 4880e0bcb4df..f939fe312a02 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/pixie
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.23 2006/05/06 00:38:53 eradicator Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.24 2007/01/04 15:07:44 flameeyes Exp $
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> pixie-1.6.3.ebuild:
+  Fix broken autotools handling.
 
 *pixie-1.6.3 (06 May 2006)
 
diff --git a/media-gfx/pixie/pixie-1.6.3.ebuild b/media-gfx/pixie/pixie-1.6.3.ebuild
index 98bf8bb6baef..6177a6bcedc3 100644
--- a/media-gfx/pixie/pixie-1.6.3.ebuild
+++ b/media-gfx/pixie/pixie-1.6.3.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.6.3.ebuild,v 1.1 2006/05/06 00:38:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.6.3.ebuild,v 1.2 2007/01/04 15:07:44 flameeyes Exp $
 
-inherit eutils
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools
 
 IUSE="X openexr"
 
@@ -24,25 +27,15 @@ RDEPEND="media-libs/jpeg
 	 openexr? ( media-libs/openexr )
 	 X? ( || ( x11-libs/libXext virtual/x11 ) )"
 
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	>=sys-devel/automake-1.8"
-
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
-	# Don't install a lib with a name like 'libcommon'.  Renaming it to libpixiecommon
+	# Don't install a lib with a name like 'libcommon'.	 Renaming it to libpixiecommon
 	epatch ${FILESDIR}/${PN}-1.6.3-libcommon.patch
 
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal || die
-	automake -a -f -c || die
-	autoheader || die
-	autoconf || die
+	eautoreconf
 }
 
 src_install() {
diff --git a/media-gfx/yafray/Manifest b/media-gfx/yafray/Manifest
index d46d3798de20..1aa555c22df8 100644
--- a/media-gfx/yafray/Manifest
+++ b/media-gfx/yafray/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX yafray-0.0.7-scons.patch 866 RMD160 376f7358d1e6d9a807c64d9c31ef92c281111a70 SHA1 805fc1ccf670f07f1f4e658b18a16f94a971a251 SHA256 eb742fd5b5acc74967f426611ea81f90fb8477c71616673dca8e838107e04160
 MD5 7b50d20a15ce12bca91f1354401f1351 files/yafray-0.0.7-scons.patch 866
 RMD160 376f7358d1e6d9a807c64d9c31ef92c281111a70 files/yafray-0.0.7-scons.patch 866
@@ -33,14 +36,14 @@ EBUILD yafray-0.0.8.ebuild 1167 RMD160 642e8aa67afdaf9b3f2d485f1d42535382137ce1
 MD5 a50ce3769319a1cbc2458da4771e7c4e yafray-0.0.8.ebuild 1167
 RMD160 642e8aa67afdaf9b3f2d485f1d42535382137ce1 yafray-0.0.8.ebuild 1167
 SHA256 6f92d91ec216f6066d8ff53c464d0198a7673cce974d9f2d3c1caccfbce77e89 yafray-0.0.8.ebuild 1167
-EBUILD yafray-0.0.9.ebuild 1256 RMD160 3c540ad4ffe5620d48fc45d55c965595fe0f2046 SHA1 3e14893f8c59a0fb135e350c3b1a5d6d24478653 SHA256 969fb07db13f6cc83b473d341b1e2ef44d88639812cb51d08a764a2530c90e81
-MD5 4233f86a4184b5ca579a7beedb556d66 yafray-0.0.9.ebuild 1256
-RMD160 3c540ad4ffe5620d48fc45d55c965595fe0f2046 yafray-0.0.9.ebuild 1256
-SHA256 969fb07db13f6cc83b473d341b1e2ef44d88639812cb51d08a764a2530c90e81 yafray-0.0.9.ebuild 1256
-MISC ChangeLog 4361 RMD160 7a635418449189a43db8555e2b1e960ccf2fb92b SHA1 75d6bee133554668f69468b784a729e467673179 SHA256 072406fa08bc1495dba99132f0eee42fea715d197ed22c67d2dcc38cac444bdb
-MD5 fe52da5a4369b5905458fd00576134b0 ChangeLog 4361
-RMD160 7a635418449189a43db8555e2b1e960ccf2fb92b ChangeLog 4361
-SHA256 072406fa08bc1495dba99132f0eee42fea715d197ed22c67d2dcc38cac444bdb ChangeLog 4361
+EBUILD yafray-0.0.9.ebuild 1231 RMD160 5b0b37a0ab20a732e8d9d9416be0fdfded2f9da0 SHA1 b9670699de45cb73279fe84fd1a232358d58bb80 SHA256 bf9cd4cfaae454e62373f19bcd8fdcbd8582e863d2228f93900f21436358b576
+MD5 ab08c7fdbfdff9507c8d299deb3239e4 yafray-0.0.9.ebuild 1231
+RMD160 5b0b37a0ab20a732e8d9d9416be0fdfded2f9da0 yafray-0.0.9.ebuild 1231
+SHA256 bf9cd4cfaae454e62373f19bcd8fdcbd8582e863d2228f93900f21436358b576 yafray-0.0.9.ebuild 1231
+MISC ChangeLog 4548 RMD160 f8c7dcf32d5b7792ce4019d0c2e927077af36b9f SHA1 86b4eccfea01dc1d0ca0ded703852d08d2952130 SHA256 2294c35bac7243b249f33238072ff10aaec648130813332a357aa0477abe8551
+MD5 5583ff077963a98969be33a9b0865181 ChangeLog 4548
+RMD160 f8c7dcf32d5b7792ce4019d0c2e927077af36b9f ChangeLog 4548
+SHA256 2294c35bac7243b249f33238072ff10aaec648130813332a357aa0477abe8551 ChangeLog 4548
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 metadata.xml 161
@@ -54,3 +57,10 @@ SHA256 f0109b6c66dc52b226c3b0b8888a3f24e94f99eaa5c6afbfccf4c7e402f1d1db files/di
 MD5 fa101844a617396ff91cb0b406e2865e files/digest-yafray-0.0.9 238
 RMD160 c45f85e90df28997e94550777d7c2882c11d0fe6 files/digest-yafray-0.0.9 238
 SHA256 167d7e042f7c81316edbc1e66810f67158bea16d29ed6973fbb09247f8d556ad files/digest-yafray-0.0.9 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFnRh6AiZjviIA2XgRAlvLAJ9M99XbX6aCWu66qNZ/2UafL/etVQCglKbn
+fa1YvqX051ljMsed6d9FsdA=
+=Ncxn
+-----END PGP SIGNATURE-----