Version bump, closes bug #143074.

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 119 insertions, 5 deletions

diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
index cd7c77976ae1..9a01a61f6bd0 100644
--- a/dev-php5/jpgraph/ChangeLog
+++ b/dev-php5/jpgraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/jpgraph
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.9 2006/06/29 17:09:40 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.10 2006/08/07 14:06:00 sebastian Exp $
+
+*jpgraph-2.1.2 (07 Aug 2006)
+
+  07 Aug 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  +jpgraph-2.1.2.ebuild:
+  Version bump, closes bug #143074.
 
   29 Jun 2006; Guy Martin <gmsoft@gentoo.org> jpgraph-2.1.1.ebuild:
   Added ~hppa to KEYWORDS.
diff --git a/dev-php5/jpgraph/Manifest b/dev-php5/jpgraph/Manifest
index fc5ba96953ba..ed03d0fab314 100644
--- a/dev-php5/jpgraph/Manifest
+++ b/dev-php5/jpgraph/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jpgraph-2.0.tar.gz 4075519 RMD160 0868cfcb2a96ecd637e97d2556bda61be4a12e82 SHA256 8a3fba112a5ac72862608e0ab89260f1c6332af199e334bfc58b2f8101faaf44
 DIST jpgraph-2.1.1.tar.gz 4458311 RMD160 3373edf444f11958e02716d74d9481a82f93d1a2 SHA1 f262de6d35d192a68c75ec92a634a5a2c61b2d5e SHA256 87f3a70a752b1a00100dc6cd83fd0a0749370bb516582f2978c6ac5feb5a0055
+DIST jpgraph-2.1.2.tar.gz 4479849 RMD160 4865c564707b5960471124c1f5d9be07e4ca72fb SHA1 0171016b0849eb0649f725c681f0fba80f8df6e3 SHA256 ae97dbfae010d620d495c1ac06e500dfd1a2ff03fcb9c642f8d062d5bbbec6f2
 EBUILD jpgraph-2.0.ebuild 2552 RMD160 798195815976b28227750736e0506b4157f507e9 SHA1 0a13a421b4085ec3fb3ab61fd7cab7777ac68b08 SHA256 6b845c62d191b5a245528799653de8ce8da3f92decf90c7f814d27ba2707a302
 MD5 3c35b9f163bc40c597852c7e142dd138 jpgraph-2.0.ebuild 2552
 RMD160 798195815976b28227750736e0506b4157f507e9 jpgraph-2.0.ebuild 2552
@@ -8,10 +12,14 @@ EBUILD jpgraph-2.1.1.ebuild 2584 RMD160 e21a1b12c58d6c5e08864ea4564ee6fb0e6e5218
 MD5 b35dc8bda520dc03e76bd7827b44525a jpgraph-2.1.1.ebuild 2584
 RMD160 e21a1b12c58d6c5e08864ea4564ee6fb0e6e5218 jpgraph-2.1.1.ebuild 2584
 SHA256 0628f0ae390a2d5a615ded3d191c4c857c350d4d5a36fcf59f532158dc02bd5a jpgraph-2.1.1.ebuild 2584
-MISC ChangeLog 1239 RMD160 ef2e9c697bba09cfef53801be86cd0573a5ee0de SHA1 62765f7c6f9aa436ed15d4203038afa5c8214894 SHA256 46a435bab63ef4c2906c47d8d6460f7f4cc22543fad691dceb292b38e9c15d5a
-MD5 09717c39742e1df4114388ffbbb6212e ChangeLog 1239
-RMD160 ef2e9c697bba09cfef53801be86cd0573a5ee0de ChangeLog 1239
-SHA256 46a435bab63ef4c2906c47d8d6460f7f4cc22543fad691dceb292b38e9c15d5a ChangeLog 1239
+EBUILD jpgraph-2.1.2.ebuild 2587 RMD160 28426ccc56a76e29845a192c1051dd678cc7ac64 SHA1 4c6b935a88de62568f7e20c69c61c8eb52b3cf54 SHA256 662b05bc4f89275bb75b4ebddfa44adcabe6a34f43f3d02de84295dda8e032e5
+MD5 66f99a1b059f2c2519afc4f05e7284bc jpgraph-2.1.2.ebuild 2587
+RMD160 28426ccc56a76e29845a192c1051dd678cc7ac64 jpgraph-2.1.2.ebuild 2587
+SHA256 662b05bc4f89275bb75b4ebddfa44adcabe6a34f43f3d02de84295dda8e032e5 jpgraph-2.1.2.ebuild 2587
+MISC ChangeLog 1392 RMD160 3d50b9a44b949819f73e95c4abebd1fb1bcc5d4c SHA1 848aa73e1d388f4cf1b8bebae58b64e1390f671b SHA256 b49da5468b3369a33a92837d11ab35a0f164fb124dbf9f2ac32dde91fd29d01a
+MD5 2431092e711c79f46949a8c9ff14b4ae ChangeLog 1392
+RMD160 3d50b9a44b949819f73e95c4abebd1fb1bcc5d4c ChangeLog 1392
+SHA256 b49da5468b3369a33a92837d11ab35a0f164fb124dbf9f2ac32dde91fd29d01a ChangeLog 1392
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -22,3 +30,13 @@ SHA256 ddf8439b64b8903259eea386214efa4e76179c34eb83aeffb215be93ef7083fb files/di
 MD5 612644086459eb2943c4fecc9e22f99c files/digest-jpgraph-2.1.1 244
 RMD160 10ad6918527714d0f223a092f334c1511a12207b files/digest-jpgraph-2.1.1 244
 SHA256 b652c7639d3d3cfc4febe0c0c7d8cc2ec1f54fe7e3aaf2900a5e9310f10694a6 files/digest-jpgraph-2.1.1 244
+MD5 73f7167f4ab249d1681295536df15ac2 files/digest-jpgraph-2.1.2 244
+RMD160 e0a630b2e450db243376e735a99aa6732f0daf4f files/digest-jpgraph-2.1.2 244
+SHA256 afbd2cecb0d8062c4ab585c3a854a2e26979baf52b21fe04beaa2bd668fff384 files/digest-jpgraph-2.1.2 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE10jOaGfFFLhbXWkRAm75AJwPLeI9WyoudzzYT5lwTgnqH3+Y0ACfbCQR
+asFMd1qWZkuwufDsR+VeotI=
+=qtHz
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/jpgraph/files/digest-jpgraph-2.1.2 b/dev-php5/jpgraph/files/digest-jpgraph-2.1.2
new file mode 100644
index 000000000000..971ae7fdccc1
--- /dev/null
+++ b/dev-php5/jpgraph/files/digest-jpgraph-2.1.2
@@ -0,0 +1,3 @@
+MD5 af90ddff994629d3162192efff565179 jpgraph-2.1.2.tar.gz 4479849
+RMD160 4865c564707b5960471124c1f5d9be07e4ca72fb jpgraph-2.1.2.tar.gz 4479849
+SHA256 ae97dbfae010d620d495c1ac06e500dfd1a2ff03fcb9c642f8d062d5bbbec6f2 jpgraph-2.1.2.tar.gz 4479849
diff --git a/dev-php5/jpgraph/jpgraph-2.1.2.ebuild b/dev-php5/jpgraph/jpgraph-2.1.2.ebuild
new file mode 100644
index 000000000000..53c6b8d483e6
--- /dev/null
+++ b/dev-php5/jpgraph/jpgraph-2.1.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.1.2.ebuild,v 1.1 2006/08/07 14:06:00 sebastian Exp $
+
+inherit php-lib-r1
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+DESCRIPTION="Fully OO graph drawing library for PHP."
+HOMEPAGE="http://www.aditus.nu/jpgraph/"
+LICENSE="QPL-1.0"
+SLOT="0"
+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() {
+	has_php
+
+	# 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.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/jpg-config.inc.php
+
+	# 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.php
+
+	# 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.php
+	fi
+
+	# patch 4:
+	# disable READ_CACHE in jpgraph
+
+	sed -i "s|^DEFINE(\"READ_CACHE\",true);|DEFINE(\"READ_CACHE\",false);|" src/jpg-config.inc.php
+
+	# 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 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}"
+}