gentoo resync : 16.09.2021

3 files changed, 99 insertions, 2 deletions

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 9b870a51a284..90732736c3f1 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -4,7 +4,9 @@ AUX gd-2.3.0-getlib.patch 2848 BLAKE2B 308577a8fce5b764cf96139d21d4aa6a6deb86244
 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.ebuild 2630 BLAKE2B 677b6e663ed6c30a958acb0ece03b43064c6e552c0f61dacd528afb3bdc57b23183a8444901fc5f283640dc99df276ef75d4f80ee0f2723dd6030311f358125b SHA512 1a9d9b7f5ae614bef9167e5ce168a39e02b6d526c21ab865355a48850499e5d9c0a88c413345abd339cdbf3e7d6ebf240780047a1147f2038ba791d4d18a7608
-MISC metadata.xml 1636 BLAKE2B 2f70829e07669f433893a7ecd5dc7097e3ca80c6d86ef018823723601228d5960ea4c4bf97635107306e1e0fa401c593374a3a5514b645211c05bae253a95511 SHA512 5ed6fa619ad40835ae21266222975283322ca6092f8a5ad71258f48e012fb6537b44da2aa6ea07b92043dd5fc252239af5b51f558ddb69d7f6ce1cb667bc223d
+EBUILD gd-2.3.3.ebuild 2779 BLAKE2B 823b6026231f4fe4cf36b5813c7b326c5345ccfdce1813073b9f9f891b268c87f83412b2f776175acccb7676636df1004e64372bb3dd8055509a15eb76a58914 SHA512 c78dabe8895870932546b19bd2902b58f75a947c572791c66dc66b1e6860c80322adcac61575a98f5be0471777c3ae3c95878f8d9a1116c7b5a2a320832c4ed0
+MISC metadata.xml 1637 BLAKE2B 68ed864c268f2f84f341e7281d68c2f227c6e65b78bf490cea11dd09208f7cad4426c94b8100f8f7be1fb1725e5aca0b699bf08286135996e39f61de3d0006d1 SHA512 63c490455fa6bd7d6f3cc2b8b4d68c49eb28d14e4d83696df270bebebe8186ca04e58f4dc73e381d0f932e1f273a8c13b4f9f3a0a926debc4173bc8b4ba94d0e
diff --git a/media-libs/gd/gd-2.3.3.ebuild b/media-libs/gd/gd-2.3.3.ebuild
new file mode 100644
index 000000000000..e890c90f2dd2
--- /dev/null
+++ b/media-libs/gd/gd-2.3.3.ebuild
@@ -0,0 +1,95 @@
+# 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="avif cpu_flags_x86_sse fontconfig +jpeg heif +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="
+	avif? ( media-libs/libavif[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif[${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 avif)
+		$(use_with fontconfig)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype freetype)
+		$(use_with heif)
+		$(use_with jpeg)
+		$(use_with webp)
+		$(use_with xpm)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# See https://github.com/libgd/libgd/issues/763 (although it still passed without it here?)
+	TMPDIR="${T}" default
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 6c08c2fe834f..1b70c49f5823 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>codec@gentoo.org</email>