commit: 2f7948d6830dcabf5722c4f8ad09e399cfb57346 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Sep 25 08:54:57 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Sep 25 10:19:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7948d6
media-gfx/mypaint: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-gfx/mypaint/Manifest | 1 - .../files/mypaint-1.2.1-json-c-boolean-defs.patch | 34 --------- media-gfx/mypaint/mypaint-1.2.1-r5.ebuild | 89 ---------------------- 3 files changed, 124 deletions(-) diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index 4dd29e8dea2..f69a70eeb4d 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -1,2 +1 @@ -DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562 diff --git a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch deleted file mode 100644 index caa2df4de6e..00000000000 --- a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit a2b3f56b347c1897454eac1b5bdfe9d228302b80 -Author: Jehan <[email protected]> -Date: Sat Jan 26 12:50:31 2019 +0100 - - Boolean #define-s removed from json-c in 2017. - - We don't need to #undef TRUE and FALSE before including json.h as this - redefinition has been removed in upstream json-c. - See json-c commit 0992aac61f8b087efd7094e9ac2b84fa9c040fcd. - - Note that it still works even if using an older json-c since the - original code was alreadying #undef-ing these 2 values before redefining - them. So that was anyway useless code and this change should work both - with old or new json-c. - - Note: the previous code was still working fine when building on Linux, - but not when cross-compiling on Windows. But this is the correct fix - anyway. - - (cherry picked from commit f4fd97445d3b6843af57ff8ba5f02cbdeb3942e9) - -diff --git a/brushlib/mypaint-brush.c b/mypaint-brush.c -index 4759d11..7a1380c 100644 ---- a/brushlib/mypaint-brush.c -+++ b/brushlib/mypaint-brush.c -@@ -35,9 +35,6 @@ - #include "rng-double.h" - - #ifdef HAVE_JSON_C --// Allow the C99 define from json.h --#undef TRUE --#undef FALSE - #include <json.h> - #endif // HAVE_JSON_C diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild deleted file mode 100644 index 4c5a1859342..00000000000 --- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg - -DESCRIPTION="fast and easy graphics application for digital painters" -HOMEPAGE="http://mypaint.org/"; -SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - || ( - dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ) - >=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}] - dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] - ') - >=dev-libs/json-c-0.11:= - media-libs/lcms:2 - >=media-libs/libmypaint-1.3.0 - media-libs/libpng:0= - gnome-base/librsvg - sys-libs/libomp - x11-libs/gtk+:3 -" -DEPEND="${RDEPEND} - dev-lang/swig - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}/${P}-json-c-boolean-defs.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_compile() { - # Workaround scons bug with locales. Bug #352700 - export LANG="en_US.UTF-8" - tc-export CC CXX - strip-flags # scons upstream issue #3017 - escons -} - -src_install() { - escons prefix="${D}/usr" install - newicon pixmaps/${PN}_logo.png ${PN}.png - for x in ${LANGS}; do - if ! has ${x} ${LINGUAS}; then - rm -rf "${ED}"/usr/share/locale/${x} || die - fi - done - - python_optimize "${D}"usr/share/${PN} - # not used and broken - rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die - # already provided by system-libmypaint - rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die -} - -pkg_preinst() { - xdg_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_pkg_postrm - fdo-mime_desktop_database_update -}
