Revision bump; fix perms on config.inc.php. Tidy old ebuilds.

Package-Manager: portage-2.0.51.21

6 files changed, 19 insertions, 103 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index eec22b5876d3..14fecceeb05e 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.109 2005/04/27 07:09:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.110 2005/05/03 00:56:46 ka0ttic Exp $
+
+*phpmyadmin-2.6.2-r2 (03 May 2005)
+
+  03 May 2005; Aaron Walker <ka0ttic@gentoo.org> -phpmyadmin-2.6.2.ebuild,
+  -phpmyadmin-2.6.2-r1.ebuild, +phpmyadmin-2.6.2-r2.ebuild:
+  Revision bump; fix perms on config.inc.php. Tidy old ebuilds.
 
   27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
   phpmyadmin-2.6.2-r1.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 25898917ecf0..4a604bd2acd2 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8f011bc1d38fe3482845ef109801e41d ChangeLog 15393
-MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 6fa2bdf68166b9a6bf596e4ab4f4117a phpmyadmin-2.6.2.ebuild 2466
-MD5 2afb0a37822caefdd6feeaf6e9bef7fa phpmyadmin-2.6.2-r1.ebuild 2466
 MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390
-MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2 70
-MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r1 70
-MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
+MD5 48f714785bc74b5b0ef3adb1f39421c0 phpmyadmin-2.6.2-r2.ebuild 2563
+MD5 cbfeaf1f5f7f932a2d239e5a16feb482 ChangeLog 15630
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r2 70
+MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
 MD5 f7405589420f250cead2a0d7d3855164 files/postinstall-en.txt 458
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
-MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
+MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbzrVKf2g/qXtneoRAt5oAJ464VH11287gjTlJ0pe1sB/vWIZ9wCgwqB1
-Dcjri84aeitojmcEw+ACnSA=
-=Ejza
+iD8DBQFCdsxdEZCkKN40op4RAlS3AJwPPBEr8FHJScR4x8hHNlbfGv3qnQCdEl2n
+CuSGYoFYIMcUHr7V2EJaIxU=
+=kGI9
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1
deleted file mode 100644
index 148c15bd4d2d..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fc8cf4e7f9a84d725b159176e0621e1 phpMyAdmin-2.6.2.tar.bz2 1645396
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r2
index 148c15bd4d2d..148c15bd4d2d 100644
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r2
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2-r2.ebuild
index 4e8f46ded52a..e67442af405d 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.2-r2.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/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild,v 1.7 2005/04/27 07:09:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2-r2.ebuild,v 1.1 2005/05/03 00:56:46 ka0ttic Exp $
 
 inherit eutils webapp
 
@@ -84,6 +84,8 @@ src_install() {
 
 	webapp_src_install
 
+	fperms 0640 ${MY_HTDOCSDIR}/config.inc.php
+	fowners root:apache ${MY_HTDOCSDIR}/config.inc.php
 	# bug #88831, make sure the create script it's word-readable.
 	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 }
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
deleted file mode 100644
index 7f1b8689421d..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild,v 1.2 2005/04/25 11:00:38 beu Exp $
-
-inherit eutils webapp
-
-MY_P=phpMyAdmin-${PV}
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~ppc ~hppa ~sparc ~x86 ~amd64 ~mips"
-IUSE=""
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	virtual/httpd-php
-	sys-apps/findutils
-	!<=dev-db/phpmyadmin-2.5.6"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.inc.php-2.5.6.patch
-
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-
-	sed -e "s:\${MY_SQLSCRIPTSDIR}:${MY_SQLSCRIPTSDIR}:" \
-		-e "s:\${PVR}:${PVR}:" \
-		${FILESDIR}/postinstall-en.txt > ${WORKDIR}/postinstall-en.txt
-}
-
-src_compile() {
-	einfo "Setting random user/password details for the controluser"
-
-	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-	mv config.inc.php ${T}/config.inc.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${T}/config.inc.php > config.inc.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO ChangeLog LICENSE README"
-
-	# install the SQL scripts available to us
-	#
-	# unfortunately, we do not have scripts to upgrade from older versions
-	# these are things we need to add at a later date
-
-	webapp_sqlscript mysql ${T}/mysql-setup.sql
-
-	# handle documentation files
-	#
-	# NOTE that doc files go into /usr/share/doc as normal; they do NOT
-	# get installed per vhost!
-
-	dodoc ${docs}
-	for doc in ${docs} INSTALL; do
-		rm -f ${doc}
-	done
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	# Identify the configuration files that this app uses
-
-	webapp_configfile ${MY_HTDOCSDIR}/config.inc.php
-
-	# there are no files which need to be owned by the web server
-
-	# add the post-installation instructions
-
-	webapp_postinst_txt en ${WORKDIR}/postinstall-en.txt
-
-	# all done
-	#
-	# now we let the eclass strut its stuff ;-)
-
-	webapp_src_install
-
-	# bug #88831, make sure the create script it's word-readable.
-	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-}