Bumping to 1.10.7

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

4 files changed, 9 insertions, 163 deletions

diff --git a/dev-php5/ZendFramework/ChangeLog b/dev-php5/ZendFramework/ChangeLog
index 29de26b4c04e..8477c5cffffd 100644
--- a/dev-php5/ZendFramework/ChangeLog
+++ b/dev-php5/ZendFramework/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/ZendFramework
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ChangeLog,v 1.66 2010/04/03 12:43:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ChangeLog,v 1.67 2010/08/14 09:46:36 gurligebis Exp $
+
+*ZendFramework-1.10.7 (14 Aug 2010)
+
+  14 Aug 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -ZendFramework-1.8.3.ebuild, -ZendFramework-1.9.7.ebuild,
+  -ZendFramework-1.10.3.ebuild, +ZendFramework-1.10.7.ebuild:
+  Bumping to 1.10.7 and removing old unstable versions.
 
 *ZendFramework-1.10.3 (03 Apr 2010)
 
diff --git a/dev-php5/ZendFramework/ZendFramework-1.10.3.ebuild b/dev-php5/ZendFramework/ZendFramework-1.10.7.ebuild
index e3bbcb2d332f..d8a8a5aab88c 100644
--- a/dev-php5/ZendFramework/ZendFramework-1.10.3.ebuild
+++ b/dev-php5/ZendFramework/ZendFramework-1.10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.10.3.ebuild,v 1.1 2010/04/03 12:43:18 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.10.7.ebuild,v 1.1 2010/08/14 09:46:36 gurligebis Exp $
 
 EAPI="2"
 
diff --git a/dev-php5/ZendFramework/ZendFramework-1.8.3.ebuild b/dev-php5/ZendFramework/ZendFramework-1.8.3.ebuild
deleted file mode 100644
index 21b03a2e3ce3..000000000000
--- a/dev-php5/ZendFramework/ZendFramework-1.8.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.8.3.ebuild,v 1.5 2010/03/02 22:30:42 gurligebis 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 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
-
-	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
-		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
-}
diff --git a/dev-php5/ZendFramework/ZendFramework-1.9.7.ebuild b/dev-php5/ZendFramework/ZendFramework-1.9.7.ebuild
deleted file mode 100644
index 29cbd85958c8..000000000000
--- a/dev-php5/ZendFramework/ZendFramework-1.9.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/ZendFramework/ZendFramework-1.9.7.ebuild,v 1.2 2010/03/02 22:30:42 gurligebis 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
-}