Don't use custom src_install function. Fix improper split KDE ebuild dependencies. Get rid of invalid aRts dependency. Fixed desktop file. Build with GCC 4.3, bug #251261.

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

4 files changed, 94 insertions, 2 deletions

diff --git a/media-tv/ktvschedule/ChangeLog b/media-tv/ktvschedule/ChangeLog
index fbc2eb7398ca..4dbb94e32111 100644
--- a/media-tv/ktvschedule/ChangeLog
+++ b/media-tv/ktvschedule/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/ktvschedule
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ktvschedule/ChangeLog,v 1.4 2008/02/19 01:53:33 ingmar Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ktvschedule/ChangeLog,v 1.5 2009/02/14 20:10:07 carlo Exp $
+
+*ktvschedule-0.1.9.1-r1 (14 Feb 2009)
+
+  14 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/ktvschedule-0.1.9.1-desktop-file.diff,
+  +files/ktvschedule-0.1.9.1-gcc43.diff, +ktvschedule-0.1.9.1-r1.ebuild:
+  Don't use custom src_install function. Fix improper split KDE ebuild
+  dependencies. Get rid of invalid aRts dependency. Fixed desktop file. Build
+  with GCC 4.3, bug #251261.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   ktvschedule-0.1.9.1.ebuild:
diff --git a/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-desktop-file.diff b/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-desktop-file.diff
new file mode 100644
index 000000000000..c5b3c112495a
--- /dev/null
+++ b/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-desktop-file.diff
@@ -0,0 +1,26 @@
+--- src/ktvschedule.desktop.o	2009-02-14 17:50:27.000000000 +0100
++++ src/ktvschedule.desktop	2009-02-14 18:00:17.000000000 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=ktvschedule
+ Name[xx]=xxktvschedulexx
+ Exec=ktvschedule
+@@ -31,4 +30,4 @@
+ Comment[xx]=xxA simple KDE Applicationxx
+ Comment[zh_CN]=一个简单的KDE应用程序
+ GenericName=TV Scheduler
+-Categories=Qt;KDE;Utility
+\ No newline at end of file
++Categories=Qt;KDE;AudioVideo;Video;TV;Utility;
+--- src/Makefile.am.o	2009-02-14 17:50:53.000000000 +0100
++++ src/Makefile.am	2009-02-14 18:00:59.000000000 +0100
+@@ -25,7 +25,7 @@
+ ktvschedule_LDADD = $(LIB_KIO) $(LIB_KDEUI)
+ 
+ # this is where the desktop file will go 
+-shelldesktopdir   = $(kde_appsdir)/Utilities
++shelldesktopdir   = $(xdg_appsdir)
+ shelldesktop_DATA = ktvschedule.desktop
+ xdg_apps_DATA = ktvschedule.desktop
+ 
diff --git a/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-gcc43.diff b/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-gcc43.diff
new file mode 100644
index 000000000000..b2132128c4b5
--- /dev/null
+++ b/media-tv/ktvschedule/files/ktvschedule-0.1.9.1-gcc43.diff
@@ -0,0 +1,23 @@
+diff -rupN ktvschedule-0.1.9.1b/src/prefsdialog.cpp ktvschedule-0.1.9.1/src/prefsdialog.cpp
+--- ktvschedule-0.1.9.1b/src/prefsdialog.cpp	2009-01-23 17:11:01.000000000 -0400
++++ ktvschedule-0.1.9.1/src/prefsdialog.cpp	2009-01-23 17:13:58.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <klineedit.h>      // for KLineEdit
+ #include <kmessagebox.h> 
+ #include <qwidgetstack.h>
++#include <cstdlib>
+ 
+ #include "configuration.h"
+ #include "styleprefslayout.h"
+
+diff -rupN ktvschedule-0.1.9.1b/src/tvguidetable.cpp ktvschedule-0.1.9.1/src/tvguidetable.cpp
+--- ktvschedule-0.1.9.1b/src/tvguidetable.cpp	2009-01-23 17:11:01.000000000 -0400
++++ ktvschedule-0.1.9.1/src/tvguidetable.cpp	2009-01-23 17:13:31.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include <kiconloader.h>
+ #include <knotifyclient.h>
+ #include <klocale.h>
++#include <cstdlib>
+ 
+ #include <qframe.h>
+ #include <qfont.h>
diff --git a/media-tv/ktvschedule/ktvschedule-0.1.9.1-r1.ebuild b/media-tv/ktvschedule/ktvschedule-0.1.9.1-r1.ebuild
new file mode 100644
index 000000000000..972cd29d5447
--- /dev/null
+++ b/media-tv/ktvschedule/ktvschedule-0.1.9.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ktvschedule/ktvschedule-0.1.9.1-r1.ebuild,v 1.1 2009/02/14 20:10:07 carlo Exp $
+
+EAPI="1"
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+DESCRIPTION="KDE frontend for TV listings guide grabbers xmltv and nxtvpeg"
+HOMEPAGE="http://ktvschedule.berlios.de/"
+# SRC_URI hardcoded because of an upstream tarring bug
+SRC_URI="mirror://berlios/ktvschedule/ktvschedule-0.1.9.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	|| ( media-tv/nxtvepg media-tv/xmltv )
+	|| ( ( kde-base/korganizer:3.5 kde-base/kalarm:3.5 ) kde-base/kdepim:3.5 )"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/ktvschedule-0.1.9.1-gcc43.diff"
+	"${FILESDIR}/ktvschedule-0.1.9.1-desktop-file.diff"
+	)
+
+src_unpack(){
+	kde_src_unpack
+	rm -f "${S}"/configure
+}