Version bump, closes bug 97675.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 92 insertions, 7 deletions

diff --git a/dev-php/jpgraph/ChangeLog b/dev-php/jpgraph/ChangeLog
index b011d8f0fe23..cc16cdc46d6b 100644
--- a/dev-php/jpgraph/ChangeLog
+++ b/dev-php/jpgraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/jpgraph
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/ChangeLog,v 1.14 2005/02/17 15:31:26 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/ChangeLog,v 1.15 2005/07/02 05:28:16 sebastian Exp $
+
+*jpgraph-1.18 (02 Jul 2005)
+
+  02 Jul 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +jpgraph-1.18.ebuild:
+  Version bump, closes bug 97675.
 
   17 Feb 2005; Sebastian Bergmann <sebastian@gentoo.org>
   jpgraph-1.17.ebuild:
diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
index 91322f263644..9757948e790d 100644
--- a/dev-php/jpgraph/Manifest
+++ b/dev-php/jpgraph/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d793812271af4735c955d1d45cb2703f ChangeLog 1556
+MD5 4e43f39f013e5f12cb2961532ed110fd jpgraph-1.17.ebuild 2165
 MD5 f1c8a0209c14ab85c01050770da718f2 jpgraph-1.12.2.ebuild 2160
+MD5 e3aca2eafc2739359b1cd2baada9f18b ChangeLog 1701
+MD5 a879bb64ffb545f49ae60a837f8b6c95 jpgraph-1.18.ebuild 2159
 MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 4e43f39f013e5f12cb2961532ed110fd jpgraph-1.17.ebuild 2165
 MD5 4f6fb9ae9a7dd1daf9b37c4b458bf0d3 files/digest-jpgraph-1.12.2 67
 MD5 b5aebc713916d28b8770109344a4ffa6 files/digest-jpgraph-1.17 65
+MD5 bf66fee755b65d5b171814fee090d51d files/digest-jpgraph-1.18 65
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCFLlNaGfFFLhbXWkRAs4JAJ0c1DfwiGrIbUBQUwMMHIC/9DH5KQCeLv4x
-DF9DO5I5v87ES5V9cX5umgA=
-=a9cy
+iD8DBQFCxiYGaGfFFLhbXWkRAk5/AJ0Y4RTcmjT7BEldQbsAV0MsPxQ9NgCgi7zD
+IOqUAtRL80ZpQKj6qJUbvWo=
+=Ia7x
 -----END PGP SIGNATURE-----
diff --git a/dev-php/jpgraph/files/digest-jpgraph-1.18 b/dev-php/jpgraph/files/digest-jpgraph-1.18
new file mode 100644
index 000000000000..435567919d31
--- /dev/null
+++ b/dev-php/jpgraph/files/digest-jpgraph-1.18
@@ -0,0 +1 @@
+MD5 b247b1a3c44dd36da128da4ae416ee78 jpgraph-1.18.tar.gz 4065908
diff --git a/dev-php/jpgraph/jpgraph-1.18.ebuild b/dev-php/jpgraph/jpgraph-1.18.ebuild
new file mode 100644
index 000000000000..61e40c372fa5
--- /dev/null
+++ b/dev-php/jpgraph/jpgraph-1.18.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/jpgraph/jpgraph-1.18.ebuild,v 1.1 2005/07/02 05:28:16 sebastian Exp $
+
+inherit php-lib
+
+DESCRIPTION="fully OO graph drawing library for PHP"
+HOMEPAGE="http://www.aditus.nu/jpgraph/"
+SRC_URI="http://members.chello.se/jpgraph/jpgdownloads/${P}.tar.gz"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/php
+	>=media-libs/gd-1.8"
+
+JPGRAPH_CACHE_DIR="/var/cache/jpgraph"
+
+HTTPD_USER=root
+HTTPD_GROUP=root
+
+has_version "net-www/apache" && USE_APACHE=1 && inherit webapp-apache
+[ -n "${USE_APACHE}" ] && webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	if [ "${NO_WEBSERVER}" = "1" ]; then
+		ewarn "No webserver detected - ${JPGRAPH_CACHE_DIR} will be"
+		ewarn "owned by ${HTTPD_USER} instead"
+	else
+		einfo "Configuring cache dir ${JPGRAPH_CACHE_DIR} for ${WEBAPP_SERVER}"
+	fi
+}
+
+src_install() {
+	einfo "Patching jpgraph.php"
+
+	# 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/jpgraph.php
+
+	# patch 2:
+	# make jpgraph use the correct directory for caching
+
+	sed -i "s|/tmp/jpgraph_cache/|${JPGRAPH_CACHE_DIR}/|g;" src/jpgraph.php
+
+	# patch 3:
+	# switch off the directory cache
+
+	sed -i 's|^DEFINE("USE_CACHE",false);|if (!defined("USE_CACHE")) DEFINE("USE_CACHE", false);|' src/jpgraph.php
+
+	# patch 4:
+	# don't read the READ_CACHE if we're not creating any images in the
+	# cache in the first place (doh)
+
+	sed -i 's|DEFINE("READ_CACHE",true);|DEFINE("READ_CACHE", USE_CACHE);|' src/jpgraph.php
+
+	# install php files
+	einfo "Building list of files to install"
+	php-lib_src_install src `cd src ; find . -type f -print`
+
+	# install 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!
+
+	keepdir "${JPGRAPH_CACHE_DIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHE_DIR}"
+	fperms 700 "${JPGRAPH_CACHE_DIR}"
+}