Version bump.

Package-Manager: portage-2.2.0_alpha32_p7/cvs/Linux x86_64

3 files changed, 183 insertions, 17 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 1d46825db528..6a9a87cde8c6 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/zope
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.198 2011/04/03 19:47:47 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.199 2011/05/09 23:35:35 arfrever Exp $
+
+*zope-2.12.18 (09 May 2011)
+
+  09 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +zope-2.12.18.ebuild:
+  Version bump.
 
 *zope-2.13.6 (03 Apr 2011)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 579c52807646..8e82af04cfce 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -10,16 +10,16 @@ DIST Zope-2.9.10-final.tgz 7060210 RMD160 56bf67c05c2ef588844a2fb2140ac244565e3b
 DIST Zope-2.9.12-final.tgz 7088973 RMD160 c5095d988a745b9929a28a816b78a147f858b262 SHA1 673555c832c52d52ca29e1f9f10425ce13630897 SHA256 38aadbbaad940727a39080ef1f6de1d6a47dd77e4525e37b8abcc920e03b7802
 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.16.zip 2337466 RMD160 12222234feaa122dabcc30346daf3464e8367efc SHA1 18096e6af5506c11743866166009b0c86dc5e0f8 SHA256 220f5658123afe1b042a1a2815e348ac82471e67cfd97a328d2be4113cbe8480
 DIST Zope2-2.12.17.zip 2337323 RMD160 4d30fb5b878819719beb34f205418b7d02c4f781 SHA1 52242f8c9fd992b0c8f39f39ac08265d9690bcb6 SHA256 afd20b6c081852b4c7b67459ebb31208ae5ca8473aa9d0c7bfce916131503753
+DIST Zope2-2.12.18.zip 2337399 RMD160 3154a51f124f80a347b07554ffdbd317d198bb05 SHA1 e39be58cd96312f95270ff01d6d2ed612e9d1e7e SHA256 93226698312dac2ef616477b8217e86c6195d8a1cf1ee05beb252336ec9c254d
 DIST Zope2-2.13.5.zip 1391823 RMD160 cb262f7d61c0b1074972b1fda26539f14c9d6b00 SHA1 ec7ed9a61467aaccafda7cc2ca417c69e9215041 SHA256 42ca962ca425638e69d136a75105a3bc58dd8a3d842d2a9e59d502a28042b78e
 DIST Zope2-2.13.6.zip 1392634 RMD160 5017a17aeb7311c7c7c7eaffeb0255c938ef7f04 SHA1 9b14cc7204a47f5f11d87ca6bf6bb386a5e4f38c SHA256 98d13a17b644ebe2b6e8b90a15c991ce31bd6fd8f52fc722e07a61772c0197bc
 EBUILD zope-2.10.11.ebuild 2334 RMD160 5628a00cce8b9dfcd847049528cc13c6c41c401d SHA1 1fabddbc3731fc9cb9344fe05970cbf5f14d8438 SHA256 ec30cd035f75578d46a9588a50c973abdad2eb54a8a0d8e2f6914a2a9cccb7d9
 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.16.ebuild 4958 RMD160 53648fc6b7979d81f86ced4c14d4ce215963bc3f SHA1 79634547e285cb17e24603ecb8f6c049bd39ba26 SHA256 9a9a6e5da8dcf1064ac5717453134b2704f97f68c6759e71836e5410a522b3d5
 EBUILD zope-2.12.17.ebuild 4981 RMD160 41ce80f46d0099ecaedb64279ad6fd2638cdcc02 SHA1 9ebe01ce5cc6cea4d814621bac097442c06d2450 SHA256 85998c31d9866914511f959d18f90c6af28b3e0e70d79e18386f5611bf7ead25
+EBUILD zope-2.12.18.ebuild 4981 RMD160 b71b1ef819281d86b826ed17b3798fcd8dc40461 SHA1 6bed55bb80aee7bf61a34fdcaa16d08f1f587c53 SHA256 88fb37921fe145d90652f9df202232d9b718abe6e3e0f86ac34b425a1cb68072
 EBUILD zope-2.13.5.ebuild 5100 RMD160 ef1ebac004928b09c330b0ecf96f8221ef54e9c1 SHA1 c165d04e9d5e42860fe5b13bc7517ec77c2d9fd4 SHA256 8408b703c3628cef90de18938e1ba0f63d7e649a98e9f1a5a3c9956baf186949
 EBUILD zope-2.13.6.ebuild 5123 RMD160 85ad3dfd2b58a0c824c1c7e378a931d8c4dc749c SHA1 a175800b97308f419f19f6187c8599f3f34c9094 SHA256 b0451d8924135828076de8568d5b43b74436bcd665678490c92329caacbc73c6
 EBUILD zope-2.9.10-r1.ebuild 2439 RMD160 4d893fe82971f3d3a6b5bf47873c272ec732329b SHA1 930744cecdff3eed82705332bb505b9d5abbf486 SHA256 057741f43d33bd395e4bf69a1706931c5dcae18cd4f5e7e94d849a85dcde6345
@@ -27,22 +27,22 @@ EBUILD zope-2.9.10.ebuild 2397 RMD160 e33501ae1658b572c23e9383492215c2af0cc5b1 S
 EBUILD zope-2.9.12.ebuild 2356 RMD160 77459a869dd0925c53572055e901fa1e710128f1 SHA1 2abb52de300d7d67c1f5f13600310cbc37264dfd SHA256 55a08e94da72603b68859f3dd91595fb8d2fc481378e5e0c868265dc396f164d
 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 30667 RMD160 2b39771eed3ba8bd525b11ca58981f785ca676c8 SHA1 b7960102a8353092f5d685f9718d407318fbe58a SHA256 11cc32bcc7450594aad3fcbe6ec952adb1612b6b6da98314ec17f61a8cb6b436
+MISC ChangeLog 30810 RMD160 9c97e03687a036bfad388d569d166db9b5ca0205 SHA1 44e9c335ce67a01b241358f10f3e3b4e3e8a0714 SHA256 06b428e9e8ff0e1332b4cb0e180b4dd9c59bcc105d8840c47411689cda2c0171
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNpNHHAAoJENgZr6v6gHY05+sP/3NXt7KcZWkxR0LMm9AKHCSD
-taStm72bOz4LxlJjPJhF8JoGVy8AYIEBatbmMqWmlhVBmPFgPLRkkcbWejoUQLeT
-o9C+iMHAHOzvFRmpgXFvgUCdviq6LUynia0A49Pm3pyHgchQLdv8sshKEowEu4HA
-Dd8ZbyeRJUYSp0D/yb/xPi1CZGQ07+G3+/oEa3EILDQ1D7tqphNVRi3nLTYjSus/
-7S2YuOq/wvEPGjcK7iYOh7Zvxz+vyco7KgNHlP6KPE8WFnf1tTppM7LJJqKIoyM/
-FQlS/uDEg8feT5ITatY0jcts8m3d8J9IpLw7LVVIIqMRw75a+8uq6/LbIpkPwZm7
-++D77v0GXukEDoIJW2AAH8FgoVuak03iRCkzIbZ5uyo8+NrdlZtycHrOLwjnoGCT
-Tvt4tZTVZy5aUNr8qIdT22KzSevI+J+unB6IuFW1SgVO+vg2XwqK1sW7LNpAstHi
-8KtWNG2B32o7vYIrffLaMRXJ1sT1WE1K2T3wzaGFaJH4wQmSXbaO9540AaS8+qBZ
-kyFnOHA4YohKhS/8TovvDG3cxQSI4IQn8LXgskeDQM62X2jC7kr11Ug9Tnm2iqEs
-Ko/rLbfauE19r5a/rcFIo0ndZ1FlcpFFzsIEIvRoTWkDUoB9A8DwVP+z+svR130n
-3TsoBlC7hNirAotAFvGs
-=CI6K
+iQIcBAEBAgAGBQJNyHpZAAoJENgZr6v6gHY0cWkP/jO2PkfZlDC0Toes3KDGN9vP
+UXKF7ya1vCsu++X6aBqnSkt2RFK2bH53eCNZW7xYCj4s9i9RVzD4dU+5pmEuDhwy
+IVnzZ1Ne+mRDec+Rh9pFP8dRJmvj/7NiqM4JRdCFPkj2Hwzlro0D2/ZCSg9ol7kc
+6h3F39k51F1P8sguExaawxXuzlBnpgreoohB71GA94qbPT0zCE7sySCoorNBaZcc
+B9HeWl1kHITuDyiVvEkC+DAMmZqYmQnuWSmYNlgqmKphhrkpTiYyFG8My8c+wiD8
+tI+jWwhQSn5mfOFQ/mtGf9sKe8XTlZtzDjQLKppapGq51EMra2wqB+N3tuWaRDgb
+IpJvfe/Dxe4GsdfQd3fmKttsRP5urrn0T7qK6nhs0IV+XxWn0Y1xWpGPXusOP24A
+JXE9CeVvZKcrzt1g5tcbfkynMWxq4waQSTJ3sHMZ1g7MXse0KjJgatnMTlwn28gA
+1O+RYYMPVNlYmJy87pxhmPTrplhh8CJveP6nMyM3qH99MKgSx0P1gyGQo4B0hkft
+Yt+w0K+1ok7BLOmM1uEOk+DAg8UMS1PilQVhZP60yTiBoU1H+eWKApbdDS2ckTKG
+wqO0HXN+Mjo6uHe6FuLY85s3jb0Y/PfnAK+QR/OY3x1Z+FfRQRPX0ycI/oZHcgyN
+hbs1QZS4cm70jr+IA3P3
+=nDxi
 -----END PGP SIGNATURE-----
diff --git a/net-zope/zope/zope-2.12.18.ebuild b/net-zope/zope/zope-2.12.18.ebuild
new file mode 100644
index 000000000000..1b72b5148548
--- /dev/null
+++ b/net-zope/zope/zope-2.12.18.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.12.18.ebuild,v 1.1 2011/05/09 23:35:35 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython"
+
+inherit distutils multilib versionator
+
+MY_PN="Zope2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Zope 2 application server / web framework"
+HOMEPAGE="http://www.zope.org http://zope2.zope.org http://pypi.python.org/pypi/Zope2 https://launchpad.net/zope2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="ZPL"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+RESTRICT="test"
+
+RDEPEND="|| ( net-zope/namespaces-zope[Products,Shared,Shared-DC] net-zope/namespaces )
+	dev-python/docutils
+	dev-python/restrictedpython
+	dev-python/setuptools
+	net-zope/acquisition
+	net-zope/datetime
+	net-zope/extensionclass
+	net-zope/five-formlib
+	net-zope/initgroups
+	net-zope/missing
+	net-zope/multimapping
+	net-zope/persistence
+	net-zope/record
+	net-zope/tempstorage
+	net-zope/threadlock
+	net-zope/transaction
+	net-zope/zconfig
+	net-zope/zdaemon
+	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-mkzeoinstance
+	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-3.7.0
+	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
+	net-zope/zopeundo"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( dev-python/sphinx )"
+PDEPEND="net-zope/zsqlmethods"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_pkg_setup
+	ZOPE_INSTALLATION_DIR="usr/$(get_libdir)/${PN}-${SLOT}"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		"$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+	fi
+}
+
+distutils_src_install_post_hook() {
+	mv "$(distutils_get_intermediate_installation_image)/${ZOPE_INSTALLATION_DIR}/lib/python"{,-${PYTHON_ABI}}
+}
+
+src_install() {
+	distutils_src_install --home="${ZOPE_INSTALLATION_DIR}"
+
+	# Don't install C sources.
+	find "${D}${ZOPE_INSTALLATION_DIR}" -name "*.c" | xargs rm -f
+
+	local file
+	for file in "${D}${ZOPE_INSTALLATION_DIR}/bin/"*; do
+		scripts_preparation() {
+			cp "${file}" "${file}-${PYTHON_ABI}" || return 1
+			python_convert_shebangs -q $(python_get_version) "${file}-${PYTHON_ABI}"
+			sed \
+				-e "/import sys/i import os\nos.environ['PYTHONPATH'] = (os.environ.get('PYTHONPATH') + ':' if os.environ.get('PYTHONPATH') is not None else '') + os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib', 'python-${PYTHON_ABI}'))" \
+				-e "/import sys/a sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'lib', 'python-${PYTHON_ABI}')))" \
+				-i "${file}-${PYTHON_ABI}"
+		}
+		python_execute_function -q scripts_preparation
+
+		python_generate_wrapper_scripts -f "${file}"
+	done
+
+	modules_installation() {
+		local module
+		for module in Products Shared Shared/DC; do
+			echo "__import__('pkg_resources').declare_namespace(__name__)" > "${D}${ZOPE_INSTALLATION_DIR}/lib/python-${PYTHON_ABI}/${module}/__init__.py" || return 1
+		done
+	}
+	python_execute_function -q modules_installation
+
+	skel_preparation() {
+		sed -e "/^ZOPE_RUN=/s/runzope/&-${PYTHON_ABI}/" -i "${D}${ZOPE_INSTALLATION_DIR}/lib/python-${PYTHON_ABI}/Zope2/utilities/skel/bin/runzope.in" || return 1
+		sed -e "/^ZDCTL=/s/zopectl/&-${PYTHON_ABI}/" -i "${D}${ZOPE_INSTALLATION_DIR}/lib/python-${PYTHON_ABI}/Zope2/utilities/skel/bin/zopectl.in" || return 1
+	}
+	python_execute_function -q skel_preparation
+
+	if use doc; then
+		pushd build/sphinx/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 "/${ZOPE_INSTALLATION_DIR}/skel"
+	doins "${FILESDIR}/zope.initd" || die "doins failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize --allow-evaluated-non-sitedir-paths "/${ZOPE_INSTALLATION_DIR}/lib/python-\${PYTHON_ABI}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup --allow-evaluated-non-sitedir-paths "/${ZOPE_INSTALLATION_DIR}/lib/python-\${PYTHON_ABI}"
+}