Version bump, misc improvements wrt bug #126648.

(Portage version: 2.1_pre6-r3)

7 files changed, 77 insertions, 22 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 5bf9250e86d9..f289accd0c9b 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,12 @@
 # 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.81 2006/03/24 15:47:48 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.82 2006/03/24 15:56:20 rl03 Exp $
+
+*gallery-2.1 (24 Mar 2006)
+
+  24 Mar 2006; Renat Lumpau <rl03@gentoo.org> files/postinstall-en2.txt,
+  +gallery-2.1.ebuild:
+  Version bump, misc improvements wrt bug #126648.
 
   24 Mar 2006; Renat Lumpau <rl03@gentoo.org> -gallery-2.0.3.ebuild:
   Removed old version
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index c607607faa33..0cc24ff53aae 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 88c6a5ff450a70e4f1075941aedccaec ChangeLog 14553
 RMD160 971aa05d19dd53a3425aff55377a22252a4e6221 ChangeLog 14553
 SHA256 8ce991de3f97161c6af46a951bd9bab8c4b800a9cc7c9db090f894adf3d4318d ChangeLog 14553
@@ -10,18 +7,21 @@ SHA256 240266e2d9c49faf59661d8bf122ec2c5ce97d268ca6693fc92efddc7642e2ec files/Ff
 MD5 f98e440afe625e13a8b90e5ad7f6e773 files/digest-gallery-1.5.2_p2 256
 RMD160 34ef6e66a7aebb98459da9880f5b1d838207e9f6 files/digest-gallery-1.5.2_p2 256
 SHA256 3571141ca8bb5fc9183478a0270f1dceb8bafeda45cd4312645a6867b0a03041 files/digest-gallery-1.5.2_p2 256
-MD5 2766aeba32226962ae298487f56c37aa files/digest-gallery-2.0.2-r1 71
-RMD160 79522c528ec770842173ad841db6f34ab950fe0a files/digest-gallery-2.0.2-r1 71
-SHA256 3bca6cf123d091127413fc5fc7a425866fc735de539641b6a5784cdf77a219ba files/digest-gallery-2.0.2-r1 71
-MD5 95e96e7848e8054755212b65e012894c files/digest-gallery-2.0.4 259
-RMD160 30ba2073022b85b1714c3099eaa66eb11726b8fc files/digest-gallery-2.0.4 259
-SHA256 ca27cbfd2ed469c584082bf69dbfb6a45af6d0942df733ef06e41bf94f48fa6b files/digest-gallery-2.0.4 259
+MD5 a593bd84d436ebd24b0617d13412f34a files/digest-gallery-2.0.2-r1 259
+RMD160 8afa353e114d5d4bc840a34a71a070fdb1522b9c files/digest-gallery-2.0.2-r1 259
+SHA256 86fb73f32772ab7b7b2fc7bb2e2f9c635a152313cc91468e6373e878c2ba2138 files/digest-gallery-2.0.2-r1 259
+MD5 f70d72c672789da82bf40a302abdc917 files/digest-gallery-2.0.4 259
+RMD160 1ec1fd8a8c3935044042a1d340bb21d4747335df files/digest-gallery-2.0.4 259
+SHA256 6f24e3bb87912c206c11d0493ad6cbfc500a4d52ac9a1b053ec78d5e8c590d1d files/digest-gallery-2.0.4 259
+MD5 d62b21398b0b140801d92a260073bb79 files/digest-gallery-2.1 253
+RMD160 f086b4b83d76bb4ede5dbae3fa6c3e60d1a8241f files/digest-gallery-2.1 253
+SHA256 cc7a8acfad06a1db1b6f064fde4c731ae62647a453b010249be006652404ae68 files/digest-gallery-2.1 253
 MD5 d86a2cffa618ecf7fe9a2b001be69523 files/postinstall-en.txt 430
 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 files/postinstall-en.txt 430
 SHA256 e2e63ec31b83e97fec9ecc7163f84beda4744150fa179ce39f0c26ed7ec54f3b files/postinstall-en.txt 430
-MD5 7fd340b3582fa5f65153a85c04f01160 files/postinstall-en2.txt 913
-RMD160 937a101b3ace40799c2a426378bc69d5b7127ccc files/postinstall-en2.txt 913
-SHA256 2a6a523d4c5658b6233b11e6fca78ad5d3a00d93d36d2f6e3010ce29717df233 files/postinstall-en2.txt 913
+MD5 3ebb657970521358631f192e7af99f46 files/postinstall-en2.txt 912
+RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 files/postinstall-en2.txt 912
+SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b files/postinstall-en2.txt 912
 MD5 9c470b37b023b788b0d1c9ef1898517c gallery-1.5.2_p2.ebuild 996
 RMD160 b40398aa60938065326c6c6f6977af2f8d8faa4e gallery-1.5.2_p2.ebuild 996
 SHA256 b2045b34d21ea0912bcb20fe982f9040c146d662a2bb6d8979924b5f65b4ce06 gallery-1.5.2_p2.ebuild 996
@@ -31,13 +31,9 @@ SHA256 a661e64645c3a56f89eb461836d7cc45aedc15cea62b7f8cba4483b80edebb6d gallery-
 MD5 c0891d7032de2d2241c16879cc942c30 gallery-2.0.4.ebuild 1117
 RMD160 9ebd8b22ffe95140a2056a2d19c839c277df9fd1 gallery-2.0.4.ebuild 1117
 SHA256 2b5dbb65f305ff9f96d2e533ec23c8a046c682c5c8315ec80bf9fe22dd0edde0 gallery-2.0.4.ebuild 1117
+MD5 3422193c679a34d0ac621b55c9ec7b56 gallery-2.1.ebuild 1509
+RMD160 b51c51abc006cefec1fd2c097c862854186558f5 gallery-2.1.ebuild 1509
+SHA256 caa9d5a1781f356d2149ffb0a01740f67258a2c0da9823667dbf03c2365773d2 gallery-2.1.ebuild 1509
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a metadata.xml 280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEJBSzEzitwsaoONoRAlLfAJ0RKAlOiZDFq75oeAA6UOMkaS35GwCfUjYV
-JFrH69xOTxWmeD+ZyliAkFw=
-=zO2K
------END PGP SIGNATURE-----
diff --git a/www-apps/gallery/files/digest-gallery-2.0.2-r1 b/www-apps/gallery/files/digest-gallery-2.0.2-r1
index 8b3cfffb105f..221deef677d3 100644
--- a/www-apps/gallery/files/digest-gallery-2.0.2-r1
+++ b/www-apps/gallery/files/digest-gallery-2.0.2-r1
@@ -1 +1,3 @@
 MD5 b833b195d1713745b97be0abfec221f6 gallery-2.0.2-full.tar.gz 5426443
+RMD160 0dcfc3d897e2def198f9802f976e7703e229d70e gallery-2.0.2-full.tar.gz 5426443
+SHA256 d18916b5300f47b69fb941da5591ab986a673f4ef1148a6a2aa0f922d1b6f564 gallery-2.0.2-full.tar.gz 5426443
diff --git a/www-apps/gallery/files/digest-gallery-2.0.4 b/www-apps/gallery/files/digest-gallery-2.0.4
index 8e6e3a2c02bd..5ee8c7386134 100644
--- a/www-apps/gallery/files/digest-gallery-2.0.4
+++ b/www-apps/gallery/files/digest-gallery-2.0.4
@@ -1,3 +1,3 @@
+MD5 6e178785f0c35cb4d871241bb56740a8 gallery-2.0.4-full.tar.gz 5427163
 RMD160 87ef13198dac5c6de698f46d7e6c7d44a1ce067b gallery-2.0.4-full.tar.gz 5427163
 SHA256 a6ffc904c1cd0971e4eee1a0d298b533790047aa579f51b672c43224cfec34ba gallery-2.0.4-full.tar.gz 5427163
-MD5 6e178785f0c35cb4d871241bb56740a8 gallery-2.0.4-full.tar.gz 5427163
diff --git a/www-apps/gallery/files/digest-gallery-2.1 b/www-apps/gallery/files/digest-gallery-2.1
new file mode 100644
index 000000000000..db10f1a2f055
--- /dev/null
+++ b/www-apps/gallery/files/digest-gallery-2.1
@@ -0,0 +1,3 @@
+MD5 b16fb2a527df31fffc07bb0babc5a2a9 gallery-2.1-full.tar.gz 8012710
+RMD160 9e1bb758366ed8f5f7b94b66fc51cb99b7ea3121 gallery-2.1-full.tar.gz 8012710
+SHA256 6a1d25c821ca303662f81cee7654cd8b776f6d9d71fe0ffe9bd6fa2136ed7d62 gallery-2.1-full.tar.gz 8012710
diff --git a/www-apps/gallery/files/postinstall-en2.txt b/www-apps/gallery/files/postinstall-en2.txt
index bc8b027e2b8a..bcc977036752 100755
--- a/www-apps/gallery/files/postinstall-en2.txt
+++ b/www-apps/gallery/files/postinstall-en2.txt
@@ -14,7 +14,7 @@ For new installations:
 

 3. Now browse to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install

 

-NOTE: The installer will complain that FfmpegToolkit.class has been modified.

+NOTE: The installer may complain that FfmpegToolkit.class has been modified.

 This is normal, as we patch it to fix a bug with newer versions of ffmpeg.

 

 For upgrades:

diff --git a/www-apps/gallery/gallery-2.1.ebuild b/www-apps/gallery/gallery-2.1.ebuild
new file mode 100644
index 000000000000..e079cf736d1d
--- /dev/null
+++ b/www-apps/gallery/gallery-2.1.ebuild
@@ -0,0 +1,48 @@
+# 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.ebuild,v 1.1 2006/03/24 15:56:20 rl03 Exp $
+
+inherit webapp eutils
+
+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 ~sparc ~x86"
+IUSE="ffmpeg gd imagemagick netpbm mysql postgres unzip zip"
+
+RDEPEND="virtual/httpd-php
+	app-arch/unzip
+	media-libs/jpeg
+	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 )
+	postgres? ( >=dev-db/postgresql-7 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )
+"
+
+S=${WORKDIR}/${PN}2
+
+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() {
+	einfo "You are strongly encouraged to back up your database"
+	einfo "and the g2data directory, as upgrading to 2.1.x will make"
+	einfo "irreversible changes to both."
+	einfo
+	einfo "g2data dir: cp -Rf /path/to/g2data/ /path/to/backup"
+	einfo "mysql: mysqldump --opt -u username -h hostname -p database > /path/to/backup.sql"
+	einfo "postgres: pg_dump -h hostname --format=t database > /path/to/backup.sql"
+}