stable on all arches. Closes 48379

7 files changed, 11 insertions, 211 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 7cf08bfa8859..f40b77a18b64 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +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.44 2004/04/30 22:49:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.45 2004/05/01 09:54:27 mholzer Exp $
+
+  01 May 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  stable on all arches. Closes 48379
 
   01 May 2004; Bryan Østergaard <kloeri@gentoo.org> phpmyadmin-2.5.6.ebuild:
   Stable on alpha.
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 18f4f9f8326e..8080b462b7bc 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,14 +1,10 @@
-MD5 e867ce81c6946d240ee16ebbc6c17a3d phpmyadmin-2.5.6_rc1.ebuild 2966
+MD5 71dec386d6e6b94397209c5e8d1bf26d ChangeLog 7243
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 519f0f17cb86db5f1f08f022f945ded0 ChangeLog 7129
-MD5 7bb0ecc15904f9eecdaa286ea1589b75 phpmyadmin-2.5.6.ebuild 3007
-MD5 02cd31270333733444625dbb848abd4f phpmyadmin-2.5.6_rc1-r1.ebuild 3006
+MD5 a1936cd835f6d509010f0d887f87e443 phpmyadmin-2.5.6.ebuild 3006
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
+MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.6 3230
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 53b6d69a4dd7609b24b4407800557f37 files/digest-phpmyadmin-2.5.6_rc1-r1 74
 MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
-MD5 53b6d69a4dd7609b24b4407800557f37 files/digest-phpmyadmin-2.5.6_rc1 74
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6_rc1.patch 5525
 MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.6_rc1 3230
-MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
-MD5 12e8a97118eb6912911e207e72d1a421 files/mysql-setup.sql.in-2.5.6 3230
-MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1
deleted file mode 100644
index 36d80adab454..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1233c2068c230895fe389b8fcb72e29 phpMyAdmin-2.5.6-rc1.tar.bz2 1107008
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1-r1
deleted file mode 100644
index 36d80adab454..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.6_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1233c2068c230895fe389b8fcb72e29 phpMyAdmin-2.5.6-rc1.tar.bz2 1107008
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
index 7949cf52a1b2..0b0a5c45680c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6.ebuild,v 1.8 2004/04/30 22:49:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild,v 1.9 2004/05/01 09:54:27 mholzer Exp $
 
 inherit eutils
 inherit webapp-apache
@@ -13,7 +13,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 IUSE="apache2"
 SLOT="0"
-KEYWORDS="alpha ~ppc hppa sparc x86 ~amd64"
+KEYWORDS="alpha ppc hppa 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
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1-r1.ebuild
deleted file mode 100644
index 5e82b98b4c04..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 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.6_rc1-r1.ebuild,v 1.1 2004/03/01 20:43:58 twp Exp $
-
-inherit eutils
-inherit webapp-apache
-
-MY_P=phpMyAdmin-${PV/_rc/-rc}
-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 -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}
-
-pkg_setup() {
-	webapp-detect || NO_WEBSERVER=1
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing into ${ROOT}${HTTPD_ROOT}."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	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-detect || NO_WEBSERVER=1
-	webapp-mkdirs
-
-	local DocumentRoot=${HTTPD_ROOT}
-	local destdir=${DocumentRoot}/phpmyadmin
-	local docs="CREDITS Documentation.txt RELEASE-DATE-* 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.6_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild
deleted file mode 100644
index 783337a180a6..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.6_rc1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 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.6_rc1.ebuild,v 1.5 2004/04/12 16:56:04 twp Exp $
-
-inherit eutils
-inherit webapp-apache
-
-MY_P=phpMyAdmin-${PV/_rc/-rc}
-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"
-IUSE=""
-SLOT="0"
-KEYWORDS="alpha ppc hppa 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}
-	cd ${S}
-	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-* 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"
-}