Version bump

Package-Manager: portage-2.1.2-r10

4 files changed, 108 insertions, 8 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index d99f5e2bb417..f045ca7e3e6f 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.109 2007/01/02 22:26:29 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.110 2007/03/17 21:25:25 rl03 Exp $
+
+*gallery-2.2 (17 Mar 2007)
+
+  17 Mar 2007; Renat Lumpau <rl03@gentoo.org> +gallery-2.2.ebuild:
+  Version bump
 
   02 Jan 2007; Renat Lumpau <rl03@gentoo.org> gallery-2.1.2.ebuild:
   Remove db deps wrt bug #159781
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index 871ea985361c..04ca24700fbe 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -12,6 +12,7 @@ SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b files/po
 DIST gallery-1.5.3.tar.gz 2353018 RMD160 7f8e698bc3d145f1776dfa9dba3d213580f1061d SHA1 0e01ec98d1a45790c695ba96732145b99bc89926 SHA256 816d53da5f1fe4373b3e217143af86681c6d18e4b4dde0f1c6c8d8f5d2138481
 DIST gallery-1.5.5.tar.gz 2377249 RMD160 7886146913a6f9f81c28a4f42ca9071a40831464 SHA1 7e31a90a8204b83de2cf888e772d520741ea80c9 SHA256 56d9e9f2c29ccae57c044f38a165dd6c804a150ea9eb643f5a95336b00f825f7
 DIST gallery-2.1.2-full.tar.gz 8061300 RMD160 46ed198fb5f7d5968d7216b4f73d6d3b8182deac SHA1 799cf275147b31dd865c5582b674672398559326 SHA256 84aa2a164cc684c0923d4da6f9b418975d823690c399baf1dd41477f3ec428f2
+DIST gallery-2.2-full.tar.gz 11850649 RMD160 fc4fab48639df67e08fe11e3fe36cf59821a40cd SHA1 2a9bc850c979aadfd6f07f34ff2f2d0a8649435e SHA256 8a71000dad587a2d8fc0afa6edb11ee3c1860a2854c9db2b4859c13882ccc7c0
 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
@@ -24,10 +25,14 @@ EBUILD gallery-2.1.2.ebuild 2229 RMD160 16ef51577b894b4f2b1f2c0ed92e46c40c019e76
 MD5 d64ff1c4d7dca0334a1fe5018eeb38bc gallery-2.1.2.ebuild 2229
 RMD160 16ef51577b894b4f2b1f2c0ed92e46c40c019e76 gallery-2.1.2.ebuild 2229
 SHA256 6d21e87cb48685f5ef20f940ce3da5bf60b21b8494892c70a1eb6ef671e23318 gallery-2.1.2.ebuild 2229
-MISC ChangeLog 18003 RMD160 ad149b8bd82c62fd585e4c8c99a9b9fd06fd9714 SHA1 2e8abead46c5cf7a34d7f1238bd528eb3a1a51c7 SHA256 2f6f66fde40cf3a0619d438534d6821edb715be41fc7466042b10dca7ded455f
-MD5 fbf64d7ee8ffb1bcf8fee6f75c9021da ChangeLog 18003
-RMD160 ad149b8bd82c62fd585e4c8c99a9b9fd06fd9714 ChangeLog 18003
-SHA256 2f6f66fde40cf3a0619d438534d6821edb715be41fc7466042b10dca7ded455f ChangeLog 18003
+EBUILD gallery-2.2.ebuild 2214 RMD160 23a46aa5badba48e702b5cd72c5395d1c546edc8 SHA1 a978b3278cac5defb123192ac29bf023e34eacd3 SHA256 403bb93dc5c659ae5e226ec7bc2a801cfeb0f0508d36fe180bd269c60b797eb9
+MD5 c9fd8b9f27560cfa56280570e9fbd871 gallery-2.2.ebuild 2214
+RMD160 23a46aa5badba48e702b5cd72c5395d1c546edc8 gallery-2.2.ebuild 2214
+SHA256 403bb93dc5c659ae5e226ec7bc2a801cfeb0f0508d36fe180bd269c60b797eb9 gallery-2.2.ebuild 2214
+MISC ChangeLog 18114 RMD160 311e4a53fa1036abf925458b84198261aadca05e SHA1 43c14bd4b95b0b6cfc86f3b2b1eb69003efde3f2 SHA256 6afae6880c245d85b973c9d47328da86011dc052168ee9a080a85405a9762d0b
+MD5 52fc3e2886cb0401a831389def6e1a07 ChangeLog 18114
+RMD160 311e4a53fa1036abf925458b84198261aadca05e ChangeLog 18114
+SHA256 6afae6880c245d85b973c9d47328da86011dc052168ee9a080a85405a9762d0b ChangeLog 18114
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -41,10 +46,13 @@ SHA256 59a57cf7de6afafa00e8d04e52f43bfb2fa242e39f66ab324887631f1f586ebe files/di
 MD5 c173cb3c07ee2d1fcfb261daec439d63 files/digest-gallery-2.1.2 259
 RMD160 5b451f1a36b24c4441af136a4e6af8a7ca609282 files/digest-gallery-2.1.2 259
 SHA256 3aa25a009c02a6b9c3191139093f0b5ba430dc60b8edb25757f2b443128e38ee files/digest-gallery-2.1.2 259
+MD5 da5ce4b1374e151b59abcf3ba55d861b files/digest-gallery-2.2 256
+RMD160 d64878e49249f2f93eb45c095d774b1b9c3c4813 files/digest-gallery-2.2 256
+SHA256 7c2b9505068968cfaa3e013590e8ce3ba3033cdffd00f36918fc4feacede2939 files/digest-gallery-2.2 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFmtwdEzitwsaoONoRAl0RAJ4ptZ/00sTj/bJFCgSkgPuw+HFnbgCg227J
-0tWUNXck6RtBEUoyoCvJc6U=
-=E7SH
+iD8DBQFF/FzOEzitwsaoONoRAhQpAJ0Rg36kZ0TQNbd6fqqf1aQVY8UJMwCg30Vo
+bY7C1J39v87+5POjrVSDcTI=
+=+ZmF
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/files/digest-gallery-2.2 b/www-apps/gallery/files/digest-gallery-2.2
new file mode 100644
index 000000000000..9d6d7abae427
--- /dev/null
+++ b/www-apps/gallery/files/digest-gallery-2.2
@@ -0,0 +1,3 @@
+MD5 68742ba80acb25710702ea5e52251dfe gallery-2.2-full.tar.gz 11850649
+RMD160 fc4fab48639df67e08fe11e3fe36cf59821a40cd gallery-2.2-full.tar.gz 11850649
+SHA256 8a71000dad587a2d8fc0afa6edb11ee3c1860a2854c9db2b4859c13882ccc7c0 gallery-2.2-full.tar.gz 11850649
diff --git a/www-apps/gallery/gallery-2.2.ebuild b/www-apps/gallery/gallery-2.2.ebuild
new file mode 100644
index 000000000000..c5acfae66cbd
--- /dev/null
+++ b/www-apps/gallery/gallery-2.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.2.ebuild,v 1.1 2007/03/17 21:25:25 rl03 Exp $
+
+inherit webapp eutils depend.php
+
+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="dcraw ffmpeg gd imagemagick mysql netpbm postgres unzip zip"
+
+RDEPEND="
+	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 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )
+"
+
+S=${WORKDIR}/${PN}2
+
+need_php
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	local php_flags="session"
+	local DIE=
+
+	use mysql && php_flags="${php_flags} mysql"
+	use postgres && php_flags="${php_flags} postgres"
+
+	if ! PHPCHECKNODIE="yes" require_php_with_use ${php_flags}; then
+		DIE="yes"
+	fi
+	if use gd; then
+		if ! PHPCHECKNODIE="yes" require_php_with_any_use gd gd-external ; then
+			DIE="yes"
+		fi
+	fi
+
+	if [[ ${DIE} == "yes" ]]; then
+		eerror
+		eerror "${PHP_PKG} needs to be re-installed with all of the following"
+		eerror "USE flags enabled:"
+		eerror
+		eerror "${php_flags}"
+		eerror
+		if use gd; then
+			eerror "as well as any of the following USE flags enabled:"
+			eerror
+			eerror "gd gd-external"
+			eerror
+		fi
+		die "Re-install ${PHP_PKG}"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -R * ${D}/${MY_HTDOCSDIR}
+	dohtml README.html
+
+	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
+}