Bumped gallery to 2.2.5 (sec issue #226059).

Package-Manager: portage-2.1.4.4

3 files changed, 84 insertions, 6 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 85835d694098..54f4c7bcf8f6 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.136 2008/02/22 15:50:50 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.137 2008/06/20 15:35:35 wrobel Exp $
+
+*gallery-2.2.5 (20 Jun 2008)
+
+  20 Jun 2008; wrobel@gentoo.org +gallery-2.2.5.ebuild:
+  Bumped gallery to 2.2.5 (sec issue #226059).
 
   22 Feb 2008; Benedikt Böhm <hollow@gentoo.org> gallery-1.5.3.ebuild,
   gallery-1.5.7.ebuild, gallery-2.2.4.ebuild:
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 3f6ccc401ab8..fbc975a1ea31 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -6,15 +6,17 @@ AUX postinstall-en2.txt 912 RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 SHA1
 DIST gallery-1.5.3.tar.gz 2353018 RMD160 7f8e698bc3d145f1776dfa9dba3d213580f1061d SHA1 0e01ec98d1a45790c695ba96732145b99bc89926 SHA256 816d53da5f1fe4373b3e217143af86681c6d18e4b4dde0f1c6c8d8f5d2138481
 DIST gallery-1.5.7.tar.gz 2357005 RMD160 69b2488b228232173ad3b80072a3a90c952a08ca SHA1 70ce61509545bf76456e43a118e6c8c692e37841 SHA256 79fef2266c495cfaf7b50db27739fcea58270cebea1722a7ac0fa28ff9f8ea6c
 DIST gallery-2.2.4-full.tar.gz 11906720 RMD160 ba2cb946999660a55154e5f3dc9478e134589c59 SHA1 6b065dcb248e6d75d07099110cca21158abb1b8e SHA256 bc7eb368b26d31e65d9a11439483186a799bc9d21dfa33c48591e4cb0ca7f9a4
+DIST gallery-2.2.5-full.tar.gz 11908434 RMD160 b4edf6d745243a3e5f3ee3cdcf1cd94a29c1e955 SHA1 713cf3c75a5963919802a63e730b8db9e2e16bbd SHA256 84969599bd3745c49c036a6e5261c5c563b0bb6cb49a938f9a9ff120637a5fc6
 EBUILD gallery-1.5.3.ebuild 1227 RMD160 8877d96f2118fae270113fa5e6988091061fae4f SHA1 7cd8668354f904ae512b5388895929c5a05ce512 SHA256 69765b453ac06628e478a7a5c6224c57dbf8d82461d62c993d83b63fc13cf77a
 EBUILD gallery-1.5.7.ebuild 1232 RMD160 da3866ad76dfb2b9df7330482298a6ae650d6ba5 SHA1 99f455abd290ae8c46b449425e2d6736b97215c8 SHA256 6f04602d626a46095e303b4e4cdc6d196e974a380ade25d7af25c72cfd15b595
 EBUILD gallery-2.2.4.ebuild 2191 RMD160 faacef6046466f311999aa28dcc3e68bd2ae85bb SHA1 cfd94e274d2c832087e841200e1c2b4d1070a016 SHA256 dcda11b6a91ec076738259300d2943e235f50ac3f3a7b3d6a7c3a2ab55325302
-MISC ChangeLog 21655 RMD160 b67533446f27b44a001d3e8cf5007525666b7ce0 SHA1 4f6ca5979d2ab4019ba642550575fbad0841b41b SHA256 3ebabf7cff3a5237d39b2b5b6130471a933b3c76de3885f575c306897e3d3bcc
+EBUILD gallery-2.2.5.ebuild 2197 RMD160 1a1099b6bf688f701d26c51cf1e92d8f7eaeda54 SHA1 c22ab49ba56e907fc050465fef9007ecf71eab82 SHA256 7ccbffca809c198992601b46469e1c6b0631d8cc922c6d2eba3d94a15733f331
+MISC ChangeLog 21789 RMD160 7d9170412d1926193c9220cb5c68a62e6e865803 SHA1 e954abaf66d832431d5a81d8ee267017f185a968 SHA256 56c31bdc80db6365e1ac614ff7e7532da0f215783d365481957dae6c114a2005
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAke+72EACgkQmPFBzbX68WEBZQCcCElMzpNq/Tdgn2GslIum6g3M
-vLoAn2QdccK0iJnRiOD7cepQoC/WfCD+
-=yqkp
+iD8DBQFIW85kEEcxCpcDQ74RAjEvAJ90sZMx5tALhiO6k/9pgtm2opaGjQCgh2Me
+Qxf7Fe4GjfUBBm8MOA/Fmx4=
+=6v54
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/gallery-2.2.5.ebuild b/www-apps/gallery/gallery-2.2.5.ebuild
new file mode 100644
index 000000000000..c2266f190adc
--- /dev/null
+++ b/www-apps/gallery/gallery-2.2.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.5.ebuild,v 1.1 2008/06/20 15:35:35 wrobel Exp $
+
+inherit webapp eutils depend.php confutils
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
+HOMEPAGE="http://gallery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg gd imagemagick mysql netpbm postgres raw unzip zip"
+
+RDEPEND="media-libs/jpeg
+	raw? ( >=media-gfx/dcraw-8.03 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )"
+
+S="${WORKDIR}"/${PN}2
+
+need_httpd_cgi
+need_php_httpd
+
+pkg_setup() {
+	webapp_pkg_setup
+	confutils_require_any gd imagemagick netpbm
+	confutils_require_any mysql postgres
+
+	local php_flags="pcre session"
+	use mysql && php_flags="${php_flags} mysql"
+	use postgres && php_flags="${php_flags} postgres"
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags} || \
+			( use gd && ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ) ; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following USE flags enabled:"
+		eerror
+		eerror "${php_flags}"
+		eerror
+		use gd && eerror "as well as with either gd or gd-external USE flag enabled."
+		die "Re-install ${PHP_PKG}."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml README.html
+	rm README.html LICENSE MANIFEST
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en2.txt
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "You are strongly encouraged to back up your database"
+	elog "and the g2data directory, as upgrading to 2.2 will make"
+	elog "irreversible changes to both."
+	elog
+	elog "g2data dir: cp -Rf /path/to/g2data/ /path/to/backup"
+	elog "mysql: mysqldump --opt -u username -h hostname -p database > /path/to/backup.sql"
+	elog "postgres: pg_dump -h hostname --format=t database > /path/to/backup.sql"
+	webapp_pkg_postinst
+}