Version bump.

Package-Manager: portage-15152-svn/cvs/Linux x86_64

4 files changed, 168 insertions, 2 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 8f28a45910d5..b25aebf4815e 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/zope
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.161 2009/12/13 18:18:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.162 2009/12/24 20:21:32 arfrever Exp $
+
+*zope-2.12.2 (24 Dec 2009)
+
+  24 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +zope-2.12.2.ebuild, +files/zope-2.12.2-fix_syntax_error.patch:
+  Version bump.
 
 *zope-2.12.1 (13 Dec 2009)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index dd9a26e65c80..f1a1aa84ce02 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,5 +1,6 @@
 AUX CVE-2009-0668+0669.patch 4297 RMD160 6b207296cf9d8785fd8e41c7bbed1695c4712e4b SHA1 1a9535b295353fb70464095818b68beba88cc288 SHA256 c8cd316c2ce4821c127c78b72e73e9b3f0211d0959105c780a1a16903d0b4c08
 AUX zope-2.12.1-fix_build.patch 971 RMD160 5e290c76ec22b3f40cc8c2e38bb6fe8246e070f4 SHA1 2b37dc9d2e1d385686f3123caa67f5a05eb32637 SHA256 d8fd1faecc0dfd5d2884b67c54814fdec64cb3193857aceaa146360af8a702dd
+AUX zope-2.12.2-fix_syntax_error.patch 614 RMD160 6be759d460561658d41c2011d1b0bed7ffd41709 SHA1 993780367e8389b6b48bd3f1d9d1dbd08f192531 SHA256 ca0763b7c8db4686e37bb240cd87c137899457ef42cd2240ac4f155762c2e50b
 AUX zope.initd 1317 RMD160 39fa98ed8cbc703cd77238d345328430e39bddd4 SHA1 6215743f7d108fa3e668cf24d748ad19d68faeab SHA256 1a3a03ef186fbdfd566023cf3fbb311f03214c51021b3af628b3233704838506
 DIST Zope-2.10.7-final.tgz 7269082 RMD160 5a9123ab70d9fac6101bdfcdc2141dd10b4d7c41 SHA1 94bb8c2ff13345fc16052c4f6b3ef585f3f90f9e SHA256 bedcd85d859839f2390ebe80c4b2cd4442d31210f317d056d9998cc4f6df87cd
 DIST Zope-2.10.9-final.tgz 7189195 RMD160 6c4605546ac48f493d85fadd01fea523140a9e31 SHA1 b479ae514e578ade826ab5237786677647b8b65e SHA256 32c172e11b56af85dc6192e6ae5d02218e39e6399017dbb035f94e7c213b43f1
@@ -7,13 +8,15 @@ DIST Zope-2.9.10-final.tgz 7060210 RMD160 56bf67c05c2ef588844a2fb2140ac244565e3b
 DIST Zope-3.2.2.tgz 6544087 RMD160 1e7e08e1178f449bf120d7fc2caa6259fde1a0cf SHA1 9bd3c099fc77f981a8b803770aca168eb813e260 SHA256 c6f6d49d8b910bc35a32b848c6296b7ad61cb64f83974b52dd3623169f141ba4
 DIST Zope-3.3.1.tgz 6594248 RMD160 11bf3b8c899518a5965f21a4a372912a4bc1438d SHA1 4576ac21c3415563d3b0b747e40963a762b63fce SHA256 6189999de3190e4b0d5110490567d9f7ef92379ea555f738fc741d49d0807be3
 DIST Zope2-2.12.1.tar.gz 1952771 RMD160 f43e4fc983c02a7c6c43087fdd0479c8157804f6 SHA1 3973388f34e67340470499405ca54c6458cb82e4 SHA256 fb60c750b17d55d9d75f2c4d92a90c0324212f3d5982616cbb946f7f826b1a60
+DIST Zope2-2.12.2.tar.gz 1954193 RMD160 1e18e9650f11ba1c1e3facd18ae9bbbee6cdf50c SHA1 4b86ff82dac5e932e17f3f3dd9ce69f6d1951177 SHA256 2a9e15c721561f42ff66b587eaee7c6c93a74b65430e57f75a6661ab9a27dd6a
 EBUILD zope-2.10.7-r1.ebuild 2419 RMD160 a8eacc97fc3ec0d837e130c19b6160c51087054f SHA1 6cb14047b90e25b36582dc1b77296fd7033a1421 SHA256 b9fc3ccc0f925043e4999bc40d077ac3f927987fb72a4e2db3c1d2e9dac78f69
 EBUILD zope-2.10.7.ebuild 2378 RMD160 b5aec5e9ff6fc8081dff21d3ab5049929922712d SHA1 8a7d41e475abb6efd60b1212e8520f862d804f8b SHA256 641c43f253d26a75a926283f5a5c8dadc65797cf605984b5d1b185c1161e8845
 EBUILD zope-2.10.9.ebuild 2337 RMD160 7c7c5d215a96ecad33a10810e0d9c8e1d9dd9400 SHA1 b371ad3c5bfac6492b9c2c8483e3a00d60da3d3d SHA256 1dcd78b0751013e7b50fa9364ff2cf362a11046a7b824681c10395444cfc4889
 EBUILD zope-2.12.1.ebuild 4060 RMD160 573d11ddc8a10d457fcb91bce4c645109856b26a SHA1 0b601f90208b7e63f4f6e87100090e7b1da1b78f SHA256 c365a83b0a454abca61705e6a012cb0785ec55f313d545c599b386d2da546639
+EBUILD zope-2.12.2.ebuild 4047 RMD160 f2c5bf95193d345c7e81bd2c8f2baeb2fb6679fc SHA1 7c7525c5e07ef22109c647c860410da52529b0a0 SHA256 cc8700ba4e166a6d365407aaa68a16f738891f0fb62b29200dfa6b48fcaab02f
 EBUILD zope-2.9.10-r1.ebuild 2439 RMD160 4d893fe82971f3d3a6b5bf47873c272ec732329b SHA1 930744cecdff3eed82705332bb505b9d5abbf486 SHA256 057741f43d33bd395e4bf69a1706931c5dcae18cd4f5e7e94d849a85dcde6345
 EBUILD zope-2.9.10.ebuild 2397 RMD160 e33501ae1658b572c23e9383492215c2af0cc5b1 SHA1 fabcdb45cce3c0ae12e3f77e12a2122f409f13ec SHA256 c2ccd01a1e47987ef0a82c2803decdb85bc189e955b2c6c6c62186c897164a04
 EBUILD zope-3.2.2.ebuild 3624 RMD160 e74adaedc41a265b71fd583d87b6f33b34448c0a SHA1 5632e19dc545b80c4ebe734119d81c39fe2b101e SHA256 82e0e16be113e8e2c7f4ca11ef1fa3dc24b96ca4a65161909c4c58999779d57d
 EBUILD zope-3.3.1.ebuild 3429 RMD160 4951ab3da1c9adc918f0a093a4bfac6deceba2b5 SHA1 5aefef7e3cf1cfc22674510ec6c78b4d8bcc6448 SHA256 7cc2aa03f0e77a65a6fc93aa01755a7eb41de30384366fd963172389606cc139
-MISC ChangeLog 24921 RMD160 16b6d97cb00abcb027f5539b692e35696f640a89 SHA1 b2601912983de8611d9e3b60a64a411349437c1a SHA256 0712d772da3e2fc37cb0cc46e21efabe670bcdf4aa70c28fb67b5c6e04a269db
+MISC ChangeLog 25105 RMD160 410f766add123fe9a217de61d9f8ea9388807e5e SHA1 c2b0e0f726f88e14fdd9a69a6972b5e950aae75e SHA256 59c260425b417ec09b8381c073f671695bea37aef26fc9eade74a326479cc24e
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
diff --git a/net-zope/zope/files/zope-2.12.2-fix_syntax_error.patch b/net-zope/zope/files/zope-2.12.2-fix_syntax_error.patch
new file mode 100644
index 000000000000..ced341591c3a
--- /dev/null
+++ b/net-zope/zope/files/zope-2.12.2-fix_syntax_error.patch
@@ -0,0 +1,15 @@
+http://svn.zope.org/?rev=106985&view=rev
+
+--- src/Zope2/utilities/load_site.py
++++ src/Zope2/utilities/load_site.py
+@@ -245,8 +245,8 @@
+             body = ("<!--#var standard_html_header-->\n\n" +
+                     body + "\n\n<!--#var standard_html_footer-->")
+         else:
+-            body = ("<html><head><title><dtml-var title_or_id></title>
+-                     </head><body bgcolor="#FFFFFF">\n\n" +
++            body = ("<html><head><title><dtml-var title_or_id></title>"
++                    "</head><body bgcolor=\"#FFFFFF\">\n\n" +
+                      body + "\n\n</body></html>")
+ 
+     else:
diff --git a/net-zope/zope/zope-2.12.2.ebuild b/net-zope/zope/zope-2.12.2.ebuild
new file mode 100644
index 000000000000..206d61082f21
--- /dev/null
+++ b/net-zope/zope/zope-2.12.2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.12.2.ebuild,v 1.1 2009/12/24 20:21:32 arfrever Exp $
+
+EAPI="2"
+
+inherit eutils multilib python versionator
+
+MY_PN="Zope2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
+HOMEPAGE="http://www.zope.org http://pypi.python.org/pypi/Zope2"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64"
+IUSE="doc"
+RESTRICT="test"
+
+RDEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-python/docutils
+	dev-python/restrictedpython
+	dev-python/setuptools
+	net-zope/acquisition
+	net-zope/datetime
+	net-zope/extensionclass
+	net-zope/persistence
+	net-zope/tempstorage
+	net-zope/transaction
+	net-zope/zdaemon
+	net-zope/zconfig
+	net-zope/zlog
+	>=net-zope/zodb-3.9
+	net-zope/zope-app-form
+	net-zope/zope-app-publication
+	net-zope/zope-app-publisher
+	net-zope/zope-app-schema
+	net-zope/zope-component
+	net-zope/zope-configuration
+	net-zope/zope-container
+	net-zope/zope-contentprovider
+	net-zope/zope-contenttype
+	net-zope/zope-deferredimport
+	net-zope/zope-event
+	net-zope/zope-exceptions
+	net-zope/zope-formlib
+	net-zope/zope-i18n
+	net-zope/zope-i18nmessageid
+	net-zope/zope-interface
+	net-zope/zope-lifecycleevent
+	net-zope/zope-location
+	net-zope/zope-pagetemplate
+	net-zope/zope-processlifetime
+	net-zope/zope-proxy
+	net-zope/zope-publisher
+	net-zope/zope-schema
+	net-zope/zope-security
+	net-zope/zope-sendmail
+	net-zope/zope-sequencesort
+	net-zope/zope-site
+	net-zope/zope-size
+	net-zope/zope-structuredtext
+	net-zope/zope-tales
+	net-zope/zope-testbrowser
+	net-zope/zope-testing
+	net-zope/zope-traversing
+	net-zope/zope-viewlet
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+S="${WORKDIR}/${MY_P}"
+
+ZUID="zope"
+ZGID="zope"
+
+ZSERVDIR="/usr/$(get_libdir)/${PN}-${SLOT}"
+
+# Narrow the scope of ownership/permissions.
+# Security plan:
+# * ZUID is the superuser for all zope instances.
+# * ZGID is for a single instance's administration.
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_syntax_error.patch"
+}
+
+src_compile() {
+	"$(PYTHON -2)" setup.py build || "Building failed"
+
+	if use doc; then
+		cd doc
+		emake html || die "Building of documentation failed"
+	fi
+}
+
+src_install() {
+	"$(PYTHON -2)" setup.py install --home="${ZSERVDIR}" --root="${D}" || die "Installation failed"
+	dosym "$(PYTHON -2 -a)" "${ZSERVDIR}/bin/python" || die "dosym failed"
+
+	for file in "${D}usr/$(get_libdir)/${PN}-${SLOT}/bin/"*; do
+		if [[ -f "${file}" && ! -L "${file}" ]]; then
+			sed -e '/import sys/iimport os\nos.environ["PYTHONPATH"] = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "lib", "python"))' -e '/import sys/asys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "lib", "python")))' -i "${file}" || die "Changing of os.environ and sys.path in ${file} failed"
+		fi
+	done
+
+	touch "${D}usr/$(get_libdir)/${PN}-${SLOT}/lib/python/Products/__init__.py" || die "touch failed"
+
+	if use doc; then
+		pushd doc/.build/html > /dev/null
+		dodoc _sources/* || die "Installation of documentation failed"
+		docinto html
+		dohtml -r [A-Za-z]* _static || die "Installation of documentation failed"
+		popd > /dev/null
+	fi
+
+	# Copy the init script skeleton to skel directory of our installation.
+	insinto "${ZSERVDIR}/skel"
+	doins "${FILESDIR}/zope.initd" || die "doins failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ZSERVDIR}/lib/python"
+
+	# Create the zope user and group for backward compatibility.
+	enewgroup ${ZGID} 261
+	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
+	enewuser ${ZUID} 261 -1 /var/$(get_libdir)/zope  ${ZGID}
+
+	einfo "Be warned that you need at least one zope instance to run zope."
+	einfo "Please emerge zope-config for further instance management."
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ZSERVDIR}/lib/python"
+}