Adding metadata

4 files changed, 41 insertions, 17 deletions

diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index 12bc0962ad5c..507e3bd820f6 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1,2 +1,2 @@
-DIST leechcorepyc-2.14.3.tar.gz 126511 BLAKE2B a15b593144685d1f44dc1b580c8146f57d6c784e39d2a4aad8b4221ea718ee79dffe24877ac74198a2f8baeaca30a37d3fe1e6680265b94bcc30dc7117002706 SHA512 06c4c66cc92c2c55e2dd2e57e5488a1864dc21a1667b4b39237372e95fcd6b99b569754a44eea7afdae32207245016b096939c0edf11a4133fc24a343c892ba8
 DIST leechcorepyc-2.15.0.tar.gz 176764 BLAKE2B d0e4aa14d0cc1ce1ad3c14e704949c3b872b0889449ca81c9ac8642340b301ce52baf638ce58a6c3d1262f0cfe5cc5ec8eb26f80d01d87933c33a0f87ac46338 SHA512 d1d5f775d4166b510dd110dfe3e28179464170682d3092e7887fd7464fef21c2e2d1bb6d2294eb8ab45cb2566df15f0bf3254d098afd8bcb6b36186517496bd2
+DIST leechcorepyc-2.16.5.tar.gz 177365 BLAKE2B a5193e6e6c3fc2dc63358f62a2240b3a186b2acb37968597c5b5c690fbc94487c17bef55e8123bfdc55df2aa8668f667750a850fe4480b08d85bc311b1d2a95d SHA512 8d9b556d7ebc7de474dc853f9dfa005f91a19e6f7672d4021bc83c48b7d3ab0b6617bdbaf79e79b2fc930b64f448e3b8849d83c735077fd98776b026cff57a30
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
deleted file mode 100644
index 945f4e41e1c1..000000000000
--- a/dev-python/leechcorepyc/files/leechcorepyc-2.14.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/893824
---- a/leechcore/Makefile
-+++ b/leechcore/Makefile
-@@ -6,7 +6,8 @@
- # CFLAGS  += -fsanitize=address -fsanitize=leak -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=bounds-strict -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow

- # CFLAGS  += -fsanitize=pointer-compare -fsanitize=pointer-subtract -fanalyzer

- # DEBUG FLAGS ABOVE

--CFLAGS  += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack

-+CFLAGS  := -D_FORTIFY_SOURCE=2 ${CFLAGS}

-+CFLAGS  += -fPIE -fPIC -pie -Wl,-z,noexecstack

- CFLAGS  += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast

- LDFLAGS += -g -ldl -shared

- DEPS = leechcore.h

diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch
new file mode 100644
index 000000000000..ce29c885512b
--- /dev/null
+++ b/dev-python/leechcorepyc/files/leechcorepyc-2.16.0-respect-CC.patch
@@ -0,0 +1,30 @@
+--- a/leechcore/Makefile
++++ b/leechcore/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc

+-CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags`

++CC?=gcc

++PKG_CONFIG ?= pkg-config

++CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags`

+ # DEBUG FLAGS BELOW

+ # export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2

+ # CFLAGS  += -g -O0 -Wextra -Wno-unused-parameter -Wno-cast-function-type

+--- a/leechcore_device_rawtcp/Makefile
++++ b/leechcore_device_rawtcp/Makefile
+@@ -1,4 +1,4 @@
+-CC=gcc
++CC?=gcc
+ CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
+ LDFLAGS += -g -shared
+ DEPS = 
+--- a/leechcore_ft601_driver_linux/Makefile
++++ b/leechcore_ft601_driver_linux/Makefile
+@@ -1,5 +1,6 @@
+-CC=gcc
+-CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags`
++CC?=gcc
++PKG_CONFIG ?= pkg-config
++CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
+ LDFLAGS += -g -shared
+ DEPS = leechcore_ft601_driver_linux.h
+ OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.16.5.ebuild
index 201cda7a3a13..62989aa65334 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.14.3.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.16.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
@@ -13,7 +14,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
@@ -23,10 +24,16 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.14.0-respect-CC.patch"
-	"${FILESDIR}/${PN}-2.14.0-cflags.patch"
+	"${FILESDIR}/${PN}-2.16.0-respect-CC.patch"
 )
 
+src_prepare() {
+	default
+
+	# Avoid redefining _FORTIFY_SOURCE. See #893824, #906715.
+	sed -i -e 's/ -D_FORTIFY_SOURCE=2 / /g' leechcore/Makefile || die
+}
+
 src_configure() {
 	tc-export CC