gentoo resync : 17.05.2018

4 files changed, 98 insertions, 3 deletions

diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 4dd160c474c9..68a8df2ee678 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,3 +1,4 @@
+AUX babl-0.1.48-configure-cflags.patch 672 BLAKE2B 42cc735f6191ae71da8f8c884a0d218deaedd5fddf3c3d91d17c85bb77bf2dc847f2998e27bf1aa9e55b33a6b0ab80e0870586ae0c57b419c8b56e8489a40c12 SHA512 5a17a4322b7a8526e8a1b3e48dfb16eef8a5af05540960859b9463efeba29e63b40c0de5e62ed79d420cad1810867aaba1798c9afecab738086be7ee7ad0caad
 DIST babl-0.1.12.tar.bz2 642234 BLAKE2B 2e60f7bc5edd55d78e3e588c1c777e3aff6953ffb0ecb5ac91b2a1bf7019329a1ddedb8de53b77fd1c37342b607f2f9603bedfb45ceb9943051d63bb0bd364ba SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a
 DIST babl-0.1.18.tar.bz2 734225 BLAKE2B 8fc7f0c25adbde4c88fef6ef104de232f5dd074c6262a6e47f177be9362d62dc8cf30e098f3f341fe57f164383eb2fc5054d7796214464482c1ef684f09d1cbd SHA512 70cf2db7294d5744e30519ccc9bfd795c9ef4bae4425bdf8719ce0028c6bb81deca7b2c0550e98877beddc7f5d5ce71b9ba5318416dc32c3087a13d8eee42304
 DIST babl-0.1.20.tar.bz2 763513 BLAKE2B 3327a44ca51303def81b4667d2a7d1c90a18f3264a143204e6146216d17bca8f53c556b6bbd98ea725571d3955eacfe8ce584ea84a1f174217c551f698ca38f0 SHA512 7200fecdc476233f6b448523b1bb39f34a47438ad1e4033a430851bc30e49b3a1de5086d486d9fadf4ecefd59219541f53575e0677753d059214b93b6270013d
@@ -10,6 +11,7 @@ DIST babl-0.1.40.tar.bz2 653272 BLAKE2B 4e5694db5a6d29c2faeada7046cacc511623bf54
 DIST babl-0.1.42.tar.bz2 653385 BLAKE2B 62b33ccafb8bff2e7bbe06ea38692e715defe545b3651988bb160e52283a7080f49ccabc2cf71c7f51160e9a5a12121e4a5953471535e91de08d6733993b84a7 SHA512 0c37944d273b3818a7bb316d3086d48966daa6b401b4e6c0cb9ff52c8d69a80d8b632fe236110f376ab107d349fa4383b20f22cac31889ba50e48ab25d5c42d6
 DIST babl-0.1.44.tar.bz2 653829 BLAKE2B 8014d66886645c67291ffbe218b95bf492512cb80fe4337ffdf714723cc4221850e71c97b8208d4242bb90855e8121047d2c683560d0eba2d0077620acb8395f SHA512 bb86d3676e12217c042464c74e22f9243d3a9c26bf4f78b0df991f40e341e02165e58284077c743489eda69274e3afd4d5b2c5312e28cc290eebaf4e8e86a9e9
 DIST babl-0.1.46.tar.bz2 653887 BLAKE2B dacfb2c4761a454012532dd74a31aa425a7aa989a98b9862c69c4f74fe6238a6b4d7af32358711f53c40094c3a0e4995c105a97282418eb30fc78b429c92a605 SHA512 a62d78d49565cfb5c3187353f31d7793156ae318e2a29b7430ca08272ea98b9101afb602d73c5cc87bc9f20a4469bc08bf8c6c197529260ae0e41d183f300648
+DIST babl-0.1.48.tar.bz2 659945 BLAKE2B 7daa742f27f39dee9ec1ff6955082585246ecd4532e83b664e28d219151d74cdea7856dc45ee26468c85fce5d2400399f02074b6ee7ee7fce65158e17d782607 SHA512 1fc9e2c60980b3e0531ba0418231e988ea5d96ebf5a22b96dc57536e17d45bfe8816408707179438df5c7e487b62421b968ffad491a97d54221f236198b53471
 EBUILD babl-0.1.12.ebuild 1336 BLAKE2B 0034d85113ab047a7e0eb363e1bce67246678b4c08a5d562cd4121fa8465ab4c8f571af5ca46fed7e9184e2e710d36a0ecd57dc7c181e47e8a3f0488488da630 SHA512 4b97fc493ade3c9ab855e007120e710a6918875481656f86f9d721dfae0e68d591208f55787069fc6a7473da9ecdabe27dec7031906b3ab0f1116f1b9a7f03d4
 EBUILD babl-0.1.18.ebuild 1466 BLAKE2B 8aa28a3d191cec1963032c99a7b8f6bcb663ba90290062c1e86efd760d96086a9e94de7f0bcc3881ce27ff583d627ded168e81693a9062a563ee47075aef9ca0 SHA512 4b4af9460080eeb97899a303c04527e7c970664b8bc754073b11ac8ace172b048109c40831bad70e14d3bd081a6a9f3509418f6f9995cbc3ae171e5d7a232d99
 EBUILD babl-0.1.20.ebuild 1474 BLAKE2B 670df7c287b3ddb67aa63e770e58d546465f2fe67b484fc4847d761c4268a7582f7af84d55b3ca4db4b7e3a38ea46e9947cd3c1eb75a25683b0df3951fa86557 SHA512 76b6996b06b4b346d500752f2d6096c7b0ad568d8d81c540f0662454175143aa143ca856140cafb96941fc1259e6633892501281b421c66f6b7c1d322e83cb9d
@@ -22,5 +24,6 @@ EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e79
 EBUILD babl-0.1.42.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
 EBUILD babl-0.1.44.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
 EBUILD babl-0.1.46.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
-EBUILD babl-9999.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc
+EBUILD babl-0.1.48.ebuild 1589 BLAKE2B 332a0d1f01e977bd1d657c6c342a012219a229c8a58580ec9a59ad22acd3363b85baa551cea45436297dc614e0aa65c8ea938c063496bd27b612638296a95022 SHA512 9f3f6b897e9805b1272dad65066a545feda96be7dc7a398737f41649b8cfc17eb312dfeab080e9e8151279f4e5306d70b9141b4da30aa6bee59c107e61b87150
+EBUILD babl-9999.ebuild 1603 BLAKE2B 8a870dfec71b8ff498107eba616c3878784c94f1dcc528d4c41df02323cab14f61d3777c87e999acfa97ac7768c92eda3262daa494779157b29e1c946511b988 SHA512 eeab542b8d7eecd2142cfc89f2948ee4a475e35dbaaa3c4d3b726b1c2d3f34c3fcdd0a2d29df2a6dcb35ce60e217462fb7c267a8b7d699147af252d9dbca5232
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.48.ebuild b/media-libs/babl/babl-0.1.48.ebuild
new file mode 100644
index 000000000000..fa9642d79c1c
--- /dev/null
+++ b/media-libs/babl/babl-0.1.48.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.gnome.org/babl"
+	SRC_URI=""
+else
+	inherit autotools
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-cflags.patch
+)
+
+src_prepare() {
+	default
+	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_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 8c2968e647f6..f4b8834a2f56 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils
+inherit ltprune
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.gegl.org/babl/"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.1.48-configure-cflags.patch
+)
+
 src_prepare() {
 	default
 	[[ ${PV} == *9999* ]] && eautoreconf
@@ -46,6 +50,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
 		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
 }
 
diff --git a/media-libs/babl/files/babl-0.1.48-configure-cflags.patch b/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
new file mode 100644
index 000000000000..089a82f0e00e
--- /dev/null
+++ b/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
@@ -0,0 +1,26 @@
+From 17d85b43750bc4cdfde71ab6b1d5f41acc89f2ed Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 17 May 2018 20:50:29 +0200
+Subject: [PATCH] configure.ac: No longer enforce -Ofast
+
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 924b0df..7933ead 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -161,9 +161,6 @@ CFLAGS="$CFLAGS $extra_warnings"
+ BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition')
+ CFLAGS="$CFLAGS $extra_warnings"
+ 
+-BABL_DETECT_CFLAGS(extra_warnings, '-Ofast' )
+-CFLAGS="$CFLAGS $extra_warnings"
+-
+ fi
+ 
+ AC_PATH_PROG(RSVG, rsvg-convert, no)
+-- 
+2.17.0
+