gentoo resync : 12.05.2022

5 files changed, 0 insertions, 313 deletions

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 01f145a5f403..903d2c58b36b 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,12 +1,6 @@
 AUX gd-2.3.0-disable-flaky-tests.patch 792 BLAKE2B 81d4d56f0365e51fd1f406f3f27cd788a670bc091e13c8d39e8fb8234dd934896d6161940e010e2c0118000a36012bc2f878674a7409bcc19662686afaf99cb3 SHA512 285c542ca60f25597c29c040c95bd1885dbd3c29d3c1af52123646bc06abbd271bd37d4dedc1fc0bb218a84063814c8d8176a30c1da8a19445064469e26a5ea6
-AUX gd-2.3.0-fix-tests-bug722448.patch 2231 BLAKE2B 629caa9cd7dbd63cab93c97466921ee9131c5542618fdb5ce772a9b1bd3fcf2e64f93da999ca9011917cf8e726cae914c76529eca1a24cd2c31f55c4e75aaa7c SHA512 6d66af4e5d70e1e919f81bf0fd7261bd13216da4873927826d5c4925cf1673a9a3e98d588f693bab7505ee02e7a231c19687e27c1efc1a606bab3b3ab20a93dd
-AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244d0b858f520da1835547853d693f7c71621222744fe438f393aaaefa1fc6316ef27442a426af09df95c0faa2 SHA512 24d4774af36ca832504063c8327ff9a84956ae1a48cda3ef6f27d819e8a18b31a9083f2ce6d2587d5acb237d8c96c3d68cfe8eb8350a10715c15d16aca1cf37c
-DIST libgd-2.3.0.tar.xz 2539188 BLAKE2B a90f48be959d1bb6774ec44960e191b8be134ff3e74401eba4cbf9b165c72665f3dffe3beaaf92fa6069e0ef79533be5d57a5946a1839f55446072fa322ed808 SHA512 5b201d22560e147a3d5471010b898ad0268c3a2453b870d1267b6ba92e540cf9f75099336c1ab08217e41827ac86fe04525726bf29ad117e5dcbaef9a8d0622a
-DIST libgd-2.3.1.tar.xz 2632076 BLAKE2B 22457c4a2fc493872ccbc8a2c45283e785ab200ca671c48f00f3f22a037fac3b97afb35534f5ec7288714a16dfaa59ed53acbbd39c3e7f89f16cdec72ef1bed1 SHA512 0b96406a1d62129d7d63f78fc4558062c223a3bfbf9719be86362fd922b72b5dac294524dd1b0a996a4a7a709ee9d2dfc790ee32564add70adad41d044a0ed80
 DIST libgd-2.3.2.tar.xz 2821096 BLAKE2B a126fbac1c20113fe8f27187e70b1b81712212b7da01c9a0b3e5e38fb4d4356b7992a0cfd7db55a2f94877f6ecf82d775c39977a523db1f948cf215c6c0d7672 SHA512 a31c6dbb64e7b725b63f3b400f7bebc289e2d776bdca0595af23006841660dc93a56c2247b98f8a584438a826f9e9ff0bea17d0b3900e48e281580b1308794d2
 DIST libgd-2.3.3.tar.xz 2809056 BLAKE2B bde7a3218e5b07758b0beb96a654a44a97ba79abfe1ebe115ffd44aa34301be8e76f33840824362826dbfe93b16a4c4403b00b34aa631a0b18398cd46a09889d SHA512 aa49d4381d604a4360d556419d603df2ffd689a6dcc10f8e5e1d158ddaa3ab89912f6077ca77da4e370055074007971cf6d356ec9bf26dcf39bcff3208bc7e6c
-EBUILD gd-2.3.0.ebuild 2562 BLAKE2B 439023b5e0794151ac045b0fc9e7686db50b71044e7866c65a756398720473cb9c887a7323ac9914e2ff3c4339d4055af4b0100b3ab7ee9f6e3319b6169b4c81 SHA512 401ae121978ea066367e26dfbfeaa6ca98588830b60f7f0ba89c0aa95be486811f91a33c3c6922d34adf1ef1b8ca82b3df688d546760e2e91c03a1e2e29cff72
-EBUILD gd-2.3.1.ebuild 2474 BLAKE2B 330a280915eec3c018663ce118d62e6bec06d22b9e6bf99c873af74e2362451a7b1bbc2cb63401d805ad2230d94a9f93688d3269a25204e77d0c47330e22d230 SHA512 959c4948cd62837b7000f733d64575ad624bf316c0ce628eb4e1f1171d1096f303dd04c1928679a9cda2769eae71f34214a7ce4dabc67bdbcd4498c03a2a3c01
 EBUILD gd-2.3.2-r1.ebuild 2634 BLAKE2B 4746729ee31a6ec9a5a8a41210a2de5f8529bca0822e8ce187e070582694a57ba43c1f63d3e01e716602c9574c3a83839bb0b51284e33ef04e53fc87919f9bab SHA512 8be8b59df981b11333debcaa821d198eef57a9c22f064905c9d9bc49a40475fa9af53760c573030d133a47360b7a403e395e8765c89622188fc3b77d9e7125df
 EBUILD gd-2.3.3-r1.ebuild 2783 BLAKE2B 2ca3bcfedd498cb2cb34cec1554571d63494eb2edc1e9dbc228b32623e6a6c6aed67ae8f3c20dd76134cbb963da07c0be764b8b62dff6eb60dee3d214fccb62a SHA512 b59e2e135bd8e41f72270691d170f4663fa0d62874fb9de9fde80d498d5fd1484179778e6f0acd9b543e809aa81c36c0d8432d7a1de9096706711041c21b0086
 MISC metadata.xml 1637 BLAKE2B 68ed864c268f2f84f341e7281d68c2f227c6e65b78bf490cea11dd09208f7cad4426c94b8100f8f7be1fb1725e5aca0b699bf08286135996e39f61de3d0006d1 SHA512 63c490455fa6bd7d6f3cc2b8b4d68c49eb28d14e4d83696df270bebebe8186ca04e58f4dc73e381d0f932e1f273a8c13b4f9f3a0a926debc4173bc8b4ba94d0e
diff --git a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch b/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
deleted file mode 100644
index eef62fca676b..000000000000
--- a/media-libs/gd/files/gd-2.3.0-fix-tests-bug722448.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ec0b4397698bd358557d33641aac4beb1912f43b Mon Sep 17 00:00:00 2001
-From: wilson chen <willson.chenwx@gmail.com>
-Date: Wed, 15 Apr 2020 00:25:01 +0800
-Subject: [PATCH] Improve test cases for gdImageString16 and gdImageStringUp16
- (#625)
-
-Fixed #623. wchar_t is 32 bits on 64-bits AIX, which will result in test case failure.
-So we replace wchar_t with unsigned short array.
----
- tests/gdimagestring16/gdimagestring16.c     | 6 ++----
- tests/gdimagestringup16/gdimagestringup16.c | 6 ++----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c
-index 57eae978..0ca06680 100644
---- a/tests/gdimagestring16/gdimagestring16.c
-+++ b/tests/gdimagestring16/gdimagestring16.c
-@@ -9,9 +9,7 @@ int main()
- {
- 	/* Declare the image */
- 	gdImagePtr im = NULL;
--	wchar_t *wchr = L"H";
--	unsigned short *sptr;
--	sptr = (unsigned short *)wchr;
-+	unsigned short s[2] = {'H', 0};
- 	int foreground;
- 	int errorcode = 0;
- 	gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- 	gdImageColorAllocate(im, 255, 255, 255);
- 	foreground = gdImageColorAllocate(im, 22, 4, 238);
- 
--	gdImageString16(im, fontptr, 2, 2, sptr, foreground);
-+	gdImageString16(im, fontptr, 2, 2, s, foreground);
- 
- 	if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im))
- 		errorcode = 1;
-diff --git a/tests/gdimagestringup16/gdimagestringup16.c b/tests/gdimagestringup16/gdimagestringup16.c
-index c843abec..c24639fd 100644
---- a/tests/gdimagestringup16/gdimagestringup16.c
-+++ b/tests/gdimagestringup16/gdimagestringup16.c
-@@ -9,9 +9,7 @@ int main()
- {
- 	/* Declare the image */
- 	gdImagePtr im = NULL;
--	wchar_t *wchr = L"H";
--	unsigned short *sptr;
--	sptr = (unsigned short *)wchr;
-+	unsigned short s[2] = {'H', 0};
- 	int foreground;
- 	int errorcode = 0;
- 	gdFontPtr fontptr = gdFontGetLarge();
-@@ -20,7 +18,7 @@ int main()
- 	gdImageColorAllocate(im, 255, 255, 255);
- 	foreground = gdImageColorAllocate(im, 22, 4, 238);
- 
--	gdImageStringUp16(im, fontptr, 2, 18, sptr, foreground);
-+	gdImageStringUp16(im, fontptr, 2, 18, s, foreground);
- 
- 	if (!gdAssertImageEqualsToFile("gdimagestringup16/gdimagestringup16_exp.png", im))
- 		errorcode = 1;
-
diff --git a/media-libs/gd/files/gd-2.3.0-getlib.patch b/media-libs/gd/files/gd-2.3.0-getlib.patch
deleted file mode 100644
index 91884e93292d..000000000000
--- a/media-libs/gd/files/gd-2.3.0-getlib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 635dd9a3065ed88e1741e6b963044b80e913f96a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 24 Mar 2020 08:01:01 +0100
-Subject: [PATCH] distribute getlib.sh
-
----
- config/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/Makefile.am b/config/Makefile.am
-index 122287ee..6416dda4 100644
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -1,5 +1,5 @@
- ## Process this file with automake to produce Makefile.in -*-Makefile-*-
--EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getver.pl
-+EXTRA_DIST = gdlib.pc.cmake gdlib.pc.in getlib.sh getver.pl
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = gdlib.pc
-
-diff -ruN a/config/getlib.sh b/config/getlib.sh
---- a/config/getlib.sh	1970-01-01 00:00:00.000000000 -0000
-+++ b/config/getlib.sh	2020-05-05 17:37:31.638896089 -0000
-@@ -0,0 +1,43 @@
-+#!/bin/sh
-+
-+GETVER="${0%/*}/getver.pl"
-+GDLIB_MAJOR=$("${GETVER}" MAJOR)
-+GDLIB_MINOR=$("${GETVER}" MINOR)
-+GDLIB_REVISION=$("${GETVER}" RELEASE)
-+
-+# Dynamic library version information
-+# See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-+
-+GDLIB_LT_CURRENT=3
-+# This is the version where the soname (current above) changes.  We use it
-+# to reset the revision base back to zero.  It's a bit of a pain, but some
-+# systems restrict the revision range below to [0..255] (like OS X).
-+GDLIB_PREV_MAJOR=2
-+GDLIB_PREV_MINOR=2
-+# This isn't 100% correct, but it tends to be a close enough approximation
-+# for how we manage the codebase.  It's rare to do a release that doesn't
-+# modify the library since this project is centered around the library.
-+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
-+GDLIB_LT_AGE=0
-+
-+# The first three fields we feed into libtool and the OS target determines how
-+# they get used.  The last two fields we feed into cmake.  We use the same rules
-+# as Linux SONAME versioning in libtool, but cmake should handle it for us.
-+case $1 in
-+CURRENT)
-+	printf '%s' "${GDLIB_LT_CURRENT}"
-+	;;
-+REVISION)
-+	printf '%s' "${GDLIB_LT_REVISION}"
-+	;;
-+AGE)
-+	printf '%s' "${GDLIB_LT_AGE}"
-+	;;
-+VERSION)
-+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE )).${GDLIB_LT_AGE}.${GDLIB_LT_REVISION}"
-+	;;
-+SONAME)
-+	printf '%s' "$(( GDLIB_LT_CURRENT - GDLIB_LT_AGE ))"
-+	;;
-+esac
-+
-diff --git a/configure.ac b/configure.ac
-index 8996053..86d0bc9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_CANONICAL_HOST
- 
- dnl Keep the libtool version details in an external script so cmake can
- dnl access the values too.
--define([lt_gv], [config/getlib.sh ]$1)
-+define([lt_gv], [${SHELL} config/getlib.sh ]$1)
- m4_define([gd_LT_CURRENT], esyscmd(lt_gv(CURRENT)))
- m4_define([gd_LT_REVISION], esyscmd(lt_gv(REVISION)))
- m4_define([gd_LT_AGE], esyscmd(lt_gv(AGE)))
diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild
deleted file mode 100644
index 2bbd3e5bb1d8..000000000000
--- a/media-libs/gd/gd-2.3.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
-	prefix? ( fontconfig )
-	test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-getlib.patch"
-	"${FILESDIR}/${P}-fix-tests-bug722448.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
-	if use cpu_flags_x86_sse ; then
-		append-cflags -msse -mfpmath=sse
-	else
-		append-cflags -ffloat-store
-	fi
-
-	# bug 632076, https://github.com/libgd/libgd/issues/278
-	if use arm64 || use ppc64 || use s390 ; then
-		append-cflags -ffp-contract=off
-	fi
-
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gd/gd-2.3.1.ebuild b/media-libs/gd/gd-2.3.1.ebuild
deleted file mode 100644
index 99fe254589bc..000000000000
--- a/media-libs/gd/gd-2.3.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="Graphics library for fast image creation"
-HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-S="${WORKDIR}/lib${P}"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib"
-RESTRICT="!test? ( test )"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="
-	prefix? ( fontconfig )
-	test? ( png )
-"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
-	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
-	if use cpu_flags_x86_sse ; then
-		append-cflags -msse -mfpmath=sse
-	else
-		append-cflags -ffloat-store
-	fi
-
-	# bug 632076, https://github.com/libgd/libgd/issues/278
-	if use arm64 || use ppc64 || use s390 ; then
-		append-cflags -ffp-contract=off
-	fi
-
-	# we aren't actually {en,dis}abling X here ... the configure
-	# script uses it just to add explicit -I/-L paths which we
-	# don't care about on Gentoo systems.
-	local myeconfargs=(
-		--disable-werror
-		--without-x
-		--without-liq
-		$(use_enable static-libs static)
-		$(use_with fontconfig)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype freetype)
-		$(use_with jpeg)
-		$(use_with webp)
-		$(use_with xpm)
-		$(use_with zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc README.md
-	find "${ED}" -name '*.la' -delete || die
-}