gentoo resync : 25.08.2020

4 files changed, 43 insertions, 40 deletions

diff --git a/media-sound/chordii/Manifest b/media-sound/chordii/Manifest
index d30ccb92943c..96fe74330bce 100644
--- a/media-sound/chordii/Manifest
+++ b/media-sound/chordii/Manifest
@@ -1,7 +1,5 @@
-DIST chordii-4.5.1.tar.gz 156976 BLAKE2B adfffe19518b890c5c573a8450f8dc95ec66398da7b8dd1c01ef48e551fce85baf66b05fbd15c257c573e9545becde251314fc8023089a443c522455a3ee1ebd SHA512 92996893417cfecb3cc18db283f2f608721172540f1fbb9ea300a0235fa99228a89d2c65417e8ddee91453d4bc12190d1504039e9689ed28ca863546fa938088
+AUX chordii-4.5.3-fno-common.patch 604 BLAKE2B abc805abde8831fd1e3fc2690bdd5c7b06f4f38a9f74c65f34b97aad42e21e12914178a3606e5337d9f7423f76a4913fac3703105945ba42244d6684404140d2 SHA512 c69a725d74294f2c6b316b61557a3e2e6963dc4d801d5c7f04cb565be7da6c0d2d2aac821f5bc40b62b17b036902f99ad06d368639b70e32337c78f9c2233af7
 DIST chordii-4.5.3.tar.gz 172983 BLAKE2B 70fc30ab00afca4d17e1948cfdc5fbb696e479f7510a832d42d9d60844fc435ada7da528cae02a02fab237c3410828ac72b05fb21a3ff787ca1b3baea38b9de6 SHA512 d877400e4b55cf7a4f9fd17a17d829fc9189ce1e79775ca67c94fbe9047c36bf5efbd947501814c797e54bed74d4abbc62c8609f75a79e14e9aed219cb7d9772
 DIST user_guide-4.5.3.pdf 495972 BLAKE2B 2295305815432df57c77182b17e90699a9cb47878362d70eb8f7e97d16eb150467ee4f7244771bb61407b64421be618de8fc78c7f638420d629fa53d81f1e135 SHA512 0fa8ca45c8911368db82cd16ede757205d3ce776b2a21762644133867f47109a482fe3064506123c984317b02af8ec88a2ee81109c0ab86940499eeb35dd3bd1
-DIST user_guide-4.5.pdf 389353 BLAKE2B 4343e2be8e74bc1315705308367705e540d9e0f5a7751e247ceb1bfa342fc4f937a9aa61e2746d831aacf7bb3846e6e1fe144819df1e9857db85c8b510bfd0af SHA512 9ad15cf89ae6790f59d4a224367d1b5d8ffb0aec04f217875d9f31477751046e22ab7f90f798ce2347d7dc781bcdf1665323cd315ad1148d600d5e5bf27ee096
-EBUILD chordii-4.5.1.ebuild 565 BLAKE2B 2b0111549fd2c46c47b8cf25f0308697fdfdcacea474132594f8a7c94659b1bda0b0a2debd3ea7d1216a0db67d1cfaf5aeea8791b9660106f432da425f2d32aa SHA512 e54efa186886373a4d8f61f333d3a40981fe7890a0c8b0efc8fe8d2f2cfd40f2c5ab1c444992b330745ba615faa4fc740c3a079f2d2e006a8ed09f72f3c67c1e
-EBUILD chordii-4.5.3.ebuild 569 BLAKE2B a0ec7b12e3de8734e171a6c199a75af7ae95044d1fdbf96749e8ee2211b40a31a0497113130c598052f311f9f88c3718a90c80e525fab46ce7567a17be58c53a SHA512 ac8438d90b8cbf9f7a3c1660b641981fd03ea90bf6b8be0b264fc1a6881c352c831cf3eb5eff1bdb53f3221be5db9a7d0b1668d7062e97ff463dd2390c4dbd9a
+EBUILD chordii-4.5.3.ebuild 567 BLAKE2B a1ee7309a850cb12c82195bcc5a3642637a584f930bfbca1003f9b356b62223de82b9fe40f0ad2db36db1ab5069df0baa3acec351a5452215e1c8fb1af55492d SHA512 680bf5052ba3dac06e03dffdec700841e452354ea4c20ed173853d791d3ff62ebf1a682eb3c31c50386da6cd1e7f27c05f540483be14d772f3dc0822e8957cf7
 MISC metadata.xml 1257 BLAKE2B a8a0bce702420c732f9e7f947292fcfbec131781537cdb091ea35a7f5a4c33526765cd2dc2750e28878da92ad968492e988aad332c7829f1d1190fe53d851526 SHA512 2761d63f4130afd75abb5717c1ab8571d2018cfc21b7635cc7b68f078992cc4bf6c13fed317f87c0bc9430c4370763d823c9f3248abef08e8a5f1c66aa76b160
diff --git a/media-sound/chordii/chordii-4.5.1.ebuild b/media-sound/chordii/chordii-4.5.1.ebuild
deleted file mode 100644
index 303f9e0f67d4..000000000000
--- a/media-sound/chordii/chordii-4.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A guitar music typesetter"
-HOMEPAGE="http://chordii.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/user_guide-4.5.pdf )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-src_install() {
-	default
-
-	use doc && dodoc "${DISTDIR}"/user_guide-4.5.pdf
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-sound/chordii/chordii-4.5.3.ebuild b/media-sound/chordii/chordii-4.5.3.ebuild
index 605ec52c35a4..1b9c9f3d7f9b 100644
--- a/media-sound/chordii/chordii-4.5.3.ebuild
+++ b/media-sound/chordii/chordii-4.5.3.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A guitar music typesetter"
 HOMEPAGE="http://chordii.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? ( mirror://sourceforge/${PN}/user_guide-${PV}.pdf )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
+IUSE="doc"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.5.3-fno-common.patch )
 
 src_install() {
 	default
 
-	use doc && dodoc "${DISTDIR}"/user_guide-${PV}.pdf
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 
-	if use examples ; then
-		docinto examples
-		dodoc examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	use doc && dodoc "${DISTDIR}"/user_guide-${PV}.pdf
 }
diff --git a/media-sound/chordii/files/chordii-4.5.3-fno-common.patch b/media-sound/chordii/files/chordii-4.5.3-fno-common.patch
new file mode 100644
index 000000000000..914a532252cd
--- /dev/null
+++ b/media-sound/chordii/files/chordii-4.5.3-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/src/chordii.c
++++ b/src/chordii.c
+@@ -19,6 +19,8 @@
+ 
+ static FILE *source_fd;
+ 
++struct kcs dummy_kcs;
++
+ char
+ 	text_line[MAXLINE],	/* Lyrics Buffer */
+ 	chord[MAXTOKEN],	/* Buffer for the name of the chord */
+--- a/src/chordii.h
++++ b/src/chordii.h
+@@ -67,7 +67,7 @@
+ #define CHORD_EASY	0
+ #define CHORD_HARD	1
+ 
+-struct kcs {
++extern struct kcs {
+ 	struct	kcs *next;
+ 	char	chord_name[CHORD_NAME_SZ];
+ 	int	displ;
+@@ -76,7 +76,7 @@
+ 	int	difficult;
+ 	} dummy_kcs;
+ 
+-struct chord_struct {
++typedef struct chord_struct {
+ 	struct chord_struct *next;
+ 	struct kcs *chord;
+ 	} dummy_chord_struct;