[gentoo-commits] repo/gentoo:master commit in: x11-misc/accessx/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/accessx/

[Jeroen Roovers]

commit:     25cce2eed3ea733a6a8dad41f7e37744574fd104
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 12:10:50 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 13 12:10:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25cce2ee

x11-misc/accessx: Old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-misc/accessx/accessx-0951-r1.ebuild | 38 ---------------------------------
 1 file changed, 38 deletions(-)

diff --git a/x11-misc/accessx/accessx-0951-r1.ebuild b/x11-misc/accessx/accessx-0951-r1.ebuild
deleted file mode 100644
index 76d49a3994c..00000000000
--- a/x11-misc/accessx/accessx-0951-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Interface to the XKEYBOARD extension in X11"
-HOMEPAGE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php"
-SRC_URI="http://cmos-eng.rehab.uiuc.edu/${PN}/software/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	dev-lang/tk"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-
-	sed -i \
-		-e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" \
-		XLIBDIR="-L/usr/$(get_libdir)" LLIBS="-lXext -lX11" || die
-}
-
-src_install() {
-	dobin accessx ax || die
-	dodoc CHANGES README
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/accessx/

[Sam James]

commit:     4e30c3a1d775d876c4f97c8b5ebf00a0410cb9fc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 20:37:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 20:37:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e30c3a1

x11-misc/accessx: EAPI 8

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...cessx-0951-r2.ebuild => accessx-0951-r3.ebuild} | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/x11-misc/accessx/accessx-0951-r2.ebuild b/x11-misc/accessx/accessx-0951-r3.ebuild
similarity index 68%
rename from x11-misc/accessx/accessx-0951-r2.ebuild
rename to x11-misc/accessx/accessx-0951-r3.ebuild
index effe98e9c553..852c3f4ae74b 100644
--- a/x11-misc/accessx/accessx-0951-r2.ebuild
+++ b/x11-misc/accessx/accessx-0951-r3.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Interface to the XKEYBOARD extension in X11"
 HOMEPAGE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php"
 SRC_URI="http://cmos-eng.rehab.uiuc.edu/${PN}/software/${PN}${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	dev-lang/tk:=
+	x11-libs/libX11
 	x11-libs/libXext
-	dev-lang/tk:0="
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \
 		Makefile || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" XLIBDIR="-L/usr/$(get_libdir)" \
+	emake \
+		CC="$(tc-getCXX)" \
+		OPTS="${CXXFLAGS}" \
+		XLIBDIR="-L${ESYSROOT}/usr/$(get_libdir)" \
 		LLIBS="$($(tc-getPKG_CONFIG) --libs xext) $($(tc-getPKG_CONFIG) --libs x11)"
 }