Changed install location to /usr/share/php, fixing bug #394561

Package-Manager: portage-2.2.0_alpha81/cvs/Linux i686

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-php/ZendFramework/ChangeLog b/dev-php/ZendFramework/ChangeLog
index 6826891edea7..1127c95c28e0 100644
--- a/dev-php/ZendFramework/ChangeLog
+++ b/dev-php/ZendFramework/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2011/09/25 14:21:32 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ChangeLog,v 1.12 2011/12/15 22:03:55 gurligebis Exp $
+
+  15 Dec 2011; <gurligebis@gentoo.org> ZendFramework-1.11.6.ebuild,
+  ZendFramework-1.11.10.ebuild:
+  Changed install location to /usr/share/php, fixing bug #394561
 
 *ZendFramework-1.11.10 (25 Sep 2011)
 
diff --git a/dev-php/ZendFramework/Manifest b/dev-php/ZendFramework/Manifest
index 7ee60ba962aa..025a21d249c3 100644
--- a/dev-php/ZendFramework/Manifest
+++ b/dev-php/ZendFramework/Manifest
@@ -9,14 +9,14 @@ DIST ZendFramework-1.11.6-apidoc.tar.gz 4989361 RMD160 df68316ad2df6e9b260dda249
 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
-EBUILD ZendFramework-1.11.10.ebuild 2038 RMD160 25e194ccbd6104d78b71bc0ad6146d8f1b8c57a7 SHA1 cc9aa15d46bda5ff91f90df7501223da0b5f1428 SHA256 3652bf3bfa0455187d2cd23ada12195a12d95cb73c78f6e36fd011966d2cbd1f
-EBUILD ZendFramework-1.11.6.ebuild 2032 RMD160 3661b19a1954f35c4bddd72687b925832482aca1 SHA1 800c0ab2feb3fd792356dbfca794ca7e7afa0529 SHA256 4a285f672b02195294dddbdea4c69800a634ae3973687c72c7793883c6949537
-MISC ChangeLog 13554 RMD160 7646ad43a32e82a2d5e8423565bfda0e04a1762b SHA1 60f8efcb557f399312bcfbc8d912e5f59b3a443b SHA256 0fe8c3df18f636c008982c7065244647be7db92896f9b9a6a80b5437eaa994d6
+EBUILD ZendFramework-1.11.10.ebuild 2037 RMD160 e304705fefe42c93bae66cca2fad3cb3ebad5ba2 SHA1 5187f52104fc81f4c1390bc03eba995311c2d5e0 SHA256 68d99cc0f0a05b55dd4f22b140af7da8186e0ad7ef1dbcee17a22a3ec7af5bd7
+EBUILD ZendFramework-1.11.6.ebuild 2031 RMD160 70048715c7e21573bb68e0f0692e48e7bd143c6d SHA1 4bc5599dc82f59e99d90d49b5d14c528db83739b SHA256 e1430f9e4a08c1dc07d43ba81f43c0fb6bf9630367ccf2107767ff3ea8f3007b
+MISC ChangeLog 13720 RMD160 5fe7c5017eecab3129520643730a5ed8cd07fc46 SHA1 f3cd4a699af24ee897684209af58a3bc9fd93965 SHA256 b9451c03bdbedba882b2a4e0ef0290c85127fa061fca08e8c118258111993536
 MISC metadata.xml 523 RMD160 129ba00df70b4e9d7ccb7b8dc828e9406f9e312d SHA1 f5e9925403974e649a44402617249bb9dcc34f92 SHA256 ea4383a6e685b9e68b44e3edf3494439ecaf4ac56e4bf1bc3cd5dd5c6427ccec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5/OPIACgkQsR7PQhRXYEn1TwCfQPSGmCYBVw8Y+bq3pVeJuSCg
-TukAnRjpJUF5FAnw/OE9Mxalr15VgxaA
-=gNDq
+iEYEARECAAYFAk7qbtYACgkQsR7PQhRXYEmPDgCfeyVWKn4g7Hp7vqUdOcrFEjvJ
+uH4AnROewYGyuLIplGqqOln1YNtqOJbs
+=3vuB
 -----END PGP SIGNATURE-----
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild
index a860479e1245..16743f601e59 100644
--- a/dev-php/ZendFramework/ZendFramework-1.11.10.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.10.ebuild,v 1.1 2011/09/25 14:21:32 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.11.10.ebuild,v 1.2 2011/12/15 22:03:55 gurligebis Exp $
 
 EAPI="2"
 
@@ -44,7 +44,7 @@ src_install() {
 	php-lib-r1_src_install library/Zend $(cd library/Zend ; find . -type f -print)
 
 	if ! use minimal ; then
-		insinto /usr/share/php5
+		insinto /usr/share/php
 		doins -r externals/dojo
 	fi
 
diff --git a/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild b/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild
index 907d6494cd00..c70bf803c241 100644
--- a/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild
+++ b/dev-php/ZendFramework/ZendFramework-1.11.6.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.6.ebuild,v 1.6 2011/06/07 09:38:40 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ZendFramework/ZendFramework-1.11.6.ebuild,v 1.7 2011/12/15 22:03:55 gurligebis Exp $
 
 EAPI="2"
 
@@ -44,7 +44,7 @@ src_install() {
 	php-lib-r1_src_install library/Zend $(cd library/Zend ; find . -type f -print)
 
 	if ! use minimal ; then
-		insinto /usr/share/php5
+		insinto /usr/share/php
 		doins -r externals/dojo
 	fi