Fix kdeenablefinal build (bug 349620), remove old

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

6 files changed, 37 insertions, 61 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/Manifest b/media-video/kplayer/Manifest
index e6db67ad45b0..a22748a401fc 100644
--- a/media-video/kplayer/Manifest
+++ b/media-video/kplayer/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX kplayer-0.7-enablefinal.patch 359 RMD160 2db5e35d7ac88be2dab142caf1faacfb30c96f45 SHA1 470ebafc30463d5893e97ef9c0bf4ae620143ea8 SHA256 5425610eec02b6f8eeff68d6918a37d880e3ea2df4ff802c6e2d2798f41cbb0d
+AUX kplayer-0.7.1-enablefinal.patch 580 RMD160 d9237356ddeafcf64038aa66a6404e980cf922a9 SHA1 98162f54a2b387dbaa9f9f1e958036f55e0c109d SHA256 1adb4bd4b8a05a50a32519442b532b9f6babe996ca0a376b572edf4f43aa00dd
 DIST kplayer-0.7.1.tar.bz2 6522939 RMD160 15135f98d567e703c08181c00b4cad00053ddf46 SHA1 6a010565d1cd6ce06ac26b8794c150ed9471db62 SHA256 f046cf90b414ee95b3e1eb4483ad9461badb3c37adb103e61455984880fd74ac
-DIST kplayer-0.7.tar.bz2 4769797 RMD160 1faeeef3272db018c101fd5d1ce1e21f18eaa54e SHA1 a0c49ada6efef5d71866795adf4e2b6dbe7f3167 SHA256 642fa861b8cee1a45c92a0378c07203c36c7f922ae2bcb38b9e674d5bf0ee0b7
-EBUILD kplayer-0.7.1.ebuild 840 RMD160 6579198ebd19a817c749c1fa8bc3876bfb6d9e92 SHA1 04135137af2dd611bfc5368ab746cc0f2debaaa4 SHA256 5b5f64c6f1f3fe2c56d00a9a8c9e62b4f0fc277d81a37b5d56d94e69397d0b99
-EBUILD kplayer-0.7.ebuild 1076 RMD160 dac8631d36f666ef6dea0ca21038a4986cdb9da5 SHA1 951255d283ae0d57f58f02dbce61752538e83938 SHA256 3b9dae791055f7fa36e7b82ca6b3ecf932c8628a83160efe8b63dffbf823794f
-MISC ChangeLog 6011 RMD160 2e827a3e824c0a0124e92de4b7d08a1940a69eec SHA1 e0b212de56c77d77317e28882142a442ef93af1a SHA256 e72fdfe3252266b5fc636d411b16856005c0ad65aa035585a37cb35f9e4d8788
+EBUILD kplayer-0.7.1.ebuild 889 RMD160 e101947041f09d42495cd0ee060c40ec7fb26dbd SHA1 320f79f9b7f723fd642dcb74cc4bed81c372cbbb SHA256 e3244bc3ca343fabfd954f2328f2693fd95de11452fba56090525bc0788b6a84
+MISC ChangeLog 6245 RMD160 0dbb0cce15c530e74780a63df91fa772af5af217 SHA1 bc5ad2a1407097212442b60768feb97049542ed4 SHA256 13c00a83dddfd3cb8ad42a69947c4b173a38d9f62ffea6a3d85455cc6095e916
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk686VgACgkQuUQtlDBCeQIpTACfU+c9pmqVvDVT+3RLx7ijdSQ0
-ap0An0tt7c4+7Sm6FHqrCK6A1smjsFOp
-=+3RL
+iQIcBAEBCgAGBQJOvu26AAoJENwGBM22xffeFA4P/25xsDNIOWGgihuJLRmrddij
+ydRN5SNHiTHfc+IcIvM3ehMM1pzDU7C28SX2xpMPTHkPcT2csPg5OxXMBEU0pZaL
+OJiG6EjGieVkz/uqOWvHH8hqfcjfLoM7VWV4F1l7Nvol0COBWAcaOiDJc8CT3kRA
+Z/EhCH8nhMf0VYs6vRQ7Saj2U1wG9cfE/vkiTTorOReSRlHdnzitONIEcuCK4+OX
+CIbT97TjvziCD/0JE3uUVsJcgAyd4VoKHYZBsd2zydtq9sLzXCuaUMHagnQGoyoy
+9Ee8DN0sG1CnmJk1gVbXmNyV3uGHCNymUWiBF0PdjJXSvHapRJs9eDgRbNk87b6E
+2FQPMNyhdlsi9sL0Yr3e7IOHKYHwn9CPa4IN4ysMLik4jg0nlNvhWVxSDGyXBAf6
+Lfa8Zd0wTPvYOqxZA6gxz/JFLpGvyFMJKgR8anp4E4KHXPGZzHWyhiuxOKXqlVKr
+mO4mkiENHrnf2mTwzrQdIHxhj3LMcVP0aqE9Zb8OX1cN7NZ5GtZrPA+UtjlD00eL
+C3n4yI7ZrOVTiJ2QFwHE/fjuktGWKfypXV8o8TsmGchTIMrcoBB460zheaRqLA5y
+ygmp3tO2XWHtDXiuAph9LfnWuGkrgQvic7lxU4b7U+SKXoFHMuDwtkEduHQoKFqd
+zEU++ABUlNgYN+WOMkHA
+=M7Gh
 -----END PGP SIGNATURE-----
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
-}