gentoo auto-resync : 16:04:2023 - 17:51:01

4 files changed, 55 insertions, 38 deletions

diff --git a/x11-misc/xcape/Manifest b/x11-misc/xcape/Manifest
index 5bbaea5fbc12..47c0fe5c5afa 100644
--- a/x11-misc/xcape/Manifest
+++ b/x11-misc/xcape/Manifest
@@ -1,3 +1,4 @@
+AUX xcape-1.2-makefile.patch 592 BLAKE2B 780f35b34a90ef5f2ee250303b973a43096f3121d1a134b5e024d3d40004d3b470ae7a4270c8d1ef836725807d552025f773f5ae5e640d1c0899956da3bff93d SHA512 ab0a0f167cb4369b0063aca3190a918448f673a2f9c2df293fd7c14ca2f3eb6f8d8477a0d689a84cf8be32488fa720fcec4878eb28dc51dc8bb6f543e346184c
 DIST xcape-1.2.tar.gz 18730 BLAKE2B 7e65d9d64d34f0500f524fe806c4d7d092c7670e1b78d0e7ea16860c4b268de0bfa732935eca45820a26be694e030cb6847b5910e0aad27974f4e9e74634c20c SHA512 5ae8502250a9ec55a4b0c5f7301c1597c652b76904261153b720362e3c5882e8db980c85396a2594f99ae2fb72ab7070c1b06c9432d54b7da84975ff45b25a79
-EBUILD xcape-1.2.ebuild 823 BLAKE2B fa501878fc7720a37d067d05621b0074c25824cb98c89b29f12c6ab62f5993acb2d46a91b5a84bfa7bf89c0209859c3fdcac3cef9abe8240b8c567c72669703a SHA512 cc4c785ef595fc64ac059debdf57f832c7569745c8cfa6262b3bc47106d62e09469faa02fda5d37dbfd014876e7f7ee4a6aa62f947be85c945a8e35fdb7f1026
+EBUILD xcape-1.2-r1.ebuild 612 BLAKE2B ee921b3bea5069ba365147c5047bff3c531b5b7b9cccb1ac9d49b4c6d57ae4d90ac2ef38eeb2b85bff4b87e8f24701e6473c414f5dc94d3d6053bf40add4ed06 SHA512 7217f7991f3c8e5b4e19db7d86131c24615a57d2604e21922edcd590d7eb1c8aa827f276ec19106233a3810a58d8336cc6acd6d7c1545118f68e3c1a1f885b30
 MISC metadata.xml 499 BLAKE2B 5a31f5e7ad52a9c086b9b4f62e7e3017511cb5c19fb0fe18480a31471fa2b257e8e8dd4637e3da606271ce9e65a7c449102c8aa1bfb3901cceda2dd5b6e93cd5 SHA512 1999fd2c260c9e1fa908acfba8dd25da5537fb56bbb58b1b738297d0812bf600ba4f2f32578a48c756f45b9b5403a5e258d515fbdcbe0c6e9e1a8b697867d839
diff --git a/x11-misc/xcape/files/xcape-1.2-makefile.patch b/x11-misc/xcape/files/xcape-1.2-makefile.patch
new file mode 100644
index 000000000000..06d4d04cdf50
--- /dev/null
+++ b/x11-misc/xcape/files/xcape-1.2-makefile.patch
@@ -0,0 +1,27 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,19 +1,16 @@
+ INSTALL=install
+-PREFIX=/usr
+-MANDIR?=/local/man/man1
++PREFIX=$(EPREFIX)/usr
++MANDIR?=/share/man/man1
+ 
+ TARGET := xcape
+ 
+ CFLAGS += -Wall
+-CFLAGS += `pkg-config --cflags xtst x11`
+-LDFLAGS += `pkg-config --libs xtst x11`
+-LDFLAGS += -pthread
++CFLAGS += `$(PKG_CONFIG) --cflags xtst x11`
++LDLIBS += `$(PKG_CONFIG) --libs xtst x11`
++LDLIBS += -pthread
+ 
+ all: $(TARGET)
+ 
+-$(TARGET): xcape.c
+-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
+-
+ install:
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+ 	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)$(MANDIR)
diff --git a/x11-misc/xcape/xcape-1.2-r1.ebuild b/x11-misc/xcape/xcape-1.2-r1.ebuild
new file mode 100644
index 000000000000..8b524c8c6a55
--- /dev/null
+++ b/x11-misc/xcape/xcape-1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own"
+HOMEPAGE="https://github.com/alols/xcape"
+SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+}
diff --git a/x11-misc/xcape/xcape-1.2.ebuild b/x11-misc/xcape/xcape-1.2.ebuild
deleted file mode 100644
index 48e5ae1a3290..000000000000
--- a/x11-misc/xcape/xcape-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utility to make modifier keys send custom key events when pressed on their own"
-HOMEPAGE="https://github.com/alols/xcape"
-SRC_URI="https://github.com/alols/xcape/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Fix path to man and to pkg-config
-	sed -i \
-		-e '/MANDIR/s:local:share:' \
-		-e 's/pkg-config/${PKG_CONFIG}/' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}