Fix collision with kdelibs (per bug #269840). Remove old.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 16 insertions, 296 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index b024d9ec973a..0ebe11314cc3 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # 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.123 2009/04/06 11:56:28 scarabeus Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.124 2009/05/14 13:23:18 scarabeus Exp $
+
+  14 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -kmplayer-0.9.4a-r1.ebuild, -kmplayer-0.10.0.ebuild,
+  -kmplayer-0.10.0a.ebuild, kmplayer-0.10.0c.ebuild,
+  kmplayer-0.10.0c-r1.ebuild:
+  Fix collision with kdelibs (per bug #269840). Remove old.
 
   06 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kmplayer-0.11.0a.ebuild:
   Preparation for new eclass. Unprefixing misc apps.
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 9c855818d831..5096160a484b 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -3,16 +3,10 @@ AUX 0.11.0a-npp.patch 549 RMD160 eb7e070a6ce2815008400044d16f4ca3494588d3 SHA1 c
 AUX kmplayer-0.10.0-prtypes.patch 843 RMD160 3da261a5e254beaf20c340e06952d8065d20bf28 SHA1 4fbb734b2f0490b9adebd9a4e2553c0be9512230 SHA256 a192d8569abae303feb9c47842fde4bb2dd95cf535d318820c3017e538239c43
 AUX kmplayer-0.10.0c-desktop-file.diff 497 RMD160 0d39570e70eb506587c6d7893a4815cade8cc7a5 SHA1 56b969a538b5ae470b80955658c0c5878be9280b SHA256 24ecdeef6a5fb3df8a481b7e108be7573947f37cd57a822ddd520881c7d1fe59
 AUX kmplayer-0.9.4a-vop2vf.patch 3636 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c SHA1 017911852e58dcd50772ae9cc8ebc45c84eeee4a SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3
-DIST kmplayer-0.10.0.tar.bz2 1046079 RMD160 79ffac84e28f719582233e1a72ceb61927a28056 SHA1 b99ecdff0c77b8db549579ef45538750aa0dc1d4 SHA256 94e8068c5a1b7205e01079213c025fc2f70f521c7d72e5d9ee8cd914325436c7
-DIST kmplayer-0.10.0a.tar.bz2 1054675 RMD160 28fd5d736eac6568d2b08cd7eab1ca3d95f0be36 SHA1 e8dd9b21ed876c49aa728261b86c23ae9c835220 SHA256 300d996bdccd0733d695be5be0806d0a5f0646600b674c7782149cd71e9e6e78
 DIST kmplayer-0.10.0c.tar.bz2 1047729 RMD160 4f7f291733f9a73f5838e028af5e5268d1a0ee10 SHA1 52bfa017e1360fdc60c10445090c867039da4830 SHA256 f9a699fa7bf53c7130ce6aff56e4bc53f957c5d86d3d1d23d791cca8f1cf3820
 DIST kmplayer-0.11.0a.tar.bz2 483357 RMD160 1b4ea26ae6dbf1f16d997bf000cafc8328698cc4 SHA1 9f660c0ea22c5906f577d6bd064d7e9cf8f348ca SHA256 84519a00f9836274dca8955c634fdf08f74f8c1d6386cbe02b2b15260c3b276a
-DIST kmplayer-0.9.4a.tar.bz2 970527 RMD160 74d8fe2b2fd2c9e18518ff73b66b254b974291be SHA1 27d78793d6e9ac37a5810b8e742ffa0f55317488 SHA256 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c
-EBUILD kmplayer-0.10.0.ebuild 2940 RMD160 b95bd3f466e4402c7cf87cec77c811f6ad4c8bd5 SHA1 152a076ffeba8fb1c2d2e498765240d4e0029a76 SHA256 60a25bc32f3c7389d1d7d48483c4af043ddfee3d07e27f52cc030ee80f0b21ac
-EBUILD kmplayer-0.10.0a.ebuild 3077 RMD160 d20249da66d5fb75ea69a1405b76798673e973d9 SHA1 14da885585a3a266e379bc5d41c653719c19cb9c SHA256 64850212de79473a922954ab72db4beb67a298dff8c7a01f530fe3dad1b845dc
-EBUILD kmplayer-0.10.0c-r1.ebuild 2826 RMD160 673181de9067f58f4a416c297b1d7bd6a16dc7f7 SHA1 74968236348cc60fa0e2a76bc8562e255eb46f1c SHA256 4bdff35e3b1732a86c61351623d5c24162bda3f977320eca25062b0f9ce2f14c
-EBUILD kmplayer-0.10.0c.ebuild 3001 RMD160 da889ddae77310d28e9d3efe495d9c7935dedbaa SHA1 93e8f44c741921a12cc432080d18da876a76404f SHA256 5f47dc7814bdd73a482197edeb3caf1746ac1ffe6d44f52f5b1ecf94ac4ef0f0
+EBUILD kmplayer-0.10.0c-r1.ebuild 2836 RMD160 5c19587fc69bd5ab62e77028ead02c1e4a66ce79 SHA1 65eca8e628abdfb5bcd33b660c071ce24664d0c3 SHA256 0af86d27b45f7ab490dbcf54ddcc8afe5335fd1e276cf9383459ff7cba12342b
+EBUILD kmplayer-0.10.0c.ebuild 3011 RMD160 a01c937d058b2b7c56398847a5a15102c939cd27 SHA1 cdf98d37b8870adde1cc18e17a68d149da1956af SHA256 10a594bcb7f49d421b5895cc4580903ed571dd0820a81412ace7b5328b60c17f
 EBUILD kmplayer-0.11.0a.ebuild 1583 RMD160 ddf59eafee8bf123eda3bc40c176dbddeee84bd3 SHA1 907420fd61249909ad43d0b14e965465b6c2ebc4 SHA256 6dc00431528c068a09bc027948343dec8ea7ed745606599b2eedf3f67dad077b
-EBUILD kmplayer-0.9.4a-r1.ebuild 2365 RMD160 eaba9fe9e98f01d7a98f71f99451e961d12d430d SHA1 af3b7109ead14f3926ba45c5f989fcf1e10c4e3c SHA256 586346e2cd2cbc82007853e538c4d689551970efa0fa6814b6d4212cc04781e9
-MISC ChangeLog 17511 RMD160 e947f46fdd871914a9926dee3901eb8d87dbdd32 SHA1 7e641f28ee4ada06174693ed3cd9560a6fdba1e5 SHA256 f992aeefa377f3757ea476e9ae7711d3cae65d910129cc73987cbc45652b9652
+MISC ChangeLog 17762 RMD160 e27be00d3cca6cf6748102f53a15292e2373998a SHA1 38f9277fa4f8ea22af865f9d0d01e1ce5df6098d SHA256 902fd52c4b4ddf851dbab5dc70a8fb9e868f69d3e885e57de382c500ddab7a28
 MISC metadata.xml 427 RMD160 c44a276c2bec1408fb537a0db3422de2958c23ba SHA1 dd328c866c4cd6837cd40a5ddc8a4470ea02bd2f SHA256 debd27d9d06ca1dd09cb347e5f43a83f3bdbf1bce66564c6a247d18928f24b06
diff --git a/media-video/kmplayer/kmplayer-0.10.0.ebuild b/media-video/kmplayer/kmplayer-0.10.0.ebuild
deleted file mode 100644
index 1df8b0f42c9a..000000000000
--- a/media-video/kmplayer/kmplayer-0.10.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0.ebuild,v 1.3 2008/07/31 20:27:20 carlo Exp $
-
-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 ~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 )
-		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 )"
-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}/${P}-prtypes.patch"
-
-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
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-
-	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"
-
-	# Fix the desktop file
-	sed -i -e 's:\(Icon=kmplayer\).png:\1:' "${S}/src/kmplayer.desktop"
-
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="--enable-expat
-				$(use_with gstreamer)
-				$(use_with xine)
-				$(use_with cairo)
-				--disable-koffice-plugin"
-
-	if use npp ; then
-		myconf="${myconf} --enable-nspr --enable-npplayer"
-	else
-		myconf="${myconf} --disable-nspr --disable-npplayer"
-	fi
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kmplayer/kmplayer-0.10.0a.ebuild b/media-video/kmplayer/kmplayer-0.10.0a.ebuild
deleted file mode 100644
index 87dd989af238..000000000000
--- a/media-video/kmplayer/kmplayer-0.10.0a.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0a.ebuild,v 1.2 2008/07/31 20:27:20 carlo Exp $
-
-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 ~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 )
-		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"
-
-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
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-
-	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"
-
-	# Fix the desktop file
-	sed -i -e 's:\(Icon=kmplayer\).png:\1:' "${S}/src/kmplayer.desktop"
-
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="--enable-expat
-				$(use_with gstreamer)
-				$(use_with xine)
-				$(use_with cairo)
-				--disable-koffice-plugin"
-
-	if use npp ; then
-		myconf="${myconf} --enable-nspr --enable-npplayer"
-	else
-		myconf="${myconf} --disable-nspr --disable-npplayer"
-	fi
-
-	# 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"
-}
diff --git a/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild b/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild
index 818ed30b3d82..2f3fe2e5b22d 100644
--- a/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c-r1.ebuild,v 1.2 2009/05/14 13:23:18 scarabeus Exp $
 
 EAPI="2"
 
@@ -99,5 +99,5 @@ src_install() {
 	kde_src_install
 
 	# Remove this, as kdelibs provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
+	rm -f "${D}/${KDEDIR}/share/mimelnk/application/x-mplayer2.desktop"
 }
diff --git a/media-video/kmplayer/kmplayer-0.10.0c.ebuild b/media-video/kmplayer/kmplayer-0.10.0c.ebuild
index f058bcdab330..0aeb94904d1a 100644
--- a/media-video/kmplayer/kmplayer-0.10.0c.ebuild
+++ b/media-video/kmplayer/kmplayer-0.10.0c.ebuild
@@ -1,6 +1,6 @@
-# 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/media-video/kmplayer/kmplayer-0.10.0c.ebuild,v 1.7 2008/07/31 20:27:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.10.0c.ebuild,v 1.8 2009/05/14 13:23:18 scarabeus Exp $
 
 inherit kde eutils
 
@@ -94,5 +94,5 @@ src_install() {
 	kde_src_install
 
 	# Remove this, as kdelibs provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
+	rm -f "${D}/${KDEDIR}/share/mimelnk/application/x-mplayer2.desktop"
 }
diff --git a/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
deleted file mode 100644
index 7cac119a6054..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild,v 1.9 2008/07/31 20:27:20 carlo Exp $
-
-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 x86"
-IUSE="mplayer xine cairo"
-
-RDEPEND="mplayer? ( media-video/mplayer )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	cairo? ( x11-libs/cairo )"
-DEPEND="x11-libs/libXv
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	cairo? ( x11-libs/cairo )"
-
-LANGS="ar br bs ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
-lt mt nb nl 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}/kmplayer-0.9.4a-vop2vf.patch"
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use cairo; then
-		echo
-		ewarn "Neither the mplayer, xine or cairo use flags have been set."
-		ewarn "One of them is required. From them, mplayer can be installed"
-		ewarn "afterwards; however and xine will require you to recompile."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-
-	cd "${WORKDIR}/${MY_P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} || rm -f "${X}."*
-	done
-
-	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 = ${MAKE_DOC}:" \
-		"${KDE_S}/doc/Makefile.am" || die "sed for locale failed"
-
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="--without-gstreamer $(use_with xine) $(use_with cairo)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}