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

(Portage version: 2.2_rc40/cvs/Linux i686)

3 files changed, 27 insertions, 72 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/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