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

[Sam James]

commit:     137b49a84fb9a3edc65f82d49c6a181580ba00f0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 00:09:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 00:09:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137b49a8

x11-misc/lineakd: fix revisions

Closes: https://bugs.gentoo.org/722372
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/lineakd/lineakd-0.9.0-r3.ebuild           | 38 ++++++++++------------
 ...akd-0.9.0-r3.ebuild => lineakd-0.9.0-r4.ebuild} |  0
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
index 8f2fca9f6c7c..8b2026bc430b 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
@@ -1,53 +1,49 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
-
-inherit autotools
+EAPI=7
+inherit multilib
 
 MY_P=${P/.0/}
+
 DESCRIPTION="Linux support for Easy Access and Internet Keyboards"
 HOMEPAGE="http://lineak.sourceforge.net"
 SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="debug"
 
-RDEPEND="x11-libs/libICE
+RDEPEND="
+	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/libxkbfile
 	x11-libs/libXt
-	x11-libs/libXtst"
+	x11-libs/libXtst
+"
 
+S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
-	"${FILESDIR}"/${P}-automake-linking-libdl.patch
 )
 
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
 src_configure() {
-	# admin/lineakd.m4.in contains Bashisms but fixes it causes a confusing
-	# autotools avalanche, so workaround it with CONFIG_SHELL as bash.
-	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+	econf \
 		$(use_enable debug) \
-		--with-x
+		--with-x \
+		--disable-static
 }
 
 src_install() {
-	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile || die
+	sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile
 
 	dodir /usr/share/man/man8
 

diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild
similarity index 100%
copy from x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
copy to x11-misc/lineakd/lineakd-0.9.0-r4.ebuild