Revbump. Change slot to 3.5 as is expected to all kde3 apps. Depend on correct slot for amarok. Per bug #271265. Remove old.

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 81 insertions, 64 deletions

diff --git a/media-sound/transkode/ChangeLog b/media-sound/transkode/ChangeLog
index 0e590878976a..101b1f77083e 100644
--- a/media-sound/transkode/ChangeLog
+++ b/media-sound/transkode/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/transkode
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.16 2009/04/30 19:32:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/ChangeLog,v 1.17 2009/05/26 09:05:58 scarabeus Exp $
+
+*transkode-0.7-r2 (26 May 2009)
+
+  26 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -transkode-0.6-r1.ebuild, transkode-0.7-r1.ebuild,
+  +transkode-0.7-r2.ebuild:
+  Revbump. Change slot to 3.5 as is expected to all kde3 apps. Depend on
+  correct slot for amarok. Per bug #271265. Remove old.
 
   30 Apr 2009; Brent Baude <ranger@gentoo.org> transkode-0.7.ebuild:
   stable ppc, bug 252691
diff --git a/media-sound/transkode/transkode-0.6-r1.ebuild b/media-sound/transkode/transkode-0.6-r1.ebuild
deleted file mode 100644
index ce0cabcb038a..000000000000
--- a/media-sound/transkode/transkode-0.6-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 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.3 2008/12/26 17:14:05 scarabeus Exp $
-
-EAPI="1"
-
-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:0 )"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	shorten? ( media-sound/shorten )
-	wavpack? ( media-sound/wavpack )
-	media-video/mplayer"
-
-need-kde 3.5
-
-PATCHES=(
-	"${FILESDIR}/${P}-wavpack-options-fix.patch"
-	"${FILESDIR}/${P}-wvunpack-options-fix.patch"
-	"${FILESDIR}/${P}+gcc-4.3.patch"
-	)
-
-src_compile() {
-	local myconf="$(use_enable amarok amarokscript)"
-
-	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
-}
diff --git a/media-sound/transkode/transkode-0.7-r1.ebuild b/media-sound/transkode/transkode-0.7-r1.ebuild
index 731b3a6d589d..91f10438f9ba 100644
--- a/media-sound/transkode/transkode-0.7-r1.ebuild
+++ b/media-sound/transkode/transkode-0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/transkode-0.7-r1.ebuild,v 1.1 2009/02/13 23:38:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/transkode-0.7-r1.ebuild,v 1.2 2009/05/26 09:05:58 scarabeus Exp $
 
 EAPI="1"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="amarok ffmpeg gstreamer mplayer wavpack xine"
 
 RDEPEND="media-libs/taglib
-	amarok? ( media-sound/amarok:0 )
+	amarok? ( media-sound/amarok:3.5 )
 	ffmpeg? ( media-video/ffmpeg )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
diff --git a/media-sound/transkode/transkode-0.7-r2.ebuild b/media-sound/transkode/transkode-0.7-r2.ebuild
new file mode 100644
index 000000000000..ffabe07d9655
--- /dev/null
+++ b/media-sound/transkode/transkode-0.7-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/transkode/transkode-0.7-r2.ebuild,v 1.1 2009/05/26 09:05:58 scarabeus Exp $
+
+EAPI="1"
+
+ARTS_REQUIRED="never"
+inherit kde confutils
+
+DESCRIPTION="transKode is a 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="3.5"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="amarok ffmpeg gstreamer mplayer wavpack xine"
+
+RDEPEND="!${CATEGORY}/${PN}:0
+	media-libs/taglib
+	amarok? ( media-sound/amarok:3.5 )
+	ffmpeg? ( media-video/ffmpeg )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-good-0.10
+		>=media-plugins/gst-plugins-flac-0.10
+		>=media-plugins/gst-plugins-lame-0.10
+		>=media-plugins/gst-plugins-vorbis-0.10
+		>=media-plugins/gst-plugins-ogg-0.10
+		>=media-plugins/gst-plugins-faad-0.10
+		)
+	mplayer? ( media-video/mplayer )
+	wavpack? ( media-sound/wavpack )
+	xine? ( media-sound/xineadump )"
+DEPEND="${RDEPEND}"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.3.patch"
+	"${FILESDIR}/transkode-0.7-desktop-file.diff"
+	)
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	kde_pkg_setup
+	confutils_require_built_with_any ffmpeg mplayer gstreamer xine
+}
+
+src_unpack() {
+	kde_src_unpack
+	rm -f "${S}"/configure
+}
+
+src_compile() {
+	local myconf="$(use_enable amarok amarokscript)"
+	kde_src_compile
+}
+
+pkg_postinst() {
+	kde_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
+}