Cleanup.

(Portage version: 2.1.2.2)

7 files changed, 36 insertions, 43 deletions

diff --git a/dev-php5/propel-generator/ChangeLog b/dev-php5/propel-generator/ChangeLog
index 373aca3a631b..71212aa3ddcf 100644
--- a/dev-php5/propel-generator/ChangeLog
+++ b/dev-php5/propel-generator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/propel-generator
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.6 2006/09/20 11:00:19 sebastian Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.7 2007/03/18 02:50:18 chtekk Exp $
+
+*propel-generator-1.2.1 (18 Mar 2007)
+
+  18 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/ForeignKey.php.patch, metadata.xml, -propel-generator-1.2.0.ebuild,
+  +propel-generator-1.2.1.ebuild:
+  Cleanup, version bump.
 
 *propel-generator-1.2.0 (20 Sep 2006)
 
diff --git a/dev-php5/propel-generator/files/ForeignKey.php.patch b/dev-php5/propel-generator/files/ForeignKey.php.patch
deleted file mode 100644
index 3c80cc8dc450..000000000000
--- a/dev-php5/propel-generator/files/ForeignKey.php.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur propel_generator-1.1.1/engine/database/model/ForeignKey.php propel_generator-1.1.1.patched/engine/database/model/ForeignKey.php
---- engine/database/model/ForeignKey.php	2005-09-17 16:39:12.000000000 +0200
-+++ engine/database/model/ForeignKey.php	2006-01-11 22:41:43.000000000 +0100
-@@ -43,10 +43,10 @@
- 
-     // the uppercase equivalent of the onDelete/onUpdate values in the dtd
-     const NONE     = "";            // No "ON [ DELETE | UPDATE]" behaviour specified.
--    const CASCADE  = "NO ACTION";
-+    const NOACTION = "NO ACTION";
-     const CASCADE  = "CASCADE";
-     const RESTRICT = "RESTRICT";
--    const SETNULL  = "SET DEFAULT";
-+    const SETDEFAULT = "SET DEFAULT";
-     const SETNULL  = "SET NULL";
- 
-     /**
diff --git a/dev-php5/propel-generator/files/digest-propel-generator-1.2.0 b/dev-php5/propel-generator/files/digest-propel-generator-1.2.0
deleted file mode 100644
index 61c08fad4521..000000000000
--- a/dev-php5/propel-generator/files/digest-propel-generator-1.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b02a220e4744997ed1bc01c0e65e24e9 propel_generator-1.2.0.tgz 216195
-RMD160 acfe4f137f3605cf4368e4cabc1fc14f4ee1d7e5 propel_generator-1.2.0.tgz 216195
-SHA256 c8a0b81dbc2ec470f9051775bf81b8ba0abd8afceb47af3b2b836542f8cf2111 propel_generator-1.2.0.tgz 216195
diff --git a/dev-php5/propel-generator/files/digest-propel-generator-1.2.1 b/dev-php5/propel-generator/files/digest-propel-generator-1.2.1
new file mode 100644
index 000000000000..c1a3fc4ce1a9
--- /dev/null
+++ b/dev-php5/propel-generator/files/digest-propel-generator-1.2.1
@@ -0,0 +1,3 @@
+MD5 c6de507845d46f8578867b830bc045dc propel_generator-1.2.1.tgz 209022
+RMD160 d01720b2b593a45889afe053c41dce26b8877b25 propel_generator-1.2.1.tgz 209022
+SHA256 802c213703e5987545655a654f0975168f2a9c81dc9ba556ba15a5af3221e95c propel_generator-1.2.1.tgz 209022
diff --git a/dev-php5/propel-generator/metadata.xml b/dev-php5/propel-generator/metadata.xml
index 40dbb4c4bbaf..fd3dbe39fa64 100644
--- a/dev-php5/propel-generator/metadata.xml
+++ b/dev-php5/propel-generator/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>php</herd>
+	<herd>php</herd>
 </pkgmetadata>
diff --git a/dev-php5/propel-generator/propel-generator-1.2.0.ebuild b/dev-php5/propel-generator/propel-generator-1.2.0.ebuild
deleted file mode 100644
index aeb128b1f5b2..000000000000
--- a/dev-php5/propel-generator/propel-generator-1.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 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.2.0.ebuild,v 1.1 2006/09/20 11:00:19 sebastian Exp $
-
-inherit php-pear-lib-r1
-
-DESCRIPTION="Object Persistence Layer for PHP 5 (Generator)"
-HOMEPAGE="http://propel.phpdb.org/wiki/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-SRC_URI="http://pear.phpdb.org/get/propel_generator-${PV}.tgz"
-RDEPEND=">=dev-php5/phing-2.2.0"
-S="${WORKDIR}/propel_generator-${PV}"
-
-need_php_by_category
-
-pkg_setup() {
-	require_php_with_use simplexml
-}
diff --git a/dev-php5/propel-generator/propel-generator-1.2.1.ebuild b/dev-php5/propel-generator/propel-generator-1.2.1.ebuild
new file mode 100644
index 000000000000..4fa7ca00839c
--- /dev/null
+++ b/dev-php5/propel-generator/propel-generator-1.2.1.ebuild
@@ -0,0 +1,23 @@
+# 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.2.1.ebuild,v 1.1 2007/03/18 02:50:18 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/creole-1.1.0
+		>=dev-php5/phing-2.2.0
+		>=dev-php/PEAR-Log-1.8.7-r1"
+
+S="${WORKDIR}/propel_generator-${PV}"
+
+need_php_by_category