bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 13 insertions, 26 deletions

diff --git a/dev-php/PEAR-Services_Weather/ChangeLog b/dev-php/PEAR-Services_Weather/ChangeLog
index e40483812a15..17621b3f6217 100644
--- a/dev-php/PEAR-Services_Weather/ChangeLog
+++ b/dev-php/PEAR-Services_Weather/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-Services_Weather
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/ChangeLog,v 1.41 2010/01/26 22:11:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/ChangeLog,v 1.42 2010/06/17 13:17:28 mabi Exp $
+
+*PEAR-Services_Weather-1.4.5 (17 Jun 2010)
+
+  17 Jun 2010; <mabi@gentoo.org> -PEAR-Services_Weather-1.3.2-r1.ebuild,
+  -PEAR-Services_Weather-1.4.4.ebuild, +PEAR-Services_Weather-1.4.5.ebuild:
+  version & eapi bump for php-5.3 (bug #298205)
 
   26 Jan 2010; Ulrich Mueller <ulm@gentoo.org>
   PEAR-Services_Weather-1.3.2-r1.ebuild:
diff --git a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild b/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild
deleted file mode 100644
index e0d6c066a377..000000000000
--- a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,17 +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/PEAR-Services_Weather/PEAR-Services_Weather-1.3.2-r1.ebuild,v 1.19 2010/01/26 22:11:10 ulm Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="This class acts as an interface to various online weather-services.."
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-RDEPEND=">=dev-php/PEAR-Cache-1.5.4-r1
-	>=dev-php/PEAR-DB-1.7.6-r1
-	>=dev-php/PEAR-HTTP_Request-1.2.4-r1
-	>=dev-php/PEAR-SOAP-0.8.1-r1
-	>=dev-php/PEAR-XML_Serializer-0.15.0-r1"
diff --git a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.4.ebuild b/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.5.ebuild
index d7ae854e57c5..424db565ae0b 100644
--- a/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.4.ebuild
+++ b/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.4.ebuild,v 1.1 2009/08/22 18:14:20 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Services_Weather/PEAR-Services_Weather-1.4.5.ebuild,v 1.1 2010/06/17 13:17:28 mabi Exp $
 
-inherit php-pear-r1 depend.php
+EAPI="2"
+
+inherit php-pear-r1
 
 DESCRIPTION="This class acts as an interface to various online weather-services"
 
@@ -10,14 +12,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="minimal"
-
+DEPEND="|| ( <dev-lang/php-5.3[ctype,pcre] >=dev-lang/php-5.3[ctype] )"
 RDEPEND=">=dev-php/PEAR-HTTP_Request-1.2.4-r1
 	!minimal? ( >=dev-php/PEAR-Cache-1.5.4-r1
 		    >=dev-php/PEAR-DB-1.7.6-r1
 		    >=dev-php/PEAR-SOAP-0.8.1-r1
 		    >=dev-php/PEAR-XML_Serializer-0.15.0-r1
 		    >=dev-php/PEAR-Net_FTP-1.3.1 )"
-
-pkg_setup() {
-	require_php_with_use ctype pcre
-}