Vbump.

(Portage version: 2.1.2.1)

5 files changed, 43 insertions, 47 deletions

diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
index 91d92db3363e..9acb6eb96370 100644
--- a/dev-php5/jpgraph/ChangeLog
+++ b/dev-php5/jpgraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/jpgraph
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.17 2007/03/06 16:34:33 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.18 2007/03/08 19:07:37 chtekk Exp $
+
+*jpgraph-2.1.4 (08 Mar 2007)
+
+  08 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -jpgraph-2.0.ebuild,
+  jpgraph-2.1.3.ebuild, +jpgraph-2.1.4.ebuild:
+  Version bump, cleanup.
 
   06 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> jpgraph-2.1.3.ebuild:
   Stable on alpha wrt bug #143376
diff --git a/dev-php5/jpgraph/files/digest-jpgraph-2.0 b/dev-php5/jpgraph/files/digest-jpgraph-2.0
deleted file mode 100644
index c2fad2249ca0..000000000000
--- a/dev-php5/jpgraph/files/digest-jpgraph-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 343c355a5c50cdbae49706cba20083ea jpgraph-2.0.tar.gz 4075519
-RMD160 0868cfcb2a96ecd637e97d2556bda61be4a12e82 jpgraph-2.0.tar.gz 4075519
-SHA256 8a3fba112a5ac72862608e0ab89260f1c6332af199e334bfc58b2f8101faaf44 jpgraph-2.0.tar.gz 4075519
diff --git a/dev-php5/jpgraph/files/digest-jpgraph-2.1.4 b/dev-php5/jpgraph/files/digest-jpgraph-2.1.4
new file mode 100644
index 000000000000..5322f357aa72
--- /dev/null
+++ b/dev-php5/jpgraph/files/digest-jpgraph-2.1.4
@@ -0,0 +1,3 @@
+MD5 2146fa93269cf4203e26296fb04167f3 jpgraph-2.1.4.tar.gz 4480770
+RMD160 ebc554950310083c35e347c9fb746b130181bf8b jpgraph-2.1.4.tar.gz 4480770
+SHA256 26bbed9eb07a411d9388b6be5813054b21214f279178dba28ae4337d43707da9 jpgraph-2.1.4.tar.gz 4480770
diff --git a/dev-php5/jpgraph/jpgraph-2.1.3.ebuild b/dev-php5/jpgraph/jpgraph-2.1.3.ebuild
index 411a0b773056..7ed75da93401 100644
--- a/dev-php5/jpgraph/jpgraph-2.1.3.ebuild
+++ b/dev-php5/jpgraph/jpgraph-2.1.3.ebuild
@@ -1,43 +1,40 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.1.3.ebuild,v 1.7 2007/03/06 16:34:33 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.1.3.ebuild,v 1.8 2007/03/08 19:07:37 chtekk 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/"
+SRC_URI="http://hem.bredband.net/jpgraph2/${P}.tar.gz"
 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 )"
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )"
 
 need_php_by_category
 
-JPGRAPH_CACHE_DIR="/var/cache/jpgraph"
-COREFONTS_DIR="/usr/share/fonts/corefonts"
+[[ -z "${JPGRAPH_CACHEDIR}" ]] && JPGRAPH_CACHEDIR="/var/cache/jpgraph-php5/"
 
 pkg_setup() {
 	has_php
 
-	# we need the GD functionality of PHP
+	# we need the PHP GD functionality
 	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."
+		einfo "Configuring ${JPGRAPH_CACHEDIR} for Apache."
 	else
 		HTTPD_USER="root"
 		HTTPD_GROUP="root"
-		ewarn "No Apache webserver detected - ${JPGRAPH_CACHE_DIR} will be"
+		ewarn "No Apache webserver detected - ${JPGRAPH_CACHEDIR} will be"
 		ewarn "owned by ${HTTPD_USER}:${HTTPD_GROUP} instead."
 	fi
 }
@@ -54,13 +51,13 @@ src_install() {
 	# 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
+	sed -i "s|.*DEFINE(\"CACHE_DIR\",\"/tmp/jpgraph_cache/\");|DEFINE(\"CACHE_DIR\",\"${JPGRAPH_CACHEDIR}\");|" 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
+		sed -i "s|.*DEFINE(\"TTF_DIR\",\"/usr/X11R6/lib/X11/fonts/truetype/\");|DEFINE(\"TTF_DIR\",\"/usr/share/fonts/corefonts/\");|" src/jpg-config.inc.php
 	fi
 
 	# patch 4:
@@ -78,10 +75,8 @@ src_install() {
 	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}"
+	keepdir "${JPGRAPH_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHEDIR}"
+	fperms 750 "${JPGRAPH_CACHEDIR}"
 }
diff --git a/dev-php5/jpgraph/jpgraph-2.0.ebuild b/dev-php5/jpgraph/jpgraph-2.1.4.ebuild
index a28df4956ca7..e82b479f50cb 100644
--- a/dev-php5/jpgraph/jpgraph-2.0.ebuild
+++ b/dev-php5/jpgraph/jpgraph-2.1.4.ebuild
@@ -1,72 +1,69 @@
-# 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-php5/jpgraph/jpgraph-2.0.ebuild,v 1.1 2006/02/11 12:15:00 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.1.4.ebuild,v 1.1 2007/03/08 19:07:37 chtekk Exp $
 
 inherit php-lib-r1
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+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.gz"
 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 )"
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )"
 
 need_php_by_category
 
-JPGRAPH_CACHE_DIR="/var/cache/jpgraph"
-COREFONTS_DIR="/usr/share/fonts/corefonts"
+[[ -z "${JPGRAPH_CACHEDIR}" ]] && JPGRAPH_CACHEDIR="/var/cache/jpgraph-php5/"
 
 pkg_setup() {
 	has_php
 
-	# we need the GD functionality of PHP
+	# we need the PHP GD functionality
 	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."
+		einfo "Configuring ${JPGRAPH_CACHEDIR} for Apache."
 	else
 		HTTPD_USER="root"
 		HTTPD_GROUP="root"
-		ewarn "No Apache webserver detected - ${JPGRAPH_CACHE_DIR} will be"
+		ewarn "No Apache webserver detected - ${JPGRAPH_CACHEDIR} 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"
+	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
+	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
+	sed -i "s|.*DEFINE(\"CACHE_DIR\",\"/tmp/jpgraph_cache/\");|DEFINE(\"CACHE_DIR\",\"${JPGRAPH_CACHEDIR}\");|" 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
+		sed -i "s|.*DEFINE(\"TTF_DIR\",\"/usr/X11R6/lib/X11/fonts/truetype/\");|DEFINE(\"TTF_DIR\",\"/usr/share/fonts/corefonts/\");|" 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
+	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"
@@ -78,10 +75,8 @@ src_install() {
 	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}"
+	keepdir "${JPGRAPH_CACHEDIR}"
+	fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHEDIR}"
+	fperms 750 "${JPGRAPH_CACHEDIR}"
 }