Fix for breakage with new pkgconfig versions. See bug #92731.

(Portage version: 2.0.51.21-r1)

6 files changed, 26 insertions, 17 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 48eafd7c733e..474d72181f83 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.30 2005/05/15 09:11:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.31 2005/05/16 15:56:17 latexer Exp $
+
+  16 May 2005; Peter Johanson <latexer@gentoo.org> gtk-sharp-1.0.6.ebuild,
+  gtk-sharp-1.0.8.ebuild, gtk-sharp-1.9.2.ebuild, gtk-sharp-1.9.3-r1.ebuild,
+  gtk-sharp-1.9.3.1.ebuild:
+  Fix for breakage with new pkgconfig versions. See bug #92731.
 
   15 May 2005; Doug Goldstein <cardoe@gentoo.org> gtk-sharp-1.9.3.1.ebuild:
   fixes support with pkgconfig-0.17, bug #92503. urilith ok'd my commit.
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild
index 32ce2348f7be..a022cf3a5b6a 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild,v 1.6 2005/03/21 19:51:43 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.6.ebuild,v 1.7 2005/05/16 15:56:17 latexer Exp $
 
 inherit eutils mono
 
@@ -31,6 +31,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${WORKDIR}/${P}-configurable.diff
+	sed -i -e 's:\<PKG_PATH\>:GTK_SHARP_PKG_PATH:g' configure.in
 	aclocal || die
 	# See bug #73563, comment #9
 	libtoolize --copy --force || die
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild
index b19118cf85d4..69de31861b63 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild,v 1.3 2005/05/12 12:33:28 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.8.ebuild,v 1.4 2005/05/16 15:56:17 latexer Exp $
 
 inherit eutils mono
 
@@ -27,10 +27,11 @@ KEYWORDS="x86 ppc -amd64"
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
 
 	epatch ${WORKDIR}/${P}-configurable.diff
+	sed -i -e 's:\<PKG_PATH\>:GTK_SHARP_PKG_PATH:g' configure.in
+
 	aclocal || die
 	# See bug #73563, comment #9
 	libtoolize --copy --force || die
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild
index f77b222a2d8c..efacd407f2d9 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild,v 1.2 2005/04/15 17:58:32 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.2.ebuild,v 1.3 2005/05/16 15:56:17 latexer Exp $
 
 inherit eutils mono
 
@@ -25,16 +25,18 @@ KEYWORDS="~x86 ~ppc"
 
 src_unpack() {
 	unpack ${A}
-
-	# disable building of samples (#16015)
 	cd ${S}
+
 	epatch ${WORKDIR}/${P}-configurable.diff
+	sed -i -e 's:\<PKG_PATH\>:GTK_SHARP_PKG_PATH:g' configure.in
+
 	export WANT_AUTOMAKE="1.8"
 	aclocal || die
 	automake || die
 	autoconf || die
 	libtoolize --copy --force
 
+	# disable building of samples (#16015)
 	sed -i -e "s:sample::" Makefile.in
 }
 
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild
index 3e4779e60e07..d3900ef8bd74 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild,v 1.1 2005/05/06 16:26:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3-r1.ebuild,v 1.2 2005/05/16 15:56:17 latexer Exp $
 
 inherit eutils mono
 
@@ -25,16 +25,18 @@ KEYWORDS="~x86 ~ppc ~ppc"
 
 src_unpack() {
 	unpack ${A}
-
-	# disable building of samples (#16015)
 	cd ${S}
+
 	epatch ${WORKDIR}/${P}-configurable.diff
+	sed -i -e 's:\<PKG_PATH\>:GTK_SHARP_PKG_PATH:g' configure.in
+
 	export WANT_AUTOMAKE="1.8"
 	aclocal || die
 	automake || die
 	autoconf || die
 	libtoolize --copy --force
 
+	# disable building of samples (#16015)
 	sed -i -e "s:sample::" Makefile.in
 }
 
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild
index 4951faa41cc5..5e30a2f2838a 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild,v 1.2 2005/05/15 09:11:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.3.1.ebuild,v 1.3 2005/05/16 15:56:17 latexer Exp $
 
 inherit eutils mono
 
@@ -25,20 +25,18 @@ KEYWORDS="~x86 ~ppc ~ppc"
 
 src_unpack() {
 	unpack ${A}
-
-	# disable building of samples (#16015)
 	cd ${S}
-	epatch ${WORKDIR}/${P}-configurable.diff
-	export WANT_AUTOMAKE="1.8"
 
-	#fixes support with pkgconfig-0.17, bug #92503
-	sed -i -e 's/\<PKG_PATH\>/GTK_SHARP_PKG_PATH/g' configure.in
+	epatch ${WORKDIR}/${P}-configurable.diff
+	sed -i -e 's:\<PKG_PATH\>:GTK_SHARP_PKG_PATH:g' configure.in
 
+	export WANT_AUTOMAKE="1.8"
 	aclocal || die
 	automake || die
 	autoconf || die
 	libtoolize --copy --force
 
+	# disable building of samples (#16015)
 	sed -i -e "s:sample::" Makefile.in
 }