Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/graphicsmagick/files/, media-gfx/graphicsmagick/
Date: Sun, 20 Feb 2022 05:51:50
Message-Id: 1645335618.32fe5498447350c6a92de7bfa04a743bbfb6e5e8.sam@gentoo
1 commit: 32fe5498447350c6a92de7bfa04a743bbfb6e5e8
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 20 05:40:18 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 05:40:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fe5498
7
8 media-gfx/graphicsmagick: drop 1.3.36
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-gfx/graphicsmagick/Manifest | 1 -
13 .../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 24 ----
14 .../graphicsmagick/graphicsmagick-1.3.36.ebuild | 133 ---------------------
15 3 files changed, 158 deletions(-)
16
17 diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
18 index 559dac8e96a3..4a582fed0167 100644
19 --- a/media-gfx/graphicsmagick/Manifest
20 +++ b/media-gfx/graphicsmagick/Manifest
21 @@ -1,2 +1 @@
22 -DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
23 DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
24
25 diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
26 deleted file mode 100644
27 index 5a78527b2286..000000000000
28 --- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
29 +++ /dev/null
30 @@ -1,24 +0,0 @@
31 -http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
32 -
33 -Sent upstream.
34 -
35 -# User Sam James <sam@g.o>
36 -# Date 1631846586 -3600
37 -# Fri Sep 17 03:43:06 2021 +0100
38 -magick/blob.c: Fix build with bzip2 enabled and zlib disabled
39 -
40 -Seems to be a typo.
41 -
42 -Bug: https://bugs.gentoo.org/641164
43 -
44 ---- a/magick/blob.c
45 -+++ b/magick/blob.c
46 -@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima
47 - else
48 - amount=(int) remaining;
49 -
50 -- bz_count=BZ2_bzwrite(blob->handle.gz,
51 -+ bz_count=BZ2_bzwrite(blob->handle.bz,
52 - (void *) ((unsigned char *) data+i),amount);
53 - if (bz_count <= 0)
54 - break;
55
56 diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
57 deleted file mode 100644
58 index 45f73976f1ad..000000000000
59 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
60 +++ /dev/null
61 @@ -1,133 +0,0 @@
62 -# Copyright 1999-2021 Gentoo Authors
63 -# Distributed under the terms of the GNU General Public License v2
64 -
65 -EAPI=7
66 -
67 -inherit autotools toolchain-funcs
68 -
69 -MY_P=${P/graphicsm/GraphicsM}
70 -DESCRIPTION="Collection of tools and libraries for many image formats"
71 -HOMEPAGE="http://www.graphicsmagick.org/ http://hg.code.sf.net/p/graphicsmagick/code/"
72 -LICENSE="MIT"
73 -SLOT="0/${PV%.*}"
74 -
75 -if [[ ${PV} == "9999" ]] ; then
76 - inherit mercurial
77 - EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
78 -else
79 - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
80 - S="${WORKDIR}/${MY_P}"
81 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
82 -fi
83 -
84 -IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
85 - openmp perl png postscript q16 q32 static-libs svg threads tiff truetype
86 - webp wmf X zlib"
87 -
88 -RDEPEND="
89 - dev-libs/libltdl:0
90 - bzip2? ( app-arch/bzip2 )
91 - fpx? ( media-libs/libfpx )
92 - imagemagick? ( !media-gfx/imagemagick )
93 - jbig? ( media-libs/jbigkit )
94 - jpeg? ( virtual/jpeg:0 )
95 - lcms? ( media-libs/lcms:2 )
96 - lzma? ( app-arch/xz-utils )
97 - perl? ( dev-lang/perl:= )
98 - png? ( media-libs/libpng:0= )
99 - postscript? ( app-text/ghostscript-gpl )
100 - svg? ( dev-libs/libxml2 )
101 - tiff? ( media-libs/tiff:0 )
102 - truetype? (
103 - media-fonts/urw-fonts
104 - >=media-libs/freetype-2
105 - )
106 - webp? ( media-libs/libwebp:= )
107 - wmf? ( media-libs/libwmf )
108 - X? (
109 - x11-libs/libSM
110 - x11-libs/libXext
111 - )
112 - zlib? ( sys-libs/zlib )"
113 -DEPEND="${RDEPEND}"
114 -
115 -PATCHES=(
116 - "${FILESDIR}"/${PN}-1.3.36-flags.patch
117 - "${FILESDIR}"/${PN}-1.3.19-perl.patch
118 - "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch
119 -)
120 -
121 -src_prepare() {
122 - default
123 - eautoreconf
124 -}
125 -
126 -src_configure() {
127 - local depth=8
128 - use q16 && depth=16
129 - use q32 && depth=32
130 -
131 - local openmp=disable
132 - if use openmp && tc-has-openmp ; then
133 - openmp=enable
134 - fi
135 -
136 - local myeconfargs=(
137 - --${openmp}-openmp
138 - --enable-largefile
139 - --enable-shared
140 - $(use_enable static-libs static)
141 - $(use_enable debug prof)
142 - $(use_enable debug gcov)
143 - $(use_enable imagemagick magick-compat)
144 - $(use_with threads)
145 - $(use_with dynamic-loading modules)
146 - --with-quantum-depth=${depth}
147 - --without-frozenpaths
148 - $(use_with cxx magick-plus-plus)
149 - $(use_with perl)
150 - --with-perl-options=INSTALLDIRS=vendor
151 - $(use_with bzip2 bzlib)
152 - $(use_with postscript dps)
153 - $(use_with fpx)
154 - $(use_with jbig)
155 - $(use_with webp)
156 - $(use_with jpeg)
157 - --without-jp2
158 - $(use_with lcms lcms2)
159 - $(use_with lzma)
160 - $(use_with png)
161 - $(use_with tiff)
162 - $(use_with truetype ttf)
163 - $(use_with wmf)
164 - --with-fontpath="${EPREFIX}"/usr/share/fonts
165 - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
166 - --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
167 - $(use_with svg xml)
168 - $(use_with zlib)
169 - $(use_with X x)
170 - )
171 - econf "${myeconfargs[@]}"
172 -}
173 -
174 -src_compile() {
175 - default
176 - use perl && emake perl-build
177 -}
178 -
179 -src_test() {
180 - unset DISPLAY # some perl tests fail when DISPLAY is set
181 - default
182 -}
183 -
184 -src_install() {
185 - default
186 -
187 - if use perl ; then
188 - emake -C PerlMagick DESTDIR="${D}" install
189 - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
190 - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
191 - fi
192 -
193 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
194 -}