media-libs/gegl: Fix introspection version (bug #416587)

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 46 insertions, 7 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index 57d1328dc45e..c84304d6a773 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.82 2013/04/28 15:29:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.83 2013/04/28 16:47:56 sping Exp $
+
+  28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
+  +files/gegl-0.2.0-introspection-version.patch:
+  Use upstream patch to fix introspection version (bug #416587)
 
   28 Apr 2013; Sebastian Pipping <sping@gentoo.org> gegl-0.2.0-r1.ebuild,
   gegl-9999.ebuild:
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 9780aadd5f87..8567092b10d1 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -7,6 +7,7 @@ AUX gegl-0.1.8-cve-2012-4433-4757cdf7.patch 2118 SHA256 b9d0d3a304525af4524d1865
 AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 SHA256 0351770b65c4620868e575ba8e3f5d4e46b09fcf83cb52231ecdc42b2bc96bac SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348 WHIRLPOOL 107f7ae3d7aa6eac22a5c127cc2dcc1387f808bbab4254cb55aebbc5f1e70be2dbf9b40d6b79c2b62fdc5edde5f2384164ec3b441c281829ba89b366131c873a
 AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 SHA256 6ecb465e6fc060417b353418c23c1d97d664666f652f2c4967d7fa6e0125fc84 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57 WHIRLPOOL 34287b2ae70f0d2f61c1aa817e767b3db6041857ce6a09a85371177ae31575d3b73d1f2efe6dccdb6776bdbf9cc518a06e7ed77662eeee85fe4658bb13815dc7
 AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 SHA256 79b2385d828a6e9506f715b423bd5fd1e0ad3d62f3f02bdfe336952f1f3ca46f SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493 WHIRLPOOL 2dbd04451a4372289bed0f34fdc8283b85b55bd2d75c32c9b08507a7404e5f5d4274076df300f8caac25df31361f855ca30c19df4d45683136878ebb9ef5603a
+AUX gegl-0.2.0-introspection-version.patch 1233 SHA256 7238b314bcefedb0cc6e9d65547c0b9cf81466b3ef35ba179607c10f81381b8d SHA512 539508215c769a5571ba0b798ab001d37756a0f264817394282ee3aa9d46ca83fe10a3d37ee8915afe79453d1e72e7adcb928fbb54a22229a06cf0a308095d23 WHIRLPOOL af6f735fce74d161fd3d8e758a38a18b1c65c1192fa7d67c2e10105ae9d0ece6bc771fee385aa76a1f28a089f952480d918e529da9d31b78a2210fed2197a48a
 AUX gegl-doubledestdir.diff 438 SHA256 a39da1569b510092ba345f52f33486fc246165ffd0f84d0129d29e77a26ccc2b SHA512 dcfd999de171ebc80a4016d380793ea5bf39bfb4839715acd01a26edd28dea0a81cc31e92343934a6940f5aece8b2fc476f3328ba45343a3995e79040560b131 WHIRLPOOL da248cfb52a39157d0ef010121182151a00ad684e354c8d3fd2110d64344ca80f77acea5cf0c22ee6467a63ca43d6c2efc846d74137d1a9262d56baa042bad1f
 AUX replace-imgconvert-by-swsscale.patch 2154 SHA256 d0470dd22814afffbbb2fffa7fc9488129b9cae715f26c8330eea913550885dc SHA512 e988ea43516b5664ed8e359e1d964875916540f617b810e958f0644efc98f41abaed6c6cac41c049524dd85decf8819382fb49a5ddd3df42c12747a16fed79e1 WHIRLPOOL 0f28afaf5b9bedb18b178f5df9eddbfc6219899a189e16e15bbeed5da1d1417c55988cf1b6ee5da643fe7494c53f54c2d531cf2d543c94f03869279947b73ef0
 DIST gegl-0.1.6.tar.bz2 4118465 SHA256 a166225625eebfb57fd417c88cf1fa6e29b1d308d50ac3bd9ef30bad9f3726d1 SHA512 dc1cd83d822fc52293357601172b066eca842b74b459b0efce2348a60cfd57116e37b4ee926829fb7859355a48c2fee082fc057d72f2a8cf3f7de02e11247a5f WHIRLPOOL 1cd5cdb0714f79982918a8bb9ff9b653e242d1c472fc8b43b64042cefe905f225fd9499598ef9522dd871e629b87ac62b9f158e20df9eaf16a82b512e3402f63
@@ -16,15 +17,15 @@ EBUILD gegl-0.1.6-r1.ebuild 2957 SHA256 0e86587d32b6387a9786db121602d5753a8f6e7c
 EBUILD gegl-0.1.6.ebuild 2743 SHA256 6829f93779057e10caf9a985556190e72ff64371511f952971f28c421dfa6884 SHA512 a5ee9f166ed68698c55e1a1da561536705c9c8282dcb949694eeae751dd31748972b943c2f4cab38ffde9caad12eeb60e45639e0cabffaa594e6006a87bfb3f0 WHIRLPOOL e6dbf18465bf4112dde66c20c4e87fe47634d119cc787db48390f2e6324fd76e93c3a1f6372c0ad4b7b3fd89d868ec3c5a04efb84c45f2782f782d5e79210445
 EBUILD gegl-0.1.8-r1.ebuild 3413 SHA256 c3a016c6ca5d9e889e68552c6af85b34718dbce5825949c8d4b1334aa0b3e759 SHA512 c6d7b97ec39b7fca698a5b2e2ffa4da2690a2b45630746920102e4e0e5f99ca43abb76cbb6b68786990be448bd0faf8ae984112aa881da6b2bad7316280f3346 WHIRLPOOL 01c3f567c5171dbe21eee204c587a588ee63c7cf848362d95a2c05edb4334de19fd8a80450369e16fb58d120e590bb4d574a5f83572fe3e1a6d5e8a7839ea743
 EBUILD gegl-0.1.8.ebuild 3215 SHA256 3eb7db2d937e0dc698bea674f40fc1b4bb810a8e40267e28eef7ac21a1f4b708 SHA512 34c57cb573ec2387b69128dd3a2b523f6ef8120f17e84c29a05961f88b75203b91cf53500f4e323aa41523c71cce4900486da06f3fe627ce1c87740fda046242 WHIRLPOOL c04c028d7d12c42f007ca31a8dc3ef18c99213c6a760e9802e92d42a2cfef6f47afa918eff29ae77539346b45ee223579fb6af08cca40226c7335daae6910248
-EBUILD gegl-0.2.0-r1.ebuild 3516 SHA256 53b52145c81da79ff1bd494f05ceba287edd9b877f1afb30a22afe1ed5751814 SHA512 cf0bdeaeb2454e09d9e22636f33cd69ba4b1d78e275024ddbf28226ffe0312e3d07491991bf1b7dcd7a3eb39e67a109c0f63c3e9bc9ada21d6baf0f1e3002b79 WHIRLPOOL 22f84927b950696c2e61bdab0a86bde62e59a700c19d7eea309daa7f3f475e6cea07d51762c329545ca5fb6713378638c70b713b34404173c5484da74976a73c
+EBUILD gegl-0.2.0-r1.ebuild 3622 SHA256 598a0cc88b750b39c221ba3727ea84f47d4ef0fade46764f98417c47393a5184 SHA512 bbd947495b60615e71d91a9d3a92bdf095021722908173ff824f74bf999db97cbe958cb71e2aee78b1c4d685b9525d67c12cd9b2ccfb9649c0e3b93c232e923d WHIRLPOOL d4dafb13f7e6f5e96e75fa35403551cf54d3168fcb27a916964c1e5c0c5f7482db98ce47811fb30d33fe48b94c4cdebdc4b4f4a52763a3efb94d9d9a5bdf529d
 EBUILD gegl-0.2.0.ebuild 3306 SHA256 5abb3122550e7d6ce38a19882448eb0585569506d6a9c111a9bddb98f54114be SHA512 d63eaf38b8d071009b561040d169071f53d00ac003cf3278d4a84dfb665ac2958d0e833702d6ba3237685347a3bafc61f1bb8ab4c316cc90002724ddd61f16e8 WHIRLPOOL 41ef434bf73b549292a98e8c2b7c3bec589820626e93a5e1943d6767398342d5446ae119c281f8d517bbbb18161caae2e2b494bacb7d3956ad9a971289fc7cba
 EBUILD gegl-9999.ebuild 3168 SHA256 aec89937b0e4d17260a39821be64d4b6089479cc1aad3a6ac09a1eb1360722b5 SHA512 3ad32fa66b6f36be22f23e354a52f27fb8ab507db4fd1eb74eba5e3ba067d15519559c067a4801ccbfda28d3e4f5870206c4236b59b9fc225a267f2765e76f6d WHIRLPOOL 762b9157b43045de85fec0a4da5b8bfa995f75b9aa2d089db5769ee3f31f0a2241bffb524d4c4c73ea45d942558cb8763a5787e5206a2e49d679f48b907cd4f5
-MISC ChangeLog 11543 SHA256 4f995364bdfdc915e2e1dc6e28a92cae99fe87f175d6e36ce0c749d99a096628 SHA512 241406f5ce688a126a84f3a714d0bd221fb20fd3e1c316dcd0dc540743181e291767b5237e151ea600c1ef12e504759ce5b5def23922b132467ce4dd0c617d85 WHIRLPOOL f725923f3612e6736774c5ed93a5babd0753233f8cf6b7a84ba00931ad660305c190a2a7cf2f320347962c73376bc83a2ff02beabc5a57edf5e625189076468f
+MISC ChangeLog 11731 SHA256 46a972bf4ebffeedd25f95408cbf38453cfe57518f96f731e387ab584102cfc8 SHA512 c4ee2ed6ba0b27a8e5db7daf17ae90902959dbd52314234495154850c2453f622215e30e559b3f1fb2905d980243165f418237f968b3c7a5f3914f4575905c62 WHIRLPOOL 608c8e4feb3626676dd5388df7f09cbc8789e572dcfed15543f23a8506f12771d9160b3bc98710ac5015a72254ad53cd306b6fc343b7641edc5d6cc05b08d078
 MISC metadata.xml 546 SHA256 76148af87ef72e06a1daae6476a80a97058f4f9e5d115c0603e156aeb3fd492d SHA512 0aab6757fb995142f0407c2b9aa35fdd7d18566541ca2dd06134451482287d0fb9b3fabf3b744644edba43d7d5b5838558c622792c041144d1b160f44cf48fb4 WHIRLPOOL a073c9fe5d73789ed6ba380b1c0337948300765d1e509f0097be34f1bdbbdebf8863608dbdfa63b0430695d9f22ae0c3b2a2513cba1520a6fc4178419854bee5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlF9QJoACgkQsAvGakAaFgBYKgCginGQ6Bz6hW5LYEGps0FXi5Ae
-UXAAoJYxWsBOjCBK5WGG08NILlVZraqK
-=2edv
+iEYEAREIAAYFAlF9UuMACgkQsAvGakAaFgArSACfcQXOzuAvfPFZOmdII8fnh7DC
+wXgAn0p70X5l+EMvB2U0alZGh65wKclO
+=lZW9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
new file mode 100644
index 000000000000..1ac28dc62964
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
@@ -0,0 +1,31 @@
+From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001
+From: Jon Nordby <jononor@gmail.com>
+Date: Thu, 12 Apr 2012 12:10:05 +0000
+Subject: gobject-introspection: Fix build after 0.2.x version bump
+
+Remove hardcoding of version numbers so that this does
+not happen again.
+---
+(limited to 'gegl/Makefile.am')
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index aef4c33..43010ce 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -118,10 +118,10 @@ introspection_sources = \
+ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
+ 
+ Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
+-Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
+-Gegl_0_1_gir_CFLAGS = $(INCLUDES)
+-Gegl_0_1_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
+-Gegl_0_1_gir_FILES = $(introspection_sources)
++Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
++Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
++Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
++Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
+ 
+ girdir = $(datadir)/gir-1.0
+--
+cgit v0.9.1
diff --git a/media-libs/gegl/gegl-0.2.0-r1.ebuild b/media-libs/gegl/gegl-0.2.0-r1.ebuild
index 1ba96e836e45..ccf6ca578fca 100644
--- a/media-libs/gegl/gegl-0.2.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.6 2013/04/28 15:29:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r1.ebuild,v 1.7 2013/04/28 16:47:56 sping Exp $
 
 EAPI=4
 
@@ -59,6 +59,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
 	epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
 
+	# https://bugs.gentoo.org/show_bug.cgi?id=416587
+	epatch "${FILESDIR}/${P}-introspection-version.patch"
+
 	epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
 	# fix OSX loadable module filename extension
 	sed -i -e 's/\.dylib/.bundle/' configure.ac || die