diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index a7b563e12d..05cba21f29 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1 +1,2 @@
 DIST azpainter-2.1.6.tar.xz 747464 BLAKE2B a3d242cb3fa881c761711595686362924e55125f7b33def30949c321b6a23ccb2bed1b4d3df0b7e73ebd4a5f6a75e7c4b99c4116d5e6af62518d03fc92e6de81 SHA512 94ebe3ad8df7148d73a6f73fe383df2d8b9203aa67ef77ebcc68c8fa937ba134315ca757693c5ad33bdf79afd90915779a3086d24f5a81ab767eced50d4d97d9
+DIST azpainter-2.1.7b4.tar.xz 758652 BLAKE2B 9181d68c444a84031b8dd02622a4a04092ce752d6a066cf7763a1678e9a69eae6c73331039199e836a9ab28bc5667f4bc3a72531ea96f82805186d143eb8bf8c SHA512 fbee61033cb43cbd9cc769687a962c685765239995c82224ad024cced92841f629e22982d94eed7113615a043611080d8e1a38918932f9d2f0b9e540a36f67b2
diff --git a/media-gfx/azpainter/azpainter-2.1.7_beta4.ebuild b/media-gfx/azpainter/azpainter-2.1.7_beta4.ebuild
new file mode 100644
index 0000000000..34f69bdc81
--- /dev/null
+++ b/media-gfx/azpainter/azpainter-2.1.7_beta4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P//_beta/b}"
+
+DESCRIPTION="Full color painting software for Linux for illustration drawing"
+HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html"
+SRC_URI="http://azsky2.html.xdomain.jp/arc/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXi:=
+	media-libs/freetype:=
+	media-libs/fontconfig:=
+	sys-libs/zlib:=
+	media-libs/libpng:=
+	media-libs/libjpeg-turbo:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sh ./configure --prefix=/usr CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/net-misc/kristall/kristall-0.3.ebuild b/net-misc/kristall/kristall-0.3.ebuild
index c3b48ce29c..f668cbd38d 100644
--- a/net-misc/kristall/kristall-0.3.ebuild
+++ b/net-misc/kristall/kristall-0.3.ebuild
@@ -7,11 +7,17 @@ inherit qmake-utils xdg
 
 DESCRIPTION="Visual cross-platform gemini browser"
 HOMEPAGE="https://github.com/MasterQ32/kristall"
-SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git"
+else
+	SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
 
 RDEPEND="
 	dev-qt/qtmultimedia:5[widgets]
@@ -20,13 +26,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	# qmake overwrites Makefile but it is needed for installing.
-	mv Makefile{,.tmp} || die
-	eqmake5 src/kristall.pro
+src_compile() {
+	emake
 }
 
 src_install() {
-	mv Makefile{.tmp,} || die
-	INSTALL="install -D" PREFIX="${EPREFIX}/usr" default
+	emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-9999.ebuild
new file mode 100644
index 0000000000..f668cbd38d
--- /dev/null
+++ b/net-misc/kristall/kristall-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Visual cross-platform gemini browser"
+HOMEPAGE="https://github.com/MasterQ32/kristall"
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git"
+else
+	SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-qt/qtmultimedia:5[widgets]
+	dev-qt/qtsvg:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+}