[gentoo-commits] repo/gentoo:master commit in: media-libs/libmng/

[Andreas Sturmlechner]

commit:     2aeb23988910287888cccf4f101fd2782b043f3a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 19:51:40 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 20:26:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aeb2398

media-libs/libmng: EAPI-7, https, sort deps

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/libmng/libmng-2.0.3.ebuild | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 5f34855de15..6e68deaa68d 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -1,11 +1,12 @@
-# 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"
@@ -13,17 +14,18 @@ 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"
 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}"
 
 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 +33,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}
 }