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

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 79 insertions, 115 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/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>