Fix pkgconfig installation location. Patch from upstream.

Package-Manager: portage-2.1.3_rc8

5 files changed, 43 insertions, 14 deletions

diff --git a/x11-misc/shared-mime-info/ChangeLog b/x11-misc/shared-mime-info/ChangeLog
index 8740a8d374f1..8797032fa00b 100644
--- a/x11-misc/shared-mime-info/ChangeLog
+++ b/x11-misc/shared-mime-info/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/shared-mime-info
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.89 2007/07/19 03:56:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/ChangeLog,v 1.90 2007/07/19 15:18:31 drac Exp $
+
+*shared-mime-info-0.21-r1 (19 Jul 2007)
+
+  19 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/shared-mime-info-0.21-pkgconfig.patch,
+  +shared-mime-info-0.21-r1.ebuild:
+  Fix pkgconfig installation location. Patch from upstream.
 
 *shared-mime-info-0.21 (19 Jul 2007)
 
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 52e43010a045..14b4f5bc1b8c 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,17 +1,21 @@
+AUX shared-mime-info-0.21-pkgconfig.patch 361 RMD160 e4423d4c82379624a7aa1a5327bbe3d81a8fd546 SHA1 4a6a425b47fe5f64ce0879f919f6d41c9fccab2a SHA256 3f3388ae3e6a2b77aca960c5d778269cdce0625fdf34088fa02e0795bdf5fa0c
+MD5 25ca273e1955e015f82b0cc7b814da05 files/shared-mime-info-0.21-pkgconfig.patch 361
+RMD160 e4423d4c82379624a7aa1a5327bbe3d81a8fd546 files/shared-mime-info-0.21-pkgconfig.patch 361
+SHA256 3f3388ae3e6a2b77aca960c5d778269cdce0625fdf34088fa02e0795bdf5fa0c files/shared-mime-info-0.21-pkgconfig.patch 361
 DIST shared-mime-info-0.20.tar.bz2 429405 RMD160 74fb58dcf9a6b7a651a0708a81b5f37b9e5eb617 SHA1 5918a9bb72da72fea63a480d07eb1c1150b14c3a SHA256 6febe616fb850f4319efa7017312abb796024e7ac20da37c4d2ce34afa41776c
 DIST shared-mime-info-0.21.tar.bz2 439533 RMD160 209d1686077a43abc20902f08871249c11c6e27d SHA1 5b1b834be6595a27446766af0a412038cee4f87e SHA256 135a36a3d8b14742a569f4fc3fa7c51b709f676f1aad569d6f0e6c0eedf61214
 EBUILD shared-mime-info-0.20.ebuild 923 RMD160 339c325527a33554e1ebe7025a2c7f9d4adb5fd2 SHA1 6d0233d2bdc2f2fa4f902fccf4f5ad1cfe034f25 SHA256 9ea66419efb82db9a5a7bf2f32790071bf35b0d34040b7edd273bb08c4f97adf
 MD5 101284a35dc30ce231695df48aadc83b shared-mime-info-0.20.ebuild 923
 RMD160 339c325527a33554e1ebe7025a2c7f9d4adb5fd2 shared-mime-info-0.20.ebuild 923
 SHA256 9ea66419efb82db9a5a7bf2f32790071bf35b0d34040b7edd273bb08c4f97adf shared-mime-info-0.20.ebuild 923
-EBUILD shared-mime-info-0.21.ebuild 932 RMD160 f4720a12484c2920a3ed7fe5e61cf75420d8ec98 SHA1 a405664c9cd9a4f3f675268a82fa18699c375316 SHA256 04acf5cb4ab3bf1891e33442449947cfa96f0dbdf6762570911449284478f976
-MD5 cb4a70f8dbe551546c1cdb0a50a61ba9 shared-mime-info-0.21.ebuild 932
-RMD160 f4720a12484c2920a3ed7fe5e61cf75420d8ec98 shared-mime-info-0.21.ebuild 932
-SHA256 04acf5cb4ab3bf1891e33442449947cfa96f0dbdf6762570911449284478f976 shared-mime-info-0.21.ebuild 932
-MISC ChangeLog 11047 RMD160 4ee1fd351547eec3c68fd0c1283001554232f01d SHA1 d12b27e11b77913225c0a9da0460f2c64b99c72a SHA256 04668652e7163a02cdfd827f28630d6e37fa66aff16f65bfef624f7e406bacb7
-MD5 97500074543ee341b35b606d96da8b2f ChangeLog 11047
-RMD160 4ee1fd351547eec3c68fd0c1283001554232f01d ChangeLog 11047
-SHA256 04668652e7163a02cdfd827f28630d6e37fa66aff16f65bfef624f7e406bacb7 ChangeLog 11047
+EBUILD shared-mime-info-0.21-r1.ebuild 1048 RMD160 66adeaee70da73147241843fec777603e126f48a SHA1 e63dd1c62b3f5dc88fd85e0a9ee433144a21a3cd SHA256 801ac15d38490dddf8d9569f7dfeefe999eab0edb86f878556df35398c8286bb
+MD5 76308968635533393c17e0d48081b7ce shared-mime-info-0.21-r1.ebuild 1048
+RMD160 66adeaee70da73147241843fec777603e126f48a shared-mime-info-0.21-r1.ebuild 1048
+SHA256 801ac15d38490dddf8d9569f7dfeefe999eab0edb86f878556df35398c8286bb shared-mime-info-0.21-r1.ebuild 1048
+MISC ChangeLog 11282 RMD160 ca7dfc3b8bdc9e9b9fc363092d1fb165bb10699f SHA1 b0b96306bda2416ebfbbd336242cc541fec1f3f2 SHA256 752cd0fc27b2b9b276cd4dba8fd1573cfb55d4138dbbdf63c69c3bf0cb604b9e
+MD5 e2ec74d3cd308615b1ed9a7f8d05604e ChangeLog 11282
+RMD160 ca7dfc3b8bdc9e9b9fc363092d1fb165bb10699f ChangeLog 11282
+SHA256 752cd0fc27b2b9b276cd4dba8fd1573cfb55d4138dbbdf63c69c3bf0cb604b9e ChangeLog 11282
 MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
 MD5 8ea528c241b480ab53256eb332821871 metadata.xml 234
 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 metadata.xml 234
@@ -19,6 +23,6 @@ SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 metadata
 MD5 9c9560a46b4254af1c3c076a13949e52 files/digest-shared-mime-info-0.20 268
 RMD160 a663a0215ec6fd37bc9b2a939dffcac4926313c8 files/digest-shared-mime-info-0.20 268
 SHA256 8d7a5bc9038240a85f52529757ba9c9c96414078c2eb59bc2775a0f9fca5023d files/digest-shared-mime-info-0.20 268
-MD5 4109d0d14dcdd8e8eefa5b0d6b80899c files/digest-shared-mime-info-0.21 268
-RMD160 f3e2594e3a08c26c32fafb6c383d03be166c5181 files/digest-shared-mime-info-0.21 268
-SHA256 56cdc9b8c30acb221bbe6b129395c85685cf7eb72ab482f0667a406eb1bfb374 files/digest-shared-mime-info-0.21 268
+MD5 4109d0d14dcdd8e8eefa5b0d6b80899c files/digest-shared-mime-info-0.21-r1 268
+RMD160 f3e2594e3a08c26c32fafb6c383d03be166c5181 files/digest-shared-mime-info-0.21-r1 268
+SHA256 56cdc9b8c30acb221bbe6b129395c85685cf7eb72ab482f0667a406eb1bfb374 files/digest-shared-mime-info-0.21-r1 268
diff --git a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.21 b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.21-r1
index aca0a64ddb03..aca0a64ddb03 100644
--- a/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.21
+++ b/x11-misc/shared-mime-info/files/digest-shared-mime-info-0.21-r1
diff --git a/x11-misc/shared-mime-info/files/shared-mime-info-0.21-pkgconfig.patch b/x11-misc/shared-mime-info/files/shared-mime-info-0.21-pkgconfig.patch
new file mode 100644
index 000000000000..d5e34ad36906
--- /dev/null
+++ b/x11-misc/shared-mime-info/files/shared-mime-info-0.21-pkgconfig.patch
@@ -0,0 +1,11 @@
+--- Makefile.am	2007/02/06 10:51:22	1.26
++++ Makefile.am	2007/06/27 18:20:12	1.27
+@@ -31,7 +31,7 @@
+ CLEANFILES = freedesktop.org.xml po/stamp-it
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+ 
+-pkgconfigdir = $(datadir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = shared-mime-info.pc
+ 
+ $(pkgconfig_DATA): config.status
diff --git a/x11-misc/shared-mime-info/shared-mime-info-0.21.ebuild b/x11-misc/shared-mime-info/shared-mime-info-0.21-r1.ebuild
index 57d38b59192f..33370329a216 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-0.21.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-0.21-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.21.ebuild,v 1.1 2007/07/19 03:56:08 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.21-r1.ebuild,v 1.1 2007/07/19 15:18:31 drac Exp $
 
-inherit fdo-mime
+inherit autotools eutils fdo-mime
 
 DESCRIPTION="The Shared MIME-info Database specification"
 HOMEPAGE="http://www.freedesktop.org/software/shared-mime-info"
@@ -20,6 +20,13 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+	eautomake
+}
+
 src_compile() {
 	econf --disable-update-mimedb
 	emake || die "emake failed."