gentoo resync : 16.09.2020

3 files changed, 33 insertions, 68 deletions

diff --git a/x11-terms/roxterm/Manifest b/x11-terms/roxterm/Manifest
index e51dd905ee89..56a4114ac601 100644
--- a/x11-terms/roxterm/Manifest
+++ b/x11-terms/roxterm/Manifest
@@ -1,5 +1,5 @@
-DIST roxterm-3.1.5.tar.xz 309892 BLAKE2B 11ede6d870a2aa96bfff4974ab33ac4814802f6b08e684f9367e3e268adc113be2b0c92eb337447f8d20a687c7be5f414854cf1f75831ef6c38f4d78d3897317 SHA512 f07989331b1cf915e94582bfceff8cb87f20613eb272ccc502fb49c7508a1330cfa3b137c59f300b8541595aed541867c1b0aad36809e7e9a326f7119fde2acd
 DIST roxterm-3.9.3.tar.gz 527056 BLAKE2B 442b9ee2605dd2b5e817ec792cab718eeed7aeacdd5a34582df780ee7fb970299985a49fda146c56dfa242d3a34098673fdcdbf7af96f1ab9e7c4340f08d78d9 SHA512 d3e29575a9985c8c967d9fa2b73d7dfd45cc13334b29c759219a90a3e0299c4d253a15e969be8c85c9aa12b1fddd390830fdb3ae99fea49d37a849e9881bd087
-EBUILD roxterm-3.1.5-r1.ebuild 1330 BLAKE2B 065b8390a3e504329a86773d9303b2bec008e36428d39fd5062b136878dc374e210e01babb6750968f5d430c70644bf86699601f2d13747e3af70c6d4887b2d9 SHA512 af40d002452814c561bae1116beaf7b7de85347e0ec57bce723628ba6420fe64c76833d487b1c06747d96e7bbbaf47e3347102b673c39984bd4fa1215aad24d8
+DIST roxterm-3.9.4.tar.gz 527450 BLAKE2B 0041ce4a026eddd2b78c7e9aed650f21c5ed75903c7903ef79950e95a92045fdc951b23f199173846439b39712be72b0325fba5c2be92f95ee5a121b112977bb SHA512 42f48e56b2f8017fc3ec249ed1e6d42aadc171ab854f948a7b686c36d9b1c5202f7879dab66a04f2a4e0438b09ef0eed69da72eac0cf651c205d9b4724403759
 EBUILD roxterm-3.9.3.ebuild 735 BLAKE2B eaad5b3287da4c87904da51ad48fef8653049ac798ebde2b934252d92132b659c1f0efe58e7c95b26cad8f8979da1d4e87069c91b2fe779faea6ad85f9d57eb0 SHA512 505fbdb617db79b8e59b8f405dd651a2a99dd0389ab5bb58285d335295f15a444bdaab78c37d407d7acbf0d937a6aa233d7067366cc0afc77a98c039ae1ef3ea
+EBUILD roxterm-3.9.4.ebuild 717 BLAKE2B de9c31470e2f6a3006e6a1bedb0b1db84bb5181eb0f73228cd2c0b3389a1ce03766a33878ed812e0ac403fade50f970c5a85ee3254439ca744db63d152ee9a5c SHA512 5c61660d9a0561ec4bcf9d0aabbb4cbc73c202daa5d096b5aa6706663fa8fca35bfe9616f4afbad778d4c5a2783f825a1d49b768151f2e2587f2ec8e507e5677
 MISC metadata.xml 472 BLAKE2B 90826818bb97e1be487ba8f3a3563e06740b0dd133f9785af4f8d37659fe2db305934f72bd7120b19f28de4be7e29566a937e2f4b171b143098ad8063b462aea SHA512 ee65349209ec6c4c5755fea00a37a5f7c671c425bf7804727446b7a59e7069fdcb23e36234b48edaa539ee82ee78574611a174b085f4e9f8ad9532ce93673e6c
diff --git a/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild b/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
deleted file mode 100644
index ee27b9972b68..000000000000
--- a/x11-terms/roxterm/roxterm-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-inherit gnome2-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
-HOMEPAGE="http://roxterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roxterm/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/vte:2.91
-	!x11-terms/roxterm:0"
-# slotted versions of roxterm need block one another due to file collisions. #565288
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxslt
-	dev-python/lockfile
-	virtual/pkgconfig
-	virtual/imagemagick-tools
-	nls? ( app-text/po4a sys-devel/gettext )"
-
-src_configure() {
-	local myconf=(
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}"
-		LDFLAGS="${LDFLAGS}"
-		--prefix=/usr
-		--docdir="/usr/share/doc/${PF}"
-		--destdir="${D}"
-	)
-
-	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
-	./mscript.py configure "${myconf[@]}"
-}
-
-src_compile() {
-	./mscript.py build
-}
-
-src_install() {
-	./mscript.py install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-terms/roxterm/roxterm-3.9.4.ebuild b/x11-terms/roxterm/roxterm-3.9.4.ebuild
new file mode 100644
index 000000000000..62aa1b550f3c
--- /dev/null
+++ b/x11-terms/roxterm/roxterm-3.9.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="https://github.com/realh/roxterm"
+SRC_URI="https://github.com/realh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/dbus-glib
+	dev-libs/glib:2
+	dev-libs/libpcre2
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/pango
+	x11-libs/vte:2.91[vanilla]"
+# vanilla vte due to https://github.com/realh/roxterm/issues/222
+DEPEND="${RDEPEND}
+	dev-libs/libxslt"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	cmake_src_prepare
+}