gentoo resync : 31.05.2021

3 files changed, 27 insertions, 89 deletions

diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
deleted file mode 100644
index 85c7b61f896d..000000000000
--- a/dev-perl/GD/GD-2.560.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=LDS
-DIST_VERSION=2.56
-inherit perl-module
-
-DESCRIPTION="Interface to Thomas Boutell's gd library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="animgif gif jpeg png truetype xpm"
-PATCHES=(
-	"${FILESDIR}/${P}-rt106594.patch"
-)
-RDEPEND="
-	virtual/perl-Math-Complex
-	>=media-libs/gd-2.0.33
-	png? (
-		media-libs/gd[png]
-		media-libs/libpng:0
-		sys-libs/zlib
-	)
-	jpeg? (
-		media-libs/gd[jpeg]
-		virtual/jpeg:0
-	)
-	truetype? (
-		media-libs/gd[truetype]
-		media-libs/freetype:2
-	)
-	xpm? (
-		media-libs/gd[xpm]
-		x11-libs/libXpm
-	)
-	gif? ( media-libs/giflib )
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PREFER_BUILDPL="no"
-
-src_prepare() {
-	perl-module_src_prepare
-
-	# bug 572000
-	ln -s "${S}"/lib/GD.xs "${S}"/GD.xs
-
-	sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config pass_through);/" \
-		"${S}"/Makefile.PL || die
-}
-
-src_configure() {
-	local myconf
-	use gif && use animgif && myconf+=",ANIMGIF"
-	use jpeg && myconf+=",JPEG"
-	use truetype && myconf+=",FT"
-	use png && myconf+=",PNG"
-	use xpm && myconf+=",XPM"
-	use gif && myconf+=",GIF"
-	myconf="-options '${myconf:1}'"
-	perl-module_src_configure
-}
-
-mydoc="GD.html"
diff --git a/dev-perl/GD/GD-2.560.0-r2.ebuild b/dev-perl/GD/GD-2.730.0.ebuild
index f8fac1a9a8b8..d6d5874dceeb 100644
--- a/dev-perl/GD/GD-2.560.0-r2.ebuild
+++ b/dev-perl/GD/GD-2.730.0.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DIST_AUTHOR=LDS
-DIST_VERSION=2.56
+DIST_AUTHOR=RURBAN
+DIST_VERSION=2.73
+DIST_EXAMPLES=("demos/*")
 inherit perl-module
 
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="animgif gif jpeg png truetype xpm"
-PATCHES=(
-	"${FILESDIR}/${P}-rt106594.patch"
-)
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc"
+IUSE="animgif fcgi gif jpeg png test truetype xpm"
+
 RDEPEND="
-	virtual/perl-Math-Complex
 	>=media-libs/gd-2.2.3
 	png? (
 		media-libs/gd[png]
@@ -35,21 +33,27 @@ RDEPEND="
 		media-libs/gd[xpm]
 		x11-libs/libXpm
 	)
+	fcgi? (
+		dev-libs/fcgi
+	)
 	gif? ( media-libs/giflib )
 "
 DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-CBuilder
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-Constant-0.230.0
+	dev-perl/ExtUtils-PkgConfig
 	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=dev-perl/Test-Fork-0.20.0
+		>=virtual/perl-Test-Simple-0.880.0
+	)
 "
 
-PREFER_BUILDPL="no"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	perl-module_src_prepare
-
-	# bug 572000
-	ln -s "${S}"/lib/GD.xs "${S}"/GD.xs
-
 	sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config pass_through);/" \
 		"${S}"/Makefile.PL || die
 }
@@ -64,7 +68,11 @@ src_configure() {
 	use xpm && myconf+=",XPM"
 	use gif && myconf+=",GIF"
 	myconf="-options '${myconf}'"
+	use fcgi && myconf+=" --fcgi"
 	perl-module_src_configure
 }
 
-mydoc="GD.html"
+src_test() {
+	perl_rm_files t/z_*.t
+	perl-module_src_test
+}
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 980fc923ebee..abd77e4ef878 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,7 +1,6 @@
 AUX GD-2.560.0-rt106594.patch 1253 BLAKE2B d7d05d2c492782a90e877932dd9a12aeedc5d206fa41a4bbf35b871c6d3fd27557f2d9e0606f39cddee92f4b132e6d57f0f83dc90d0c82689b52f36ae7ec5c6b SHA512 6bb62f4dd24076f1d99a99e6adbba8daba6c94366ac6e0bdd5a9c18758f7090d6a387d1405b8402fe0463a25825542100d46768f56f80d64d05f34a0b20f0881
-DIST GD-2.56.tar.gz 273441 BLAKE2B eb8d27a1a18f3ee8474138c82d1305b6bc8248e6b4ba4ab0bc4470d070eae0207a837e54e8f02c8f6c06e813663396561c0ac2d191e9884ea1f0ff65d23bc166 SHA512 51c4b46b199625a12ae1ad1003cafe4e66913d1e0c0b51d9bccbc7c14a86dfe29144caefbeca2927a66a44d4ba8b134550ee4a63eb86aceaa13513c46a4e71f4
 DIST GD-2.66.tar.gz 253000 BLAKE2B 1a1d5374c06fcb07849e504c8c5c6f00443890cfb728fd02b4c94838d754c2f04bbda80cfa8e2a7b08a3c07cbed32aa6a499468dfb044865f833b3486965d2b8 SHA512 37d3da70f4e0b89b0166488a1f8a48c508ff5e515653fe1b10602cb708ae0ce713c617dcae21c48ec795799fb0e061762696e6a65bb8ba359859223d15677c61
-EBUILD GD-2.560.0-r1.ebuild 1384 BLAKE2B e741d630b244aa687d417cc32e4a2c350bf8e138ee97d7fea88a7f16bd63d09451c85364906acdcd898bc06218ddb8162903e08eb62e677f0ee95adb22314f26 SHA512 40d6be171dec03dc834a2de634ee968da8878962bebcd55c59d283e64f76d624a96eccf16251c65f3fa95bd4e8ca2e11537c5b9c5d87d19e9c1b23d6ac9ea8bb
-EBUILD GD-2.560.0-r2.ebuild 1460 BLAKE2B 17f3994ee7172098ca1a8c2e82f2c624d4944031f0e826409d4ba56d97db3361e707df379fb5937e3a4e831947155b4d14ab55ffbcc07f074628b1c373667c21 SHA512 440a3c1b0b351ae7a9b6990b3055cc684b630eb1a77ccd88a99cdafd689309c0b9e7e3e968c5c11888f35f66f4164be2ba1c4a348cbcbc0d6c8973d3c03c53a3
+DIST GD-2.73.tar.gz 261203 BLAKE2B 088cb4d3c846d61e89631c7fef6b0273489297f0613e1ebb98c33b404a613431c79a5e72c2b757450496ef8d86aabe387b102a4c8d22d69532b8d8e989bac9bf SHA512 0c360c86307c8a2484bd8e1fb4cf24e27f7976bcfd830d9070fdc3775d233845734c59796082d498276aa715f30c9452c492b0d5bd75e488c1e9c5fa76490709
 EBUILD GD-2.660.0.ebuild 1489 BLAKE2B 7f5d3c7fc11662353a27be7eebc9e5ba69f24fb11a0d7bee6dd1cb4dc8b2d844fcf20ad15b408c8baa0a68172d823648a057df6989e9e636fdcd286cb1e9a7f5 SHA512 e4c72da6ca0757b4d06fb92e5565244bf56b1b093c80fb073fd1eb42ad4f4816d942387cd42a24f0c7f12ecf84bb9c3f38160f7e17a597048658542910de8c1e
+EBUILD GD-2.730.0.ebuild 1544 BLAKE2B 69038bf78e6cc656539167e2b8d9f0e6f4bdc076ad90f9b41dc5e5706275573aeb7ab682d948a6840c4c72449214c23b078e7aeb748ee8d395714c7b7368f790 SHA512 67b1b53891e669ed6b0b82d4371aeda264f7e0d8361657473b12b6d786c92ccb5531210c3293d201f6bcb9ef13aed6f6477809a800e889e9255814ee79f687dc
 MISC metadata.xml 852 BLAKE2B ab7abbcbf4d6d62266365794525899c41cb9119ac9173363eebb2573e682671c3e7b7cf032d450d90c19a9ba692915f2cbf706e2a90260c80f8e8eb251cee763 SHA512 7b5fe91b323a991d33efaa0b4eb5e4cb96ae8b279035e72a9d9937e08d64cfc7ae39d6ee720becabaa434d55088f05bb4352ff57e7abd63abe0c1949771a3f86