Version bump based on Nokilis work on bug 471554, drop old.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 93 insertions, 121 deletions

diff --git a/media-sound/flacon/ChangeLog b/media-sound/flacon/ChangeLog
index 18133013f5f6..4f96122f5eaa 100644
--- a/media-sound/flacon/ChangeLog
+++ b/media-sound/flacon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/flacon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/ChangeLog,v 1.6 2012/08/23 15:16:36 maksbotan Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/ChangeLog,v 1.7 2013/05/29 08:33:51 xmw Exp $
+
+*flacon-0.8.0 (29 May 2013)
+
+  29 May 2013; Michael Weber <xmw@gentoo.org> +flacon-0.8.0.ebuild,
+  -flacon-0.5.7.ebuild, -flacon-0.6.0.ebuild, metadata.xml:
+  Version bump based on Nokilis work on bug 471554, drop old.
 
 *flacon-0.7.2 (23 Aug 2012)
 
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 3f5bca24ed81..f1f9293846e5 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,10 +1,18 @@
-DIST flacon-0.5.7.tgz 115518 SHA256 46a2c50d37e9c67cba7ce458430217963e7f48d05b3f2b8e2bdb054cddfd0063
-DIST flacon-0.6.0.tgz 168541 SHA256 243113f9d9f922caf2f27a2bcf4e5603ca69ce03929f915642e9064d2ec13d04
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST flacon-0.6.1.tgz 165571 SHA256 03d417efcc59f99484467060eb56d0fe1e8d634086078254e9c5df569743519f
 DIST flacon-0.7.2.tgz 238604 SHA256 b10cfe6d7f99c3b64082edc5bf926c1759714719ef5ec99065f92df4c7da87ac SHA512 2393765d39a6cdb711a7ad27b644866d58f633b692db268b9a7b7a46be10e80c3aa4fbea2ddbeba45a6dbeddd0fd6893f753d7725534e8906bd752426530322b WHIRLPOOL ef5f28563a9871525e72815e1c3e9b28212cedc874a9329edd72180446a790517e412043f189f439106b38c79923714e118cd185475a9540ef49dc5b5d373716
-EBUILD flacon-0.5.7.ebuild 1239 SHA256 1d8d76b50f4339a108f68be7a90aa37293f5d0894f26f5d6ce242af77a546aff SHA512 47fa903629995592b6af0d8b99b1d5893288713fe0ec7d2d0942ec42dc40929db1d3f8d776241c2f5aaae610c6a1d5874619cf37d9c0e3183da95251359aff01 WHIRLPOOL 7cf0b0dd2ec113239ac0781091a66b891b5bdeff8bea85e4c4a511e5a1a11d3800e980cfd00ea213ae605f1b1153233d920e30a09a5b2045049f642d0a225c97
-EBUILD flacon-0.6.0.ebuild 1235 SHA256 5d62c3cf46e1c9d0801a0482f4d0935d918b8c8ec22c80868a7131dde5e4d3c0 SHA512 81a344b1cc1e2b561ea0c9991e05e93aa16fd8fb06d8fbbd1922e4ad33c36c0102bf0b9a7d0b8a3b3d5bd3b1b0372be617ee64e630f97eb42a3404957031230d WHIRLPOOL 9bde2e9e2555cb17adf4786564ee97f9eaad95b4aa1276c983ceca3b51a4119690e6672403869550f998dd0b2c8d9014e661149c9ec37c9668c8ea8e63087965
+DIST flacon-0.8.0.tgz 272910 SHA256 d2889b364ea49b19c400ce8081d829e5a37149dfdcb82d55f6ab453b679d1f85 SHA512 58b2cd57266533ae3bdd524d18c279171c3092665e20332a16c421d6931492deb6d201e2b3f818ecda7e2d50fdbe7170597b12922aa9cbe07cc24dc7b6d4d0d1 WHIRLPOOL e515de827886d95c6e67c8549ef4ec3ec6700d6d7cc9f06d9e568d79274942d37e0153b88391bedfda7d5b28fc3231ceb59a7faecd0830a01468d61c1cd5197f
 EBUILD flacon-0.6.1.ebuild 1234 SHA256 fb6c570d74a0562d3fa832089a4c6cc117047417e4c2fa3fe0db3b423c49fb0a SHA512 54905d18a571ab86b521ea5f35927e9d4ccee14a395a4f781db018cbaba28221c036971c774fbfcb5210c4bfc30ebc4431592f0e781168af7af6f6c752ea2c54 WHIRLPOOL d4885bdbc233b99040b6e035938c3cba7f19b52da1aec3cc7437d2ba26851d2d7ca13fc647886c03b2f81b03cc0bd5040232971b70f59125929da25beef98cce
 EBUILD flacon-0.7.2.ebuild 1255 SHA256 5c24d17162a287f31ec1cbd388219d3f16e6f540aa1fa809496f47f14b53a7cf SHA512 b4ed32475a366773734b32f1c4cd7a8edadf2d7bf990fae20f47fc0431862b765705eef216d74a26ddedca28f3fe8e5123e35042d350e2a505c4a989a66dcadc WHIRLPOOL 544033ed7722470d1a8d09e5887d072ba78985d7c3fb7d6bf6896cbb5e4d262fa3bb105635450d08c0ec79b9b72ad61a7decfbc82df3e8a4508521d848be7560
-MISC ChangeLog 1065 SHA256 a13c0583c783607e71fbacf96c858976bc7a6bde62843f616e12264916b9c486 SHA512 95ce33e1f16b4aa2c1b3a309e70487d2211da61048edd9556978d95f89ad89a74237c8c12a8b16b8ec2d0524d95d8e276c33096523c435b6d33c40a34c0cce9d WHIRLPOOL 73e130616a2bbfd5ba1461f12e3bc2bb065e20803fdeb2cfa5dcabd5435150149810590cf88a1ebbbbe3b3309ccfdf39911d1d25a4991ab60df226ff6aab181a
-MISC metadata.xml 592 SHA256 2ee0854704d42499dbb029b558cf9dd1ed1d5f21b756d609109419b47f7c0e52 SHA512 18e7b5cc07597fd56d32ea76bfc98ba1d885489ab92e64e9878e55edde3403d6769710c144b9eebde9ae9610430913888efde72cf8fce95f24e4afba7a5d44e8 WHIRLPOOL 9e370919f149000c17202c4dae1945f6590b672fd5d950069183f450a5bb315289d261c4ee53f158980b269308895d67a39ceabc5175e2c9368de8378377b1e3
+EBUILD flacon-0.8.0.ebuild 1767 SHA256 2c5e6a79e5b78d219cb1d41879d4d15eca1188a2149fbc57c699d633bc097362 SHA512 50c6893d443a1d6ae3e8fe076b259fc6f65c2267fbac154990c2987dde2dcf9d7f06aaf872b699ad5038be65a4793bb0f94993e474ba04920798f89e25742ed8 WHIRLPOOL a26559b0e8b0c87416ea54bfa34306d3ca00f05ce26ba2f64f43a9331f29928ac26dcefafc932b434dba38aab8e3e58ca0fe3fc2ac97ff0db73d541b8a355898
+MISC ChangeLog 1279 SHA256 93e4fcdd2a3da40ab0e811c42c2b594e0372952eaea1416381171ad493c16c89 SHA512 3b2917e11f15fe30067589f6e4ee01a4fa009fd67c0af7bbad3d813c19ca12e673c6e25c97a3f64fe8eec6aae96c7b172da67501baefe4783b296977d4d2271d WHIRLPOOL 736845c760cb9cc4c768883a3a9777c1adde6f77d14ac7fb3491ebcc4f31ef7ea1d4c7b9d4776d7aa5239d4cbef06c54992aa641d737680d6513facec296fa70
+MISC metadata.xml 643 SHA256 5987523fff21e8817e2cac9cb0245e63249c9c390adf08611ce0fe4916ccad72 SHA512 261c9af0e0134f00f3b37700e7c70fe9bce79e34c2fb3364d8b8d7fc0628caaf29b325c2181a045a9ee3ea360b6231bb864864ad3716f9af76a11f1587a333c1 WHIRLPOOL 560f96fb905765de3ccb43847b9160f9afaaa1e1f0afcea212e79302698c938206459bd7fb6063336f7dd188ae8dd3d2a001389adff42c2023597427802570a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iF0EAREIAAYFAlGlvYwACgkQknrdDGLu8JAbOwD/UqB5Fk/OuOUbu/AZTYE5JLKJ
+Et3szQdwspmsutlbmzkA93ksSfd43vtT6zIYAXP54J2Uu7dHr/u3H8kubpeFiIQ=
+=znSx
+-----END PGP SIGNATURE-----
diff --git a/media-sound/flacon/flacon-0.5.7.ebuild b/media-sound/flacon/flacon-0.5.7.ebuild
deleted file mode 100644
index 86fa04ba2737..000000000000
--- a/media-sound/flacon/flacon-0.5.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.5.7.ebuild,v 1.1 2011/09/24 18:15:13 maksbotan Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
-HOMEPAGE="https://code.google.com/p/flacon/"
-SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac mac mp3 ogg replaygain tta wavpack"
-
-RDEPEND="
-	dev-python/PyQt4[X]
-	media-sound/shntool[mac?]
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	ogg? ( media-sound/vorbis-tools )
-	tta? ( media-sound/ttaenc )
-	wavpack? ( media-sound/wavpack )
-	replaygain? (
-		mp3? ( media-sound/mp3gain )
-		ogg? ( media-sound/vorbisgain )
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/media-sound/flacon/flacon-0.6.0.ebuild b/media-sound/flacon/flacon-0.6.0.ebuild
deleted file mode 100644
index c58cb1c35b37..000000000000
--- a/media-sound/flacon/flacon-0.6.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.6.0.ebuild,v 1.1 2011/12/07 20:11:31 maksbotan Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
-HOMEPAGE="https://code.google.com/p/flacon/"
-SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
-
-RDEPEND="
-	dev-python/PyQt4[X]
-	media-sound/shntool[mac?]
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	mp4? ( media-libs/faac )
-	ogg? ( media-sound/vorbis-tools )
-	tta? ( media-sound/ttaenc )
-	wavpack? ( media-sound/wavpack )
-	replaygain? (
-		mp3? ( media-sound/mp3gain )
-		ogg? ( media-sound/vorbisgain )
-	)
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-
-	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
-}
-
-src_compile() { :; }
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/media-sound/flacon/flacon-0.8.0.ebuild b/media-sound/flacon/flacon-0.8.0.ebuild
new file mode 100644
index 000000000000..9313aaf08b1e
--- /dev/null
+++ b/media-sound/flacon/flacon-0.8.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/flacon/flacon-0.8.0.ebuild,v 1.1 2013/05/29 08:33:51 xmw Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PLOCALES="cs_CZ es_MX fr gl it pl_PL pt_BR ro_RO ru si_LK uk zh_CN zh_TW"
+
+inherit python-single-r1 l10n
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://code.google.com/p/flacon/"
+SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	my_rm_loc() {
+		rm -v "translations/${PN}_${1}."{ts,qm} || die
+	}
+
+	l10n_find_plocales_changes "translations" "${PN}_" '.qm'
+	l10n_for_each_disabled_locale_do my_rm_loc
+	touch translations/dummy.{ts,qm}
+
+	python_fix_shebang .
+
+	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
+
+	# do not use /tmp/ for tests
+	sed -e "s,/tmp/,${T}/," \
+		-i Makefile tests/flacon_tests.py || die
+}
+
+src_compile() { :; }
+
+src_test() {
+	"${PYTHON}" tests/flacon_tests.py --verbose || die "Testing failed with ${PYTHON}"
+}
+
+src_install() {
+	default
+
+	rm "${D}"/usr/share/${PN}/translations/dummy.qm
+
+	python_optimize "${D}"
+}
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index 7fd9f25cb552..b63779ec0641 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -11,6 +11,7 @@
 		<name>Maxim Koltsov</name>
 	</maintainer>
 	<use>
+		<flag name='linguas_si_LK'>Sinhala locale</flag>
 		<flag name='mac'>Add support for Monkey's Audio files</flag>
 		<flag name='replaygain'>Support for Replay Gain metadata, for relative volume adjustment</flag>
 		<flag name='tta'>Add support for True Audio encoding</flag>