gentoo resync : 25.11.2020

3 files changed, 39 insertions, 36 deletions

diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest
index cf4925970a7f..0c689cf9ad2c 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,8 +1,8 @@
 AUX plotutils-2.5.1-rangecheck.patch 792 BLAKE2B e855deee019d6c73ea442ec91f01c799120178cacd750fab01e29ea9770e5fa91ff8bfe4398ed00932036243c34b3d670afa3c333f2f011d42a33c45c842676c SHA512 b514a9502cd64f39c4a8b7e63761ecf4a82f1565a8f44abff60ee6f46d4b1ba1ed514c1094582521ed63b9f21ebafd4dcf18e482f030bd51b5ed7b59607cf07e
 AUX plotutils-2.6-format-security.patch 660 BLAKE2B 16f5ad83fcc73f6c7640b3608de8148b38b1ebd9c105c099a8606906f7ed2b2c02b5a014a283bfdad69d9c2ce80f992af198481acc7b18bdbb4f14146721f002 SHA512 2e53074f21d781e6081f8e7e0b365fed848f4447fba292be94b5a421aa26eedc98024f7bad83ef5dc24c1896f571fc1726c5afa1313cbadf558162249b3fe12e
-AUX plotutils-2.6-libpng-1.5.patch 575 BLAKE2B b35dc9895e5a2f17ad1d5b71d8dfc1d04fbef89246f8cf39d38378a12b456747859e8f049e59730d38acb0b156b93aa9a2d322dcdd0692cdc0bbf7fa6c0ac016 SHA512 bb250e520f37d1ccaa33af1267fe7b6972f709cc411ec411897d1e61a994ec4284ff3218a9abc6de9ba6345d546377e49f058f5d6cdb894b151b8f15dd7fc4e6
+AUX plotutils-2.6-libpng-1.5.patch 579 BLAKE2B b2c4b5f2fcae4a44f6817f61d92ba04624e02a6c756aef403f4a4f1631622a4f72e0ac48c6a5459b3eb474e710ba166f96495a1168d165e745f210aea3684fe1 SHA512 46080acf7154f8d63e9c340fd78df6967e820bd61617fc436eef98f62c8c3fff8b4401d0ba5877f537e1d6c40000910bd3d153d3bf7ceebcb447cc65ac2029ac
 AUX plotutils-2.6-libxmi.patch 5076 BLAKE2B ca028895b5af74e38176b3fe43747196033d39f01aa763f5388de8dc502ca5119f5bc153ec9537a1f1934940fe253125460844e8090459890132d4ade90e446b SHA512 157824dce491a06c15091eae8129e0c2269ffecaff168485e17535d61eabfade4007fd7e799921d91d674f28b2a9f67ac957155f0661821b1363fe5045dacae1
 AUX plotutils-2.6-makefile.patch 2921 BLAKE2B db41feef6b6f25cd5fe3b9e2329c142805d8cc2b3698042846f91275eb968f1eea797c482dd153f97ab63d0a0f937d3efa4fc01a52e97d0f72cf05614a403cb3 SHA512 ac98f183d19d36c4380d0bbb25a2f86569d79136729a6c265cbc51ce4aa7ad1fc279f9ae7c0ac1db7b4e49325032bbf082db900eb740f394d890ecca57f19a84
 DIST plotutils-2.6.tar.gz 3657562 BLAKE2B d77d62ba4e632001d056da7333d1300b2e3d7966029a130e6836fa88545a1749e15b5dc7322d03575432fc5e1342c839f4769ed821962f711848c2d8523904fb SHA512 4e5982605e5c1fbdb7325069c3ab2edd736e37a2eb30a1ec01fdc3541fcee6ed49937d4814c6baf79dab5b6fa42f909e4800c851d0ace3c7cf6d5a8681d0f0e7
-EBUILD plotutils-2.6-r2.ebuild 1994 BLAKE2B 5a2cddc7109c695d79e37abb2dbaf2dff998cdb832396f7dfed5b96571198456f53b942f6090f185a5287f48a6c7c229f10194be45ef5ebef0737091c0f3cf8b SHA512 4dc96936d7a6851525844d3eb9c1040e0722613afcacc2150e8f3ecca0191d5ef38bff8143ed6094bd0b22a9f9f12b7d480e2f7fa0fb8a38a853353048cdb0dc
+EBUILD plotutils-2.6-r2.ebuild 1948 BLAKE2B cfdd285b014f4224327d00868a11f6bdce5ee4764f4aa044603a316a5629f07ecabcc71c0780f57a8857dd35329b9c4262fb26fe247860ef938e9181340823b7 SHA512 a8872ec92957124f5896ac054362c2ee6063a2aea9ae5b991f87eadab5baf0bd54412018dfddab2a51bdf866a54f7980029b3b7eea7235ddfd54017208fa27b4
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
index b86d9f457421..431c638a553e 100644
--- a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
+++ b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
@@ -1,7 +1,7 @@
 fix building with libpng-1.5
 
---- libplot/z_write.c
-+++ libplot/z_write.c
+--- a/libplot/z_write.c
++++ b/libplot/z_write.c
 @@ -164,7 +164,7 @@
      }
  
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index d3c6f4302a93..19f52b52bf56 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit libtool eutils autotools
+inherit libtool autotools
 
 DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
 HOMEPAGE="https://www.gnu.org/software/plotutils/"
@@ -11,48 +11,51 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+png static-libs X"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+png X"
 
 DEPEND="
-	!<media-libs/plotutils-${PV}
 	media-libs/libxmi
 	png? (
 		media-libs/libpng:0=
-		sys-libs/zlib )
-	X? ( x11-libs/libXaw )"
-RDEPEND="${DEPEND}"
+		sys-libs/zlib
+	)
+	X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+	!<media-libs/plotutils-${PV}
+"
 
-DOCS="AUTHORS COMPAT ChangeLog INSTALL.* KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
+DOCS=( AUTHORS COMPAT ChangeLog INSTALL.{fonts,pkg} KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-libxmi.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_prepare() {
-	rm -rf libxmi/* || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	epatch \
-		"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-libpng-1.5.patch \
-		"${FILESDIR}"/${P}-libxmi.patch \
-		"${FILESDIR}"/${P}-format-security.patch
+	default
+
+	rm -r libxmi/* || die
+	sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
 	eautoreconf
 	elibtoolize
 }
 
 src_configure() {
-	local myconf
-	if use X ; then
-		myconf="--with-x --enable-libxmi"
-	else
-		myconf="--without-x"
-	fi
-
-	econf \
-		--enable-shared \
-		--enable-libplotter \
-		--disable-libxmi \
-		$(use_enable static-libs static) \
-		$(use_with png libpng) \
-		${myconf}
+	local myeconfargs=(
+		--enable-shared
+		--enable-libplotter
+		--disable-libxmi
+		--disable-static
+		$(use_with png libpng)
+		$(usex X "--with-x --enable-libxmi" "--without-x")
+	)
+	econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
@@ -60,7 +63,7 @@ pkg_postinst() {
 		elog "There are extra fonts available in the plotutils package."
 		elog "The current ebuild does not install them for you since most"
 		elog "of them can be installed via the media-fonts/urw-fonts"
-		elog "package. See /usr/share/doc/${P}/INSTALL.fonts for"
+		elog "package. See /usr/share/doc/${PF}/INSTALL.fonts for"
 		elog "information on installing the remaining Tektronix fonts."
 		elog ""
 		elog "If you manually install the extra fonts and use the"