Changeset 709

Timestamp:

12/21/09 22:25:13 (2 years ago)

Author:

sleipnir

Message:

Merge upstream changes and make the ugly hack a bit less ugly.

Location:

openmoko/trunk/openmoko-target/dev-lang/python

Files:

• Manifest (modified) (1 diff)
• python-2.6.4.ebuild (modified) (6 diffs)

openmoko/trunk/openmoko-target/dev-lang/python/Manifest

@@ -28 +28 @@
 EBUILD python-2.6.2-r1.ebuild 9374 RMD160 e2b6b466ff8cfa363d5af68aadd9189daa9bdbfd SHA1 3d207025be7d8ad30f548a351a695dbec641b227 SHA256 cce9f301cae10a0c8e6ce29a9161f3c72b0cf91d372dfbb18006d28ccbde9b8f
 EBUILD python-2.6.2-r2.ebuild 11162 RMD160 9f3215c3353f41a7427334b22d1dd00c54e852eb SHA1 7c8b87d5abcb511bb0e6c85871e0c4098d0be41c SHA256 2e431e703e3b255f619e45295c529a7abb13898014330d6d2aeea474da36a424
-EBUILD python-2.6.4.ebuild 10703 RMD160 a2d8c75ac6992befd29a3a02bda437ebf41c3551 SHA1 c6f957d8eabc7e4936dfd3bcc44f223e0fbd10aa SHA256 6d8a06c3e96eeaba018b7de39f41b3b0dc48c1caee9c388d39c95e13ba2fa66a
+EBUILD python-2.6.4.ebuild 10766 RMD160 117db0eb7204e389dc66bdda46c62d2f28cc070e SHA1 78fd91c8b9f2f305f417a16c1dbc2daeec1f4d44 SHA256 56c5ee943ba15da505d8b96d823b26699d635300677e204bc80b2ac134c677fd

openmoko/trunk/openmoko-target/dev-lang/python/python-2.6.4.ebuild

@@ -1 +1 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4.ebuild,v 1.1 2009/10/30 11:49:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.4.ebuild,v 1.7 2009/12/13 16:34:03 armin76 Exp $
 
 EAPI="2"
@@ -24 +24 @@
 LICENSE="PSF-2.2"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk ucs2 wininst +xml"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk +wide-unicode wininst +xml"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes}
@@ -55 +55 @@
                 )"
 DEPEND="${RDEPEND}
-                dev-util/pkgconfig"
+                dev-util/pkgconfig
+                !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-admin/python-updater"
@@ -176 +177 @@
                 make distclean
                 # Ugly fix, hostpython require few modules to pass test_unicode.py test
-                cp -v /usr/lib/python2.6/lib-dynload/unicodedata.so Modules/.
-                cp -v /usr/lib/python2.6/lib-dynload/time.so Modules/.
-                cp -v /usr/lib/python2.6/lib-dynload/math.so Modules/.
+                cp -v /usr/lib/python${PYVER}/lib-dynload/unicodedata.so Modules/.
+                cp -v /usr/lib/python${PYVER}/lib-dynload/time.so Modules/.
+                cp -v /usr/lib/python${PYVER}/lib-dynload/math.so Modules/.
                 sed -i \
                         -e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
@@ -198 +199 @@
                 $(use_enable ipv6) \
                 $(use_with threads) \
-                $(use ucs2 && echo "--enable-unicode=ucs2" || echo "--enable-unicode=ucs4") \
+                $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
                 --infodir='${prefix}'/share/info \
                 --mandir='${prefix}'/share/man \
@@ -281 +282 @@
         newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT}
 
-        # Installs empty directory.
-        rmdir "${D}usr/$(get_libdir)/${PN}${PYVER}/lib-old"
+        # Don't install empty directory.
+        rmdir "${D}usr/$(get_libdir)/python${PYVER}/lib-old"
 }