Use webapp-apache.eclass

3 files changed, 29 insertions, 6 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 57a3f095278a..96364c9f1d15 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2003/08/09 11:00:59 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.26 2003/09/11 21:08:03 twp Exp $
+
+*phpmyadmin-2.5.3 (11 Sep 2003)
+
+  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.
 
 *phpmyadmin-2.5.2_p1 (09 Aug 2003)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index c2a66e011c25..4c580d8374b4 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,6 @@
-MD5 60241094f497b1255e745590a7938185 ChangeLog 4745
+MD5 b15d71f625428e20572c2ddbcce85c95 ChangeLog 4745
 MD5 6a8a94b96dc312877aaac492a29800ea phpmyadmin-2.5.2_p1.ebuild 2676
-MD5 d0937db778cafdd09a7f25ef63a06ae8 phpmyadmin-2.5.3.ebuild 3421
+MD5 0e7ffe1fad9e2fda059f0c77f2ff0ea7 phpmyadmin-2.5.3.ebuild 3170
 MD5 c8831e7a64bded4933b46b81e013e9b8 phpmyadmin-2.4.0.ebuild 2245
 MD5 16ffe21b622dc1a247ce45b654674bc8 phpmyadmin-2.5.0.ebuild 2661
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.3.ebuild
index 15f29a8eeb46..f5cd74533385 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.3.ebuild
@@ -1,8 +1,9 @@
 # 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.ebuild,v 1.2 2003/09/10 20:21:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.3.ebuild,v 1.3 2003/09/11 21:08:04 twp Exp $
 
 inherit eutils
+inherit webapp-apache
 
 MY_P=phpMyAdmin-${PV/_p/-pl}
 DESCRIPTION="Web-based administration for MySQL database in PHP"
@@ -17,6 +18,22 @@ DEPEND=">=net-www/apache-1.3
 	sys-apps/findutils"
 S=${WORKDIR}/${MY_P}
 
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+
+	if [ -d ${HTTPD_ROOT}/phpmyadmin ] ; then
+		echo ""
+		eerror "phpmyadmin directory detected in ${HTTPD_ROOT}."
+		eerror "You must unmerge your older version first,"
+		eerror "and remove the directory before continuing."
+		die "Will not overwrite previous installation."
+	fi
+
+	einfo "Installing into ${HTTPD_ROOT}."
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/config.inc.php-${PV}.patch
@@ -33,7 +50,7 @@ src_compile() {
 
 src_install() {
 
-	local DocumentRoot=/home/httpd/htdocs
+	local DocumentRoot=${HTTPD_ROOT}
 	local destdir=${DocumentRoot}/phpmyadmin
 	local docs="ANNOUNCE.txt CREDITS Documentation.txt README RELEASE-DATE-${PV} TODO"
 
@@ -78,7 +95,8 @@ pkg_postinst() {
 }
 
 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
+	mysql -u root -p < ${ROOT}etc/phpmyadmin/mysql-setup.sql || die
 	einfo "You need to reload MySQL for the changes to take effect"
 }