Add a patch to properly respect libdir; before the pkg-config file was updated by the installed files were still in /usr/lib rather than /usr/lib64. Submitted as upstream bug #559977.

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 52 insertions, 11 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 9a2bf140fad6..0db480137ff7 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/evolution-sharp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.28 2008/11/01 13:35:47 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.29 2008/11/09 09:20:00 flameeyes Exp $
+
+  09 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/evolution-sharp-0.18.0-respectlibdir.patch,
+  evolution-sharp-0.18.0.ebuild:
+  Add a patch to properly respect libdir; before the pkg-config file was
+  updated by the installed files were still in /usr/lib rather than
+  /usr/lib64. Submitted as upstream bug #559977.
 
   01 Nov 2008; Daniel Drake <dsd@gentoo.org> evolution-sharp-0.18.0.ebuild:
   Remove broken TestCal.exe program from compilation
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index 3691c58e1b01..907be5c6e987 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -1,8 +1,9 @@
+AUX evolution-sharp-0.18.0-respectlibdir.patch 1617 RMD160 6e8ad68e4637bdc3245d117038c0b48918eea613 SHA1 a2ca8b3c97a8598b7863bb50b5021f97c7a162c1 SHA256 6be548a1393ce87172b068c46f68cd69deecf5d2f76ab7ffe6558d09729baad1
 DIST evolution-sharp-0.14.0.1.tar.bz2 266653 RMD160 21f373da3d42b94794a4357ec604f0a11bb323c0 SHA1 ff8ef5f50e33ac2bef0d590c30efca5c59264157 SHA256 6a2b4af6dadc7b674706f1cc217551bdc2d8c72768d2e53dd0e29e26440ba459
 DIST evolution-sharp-0.17.4.tar.bz2 276899 RMD160 45cba93354068e8417912744545a600079d73737 SHA1 2bb975fd77d73a65f6b6aa1d637a73d0ab8fefb3 SHA256 f5895815caa31f7b878294bfb0023a3d465705389b7fb92400e03d29256cebdf
 DIST evolution-sharp-0.18.0.tar.bz2 308847 RMD160 29d2ef8c96fe1461c2a8c4c58b5812553a957cb7 SHA1 c07880cc5f57944956c753bc63fec5171b4ce815 SHA256 911a9fe488ebe22a21016da108eb6a2ef29083262c9964ab514756654a01468c
 EBUILD evolution-sharp-0.14.0.1.ebuild 973 RMD160 f779fe554a299964133d63d46b0c6b978d20c126 SHA1 0eaf0b5d4a2a789f21f3f7f9f2a9fbb1ebed5ef8 SHA256 aef0d838575da98c41a4586c350808439a54a1faf6bd968ccbf34e78c43fbc1d
 EBUILD evolution-sharp-0.17.4.ebuild 913 RMD160 3e1ef993cf2be49e0868dc44c0cc1e6f0fdf9afe SHA1 2779658d9a205b6cc41aaa0b5dc8c6ab8751ad11 SHA256 fbbb3d70b54163ba6beeff6411d7f766d8349e92da4546a841876370c5f27a8d
-EBUILD evolution-sharp-0.18.0.ebuild 1075 RMD160 6646ee2728fc97436a58bf9c9eef2ce747c809a0 SHA1 73bd6075bdf46687d913e8a9fb9967cd267502f6 SHA256 60829d6f22605f6c57bc354b6f73be75f10c3959749d4701e369373482121e93
-MISC ChangeLog 4830 RMD160 07d190e9277246012c6d3f193ee74628e4efa5b1 SHA1 9acfbb30d288b46ffcea4e909337f29edf1a4e06 SHA256 140bdbc2d3a6c0eb0a9d72dbe963b5accde2b9b72d4016f61ef1b16783f894ed
+EBUILD evolution-sharp-0.18.0.ebuild 968 RMD160 f931da2dc04a5840ac90dbf94ddf1d3bd25ca338 SHA1 365b98194fd228bb9b5750ba15b789661cf6bbb0 SHA256 104e05cc4e72efbba5bb408ace40be0a96d49855eb852c09875f3e72a3c41be9
+MISC ChangeLog 5166 RMD160 fe5483bbc44be184dcc9affb2bf885c398051798 SHA1 81b11f173db00ff0bdaab9181e00eb64136c5979 SHA256 a092f6a803ed24b39e90634048af477b5f849e55cb3aa70c36bd61927a26c93d
 MISC metadata.xml 250 RMD160 c401273fd853436a4cba10276899805f44850777 SHA1 5614700897ad4552a50ee22f87b9b9ac33d829f3 SHA256 1811d5a877974d365a2d6e47eb3ab815106ba50a7c2ea15655fe8501704af972
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.18.0.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.18.0.ebuild
index 4b9469e80700..fa951a2e4e42 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.18.0.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.18.0.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/evolution-sharp/evolution-sharp-0.18.0.ebuild,v 1.2 2008/11/01 13:35:47 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.18.0.ebuild,v 1.3 2008/11/09 09:20:00 flameeyes Exp $
 
-inherit mono gnome.org
+inherit mono gnome.org eutils autotools
 
 DESCRIPTION="Mono bindings for Evolution"
 HOMEPAGE="http://www.gnome.org/projects/beagle"
@@ -22,15 +22,13 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Use correct libdir in pkgconfig files
-	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-		-e 's:^prefix=:exec_prefix=:' \
-		-e 's:prefix)/lib:libdir):' \
-		"${S}"/*.pc.in || die "sed failed."
+	epatch "${FILESDIR}/${P}-respectlibdir.patch"
 
 	# r188 broke TestCal compilation
 	sed -i -e 's/TEST_TARGETS = $(TESTCAL_TARGET)/TEST_TARGETS = /g' \
-		"${S}"/evolution/Makefile.in || die "sed TestCal failed."
+		"${S}"/evolution/Makefile.am || die "sed TestCal failed."
+
+	eautomake
 }
 
 src_install() {
diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch
new file mode 100644
index 000000000000..ee6b6311b5f8
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch
@@ -0,0 +1,35 @@
+Index: evolution-sharp-0.18.0/evolution/Makefile.am
+===================================================================
+--- evolution-sharp-0.18.0.orig/evolution/Makefile.am
++++ evolution-sharp-0.18.0/evolution/Makefile.am
+@@ -92,14 +92,14 @@ all: $(ASSEMBLY) $(TEST_TARGETS)
+ 
+ install-data-local:
+ 	@if test -n '$(TARGET)'; then									\
+-	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
+-	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;		\
++	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
++	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;		\
+ 	fi
+ 
+ uninstall-local:
+ 	@if test -n '$(TARGET)'; then									\
+-	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
+-	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
++	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
++	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
+ 	fi
+ 
+ evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk
+Index: evolution-sharp-0.18.0/evolution-sharp.pc.in
+===================================================================
+--- evolution-sharp-0.18.0.orig/evolution-sharp.pc.in
++++ evolution-sharp-0.18.0/evolution-sharp.pc.in
+@@ -1,5 +1,6 @@
+ prefix=@prefix@
+-libdir=${prefix}/lib
++exec_prefix=@exec_prefix@
++libdir=@libdir@
+ 
+ Name: Evolution#
+ Description: Evolution# - Evolution .NET Binding