Gentoo Archives: gentoo-commits

From: Markus Meier <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gd/, media-libs/gd/files/
Date: Wed, 02 Nov 2016 18:54:13
Message-Id: 1478112760.7492ba6074ec9a5c1e726b553faa6878dbae6d95.maekke@gentoo
1 commit: 7492ba6074ec9a5c1e726b553faa6878dbae6d95
2 Author: Markus Meier <maekke <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 2 18:52:40 2016 +0000
4 Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 2 18:52:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7492ba60
7
8 media-libs/gd: remove old, bug #587662
9
10 Package-Manager: portage-2.3.2
11
12 media-libs/gd/Manifest | 1 -
13 media-libs/gd/files/gd-2.2.2-osx-libtool.patch | 37 ---------------
14 media-libs/gd/gd-2.2.2.ebuild | 65 --------------------------
15 3 files changed, 103 deletions(-)
16
17 diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
18 index fb5be03..49ca5f9 100644
19 --- a/media-libs/gd/Manifest
20 +++ b/media-libs/gd/Manifest
21 @@ -1,2 +1 @@
22 -DIST libgd-2.2.2.tar.xz 2105628 SHA256 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c SHA512 65c2f22ff35b5d62889921d7963d9cf808700299aece9292716555ac544e8c52ca435d6c5f817610553162e249343868a9164bf0fef9d59b61cd8075334c7e8d WHIRLPOOL 862588677be868c56af7c312e4aa66a5e67f10ccbc3cc7209b0fd23bcc3aae594c1e092b4b08ca7f913b334be47a486e696bced69d3f461056649f9ea8cc130d
23 DIST libgd-2.2.3.tar.xz 2164152 SHA256 746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c SHA512 bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557 WHIRLPOOL 1f290bb446618e402422488e77e1b88626ea3d9679653f10392b90386cf2ae861f9f8fdf624ebd96d152b764cfa3bf6f01859f58a033585db01ef8ea77c21e1a
24
25 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
26 deleted file mode 100644
27 index 4d20f33..00000000
28 --- a/media-libs/gd/files/gd-2.2.2-osx-libtool.patch
29 +++ /dev/null
30 @@ -1,37 +0,0 @@
31 -https://bugs.gentoo.org/583584
32 -https://github.com/libgd/libgd/issues/241
33 -
34 -From dd6615fd138e53656a7883015d4a6b2d02292b26 Mon Sep 17 00:00:00 2001
35 -From: Mike Frysinger <vapier@g.o>
36 -Date: Sat, 21 May 2016 15:00:53 -0400
37 -Subject: [PATCH] libtool: rework revision to fix OS X breakage
38 -
39 -It seems the OS X linker restricts the revision field to 8 bits.
40 -Rework how we calculate that value and pack it in closer to fit.
41 -It might produce some collisions if we get to like 2.2.8, but oh
42 -well ... this field doesn't need to be super exact.
43 -
44 -Fixes #214 and fixes #241.
45 ----
46 - configure.ac | 7 ++++++-
47 - 1 file changed, 6 insertions(+), 1 deletion(-)
48 -
49 ---- a/configure
50 -+++ b/configure
51 -@@ -2460,7 +2460,12 @@ AC_SUBST(GDLIB_VERSION)
52 - # See http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
53 -
54 - GDLIB_LT_CURRENT=3
55 -+# This is the version where the soname (current above) changes. We use it
56 -+# to reset the revision base back to zero. It's a bit of a pain, but some
57 -+# systems restrict the revision range below to [0..255] (like OS X).
58 -+GDLIB_PREV_MAJOR=2
59 -+GDLIB_PREV_MINOR=2
60 --GDLIB_LT_REVISION=$(printf '%i%02i%02i' $GDLIB_MAJOR $GDLIB_MINOR $GDLIB_REVISION)
61 -+GDLIB_LT_REVISION=$(( ((GDLIB_MAJOR - GDLIB_PREV_MAJOR) << 6) | ((GDLIB_MINOR - GDLIB_PREV_MINOR) << 3) | GDLIB_REVISION ))
62 - GDLIB_LT_AGE=0
63 -
64 -
65 ---
66 -2.8.2
67 -
68
69 diff --git a/media-libs/gd/gd-2.2.2.ebuild b/media-libs/gd/gd-2.2.2.ebuild
70 deleted file mode 100644
71 index 1666398..00000000
72 --- a/media-libs/gd/gd-2.2.2.ebuild
73 +++ /dev/null
74 @@ -1,65 +0,0 @@
75 -# Copyright 1999-2016 Gentoo Foundation
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=6
79 -
80 -inherit eutils libtool multilib-minimal
81 -
82 -DESCRIPTION="A graphics library for fast image creation"
83 -HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
84 -SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
85 -
86 -LICENSE="gd IJG HPND BSD"
87 -SLOT="2/3"
88 -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"
89 -IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
90 -
91 -# fontconfig has prefixed font paths, details see bug #518970
92 -REQUIRED_USE="prefix? ( fontconfig )"
93 -
94 -RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
95 - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
96 - png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
97 - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
98 - truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
99 - webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
100 - xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
101 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
102 -DEPEND="${RDEPEND}
103 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
104 -
105 -S="${WORKDIR}/lib${P}"
106 -
107 -PATCHES=(
108 - "${FILESDIR}"/${P}-osx-libtool.patch #583584
109 -)
110 -
111 -src_prepare() {
112 - default
113 - elibtoolize # for shared library on Solaris
114 -}
115 -
116 -multilib_src_configure() {
117 - # we aren't actually {en,dis}abling X here ... the configure
118 - # script uses it just to add explicit -I/-L paths which we
119 - # don't care about on Gentoo systems.
120 - ECONF_SOURCE=${S} \
121 - econf \
122 - --disable-werror \
123 - --without-x \
124 - --without-liq \
125 - $(use_enable static-libs static) \
126 - $(use_with fontconfig) \
127 - $(use_with png) \
128 - $(use_with tiff) \
129 - $(use_with truetype freetype) \
130 - $(use_with jpeg) \
131 - $(use_with webp) \
132 - $(use_with xpm) \
133 - $(use_with zlib)
134 -}
135 -
136 -multilib_src_install_all() {
137 - dodoc NEWS README.md
138 - prune_libtool_files
139 -}