Version bump, masked in package.mask

Package-Manager: portage-2.0.51-r15

7 files changed, 73 insertions, 23 deletions

diff --git a/www-apps/moinmoin/ChangeLog b/www-apps/moinmoin/ChangeLog
index 1757f693bf9f..2fb91430d63a 100644
--- a/www-apps/moinmoin/ChangeLog
+++ b/www-apps/moinmoin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/moinmoin
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.5 2004/09/05 08:49:08 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/ChangeLog,v 1.6 2005/02/08 18:14:14 g2boojum Exp $
+
+*moinmoin-1.3.3 (08 Feb 2005)
+
+  08 Feb 2005; Grant Goodyear <g2boojum@gentoo.org> +moinmoin-1.3.3.ebuild:
+  Version bump, needs serious testing.  Hopefully bugs will be 
+  added to bug 74939.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-apps/moinmoin/Manifest b/www-apps/moinmoin/Manifest
index 461c2eabded3..77ba94786f0e 100644
--- a/www-apps/moinmoin/Manifest
+++ b/www-apps/moinmoin/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 14d9efb8049d47b5b2d2e96c13467712 ChangeLog 2797
 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
-MD5 445085f64756d21d4dff9caabdb12eb2 moinmoin-1.2.2.ebuild 1323
-MD5 9aa5b9b6f840bec83eaf15743fd18223 moinmoin-1.2.3.ebuild 1323
-MD5 6b985f02a6da2c47e44fcd29ebade830 moinmoin-1.2.3-r1.ebuild 1036
-MD5 ca346a996dde428941a72197de1889bd ChangeLog 2603
+MD5 803c1dd135efc6b751540bf48cae1ca6 moinmoin-1.2.2.ebuild 1323
+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 9f892950e59827ee9c7a8a082a880bd2 files/digest-moinmoin-1.2.2 63
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3 63
-MD5 87c3c30ece7ca607f5cd419d0e2e9538 files/postinstall-en.txt 353
 MD5 83ae27d75112afb66a2d5d1319ba9874 files/digest-moinmoin-1.2.3-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBOtMKI1lqEGTUzyQRAqE9AKChsZVZckL3ET/QBI0tQeZYVZAg8gCfWbxD
-kKbcNVzOntANpf2ge2eGtkE=
-=ko3G
------END PGP SIGNATURE-----
+MD5 87c3c30ece7ca607f5cd419d0e2e9538 files/postinstall-en.txt 353
+MD5 4a15b460b1bb9ff77b8b08e71a0f1f14 files/digest-moinmoin-1.3.3 63
diff --git a/www-apps/moinmoin/files/digest-moinmoin-1.3.3 b/www-apps/moinmoin/files/digest-moinmoin-1.3.3
new file mode 100644
index 000000000000..5ba906c51b38
--- /dev/null
+++ b/www-apps/moinmoin/files/digest-moinmoin-1.3.3
@@ -0,0 +1 @@
+MD5 21ea942a180845115bf58fc6ed1d5479 moin-1.3.3.tar.gz 3049108
diff --git a/www-apps/moinmoin/moinmoin-1.2.2.ebuild b/www-apps/moinmoin/moinmoin-1.2.2.ebuild
index 294f7f70c09e..bd76c698ada1 100644
--- a/www-apps/moinmoin/moinmoin-1.2.2.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.2.ebuild,v 1.2 2004/09/03 17:17:20 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.2.ebuild,v 1.3 2005/02/08 18:14:14 g2boojum Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild b/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild
index 0ff48001f257..260ac22bf936 100644
--- a/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.3-r1.ebuild,v 1.1 2004/08/27 22:04:04 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.3-r1.ebuild,v 1.2 2005/02/08 18:14:14 g2boojum Exp $
 
 inherit webapp
 
diff --git a/www-apps/moinmoin/moinmoin-1.2.3.ebuild b/www-apps/moinmoin/moinmoin-1.2.3.ebuild
index 4c12336335a8..1eadfda402ba 100644
--- a/www-apps/moinmoin/moinmoin-1.2.3.ebuild
+++ b/www-apps/moinmoin/moinmoin-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.2.3.ebuild,v 1.2 2004/09/03 17:17:20 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/moinmoin/moinmoin-1.2.3.ebuild,v 1.3 2005/02/08 18:14:14 g2boojum Exp $
 
 inherit webapp-apache
 
diff --git a/www-apps/moinmoin/moinmoin-1.3.3.ebuild b/www-apps/moinmoin/moinmoin-1.3.3.ebuild
new file mode 100644
index 000000000000..2b613f7ca0fe
--- /dev/null
+++ b/www-apps/moinmoin/moinmoin-1.3.3.ebuild
@@ -0,0 +1,51 @@
+# 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.3.ebuild,v 1.1 2005/02/08 18:14:14 g2boojum Exp $
+
+inherit webapp
+
+PN0="moin"
+S=${WORKDIR}/${PN0}-${PV}
+
+DESCRIPTION="Python WikiClone"
+SRC_URI="http://download.sourceforge.net/${PN0}/${PN0}-${PV}.tar.gz"
+HOMEPAGE="http://moin.sourceforge.net"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.2"
+
+src_compile() {
+	python setup.py build || die "python build failed"
+}
+
+src_install () {
+	webapp_src_preinst
+
+	python setup.py install --root=${D} --prefix=/usr install || die "python install failed"
+
+	dodoc CHANGES COPYING ChangeLog INSTALL.html LICENSE.Python \
+		README README.migration UPDATE.html
+	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}
+
+	# data needs to be serverowned per moin devs
+	for file in `find data`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	done
+	chmod +x moin.cgi
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_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"
+}