Added examples USE-flag (bug #111508). Dropped old versions. Version bump.

(Portage version: 2.1.2_rc4-r1)

6 files changed, 121 insertions, 14 deletions

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index e2c0d8e0d2b3..73c8cb5cbcfa 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,15 @@
 # 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.32 2006/12/01 18:41:41 gustavoz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.33 2007/01/06 15:57:34 dev-zero Exp $
+
+*pycairo-1.2.6 (06 Jan 2007)
+
+  06 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/pycairo-1.2.0-no-automagic-deps.patch,
+  +files/pycairo-1.2.6-no-automagic-deps.patch, pycairo-1.0.2.ebuild,
+  -pycairo-1.0.2-r1.ebuild, -pycairo-1.2.0.ebuild, pycairo-1.2.2.ebuild,
+  +pycairo-1.2.6.ebuild:
+  Added examples USE-flag (bug #111508). Dropped old versions. Version bump.
 
   01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-1.2.2.ebuild:
   Stable on hppa wrt #155544
diff --git a/dev-python/pycairo/files/digest-pycairo-1.2.6 b/dev-python/pycairo/files/digest-pycairo-1.2.6
new file mode 100644
index 000000000000..9d99d0347013
--- /dev/null
+++ b/dev-python/pycairo/files/digest-pycairo-1.2.6
@@ -0,0 +1,3 @@
+MD5 166b04c4800c01aba1a6c8b14e87e0bc pycairo-1.2.6.tar.gz 480714
+RMD160 7b46efa78fd3c303aa7a011bf5ecbe713255edac pycairo-1.2.6.tar.gz 480714
+SHA256 28f01729946721bec2361480f2802da5015e1271ce5cdbe6ff97a1442a19c595 pycairo-1.2.6.tar.gz 480714
diff --git a/dev-python/pycairo/files/pycairo-1.2.6-no-automagic-deps.patch b/dev-python/pycairo/files/pycairo-1.2.6-no-automagic-deps.patch
new file mode 100644
index 000000000000..fcb5650715d9
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.2.6-no-automagic-deps.patch
@@ -0,0 +1,40 @@
+--- pycairo-1.2.2.orig/configure.ac	2006-08-28 22:12:10.000000000 +0200
++++ pycairo-1.2.2/configure.ac	2006-08-28 22:13:38.000000000 +0200
+@@ -32,6 +32,9 @@
+             [AC_HELP_STRING([--with-pygtk], [support pygtk [default=yes]])],
+ 	    [],
+ 	    [with_pygtk="yes"])
++AC_ARG_WITH([numeric],
++            AS_HELP_STRING([--without-numeric],
++                           [Build without numeric support (default: test)]))
+ 
+ 
+ # put the ACLOCAL flags in the makefile
+@@ -79,14 +82,19 @@
+ 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$have_numpy = xyes; then
+-  AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
++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"
++  if test x$have_numpy = xyes; then
++    AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
++  fi
++else
++  # only needed for the summary printed at the end of configure
++  have_numpy=no
+ fi
+ 
+ # checks for types and compilers ---
diff --git a/dev-python/pycairo/pycairo-1.0.2.ebuild b/dev-python/pycairo/pycairo-1.0.2.ebuild
index cb3c16766d83..0cb9240c4f0c 100644
--- a/dev-python/pycairo/pycairo-1.0.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.0.2.ebuild,v 1.15 2006/10/01 17:10:56 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.0.2.ebuild,v 1.16 2007/01/06 15:57:34 dev-zero Exp $
 
 DESCRIPTION="Python wrapper for cairo vector graphics library"
 HOMEPAGE="http://cairographics.org/pycairo"
@@ -9,7 +9,7 @@ SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
-IUSE="gtk numeric svg"
+IUSE="examples gtk numeric svg"
 
 RDEPEND=">=dev-lang/python-2.3
 	=x11-libs/cairo-1.0*
@@ -29,9 +29,11 @@ src_compile() {
 src_install() {
 	einstall || die "install failed"
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-	rm ${D}/usr/share/doc/${PF}/examples/Makefile*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+		rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
 
 	dodoc AUTHORS NOTES README NEWS ChangeLog
 }
diff --git a/dev-python/pycairo/pycairo-1.2.2.ebuild b/dev-python/pycairo/pycairo-1.2.2.ebuild
index 8c9a5db0fbc1..94abd87c5849 100644
--- a/dev-python/pycairo/pycairo-1.2.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.2.2.ebuild,v 1.9 2006/12/01 18:41:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.2.2.ebuild,v 1.10 2007/01/06 15:57:34 dev-zero Exp $
 
 inherit eutils autotools
 
@@ -11,7 +11,7 @@ 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 sh sparc x86 ~x86-fbsd"
-IUSE="numeric"
+IUSE="examples numeric"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/cairo-1.2.0
@@ -38,9 +38,11 @@ src_compile() {
 src_install() {
 	einstall || die "install failed"
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-	rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+		rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
 
 	dodoc AUTHORS NOTES README NEWS ChangeLog
 }
diff --git a/dev-python/pycairo/pycairo-1.2.6.ebuild b/dev-python/pycairo/pycairo-1.2.6.ebuild
new file mode 100644
index 000000000000..1de7fb4ac918
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.2.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.2.6.ebuild,v 1.1 2007/01/06 15:57:34 dev-zero Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples numeric"
+
+RDEPEND=">=dev-lang/python-2.3
+	>=x11-libs/cairo-1.2.6
+	numeric? ( dev-python/numeric )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with numeric) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+		rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+	fi
+
+	dodoc AUTHORS NOTES README NEWS ChangeLog
+}