9 files changed, 116 insertions, 33 deletions
diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
new file mode 100644
index 000000000000..3bf47210884e
--- /dev/null
+++ b/dev-php5/jpgraph/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for dev-php5/jpgraph
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.1 2005/09/18 14:30:09 hollow Exp $
+
+*jpgraph-2.0_beta (18 Sep 2005)
+
+  18 Sep 2005; Benedikt Boehm <hollow@gentoo.org> +metadata.xml,
+  +jpgraph-2.0_beta.ebuild:
+  initial version
+
diff --git a/dev-php5/jpgraph/Manifest b/dev-php5/jpgraph/Manifest
new file mode 100644
index 000000000000..444fe778829d
--- /dev/null
+++ b/dev-php5/jpgraph/Manifest
@@ -0,0 +1,4 @@
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 5cbee36805913aac0974ccd411774855 jpgraph-2.0_beta.ebuild 2410
+MD5 908c3ca6254aca286815b15609ca9e82 ChangeLog 262
+MD5 9c1a606f1b31c4a2d6806167e89860b6 files/digest-jpgraph-2.0_beta 68
diff --git a/dev-php5/jpgraph/files/digest-jpgraph-2.0_beta b/dev-php5/jpgraph/files/digest-jpgraph-2.0_beta
new file mode 100644
index 000000000000..8c0ac1feb349
--- /dev/null
+++ b/dev-php5/jpgraph/files/digest-jpgraph-2.0_beta
@@ -0,0 +1 @@
+MD5 8c314f1b943b9fba130989a2b7ec77f8 jpgraph-2.0beta.tar.gz 3998445
diff --git a/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild b/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild
new file mode 100644
index 000000000000..055d44c13e5d
--- /dev/null
+++ b/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild,v 1.1 2005/09/18 14:30:09 hollow Exp $
+
+inherit php-lib-r1
+
+DESCRIPTION="fully OO graph drawing library for PHP"
+HOMEPAGE="http://www.aditus.nu/jpgraph/"
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="truetype"
+
+MY_P=${P/_/}
+SRC_URI="http://members.chello.se/jpgraph/jpgdownloads/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="${RDEPEND}
+		truetype? ( media-fonts/corefonts )"
+
+need_php_by_category
+
+JPGRAPH_CACHE_DIR="/var/cache/jpgraph"
+COREFONTS_DIR="/usr/share/fonts/corefonts"
+
+pkg_setup() {
+	# we need the GD functionality of PHP
+	require_gd
+
+	# check to wich user:group the cache dir will go
+	if has_version "net-www/apache" ; then
+		HTTPD_USER=apache
+		HTTPD_GROUP=apache
+		einfo "Configuring cache dir ${JPGRAPH_CACHE_DIR} for Apache."
+	else
+		HTTPD_USER=root
+		HTTPD_GROUP=root
+		ewarn "No Apache webserver detected - ${JPGRAPH_CACHE_DIR} will be"
+		ewarn "owned by ${HTTPD_USER}:${HTTPD_GROUP} instead."
+	fi
+}
+
+src_install() {
+	# some patches to adapt the config to Gentoo
+	einfo "Patching jpg-config.inc"
+
+	# patch 1:
+	# make jpgraph use the correct group for file permissions
+
+	sed -i "s|^DEFINE(\"CACHE_FILE_GROUP\",\"wwwadmin\");|DEFINE(\"CACHE_FILE_GROUP\",\"${HTTPD_GROUP}\");|" src/jpg-config.inc
+
+	# patch 2:
+	# make jpgraph use the correct directory for caching
+
+	sed -i "s|.*DEFINE(\"CACHE_DIR\",\"/tmp/jpgraph_cache/\");|DEFINE(\"CACHE_DIR\",\"${JPGRAPH_CACHE_DIR}/\");|" src/jpg-config.inc
+
+	# patch 3:
+	# make jpgraph use the correct directory for the corefonts if the truetype USE flag is set
+
+	if use truetype ; then
+		sed -i "s|.*DEFINE(\"TTF_DIR\",\"/usr/X11R6/lib/X11/fonts/truetype/\");|DEFINE(\"TTF_DIR\",\"${COREFONTS_DIR}/\");|" src/jpg-config.inc
+	fi
+
+	# patch 4:
+	# disable READ_CACHE in jpgraph
+
+	sed -i "s|^DEFINE(\"READ_CACHE\",true);|DEFINE(\"READ_CACHE\",false);|" src/jpg-config.inc
+
+	# install php files
+	einfo "Building list of files to install"
+	php-lib-r1_src_install src `cd src ; find . -type f -print`
+
+	# install documentation
+	einfo "Installing documentation"
+	dodoc README QPL.txt
+	dohtml -r docs/*
+
+	# setup the cache dir
+	# cachedir must be world-writable, because PHP/CLI doesn't run
+	# as the apache user!
+	einfo "Setting up the cache dir"
+	keepdir "${JPGRAPH_CACHE_DIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHE_DIR}"
+	fperms 700 "${JPGRAPH_CACHE_DIR}"
+}
diff --git a/dev-php5/jpgraph/metadata.xml b/dev-php5/jpgraph/metadata.xml
new file mode 100644
index 000000000000..fd3dbe39fa64
--- /dev/null
+++ b/dev-php5/jpgraph/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+</pkgmetadata>
diff --git a/dev-php5/pecl-apd/Manifest b/dev-php5/pecl-apd/Manifest
index e79eb6c80498..380451c05817 100644
--- a/dev-php5/pecl-apd/Manifest
+++ b/dev-php5/pecl-apd/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7205627f7dd26b2385e3602fe4aadd1e pecl-apd-1.0.1.ebuild 582
 MD5 9a5b087cc16e34cb6d686ab214b345f9 ChangeLog 371
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 18fc9ba14e52ecb3f7e121e31a78dd69 pecl-apd-1.0.1.ebuild 516
 MD5 3f5b44e18a6fc64c64ad6919e7192603 files/digest-pecl-apd-1.0.1 57
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIucdaGfFFLhbXWkRAtmXAJ9vL3D2NTVn4kg0OzYWvovmN5cJEgCfVANO
-6/Kifi68da0/9ckPU3Jj1fU=
-=Z4cY
------END PGP SIGNATURE-----
diff --git a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild b/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
index c9ad69c57756..c8756ce4822e 100644
--- a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
+++ b/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.1 2005/09/10 13:59:53 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.2 2005/09/18 14:33:15 hollow Exp $
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_PECL_PKG="apd"
@@ -9,12 +9,13 @@ PHP_EXT_INI="yes"
 
 inherit php-ext-pecl-r1
 
-DESCRIPTION="pecl-pdo"
-
-LICENSE="PHP"
+IUSE=""
+DESCRIPTION="A full-featured engine-level profiler/debugger."
 SLOT="0"
+LICENSE="PHP"
 KEYWORDS="~x86"
-IUSE=""
+
+need_php_by_category
 
 src_install () {
 	sed -i 's:/usr/local:/usr:g' ${S}/pprofp || die #83612
@@ -22,5 +23,3 @@ src_install () {
 	dobin pprofp pprof2calltree
 	dodoc LICENSE README
 }
-
-need_php_by_category
diff --git a/dev-php5/pecl-pdo/Manifest b/dev-php5/pecl-pdo/Manifest
index a8fffd69a664..7220f63a07cc 100644
--- a/dev-php5/pecl-pdo/Manifest
+++ b/dev-php5/pecl-pdo/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f457552169969c88b733aae3fa7a50b2 ChangeLog 665
-MD5 6279556cf34bf92200701c7a65f81ed9 files/digest-pecl-pdo-0.9 55
-MD5 c52b46703f8061eb524872fa24edc342 files/pdo_stmt.c.diff 915
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 f1f6a9f3ef7aea5462fa4e600a32fa25 pecl-pdo-0.9.ebuild 1585
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDK2YRI1lqEGTUzyQRAqCjAKDQuXU1pq7ZibatA9Ey7PyajQNJrQCeJssQ
-WtKlUIwj0BNusG8QaJ4xRO4=
-=IdRv
------END PGP SIGNATURE-----
+MD5 c79806cc5e11cbe6d4e97604ba43ac6d pecl-pdo-0.9.ebuild 1467
+MD5 c52b46703f8061eb524872fa24edc342 files/pdo_stmt.c.diff 915
+MD5 6279556cf34bf92200701c7a65f81ed9 files/digest-pecl-pdo-0.9 55
diff --git a/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild b/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild
index a39f8c0ba985..acb46e9c1249 100644
--- a/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild
+++ b/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild,v 1.3 2005/09/16 23:23:37 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild,v 1.4 2005/09/18 14:35:02 hollow Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO"
@@ -14,7 +14,6 @@ DESCRIPTION="Core PHP Data Objects (PDO)"
 SLOT="0"
 LICENSE="PHP"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-DEPEND="${DEPEND}"
 PDEPEND="${PDEPEND}
 		firebird? ( dev-php5/pecl-pdo-firebird )
 		mssql? ( dev-php5/pecl-pdo-dblib )