correct kplayer-0.6.3 + desktop-entry

4 files changed, 81 insertions, 30 deletions

diff --git a/media-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index 10774b91..66c60e2f 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -2,6 +2,37 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.40 2009/10/18 18:25:21 maekke Exp $
 
+  18 Oct 2009; Markus Meier <maekke@gentoo.org> kplayer-0.7.ebuild:
+  x86 stable, bug #288837
+
+  13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> kplayer-0.7.ebuild:
+  amd64 stable wrt #288837
+
+  06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kplayer-0.7.ebuild:
+  Preparation for new eclass. Unprefixing misc apps.
+
+  27 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> kplayer-0.7.ebuild:
+  Update deps to block old kplayer with -kdeprefix. Per bug #259868.
+
+  11 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org> kplayer-0.7.ebuild:
+  small fixes
+
+*kplayer-0.7 (11 Feb 2009)
+
+  11 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org> +kplayer-0.7.ebuild:
+  initial import of the KDE4 version
+
+  12 Jan 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/kplayer-0.6.3-desktop-entry.diff, kplayer-0.6.3.ebuild:
+  Fix desktop entry.
+
+  10 Aug 2007; Raúl Porcel <armin76@gentoo.org> kplayer-0.6.3.ebuild:
+  Back to ~arch, went stright to stable
+
+  09 Aug 2007; Tobias Heinlein <keytoaster@gentoo.org> kplayer-0.6.3.ebuild:
+  Fixing LICENSE, kplayer-0.6.3 and later is licensed under the GPL version 3
+  or later
+
 *kplayer-0.6.3 (09 Aug 2007)
 
   09 Aug 2007; Tobias Heinlein <keytoaster@gentoo.org>
diff --git a/media-video/kplayer/Manifest b/media-video/kplayer/Manifest
index dff592e0..002bef80 100644
--- a/media-video/kplayer/Manifest
+++ b/media-video/kplayer/Manifest
@@ -1,3 +1,4 @@
+AUX kplayer-0.6.3-desktop-entry.diff 3990 RMD160 b8e22c0c16720037fb12f51ad4068988b5f3d629 SHA1 4890c82c16b85d15003fae312b05e5d894302d04 SHA256 6f65182e53f2b19638a10b875ec671cf25c02252f75bd8098d0f92101e540266
 DIST kplayer-0.6.3.tar.bz2 4912815 RMD160 269052c6edcd77c7776d834406d3dfc464d9843a SHA1 7a27b2c46fe030c7d3607e7596b581e4af05c642 SHA256 750c8f3d4e3e3d7bcf79c8a3a626f894d3f32089ceee59fba9300a54db4919cc
-EBUILD kplayer-0.6.3.ebuild 922 RMD160 2334c52932bea9376c16250c34ad9dac423585cf SHA1 7a857db65c624b83bf67bf7582f94a73699c7bc3 SHA256 1d104a24c3ef98f01b9ba8f10f4b7849051cbd2fa0b336cf48d2fbb271557a27
-MISC ChangeLog 3989 RMD160 a8eabdf9ef256fcf0f0bc13ea3f036f00f5fb3d9 SHA1 7817405bad6c34680b8f63a066f62980d62917d5 SHA256 46ef7aeb656f4a8ed9f58f6197652ba4fddf8355ff53b2146973c7ea7614ddab
+EBUILD kplayer-0.6.3.ebuild 916 RMD160 ccea7747a0dad549ca7b5978b630797bf3bfadd4 SHA1 3c75808a302ed16b279244495b4f3ca98b7e80ce SHA256 29238210d655ab366d7de0f6d3c1a9cd9c5a1129c3e8365f0f45dd031f8f6788
+MISC ChangeLog 5103 RMD160 0bc0a9eb4f8b74f5a2ea8dab179d3f489a4b3349 SHA1 f429cbb06a63b842eafb936e8499fd80c4c03e64 SHA256 5e331a471c67639f15042e029511424040a8ffbdd02af0b96179ffffd494c135
diff --git a/media-video/kplayer/files/kplayer-0.6.3-desktop-entry.diff b/media-video/kplayer/files/kplayer-0.6.3-desktop-entry.diff
new file mode 100644
index 00000000..81b989fe
--- /dev/null
+++ b/media-video/kplayer/files/kplayer-0.6.3-desktop-entry.diff
@@ -0,0 +1,21 @@
+--- kplayer/kplayer.desktop.orig	2008-01-11 18:32:37.000000000 +0100
++++ kplayer/kplayer.desktop	2008-01-11 18:33:48.000000000 +0100
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=kplayer -- %U
+-Icon=kplayer.png
+-DocPath=kplayer/index.html
++Icon=kplayer
++X-DocPath=kplayer/index.html
+ Comment=Media Player
+ Comment[af]=Media Speler
+ Comment[ar]=قارئ الوسائط
+@@ -116,5 +115,5 @@
+ GenericName[zh_CN]=媒体播放器
+ GenericName[zh_TW]=多媒體播放器
+ GenericName[zu]=Umdlali Wezezindaba
+-MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu
++MimeType=audio/mp3;audio/mpeg3;audio/mpeg4;audio/mpg;audio/mpeg;audio/mpegurl;audio/m3u;audio/mp4;audio/wav;video/msvideo;video/mpeg4;video/mpeg;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/mp4;video/x-msmpeg;video/vnd.mpegurl;video/x-mpegurl;video/x-msvideo;video/quicktime;video/x-qtc;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wma;audio/x-ms-wax;audio/x-ms-wmp;audio/x-ms-wmv;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-asx;video/x-ms-wax;video/x-ms-wmp;video/x-ms-wmv;video/x-ms-wma;video/x-ms-wvx;video/x-ms-wmx;video/x-ms-wm;application/asx;application/x-ms-asf;application/vnd.ms-asf;application/x-ms-wmd;application/x-ms-wmz;audio/scpls;audio/x-scpls;audio/x-pls;audio/vnd.mpegurl;audio/x-mpg;audio/x-mpeg;audio/x-mpeg3;audio/x-mpegurl;audio/x-realaudio;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;application/x-pn-realaudio;audio/vnd.rn-realaudio;video/x-realvideo;video/x-pn-realvideo;video/vnd.rn-realvideo;video/x-pn-realvideo-plugin;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;application/vnd.rn-realplayer;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;video/nsv;audio/x-mp3;video/x-ogm;video/x-theora;audio/vorbis;audio/x-vorbis;audio/x-oggflac;application/x-ogg;application/ogg;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/x-wav;video/avi;video/x-avi;video/x-divx;video/x-fli;video/x-matroska;audio/x-matroska;application/x-mplayer2;application/x-cda;audio/aac;audio/ac3;audio/basic;audio/m4a;audio/x-aac;audio/x-adpcm;audio/x-flac;audio/x-m3u;audio/x-m4a;audio/x-musepack;audio/x-pn-windows-pcm;video/x-3gpp;video/x-3gpp2;video/mediaplayer;uri/mms;uri/mmst;uri/mmsu;uri/pnm;uri/rtsp;uri/rtspt;uri/rtspu;
+ Categories=AudioVideo;Player;Qt;KDE;
diff --git a/media-video/kplayer/kplayer-0.6.3.ebuild b/media-video/kplayer/kplayer-0.6.3.ebuild
index 16d9b4e6..ab9f177c 100644
--- a/media-video/kplayer/kplayer-0.6.3.ebuild
+++ b/media-video/kplayer/kplayer-0.6.3.ebuild
@@ -1,40 +1,38 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87-r1.ebuild,v 1.1 2008/11/01 02:46:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.6.3.ebuild,v 1.5 2009/10/13 08:54:42 ssuominen Exp $
 
-inherit eutils toolchain-funcs
+inherit kde
 
-DESCRIPTION="A SKK-like Japanese input method for console"
-HOMEPAGE="http://homepage2.nifty.com/aito/soft.html"
-#SRC_URI="http://homepage2.nifty.com/aito/skkfep/${P}.tar.gz"
+DESCRIPTION="KPlayer is a KDE media player based on mplayer."
+HOMEPAGE="http://kplayer.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kplayer/${P}.tar.bz2"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-apps/gawk"
-RDEPEND="${RDEPEND}
-	app-i18n/skk-jisyo"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
+RDEPEND=">=media-video/mplayer-1.0_rc1"
 
-src_compile() {
-	emake CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" || die
-}
+DEPEND="${RDEPEND}"
 
-src_install() {
-	dobin skkfep escmode || die
-	doman skkfep.1
+LANGS="br ca cs cy da de el en_GB es et fi fr ga gl he hu it ja nb nl pa pl
+pt_BR pt ru sr@Latn sr sv tr zh_CN"
 
-	dodoc README HISTORY TODO
-}
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
 
+need-kde 3.5
+
+PATCHES=( "${FILESDIR}/kplayer-0.6.3-desktop-entry.diff" )
+
+src_unpack () {
+	kde_src_unpack
+	cd "${WORKDIR}/${P}/po"
+	for X in ${LANGS} ; do
+		use linguas_${X} || rm -f "${X}."*
+	done
+	rm -f "${S}/configure"
+}