Added gallery-1.5.7, removed insecure 2.2.3 (#203217).

Package-Manager: portage-2.1.4_rc7

6 files changed, 71 insertions, 100 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 8564023bbe89..5d1677b766bf 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.132 2008/01/23 16:02:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.133 2008/01/23 16:51:37 wrobel Exp $
+
+*gallery-1.5.7 (23 Jan 2008)
+
+  23 Jan 2008; Gunnar Wrobel <wrobel@gentoo.org> +gallery-1.5.7.ebuild,
+  -gallery-2.2.3.ebuild:
+  Added gallery-1.5.7, removed insecure 2.2.3 (#203217).
 
   23 Jan 2008; Steve Dibb <beandog@gentoo.org> gallery-2.2.4.ebuild:
   amd64 stable, security bug 203217
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index eb2f4c919bc7..f392bbfcb72a 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en.txt 430 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 SHA1 c1abf75f41ca3dea22c029e3e3f6604c02e71d08 SHA256 e2e63ec31b83e97fec9ecc7163f84beda4744150fa179ce39f0c26ed7ec54f3b
 MD5 d86a2cffa618ecf7fe9a2b001be69523 files/postinstall-en.txt 430
 RMD160 bfac0f557ce318745a713cf7a4b90c4473ee97a5 files/postinstall-en.txt 430
@@ -8,7 +11,7 @@ RMD160 c84759b0159710075f0099153bfc802cd76e8cb9 files/postinstall-en2.txt 912
 SHA256 ae1b0727e11518abf12616cd11cb82e6648a026769d9e4854ba6afb6d972c30b files/postinstall-en2.txt 912
 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.2.3-full.tar.gz 11901089 RMD160 1ae6474c48a7374540ff3f3b46d4d6c5cb34cb24 SHA1 d2624a89fa6d3b97c0b4c644fe1071b918e4d29e SHA256 ce7d9c1c4497954e1828047be25b31c3a271b5c86c0c97bbc652b3746aa1b364
+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
 EBUILD gallery-1.5.3.ebuild 1020 RMD160 c8a93aeba43583030ee793280b4c50aa2940ead8 SHA1 48df4b199906115abe9258e187f9ea9f554bb1f5 SHA256 707c351dcb97d90eb465e673736339ed6ce9c8e1b251cafc26341e584fe5dee1
 MD5 74ef4dbf04f800d480512c138428d6a3 gallery-1.5.3.ebuild 1020
@@ -18,18 +21,18 @@ EBUILD gallery-1.5.5.ebuild 1026 RMD160 61471ce75f68ae554cf238214d31f71e81089309
 MD5 e71919b5218b195075995cf53a7ad664 gallery-1.5.5.ebuild 1026
 RMD160 61471ce75f68ae554cf238214d31f71e81089309 gallery-1.5.5.ebuild 1026
 SHA256 55bce55a897b2cf4acd4b000dce109304c7c40978a07645ef7da6e82b27f2382 gallery-1.5.5.ebuild 1026
-EBUILD gallery-2.2.3.ebuild 2210 RMD160 ffa66eef67f4f34fcb2b284b8197a644c070c496 SHA1 d1bdcf032ce30c7479798cb1c82e19909b47313b SHA256 524b63cd3b2dc5a1ec8bc7e8431a21528d91c95c68e0dcb70f6b639ffc42cc32
-MD5 bada5eb5860c93fc4a732669256bd959 gallery-2.2.3.ebuild 2210
-RMD160 ffa66eef67f4f34fcb2b284b8197a644c070c496 gallery-2.2.3.ebuild 2210
-SHA256 524b63cd3b2dc5a1ec8bc7e8431a21528d91c95c68e0dcb70f6b639ffc42cc32 gallery-2.2.3.ebuild 2210
+EBUILD gallery-1.5.7.ebuild 1051 RMD160 1cda9fb08f8681c1d5ae3129f90f7d5e334cb9e7 SHA1 eb3e5f5c49af0c21d83eb8457cc4df08fae08628 SHA256 0f633b8773d79232ea042e8aa9ebdffa811bee5221098861d428323b69896fe1
+MD5 acafa4ea23931aadb16a39431340fd81 gallery-1.5.7.ebuild 1051
+RMD160 1cda9fb08f8681c1d5ae3129f90f7d5e334cb9e7 gallery-1.5.7.ebuild 1051
+SHA256 0f633b8773d79232ea042e8aa9ebdffa811bee5221098861d428323b69896fe1 gallery-1.5.7.ebuild 1051
 EBUILD gallery-2.2.4.ebuild 2234 RMD160 2832a92df6cf37b2ada1182ee871ed19fa60b30d SHA1 f2adc83f45655ee65fd3356f67c896ef22e9c71e SHA256 f882a2276ffee56528dcf4eb789bb9b1c7c1fa55a0afb5fb4f03802b5c125051
 MD5 e172c772a3acfe60b56d3f4688a60070 gallery-2.2.4.ebuild 2234
 RMD160 2832a92df6cf37b2ada1182ee871ed19fa60b30d gallery-2.2.4.ebuild 2234
 SHA256 f882a2276ffee56528dcf4eb789bb9b1c7c1fa55a0afb5fb4f03802b5c125051 gallery-2.2.4.ebuild 2234
-MISC ChangeLog 20797 RMD160 b24aef77dfbc3e0a0956f5732247448d53b302a5 SHA1 c701f469413bfffd698fe7135c1eed19009c1087 SHA256 33f997164943f767a1732b82b20fbcb667d42aa0ad8bd4adb3b098c5db8d1823
-MD5 8d49e6955ccad17430a60862e7252d9e ChangeLog 20797
-RMD160 b24aef77dfbc3e0a0956f5732247448d53b302a5 ChangeLog 20797
-SHA256 33f997164943f767a1732b82b20fbcb667d42aa0ad8bd4adb3b098c5db8d1823 ChangeLog 20797
+MISC ChangeLog 20981 RMD160 b88f04ab72787186c4369e422d2690e226b0d387 SHA1 0b7b2139eb0407a14b20ebb5e30c527552d2c789 SHA256 400b28bede38fb1b686b700ad87634ad24c9d496dcf1471018e713d087f775a1
+MD5 905fcd48569bdd97a9fb325e8a3b488f ChangeLog 20981
+RMD160 b88f04ab72787186c4369e422d2690e226b0d387 ChangeLog 20981
+SHA256 400b28bede38fb1b686b700ad87634ad24c9d496dcf1471018e713d087f775a1 ChangeLog 20981
 MISC metadata.xml 280 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 SHA1 9be68166586fe2133dc7cc5347b8edddd34e4926 SHA256 fd37fa0f441b1b68ef8dc4bffbb0a51f0414aa7c370b48369453af5f4bff177a
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 RMD160 c449ad35e8af3f158d8f8305f8a02ff98a420970 metadata.xml 280
@@ -40,9 +43,16 @@ SHA256 2783cf72e36aa1d08095f085709eb2ebdd26b3108c4373787040d2fd4ab738cb files/di
 MD5 75d4221e6bf48281113329f6aa6ae0ed files/digest-gallery-1.5.5 244
 RMD160 ef37bd9465395aaa857f9c97b2a3f234859ad4a8 files/digest-gallery-1.5.5 244
 SHA256 59a57cf7de6afafa00e8d04e52f43bfb2fa242e39f66ab324887631f1f586ebe files/digest-gallery-1.5.5 244
-MD5 7f42c2eca24fe8fe7f4a93d3634d266c files/digest-gallery-2.2.3 262
-RMD160 86235ee2717afea17163666fa9f57eed3679c8f3 files/digest-gallery-2.2.3 262
-SHA256 cb2e9220381a6c8fdcf566cefbdc6e77c61331d241d15e3dd7fdf7bb7fd5258d files/digest-gallery-2.2.3 262
+MD5 e1eb6a187694ab2bcb6955de9973ca20 files/digest-gallery-1.5.7 244
+RMD160 dc4104f8ae58f8a6cfd8c16e786fb801f034488c files/digest-gallery-1.5.7 244
+SHA256 63a676bce2593c484b3fe3488bd2d40ec87cf3b6001da871b03859694ce70cdc files/digest-gallery-1.5.7 244
 MD5 0791f58e8bb13858f43729ca6269512d files/digest-gallery-2.2.4 262
 RMD160 c9f27e3a69de05e62c5c8f8d3ff21cfa53cc0161 files/digest-gallery-2.2.4 262
 SHA256 d0b9614d8b1194c88ccb4e0e41947b719f789465302cc92e4f121fa7cbef1b6c files/digest-gallery-2.2.4 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHl3CgEEcxCpcDQ74RAikcAKCK+VI0dZdFJnzzJ4L8nNfqYWfv0QCeNn0f
+kqZX2NEQLk/clUxlBI4fXmA=
+=Ullx
+-----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/files/digest-gallery-1.5.7 b/www-apps/gallery/files/digest-gallery-1.5.7
new file mode 100644
index 000000000000..15cd889dfa7b
--- /dev/null
+++ b/www-apps/gallery/files/digest-gallery-1.5.7
@@ -0,0 +1,3 @@
+MD5 ff6ca5652e1c4007775bfc905b1a3b55 gallery-1.5.7.tar.gz 2357005
+RMD160 69b2488b228232173ad3b80072a3a90c952a08ca gallery-1.5.7.tar.gz 2357005
+SHA256 79fef2266c495cfaf7b50db27739fcea58270cebea1722a7ac0fa28ff9f8ea6c gallery-1.5.7.tar.gz 2357005
diff --git a/www-apps/gallery/files/digest-gallery-2.2.3 b/www-apps/gallery/files/digest-gallery-2.2.3
deleted file mode 100644
index a0c95ec702c4..000000000000
--- a/www-apps/gallery/files/digest-gallery-2.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df5c1a6ecbf0b498417ceffc66fe5f3b gallery-2.2.3-full.tar.gz 11901089
-RMD160 1ae6474c48a7374540ff3f3b46d4d6c5cb34cb24 gallery-2.2.3-full.tar.gz 11901089
-SHA256 ce7d9c1c4497954e1828047be25b31c3a271b5c86c0c97bbc652b3746aa1b364 gallery-2.2.3-full.tar.gz 11901089
diff --git a/www-apps/gallery/gallery-1.5.7.ebuild b/www-apps/gallery/gallery-1.5.7.ebuild
new file mode 100644
index 000000000000..1cf99a26434f
--- /dev/null
+++ b/www-apps/gallery/gallery-1.5.7.ebuild
@@ -0,0 +1,39 @@
+# 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-1.5.7.ebuild,v 1.1 2008/01/23 16:51:37 wrobel Exp $
+
+inherit webapp
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
+HOMEPAGE="http://gallery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="imagemagick netpbm unzip zip"
+
+RDEPEND=">=www-servers/apache-2.0
+	virtual/httpd-cgi
+	virtual/php
+	media-libs/jpeg
+	netpbm? ( >=media-libs/netpbm-9.12 >=media-gfx/jhead-2.2 )
+	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	unzip? ( app-arch/unzip )
+	zip? ( app-arch/zip )"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -R * "${D}/${MY_HTDOCSDIR}"
+	for file in AUTHORS ChangeLog README ChangeLog.archive.gz; do
+		dodoc ${file}
+		rm -f "${D}/${MY_HTDOCSDIR}/${file}"
+	done
+	dohtml docs/*
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+
+	webapp_src_install
+}
diff --git a/www-apps/gallery/gallery-2.2.3.ebuild b/www-apps/gallery/gallery-2.2.3.ebuild
deleted file mode 100644
index 89d0962812c9..000000000000
--- a/www-apps/gallery/gallery-2.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.3.ebuild,v 1.8 2007/09/15 12:28:30 drac 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="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 )
-	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="pcre 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
-}