Bug # 28868

4 files changed, 103 insertions, 4 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 96364c9f1d15..9a0aad6adf2e 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.26 2003/09/11 21:08:03 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.27 2003/09/17 11:05:08 twp Exp $
 
 *phpmyadmin-2.5.3 (11 Sep 2003)
 
+  17 Sep 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.3-r1.ebuild :
+  Change ownership on config files. Bug # 28868. Thanks dju.
+
   11 Sep 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.3.ebuild :
   Version bump. Use webapp-apache.eclass. Bugs # 27741 & 28129. Thanks Ian Leitch.
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 46c4bf624ac7..f0334cd1161c 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,9 +1,9 @@
-MD5 b15d71f625428e20572c2ddbcce85c95 ChangeLog 4745
+MD5 b7142e5c75e48d696c4b89a6518a2b74 ChangeLog 4878
 MD5 6a8a94b96dc312877aaac492a29800ea phpmyadmin-2.5.2_p1.ebuild 2676
-MD5 2a26ac24b2f2dd9d98c7b396c7553ae1 phpmyadmin-2.5.3.ebuild 3222
+MD5 831f883cf6faa2ed6db463964c0d3189 phpmyadmin-2.5.3.ebuild 3191
 MD5 c8831e7a64bded4933b46b81e013e9b8 phpmyadmin-2.4.0.ebuild 2245
 MD5 16ffe21b622dc1a247ce45b654674bc8 phpmyadmin-2.5.0.ebuild 2661
-MD5 831f883cf6faa2ed6db463964c0d3189 phpmyadmin-2.5.3-r1.ebuild 3191
+MD5 4b4c906305f69a56a060f1f5c0886ff8 phpmyadmin-2.5.3-r1.ebuild 2946
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 2f1fcee3c3573d6d92cbcddd4da6291d files/config.inc.php-2.5.0.patch 4826
 MD5 6a880a1a4b15034019ebeeb0de87041e files/config.inc.php-2.5.1.patch 4826
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1
new file mode 100644
index 000000000000..ab151732211a
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.5.3-r1
@@ -0,0 +1 @@
+MD5 1a7848cdb2e004ae07012f2306606e0f phpMyAdmin-2.5.3-php.tar.bz2 1014664
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..e5f6724f1700
--- /dev/null
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.3-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.3-r1.ebuild,v 1.1 2003/09/17 11:05:08 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/phpmyadmin/${MY_P}-php.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~ppc hppa ~mips ~sparc ~x86"
+DEPEND=">=net-www/apache-1.3
+	>=dev-db/mysql-3.21 <dev-db/mysql-4.1
+	>=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() {
+
+	local DocumentRoot=${HTTPD_ROOT}
+	local destdir=${DocumentRoot}/phpmyadmin
+	local docs="ANNOUNCE.txt CREDITS Documentation.txt README RELEASE-DATE-${PV} TODO"
+
+	# Copy everything
+	mkdir -p ${D}${destdir}
+	cp -r . ${D}${destdir}
+	# Remove documentation files
+	for doc in ${docs} INSTALL LICENSE; 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
+
+	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"
+}