Version bump. Per bug #259704. Remove old broken snapshot. Note this means removal of kde3 version and adding kde4 one.

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

5 files changed, 59 insertions, 87 deletions

diff --git a/media-sound/kradio/ChangeLog b/media-sound/kradio/ChangeLog
index 0ef8e105f025..507aed880908 100644
--- a/media-sound/kradio/ChangeLog
+++ b/media-sound/kradio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/kradio
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.19 2009/02/13 20:38:37 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/ChangeLog,v 1.20 2009/05/30 21:26:47 scarabeus Exp $
+
+*kradio-4.0.0_rc4 (30 May 2009)
+
+  30 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +kradio-4.0.0_rc4.ebuild, -kradio-20061112-r2.ebuild,
+  -files/kradio-20061112-desktop-file.diff,
+  -files/kradio-20061112-gcc43.patch:
+  Version bump. Per bug #259704. Remove old broken snapshot. Note this means
+  removal of kde3 version and adding kde4 one.
 
 *kradio-20061112-r2 (13 Feb 2009)
 
diff --git a/media-sound/kradio/files/kradio-20061112-desktop-file.diff b/media-sound/kradio/files/kradio-20061112-desktop-file.diff
deleted file mode 100644
index 3fd41793896d..000000000000
--- a/media-sound/kradio/files/kradio-20061112-desktop-file.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./kradio3/src/kradio.desktop.orig	2009-02-13 20:59:58.000000000 +0100
-+++ ./kradio3/src/kradio.desktop	2009-02-13 20:59:58.000000000 +0100
-@@ -1,10 +1,9 @@
- # KDE Config File  
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
--Exec=kradio -caption "%c" %i %m  
--Icon=kradio.png
--DocPath=kradio/index.html
-+Exec=kradio -caption "%c" %i  
-+Icon=kradio
-+X-DocPath=kradio/index.html
- Comment=
- Comment[de]=
- Terminal=false
diff --git a/media-sound/kradio/files/kradio-20061112-gcc43.patch b/media-sound/kradio/files/kradio-20061112-gcc43.patch
deleted file mode 100644
index a7e161061e03..000000000000
--- a/media-sound/kradio/files/kradio-20061112-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kradio3/plugins/lirc/lircsupport.cpp
-+++ kradio3/plugins/lirc/lircsupport.cpp
-@@ -29,6 +29,8 @@
- #include <kaboutdata.h>
- #include <kstandarddirs.h>
- 
-+#include <cstdlib>
-+
- #include "../../src/include/errorlog-interfaces.h"
- #include "../../src/include/radiodevice_interfaces.h"
- #include "../../src/include/stationlist.h"
diff --git a/media-sound/kradio/kradio-20061112-r2.ebuild b/media-sound/kradio/kradio-20061112-r2.ebuild
deleted file mode 100644
index aecea7b49391..000000000000
--- a/media-sound/kradio/kradio-20061112-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-20061112-r2.ebuild,v 1.1 2009/02/13 20:38:37 carlo Exp $
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-MY_PV="snapshot-2006-11-12-r497"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="KRadio is a radio tuner application for KDE."
-HOMEPAGE="http://kradio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa lirc encode vorbis v4l2 oss"
-
-DEPEND="lirc? ( app-misc/lirc )
-	media-libs/libsndfile
-	encode? ( media-sound/lame )
-	vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}"
-need-kde 3.5
-
-PATCHES=(
-	"${FILESDIR}/kradio-20061112-gcc43.patch"
-	"${FILESDIR}/kradio-20061112-desktop-file.diff"
-	)
-
-src_unpack() {
-	kde_src_unpack
-	rm "${S}"/configure
-}
-
-src_compile() {
-	if ! use vorbis; then
-		myconf="${myconf} --enable-ogg=no"
-	fi
-	if ! use encode; then
-		myconf="${myconf} --enable-lame=no"
-	fi
-	if ! use lirc; then
-		myconf="${myconf} --enable-lirc=no"
-	fi
-	if ! use alsa; then
-		myconf="${myconf} --enable-alsa=no"
-	fi
-	if ! use v4l2; then
-		myconf="${myconf} --enable-v4l2=no"
-	fi
-	if ! use oss; then
-		myconf="${myconf} --enable-oss=no"
-	fi
-	kde_src_compile || die "make failed"
-}
diff --git a/media-sound/kradio/kradio-4.0.0_rc4.ebuild b/media-sound/kradio/kradio-4.0.0_rc4.ebuild
new file mode 100644
index 000000000000..34b8b1cbd3de
--- /dev/null
+++ b/media-sound/kradio/kradio-4.0.0_rc4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kradio/kradio-4.0.0_rc4.ebuild,v 1.1 2009/05/30 21:26:47 scarabeus Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="cs de es pl pt ru uk"
+inherit kde4-base
+
+MY_P="${PN}4-${PV/_/-}"
+
+DESCRIPTION="kradio is a radio tuner application for KDE"
+HOMEPAGE="http://kradio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="alsa debug encode ffmpeg lirc +mp3 +vorbis v4l2"
+
+DEPEND="
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	lirc? ( app-misc/lirc )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
+	ffmpeg? (
+		>=media-libs/libmms-0.4
+		<media-video/ffmpeg-0.5
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs="$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with mp3 LAME)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with lirc LIRC)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with v4l2 V4L2)"
+
+	kde4-base_src_configure
+}