[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2024-07-16 Thread Sam James
commit: fc20d383981a2f3ef863ad31b79c0dc69d060957
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul 17 05:48:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 17 05:53:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc20d383

media-gfx/mypaint: enable py3.13

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index 3ddd273019c8..8f03d4e44e6c 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit desktop distutils-r1 xdg



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2024-03-06 Thread Arthur Zamarin
commit: d73c114094249dd1d2bb5b5a9355e816fba95497
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar  6 19:34:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar  6 19:47:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73c1140

media-gfx/mypaint: update HOMEPAGE, enable py3.12

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index d29bb2628329..3ddd273019c8 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit desktop distutils-r1 xdg
 
 DESCRIPTION="Fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/";
+HOMEPAGE="http://mypaint.app/";
 SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz";
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2023-12-27 Thread Sam James
commit: 6cb5ff88e5940dc033838dbceb64159dc71fe5eb
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 03:38:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 03:38:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb5ff88

media-gfx/mypaint: drop 2.0.1-r2

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r2.ebuild | 77 ---
 1 file changed, 77 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
deleted file mode 100644
index 812d8ffc0745..
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-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="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"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-lang/swig
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   ')
-   >=dev-libs/json-c-0.11:=
-   gnome-base/librsvg
-   media-gfx/mypaint-brushes:2.0
-   media-libs/lcms:2
-   >=media-libs/libmypaint-1.5.0[openmp?]
-   media-libs/libpng:0=
-   sys-devel/gettext
-   sys-libs/libomp
-   x11-libs/gdk-pixbuf[jpeg]
-   x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.0.1-r1-build-system.patch"
-   "${FILESDIR}/${P}-GIL-hold.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_compile() {
-   # --disable-openmp can't be passed to setup.py build,
-   # only setup.py build_ext.
-   # Trying to call build_ext then build and such fails.
-   #
-   # We just override the environment instead for simplicity.
-   local openmp=$(usex openmp '-fopenmp' '-fno-openmp')
-
-   OPENMP_CFLAG="${openmp}" OPENMP_LDFLAG="${openmp}" 
distutils-r1_src_compile
-}
-
-src_install() {
-   distutils-r1_src_install
-
-   newicon pixmaps/${PN}_logo.png ${PN}.png
-
-   local lang=
-   for lang in ${LANGS}; do
-   if ! has ${lang} ${LINGUAS}; then
-   rm -rf "${ED}"/usr/share/locale/${lang} || die
-   fi
-   done
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2023-06-04 Thread Arthur Zamarin
commit: c124f4133439c3adcbfb921daaf1445deb3435fc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun  4 15:49:17 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun  4 15:49:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c124f413

media-gfx/mypaint: Keyword 2.0.1-r3 arm64, #907776

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index 3321a34f933c..d29bb2628329 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.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 ~arm64 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"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2023-03-10 Thread Arthur Zamarin
commit: ca9ea9eb5c7a814c7d0a894e2ecbcd6a635ee561
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 10 08:20:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 10 08:20:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9ea9eb

media-gfx/mypaint: Stabilize 2.0.1-r3 x86, #900453

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index bbf6566e2906..3321a34f933c 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.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"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2023-03-09 Thread Sam James
commit: 87212b234b9e0c9a84bde4069881b510c0ceb41e
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  9 08:54:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 08:54:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87212b23

media-gfx/mypaint: Stabilize 2.0.1-r3 amd64, #900453

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
index 46937aba7d14..bbf6566e2906 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r3.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"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/, media-gfx/mypaint/files/

2023-01-09 Thread Sam James
commit: 45846fb0a873286029d6673f114c43433b7be91c
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 10 04:55:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 10 04:56:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45846fb0

media-gfx/mypaint: update EAPI 7 -> 8, enable py3.11

Small chance the gettext stuff in the Python 3.11 patch helps
w/ the musl segfault, bug #836232.

Bug: https://bugs.gentoo.org/836232
Closes: https://bugs.gentoo.org/807979
Signed-off-by: Sam James  gentoo.org>

 .../mypaint/files/mypaint-2.0.1-python3.11.patch   | 92 ++
 .../mypaint/files/mypaint-2.0.1-setuptools.patch   | 74 +
 media-gfx/mypaint/mypaint-2.0.1-r3.ebuild  | 79 +++
 3 files changed, 245 insertions(+)

diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch 
b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch
new file mode 100644
index ..7a652754204d
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-python3.11.patch
@@ -0,0 +1,92 @@
+https://github.com/mypaint/mypaint/pull/1193
+
+From 032a155b72f2b021f66a994050d83f07342d04af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ 
+Date: Wed, 9 Nov 2022 11:24:33 +0700
+Subject: [PATCH] python: fix for Python 3.11
+
+- python 3 always open in universal mode, U is default mode in 3.0,
+  and removed in 3.11
+- mypaint doesn't use ld?n?gettext, so bind_textdomain_codeset isn't
+  needed, that function is deprecated in 3.8 and is no-ops in 3.10 and
+  removed in 3.11
+--- a/lib/gettext_setup.py
 b/lib/gettext_setup.py
+@@ -82,13 +82,11 @@ def init_gettext(localepath):
+ # yanked in over GI.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=574520#c26
+ bindtextdomain = None
+-bind_textdomain_codeset = None
+ textdomain = None
+ 
+ # Try the POSIX/Linux way first.
+ try:
+ bindtextdomain = locale.bindtextdomain
+-bind_textdomain_codeset = locale.bind_textdomain_codeset
+ textdomain = locale.textdomain
+ except AttributeError:
+ logger.warning(
+@@ -117,12 +115,6 @@ def init_gettext(localepath):
+ ctypes.c_char_p,
+ )
+ bindtextdomain.restype = ctypes.c_char_p
+-bind_textdomain_codeset = libintl.bind_textdomain_codeset
+-bind_textdomain_codeset.argtypes = (
+-ctypes.c_char_p,
+-ctypes.c_char_p,
+-)
+-bind_textdomain_codeset.restype = ctypes.c_char_p
+ textdomain = libintl.textdomain
+ textdomain.argtypes = (
+ ctypes.c_char_p,
+@@ -177,35 +169,22 @@ def init_gettext(localepath):
+ # complete set from the same source.
+ # Required for translatable strings in GtkBuilder XML
+ # to be translated.
+-if bindtextdomain and bind_textdomain_codeset and textdomain:
++if bindtextdomain and textdomain:
+ assert os.path.exists(path)
+ assert os.path.isdir(path)
+ if sys.platform == 'win32':
+ p = bindtextdomain(dom.encode('utf-8'), path.encode('utf-8'))
+-c = bind_textdomain_codeset(
+-dom.encode('utf-8'), codeset.encode('utf-8')
+-)
+ else:
+ p = bindtextdomain(dom, path)
+-c = bind_textdomain_codeset(dom, codeset)
+ logger.debug("C bindtextdomain(%r, %r): %r", dom, path, p)
+-logger.debug(
+-"C bind_textdomain_codeset(%r, %r): %r",
+-dom, codeset, c,
+-)
+ # Call the implementations in Python's standard gettext module
+ # too.  This has proper cross-platform support, but it only
+ # initializes the native Python "gettext" module.
+ # Required for marked strings in Python source to be translated.
+ # See http://docs.python.org/release/2.7/library/locale.html
+ p = gettext.bindtextdomain(dom, path)
+-c = gettext.bind_textdomain_codeset(dom, codeset)
+ logger.debug("Python bindtextdomain(%r, %r): %r", dom, path, p)
+-logger.debug(
+-"Python bind_textdomain_codeset(%r, %r): %r",
+-dom, codeset, c,
+-)
+-if bindtextdomain and bind_textdomain_codeset and textdomain:
++if bindtextdomain and textdomain:
+ if sys.platform == 'win32':
+ d = textdomain(defaultdom.encode('utf-8'))
+ else:
+--- a/setup.py
 b/setup.py
+@@ -679,7 +679,7 @@ def _install_script(self, src, header):
+ self.announce("installing %s as %s" % (src, targ_basename), level=2)
+ if self.dry_run:
+ return []
+-with open(src, "rU") as in_fp:
++with open(src, "r") as in_fp:
+  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2022-11-30 Thread WANG Xuerui
commit: bc7438530f5ec2a2ffc1d1565d0e13b0d6c24bc0
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed Nov 30 12:15:08 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu Dec  1 02:44:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc743853

media-gfx/mypaint-brushes: keyword 2.0.2-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
index 64652b5f63be..0b8ac9f4982c 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv x86"
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2022-10-17 Thread Sam James
commit: 9136cd18ec0c874dae5a63df5caca8da8995d741
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 17 23:29:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 17 23:29:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9136cd18

media-gfx/mypaint-brushes: switch to (xz) release tarballs

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/Manifest | 2 +-
 ...ypaint-brushes-2.0.2.ebuild => mypaint-brushes-2.0.2-r1.ebuild} | 7 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/media-gfx/mypaint-brushes/Manifest 
b/media-gfx/mypaint-brushes/Manifest
index 69ab7282754f..2dbebfe48f5f 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1 +1 @@
-DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 
68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe
 SHA512 
89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556
+DIST mypaint-brushes-2.0.2.tar.xz 1522216 BLAKE2B 
ba274d9abcac51bba3b8e7d4489893eef62e2b35ee8d0607d476d022150d92944693cae6d1ddb9f4f9b01f229f050f4ccf7416a0ef0fe27e9e0f5e84a4e2c56f
 SHA512 
bae870e930381b818165e5e39d38b25782d5744c9a507a71dab37ae7ca2d4502896057f919a16eb9305d803a01db3a948a735d5c5b850893997a9afd6403144b

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
similarity index 66%
rename from media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
rename to media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
index 51718d70c079..64652b5f63be 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,15 +7,12 @@ inherit autotools
 
 DESCRIPTION="Default MyPaint brushes"
 HOMEPAGE="https://github.com/mypaint/mypaint-brushes";
-SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mypaint/mypaint-brushes/releases/download/v${PV}/${P}.tar.xz";
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv x86"
 
-# Chosen to exclude README symlink
-DOCS=( AUTHORS NEWS README.md )
-
 src_prepare() {
default
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2022-01-04 Thread Sam James
commit: 8c95d212974e95e5a7059fea757954eee0166ff2
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan  4 20:31:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  4 20:45:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c95d212

media-gfx/mypaint: enable py3.10 and disable py3.7

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index 197c29a79191..63497e65a90b 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit desktop distutils-r1 xdg



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2021-03-22 Thread Sam James
commit: 043b64ce38aeb7e98a4484b8d2f092e66e35ef59
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 22 22:52:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 23 04:48:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043b64ce

media-gfx/mypaint-brushes: tiny cosmetic changes

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 635c072998e..c4f8c08f072 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,10 @@ LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
-DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
+# Chosen to exclude README symlink
+DOCS=( AUTHORS NEWS README.md )
 
 src_prepare() {
-   eapply_user
+   default
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-10-20 Thread Sam James
commit: 893a1bd68fadb1a47fe2698eca7c62d87e6616aa
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 09:05:20 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 09:05:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893a1bd6

media-gfx/mypaint-brushes: adopt package

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/metadata.xml 
b/media-gfx/mypaint-brushes/metadata.xml
index 3c58a0219fb..a1af484833b 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -1,6 +1,9 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   s...@gentoo.org
+   Sam James
+   

 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-10-20 Thread Sam James
commit: e22a0919543f954bb19e2b6d58a94ee31a771677
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 20 09:04:53 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 20 09:04:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22a0919

media-gfx/mypaint: adopt package

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/metadata.xml b/media-gfx/mypaint/metadata.xml
index 3bce1ea264f..8f3ad100df7 100644
--- a/media-gfx/mypaint/metadata.xml
+++ b/media-gfx/mypaint/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   s...@gentoo.org
+   Sam James
+   

mypaint/mypaint




[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-09-25 Thread Michał Górny
commit: 2a7217dafee396a1a76ef5f6d4d025c11a8c99dd
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 25 08:55:11 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 25 10:19:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7217da

media-gfx/mypaint-brushes: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/mypaint-brushes/Manifest |  1 -
 .../mypaint-brushes-1.3.0-r1.ebuild| 22 --
 2 files changed, 23 deletions(-)

diff --git a/media-gfx/mypaint-brushes/Manifest 
b/media-gfx/mypaint-brushes/Manifest
index 655508e6c20..69ab7282754 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,2 +1 @@
-DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 
26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1
 SHA512 
f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
 DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 
68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe
 SHA512 
89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
deleted file mode 100644
index c217baafef1..000
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/mypaint/mypaint-brushes";
-SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
-
-src_prepare() {
-   eapply_user
-   eautoreconf
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/, media-gfx/mypaint/files/

2020-09-25 Thread Michał Górny
commit: 2f7948d6830dcabf5722c4f8ad09e399cfb57346
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 25 08:54:57 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 25 10:19:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7948d6

media-gfx/mypaint: Remove old

Signed-off-by: Michał Górny  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..000
--- a/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
-Author: Jehan 
-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 
- #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..000
--- 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
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-09-25 Thread Agostino Sarubbo
commit: dd0af8efb1d476cb244fdbe2b61e314508dff434
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 25 08:46:11 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 25 08:46:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0af8ef

media-gfx/mypaint: x86 stable wrt bug #708500

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index d0e52bef58b..494d4ce80a0 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"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-09-25 Thread Agostino Sarubbo
commit: 64bf6ff8ecaed366eea802fa87ef0303c0fe63e3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 25 08:46:15 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 25 08:46:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64bf6ff8

media-gfx/mypaint-brushes: x86 stable wrt bug #708500

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 4a806df9a31..635c072998e 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-09-19 Thread Sam James
commit: 8856114c4fc717ba7a4ea145737a0f8fd2db9197
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 19 21:28:59 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 19 21:28:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8856114c

media-gfx/mypaint: Stabilize 2.0.1-r2 amd64, #708500

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/mypaint-2.0.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index 8cef2b3a419..d0e52bef58b 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"
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-09-19 Thread Sam James
commit: a397d2c833f00c16d64695f0abda5232afc5fded
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 19 21:28:59 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 19 21:28:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a397d2c8

media-gfx/mypaint-brushes: Stabilize 2.0.2 amd64, #708500

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index f4024ac3c55..4a806df9a31 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/, media-gfx/mypaint/files/

2020-09-19 Thread Sam James
commit: 226a0725ccc8ebe63bdb79676c9873d8fe40e714
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 19 21:23:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 19 21:24:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226a0725

media-gfx/mypaint: cleanup old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../mypaint/files/mypaint-2.0.1-build-system.patch | 37 
 media-gfx/mypaint/mypaint-2.0.1.ebuild | 69 --
 2 files changed, 106 deletions(-)

diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch 
b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
deleted file mode 100644
index c7806e7119d..000
--- a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 670df4d..703f9d2 100644
 a/setup.py
-+++ b/setup.py
-@@ -471,9 +471,6 @@ class BuildExt (build_ext):
- linkflags.extend([
- "-O0",
- ])
--else:
--linkflags.append("-O3")
--ccflags.append("-O3")
- 
- return build_ext.build_extension(self, ext)
- 
-@@ -869,7 +866,6 @@ def get_ext_modules():
- '-Wno-write-strings',
- '-D_POSIX_C_SOURCE=200809L',
- "-DNO_TESTS",  # FIXME: we're building against shared libmypaint now
--'-g',  # always include symbols, for profiling
- ]
- extra_link_args = []
- 
-diff --git a/setup.py b/setup.py
-index 703f9d2..cc8abbd 100644
 a/setup.py
-+++ b/setup.py
-@@ -456,10 +456,6 @@ class BuildExt (build_ext):
- ccflags = ext.extra_compile_args
- linkflags = ext.extra_link_args
- 
--if sys.platform != "darwin" and not self.disable_openmp:
--linkflags.append(OPENMP_CFLAG)
--ccflags.append(OPENMP_LDFLAG)
--
- if self.debug:
- skip = ["-DNDEBUG"]
- ccflags[:] = [f for f in ccflags if f not in skip]

diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1.ebuild
deleted file mode 100644
index 1ca2e261568..000
--- a/media-gfx/mypaint/mypaint-2.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit desktop distutils-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"
-
-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"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-lang/swig
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   ')
-   >=dev-libs/json-c-0.11:=
-   gnome-base/librsvg
-   media-gfx/mypaint-brushes:2.0
-   media-libs/lcms:2
-   >=media-libs/libmypaint-1.5.0
-   media-libs/libpng:0=
-   sys-devel/gettext
-   sys-libs/libomp
-   x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.0.1-build-system.patch"
-)
-
-distutils_enable_tests setup.py
-
-# TODO: Allow openmp support (patched out)
-# There's no urgency on this given that it currently
-# breaks runtime use [0]
-# [0] https://github.com/mypaint/mypaint/issues/1107.
-
-src_install() {
-   distutils-r1_src_install
-
-   newicon pixmaps/${PN}_logo.png ${PN}.png
-
-   local lang=
-   for lang in ${LANGS}; do
-   if ! has ${lang} ${LINGUAS}; then
-   rm -rf "${ED}"/usr/share/locale/${lang} || die
-   fi
-   done
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-09-18 Thread Sergei Trofimovich
commit: c41fc98f60f736916f48652c9e1b4085e0c8ac00
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 18 22:56:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 18 22:57:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41fc98f

media-gfx/mypaint-brushes: stable 2.0.2 for ppc64

stable wrt bug #708500

Package-Manager: Portage-3.0.7, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index af0b376bc03..f4024ac3c55 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-09-18 Thread Sam James
commit: 3c19116e7f0be5bfeda197d9a1ae37c7ffe81391
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 18 13:55:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 18 13:55:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c19116e

media-gfx/mypaint: add gdk-pixbuf[jpeg] dep

Closes: https://bugs.gentoo.org/735374
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/{mypaint-2.0.1-r1.ebuild => mypaint-2.0.1-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
similarity index 98%
rename from media-gfx/mypaint/mypaint-2.0.1-r1.ebuild
rename to media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
index 9cc5552420b..8cef2b3a419 100644
--- a/media-gfx/mypaint/mypaint-2.0.1-r1.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1-r2.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
media-libs/libpng:0=
sys-devel/gettext
sys-libs/libomp
+   x11-libs/gdk-pixbuf[jpeg]
x11-libs/gtk+:3
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-09-17 Thread Sam James
commit: 8d1b41b0ecbb25899d9786fc7e6f474dde4d4b7e
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 17 17:37:54 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 17 17:37:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1b41b0

media-gfx/mypaint-brushes: Stabilize 2.0.2 arm64, #708500

Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
index 41606195eab..af0b376bc03 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/files/, media-gfx/mypaint/

2020-09-12 Thread Sam James
commit: 4e927e88b17bdaff3cd044ba63b877035ccca485
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 12 20:19:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 12 20:26:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e927e88

media-gfx/mypaint: apply upstream patch for openmp crash

We apply the upstream patch for an OpenMP crash which was
(after quite some effort by upstream and a contributor)
now solved.

Thanks-to: Red Rozenglass  protonmail.com>
URL: https://github.com/mypaint/mypaint/issues/1107
Closes: https://bugs.gentoo.org/739122
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../mypaint/files/mypaint-2.0.1-GIL-hold.patch | 112 +
 .../files/mypaint-2.0.1-r1-build-system.patch  |  22 
 media-gfx/mypaint/mypaint-2.0.1-r1.ebuild  |  76 ++
 3 files changed, 210 insertions(+)

diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch 
b/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch
new file mode 100644
index 000..7fbf6ef9f26
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-GIL-hold.patch
@@ -0,0 +1,112 @@
+https://github.com/mypaint/mypaint/issues/1107
+https://bugs.gentoo.org/739122
+https://github.com/mypaint/mypaint/commit/356716e7bacfcbb1f3ab80171fea405fdd10b2b9.patch
+
+From 356716e7bacfcbb1f3ab80171fea405fdd10b2b9 Mon Sep 17 00:00:00 2001
+From: Red Rozenglass 
+Date: Fri, 11 Sep 2020 02:43:49 +0300
+Subject: [PATCH] Acquire/release the GIL while processing tile requests
+
+Fixes crashes on some Linux distros, potentially improves performance.
+
+When handling tile requests we currently use an openmp critical block in a
+callback registered with libmypaint. The callback calls into Python code
+without locking the GIL. This sometimes crashes mypaint in numpy's memory
+cache allocator on some Linux distros that compile numpy with run-time
+asserts (without `-DNDEBUG`), like Gentoo, as numpy uses Python's GIL
+internally as a locking mechanism for its non-thread-safe global cache
+management.
+
+Acquiring the GIL in the C callback, before calling into Python, ensures
+that the GIL is still locked by the current thread when it reaches numpy's
+code, and thus prevents the crashes. We yield the GIL whenever Python code
+calls again into libmypaint, This allows other threads to acquire it, and
+concurrent callbacks to run, which prevents deadlocks that would otherwise
+happen while waiting for all the callbacks to finish on Python's side. When
+libmypaint is done we re-acquire the GIL, and return up to the callback
+where the GIL is released again after some Python reference count
+bookkeeping.
+
+The OpenMP critical block is no longer necessary after introducing the GIL
+locking mechanism. This would potentially improve performance as the C code
+in libmypaint can process multiple callbacks at the same time during the
+`Py_BEGIN_ALLOW_THREADS' period that yields the GIL.
+---
+ lib/brush.hpp  | 16 ++--
+ lib/pythontiledsurface.cpp |  7 +--
+ lib/tiledsurface.hpp   |  4 +++-
+ 3 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/lib/brush.hpp b/lib/brush.hpp
+index f717a42df..0db455377 100644
+--- a/lib/brush.hpp
 b/lib/brush.hpp
+@@ -66,13 +66,25 @@ class Brush {
+   bool stroke_to (Surface * surface, float x, float y, float pressure, float 
xtilt, float ytilt, double dtime, float viewzoom, float viewrotation, float 
barrel_rotation)
+   {
+   MyPaintSurface2 *c_surface = surface->get_surface2_interface();
+-  return mypaint_brush_stroke_to_2(c_brush, c_surface, x, y, pressure, 
xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++  bool stroke_finished_or_empty;
++
++  Py_BEGIN_ALLOW_THREADS
++  stroke_finished_or_empty = mypaint_brush_stroke_to_2(c_brush, 
c_surface, x, y, pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, 
barrel_rotation);
++  Py_END_ALLOW_THREADS
++
++  return stroke_finished_or_empty;
+   }
+ 
+   bool stroke_to_linear (Surface * surface, float x, float y, float pressure, 
float xtilt, float ytilt, double dtime, float viewzoom, float viewrotation, 
float barrel_rotation)
+   {
+   MyPaintSurface2 *c_surface = surface->get_surface2_interface();
+-  return mypaint_brush_stroke_to_2_linearsRGB(c_brush, c_surface, x, y, 
pressure, xtilt, ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++  bool stroke_finished_or_empty;
++
++  Py_BEGIN_ALLOW_THREADS
++  stroke_finished_or_empty = 
mypaint_brush_stroke_to_2_linearsRGB(c_brush, c_surface, x, y, pressure, xtilt, 
ytilt, dtime, viewzoom, viewrotation, barrel_rotation);
++  Py_END_ALLOW_THREADS
++
++  return stroke_finished_or_empty;
+   }
+ 
+   double get_total_stroke_painting_time()
+diff --git a/lib/pythontiledsurface.cpp b/lib/pythontiledsurface.cpp
+index 46c515c99..2c6e773db 100644
+--- a/lib/pythontiledsurface.cpp

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/files/, media-gfx/mypaint/

2020-09-06 Thread Sam James
commit: 0a0118d6d8576e7a0182af1d517b16a85a7f49b1
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  6 18:32:52 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  6 18:36:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0118d6

media-gfx/mypaint: patch out openmp flag

We'll return to whether we want USE=openmp later on,
but there's no point for now, as it's being added
unconditionally and libmypaint's openmp is causing
a crash right now.

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch | 15 +++
 media-gfx/mypaint/mypaint-2.0.1.ebuild   |  5 +
 2 files changed, 20 insertions(+)

diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch 
b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
index 63a7a5bf75e..c7806e7119d 100644
--- a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
@@ -20,3 +20,18 @@ index 670df4d..703f9d2 100644
  ]
  extra_link_args = []
  
+diff --git a/setup.py b/setup.py
+index 703f9d2..cc8abbd 100644
+--- a/setup.py
 b/setup.py
+@@ -456,10 +456,6 @@ class BuildExt (build_ext):
+ ccflags = ext.extra_compile_args
+ linkflags = ext.extra_link_args
+ 
+-if sys.platform != "darwin" and not self.disable_openmp:
+-linkflags.append(OPENMP_CFLAG)
+-ccflags.append(OPENMP_LDFLAG)
+-
+ if self.debug:
+ skip = ["-DNDEBUG"]
+ ccflags[:] = [f for f in ccflags if f not in skip]

diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1.ebuild
index ac43f1303cf..1ca2e261568 100644
--- a/media-gfx/mypaint/mypaint-2.0.1.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild
@@ -50,6 +50,11 @@ PATCHES=(
 
 distutils_enable_tests setup.py
 
+# TODO: Allow openmp support (patched out)
+# There's no urgency on this given that it currently
+# breaks runtime use [0]
+# [0] https://github.com/mypaint/mypaint/issues/1107.
+
 src_install() {
distutils-r1_src_install
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/files/, media-gfx/mypaint/

2020-09-05 Thread Sam James
commit: 8048c4c0150f6761115dfef23be004e589f21fc3
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  6 03:50:31 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  6 03:50:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8048c4c0

media-gfx/mypaint: tidy ebuild

* Respect CFLAGS further (was injecting -O3 -g later on for
  some of the build)

* Tidy eclass usage

* Unrestrict tests (failing at present), reported upstream.

Bug: https://bugs.gentoo.org/739122
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../mypaint/files/mypaint-2.0.1-build-system.patch | 22 ++
 media-gfx/mypaint/mypaint-2.0.1.ebuild | 27 ++
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch 
b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
new file mode 100644
index 000..63a7a5bf75e
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-2.0.1-build-system.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 670df4d..703f9d2 100644
+--- a/setup.py
 b/setup.py
+@@ -471,9 +471,6 @@ class BuildExt (build_ext):
+ linkflags.extend([
+ "-O0",
+ ])
+-else:
+-linkflags.append("-O3")
+-ccflags.append("-O3")
+ 
+ return build_ext.build_extension(self, ext)
+ 
+@@ -869,7 +866,6 @@ def get_ext_modules():
+ '-Wno-write-strings',
+ '-D_POSIX_C_SOURCE=200809L',
+ "-DNO_TESTS",  # FIXME: we're building against shared libmypaint now
+-'-g',  # always include symbols, for profiling
+ ]
+ extra_link_args = []
+ 

diff --git a/media-gfx/mypaint/mypaint-2.0.1.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1.ebuild
index cb35547d5db..ac43f1303cf 100644
--- a/media-gfx/mypaint/mypaint-2.0.1.ebuild
+++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild
@@ -4,10 +4,11 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
 
-inherit desktop distutils-r1 gnome2-utils xdg xdg-utils
+inherit desktop distutils-r1 xdg
 
-DESCRIPTION="fast and easy graphics application for digital painters"
+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";
 
@@ -18,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
 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"
 
 BDEPEND="
+   ${PYTHON_DEPS}
dev-lang/swig
sys-devel/gettext
virtual/pkgconfig
@@ -42,9 +44,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-# Need to poke at failing tests
-# Dying on a numpy assert
-RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.1-build-system.patch"
+)
 
 distutils_enable_tests setup.py
 
@@ -60,18 +62,3 @@ src_install() {
fi
done
 }
-
-pkg_preinst() {
-   xdg_pkg_preinst
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_pkg_postrm
-   xdg_mimeinfo_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-08-16 Thread Sam James
commit: 2b51ea3a2a46efbfafb80a2d8a62f5d678d5f57d
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 16 19:48:42 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 16 19:48:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b51ea3a

media-gfx/mypaint: bump to 2.0.1

Bug: https://bugs.gentoo.org/735374
Bug: https://bugs.gentoo.org/708500
Bug: https://bugs.gentoo.org/701098
Closes: https://bugs.gentoo.org/701104
Closes: https://bugs.gentoo.org/701078
Closes: https://bugs.gentoo.org/662562
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint/Manifest |  1 +
 media-gfx/mypaint/mypaint-2.0.1.ebuild | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 190d7a1c477..4dd29e8dea2 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1 +1,2 @@
 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/mypaint-2.0.1.ebuild 
b/media-gfx/mypaint/mypaint-2.0.1.ebuild
new file mode 100644
index 000..cb35547d5db
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-2.0.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit desktop distutils-r1 gnome2-utils xdg xdg-utils
+
+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"
+
+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"
+
+BDEPEND="
+   dev-lang/swig
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+RDEPEND="
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   ')
+   >=dev-libs/json-c-0.11:=
+   gnome-base/librsvg
+   media-gfx/mypaint-brushes:2.0
+   media-libs/lcms:2
+   >=media-libs/libmypaint-1.5.0
+   media-libs/libpng:0=
+   sys-devel/gettext
+   sys-libs/libomp
+   x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+
+# Need to poke at failing tests
+# Dying on a numpy assert
+RESTRICT="test"
+
+distutils_enable_tests setup.py
+
+src_install() {
+   distutils-r1_src_install
+
+   newicon pixmaps/${PN}_logo.png ${PN}.png
+
+   local lang=
+   for lang in ${LANGS}; do
+   if ! has ${lang} ${LINGUAS}; then
+   rm -rf "${ED}"/usr/share/locale/${lang} || die
+   fi
+   done
+}
+
+pkg_preinst() {
+   xdg_pkg_preinst
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   xdg_icon_cache_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   xdg_mimeinfo_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-08-16 Thread Sam James
commit: b39dae554729c7948cf0a09abfb197a390b223b3
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 16 19:48:40 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 16 19:48:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39dae55

media-gfx/mypaint-brushes: bump to 2.0.2

Bug: https://bugs.gentoo.org/701098
Closes: https://bugs.gentoo.org/701100
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/Manifest  |  1 +
 .../mypaint-brushes/mypaint-brushes-2.0.2.ebuild| 21 +
 2 files changed, 22 insertions(+)

diff --git a/media-gfx/mypaint-brushes/Manifest 
b/media-gfx/mypaint-brushes/Manifest
index 1755ba55535..655508e6c20 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1 +1,2 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 
26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1
 SHA512 
f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
+DIST mypaint-brushes-2.0.2.tar.gz 1564926 BLAKE2B 
68a244f42cd5d9b1f96466f5409f0c7ebae257f6dbbfdc5139cb9fda86ee4898ce8fda2a35e96f3a65f41333f7f689edb85445bcd88dc0fc4b428d05ba2870fe
 SHA512 
89cecd9d78f4de84ada97a3e33fd67b86dfd259880da15c0ecbfad0fceb8c3b0e93790f3c0bff0cc375959bdf6921b01d1f3646e27c3f961715219a349017556

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
new file mode 100644
index 000..41606195eab
--- /dev/null
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Default MyPaint brushes"
+HOMEPAGE="https://github.com/mypaint/mypaint-brushes";
+SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="2.0" # due to pkgconfig name "mypaint-brushes-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
+
+src_prepare() {
+   eapply_user
+   eautoreconf
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-08-16 Thread Sam James
commit: 9cb51d6b99a206540b5dda942b01b253954932e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 16 19:48:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 16 19:48:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb51d6b

media-gfx/mypaint-brushes: mark ALLARCHES

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/mypaint-brushes/metadata.xml 
b/media-gfx/mypaint-brushes/metadata.xml
index 7a38bb90096..3c58a0219fb 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -2,4 +2,5 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

+   
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-08-11 Thread Sergei Trofimovich
commit: 81be929166961a08146c759b628de91dc108bf50
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Aug 11 07:17:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Aug 11 07:18:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81be9291

media-gfx/mypaint-brushes: keyworded 1.3.0-r1 for ppc

keyworded wrt bug #
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.2, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 024417f2664..c217baafef1 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-07-16 Thread Sam James
commit: 52f5fca9d9834a99c7da2d5b4849ca5936aa2487
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 17 00:25:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 17 00:25:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f5fca9

media-gfx/mypaint-brushes: arm keyworded (bug #685624)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index fa662603aa5..024417f2664 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-06-24 Thread Joonas Niilola
commit: b965483b1a1ec40d20b3c476987bbf8ec1bf9bdc
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri May 29 21:36:53 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 24 14:29:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b965483b

media-gfx/mypaint-brushes: update homepage and SRC_URI

Closes: https://bugs.gentoo.org/723784
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/16008
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 62c440f7445..fa662603aa5 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="Default MyPaint brushes"
-HOMEPAGE="https://github.com/Jehan/mypaint-brushes";
-SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> 
${P}.tar.gz"
+HOMEPAGE="https://github.com/mypaint/mypaint-brushes";
+SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/, media-gfx/mypaint/files/

2020-06-17 Thread Joonas Niilola
commit: c7e9406d31735f3eebac889d3326fa96f690317f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon May 25 08:09:56 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jun 17 17:00:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e9406d

media-gfx/mypaint: fix build failure

The added patch fixes build failure caused by missing boolean definition when 
building with new json-c versions.

Closes: https://bugs.gentoo.org/721388
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/15959
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/mypaint-1.2.1-json-c-boolean-defs.patch  | 34 ++
 media-gfx/mypaint/mypaint-1.2.1-r5.ebuild  |  3 ++
 2 files changed, 37 insertions(+)

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
new file mode 100644
index 000..caa2df4de6e
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-1.2.1-json-c-boolean-defs.patch
@@ -0,0 +1,34 @@
+commit a2b3f56b347c1897454eac1b5bdfe9d228302b80
+Author: Jehan 
+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 
+ #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
index ed192d39fbd..4c5a1859342 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -41,6 +41,9 @@ DEPEND="${RDEPEND}
dev-lang/swig
virtual/pkgconfig
 "
+PATCHES=(
+   "${FILESDIR}/${P}-json-c-boolean-defs.patch"
+)
 
 pkg_setup() {
python-single-r1_pkg_setup



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-05-24 Thread Jeroen Roovers
commit: cf3bc4809f7453df8ff0936ae816728f1a3f8985
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun May 24 12:30:09 2020 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun May 24 12:31:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3bc480

media-gfx/mypaint-brushes: Mark ~hppa

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jeroen Roovers  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 6b87f8055f3..62c440f7445 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-03-17 Thread Matt Turner
commit: aad90213db73a9b1dc7c13129045c93fb5ae0d9c
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 18 00:05:21 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 18 00:05:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aad90213

media-gfx/mypaint-brushes-1.3.0-r1: add ~alpha, bug 685624

Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 81cc30d41ad..64ae44b0d7f 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-02-09 Thread Michał Górny
commit: 658af902b69382fe012cdba3de81f53be1d34c04
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 15:04:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:26:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658af902

media-gfx/mypaint: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 .../{mypaint-1.2.1-r4.ebuild => mypaint-1.2.1-r5.ebuild} | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
similarity index 85%
rename from media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
rename to media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
index d30ef32ed43..a55e0059969 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -20,13 +20,15 @@ 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}
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   || (
-   dev-python/numpy-python2[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   )
-   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   $(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



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2020-01-26 Thread Sergei Trofimovich
commit: 82d5f270b41a2408ca99196ff27cccf5390d0d45
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jan 27 07:53:23 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan 27 07:54:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d5f270

media-gfx/mypaint-brushes: keyworded 1.3.0-r1 for ia64, bug #685624

Package-Manager: Portage-2.3.85, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 7c8f622060c..81cc30d41ad 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-01-22 Thread Michał Górny
commit: 53b758da15b80a7f1196d20d25a1062e7b5e7ccd
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 22 21:45:42 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 22 21:50:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b758da

media-gfx/mypaint: Revbump post dep change

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/mypaint/{mypaint-1.2.1-r3.ebuild => mypaint-1.2.1-r4.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
similarity index 100%
rename from media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
rename to media-gfx/mypaint/mypaint-1.2.1-r4.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2020-01-15 Thread Michał Górny
commit: 6239799ea9a410047ee324758ed6f5423626cbfc
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:09:42 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 06:09:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6239799e

media-gfx/mypaint: Permit numpy-python2

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index a557d74eb68..d30ef32ed43 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,10 @@ 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 z
 
 RDEPEND="${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   || (
+   dev-python/numpy-python2[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
>=dev-libs/json-c-0.11:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2019-12-26 Thread Georgy Yakovlev
commit: 3678dcf314b5b3b8b065b4fe8852453226c0241a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Dec 26 12:31:10 2019 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Dec 26 12:56:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3678dcf3

media-gfx/mypaint-brushes: keyword on ~ppc64

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 96c9e1aba15..7c8f622060c 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2019-07-24 Thread Aaron Bauman
commit: 67472a935724ce6da21c48a19b602ae7281cd4ed
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Jul 24 22:32:29 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jul 24 22:32:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67472a93

media-gfx/mypaint-brushes: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 3a39bb582fd..96c9e1aba15 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2019-05-08 Thread Mikle Kolyada
commit: 9d76d68d978ea1d1741084939a15a91b235072a8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed May  8 19:20:33 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed May  8 19:20:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d76d68d

media-gfx/mypaint-brushes: x86 stable wrt bug #681082

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index a54ba289fde..3a39bb582fd 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2019-04-25 Thread Pacho Ramos
commit: 7fdf4c073550cf286bd4fa81ed3a8c9177d59251
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Apr 25 22:31:17 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Apr 25 22:32:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fdf4c07

media-gfx/mypaint-brushes: amd64 stable, bug #681082

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 5cf603c4f1d..a54ba289fde 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> ${P}.
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2019-04-01 Thread Thomas Deutschmann
commit: 58f7ff882a3d15550d32ef0b8ece1805d5fb8999
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  1 17:15:53 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  1 17:15:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f7ff88

media-gfx/mypaint: x86 stable (bug #676552)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index d3156f6ad31..a557d74eb68 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -12,7 +12,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=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2019-03-17 Thread Agostino Sarubbo
commit: 0a322c0cea4d2b76c3e2682dc92f84d02db4c9e8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar 17 18:12:38 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar 17 18:12:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a322c0c

media-gfx/mypaint: amd64 stable wrt bug #676552

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
index 43afe4219d7..d3156f6ad31 100644
--- a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,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=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-10-13 Thread Pacho Ramos
commit: b02a5e3cda51170b7d63b2ad702dcdc85791bc82
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 13 17:10:25 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 13 17:35:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b02a5e3c

media-gfx/mypaint: Pull missing and automagic deps

Closes: https://bugs.gentoo.org/578580
Closes: https://bugs.gentoo.org/657482
Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/mypaint/mypaint-1.2.1-r3.ebuild | 81 +++
 1 file changed, 81 insertions(+)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
new file mode 100644
index 000..43afe4219d7
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 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}
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-python/protobuf-python[${PYTHON_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
+"
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-10-13 Thread Pacho Ramos
commit: cd19a9b4965e0f203857aae797c68bb295d326e9
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Oct 13 17:11:05 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Oct 13 17:35:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd19a9b4

media-gfx/mypaint: Drop old

Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/mypaint/Manifest|  1 -
 media-gfx/mypaint/mypaint-1.2.0.ebuild| 80 -
 media-gfx/mypaint/mypaint-1.2.1-r1.ebuild | 77 
 media-gfx/mypaint/mypaint-1.2.1-r2.ebuild | 78 
 media-gfx/mypaint/mypaint-1.2.1.ebuild| 85 ---
 5 files changed, 321 deletions(-)

diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 3ab82befc86..576ed9331ff 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,3 +1,2 @@
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 
4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9
 SHA512 
a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
-DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B 
fa0130a0b8ea6aba14f2994584f990c8c0cb4a784df2cbcec10a2be331c3f831dd0913e5b7d1f343ed90b9976b56fa8d55687c4421e11ea6377d2c87f218d59d
 SHA512 
b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 
2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c
 SHA512 
1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
deleted file mode 100644
index 0e430db29cc..000
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs 
python-single-r1
-
-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=""
-
-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="
-   dev-python/pygobject:3[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   >=dev-libs/json-c-0.11:=
-   media-libs/lcms:2
-   media-libs/libpng:0=
-   gnome-base/librsvg
-   ${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-   dev-lang/swig
-   virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   # multilib support
-   sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
-   SConstruct SConscript || die
-}
-
-src_compile() {
-   #workaround scons bug with locales. Bug #352700
-   export LANG="en_US.UTF-8"
-   tc-export CC CXX
-   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 -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   fdo-mime_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   fdo-mime_desktop_database_update
-}

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
deleted file mode 100644
index 8489c3857e4..000
--- a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
-
-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=""
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro r

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-08-08 Thread Sebastian Pipping
commit: 8e50130aa47c1b63991eb8057ad97ab2742e0a96
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Wed Aug  8 17:05:09 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Wed Aug  8 17:22:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e50130a

media-gfx/mypaint: Be robust to scons CXXFLAGS issues

Upstream scons bug:
https://github.com/SCons/scons/issues/3017

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-gfx/mypaint/mypaint-1.2.1-r2.ebuild | 78 +++
 1 file changed, 78 insertions(+)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
new file mode 100644
index 000..6dc9afe61a5
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic fdo-mime gnome2-utils scons-utils toolchain-funcs 
python-single-r1
+
+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=""
+
+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="
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   >=dev-libs/json-c-0.11:=
+   media-libs/lcms:2
+   >=media-libs/libmypaint-1.3.0
+   media-libs/libpng:0=
+   gnome-base/librsvg
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+   dev-lang/swig
+   virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+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() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-07-31 Thread Michał Górny
commit: bcd4cee81065125672f1903237e086c3f0db741f
Author: Guillaume Castagnino  xwing  info>
AuthorDate: Tue Jul 31 20:25:34 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jul 31 21:57:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd4cee8

media-gfx/mypaint: drop broken multilib handling

The current multilib handling is only partial as it moves libs to
$(get_libdir) but does not fix the python entry point to load librbries
from the correct directory. The bug is only triggered on SYMLINK_LIB
systems.
As this package will never be installed for multiple libdirs, drop this
and stick to upstream.

Closes: https://bugs.gentoo.org/648960
Closes: https://github.com/gentoo/gentoo/pull/9337
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-gfx/mypaint/mypaint-1.2.1-r1.ebuild | 77 +++
 1 file changed, 77 insertions(+)

diff --git a/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
new file mode 100644
index 000..8489c3857e4
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils scons-utils toolchain-funcs python-single-r1
+
+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=""
+
+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="
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   >=dev-libs/json-c-0.11:=
+   media-libs/lcms:2
+   >=media-libs/libmypaint-1.3.0
+   media-libs/libpng:0=
+   gnome-base/librsvg
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+   dev-lang/swig
+   virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+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
+   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() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2018-07-08 Thread Sebastian Pipping
commit: 0cf1b86929c247db1a286705755338560f88a2fd
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jul  8 18:30:24 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jul  8 18:30:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf1b869

media-gfx/mypaint-brushes: Address broken README symlink

Closes: https://bugs.gentoo.org/659908
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{mypaint-brushes-1.3.0.ebuild => mypaint-brushes-1.3.0-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
similarity index 88%
rename from media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
rename to media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index 67caf0132e3..5cf603c4f1d 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DOCS=( AUTHORS NEWS README )  # to exclude README.md
+DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
 
 src_prepare() {
eapply_user



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-04-30 Thread Mike Gilbert
commit: 4a53048eefb2067ac335587583c05b5807713a43
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Mon Apr 30 15:03:20 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 30 15:39:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a53048e

media-gfx/mypaint: Clean dev-libs/protobuf dependencies.

 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 5 +
 media-gfx/mypaint/mypaint-1.2.0.ebuild| 5 +
 media-gfx/mypaint/mypaint-1.2.1.ebuild| 5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index 5cdf4d15a8f..8c81ae60984 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
dev-python/pygtk:2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index 4a465a64cc5..0e430db29cc 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index ee5a95e57d0..b2c2e285156 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   || (
-   dev-python/protobuf-python[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
-   )
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
>=media-libs/libmypaint-1.3.0



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint-brushes/

2018-01-07 Thread Sebastian Pipping
commit: 0f3bc67c8584766f78cf970a451ba45f228ed2f8
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Mon Jan  8 00:24:57 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Mon Jan  8 00:26:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3bc67c

media-gfx/mypaint-brushes: 1.3.0, new package

Bug: https://bugs.gentoo.org/643416
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/mypaint-brushes/Manifest |  1 +
 media-gfx/mypaint-brushes/metadata.xml |  7 +++
 .../mypaint-brushes/mypaint-brushes-1.3.0.ebuild   | 22 ++
 3 files changed, 30 insertions(+)

diff --git a/media-gfx/mypaint-brushes/Manifest 
b/media-gfx/mypaint-brushes/Manifest
new file mode 100644
index 000..1755ba55535
--- /dev/null
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -0,0 +1 @@
+DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 
26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1
 SHA512 
f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414

diff --git a/media-gfx/mypaint-brushes/metadata.xml 
b/media-gfx/mypaint-brushes/metadata.xml
new file mode 100644
index 000..82b7b795379
--- /dev/null
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -0,0 +1,7 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   sp...@gentoo.org
+   
+

diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild 
b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
new file mode 100644
index 000..67caf0132e3
--- /dev/null
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Default MyPaint brushes"
+HOMEPAGE="https://github.com/Jehan/mypaint-brushes";
+SRC_URI="https://github.com/Jehan/mypaint-brushes/archive/v1.3.0.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS=( AUTHORS NEWS README )  # to exclude README.md
+
+src_prepare() {
+   eapply_user
+   eautoreconf
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2018-01-05 Thread Ulrich Müller
commit: 9dc02d2e9ba2246988cb81e75e588e5b3fb2ae45
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan  5 20:45:46 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan  5 22:00:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc02d2e

media-gfx/mypaint: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 5 +
 media-gfx/mypaint/mypaint-1.2.0.ebuild| 5 +
 media-gfx/mypaint/mypaint-1.2.1.ebuild| 5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index e0a166f92e9..5cdf4d15a8f 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,9 +17,6 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 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"
-for x in ${LANGS}; do
-   IUSE+="linguas_${x} "
-done
 
 RDEPEND="
dev-python/pygtk:2[${PYTHON_USEDEP}]

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index f95ce3047df..4a465a64cc5 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,9 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 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"
-for x in ${LANGS}; do
-   IUSE+="linguas_${x} "
-done
 
 RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]

diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index 9b65292a4a4..ee5a95e57d0 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,9 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 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"
-for x in ${LANGS}; do
-   IUSE+="linguas_${x} "
-done
 
 RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2017-09-21 Thread Mike Gilbert
commit: 1ef264f46c776ec2913a5bea05bd1563c73e6d7b
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Sep 21 04:54:55 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Sep 21 21:03:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef264f4

media-gfx/mypaint: Depend on || ( dev-python/protobuf-python 
dev-libs/protobuf[python] ).

 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 5 -
 media-gfx/mypaint/mypaint-1.2.0.ebuild| 7 +--
 media-gfx/mypaint/mypaint-1.2.1.ebuild| 5 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index 0bcf8d438b8..e0a166f92e9 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
dev-python/pygtk:2[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index 9405f147f88..f95ce3047df 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,10 @@ RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
media-libs/libpng:0=

diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index 616f7a56052..9b65292a4a4 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -25,7 +25,10 @@ RDEPEND="
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   || (
+   dev-python/protobuf-python[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   )
>=dev-libs/json-c-0.11:=
media-libs/lcms:2
>=media-libs/libmypaint-1.3.0



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2017-01-21 Thread Lars Wendler
commit: 762049d5a2ff59532a3917e639c2699c30b69f4b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Jan 22 00:18:28 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan 22 00:18:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762049d5

media-gfx/mypaint: Bump to version 1.2.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/mypaint/mypaint-1.2.1.ebuild | 89 ++
 1 file changed, 89 insertions(+)

diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild 
b/media-gfx/mypaint/mypaint-1.2.1.ebuild
new file mode 100644
index ..b88de18
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs 
python-single-r1
+
+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=""
+
+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"
+for x in ${LANGS}; do
+   IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   >=dev-libs/json-c-0.11:=
+   media-libs/lcms:2
+   >=media-libs/libmypaint-1.3.0
+   media-libs/libpng:0=
+   gnome-base/librsvg
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+   dev-lang/swig
+   virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   # multilib support
+   sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
+   SConstruct SConscript || die
+}
+
+src_compile() {
+   #workaround scons bug with locales. Bug #352700
+   export LANG="en_US.UTF-8"
+   tc-export CC CXX
+   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() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/, media-libs/libmypaint/

2017-01-21 Thread Lars Wendler
commit: dfb47abac5677162a891c20873f4f523b56994e5
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jan 21 23:48:15 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Jan 22 00:14:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb47aba

media-libs/libmypaint: Bump to version 1.3.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/mypaint/Manifest|  1 +
 media-libs/libmypaint/Manifest|  1 +
 media-libs/libmypaint/libmypaint-1.3.0.ebuild | 59 +++
 3 files changed, 61 insertions(+)

diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index e993409..7a3f7e9 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,2 +1,3 @@
 DIST mypaint-1.1.0.tar.bz2 37416388 SHA256 
780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 SHA512 
a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 WHIRLPOOL 
bfd7356ad393dd85b91ccc010b5d0be23a6d82a33866edade0ef6eb739a1cbdb6823d7bffbdc943f96cdac9059abb7ac1edacf31d4ac2cd3871444594e23557a
 DIST mypaint-1.2.0.tar.xz 37895196 SHA256 
cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2 SHA512 
b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 WHIRLPOOL 
aee266e09258cbf23bf1fc8e78f0d717ecf5a2a1c03898193901b24e38266922d575744a01f4a31aa4fe6da566d05f246b16cad690d21f40a9ff90ad1596cc49
+DIST mypaint-1.2.1.tar.xz 37897196 SHA256 
ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7 SHA512 
1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
 WHIRLPOOL 
5af6ec271d7844c45f3af0bca8dbc7ae4ff46416fd43a7760ccc4bc79af415e993107d9ee9cb9fadc4c5feea3d55917f6c0c8052134f4642694706d4606b9586

diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index bf753e8..1f51ab5 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1 +1,2 @@
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 SHA256 
d39138b21b9057376138e64f09f4c4741a14a7baed71d6f0ba9bc2504d69f9ee SHA512 
ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 WHIRLPOOL 
af50526090b0613d3eca89dd8a6773f93889d2b966263e1497c8008bf2ef73c491559ddb5c14a3bfa9c4d407755780b4a9d54a2f6a572eedf2a9415d6ce4ef45
+DIST libmypaint-1.3.0.tar.xz 438160 SHA256 
6a07d9d57fea60f68d218a953ce91b168975a003db24de6ac01ad69dcc94a671 SHA512 
553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
 WHIRLPOOL 
ea0abb1e0a57d430d1b3aaa0701ef577dc529b6aa3ae3423dc924bcd59aaba06a98c1d2b26279d545049ce74f9bb00f2f7e62533e8ac45ea3cf4dd109fec

diff --git a/media-libs/libmypaint/libmypaint-1.3.0.ebuild 
b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
new file mode 100644
index ..e1c204c
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.3.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint";
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz";
+
+LICENSE="ISC"
+SLOT="0/0"  # first soname component for subslot
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="gegl introspection nls openmp"
+
+CDEPEND="
+   dev-libs/glib:2
+   dev-libs/json-c
+   gegl? (
+   media-libs/babl
+   media-libs/gegl:0.3[introspection?]
+   )
+   introspection? ( >=dev-libs/gobject-introspection-1.32 )
+   openmp? ( sys-devel/gcc:*[openmp] )
+   nls? ( sys-devel/gettext )
+   "
+DEPEND="${CDEPEND}
+   ${PYTHON_DEPS}
+   nls? ( dev-util/intltool )
+   "
+RDEPEND="${CDEPEND}
+   !

[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/files/

2017-01-04 Thread David Seifert
commit: aa9319e56ca9395856305ec64174d5d6ec03be42
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Dec 27 20:01:48 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan  4 10:14:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9319e5

media-gfx/mypaint: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3255

 media-gfx/mypaint/files/mypaint-0.9.0-gentoo.patch | 26 --
 1 file changed, 26 deletions(-)

diff --git a/media-gfx/mypaint/files/mypaint-0.9.0-gentoo.patch 
b/media-gfx/mypaint/files/mypaint-0.9.0-gentoo.patch
deleted file mode 100644
index 329c8a9..
--- a/media-gfx/mypaint/files/mypaint-0.9.0-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mypaint-0.9.0/SConstruct
-===
 mypaint-0.9.0.orig/SConstruct
-+++ mypaint-0.9.0/SConstruct
-@@ -64,6 +64,21 @@ if env['debug']:
- env.Append(CPPDEFINES='HEAVY_DEBUG')
- env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
- 
-+# Respect cxxflags,ldflags and cxx
-+# Code found on
-+# http://http://dev.gentoo.org/~vapier/scons-blows.txt
-+import SCons.Util
-+if os.environ.has_key('CC'):
-+  env['CC'] = os.environ['CC']
-+if os.environ.has_key('CFLAGS'):
-+  env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXX'):
-+  env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+  env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+  env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
- Export('env')
- module = SConscript('lib/SConscript')
- SConscript('brushlib/SConscript')



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2016-12-20 Thread Tobias Klausmann
commit: 4a49b2bcef0d41dcdcfd9539c75401378b58bca4
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 15:51:18 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 15:51:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a49b2bc

media-gfx/mypaint-1.1.0-r2: stable on amd64

Gentoo-Bug: 593554

 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild 
b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index ed9dcf1..5823939 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 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"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/mypaint/

2016-03-06 Thread Markos Chandras
commit: 2f27d2fa2bc273fb5e9a8eb695fcd4d5dc33bf6f
Author: Markos Chandras  gentoo  org>
AuthorDate: Sun Mar  6 11:34:32 2016 +
Commit: Markos Chandras  gentoo  org>
CommitDate: Sun Mar  6 11:41:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f27d2fa

media-gfx/mypaint: Version bump. Ebuild by darkstalker  
gmail.com>. Bug #572300

Package-Manager: portage-2.2.27

 media-gfx/mypaint/Manifest |  1 +
 media-gfx/mypaint/mypaint-1.2.0.ebuild | 84 ++
 2 files changed, 85 insertions(+)

diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index eae8bb3..d2c564c 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,2 +1,3 @@
 DIST mypaint-1.0.0.tar.bz2 36748957 SHA256 
ced440ec0307e29bfe4f612604fe27ec9bfaea3f4f9c8019ffaa50ef12dc7131 SHA512 
91434f6d352d4f5dde3d919772a678a17f15a6d2914fb2377b40e4a0fea042e3c96b5618e1864eacdbfa52f449be03062da2ecb8ec08bae168e3a12904047bf2
 WHIRLPOOL 
a4693b6436485126a033dacb014586e85c448863bbb14acb30aff739a96d8d2abdd2c920ad3e9a5be7790d18e13e4a8e15ebcde85fafcaafe9d2a901b53d5f52
 DIST mypaint-1.1.0.tar.bz2 37416388 SHA256 
780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 SHA512 
a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 WHIRLPOOL 
bfd7356ad393dd85b91ccc010b5d0be23a6d82a33866edade0ef6eb739a1cbdb6823d7bffbdc943f96cdac9059abb7ac1edacf31d4ac2cd3871444594e23557a
+DIST mypaint-1.2.0.tar.xz 37895196 SHA256 
cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2 SHA512 
b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 WHIRLPOOL 
aee266e09258cbf23bf1fc8e78f0d717ecf5a2a1c03898193901b24e38266922d575744a01f4a31aa4fe6da566d05f246b16cad690d21f40a9ff90ad1596cc49

diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild 
b/media-gfx/mypaint/mypaint-1.2.0.ebuild
new file mode 100644
index 000..f0f0f97
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs 
python-single-r1
+
+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=""
+
+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"
+for x in ${LANGS}; do
+   IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+   dev-python/pygobject:3[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+   dev-libs/protobuf[python,${PYTHON_USEDEP}]
+   >=dev-libs/json-c-0.11:=
+   media-libs/lcms:2
+   media-libs/libpng:0=
+   gnome-base/librsvg
+   ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+   dev-lang/swig
+   virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   # multilib support
+   sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
+   SConstruct SConscript || die
+}
+
+src_compile() {
+   #workaround scons bug with locales. Bug #352700
+   export LANG="en_US.UTF-8"
+   tc-export CC CXX
+   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 -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   fdo-mime_desktop_database_update
+}