Permalink
Browse files

Fix unity-base/unity python scripts, only compatible with python2

  • Loading branch information...
1 parent 1d73358 commit 70d20492e623ad03f58ceb04f1ab85f0f04223c1 @shiznix committed Oct 2, 2012
Showing with 10 additions and 5 deletions.
  1. +1 −1 unity-base/unity/Manifest
  2. +9 −4 unity-base/unity/unity-5.16.0.ebuild
@@ -5,5 +5,5 @@ DIST unity_5.16.0-0ubuntu1.diff.gz 60803 SHA256 d9326210376b430704b1a6c40597fe26
DIST unity_5.16.0.orig.tar.gz 1288289 SHA256 2b99b7d8308817b9e1d431beb162a0cf03e92acfb01eb71d69ea01e63c7753e6 SHA512 b8db561f9fb57a9d00fae67d96106f759f2aa16b2eaae5ba13dcbb28fd7ce8f15d9334ae9bd40e68f71507c01b5ea729c9457f52d4f5e4280cc554b62699d66e WHIRLPOOL 8e55ec46da74cada9c4935b6c3b2d0b9a89bb897b21cb0bdeb307f3ee6e618f98792a6451e8abfe9c6750dc2dff889f06c591f5db289443d0939f826e2cbc2d1
DIST unity_6.6.0-0ubuntu2.diff.gz 68521 SHA256 47f0e390dd13981ac3e7e6d896f63a46a898f2fa2bc9bb9f3a9456b5bad6f2b5 SHA512 5e2802e271cd34c35ed6b7e638f3786c4b99b8ffedff31a92b9eb254df3fa0e64b295a7dd8635f3777a828d39c63f150531ca6882fff3b065ff05b738a0e0af1 WHIRLPOOL 8c0441faf19d0614832d400b55c722da24058fce2b9396c04e6c3d670ba107a1d5aee657f2e1eb7a6955d354e4da7aedefd6efeefa50e06d697c5afdc99b0f30
DIST unity_6.6.0.orig.tar.gz 1641442 SHA256 3ef633ab466b979a1c0e114a264ff6a859520204716e8e8ef5a8ab22aed3adaf SHA512 e23c791de1e5f7076d9de8be9165f0d4ad3b0efb2c4af977497453c05eb2323a938efba76c80b49d595a59f2e371bae4b002865e47c8ff5909b7a2adfee1ce57 WHIRLPOOL 1e5e1e0277cbaeb4bac4743181e12983ab78c7a97778700b6443041c2d38a80c433de5b2d173b07d6482852352aa5c8d2a967718f04965edea00dc8d6460f044
-EBUILD unity-5.16.0.ebuild 2977 SHA256 1889dcde56a6969541fb0e8a8562de6d3fa43899e0b71b2282374150cf3d9fcf SHA512 d6852f8c1f6026e06dad7ddda7ad655d851db561f53257eeab4169554055f18110a969a344f6298c19cb6441ff4b6d5a7bda0efe9f9ae5d0a0d81019b48f5079 WHIRLPOOL 3cdc474ed8d61dd2fe00a481654f1455cc158ab5e814c52c5e3af5b8fdfcd55f11c2940d5420aa11251108c77402ddbcfd6d7fa60a233c669ec6a5a2be41ede1
+EBUILD unity-5.16.0.ebuild 3081 SHA256 82847bfa1f3e1b124d0f96ea61892da11dc1d3139596c730cc5855d9b8104fda SHA512 0016b349b3e3a7e2074127b731410175be5505be578a31caa08fff879ef882fad699b03ef0d88011785fb68600753e8cd07f6c5d5f4ee378c0ef30cfcc040ffa WHIRLPOOL f1d16ac26e6dbcee9c277fecb9901f837e965cb0066d4a7b80f53ff5f60cca35a1cecef57b3722761a9b7c550a9ec533c05d74e6dada52d763d7fa457cb9b2d8
EBUILD unity-6.6.0.ebuild 2864 SHA256 adbc322332ab309702cfb858328a3d097a4b241076662abe373eb841a9e818a2 SHA512 7dde2f16b902a81831ea45c6c19b5efd4a17f0e6d57bed3d4dd3434c61188e407a31e682f76fb4caf7e91d9d99d64929840669f411a0d9f104c67015d0b361a2 WHIRLPOOL 4cd30507c89a22cf1af03108265c36c90f14f4191188a68ed409429a4daf30c3a3238e969edac9362d48854a7dbb4adcf36d37b9c52511cb9de835971168f8a6
@@ -1,4 +1,6 @@
EAPI=4
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
inherit base gnome2 cmake-utils eutils python toolchain-funcs
@@ -67,6 +69,9 @@ pkg_pretend() {
src_prepare() {
base_src_prepare
+ python_convert_shebangs -r 2 .
+ python_src_prepare
+
sed -e "s:/desktop:/org/unity/desktop:g" \
-i "com.canonical.Unity.gschema.xml" || die
@@ -86,10 +91,10 @@ src_configure() {
src_install() {
pushd ${CMAKE_BUILD_DIR}
- addpredict /root/.gconf # FIXME
- addpredict /usr/share/glib-2.0/schemas/ # FIXME
- addpredict $(python_get_sitedir) # FIXME
- emake DESTDIR="${D}" install
+ addpredict /root/.gconf # FIXME
+ addpredict /usr/share/glib-2.0/schemas/ # FIXME
+# addpredict $(python_get_sitedir) # FIXME
+ emake DESTDIR="${D}" install
popd ${CMAKE_BUILD_DIR}
}

0 comments on commit 70d2049

Please sign in to comment.