Go eapi-2. Most of the ebuilds pulling this are eapi-2 anyway, and this way I know what the blocker means *exactly*. Drop libdir fiddling patch, we go with upstream as far as possible. Perhaps mono won't have half a tonne of patches dragging it down.

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64)

4 files changed, 20 insertions, 125 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 3648aa1a0ea0..718316bf69e5 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.82 2008/11/23 21:02:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.83 2008/11/25 00:22:05 loki_val Exp $
+
+  25 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/gtk-sharp-2.12.0-noautomagic.patch,
+  -files/gtk-sharp-2.12.0-respect-choices.patch, gtk-sharp-2.12.6.ebuild:
+  Go eapi-2. Most of the ebuilds pulling this are eapi-2 anyway, and this
+  way I know what the blocker means *exactly*. Drop libdir fiddling patch,
+  we go with upstream as far as possible. Perhaps mono won't have half a
+  tonne of patches dragging it down.
 
   23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/gtk-sharp-2.12.0-doc-parallelmake.patch, gtk-sharp-2.12.6.ebuild:
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
index 0799d7814cee..852662e3ab39 100644
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-noautomagic.patch
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-respect-choices.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-respect-choices.patch
deleted file mode 100644
index ef752c46c413..000000000000
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-respect-choices.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-Index: gtk-sharp-2.12.0/configure.in
-===================================================================
---- gtk-sharp-2.12.0.orig/configure.in
-+++ gtk-sharp-2.12.0/configure.in
-@@ -114,7 +114,7 @@ if test "x$AL" = "xno" ; then
- fi
- 
- if test "x$has_mono" = "xtrue"; then
--GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
-+GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /root $(DESTDIR)$(libdir)'
- GENERATED_SOURCES=generated/*.cs
- AC_PATH_PROG(RUNTIME, mono, no)
- 
-Index: gtk-sharp-2.12.0/doc/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/doc/Makefile.am
-+++ gtk-sharp-2.12.0/doc/Makefile.am
-@@ -20,7 +20,7 @@ UPDATE_ASSEMBLIES = $(addprefix -assembl
- UPDATER = $(MONODOCER) -path:en -pretty $(UPDATE_ASSEMBLIES)
- 
- if ENABLE_MONODOC
--SOURCESDIR=$(prefix)/lib/monodoc/sources
-+SOURCESDIR=$(libdir)/monodoc/sources
- TARGETS=gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.source
- else
- SOURCESDIR=$(datadir)
-Index: gtk-sharp-2.12.0/generator/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/generator/Makefile.am
-+++ gtk-sharp-2.12.0/generator/Makefile.am
-@@ -1,4 +1,4 @@
--assemblydir = $(prefix)/lib/gtk-sharp-2.0
-+assemblydir = $(libdir)/gtk-sharp-2.0
- assembly_DATA = gapi_codegen.exe
- bin_SCRIPTS = gapi2-codegen
- CLEANFILES = gapi_codegen.exe
-Index: gtk-sharp-2.12.0/parser/Makefile.am
-===================================================================
---- gtk-sharp-2.12.0.orig/parser/Makefile.am
-+++ gtk-sharp-2.12.0/parser/Makefile.am
-@@ -1,4 +1,4 @@
--assemblydir = $(prefix)/lib/gtk-sharp-2.0
-+assemblydir = $(libdir)/gtk-sharp-2.0
- pkgconfigdir = $(libdir)/pkgconfig
- assembly_DATA = gapi-fixup.exe gapi-parser.exe
- pkgconfig_DATA = gapi-2.0.pc
-Index: gtk-sharp-2.12.0/glade/glade-sharp-2.0.pc.in
-===================================================================
---- gtk-sharp-2.12.0.orig/glade/glade-sharp-2.0.pc.in
-+++ gtk-sharp-2.12.0/glade/glade-sharp-2.0.pc.in
-@@ -1,6 +1,6 @@
--prefix=${pcfiledir}/../..
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
- gapidir=${prefix}/share/gapi-2.0
- 
- 
-Index: gtk-sharp-2.12.0/glib/glib-sharp-2.0.pc.in
-===================================================================
---- gtk-sharp-2.12.0.orig/glib/glib-sharp-2.0.pc.in
-+++ gtk-sharp-2.12.0/glib/glib-sharp-2.0.pc.in
-@@ -1,6 +1,6 @@
--prefix=${pcfiledir}/../..
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
- gapidir=${prefix}/share/gapi-2.0
- 
- 
-Index: gtk-sharp-2.12.0/gtkdotnet/gtk-dotnet-2.0.pc.in
-===================================================================
---- gtk-sharp-2.12.0.orig/gtkdotnet/gtk-dotnet-2.0.pc.in
-+++ gtk-sharp-2.12.0/gtkdotnet/gtk-dotnet-2.0.pc.in
-@@ -1,6 +1,6 @@
--prefix=${pcfiledir}/../..
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
- 
- 
- Name: Gtk.DotNet
-Index: gtk-sharp-2.12.0/gtk/gtk-sharp-2.0.pc.in
-===================================================================
---- gtk-sharp-2.12.0.orig/gtk/gtk-sharp-2.0.pc.in
-+++ gtk-sharp-2.12.0/gtk/gtk-sharp-2.0.pc.in
-@@ -1,6 +1,6 @@
--prefix=${pcfiledir}/../..
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
- gapidir=${prefix}/share/gapi-2.0
- 
- 
-Index: gtk-sharp-2.12.0/parser/gapi-2.0.pc.in
-===================================================================
---- gtk-sharp-2.12.0.orig/parser/gapi-2.0.pc.in
-+++ gtk-sharp-2.12.0/parser/gapi-2.0.pc.in
-@@ -1,4 +1,4 @@
--prefix=${pcfiledir}/../..
-+prefix=@prefix@
- 
- 
- Name: GAPI
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
index c1a8febea8ff..225756f6f22b 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 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.12.6.ebuild,v 1.2 2008/11/23 21:02:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild,v 1.3 2008/11/25 00:22:05 loki_val Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils mono autotools
 
@@ -13,31 +13,27 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV%.*}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="+glade"
+IUSE="+glade doc"
 
 RDEPEND=">=dev-lang/mono-1.1.9
 		glade? ( >=gnome-base/libglade-2.3.6 )
 		 >=x11-libs/gtk+-2.12
-		!<dev-dotnet/glade-sharp-9999"
+		!dev-dotnet/glade-sharp"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.19
-		>=dev-util/monodoc-1.1.8"
+		doc? ( >=dev-util/monodoc-1.1.8 )"
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 
 	# Upstream bug #421063
 	epatch "${FILESDIR}/${PN}-2.12.0-parallelmake.patch"
 	epatch "${FILESDIR}/${PN}-2.12.0-doc-parallelmake.patch"
-	# Upstream bug #443174
-	epatch "${FILESDIR}/${PN}-2.12.0-respect-choices.patch"
 	# Upstream bug #443180
 	epatch "${FILESDIR}/${PN}-2.12.0-noautomagic.patch"
 
-	# Upsteram bug #443175
+	# Upstream bug #443175
 	sed -i -e ':^CFLAGS=:d' "${S}/configure.in"
 
 	# disable building of samples (#16015)
@@ -46,8 +42,11 @@ src_unpack() {
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable doc monodoc) $(use_enable glade) || die "configure failed"
+}
+
 src_compile() {
-	econf $(use_enable glade) || die "configure failed"
 	LANG=C emake || die
 }