projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3da8a66)
Vbump.
authorLuca Longinotti <chtekk@gentoo.org>
Thu, 8 Mar 2007 19:07:37 +0000 (19:07 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Thu, 8 Mar 2007 19:07:37 +0000 (19:07 +0000)
Package-Manager: portage-2.1.2.1

dev-php5/jpgraph/ChangeLog patch | blob | history
dev-php5/jpgraph/Manifest patch | blob | history
dev-php5/jpgraph/files/digest-jpgraph-2.0 [deleted file] patch | blob | history
dev-php5/jpgraph/files/digest-jpgraph-2.1.4 [new file with mode: 0644] patch | blob
dev-php5/jpgraph/jpgraph-2.1.3.ebuild patch | blob | history
dev-php5/jpgraph/jpgraph-2.1.4.ebuild [moved from dev-php5/jpgraph/jpgraph-2.0.ebuild with 57% similarity] patch | blob | history

diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
index 91d92db3363e864178623648bf7bdc40931364c0..9acb6eb96370c1c1cc1277099d20d3d3833af823 100644 (file)
--- 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/Manifest b/dev-php5/jpgraph/Manifest
index a1229b1b702493e2ba05afc7d545ce7377ecaa4d..4f6aaf61a58f5e653fe0513f1c1d5dd07c077baf 100644 (file)
--- a/dev-php5/jpgraph/Manifest
+++ b/dev-php5/jpgraph/Manifest
@@ -1,24 +1,24 @@
-DIST jpgraph-2.0.tar.gz 4075519 RMD160 0868cfcb2a96ecd637e97d2556bda61be4a12e82 SHA1 c88f6ea881eb8ed2756f67e273df6f3cf673fcd6 SHA256 8a3fba112a5ac72862608e0ab89260f1c6332af199e334bfc58b2f8101faaf44
 DIST jpgraph-2.1.3.tar.gz 4472095 RMD160 ba549c05894138b65a42bc74b2876aa6906ed946 SHA1 b1b08dab1627cb136a41d25dbc8b74250dd917ec SHA256 712646c74defa44b4cfca150857bda15df051d75b0971b9e54e38bada39f649d
-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
-SHA256 6b845c62d191b5a245528799653de8ce8da3f92decf90c7f814d27ba2707a302 jpgraph-2.0.ebuild 2552
-EBUILD jpgraph-2.1.3.ebuild 2578 RMD160 6dce886fb7365c4173657d6a8c02185b71855432 SHA1 0253b4ef51e2967252bc7b19dfeacec269fceaf2 SHA256 f3b6a4c4a40b9ec50a6c8678521d5c31b6df41b3457b52c619f29cb235e413ee
-MD5 292c74a0625c1b25d6f461269817e62c jpgraph-2.1.3.ebuild 2578
-RMD160 6dce886fb7365c4173657d6a8c02185b71855432 jpgraph-2.1.3.ebuild 2578
-SHA256 f3b6a4c4a40b9ec50a6c8678521d5c31b6df41b3457b52c619f29cb235e413ee jpgraph-2.1.3.ebuild 2578
-MISC ChangeLog 2182 RMD160 8b290da4f5a3005fb91398f2891f1f8845bc8305 SHA1 6c0b14ac012393326006ff7e845fd0a7b7ca22ef SHA256 93496ea55cbb70b03517346a83d0de81d6a742992b29e4e6ff9d3b35a0ff3b4c
-MD5 e3667bb8af4e86d26b678f4c47360e84 ChangeLog 2182
-RMD160 8b290da4f5a3005fb91398f2891f1f8845bc8305 ChangeLog 2182
-SHA256 93496ea55cbb70b03517346a83d0de81d6a742992b29e4e6ff9d3b35a0ff3b4c ChangeLog 2182
+DIST jpgraph-2.1.4.tar.gz 4480770 RMD160 ebc554950310083c35e347c9fb746b130181bf8b SHA1 3e9b0cbf9cb9099222b4c56e5fe2549ad3aed34b SHA256 26bbed9eb07a411d9388b6be5813054b21214f279178dba28ae4337d43707da9
+EBUILD jpgraph-2.1.3.ebuild 2422 RMD160 1417fd6d5a04be080ac7db31a169a6f963cd6152 SHA1 bcbaf2ad664ca41d3dea19b9c245eed21c8671f8 SHA256 231ae7365ca83ed152bfc8522872367316228177bcebf70e13bae6adcaf5ff9a
+MD5 179f918554e1715cfef0020d49b708bb jpgraph-2.1.3.ebuild 2422
+RMD160 1417fd6d5a04be080ac7db31a169a6f963cd6152 jpgraph-2.1.3.ebuild 2422
+SHA256 231ae7365ca83ed152bfc8522872367316228177bcebf70e13bae6adcaf5ff9a jpgraph-2.1.3.ebuild 2422
+EBUILD jpgraph-2.1.4.ebuild 2428 RMD160 423c2f2180daa9320005bf2a37418387b28e0722 SHA1 2a428fe9f59b984a4870c3f85c284796cfb5712a SHA256 448695deff15df28e48397d5d22951c6a9cae538353b2d84431a40b0142f4c29
+MD5 0904960f674724ddbbb2279174059a3e jpgraph-2.1.4.ebuild 2428
+RMD160 423c2f2180daa9320005bf2a37418387b28e0722 jpgraph-2.1.4.ebuild 2428
+SHA256 448695deff15df28e48397d5d22951c6a9cae538353b2d84431a40b0142f4c29 jpgraph-2.1.4.ebuild 2428
+MISC ChangeLog 2356 RMD160 fa72dc5b7207abd98fb26047ba12c771877847bc SHA1 d3b16a7f220c92bfc6b459b82c67492b83b296fe SHA256 96ba8b1820b6ce6c500e4e31665a29da61c7b00c39d7a87955041d0231e7a661
+MD5 59c43da849d4e4e7d27ba9bbd1b506d5 ChangeLog 2356
+RMD160 fa72dc5b7207abd98fb26047ba12c771877847bc ChangeLog 2356
+SHA256 96ba8b1820b6ce6c500e4e31665a29da61c7b00c39d7a87955041d0231e7a661 ChangeLog 2356
 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 af843c2e6338394518f486afaa7d5fe5 files/digest-jpgraph-2.0 238
-RMD160 3977689f28b581f25e9ecdcf520220f041a85f6a files/digest-jpgraph-2.0 238
-SHA256 ddf8439b64b8903259eea386214efa4e76179c34eb83aeffb215be93ef7083fb files/digest-jpgraph-2.0 238
 MD5 f52452d97234cc867b983bf184de2017 files/digest-jpgraph-2.1.3 244
 RMD160 0d0a3bd65a75e5ec9f34a8edef46b7c4fd28568b files/digest-jpgraph-2.1.3 244
 SHA256 635de3bb5c40408674374be84d7b275090d8be51e66913c9851b128bb44e02c8 files/digest-jpgraph-2.1.3 244
+MD5 5ab6c3e333d214f3739da7cfc1ee050e files/digest-jpgraph-2.1.4 244
+RMD160 dc90175cf20ed487a1f8bdbbf4133765a22588a9 files/digest-jpgraph-2.1.4 244
+SHA256 217f089e9e3a0bf462033efbeb1da1135c24218d93f86221593d02bdaef8d74c files/digest-jpgraph-2.1.4 244
diff --git a/dev-php5/jpgraph/files/digest-jpgraph-2.0 b/dev-php5/jpgraph/files/digest-jpgraph-2.0
deleted file mode 100644 (file)
index c2fad22..0000000
--- 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 (file)
index 0000000..5322f35
--- /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 411a0b773056946b9751ad149e58c1771a476242..7ed75da93401a5ac46a6c01ffb5b1138fecc8f03 100644 (file)
--- 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
similarity index 57%
rename from dev-php5/jpgraph/jpgraph-2.0.ebuild
rename to dev-php5/jpgraph/jpgraph-2.1.4.ebuild
index a28df4956ca7f5b92c8da8ab074662f3d2a2662b..e82b479f50cb9bf41a3af070deaf8c3cde3a7fde 100644 (file)
--- 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}"
 }
Unnamed repository; edit this file 'description' to name the repository.