summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOldřich Jedlička <oldium.pro@seznam.cz>2009-01-06 19:44:01 +0100
committerTomas Chvatal <scarabeus@gentoo.org>2009-01-06 20:00:02 +0100
commitf30d5db856ed070b88a85833e52df83116992803 (patch)
treef537f4683569a2597871ed2ef97dc27aa9f8a257
parent00b1c276d2bc3e2f5e48178275960ab24840a6c5 (diff)
downloadkde-f30d5db856ed070b88a85833e52df83116992803.tar.gz
kde-f30d5db856ed070b88a85833e52df83116992803.tar.bz2
kde-f30d5db856ed070b88a85833e52df83116992803.zip
Fixed kde-base/plasma-workspace as per bug #253875. Fixed kde-base/pykde4 to use $(get_libdir).
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
-rw-r--r--kde-base/plasma-workspace/Manifest2
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.1.87.ebuild21
-rw-r--r--kde-base/pykde4/Manifest2
-rw-r--r--kde-base/pykde4/pykde4-4.1.87.ebuild4
4 files changed, 24 insertions, 5 deletions
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index e3321844346..e8e0a3af9c1 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -2,6 +2,6 @@ AUX plasma-workspace-4.1.72-fix.patch 958 RMD160 2922b5ac13b9cbd79a747181b3ff846
DIST kdebase-workspace-4.1.85.tar.bz2 48473810 RMD160 42af9cec1b3a6fb6ff1563d3dd3dee3e05fb90b1 SHA1 fe9b60c191adef803eb6952947bbe0fa3b36a5db SHA256 ce7e89233d1b4c8920288e26dc78c1a7ba6ccc11cffcdc4308922eb15be1c3a8
DIST kdebase-workspace-4.1.87.tar.bz2 41504469 RMD160 dea8664f59d0d9a07039ed7acb95a62fd1cf556c SHA1 e02b60eb3ac14653f93fdf58dd5a3f9cf17ae576 SHA256 6f88f6a3a8342b5aca4909cee66ace7a34b1586730663c126d701809a0abeb98
EBUILD plasma-workspace-4.1.85.ebuild 1720 RMD160 a33ef0ab0f037996571287a82950f5aad3702f41 SHA1 1e554526c2ca2867f9bdfc5febad87c505a9ae3d SHA256 f1333c7d0205a68a3e1eccdba22b1151ff4a46559b637e6993a04d7393aaab0a
-EBUILD plasma-workspace-4.1.87.ebuild 1648 RMD160 e730612c53d7dfa72f86d800f9404f18843ac178 SHA1 87f280f683f78ab643b4f9cf5a052e7085af1014 SHA256 2c475d23cf2bb257261768ecb7beb9ded11cf03e0ce3c4821686b97b4fd859c1
+EBUILD plasma-workspace-4.1.87.ebuild 2091 RMD160 565a4c6d69d92dc3021d5b2d338299dad9087440 SHA1 e0618573eb94660a701403b6a444376ecaf1516e SHA256 535a446e22a7f686e5a7b3c558ffe0cf3ae1ed1c41facc67dc8305b3fa5c3257
MISC ChangeLog 5089 RMD160 4b1e8f75719cd9245c7385e255c0017cf2c2a922 SHA1 992438f545ae1c82a6f919b11f5b82bdf1275002 SHA256 994ab4a0d5b6365df945a56384e19698a7b2b6b229762bf1f52195a6d0973506
MISC metadata.xml 232 RMD160 d028fb8b7f2b679b9b9ca34425e9e486613d1214 SHA1 0e593316c91dbc1ebf44fce61ab06fae59e31179 SHA256 56df5d6c9a58e369ad080bca94c3790fbd7d0f83fe90e29eec1e58266e10af8a
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.1.87.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.1.87.ebuild
index 75fdafb54d6..e9a5dc8e528 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.1.87.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.1.87.ebuild
@@ -6,7 +6,7 @@ EAPI="2"
KMNAME="kdebase-workspace"
KMMODULE="plasma"
-inherit kde4-meta
+inherit python kde4-meta
DESCRIPTION="Plasma: KDE desktop framework"
KEYWORDS="~amd64 ~x86"
@@ -58,3 +58,22 @@ src_configure() {
kde4-meta_src_configure
}
+
+src_install() {
+ kde4-meta_src_install
+ rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/PyKDE4/*.py[co]
+ rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+ python_version
+ python_mod_optimize \
+ /usr/$(get_libdir)/python${PYVER}/site-packages/PyKDE4 \
+ "${PREFIX}"/share/apps/plasma_scriptengine_python
+}
+
+pkg_postrm() {
+ kde4-meta_pkg_postrm
+ python_mod_cleanup
+}
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index f9afc26c73d..fa83905d74e 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,6 +1,6 @@
DIST kdebindings-4.1.85.tar.bz2 4879309 RMD160 10ce23ffff1dee00e9a4950cad460f96f44850ba SHA1 61b3b4fe483b88c807840bf2ed8797c8a8a2bdd0 SHA256 952f1fcd9e640dab163ff1fb7ed4ab89fb076ea9c67f0f6a01e7bf65fa5b2ee5
DIST kdebindings-4.1.87.tar.bz2 4703741 RMD160 0482ddd08c5a235afb997720441d9be533981ced SHA1 cd8d5dcf10c6032dc5c0884be9e47b2e0c05834a SHA256 f9ec22dbd215b86ad7594e77d4a8caccef8abe0208611e9a6af350bf6d01f5d3
EBUILD pykde4-4.1.85.ebuild 1008 RMD160 81398a198a5780f37ab0f2f1c3da2df4ae000285 SHA1 ef141ed4a1ee38b88466a7adaceb0474ebc76bc6 SHA256 88c64ccc56ca34c5cdaa55b4c529f46e641f245ccbc91dd046c29a69356c5d43
-EBUILD pykde4-4.1.87.ebuild 1477 RMD160 fab2107ec49742ae5bbe2db083b9638707ff5002 SHA1 c332dd1ab4d499733b3ba38e4fc2d306f2c8fcae SHA256 f15728f0513e05b30ef83c90b8a3e668788971bbb6663caac077bb61d8d5b4ee
+EBUILD pykde4-4.1.87.ebuild 1435 RMD160 56ee41dfbd6d56fa1aeb55e72a84d7a8e565ee86 SHA1 1cfdb35f1680a77b0edfe1ff07a1cd07237cce55 SHA256 bb1973caccec7cc61558c8ffd273d7d64b3f44627a06da2eb07404666f9bee15
MISC ChangeLog 2832 RMD160 cab8885adb2bda66ccd01be4deb5fcfe30b1844b SHA1 f265c8ff9cc46418a44bfb6bfeff9772d41dd443 SHA256 34f7391a5dc6a825a36b3c97afadbc46c73373fd2035dda8d1b80404a844c8ea
MISC metadata.xml 329 RMD160 1e633aec2db7e678d0b0163a49317c55266ce240 SHA1 6d1f4ca500d135caf6efa5162b8b523fa80fd13d SHA256 27ecce29f8fbc134b365d3873f5d92f6230c43b4fbb30df8b1d0931b9f4a12ac
diff --git a/kde-base/pykde4/pykde4-4.1.87.ebuild b/kde-base/pykde4/pykde4-4.1.87.ebuild
index 282d9f1b18a..20d4d5869c5 100644
--- a/kde-base/pykde4/pykde4-4.1.87.ebuild
+++ b/kde-base/pykde4/pykde4-4.1.87.ebuild
@@ -45,7 +45,7 @@ src_configure() {
src_install() {
kde4-meta_src_install
rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/PyKDE4/*.py[co]
- rm -f "${D}${PREFIX}"/share/apps/plasma_scriptengine_python/*.py[co]
+ rm -f "${D}${PREFIX}"/share/apps/${PN}/*.py[co]
}
pkg_postinst() {
@@ -53,7 +53,7 @@ pkg_postinst() {
python_version
python_mod_optimize \
/usr/$(get_libdir)/python${PYVER}/site-packages/PyKDE4 \
- "${PREFIX}"/share/apps/plasma_scriptengine_python
+ "${PREFIX}"/share/apps/${PN}
}
pkg_postrm() {