gentoo resync : 30.09.2020

4 files changed, 2 insertions, 128 deletions

diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 6de7ea08b36a..ea34ba704f2d 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,8 +1,5 @@
-AUX mypaint-1.2.1-json-c-boolean-defs.patch 1189 BLAKE2B 7cc9728fbe01195b0c95bd844592d4fbae29a7a26758d242933ed712b940d8a893cd41bd2987952e2a817208efbffd779e9c39d4dde42d809a1e11de06a234fa SHA512 8e5815c281a6c63c7818f378d0e75a94860dd24ea69e9fff8e5951b05c407f12e2e19fefeaa559476a4dab46c88eab8821eff061e8c8eadd1f3ce150e42563c2
 AUX mypaint-2.0.1-GIL-hold.patch 5153 BLAKE2B 3d70b414bfb6396fffb9ebfc9c1fe6791878a97a999355b103fd848993172049db7f97f81d96e253294b9629a2a5dfe7c6710f29561f45b89f4fb26d4cf9a788 SHA512 aa64bb4ffb907516af811bb8ef4c0bccce9b785f94e0d71a44be30e7c96ea3a35dcceeac618956bf11c9d2c5c4e05524c8492ed14967148e2d6b9646b1ed5c15
 AUX mypaint-2.0.1-r1-build-system.patch 638 BLAKE2B 8e0209eb8fdba535cb8c0075e183681b0d8f8a11613cf7c3d2ddb5e20954d6c95da3ef3824063ac55bb11feda38cdf00eb8190cf76ca7753d2432d870926194b SHA512 8c088a089408542f57ef0fb608a63ae6fa0cce5392cb309376198813d35f5c3e54466945419984973af77e11f5bc4908961b5e81982a32fbef04c081df1b0349
-DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 DIST mypaint-2.0.1.tar.xz 7295048 BLAKE2B 813a939f95ea6887c57d8c0868e33e9bc8b1b95746d5ecd793d4fd13a32198ee5a445cfdd2691a15e944bfb0099d6ac624dff320ae29465db5b1e0d197bedb30 SHA512 449beddcc6da5d720c9efbeac94a466ed0057bd1962d42ebb419190e8b7fd8ffd341327408467fc5da47920f9d0da1fd6d78233a0dda88de5f5d52d53d9ab562
-EBUILD mypaint-1.2.1-r5.ebuild 2016 BLAKE2B 0a00318c334adc4c97021ca1e52cb089075b1db667f0ad431fcf758345756d7d3558e50a353c8578d5749172ea4bbe396a99041c026cecce6174cb7cc6e4caf3 SHA512 5b1a703cf2efb5e0d729315ea092c58954975dedc177472467f03726956211b34744018cb3ef730f4b5a8ff2053f30218f838609ef225dd05eab21f5d8a683d8
-EBUILD mypaint-2.0.1-r2.ebuild 1819 BLAKE2B 118b55b447bff16f992272017b3df8e28e9929c8904fb5417646c643f32eff5df4b1b266237fbee9b914da942482a7b33fae71af5bc7993ee83f98c8b95e3d36 SHA512 c6015d2ab888f48a32c5fcea45dd6532ec315ef61226e8ddb5ddfcb2b7ea2efcb0d3147a23b361c04553c71bef8863ef4508946707619e08f5bd52cb0d3d628c
+EBUILD mypaint-2.0.1-r2.ebuild 1818 BLAKE2B 834cc6863ab6c57876cdb2e56aab050be451806da7192a53bcd99d306e86cff9de0389ff5d35310ef4c45afed763109246e800b9ad4d744f0e8f1face0784362 SHA512 63e3c76f051c261b3c6a429a6629798673a36142dbb8756e8595651ebfc8379ed16c0f9c76e7fe38990c33f64ceb4c10c3f2393a859cdb1be3cbdb8668012275
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
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 caa2df4de6ee..000000000000
--- a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
-Author: Jehan <jehan@girinstud.io>
-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 4c5a1859342c..000000000000
--- 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
-}
diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index d0e52bef58bf..494d4ce80a0a 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openmp"
 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"