Version bump.

(Portage version: 13397-svn/cvs/Linux x86_64)

8 files changed, 20 insertions, 225 deletions

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index d1f8a520e2a5..b7f1a8bec3a1 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.61 2009/01/24 16:27:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.62 2009/04/25 16:25:19 arfrever Exp $
+
+*pycairo-1.8.4 (25 Apr 2009)
+
+  25 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/pycairo-1.2.2-no-automagic-deps.patch,
+  -files/pycairo-1.2.6-no-automagic-deps.patch, -pycairo-1.2.2.ebuild,
+  -pycairo-1.2.6.ebuild, -pycairo-1.4.0.ebuild, pycairo-1.8.2,
+  +pycairo-1.8.4.ebuild:
+  Version bump.
 
 *pycairo-1.8.2 (24 Jan 2009)
 
diff --git a/dev-python/pycairo/files/pycairo-1.2.2-no-automagic-deps.patch b/dev-python/pycairo/files/pycairo-1.2.2-no-automagic-deps.patch
deleted file mode 100644
index fcb5650715d9..000000000000
--- a/dev-python/pycairo/files/pycairo-1.2.2-no-automagic-deps.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/files/pycairo-1.2.6-no-automagic-deps.patch b/dev-python/pycairo/files/pycairo-1.2.6-no-automagic-deps.patch
deleted file mode 100644
index fcb5650715d9..000000000000
--- a/dev-python/pycairo/files/pycairo-1.2.6-no-automagic-deps.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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/metadata.xml b/dev-python/pycairo/metadata.xml
index c3239fed4dad..301d2207cc29 100644
--- a/dev-python/pycairo/metadata.xml
+++ b/dev-python/pycairo/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <herd>python</herd>
- <use>
- 	<flag name='numeric'>enable Numeric support</flag>
- </use>
+	<herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/pycairo/pycairo-1.2.2.ebuild b/dev-python/pycairo/pycairo-1.2.2.ebuild
deleted file mode 100644
index 73c1448e2fc8..000000000000
--- a/dev-python/pycairo/pycairo-1.2.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 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.14 2008/05/29 16:24:40 hawking Exp $
-
-NEED_PYTHON=2.3
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools python multilib
-
-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=">=x11-libs/cairo-1.2.0
-	numeric? ( dev-python/numeric )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# don't run py-compile
-	sed -i \
-		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
-		cairo/Makefile.in || die "sed in cairo/Makefile.in failed"
-
-	epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with numeric) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || 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
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/cairo
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-python/pycairo/pycairo-1.2.6.ebuild b/dev-python/pycairo/pycairo-1.2.6.ebuild
deleted file mode 100644
index 0527c09e9f80..000000000000
--- a/dev-python/pycairo/pycairo-1.2.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 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.7 2008/05/29 16:24:40 hawking Exp $
-
-NEED_PYTHON=2.3
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools python multilib
-
-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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="examples numeric"
-
-RDEPEND=">=x11-libs/cairo-1.2.6
-	numeric? ( dev-python/numeric )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# don't run py-compile
-	sed -i \
-		-e '/if test -n "$$dlist"; then/,/else :; fi/d' \
-		cairo/Makefile.in || die "sed in cairo/Makefile.in failed"
-
-	epatch "${FILESDIR}"/${P}-no-automagic-deps.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with numeric) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make 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
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/cairo
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/dev-python/pycairo/pycairo-1.8.2.ebuild b/dev-python/pycairo/pycairo-1.8.2.ebuild
index 7504affce9fc..a0c2cafc1940 100644
--- a/dev-python/pycairo/pycairo-1.8.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.2.ebuild,v 1.1 2009/01/24 16:27:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.2.ebuild,v 1.2 2009/04/25 16:25:19 arfrever Exp $
 
-NEED_PYTHON=2.4
+NEED_PYTHON=2.5
 
 inherit distutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="examples"
 
-RDEPEND=">=x11-libs/cairo-1.4.12"
+RDEPEND=">=x11-libs/cairo-1.8.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
diff --git a/dev-python/pycairo/pycairo-1.4.0.ebuild b/dev-python/pycairo/pycairo-1.8.4.ebuild
index 1f74ca39b182..1da561867def 100644
--- a/dev-python/pycairo/pycairo-1.4.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.4.0.ebuild,v 1.12 2008/03/10 05:04:17 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.4.ebuild,v 1.1 2009/04/25 16:25:19 arfrever Exp $
 
-NEED_PYTHON=2.3
+NEED_PYTHON=2.6
 
 inherit distutils
 
@@ -12,14 +12,15 @@ 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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="examples"
 
-RDEPEND=">=x11-libs/cairo-1.4.0"
+RDEPEND=">=x11-libs/cairo-1.8.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 PYTHON_MODNAME="cairo"
+DOCS="AUTHORS NEWS doc/*"
 
 src_unpack() {
 	unpack ${A}
@@ -39,8 +40,6 @@ src_install() {
 		doins -r examples/*
 		rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
 	fi
-
-	dodoc AUTHORS NOTES README NEWS ChangeLog
 }
 
 src_test() {