Fixed system-config-printer-kde a bit

5 files changed, 41 insertions, 15 deletions

diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 3091e08c872..0e815780a09 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  +files/system-config-printer-kde-pykde4.patch,
+  system-config-printer-kde-4.2.70.ebuild,
+  system-config-printer-kde-9999.ebuild:
+  Fixed buildsystem
+
   18 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -system-config-printer-kde-4.2.69.ebuild,
   +system-config-printer-kde-4.2.70.ebuild:
diff --git a/kde-base/system-config-printer-kde/Manifest b/kde-base/system-config-printer-kde/Manifest
index 65c59a1f69d..23b61def726 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -1,7 +1,8 @@
+AUX system-config-printer-kde-pykde4.patch 1941 RMD160 e88a32ed052420f00faf4e9c874112d7d7ee068d SHA1 78e53d5fdf3a33159769ef9180f403bc3ed0c7f2 SHA256 35d15512facde93468aa4f5576d917fb07432e18354ec1a58f0f6de217e51df5
 DIST kdeadmin-4.2.2.tar.bz2 1923811 RMD160 c552e9252d47bcf1016518a171238844192ac73d SHA1 3bf8f689d6fcafcfdfb2bea4c6003e56c80c4601 SHA256 956f43fa1bf640451d1f7bc532895e90952d56aafd9b824083ae9a4683670bef
 DIST kdeadmin-4.2.70.tar.lzma 1664786 RMD160 bdb7409614f70492f399517c6a4670b530e815e6 SHA1 5059ea4b96631964ec426965289aa62ec480e9a6 SHA256 71ae8da7a7a6c201df4c80b1ff1f8304229ceb96b2add6e70513893a1c4fda71
 EBUILD system-config-printer-kde-4.2.2.ebuild 496 RMD160 fb51e9d33cb370b2cd77e52006c687e38fe84405 SHA1 b97086d4f57d1c2b2f6cce2335bfa1fd1ae99c7e SHA256 d29f3b051e549d5b4fdb01369090dbea5eec9deab06d855c563c21a6dee62477
-EBUILD system-config-printer-kde-4.2.70.ebuild 638 RMD160 e987bdb0e39eaf695576d922a72b00efbf27db87 SHA1 1b99076717ac33aaa9f943dedc0f86f101246655 SHA256 c9653ea1490070f366dbc8bc5cd82951649bcef26678a7915726ea84bd369c72
-EBUILD system-config-printer-kde-9999.ebuild 627 RMD160 832a44f001951670cb8b29b2544334e6d205caf0 SHA1 994a8014b8ff760d24ee9f624a6fc075426cab9a SHA256 51cdf596b646ef5c40ac7cb8930ab1b8a297da97fd672e6e85fd326f1169953d
-MISC ChangeLog 3676 RMD160 c5413bda43a5952f8dba9a62441a217b5b9092bf SHA1 6e591f7ba958e7c1b08b1ed0a61362b029b1f902 SHA256 8f3b8714912252463af82d6f5e5e5e1e38a5d46681444e5c4e88e3919ec4da00
+EBUILD system-config-printer-kde-4.2.70.ebuild 517 RMD160 35dd99db131ebfe4e0254190ed8fd33eb0cd64b0 SHA1 73bdca0dcafb26e921b1d2e4d65da5fcb3c7afc8 SHA256 3c318cbf8a2aa07e6ff8a675652b8c08332b5a95a331cbdb7f1bd351df2c989d
+EBUILD system-config-printer-kde-9999.ebuild 506 RMD160 4250c6abad30c140bd175f64e1779098cf3b4b19 SHA1 70e5d30db5239414b45621e654f605f88bcb072d SHA256 38860e5b88fa7ad3431d06f531c47d978b13661135cbcdda3d852ee04454bb33
+MISC ChangeLog 3894 RMD160 5b9a333618778e224a1d6dbb523521a20c99b1d9 SHA1 3707fdb29c8ece518135c1f2f5ba3c7ecbbeec71 SHA256 2fecd0bb8bedb6c41da2e676af4af823cd32791e94e43fed68f865123396a0bd
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/system-config-printer-kde/files/system-config-printer-kde-pykde4.patch b/kde-base/system-config-printer-kde/files/system-config-printer-kde-pykde4.patch
new file mode 100644
index 00000000000..c99e36c421e
--- /dev/null
+++ b/kde-base/system-config-printer-kde/files/system-config-printer-kde-pykde4.patch
@@ -0,0 +1,29 @@
+--- system-config-printer-kde/CMakeLists.txt	2009-04-18 12:42:46.000000000 +0200
++++ system-config-printer-kde/CMakeLists.txt	2009-04-19 06:17:37.000000000 +0200
+@@ -10,10 +10,10 @@
+     macro_log_feature(PYQT4_FOUND "PyQt4" "PyQt4 was not found.  It is needed by system-config-printer-kde to run. (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://www.riverbankcomputing.co.uk/pyqt/" FALSE)
+ ENDIF(NOT PYQT4_FOUND)
+ 
+-macro_optional_find_package(PyKDE)
+-IF(NOT PYKDE_FOUND)
+-    macro_log_feature(PYKDE_FOUND "PyKDE" "PyKDE was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
+-ENDIF(NOT PYKDE_FOUND)
++macro_optional_find_package(PyKDE4)
++IF(NOT PYKDE4_FOUND)
++    macro_log_feature(PYKDE4_FOUND "PyKDE4" "PyKDE4 was not found.  It is needed by system-config-printer-kde to run.  (Use -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE to install anyway)" "http://websvn.kde.org/trunk/KDE/kdebindings/python/pykde4/" FALSE)
++ENDIF(NOT PYKDE4_FOUND)
+ 
+ macro_optional_find_package(PyCups)
+ IF(NOT PYCUPS_FOUND)
+@@ -25,9 +25,9 @@
+     macro_log_feature(SYSTEMCONFIGPRINTER_FOUND "system-config-printer" "system-config-printer was not found.  Some of its modules (cupshelpers.py, config.py, smburi.py and debug.py) are required by system-config-printer-kde." "http://cyberelk.net/tim/software/system-config-printer/" FALSE)
+ ENDIF(NOT SYSTEMCONFIGPRINTER_FOUND)
+ 
+-IF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
++IF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+     SET(INSTALL_SYSTEM_CONFIG_PRINTER TRUE)
+-ENDIF(PYQT4_FOUND AND PYKDE_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
++ENDIF(PYQT4_FOUND AND PYKDE4_FOUND AND PYCUPS_FOUND AND SYSTEMCONFIGPRINTER_FOUND)
+ 
+ IF(INSTALL_SYSTEM_CONFIG_PRINTER)
+     install( FILES
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.70.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.70.ebuild
index d27253bc605..36f331e782b 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.70.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.2.70.ebuild
@@ -21,9 +21,4 @@ RDEPEND="${DEPEND}
 	net-print/cups[dbus]
 "
 
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e 's/^project(system-config-printer-kde)//' \
-		"${PN}"/CMakeLists.txt || die "failed to apply sandbox workaround"
-}
+PATCHES=( "${FILESDIR}/${PN}-pykde4.patch" )
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
index 03b4263a874..c89bcf961f6 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
@@ -21,9 +21,4 @@ RDEPEND="${DEPEND}
 	net-print/cups[dbus]
 "
 
-src_prepare() {
-	kde4-meta_src_prepare
-
-	sed -i -e 's/^project(system-config-printer-kde)//' \
-		"${PN}"/CMakeLists.txt || die "failed to apply sandbox workaround"
-}
+PATCHES=( "${FILESDIR}/${PN}-pykde4.patch" )