Release x11-terms/terminator/terminator-1.92-r1.ebuild

2 files changed, 10 insertions, 8 deletions

diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 9c2efa6..d5c53b0 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -2,5 +2,5 @@ AUX terminator-1.91-desktop.patch 355 BLAKE2B c8c1488779116eee3e1c41440e04409381
 AUX terminator-1.91-without-icon-cache.patch 567 BLAKE2B 72ebaa0eaee27491d0f93982b84c56009fd327108cb8e0b3a8e88a95a781dc324f11f6f8290e7082919a7753a1419777e7e028bafcc1437cc62e51eda465f3f3 SHA512 36f5f08f1724b6cd4bd43d37a27e5161feec66f03a9dd1de973e50eb557f5fe171329903a8074343b5fc816bcaa0fec2642060001c727c35792680a8007a7c50
 AUX terminator-1.92-single-tab.patch 1024 BLAKE2B 4611e9275573233bb3c9f618f13348fbc36f880e4a9e239a8d1ee20e2795e90bdbb41c61f5126e166f39008d7b9d917708bc66a73c0fe1445145e74da43b967d SHA512 fda7d93d015d9a8a7847f9ebff222c15372437763b823194e5502be0d592d1ecad54f9050464bdfbda786fcbcc0e9e9f1feac5ee3b2097b3823e3096a31d3be4
 DIST terminator-1.92.tar.gz 910613 BLAKE2B d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63 SHA512 9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
-EBUILD terminator-1.92.ebuild 1380 BLAKE2B fa520b244a25e89ba98599257023caa1607444fa543c9c467edfb23af9fbdaa2299ccba28d921042ac827ae11f38e98c5c9f752c72491e65836d15f4078847db SHA512 023c77d76adadcc427cc961596f81d05def1ca3be023ff6d856d359809eab457a4f5c36e27d5171b8c57d6adbc86d33cc253abcdca069c2489ff1e13dad87797
+EBUILD terminator-1.92-r1.ebuild 1481 BLAKE2B 6c6f69263e2262a03bf604228b801c4f30d95b19a749fb353e8b74948245b1ea4fe97492958bf54fe8ae424b79ae8f7a1516e94408908e7c67684163812da609 SHA512 da1cddac602b19c354a58b1394f2d279490e9428b2911fc827dac315de5c645a1cc6109d083f9ee2f0e730e3e8f5d8e7aae5fc58d8abc6c3d42ecd38c0bd97a2
 MISC metadata.xml 834 BLAKE2B 59ff943ca3ecfe92e3029c6573d69fb4e9ed09e0a0bcec160545dabf12baace6cdb7424920fafb6f90e0d7d2c2466978fe60b2aa3058936beca7b3b7a583d7e8 SHA512 1a1e181b6cb668239ff8973545b7a8d13908c892c2106bf702f9e8d4d22530cb812c2af57ba93ef41be2ddc566c9ff48588597210cf90ea001e5c7a10075f341
diff --git a/x11-terms/terminator/terminator-1.92.ebuild b/x11-terms/terminator/terminator-1.92-r1.ebuild
index a0deaff..f9e10a2 100644
--- a/x11-terms/terminator/terminator-1.92.ebuild
+++ b/x11-terms/terminator/terminator-1.92-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="no"
 inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="Multiple GNOME terminals in one window (patched by sgs)"
@@ -12,9 +13,8 @@ SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="dbus +libnotify test"
-RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="dbus +libnotify"
 
 RDEPEND="
         >=dev-libs/glib-2.32:2
@@ -25,17 +25,19 @@ RDEPEND="
         dev-python/pygobject:3[${PYTHON_USEDEP}]
         >=x11-libs/gtk+-3.16:3
         x11-libs/vte:2.91[introspection]
-        dbus? ( sys-apps/dbus )
+        dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
         libnotify? ( x11-libs/libnotify[introspection] )
 "
 BDEPEND="
         dev-util/intltool
-        test? ( ${RDEPEND} )
 "
+distutils_enable_tests setup.py
 
 PATCHES=(
         "${FILESDIR}"/terminator-1.91-without-icon-cache.patch
         "${FILESDIR}"/terminator-1.91-desktop.patch
+        "${FILESDIR}"/terminator-1.92-make-tests-fail.patch
+        "${FILESDIR}"/terminator-1.92-metainfo.patch
         "${FILESDIR}"/${P}-single-tab.patch
 )
 
@@ -44,8 +46,8 @@ src_prepare() {
         distutils-r1_src_prepare
 }
 
-python_test() {
-        virtx esetup.py test || die "tests fail with ${EPYTHON}"
+src_test() {
+        virtx distutils-r1_src_test
 }
 
 pkg_postinst() {