bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 101 insertions, 3 deletions

diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
index 90da3749030a..31b7bcff0634 100644
--- a/dev-php5/jpgraph/ChangeLog
+++ b/dev-php5/jpgraph/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php5/jpgraph
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.31 2008/03/08 21:09:36 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.32 2010/04/21 22:43:46 mabi Exp $
+
+*jpgraph-3.0.7 (21 Apr 2010)
+
+  21 Apr 2010; <mabi@gentoo.org> +jpgraph-3.0.7.ebuild:
+  bump (bug #299054), provided by Ole Markus With
 
   08 Mar 2008; <pva@gentoo.org> jpgraph-2.3.ebuild:
   amd64 stable, bug #208284.
diff --git a/dev-php5/jpgraph/Manifest b/dev-php5/jpgraph/Manifest
index cf1b4588ed45..57df741665c8 100644
--- a/dev-php5/jpgraph/Manifest
+++ b/dev-php5/jpgraph/Manifest
@@ -1,8 +1,10 @@
 DIST jpgraph-2.1.3.tar.gz 4472095 RMD160 ba549c05894138b65a42bc74b2876aa6906ed946 SHA1 b1b08dab1627cb136a41d25dbc8b74250dd917ec SHA256 712646c74defa44b4cfca150857bda15df051d75b0971b9e54e38bada39f649d
 DIST jpgraph-2.2.tar.gz 4604898 RMD160 d83e84dcf80ac037666ec4e2d84e8c8ade7abcec SHA1 5130098441bb8bd0034767cd3a655fd7f533c8f1 SHA256 1b1de456bf7c01a94e32e6dd56cecb9570b294da1d55f410d5b48e7e147f566f
 DIST jpgraph-2.3.tar.gz 4619908 RMD160 dcebe1591bc9ccd1a24d454b8890416d06e4ef4b SHA1 69c14f902befa68cfe84de19a2f42621f770604c SHA256 f149ed7a45e4e2e8045f9ccf3f8342153d25766ffc0f0f7242cfcf7185b88fb9
+DIST jpgraph-3.0.7.tar.bz2 10541173 RMD160 338f78c8b3ef0a9f3e52240be43bb5f5e02662b9 SHA1 3f841ea20cb27d0ee2376669936ca5127f7c2291 SHA256 412a1aaf47c7d70c5a4350d1c571ebb88c77138d9b95afd51895c44f188a03b6
 EBUILD jpgraph-2.1.3.ebuild 2426 RMD160 e3d6d0e3fd2e204ec4b75206a4c248c7bd860b32 SHA1 b8883cdee2524ba13b259d24a1e52f62a015c78d SHA256 43aa0bb45058d4b6f2ad5e692275b8e1915031d0f84637114729d7a3feef9dd5
 EBUILD jpgraph-2.2.ebuild 2775 RMD160 3cfc5291a00473fe02f4d7dd99fa07cde8154228 SHA1 a4e209d1338b0a06cff7d18a379fc7247143c646 SHA256 1c6b3b1d68dafdb40dd4c1d7449c591704386dc71aff41df1c3fc2014ba38551
 EBUILD jpgraph-2.3.ebuild 2767 RMD160 1e50f9f23e0171af653f09d1df7d65f035ba9260 SHA1 2d0a50fa6cb1029c440a9b3345a44172614ecbf5 SHA256 15e691f888ef0a2307792653c1a41f8a1c44977f9e344f84b5b4669dfd9ebb78
-MISC ChangeLog 4035 RMD160 dc26ec742b3afa4581674e8dc95edffed965204e SHA1 90df7d738f76e9a2a661c295f4623e5fe33b502f SHA256 8fa1c8f7526f55b4a4118bad5cd8180be0c21c83b7a532019c88cddc3dd0768b
+EBUILD jpgraph-3.0.7.ebuild 2731 RMD160 70c48346f1360a0effb3451db78da62bfcf2c9e3 SHA1 1c93e0bf13df2928f4335819b186386c29cf5ea5 SHA256 f844d8699037415939875b5f9fed508e54497816cdff59c94e20fb1a07b3b495
+MISC ChangeLog 4173 RMD160 aed214aaf68311b8f526114923cdd6753528808b SHA1 abf260d3b4f1c4eb58816044af7ddab871342dda SHA256 b6dbee1b1013b335f20c583f5ba1df2bab4bfeb6d4379c7a947a0bf4c27c75e0
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php5/jpgraph/jpgraph-3.0.7.ebuild b/dev-php5/jpgraph/jpgraph-3.0.7.ebuild
new file mode 100644
index 000000000000..77ceea0d20b9
--- /dev/null
+++ b/dev-php5/jpgraph/jpgraph-3.0.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-3.0.7.ebuild,v 1.1 2010/04/21 22:43:46 mabi Exp $
+
+EAPI="2"
+
+inherit php-lib-r1 eutils
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DESCRIPTION="Fully OO graph drawing library for PHP."
+HOMEPAGE="http://www.aditus.nu/jpgraph/"
+SRC_URI="http://hem.bredband.net/jpgraph2/${P}.tar.bz2"
+LICENSE="QPL-1.0"
+SLOT="0"
+IUSE="truetype"
+
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )
+	dev-lang/php[gd]
+	"
+
+need_php_by_category
+
+[[ -z "${JPGRAPH_CACHEDIR}" ]] && JPGRAPH_CACHEDIR="/var/cache/jpgraph-php5/"
+
+pkg_setup() {
+	has_php
+
+	# check to which user:group the cache dir will go
+	if has_version "www-servers/apache" ; then
+		HTTPD_USER="apache"
+		HTTPD_GROUP="apache"
+		einfo "Configuring ${JPGRAPH_CACHEDIR} for Apache."
+	else
+		HTTPD_USER="${HTTPD_USER:-root}"
+		HTTPD_GROUP="${HTTPD_GROUP:-root}"
+		ewarn "No Apache webserver detected - ${JPGRAPH_CACHEDIR} will be"
+		ewarn "owned by ${HTTPD_USER}:${HTTPD_GROUP} instead."
+		ewarn "It this is not what you want, you can define"
+		ewarn "HTTPD_USER and HTTPD_GROUP variables and re-emerge ${PN}."
+		epause 3
+	fi
+}
+
+src_install() {
+	# some patches to adapt the config to Gentoo
+	einfo "Patching jpg-config.inc.php"
+
+	# patch 1:
+	# make jpgraph use the correct group for file permissions
+
+	sed -i "s|^define('CACHE_FILE_GROUP','www');|define('CACHE_FILE_GROUP','${HTTPD_GROUP}');|" src/jpg-config.inc.php \
+		|| die "sed failed in patch 1"
+
+	# patch 2:
+	# make jpgraph use the correct directory for caching
+
+	sed -i "s|.*define('CACHE_DIR','/tmp/jpgraph_cache/');|define('CACHE_DIR','${JPGRAPH_CACHEDIR}');|" src/jpg-config.inc.php \
+		|| die "sed failed in patch 2"
+
+	# 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','/usr/share/fonts/corefonts/');|" src/jpg-config.inc.php \
+			|| die "sed failed in patch 3"
+	fi
+
+	# patch 4:
+	# disable READ_CACHE in jpgraph
+
+	sed -i "s|^define('READ_CACHE',true);|define('READ_CACHE',false);|" src/jpg-config.inc.php \
+		|| die "sed failed in patch 4"
+
+	# 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-php README
+	insinto /usr/share/doc/${CATEGORY}/${PF}
+	doins -r docportal/*
+
+	# setup the cache dir
+	einfo "Setting up the cache dir"
+	keepdir "${JPGRAPH_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHEDIR}"
+	fperms 750 "${JPGRAPH_CACHEDIR}"
+}