3 files changed, 51 insertions, 4 deletions
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
index 907359c8ba23..4c2bc96a6303 100644
--- a/media-sound/takcd/Manifest
+++ b/media-sound/takcd/Manifest
@@ -1,4 +1,5 @@
+AUX takcd-0.10-fno-common.patch 926 BLAKE2B 2bda7bfaebb59506c4218fa5bc4fe966f7fe8230d78105ab76a6e2e9b3276fdaae548ae1615127d3ab5d79b03e2cbf724dd74163ecd3c1efb2fcf3ca731e46a4 SHA512 e52b3f686205aecca2b71c4a0fbabcafc9ab589c911f4650e3b6d1db372e13e6d07442111dc25107a5022b05d1f1f941fc05f39dd058cd8e155cb9f4729b5b12
 AUX takcd-0.10-overflow.patch 367 BLAKE2B ab2168e1445ace23dcf31410040f363575302ea38ddee9a308ee4dcf7d24ccd0ae9909a72444a4c663412c54a5ccb3811f7f14e222569c76bbf52e2c40c83d92 SHA512 0e1193d558c0c3af0d37d06b0dbacbd10491e0be3dc42e58bcdecdad3308ed19394a9ba3401996df8df5f9cba9186f727272fd9d51cc34ac4334778ec809b7f4
 DIST takcd-0.10.tar.gz 95457 BLAKE2B 60e29a67d84fc600bcd55a7aa24e65bc042de13bc02686597a41cfd2e0490110ac66d60d0dc66977b4dce7bbdd34b7a20a1f6fe46474df16b11cbe1149b7d403 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33
-EBUILD takcd-0.10-r1.ebuild 506 BLAKE2B 035190925d420bc64fcb1981d7b002972d2076e1f0d44a387c26c6e19eeb3c8e35733b065d8281ea7bed8132111131719a74080e9b70879f5593a0414f815406 SHA512 226dc7b6d496816043a322c3a667e1096071875d81e87ca40501b4ad72337f9d176db1c451870e246d10c99ec76a8799087f770b5ded4af402b62675b48514b4
+EBUILD takcd-0.10-r1.ebuild 536 BLAKE2B a80cbe24d5f48261e806eeb4c961dced9e8170a2416f3183c8f79749afce932a0391cd798eb65c9d70ad5755fbe4014273569a2fb75553541d1870a15466b762 SHA512 247b16b0e79f22aa155de32d4669fcb8b6ecf169416b86dc84fda87845052260b628b314b31456c8bfa007d5b8d3c3680bcdf41279a5101d337c170c30319b35
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/takcd/files/takcd-0.10-fno-common.patch b/media-sound/takcd/files/takcd-0.10-fno-common.patch
new file mode 100644
index 000000000000..ec97e62eea30
--- /dev/null
+++ b/media-sound/takcd/files/takcd-0.10-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/bsd_discid.c
++++ b/bsd_discid.c
+@@ -29,7 +29,7 @@
+ #include "config.h"
+ 
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+ 
+ int Discid_Init(void) {
+ /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/darwin_discid.c
++++ b/darwin_discid.c
+@@ -29,7 +29,7 @@
+ #include "config.h"
+ 
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+ 
+ int Discid_Init(void) {
+ /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/linux_discid.c
++++ b/linux_discid.c
+@@ -31,7 +31,7 @@
+ 
+ char *cdrom_device = NULL;
+ 
+-int cdrom_fd;
++extern int cdrom_fd;
+ 
+ int Discid_Init(void) {
+ /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
+--- a/sun_discid.c
++++ b/sun_discid.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+ 
+ const char *cdrom_device=DEV_CDROM;
+-int cdrom_fd;
++extern int cdrom_fd;
+ 
+ int Discid_Init(void) {
+ /*	if ((cdrom_device = getenv("CD_DEVICE")) == NULL) {
diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
index 154fab65024c..9bbbf1143850 100644
--- a/media-sound/takcd/takcd-0.10-r1.ebuild
+++ b/media-sound/takcd/takcd-0.10-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,9 +12,11 @@ SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
-IUSE=""
 
-PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default