Fix broken pkgconfig file that prevented eog etc. from being built (bug #415961, thanks to pingouin21).

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

4 files changed, 48 insertions, 11 deletions

diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 99eab4bcdd8b..136d3a8f0f4e 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.4 2012/04/22 23:28:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.5 2012/05/14 19:07:46 tetromino Exp $
+
+*libpeas-1.4.0-r1 (14 May 2012)
+
+  14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libpeas-1.4.0.ebuild, +libpeas-1.4.0-r1.ebuild,
+  +files/libpeas-1.4.0-pkgconfig.patch:
+  Fix broken pkgconfig file that prevented eog etc. from being built (bug
+  #415961, thanks to pingouin21).
 
 *libpeas-1.4.0 (22 Apr 2012)
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 031afded7d04..0b55401a0658 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA1
 
 AUX libpeas-1.2.0-PeasPluginInfo-annotation.patch 2255 RMD160 fb56f5698eaae7fe164164d1d2ea58646b57a50f SHA1 add8ee5aa71c7be0aa502c44863704b2b7816ac9 SHA256 2b187f0681021ea1cca8f805e9eaf452cd7c5611c80bfa1e04315aac68b75f80
+AUX libpeas-1.4.0-pkgconfig.patch 1009 RMD160 220f5792193573494d67767d2b6d3c34766a5a70 SHA1 12049828c92a56a344b9d91d2e89759150a9a6f4 SHA256 58dd1842947442f9b548e9bde969ba0e122b407fc956da439c323a444c3e128e
 DIST libpeas-1.0.0.tar.bz2 598820 RMD160 66a04dfd5c72d0611848937a58055ac717044448 SHA1 f15caf0b7c4621979eff5bca06f567d2d4828443 SHA256 b1482690565241baf3870311a77efb3f89a4335f48cb4ca31e8b8405220a8d99
 DIST libpeas-1.2.0.tar.xz 497176 RMD160 60ce43c0253568abcf44e824a2bd2e18ff7f904d SHA1 4877d53a55671c51f73cea75365ece037badd1bf SHA256 871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c
 DIST libpeas-1.4.0.tar.xz 521044 RMD160 f03fe9b5f35e5058554db69f2149cd55af9834b2 SHA1 2c1f8d4aed2949cfebddecba7b5109e15b09443b SHA256 d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6
 EBUILD libpeas-1.0.0.ebuild 1680 RMD160 8cd7bf626de62bb7801fe563ec0da0f532ee1d95 SHA1 86a172599d17bdb29bc561a36300b1235bd7bb85 SHA256 af84e27bbe7f5ec0dd36d217f5e62d9d69a7916cb77dc02d31e8b3872e99af26
 EBUILD libpeas-1.2.0-r1.ebuild 1935 RMD160 72b33b30e784f1ca4b6524b822f1a96c51ce76c9 SHA1 0291d971d89e00f75e8b546e05e20d98cdf9e316 SHA256 5f6ee0ad70b0601bae05357a415d63e0039431446745e071149ffead4ccffff4
-EBUILD libpeas-1.4.0.ebuild 2073 RMD160 4578d13c46bbe07b3704ee1daaa82b2c5855bb02 SHA1 f3b0f2bd3d5933ad596cd0480089c2250f771386 SHA256 95a4760d781e852eff037ff0ed232f7499c233b649f4c91630f7ae2e3a97467c
-MISC ChangeLog 1007 RMD160 deaa6498139a25c65730ca086cd74967c32710ab SHA1 13011550f32e8d9bc483c72d9b18adc0a8a7be89 SHA256 a8e572753fe67555d7bb908ba1668712d3a6e4fe974c27185d7deeef7691a34f
+EBUILD libpeas-1.4.0-r1.ebuild 2152 RMD160 d7b2c9d8cd0e660d65f88c5f353d1e8c34b744a7 SHA1 6dc32ba9046152904ce369e6c79b6415a79df200 SHA256 793b69d51e121090dd20d30d0d09f54b9591ee3780bf2867c1c911fd2e3afd34
+MISC ChangeLog 1299 RMD160 dbce82c101eccae28a0ce52cdc1804a8b5cecc21 SHA1 75ae18256b6df06e6514f7c7fb5d2248a558be43 SHA256 ad1732436498f059c91828f1fe344ceb0c406313d1af209bc693952aae889ad2
 MISC metadata.xml 620 RMD160 dbc561a1d545d5709b799b32f40079727990d2b7 SHA1 2bf24d052ea1f2cde1736c8016ae856de34c0787 SHA256 4e7d5a8ee528a66e66dedb86ea1789a60b865c4c35429a389f2ae7ffc69faec2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPlJRAAAoJEJ0WA1zPCt1hov4H/2YR2qSl9cij3S0/5V3iPIBV
-MSFYwPuJMiDCOnv1Jejy8lR+mpvdoIwz6nREWM6qHb2Be4P0yHBj5QoyUU3n5RLV
-Td3YMHv6SycJD0Fmq/FJuZdAMnfa4pKu1uf+02HZJC/aMNMmpNQyVymT6EeqW+x/
-JSQDM85+TpkqhkiwNjaIw4fSEOgW6mUdrrTnxva6HQvSqoGWR9KbTP9UjvdDSN1N
-uakCXoWjZubMnjqcwd0YxGHmo+UeDXRRFvtRPvwH2FlhdNPUzCZ0Cg580nzRV4lQ
-RBNxkrPd9RMIuB4+f4JbGsFok3rRGv7YyyWoaj30ZtIJHqUHuoueep2V/P+604k=
-=wV/2
+iQEcBAEBAgAGBQJPsVgHAAoJEJ0WA1zPCt1hfa8IAJ4yFDdzUnGI9lf9u7qV1BLb
+4LVVzA8BB10MWNZ1GaS5uGP35DOFZ1o5tV/4JMjpm4L/XPMZdMqAGoVVo3MwH56k
+djMmRBogEM4ySlu+JSwLLHeVzHpuclsj17tZud+TLMaTQcUYB3e7zm9Y28FXDpPf
+h62OUq8qHgV3CEblCTzEQWFJz/NNvNpg7e2rSV6Wjp5YsjV+pNEAE0iXB+Gyxbf2
+bZji+/bpvpyMsv6eeSk5r/JYIcG025LgYYvoW11KG+42IaKuwzro5Pn1aE9XrPfi
+r5jQ3mMOHp/MTbc3IVDL7+Y+Yp/E7vkuZybOjuD/+AiLW4mVBy4oMyzve8gBpAI=
+=wmmW
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch b/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch
new file mode 100644
index 000000000000..125af02657b9
--- /dev/null
+++ b/dev-libs/libpeas/files/libpeas-1.4.0-pkgconfig.patch
@@ -0,0 +1,25 @@
+From 2d6ea307cf45af6b92b1cd708d0ee288aca0b3fe Mon Sep 17 00:00:00 2001
+From: Olav Vitters <olav@vitters.nl>
+Date: Wed, 28 Mar 2012 15:28:40 +0200
+Subject: [PATCH] fix forgotten @ in pkgconfig file
+
+---
+ data/libpeas-1.0.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/libpeas-1.0.pc.in b/data/libpeas-1.0.pc.in
+index 9523067..704d686 100644
+--- a/data/libpeas-1.0.pc.in
++++ b/data/libpeas-1.0.pc.in
+@@ -5,7 +5,7 @@ includedir=@includedir@
+ 
+ Name: libpeas
+ Description: libpeas, a GObject plugins library
+-Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@
++Requires: glib-2.0 >= @GLIB_REQUIRED@, gobject-2.0 >= @GLIB_REQUIRED@, gmodule-2.0 >= @GLIB_REQUIRED@, gio-2.0 >= @GIO_REQUIRED@ gobject-introspection-1.0 >= @INTROSPECTION_REQUIRED@
+ Version: @VERSION@
+ Cflags: -I${includedir}/libpeas-1.0
+ Libs: -L${libdir} -lpeas-1.0
+-- 
+1.7.8.6
+
diff --git a/dev-libs/libpeas/libpeas-1.4.0.ebuild b/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild
index 55dd5bd2d4cb..005bacb78b70 100644
--- a/dev-libs/libpeas/libpeas-1.4.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.4.0.ebuild,v 1.1 2012/04/22 23:28:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.4.0-r1.ebuild,v 1.1 2012/05/14 19:07:46 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -51,6 +51,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# In next release, bug #415961
+	epatch "${FILESDIR}/${P}-pkgconfig.patch"
+
 	use python && python_clean_py-compile_files
 	gnome2_src_prepare
 }