summaryrefslogtreecommitdiff
path: root/sys-apps/isapnptools
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /sys-apps/isapnptools
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-apps/isapnptools')
-rw-r--r--sys-apps/isapnptools/Manifest3
-rw-r--r--sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch22
-rw-r--r--sys-apps/isapnptools/isapnptools-1.27.ebuild12
3 files changed, 31 insertions, 6 deletions
diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest
index 25a28c729a6c..fc07d348bb04 100644
--- a/sys-apps/isapnptools/Manifest
+++ b/sys-apps/isapnptools/Manifest
@@ -1,5 +1,6 @@
AUX isapnp.rc 545 BLAKE2B 45a2d468943fce175e1c2ff2a6666b31844493cf9dd00df8fc0b2c28d83f3e8cbe59984ae6c66853bce8b6ea1e84534e8db7ba28abef9a166b0add174bd67266 SHA512 9844f1d7a959e96750a8adb906f9c85d7ab693421d7ac51af08380ed6690c017d3f9a74694f2c5d7c7a3da8266f18f1f574095435aa6e9ec2ab9f7604ea470a7
+AUX isapnptools-1.27-fno-common.patch 578 BLAKE2B aaa06b450b6698d3b0caa10dd2c50a150bff069ee231f46b0e74a1129cf64329ec828d9f7b33205bc409da119d37062f9cc8e96f115e46c6d1eb7feed61a2094 SHA512 202f955c3e4701b7af49ba99b117d1ac8f5dca2bf710fa5d7dc9b73d2988e22a8283900d87b85a500d6b20a4736cf78d5e751e0a9447574dd8d142d8e5f0feec
AUX isapnptools-1.27-include.patch 241 BLAKE2B 838759903a4bf42b48da7dbd900f9fa360e3916068cfcc67d7803111d1c50358ec9bb1c9a20916064ecb05e347e026be5e97a8400bd6021a30bbc00e55d0b085 SHA512 8533282a59f4860fd16e9f76a2d7e55db0629ce754e94a17c9339e08b777253e936a4fe242db5d38f99283e474969c03726560b0f27243c898fd4881ad1920b7
DIST isapnptools-1.27.tgz 499639 BLAKE2B 9da8968abeaf1fe2f39e3003cad32aecb546016d72489a9b4c84b8427acee7a54c2580d6536e2c39aa06a44cf363705af06968b71100c51663e928ffdbfa7353 SHA512 ccd1c8f7b66ba7f26d50fcfa64d0397dd1a09866c7c74226acbcb4e08be77717aaa4dde7eabcad5bac4e5f92774c40bca48dbf97069c62cc71355b768eca4d34
-EBUILD isapnptools-1.27.ebuild 592 BLAKE2B d8cd80fcb77e3f1502e26246ceb267147cabad79e6488138499934d1507158df7a46f9f860d6f9beacac0124e7d941089f4654bd101382b265a2503b9acae416 SHA512 3d5271332b39ccdc4bc356cc1ec2cfe62f0e4d5220af69d053e9678a48ac9754e17c0af49a81bb67a9a6d9361db6805444c407193bf59e77d76e58a717c3f0b6
+EBUILD isapnptools-1.27.ebuild 617 BLAKE2B 94f1138e597d4aa1f8a0a90274b0bdff452f161219656b4e76e7f3faffacf63dc842710999e5cb63addd2e5b5f98294118a14556eff4d525cbb2e4c4ebce0488 SHA512 c6c9de1ef886b48a8994c38a1075299e35c4a75bad7e00063e2f7214db5967c3cb974b3c26ba48cf159f3ecd4ff7fc8a67a8d8406c22188342939cdb6cf8b380
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch b/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch
new file mode 100644
index 000000000000..54da41cdd602
--- /dev/null
+++ b/sys-apps/isapnptools/files/isapnptools-1.27-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/src/isapnp_main.c
++++ b/src/isapnp_main.c
+@@ -1153,7 +1153,7 @@
+ return 0;
+ }
+
+-unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
++extern unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
+ static char *boardid[NUM_CARDS+1];
+ static unsigned long serno[NUM_CARDS+1];
+
+--- a/src/isapnp_main.l
++++ b/src/isapnp_main.l
+@@ -363,7 +363,7 @@
+ return 0;
+ }
+
+-unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
++extern unsigned char serial_identifier[NUM_CARDS+1][IDENT_LEN];
+ static char *boardid[NUM_CARDS+1];
+ static unsigned long serno[NUM_CARDS+1];
+
diff --git a/sys-apps/isapnptools/isapnptools-1.27.ebuild b/sys-apps/isapnptools/isapnptools-1.27.ebuild
index c95092405332..cdcbf0fbdb96 100644
--- a/sys-apps/isapnptools/isapnptools-1.27.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.27.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Tools for configuring ISA PnP devices"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -10,15 +10,17 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* amd64 x86"
-IUSE=""
-PATCHES=( "${FILESDIR}"/${P}-include.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-include.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
src_install() {
default
dodir /sbin
- mv "${ED%/}"/{usr/sbin/isapnp,sbin/} || die
+ mv "${ED}"/{usr/sbin/isapnp,sbin/} || die
docinto txt
dodoc doc/{README*,*.txt} test/*.txt