Added wavpack patches from bug 186033. Thanks, Jure!

Package-Manager: portage-2.1.3_rc8

6 files changed, 113 insertions, 9 deletions

diff --git a/media-sound/transkode/ChangeLog b/media-sound/transkode/ChangeLog
index 7a38f2de1b04..e5d015b664a6 100644
--- a/media-sound/transkode/ChangeLog
+++ b/media-sound/transkode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/transkode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.7 2007/03/19 03:06:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.8 2007/07/21 19:07:49 philantrop Exp $
+
+*transkode-0.6-r1 (21 Jul 2007)
+
+  21 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/transkode-0.6-wavpack-options-fix.patch,
+  +files/transkode-0.6-wvunpack-options-fix.patch, +transkode-0.6-r1.ebuild:
+  Added wavpack patches from bug 186033. Thanks, Jure!
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove flameeyes from metadata.xml due to retirement.
diff --git a/media-sound/transkode/Manifest b/media-sound/transkode/Manifest
index ced31324856c..8b75e19bd480 100644
--- a/media-sound/transkode/Manifest
+++ b/media-sound/transkode/Manifest
@@ -1,8 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX transkode-0.6-wavpack-options-fix.patch 618 RMD160 d434e889be88ac313cd3c3f654ffc1b6aab960ad SHA1 d0cf776fe5057c323aef1c55dc44b8957c8b6b36 SHA256 d022e8c16940ead177106ac16d90001c99f82720220c0018e8038086f71350ae
+MD5 38b8795f16f60e90c07241d4da382fb5 files/transkode-0.6-wavpack-options-fix.patch 618
+RMD160 d434e889be88ac313cd3c3f654ffc1b6aab960ad files/transkode-0.6-wavpack-options-fix.patch 618
+SHA256 d022e8c16940ead177106ac16d90001c99f82720220c0018e8038086f71350ae files/transkode-0.6-wavpack-options-fix.patch 618
+AUX transkode-0.6-wvunpack-options-fix.patch 517 RMD160 5aab4363f834ae171b11df51f810d4e1b91ca001 SHA1 325e8c500489d07376e46ad1fd7f109bc5e4229f SHA256 2daff1bed25e30d9a548c7be1e931ea61122c03f2f73ba2c5856d6f24a521f86
+MD5 7c9a0c66c8652f1354a2413dacdc6cc1 files/transkode-0.6-wvunpack-options-fix.patch 517
+RMD160 5aab4363f834ae171b11df51f810d4e1b91ca001 files/transkode-0.6-wvunpack-options-fix.patch 517
+SHA256 2daff1bed25e30d9a548c7be1e931ea61122c03f2f73ba2c5856d6f24a521f86 files/transkode-0.6-wvunpack-options-fix.patch 517
 DIST transkode-0.6.tar.bz2 871042 RMD160 86d082c1d56d915d20083d9e897477b12abc9ff0 SHA1 33636a8caddf55696a31a2e39c49b9c411bae841 SHA256 2538063f735c4a4d9f9b379b37073970a255c8328eb487fa06c69ffe8ff83e67
 DIST transkode-0.6b2.tar.bz2 803534 RMD160 9b55935045cad67bebee69589d131c076a2b2bb8 SHA1 36601cf0ee877a08f51614f6fbfd289e922f456b SHA256 7f447c37b9c7db1afc45294ab4f11cbc369b718e372345089b72f5f28d99cc9d
+EBUILD transkode-0.6-r1.ebuild 1477 RMD160 3790b985c4fb23c761799bd100294c0831de077c SHA1 7d2803db9cac4669e532e39a7b4bd9d6217aa30b SHA256 1063a41fdb870c60659dfe3b10a62ced355be1923ab49f111fe8775cadd08437
+MD5 6c4e4137ebc4b91370d6225710cbe637 transkode-0.6-r1.ebuild 1477
+RMD160 3790b985c4fb23c761799bd100294c0831de077c transkode-0.6-r1.ebuild 1477
+SHA256 1063a41fdb870c60659dfe3b10a62ced355be1923ab49f111fe8775cadd08437 transkode-0.6-r1.ebuild 1477
 EBUILD transkode-0.6.ebuild 1358 RMD160 8a3e690b74e1d7df7b0a06641259b9a69cfb54a2 SHA1 2633685806efd3c323daa8ddf78f9ef0d1c873a3 SHA256 393aaa69aec39098990329b4568efe63e386ad7c69106fc458ea2afc268f6c77
 MD5 07102aad3f189042264bb4ed9dade6b3 transkode-0.6.ebuild 1358
 RMD160 8a3e690b74e1d7df7b0a06641259b9a69cfb54a2 transkode-0.6.ebuild 1358
@@ -11,10 +23,10 @@ EBUILD transkode-0.6_beta2.ebuild 1149 RMD160 0e6b0f6154ad145f66035063bc3520ee6e
 MD5 069d41baccb3c2a6a171b6d8a0a77524 transkode-0.6_beta2.ebuild 1149
 RMD160 0e6b0f6154ad145f66035063bc3520ee6efabaae transkode-0.6_beta2.ebuild 1149
 SHA256 dda29a6dc0b99ac4e40c1202dea42a2f0dcea9641a05cb44a25b467e5d6581fe transkode-0.6_beta2.ebuild 1149
-MISC ChangeLog 1512 RMD160 c5ad148e550f6e09baa5c1249d5657e35e39903d SHA1 acd2adc14c287037e9043a0ed15ef2641c75f08c SHA256 df8c8d6080756cef0e0343bc1bf57fa38d8e064b380b49017d73ad204054067f
-MD5 9cabcf35f0a994385fa69f3d911a6133 ChangeLog 1512
-RMD160 c5ad148e550f6e09baa5c1249d5657e35e39903d ChangeLog 1512
-SHA256 df8c8d6080756cef0e0343bc1bf57fa38d8e064b380b49017d73ad204054067f ChangeLog 1512
+MISC ChangeLog 1787 RMD160 bba0fb2f4a8bb55981723cfc10933d0e2046117b SHA1 d8baee08bf788f4fbe3160b8f9be1a0ce1f04e97 SHA256 651ed6c0c01d2e61c94baeb5e40d3bfc574a2b0950284fb853364969da82f3cc
+MD5 d0ea6bf6cfe160aaeb8fee4e7dc49aff ChangeLog 1787
+RMD160 bba0fb2f4a8bb55981723cfc10933d0e2046117b ChangeLog 1787
+SHA256 651ed6c0c01d2e61c94baeb5e40d3bfc574a2b0950284fb853364969da82f3cc ChangeLog 1787
 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
@@ -22,13 +34,16 @@ SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata
 MD5 90aff3c6cd53fb1fe2c6961b79da2810 files/digest-transkode-0.6 244
 RMD160 8ec4ef074088180343cf3868ce4de075ba5c9df8 files/digest-transkode-0.6 244
 SHA256 98c0291a471e9ea013677405bee89815f964b5e980878fb261a27709ad0b08e4 files/digest-transkode-0.6 244
+MD5 90aff3c6cd53fb1fe2c6961b79da2810 files/digest-transkode-0.6-r1 244
+RMD160 8ec4ef074088180343cf3868ce4de075ba5c9df8 files/digest-transkode-0.6-r1 244
+SHA256 98c0291a471e9ea013677405bee89815f964b5e980878fb261a27709ad0b08e4 files/digest-transkode-0.6-r1 244
 MD5 700f256d1156f1bfc755cd2e9a15937c files/digest-transkode-0.6_beta2 250
 RMD160 3ab9bc5734ca1e8c76e6737ec4a0ea420abc86a9 files/digest-transkode-0.6_beta2 250
 SHA256 091b63b033badc07d97850fc672773578ab2aa8e019d546db3ba172064e1c74c files/digest-transkode-0.6_beta2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFF/f3yugEuf3OQ0akRAouPAJ9h+qyt8UPtGT1ZaIDb69jSif0vKwCcDRvk
-379EiQcAWrVH6a9i81Gx4ug=
-=6ASm
+iD8DBQFGolmTCkvF58q80IkRAvbZAKCDcM+VTio8zH5NUvD6qAYs4eGQSACeP5Tk
+n3UylltQ/bJT5xP5vT2A+yM=
+=+t7f
 -----END PGP SIGNATURE-----
diff --git a/media-sound/transkode/files/digest-transkode-0.6-r1 b/media-sound/transkode/files/digest-transkode-0.6-r1
new file mode 100644
index 000000000000..ca52d0e148d7
--- /dev/null
+++ b/media-sound/transkode/files/digest-transkode-0.6-r1
@@ -0,0 +1,3 @@
+MD5 6ce8c946277d925b76e122fee1f45626 transkode-0.6.tar.bz2 871042
+RMD160 86d082c1d56d915d20083d9e897477b12abc9ff0 transkode-0.6.tar.bz2 871042
+SHA256 2538063f735c4a4d9f9b379b37073970a255c8328eb487fa06c69ffe8ff83e67 transkode-0.6.tar.bz2 871042
diff --git a/media-sound/transkode/files/transkode-0.6-wavpack-options-fix.patch b/media-sound/transkode/files/transkode-0.6-wavpack-options-fix.patch
new file mode 100644
index 000000000000..214d9ddf5d27
--- /dev/null
+++ b/media-sound/transkode/files/transkode-0.6-wavpack-options-fix.patch
@@ -0,0 +1,11 @@
+--- transkode-0.6.orig/src/plugins/wavpack/wavpackencoderplugin.h	2006-08-18 00:59:15.000000000 +0200
++++ transkode-0.6/src/plugins/wavpack/wavpackencoderplugin.h	2007-07-19 16:28:46.443403130 +0200
+@@ -59,7 +59,7 @@
+ 			if ( ! metadata[Tag::title].isEmpty() )		{ proc << "-w" << "title=" + metadata[Tag::title]; }
+ 			if ( ! metadata[Tag::comment].isEmpty() )	{ proc << "-w" << "comment=" + metadata[Tag::comment]; }
+ 			if ( ! metadata[Tag::genre].isEmpty() )		{ proc << "-w" << "genre=" + metadata[Tag::genre]; }
+-			proc << src << dst;
++			proc << src << "-o" << dst;
+ 			proc.setShellParsingMode( pMode );
+ 		}
+ 
diff --git a/media-sound/transkode/files/transkode-0.6-wvunpack-options-fix.patch b/media-sound/transkode/files/transkode-0.6-wvunpack-options-fix.patch
new file mode 100644
index 000000000000..74e6515846f6
--- /dev/null
+++ b/media-sound/transkode/files/transkode-0.6-wvunpack-options-fix.patch
@@ -0,0 +1,11 @@
+--- transkode-0.6.orig/src/plugins/wvunpack/wvunpackdecoderplugin.h	2006-09-10 01:02:44.000000000 +0200
++++ transkode-0.6/src/plugins/wvunpack/wvunpackdecoderplugin.h	2007-07-17 22:02:28.921011061 +0200
+@@ -39,7 +39,7 @@ class WvUnpackDecoderPlugin : public Tra
+ 			proc.clearArguments();
+ 			bool pMode = proc.getShellParsingMode();
+ 			proc.setShellParsingMode( false );
+-			proc << programPath() << "-d" << src << dst;
++			proc << programPath() << src << "-o" << dst;
+ 			proc.setShellParsingMode( pMode );
+ 		}
+ 
diff --git a/media-sound/transkode/transkode-0.6-r1.ebuild b/media-sound/transkode/transkode-0.6-r1.ebuild
new file mode 100644
index 000000000000..c30ad7b69f51
--- /dev/null
+++ b/media-sound/transkode/transkode-0.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/transkode-0.6-r1.ebuild,v 1.1 2007/07/21 19:07:49 philantrop Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde eutils
+
+DESCRIPTION="KDE frontend for various audio transcoding tools"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=37669"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+IUSE="amarok shorten wavpack"
+
+RDEPEND="media-libs/taglib
+	amarok? ( media-sound/amarok )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	shorten? ( media-sound/shorten )
+	wavpack? ( media-sound/wavpack )
+	media-video/mplayer"
+
+need-kde 3.5
+
+src_compile() {
+	local myconf="$(use_enable amarok amarokscript)"
+
+	epatch "${FILESDIR}/${P}-wavpack-options-fix.patch"
+	epatch "${FILESDIR}/${P}-wvunpack-options-fix.patch"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	dodir /usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Utilities/${PN}.desktop" \
+		"${D}/usr/share/applications/kde"
+
+	echo "Categories=Qt;KDE;AudioVideo;" \
+		>> "${D}/usr/share/applications/kde/${PN}.desktop"
+}
+
+pkg_postinst() {
+	if use amarok; then
+		elog "If you want to use TransKode to encode audio files on the fly"
+		elog "when transferring music to a portable media device, remember"
+		elog "to start the TransKode script through the Script Manager"
+		elog "on the Tools menu."
+	fi
+}