gentoo resync : 22.01.2021

4 files changed, 82 insertions, 2 deletions

diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index a742e764d31c..0a4f543cbe35 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,3 +1,6 @@
+AUX imlib2_loaders-1.7.1-loader-api.patch 1637 BLAKE2B 702793e9faf6ff67ec52069a2e6add85094cefcb3a3b46d9038567354fe4cd9d928306c3321b3a7ed3c545c31f8ef9d3105ac43769106b1aea5c28df7ec0f345 SHA512 67930338864745fe13da81832125d3089505dc4178c267a2b0595a75236c1c90cc29acb73e165a970b62efc276cfd541f35ae4f07b98f4eabb7d66d1c67661eb
 DIST imlib2_loaders-1.6.1.tar.gz 375642 BLAKE2B 20f4213e3d84c333faff82910f4f402524e50f567cddcce225678c0706d04c5a9520d8a54956f50be4d42fd231f317573ec091864f1d526336aacc8f7e0ae399 SHA512 1017b3587b2815d8347e9aef3f11649bdaadd48be10fe89d6e6eb8cb1d022723d414869cf12a2bff3eaa2f14c12ffd424767993e07990f8fa3ce5062ab0844fa
+DIST imlib2_loaders-1.7.1.tar.bz2 302348 BLAKE2B 8f73daa5b70d7122c136a001df920649a438edc60d4e7e94b691dfecc0864b66c321c676fb78a2f9e990b842d31fd5f95dcbacf232d6b9809382173449f86673 SHA512 5752768aa61c36e8f8ae5ff9219f950ba7b1561629bb21e4b4e16890d0fa904e93899e64152f05c6d7190553404336ec33b1d88b0cbec46c61a26598e27d449d
 EBUILD imlib2_loaders-1.6.1.ebuild 842 BLAKE2B 9fafbe47bdf42e124be8435dcdec8a85662383c864c346e595b80431fda64c22d853eefc0213f99926483f0451da797d5e0405d81525cc27221545d211b9df3b SHA512 7a4a3fe6ed9c48cbdee20fafc912fa85ad10ec2204e8ba2a96387a7ad58a7655206b444c5fa27c0e47b833e46e548a608dca81e9cdbef79c9a807fca8403ced9
-MISC metadata.xml 740 BLAKE2B f8a81519b6f15ec696052ac0b6c49d9d88704d5838c95012f871192647b55c1b8b5feb45c50dc2783d114f30617352a8eb21fbceb9076fc35bd44dd7f07e613e SHA512 e8a40301b4e6d747b27eca86effe9fb5067b3e23f063ebcaeeab2cc61caa8b826b1e4741ca1438fb14f7716a2171792b28a57958e55663c84deea6be4c05b66a
+EBUILD imlib2_loaders-1.7.1.ebuild 894 BLAKE2B 8c389f831e6e879df08d165b7e3debab44faf1b3cea06dc9c2dddd3642146a3e2cfff603fb266293e6d881c599fe903edb325627b1886595dd9ddeebf5f15a18 SHA512 c299afba91091a0233e866e57c10cc87800c3ea1892809250c84b4d2322d01e2ce73d00c11330f2cc6a5ff6fc10f23672fc87a45e0f7fdd8e2aea9770c858f9a
+MISC metadata.xml 830 BLAKE2B 36c15f8c0c8168c0c34a04eb20f47cf942531fde385aa80a7f93d5731557ec44fc616726116fcc4e2c38b21fba51ba6dbbbb37053c4d27b3c28a92915c7cbe08 SHA512 1f1af694b3447119959d854a691f61a7eb179d32e42e7e9c9dd2e96a0f00117083dec765478aec0be7486f3f50beba768766ea7fc7daf1531f25a4b07b5ffcca
diff --git a/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch b/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch
new file mode 100644
index 000000000000..981b1ce1e9b1
--- /dev/null
+++ b/media-plugins/imlib2_loaders/files/imlib2_loaders-1.7.1-loader-api.patch
@@ -0,0 +1,36 @@
+diff '--color=auto' -Naurd imlib2_loaders-1.7.1.orig/src/modules/loaders/loader_common.h imlib2_loaders-1.7.1/src/modules/loaders/loader_common.h
+--- imlib2_loaders-1.7.1.orig/src/modules/loaders/loader_common.h	2020-05-21 06:49:09.000000000 +0300
++++ imlib2_loaders-1.7.1/src/modules/loaders/loader_common.h	2021-01-16 15:11:53.229675567 +0300
+@@ -4,6 +4,7 @@
+ #include "config.h"
+ #include "common.h"
+ #include "image.h"
++#include "loaders.h"
+ 
+ __EXPORT__ char     load(ImlibImage * im, ImlibProgressFunction progress,
+                          char progress_granularity, char load_data);
+diff '--color=auto' -Naurd imlib2_loaders-1.7.1.orig/src/modules/loaders/loaders.h imlib2_loaders-1.7.1/src/modules/loaders/loaders.h
+--- imlib2_loaders-1.7.1.orig/src/modules/loaders/loaders.h	1970-01-01 03:00:00.000000000 +0300
++++ imlib2_loaders-1.7.1/src/modules/loaders/loaders.h	2020-07-28 21:13:51.000000000 +0300
+@@ -0,0 +1,21 @@
++#ifndef __LOADERS
++#define __LOADERS 1
++
++#include "image.h"
++
++struct _imlibloader {
++   char               *file;
++   int                 num_formats;
++   char              **formats;
++   void               *handle;
++   char                (*load)(ImlibImage * im,
++                               ImlibProgressFunction progress,
++                               char progress_granularity, char load_data);
++   char                (*save)(ImlibImage * im,
++                               ImlibProgressFunction progress,
++                               char progress_granularity);
++   ImlibLoader        *next;
++   int                 (*load2)(ImlibImage * im, int load_data);
++};
++
++#endif /* __LOADERS */
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
new file mode 100644
index 000000000000..06e19e93bd38
--- /dev/null
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Additional image loaders for Imlib2"
+HOMEPAGE="https://www.enlightenment.org/
+	https://sourceforge.net/projects/enlightenment/files/imlib2-src/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE="eet xcf"
+
+RDEPEND=">=media-libs/imlib2-${PV}
+	eet? ( dev-libs/efl[eet] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-loader-api.patch" )
+
+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/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index b55a612ff94f..bf2ad974a049 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
   <use>
     <flag name="eet">Enable Eet image loader</flag>
     <flag name="xcf">Enable XCF image loader</flag>