Reflect use dependency properly, bug #225151. Get rid of invalid aRts dependency. Missing kde.eclass function call. Proper desktop file fix.

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

3 files changed, 127 insertions, 1 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 58617ff96f66..c635223d671a 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.119 2009/02/13 12:01:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.120 2009/02/15 17:21:41 carlo Exp $
+
+*kmplayer-0.10.0c-r1 (15 Feb 2009)
+
+  15 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kmplayer-0.10.0c-desktop-file.diff, +kmplayer-0.10.0c-r1.ebuild:
+  Reflect use dependency properly, bug #225151. Get rid of invalid aRts
+  dependency. Missing kde.eclass function call. Proper desktop file fix.
 
   13 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> kmplayer-0.11.0a.ebuild:
   Fix stupid typo.
diff --git a/media-video/kmplayer/files/kmplayer-0.10.0c-desktop-file.diff b/media-video/kmplayer/files/kmplayer-0.10.0c-desktop-file.diff
new file mode 100644
index 000000000000..52be01327bf4
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.10.0c-desktop-file.diff
@@ -0,0 +1,16 @@
+--- src/kmplayer.desktop.o	2009-02-15 01:45:40.000000000 +0100
++++ src/kmplayer.desktop	2009-02-15 01:45:51.000000000 +0100
+@@ -1,10 +1,9 @@
+ # KDE Config File
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+-Exec=kmplayer -caption "%c" %i %m %U
+-Icon=kmplayer.png
+-DocPath=kmplayer/index.html
++Exec=kmplayer -caption "%c" %i %U
++Icon=kmplayer
++X-DocPath=kmplayer/index.html
+ Comment=KDE interface for MPlayer
+ Comment[af]=KDE koppelvlak na MPlayer
+ Comment[ar]=واجهة KDE لِــ MPlayer
diff --git a/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild b/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild
new file mode 100644
index 000000000000..818ed30b3d82
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild,v 1.1 2009/02/15 17:21:41 carlo Exp $
+
+EAPI="2"
+
+ARTS_REQUIRED="never"
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mplayer xine cairo gstreamer npp"
+
+DEPEND="x11-libs/libXv
+		>=dev-libs/expat-2.0.1
+		xine? ( >=media-libs/xine-lib-1.1.1 )
+		cairo? ( x11-libs/cairo[X] )
+		gstreamer? ( >=media-libs/gstreamer-0.10.11
+					npp? ( >=sys-apps/dbus-1.0.2-r2
+							>=dev-libs/dbus-glib-0.73
+							>=dev-libs/dbus-qt3-old-0.70 ) )
+		npp? ( >=dev-libs/nspr-4.6.7
+				>=x11-libs/gtk+-2.10.14 )"
+RDEPEND="${DEPEND}
+		mplayer? ( media-video/mplayer )"
+
+LANGS="ar be br bs ca csb cs cy da de el en_GB es et fi fr ga gl he hi hu is it
+ja ka lt mt nb nl nn pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
+LANGS_DOC="da de en es et fr it nl pt ru sv"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+need-kde 3.5
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.0-prtypes.patch"
+	"${FILESDIR}/kmplayer-0.10.0c-desktop-file.diff"
+	)
+
+pkg_setup() {
+	kde_pkg_setup
+
+	if ! use mplayer && ! use xine && ! use cairo && ! use gstreamer ; then
+		echo
+		ewarn "Neither the mplayer, xine, cairo nor gstreamer USE flags have been set. One of"
+		ewarn "them is required. mplayer can be installed afterwards; all of the others will"
+		ewarn "require you to recompile ${PN}."
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	for X in ${LANGS} ; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"
+	done
+	cd "${S}/po"
+	sed -i -e "s:POFILES =.*:POFILES = ${MAKE_LANGS}:" Makefile.am
+
+	MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | tr ' ' '\n' | sort | uniq -d))
+	[[ -n ${MAKE_DOC} ]] && [[ -n ${DOC_DIR_SUFFIX} ]] && \
+		MAKE_DOC=$(echo "${MAKE_DOC}" | tr '\n' ' ') && \
+		MAKE_DOC="${MAKE_DOC// /${DOC_DIR_SUFFIX} }"
+	sed -i -e "s:^SUBDIRS =.*:SUBDIRS = en ${MAKE_DOC}:" \
+		"${KDE_S}/doc/Makefile.am" || die "sed for locale failed"
+
+	rm -f "${S}/configure"
+}
+
+src_prepare() {
+	:
+}
+
+src_compile() {
+	local myconf="--enable-expat
+				$(use_with gstreamer)
+				$(use_with xine)
+				$(use_with cairo)
+				--disable-koffice-plugin
+				$(use_enable npp nspr)
+				$(use_enable npp npplayer)"
+
+	# The configure script is a bloated mess and won't work correctly without this.
+	PKG_CONFIG="pkg-config"	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# Remove this, as kdelibs provides it
+	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
+}