Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/
Date: Sun, 30 Aug 2020 07:58:52
Message-Id: 1598774301.50794b30459d21b1f73043a6640893917fe427c2.asturm@gentoo
1 commit: 50794b30459d21b1f73043a6640893917fe427c2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 07:23:16 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 07:58:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50794b30
7
8 media-gfx/gimp: Drop 2.10.14-r1
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-gfx/gimp/Manifest | 1 -
14 media-gfx/gimp/gimp-2.10.14-r1.ebuild | 230 ----------------------------------
15 2 files changed, 231 deletions(-)
16
17 diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
18 index 06c48a73c14..117a1e8633a 100644
19 --- a/media-gfx/gimp/Manifest
20 +++ b/media-gfx/gimp/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b SHA512 acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
23 DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9 SHA512 88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
24 DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
25
26 diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
27 deleted file mode 100644
28 index ca8f53ba5a9..00000000000
29 --- a/media-gfx/gimp/gimp-2.10.14-r1.ebuild
30 +++ /dev/null
31 @@ -1,230 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -PYTHON_COMPAT=( python2_7 )
37 -GNOME2_EAUTORECONF=yes
38 -
39 -inherit autotools gnome2 python-single-r1 virtualx
40 -
41 -DESCRIPTION="GNU Image Manipulation Program"
42 -HOMEPAGE="https://www.gimp.org/"
43 -SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
44 -LICENSE="GPL-3 LGPL-3"
45 -SLOT="2"
46 -KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc64 x86"
47 -
48 -IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
49 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
50 -
51 -RESTRICT="!test? ( test )"
52 -
53 -COMMON_DEPEND="
54 - app-arch/bzip2
55 - >=app-arch/xz-utils-5.0.0
56 - >=app-text/poppler-0.50[cairo]
57 - >=app-text/poppler-data-0.4.7
58 - >=dev-libs/atk-2.2.0
59 - >=dev-libs/glib-2.56.0:2
60 - dev-libs/libxml2
61 - dev-libs/libxslt
62 - >=gnome-base/librsvg-2.40.6:2
63 - >=media-gfx/mypaint-brushes-1.3.0
64 - >=media-libs/babl-0.1.72
65 - >=media-libs/fontconfig-2.12.4
66 - >=media-libs/freetype-2.1.7
67 - >=media-libs/gegl-0.4.18:0.4[cairo]
68 - >=media-libs/gexiv2-0.10.6
69 - >=media-libs/harfbuzz-0.9.19
70 - >=media-libs/lcms-2.8:2
71 - >=media-libs/libmypaint-1.3.0:=
72 - >=media-libs/libpng-1.6.25:0=
73 - >=media-libs/tiff-3.5.7:0
74 - net-libs/glib-networking[ssl]
75 - sys-libs/zlib
76 - virtual/jpeg:0
77 - >=x11-libs/cairo-1.12.2
78 - >=x11-libs/gdk-pixbuf-2.31:2
79 - >=x11-libs/gtk+-2.24.32:2
80 - x11-libs/libXcursor
81 - >=x11-libs/pango-1.29.4
82 - aalib? ( media-libs/aalib )
83 - alsa? ( >=media-libs/alsa-lib-1.0.0 )
84 - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
85 - heif? ( >=media-libs/libheif-1.3.2:= )
86 - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
87 - mng? ( media-libs/libmng:= )
88 - openexr? ( >=media-libs/openexr-1.6.1:= )
89 - postscript? ( app-text/ghostscript-gpl )
90 - python? (
91 - ${PYTHON_DEPS}
92 - $(python_gen_cond_dep '
93 - >=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
94 - >=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
95 - ')
96 - )
97 - udev? ( dev-libs/libgudev:= )
98 - unwind? ( >=sys-libs/libunwind-1.1.0:= )
99 - webp? ( >=media-libs/libwebp-0.6.0:= )
100 - wmf? ( >=media-libs/libwmf-0.2.8 )
101 - xpm? ( x11-libs/libXpm )
102 -"
103 -
104 -RDEPEND="
105 - ${COMMON_DEPEND}
106 - x11-themes/hicolor-icon-theme
107 - gnome? ( gnome-base/gvfs )
108 -"
109 -
110 -DEPEND="
111 - ${COMMON_DEPEND}
112 - >=dev-lang/perl-5.10.0
113 - dev-libs/appstream-glib
114 - dev-util/gtk-update-icon-cache
115 - >=dev-util/intltool-0.40.1
116 - sys-apps/findutils
117 - >=sys-devel/automake-1.11
118 - >=sys-devel/gettext-0.19
119 - >=sys-devel/libtool-2.2
120 - virtual/pkgconfig
121 -"
122 -
123 -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
124 -
125 -# Bugs 685210 (and duplicate 691070)
126 -PATCHES=(
127 - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
128 -)
129 -
130 -pkg_setup() {
131 - if use python; then
132 - python-single-r1_pkg_setup
133 - fi
134 -}
135 -
136 -src_prepare() {
137 - # Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
138 - sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
139 - -e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
140 -
141 - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
142 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
143 -
144 - gnome2_src_prepare # calls eautoreconf
145 -
146 - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
147 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
148 -}
149 -
150 -_adjust_sandbox() {
151 - # Bugs #569738 and #591214
152 - local nv
153 - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
154 - # We do not check for existence as they may show up later
155 - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
156 - addwrite "${nv}"
157 - done
158 -
159 - addwrite /dev/dri/ # bugs #574038 and #684886
160 - addwrite /dev/ati/ # bug #589198
161 - addwrite /proc/mtrr # bug #589198
162 -}
163 -
164 -src_configure() {
165 - _adjust_sandbox
166 -
167 - local myconf=(
168 - GEGL="${EPREFIX}"/usr/bin/gegl-0.4
169 - GDBUS_CODEGEN="${EPREFIX}"/bin/false
170 -
171 - --enable-default-binary
172 -
173 - --enable-mp
174 - --with-appdata-test
175 - --with-bug-report-url=https://bugs.gentoo.org/
176 - --with-xmc
177 - --without-libbacktrace
178 - --without-webkit
179 - --without-xvfb-run
180 - $(use_enable altivec)
181 - $(use_enable cpu_flags_x86_mmx mmx)
182 - $(use_enable cpu_flags_x86_sse sse)
183 - $(use_enable python)
184 - $(use_enable vector-icons)
185 - $(use_with aalib aa)
186 - $(use_with alsa)
187 - $(use_with !aqua x)
188 - $(use_with heif libheif)
189 - $(use_with jpeg2k jpeg2000)
190 - $(use_with mng libmng)
191 - $(use_with openexr)
192 - $(use_with postscript gs)
193 - $(use_with udev gudev)
194 - $(use_with unwind libunwind)
195 - $(use_with webp)
196 - $(use_with wmf)
197 - $(use_with xpm libxpm)
198 - )
199 -
200 - gnome2_src_configure "${myconf[@]}"
201 -}
202 -
203 -src_compile() {
204 - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
205 - gnome2_src_compile
206 -}
207 -
208 -# for https://bugs.gentoo.org/664938
209 -_rename_plugins() {
210 - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
211 - local prepend=gimp-org-
212 - (
213 - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
214 - for plugin_slash in $(ls -d1 */); do
215 - plugin=${plugin_slash%/}
216 - if [[ -f ${plugin}/${plugin} ]]; then
217 - # NOTE: Folder and file name need to match for Gimp to load that plug-in
218 - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
219 - mv ${plugin}/{,${prepend}}${plugin} || exit 1
220 - mv {,${prepend}}${plugin} || exit 1
221 - fi
222 - done
223 - )
224 -}
225 -
226 -src_test() {
227 - virtx emake check
228 -}
229 -
230 -src_install() {
231 - gnome2_src_install
232 -
233 - if use python; then
234 - python_optimize
235 - fi
236 -
237 - # Workaround for bug #321111 to give GIMP the least
238 - # precedence on PDF documents by default
239 - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
240 -
241 - find "${D}" -name '*.la' -type f -delete || die
242 -
243 - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
244 - local gimp_app_version=$(get_version_component_range 1-2)
245 - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
246 -
247 - # Remove gimp devel-docs html files if user doesn't need it
248 - if ! use doc; then
249 - rm -r "${ED%/}"/usr/share/gtk-doc || die
250 - fi
251 -
252 - _rename_plugins || die
253 -}
254 -
255 -pkg_postinst() {
256 - gnome2_pkg_postinst
257 -}
258 -
259 -pkg_postrm() {
260 - gnome2_pkg_postrm
261 -}