Reflect use dependency properly. Get rid of invalid aRts dependency. Fix desktop file.

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

5 files changed, 108 insertions, 4 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index 5a17b86242de..df34ff25d6fe 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/kdetv
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.38 2008/12/11 22:27:54 scarabeus Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.39 2009/02/14 20:02:59 carlo Exp $
+
+*kdetv-0.8.9-r1 (14 Feb 2009)
+
+  14 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdetv-0.8.9-desktop-entry.diff, +kdetv-0.8.9-r1.ebuild:
+  Reflect use dependency properly. Get rid of invalid aRts dependency. Fix
+  desktop file.
 
   11 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> kdetv-0.8.9.ebuild:
   Update homepage. Per bug #235415
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index fed12e5ca640..da31c40b77f8 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,5 +1,7 @@
+AUX kdetv-0.8.9-desktop-entry.diff 806 RMD160 c5cf7e852024b4880578f9120da672ee2edf2b82 SHA1 77e73f98c1c39341ee787038c1e031a52f332e85 SHA256 526f666253439bc012372b7a78961e7615ac05774e20eb9366b1824d66ba3b35
 AUX kdetv-0.8.9-xinerama.patch 1573 RMD160 eacb00a750f0d46bb28d22e258d3ce805b14196a SHA1 55f019c73ac3c5ee7347c54162e7d0e657d6af9a SHA256 5264345962d22ceb40103e66a5af84313aa8989efdcda767ffecc6fd92103154
 DIST kdetv-0.8.9.tar.bz2 1304743 RMD160 7068e483e1d5ae2e91454c60acdfbdeae018deee SHA1 321c1c4ce2772ed8602cb556eafc05ab762ea28d SHA256 c55c0187175af5686acc9f93082b08a665aec760d60ff0fa3ddd297670ad1e88
+EBUILD kdetv-0.8.9-r1.ebuild 1642 RMD160 713d65bfa73a1163bdd685772d376fd1124d538c SHA1 c5b601995367ad1efca46a79f2976d9c64b177e9 SHA256 d7d1e3b328ec20c9ba0af13f742d9b51fa7e55ad734139d95fe1cf90ecc03b3d
 EBUILD kdetv-0.8.9.ebuild 1853 RMD160 c1f6142ce6da0d52d2e8f6c9066cd2ceb7215985 SHA1 a985a6f9004f907ac3b75954ff6f2482d12f681c SHA256 a0c492716e17af9d9ec7ac664d4f07aee1d97485cd58a09c6ab0398ce38dd477
-MISC ChangeLog 5778 RMD160 42a2d11038e14250ef94a12b97e46d84b254bc96 SHA1 f05cac12af98039a52aa4fe47a8c001c79d2e05d SHA256 d9b90c4b3cb09bc005bbd520b63aec7a9719641fa24a2d2d20012eeea6fad6cd
+MISC ChangeLog 6011 RMD160 1986e9461c24355f12c0858f72e938b93554d2d6 SHA1 24c74a0339fd4c1a4e62b83c9ed65f98a89e50bb SHA256 3ce61215a822256380d85f4f418e67f9be960fe5d854c1e8996ae176da678e33
 MISC metadata.xml 244 RMD160 7bddb4b6683ade6b0a2d663c874ea6bf146bb3c7 SHA1 1351e9ab9d57d274c2e2f74658d2f82e60a8fe89 SHA256 74e2a4a8f201b3f16c6b991c019bf1b6e04e93a5898b001fd0a3ccf340041e57
diff --git a/media-tv/kdetv/files/kdetv-0.8.9-desktop-entry.diff b/media-tv/kdetv/files/kdetv-0.8.9-desktop-entry.diff
new file mode 100644
index 000000000000..e02b62a8a586
--- /dev/null
+++ b/media-tv/kdetv/files/kdetv-0.8.9-desktop-entry.diff
@@ -0,0 +1,25 @@
+--- kdetv/clients/kdetv/Makefile.am.orig	2008-01-13 22:50:46.000000000 +0100
++++ kdetv/clients/kdetv/Makefile.am	2008-01-13 22:51:22.000000000 +0100
+@@ -11,7 +11,7 @@
+ rc_DATA = kdetvui.rc tips
+ rcdir   = $(kde_datadir)/kdetv
+ 
+-mydatadir = $(kde_appsdir)/Multimedia
++mydatadir = $(xdg_appsdir)
+ mydata_DATA = kdetv.desktop
+ 
+ # install kdelirc profile
+--- ./kdetv/clients/kdetv/kdetv.desktop.orig	2008-01-13 22:32:02.000000000 +0100
++++ ./kdetv/clients/kdetv/kdetv.desktop	2008-01-13 22:49:36.000000000 +0100
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kdetv -caption "%c" %i %m
+ Icon=kdetv
+@@ -40,4 +39,4 @@
+ GenericName[zh_CN]=看电视
+ MimeType=text/x-tv-channels;
+ Terminal=false
+-Categories=QT;KDE;Multimedia;AudioVideo;Video;TV;
++Categories=Qt;KDE;AudioVideo;Video;TV;
diff --git a/media-tv/kdetv/kdetv-0.8.9-r1.ebuild b/media-tv/kdetv/kdetv-0.8.9-r1.ebuild
new file mode 100644
index 000000000000..d0885ae0dc95
--- /dev/null
+++ b/media-tv/kdetv/kdetv-0.8.9-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.9-r1.ebuild,v 1.1 2009/02/14 20:02:59 carlo Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
+LANGS_DOC="da et fr it nl pt ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit flag-o-matic kde
+
+DESCRIPTION="A TV application for KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=11602"
+SRC_URI="http://dziegel.free.fr/releases/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc zvbi opengl"
+
+RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl x11-libs/qt[opengl] )
+	media-libs/alsa-lib
+	x11-libs/libICE
+	x11-libs/libXxf86dga
+	x11-libs/libXrandr
+	x11-libs/libX11
+	x11-libs/libXv
+	x11-libs/libSM
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	x11-libs/libXrender"
+
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto
+	x11-proto/videoproto
+	virtual/os-headers"
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${P}-xinerama.patch"
+	"${FILESDIR}/kdetv-0.8.9-desktop-entry.diff"
+	)
+
+src_prepare() {
+	# ugly hack - override base_src_prepare, kde.eclass does patching
+	:
+}
+
+src_compile() {
+	local myconf="$(use_enable lirc kdetv-lirc)
+		$(use_with zvbi) $(use_with opengl gl)"
+	#Filtering the below on x86 and amd64 for bug #145754 and bug #153721
+	if [[ ( "$ARCH" == "x86" ) || ( "$ARCH" == "amd64" ) ]]; then
+		filter-flags -fforce-addr
+	fi
+	append-flags -fno-strict-aliasing
+
+	rm -f "${S}"/configure
+
+	kde_src_compile
+}
diff --git a/media-tv/kvdr/Manifest b/media-tv/kvdr/Manifest
index 7280ed15c92a..11256559fbc5 100644
--- a/media-tv/kvdr/Manifest
+++ b/media-tv/kvdr/Manifest
@@ -1,8 +1,10 @@
+AUX kvdr-0.64-desktop-file.diff 1361 RMD160 a542b5c6053ccdde1eea11d42c80c9d5a4da6394 SHA1 cdc3b82a50a55a6a27d0b839d967c6a777e05f28 SHA256 0360d911270b6ed53cc253bf84b277d9a5f3ca497dade38bd2a0e67faf88fc3d
 AUX kvdr-0.64-desktop-file.patch 570 RMD160 4cf8b51deab30a23b450bfde7d0cf3c2bde8afc4 SHA1 b7a011203de5b0ee2383e140926f09dedbb36daa SHA256 3860035a624948780d33579887299f412956a84236e81b9724d4fc4047bf0db9
 AUX kvdr-0.64-pointer-casting.patch 4350 RMD160 38eb7fd995ddbd88db16aa8b37f33760dbb6f712 SHA1 f7ad8b5c80bdcdbd220817cc3846b6cce5bc4bdc SHA256 9dbab0aed89d913c5ef8f1b3ebb6c56f2312b6c9b32a6a37beefac17c139764d
 AUX kvdr-0.64-remove-ansi-cflag.patch 3823 RMD160 e4e27685344632a47c7cd7a65022b771ac354c56 SHA1 67122bada04cdffc815d743b80e826334cd3c9b2 SHA256 8639490112eb61054b63123ce9e611476d36516e1731555bae303b7324703177
 AUX kvdr-0.64-unsigned-int-casting.patch 509 RMD160 ca73578465b500996b5f3d8ee958024de7c1abb0 SHA1 190c279e451f50f305035a4fa7d84a18f44fe9f7 SHA256 7abdb602934987d7fba63ff487558f3d06b2f96e666260990c4b62b51fd461cf
 DIST kvdr-0.64-gentoo.tar.gz 714071 RMD160 68b420c3459b4b6bfbe690f24ab1200032f8c44f SHA1 ac3ab4e6bfd2820bb2ff3653c47d601e47825406 SHA256 4b1a264478251ebb7108d6188e86bcc2bcbadfbce47c250d422f15ef94a49e2c
 EBUILD kvdr-0.64-r3.ebuild 954 RMD160 440b6c1c2a466feaecb7e0832dc5b56d9b2277c5 SHA1 78dec40b095a7ef4f9a0ef312013c5ac0d3fcde4 SHA256 76378a169e6ab42befecaa65084e495ae9fdd1407069cc3646345ac25a6cea73
-MISC ChangeLog 2290 RMD160 183805c9195e59d0d5d596210063a26c36591edd SHA1 d86b3f961fc6772c697d16b5d9f1bdf8986fdaf0 SHA256 ba84341e8bba86305f31162f38de197b930d18c97e58a00ad53ba45bc26070fd
+EBUILD kvdr-0.64-r4.ebuild 969 RMD160 a7c997fa825b4f214652ac6354f84bdd06da5fd7 SHA1 5136998282950076975133241388daa62f27897a SHA256 f81946993663b3c3f4ded8c78945fc80b9e992bc6b0c7e7ccc90441d9e9b9b64
+MISC ChangeLog 2492 RMD160 61bc7a94d56b5ea0115286e1d76fefacc0e398f3 SHA1 d7892941aab0e2dd54de154b17a3879c24e3369f SHA256 cadd949908598227cab6a581b76065262c38dd99f03471575bb71486639a7e55
 MISC metadata.xml 225 RMD160 b71cde62bd3570d3cb54b16d552be0219749515f SHA1 cce09b038a512f48d2106c4b81317dedd3f4098c SHA256 592a8bbb575ce5cdb914f70320e266f745b6211c422ad48fd60e4796942337bb