Version bump (bug #299307 by Chan Min Wai). Allow media-gfx/graphicsmagick[imagemagick] to satisfy the imagemagick dependency (bug #314387 by Wojciech Porczyk) and allow mysql or mysqli USE flags for php (bug #286636).

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

3 files changed, 82 insertions, 9 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 0c5b8522c40c..3c7741e96388 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/gallery
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.176 2010/12/09 08:19:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.177 2010/12/09 09:02:31 radhermit Exp $
+
+*gallery-2.3.1 (09 Dec 2010)
+
+  09 Dec 2010; Tim Harder <radhermit@gentoo.org> +gallery-2.3.1.ebuild:
+  Version bump (bug #299307 by Chan Min Wai). Allow
+  media-gfx/graphicsmagick[imagemagick] to satisfy the imagemagick dependency
+  (bug #314387 by Wojciech Porczyk) and allow mysql or mysqli USE flags for php
+  (bug #286636).
 
   09 Dec 2010; Tim Harder <radhermit@gentoo.org> gallery-2.3-r2.ebuild:
   Fix mysql and postgres USE flag dependencies (bug #326883 by Diego E.
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 16553fe848cc..09f1019827a0 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -5,20 +5,22 @@ AUX postinstall-en.txt 430 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 SHA1
 AUX postinstall-en2.txt 912 RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 SHA1 afe393b216f0d5c9588e5e2d07cc852724860d2f SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b
 DIST gallery-1.5.10.tar.gz 2490275 RMD160 62f8e268d5d91b96728821d755c3dfbd869ad5ed SHA1 f53122d763a11627ec04f54dc6dc9c02ebd3ab82 SHA256 c992a5848d24dfdf774a982e9de06ac7aa41dd6681f00592792d168b0c1ef081
 DIST gallery-2.3-full.tar.gz 14412950 RMD160 e6b8977295d882bda3ade3f46502282d9bab1f23 SHA1 585e9530aeb4f44f198c7d430fe458d461c743bb SHA256 6f011accbd13f2cc15aa7a12e266684404a77c2a394d8e96f1b2e5f9bda02f2b
+DIST gallery-2.3.1-full.tar.gz 14564660 RMD160 751343d3ddaa7898eb0cb412e08c2c7570c70620 SHA1 6cecd8d9ca1dc036faebafe71352321b3b08074b SHA256 ca07b03ba3c300cdb3ece36350547ecb66d3e3b8facc3074864bf9cf8305a1df
 EBUILD gallery-1.5.10.ebuild 1223 RMD160 4da33385e2bd0c008c9534be2212265a6da159fc SHA1 ec20cf55e7acc7703159ff5113126b488fe93022 SHA256 94dba2e2f43a89504e7c4cf166700c164bd166d5e76be70f164ee9d588a20ab6
 EBUILD gallery-2.3-r1.ebuild 2279 RMD160 5dde342346e6b6593eee6d4bc5d73c79bf772721 SHA1 7bdfb664cc0a9a4e0010e441be24b277e89ee1e9 SHA256 f1e33b180b6f61c59915fc30f66c8ac08c624bbd590e1bd422dea08cd2f9a62e
 EBUILD gallery-2.3-r2.ebuild 1893 RMD160 f9548fb8be41a60dc256ec72b641379a0dbb3f1a SHA1 c86d3454c8bf23c849f23dc52158a4a520ce4b2a SHA256 007cd931acbcceb02be39540df76f7a63d20571afbd93e57b45a645620d2079d
+EBUILD gallery-2.3.1.ebuild 1952 RMD160 ecec866fd2fa626ddcdd40c42ac66d210d6106b7 SHA1 c7dc7c619b42b232b14c0fefff341eff4cae465f SHA256 d5d24d20426bd2386f6fb0dbbcdbc3155565a28c6bb11c36cf3a2a7738e98356
 EBUILD gallery-2.3.ebuild 2218 RMD160 bd189edb0c6ac55f1dd2e71a71c4c854cde86440 SHA1 0455252072bc287cbe8d2264d142fc19532e7cb6 SHA256 2d7e862bf5aff0aa579960f2e099f332cf7ac73a76d79cc336c5e13bf69fd8a8
-MISC ChangeLog 26703 RMD160 02cfa536ce8460b52447965c8949c17597d2e7b2 SHA1 ce8003d1b25a7b895418443f54d43de708b1ee0e SHA256 8f4425ab25c939dd2630fbefc04082374b6d80ddcfba5472df448836d4c18064
+MISC ChangeLog 27033 RMD160 fcc1ecfc5b330d88d9ddfaea60d18a1627a07555 SHA1 f5e8ef282505272abe5f7778a7449ab5e50211e2 SHA256 2ce284465f4259171fadd829573ebc3daf93adb77a7213e88d13629ccd24a76e
 MISC metadata.xml 1066 RMD160 426d56b413041a26ab775772274c61d782199b40 SHA1 d72fb34e372d0095c9628ec6b16704ff3b974c9a SHA256 1bfca5fd0c7c2389cfec66f1d43c715cbad70c042ceb317bf3340ed843a221a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNAJEFAAoJEEqz6FtPBkyjjJQH/1GN6xbzuBGv1FtQYhWeI+5e
-GOXWtKF4N5DxJBAKy/KM2jB2tTZ/9NpTXZsxuYrsvnSpMqDLuW+7HTncVM0A/6uX
-EnubQSXaJmUgobyz9oDkkkJ1ii0OvGbxmkgR4Zc0NOBKmozr9sXVppMlhBoxlt08
-9eQ8VbJNODk9warWuE+XsUKJU8aXLhcAcDwCLlx10n6tAeKI0ozKUdzDzB3Hh0fx
-iFg7kRFDYUN1mCGvmwJ4A/mj/v2I+jB5gG+zqCJDQ7GgxFa/jx9WLMJhtBTcjFm8
-r9ECtG3UyQ57hMh9Q2Vg5X54aPsKUnEQRbaZ7d/7GpQbimYx2oeJuo0bZ6+5H50=
-=mgC5
+iQEcBAEBAgAGBQJNAJsvAAoJEEqz6FtPBkyjwoUH/1LaxoQBHaWw5xEqGEFpnG4/
+9slpbBTTLssM6FlNoNA9GT3pie/ihQi0+CoUw+fSAgNnRKGV/3n2OmQZiCEDrQss
+5OI6V1B4Ul3b1Z0MffRf9WhmXoLI9Tof/jj7GGd/Rb1TvBxUkfIhtLk3RdBTXrWi
+lPTPE4vgeNnYVYzJtlfZq63f1gMt2OttN4tkFvdTjJ92g2UHtziY7XhITu46qM47
+s9SA9hch7BVP4jLB0agkOH6731iLGx/2Ooy9ErnUDAD8bJdAxB8Num9zYsvn8YAM
+rPP4RGoU8D1xPzQu+ODcrR5L4/SmUMFRnHWkcCUB6HgUspCX8fuULylPDNQe8Jc=
+=tUK3
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/gallery-2.3.1.ebuild b/www-apps/gallery/gallery-2.3.1.ebuild
new file mode 100644
index 000000000000..13744017d271
--- /dev/null
+++ b/www-apps/gallery/gallery-2.3.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.1.ebuild,v 1.1 2010/12/09 09:02:31 radhermit Exp $
+
+EAPI="2"
+
+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 sqlite unzip zip"
+
+RDEPEND="raw? ( media-gfx/dcraw )
+	ffmpeg? ( media-video/ffmpeg )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	netpbm? ( media-libs/netpbm media-gfx/jhead )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )
+	sqlite? ( dev-lang/php[pdo] )
+	gd? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
+	mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) )
+	dev-lang/php[mysql?,session,postgres?,sqlite?]
+	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
+
+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 sqlite
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml README.html
+	rm README.html LICENSE
+	sed -i -e "/^LICENSE\>/d" -e "/^README\.html\>/d" 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 may 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
+}