summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-apps/gallery/ChangeLog5
-rw-r--r--www-apps/gallery/Manifest24
-rw-r--r--www-apps/gallery/gallery-2.1.1a.ebuild21
3 files changed, 33 insertions, 17 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 33b042da98b2..9974bf7bf094 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-apps/gallery
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.94 2006/07/09 20:55:19 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.95 2006/07/09 21:55:17 rl03 Exp $
+
+ 09 Jul 2006; Renat Lumpau <rl03@gentoo.org> gallery-2.1.1a.ebuild:
+ Add php checking from bug #137490.
09 Jul 2006; Renat Lumpau <rl03@gentoo.org> -gallery-1.5.2_p2.ebuild,
gallery-2.1.1a.ebuild:
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 7e14a19e9c35..019e8c52ed75 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -16,7 +16,7 @@ SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b files/po
DIST gallery-1.5.3.tar.gz 2353018 RMD160 7f8e698bc3d145f1776dfa9dba3d213580f1061d SHA256 816d53da5f1fe4373b3e217143af86681c6d18e4b4dde0f1c6c8d8f5d2138481
DIST gallery-2.0.2-full.tar.gz 5426443 RMD160 0dcfc3d897e2def198f9802f976e7703e229d70e SHA256 d18916b5300f47b69fb941da5591ab986a673f4ef1148a6a2aa0f922d1b6f564
DIST gallery-2.0.4-full.tar.gz 5427163 RMD160 87ef13198dac5c6de698f46d7e6c7d44a1ce067b SHA256 a6ffc904c1cd0971e4eee1a0d298b533790047aa579f51b672c43224cfec34ba
-DIST gallery-2.1.1a-full.tar.gz 8019852 RMD160 2e383190677c772b469747b9b95cd787e305a1f2 SHA256 c6e0bb4aabfda499e630b2997677d2c42db87b1d89dc59da7687d7d15b6fb159
+DIST gallery-2.1.1a-full.tar.gz 8019852 RMD160 2e383190677c772b469747b9b95cd787e305a1f2 SHA1 3f6add3c17abd1a891d14f0bf6657b0d7155a58d SHA256 c6e0bb4aabfda499e630b2997677d2c42db87b1d89dc59da7687d7d15b6fb159
EBUILD gallery-1.5.3.ebuild 1024 RMD160 57144ce1dbbc9b2338f1d0307067033114bce2ba SHA1 97a4f82824ac61021fd8b38f438e90bf81ad48a4 SHA256 4cefd6977654de776c458a264b0554a68ec64e3ba48a0c8ec47d6de8cc83a27a
MD5 be003c1ece52c9ff0bc4d8dea023a14c gallery-1.5.3.ebuild 1024
RMD160 57144ce1dbbc9b2338f1d0307067033114bce2ba gallery-1.5.3.ebuild 1024
@@ -29,14 +29,14 @@ EBUILD gallery-2.0.4.ebuild 1124 RMD160 a7f827de37211dd4f91bb6ed0d0381d363b5ca20
MD5 f5ed4b5a047d5eba47f5e7020e55a955 gallery-2.0.4.ebuild 1124
RMD160 a7f827de37211dd4f91bb6ed0d0381d363b5ca20 gallery-2.0.4.ebuild 1124
SHA256 bec8886a6845e2e45cc1436752f2e98db7a80463d15232a455d8a93b5c18e8f6 gallery-2.0.4.ebuild 1124
-EBUILD gallery-2.1.1a.ebuild 1507 RMD160 2f89bd456ea724cb5a5d131997dca09dac4a21cc SHA1 f6d343fd748b9a6064d2fee9b66ece3a87cfbd19 SHA256 57e88dcabb126061d9eb9d5402349cc865a6fbc8571b0a83eb3d6bc960d54747
-MD5 0c3cc16e7600fedb0223e5a94b845188 gallery-2.1.1a.ebuild 1507
-RMD160 2f89bd456ea724cb5a5d131997dca09dac4a21cc gallery-2.1.1a.ebuild 1507
-SHA256 57e88dcabb126061d9eb9d5402349cc865a6fbc8571b0a83eb3d6bc960d54747 gallery-2.1.1a.ebuild 1507
-MISC ChangeLog 16198 RMD160 12518463d8ecaeb57339b9c3180e1b138361e8f0 SHA1 f555ed7f21f34ea22487e836756cc831c015d6ea SHA256 a17a98feca97caf872676d3dd7ca80f20dfcaae07a1b2540b2de808ac4738485
-MD5 8e166cdc06592c29d0b2a1df01c2b4d2 ChangeLog 16198
-RMD160 12518463d8ecaeb57339b9c3180e1b138361e8f0 ChangeLog 16198
-SHA256 a17a98feca97caf872676d3dd7ca80f20dfcaae07a1b2540b2de808ac4738485 ChangeLog 16198
+EBUILD gallery-2.1.1a.ebuild 1794 RMD160 4ea56706e8e60d48d7edbd35ab46cc69397a188e SHA1 bb9314838e53c905377b3b28589399fc74ac6db6 SHA256 d8e9f7a116e55dadd0414ae824ae8d309d6041548c1ae7e710208a75bc33801b
+MD5 b20b22f9e6d16b2f09c1cbbe96c4d1a4 gallery-2.1.1a.ebuild 1794
+RMD160 4ea56706e8e60d48d7edbd35ab46cc69397a188e gallery-2.1.1a.ebuild 1794
+SHA256 d8e9f7a116e55dadd0414ae824ae8d309d6041548c1ae7e710208a75bc33801b gallery-2.1.1a.ebuild 1794
+MISC ChangeLog 16305 RMD160 f535e56d28532971ec27d2fa0c1a7b86fa749fef SHA1 f2fd6158ac67b632b5d25a6b673f7c4582d469d5 SHA256 90b8b11eb4ecd12f96f57f05fab45ef97388ac2e7faaddafd50a904718c83072
+MD5 f7f419f14bf392cb32d6ed60c8a29171 ChangeLog 16305
+RMD160 f535e56d28532971ec27d2fa0c1a7b86fa749fef ChangeLog 16305
+SHA256 90b8b11eb4ecd12f96f57f05fab45ef97388ac2e7faaddafd50a904718c83072 ChangeLog 16305
MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -56,7 +56,7 @@ SHA256 d3f1947f8f21f224ff7da840c60e14cd0d28f77bc058b4048d1ede0fa78160a6 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD8DBQFEsW0+EzitwsaoONoRAv0IAKCK/nTTr9CeE/mAtsVZOf00FJiFhgCgovnd
-1Af31UlRidOeiDhw4qkIbNY=
-=NwT9
+iD8DBQFEsXt7EzitwsaoONoRAqckAJ9KH29tFAC3KVslAXcNGzI6F2GR4QCeLSnQ
+b5ruTHFiRL8ia113Bwac8rw=
+=0W+m
-----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/gallery-2.1.1a.ebuild b/www-apps/gallery/gallery-2.1.1a.ebuild
index 71c752a5ba5b..67752c35ba06 100644
--- a/www-apps/gallery/gallery-2.1.1a.ebuild
+++ b/www-apps/gallery/gallery-2.1.1a.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.2 2006/07/09 20:55:19 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.1.1a.ebuild,v 1.3 2006/07/09 21:55:17 rl03 Exp $
-inherit webapp eutils
+inherit webapp eutils depend.php
DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
HOMEPAGE="http://gallery.sourceforge.net/"
@@ -10,15 +10,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="ffmpeg gd imagemagick netpbm mysql postgres unzip zip"
+IUSE="dcraw ffmpeg gd imagemagick mysql netpbm postgres unzip zip"
RDEPEND="virtual/httpd-php
media-libs/jpeg
+ dcraw? ( >=media-gfx/dcraw-8.03 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
gd? ( >=media-libs/gd-2 )
imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
- netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
mysql? ( dev-db/mysql )
+ netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
postgres? ( >=dev-db/postgresql-7 )
unzip? ( app-arch/unzip )
zip? ( app-arch/zip )
@@ -26,6 +27,18 @@ RDEPEND="virtual/httpd-php
S=${WORKDIR}/${PN}2
+pkg_setup() {
+ webapp_pkg_setup
+
+ local php_flags="session"
+
+ use gd && php_flags="${php_flags} gd"
+ use mysql && php_flags="${php_flags} mysql"
+ use postgres && php_flags="${php_flags} postgres"
+
+ require_php_with_use ${php_flags}
+}
+
src_install() {
webapp_src_preinst