[gentoo-commits] repo/gentoo:master commit in: media-gfx/tif22pnm/files/, media-gfx/tif22pnm/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tif22pnm/files/, media-gfx/tif22pnm/

[Sergei Trofimovich]

commit:     439d46108718e32e9c8f8528391184bf9155062e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 20:37:24 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 20:37:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439d4610

media-gfx/tif22pnm: add missing -lm, bug #516274

Reported-by: Patrick Lauer
Bug: https://bugs.gentoo.org/516274

Package-Manager: portage-2.2.28

 media-gfx/tif22pnm/files/tif22pnm-0.14-math.patch | 31 +++++++++++++++++++++++
 media-gfx/tif22pnm/tif22pnm-0.14.ebuild           |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/media-gfx/tif22pnm/files/tif22pnm-0.14-math.patch b/media-gfx/tif22pnm/files/tif22pnm-0.14-math.patch
new file mode 100644
index 0000000..99c6dba
--- /dev/null
+++ b/media-gfx/tif22pnm/files/tif22pnm-0.14-math.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/516274
+diff --git a/cc_help.sh.in b/cc_help.sh.in
+index b20feb6..1820304 100644
+--- a/cc_help.sh.in
++++ b/cc_help.sh.in
+@@ -7,2 +7,3 @@ LIBS_PNG='@LIBS_PNG@'
+ LIBS_TIFF='@LIBS_TIFF@'
++LIBS_MATH='@LIBS_MATH@'
+ ENABLE_DEBUG='@ENABLE_DEBUG@'
+diff --git a/configure.in b/configure.in
+index d11f42c..459ad8f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -125,2 +125,8 @@ fi
+ 
++LIBS=""
++AC_SEARCH_LIBS([pow], [m], [LIBS_MATH="$LIBS"], [
++  AC_MSG_ERROR([unable to find the pow() function])
++])
++AC_SUBST(LIBS_MATH)
++
+ dnl Checks for header files.
+diff --git a/do.sh b/do.sh
+index fa15db8..0e9f449 100755
+--- a/do.sh
++++ b/do.sh
+@@ -117,3 +117,3 @@ SOURCES='png22pnm.c'
+ TARGET=png22pnm
+-LIBS="$LIBS_PNG"
++LIBS="$LIBS_PNG $LIBS_MATH"
+ build

diff --git a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
index 2b78a6f..e01fcc1 100644
--- a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
+++ b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=4
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="tif22pnm and png22pnm command-line converters"
 HOMEPAGE="http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/"
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-math.patch
 	eautoreconf
 }
 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tif22pnm/files/, media-gfx/tif22pnm/

[David Seifert]

commit:     e82de422ac06de5df4829df9c0ed069c3a1e7610
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 15:07:13 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 15:07:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82de422

media-gfx/tif22pnm: Port to EAPI 7

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

 .../tif22pnm/files/tif22pnm-0.14-gentoo.patch      |  8 ++++----
 media-gfx/tif22pnm/tif22pnm-0.14.ebuild            | 24 ++++++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch b/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
index f71c751bd1a..cc97d68d232 100644
--- a/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
+++ b/media-gfx/tif22pnm/files/tif22pnm-0.14-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -21,7 +21,6 @@
  dnl Checks for programs.
  AC_PROG_CC
@@ -8,8 +8,8 @@
  dnl ^^^ set it to non-empty, so AC_PROG_CXX won't include `-g'
  dnl AC_PROG_CXX
  dnl AC_PTS_PROG_CFLAGS(fs, -fsigned-char)
---- do.sh
-+++ do.sh
+--- a/do.sh
++++ b/do.sh
 @@ -35,8 +35,8 @@
  if [ x"$CMD" != x ]; then echo "Executing: $CMD"; fi
  

diff --git a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
index fd8bd8740a0..cb5142c6aa6 100644
--- a/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
+++ b/media-gfx/tif22pnm/tif22pnm-0.14.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="tif22pnm and png22pnm command-line converters"
 HOMEPAGE="http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/"
@@ -11,19 +12,24 @@ SRC_URI="https://sam2p.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libpng-1.2:0
-	media-libs/tiff:0"
+RDEPEND="
+	media-libs/libpng:0=
+	media-libs/tiff:0="
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-math.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-math.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
 	dobin png22pnm tif22pnm
-	dodoc README
+	einstalldocs
 }