Bumping to 1.9.2 and removing unstable old 1.7.x versions.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

4 files changed, 33 insertions, 93 deletions

diff --git a/dev-php5/ZendFramework/ChangeLog b/dev-php5/ZendFramework/ChangeLog
index 04bd2928a705..6559e88866fd 100644
--- a/dev-php5/ZendFramework/ChangeLog
+++ b/dev-php5/ZendFramework/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/ZendFramework
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ChangeLog,v 1.57 2009/07/19 11:52:28 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ChangeLog,v 1.58 2009/09/19 20:59:07 gurligebis Exp $
+
+*ZendFramework-1.9.2 (19 Sep 2009)
+
+  19 Sep 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -ZendFramework-1.7.6.ebuild, -ZendFramework-1.7.7.ebuild,
+  +ZendFramework-1.9.2.ebuild:
+  Bumping to 1.9.2 and removing unstable old 1.7.x versions
 
   19 Jul 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
   ZendFramework-1.8.3.ebuild:
diff --git a/dev-php5/ZendFramework/Manifest b/dev-php5/ZendFramework/Manifest
index 2a8b2361dcc3..14e422f67e4f 100644
--- a/dev-php5/ZendFramework/Manifest
+++ b/dev-php5/ZendFramework/Manifest
@@ -1,32 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 DIST ZendFramework-1.7.5.tar.gz 21238396 RMD160 147572e320d851ba2118e4a0f924cda7066bb02a SHA1 3a719ab49d7d200585eda2638bcb8eedd5d07788 SHA256 16559635e591af04f01ea66a2ad98dbdd39c75a890f4301611517b799916c62f
-DIST ZendFramework-1.7.6-apidoc.tar.gz 4924780 RMD160 ab7ff96ac61065a763cb1b9b07f95920962834d0 SHA1 646a3d48f9771e24891cd1c2d6bcd20fbaa8bc7f SHA256 4fffed231fe3623ede8a6130b4b2410117cc6bbd54361fc8ae9bb9eceb71e48c
-DIST ZendFramework-1.7.6-manual-en.tar.gz 1196340 RMD160 c76c8673c2402e191faab99e0959c3401921fe50 SHA1 0d285ca13bb73b275e235ecf5709f84f0f547832 SHA256 493d3b5f74ca81ec99a672324e113a8ed156d5f17fe9890083a86de1bdee6143
-DIST ZendFramework-1.7.6-minimal.tar.gz 2584415 RMD160 44ac49aefa4ad500ac9b450d9e0acb97ca4c9577 SHA1 44964912c7d61b834101c556b62bf25c5f660f29 SHA256 124c98bc0aea747b6627f0b92de88648e7734ab237ded23fae385410ae555453
-DIST ZendFramework-1.7.6.tar.gz 21257707 RMD160 f4a953be9e4a78a1d6646d407beca030f2398791 SHA1 ce0a0245c163c92c0efb0a468c6fa49509e5a565 SHA256 316c8f7901afd6d676cf660f3c2dabb9e4eedf00cabea5987e0938c7fe8522ea
-DIST ZendFramework-1.7.7-apidoc.tar.gz 4928141 RMD160 caa74c5bd1e8059c484a2b2137079e5a56e34317 SHA1 525617f9b0a28b14e2870dcea292828cbbb1c78f SHA256 6e04bbaade9eec4e96a0dd23af13c41e5930ba1651c09bffa32cee4def6ba04c
-DIST ZendFramework-1.7.7-manual-en.tar.gz 1200664 RMD160 c4df2821e0a862074081f9308de3b0f81fe6acab SHA1 4745328d1295e4e4a892a6764bc9c113f926ecf2 SHA256 fc9e9701c1fa4d843cdeb3d4c17f9bc6effba27d7b30d9bfc4116488eb442124
-DIST ZendFramework-1.7.7-minimal.tar.gz 2586028 RMD160 1c73521198cbffe1375a1a8f454e31e8826d0252 SHA1 6b3f8194e472d85f3ae24a56c505e8f708e2d06e SHA256 3bea1599e9f78f5187cb4f67fa55f12d41bc1146890af745e09762a21d8d072d
-DIST ZendFramework-1.7.7.tar.gz 21268710 RMD160 a013357305456be89d4c9f3a110510b1f53fcc62 SHA1 6a1e6116674c9e51f8ff520a94a7fba7552742c6 SHA256 310195ff6c7fda92adeef9f9775413495f70b1e7ac3c5564484aca6bceae5265
 DIST ZendFramework-1.8.3-apidoc.tar.gz 5693906 RMD160 ed4259f2cfa48eea02cc3166bf966acfa87c8cab SHA1 952f9f2f9cc417be147ba6ba2109e85b617f2fd3 SHA256 b856d7a3f84b75887b2f5f52af23b7f1cd9c11090e4569fb00345f1eebda0dd6
 DIST ZendFramework-1.8.3-manual-en.tar.gz 1504606 RMD160 decdaade0de0821083012c9ea9cefbd556086e0b SHA1 e753f54de4b9cf46a59fea62e35a564b831f4579 SHA256 69396d0fe7fd5f57a1539554f2ec9e1279a70e0a813c695793aa9df16cb6c037
 DIST ZendFramework-1.8.3-minimal.tar.gz 2937219 RMD160 4d4dc3a987d83b876bf8747a48f0c56e06423893 SHA1 85b75b0564a2fec5c15844706644b0d8e1756a78 SHA256 9d190d572964029064de5a37f96cb87133389369835a861e24dd74fc2d7cc56c
 DIST ZendFramework-1.8.3.tar.gz 40091777 RMD160 e6fe6ecec13a982e9d99c57ed89554eeead25ebe SHA1 58141f6d1b0f7c3ae5ca34f3465a20733909d291 SHA256 27701e0a580023d79b18c924ce69c43f807e0c59f86a18bbdad890b4f271c311
+DIST ZendFramework-1.9.2-apidoc.tar.gz 6218188 RMD160 17d23bb9f4c310e5f6bc3c3d2fe2331d07a97761 SHA1 f3d403c4b0c7731464886dae627a6bb0ea2a2348 SHA256 89c8dd48aac4d743403eb6c9657cffd605b8f36ff3915018b0a963e36cd6905c
+DIST ZendFramework-1.9.2-manual-en.tar.gz 1680826 RMD160 d8ba74d6261c817e11c7a556ff09148b01fe52fd SHA1 c65d96fb133489f53041ca4b793c2f8c73f9f37d SHA256 cc307bd7579527260b51ab9b2e106514638d38b706bdd6bbd6333b469b25af24
+DIST ZendFramework-1.9.2-minimal.tar.gz 3328030 RMD160 b79fc7ccf5722fa6848b7ce7e81a5207154d179c SHA1 6ec460b59943b46d961f28599dcb75bfc16811b1 SHA256 a84d4475b32e72f8150f8802fe9eb86e162ed20330883ca19c8ba467f39d8df6
+DIST ZendFramework-1.9.2.tar.gz 40746830 RMD160 42a03dd0d810c382d96a1bcf5d0c74f7b7663d1d SHA1 f67f9c95612bb4427add9156a8369a8f4bb9f33a SHA256 9dfad7be1c332083e14f983a115562419f4d32abe9dde63dfe1006fc4ae785b2
 EBUILD ZendFramework-1.7.5.ebuild 1726 RMD160 5ec1f69bcae5b12503d047df33170b8d7713acc5 SHA1 1ca00eae5995e511622435df837453756bd875f2 SHA256 022843e1c3ea0f3e6fd1033eaf72e333331a18fa610b7a9cff998e01a27d5a5f
-EBUILD ZendFramework-1.7.6.ebuild 1731 RMD160 2769606bb9454fd34ef4a6134836f95dcea7b4e2 SHA1 06838217466ae0fe399d91862afa5f979dfa77e1 SHA256 6efa0ac7bd845ef4cecf393fe3e50a1e6399f8cd8c4d1c1162f4bac671d07acb
-EBUILD ZendFramework-1.7.7.ebuild 1724 RMD160 6606fa6e4c83c5e584d2f35694e7fb7491c7e261 SHA1 4d8078d3c6895f005e6f78990edae2bf603544ff SHA256 809321d392bd3a547355b642aa3154ed28b0176faab1c16de5bdcc3e4b1a1a59
 EBUILD ZendFramework-1.8.3.ebuild 2002 RMD160 abbccc32a98b0723f8e20242acaa33657ed50158 SHA1 1ce282b960fdf11c79c9c3e5464dee9557aa1811 SHA256 e026e2e54231967b820f8144550d9fd76e8ad46922ef56ac86e3295e8ddbb276
-MISC ChangeLog 9065 RMD160 7a2006fc055c9dcd89fa959545b6378d495de5fc SHA1 909694e5bfa8ca74f9d4bfa83c6dbde1633504d7 SHA256 bc5266d838c1009b1782cd4c832734eb66ca8ff522f2957b47873f5775eb17c3
+EBUILD ZendFramework-1.9.2.ebuild 2002 RMD160 435dc4d65e74a517a61b5221a6e1c3aafc8f539a SHA1 85a67f27817bf70785646b743396c9e0f556dd78 SHA256 4ee6797f9ba210de3ec082d05f99fbf61600a399979d2caf15f7a8541a095343
+MISC ChangeLog 9315 RMD160 76d71b5b5014ad3bfb0932ddf96aa8ed2fb63240 SHA1 e0ad514d9859c3956ca5c63db59f3ae8f0bc33b6 SHA256 77d9f482d292490783c55c8988417b542a054dfd1846ffda559b962e522cfd24
 MISC metadata.xml 523 RMD160 129ba00df70b4e9d7ccb7b8dc828e9406f9e312d SHA1 f5e9925403974e649a44402617249bb9dcc34f92 SHA256 ea4383a6e685b9e68b44e3edf3494439ecaf4ac56e4bf1bc3cd5dd5c6427ccec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpjCQYACgkQsR7PQhRXYEkWSACfRWZ0TVt1J5hGFTAqtG8KUWv0
-gz0AnR9sqWSwMwtwCjFQjgaHKuYji4nT
-=Rw++
------END PGP SIGNATURE-----
diff --git a/dev-php5/ZendFramework/ZendFramework-1.7.7.ebuild b/dev-php5/ZendFramework/ZendFramework-1.7.7.ebuild
deleted file mode 100644
index 2641803bc75a..000000000000
--- a/dev-php5/ZendFramework/ZendFramework-1.7.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.7.7.ebuild,v 1.1 2009/03/29 08:52:04 pva Exp $
-
-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"
-
-DEPEND=""
-RDEPEND=""
-need_php_by_category
-
-src_unpack() {
-	if use minimal ; then
-		S="${WORKDIR}/${P}-minimal"
-	fi
-
-	unpack ${A}
-
-	cd "${S}"
-}
-
-src_install() {
-	php-lib-r1_src_install library/Zend $(cd library/Zend ; find . -type f -print)
-
-	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 there, enable the"
-		elog "minimal USE flag."
-	fi
-}
diff --git a/dev-php5/ZendFramework/ZendFramework-1.7.6.ebuild b/dev-php5/ZendFramework/ZendFramework-1.9.2.ebuild
index 9e1c30d0d56f..3c4e575a74d3 100644
--- a/dev-php5/ZendFramework/ZendFramework-1.7.6.ebuild
+++ b/dev-php5/ZendFramework/ZendFramework-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.7.6.ebuild,v 1.1 2009/03/07 11:47:31 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.9.2.ebuild,v 1.1 2009/09/19 20:59:07 gurligebis Exp $
 
 PHP_LIB_NAME="Zend"
 
@@ -17,23 +17,38 @@ SRC_URI="!minimal? ( http://framework.zend.com/releases/${P}/${P}.tar.gz )
 		http://framework.zend.com/releases/${P}/${P}-manual-en.tar.gz )"
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples minimal"
+IUSE="doc examples minimal cli"
 
 DEPEND=""
 RDEPEND=""
 need_php_by_category
 
+pkg_setup() {
+	if use cli ; then
+		require_php_with_use simplexml tokenizer
+	fi
+}
+
 src_unpack() {
+	unpack ${A}
+
 	if use minimal ; then
 		S="${WORKDIR}/${P}-minimal"
+		if use doc ; then
+			mv "${WORKDIR}/${P}/documentation" "${S}"
+		fi
 	fi
 
-	unpack ${A}
-
 	cd "${S}"
 }
 
 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 examples ; then