[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tktray/

[Andreas Sturmlechner]

commit:     6fe8bf9da54c13357bfa31345dcd41cb62be63b2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 18:11:50 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 19:59:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe8bf9d

dev-tcltk/tktray: EAPI-7 bump, drop useless virtualx and src_test()

Xemake did nothing at all in this case and by that hid the fact that tests
are indeed (still) impossible to run for us, see also the ancient bug.

Bug: https://bugs.gentoo.org/284919
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-tcltk/tktray/tktray-1.3.9.ebuild | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/dev-tcltk/tktray/tktray-1.3.9.ebuild b/dev-tcltk/tktray/tktray-1.3.9.ebuild
index 3cb9eb4b38a..cdfa53b8e12 100644
--- a/dev-tcltk/tktray/tktray-1.3.9.ebuild
+++ b/dev-tcltk/tktray/tktray-1.3.9.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils virtualx
-
-MY_P="${PN}${PV}"
+EAPI=7
 
 DESCRIPTION="System Tray Icon Support for Tk on X11"
 HOMEPAGE="https://code.google.com/p/tktray/"
-SRC_URI="https://tktray.googlecode.com/files/${MY_P}.tar.gz"
+SRC_URI="https://tktray.googlecode.com/files/${PN}${PV}.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
 
 LICENSE="tcltk"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="debug threads test"
-RESTRICT="!test? ( test )"
+IUSE="debug threads"
+
+# tests need actual X server with user interaction, bug #284919
+RESTRICT="test"
 
 DEPEND="
 	>=dev-lang/tcl-8.4:0=
@@ -23,11 +22,7 @@ DEPEND="
 	x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.1-ldflags.patch
-}
+PATCHES=( "${FILESDIR}"/1.1-ldflags.patch )
 
 src_configure() {
 	source /usr/lib/tclConfig.sh
@@ -36,7 +31,3 @@ src_configure() {
 		$(use_enable debug symbols) \
 		$(use_enable threads)
 }
-
-src_test() {
-	Xemake
-}