Version bump (in package.mask). Fix automagic dependencies, minor quoting fix.

(Portage version: 2.1.1_pre1-r5)

4 files changed, 119 insertions, 1 deletions

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index 4cc2d0a59288..be94a9133bc4 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.20 2006/06/06 22:25:21 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.21 2006/07/04 14:45:06 marienz Exp $
+
+*pycairo-1.2.0 (04 Jul 2006)
+
+  04 Jul 2006; Marien Zwart <marienz@gentoo.org>
+  +files/pycairo-1.2.0-no-automagic-deps.patch, +pycairo-1.2.0.ebuild:
+  Version bump (in package.mask). Fix automagic dependencies, minor quoting fix.
 
   06 Jun 2006; Carsten Lohrke <carlo@gentoo.org> ChangeLog:
   Fix use of nonexistent versioned virtual/python.
diff --git a/dev-python/pycairo/files/digest-pycairo-1.2.0 b/dev-python/pycairo/files/digest-pycairo-1.2.0
new file mode 100644
index 000000000000..4a2ccff334cd
--- /dev/null
+++ b/dev-python/pycairo/files/digest-pycairo-1.2.0
@@ -0,0 +1,3 @@
+MD5 ab531e02fda56a9d6b2b65153fda65f6 pycairo-1.2.0.tar.gz 490529
+RMD160 473fd6abea8dccd6f5c90f7ef1e72ebbd382ec38 pycairo-1.2.0.tar.gz 490529
+SHA256 71b88f540a393d079c671813e8e42d7867d77b6393dd808341a55b3207905504 pycairo-1.2.0.tar.gz 490529
diff --git a/dev-python/pycairo/files/pycairo-1.2.0-no-automagic-deps.patch b/dev-python/pycairo/files/pycairo-1.2.0-no-automagic-deps.patch
new file mode 100644
index 000000000000..ba3b2393e105
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.2.0-no-automagic-deps.patch
@@ -0,0 +1,63 @@
+=== modified file 'configure.ac'
+--- configure.ac	
++++ configure.ac	
+@@ -33,6 +33,12 @@
+             [AC_HELP_STRING([--with-pygtk], [support pygtk [default=yes]])],
+ 	    [],
+ 	    [with_pygtk="yes"])
++AC_ARG_WITH([svg],
++            AS_HELP_STRING([--without-svg],
++                           [Build without libsvg-cairo library (default: test)]))
++AC_ARG_WITH([numeric],
++            AS_HELP_STRING([--without-numeric],
++                           [Build without numeric support (default: test)]))
+ 
+ 
+ # put the ACLOCAL flags in the makefile
+@@ -77,11 +83,16 @@
+ AM_CONDITIONAL(WITH_PYGTK, test x$with_pygtk = xyes)
+ 
+ # is libsvg-cairo installed?
+-PKG_CHECK_MODULES(LIBSVG_CAIRO,
+-  libsvg-cairo >= libsvg_cairo_required_version,
+-  [have_libsvg_cairo=yes],[have_libsvg_cairo=no])
+-if test -n "$export_dynamic"; then
+-  LIBSVG_CAIRO_LIBS=`echo $LIBSVG_CAIRO_LIBS | sed -e "s/$export_dynamic//"`
++if test "x$with_svg" != "xno"; then
++  PKG_CHECK_MODULES(LIBSVG_CAIRO,
++    libsvg-cairo >= libsvg_cairo_required_version,
++    [have_libsvg_cairo=yes],[have_libsvg_cairo=no])
++  if test -n "$export_dynamic"; then
++    LIBSVG_CAIRO_LIBS=`echo $LIBSVG_CAIRO_LIBS | sed -e "s/$export_dynamic//"`
++  fi
++else
++  # only needed for the summary printed at the end of configure
++  have_libsvg_cairo=no
+ fi
+ AM_CONDITIONAL(HAVE_LIBSVG_CAIRO, test x$have_libsvg_cairo = xyes)
+ 
+@@ -89,12 +100,17 @@
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+ 
+ # Numeric Python
+-save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+-AC_CHECK_HEADER([Numeric/arrayobject.h],
+-  [have_numpy=yes], [have_numpy=no],
+-  [#include <Python.h>])
+-CPPFLAGS="$save_CPPFLAGS"
++if test "x$with_numeric" != "xno"; then
++  save_CPPFLAGS="$CPPFLAGS"
++  CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
++  AC_CHECK_HEADER([Numeric/arrayobject.h],
++    [have_numpy=yes], [have_numpy=no],
++    [#include <Python.h>])
++  CPPFLAGS="$save_CPPFLAGS"
++else
++  # only needed for the summary printed at the end of configure
++  have_numpy=no
++fi
+ if test x$have_numpy = xyes; then
+   AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
+ fi
+
diff --git a/dev-python/pycairo/pycairo-1.2.0.ebuild b/dev-python/pycairo/pycairo-1.2.0.ebuild
new file mode 100644
index 000000000000..313a2e553350
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.2.0.ebuild,v 1.1 2006/07/04 14:45:06 marienz Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Python wrapper for cairo vector graphics library"
+HOMEPAGE="http://cairographics.org/pycairo"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="numeric svg"
+
+DEPEND=">=dev-lang/python-2.3
+	>=x11-libs/cairo-1.2.0
+	svg? ( >=x11-libs/libsvg-cairo-0.1.6 )
+	numeric? ( dev-python/numeric )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-no-automagic-deps.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with svg) \
+		$(use_with numeric) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "install failed"
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/*
+	rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+
+	dodoc AUTHORS NOTES README NEWS ChangeLog
+}