Housekeeping. Fix #62405.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 25 insertions, 30 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index 213bacdb70a2..ad6026557160 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.19 2005/05/01 07:37:24 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.20 2005/06/30 20:46:43 rl03 Exp $
+
+  30 Jun 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  gallery-1.5.ebuild:
+  Housekeeping. Fix #62405.
 
 *gallery-1.5 (01 May 2005)
 
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index ae111a4e7826..3d97c59fee97 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 d95c0c4751466d60d6be7792123788a3 ChangeLog 6767
+MD5 1e9614219c46b57870e34fb62b8f3d35 gallery-1.5.ebuild 968
 MD5 033749b6b1a992827071bc327a387f18 gallery-1.4.4_p6.ebuild 1219
-MD5 6986ecf9d49a6dc3b0e117c003a4450d gallery-1.5.ebuild 1195
-MD5 1a10c9a2ede35b5bfcfcedc4d90373e3 files/postinstall-en.txt 287
-MD5 3485f6f6f43d72b5c119d09d0db3f7ca files/digest-gallery-1.5 64
+MD5 95c28f165b7135b9a3b0cbd8c900648c ChangeLog 6891
+MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 a8729b1e72b2703178d00a546bc8a925 files/digest-gallery-1.4.4_p6 70
+MD5 f24f8a21b5eb191ec049bef16ee16f3b files/postinstall-en.txt 349
+MD5 3485f6f6f43d72b5c119d09d0db3f7ca files/digest-gallery-1.5 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFCdJUWjUHll2nfF60RAmXBAJiMsjI7nZAsnuBzyZcvw20CkeRzAKCPAPAa
-TaGN6ERP8BcyGCsShrzmcg==
-=kbOQ
+iD8DBQFCxFpNEzitwsaoONoRAlcnAJ9Afl7JvHO0MhhM1gGcvL9oQCmWlgCePqPU
+8YjrbcI+0bt2RKVAz4TpK8w=
+=vPMe
 -----END PGP SIGNATURE-----
diff --git a/www-apps/gallery/files/postinstall-en.txt b/www-apps/gallery/files/postinstall-en.txt
index 164cd3b705d8..8fd6570365e7 100644
--- a/www-apps/gallery/files/postinstall-en.txt
+++ b/www-apps/gallery/files/postinstall-en.txt
@@ -1,7 +1,7 @@
 For new installations:

-- touch ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

-and 

-chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

+  touch ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php

+  mkdir ${MY_INSTALLDIR}/albums

+  chown ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/.htaccess ${MY_INSTALLDIR}/config.php ${MY_INSTALLDIR}/albums

 

-Then point your browser to http://yourhost/gallery/setup/

+Then point your browser to http://${VHOST_HOSTNAME}/gallery/setup/

 and follow the instructions.

diff --git a/www-apps/gallery/gallery-1.5.ebuild b/www-apps/gallery/gallery-1.5.ebuild
index 81257a4e987f..ef8e376a18b7 100644
--- a/www-apps/gallery/gallery-1.5.ebuild
+++ b/www-apps/gallery/gallery-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.ebuild,v 1.2 2005/05/01 08:36:03 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-1.5.ebuild,v 1.3 2005/06/30 20:46:43 rl03 Exp $
 
 inherit webapp
 
@@ -10,11 +10,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="imagemagick"
 
 RDEPEND=">=net-www/apache-1.3.24-r1
-	>=dev-php/mod_php-4.1.2-r5
+	>=virtual/php-4.1
 	>=media-gfx/jhead-1.6
+	app-arch/unzip
+	media-libs/jpeg
 	>=media-libs/netpbm-9.12
 	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )"
 
@@ -23,24 +25,13 @@ 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 ${file}
+		rm -f ${D}/${MY_HTDOCSDIR}/${file}
 	done
-
-	touch ${S}/.htaccess ${S}/config.php
-	cp -R . ${D}/${MY_HTDOCSDIR}
-
-	# config files
-	webapp_configfile ${MY_HTDOCSDIR}/config.php
-
-	# owned files
-	dodir ${MY_HTDOCSDIR}/albums
-	webapp_serverowned ${MY_HTDOCSDIR}/albums
-	webapp_serverowned ${MY_HTDOCSDIR}/config.php
-	webapp_serverowned ${MY_HTDOCSDIR}/.htaccess
-
 	dohtml docs/*
+
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 
 	webapp_src_install