Fix bug 455118 by modifying PHP dependency. Fix bug 450998 by correcting dohtml command. Fix bug 423097 by virtue of being bumped.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

3 files changed, 26 insertions, 11 deletions

diff --git a/sci-libs/geos/ChangeLog b/sci-libs/geos/ChangeLog
index 1c891f00dbad..4226fe0e8030 100644
--- a/sci-libs/geos/ChangeLog
+++ b/sci-libs/geos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/geos
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.71 2013/03/02 04:04:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/ChangeLog,v 1.72 2013/03/02 16:09:54 titanofold Exp $
+
+*geos-3.3.8-r1 (02 Mar 2013)
+
+  02 Mar 2013; Aaron W. Swenson <titanofold@gentoo.org> -geos-3.3.8.ebuild,
+  +geos-3.3.8-r1.ebuild:
+  Fix bug 455118 by modifying PHP dependency. Fix bug 450998 by correcting
+  dohtml command. Fix bug 423097 by virtue of being bumped.
 
 *geos-3.3.8 (02 Mar 2013)
 
diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest
index af24cce3691e..b6a4acf5d758 100644
--- a/sci-libs/geos/Manifest
+++ b/sci-libs/geos/Manifest
@@ -19,13 +19,13 @@ EBUILD geos-3.3.3.ebuild 2387 SHA256 6f86b1b12a60eb74acd2fc32cdca5e42b2e26d89620
 EBUILD geos-3.3.4.ebuild 2390 SHA256 e86b0f4cf0b5faa7ad9c69a53bf9cef78ac681219feaa07d1490b06b0c31fa80 SHA512 383de8632d4a05b731439315a458574d4ed4f8c8bb3ba8d3ac3123edfba7718cf33a0f8a77918fa62fe0ea343929b772758d01ae600932cfd1822540ce1b538c WHIRLPOOL fa8b3efa5b3381db3e2c5784edb766a26e956e1242fb12befe58f0599a0118bb9bcafb7635ecf4829be94e1e97eaa22422072b4cd3fe7f1d2d1e22a7ed8f38e4
 EBUILD geos-3.3.5.ebuild 2390 SHA256 36312ff5c69290bca176aeb43e68b9b8b633f3ade3718b956427b5383ad4c9e2 SHA512 c8f669f5c1d51ac9607d79dcaf373723404dcbdf81f6b35ed2911592d7aa962248124ec16216a19e8ca3a1e79cc6b5fe003d7dbd71cd4fb2afcb0bf9f7ae0355 WHIRLPOOL fde0abe816e16bdcb38295a4dbc0dc05bc0125a7cd7f78eeb49d6ad495d5fe4b9b39504aa5b12adb17277da3e05202f68f355f01cb5d916015bc115bcb121746
 EBUILD geos-3.3.7.ebuild 2392 SHA256 fcbe3483f1b78c5c629354e7b233f8eecb4f8d9a95aafccc5cbd11efafb37733 SHA512 c8e58aab73a2427636ba8e32430e946872ece7427ac1baeef21000ef4d65f06debf5b73487c1a33d54a2161e1a773fea044dbdab342680b90a84c4f525169dfa WHIRLPOOL 3cf158a3f219f5a1f274228ec381ab20016e1cacfbf79d48d298d016a685ded2c17fd43909226c3653ee876f6ae41ea3edd9039c76104a27de2681106927cabf
-EBUILD geos-3.3.8.ebuild 2395 SHA256 b369249a140a3e09d66710a83cdcad3630c92b6fc77f1f746657f0adb783d98a SHA512 52ae8bd7f671ca5604040701a8f381cec4a4db9d6df885d9f49c880be2990eafa1985c9c44de4fc49551a7ab3ec45bb4b673182c435429f3a57b521530a63987 WHIRLPOOL 15474041de9f04f47af2fd2fd0cff474b80ecf43b333038a52ff42154e675865124ff23e3ac84c45dd1e980633522138e4f5c32077d19b8e55f5b544a0d4ed88
-MISC ChangeLog 11418 SHA256 8e1cfb05f87ad775250071a6365b0b94172721aebed2ef49fa6162e43a09c78f SHA512 cf41e368a1f44ee3228488dabaa4980af3da5da8575fbab8912a7ab2b2ce3f4ae42168d91531a164397363f48b629613f3d74f941f10c8d950524ffb36e10d6f WHIRLPOOL 09f582ea657e6b1297e4ecc433936946207ae6c6bdf362a266661cad5d9702951e8f30f7af2b657f2ddeef21f61ea38b7e41cf85afd7e0c4062443ef02886ca7
+EBUILD geos-3.3.8-r1.ebuild 2402 SHA256 891efd7e34687f71212c632755fcc8e3976a16cbf7ede1be5db620d5aadc9d0d SHA512 e4a6beef6add5dd737e3299f4f76e4d368bcb21e89aa41d53b77550490de3eb9a1360834996abda1d2370d55a03765610d1d0eecf84c8cdb2366ba2b3b854be9 WHIRLPOOL 42fedc8b93833ea4e78011855515e813f3d07c4f06dc3d55645e55adabe5670fe713baa87063b07ac38d783380bfc359ead1a5ba566a85e67c365f33bf9f3e9c
+MISC ChangeLog 11685 SHA256 79f9239ab7ff5a4fd7bbe40ca2b2321d6bf62a5afeb42c1f8b70be1bc3cc445d SHA512 b51ac66ddac4fe6099cc6f9dfcb1ec2c2230afaa06865aabaee10ea1e8dc49837ca16a0149fb708d90b12cb0abf811420a5b36f82db59b87f6340e5ea41c4a85 WHIRLPOOL 166834d6b6faaec274ad6dfdfb1416c49146114ea3a8f5e82f6af04a5f46de71c4f9c970667e53efa76651d2e0b914acb39003c4c84fb56eed7e7dd14fbf6d31
 MISC metadata.xml 715 SHA256 c3649dde498324e2f8b91160ff1729eeb00b5d7f422309643c7f41a81cee657d SHA512 7161505aa45873fa8e78460be356bf516840db71987f55142bf1bcef80dbe68f7d187851fbd710c3137767fc31ec90120d4b9c9b6614f6d13fdcd8e2e3de5250 WHIRLPOOL 909e3b3888e5f759cff04edc88a8d5aca61310cb88a1ba031138d53e80f48e7103ae684b324239cbd11f3e5fe410eee8ba5cc1658cdacf398f6bc44652c770c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlExemkACgkQVxOqA9G7/aB5PAD/VvqOlyhmL6tcJR2FUX66jpTB
-TOdjyojFkp4O54S/V6sA/i73w0ny0SvQ0fUwnBYZn3/3n++Qc7l7rpkm7eLC9vsk
-=uoNt
+iF4EAREIAAYFAlEyJFcACgkQVxOqA9G7/aCliAD/e2ZCI8VV4bdp2qqRzNLFw0yL
+OkXnaQa6GGz/I+WzdhoA/RfyPQnLpLgghJXBkFLIb9Y0NLolFDyXoKuombt1bjp2
+=eMD0
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/geos/geos-3.3.8.ebuild b/sci-libs/geos/geos-3.3.8-r1.ebuild
index ff147d3b0b4c..ea49cb4d3f28 100644
--- a/sci-libs/geos/geos-3.3.8.ebuild
+++ b/sci-libs/geos/geos-3.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.8.ebuild,v 1.1 2013/03/02 04:04:09 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/geos/geos-3.3.8-r1.ebuild,v 1.1 2013/03/02 16:09:54 titanofold Exp $
 
 EAPI=4
 
@@ -18,13 +18,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc php python ruby static-libs"
 
-RDEPEND="php? ( dev-lang/php:5.3[-threads] )
-	ruby? ( dev-lang/ruby )"
+RDEPEND="
+	php? ( >=dev-lang/php-5.3[-threads] )
+	ruby? ( dev-lang/ruby )
+"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	php? ( dev-lang/swig )
 	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )"
+	ruby? ( dev-lang/swig )
+"
 
 pkg_setup() {
 	use python && python_pkg_setup
@@ -49,6 +52,7 @@ src_configure() {
 
 src_compile() {
 	emake
+
 	if use python; then
 		emake -C swig/python clean
 		python_copy_sources swig/python
@@ -62,11 +66,13 @@ src_compile() {
 		}
 		python_execute_function -s --source-dir swig/python building
 	fi
+
 	use doc && emake -C "${S}/doc" doxygen-html
 }
 
 src_install() {
 	default
+
 	if use python; then
 		installation() {
 			emake \
@@ -78,7 +84,9 @@ src_install() {
 		python_execute_function -s --source-dir swig/python installation
 		python_clean_installation_image
 	fi
-	use doc && dohtml -r "${S}/doc" doxygen_docs/html/*
+
+	use doc && dohtml -r doc/doxygen_docs/html/*
+
 	find "${ED}" -name '*.la' -exec rm -f {} +
 }