Fix location of config files (#55760)

(Portage version: 2.0.51.22-r1)

4 files changed, 19 insertions, 39 deletions

diff --git a/dev-db/phppgadmin/ChangeLog b/dev-db/phppgadmin/ChangeLog
index 7793cdea978e..6b59d5f605a5 100644
--- a/dev-db/phppgadmin/ChangeLog
+++ b/dev-db/phppgadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/phppgadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.41 2005/05/07 07:51:31 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.42 2005/07/06 19:17:46 rl03 Exp $
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  phppgadmin-3.5.3.ebuild:
+  Fix location of config files (#55760)
 
   07 May 2005; Elfyn McBratney <beu@gentoo.org> phppgadmin-3.5.1.ebuild,
   phppgadmin-3.5.2.ebuild, phppgadmin-3.5.3.ebuild:
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index a44c4bf95ca2..6f4924ee9f5a 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8c05332043586029d9d1417154cda2fc metadata.xml 185
-MD5 fb41519ea19571947bb27d31e5f9a386 ChangeLog 4921
 MD5 02614b10f3cf0fcbdcc5c8207cd2409a phppgadmin-3.5.1.ebuild 1404
-MD5 859340b4ddcb2658bf63b843b7106e30 phppgadmin-3.5.3.ebuild 1409
+MD5 0404572107c8e98db31885193f561b07 phppgadmin-3.5.3.ebuild 1109
+MD5 01a8394f6db0c28209f4ba9b6bfe95c5 ChangeLog 5061
+MD5 8c05332043586029d9d1417154cda2fc metadata.xml 185
 MD5 bc8f546fe4e13fe34b1a92f06c4e7ffa phppgadmin-3.5.2.ebuild 1409
-MD5 a6948e041a57a6f252acd7bdb96216ba files/postinstall-en.txt 152
-MD5 0352c1231276349786959b22c40c84a9 files/digest-phppgadmin-3.5.3 69
+MD5 f066d1c1e8f9d0f266a99943662abf6f files/postinstall-en.txt 163
 MD5 57dc515981d12ae05c3100e100657ba4 files/digest-phppgadmin-3.5.1 69
 MD5 185c92eb84018e2da326625e44814224 files/digest-phppgadmin-3.5.2 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfHOyjUHll2nfF60RArmpAJ9FwUnmgDr9D7/dsovLFcHa2B9AZQCfZb4H
-elad7syi083Z0gnOfjW/Fus=
-=E+lT
------END PGP SIGNATURE-----
+MD5 0352c1231276349786959b22c40c84a9 files/digest-phppgadmin-3.5.3 69
diff --git a/dev-db/phppgadmin/files/postinstall-en.txt b/dev-db/phppgadmin/files/postinstall-en.txt
index 9f0f647ac0a5..b91c873296cb 100644
--- a/dev-db/phppgadmin/files/postinstall-en.txt
+++ b/dev-db/phppgadmin/files/postinstall-en.txt
@@ -1,6 +1,6 @@
-Make sure you edit /etc/phppgadmin/config.inc.php
+Make sure you edit ${MY_INSTALLDIR}/conf/config.inc.php
 
 To use the reports-database, you have to manually
 execute
-psql -f /etc/phppgadmin/reports-pgsql.sql
+psql -f ${MY_INSTALLDIR}/sql/reports-pgsql.sql
 
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.3.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.3.ebuild
index 93575f383b1e..4ff45d67b01f 100644
--- a/dev-db/phppgadmin/phppgadmin-3.5.3.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-3.5.3.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/phppgadmin/phppgadmin-3.5.3.ebuild,v 1.2 2005/05/07 07:51:31 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.3.ebuild,v 1.3 2005/07/06 19:17:46 rl03 Exp $
 
 inherit eutils webapp
 
@@ -24,33 +24,19 @@ DEPEND=">=dev-db/postgresql-7.0.0
 RDEPEND="${DEPEND}
 	!<=dev-db/phppgadmin-3.3.1"
 
-src_compile() {
-	mv libraries/lib.inc.php ${T}/lib.inc.php
-	mv login.php ${T}/login.php
-	sed -e "s|conf/config.inc.php|/etc/phppgadmin/config.inc.php|g" \
-		${T}/login.php > login.php
-	sed -e "s|include('./conf|include('conf|g" \
-		-e "s|conf/config.inc.php|/etc/phppgadmin/config.inc.php|g" \
-		${T}/lib.inc.php > libraries/lib.inc.php
-}
-
 src_install() {
 	webapp_src_preinst
 
-	local docs="DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS CREDITS LICENSE BUGS"
-
+	local docs="DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS CREDITS BUGS"
 	dodoc ${docs}
-	for docs in ${docs} INSTALL; do
-		rm -f $doc
-	done
-
-	dodir /etc/phppgadmin
-	mv conf/* sql/* ${D}/etc/phppgadmin/
-	rm -fr config/ sql/
+	mv conf/config.inc.php-dist conf/config.inc.php
 
 	cp -r * ${D}${MY_HTDOCSDIR}
+	for doc in ${docs} INSTALL LICENSE; do
+		rm -f ${D}${MY_HTDOCSDIR}/${doc}
+	done
 
+	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-
 	webapp_src_install
 }