Marked stable on all ARCHes.

6 files changed, 3 insertions, 203 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index c5bced203e2c..a1e03cd3ef30 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.34 2004/02/02 18:13:13 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.35 2004/02/02 18:15:25 mholzer Exp $
 
   02 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.5_p1.ebuild:
-  x86 stable
+  Marked stable on all ARCHes.
 
 *phpmyadmin-2.5.5_p1 (07 Jan 2004)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index d3e74fa0653b..f45346413c2b 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,15 +1,11 @@
-MD5 0210f966404a395f5c256bcf75cd2d64 ChangeLog 5835
+MD5 bedbcd1c71f5170235cb4aaed2fe8ce0 ChangeLog 5853
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 3042c653eabd26e0a9b00316f9840c8c phpmyadmin-2.5.4.ebuild 2976
-MD5 246ad25582da5f595de3a0b904fff86f phpmyadmin-2.5.5.ebuild 2965
 MD5 30a7e8e1e79fe8d7dba4cf627c913030 phpmyadmin-2.5.5_p1.ebuild 2976
 MD5 069e2c15dc9725b90d0255b042d88489 files/config.inc.php-2.5.4.patch 4826
-MD5 c1b0654f2909f7a01d9621c1dd41cca3 files/digest-phpmyadmin-2.5.4 74
 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.4 3230
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
 MD5 a356cfed6f61c3ab1f1600f63eb67a6b files/config.inc.php-2.5.5.patch 5549
-MD5 5974647981765b27b3f6beb050377fb0 files/digest-phpmyadmin-2.5.5 70
 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.5 3230
 MD5 c1d7fa926b7ce3c5f2db032ede08217d files/digest-phpmyadmin-2.5.5_p1 74
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.5_p1.patch 5525
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4
deleted file mode 100644
index 38752f13df68..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3a8d771c9846dd95b7283c7ce0f20dd phpMyAdmin-2.5.4-php.tar.bz2 1051651
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.5 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.5
deleted file mode 100644
index 5a9c1516a3fb..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b790e9f10f9e0d8406d2684e7ad6a9df phpMyAdmin-2.5.5.tar.bz2 1094355
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild
deleted file mode 100644
index 76ce6c82f29b..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.4.ebuild,v 1.6 2003/12/15 20:03:27 stuart Exp $
-
-inherit eutils
-inherit webapp-apache
-
-MY_P=phpMyAdmin-${PV/_p/-pl}
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://phpmyadmin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-php.tar.bz2"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha arm ppc hppa mips sparc x86 amd64"
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.21 <dev-db/mysql-5.0
-	>=dev-php/mod_php-3.0.8
-	sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
-pkg_setup() {
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/config.inc.php-${PV}.patch
-}
-
-src_compile() {
-	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-${PV} > ${T}/mysql-setup.sql
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/phpmyadmin
-	local docs="ANNOUNCE.txt CREDITS Documentation.txt RELEASE-DATE-${PV} TODO"
-
-	# Copy everything
-	mkdir -p ${D}${destdir}
-	cp -r . ${D}${destdir}
-	# Remove documentation files
-	for doc in ${docs} INSTALL; do
-		rm -f ${D}${destdir}/${doc}
-	done
-	# Remove .cvs* files and CVS directories
-	find ${D}${destdir} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-	# Fix permissions
-	find ${D}${destdir} -type d | xargs chmod 755
-	find ${D}${destdir} -type f | xargs chmod 644
-
-	dodoc ${docs} ChangeLog LICENSE README
-
-	dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php
-	insinto /etc/phpmyadmin
-	insopts -g apache -m 640
-	doins config.inc.php
-	doins ${T}/mysql-setup.sql
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To complete installation, you must"
-	einfo "1. Update your configuration files:"
-	einfo "     etc-update"
-	einfo "2. Update MySQL's grant tables and the pmadb database:"
-	einfo "     ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "3. Reload MySQL:"
-	einfo "     /etc/init.d/mysql restart"
-	einfo
-	einfo "If you are upgrading from an earlier version and are using phpMyAdmin's"
-	einfo "features for master/foreign tables be sure to read"
-	einfo "  http://localhost/phpmyadmin/Documentation.html#col_com"
-	einfo "You will need to perform the ALTER TABLE step yourself."
-	einfo
-	einfo "Finally, point your browser to http://localhost/phpmyadmin/."
-	einfo
-}
-
-pkg_config() {
-	einfo "This will execute the contents of ${ROOT}etc/phpmyadmin/mysql-setup.sql"
-	einfo "Type in your MySQL root password:"
-	mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die
-	einfo "You need to reload MySQL for the changes to take effect"
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.5.ebuild
deleted file mode 100644
index 02b6556f676f..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.5.ebuild,v 1.1 2003/12/29 01:29:51 twp Exp $
-
-inherit eutils
-inherit webapp-apache
-
-MY_P=phpMyAdmin-${PV/_p/-pl}
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://phpmyadmin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~arm ~ppc ~hppa ~mips ~sparc ~x86 ~amd64"
-DEPEND=">=net-www/apache-1.3
-	>=dev-db/mysql-3.23.32 <dev-db/mysql-5.0
-	>=dev-php/mod_php-4.1
-	sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-webapp-detect || NO_WEBSERVER=1
-
-pkg_setup() {
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/config.inc.php-${PV}.patch
-}
-
-src_compile() {
-	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-${PV} > ${T}/mysql-setup.sql
-}
-
-src_install() {
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/phpmyadmin
-	local docs="CREDITS Documentation.txt RELEASE-DATE-${PV} TODO"
-
-	# Copy everything
-	mkdir -p ${D}${destdir}
-	cp -r . ${D}${destdir}
-	# Remove documentation files
-	for doc in ${docs} INSTALL; do
-		rm -f ${D}${destdir}/${doc}
-	done
-	# Remove .cvs* files and CVS directories
-	find ${D}${destdir} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-	# Fix permissions
-	find ${D}${destdir} -type d | xargs chmod 755
-	find ${D}${destdir} -type f | xargs chmod 644
-
-	dodoc ${docs} ChangeLog LICENSE README
-
-	dosym /etc/phpmyadmin/config.inc.php ${destdir}/config.inc.php
-	insinto /etc/phpmyadmin
-	insopts -g apache -m 640
-	doins config.inc.php
-	doins ${T}/mysql-setup.sql
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To complete installation, you must"
-	einfo "1. Update your configuration files:"
-	einfo "     etc-update"
-	einfo "2. Update MySQL's grant tables and the pmadb database:"
-	einfo "     ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "3. Reload MySQL:"
-	einfo "     /etc/init.d/mysql restart"
-	einfo
-	einfo "If you are upgrading from an earlier version and are using phpMyAdmin's"
-	einfo "features for master/foreign tables be sure to read"
-	einfo "  http://localhost/phpmyadmin/Documentation.html#col_com"
-	einfo "You will need to perform the ALTER TABLE step yourself."
-	einfo
-	einfo "Finally, point your browser to http://localhost/phpmyadmin/."
-	einfo
-}
-
-pkg_config() {
-	einfo "This will execute the contents of ${ROOT}etc/phpmyadmin/mysql-setup.sql"
-	einfo "Type in your MySQL root password:"
-	mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die
-	einfo "You need to reload MySQL for the changes to take effect"
-}