Remove old version. Stable on amd64. Cleanup ebuild.

(Portage version: 2.1.2.1)

4 files changed, 19 insertions, 104 deletions

diff --git a/dev-php4/jpgraph/ChangeLog b/dev-php4/jpgraph/ChangeLog
index e45d82ae5066..5fef55b13c0d 100644
--- a/dev-php4/jpgraph/ChangeLog
+++ b/dev-php4/jpgraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php4/jpgraph
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/jpgraph/ChangeLog,v 1.14 2007/03/06 15:25:35 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/jpgraph/ChangeLog,v 1.15 2007/03/06 16:46:47 chtekk Exp $
+
+  06 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -jpgraph-1.19.ebuild,
+  jpgraph-1.20.5.ebuild:
+  Remove old version. Stable on amd64. Cleanup ebuild.
 
   06 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> jpgraph-1.20.5.ebuild:
   Stable on alpha wrt #143376
diff --git a/dev-php4/jpgraph/files/digest-jpgraph-1.19 b/dev-php4/jpgraph/files/digest-jpgraph-1.19
deleted file mode 100644
index 444e2bcd13a2..000000000000
--- a/dev-php4/jpgraph/files/digest-jpgraph-1.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fc364e1b56dea32bdace47411085cd72 jpgraph-1.19.tar.gz 4068179
-RMD160 2645501ed39387702a3441ee7ae3397aac41f513 jpgraph-1.19.tar.gz 4068179
-SHA256 cdf70a5d308363c1c822c22ceb9fcc94c83545dc8a23a0cc244240d83f42c7c3 jpgraph-1.19.tar.gz 4068179
diff --git a/dev-php4/jpgraph/jpgraph-1.19.ebuild b/dev-php4/jpgraph/jpgraph-1.19.ebuild
deleted file mode 100644
index a3f8dcd20161..000000000000
--- a/dev-php4/jpgraph/jpgraph-1.19.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/jpgraph/jpgraph-1.19.ebuild,v 1.7 2006/02/03 20:06:52 nixnut Exp $
-
-inherit php-lib-r1
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-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"
-IUSE="truetype"
-
-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"
-
-	# 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-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}"
-}
diff --git a/dev-php4/jpgraph/jpgraph-1.20.5.ebuild b/dev-php4/jpgraph/jpgraph-1.20.5.ebuild
index 9e5136401bd5..07f40c7e62d8 100644
--- a/dev-php4/jpgraph/jpgraph-1.20.5.ebuild
+++ b/dev-php4/jpgraph/jpgraph-1.20.5.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php4/jpgraph/jpgraph-1.20.5.ebuild,v 1.6 2007/03/06 15:25:35 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php4/jpgraph/jpgraph-1.20.5.ebuild,v 1.7 2007/03/06 16:46:47 chtekk Exp $
 
 inherit php-lib-r1
 
-KEYWORDS="alpha ~amd64 hppa 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://members.chello.se/jpgraph/jpgdownloads/${P}.tar.gz"
@@ -12,29 +13,28 @@ LICENSE="QPL-1.0"
 SLOT="0"
 IUSE="truetype"
 
-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-php4/"
 
 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
 }
@@ -51,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
+	sed -i "s|.*DEFINE(\"CACHE_DIR\",\"/tmp/jpgraph_cache/\");|DEFINE(\"CACHE_DIR\",\"${JPGRAPH_CACHEDIR}\");|" 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
+		sed -i "s|.*DEFINE(\"TTF_DIR\",\"/usr/X11R6/lib/X11/fonts/truetype/\");|DEFINE(\"TTF_DIR\",\"/usr/share/fonts/corefonts/\");|" src/jpg-config.inc
 	fi
 
 	# patch 4:
@@ -75,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}"
 }