Use autotools eclass. See bug #125950.

(Portage version: 2.1_pre7)

4 files changed, 29 insertions, 41 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 0aa5ddb8f7ce..2994063c6cce 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.60 2006/03/20 00:14:54 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.61 2006/04/16 18:29:10 latexer Exp $
+
+  16 Apr 2006; Peter Johanson <latexer@gentoo.org> gtk-sharp-2.4.2.ebuild,
+  gtk-sharp-2.8.2.ebuild:
+  Use autotools eclass. See bug #125950.
 
   20 Mar 2006; Luis Medinas <metalgod@gentoo.org> gtk-sharp-1.0.10.ebuild:
   Stable on amd64.
diff --git a/dev-dotnet/gtk-sharp/Manifest b/dev-dotnet/gtk-sharp/Manifest
index a4999caddd9d..da2c5b22b124 100644
--- a/dev-dotnet/gtk-sharp/Manifest
+++ b/dev-dotnet/gtk-sharp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6272ac191a9235be44d8e89ac43303ea ChangeLog 14507
 RMD160 30570da1b6fbf512d1683cf3dc92561530c5ce60 ChangeLog 14507
 SHA256 67b7a9ca90d557e29e52f92830ad2823a5b08ce4ed007dd2e1d32cf4f342674a ChangeLog 14507
@@ -31,22 +28,15 @@ SHA256 eee3ee78c3f24c102ab93a50643f9a7b61f97116dc4f2af361d2cbce1f89ac08 gtk-shar
 MD5 881970f79365091da1275e6bcda8d8b4 gtk-sharp-2.4.0.ebuild 1748
 RMD160 681a6aa44f63f0c563bc901a5c3f00b1487e779c gtk-sharp-2.4.0.ebuild 1748
 SHA256 7ea28e035e1244f9a444d748a8c363449b6513d1c76e6826885633ef6bac988e gtk-sharp-2.4.0.ebuild 1748
-MD5 a7021ebe5a5190a13525bd21d05fb104 gtk-sharp-2.4.2.ebuild 1748
-RMD160 b6b516a5ee07ee8587329ad77938760e3cf9c362 gtk-sharp-2.4.2.ebuild 1748
-SHA256 0a3dde579049988d6d5531d9b0692f0c363fc02c9555c2dcf05d203cf301257e gtk-sharp-2.4.2.ebuild 1748
+MD5 64d16cc62a25d77b28658a6405583338 gtk-sharp-2.4.2.ebuild 1677
+RMD160 8cf8c432a380ce2ed25be20932118d1af179c5eb gtk-sharp-2.4.2.ebuild 1677
+SHA256 66459ed77515a151c70157ef2e4dc774e39fb78ca3756bb230d10d3b7fa5045e gtk-sharp-2.4.2.ebuild 1677
 MD5 28efeef2a57039bf6356d9daf805f183 gtk-sharp-2.8.0.ebuild 1748
 RMD160 1f62741561c8936b68bb6e2c7cc7219729c128d1 gtk-sharp-2.8.0.ebuild 1748
 SHA256 bb25799430445dd92412e2da34ce91fe3cd4fc919ffccb506ac59dcb754beade gtk-sharp-2.8.0.ebuild 1748
-MD5 426077eaf25af27d40a7869fc4c4572a gtk-sharp-2.8.2.ebuild 1748
-RMD160 b5173f8774ed6fbaa906241a1897ffbedb4ec612 gtk-sharp-2.8.2.ebuild 1748
-SHA256 6b74b115087b4451cbd4ce4069aff74bfc878a70f1223f93c744e84ba0bdc4e9 gtk-sharp-2.8.2.ebuild 1748
+MD5 65ab5d03437f4b10e9e5484c586fcd08 gtk-sharp-2.8.2.ebuild 1677
+RMD160 8ae44873fca04413849732b19d9ac6b793e13c8e gtk-sharp-2.8.2.ebuild 1677
+SHA256 fafede058e7f4fea9a71295310f6a4baec8a252f77ea712015cd80b23f027cea gtk-sharp-2.8.2.ebuild 1677
 MD5 e06909c47712ae995f4879eefb22e38b metadata.xml 160
 RMD160 f695863a7303e221fcd6031c1abcdd1539f81ce1 metadata.xml 160
 SHA256 24dd16fd81fd73a75aabdc83d54336201cd70c6bb711e0db7de4cd3e77a93354 metadata.xml 160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHfP6wUpWvClEHQoRAvklAJsEaKvszIhb92ocK3xwH+mvg76rvACfXh85
-bkZJthqBKan8yXHJpFFPtmw=
-=HaRk
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.ebuild
index e5e7ac19b4b3..23856685cb5d 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.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/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.ebuild,v 1.1 2006/03/16 21:48:43 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.4.2.ebuild,v 1.2 2006/04/16 18:29:10 latexer Exp $
 
-inherit eutils mono
+inherit eutils mono autotools
 
 DESCRIPTION="Gtk# is a C# language binding for the GTK2 toolkit and GNOME libraries"
 SRC_URI="http://go-mono.com/sources/${PN}-2.0/${P}.tar.gz
@@ -21,9 +21,6 @@ RDEPEND=">=dev-lang/mono-1.1.9
 
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/monodoc-1.1.8 )
-	>=sys-apps/sed-4.0
-	sys-devel/automake
-	sys-devel/autoconf
 	dev-util/pkgconfig"
 
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -33,18 +30,18 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${WORKDIR}/${P}-configurable.diff
-	#fixes support with pkgconfig-0.17, bug #92503
-	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' configure.in
+
+	# fixes support with pkgconfig-0.17, bug #92503
+	# as well as remove zapping of CFLAGS
+	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' \
+		-e ':^CFLAGS=:d' \
+		${S}/configure.in
 
 	# Use correct libdir in pkgconfig files
 	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
 		${S}/*/{,GConf}/*.pc.in || die
 
-	export WANT_AUTOMAKE="1.8"
-	aclocal || die
-	automake || die
-	autoconf || die
-	libtoolize --copy --force
+	eautoreconf
 
 	# disable building of samples (#16015)
 	sed -i -e "s:sample::" Makefile.in
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.ebuild
index 281aad58fc67..6a136a437f73 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.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/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.ebuild,v 1.2 2006/03/17 03:51:42 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.8.2.ebuild,v 1.3 2006/04/16 18:29:10 latexer Exp $
 
-inherit eutils mono
+inherit eutils mono autotools
 
 DESCRIPTION="Gtk# is a C# language binding for the GTK2 toolkit and GNOME libraries"
 SRC_URI="http://go-mono.com/sources/${PN}-2.8/${P}.tar.gz
@@ -21,9 +21,6 @@ RDEPEND=">=dev-lang/mono-1.1.9
 
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/monodoc-1.1.8 )
-	>=sys-apps/sed-4.0
-	sys-devel/automake
-	sys-devel/autoconf
 	dev-util/pkgconfig"
 
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -33,18 +30,18 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${WORKDIR}/${P}-configurable.diff
-	#fixes support with pkgconfig-0.17, bug #92503
-	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' configure.in
+
+	# fixes support with pkgconfig-0.17, bug #92503
+	# as well as remove zapping of CFLAGS
+	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' \
+		-e ':^CFLAGS=:d' \
+		${S}/configure.in
 
 	# Use correct libdir in pkgconfig files
 	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
 		${S}/*/{,GConf}/*.pc.in || die
 
-	export WANT_AUTOMAKE="1.8"
-	aclocal || die
-	automake || die
-	autoconf || die
-	libtoolize --copy --force
+	eautoreconf
 
 	# disable building of samples (#16015)
 	sed -i -e "s:sample::" Makefile.in