commit: 841caba79792f1c0f747041c5bf6e61b63eab56e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Nov 9 19:47:24 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Nov 9 19:50:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841caba7
x11-misc/x2x: Bump to EAPI 7 Closes: https://bugs.gentoo.org/697150 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> x11-misc/x2x/Manifest | 1 - x11-misc/x2x/x2x-1.27-r3.ebuild | 47 ++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest index 4b10d5c4033..b7569af88c5 100644 --- a/x11-misc/x2x/Manifest +++ b/x11-misc/x2x/Manifest @@ -1,5 +1,4 @@ DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f -DIST x2x-1.27-license.patch.gz 1001 BLAKE2B c63aaa33f669a63073e5ee52c51d47a9c2ca27d222f28cefe46eb6ed092d32004b4a42ce7b9176960a75ef95443ed7fee33cb01f4e343c7c2cda2d80f516f9f5 SHA512 cdff296ed3ea7d3d72b7d64f4878d94b63ee459a3487668b2174f54e4d2519daa1fb80ffec2cb3ce188032bb72148629cb276eb0d0311ed1f26c3da8066caed8 DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild index a353108f7c6..4c02869b428 100644 --- a/x11-misc/x2x/x2x-1.27-r3.ebuild +++ b/x11-misc/x2x/x2x-1.27-r3.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=0 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X" HOMEPAGE="http://www.the-labs.com/X11/#x2x"; -LICENSE="x2x" SRC_URI="http://ftp.digital.com/pub/Digital/SRC/x2x/${P}.tar.gz mirror://debian/pool/main/x/x2x/x2x_1.27-8.diff.gz mirror://gentoo/x2x_1.27-8-initvars.patch.gz - mirror://gentoo/${P}-license.patch.gz mirror://gentoo/${P}-keymap.diff.gz" + +LICENSE="x2x" SLOT="0" KEYWORDS="amd64 ~arm ~mips ppc x86" IUSE="" @@ -25,36 +25,35 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-misc/imake" -src_unpack() { - unpack ${A} - cd "${S}" - +PATCHES=( # Patch from Debian to add -north and -south, among other fixes - epatch "${DISTDIR}"/x2x_1.27-8.diff.gz - # Revert part of debian patch messing with CFLAGS - sed -i '/CFLAGS = -Wall/d' Imakefile || die - + "${WORKDIR}"/x2x_1.27-8.diff # Fix variable initialization in Debian patch - epatch "${DISTDIR}"/x2x_1.27-8-initvars.patch.gz - - # Patch to add LICENSE - epatch "${DISTDIR}"/${P}-license.patch.gz - + "${WORKDIR}"/x2x_1.27-8-initvars.patch # Patch to fix bug #126939 # AltGr does not work in x2x with different keymaps: - epatch "${DISTDIR}"/${P}-keymap.diff.gz + "${WORKDIR}"/${P}-keymap.diff +) + +src_prepare() { + default + # Revert part of debian patch messing with CFLAGS + sed -i '/CFLAGS = -Wall/d' Imakefile || die # Man-page is packaged as x2x.1 but needs to be x2x.man for building mv x2x.1 x2x.man || die } -src_compile() { +src_configure() { xmkmf || die +} + +src_compile() { emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" || die + EXTRA_LDOPTIONS="${LDFLAGS}" } -src_install () { - emake DESTDIR="${D}" install || die - newman x2x.man x2x.1 || die +src_install() { + default + newman x2x.man x2x.1 }
