Fixing bug #383539

(Portage version: 2.2.0_alpha59/cvs/Linux i686)

7 files changed, 10 insertions, 385 deletions

diff --git a/dev-php/ZendFramework/ChangeLog b/dev-php/ZendFramework/ChangeLog
index 8a9300a1f4e0..6826891edea7 100644
--- a/dev-php/ZendFramework/ChangeLog
+++ b/dev-php/ZendFramework/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2011/06/07 09:38:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.11 2011/09/25 14:21:32 gurligebis Exp $
+
+*ZendFramework-1.11.10 (25 Sep 2011)
+
+  25 Sep 2011; <gurligebis@gentoo.org> -ZendFramework-1.7.5.ebuild,
+  -ZendFramework-1.10.7.ebuild, -ZendFramework-1.11.0.ebuild,
+  -ZendFramework-1.11.4.ebuild, -ZendFramework-1.11.5.ebuild,
+  -ZendFramework-1.11.7.ebuild, +ZendFramework-1.11.10.ebuild:
+  Bumping to 1.11.10 and removing old ebuilds - fixing bug #383539
 
   07 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org>
   ZendFramework-1.11.6.ebuild:
diff --git a/dev-php/ZendFramework/ZendFramework-1.10.7.ebuild b/dev-php/ZendFramework/ZendFramework-1.10.7.ebuild
deleted file mode 100644
index 039028dab524..000000000000
--- a/dev-php/ZendFramework/ZendFramework-1.10.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.10.7.ebuild,v 1.1 2011/03/03 20:56:46 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
-}
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.0.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.0.ebuild
deleted file mode 100644
index a689bf653cc6..000000000000
--- a/dev-php/ZendFramework/ZendFramework-1.11.0.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-php/ZendFramework/ZendFramework-1.11.0.ebuild,v 1.1 2011/03/03 20:56:46 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
-}
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.7.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild
index bee8cbc68031..a860479e1245 100644
--- a/dev-php/ZendFramework/ZendFramework-1.11.7.ebuild
+++ b/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.1 2011/06/02 15:34:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild,v 1.1 2011/09/25 14:21:32 gurligebis Exp $
 
 EAPI="2"
 
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.4.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.4.ebuild
deleted file mode 100644
index 6e97a06f232f..000000000000
--- a/dev-php/ZendFramework/ZendFramework-1.11.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.4.ebuild,v 1.1 2011/03/03 21:08:46 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
-}
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.5.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.5.ebuild
deleted file mode 100644
index d570a9ffba09..000000000000
--- a/dev-php/ZendFramework/ZendFramework-1.11.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.5.ebuild,v 1.1 2011/04/08 11:53:05 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
-}
diff --git a/dev-php/ZendFramework/ZendFramework-1.7.5.ebuild b/dev-php/ZendFramework/ZendFramework-1.7.5.ebuild
deleted file mode 100644
index 86a44d4dc88b..000000000000
--- a/dev-php/ZendFramework/ZendFramework-1.7.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.7.5.ebuild,v 1.1 2011/03/03 20:56:46 olemarkus 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 these, enable the"
-		elog "minimal USE flag."
-	fi
-}