gentoo resync : 09.06.2018

7 files changed, 72 insertions, 52 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 6acb4cab38d1..ea09b33e56d1 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index b37b0d48b270..3ecddf4ed38c 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,6 +1,7 @@
 DIST imlib2_loaders-1.4.7.tar.gz 384739 BLAKE2B 125200707c6bb9bb8f0c4ded56a3f8c0073843819e11d7ded6a363e1bef1a8c95227c4d010a3101c8a4714f9df8593cb2b58fd9e8b8f6da514a4be06ca1af10a SHA512 c7be31b9a7b50ea5a44cadf0ec7f056f5080498ec53fcd32d82a0a6da163b59397e8470c7bbe536d2cabf88c7694d18b450ad85cc6693e8862aeb7d4ee0f4835
 DIST imlib2_loaders-1.4.8.tar.gz 384862 BLAKE2B 53ac4d0dec5fccf2cb442883dbf9a0a31dab26c3ef206ef07b1bacf59ab74d9318dd6836eb0371183863e43b68db7f209efe92a1f8ecc18a1c2cfe038992f631 SHA512 5acf6568000d98571f0a4b7e63c3e5c534a7d12139654cdc64eaa3a551b7952f3752ad78e4ced595945adf03454367cc9c3dff7766bd35c2f7ee6baffdbb0a1a
+DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 EBUILD imlib2_loaders-1.4.7.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
 EBUILD imlib2_loaders-1.4.8.ebuild 688 BLAKE2B 042e80b5ca9f28e17a98b86101d70226d7bc7c341ba4f1a17cf40f282ed9b5617b56557b7c9407d74bb6f73291aed118b8f17c4df69f34a04ce5c445cb87c594 SHA512 e42176a5845b12927225667704ebde5a73458cd7e03140b0d36d113c7c7404bff6088da5e83b57459d57babb377f1709ed058b2afd4b3d0ae74db6e07b8067d8
-EBUILD imlib2_loaders-9999.ebuild 540 BLAKE2B 8602436eb581c5bcbebd85a6f9515e1ddd50e030e82a8a6c0b5942551d32b5926eca06c473138c0f232733483c061f65b22460690c91964c0aaeac0de5c36356 SHA512 7ff084e57014e3506b724e86a642274750df2eb470f35b3732e5b5914deda16a4a45e6561e4d44624b7083487ab58e91ed0d6dc694b8ebb686e9b0cd2557d2bb
-MISC metadata.xml 438 BLAKE2B 01a974e43ba1ea6f7249e3dd9fc58abb36d4ddf582de86f3154053b46703439ff640a92a692f982d7d0b2c3c96baa888787d3defe52d8474e022f139528780d9 SHA512 47c55c6e5a800cd52bc03c0ad16ddb614d82f6694eec40050e558499cc921425aecfa92ea88a6db189c9b6c9cc4b3ed71971ba1a8ed16734f20d0e235e3ffcd9
+EBUILD imlib2_loaders-1.5.1.ebuild 694 BLAKE2B 611aa5e81944b34a4b78447fe0c9395dee5673c71ca71a1d9fb5363f5937960bcea9c1cb0c34202585fcff1ae8d5f1c5efa3e610dfaf29815fac34c40f86f8f6 SHA512 1192edfec21029550f3daeaedf1ff7d505a479b2a98f57119cd2e6f5444d735dc6c89603ebe90942584ee944ff8bff3cceb29ea9b749c366a31c5e06ccc4851c
+MISC metadata.xml 922 BLAKE2B 6f1e856106a42159a968188e7638f70f8a5b0570f452c0fec6f917f50fa86e1be0ab9b3688dd1917c4db62968cecaa1c658bb403c7a55a08223566fb403d1468 SHA512 18ff6fed6da1e8e9657eca8b04c05b509c2f968f4798a2f5a54d54d6827c4a11f22ee4efdb174c5008816b9fad8b496a3cf2e6561efd8c55e23b9031de2becbe
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
new file mode 100644
index 000000000000..44ed51cae4d5
--- /dev/null
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Additional image loaders for Imlib2"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="eet xcf"
+
+RDEPEND="
+	>=media-libs/imlib2-${PV}
+	eet? ( dev-libs/efl[eet] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable eet)
+		$(use_enable xcf)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild
deleted file mode 100644
index ac30d7f3eec6..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="legacy"
-	EGIT_URI_APPEND=${PN}
-else
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment
-
-DESCRIPTION="image loader plugins for Imlib 2"
-HOMEPAGE="https://www.enlightenment.org/pages/imlib2.html"
-
-IUSE="eet xcf"
-
-RDEPEND=">=media-libs/imlib2-${PV}
-	eet? ( dev-libs/efl )"
-
-src_configure() {
-	E_ECONF=(
-		$(use_enable eet)
-		$(use_enable xcf)
-	)
-
-	enlightenment_src_configure
-}
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index 1f5dc09a7f4d..f427414f57c9 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="eet">Enable Eet image loader</flag>
-	<flag name="xcf">Enable XCF image loader</flag>
-</use>
-<longdescription>
-additional image library loaders for imlib2
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="eet">Enable Eet image loader</flag>
+    <flag name="xcf">Enable XCF image loader</flag>
+  </use>
+  <longdescription>
+    This package contains image loader plugins for Imlib2 that are not 
+    distributed together with the Imlib2 package itself.
+
+    The XCF loader cannot be packaged together with Imlib2 because 
+    Imlib2 is distributed under the BSD license, whereas the XCF loader 
+    is using elements of the Gimp's (www.gimp.org) codebase, which is 
+    distributed under the GPL. The XCF loader therefore is GPL'd as well.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-plugins/vamp-libxtract-plugins/Manifest b/media-plugins/vamp-libxtract-plugins/Manifest
index b075ee810096..06976f8ddaa4 100644
--- a/media-plugins/vamp-libxtract-plugins/Manifest
+++ b/media-plugins/vamp-libxtract-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST vamp-libxtract-plugins-0.6.6.20121204.tar.gz 20891 BLAKE2B 092358f93d00637627dd3ab2163cb9c38f65b3d1a1a5b9c118f8c50a38dc0f6dd5be4adba9027a8f1cd2d059d22457e79008fa16b2c93e4a1cc003727f9f54f2 SHA512 227b848409e4b57be042350ad1dedc8c02c0358239eaf530a0955a4b19ec2c4788e61c7b53b43de5ec1f051a33241e7a4c878584da1480b384756268b501c4c4
-EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 796 BLAKE2B 67e06a531a56ab4396fd0233c276c73f6c61c21f7661bf03a537bac1d99822d00f709f8d2aae665bce4b9b283aac94bc841476e1d41725ef4161f7ee85ab67f4 SHA512 dfb1d5c82fcf37e103b6f79504a856893d43ffa206d51cf65cb7d08497eedfbc56c3d7fa4cd3c8ac3eeba0ca5250788cc6a56613cdc6ddda1944e10bc52963fb
+EBUILD vamp-libxtract-plugins-0.6.6.20121204.ebuild 772 BLAKE2B 94067258b019ad8eb3a3abb93531bd6fb592e22f9697e85daa4ba08cb6926602ca7357027a7281c29be61d89c8c2bbc029463e4d085963dec7b64402cbe4b4a0 SHA512 3b2747bac958cd5ad1e40e71efe3e8c5f9b663dfde31b91fe32ea1da5c7f71dd803a2e94c971e217f0d60ec48bf975431b254131a6d694ec70c64e01be1f7685
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
index c6fb88e8947c..08a717bc9b5a 100644
--- a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
+++ b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.6.6.20121204.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils multilib toolchain-funcs
+EAPI=6
+
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Vamp plugin encapsulating many of the functions of the LibXtract library"
 HOMEPAGE="http://www.vamp-plugins.org/"
@@ -19,16 +20,16 @@ RDEPEND="=sci-libs/fftw-3*
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -e "s/-O3//" -e "s/ -Wl,-Bstatic//" -i Makefile
+	default
+	sed -e "s/-O3//" -e "s/ -Wl,-Bstatic//" -i Makefile || die "sed Makefile failed"
 }
 
-src_compile() {
+src_configure() {
 	tc-export CXX
-	emake || die "emake failed"
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/vamp
-	doins vamp-libxtract.{so,cat} || die "doins failed"
-	dodoc README STATUS
+	doins vamp-libxtract.{so,cat}
+	einstalldocs
 }