Version bump. Remove old.

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

4 files changed, 102 insertions, 64 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 385b82e9c86a..677f4214049e 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.126 2009/06/05 12:13:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.127 2009/09/07 11:56:52 scarabeus Exp $
+
+*kmplayer-0.11.1b (07 Sep 2009)
+
+  07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -kmplayer-0.11.1.ebuild, +kmplayer-0.11.1b.ebuild:
+  Version bump. Remove old.
 
 *kmplayer-0.11.1a (05 Jun 2009)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 2dcb227dcd40..96c27724426f 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 DIST kmplayer-0.10.0c.tar.bz2 1047729 RMD160 4f7f291733f9a73f5838e028af5e5268d1a0ee10 SHA1 52bfa017e1360fdc60c10445090c867039da4830 SHA256 f9a699fa7bf53c7130ce6aff56e4bc53f957c5d86d3d1d23d791cca8f1cf3820
-DIST kmplayer-0.11.1.tar.bz2 492580 RMD160 31ba4a292064dc8393654bfea4d241b0f1126fe6 SHA1 c773fd2f059aca4f624939b302c94c570201fade SHA256 d10df9c31f540ab9442b75e0be0ed2cff9313de9004a4a8acbe3dbed79d5fddb
 DIST kmplayer-0.11.1a.tar.bz2 525654 RMD160 0d124f2c52eb38def34c476bd22039e0b1998f15 SHA1 b5c74326db56bd5529cbccdff808be1c94bb881a SHA256 df2c1ec1ddb7067ef8047d33e15ba67ed8b06a866dcf79ec9962823001e0d29b
+DIST kmplayer-0.11.1b.tar.bz2 527780 RMD160 b6991c9bc7eb442157d844f883300e163ee7a441 SHA1 e2bec0438f2915f079eb54e38978e3e3cd9f6ed0 SHA256 d1518432f5b71e6d0c177536f8e708529a36017d6d519af5fdaecf8154ef9f13
 EBUILD kmplayer-0.10.0c-r2.ebuild 2810 RMD160 f26cee9a35aa98d9c3cc534145f5c87fc9370a99 SHA1 c104fd9ab3ed437a1ef4a9eb86cd5cab9690dc87 SHA256 acdf0fe122fb7bb01f458b230bb15e15f8c6db8341119c5bfa29810b08438050
 EBUILD kmplayer-0.10.0c.ebuild 3011 RMD160 a01c937d058b2b7c56398847a5a15102c939cd27 SHA1 cdf98d37b8870adde1cc18e17a68d149da1956af SHA256 10a594bcb7f49d421b5895cc4580903ed571dd0820a81412ace7b5328b60c17f
-EBUILD kmplayer-0.11.1.ebuild 1556 RMD160 b97d0839317f013be72a886e408c30a5c5e6debe SHA1 f40cc3f535e98e3680adaaf962aaf147aa05a25a SHA256 89940669bcc83b000599ff826941b443bc54ce69eb2e7e4f9af43b2ba35a988f
 EBUILD kmplayer-0.11.1a.ebuild 2015 RMD160 831a3f4a2dbdafe0350306b0ab6f60cb56bdfcb6 SHA1 2e4a3c7631d02523866075f3330b8f86710f7582 SHA256 97ad81814528d4b7dbaa6c898cbf92a0f83a6726056fd5a5ae1f1a5c1739313d
-MISC ChangeLog 18276 RMD160 607ff092dd41e6f3c0474d2bb82279b1f4b947cc SHA1 16ac180be4c3e0b75b50b30394c75775cfce66ca SHA256 a2a45ea523fb63a329c0be1b83b1827be026bec97a21aa6bcca8e88bda2aaca1
+EBUILD kmplayer-0.11.1b.ebuild 2015 RMD160 84d1f3fb15e5f58e296b8b9cec7f84951b666f11 SHA1 f5c73893d4097eabae029db0803ee3ca34c54d8d SHA256 a87e2e2125c11e4efc53306b5774599cb12a3d036ee62fc94196dbcff3672c17
+MISC ChangeLog 18446 RMD160 1ad7d54c5555348fcd8dc753e550aa4adafa241a SHA1 a7a25f7efdd9cb3834d4960b46a79c99578f49ae SHA256 26c715db6e294f90c41c0d821d05fa78d5c27713cfad446e63c242caea8b376f
 MISC metadata.xml 427 RMD160 c44a276c2bec1408fb537a0db3422de2958c23ba SHA1 dd328c866c4cd6837cd40a5ddc8a4470ea02bd2f SHA256 debd27d9d06ca1dd09cb347e5f43a83f3bdbf1bce66564c6a247d18928f24b06
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqk9R8ACgkQHB6c3gNBRYde9gCfcpArH5+JYlUcXlIXNfsQwg4D
+P2YAnR54NP3xQj23Bo2+8tZ5stLxCX3V
+=RTS4
+-----END PGP SIGNATURE-----
diff --git a/media-video/kmplayer/kmplayer-0.11.1.ebuild b/media-video/kmplayer/kmplayer-0.11.1.ebuild
deleted file mode 100644
index 3b97b061a8b6..000000000000
--- a/media-video/kmplayer/kmplayer-0.11.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.11.1.ebuild,v 1.1 2009/05/28 12:44:48 scarabeus Exp $
-
-EAPI="2"
-
-inherit kde4-base
-
-MY_P="${P/_/-}"
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://${PN}.kde.org/pkgs/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cairo doc npp"
-
-DEPEND="
-	>=dev-libs/expat-2.0.1
-	|| ( media-sound/phonon x11-libs/qt-phonon )
-	x11-libs/libXv
-	cairo? ( x11-libs/cairo )
-	npp? (
-		>=dev-libs/nspr-4.6.7
-		x11-libs/gtk+
-	)
-"
-RDEPEND="${DEPEND}
-	!${CATEGORY}/${PN}:0
-	!${CATEGORY}/${PN}:4.1
-	media-video/mplayer"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# remove duplicate icons (only app icon that is already in oxygen)
-	sed -i \
-		-e "/add_subdirectory(icons)/ s/^/#DONOTINSTALL /" \
-		CMakeLists.txt || die "removing icons failed"
-	# install handbook only when requested
-	if ! use doc; then
-		sed -i \
-			-e "/add_subdirectory(doc)/ s/^/#DONOTINSTALL /" \
-			CMakeLists.txt || die "removing docs failed"
-	else
-		# fix the install dir for docs
-		sed -i \
-			-e "s:\${HTML_INSTALL_DIR}/en:\${HTML_INSTALL_DIR}/en/${PF}:g" \
-			doc/CMakeLists.txt || die "fixing target dir failed"
-	fi
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with cairo CAIRO)
-		$(cmake-utils_use_with npp NPP)"
-	kde4-base_src_configure
-}
diff --git a/media-video/kmplayer/kmplayer-0.11.1b.ebuild b/media-video/kmplayer/kmplayer-0.11.1b.ebuild
new file mode 100644
index 000000000000..e4e5f039d7c8
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.11.1b.ebuild
@@ -0,0 +1,82 @@
+# 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.11.1b.ebuild,v 1.1 2009/09/07 11:56:52 scarabeus Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="cs da de el en_GB es et fr ga gl it ja km ku lt lv mai nb nds nl
+nn pl pt pt_BR ro ru sk sv tr uk"
+
+KMNAME="extragear/multimedia"
+inherit kde4-base
+
+MY_P="${P/_/-}"
+DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://${PN}.kde.org/pkgs/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cairo debug doc expat npp"
+
+DEPEND="
+	expat? ( >=dev-libs/expat-2.0.1 )
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	npp? (
+		dev-libs/dbus-glib
+		>=x11-libs/gtk+-2.10.14
+	)
+"
+RDEPEND="${DEPEND}
+	!media-video/kmplayer:4.1
+	|| (
+		media-video/mplayer
+		media-video/mplayer-bin
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if has_version "media-video/mplayer-bin"; then
+		echo
+		elog 'NOTICE: You have mplayer-bin installed; you may need to configure'
+		elog 'NOTICE: kmplayer to use it from within the application.'
+		echo
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	# do not install icons
+	sed -i \
+		-e "s:add_subdirectory(icons):#add_subdirectory(icons):g" \
+		CMakeLists.txt || die "removing icons failed"
+
+	# fix the install dir for docs
+	sed -i \
+		-e "s|\${HTML_INSTALL_DIR}/en|\${HTML_INSTALL_DIR}/en SUBDIR ${PN}|" \
+		doc/CMakeLists.txt || die "fixing docs target dir failed"
+
+	# make docs optional
+	sed -i \
+		-e "s:add_subdirectory(doc):macro_optional_add_subdirectory(doc):g" \
+		CMakeLists.txt || die "failed to make docs optional"
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use cairo KMPLAYER_BUILT_WITH_CAIRO)
+		$(cmake-utils_use expat KMPLAYER_BUILT_WITH_EXPAT)
+		$(cmake-utils_use npp KMPLAYER_BUILT_WITH_NPP)"
+
+	kde4-base_src_configure
+}