Delete calls to python_version().
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Fri, 26 Feb 2010 19:29:38 +0000 (19:29 +0000)
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Fri, 26 Feb 2010 19:29:38 +0000 (19:29 +0000)
Package-Manager: portage-15458-svn/cvs/Linux x86_64

dev-util/eric/Manifest
dev-util/eric/eric-4.3.10-r1.ebuild
dev-util/eric/eric-4.3.9.ebuild

index c456663a01abf63c05edc5dc5cc125f896b238c6..098eb91456867320af34fb16c723f541f1e8ff13 100644 (file)
@@ -37,8 +37,8 @@ DIST eric4-i18n-zh_CN.GB2312-4.3.10.tar.gz 370574 RMD160 34477924e9e82859ce78d2a
 DIST eric4-i18n-zh_CN.GB2312-4.3.9.tar.gz 370571 RMD160 ecb82b88d3d9b2b3be429b0e45db6ce197ab3092 SHA1 af0abbea9ac348a17eb54a2e40e56c79d42e506f SHA256 4b6b03691112e9e21fdb83b127766aa894bc1dc57675a8206cccef045160bd8c
 DIST eric4-i18n-zh_CN.GB2312-4.4.0.tar.gz 391765 RMD160 95302b143c5ce2898e02fa29e3fc7fe1e7f0e00c SHA1 30818c3f7638588c3fbbd842c2c96dbd347dcd9f SHA256 e3ad80b1d1085895ec8b5f4a837ba22000e37a464dc44dbb6c1b4ce442f0ec5a
 DIST eric4-i18n-zh_CN.GB2312-4.4.1.tar.gz 391764 RMD160 9afcfb21bf4576d695d9dee0dbee45ab5872b820 SHA1 e1fe28deb40e67405a8011ee29779afdc15152ae SHA256 12d6f15327a0e08f78fff5f190fd411831738ff9397d917a8340debd62b9b90b
-EBUILD eric-4.3.10-r1.ebuild 2556 RMD160 8218cac21349f7df1f8954365d151cb811ba351e SHA1 419910ab3ba16daa739cf483e5ad5dab054d2409 SHA256 02c5297a1879f1eca6bb93e2294dc0b127dfa7f68dcc2350709fb2ae1907bea4
-EBUILD eric-4.3.9.ebuild 2449 RMD160 fef620e1a4e28cbd96797ffd46caea6403f64f94 SHA1 be88b123564354ada5ba8fd252349635699835aa SHA256 21d9624028b5fcaa82ca36a7da0e9126ec6a3ccac27af31f279489d0a91b9ed6
+EBUILD eric-4.3.10-r1.ebuild 2503 RMD160 756c8fbade4dad20d37425816411cf7311118fbc SHA1 d00c0ebe49af7a3b231e491f32929dedd78e7aad SHA256 7efbc18c9c3e04e4f757c2fa187ec474ce19dba2287e169304aaea744b0ffc24
+EBUILD eric-4.3.9.ebuild 2395 RMD160 fbdcb622cf0242356f9cadd739b88b2d2b8ed0e4 SHA1 b9cc73a19c22c715accb3baee70604fc01224b5e SHA256 db1a7270dc6da5618f6d8df020b593086f5999a29d685b56c6259f80aef6a981
 EBUILD eric-4.4.0-r1.ebuild 2411 RMD160 639c35f92be0b2d49aced8c852df231095a60ca9 SHA1 6d6ebb06f3fe35b2b74f9e28bf09b1132b47dc44 SHA256 9b495699e94a0657a729795026333d408e689745e33226f0ba148bd73807f615
 EBUILD eric-4.4.1.ebuild 2395 RMD160 8d9f819453d1c7ba7bfc922e69a48a58803c706c SHA1 51c23dd04edf3e1a1b6f0c92c51980434da2fcfe SHA256 127df8ca34059a45862edcca38f2db1941567fb70a34f6c7f77b8e63f0945ced
 MISC ChangeLog 14855 RMD160 cf72de9a9a65f4cfc26b30e618eb2abcf4406c4e SHA1 d06783f26b10e78461b474635b95478c1ffd7daf SHA256 011411607a919e92abbfc1aee17e941b314a313b0e8d4056751ff4ad944fd6cf
index 0c2eca094dbf6033a5a523c709f7286f47462eb2..b6946e2c3de0c99fa189bc11578839da79e5da5e 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.10-r1.ebuild,v 1.2 2010/01/02 16:55:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.10-r1.ebuild,v 1.3 2010/02/26 19:29:38 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -35,8 +35,6 @@ S=${WORKDIR}/${MY_P}
 
 LANGS="cs de es fr ru tr"
 
-python_version
-
 src_prepare() {
        epatch "${FILESDIR}/4.2.3-no-interactive.patch"
        ! use kde && epatch "${FILESDIR}"/${PN}-4.3-no-pykde.patch
@@ -56,10 +54,9 @@ src_install() {
        }
        python_execute_function installation
 
-       python_version
        make_desktop_entry "eric4 --nosplash" \
                        eric4 \
-                       "/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
+                       "$(python_get_sitedir -f)/eric4/icons/default/eric.png" \
                        "Development;IDE;Qt"
 }
 
index 76f320934bf413915a97b9b229fd4b6769a95fa9..fb26169faf6be35eb89b898204ba847da621dab9 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.9.ebuild,v 1.8 2010/01/17 19:09:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.3.9.ebuild,v 1.9 2010/02/26 19:29:38 arfrever Exp $
 
 EAPI="2"
 NEED_PYTHON="2.4"
@@ -36,8 +36,6 @@ S=${WORKDIR}/${MY_P}
 
 LANGS="cs de es fr ru tr"
 
-python_version
-
 src_prepare() {
        epatch "${FILESDIR}/4.2.3-no-interactive.patch"
 }
@@ -56,10 +54,9 @@ src_install() {
        }
        python_execute_function installation
 
-       python_version
        make_desktop_entry "eric4 --nosplash" \
                        eric4 \
-                       "/usr/$(get_libdir)/python${PYVER}/site-packages/eric4/icons/default/eric.png" \
+                       "$(python_get_sitedir -f)/eric4/icons/default/eric.png" \
                        "Development;IDE;Qt"
 }