Fixes for w-c-1.50

(Portage version: 2.0.51.22-r2)

5 files changed, 14 insertions, 20 deletions

diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog
index 568ac92759ef..b284274906e3 100644
--- a/www-apps/metadot/ChangeLog
+++ b/www-apps/metadot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/metadot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.14 2005/09/02 11:20:54 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.15 2005/12/04 22:50:24 rl03 Exp $
+
+  04 Dec 2005; Renat Lumpau <rl03@gentoo.org> files/reconfig-6.4_p3,
+  files/postinstall-en-6.4_p3.txt, metadot-6.4_p3.ebuild:
+  Fixes for w-c-1.50
 
   02 Sep 2005; Renat Lumpau <rl03@gentoo.org> metadot-6.1.6.ebuild:
   Fix 6.1.6
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index 52fad83dec48..b1c5d48a7fb4 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5c802b64f9e5b8cb1a9a2e6d96970197 metadot-6.4_p3.ebuild 1828
+MD5 771fd17a7355486ead201213d5a6b936 metadot-6.4_p3.ebuild 1824
 MD5 dfd60989a17e0ab31fe6e6c850886525 metadot-6.1.6.ebuild 1410
 MD5 7f042ee94e1a007223d1ae2ee236526a ChangeLog 2190
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 d94b7dade124ac6fcecd869a69a59f48 files/reconfig-6.4_p3 370
-MD5 a50cf71c764014873dd735a19b6b77f6 files/postinstall-en-6.4_p3.txt 1187
+MD5 be4549836158851ad57cea2f758c1b69 files/reconfig-6.4_p3 361
+MD5 c5c30555371d581d6690a53ea84346d8 files/postinstall-en-6.4_p3.txt 1174
 MD5 04f2425090275b79624c2ef14ef107ff files/digest-metadot-6.1.6 65
 MD5 20d7f02a98e7e1bdd83cc868dc128863 files/postinstall-en-6.1.6.txt 1567
 MD5 a46f23e9d0e84956e0d476a0a52a1f32 files/digest-metadot-6.4_p3 65
 MD5 f06f271783c0db5fcb541f0fc51812a1 files/metadot.conf 445
 MD5 c7ad307b2475e81f9e5a15c731185dd4 files/reconfig-6.1.6 337
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDGDWrEzitwsaoONoRAva/AKCxHzgvS8iNO4NvTvC+IboBFDUMIQCcDA/h
-f7mw62bgA42uGzk5imRyFOk=
-=/9IS
------END PGP SIGNATURE-----
diff --git a/www-apps/metadot/files/postinstall-en-6.4_p3.txt b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
index 23a9ea0ae244..9888bd3509e1 100644
--- a/www-apps/metadot/files/postinstall-en-6.4_p3.txt
+++ b/www-apps/metadot/files/postinstall-en-6.4_p3.txt
@@ -19,8 +19,8 @@ Set your database password from step 1.
 Read the online docs! Especially if you want to use virtual servers.
 
 3. Configure Apache:
-The ebuild installed an Apache configfile into ${MY_SERVERCONFIGDIR}.
-Copy it into /etc/{apache,apache2}/vhosts.d directory and edit it to 
+The ebuild installed an Apache configfile: ${VHOST_ROOT}/${PN}.conf
+Copy it into /etc/{apache,apache2}/vhosts.d and edit it to
 suit your needs.
 
 4. Configure cronjobs.
diff --git a/www-apps/metadot/files/reconfig-6.4_p3 b/www-apps/metadot/files/reconfig-6.4_p3
index 34f4bc6d57bf..f37752ba4a94 100644
--- a/www-apps/metadot/files/reconfig-6.4_p3
+++ b/www-apps/metadot/files/reconfig-6.4_p3
@@ -11,8 +11,8 @@ if [ $1 = "install" ]; then
 	sed -e "s|/home/metadot/metadot|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/etc/metadot.conf || die
 	# fix Apache configs
 	sed -e "s|ROOTDIR|${MY_INSTALLDIR}|g
-	s|VHOST|${VHOST_HOSTNAME}|" -i ${MY_SERVERCONFIGDIR}/metadot.conf || die
-	
+	s|VHOST|${VHOST_HOSTNAME}|" -i ${VHOST_ROOT}/metadot.conf || die
+
 elif [ $1 = "clean" ]; then
 	echo $1
 fi
diff --git a/www-apps/metadot/metadot-6.4_p3.ebuild b/www-apps/metadot/metadot-6.4_p3.ebuild
index c247c7954a07..32892658c429 100644
--- a/www-apps/metadot/metadot-6.4_p3.ebuild
+++ b/www-apps/metadot/metadot-6.4_p3.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/www-apps/metadot/metadot-6.4_p3.ebuild,v 1.2 2005/09/02 11:19:51 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/metadot-6.4_p3.ebuild,v 1.3 2005/12/04 22:50:24 rl03 Exp $
 
 inherit webapp
 MY_P="${PN}${PV/_p/r}"
@@ -59,7 +59,7 @@ src_install() {
 	dodoc CHANGELOG README
 	cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR}
 
-	cp ${FILESDIR}/${PN}.conf ${D}/${MY_SERVERCONFIGDIR}
+	cp ${FILESDIR}/${PN}.conf ${D}/${MY_HOSTROOTDIR}
 
 	webapp_serverowned ${MY_HTDOCSDIR}
 	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public