Version bump. Ref security bug 369139

3 files changed, 91 insertions, 16 deletions

diff --git a/dev-php/ZendFramework/ChangeLog b/dev-php/ZendFramework/ChangeLog
index 0c717d8a79e9..65bb1a3ecb12 100644
--- a/dev-php/ZendFramework/ChangeLog
+++ b/dev-php/ZendFramework/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/ZendFramework
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.3 2011/04/08 11:53:05 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.4 2011/05/29 11:05:24 olemarkus Exp $
+
+*ZendFramework-1.11.6 (29 May 2011)
+
+  29 May 2011; <olemarkus@gentoo.org> +ZendFramework-1.11.6.ebuild:
+  Version bump. Ref security bug 369139
 
 *ZendFramework-1.11.5 (08 Apr 2011)
 
diff --git a/dev-php/ZendFramework/Manifest b/dev-php/ZendFramework/Manifest
index b189373f4b63..797f37f04d65 100644
--- a/dev-php/ZendFramework/Manifest
+++ b/dev-php/ZendFramework/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ZendFramework-1.10.7-apidoc.tar.gz 7411414 RMD160 c16922f034d92a2a685ea6eba66a9447cc7a4570 SHA1 5070aed2af856c668040bcf14b24d9cd40908c53 SHA256 8484fdb8dcb5b505547bcfc0cbd763a8c515ad45113f04178e91c0ffeb29fae9
 DIST ZendFramework-1.10.7-manual-en.tar.gz 3340442 RMD160 352ec26314f01d0cd8c95d61e0b3a89c3dd832b2 SHA1 3f59c41dada9e8ff6b28739398bce2253e6c2117 SHA256 83b7e2a42937c769fb4d9fb2c7681364f10ee5c84defed4315250b165ca9f6b8
 DIST ZendFramework-1.10.7-minimal.tar.gz 3609724 RMD160 3ea5bb8cb5814efbf0d971802ba06520694a2722 SHA1 afe4bcd5acec4060907f8a51b6d1ab25ee62db22 SHA256 11f04c024e524b6396df1de2b7d3221ab5666a284b3056c5ead4bdc994d268a5
@@ -17,6 +14,10 @@ DIST ZendFramework-1.11.5-apidoc.tar.gz 4984172 RMD160 e199ffb3523ef3db59eb5d41c
 DIST ZendFramework-1.11.5-manual-en.tar.gz 3425341 RMD160 d51810075077a9eab29f92e80266f0f5bb815db8 SHA1 512ed39f02edb9e00d6fc9cc85bfb563bb75dc8e SHA256 08ff45db840d94e5e37b112c308a2029cf8112a2b299755d43845a73e08f73af
 DIST ZendFramework-1.11.5-minimal.tar.gz 3725673 RMD160 13f3d58b32763dbb15f65a2544b85e7fabcf622c SHA1 595e899639c762fe24e1316ff35278fb63653db7 SHA256 457e08fd8709891d7aab70d8c50b40d2fae3c99893d8f278e1e600086c46a51d
 DIST ZendFramework-1.11.5.tar.gz 20114107 RMD160 65a240bddcebb32766261e3d4636b1636a8f962a SHA1 dbeceba06b389c5fd48c1390fc61a3bab4fce744 SHA256 cf3ae1d1854e0fd08ab5f769b3c132ac0e58850213308f88b180f9469df8c569
+DIST ZendFramework-1.11.6-apidoc.tar.gz 4989361 RMD160 df68316ad2df6e9b260dda2497aff127784ed56a SHA1 cdb255d627b3fdb85a3611f0904a1ffafd17c245 SHA256 904700d5bf39f9821607e4ad17d0c05f8032464dd6d8b9390cfb36f70ef30c99
+DIST ZendFramework-1.11.6-manual-en.tar.gz 3425928 RMD160 a114a9cb90ea30288211d94c4ed21adad15599db SHA1 5ae2b71fcb9c0bfcd60777cfda81a5a5ff7f334e SHA256 b790cdca951ea37c1c3852f7c10681f637f6517edc787a8880ae313fd4c91202
+DIST ZendFramework-1.11.6-minimal.tar.gz 3729228 RMD160 7b9eb4f747f2d6e2f537eb80d22b4a28384f0f19 SHA1 7d4744070899ca0f9c1c4aa4f5465194ec93f60c SHA256 3e2c37d491e12d64ea831b49c60d671233f8c00db1756101efdb822bf701bc45
+DIST ZendFramework-1.11.6.tar.gz 20131174 RMD160 421f8b5aaf259833fb00d6d540d3615f4a98085c SHA1 119d47ff5aff7f79d7653ebb563977cde85ec778 SHA256 31370c31bf67cac8039392af0d4c1adba22e1d5b3edecea5ea789f70582e205e
 DIST ZendFramework-1.7.5-apidoc.tar.gz 4907260 RMD160 684773c9314361495c079a005b85b10468d6617c SHA1 bac648a9caa05d0afad1fb8bf14ff0a1c26f320f SHA256 10bb3ec7d3057baa9d9f20e82304bb72fd63b750771d00c9c112490dd9841624
 DIST ZendFramework-1.7.5-manual-en.tar.gz 1194554 RMD160 2354f57a18e6803f75a0fb2f3e48380cd664e480 SHA1 a10455cca14bad3848019369cdcf5d1db0ee1dc7 SHA256 2fab39b3b5e30c66d44e9ec5e4b88fef48a627fb2259aad58d555a3cdeabbb73
 DIST ZendFramework-1.7.5-minimal.tar.gz 2578136 RMD160 0d0371a7fdb1ce84390ec54b0f2f5478305261df SHA1 118f511b039a9f2cac2d68064392de3af544f4a8 SHA256 d74455ac522bc1e15a206b95c4571e2c3b41a4a33c2020a9252fab5fbdcb8a8b
@@ -25,17 +26,7 @@ EBUILD ZendFramework-1.10.7.ebuild 2032 RMD160 0f73dcac447b38fa27736283104fc6cd3
 EBUILD ZendFramework-1.11.0.ebuild 2036 RMD160 89269c643e4e09ea8b37873ec39604db108aaaa5 SHA1 01fca302b0417a5e44c157387430dc142ee9bedb SHA256 dda2e174548aa53e0dbc59f9fca1336649799892942bc391c0aba3ba824d47e9
 EBUILD ZendFramework-1.11.4.ebuild 2036 RMD160 d6c588a08072d8ba682691db9220e3c3df1832ba SHA1 0e3fb6fafd0dc2dbaf6a54ee9e9796c18568aa55 SHA256 8b4424f464f488f2f01e5ca67b596ec7d7ed7b7f26b924f23e18e6d6d4465871
 EBUILD ZendFramework-1.11.5.ebuild 2036 RMD160 2ac366449f2648f148595bdf9aa409b44bd292d5 SHA1 b3a2ff7032cbddf8c33721da2c9cc08dd0277d7f SHA256 adb17dac170bfce6b6f8185f15cc929b3d439707e15a0f3c8e32863ccb4d97a1
+EBUILD ZendFramework-1.11.6.ebuild 2036 RMD160 2ac366449f2648f148595bdf9aa409b44bd292d5 SHA1 b3a2ff7032cbddf8c33721da2c9cc08dd0277d7f SHA256 adb17dac170bfce6b6f8185f15cc929b3d439707e15a0f3c8e32863ccb4d97a1
 EBUILD ZendFramework-1.7.5.ebuild 1724 RMD160 79d30260d0c35fd51862529668b753b329154fc4 SHA1 bb995e3fb47126a562f6aa2bf46b745295a9eb71 SHA256 02ef0025b00ebb7ab9daeea5ab1674cc755bafa3077e1f16b12cfc81bbbd7a17
-MISC ChangeLog 12312 RMD160 e124ae3d33dbcf73d7e8a78d597ed0e0792b0856 SHA1 673e95d55e7d4c515635ae5304554af6cf2f5c12 SHA256 bd260f8698d2f3e49412664072fb5c082fe4e5f07cbcaa08046227bac778e6e4
+MISC ChangeLog 12458 RMD160 ef27c939acf2fd7e1af9acd9cdfcd2f685940130 SHA1 f078188fbf6c11ee8246d4098486170ce9858cef SHA256 4628a6453882209ea57978eecb802e909ddcd6651e5c549e2e52dc732e7014a3
 MISC metadata.xml 523 RMD160 129ba00df70b4e9d7ccb7b8dc828e9406f9e312d SHA1 f5e9925403974e649a44402617249bb9dcc34f92 SHA256 ea4383a6e685b9e68b44e3edf3494439ecaf4ac56e4bf1bc3cd5dd5c6427ccec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNnvcwAAoJEGurSuXEqSv10jcIALACWWMzWrToaDDc4Xja0ZeX
-DFN6g87wp6LZcp2TMalwUTJkCot3suGmlHqOHXYi0pvRVsKF75ouEX9b8lLqKtRK
-ja0WokiUHSphA1G2f/XDvp5qD5nA/spUDhrDKQKJayVnhvbQxHSQzm75q0GeS/kc
-9gMlF8dMan2XOAxWa6/WFVbXFtVINVefeJi91i1hNDtZmFxlE4JMNSRBp9BdAULN
-YlbILCHl6EPeQiQK1L/xgYTYkckLi9eSnKDMCaHPOOzDUNQPHX4D1EvR+wEOLpPk
-dvAxZ6jqZPFxsFGRXHtxNiJ0LQokUYzhw/EPU7J0A1eiUJk3BkLpn7Ox/AuoZVQ=
-=Ys9/
------END PGP SIGNATURE-----
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild
new file mode 100644
index 000000000000..fe6d6ec3f6d5
--- /dev/null
+++ b/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild,v 1.1 2011/05/29 11:05:24 olemarkus Exp $
+
+EAPI="2"
+
+PHP_LIB_NAME="Zend"
+
+inherit php-lib-r1
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="Zend Framework is a high quality and open source framework for developing Web Applications."
+HOMEPAGE="http://framework.zend.com/"
+SRC_URI="!minimal? ( http://framework.zend.com/releases/${P}/${P}.tar.gz )
+	minimal? ( http://framework.zend.com/releases/${P}/${P}-minimal.tar.gz )
+	doc? (
+		http://framework.zend.com/releases/${P}/${P}-apidoc.tar.gz
+		http://framework.zend.com/releases/${P}/${P}-manual-en.tar.gz )"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples minimal cli"
+
+DEPEND="cli? ( dev-lang/php[simplexml,tokenizer] )"
+RDEPEND="${DEPEND}"
+need_php_by_category
+
+src_prepare() {
+	if use minimal ; then
+		S="${WORKDIR}/${P}-minimal"
+		if use doc ; then
+			mv "${WORKDIR}/${P}/documentation" "${S}"
+		fi
+	fi
+}
+
+src_install() {
+	if use cli ; then
+		insinto /usr/bin
+		doins bin/zf.php
+		dobin bin/zf.sh
+		dosym /usr/bin/zf.sh /usr/bin/zf
+	fi
+	php-lib-r1_src_install library/Zend $(cd library/Zend ; find . -type f -print)
+
+	if ! use minimal ; then
+		insinto /usr/share/php5
+		doins -r externals/dojo
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+
+		if ! use minimal ; then
+			doins -r demos
+		fi
+	fi
+
+	dodoc README.txt
+	if use doc ; then
+		dohtml -r documentation/*
+	fi
+}
+
+pkg_postinst() {
+	elog "For more info, please take a look at the manual at:"
+	elog "http://framework.zend.com/manual"
+	elog ""
+
+	if use minimal; then
+		elog "You have installed the minimal version of ZendFramework,"
+		elog "so the Dojo toolkit, demos and tests have not been installed."
+	else
+		elog "You have installed the full version of ZendFramework, which"
+		elog "includes the Dojo toolkit, demos and tests."
+		elog "To install ZendFramework without these, enable the"
+		elog "minimal USE flag."
+	fi
+}