diff options
Diffstat (limited to 'dev-python/gdl-python')
| -rw-r--r-- | dev-python/gdl-python/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/gdl-python/files/gdl-python-2.25.3-python-libs.patch | 59 | ||||
| -rw-r--r-- | dev-python/gdl-python/gdl-python-2.25.3.ebuild | 13 |
3 files changed, 74 insertions, 6 deletions
diff --git a/dev-python/gdl-python/ChangeLog b/dev-python/gdl-python/ChangeLog index fa3dc80aaf25..bdb459c0525b 100644 --- a/dev-python/gdl-python/ChangeLog +++ b/dev-python/gdl-python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/gdl-python -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.37 2011/02/26 19:22:50 eva Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.38 2012/08/13 09:25:56 tetromino Exp $ + + 13 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + gdl-python-2.25.3.ebuild, +files/gdl-python-2.25.3-python-libs.patch: + Finally fix horribly slow python libs detection (bug #344231). 26 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> gdl-python-2.25.3.ebuild: Pin gdl dependency to slot 1. diff --git a/dev-python/gdl-python/files/gdl-python-2.25.3-python-libs.patch b/dev-python/gdl-python/files/gdl-python-2.25.3-python-libs.patch new file mode 100644 index 000000000000..ab691272cbb6 --- /dev/null +++ b/dev-python/gdl-python/files/gdl-python-2.25.3-python-libs.patch @@ -0,0 +1,59 @@ +From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Mon, 13 Aug 2012 04:42:47 -0400 +Subject: [PATCH] Replace horrible slow python libs search + +--- + acinclude.m4 | 36 ++---------------------------------- + 1 files changed, 2 insertions(+), 34 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8694a65..f5373eb 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -59,40 +59,8 @@ $1],dnl + [AC_MSG_RESULT(not found) + $2]) + CPPFLAGS="$save_CPPFLAGS" +- +- # This bit is copied from Planner. murrayc. +- # Check for Python library path +- AC_MSG_CHECKING([for Python library path]) +- +- # Win32 has libpython25.a instead of libpython2.5.a, so we look +- # for both. TODO: Only look for libpython25.a on Windows, and for +- # libpython2.5.a on unix. +- WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"` +- +- python_path=`dirname $PYTHON | sed "s,/bin.*$,,"` +- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do +- if test -e "$i"; then +- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` +- if test -n "$python_path" ; then +- python_lib="python$PYTHON_VERSION" +- break +- fi +- +- # Additionally test WIN32_PYTHON_VERSION +- python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"` +- if test -n "$python_path" ; then +- python_lib="python$WIN32_PYTHON_VERSION" +- break +- fi +- fi +- done +- +- python_path=`echo $python_path | sed "s,/libpython.*$,,"` +- AC_MSG_RESULT([$python_path]) +- if test -z "$python_path" ; then +- AC_MSG_ERROR([cannot find Python library path]) +- fi +- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"]) ++PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"` ++AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"]) + ]) + + dnl +-- +1.7.8.6 + diff --git a/dev-python/gdl-python/gdl-python-2.25.3.ebuild b/dev-python/gdl-python/gdl-python-2.25.3.ebuild index 9e5d837a25a3..32aac4e49a45 100644 --- a/dev-python/gdl-python/gdl-python-2.25.3.ebuild +++ b/dev-python/gdl-python/gdl-python-2.25.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.25.3.ebuild,v 1.9 2011/02/26 19:22:50 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.25.3.ebuild,v 1.10 2012/08/13 09:25:56 tetromino Exp $ EAPI="2" G_PY_PN="gnome-python-extras" @@ -9,7 +9,7 @@ SUPPORT_PYTHON_ABIS="1" PYTHON_DEPEND="2" RESTRICT_PYTHON_ABIS="3.*" -inherit gnome-python-common +inherit autotools eutils gnome-python-common PVP="$(get_version_component_range 1-2)" SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2" @@ -21,13 +21,18 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="examples" RDEPEND=">=dev-libs/gdl-2.28:1" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig + gnome-base/gnome-common" +# eautoreconf needs gnome-base/gnome-common EXAMPLES="examples/gdl/*" src_prepare() { # Fix build failure with gdl-2.28 epatch "${FILESDIR}/${PN}-2.19.1-gdlapi-removal.patch" + epatch "${FILESDIR}/${P}-python-libs.patch" #344231 + eautoreconf gnome-python-common_src_prepare } |