Fix kdeenablefinal build (bug 349620), remove old

(Portage version: 2.1.10.34/cvs/Linux x86_64)

5 files changed, 21 insertions, 53 deletions

diff --git a/media-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index c8bd64419c4b..630067a08ced 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.47 2011/11/11 09:22:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.48 2011/11/12 21:04:43 dilfridge Exp $
+
+  12 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kplayer-0.7.ebuild,
+  kplayer-0.7.1.ebuild, +files/kplayer-0.7.1-enablefinal.patch,
+  -files/kplayer-0.7-enablefinal.patch:
+  Fix kdeenablefinal build (bug 349620), remove old
 
   11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> kplayer-0.7.1.ebuild:
   x86 stable wrt bug #389415
diff --git a/media-video/kplayer/files/kplayer-0.7-enablefinal.patch b/media-video/kplayer/files/kplayer-0.7-enablefinal.patch
deleted file mode 100644
index 4eb41a120677..000000000000
--- a/media-video/kplayer/files/kplayer-0.7-enablefinal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kplayer/x11.cpp.orig	2010-12-26 02:34:38.374000171 +0100
-+++ kplayer/x11.cpp	2010-12-26 02:35:28.989000170 +0100
-@@ -14,7 +14,7 @@ 
-  ***************************************************************************/
- 
- #include <X11/Xlib.h>
--#undef CursorShape
-+#include <fixx11h.h>
- #include <qbytearray.h>
- #include <qnamespace.h>
- #include <qx11info_x11.h>
diff --git a/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch b/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch
new file mode 100644
index 000000000000..9a0afb3fa010
--- /dev/null
+++ b/media-video/kplayer/files/kplayer-0.7.1-enablefinal.patch
@@ -0,0 +1,12 @@
+diff -ruN kplayer-0.7.1.orig/src/kplayerpropertiesdialog.cpp kplayer-0.7.1/src/kplayerpropertiesdialog.cpp
+--- kplayer-0.7.1.orig/src/kplayerpropertiesdialog.cpp	2011-06-10 22:16:25.000000000 +0200
++++ kplayer-0.7.1/src/kplayerpropertiesdialog.cpp	2011-11-12 23:02:00.529999063 +0100
+@@ -33,7 +33,7 @@
+ #define DEBUG_KPLAYER_PROPERTIES_DIALOG
+ #endif
+ 
+-QString listEntry (QComboBox* combo, bool hasDefault = false)
++QString listEntry (QComboBox* combo, bool hasDefault)
+ {
+   static QRegExp re_key_value ("^([^:]+): *(.*)$");
+   if ( hasDefault && combo -> currentIndex() == 0 )
diff --git a/media-video/kplayer/kplayer-0.7.1.ebuild b/media-video/kplayer/kplayer-0.7.1.ebuild
index b257c40f6cc3..1ba474b5cba2 100644
--- a/media-video/kplayer/kplayer-0.7.1.ebuild
+++ b/media-video/kplayer/kplayer-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.1.ebuild,v 1.5 2011/11/11 09:22:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.1.ebuild,v 1.6 2011/11/12 21:04:43 dilfridge Exp $
 
 EAPI=4
 
@@ -22,3 +22,5 @@ IUSE="debug"
 RDEPEND="${DEPEND}
 	|| ( >=media-video/mplayer-1.0_rc1 media-video/mplayer2 )
 "
+
+PATCHES=( "${FILESDIR}/${P}-enablefinal.patch" )
diff --git a/media-video/kplayer/kplayer-0.7.ebuild b/media-video/kplayer/kplayer-0.7.ebuild
deleted file mode 100644
index f3f230462d06..000000000000
--- a/media-video/kplayer/kplayer-0.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.7.ebuild,v 1.8 2011/04/03 16:32:01 dilfridge Exp $
-
-EAPI=3
-
-KDE_LINGUAS="be br ca cs cy da de el en_GB es et eu fi fr ga gl he hu it ja nb
-	nds nl oc pa pl pt pt_BR ru sr sv tr zh_CN"
-inherit kde4-base
-
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-HOMEPAGE="http://kplayer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="${DEPEND}
-	>=media-video/mplayer-1.0_rc1
-"
-
-PATCHES=( "${FILESDIR}/${P}"-enablefinal.patch )
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-src_prepare() {
-	# doc not working
-	sed -i \
-		-e "s:set(CMAKE_VERBOSE_MAKEFILE ON):#nada:g" \
-		-e "s:add_subdirectory(doc):#nada:g" \
-		"${S}"/CMakeLists.txt
-
-	# linking against X11 libraries
-	sed -i "s:target_link_libraries(kplayerpart :target_link_libraries(kplayerpart \${X11_LIBRARIES} :" \
-		"${S}"/kplayer/CMakeLists.txt
-
-	kde4-base_src_prepare
-}