Get rid of invalid aRts dependency. Improved desktop file fix.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 83 insertions, 12 deletions

diff --git a/media-tv/ktvschedule/Manifest b/media-tv/ktvschedule/Manifest
index 0593268cd0a0..92e9e8581079 100644
--- a/media-tv/ktvschedule/Manifest
+++ b/media-tv/ktvschedule/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ktvschedule-0.1.9.1-desktop-file.diff 861 RMD160 4b531f95917bc284aa142f8415e75b9ee35d5e99 SHA1 5aabeefbc7876c0939e192f36fb50cf7ba2ea480 SHA256 a3d2a756ade1c37dea64406c4da209d4d22232a2224bcde442a0f7357f2edf9d
+AUX ktvschedule-0.1.9.1-gcc43.diff 867 RMD160 fb3446707c4e6c4869bd0db8448017ec2c1f2198 SHA1 9e08dd979d52f7a98476a6348d260df406b72090 SHA256 765865b1aab630c6cedd86fd15dfde5cc97a0003c5ec15ac7b4f652eacb8fae2
 DIST ktvschedule-0.1.9.tar.bz2 478217 RMD160 ef709f9ba6d99a3b1c2e6fa7c9675412c44f62dd SHA1 ce9672541e4f8befeec7770c5f44d645f1be80b0 SHA256 275291e42d0b8c1d369744481b085e179dd89ada7ae730bcea2f5136cbd221ca
+EBUILD ktvschedule-0.1.9.1-r1.ebuild 893 RMD160 32356b02a155bdd1ce27649426d9b65c70654eca SHA1 875c8a06243a50cb40080fe27b17fb36cda880e1 SHA256 3098c477cf943d597a1d5465195a0a8d9b0422d1a121780c92b30ea7ea5b49bc
 EBUILD ktvschedule-0.1.9.1.ebuild 801 RMD160 e3bc8984e2b55efeff839d3a95de67a9bac808b4 SHA1 4a104d51a6bc21d11249d5ddbd4a36725ae004eb SHA256 6a50df2bf0dcf86bcc9f3882900511ada40f211c458d775f12b58c866ebeb423
-MISC ChangeLog 766 RMD160 962e0b060d90e7bcec2da9a772ef1cd70948c39e SHA1 a64d38e14de10eb4073d38791a604bfc5558b353 SHA256 29759db1b76706796a3ccebc58682c87943ed2ae4f26124012cbe71d64e2a885
+MISC ChangeLog 1153 RMD160 f36192ae8a49203399f6c593542f64085f217a8e SHA1 656a4602182c7bd168eb6f05194b061d4700bbb9 SHA256 380cd3ecff978f2780f3a321830f2b5c738587500104c7f22c1d45af4657b6f9
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHujZnB18eXLOpYdkRAmTmAJwOm8mh9YMcY+CFDg7+2g74gxeRygCfWIFC
-hiADPZrrev+WKEccbzVx86Y=
-=S5eO
------END PGP SIGNATURE-----
diff --git a/media-tv/kvdr/ChangeLog b/media-tv/kvdr/ChangeLog
index 60031d61e58a..1424a8bb3a90 100644
--- a/media-tv/kvdr/ChangeLog
+++ b/media-tv/kvdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/kvdr
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.14 2009/01/10 12:37:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/ChangeLog,v 1.15 2009/02/14 20:05:42 carlo Exp $
+
+*kvdr-0.64-r4 (14 Feb 2009)
+
+  14 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kvdr-0.64-desktop-file.diff, +kvdr-0.64-r4.ebuild:
+  Get rid of invalid aRts dependency. Improved desktop file fix.
 
 *kvdr-0.64-r3 (10 Jan 2009)
 
diff --git a/media-tv/kvdr/files/kvdr-0.64-desktop-file.diff b/media-tv/kvdr/files/kvdr-0.64-desktop-file.diff
new file mode 100644
index 000000000000..83ac58119227
--- /dev/null
+++ b/media-tv/kvdr/files/kvdr-0.64-desktop-file.diff
@@ -0,0 +1,33 @@
+--- kvdr/kvdr.desktop.o	2009-02-14 19:50:00.000000000 +0100
++++ kvdr/kvdr.desktop	2009-02-14 19:00:46.000000000 +0100
+@@ -1,12 +1,12 @@
+ # KDE Config File
+-[KDE Desktop Entry]
++[Desktop Entry]
++Categories=Qt;KDE;AudioVideo;Player;
+ Type=Application
+ Exec=kvdr
+-Icon=kvdr.png
+-MiniIcon=mini-kvdr.png
+-DocPath=kvdr/index.html
++Icon=kvdr
++X-DocPath=kvdr/index.html
+ Comment=Digital TV viewer and recorder
+ Comment[de]=Digital-TV Viewer and Recorder
+-Terminal=0
++Terminal=false
+ Name=Kvdr
+ Name[de]=Kvdr
+--- kvdr/Makefile.am.o	2009-02-14 18:58:57.000000000 +0100
++++ kvdr/Makefile.am	2009-02-14 19:00:00.000000000 +0100
+@@ -8,8 +8,8 @@
+ EXTRA_DIST = main.cpp kvdr.cpp kvdr.h kvdr.desktop lo32-app-kvdr.png lo16-app-kvdr.png ckvdrcfg.cpp ckvdrcfg.h ckvdrcfgdata.cpp kvdr.xpm kvdr16.png kvdr16h.png kvdr32.png kvdr32h.png kvdr48.png kvdr48h.png kvdr_xv.cpp kvdr_xv.h kvdrcfg.kdevdlg mini-kvdr.xpm svdrpc.cpp svdrpc.h 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(kde_appsdir)/Multimedia/
+-	$(INSTALL_DATA) $(srcdir)/kvdr.desktop $(kde_appsdir)/Multimedia/kvdr.desktop
++	$(mkinstalldirs) $(xdg_appsdir)
++	$(INSTALL_DATA) $(srcdir)/kvdr.desktop $(xdg_appsdir)/kvdr.desktop
+ 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
+ 	$(INSTALL_DATA) $(srcdir)/lo32-app-kvdr.png $(kde_icondir)/locolor/32x32/apps/kvdr.png
+ 	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
diff --git a/media-tv/kvdr/kvdr-0.64-r4.ebuild b/media-tv/kvdr/kvdr-0.64-r4.ebuild
new file mode 100644
index 000000000000..1146d2f1f869
--- /dev/null
+++ b/media-tv/kvdr/kvdr-0.64-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kvdr/kvdr-0.64-r4.ebuild,v 1.1 2009/02/14 20:05:42 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+DESCRIPTION="A KDE GUI for VDR (Video Disk Recorder)."
+HOMEPAGE="http://www.s.netic.de/gfiala/"
+#SRC_URI="http://www.s.netic.de/gfiala/${P}.tgz"
+SRC_URI="mirror://gentoo/${P}-gentoo.tar.gz
+	http://dev.gentoo.org/~zzam/distfiles/${P}-gentoo.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-tv/xawtv-3.86
+	media-tv/linuxtv-dvb-headers
+	>=media-video/vdr-1.2.0
+	x11-libs/libXxf86dga"
+
+need-kde 3.5
+
+S="${WORKDIR}"/${P}-gentoo
+
+PATCHES=(
+	"${FILESDIR}/kvdr-0.64-pointer-casting.patch"
+	"${FILESDIR}/kvdr-0.64-unsigned-int-casting.patch"
+	"${FILESDIR}/kvdr-0.64-remove-ansi-cflag.patch"
+	"${FILESDIR}/kvdr-0.64-desktop-file.diff"
+	)
+
+src_unpack(){
+	kde_src_unpack
+	rm -f "${S}"/configure
+}