summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-08-13 20:52:54 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-08-13 20:52:54 +0000
commit88e4ffd7d5bd2fbdcdc77b4002fc31f77a55eda7 (patch)
tree20c7f8037dafe9b518c5b0f118c2dfe30507f350 /dev-python
parentRespect LDFLAGS. Bug #332283. Thanks to Diego E. 'Flameeyes' Pettenò <flamee... (diff)
downloadgentoo-2-88e4ffd7d5bd2fbdcdc77b4002fc31f77a55eda7.tar.gz
gentoo-2-88e4ffd7d5bd2fbdcdc77b4002fc31f77a55eda7.tar.bz2
gentoo-2-88e4ffd7d5bd2fbdcdc77b4002fc31f77a55eda7.zip
Version bump, closes #328713. Load of bug fixes, closes #301658. Clean up old revisions.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pygtk/ChangeLog12
-rw-r--r--dev-python/pygtk/files/pygtk-2.14.1-fix-numpy-warning.patch12
-rw-r--r--dev-python/pygtk/files/pygtk-2.14.1-gtktoggle.patch11
-rw-r--r--dev-python/pygtk/files/pygtk-2.14.1-ltihooks.patch191
-rw-r--r--dev-python/pygtk/files/pygtk-2.14.1-numpy.patch113
-rw-r--r--dev-python/pygtk/pygtk-2.14.1-r1.ebuild88
-rw-r--r--dev-python/pygtk/pygtk-2.17.0.ebuild (renamed from dev-python/pygtk/pygtk-2.14.1-r2.ebuild)69
7 files changed, 34 insertions, 462 deletions
diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index d70299bc9e27..b18a092ded33 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-python/pygtk
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.233 2010/07/12 16:58:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.234 2010/08/13 20:52:54 eva Exp $
+
+*pygtk-2.17.0 (13 Aug 2010)
+
+ 13 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ -pygtk-2.14.1-r1.ebuild, -pygtk-2.14.1-r2.ebuild,
+ -files/pygtk-2.14.1-fix-numpy-warning.patch,
+ -files/pygtk-2.14.1-gtktoggle.patch, -files/pygtk-2.14.1-ltihooks.patch,
+ -files/pygtk-2.14.1-numpy.patch, +pygtk-2.17.0.ebuild:
+ Version bump, closes #328713. Load of bug fixes, closes #301658. Clean up
+ old revisions.
12 Jul 2010; Jeroen Roovers <jer@gentoo.org> pygtk-2.16.0-r1.ebuild:
Stable for HPPA (bug #312881).
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-fix-numpy-warning.patch b/dev-python/pygtk/files/pygtk-2.14.1-fix-numpy-warning.patch
deleted file mode 100644
index 9182e8967540..000000000000
--- a/dev-python/pygtk/files/pygtk-2.14.1-fix-numpy-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/gdkpixbuf.override-orig 2009-04-06 13:40:08.867685000 -0500
-+++ gtk/gdkpixbuf.override 2009-04-06 13:40:25.582569000 -0500
-@@ -75,7 +75,7 @@ have_numpy(void)
- }
- if (!import_done) {
- import_done = 1;
-- import_array();
-+ import_array1(1);
- if (PyErr_Occurred()) {
- PyErr_Fetch(&exc_type, &exc_value, &exc_tb);
- Py_INCREF(exc_type);
-
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-gtktoggle.patch b/dev-python/pygtk/files/pygtk-2.14.1-gtktoggle.patch
deleted file mode 100644
index aec85009edb4..000000000000
--- a/dev-python/pygtk/files/pygtk-2.14.1-gtktoggle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/gtk.override.orig 2009-06-25 20:52:31.000000000 -0400
-+++ gtk/gtk.override 2009-06-25 20:52:53.000000000 -0400
-@@ -1660,7 +1660,7 @@
- PyObject *py_use_underline = Py_True;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-- "|zO):GtkToggleButton.__init__", kwlist,
-+ "|zO:GtkToggleButton.__init__", kwlist,
- &text, &py_use_underline))
- return -1;
- if (text)
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-ltihooks.patch b/dev-python/pygtk/files/pygtk-2.14.1-ltihooks.patch
deleted file mode 100644
index dfa3851aca89..000000000000
--- a/dev-python/pygtk/files/pygtk-2.14.1-ltihooks.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From dd2009d4e0e9fa9cd4ee8d76ec0e498e62a568b7 Mon Sep 17 00:00:00 2001
-From: Paul Pogonyshev <pogonyshev@gmx.net>
-Date: Sat, 02 May 2009 13:11:06 +0000
-Subject: Remove 'ltihooks.py' as using deprecated Python module.
-
-Remove the script and all related imports. All relevant Makefile's
-now create symbolic links for '.so' files from '.libs' to the level
-up, so that C helper modules are still importable in built, but not
-installed source tree. Same as in PyGObject. (Bug #565593.)
----
-diff --git a/Makefile.am b/Makefile.am
-index 1ed5196..2472727 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -44,10 +44,6 @@ pkgconfig_DATA += pygtk-$(PLATFORM_VERSION).pc
- defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
- defs_DATA =
-
--# python
--pyexec_LTLIBRARIES =
--noinst_PYTHON = ltihooks.py
--
- # pygtk scripts
- pkgpythondir = $(pyexecdir)/gtk-2.0
-
-@@ -141,3 +137,10 @@ doc-dist:
- cp -r docs/cursors/* pygtk/cursors
- tar cfz $(PACKAGE)-docs.tar.gz pygtk
- rm -fr pygtk
-+
-+
-+all: $(pkgpyexec_LTLIBRARIES:.la=.so)
-+clean-local:
-+ rm -f $(pkgpyexec_LTLIBRARIES:.la=.so)
-+.la.so:
-+ $(LN_S) .libs/$@ $@ || true
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 2021220..b9ec8f3 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -195,7 +195,7 @@ CLEANFILES += \
- gtkunixprint.c \
- gtkunixprint.defs \
- gtkunixprint-types.defs
--
-+
-
- EXTRA_DIST += \
- $(GTKUNIXPRINT_DEFS) \
-@@ -248,3 +248,9 @@ endif
- gtk-types.c:
- @:
-
-+
-+all: $(pygtkexec_LTLIBRARIES:.la=.so) $(pkgpyexec_LTLIBRARIES:.la=.so)
-+clean-local:
-+ rm -f $(pygtkexec_LTLIBRARIES:.la=.so) $(pkgpyexec_LTLIBRARIES:.la=.so)
-+.la.so:
-+ $(LN_S) .libs/$@ $@ || true
-diff --git a/gtk/__init__.py b/gtk/__init__.py
-index e2733dc..92af869 100644
---- a/gtk/__init__.py
-+++ b/gtk/__init__.py
-@@ -22,14 +22,6 @@
-
- import sys
-
--# this can go when things are a little further along
--try:
-- import ltihooks
-- # pyflakes
-- ltihooks
--except ImportError:
-- ltihooks = None
--
- # For broken embedded programs which forgot to call Sys_SetArgv
- if not hasattr(sys, 'argv'):
- sys.argv = []
-@@ -49,13 +41,6 @@ else:
-
- import gdk
-
--if ltihooks:
-- try:
-- ltihooks.uninstall()
-- del ltihooks
-- except:
-- pass
--
- from gtk._lazyutils import LazyNamespace, LazyModule
- from gtk.deprecation import _Deprecated, _DeprecatedConstant
-
-diff --git a/tests/common.py b/tests/common.py
-index dfc3401..33216e1 100644
---- a/tests/common.py
-+++ b/tests/common.py
-@@ -7,29 +7,19 @@ def importModules(buildDir, srcDir):
- # Be very careful when you change this code, it's
- # fragile and the order is really significant
-
-- # ltihooks
-- sys.path.insert(0, srcDir)
- # atk, pango
- sys.path.insert(0, buildDir)
- # _gtk, keysyms, glade
- sys.path.insert(0, os.path.join(buildDir, 'gtk'))
- sys.argv.append('--g-fatal-warnings')
-- import ltihooks
-
- atk = importModule('atk', buildDir)
- pango = importModule('pango', buildDir)
- gtk = importModule('gtk', buildDir, 'gtk')
- gdk = importModule('gtk.gdk', buildDir, '_gdk.la')
-
-- # gtk/__init__.py removes the ltihooks, readd them
-- import gtk
--
-- ltihooks.install()
- glade = importModule('gtk.glade', buildDir)
-
-- ltihooks.uninstall()
-- del ltihooks
--
- globals().update(locals())
-
- os.environ['PYGTK_USE_GIL_STATE_API'] = ''
---
-cgit v0.8.2
---- a/ltihooks.py 2009-03-05 23:06:53.000000000 +0100
-+++ b/dev/null 2009-05-02 19:22:42.444026449 +0200
-@@ -1,60 +0,0 @@
--# -*- Mode: Python; py-indent-offset: 4 -*-
--# ltihooks.py: python import hooks that understand libtool libraries.
--# Copyright (C) 2000 James Henstridge.
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--
--import os, ihooks
--
--class LibtoolHooks(ihooks.Hooks):
-- def get_suffixes(self):
-- """Like normal get_suffixes, but adds .la suffixes to list"""
-- ret = ihooks.Hooks.get_suffixes(self)
-- ret.insert(0, ('module.la', 'rb', 3))
-- ret.insert(0, ('.la', 'rb', 3))
-- return ret
--
-- def load_dynamic(self, name, filename, file=None):
-- """Like normal load_dynamic, but treat .la files specially"""
-- if len(filename) > 3 and filename[-3:] == '.la':
-- fp = open(filename, 'r')
-- dlname = ''
-- installed = 1
-- line = fp.readline()
-- while line:
-- if len(line) > 7 and line[:7] == 'dlname=':
-- dlname = line[8:-2]
-- elif len(line) > 10 and line[:10] == 'installed=':
-- installed = line[10:-1] == 'yes'
-- line = fp.readline()
-- fp.close()
-- if dlname:
-- if installed:
-- filename = os.path.join(os.path.dirname(filename),
-- dlname)
-- else:
-- filename = os.path.join(os.path.dirname(filename),
-- '.libs', dlname)
-- return ihooks.Hooks.load_dynamic(self, name, filename, file)
--
--importer = ihooks.ModuleImporter()
--importer.set_hooks(LibtoolHooks())
--
--def install():
-- importer.install()
--def uninstall():
-- importer.uninstall()
--
--install()
diff --git a/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch b/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch
deleted file mode 100644
index 12e6c185c237..000000000000
--- a/dev-python/pygtk/files/pygtk-2.14.1-numpy.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: gtk/gdk.override
-===================================================================
---- gtk/gdk.override (révision 3082)
-+++ gtk/gdk.override (copie de travail)
-@@ -44,7 +44,7 @@
- #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
-
- #ifdef HAVE_NUMPY
--# include <Numeric/arrayobject.h>
-+# include <numpy/arrayobject.h>
- static int have_numpy(void);
- #endif
-
-Index: configure.ac
-===================================================================
---- configure.ac (révision 3082)
-+++ configure.ac (copie de travail)
-@@ -350,18 +350,27 @@
- esac
-
-
--dnl checks to see if Numeric Python is installed.
-+dnl checks to see if numpy is installed.
- AC_ARG_ENABLE(numpy,
- AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),,
- enable_numpy=yes)
-
- if test "x$enable_numpy" != xno; then
- save_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-- AC_CHECK_HEADER([Numeric/arrayobject.h],
-- [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
-- [#include <Python.h>])
-- CPPFLAGS="$save_CPPFLAGS"
-+ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()" 2> /dev/null`
-+ if test "x$numpy_INCLUDES" = "x"; then
-+ AC_MSG_WARN([Could not find a valid numpy installation, disabling.])
-+ enable_numpy=no
-+ else
-+ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES"
-+ AC_CHECK_HEADER([numpy/arrayobject.h],
-+ [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],
-+ [enable_numpy=no],
-+ [#include <Python.h>])
-+ if test "x$enable_numpy" != "xno"; then
-+ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES"
-+ fi
-+ fi
- fi
-
-
-@@ -402,11 +411,11 @@
- $have_gtk && echo gtk with $gtk_version API
- $have_libglade && echo gtk.glade
- $have_gtkunixprint && echo gtk.unixprint
--echo
-
- if test ! $have_atk || ! $have_pango || \
- ! $have_gtk || ! $have_libglade || \
- ! $have_pangocairo || ! $have_gtkunixprint; then
-+ echo
- echo "The following modules will NOT be built:"
- echo
- $have_atk || echo atk
-@@ -416,3 +425,7 @@
- $have_libglade || echo gtk.glade
- $have_gtkunixprint || echo gtk.unixprint
- fi
-+
-+echo
-+echo "Numpy support: $enable_numpy"
-+echo
-Index: setup.py
-===================================================================
---- setup.py (révision 3082)
-+++ setup.py (copie de travail)
-@@ -228,16 +228,16 @@
- data_files.append((DEFS_DIR, ('pangocairo.defs',)))
- GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
- if gtk.can_build():
-- if '--disable-numeric' in sys.argv:
-- sys.argv.remove('--disable-numeric')
-+ if '--disable-numpy' in sys.argv:
-+ sys.argv.remove('--disable-numpy')
- else:
- try:
-- import Numeric
-- Numeric # pyflakes
-+ import numpy
-+ numpy # pyflakes
- GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
- except ImportError:
-- print ('* Numeric module could not be found, '
-- 'will build without Numeric support.')
-+ print ('* numpy module could not be found, '
-+ 'will build without numpy support.')
- ext_modules.append(gtk)
- data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
- data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',
-Index: README
-===================================================================
---- README (révision 3082)
-+++ README (copie de travail)
-@@ -54,7 +54,7 @@
- GTK+ 2.14.0 or higher for 2.14 API
- * libglade 2.5.0 or higher (optional)
- * pycairo 1.0.2 or higher (optional)
-- * Numeric (optional)
-+ * numpy (optional)
-
- This release is supporting the following GTK+ releases:
-
-
diff --git a/dev-python/pygtk/pygtk-2.14.1-r1.ebuild b/dev-python/pygtk/pygtk-2.14.1-r1.ebuild
deleted file mode 100644
index 712ed9fba80a..000000000000
--- a/dev-python/pygtk/pygtk-2.14.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.14.1-r1.ebuild,v 1.10 2010/06/08 00:44:34 arfrever Exp $
-
-EAPI="2"
-
-inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
-
-DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.pygtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc examples"
-
-RDEPEND=">=dev-libs/glib-2.8.0
- >=x11-libs/pango-1.16.0
- >=dev-libs/atk-1.12.0
- >=x11-libs/gtk+-2.13.6
- >=gnome-base/libglade-2.5.0
- >=dev-lang/python-2.4.4-r5
- >=dev-python/pycairo-1.0.2
- >=dev-python/pygobject-2.15.3
- dev-python/numpy"
-
-DEPEND="${RDEPEND}
- doc? (
- dev-libs/libxslt
- >=app-text/docbook-xsl-stylesheets-1.70.1 )
- >=dev-util/pkgconfig-0.9"
-
-src_prepare() {
- # Fix declaration of codegen in .pc
- epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
-
- # Fix test failurs due to ltihooks
- # gentoo bug #268315, upstream bug #565593
- epatch "${FILESDIR}/${P}-ltihooks.patch"
-
- # Switch to numpy, bug #185692
- epatch "${FILESDIR}/${P}-numpy.patch"
- epatch "${FILESDIR}/${P}-fix-numpy-warning.patch"
-
- # Fix bug with GtkToggleButton and gtk+-2.16, bug #275449
- epatch "${FILESDIR}/${P}-gtktoggle.patch"
-
- # disable pyc compiling
- mv "${S}"/py-compile "${S}"/py-compile.orig
- ln -s $(type -P true) "${S}"/py-compile
-
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- use hppa && append-flags -ffunction-sections
- econf $(use_enable doc docs) --enable-thread
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- python_clean_installation_image
- dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
-
- if use examples; then
- rm examples/Makefile*
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- cd tests
- Xemake check-local || die "tests failed"
-}
-
-pkg_postinst() {
- python_need_rebuild
- python_mod_optimize $(python_get_sitedir)/gtk-2.0
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gtk-2.0
- rm -f "${ROOT}"$(python_get_sitedir)/pygtk.{py,pth}
- alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
- alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
-}
diff --git a/dev-python/pygtk/pygtk-2.14.1-r2.ebuild b/dev-python/pygtk/pygtk-2.17.0.ebuild
index 2803db67c250..a5632faa9416 100644
--- a/dev-python/pygtk/pygtk-2.14.1-r2.ebuild
+++ b/dev-python/pygtk/pygtk-2.17.0.ebuild
@@ -1,9 +1,12 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.14.1-r2.ebuild,v 1.3 2010/05/22 20:13:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.17.0.ebuild,v 1.1 2010/08/13 20:52:54 eva Exp $
EAPI="2"
+PYTHON_DEPEND="2:2.6"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
inherit alternatives autotools eutils flag-o-matic gnome.org python virtualx
@@ -12,17 +15,16 @@ HOMEPAGE="http://www.pygtk.org/"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples"
-RDEPEND=">=dev-libs/glib-2.8.0
- >=x11-libs/pango-1.16.0
- >=dev-libs/atk-1.12.0
- >=x11-libs/gtk+-2.13.6
- >=gnome-base/libglade-2.5.0
- >=dev-lang/python-2.4.4-r5
+RDEPEND=">=dev-libs/glib-2.8
+ >=x11-libs/pango-1.16
+ >=dev-libs/atk-1.12
+ >=x11-libs/gtk+-2.18
+ >=gnome-base/libglade-2.5
>=dev-python/pycairo-1.0.2
- >=dev-python/pygobject-2.15.3
+ >=dev-python/pygobject-2.16.1
dev-python/numpy"
DEPEND="${RDEPEND}
@@ -31,24 +33,11 @@ DEPEND="${RDEPEND}
>=app-text/docbook-xsl-stylesheets-1.70.1 )
>=dev-util/pkgconfig-0.9"
-RESTRICT_PYTHON_ABIS="3*"
-
src_prepare() {
# Fix declaration of codegen in .pc
epatch "${FILESDIR}/${PN}-2.13.0-fix-codegen-location.patch"
- # Fix test failurs due to ltihooks
- # gentoo bug #268315, upstream bug #565593
- epatch "${FILESDIR}/${P}-ltihooks.patch"
-
- # Switch to numpy, bug #185692
- epatch "${FILESDIR}/${P}-numpy.patch"
- epatch "${FILESDIR}/${P}-fix-numpy-warning.patch"
-
- # Fix bug with GtkToggleButton and gtk+-2.16, bug #275449
- epatch "${FILESDIR}/${P}-gtktoggle.patch"
-
- # disable pyc compiling
+ # Disable pyc compiling
mv "${S}"/py-compile "${S}"/py-compile.orig
ln -s $(type -P true) "${S}"/py-compile
@@ -58,19 +47,22 @@ src_prepare() {
}
src_configure() {
- configuration() {
- use hppa && append-flags -ffunction-sections
- econf $(use_enable doc docs) --enable-thread
- }
- python_execute_function -s configuration
+ use hppa && append-flags -ffunction-sections
+ python_src_configure $(use_enable doc docs) --enable-thread
}
-src_compile() {
- python_execute_function -d -s
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ testing() {
+ cd tests
+ Xemake check-local
+ }
+ python_execute_function -s testing
}
src_install() {
- python_execute_function -d -s
+ python_src_install
python_clean_installation_image
dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
@@ -81,21 +73,6 @@ src_install() {
fi
}
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
-
- testing() {
- if has ${PYTHON_ABI} 2.4 2.5; then
- einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
- return 0
- fi
-
- cd tests
- Xemake check-local
- }
- python_execute_function -s testing
-}
-
pkg_postinst() {
python_mod_optimize gtk-2.0