[kde-base/pykde4] EPREFIXify

4 files changed, 16 insertions, 13 deletions

diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 73b73a6f01d..4c77fb5258d 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,6 +1,6 @@
 AUX pykde4-python3.patch 633 RMD160 336af95b915f9d207c98e11fc72068d6803ca82f SHA1 2d8cb7f0479f93f89750724ac25874e51afb2964 SHA256 8def8114ae31b1bbd835ba2caa52dc5a7847a0011f9762dc4c35a795afc24a9d
 DIST kdebindings-4.3.80.tar.bz2 5034264 RMD160 c1b5d528b5d63d96b175d72e9b06120c63c615c3 SHA1 485568172e0d4de11b49f2263d3175a2e59ce559 SHA256 dbc2848e4c5526a39aa1ee8003fa59a123f482523d01faebf20b2a93cf39ad10
-EBUILD pykde4-4.3.80.ebuild 2588 RMD160 2b61c7de023c40ee35c71518197d051dcbb8d706 SHA1 cb5010cbc639f839fd4dd81c7c4e8dbde257fb90 SHA256 a8ccadff2adc3732dcca443aab03104365ce041b9ded1db227a1e9f2fa3e6fc7
-EBUILD pykde4-4.3.9999.ebuild 1721 RMD160 d9b3c6778a9405f30701c991e8eae9d0a0edca32 SHA1 aa4c38d49c154f55b88941ad28a386d08f2e7978 SHA256 a0aad91eb85f973d1bef26311d8c0d8ee7b2a67c0059b57b00568d1482a2d647
-EBUILD pykde4-9999.ebuild 2491 RMD160 b25ebf8edfc6c40f5cb0f47afb5ba2ca1c195993 SHA1 da6663460801c33f1a48aec1b46e4078354f241f SHA256 1a85be345bed6578854f428de72945061a6e938f88a0f05f071cecfbacd9d54e
+EBUILD pykde4-4.3.80.ebuild 2661 RMD160 5c570316107726830e894a3601bd28b890b222ce SHA1 a6abbb11d639a5ae30fa3e0ea8018cf03a2e099b SHA256 5c66a5adc77b0db37bec017daed2c12649075d8e7e9dbad8676929b7d0956dab
+EBUILD pykde4-4.3.9999.ebuild 1795 RMD160 8811453232f3b2ef94decfd0776f42502d422032 SHA1 fd3495edad94537c67e1e860aabb9b73317bf8a8 SHA256 25d19c6db379a896384f630dd3ffcfbde97b099f829bf6f0d34cdc5a4067823e
+EBUILD pykde4-9999.ebuild 2564 RMD160 673f9f51a10bc4b8f85341ce5e0bdfeac2340acb SHA1 1025899e07c12b906e9a22d1eb1a935d7acc2d08 SHA256 eb632cd47f0877f812bcaefcc951dd723081ff867b6332c599872034a84ec107
 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8
diff --git a/kde-base/pykde4/pykde4-4.3.80.ebuild b/kde-base/pykde4/pykde4-4.3.80.ebuild
index f30cf8c0c44..c681b42875d 100644
--- a/kde-base/pykde4/pykde4-4.3.80.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.80.ebuild
@@ -16,9 +16,10 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="akonadi debug examples policykit semantic-desktop"
 
 DEPEND="
-	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
+	aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
 # blocker added due to compatibility issues and error during compile time
@@ -99,7 +100,7 @@ src_install() {
 		CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
 		kde4-meta_src_install
 
-		rm -f "${D}$(python_get_sitedir)"/PyKDE4/*.py[co]
+		rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co]
 	}
 
 	python_execute_function -s do_src_install
@@ -113,7 +114,7 @@ pkg_postinst() {
 	if use examples; then
 		echo
 		elog "PyKDE4 examples have been installed to"
-		elog "${PREFIX}/share/apps/${PN}/examples"
+		elog "${EKDEDIR}/share/apps/${PN}/examples"
 		echo
 	fi
 }
diff --git a/kde-base/pykde4/pykde4-4.3.9999.ebuild b/kde-base/pykde4/pykde4-4.3.9999.ebuild
index d82d72ee4a2..c6b13eb7fad 100644
--- a/kde-base/pykde4/pykde4-4.3.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.9999.ebuild
@@ -15,8 +15,9 @@ KEYWORDS=""
 IUSE="akonadi debug examples policykit semantic-desktop"
 
 DEPEND="
-	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
+	aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
@@ -56,8 +57,8 @@ src_install() {
 	kde4-meta_src_install
 
 	rm -f \
-		"${D}$(python_get_sitedir)"/PyKDE4/*.py[co] \
-		"${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}${PREFIX}"/share/apps/"${PN}"/*.py[co]
 }
 
 pkg_postinst() {
@@ -68,7 +69,7 @@ pkg_postinst() {
 	if use examples; then
 		echo
 		elog "PyKDE4 examples have been installed to"
-		elog "${PREFIX}/share/apps/${PN}/examples"
+		elog "${EKDEDIR}/share/apps/${PN}/examples"
 		echo
 	fi
 }
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 9ef689ab3e4..3deecb9cb48 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -16,9 +16,10 @@ KEYWORDS=""
 IUSE="akonadi debug examples policykit semantic-desktop"
 
 DEPEND="
-	>=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	akonadi? ( $(add_kdebase_dep kdepimlibs) )
+	aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
 	policykit? ( >=sys-auth/policykit-qt-0.9.2 )
 "
 # blocker added due to compatibility issues and error during compile time
@@ -95,7 +96,7 @@ src_install() {
 		CMAKE_USE_DIR="${S}-${PYTHON_ABI}"
 		kde4-meta_src_install
 
-		rm -f "${D}$(python_get_sitedir)"/PyKDE4/*.py[co]
+		rm -f "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co]
 	}
 
 	python_execute_function -s do_src_install
@@ -109,7 +110,7 @@ pkg_postinst() {
 	if use examples; then
 		echo
 		elog "PyKDE4 examples have been installed to"
-		elog "${PREFIX}/share/apps/${PN}/examples"
+		elog "${EKDEDIR}/share/apps/${PN}/examples"
 		echo
 	fi
 }