[gentoo-commits] repo/gentoo:master commit in: media-libs/stimg/files/, media-libs/stimg/

[David Seifert]

commit:     c9144553d635b88262dcf818636c207734eb3b57
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 00:42:52 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 00:42:52 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9144553

media-libs/stimg: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/stimg/files/stimg-0.1.0-libpng15.patch | 15 +++++++++----
 media-libs/stimg/stimg-0.1.0.ebuild               | 26 +++++++++++------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/media-libs/stimg/files/stimg-0.1.0-libpng15.patch 
b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
index 41ae138f1b1..a1b48ac36e2 100644
--- a/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
+++ b/media-libs/stimg/files/stimg-0.1.0-libpng15.patch
@@ -1,6 +1,13 @@
---- src/png.c
-+++ src/png.c
-@@ -102,8 +102,8 @@
+--- a/src/png.c
++++ b/src/png.c
+@@ -1,5 +1,6 @@
+ /* $Id: png.c,v 1.1.1.1 2003/01/30 12:22:26 hito Exp $ */
+ #include <stdio.h>
++#include <string.h>
+ #include <png.h>
+ #include "stimg.h"
+ 
+@@ -102,8 +103,8 @@
                0x00,
                NULL);
  
@@ -11,7 +18,7 @@
  
     if (image == NULL) {
        png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -112,18 +112,18 @@
+@@ -112,18 +113,18 @@
     }     
  
     row_pointers = png_get_rows(png_ptr, info_ptr);

diff --git a/media-libs/stimg/stimg-0.1.0.ebuild 
b/media-libs/stimg/stimg-0.1.0.ebuild
index 3a7be52b0ef..dba7db45095 100644
--- a/media-libs/stimg/stimg-0.1.0.ebuild
+++ b/media-libs/stimg/stimg-0.1.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Simple and tiny image loading library"
 HOMEPAGE="http://homepage3.nifty.com/slokar/fb/";
@@ -11,26 +12,23 @@ 
SRC_URI="http://homepage3.nifty.com/slokar/stimg/${P}.tar.gz";
 LICENSE="LGPL-2+ MIT-with-advertising"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE="static-libs"
 
-RDEPEND="media-libs/libpng
-       media-libs/tiff
+RDEPEND="
+       media-libs/libpng:=
+       media-libs/tiff:=
        virtual/jpeg"
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS )
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-libpng15.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-libpng15.patch )
 
 src_configure() {
        tc-export CC
-       econf $(use_enable static-libs static)
+       econf --disable-static
 }
 
 src_install() {
        default
-       find "${D}" -name '*.la' -exec rm -f {} +
-       dodoc README.ja
+
+       # no static archives
+       find "${D}" -name '*.la' -delete || die
 }