Fixes bug #113827.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 46 insertions, 20 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index ca94855c5dbe..a82c7645df66 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.9 2005/08/28 23:38:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.10 2005/12/03 23:17:02 rl03 Exp $
+
+*moinmoin-1.3.5-r1 (03 Dec 2005)
+
+  03 Dec 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2,
+  -moinmoin-1.3.5.ebuild, +moinmoin-1.3.5-r1.ebuild:
+  Fixes bug #113827.
 
 *moinmoin-1.3.5 (28 Aug 2005)
 
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 3503fa6b4a7f..67f129da2862 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -4,21 +4,22 @@ Hash: SHA1
 MD5 77013058e89d7f7fbb52a276f071b95d moinmoin-1.2.3-r1.ebuild 1040
 MD5 1e73d40d888212699794efd23c42a5a5 moinmoin-1.2.3.ebuild 1323
 MD5 074fafad23e03d29c5d50539860bcfcf moinmoin-1.3.3.ebuild 1401
-MD5 85972b19c4ecbd63ec8df8a9486b1c05 ChangeLog 3249
+MD5 ce14ae1643b639cb8f0351eec75b3004 ChangeLog 3424
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 803c1dd135efc6b751540bf48cae1ca6 moinmoin-1.2.2.ebuild 1323
-MD5 cf080d8113cb7e26004a242f388b2eed moinmoin-1.3.5.ebuild 1638
+MD5 433cde73049ddc005366d7dc79ebc4bc moinmoin-1.3.5-r1.ebuild 1773
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3-r1 63
+MD5 4b756ef0b0c4eb10b5b2646ce792c0dc files/digest-moinmoin-1.3.5-r1 63
 MD5 6fb347eae42824c20e1dac8cd73f0ce6 files/postinstall-en.txt 808
+MD5 929e3e71ef7af009d9f289c33c382026 files/reconfig-2 421
 MD5 986a7f0ef30ca0797647e0723b3ed041 files/reconfig 251
 MD5 9f892950e59827ee9c7a8a082a880bd2 files/digest-moinmoin-1.2.2 63
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
 MD5 4a15b460b1bb9ff77b8b08e71a0f1f14 files/digest-moinmoin-1.3.3 63
-MD5 4b756ef0b0c4eb10b5b2646ce792c0dc files/digest-moinmoin-1.3.5 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDEkr+EzitwsaoONoRAshXAJ9MtScVHKp2hl2HldPferbIQSxqCQCfSJ6l
-MEnZHC8F5vAV8FR/1qtK8OU=
-=R9X+
+iD8DBQFDkid5EzitwsaoONoRAoYWAKCUS8McYT/I1pyTJR9g5oK8ybJJrwCg2Xgk
+pUJfZuBAShqTJPqLdHwuosE=
+=NllV
 -----END PGP SIGNATURE-----
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.3.5 b/www-apps/moinmoin/files/digest-moinmoin-1.3.5-r1
index bc593c1b1767..bc593c1b1767 100644
--- a/www-apps/moinmoin/files/digest-moinmoin-1.3.5
+++ b/www-apps/moinmoin/files/digest-moinmoin-1.3.5-r1
diff --git a/www-apps/moinmoin/files/reconfig-2 b/www-apps/moinmoin/files/reconfig-2
new file mode 100644
index 000000000000..57039bb766bc
--- /dev/null
+++ b/www-apps/moinmoin/files/reconfig-2
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
+if [ $1 = "install" ]; then
+	sed -e "s|/path/to/wikiconfig|${VHOST_ROOT}/${PN}-${PVR}|g" -i ${MY_INSTALLDIR}/moin.cgi || die "sed failed"
+	sed -e "s|\./data/|${VHOST_ROOT}/${PN}-${PVR}/data|
+			s|\./underlay/|${VHOST_ROOT}/${PN}-${PVR}/underlay|" -i ${VHOST_ROOT}/${PN}-${PVR}/wikiconfig.py || die "sed failed"
+
+elif [ $1 = "clean" ]; then
+	echo $1
+fi
diff --git a/www-apps/moinmoin/moinmoin-1.3.5.ebuild b/www-apps/moinmoin/moinmoin-1.3.5-r1.ebuild
index 1abae69a33b8..71108f094bf1 100644
--- a/www-apps/moinmoin/moinmoin-1.3.5.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.3.5-r1.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/moinmoin/moinmoin-1.3.5.ebuild,v 1.1 2005/08/28 23:38:26 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.3.5-r1.ebuild,v 1.1 2005/12/03 23:17:02 rl03 Exp $
 
 inherit webapp
 
@@ -20,7 +20,7 @@ WEBAPP_MANUAL_SLOT="yes"
 DEPEND=">=dev-lang/python-2.2"
 RDEPEND="${DEPEND}
 	rss? ( >=dev-python/pyxml-0.8.4 )
-	!<www-apps/moinmoin-1.3.5"
+	!<www-apps/moinmoin-1.3.5-r1"
 
 src_compile() {
 	python setup.py build || die "python build failed"
@@ -33,21 +33,23 @@ src_install () {
 
 	dodoc ChangeLog README docs/CHANGES docs/README.migration
 	dohtml docs/INSTALL.html docs/UPDATE.html
+	dodir ${MY_HOSTROOTDIR}/${PF}
+
 	cd ${D}/usr/share/moin
-	cp -r data underlay htdocs/* server/moin.cgi config/wikiconfig.py \
-		${D}/${MY_HTDOCSDIR}
-	cp -r config ${D}/${MY_HTDOCSDIR}/altconfigs
-	cp -r server ${D}/${MY_HTDOCSDIR}/altserver
-	cd ${D}/${MY_HTDOCSDIR}
+	cp -r htdocs/* server/moin.cgi ${D}/${MY_HTDOCSDIR}
+	chmod +x ${D}/${MY_HTDOCSDIR}/moin.cgi
+	cp -r data underlay config/wikiconfig.py ${D}/${MY_HOSTROOTDIR}/${PF}
+	cp -r config ${D}/${MY_HOSTROOTDIR}/${PF}/altconfigs
+	cp -r server ${D}/${MY_HOSTROOTDIR}/${PF}/altserver
 
 	# data needs to be serverowned per moin devs
-	for file in `find data underlay`; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	cd ${D}/${MY_HOSTROOTDIR}/${PF}
+	for file in $(find data underlay); do
+		webapp_serverowned "${MY_HOSTROOTDIR}/${PF}/${file}"
 	done
-	chmod +x moin.cgi
 
-	webapp_configfile ${MY_HTDOCSDIR}/wikiconfig.py
-	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_configfile ${MY_HOSTROOTDIR}/${PF}/wikiconfig.py
+	webapp_hook_script ${FILESDIR}/reconfig-2
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
 
 	webapp_src_install
@@ -55,6 +57,6 @@ src_install () {
 
 pkg_postinst() {
 	ewarn "If you are upgrading from 1.2.x to 1.3.x, please read"
-	ewarn "/usr/share/doc/${P}/README.migration.gz"
+	ewarn "/usr/share/doc/${PF}/README.migration.gz"
 	webapp_pkg_postinst
 }