commit:     87ca5c54d2d1f1dd0592e70f583a8358f7261e1f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 14:33:35 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 10:19:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ca5c54

media-gfx/gimp: Drop 2.10.20-r3 and 2.10.22-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/gimp/Manifest               |   1 -
 media-gfx/gimp/gimp-2.10.20-r3.ebuild | 214 ----------------------------------
 media-gfx/gimp/gimp-2.10.22-r1.ebuild | 212 ---------------------------------
 3 files changed, 427 deletions(-)

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 78e7a42af5d..b8e45bb0b64 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,3 @@
-DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 
060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22
 SHA512 
7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B 
d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d
 SHA512 
13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
 DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 
3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5
 SHA512 
0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
 DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B 
b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27
 SHA512 
1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b

diff --git a/media-gfx/gimp/gimp-2.10.20-r3.ebuild 
b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
deleted file mode 100644
index c97aa67e769..00000000000
--- a/media-gfx/gimp/gimp-2.10.20-r3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/";
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev 
unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx 
cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-       >=app-text/poppler-0.50[cairo]
-       >=app-text/poppler-data-0.4.7
-       >=dev-libs/atk-2.2.0
-       >=dev-libs/glib-2.56.2:2
-       >=dev-libs/json-glib-1.2.6
-       dev-libs/libxml2:2
-       dev-libs/libxslt
-       >=gnome-base/librsvg-2.40.6:2
-       >=media-gfx/mypaint-brushes-1.3.0:=
-       >=media-libs/babl-0.1.78
-       >=media-libs/fontconfig-2.12.4
-       >=media-libs/freetype-2.1.7
-       >=media-libs/gegl-0.4.24:0.4[cairo]
-       <media-libs/gegl-0.4.28:0.4
-       >=media-libs/gexiv2-0.10.6
-       >=media-libs/harfbuzz-0.9.19
-       >=media-libs/lcms-2.8:2
-       >=media-libs/libmypaint-1.3.0:=
-       >=media-libs/libpng-1.6.25:0=
-       >=media-libs/tiff-3.5.7:0
-       net-libs/glib-networking[ssl]
-       sys-libs/zlib
-       virtual/jpeg
-       >=x11-libs/cairo-1.12.2
-       >=x11-libs/gdk-pixbuf-2.31:2
-       >=x11-libs/gtk+-2.24.32:2
-       x11-libs/libXcursor
-       >=x11-libs/pango-1.29.4
-       aalib? ( media-libs/aalib )
-       alsa? ( >=media-libs/alsa-lib-1.0.0 )
-       aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-       heif? ( >=media-libs/libheif-1.3.2:= )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-       mng? ( media-libs/libmng:= )
-       openexr? ( >=media-libs/openexr-1.6.1:= )
-       postscript? ( app-text/ghostscript-gpl )
-       udev? ( dev-libs/libgudev:= )
-       unwind? ( >=sys-libs/libunwind-1.1.0:= )
-       webp? ( >=media-libs/libwebp-0.6.0:= )
-       wmf? ( >=media-libs/libwmf-0.2.8 )
-       xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-       ${COMMON_DEPEND}
-       x11-themes/hicolor-icon-theme
-       gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       >=dev-lang/perl-5.10.0
-       dev-libs/appstream-glib
-       dev-util/gtk-update-icon-cache
-       >=dev-util/intltool-0.40.1
-       sys-apps/findutils
-       >=sys-devel/gettext-0.19
-       >=sys-devel/libtool-2.2
-       virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-       "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-       if has_version "media-gfx/mypaint-brushes:2.0" ; then
-               sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' 
configure.ac || die #737794
-       fi
-
-       sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-       sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' 
-i configure.ac || die #615144
-
-       gnome2_src_prepare  # calls eautoreconf
-
-       sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' 
-i configure || die #615144
-       fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-       export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-       # Bugs #569738 and #591214
-       local nv
-       for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-               # We do not check for existence as they may show up later
-               # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-               addwrite "${nv}"
-       done
-
-       addwrite /dev/dri/  # bugs #574038 and #684886
-       addwrite /dev/ati/  # bug #589198
-       addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-       _adjust_sandbox
-
-       local myconf=(
-               GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-               GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-               --enable-default-binary
-
-               --disable-check-update
-               --disable-python
-               --enable-mp
-               --with-appdata-test
-               --with-bug-report-url=https://bugs.gentoo.org/
-               --with-xmc
-               --without-libbacktrace
-               --without-webkit
-               --without-xvfb-run
-               $(use_enable cpu_flags_ppc_altivec altivec)
-               $(use_enable cpu_flags_x86_mmx mmx)
-               $(use_enable cpu_flags_x86_sse sse)
-               $(use_enable vector-icons)
-               $(use_with aalib aa)
-               $(use_with alsa)
-               $(use_with !aqua x)
-               $(use_with heif libheif)
-               $(use_with jpeg2k jpeg2000)
-               $(use_with mng libmng)
-               $(use_with openexr)
-               $(use_with postscript gs)
-               $(use_with udev gudev)
-               $(use_with unwind libunwind)
-               $(use_with webp)
-               $(use_with wmf)
-               $(use_with xpm libxpm)
-       )
-
-       gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-       export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-       gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-       einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout 
(bug #664938)...'
-       local prepend=gimp-org-
-       (
-               cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
-               for plugin_slash in $(ls -d1 */); do
-                   plugin=${plugin_slash%/}
-                   if [[ -f ${plugin}/${plugin} ]]; then
-                       # NOTE: Folder and file name need to match for Gimp to 
load that plug-in
-                       #       so "file-svg/file-svg" becomes 
"${prepend}file-svg/${prepend}file-svg"
-                       mv ${plugin}/{,${prepend}}${plugin} || exit 1
-                       mv {,${prepend}}${plugin} || exit 1
-                   fi
-               done
-       )
-}
-
-src_test() {
-       virtx emake check
-}
-
-src_install() {
-       gnome2_src_install
-
-       # Workaround for bug #321111 to give GIMP the least
-       # precedence on PDF documents by default
-       mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-       find "${D}" -name '*.la' -type f -delete || die
-
-       # Prevent dead symlink gimp-console.1 from downstream man page 
compression (bug #433527)
-       local gimp_app_version=$(get_version_component_range 1-2)
-       mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 
|| die
-
-       # Remove gimp devel-docs html files if user doesn't need it
-       if ! use doc; then
-               rm -r "${ED%/}"/usr/share/gtk-doc || die
-       fi
-
-       _rename_plugins || die
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-}

diff --git a/media-gfx/gimp/gimp-2.10.22-r1.ebuild 
b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
deleted file mode 100644
index d0bc4bc4388..00000000000
--- a/media-gfx/gimp/gimp-2.10.22-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/";
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev 
unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx 
cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-       >=app-text/poppler-0.50[cairo]
-       >=app-text/poppler-data-0.4.7
-       >=dev-libs/atk-2.2.0
-       >=dev-libs/glib-2.56.2:2
-       >=dev-libs/json-glib-1.2.6
-       dev-libs/libxml2:2
-       dev-libs/libxslt
-       >=gnome-base/librsvg-2.40.6:2
-       >=media-gfx/mypaint-brushes-2.0.2:=
-       >=media-libs/babl-0.1.78
-       >=media-libs/fontconfig-2.12.4
-       >=media-libs/freetype-2.1.7
-       >=media-libs/gegl-0.4.26:0.4[cairo]
-       <media-libs/gegl-0.4.28:0.4
-       >=media-libs/gexiv2-0.10.6
-       >=media-libs/harfbuzz-0.9.19
-       >=media-libs/lcms-2.8:2
-       >=media-libs/libmypaint-1.3.0:=
-       >=media-libs/libpng-1.6.25:0=
-       >=media-libs/tiff-3.5.7:0
-       net-libs/glib-networking[ssl]
-       sys-libs/zlib
-       virtual/jpeg
-       >=x11-libs/cairo-1.12.2
-       >=x11-libs/gdk-pixbuf-2.31:2
-       >=x11-libs/gtk+-2.24.32:2
-       x11-libs/libXcursor
-       >=x11-libs/pango-1.29.4
-       aalib? ( media-libs/aalib )
-       alsa? ( >=media-libs/alsa-lib-1.0.0 )
-       aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-       heif? ( >=media-libs/libheif-1.3.2:= )
-       jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-       mng? ( media-libs/libmng:= )
-       openexr? ( >=media-libs/openexr-1.6.1:= )
-       postscript? ( app-text/ghostscript-gpl )
-       udev? ( dev-libs/libgudev:= )
-       unwind? ( >=sys-libs/libunwind-1.1.0:= )
-       webp? ( >=media-libs/libwebp-0.6.0:= )
-       wmf? ( >=media-libs/libwmf-0.2.8 )
-       xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-       ${COMMON_DEPEND}
-       x11-themes/hicolor-icon-theme
-       gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-       ${COMMON_DEPEND}
-       >=dev-lang/perl-5.10.0
-       dev-libs/appstream-glib
-       dev-util/gtk-update-icon-cache
-       >=dev-util/intltool-0.40.1
-       sys-apps/findutils
-       >=sys-devel/gettext-0.19
-       >=sys-devel/libtool-2.2
-       virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-       "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-       sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || 
die #737794
-
-       sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-       sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' 
-i configure.ac || die #615144
-
-       gnome2_src_prepare  # calls eautoreconf
-
-       sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' 
-i configure || die #615144
-       fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-       export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-       # Bugs #569738 and #591214
-       local nv
-       for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-               # We do not check for existence as they may show up later
-               # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-               addwrite "${nv}"
-       done
-
-       addwrite /dev/dri/  # bugs #574038 and #684886
-       addwrite /dev/ati/  # bug #589198
-       addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-       _adjust_sandbox
-
-       local myconf=(
-               GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-               GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-               --enable-default-binary
-
-               --disable-check-update
-               --disable-python
-               --enable-mp
-               --with-appdata-test
-               --with-bug-report-url=https://bugs.gentoo.org/
-               --with-xmc
-               --without-libbacktrace
-               --without-webkit
-               --without-xvfb-run
-               $(use_enable cpu_flags_ppc_altivec altivec)
-               $(use_enable cpu_flags_x86_mmx mmx)
-               $(use_enable cpu_flags_x86_sse sse)
-               $(use_enable vector-icons)
-               $(use_with aalib aa)
-               $(use_with alsa)
-               $(use_with !aqua x)
-               $(use_with heif libheif)
-               $(use_with jpeg2k jpeg2000)
-               $(use_with mng libmng)
-               $(use_with openexr)
-               $(use_with postscript gs)
-               $(use_with udev gudev)
-               $(use_with unwind libunwind)
-               $(use_with webp)
-               $(use_with wmf)
-               $(use_with xpm libxpm)
-       )
-
-       gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-       export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-       gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-       einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout 
(bug #664938)...'
-       local prepend=gimp-org-
-       (
-               cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-               for plugin_slash in $(ls -d1 */); do
-                   plugin=${plugin_slash%/}
-                   if [[ -f ${plugin}/${plugin} ]]; then
-                       # NOTE: Folder and file name need to match for Gimp to 
load that plug-in
-                       #       so "file-svg/file-svg" becomes 
"${prepend}file-svg/${prepend}file-svg"
-                       mv ${plugin}/{,${prepend}}${plugin} || die
-                       mv {,${prepend}}${plugin} || die
-                   fi
-               done
-       )
-}
-
-src_test() {
-       virtx emake check
-}
-
-src_install() {
-       gnome2_src_install
-
-       # Workaround for bug #321111 to give GIMP the least
-       # precedence on PDF documents by default
-       mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-       find "${D}" -name '*.la' -type f -delete || die
-
-       # Prevent dead symlink gimp-console.1 from downstream man page 
compression (bug #433527)
-       local gimp_app_version=$(get_version_component_range 1-2)
-       mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 
|| die
-
-       # Remove gimp devel-docs html files if user doesn't need it
-       if ! use doc; then
-               rm -r "${ED%/}"/usr/share/gtk-doc || die
-       fi
-
-       _rename_plugins || die
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-}

Reply via email to