Remove old version. Stable on amd64. Cleanup ebuild.

Package-Manager: portage-2.1.2.1

diff --git a/dev-php4/jpgraph/ChangeLog b/dev-php4/jpgraph/ChangeLog
index e45d82ae50666cb27802ce14af20680b4c57038c..5fef55b13c0dd19795e7d18b481c4a061f073695 100644 (file)
--- 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/Manifest b/dev-php4/jpgraph/Manifest
index 369fe7d463ac265c7931520044dbae6f479c5cc4..2c2a5119f83170064244df4b1358b32dff493ed8 100644 (file)
--- a/dev-php4/jpgraph/Manifest
+++ b/dev-php4/jpgraph/Manifest
@@ -1,24 +1,16 @@
-DIST jpgraph-1.19.tar.gz 4068179 RMD160 2645501ed39387702a3441ee7ae3397aac41f513 SHA1 f6354b2ad715d02ee3d2f4cbe6353b234e208b09 SHA256 cdf70a5d308363c1c822c22ceb9fcc94c83545dc8a23a0cc244240d83f42c7c3
 DIST jpgraph-1.20.5.tar.gz 4472390 RMD160 9c6728681a5fb40b6789657b0b147fc9136f46ec SHA1 353bdcb1d42cf7d8a650ddfcbfb58f730f998fbd SHA256 43367468406f6e968eb991d25a3de63f19ddbfd2a3871f34cbca325860a1281c
-EBUILD jpgraph-1.19.ebuild 2510 RMD160 06badc018a7a4161152ec413c359c077733ba4c6 SHA1 81b3741f36d82915b9f8817247de5af5c33e930e SHA256 de08caca71aadaa9fb80d730fc833fc3993e6fc74df20c904b764c43da2e49d6
-MD5 3cbe7705ebe83566da56e634513ac713 jpgraph-1.19.ebuild 2510
-RMD160 06badc018a7a4161152ec413c359c077733ba4c6 jpgraph-1.19.ebuild 2510
-SHA256 de08caca71aadaa9fb80d730fc833fc3993e6fc74df20c904b764c43da2e49d6 jpgraph-1.19.ebuild 2510
-EBUILD jpgraph-1.20.5.ebuild 2521 RMD160 8d838b20bb243a4039ed0ec6fd45f811c4fa21bb SHA1 6db2069e2f1c9eb1f27aecab752387b4fad2fb0a SHA256 a639a2dd98b74c82e8bdb23df77b42e924aa9fa51f15c0e253e9c88bf1bdd6c3
-MD5 5ddcc7392e2c9f5577c68007c9aae273 jpgraph-1.20.5.ebuild 2521
-RMD160 8d838b20bb243a4039ed0ec6fd45f811c4fa21bb jpgraph-1.20.5.ebuild 2521
-SHA256 a639a2dd98b74c82e8bdb23df77b42e924aa9fa51f15c0e253e9c88bf1bdd6c3 jpgraph-1.20.5.ebuild 2521
-MISC ChangeLog 1758 RMD160 b976b75883c7ef6710799f984e680c717dd2d4fb SHA1 23f26c3a9c8e4eafebbf1d699deddb972b093ce1 SHA256 f305f9312c4c56c5f2250e34f28494f185e1f0573700ce6594a76e823ef76a9c
-MD5 ea0ea6938d927bdcca92e25f7589de59 ChangeLog 1758
-RMD160 b976b75883c7ef6710799f984e680c717dd2d4fb ChangeLog 1758
-SHA256 f305f9312c4c56c5f2250e34f28494f185e1f0573700ce6594a76e823ef76a9c ChangeLog 1758
+EBUILD jpgraph-1.20.5.ebuild 2416 RMD160 7de4f9e35f4fde3555a553e7b4448a4852991b12 SHA1 b914d9a00f3924b3804eb446095f1e91b1b1e155 SHA256 7b49a45ddb5b035524a93e1e1ed619f548eb1bd0340f019443c9f80b3ec933d6
+MD5 0d59c07e59d4c5e699926e1267350f30 jpgraph-1.20.5.ebuild 2416
+RMD160 7de4f9e35f4fde3555a553e7b4448a4852991b12 jpgraph-1.20.5.ebuild 2416
+SHA256 7b49a45ddb5b035524a93e1e1ed619f548eb1bd0340f019443c9f80b3ec933d6 jpgraph-1.20.5.ebuild 2416
+MISC ChangeLog 1911 RMD160 626060947d0b5a585d07864f7b5e63c0f9d329a7 SHA1 8c1841ef90d2026d0ff4a1eeacd941f3777e816a SHA256 5c0a4930ec10f7f0145afe76d9b95360c888ea118cf84149e3290ee7b8cd5f7e
+MD5 9ff0a2f3fe3c83d3c58fe19fcfb7cdeb ChangeLog 1911
+RMD160 626060947d0b5a585d07864f7b5e63c0f9d329a7 ChangeLog 1911
+SHA256 5c0a4930ec10f7f0145afe76d9b95360c888ea118cf84149e3290ee7b8cd5f7e ChangeLog 1911
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
-MD5 d9d1e6c0ac26030828c6a9ffe5217376 files/digest-jpgraph-1.19 241
-RMD160 1db09a7907324786969ffc356dce7ec5b032e372 files/digest-jpgraph-1.19 241
-SHA256 76bd06fcd8a60d3a69c2281fef6b4daffc8897f1bd6816313692744f4ba5f196 files/digest-jpgraph-1.19 241
 MD5 571e7a883f09dc82661659de1d7d0a1e files/digest-jpgraph-1.20.5 247
 RMD160 70498486faf29ac6c824ecd142e32519025b573d files/digest-jpgraph-1.20.5 247
 SHA256 89ef1448f6d3487567e6a66e1d742c02abbf466241ea0d5a07a89c851d2ec78e files/digest-jpgraph-1.20.5 247

diff --git a/dev-php4/jpgraph/files/digest-jpgraph-1.19 b/dev-php4/jpgraph/files/digest-jpgraph-1.19
deleted file mode 100644 (file)
index 444e2bc..0000000
--- 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 (file)
index a3f8dcd..0000000
--- 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 9e5136401bd569a4b2747825203a776db998dd43..07f40c7e62d89be94bf5825d1ef07a605a99d782 100644 (file)
--- 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}"
 }