Fix dependencies, install cuetag.sh to /usr/bin. Fixes bug 327271 by Alexander Kozyrev <sequoiahead@gmail.com>

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

5 files changed, 68 insertions, 35 deletions

diff --git a/app-cdr/cuetools/ChangeLog b/app-cdr/cuetools/ChangeLog
index a6059a87f80c..55cd7891f14e 100644
--- a/app-cdr/cuetools/ChangeLog
+++ b/app-cdr/cuetools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cuetools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/ChangeLog,v 1.15 2009/06/20 22:10:05 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/ChangeLog,v 1.16 2011/08/07 13:21:10 xarthisius Exp $
+
+*cuetools-1.3.1-r2 (07 Aug 2011)
+
+  07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -cuetools-1.3.1-r1.ebuild, +cuetools-1.3.1-r2.ebuild,
+  +files/cuetools-1.3.1-flac.patch:
+  Fix dependencies, install cuetag.sh to /usr/bin. Fixes bug 327271 by
+  Alexander Kozyrev <sequoiahead@gmail.com>
 
 *cuetools-1.3.1-r1 (20 Jun 2009)
 
diff --git a/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild b/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild
deleted file mode 100644
index baa496d1584f..000000000000
--- a/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/cuetools-1.3.1-r1.ebuild,v 1.1 2009/06/20 22:10:05 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities to manipulate and convert cue and toc files"
-HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-debian.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}/${P}-debian.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README TODO || die
-	docinto extras
-	dodoc extras/{cue{convert.cgi,tag.sh},*.txt} || die
-}
diff --git a/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild b/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..da8f0366db53
--- /dev/null
+++ b/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild,v 1.1 2011/08/07 13:21:10 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Utilities to manipulate and convert cue and toc files"
+HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex"
+RDEPEND="extras? (
+		media-sound/vorbis-tools
+		media-libs/flac
+		media-sound/mp3info
+	)"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-flac.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README TODO
+	use extras && dobin extras/cuetag.sh
+	docinto extras
+	dodoc extras/{cueconvert.cgi,*.txt}
+}
diff --git a/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch b/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch
new file mode 100644
index 000000000000..32c76b8b0ee7
--- /dev/null
+++ b/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch
@@ -0,0 +1,16 @@
+Fix cuetag for media-libs/flac-1.2.1
+
+https://bugs.gentoo.org/show_bug.cgi?id=327271
+
+Patch written by Alexander Kozyrev <sequoiahead@gmail.com>
+--- a/extras/cuetag.sh
++++ b/extras/cuetag.sh
+@@ -18,7 +18,7 @@
+ {
+ 	# FLAC tagging
+ 	# --remove-vc-all overwrites existing comments
+-	METAFLAC="metaflac --remove-vc-all --import-vc-from=-"
++	METAFLAC="metaflac --remove-all-tags --import-tags-from=-"
+ 
+ 	# Ogg Vorbis tagging
+ 	# -w overwrites existing comments
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
index 57204ded2915..59121c9718a8 100644
--- a/app-cdr/cuetools/metadata.xml
+++ b/app-cdr/cuetools/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<longdescription lang="en">
-</longdescription>
+	<herd>media-optical</herd>
+	<use>
+		<flag name='extras'>Install additional script that tag files based on cue/toc file information</flag>
+	</use>
 </pkgmetadata>
-