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

(Portage version: 2.1.4_rc7)

5 files changed, 49 insertions, 88 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/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
-}