6 files changed, 6 insertions, 262 deletions
diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index a596b2287836..611715b30e44 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/gallery
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.185 2011/03/23 20:01:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.186 2011/03/24 07:05:05 radhermit Exp $
+
+  24 Mar 2011; Tim Harder <radhermit@gentoo.org> -gallery-1.5.10.ebuild,
+  -gallery-2.3.ebuild, -gallery-2.3-r1.ebuild, -gallery-2.3-r2.ebuild,
+  -files/postinstall-en.txt:
+  Remove old.
 
   23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> gallery-2.3.1.ebuild:
   ppc/ppc64 stable wrt #354541
diff --git a/www-apps/gallery/files/postinstall-en.txt b/www-apps/gallery/files/postinstall-en.txt
deleted file mode 100644
index 2543c1067cbd..000000000000
--- a/www-apps/gallery/files/postinstall-en.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-For new installations:
-  touch ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php
-  chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php
-
-Then create an albums directory and set permissions, e.g.,
- chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} my_albums_directory
-
-Now, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/setup/
-and follow the instructions.
diff --git a/www-apps/gallery/gallery-1.5.10.ebuild b/www-apps/gallery/gallery-1.5.10.ebuild
deleted file mode 100644
index 6e2eeb396a16..000000000000
--- a/www-apps/gallery/gallery-1.5.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.10.ebuild,v 1.7 2011/02/28 18:06:37 ssuominen Exp $
-
-inherit webapp depend.php confutils
-
-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="amd64 hppa ppc x86"
-IUSE="imagemagick netpbm unzip zip"
-
-RDEPEND="virtual/jpeg
-	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 )"
-
-need_httpd_cgi
-need_php_httpd
-
-pkg_setup() {
-	webapp_pkg_setup
-	confutils_require_any imagemagick netpbm
-	require_php_with_use pcre session
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	gunzip ChangeLog.archive.gz
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS ChangeLog ChangeLog.archive README
-	dohtml docs/*
-
-	cp -r . "${D}/${MY_HTDOCSDIR}"
-	rm -rf "${D}/${MY_HTDOCSDIR}"/{AUTHORS,ChangeLog,ChangeLog.archive,README,LICENSE.txt,docs/}
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/gallery/gallery-2.3-r1.ebuild b/www-apps/gallery/gallery-2.3-r1.ebuild
deleted file mode 100644
index 8fe5d92b151f..000000000000
--- a/www-apps/gallery/gallery-2.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 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.2 2011/02/13 18:42:59 armin76 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="~amd64 ~hppa ~ppc ~ppc64 ~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
-}
diff --git a/www-apps/gallery/gallery-2.3-r2.ebuild b/www-apps/gallery/gallery-2.3-r2.ebuild
deleted file mode 100644
index ab396a4dbd9f..000000000000
--- a/www-apps/gallery/gallery-2.3-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3-r2.ebuild,v 1.3 2011/02/13 18:42:59 armin76 Exp $
-
-EAPI="2"
-
-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="~amd64 ~hppa ~ppc ~ppc64 ~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 )
-	sqlite? ( dev-lang/php[pdo] )
-	gd? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
-	dev-lang/php[mysql?,session,postgres?]
-	|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-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
-}
-
-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
-}
diff --git a/www-apps/gallery/gallery-2.3.ebuild b/www-apps/gallery/gallery-2.3.ebuild
deleted file mode 100644
index 2a5e32723f70..000000000000
--- a/www-apps/gallery/gallery-2.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.3.ebuild,v 1.7 2011/02/13 18:42:59 armin76 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="amd64 hppa ppc ppc64 x86"
-IUSE="ffmpeg gd imagemagick mysql netpbm postgres raw 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
-
-	local php_flags="pcre session"
-	use mysql && php_flags="${php_flags} mysql"
-	use postgres && php_flags="${php_flags} postgres"
-
-	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
-}