gentoo resync : 16.06.2019

3 files changed, 34 insertions, 36 deletions

diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
index 0e7ee093bccb..3934f2c13147 100644
--- a/media-sound/split2flac/Manifest
+++ b/media-sound/split2flac/Manifest
@@ -1,4 +1,4 @@
 DIST split2flac-122.tar.gz 9468 BLAKE2B 605001d92b3de52def98db28aeaba8a48c9c4ac5d621d27cbd7637d337f18acb50ca33f46b898def94d8259ae97c5cae534334df6ed5f6ccf267103a9023da36 SHA512 3be5d8f5a55107a6230108bb49b422303504a1b16ebf458759122b27effb492353f92f95c00bcfa52b45fad24a4e08fa638df9922288bc2844e3a971d3734ed8
-EBUILD split2flac-122.ebuild 1343 BLAKE2B bbe540f2e48f0328093f7ced967503d78506dfd81e922b92beebd145dc124bfde4f9a5b00749c36236ce343f1f0ff853ea134de45a9e9f2c1f869b85045f4b82 SHA512 98b00280462ee540979541c459ea39a5983793526677a3f90ea7e890d2d6e0cfea1ab22beb9fb263e812ccfaae3cd0702b5ff2232d3931248a3b8193c19b9696
-EBUILD split2flac-9999.ebuild 1323 BLAKE2B f21a79760e5a73e64fd07e87dce447b3861a05aae9a209573e505fce450714b77d49a8d24badbfb3b7529c2d5c4fd624da8817e9adbd198706569c7ce9fd837d SHA512 493314c27d28666409d346afac45aaa8539726845e45a256fd558e4502ed7073469e9681376224e2bf38db338290b3c4194dced60cea938b635e2633b0f90d83
+EBUILD split2flac-122.ebuild 1280 BLAKE2B a9769d5f7fedbc072d8e316050ab345d0b008537b80df9f87a24010446a572d86f8d7cb09fd57315fe5cda852dc66fa9e256b0596d7f0a7fd673e354e54b99bc SHA512 111b6b069d1a6c5beed470589790fa98c4fa8684db186733938f6471150fcb2e30529a36945e51f079ca11b64c89f7d4e5de202740d5bb9213fe2f5a1e008cdb
+EBUILD split2flac-9999.ebuild 1282 BLAKE2B 06990f52afcb1dcbd91f5d4d5f06081b1ab2edb471f8d146601ce3c28f5c61c05c5d6536df7f547d3f2f2ef8c971db0de87f47754cc9c9ac8b05721df74a4f0b SHA512 ba213ef0f4865be582114ae7731d1e8d684ea87d5060b72e2f3fd1eb65878ddbb72f0be12957c9ba39359392ddcc9b5c7e385ace63b2a2e962445df6461d1e33
 MISC metadata.xml 1246 BLAKE2B 7a2df038b155c1dfefbfbc3897409de32e21b0e32e543e1c4d5cce58e6d5fbefd5b341b53fad2d81c0e5a114953be7462ad736dd2206f8a3ef6113b076ab2d3c SHA512 ee36cd39bb98e817542a6292f70e8867508eaae58e4b6a14fd1874bbeb8f21422385d07cfb1f9280852c40b3cdf87a1cde895fb327230e93a5c67a2e8f478cf4
diff --git a/media-sound/split2flac/split2flac-122.ebuild b/media-sound/split2flac/split2flac-122.ebuild
index b93363779abc..90ea1c6a5fd4 100644
--- a/media-sound/split2flac/split2flac-122.ebuild
+++ b/media-sound/split2flac/split2flac-122.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+EAPI=7
 
 inherit bash-completion-r1
-[[ ${PV} == *9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+else
+	SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
 
 DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
 HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 x86"
 IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
 
 RDEPEND="
@@ -34,20 +35,18 @@ RDEPEND="
 		mp3? ( media-sound/mp3gain )
 		ogg? ( media-sound/vorbisgain )
 	)
-	imagemagick? ( media-gfx/imagemagick )
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
+	imagemagick? ( media-gfx/imagemagick )"
 
 src_install() {
 	dobin ${PN}
 	newbashcomp ${PN}-bash-completion.sh ${PN}
 
 	dosym ${PN} /usr/bin/split2wav
-	for i in mp3 mp4 ogg
-	do
+
+	local i
+	for i in mp3 mp4 ogg; do
 		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
 	done
+
+	einstalldocs
 }
diff --git a/media-sound/split2flac/split2flac-9999.ebuild b/media-sound/split2flac/split2flac-9999.ebuild
index fd0a7bea8998..762b68edc498 100644
--- a/media-sound/split2flac/split2flac-9999.ebuild
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+EAPI=7
 
 inherit bash-completion-r1
-[[ ${PV} == *9999* ]] && inherit git-2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+else
+	SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
 HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
-[[ ${PV} == *9999* ]] || \
-SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86"
 IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
 
 RDEPEND="
@@ -34,20 +35,18 @@ RDEPEND="
 		mp3? ( media-sound/mp3gain )
 		ogg? ( media-sound/vorbisgain )
 	)
-	imagemagick? ( media-gfx/imagemagick )
-"
-
-src_configure() { :; }
-
-src_compile() { :; }
+	imagemagick? ( media-gfx/imagemagick )"
 
 src_install() {
 	dobin ${PN}
 	newbashcomp ${PN}-bash-completion.sh ${PN}
 
 	dosym ${PN} /usr/bin/split2wav
-	for i in mp3 mp4 ogg
-	do
+
+	local i
+	for i in mp3 mp4 ogg; do
 		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
 	done
+
+	einstalldocs
 }