gentoo resync : 15.12.2019

4 files changed, 70 insertions, 88 deletions

diff --git a/media-gfx/hp2xx/Manifest b/media-gfx/hp2xx/Manifest
index 0559e41bcad2..cf106fc1982a 100644
--- a/media-gfx/hp2xx/Manifest
+++ b/media-gfx/hp2xx/Manifest
@@ -1,6 +1,5 @@
 AUX hp2xx-3.4.4-docbuild.patch 474 BLAKE2B 2e790843db84da1cbc0aebde13bcb3762cae3d727c6999f45ef9a1b8598d9a47fb786a032b051540410cc1f2ade6c94394a4fd5b4f319a4cae35acb03ef36227 SHA512 48e103f3f6d71f31fa4734a500d173afa33564eebe56ded5edf42c30b6a6c52b22f7742293661328bf26111e4b7fa68c6f47fec7e9ab387d49551b49147ebc70
-AUX hp2xx-3.4.4-r1.patch 3824 BLAKE2B a5318bc7e848210f0b8b4b916ba9af62910fcdec605253421062ddf4c0b7a5e9ca46a1c6760eded382a71729003bdd74e4e57865e05e84323dd21ddf690e0f1a SHA512 49a98dc29f820bf43550bec589045e81eaaed991681625bce1a192fee967e28663f053503644663cdb0e57709ba67000dc7f6922054a4ec3969f1555a63df0a3
+AUX hp2xx-3.4.4-r1.patch 3721 BLAKE2B 0cb18857495aa32789f0df25227e5cae1f2b137cfd7f1f8a6c224778638770d98f348e9b81628f1ff45a16cc181584e2e187873d4deb0f3d2ecadda268a1e542 SHA512 e68e320602a4ff49029b8e97962b10bc38f8d23a08ed37691b835fc1ecb22ad51533961448de044092f9ba2cb79e191f2772359b22f2bb3dde19bf5f18c1aac7
 DIST hp2xx-3.4.4.tar.gz 610330 BLAKE2B c1e374d53fe36710bef6802347829fe9dce67c73c6ca2f2ea6120a1afd343bbdcbd870b6005001d934d9803b91597ebcaceccafdb5cc29d26ad3aed108016abc SHA512 ccfe4a23ca482471506e59d6d459ce3ed56d9d775613e3238bd82d11cf4ea0595bf57ff95b3bd22a674865ec7f07dc63c1bcf0deb2a430b7ae241734c7e57ccd
-EBUILD hp2xx-3.4.4-r1.ebuild 1588 BLAKE2B e3b7f3b79861cf632b4eb1e3f04d1b12a2e4fcc94f44c166ed014ec9748fce0418f221d4ed4f3ecff5f926f9b8f7dc6643d9c58b8bcd17d1a4243f5db057aaa7 SHA512 e4ca1b98406d9ff20ed03bfe2c160690b2391d2e3bb8a8419ee1a1e4d4bb1add2ca61c248d045940cb30fc1a090774015ccf431dde1276432ea9e43ffccab257
-EBUILD hp2xx-3.4.4.ebuild 829 BLAKE2B 5381efb26130bcdf40b30e561e8f7ef19a3b4e1df40d86ac1ce2d8e641db24d64159ca189ece0b76e5d70fe5bdc250015592a4c92d148b7e2dcde9f065c399e9 SHA512 1becdc810fb0a16d05e042f9abdea89a590ce398f1ef400ef708a86a15c87a60a22faf0240e60f59e78b3ef2bb044040e36774a42d25ec2b7ffc0b68e215eb6f
+EBUILD hp2xx-3.4.4-r1.ebuild 1518 BLAKE2B f07d48755c0baca8b43f3de66f62760763e7b05463f94517f13d413cb6bc0a75c0e8cfa8b7361f6fb181f2e28f67a3d8a420cc07ce548faf4e184d18760334f5 SHA512 622d36d51651ffbc1a7797ae8113876be20ba2e55925a942ea77095ae2e5f21510ce070fd9ef6fd6c47e634ea91511384457bc4f3a3ef057c7582728a6d0a4b1
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch b/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
index 9bff4f43b922..d9f3edb84947 100644
--- a/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
+++ b/media-gfx/hp2xx/files/hp2xx-3.4.4-r1.patch
@@ -1,6 +1,20 @@
-diff -ruN hp2xx-3.4.4.orig/makes/generic.mak hp2xx-3.4.4/makes/generic.mak
---- hp2xx-3.4.4.orig/makes/generic.mak	2003-06-21 17:16:35.000000000 +0200
-+++ hp2xx-3.4.4/makes/generic.mak	2012-02-07 22:30:29.000000000 +0100
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,9 @@
+ 
+ all:
+-	cd sources; make
++	cd sources && $(MAKE)
+ 
+ clean:
+-	cd sources; make clean
++	cd sources && $(MAKE) clean
+ 
+ install:
+-	cd sources; make install
++	cd sources && $(MAKE) install
+--- a/makes/generic.mak
++++ b/makes/generic.mak
 @@ -30,11 +30,11 @@
  CP       = cp
  MKINFO   = makeinfo
@@ -115,9 +129,8 @@ diff -ruN hp2xx-3.4.4.orig/makes/generic.mak hp2xx-3.4.4/makes/generic.mak
  	$(BINDCMD)
  
  
-diff -ruN hp2xx-3.4.4.orig/sources/png.c hp2xx-3.4.4/sources/png.c
---- hp2xx-3.4.4.orig/sources/png.c	2003-06-21 17:31:51.000000000 +0200
-+++ hp2xx-3.4.4/sources/png.c	2012-02-07 22:26:33.000000000 +0100
+--- a/sources/png.c
++++ b/sources/png.c
 @@ -5,6 +5,7 @@
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
index 9bdc0204255d..82bdb6b2b16f 100644
--- a/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
+++ b/media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils base
+inherit toolchain-funcs
 
 DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
 HOMEPAGE="https://www.gnu.org/software/hp2xx/"
@@ -12,58 +12,72 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X jpeg png tiff"
+IUSE="jpeg png tiff X"
 
 RDEPEND="
-	png? ( media-libs/libpng sys-libs/zlib )
-	tiff? ( media-libs/tiff )
 	jpeg? ( virtual/jpeg )
+	png? (
+		media-libs/libpng:=
+		sys-libs/zlib
+	)
+	tiff? ( media-libs/tiff:= )
 	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo"
 
-PATCHES=(  "${FILESDIR}"/${P}-r1.patch
-	"${FILESDIR}"/${P}-docbuild.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-r1.patch
+	"${FILESDIR}"/${P}-docbuild.patch
+)
 
 src_prepare() {
-	base_src_prepare
+	default
 	cp -v makes/generic.mak sources/Makefile || die
 }
 
-src_compile() {
-	cd "${S}/sources" || die
+src_configure() {
 	export PREVIEWER="no_prev"
 	export EX_SRC=
 	export EX_OBJ=
 	export EX_DEFS=-DUNIX
 	export ALL_LIBS=-lm
-	use X && \
-		PREVIEWER="to_x11" \
-		EX_DEFS="-DHAS_UNIX_X11" \
-		ALL_LIBS="${ALL_LIBS} -lX11"
+
 	use jpeg && \
-		EX_SRC="${EX_SRC} to_jpg.c" \
-		EX_OBJ="${EX_OBJ} to_jpg.o" \
-		EX_DEFS="${EX_DEFS} -DJPG" \
-		ALL_LIBS="${ALL_LIBS} -ljpeg"
+		EX_SRC+=" to_jpg.c" \
+		EX_OBJ+=" to_jpg.o" \
+		EX_DEFS+=" -DJPG" \
+		ALL_LIBS+=" -ljpeg"
 	use png && \
-		EX_SRC="${EX_SRC} png.c to_png.c" \
-		EX_OBJ="${EX_OBJ} png.o to_png.o" \
-		EX_DEFS="${EX_DEFS} -DPNG" \
-		ALL_LIBS="${ALL_LIBS} -lpng"
+		EX_SRC+=" png.c to_png.c" \
+		EX_OBJ+=" png.o to_png.o" \
+		EX_DEFS+=" -DPNG" \
+		ALL_LIBS+=" -lpng"
 	use tiff && \
-		EX_SRC="${EX_SRC} to_tif.c" \
-		EX_OBJ="${EX_OBJ} to_tif.o" \
-		EX_DEFS="${EX_DEFS} -DTIF" \
-		ALL_LIBS="${ALL_LIBS} -ltiff"
-	emake all
+		EX_SRC+=" to_tif.c" \
+		EX_OBJ+=" to_tif.o" \
+		EX_DEFS+=" -DTIF" \
+		ALL_LIBS+=" -ltiff"
+	use X && \
+		PREVIEWER="to_x11" \
+		EX_DEFS="-DHAS_UNIX_X11" \
+		ALL_LIBS+=" -lX11"
+
+	tc-export CC
+}
+
+src_compile() {
+	emake -C sources all
 }
 
 src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
+	dodir \
+		/usr/bin \
+		/usr/share/info \
+		/usr/share/man/man1
 
-	make prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		infodir="${D}/usr/share/info" \
-		install || die
+	emake \
+		prefix="${ED}"/usr \
+		mandir="${ED}"/usr/share/man \
+		infodir="${ED}"/usr/share/info \
+		install
 }
diff --git a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild b/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
deleted file mode 100644
index 731025135dbb..000000000000
--- a/media-gfx/hp2xx/hp2xx-3.4.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils base
-
-DESCRIPTION="Convert Hewlett-Packard's HP-GL plotter language to other graphics formats"
-HOMEPAGE="https://www.gnu.org/software/hp2xx/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng
-	media-libs/tiff
-	sys-libs/zlib
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-r1.patch" )
-
-src_prepare() {
-	base_src_prepare
-	cp -v makes/generic.mak sources/Makefile || die
-}
-
-src_compile() {
-	cd "${S}/sources" || die
-	emake all
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-
-	make prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		infodir="${D}/usr/share/info" \
-		install || die
-}