gentoo resync 08.09.2018

3 files changed, 57 insertions, 13 deletions

diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest
index dc499197df2e..e644d60dda86 100644
--- a/media-libs/libmng/Manifest
+++ b/media-libs/libmng/Manifest
@@ -1,7 +1,8 @@
 AUX libmng-2.0.2-jpeg-9a.patch 1183 BLAKE2B ef23ec070a72160a66b332ea4a834630ec45ff1420ac49423c6ed0e2c8ec4900d2632815e4ac1d23803bcc5836dfb9e664463471118268a0eac9e490dbf176e9 SHA512 f8c3b7296b046b5fdb6ef03b06f83a8d2034fb405c7fa8f61ebe06e71722bc6961ba09107080e08f0d57669eeab4b1fad70b9bb3fbdced039efa862ca53bc1d0
 AUX libmng-2.0.2-stdio.patch 261 BLAKE2B c47f9bb6aaf0df89bd5514fc3cd222f920ff721ba1af42c44fefd7fc162b0665ac4347299cd4fdd4cde289b39bd901806a75e4b4aba8042cdc53323010fe2475 SHA512 44492809618df0ff3e7a41c55561703ad1331853c8872237b828f767a07236be9630bb3955b4c3c444d9fb80440697b2a52fa99fdbbe2054bc35ca6eba065c06
+AUX libmng-2.0.3-jpeg-9a.patch 1231 BLAKE2B 0b9c55af1a88d836cf753410da6299a7c19f94055175034b7c204f991b7773fbfcbd46417ac69a4dfab4078fd2ae11a811051f9e7b297081bb79cd2a3aa0633a SHA512 4b4fbfa226394a1ae8e33ff9db8f0a7c9754873d27beaf0a59a4e34b0d38794314f29c0a76b9e7b6b3d792d856ee8e040c8669367ee0f1e0d5d36000418d403f
 DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687
 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6
 EBUILD libmng-2.0.2-r1.ebuild 1178 BLAKE2B 3773cc710c8193761d31f7899845b46a9034807b1035db4d3782baac2d79abf33bc993ad7c47e423a08cac435d965b9e6b28bbe1b8fdc3a66dfc8face76067dd SHA512 33f96e47638f83c69dae5860ad39ac889c079570b04ad0194390acd74a022bc9b6fcb6a67e7988988790bf8f91cad31496961a482b21d366d7a86da0533eba02
-EBUILD libmng-2.0.3.ebuild 1139 BLAKE2B f476e9fcdb4390016fb33616363432243cd3c5e41b2bffc78fae24277f446c546902f350e04dbd18e766662ae6817991edec50232ed26f983c218dd72f118607 SHA512 e0f6abd8ec06fec5904b41b68ee8946557fa952b7b5e2988ffb2635de556ca1bcbc9b3f76c40bfdfc38d97ebb53920e741de163e104431b8f808ec75f10fe180
+EBUILD libmng-2.0.3.ebuild 1175 BLAKE2B f7ab7d1743abf6afe693d037c0da55f05cce26b5f57cd2a0b4d6cd59b079cc688b4cad3b9585c3ac4146812be8227aa0ba39174ce743da13b408c398e1d01ed3 SHA512 c55845d80cb06828ba340827335f05d23a89e4a7d124b14920ed1343d715318dfd1fd743236073e82c84f09615002276326752f9b3fdb631e901f93a38825bdc
 MISC metadata.xml 335 BLAKE2B d1fae8ad219bf09d9bd3588fedaaca1599c795811ea024f726dc3e37e88e5b776e05c3c40eefa6d100e393fcf439aff9d67c77d85010f6e1e8e2319067386fee SHA512 a870b439c25b0dc7d251b15c53eded27ed9a4c708dd81bb4facc7cda49b57abb4a24c013b36c11db4d8a27af2cd55ad012792fe81e8893f5c92007790c4fd8f8
diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
new file mode 100644
index 000000000000..9441f00137d9
--- /dev/null
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/520906
+
+This kludge is unnecessary with jpeg-9a and is in fact breaking the build...
+
+libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function)
+libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function)
+libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function)
+
+...because jmorecfg.h of jpeg-9a has this:
+
+#ifndef HAVE_BOOLEAN
+#if defined FALSE || defined TRUE || defined QGLOBAL_H
+/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+typedef int boolean;
+#ifndef FALSE                   /* in case these macros already exist */
+#define FALSE   0               /* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE    1
+#endif
+#else
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+#endif
+#endif
+
+2018-09-06: Adjusted for libmng-2.0.3
+https://bugs.gentoo.org/578744
+
+--- a/libmng_types.h	2015-04-20 21:17:32.000000000 +0200
++++ b/libmng_types.h	2018-09-06 22:56:57.153190623 +0200
+@@ -201,9 +201,6 @@
+ #endif
+ #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
+ /* There has been a change in jpeg-9 : */
+-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
+-#define HAVE_BOOLEAN
+-#endif
+ #ifndef _WIN32
+ typedef int boolean;
+ #endif
diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 5f34855de15d..20be193b51e9 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib
+EAPI=7
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)"
-HOMEPAGE="http://www.libmng.com/"
+HOMEPAGE="https://www.libmng.com/"
 SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz"
 
 LICENSE="libmng"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="lcms static-libs"
 
-RDEPEND=">=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
+	>=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
 	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
+
 src_prepare() {
 	emake distclean
-	autotools-multilib_src_prepare
+	default
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myeconfargs=(
 		$(use_enable static-libs static)
 		--with-jpeg
@@ -31,12 +35,11 @@ src_configure() {
 		--without-lcms
 		)
 
-	autotools-multilib_src_configure
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
 }
 
-src_install() {
-	autotools-multilib_src_install
-
+multilib_src_install_all() {
 	dodoc CHANGES README* doc/{doc.readme,libmng.txt}
 	doman doc/man/*.{3,5}
 }