Version bump to 113_p20131017; fixes bug #488230, reported by Marc Joliet and proxied commit for Nikoli.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 95 insertions, 20 deletions

diff --git a/media-sound/split2flac/ChangeLog b/media-sound/split2flac/ChangeLog
index 8052c04249ad..6ce360d56a0a 100644
--- a/media-sound/split2flac/ChangeLog
+++ b/media-sound/split2flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/split2flac
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/ChangeLog,v 1.12 2013/10/13 10:16:06 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/ChangeLog,v 1.13 2013/10/21 07:56:37 tomwij Exp $
+
+*split2flac-113_p20131017 (21 Oct 2013)
+
+  21 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +split2flac-113_p20131017.ebuild,
+  split2flac-9999.ebuild:
+  Version bump to 113_p20131017; fixes bug #488230, reported by Marc Joliet and
+  proxied commit for Nikoli.
 
   13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Updated Nikoli's e-mail address for easier automatic assignment.
diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
index f451c771f3e1..0a523cedd128 100644
--- a/media-sound/split2flac/Manifest
+++ b/media-sound/split2flac/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST split2flac-113_p20131017.tar.xz 8700 SHA256 99603fc32f1e357bf84a65c4fb744480ddc99b8cd96889e53da3b081c0eb7907 SHA512 6bfa6ca6cb677ae1affa501c0766f5ea169c741328a8e60d25df5a9a9f12bf63d3b7945d0f6067fb5a8dd922ad33a2972c5b15ecf2e50e232a78e59690777d7b WHIRLPOOL 33cdf4ab8cf66b860086b00ecfbbf7967828e82e8e5f6458266ab96d4b728bd5827aeece538473cdec12f3bfe4b6a4e23f8a2db2a1f130f996d5656f764301e8
 DIST split2flac-20111110-r1.sh 22381 SHA256 0e3b9f10bd068c76d71bb7bca1962aa764fa25ea0d90eaa7724b6384f7170cfb
 EBUILD split2flac-0.1_pre20111110-r2.ebuild 1344 SHA256 b2640d116a1b78829b5f6e2707eca259e2542acd2e05441c0ce5c131fac63a3b SHA512 93c103902e3d85acac57b6afd6d173bd47a828d3015fdf7a1302223c4ead0169e6aaa5685981f1c14370ac10d90ddaaf955164b050453fdc61ebc8c00cda3d5b WHIRLPOOL b1419eb05b52161eae6be809e36ec3cdd226201eb59fc705224e2bcf2965726114aaa10924d043d975782afcefd01b479daf2a8015a430d417b038fd7d7480f6
-EBUILD split2flac-9999.ebuild 1225 SHA256 0613876793216be4802a6ab5e1ee7c8fbc83aeaccac74544e79b375d0c096765 SHA512 73822328cda3f5f34777f8da51ee05b7488f9eaf149606ad34b1a76cffc88256c21107bd726db816c06e3125aa28849c14aa67128dc9edfdd527e777ca25269e WHIRLPOOL 4c8b5aaa8426ae035fd25ec7ed379847569fbe305698b238873de48bcf701157abeb25c4ed72f4a6f4121a32d1ec82d7a68cc4d5ff96191887976d77e1a603c2
-MISC ChangeLog 2306 SHA256 e5fa6ed283068b928a6086bcf73caa517e5509149ce1a371c3aaa00e4475a024 SHA512 9849b3bff7246febad6d283bb2f57d88362ed4739ae2a2085bd8e1ac295507fc63f76901b91119b095c368c93a1ee3510515925e4691a96e92b14dd469b6de72 WHIRLPOOL d61495d4a198c02589b559624adb92daf9eb97b5bc6559056a4546df742d16fb85fef507c4c9a0de80e559f678d1ea48164ce4420bdef5421643bdebc408274f
+EBUILD split2flac-113_p20131017.ebuild 1487 SHA256 55a71a7fa407c8e3ab211b114b1f911141aa41e16753cd0f80c2a29393dfe48d SHA512 dadc7c9ac7cd3bdd84536aa5c979b0e63ceab50ab9436b9dc8a616beaa2739c3d7886a736d5119436b6db3360eb3522ef94ad7cb7a6075024a60546bbe2d3626 WHIRLPOOL 27f2fe4f689c0b02b55870a53591f9b80e674642bc3fc9c83ed41dbb2a2aee7fb7db7f935ac1bb9fec57bdce2c4c727f547349a1747672c526403899830b7364
+EBUILD split2flac-9999.ebuild 1478 SHA256 e5f85bcedc3c1b71f0cbb64c2e1f5062f9871e488ae23c154a33ba1fa36ac56b SHA512 5ff7d289f6cfdba89e72e45543a17f4487df0063f53ebb4d4e0177713a38dcfe94032787fb89c6c5a20b1e24bced8d26c238c12019b7f7ee57a9e867c5a1ffda WHIRLPOOL d9ad7fd93772dc2abc92e18944bb40f029267d7530c3e022d83acc936a5e379338a2b1e818037c0e748f7e5cec56d141756b372cea8a9b36b28216a99aed3e14
+MISC ChangeLog 2564 SHA256 fee653acc6fbf0fc99b7f9f34fbb451a712445c49c28d4d45cfc9080d210b625 SHA512 d6068135beaff18e72b4c425ef548b62484bd8859f4b27af13bf029f44b1d4d9280a73776d933a73004c5f6e059c77c05dc272226be4f6d3a1a05140fa9c19ef WHIRLPOOL 413d480233aea401fcbb0c727520e0080ae228015209c6942ac01e99a528089c5a700ad181d04f745821acb54e7d5661087e14dd0e0fb2cd29a35f6d25e9203f
 MISC metadata.xml 1091 SHA256 d1327f7afe6b0d35bcebf60dbcf38d620d30d9ba2888c139b530f5e06828369b SHA512 87adb0f256f53ffce54030cc1570fed36dddef87a6fab80167cb25b102958b5fec80b191853c786e0458b56ec86913285b68ca139b58ad9516c6715a14c9c2ad WHIRLPOOL 2320f6387b5c34d2ea9f9b814b53435691c5e83205cb680f64eee5e587603b31deb437460d81b7a275bcef9c21bfb081e7e6d5c16d93b488d87a465dac632677
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSWnLsAAoJEJWyH81tNOV969EH/j26U+o7P99XEenUcOC4GlQv
-u/SymqqcbuZwnKn8+8JNyJ9NAtduyDIrLqcJAAFkgts2psDlMzWDyJavdw175ZIi
-fOZHSbNwZfQ44DkfMVEw6DiVPy+EPzWgqFTtcm1A9DUt7uLeqUn6INt9/HNCfbVr
-JxLPkn4epPWPc+E/JI2yfuwHTvRANVBPqc6Ud96majaA5sj4uiWxdwssw9CA3ju7
-LOSVAal+GwaT1xu8T5wBDpPa9Reeygtf/vuTbFaXMzCCwUd/lKdUbF9dJizHSE94
-Sp4KOTcsOMNDKERMUXb7e54D0Z+UXV7lCfSJ1GRIGgB/SrVrXMlPAuwBTL7jTPE=
-=bY2K
+iQEcBAEBCAAGBQJSZN4vAAoJEJWyH81tNOV9Aj4H/jfznUp2QNwG5cAALycVvu2u
+Un1dntKToDkCzgv2btMIqSuwrxL387R6n4CAJIGTUE915eb3jIrK85T6Sgd95Uvt
+8rZU2vPk03cJ/oDjBpXt2FCq8guRTQKylBysnfc8JkIKegUr12e4yx8t4gnGZDOy
+ad5e8+vtM6tcBxAiQewAyki2KwnuzA4mP/ustg/2jgA3YL0aB3omz3Dn6ATpJC4V
+rnB0Dr6s2ve33bIS6ItJZGotKH6HCy2TIFLR+iy5F/i9qAcNVWwfv7+o0DO65XkF
+Y1kebPq7V0e6B2f5/s/tzhW7iMRK/bGLBjuTNviEgn4B5qlhtKjVRmgXqccrw9g=
+=luS2
 -----END PGP SIGNATURE-----
diff --git a/media-sound/split2flac/split2flac-113_p20131017.ebuild b/media-sound/split2flac/split2flac-113_p20131017.ebuild
new file mode 100644
index 000000000000..4cb937c688db
--- /dev/null
+++ b/media-sound/split2flac/split2flac-113_p20131017.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/split2flac-113_p20131017.ebuild,v 1.1 2013/10/21 07:56:37 tomwij Exp $
+
+EAPI="5"
+
+EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+
+inherit bash-completion-r1
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="sh script to split one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://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="
+	app-cdr/cuetools
+	media-sound/shntool[mac?]
+	virtual/libiconv
+	media-libs/flac
+	enca? ( app-i18n/enca )
+	flake? ( media-sound/flake )
+	mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) )
+	mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] )
+	ogg? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		mp4? ( media-sound/aacgain )
+		ogg? ( media-sound/vorbisgain )
+	)
+	imagemagick? ( media-gfx/imagemagick )
+"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dobin ${PN}
+	newbashcomp ${PN}-bash-completion.sh ${PN}
+
+	dosym ${PN} /usr/bin/split2wav
+	for i in mp3 mp4 ogg
+	do
+		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
+	done
+}
diff --git a/media-sound/split2flac/split2flac-9999.ebuild b/media-sound/split2flac/split2flac-9999.ebuild
index c23054938568..0b4ac930019c 100644
--- a/media-sound/split2flac/split2flac-9999.ebuild
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/split2flac-9999.ebuild,v 1.4 2012/05/19 09:11:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/split2flac/split2flac-9999.ebuild,v 1.5 2013/10/21 07:56:37 tomwij Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit mercurial
+EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+
+inherit bash-completion-r1
+[[ ${PV} == *9999* ]] && inherit git-2
 
 DESCRIPTION="sh script to split one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
-HOMEPAGE="https://code.google.com/p/split2flac/"
-EHG_REPO_URI="https://code.google.com/p/split2flac/"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
 IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
 
 RDEPEND="
@@ -34,11 +39,17 @@ RDEPEND="
 	imagemagick? ( media-gfx/imagemagick )
 "
 
+src_configure() { :; }
+
+src_compile() { :; }
+
 src_install() {
-	dobin "${PN}.sh"
-	dosym "${PN}.sh" /usr/bin/split2wav.sh
+	dobin ${PN}
+	newbashcomp ${PN}-bash-completion.sh ${PN}
+
+	dosym ${PN} /usr/bin/split2wav
 	for i in mp3 mp4 ogg
 	do
-		use $i && dosym "${PN}.sh" /usr/bin/split2${i/mp4/m4a}.sh
+		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
 	done
 }