cleaned orphaned, added new, stabled 0.40 on x86

(Portage version: 2.0.51.22-r1)

13 files changed, 21 insertions, 90 deletions

diff --git a/net-zope/zwiki/ChangeLog b/net-zope/zwiki/ChangeLog
index 914f71b99f36..f56a2538938a 100644
--- a/net-zope/zwiki/ChangeLog
+++ b/net-zope/zwiki/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-zope/zwiki
 # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.19 2005/04/03 17:43:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.20 2005/06/06 20:22:45 radek Exp $
+
+*zwiki-0.42 (06 Jun 2005)
+
+  06 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/zwiki-0.36.2-r1_xss.patch, -zwiki-0.22.0.ebuild,
+  -zwiki-0.34.0.ebuild, -zwiki-0.36.2.ebuild, -zwiki-0.36.2-r1.ebuild,
+  zwiki-0.40.ebuild, +zwiki-0.42.ebuild:
+  version bump 0.42
+  stable on x86 for 0.40
+  removed old versions
 
 *zwiki-0.40 (03 Apr 2005)
 
diff --git a/net-zope/zwiki/Manifest b/net-zope/zwiki/Manifest
index 4068374558c7..82412b440426 100644
--- a/net-zope/zwiki/Manifest
+++ b/net-zope/zwiki/Manifest
@@ -1,15 +1,8 @@
 MD5 45f730490932542b23d6064ac9763be6 zwiki-0.37.ebuild 483
-MD5 e004a3278335bd505ea336a6944fb9e0 zwiki-0.36.2.ebuild 484
-MD5 e90402136b0d7d9d977f599d68eaaf45 zwiki-0.22.0.ebuild 536
-MD5 bb3f716142f1079e74c5ce8b706db159 zwiki-0.40.ebuild 484
-MD5 53c49ae06953c67d46da1fe56da500c7 zwiki-0.36.2-r1.ebuild 584
-MD5 9e0502bd692ee63fe745dcfd67abdc03 zwiki-0.34.0.ebuild 483
-MD5 de9816010d640ad442486fd4f6c6f1a4 ChangeLog 2591
+MD5 b868833e2dbae3a0e107fa7576363a3b zwiki-0.40.ebuild 483
+MD5 3426a7bc9d42e2baa58ef605f63d99db zwiki-0.42.ebuild 509
+MD5 e94874a05216ead51624cb4342fdc21f ChangeLog 2911
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 5d791e4f82204b1751573082d6a9e948 files/zwiki-0.36.2-r1_xss.patch 411
 MD5 c5e330ddedbbbd8b06f8d6176cd3f786 files/digest-zwiki-0.37 61
 MD5 1439cea48c2d0dbe1025001a943c8e44 files/digest-zwiki-0.40 61
-MD5 d7ce8db3eeb8d6d5a8726ca5ac0b4e71 files/digest-zwiki-0.22.0 61
-MD5 f398443ae6d299e3b39e5b02f184f5cf files/digest-zwiki-0.34.0 61
-MD5 3077f48eea50c5e8420c3a72377845e2 files/digest-zwiki-0.36.2 61
-MD5 3077f48eea50c5e8420c3a72377845e2 files/digest-zwiki-0.36.2-r1 61
+MD5 90bd04a9986ba84814ce22ce2fce69e9 files/digest-zwiki-0.42 61
diff --git a/net-zope/zwiki/files/digest-zwiki-0.22.0 b/net-zope/zwiki/files/digest-zwiki-0.22.0
deleted file mode 100644
index 6cfcd695d1dc..000000000000
--- a/net-zope/zwiki/files/digest-zwiki-0.22.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a537c8c8d4243a10b35b75558b24536 ZWiki-0.22.0.tgz 170912
diff --git a/net-zope/zwiki/files/digest-zwiki-0.34.0 b/net-zope/zwiki/files/digest-zwiki-0.34.0
deleted file mode 100644
index 69c077787582..000000000000
--- a/net-zope/zwiki/files/digest-zwiki-0.34.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1342f279b1187044e992de0ec740321 ZWiki-0.34.0.tgz 378830
diff --git a/net-zope/zwiki/files/digest-zwiki-0.36.2 b/net-zope/zwiki/files/digest-zwiki-0.36.2
deleted file mode 100644
index 1f7e35824914..000000000000
--- a/net-zope/zwiki/files/digest-zwiki-0.36.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ef81f0e8c788ff9a78271f7a5315793 ZWiki-0.36.2.tgz 413970
diff --git a/net-zope/zwiki/files/digest-zwiki-0.36.2-r1 b/net-zope/zwiki/files/digest-zwiki-0.36.2-r1
deleted file mode 100644
index 1f7e35824914..000000000000
--- a/net-zope/zwiki/files/digest-zwiki-0.36.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ef81f0e8c788ff9a78271f7a5315793 ZWiki-0.36.2.tgz 413970
diff --git a/net-zope/zwiki/files/digest-zwiki-0.42 b/net-zope/zwiki/files/digest-zwiki-0.42
new file mode 100644
index 000000000000..5f5f8f4eb298
--- /dev/null
+++ b/net-zope/zwiki/files/digest-zwiki-0.42
@@ -0,0 +1 @@
+MD5 9ada98d01e3e81bea97e1d83dad7e815 ZWiki-0.42.0.tgz 495998
diff --git a/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch b/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch
deleted file mode 100644
index 4c3caba66c3e..000000000000
--- a/net-zope/zwiki/files/zwiki-0.36.2-r1_xss.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/basic/standard_error_message.dtml.original        Fri Nov 26 09:17:22 2004
-+++ content/basic/standard_error_message.dtml Fri Nov 26 09:17:55 2004
-@@ -29,7 +29,7 @@
-   <body>
-     <p>
-       I could not find any likely page matching 
--      "<b><dtml-var "here.urlunquote(searchexpr)"></b>"
-+      "<b><dtml-var "here.urlunquote(searchexpr)" html_quote></b>"
-     </p>
-     <p>
-       Click here to 
diff --git a/net-zope/zwiki/zwiki-0.22.0.ebuild b/net-zope/zwiki/zwiki-0.22.0.ebuild
deleted file mode 100644
index 840f89c6c2dc..000000000000
--- a/net-zope/zwiki/zwiki-0.22.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.22.0.ebuild,v 1.5 2005/01/14 23:03:10 radek Exp $
-
-inherit zproduct
-
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
-HOMEPAGE="http://zwiki.org/"
-SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.tgz
-	http://www.zope.org/Members/simon/ZWiki/ZWiki-${PV}.tgz"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
-
-IUSE=""
diff --git a/net-zope/zwiki/zwiki-0.34.0.ebuild b/net-zope/zwiki/zwiki-0.34.0.ebuild
deleted file mode 100644
index 7291fb74c7ef..000000000000
--- a/net-zope/zwiki/zwiki-0.34.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.34.0.ebuild,v 1.4 2005/01/14 23:03:10 radek Exp $
-
-inherit zproduct
-
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
-HOMEPAGE="http://zwiki.org"
-SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
-
-IUSE=""
diff --git a/net-zope/zwiki/zwiki-0.36.2-r1.ebuild b/net-zope/zwiki/zwiki-0.36.2-r1.ebuild
deleted file mode 100644
index e75b5cfb2ca6..000000000000
--- a/net-zope/zwiki/zwiki-0.36.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.36.2-r1.ebuild,v 1.3 2005/01/14 23:03:10 radek Exp $
-
-inherit zproduct eutils
-
-DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
-HOMEPAGE="http://zwiki.org"
-SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
-
-IUSE=""
-
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/${ZPROD_LIST}
-	epatch ${FILESDIR}/${PF}_xss.patch
-}
diff --git a/net-zope/zwiki/zwiki-0.40.ebuild b/net-zope/zwiki/zwiki-0.40.ebuild
index 4fdc5a840644..dbfed64c32fc 100644
--- a/net-zope/zwiki/zwiki-0.40.ebuild
+++ b/net-zope/zwiki/zwiki-0.40.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/net-zope/zwiki/zwiki-0.40.ebuild,v 1.1 2005/04/03 17:43:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.40.ebuild,v 1.2 2005/06/06 20:22:45 radek Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="ZWiki"
 MYDOC="ChangeLog GPL.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.36.2.ebuild b/net-zope/zwiki/zwiki-0.42.ebuild
index 7d6a7dbde2a5..c5cb06c67610 100644
--- a/net-zope/zwiki/zwiki-0.36.2.ebuild
+++ b/net-zope/zwiki/zwiki-0.42.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.36.2.ebuild,v 1.2 2005/01/14 23:03:10 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.42.ebuild,v 1.1 2005/06/06 20:22:45 radek Exp $
 
 inherit zproduct
 
 DESCRIPTION="A zope wiki-clone for easy-to-edit collaborative websites."
 HOMEPAGE="http://zwiki.org"
-SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.tgz"
+SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="ZWiki"
-MYDOC="ChangeLog GPL.txt ${MYDOC}"
+MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
 
 IUSE=""