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

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

6 files changed, 78 insertions, 42 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/Manifest b/app-cdr/cuetools/Manifest
index 85e9d3135c6b..5925a065de3a 100644
--- a/app-cdr/cuetools/Manifest
+++ b/app-cdr/cuetools/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cuetools-1.3.1-flac.patch 457 RMD160 76755770087fca97478fb28100bbe863eb7181e8 SHA1 c61754882095b434e4665d680d9ec4706edc7fa3 SHA256 6cd022a9a64ef774c25042e801f79bedbf2a5bd61c5b0ef89e238a776d104313
 DIST cuetools-1.3.1-debian.patch.bz2 7622 RMD160 5323799558a305829345a612041ccabfb96a62b0 SHA1 97469cd422af255f12be602eed3f689940ad7058 SHA256 65bd4f3a306618383fb94eb452ecb01ff8c06622db6c6c48133a74bf962c4f2c
 DIST cuetools-1.3.1.tar.gz 161483 RMD160 8bad93c40b7d0ba8b1f8ffdc84b9d460113ca2cd SHA1 ad760cdf76d6548471144302f88bf0a66f1d5ea2 SHA256 6eb54fa619e55cb73348b2bfc71262a394cda280f613d3913e8c766d9cb2bdde
-EBUILD cuetools-1.3.1-r1.ebuild 785 RMD160 befa8015e259dcb5726b560c66a97356204761fa SHA1 7c5e6784a40794bc16ccb6ac29667a4e2fe79ac8 SHA256 e8bab98a0ebea5de9bcde612265c9fc12ce09341f28d4385ea8e8f678af37c32
+EBUILD cuetools-1.3.1-r2.ebuild 921 RMD160 6e5054816b9f32ba37c9ff2014791fee3f247d96 SHA1 c7c4295500177885621d1fa5c5ceef75878483b5 SHA256 82798b4e949be16f1bf3084a02e4068d99f32ce592d00b9f6d50471bf1cf62f5
 EBUILD cuetools-1.3.1.ebuild 825 RMD160 9e14a7682a938882c099caaea3c434ea5a8455e0 SHA1 11937965e5cede75e64f01a536685153cd353248 SHA256 6649cb274e79af1503413cd4929c5c2a2f54246d0653a7dbb671734a4dfbad80
-MISC ChangeLog 2205 RMD160 e3e94daf9b5502c6d65228583b8f2aa53a61bfa3 SHA1 fa4c17d574544e8e8d5bea6375d4cfb9a54c964f SHA256 a68b9a5cf8fd03f396576ba21207325ece5016bc367c319b0151ebef100a423c
-MISC metadata.xml 214 RMD160 4120d9f1b831e1e14b793d69fcac8404e240747f SHA1 3852ff2530e5f89eaa57f1e316ba6684fadc2579 SHA256 f246585065033926d43d6fb617cf1c19cca0dd470c7efa44cbf957a9fa9e07b7
+MISC ChangeLog 2502 RMD160 e99f8dd9b3a3951c365ae5ffe3495298d0d2512f SHA1 14ad3ec0b376f32ec7d96e4752b4989ecc44418a SHA256 243c705d993216fe759fe4175e78ceb71df1f9642b27e2ebd007446631238e0b
+MISC metadata.xml 286 RMD160 cfa73000343c2205faadc9fd71799d12c132ea21 SHA1 b84e643a495788358cf0a1d351c96b9999cf5c76 SHA256 85a58bb4b85810e95356527c2be858987a336f46649601b50cd6df3eae49bdc0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAko9XkMACgkQAiZjviIA2XhXmQCgtReVdb8PjSZPFrw6RG/LQlyQ
-rEUAoMdG+cLdeRPQt9+Pi9YX5Q5wTgAB
-=Vs3L
+iJwEAQECAAYFAk4+kU8ACgkQIiMqcbOVdxQKlwP5AZzr0x3DVEq6eQDdVlqkxlKS
+L6MxDZ14V6a9cT4tnp54ua9KGiZ4Klb248qJvAb9GGB8s48Iv7KzU2bGf+T2gGLs
+CEyBKOBeBO8KVAHhWo7KrR4I5oaYEcpTD5zBqo+gMGv5Fn/WjFD0BEkn+sfwV9vj
+SeHHfUy1TOoQLeUSIwQ=
+=uEP2
 -----END PGP SIGNATURE-----
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>
-