Fix bug 118674.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 31 insertions, 9 deletions

diff --git a/dev-php5/propel-generator/ChangeLog b/dev-php5/propel-generator/ChangeLog
index 2f8e875bcdd0..e6e504927afa 100644
--- a/dev-php5/propel-generator/ChangeLog
+++ b/dev-php5/propel-generator/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for dev-php/propel-generator
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.2 2006/01/11 21:29:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/ChangeLog,v 1.3 2006/01/11 21:57:08 sebastian Exp $
 
   11 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
-  propel-generator-1.1.1.ebuild:
-  Require the SimpleXML extension, partially fixes bug 118674.
+  +files/ForeignKey.php.patch, propel-generator-1.1.1.ebuild:
+  Fix bug 118674.
 
   01 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org> +metadata.xml,
   +propel-generator-1.1.1.ebuild:
diff --git a/dev-php5/propel-generator/Manifest b/dev-php5/propel-generator/Manifest
index 08a53450d741..cdd194cf99dd 100644
--- a/dev-php5/propel-generator/Manifest
+++ b/dev-php5/propel-generator/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b951e9fe793b67472d56a319149240ef ChangeLog 1760
+MD5 c79945f6a9a3533237d1617362e83911 ChangeLog 1744
+MD5 4a86c144e772d841fc8185247535a67f files/ForeignKey.php.patch 735
 MD5 9fb7570436bd9872be728c945ff22711 files/digest-propel-generator-1.1.1 71
 MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
-MD5 d824e48c84f994a450bd23c74f90aa3f propel-generator-1.1.1.ebuild 635
+MD5 bcfc2d22f20de7b8b821cffa0b55f443 propel-generator-1.1.1.ebuild 726
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDxXjOaGfFFLhbXWkRAtZNAJ4gx9uElhfwP39daGc3zswlu9OMwgCffj3k
-5LeCOSI3FavDND36EhFutQI=
-=/Uej
+iD8DBQFDxX9ZaGfFFLhbXWkRAky5AJ0VI1EIPgCT2EflY7NjWzp8z6tnLQCeN2mX
+/yMaeuo3ft7s8og7FvIamUQ=
+=FekR
 -----END PGP SIGNATURE-----
diff --git a/dev-php5/propel-generator/files/ForeignKey.php.patch b/dev-php5/propel-generator/files/ForeignKey.php.patch
new file mode 100644
index 000000000000..3c80cc8dc450
--- /dev/null
+++ b/dev-php5/propel-generator/files/ForeignKey.php.patch
@@ -0,0 +1,16 @@
+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/propel-generator-1.1.1.ebuild b/dev-php5/propel-generator/propel-generator-1.1.1.ebuild
index cf1227bbd120..b2a9160d24f7 100644
--- a/dev-php5/propel-generator/propel-generator-1.1.1.ebuild
+++ b/dev-php5/propel-generator/propel-generator-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1.ebuild,v 1.3 2006/01/11 21:29:36 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/propel-generator/propel-generator-1.1.1.ebuild,v 1.4 2006/01/11 21:57:08 sebastian Exp $
 
 inherit php-pear-lib-r1
 
@@ -19,3 +19,8 @@ need_php_by_category
 pkg_setup() {
 	require_php_with_use simplexml
 }
+
+src_install() {
+	epatch "${FILESDIR}/ForeignKey.php.patch"
+	php-pear-lib-r1_src_install
+}