| 1 |
commit: c6d827b9d4859defcfdf4b88ea276a747bb62b95 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Mon Nov 25 22:56:18 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 1 03:15:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d827b9 |
| 7 |
|
| 8 |
media-gfx/gimp: 2.10.{10,12} update and fix TEST FAIL: test-appdata.sh |
| 9 |
|
| 10 |
Sync gimp-2.10.{10,12} ebuilds with new gimp-2.10.14.ebuild |
| 11 |
with fixing of failure test: test-appdata.sh. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/685210 |
| 14 |
Closes: https://bugs.gentoo.org/691070 |
| 15 |
|
| 16 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
media-gfx/gimp/gimp-2.10.10-r1.ebuild | 156 +++++++++++++++++----------------- |
| 20 |
media-gfx/gimp/gimp-2.10.12.ebuild | 156 +++++++++++++++++----------------- |
| 21 |
2 files changed, 158 insertions(+), 154 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-gfx/gimp/gimp-2.10.10-r1.ebuild b/media-gfx/gimp/gimp-2.10.10-r1.ebuild |
| 24 |
index faa127d6d83..ff1bb96d42f 100644 |
| 25 |
--- a/media-gfx/gimp/gimp-2.10.10-r1.ebuild |
| 26 |
+++ b/media-gfx/gimp/gimp-2.10.10-r1.ebuild |
| 27 |
@@ -5,83 +5,94 @@ EAPI=6 |
| 28 |
PYTHON_COMPAT=( python2_7 ) |
| 29 |
GNOME2_EAUTORECONF=yes |
| 30 |
|
| 31 |
-inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1 |
| 32 |
+inherit autotools gnome2 python-single-r1 virtualx |
| 33 |
|
| 34 |
DESCRIPTION="GNU Image Manipulation Program" |
| 35 |
HOMEPAGE="https://www.gimp.org/" |
| 36 |
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" |
| 37 |
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" |
| 38 |
LICENSE="GPL-3 LGPL-3" |
| 39 |
SLOT="2" |
| 40 |
KEYWORDS="~amd64 ~x86" |
| 41 |
|
| 42 |
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" |
| 43 |
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm" |
| 44 |
+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" |
| 45 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 46 |
+ |
| 47 |
+RESTRICT="!test? ( test )" |
| 48 |
|
| 49 |
-RDEPEND=">=dev-libs/glib-2.56.0:2 |
| 50 |
+COMMON_DEPEND=" |
| 51 |
+ app-arch/bzip2 |
| 52 |
+ >=app-arch/xz-utils-5.0.0 |
| 53 |
+ >=app-text/poppler-0.50[cairo] |
| 54 |
+ >=app-text/poppler-data-0.4.7 |
| 55 |
>=dev-libs/atk-2.2.0 |
| 56 |
- >=x11-libs/gtk+-2.24.32:2 |
| 57 |
- >=x11-libs/gdk-pixbuf-2.31:2 |
| 58 |
- >=x11-libs/cairo-1.12.2 |
| 59 |
- >=x11-libs/pango-1.29.4 |
| 60 |
- xpm? ( x11-libs/libXpm ) |
| 61 |
- >=media-libs/freetype-2.1.7 |
| 62 |
- >=media-libs/harfbuzz-0.9.19 |
| 63 |
- >=media-libs/gexiv2-0.10.6 |
| 64 |
- >=media-libs/libmypaint-1.3.0 |
| 65 |
- >=media-gfx/mypaint-brushes-1.3.0 |
| 66 |
- >=media-libs/fontconfig-2.12.4 |
| 67 |
- sys-libs/zlib |
| 68 |
+ >=dev-libs/glib-2.54.2:2 |
| 69 |
dev-libs/libxml2 |
| 70 |
dev-libs/libxslt |
| 71 |
- x11-themes/hicolor-icon-theme |
| 72 |
+ >=gnome-base/librsvg-2.40.6:2 |
| 73 |
+ >=media-gfx/mypaint-brushes-1.3.0 |
| 74 |
>=media-libs/babl-0.1.62 |
| 75 |
+ >=media-libs/fontconfig-2.12.4 |
| 76 |
+ >=media-libs/freetype-2.1.7 |
| 77 |
>=media-libs/gegl-0.4.14:0.4[cairo] |
| 78 |
- aalib? ( media-libs/aalib ) |
| 79 |
- alsa? ( media-libs/alsa-lib ) |
| 80 |
- aqua? ( x11-libs/gtk-mac-integration ) |
| 81 |
- gnome? ( gnome-base/gvfs ) |
| 82 |
+ >=media-libs/gexiv2-0.10.6 |
| 83 |
+ >=media-libs/harfbuzz-0.9.19 |
| 84 |
+ >=media-libs/lcms-2.8:2 |
| 85 |
+ >=media-libs/libmypaint-1.3.0:= |
| 86 |
+ >=media-libs/libpng-1.6.25:0= |
| 87 |
+ >=media-libs/tiff-3.5.7:0 |
| 88 |
+ net-libs/glib-networking[ssl] |
| 89 |
+ sys-libs/zlib |
| 90 |
virtual/jpeg:0 |
| 91 |
+ >=x11-libs/cairo-1.12.2 |
| 92 |
+ >=x11-libs/gdk-pixbuf-2.30.8:2 |
| 93 |
+ >=x11-libs/gtk+-2.24.32:2 |
| 94 |
+ x11-libs/libXcursor |
| 95 |
+ >=x11-libs/pango-1.29.4 |
| 96 |
+ aalib? ( media-libs/aalib ) |
| 97 |
+ alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
| 98 |
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) |
| 99 |
+ heif? ( >=media-libs/libheif-1.1.0:= ) |
| 100 |
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) |
| 101 |
- >=media-libs/lcms-2.8:2 |
| 102 |
- mng? ( media-libs/libmng ) |
| 103 |
+ mng? ( media-libs/libmng:= ) |
| 104 |
openexr? ( >=media-libs/openexr-1.6.1:= ) |
| 105 |
- >=app-text/poppler-0.50[cairo] |
| 106 |
- >=app-text/poppler-data-0.4.7 |
| 107 |
- >=media-libs/libpng-1.6.25:0= |
| 108 |
+ postscript? ( app-text/ghostscript-gpl ) |
| 109 |
python? ( |
| 110 |
${PYTHON_DEPS} |
| 111 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 112 |
>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
| 113 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 114 |
) |
| 115 |
- >=media-libs/tiff-3.5.7:0 |
| 116 |
- >=gnome-base/librsvg-2.40.6:2 |
| 117 |
- webp? ( >=media-libs/libwebp-0.6.0 ) |
| 118 |
- wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 119 |
- net-libs/glib-networking[ssl] |
| 120 |
- x11-libs/libXcursor |
| 121 |
- sys-libs/zlib |
| 122 |
- app-arch/bzip2 |
| 123 |
- >=app-arch/xz-utils-5.0.0 |
| 124 |
- postscript? ( app-text/ghostscript-gpl ) |
| 125 |
udev? ( dev-libs/libgudev:= ) |
| 126 |
- unwind? ( sys-libs/libunwind:= ) |
| 127 |
- heif? ( >=media-libs/libheif-1.1.0:= )" |
| 128 |
-DEPEND="${RDEPEND} |
| 129 |
+ unwind? ( >=sys-libs/libunwind-1.1.0:= ) |
| 130 |
+ webp? ( >=media-libs/libwebp-0.6.0:= ) |
| 131 |
+ wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 132 |
+ xpm? ( x11-libs/libXpm ) |
| 133 |
+" |
| 134 |
+ |
| 135 |
+RDEPEND=" |
| 136 |
+ ${COMMON_DEPEND} |
| 137 |
+ x11-themes/hicolor-icon-theme |
| 138 |
+ gnome? ( gnome-base/gvfs ) |
| 139 |
+" |
| 140 |
+ |
| 141 |
+DEPEND=" |
| 142 |
+ ${COMMON_DEPEND} |
| 143 |
>=dev-lang/perl-5.10.0 |
| 144 |
dev-libs/appstream-glib |
| 145 |
dev-util/gtk-update-icon-cache |
| 146 |
- sys-apps/findutils |
| 147 |
- virtual/pkgconfig |
| 148 |
>=dev-util/intltool-0.40.1 |
| 149 |
+ sys-apps/findutils |
| 150 |
+ >=sys-devel/automake-1.11 |
| 151 |
>=sys-devel/gettext-0.19 |
| 152 |
- doc? ( >=dev-util/gtk-doc-1 ) |
| 153 |
>=sys-devel/libtool-2.2 |
| 154 |
- >=sys-devel/automake-1.11 |
| 155 |
- dev-util/gtk-doc-am" |
| 156 |
+ virtual/pkgconfig |
| 157 |
+" |
| 158 |
|
| 159 |
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
| 160 |
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) |
| 161 |
|
| 162 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 163 |
+# Bugs 685210 (and duplicate 691070) |
| 164 |
+PATCHES=( |
| 165 |
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" |
| 166 |
+) |
| 167 |
|
| 168 |
pkg_setup() { |
| 169 |
if use python; then |
| 170 |
@@ -121,33 +132,32 @@ src_configure() { |
| 171 |
GDBUS_CODEGEN="${EPREFIX}"/bin/false |
| 172 |
|
| 173 |
--enable-default-binary |
| 174 |
- --disable-silent-rules |
| 175 |
|
| 176 |
- $(use_with !aqua x) |
| 177 |
- $(use_with aalib aa) |
| 178 |
- $(use_with alsa) |
| 179 |
- $(use_enable altivec) |
| 180 |
+ --enable-mp |
| 181 |
--with-appdata-test |
| 182 |
- --without-libbacktrace |
| 183 |
--with-bug-report-url=https://bugs.gentoo.org/ |
| 184 |
+ --with-xmc |
| 185 |
+ --without-libbacktrace |
| 186 |
--without-webkit |
| 187 |
- $(use_with jpeg2k jpeg2000) |
| 188 |
- $(use_with postscript gs) |
| 189 |
+ --without-xvfb-run |
| 190 |
+ $(use_enable altivec) |
| 191 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 192 |
+ $(use_enable cpu_flags_x86_sse sse) |
| 193 |
+ $(use_enable python) |
| 194 |
+ $(use_enable vector-icons) |
| 195 |
+ $(use_with aalib aa) |
| 196 |
+ $(use_with alsa) |
| 197 |
+ $(use_with !aqua x) |
| 198 |
+ $(use_with heif libheif) |
| 199 |
+ $(use_with jpeg2k jpeg2000) |
| 200 |
$(use_with mng libmng) |
| 201 |
$(use_with openexr) |
| 202 |
- $(use_with webp) |
| 203 |
- $(use_with heif libheif) |
| 204 |
- $(use_enable python) |
| 205 |
- --enable-mp |
| 206 |
- $(use_enable cpu_flags_x86_sse sse) |
| 207 |
+ $(use_with postscript gs) |
| 208 |
$(use_with udev gudev) |
| 209 |
$(use_with unwind libunwind) |
| 210 |
+ $(use_with webp) |
| 211 |
$(use_with wmf) |
| 212 |
- --with-xmc |
| 213 |
$(use_with xpm libxpm) |
| 214 |
- $(use_enable vector-icons) |
| 215 |
- --without-xvfb-run |
| 216 |
) |
| 217 |
|
| 218 |
gnome2_src_configure "${myconf[@]}" |
| 219 |
@@ -158,18 +168,6 @@ src_compile() { |
| 220 |
gnome2_src_compile |
| 221 |
} |
| 222 |
|
| 223 |
-_clean_up_locales() { |
| 224 |
- [[ -z ${LINGUAS+set} ]] && return |
| 225 |
- einfo "Cleaning up locales..." |
| 226 |
- for lang in ${LANGS}; do |
| 227 |
- has ${lang} ${LINGUAS} && { |
| 228 |
- einfo "- keeping ${lang}" |
| 229 |
- continue |
| 230 |
- } |
| 231 |
- rm -Rf "${ED%/}"/usr/share/locale/"${lang}" |
| 232 |
- done |
| 233 |
-} |
| 234 |
- |
| 235 |
# for https://bugs.gentoo.org/664938 |
| 236 |
_rename_plugins() { |
| 237 |
einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' |
| 238 |
@@ -209,8 +207,12 @@ src_install() { |
| 239 |
local gimp_app_version=$(get_version_component_range 1-2) |
| 240 |
mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die |
| 241 |
|
| 242 |
+ # Remove gimp devel-docs html files if user doesn't need it |
| 243 |
+ if ! use doc; then |
| 244 |
+ rm -r "${ED%/}"/usr/share/gtk-doc || die |
| 245 |
+ fi |
| 246 |
+ |
| 247 |
_rename_plugins || die |
| 248 |
- _clean_up_locales |
| 249 |
} |
| 250 |
|
| 251 |
pkg_postinst() { |
| 252 |
|
| 253 |
diff --git a/media-gfx/gimp/gimp-2.10.12.ebuild b/media-gfx/gimp/gimp-2.10.12.ebuild |
| 254 |
index c50fc2d19f7..b3c8a9550e9 100644 |
| 255 |
--- a/media-gfx/gimp/gimp-2.10.12.ebuild |
| 256 |
+++ b/media-gfx/gimp/gimp-2.10.12.ebuild |
| 257 |
@@ -5,83 +5,94 @@ EAPI=6 |
| 258 |
PYTHON_COMPAT=( python2_7 ) |
| 259 |
GNOME2_EAUTORECONF=yes |
| 260 |
|
| 261 |
-inherit eapi7-ver virtualx autotools gnome2 multilib python-single-r1 |
| 262 |
+inherit autotools gnome2 python-single-r1 virtualx |
| 263 |
|
| 264 |
DESCRIPTION="GNU Image Manipulation Program" |
| 265 |
HOMEPAGE="https://www.gimp.org/" |
| 266 |
-SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${P}.tar.bz2" |
| 267 |
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" |
| 268 |
LICENSE="GPL-3 LGPL-3" |
| 269 |
SLOT="2" |
| 270 |
KEYWORDS="~amd64 ~x86" |
| 271 |
|
| 272 |
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" |
| 273 |
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm" |
| 274 |
+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" |
| 275 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 276 |
+ |
| 277 |
+RESTRICT="!test? ( test )" |
| 278 |
|
| 279 |
-RDEPEND=">=dev-libs/glib-2.56.0:2 |
| 280 |
+COMMON_DEPEND=" |
| 281 |
+ app-arch/bzip2 |
| 282 |
+ >=app-arch/xz-utils-5.0.0 |
| 283 |
+ >=app-text/poppler-0.50[cairo] |
| 284 |
+ >=app-text/poppler-data-0.4.7 |
| 285 |
>=dev-libs/atk-2.2.0 |
| 286 |
- >=x11-libs/gtk+-2.24.32:2 |
| 287 |
- >=x11-libs/gdk-pixbuf-2.31:2 |
| 288 |
- >=x11-libs/cairo-1.12.2 |
| 289 |
- >=x11-libs/pango-1.29.4 |
| 290 |
- xpm? ( x11-libs/libXpm ) |
| 291 |
- >=media-libs/freetype-2.1.7 |
| 292 |
- >=media-libs/harfbuzz-0.9.19 |
| 293 |
- >=media-libs/gexiv2-0.10.6 |
| 294 |
- >=media-libs/libmypaint-1.3.0:= |
| 295 |
- >=media-gfx/mypaint-brushes-1.3.0 |
| 296 |
- >=media-libs/fontconfig-2.12.4 |
| 297 |
- sys-libs/zlib |
| 298 |
+ >=dev-libs/glib-2.54.2:2 |
| 299 |
dev-libs/libxml2 |
| 300 |
dev-libs/libxslt |
| 301 |
- x11-themes/hicolor-icon-theme |
| 302 |
+ >=gnome-base/librsvg-2.40.6:2 |
| 303 |
+ >=media-gfx/mypaint-brushes-1.3.0 |
| 304 |
>=media-libs/babl-0.1.66 |
| 305 |
+ >=media-libs/fontconfig-2.12.4 |
| 306 |
+ >=media-libs/freetype-2.1.7 |
| 307 |
>=media-libs/gegl-0.4.16:0.4[cairo] |
| 308 |
- aalib? ( media-libs/aalib ) |
| 309 |
- alsa? ( media-libs/alsa-lib ) |
| 310 |
- aqua? ( x11-libs/gtk-mac-integration ) |
| 311 |
- gnome? ( gnome-base/gvfs ) |
| 312 |
+ >=media-libs/gexiv2-0.10.6 |
| 313 |
+ >=media-libs/harfbuzz-0.9.19 |
| 314 |
+ >=media-libs/lcms-2.8:2 |
| 315 |
+ >=media-libs/libmypaint-1.3.0:= |
| 316 |
+ >=media-libs/libpng-1.6.25:0= |
| 317 |
+ >=media-libs/tiff-3.5.7:0 |
| 318 |
+ net-libs/glib-networking[ssl] |
| 319 |
+ sys-libs/zlib |
| 320 |
virtual/jpeg:0 |
| 321 |
+ >=x11-libs/cairo-1.12.2 |
| 322 |
+ >=x11-libs/gdk-pixbuf-2.30.8:2 |
| 323 |
+ >=x11-libs/gtk+-2.24.32:2 |
| 324 |
+ x11-libs/libXcursor |
| 325 |
+ >=x11-libs/pango-1.29.4 |
| 326 |
+ aalib? ( media-libs/aalib ) |
| 327 |
+ alsa? ( >=media-libs/alsa-lib-1.0.0 ) |
| 328 |
+ aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) |
| 329 |
+ heif? ( >=media-libs/libheif-1.1.0:= ) |
| 330 |
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) |
| 331 |
- >=media-libs/lcms-2.8:2 |
| 332 |
- mng? ( media-libs/libmng ) |
| 333 |
+ mng? ( media-libs/libmng:= ) |
| 334 |
openexr? ( >=media-libs/openexr-1.6.1:= ) |
| 335 |
- >=app-text/poppler-0.50[cairo] |
| 336 |
- >=app-text/poppler-data-0.4.7 |
| 337 |
- >=media-libs/libpng-1.6.25:0= |
| 338 |
+ postscript? ( app-text/ghostscript-gpl ) |
| 339 |
python? ( |
| 340 |
${PYTHON_DEPS} |
| 341 |
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 342 |
>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] |
| 343 |
+ >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] |
| 344 |
) |
| 345 |
- >=media-libs/tiff-3.5.7:0 |
| 346 |
- >=gnome-base/librsvg-2.40.6:2 |
| 347 |
- webp? ( >=media-libs/libwebp-0.6.0 ) |
| 348 |
- wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 349 |
- net-libs/glib-networking[ssl] |
| 350 |
- x11-libs/libXcursor |
| 351 |
- sys-libs/zlib |
| 352 |
- app-arch/bzip2 |
| 353 |
- >=app-arch/xz-utils-5.0.0 |
| 354 |
- postscript? ( app-text/ghostscript-gpl ) |
| 355 |
udev? ( dev-libs/libgudev:= ) |
| 356 |
- unwind? ( sys-libs/libunwind:= ) |
| 357 |
- heif? ( >=media-libs/libheif-1.1.0:= )" |
| 358 |
-DEPEND="${RDEPEND} |
| 359 |
+ unwind? ( >=sys-libs/libunwind-1.1.0:= ) |
| 360 |
+ webp? ( >=media-libs/libwebp-0.6.0:= ) |
| 361 |
+ wmf? ( >=media-libs/libwmf-0.2.8 ) |
| 362 |
+ xpm? ( x11-libs/libXpm ) |
| 363 |
+" |
| 364 |
+ |
| 365 |
+RDEPEND=" |
| 366 |
+ ${COMMON_DEPEND} |
| 367 |
+ x11-themes/hicolor-icon-theme |
| 368 |
+ gnome? ( gnome-base/gvfs ) |
| 369 |
+" |
| 370 |
+ |
| 371 |
+DEPEND=" |
| 372 |
+ ${COMMON_DEPEND} |
| 373 |
>=dev-lang/perl-5.10.0 |
| 374 |
dev-libs/appstream-glib |
| 375 |
dev-util/gtk-update-icon-cache |
| 376 |
- sys-apps/findutils |
| 377 |
- virtual/pkgconfig |
| 378 |
>=dev-util/intltool-0.40.1 |
| 379 |
+ sys-apps/findutils |
| 380 |
+ >=sys-devel/automake-1.11 |
| 381 |
>=sys-devel/gettext-0.19 |
| 382 |
- doc? ( >=dev-util/gtk-doc-1 ) |
| 383 |
>=sys-devel/libtool-2.2 |
| 384 |
- >=sys-devel/automake-1.11 |
| 385 |
- dev-util/gtk-doc-am" |
| 386 |
+ virtual/pkgconfig |
| 387 |
+" |
| 388 |
|
| 389 |
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*" |
| 390 |
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) |
| 391 |
|
| 392 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 393 |
+# Bugs 685210 (and duplicate 691070) |
| 394 |
+PATCHES=( |
| 395 |
+ "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" |
| 396 |
+) |
| 397 |
|
| 398 |
pkg_setup() { |
| 399 |
if use python; then |
| 400 |
@@ -121,33 +132,32 @@ src_configure() { |
| 401 |
GDBUS_CODEGEN="${EPREFIX}"/bin/false |
| 402 |
|
| 403 |
--enable-default-binary |
| 404 |
- --disable-silent-rules |
| 405 |
|
| 406 |
- $(use_with !aqua x) |
| 407 |
- $(use_with aalib aa) |
| 408 |
- $(use_with alsa) |
| 409 |
- $(use_enable altivec) |
| 410 |
+ --enable-mp |
| 411 |
--with-appdata-test |
| 412 |
- --without-libbacktrace |
| 413 |
--with-bug-report-url=https://bugs.gentoo.org/ |
| 414 |
+ --with-xmc |
| 415 |
+ --without-libbacktrace |
| 416 |
--without-webkit |
| 417 |
- $(use_with jpeg2k jpeg2000) |
| 418 |
- $(use_with postscript gs) |
| 419 |
+ --without-xvfb-run |
| 420 |
+ $(use_enable altivec) |
| 421 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 422 |
+ $(use_enable cpu_flags_x86_sse sse) |
| 423 |
+ $(use_enable python) |
| 424 |
+ $(use_enable vector-icons) |
| 425 |
+ $(use_with aalib aa) |
| 426 |
+ $(use_with alsa) |
| 427 |
+ $(use_with !aqua x) |
| 428 |
+ $(use_with heif libheif) |
| 429 |
+ $(use_with jpeg2k jpeg2000) |
| 430 |
$(use_with mng libmng) |
| 431 |
$(use_with openexr) |
| 432 |
- $(use_with webp) |
| 433 |
- $(use_with heif libheif) |
| 434 |
- $(use_enable python) |
| 435 |
- --enable-mp |
| 436 |
- $(use_enable cpu_flags_x86_sse sse) |
| 437 |
+ $(use_with postscript gs) |
| 438 |
$(use_with udev gudev) |
| 439 |
$(use_with unwind libunwind) |
| 440 |
+ $(use_with webp) |
| 441 |
$(use_with wmf) |
| 442 |
- --with-xmc |
| 443 |
$(use_with xpm libxpm) |
| 444 |
- $(use_enable vector-icons) |
| 445 |
- --without-xvfb-run |
| 446 |
) |
| 447 |
|
| 448 |
gnome2_src_configure "${myconf[@]}" |
| 449 |
@@ -158,18 +168,6 @@ src_compile() { |
| 450 |
gnome2_src_compile |
| 451 |
} |
| 452 |
|
| 453 |
-_clean_up_locales() { |
| 454 |
- [[ -z ${LINGUAS+set} ]] && return |
| 455 |
- einfo "Cleaning up locales..." |
| 456 |
- for lang in ${LANGS}; do |
| 457 |
- has ${lang} ${LINGUAS} && { |
| 458 |
- einfo "- keeping ${lang}" |
| 459 |
- continue |
| 460 |
- } |
| 461 |
- rm -Rf "${ED%/}"/usr/share/locale/"${lang}" |
| 462 |
- done |
| 463 |
-} |
| 464 |
- |
| 465 |
# for https://bugs.gentoo.org/664938 |
| 466 |
_rename_plugins() { |
| 467 |
einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' |
| 468 |
@@ -209,8 +207,12 @@ src_install() { |
| 469 |
local gimp_app_version=$(get_version_component_range 1-2) |
| 470 |
mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die |
| 471 |
|
| 472 |
+ # Remove gimp devel-docs html files if user doesn't need it |
| 473 |
+ if ! use doc; then |
| 474 |
+ rm -r "${ED%/}"/usr/share/gtk-doc || die |
| 475 |
+ fi |
| 476 |
+ |
| 477 |
_rename_plugins || die |
| 478 |
- _clean_up_locales |
| 479 |
} |
| 480 |
|
| 481 |
pkg_postinst() { |
Archives