--- mypaint-1.2.1-r3.ebuild	2019-04-01 19:39:40.000000000 +0200
+++ mypaint-2.0.0_alpha13.ebuild	2019-11-24 22:12:28.322355455 +0100
@@ -1,70 +1,73 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=yes
 
-inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
+inherit flag-o-matic gnome2-utils toolchain-funcs 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"
+if [[ ${PV} != ${PV/beta/} ]] || [[ ${PV} != ${PV/alpha/} ]]; then
+	MYPAINT_PV=$( ver_rs 3 - 4 .)
+else
+	MYPAINT_PV=${PV}
+fi
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MYPAINT_PV}.tar.gz
+	->
+	${P}.tar.gz"
+
+LICENSE="CC0-1.0 GPL-2 GPL-2+ GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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"
+LANGS="	af ar as ast az be bg bn br brx bs ca ca@valencia ckb cs csb da de dz el
+	en_CA en_GB eo es et eu fa fi fr fy ga gl gu he hi hr hu hy id is it ja
+	ka kab kk kn ko lt lv mai ml mn mr ms nb nl nn_NO oc pa pl pt pt_BR ro
+	ru se sk sl sq sr sr@latin sv ta te tg th tr uk uz vi wa zh_CN zh_HK
+	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/libmypaint:2.0
+	media-gfx/mypaint-brushes:2.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
-}
+	"
+S=${WORKDIR}/${PN}-${MYPAINT_PV}
 
-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_prepare() {
+	distutils-r1_src_prepare
+	sed -i "s|lib/mypaint|$(get_libdir)/mypaint|g" mypaint.py
+	sed -i "s|'lib', 'mypaint'|'$(get_libdir)', 'mypaint'|" mypaint.py
 }
 
-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
+src_install() {
+	distutils-r1_src_install
+	if [[ "$(get_libdir)" != "lib" ]]; then
+		einfo "Moving /usr/lib to /usr/$(get_libdir)"
+		mv "${D}/usr/lib" "${D}/usr/$(get_libdir)" || die '${D}/usr/lib doesn''t exist?'
+	fi
 }
 
 pkg_preinst() {
 	xdg_pkg_preinst
 	gnome2_icon_savelist