5 files changed, 103 insertions, 46 deletions
diff --git a/media-libs/babl/ChangeLog b/media-libs/babl/ChangeLog
index 79b803885427..2605d82b5fcd 100644
--- a/media-libs/babl/ChangeLog
+++ b/media-libs/babl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/babl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.63 2015/01/29 17:27:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/ChangeLog,v 1.64 2015/05/25 23:49:21 tetromino Exp $
+
+*babl-0.1.12 (25 May 2015)
+
+  25 May 2015; Alexandre Rostovtsev <tetromino@gentoo.org> +babl-0.1.12.ebuild,
+  babl-9999.ebuild, metadata.xml:
+  Non-maintainer version bump from the gnome overlay, needed for gegl-0.3 (bug
+  #550108). Update live ebuild. Remove unused flag descriptions.
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> babl-0.1.10-r1.ebuild,
   babl-9999.ebuild:
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 949bb0bbb89b..9811850c372f 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -5,26 +5,28 @@ AUX babl-0.1.10-clang.patch 1602 SHA256 c06a8f7daad0b918fedc6eda01e70f94cb376eae
 AUX babl-0.1.10-g-ir-compiler-crash.patch 705 SHA256 6085e0eed4951f548421e00cf3eb957576bf6126955ca2eeddef499bcd2de2e4 SHA512 5bd7f2815b0df6d65fbbbdfde009483108f2dc018d4b4e966eb73db1be25b71f3e09cd416691ff0451f601dacc268daf59b9b0582c79bc8e153d9744e867bb1b WHIRLPOOL 578185466c06e0442295109461a9f5417c617d450b0ce50de6ede41f6c91ba3d57eb96c508cb8c130a2d6264938061dc28d425deaef5de7dfb9bb0e5445912ee
 AUX babl-0.1.10-introspection.patch 1153 SHA256 9b367f4662835df0dadd2a50c8a382f0177751fa25bac7c3db7355afcf130688 SHA512 7670031fa6a901d9491754bf333aa954369df1768bb8ad81fc114a0bfd08fc6e16681da8ff365898fdbb82acdef344508adda6ed574180b1a473d9b2f47ff1f9 WHIRLPOOL 6011f46aa636376c6b6a542627cf0ecfe35c0cd8dcaca35d876b0d7eda95c5a640e046137c3954abdb292c5974737cbf35bb27d60f510546a08274c684c50ca2
 DIST babl-0.1.10.tar.bz2 449537 SHA256 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 SHA512 2950d94c255ee05d405e003a46138da0f4e0cad65e2d2a882089b788c2deac0524014f7c5758c3097253bdbebaded433caf0447c7d218c9cc96798df9e6f0c92 WHIRLPOOL a71907a531bc71c7ac0c84a197a559c50321a5d96b5d846083935390890ef116780d49bd458577aef0e948395dc14897e6fbbc75478b2a59d57d4381cf7f8db8
+DIST babl-0.1.12.tar.bz2 642234 SHA256 2f802b7f1a17b72c10bf0fe1e69b7a888cf7ce62b7cf1537b030f7f88d55a407 SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a WHIRLPOOL b1a170492f1c1e6f030f418cc66c3be02cd2bd7e10896a416b5feaf2d7aa82de4fa15c9d2a65e6e1038ab6822e4dc3333f96102e18d757a6b1e07f4017b4beba
 EBUILD babl-0.1.10-r1.ebuild 1953 SHA256 35b566ad030ae2c14c2bbf0335997e68489cf387122f5a8ea35e57d609d82604 SHA512 d5f11b5b0c9fbab03d1ac860abfe8a78dffb60027838ecd7b66c4f4c03c74213f778f2c3b7aaa7681a6d61841aa9b5bbeaac828bac1782492b465fda60f60c68 WHIRLPOOL 77e681acfe9bd1706afc4647b472df2ae705fa08a52d381caee24d81026603a681de012af774ed212325dc5fa2abbd53395bc114018bbe6bd080e87c69c48ca3
-EBUILD babl-9999.ebuild 1520 SHA256 e5179b70585a4e2ffccddb9434561bd69d1940a8d5f6525cc9bada291feedd5d SHA512 ee1c62c43bee846afc8eb4213b3bc66c9795f73ba4085d0a3eeb67ae8a63811698d8e3a67b9e7716bf46044fd658ce417f854848fabef1d7dcfccfb1c779a752 WHIRLPOOL cb01c5a196864c266db77a8839f2a84d5c5b4dfb1129434f5bcc3e2a42b07cec3e261f7cfa3b9e1f84dd77035c732b1c489dfe18ba2277f4d9468d2778d57b27
-MISC ChangeLog 7911 SHA256 adc0dce11f76ff6ef81025626427e9301972d347ddb8977a6396d5858ebe44d1 SHA512 7c81fa0c5bf90f48675db75b582e1b7bd593f601b2c5e15a39fcea39dfea977821b2f58c30e02daa172871f9182892216c12198ee8c3def5a3adfd4579763d05 WHIRLPOOL 10e2f95cb4d319b63606d8adc48ac5186ed0842970f5c4b94ae5d2c9045504223bb354cc4442c6c5ed19368aacc7b49cb3b18c8cf9f786dfe4250b75c4da8a96
-MISC metadata.xml 391 SHA256 3df30b3fc9c861ed6cf986f63b269dd11c63713ff36b234af2c31adfb78760f1 SHA512 38ad0ecbdce22d342844dc0ae2772935cf5d3cfd1dc1281aa69f6ccc640b58005af3f41f33687a30d2d86fa1722a5afdb79add27cfb46f4cd9c9e9485eff9dd1 WHIRLPOOL 843c6f2c2797b04471132fd3981b1f66cd59a0f206169a833af8965f8f1bf7f9412009f583e74d8edacda4c294d33b5560bba846e9a4fcc546dd10f710713db1
+EBUILD babl-0.1.12.ebuild 1457 SHA256 2d223619ba35dc084259098bbf2660c1b642d8e489d7d371dbcf75010fe9dccf SHA512 e75fdd13c8817e76867b66a7448ada46be152f2e97933cfac285202683ebef8577050e87ae4bc337db0ce6d917e5bbdb1f451bce86c7e5c7f6b7bfe8802cbd39 WHIRLPOOL 49e7de43a51cbd7a71ab207a0e85f0099601cd5dfdc55b12c1f04ed939668ebf2eaf34b1470cc4433041d8c949f1f5f0838e5725aaaf54d7c2f649d3183d1bb0
+EBUILD babl-9999.ebuild 1455 SHA256 092031119c9b4f6cd181ca43ff04e16bb5d081ca2d26ba85d3943d67b9e9c4db SHA512 5e11786eb80ff129430d00a2deac10bd6a0265ff7a4ebd116fb0354d226686051264282582621a86ba200139f6c3e3776822ce1a141283f81a7e6567c1792eaa WHIRLPOOL 8da2703a57fa474f0e07624d807fc3febeacdeeaf520f10d699ec8f5fb1297d9bf2634bbf8883f33353f3fbce01cc9a2b976bed6f6f595930745674e95b7885c
+MISC ChangeLog 8201 SHA256 0a47b02e0b4024b50c5981cf7fa519935242878aa70e74b9919574d4b3b66c57 SHA512 071dd3de0e9802fa59abf862801080bd8e6dd60c38650d65aa945f135eba6375c36b8cdb2b796b441fa52bc8de8dc8fa403b261483ab258e803bbe991b588cd7 WHIRLPOOL f9674aeaf1019e14dca79b2e7db398a82a322f65eafd6f83d0c6203526cd62b235e9ba9736a3422582360b2d98815d185913939732a5e5d7dafd39ca646d7e8b
+MISC metadata.xml 202 SHA256 99c6e1f6a9a995a0e46663523916461e7d0348f7f3b008176a425520534bd002 SHA512 3a80e27414666f3e50baf55525c93805692dca3fe31ae313d614a3fde4d167563abc7392f0c596717d892595c7ea115960ab7a2be0ac413d94c7a58dd32dc88d WHIRLPOOL 0cf8236e2b0760c5c23816ba4e654fe6ab92fd7ff051374447746ca0955789e0ce315617af924d60c17103b58a14da926d00783aeb1fe57b08cedcb17a0c9042
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUym2QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpJgP/1w3Z8Xmd3rGKMFI4DrPT8fI
-+L8qQwAvIqLbxfBC7l5K5RCUlVWcDQSGRqLcn9RasvZ69kLHG0rv7/xblq/Te5ep
-28TmRVs1da8pibGnjBxwV0UGgwyimFCeQP0KWEar14+MxSfiKzswvRQbwe31xwfx
-30Pr27cusU5pezvG3lBoNDFgnH3+Rhyqs1aAb8EtsVdFai8rrztha+ZrSbzSAH0r
-TvbpdfPZ8ONOuDQDz9RUWw1KEBXFP4JkWgvHAdbxMeILPMpLUH+M7fH3IRdsWHfl
-xhA/YlAgXoL+/X6tOu9SWeTu9flOgNM1VD+Unchcwz16H9geViYrnLLRg3MA+//n
-oN/maakKtHVrxwWpFb3culEFtvO2UtbNrc51OFB+WGtCkwVFGwM/Ro+8lmMMImVs
-SDkpgGaSnH0LpLl62IbB14v1axDc7g6/Pa+oDlEEhWQUyNv8JvbGfmpFz5Wc1NG4
-zTiy9NDQVBSlkwY+w5FXQ5MiM4SHGVU8n/2LlBtxT+9o9X6OpA9sr5/p3wHZDsBU
-jNHAXMNKQuYvO67/Bb/eK97tUUgqaL6tDY/iLjyUB+bQhgEDkJRMXwt5gyA2SfLM
-MS4mNGdFQemlHxRygumHBSu3Kb1Dd9VAysbaQ2JDxkzJj60c4DN+a3DZp8rojVmi
-d/7h0ekbDvBt65JYRue8
-=KMhY
+iQJ8BAEBCABmBQJVY7UCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNvoQP/0sxrY+yRU1UVs3dUtsRhlHd
+j6L6Et8sdlw8nGao1er+KXGTzXDAqOT/aTT89jVD3X7yDzBZEZ35dGimUQM4eugu
+hFw3pu9d9/WXKD0aRmFvBzoGwMQCdYiDN98/7BclK+DFJDp61ohYTLOCHaWH4s7z
+QBOhctISWY+KIvarQzJy+dC0xSLqmHddKHdYUYuHLfB2jmTgxZSYx78pyb6rYZ8O
+uhM2fXGsT1a3816Lqj9COFSoJB5JL9ooO0drf/IRv1/gGCorTl5gbeOAHZNbUfhU
+ck5GJjV8f7EOJBi0SvzZIH0jTaAAkXEWBwq5mKEKEtR50qPqNTpQLbpTM+Ofhdhe
+xehT57K/zcZNz4RFP1FX/BiQJK6iWs3nSazWK5R7Cvg7+8I3m6voM2LzO1tKJABS
+bDtiskPzCl/TBWutCr8Qz8V1Xxr/0VVV4vwRAPOBE2XY4WkZnrr6Q4KS3sDFsQQe
+wJQvMezjxLi0uIP2ZgsNSrF8sSvCe/38+WC2LBYiM55MmnsxXV6KOyCPzLv80Dxb
+BJbQOjyG9p9eyz3AvPGrRORGLtdgx5ka04dbVj849mlfo1I2+Gt1/ecnk7CQACId
+dPZbIvK3fpi3HPIV6101obm1bOkQDFmipEgj4q19mckz9XPD7dwsF+zKXlslMIUA
+8N7X4XU1X5qq2ZZtguCb
+=re6e
 -----END PGP SIGNATURE-----
diff --git a/media-libs/babl/babl-0.1.12.ebuild b/media-libs/babl/babl-0.1.12.ebuild
new file mode 100644
index 000000000000..f197d07640db
--- /dev/null
+++ b/media-libs/babl/babl-0.1.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-0.1.12.ebuild,v 1.1 2015/05/25 23:49:21 tetromino Exp $
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch_user
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse sse2)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 9c2acd29d8a6..861d7e073450 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -1,36 +1,36 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-9999.ebuild,v 1.3 2015/01/29 17:27:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/babl/babl-9999.ebuild,v 1.4 2015/05/25 23:49:21 tetromino Exp $
 
-EAPI=4
+EAPI=5
 
-VALA_MIN_API_VERSION=0.14
-VALA_USE_DEPEND=vapigen
-EGIT_REPO_URI="git://git.gnome.org/babl"
+inherit eutils
 
-inherit vala autotools eutils git-2
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
 HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS=""
-IUSE="altivec +introspection cpu_flags_x86_sse cpu_flags_x86_mmx vala"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx"
 
-RDEPEND="introspection? ( >=dev-libs/gobject-introspection-0.10 )"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
-	vala? ( $(vala_depend) )
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	# fix compilation on OSX, can be dropped on next release:
-	# http://mail.gnome.org/archives/commits-list/2012-April/msg02589.html
-	sed -i -e 's/values\.h/limits.h/' babl/babl-palette.c || die
-	eautoreconf
-
-	use vala && vala_src_prepare
+	epatch_user
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
@@ -39,17 +39,16 @@ src_configure() {
 	# w3m is used for dist target thus no issue for us that it is automagically
 	#     detected
 	econf \
+		--disable-docs \
 		--disable-static \
 		--disable-maintainer-mode \
 		$(use_enable altivec) \
-		$(use_enable introspection) \
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with vala)
+		$(use_enable cpu_flags_x86_sse sse2)
 }
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -delete
-	dodoc AUTHORS MAINTAINERS NEWS TODO
+	prune_libtool_files --all
 }
diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index b03d4dec40e6..392c18acea45 100644
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -4,9 +4,4 @@
 	<maintainer>
 		<email>sping@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-	</use>
 </pkgmetadata>