Added sqlite support, bug #247271, thank Marcin Deranek for report. Sqlite support is a bit experimental, so I'd like it to be ~arch for some time.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 82 insertions, 13 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 9a2ae8e680bb..27081c8f7a4a 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,12 @@
 # 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.173 2008/12/28 21:04:58 wrobel Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.174 2009/01/27 12:01:41 pva Exp $
+
+*gallery-2.3-r1 (27 Jan 2009)
+
+  27 Jan 2009; Peter Volkov <pva@gentoo.org> +gallery-2.3-r1.ebuild:
+  Added sqlite support, bug #247271, thank Marcin Deranek for report. Sqlite
+  support is a bit experimental, so I'd like it to be ~arch for some time.
 
   28 Dec 2008; Gunnar Wrobel <wrobel@gentoo.org> -gallery-1.5.9.ebuild:
   Removed vulnerable www-apps/gallery-1.5.9 (sec issue #249277).
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index d98a61dfbd3a..ac29c83ed346 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX postinstall-en.txt 430 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 SHA1 c1abf75f41ca3dea22c029e3e3f6604c02e71d08 SHA256 e2e63ec31b83e97fec9ecc7163f84beda4744150fa179ce39f0c26ed7ec54f3b
 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
 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.ebuild 2218 RMD160 bd189edb0c6ac55f1dd2e71a71c4c854cde86440 SHA1 0455252072bc287cbe8d2264d142fc19532e7cb6 SHA256 2d7e862bf5aff0aa579960f2e099f332cf7ac73a76d79cc336c5e13bf69fd8a8
-MISC ChangeLog 26149 RMD160 8ae3c96635edc0e3581852f0b1a28d98edc4af21 SHA1 f2cc88684e08381e957a5372da88c45171431129 SHA256 39c80ae9663b520bbc575cd06a3066c57de215ff8f5f92275036acd1a9916751
+MISC ChangeLog 26399 RMD160 60a8953d6bd464e0c62abd7f9295d5e5c51b7182 SHA1 49e918f5ee98a43df98c9edbb5741cc0f71dbb45 SHA256 8090396de98beb249620dbc379aef50fdc38574d456bc5fc349ea1e44a87fa51
 MISC metadata.xml 1066 RMD160 426d56b413041a26ab775772274c61d782199b40 SHA1 d72fb34e372d0095c9628ec6b16704ff3b974c9a SHA256 1bfca5fd0c7c2389cfec66f1d43c715cbad70c042ceb317bf3340ed843a221a5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklX6qMACgkQEEcxCpcDQ75waQCZAfMMMZMEF01kAjsxz/AFFDPK
-jQcAn0yVQxfZmp19ZOoGA+NiaF1gl7JJ
-=uoA/
------END PGP SIGNATURE-----
diff --git a/www-apps/gallery/gallery-2.3-r1.ebuild b/www-apps/gallery/gallery-2.3-r1.ebuild
new file mode 100644
index 000000000000..4fcd0327c0dc
--- /dev/null
+++ b/www-apps/gallery/gallery-2.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3-r1.ebuild,v 1.1 2009/01/27 12:01:41 pva 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 sqlite unzip zip"
+
+RDEPEND="raw? ( >=media-gfx/dcraw-8.03 )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	imagemagick? ( >media-gfx/imagemagick-6.2.4 )
+	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 sqlite
+
+	local php_flags="pcre session"
+	use mysql && php_flags="${php_flags} mysql"
+	use postgres && php_flags="${php_flags} postgres"
+	use sqlite && php_flags="${php_flags} pdo"
+
+	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
+	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 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
+}