version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 36 insertions, 84 deletions

diff --git a/dev-php5/propel-generator/ChangeLog b/dev-php5/propel-generator/ChangeLog
index b0954f414062..9bbace63f070 100644
--- a/dev-php5/propel-generator/ChangeLog
+++ b/dev-php5/propel-generator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-php5/propel-generator
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.10 2008/02/26 16:40:24 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.11 2010/05/29 18:22:37 mabi Exp $
+
+*propel-generator-1.5.1 (29 May 2010)
+
+  29 May 2010; <mabi@gentoo.org> -propel-generator-1.3.0_beta2.ebuild,
+  -propel-generator-1.3.0_beta3.ebuild,
+  -propel-generator-1.3.0_beta4.ebuild, +propel-generator-1.5.1.ebuild:
+  version bump, depends on dev-php/pear-1.9.0-1 because of pear channel name
+  change
 
 *propel-generator-1.3.0_beta4 (26 Feb 2008)
 
diff --git a/dev-php5/propel-generator/propel-generator-1.3.0_beta2.ebuild b/dev-php5/propel-generator/propel-generator-1.3.0_beta2.ebuild
deleted file mode 100644
index 51eba707d1b6..000000000000
--- a/dev-php5/propel-generator/propel-generator-1.3.0_beta2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/propel-generator-1.3.0_beta2.ebuild,v 1.1 2007/03/20 18:39:47 chtekk Exp $
-
-inherit php-pear-lib-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Object Persistence Layer for PHP 5 (Generator)."
-HOMEPAGE="http://propel.phpdb.org/trac/wiki/"
-SRC_URI="http://pear.phpdb.org/get/propel_generator-${PV/_/}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-php5/phing-2.2.0
-		>=dev-php/PEAR-Log-1.8.7-r1"
-
-S="${WORKDIR}/propel_generator-${PV/_/}"
-
-need_php_by_category
-
-pkg_setup() {
-	has_php
-
-	# We need PDO and a few other things
-	require_pdo
-	require_php_with_use reflection spl xml xsl
-}
diff --git a/dev-php5/propel-generator/propel-generator-1.3.0_beta3.ebuild b/dev-php5/propel-generator/propel-generator-1.3.0_beta3.ebuild
deleted file mode 100644
index 6457d82c3fc9..000000000000
--- a/dev-php5/propel-generator/propel-generator-1.3.0_beta3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/propel-generator-1.3.0_beta3.ebuild,v 1.1 2007/12/24 14:51:03 armin76 Exp $
-
-inherit php-pear-lib-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Object Persistence Layer for PHP 5 (Generator)."
-HOMEPAGE="http://propel.phpdb.org/trac/wiki/"
-SRC_URI="http://pear.phpdb.org/get/propel_generator-${PV/_/}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/php-5.2.0"
-RDEPEND="${DEPEND}
-	>=dev-php5/phing-2.2.0"
-PDEPEND="!minimal? ( >=dev-php5/creole-1.1.0 )"
-
-S="${WORKDIR}/propel_generator-${PV/_/}"
-
-pkg_setup() {
-	# We need PDO and a few other things
-	require_php_with_use pdo reflection spl xml xsl
-}
diff --git a/dev-php5/propel-generator/propel-generator-1.3.0_beta4.ebuild b/dev-php5/propel-generator/propel-generator-1.3.0_beta4.ebuild
deleted file mode 100644
index c9491f019e37..000000000000
--- a/dev-php5/propel-generator/propel-generator-1.3.0_beta4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/propel-generator-1.3.0_beta4.ebuild,v 1.1 2008/02/26 16:40:24 armin76 Exp $
-
-inherit php-pear-lib-r1 depend.php
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Object Persistence Layer for PHP 5 (Generator)."
-HOMEPAGE="http://propel.phpdb.org/trac/wiki/"
-SRC_URI="http://pear.phpdb.org/get/propel_generator-${PV/_/}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/php-5.2.0"
-RDEPEND="${DEPEND}
-	>=dev-php5/phing-2.3.0"
-PDEPEND="!minimal? ( >=dev-php5/creole-1.1.0 )"
-
-S="${WORKDIR}/propel_generator-${PV/_/}"
-
-pkg_setup() {
-	# We need PDO and a few other things
-	require_php_with_use pdo reflection spl xml xsl
-}
diff --git a/dev-php5/propel-generator/propel-generator-1.5.1.ebuild b/dev-php5/propel-generator/propel-generator-1.5.1.ebuild
new file mode 100644
index 000000000000..0ba428044cf9
--- /dev/null
+++ b/dev-php5/propel-generator/propel-generator-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/propel-generator-1.5.1.ebuild,v 1.1 2010/05/29 18:22:37 mabi Exp $
+
+EAPI="2"
+inherit php-pear-lib-r1
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Object Persistence Layer for PHP 5 (Generator)."
+HOMEPAGE="http://propel.phpdb.org/trac/wiki/"
+SRC_URI="http://files.propelorm.org/propel-${PV}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/php-5.2.4[pdo,xml,xsl]
+		|| ( <dev-lang/php-5.3[reflection,spl] >=dev-lang/php-5.3 )
+		>=dev-php/pear-1.9.0-r1
+"
+RDEPEND="${DEPEND}
+	>=dev-php5/phing-2.3.0"
+
+S="${WORKDIR}/propel_generator-${PV}"
+
+need_php_by_category