Vbump.

(Portage version: 2.1.2.1)

7 files changed, 17 insertions, 251 deletions

diff --git a/dev-php4/pecl-pdflib/ChangeLog b/dev-php4/pecl-pdflib/ChangeLog
index ad487b7dfa54..a580bd63bd04 100644
--- a/dev-php4/pecl-pdflib/ChangeLog
+++ b/dev-php4/pecl-pdflib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php4/pecl-pdflib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/ChangeLog,v 1.7 2006/10/05 12:53:31 sebastian Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/ChangeLog,v 1.8 2007/03/06 20:30:50 chtekk Exp $
+
+*pecl-pdflib-2.1.2 (06 Mar 2007)
+
+  06 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -files/ifgd-patch.diff,
+  -pecl-pdflib-2.0.4-r1.ebuild, -pecl-pdflib-2.1.0.ebuild,
+  +pecl-pdflib-2.1.2.ebuild:
+  Version bump, cleanup.
 
 *pecl-pdflib-2.1.0 (05 Oct 2006)
 
diff --git a/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1 b/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1
deleted file mode 100644
index 78c6ffe0a1d0..000000000000
--- a/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fad3af58b98c0b7bea64a6e760e4520 pdflib-2.0.4.tgz 36082
-RMD160 b9c376bfe5207e1c5a12ccace7c1bfd4b7873a11 pdflib-2.0.4.tgz 36082
-SHA256 08b7bb81c37a3967351ebc29b1d4a877b56b3852357eed966e1aee6085c58f10 pdflib-2.0.4.tgz 36082
diff --git a/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.0 b/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.0
deleted file mode 100644
index ab4ac86bfa22..000000000000
--- a/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1278b912e187e465f374450f3545b9b2 pdflib-2.1.0.tgz 55625
-RMD160 665ee0a5286da22f1a272e7896e67c43b5dc458b pdflib-2.1.0.tgz 55625
-SHA256 b6d6fb439d92475a06da251d43a9131a937afbc9346882ff2a2b33f572174934 pdflib-2.1.0.tgz 55625
diff --git a/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.2 b/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.2
new file mode 100644
index 000000000000..eb843ca017cd
--- /dev/null
+++ b/dev-php4/pecl-pdflib/files/digest-pecl-pdflib-2.1.2
@@ -0,0 +1,3 @@
+MD5 d1bc4c20c5f0b2f9d2bf251bc9dbb027 pdflib-2.1.2.tgz 55669
+RMD160 cc6782fcfe7ef0a1315a77c667882223b22209be pdflib-2.1.2.tgz 55669
+SHA256 9bd740fdd5f071c0e0c1d1e5304e689e29f018450e5403f4f3371986f40d64f5 pdflib-2.1.2.tgz 55669
diff --git a/dev-php4/pecl-pdflib/files/ifgd-patch.diff b/dev-php4/pecl-pdflib/files/ifgd-patch.diff
deleted file mode 100644
index 824bbd2298d0..000000000000
--- a/dev-php4/pecl-pdflib/files/ifgd-patch.diff
+++ /dev/null
@@ -1,209 +0,0 @@
---- pdf.c	2005-08-02 17:43:36.000000000 +0200
-+++ pdf.c	2005-08-02 17:45:33.000000000 +0200
-@@ -17,12 +17,12 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ */
-+/* $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $ */
- 
- /* {{{ Comments about the module */
- 
- /* derived from:
--   $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $
-+   $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $
-    synced with pdflib.h 1.237 */
- 
- /* PDFlib 2.02 ... 4.0.x is subject to the ALADDIN FREE PUBLIC LICENSE.
-@@ -63,8 +63,12 @@
- 
- /* Bootstrap of PDFlib Feature setup */
- #define PDF_FEATURE_INTERNAL
-+#define   PDFLIB_PECL_VERSIONSTRING "2.0.4-r1"
- 
--#define   PDFLIB_PECL_VERSIONSTRING "2.0.3"
-+/* set this define if you want to include GD support
-+ * this adds the (unofficial) function pdf_open_memory_image()
-+#define PDFLIB_WITH_GD_SUPPORT
-+*/
- 
- /* }}} */
- 
-@@ -87,6 +91,7 @@
- # include "Zend/zend_exceptions.h"
- #endif /* PHP_MAJOR_VERSION >= 5 */
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- # include "ext/gd/php_gd.h"
- # if HAVE_GD_BUNDLED
-@@ -96,6 +101,7 @@
- # endif /* HAVE_GD_BUNDLED */
-  static int le_gd;
- #endif /* HAVE_LIBGD13 */
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-@@ -299,10 +305,12 @@
- 
- 	/* End of the official PDFLIB API */
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- 	/* not supported by PDFlib GmbH */
- 	PHP_FE(pdf_open_memory_image, NULL)
- #endif /* HAVE_LIBGD13 */
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- 	{NULL, NULL, NULL}
- };
-@@ -491,10 +499,12 @@
- 
- 	/* End of the official PDFLIB API */
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- 	/* not supported by PDFlib GmbH */
- 	/* PHP_ME_MAPPING(open_memory_image, pdf_open_memory_image, NULL) */
- #endif /* HAVE_LIBGD13 */
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- 	{NULL, NULL, NULL}
- };
-@@ -768,7 +778,7 @@
- 	php_info_print_table_row(2, "PDF Support", "enabled" );
- 	php_info_print_table_row(2, "PDFlib GmbH Version", PDFLIB_VERSIONSTRING );
- 	php_info_print_table_row(2, "PECL Version", PDFLIB_PECL_VERSIONSTRING);
--	php_info_print_table_row(2, "Revision", "$Revision: 1.143 $" );
-+	php_info_print_table_row(2, "Revision", "$Revision: 1.144 $" );
- 	php_info_print_table_end();
- 
- }
-@@ -7197,6 +7207,7 @@
- 
- 
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- /* {{{ proto int pdf_open_memory_image(resource p, int image)
-    Takes an GD image and returns an image for placement in a PDF document */
-@@ -7276,6 +7287,7 @@
- }
- /* }}} */
- #endif /* HAVE_LIBGD13 */
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- #else /* PDFLIB_MAJORVERSION < 5 */
- /* use the old wrapper for PDFlib 4 and earlier */
---- pdf4.c	2005-08-02 17:43:43.000000000 +0200
-+++ pdf4.c	2005-08-02 17:47:52.000000000 +0200
-@@ -17,7 +17,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: pdf4.c,v 1.2 2004/11/30 11:42:13 rjs Exp $ */
-+/* $Id: pdf4.c,v 1.4 2005/07/08 06:22:03 steinm Exp $ */
- 
- /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
-    Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
-@@ -40,6 +40,7 @@
- #include "ext/standard/file.h"
- #include "php_streams.h"
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- #include "ext/gd/php_gd.h"
- #if HAVE_GD_BUNDLED
-@@ -49,6 +50,7 @@
- #endif
- static int le_gd;
- #endif
-+#endif / * PDFLIB_WITH_GD_SUPPORT * /
- 
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-@@ -187,9 +189,11 @@
- 
- 	/* some more stuff for compatibility */
- 	PHP_FE(pdf_add_annotation, NULL)
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- 	PHP_FE(pdf_open_memory_image, NULL)
- #endif
-+#endif
- 	/* depreciatet after V4.0 of PDFlib */
- 	PHP_FE(pdf_setgray_fill, NULL)
- 	PHP_FE(pdf_setgray_stroke, NULL)
-@@ -334,7 +338,7 @@
- #else
- 	php_info_print_table_row(2, "PDFlib GmbH Version", tmp );
- #endif
--	php_info_print_table_row(2, "Revision", "$Revision: 1.2 $" );
-+	php_info_print_table_row(2, "Revision", "$Revision: 1.4 $" );
- 	php_info_print_table_end();
- 
- }
-@@ -1949,6 +1953,7 @@
- }
- /* }}} */
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- /* {{{ proto int pdf_open_memory_image(int pdf, int image)
-    Takes an GD image and returns an image for placement in a PDF document */
-@@ -2015,6 +2020,7 @@
- }
- /* }}} */
- #endif /* HAVE_LIBGD13 */
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- /* {{{ proto void pdf_close_image(int pdf, int pdfimage)
-    Closes the PDF image */
---- php_pdf.h	2005-08-02 17:44:20.000000000 +0200
-+++ php_pdf.h	2005-08-02 17:49:15.000000000 +0200
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: php_pdf.h,v 1.30 2004/11/30 11:42:13 rjs Exp $ */
-+/* $Id: php_pdf.h,v 1.31 2005/03/08 12:02:19 rjs Exp $ */
- /* Derived from:
-     Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */
- 
-@@ -201,10 +201,12 @@
- #endif /* PDFlib >= 6.0.0 */
- 
- 
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- /* not supported by PDFlib GmbH */
- PHP_FUNCTION(pdf_open_memory_image);
- #endif
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- #ifdef ZTS
- #define PDFG(v) TSRMG(pdf_globals_id, php_pdf_globals *, v)
---- php_pdf4.h	2005-08-02 17:44:26.000000000 +0200
-+++ php_pdf4.h	2005-08-02 17:50:39.000000000 +0200
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
- */
- 
--/* $Id: php_pdf4.h,v 1.2 2004/11/30 11:42:13 rjs Exp $ */
-+/* $Id: php_pdf4.h,v 1.3 2005/03/08 12:02:20 rjs Exp $ */
- 
- #ifndef PHP_PDF_H
- #define PHP_PDF_H
-@@ -140,9 +140,11 @@
- 
- /* some more stuff for compatibility */
- PHP_FUNCTION(pdf_add_annotation);
-+#if PDFLIB_WITH_GD_SUPPORT
- #if HAVE_LIBGD13
- PHP_FUNCTION(pdf_open_memory_image);
- #endif
-+#endif /* PDFLIB_WITH_GD_SUPPORT */
- 
- #if (PDFLIB_MAJORVERSION >= 4)
- /* support for new functions in PDFlib V4.0 */
diff --git a/dev-php4/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild b/dev-php4/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild
deleted file mode 100644
index e9ced3d321cb..000000000000
--- a/dev-php4/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild,v 1.5 2006/05/27 00:48:31 chtekk Exp $
-
-PHP_EXT_NAME="pdf"
-PHP_EXT_PECL_PKG="pdflib"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-inherit php-ext-pecl-r1
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-DESCRIPTION="PHP extension for creating PDF files."
-LICENSE="PHP"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND}
-		media-libs/pdflib"
-
-need_php_by_category
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# Patch for http://pecl.php.net/bugs/bug.php?id=3554
-	epatch "${FILESDIR}/ifgd-patch.diff"
-}
diff --git a/dev-php4/pecl-pdflib/pecl-pdflib-2.1.0.ebuild b/dev-php4/pecl-pdflib/pecl-pdflib-2.1.2.ebuild
index 2cb6e69abaef..c4e450e4664a 100644
--- a/dev-php4/pecl-pdflib/pecl-pdflib-2.1.0.ebuild
+++ b/dev-php4/pecl-pdflib/pecl-pdflib-2.1.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-php4/pecl-pdflib/pecl-pdflib-2.1.0.ebuild,v 1.1 2006/10/05 12:53:31 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/pecl-pdflib-2.1.2.ebuild,v 1.1 2007/03/06 20:30:50 chtekk Exp $
 
 PHP_EXT_NAME="pdf"
 PHP_EXT_PECL_PKG="pdflib"
@@ -10,12 +10,13 @@ PHP_EXT_ZENDEXT="no"
 inherit php-ext-pecl-r1
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
 DESCRIPTION="PHP extension for creating PDF files."
 LICENSE="PHP"
 SLOT="0"
 IUSE=""
 
-DEPEND="${DEPEND}
-		media-libs/pdflib"
+DEPEND="media-libs/pdflib"
+RDEPEND="${DEPEND}"
 
 need_php_by_category