* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-10-11 8:56 Ionen Wolkens
0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-10-11 8:56 UTC (permalink / raw
To: gentoo-commits
commit: c16c4285e4ca3f13f0840350518fcddbc31f4d66
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 08:26:56 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 08:56:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16c4285
x11-misc/x2x: pass -std=gnu89
Does not build with `clang -std=c2x`, early workaround for
when this will become a default.
(not actively hunting for these, merely revisiting packages
previously looked at for clang16 even if not an issue "yet").
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-misc/x2x/x2x-1.30-r1.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/x11-misc/x2x/x2x-1.30-r1.ebuild b/x11-misc/x2x/x2x-1.30-r1.ebuild
index 505f19649f03..202c42f4bebf 100644
--- a/x11-misc/x2x/x2x-1.30-r1.ebuild
+++ b/x11-misc/x2x/x2x-1.30-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="A utility to connect the mouse and keyboard to another X"
HOMEPAGE="https://github.com/dottedmag/x2x"
@@ -31,7 +31,10 @@ DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old )
src_prepare() {
default
+
eautoreconf
+
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
}
src_compile() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-09-30 11:02 Ionen Wolkens
0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-09-30 11:02 UTC (permalink / raw
To: gentoo-commits
commit: ee11946e94226fc50234380a368ecd8dbb0b7520
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 08:46:22 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee11946e
x11-misc/x2x: drop 1.27-r3
Came here to do some fixing of imake-using packages, but the newer
version doesn't use it (yay). Let's just get rid of this one.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-misc/x2x/Manifest | 4 ---
x11-misc/x2x/x2x-1.27-r3.ebuild | 61 -----------------------------------------
2 files changed, 65 deletions(-)
diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest
index afbe097daec5..1de96fbf7187 100644
--- a/x11-misc/x2x/Manifest
+++ b/x11-misc/x2x/Manifest
@@ -1,5 +1 @@
-DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f
-DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131
DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11
-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
deleted file mode 100644
index 3fa95a9e0e9a..000000000000
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A utility to connect the Mouse and KeyBoard to another X"
-HOMEPAGE="http://www.the-labs.com/X11/#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}-keymap.diff.gz"
-
-LICENSE="x2x"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXext"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/rman
- x11-base/xorg-proto
- >=x11-misc/imake-1.0.8-r1"
-
-PATCHES=(
- # Patch from Debian to add -north and -south, among other fixes
- "${WORKDIR}"/x2x_1.27-8.diff
- # Fix variable initialization in Debian patch
- "${WORKDIR}"/x2x_1.27-8-initvars.patch
- # Patch to fix bug #126939
- # AltGr does not work in x2x with different keymaps:
- "${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_configure() {
- CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
- IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- default
- newman x2x.man x2x.1
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-09-30 11:02 Ionen Wolkens
0 siblings, 0 replies; 9+ messages in thread
From: Ionen Wolkens @ 2022-09-30 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 6cafe8b2adb5449e7a7c98b024b618939d0774b9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 08:51:31 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 10:48:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cafe8b2
x11-misc/x2x: fixup build deps
This doesn't use imake/rman anymore.
Small package so revbump to allow depcleaning these more easily.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
x11-misc/x2x/{x2x-1.30.ebuild => x2x-1.30-r1.ebuild} | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30-r1.ebuild
similarity index 89%
rename from x11-misc/x2x/x2x-1.30.ebuild
rename to x11-misc/x2x/x2x-1.30-r1.ebuild
index e1ea883c0b2f..505f19649f03 100644
--- a/x11-misc/x2x/x2x-1.30.ebuild
+++ b/x11-misc/x2x/x2x-1.30-r1.ebuild
@@ -8,28 +8,25 @@ inherit autotools toolchain-funcs
DESCRIPTION="A utility to connect the mouse and keyboard to another X"
HOMEPAGE="https://github.com/dottedmag/x2x"
SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-debian-1.30-10
LICENSE="MIT BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXtst
x11-libs/libXext"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/rman
- x11-base/xorg-proto
- >=x11-misc/imake-1.0.8-r1"
-
-S="${WORKDIR}"/${PN}-debian-1.30-10
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
# Patch to fix bug #126939
# AltGr does not work in x2x with different keymaps:
"${FILESDIR}"/${PN}_1.30-10-keymap.patch
)
+
DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old )
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-03-14 18:35 Agostino Sarubbo
0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2022-03-14 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 3821a84d56866538ed9717cbc5d95d49ac66d824
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 18:35:31 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:35:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3821a84d
x11-misc/x2x: x86 stable wrt bug #835092
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-misc/x2x/x2x-1.30.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild
index 0ea2d36c6179..e1ea883c0b2f 100644
--- a/x11-misc/x2x/x2x-1.30.ebuild
+++ b/x11-misc/x2x/x2x-1.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.
LICENSE="MIT BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc x86"
IUSE=""
RDEPEND="x11-libs/libX11
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-03-14 18:33 Agostino Sarubbo
0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2022-03-14 18:33 UTC (permalink / raw
To: gentoo-commits
commit: dd28782044065a9d30ccae4106c2c8a063eb1602
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 18:33:36 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:33:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd287820
x11-misc/x2x: ppc stable wrt bug #835092
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-misc/x2x/x2x-1.30.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild
index 95bc2cb3fea6..0ea2d36c6179 100644
--- a/x11-misc/x2x/x2x-1.30.ebuild
+++ b/x11-misc/x2x/x2x-1.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.
LICENSE="MIT BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~x86"
IUSE=""
RDEPEND="x11-libs/libX11
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2022-03-14 18:32 Agostino Sarubbo
0 siblings, 0 replies; 9+ messages in thread
From: Agostino Sarubbo @ 2022-03-14 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 448609f58be0d523f73810573d78849cae67549b
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 18:32:52 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:32:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448609f5
x11-misc/x2x: amd64 stable wrt bug #835092
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
x11-misc/x2x/x2x-1.30.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild
index 09d330e821dd..95bc2cb3fea6 100644
--- a/x11-misc/x2x/x2x-1.30.ebuild
+++ b/x11-misc/x2x/x2x-1.30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.
LICENSE="MIT BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
IUSE=""
RDEPEND="x11-libs/libX11
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2021-05-03 16:47 Jonas Stein
0 siblings, 0 replies; 9+ messages in thread
From: Jonas Stein @ 2021-05-03 16:47 UTC (permalink / raw
To: gentoo-commits
commit: 78da7d88658b8ee11546835bab4191852a52126e
Author: Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon May 3 16:46:59 2021 +0000
Commit: Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon May 3 16:46:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78da7d88
x11-misc/x2x: drop project desktop-misc
Drop project desktop-misc from the list of maintainers.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>
x11-misc/x2x/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
index 2ba8e9e851e..7a38bb90096 100644
--- a/x11-misc/x2x/metadata.xml
+++ b/x11-misc/x2x/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2021-04-15 6:39 Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-04-15 6:39 UTC (permalink / raw
To: gentoo-commits
commit: a50d9135ce439a19167f417374a6c8c86545cceb
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Apr 14 12:17:04 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 06:38:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50d9135
x11-misc/x2x: fix build with -native-symlinks
Also swapped DEPEND with BDEPEND to put imake in the right block.
Closes: https://bugs.gentoo.org/726236
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-misc/x2x/x2x-1.27-r3.ebuild | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index 4c02869b428..3fa95a9e0e9 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,10 +20,11 @@ IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libXtst
x11-libs/libXext"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/rman
x11-base/xorg-proto
- x11-misc/imake"
+ >=x11-misc/imake-1.0.8-r1"
PATCHES=(
# Patch from Debian to add -north and -south, among other fixes
@@ -45,7 +46,8 @@ src_prepare() {
}
src_configure() {
- xmkmf || die
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
}
src_compile() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/
@ 2019-11-09 19:50 Michał Górny
0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2019-11-09 19:50 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-10-11 8:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-11 8:56 [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2022-09-30 11:02 Ionen Wolkens
2022-09-30 11:02 Ionen Wolkens
2022-03-14 18:35 Agostino Sarubbo
2022-03-14 18:33 Agostino Sarubbo
2022-03-14 18:32 Agostino Sarubbo
2021-05-03 16:47 Jonas Stein
2021-04-15 6:39 Joonas Niilola
2019-11-09 19:50 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox