diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest index fb5be038a3794..49ca5f9c825d0 100644 --- a/media-libs/gd/Manifest +++ b/media-libs/gd/Manifest @@ -1,2 +1 @@ -DIST libgd-2.2.2.tar.xz 2105628 SHA256 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c SHA512 65c2f22ff35b5d62889921d7963d9cf808700299aece9292716555ac544e8c52ca435d6c5f817610553162e249343868a9164bf0fef9d59b61cd8075334c7e8d WHIRLPOOL 862588677be868c56af7c312e4aa66a5e67f10ccbc3cc7209b0fd23bcc3aae594c1e092b4b08ca7f913b334be47a486e696bced69d3f461056649f9ea8cc130d DIST libgd-2.2.3.tar.xz 2164152 SHA256 746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c SHA512 bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557 WHIRLPOOL 1f290bb446618e402422488e77e1b88626ea3d9679653f10392b90386cf2ae861f9f8fdf624ebd96d152b764cfa3bf6f01859f58a033585db01ef8ea77c21e1a diff --git a/media-libs/gd/files/gd-2.2.2-osx-libtool.patch b/media-libs/gd/files/gd-2.2.2-osx-libtool.patch deleted file mode 100644 index 4d20f33a340c8..0000000000000 --- a/media-libs/gd/files/gd-2.2.2-osx-libtool.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/583584 -https://github.com/libgd/libgd/issues/241 - -From dd6615fd138e53656a7883015d4a6b2d02292b26 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 21 May 2016 15:00:53 -0400 -Subject: [PATCH] libtool: rework revision to fix OS X breakage - -It seems the OS X linker restricts the revision field to 8 bits. -Rework how we calculate that value and pack it in closer to fit. -It might produce some collisions if we get to like 2.2.8, but oh -well ... this field doesn't need to be super exact. - -Fixes #214 and fixes #241. ---- - configure.ac | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - ---- a/configure -+++ b/configure -@@ -2460,7 +2460,12 @@ AC_SUBST(GDLIB_VERSION) - # 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 --GDLIB_LT_REVISION=$(printf '%i%02i%02i' $GDLIB_MAJOR $GDLIB_MINOR $GDLIB_REVISION) -+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION )) - GDLIB_LT_AGE=0 - - --- -2.8.2 - diff --git a/media-libs/gd/gd-2.2.2.ebuild b/media-libs/gd/gd-2.2.2.ebuild deleted file mode 100644 index 1666398abccdc..0000000000000 --- a/media-libs/gd/gd-2.2.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils libtool multilib-minimal - -DESCRIPTION="A graphics library for fast image creation" -HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/" -SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" - -LICENSE="gd IJG HPND BSD" -SLOT="2/3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib" - -# fontconfig has prefixed font paths, details see bug #518970 -REQUIRED_USE="prefix? ( fontconfig )" - -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} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" - -S="${WORKDIR}/lib${P}" - -PATCHES=( - "${FILESDIR}"/${P}-osx-libtool.patch #583584 -) - -src_prepare() { - default - elibtoolize # for shared library on Solaris -} - -multilib_src_configure() { - # 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. - ECONF_SOURCE=${S} \ - econf \ - --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) -} - -multilib_src_install_all() { - dodoc NEWS README.md - prune_libtool_files -}