Fix use of autotools

Package-Manager: portage-2.1.2_pre3-r8

3 files changed, 36 insertions, 20 deletions

diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index 798cd3c7e5fd..e8d37a7e71ed 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/sawfish
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.72 2006/10/15 00:44:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.73 2006/10/27 14:17:41 truedfx Exp $
+
+  27 Oct 2006; Harald van Dijk <truedfx@gentoo.org>
+  sawfish-1.3.20060816.ebuild:
+  Fix use of autotools
 
   15 Oct 2006; Aron Griffis <agriffis@gentoo.org>
   sawfish-1.3.20060816.ebuild:
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index c70e476413aa..8fb5c010c605 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Sawfish.desktop 449 RMD160 02c133c66b9816d252a8dabc5194483d586189c9 SHA1 9f491e1a9555f9bc5016354b414071e19425eea9 SHA256 58e5a5337604b0732484698a3b1ccda847cd2d39725346210113db0ae460f99f
 MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
 RMD160 02c133c66b9816d252a8dabc5194483d586189c9 files/Sawfish.desktop 449
@@ -58,14 +61,14 @@ EBUILD sawfish-1.3.20050816.ebuild 2719 RMD160 7801c83e499c4f1742ca288598b805de5
 MD5 90bf1f21dfdd1a4cc36cfa3b7055a07c sawfish-1.3.20050816.ebuild 2719
 RMD160 7801c83e499c4f1742ca288598b805de53d6d5cb sawfish-1.3.20050816.ebuild 2719
 SHA256 188a3c87e66ff26e02ceea57318f577d5117ed9f470516ddd09715a1de49d1c1 sawfish-1.3.20050816.ebuild 2719
-EBUILD sawfish-1.3.20060816.ebuild 3068 RMD160 5066a2ab28f6a79645c668d53571538e7419b791 SHA1 f5c4ee555aa8afc62c7266e3141a423f07aa7e43 SHA256 133310bb3841886acefef59f837a85ad516648d2540b03edddc07fcda2cf2453
-MD5 7334e2dbd9aca5898d306c953a8a7bec sawfish-1.3.20060816.ebuild 3068
-RMD160 5066a2ab28f6a79645c668d53571538e7419b791 sawfish-1.3.20060816.ebuild 3068
-SHA256 133310bb3841886acefef59f837a85ad516648d2540b03edddc07fcda2cf2453 sawfish-1.3.20060816.ebuild 3068
-MISC ChangeLog 11600 RMD160 9bcfe5e0b8bfa65e2024c93796f66941aad53b08 SHA1 d154e30271644066d1c690f141057f060bf56439 SHA256 70399e960c39d7e64d1c9f120e8b6ca7804cd79a41a30eb277cbb64bf6618842
-MD5 3adeef9e9152cf2960290d2e7c39e10d ChangeLog 11600
-RMD160 9bcfe5e0b8bfa65e2024c93796f66941aad53b08 ChangeLog 11600
-SHA256 70399e960c39d7e64d1c9f120e8b6ca7804cd79a41a30eb277cbb64bf6618842 ChangeLog 11600
+EBUILD sawfish-1.3.20060816.ebuild 3008 RMD160 13232ca1ccdecffcd8d71fc5a6183b6710894802 SHA1 43abaa8cd5d12c6d15801255eaddc7a3cf36c019 SHA256 92bc94c7b985e61d1699171b526ff48b198d9211d8f4618017ba370f60479da8
+MD5 0ad9233a981ee634f1a686bb3f0f1a80 sawfish-1.3.20060816.ebuild 3008
+RMD160 13232ca1ccdecffcd8d71fc5a6183b6710894802 sawfish-1.3.20060816.ebuild 3008
+SHA256 92bc94c7b985e61d1699171b526ff48b198d9211d8f4618017ba370f60479da8 sawfish-1.3.20060816.ebuild 3008
+MISC ChangeLog 11706 RMD160 f0de31f4352bd35a8b37000ff5aecb552e430ba1 SHA1 30e9bb4d0404f740bc49fea297c5e3287cbef7f5 SHA256 a652eb7eeccc8027fc23977e8e7d6d90c35528524b0498e91e19c544fd811eb2
+MD5 6a346524f713523f1ef3edbaa3443d25 ChangeLog 11706
+RMD160 f0de31f4352bd35a8b37000ff5aecb552e430ba1 ChangeLog 11706
+SHA256 a652eb7eeccc8027fc23977e8e7d6d90c35528524b0498e91e19c544fd811eb2 ChangeLog 11706
 MISC metadata.xml 252 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e SHA1 f0acfb091052a67f482b06271d0ff89796dded07 SHA256 0db1ac5dbd8480024e1398a144440c9f0b77d5edf03789905ed31ae1d284aaf2
 MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
 RMD160 e1e9d40a05f958564b97dce796d3575508fb3b2e metadata.xml 252
@@ -88,3 +91,10 @@ SHA256 bfb44f484f8df1fa3ec2a606c7d52d54aa7e495d08f391119f21c8b830e6bfcf files/di
 MD5 99dabe5f9c08d10c8f669cb3a47b1a09 files/digest-sawfish-1.3.20060816 268
 RMD160 dcee73d6b3ab66783e702abe105582cc85e0de25 files/digest-sawfish-1.3.20060816 268
 SHA256 28d87598d8af8244e47218422eb9ab7f7f27788fb9e1b7e8b0abdf1200c3193e files/digest-sawfish-1.3.20060816 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQhUNwnQyISwouHwRAvbFAJ9/3bNWdpVLZfEzCfyNoDxPmW3rYQCbBtK/
+O1RQ7g2m1ihw8epU2uBNcy4=
+=st7N
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
index 865460524ee3..c912b72d3fc6 100644
--- a/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20060816.ebuild
@@ -1,12 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20060816.ebuild,v 1.2 2006/10/15 00:44:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20060816.ebuild,v 1.3 2006/10/27 14:17:41 truedfx Exp $
 
 # detect cvs snapshots; fex. 1.3.20040120
 [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
 (( snapshot = !$? ))
 
-inherit eutils
+if (( snapshot )); then
+	WANT_AUTOCONF=latest
+	WANT_AUTOMAKE=latest
+	inherit eutils autotools
+else
+	inherit eutils
+fi
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
@@ -31,9 +37,6 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 RDEPEND="${DEPEND}"
 
 if (( snapshot )); then
-	DEPEND="${DEPEND}
-		sys-devel/automake
-		sys-devel/autoconf"
 	S="${WORKDIR}/${PN}"
 fi
 
@@ -48,6 +51,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/sawfish-xft-menu-utf8.patch
 	# Fix KDE menus
 	epatch "${FILESDIR}"/sawfish-kde-menus.patch
+
+	if (( snapshot )); then
+		eaclocal || die
+		eautoconf || die
+	fi
 }
 
 src_compile() {
@@ -56,12 +64,6 @@ src_compile() {
 	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
 	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
 
-	# If this is a snapshot then we need to create the autoconf stuff
-	if (( snapshot )); then
-		aclocal || die "aclocal failed"
-		autoconf || die "autoconf failed"
-	fi
-
 	set -- \
 		--disable-themer \
 		--with-gdk-pixbuf \