diff --git a/app-forensics/pdfwalker/Manifest b/app-forensics/pdfwalker/Manifest
new file mode 100644
index 000000000..a30cc9939
--- /dev/null
+++ b/app-forensics/pdfwalker/Manifest
@@ -0,0 +1 @@
+DIST pdfwalker-1.0.0.gem 32768 BLAKE2B f207e31a272425af9811e5e00e719fd231ff1d4c5bc5f1db61227a46e7952a3d0a03db84f212383e5e9cf02256f30eab86ffab61a5126fa0cfcd0c63c9914bf2 SHA512 7812db544572905337054184b0a3f05d9a99b2a7264f834695c4e5a9f36c1f04f7ae0b8ce7706f681586c51859891505f70fe136ba2e556c599bbf3cb09fc383
diff --git a/app-forensics/pdfwalker/metadata.xml b/app-forensics/pdfwalker/metadata.xml
new file mode 100644
index 000000000..ebc718e70
--- /dev/null
+++ b/app-forensics/pdfwalker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-forensics/pdfwalker/pdfwalker-1.0.0-r1.ebuild b/app-forensics/pdfwalker/pdfwalker-1.0.0-r1.ebuild
new file mode 100644
index 000000000..84cf228d1
--- /dev/null
+++ b/app-forensics/pdfwalker/pdfwalker-1.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25"
+
+inherit desktop ruby-fakegem xdg-utils
+
+DESCRIPTION="A GTK frontend to explore the internals of a PDF document with Origami"
+HOMEPAGE="https://github.com/gdelugre/pdfwalker"
+LICENSE="GPL-3"
+SLOT=0
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+ruby_add_rdepend "
+	app-forensics/origami-pdf
+	dev-ruby/colorize
+	dev-ruby/ruby-gtk2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	make_desktop_entry "${PN}" \
+		"PDFWalker" \
+		"application-pdf" \
+		"Utility;Office"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-forensics/pdfwalker/pdfwalker-1.0.0.ebuild b/app-forensics/pdfwalker/pdfwalker-1.0.0.ebuild
deleted file mode 100644
index 34c39844d..000000000
--- a/app-forensics/pdfwalker/pdfwalker-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23"
-
-RUBY_FAKEGEM_NAME="origami"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="PDFWalker is a GTK frontend to explore the internals of a PDF document with Origami"
-HOMEPAGE="https://github.com/gdelugre/pdfwalker"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-RESTRICT="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-ruby_add_rdepend ">=app-forensics/origami-pdf-2.1.0
-					=dev-ruby/ruby-gtk2-3.1*"
-#					dev-ruby/ruby-gtkhex"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#Gentoo bug, remove links to directories
-	rm "${ED}usr/bin"/shell
-	rm "${ED}usr/bin"/gui
-	rm "${ED}usr/bin"/config
-
-}
diff --git a/dev-ruby/ruby-gtkhex/Manifest b/dev-ruby/ruby-gtkhex/Manifest
new file mode 100644
index 000000000..136b33548
--- /dev/null
+++ b/dev-ruby/ruby-gtkhex/Manifest
@@ -0,0 +1 @@
+DIST ruby-gtkhex-0.2.0.gem 23552 BLAKE2B db0a05f544dff83adc5042799374e69fd0d7c7319ce88c090cd0bed9797c70a9ab8ac71035656a92e6b1e7b723dc6c19c4eb7beb7bbb7bc0adaf1973f4fa9f3a SHA512 316673eb5a8f930ae6494df9bf78fc053f823b781b40372fe24b62e77f40358cbedb4d1e38cd8a20731c92a43de77241405075932d4e33f5fc333503026b5334
diff --git a/dev-ruby/ruby-gtkhex/metadata.xml b/dev-ruby/ruby-gtkhex/metadata.xml
new file mode 100644
index 000000000..ebc718e70
--- /dev/null
+++ b/dev-ruby/ruby-gtkhex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/ruby-gtkhex/ruby-gtkhex-0.2.0.ebuild b/dev-ruby/ruby-gtkhex/ruby-gtkhex-0.2.0.ebuild
new file mode 100644
index 000000000..a6fcbb0a0
--- /dev/null
+++ b/dev-ruby/ruby-gtkhex/ruby-gtkhex-0.2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A hexadecimal widget using gtk2, inspired by GHex"
+HOMEPAGE="https://github.com/gdelugre/ruby-gtkhex"
+LICENSE="LGPL-3"
+SLOT=0
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/ruby-gtk2"