Version bump. Fix #96959.

(Portage version: 2.0.51.22-r1)

7 files changed, 150 insertions, 12 deletions

diff --git a/www-apps/metadot/ChangeLog b/www-apps/metadot/ChangeLog
index e282e224ae71..24643312807d 100644
--- a/www-apps/metadot/ChangeLog
+++ b/www-apps/metadot/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2005/07/02 23:58:25 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/metadot/ChangeLog,v 1.10 2005/07/03 00:05:42 rl03 Exp $
+
+*metadot-6.4_p1 (03 Jul 2005)
+
+  03 Jul 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-6.4_p1,
+  +files/postinstall-en-6.4_p1.txt, +files/metadot.conf,
+  +metadot-6.4_p1.ebuild:
+  Version bump. Fix #96959.
 
   02 Jul 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-6.1.6,
   +files/postinstall-en-6.1.6.txt, -files/postinstall-en.txt,
diff --git a/www-apps/metadot/Manifest b/www-apps/metadot/Manifest
index 2e4094004dac..852d4ffec6d4 100644
--- a/www-apps/metadot/Manifest
+++ b/www-apps/metadot/Manifest
@@ -1,16 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac855f436614ae41195eaff4f8c0a127 metadot-6.1.6.ebuild 1389
-MD5 a07ddb01a24723baab457b2a02e40125 ChangeLog 1404
+MD5 1f1e2ed1d9e827c77cd3867e39d9b838 ChangeLog 1617
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
+MD5 c9a37af2564467a00713e9c3c6f960ef metadot-6.4_p1.ebuild 1730
+MD5 4d364e382fb8ea9bdc56917fc07c712f files/reconfig-6.4_p1 300
+MD5 d93311c38519df3fae207f71a2e32740 files/postinstall-en-6.4_p1.txt 1179
 MD5 04f2425090275b79624c2ef14ef107ff files/digest-metadot-6.1.6 65
 MD5 20d7f02a98e7e1bdd83cc868dc128863 files/postinstall-en-6.1.6.txt 1567
+MD5 51bec7b28e3566a165beee434dddcf84 files/digest-metadot-6.4_p1 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)
-
-iD8DBQFCxyooEzitwsaoONoRAnPUAKC2fmwqZFzDjnJRBN7K/1ulqGxUXgCgxvB+
-gHB4+gvPIa4Q43u7K7Lyxd8=
-=Ml+q
------END PGP SIGNATURE-----
diff --git a/www-apps/metadot/files/digest-metadot-6.4_p1 b/www-apps/metadot/files/digest-metadot-6.4_p1
new file mode 100644
index 000000000000..cd8382419a03
--- /dev/null
+++ b/www-apps/metadot/files/digest-metadot-6.4_p1
@@ -0,0 +1 @@
+MD5 cc8250f478c4f34c066c5dd4c881c962 metadot6.4r1.tar.gz 4036802
diff --git a/www-apps/metadot/files/metadot.conf b/www-apps/metadot/files/metadot.conf
new file mode 100644
index 000000000000..8dc1e5036944
--- /dev/null
+++ b/www-apps/metadot/files/metadot.conf
@@ -0,0 +1,20 @@
+<VirtualHost VHOST:80>
+	DocumentRoot "ROOTDIR/html"
+
+	<Directory "ROOTDIR/html">
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	Alias /images/  ROOTDIR/html/images/
+	Alias /js/  	ROOTDIR/html/js/
+	Alias /metadot/ ROOTDIR/metadot/
+	Alias /public/  ROOTDIR/sitedata/public/
+	Alias /skins/   ROOTDIR/sitedata/skins/
+
+	<Location "/metadot">
+		SetHandler perl-script
+		PerlHandler Apache::Registry
+		Options +ExecCGI
+	</Location>
+</VirtualHost>
diff --git a/www-apps/metadot/files/postinstall-en-6.4_p1.txt b/www-apps/metadot/files/postinstall-en-6.4_p1.txt
new file mode 100644
index 000000000000..1a12757f234d
--- /dev/null
+++ b/www-apps/metadot/files/postinstall-en-6.4_p1.txt
@@ -0,0 +1,34 @@
+
+1. Set up your database:
+cd ${MY_INSTALLDIR}/default_data
+If using MySQL-3*: mysql -uroot -p mysql < createdbanduser.sql
+If using MySQL-4*: mysql -uroot -p mysql < createdbanduser4x.sql
+
+Then change the default password:
+mysql -uroot -p mysql
+mysql> update user set password = password('<newpassword>') where user = 'metadot';
+mysql> flush privileges;
+mysql> quit
+
+Now,
+mysql -umetadot -p<newpassword> metadotdb < sampledata.sql
+
+2. Edit the Metadot configuration file:
+edit ${MY_INSTALLDIR}/etc/metadot.conf
+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 
+suit your needs.
+
+4. Configure cronjobs.
+Read the relevant section in the docs, and be sure to specify the right paths.
+HINT: /home/metadot is not used, everything is in ${MY_INSTALLDIR}
+
+5. Now go to http://${VHOST_HOSTNAME}/metadot/index.pl
+Hopefully everything worked. Now go read the docs and set up your Metadot, and
+change the default Admin password.
+
+Don't forget to read the online docs!!!
diff --git a/www-apps/metadot/files/reconfig-6.4_p1 b/www-apps/metadot/files/reconfig-6.4_p1
new file mode 100644
index 000000000000..15408e8d49ae
--- /dev/null
+++ b/www-apps/metadot/files/reconfig-6.4_p1
@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ $1 = "install" ]; then
+	sed -e "s|/home/metadot/metadot|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/etc/metadot.conf
+	# fix Apache configs
+	sed -e "s|ROOTDIR|${MY_INSTALLDIR}|g
+		s|VHOST|${VHOST_HOSTNAME}|" -i ${MY_SERVERCONFIGDIR}/metadot.conf
+	
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/metadot/metadot-6.4_p1.ebuild b/www-apps/metadot/metadot-6.4_p1.ebuild
new file mode 100644
index 000000000000..e562d48847b8
--- /dev/null
+++ b/www-apps/metadot/metadot-6.4_p1.ebuild
@@ -0,0 +1,71 @@
+# 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_p1.ebuild,v 1.1 2005/07/03 00:05:42 rl03 Exp $
+
+inherit webapp
+MY_P="${PN}6.4r1"
+S=${WORKDIR}/${PN}
+
+IUSE=""
+
+DESCRIPTION="Metadot is a CMS with file, page and link management, and collaboration features."
+HOMEPAGE="http://www.metadot.com"
+SRC_URI="http://download.metadot.com/${MY_P}.tar.gz"
+
+KEYWORDS="~x86"
+
+DEPEND="$DEPEND"
+RDEPEND="
+	${DEPEND}
+	>=dev-db/mysql-3.23
+	>=net-www/apache-1.3.6
+	>=dev-lang/perl-5.6
+	>=www-apache/mod_perl-1.21
+	dev-perl/DBI
+	>=dev-perl/DBD-mysql-2.1027
+	dev-perl/Apache-DBI
+	>=dev-perl/AppConfig-1.55
+	>=perl-core/ExtUtils-MakeMaker-6.05
+	>=dev-perl/XML-RSS-1.02
+	>=perl-core/Storable-2.07
+	dev-perl/perl-ldap
+	>=dev-perl/Log-Agent-0.304
+	dev-perl/Mail-POP3Client
+	>=dev-perl/IO-stringy-2.108
+	dev-perl/MailTools
+	dev-perl/MIME-tools
+	>=dev-perl/Msql-Mysql-modules-1.1835
+	>=dev-perl/Unicode-String-2.07
+	>=dev-perl/Spreadsheet-WriteExcel-0.41
+	>=dev-perl/Date-Calc-5.3
+	>=dev-perl/ImageSize-2.991
+	>=dev-perl/Template-Toolkit-2.09
+	>=perl-core/Time-HiRes-1.48
+	>=perl-core/Test-Harness-2.28
+	>=dev-perl/Test-Manifest-0.91
+	>=perl-core/Test-Simple-0.47
+	>=dev-perl/Lingua-EN-NameParse-1.18
+	>=dev-perl/Number-Format-1.45
+	>=dev-perl/XML-Simple-2.08
+	dev-perl/XML-Dumper
+	dev-perl/Archive-Zip
+	dev-perl/Text-CSV_XS
+"
+
+LICENSE="GPL-2"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG README
+	cp -R [[:lower:]][[:lower:]]* ${D}/${MY_HTDOCSDIR}
+
+	cp ${FILESDIR}/${PN}.conf ${D}/${MY_SERVERCONFIGDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}
+	webapp_serverowned ${MY_HTDOCSDIR}/sitedata/public
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PVR}.txt
+	webapp_hook_script ${FILESDIR}/reconfig-${PVR}
+	webapp_src_install
+}