Add generics patch to fix tuprologx.AnotherList method call on Term lists

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

4 files changed, 21 insertions, 4 deletions

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index 995b8df463a6..7564b14e18e2 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.33 2010/09/13 07:29:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.34 2010/11/05 23:44:34 keri Exp $
+
+  05 Nov 2010; <keri@gentoo.org> tuprolog-2.3.0_alpha.ebuild,
+  +files/tuprolog-2.3.0_alpha-generics.patch:
+  Add generics patch to fix tuprologx.AnotherList method call on Term lists
 
   13 Sep 2010; <keri@gentoo.org> tuprolog-2.3.0_alpha.ebuild:
   Add dev-lang/javassist to RDEPEND. Closes #336952
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 7ceaa108d4ac..ef380a98f976 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,10 +1,11 @@
 AUX build.xml 2388 RMD160 022f9159fac0de7e7609bc6868997f0afb8e8ada SHA1 4c34133ae643e0fb7d5f5fc1a98610bf4f71a674 SHA256 a25dcbe42c235e2274c4cf16c1b70986df04d83513dd6573188214bce19933e3
 AUX tuprolog-2.1.1-java1.4.patch 6318 RMD160 621aec83d6f77585f15d4d0109b085c380d6e001 SHA1 4b0a471bd4103270274c5cd7e417140c45f06e15 SHA256 35bb62c71b645289242b2bb610879a455f408eddb8f65b6ead7ac71ebdfe12bc
 AUX tuprolog-2.1.1-javadocs.patch 6573 RMD160 0cc1f044ada95113ae638a9cd48c920fa3903a31 SHA1 64206767a27e7fceea9b04f9e65d2846bcd56b9d SHA256 12bc23f7f9300cc6e6d3ca0d3ebac163acec01bc490ad08135127bcded883bef
+AUX tuprolog-2.3.0_alpha-generics.patch 682 RMD160 de3a8f7c9654937b61d15cd6345c87f057a61db1 SHA1 0ee58b501c8c591ccf744bd876f8fb10fa35d99b SHA256 22b7425a3dbd857084a141fd5068239ba79882f781bd0b3c9f6496f3b26e4193
 AUX tuprolog-2.3.0_alpha-javadocs.patch 9013 RMD160 23422b8594bc5961d51d66ef4beb968e467fda94 SHA1 486339da7d60b60e8c059c58f679a58ba3bb76dd SHA256 906bf26e74ce0b15af63917f2a95d5f7287f77ee0bf84eeebe1923101e4fd4a6
 DIST 2p-2.1.1.zip 1879216 RMD160 4cb3c1505c78ac0c432a0369ca117244cf4a7bba SHA1 3477a5432a74e5d58fb9cdf1e227288025300be0 SHA256 fe49fbee0c22c3bb6799895f4e1694ead184a689ab753ebf56031c2891dab7b5
 DIST 2p-2.3.0alpha.zip 2757862 RMD160 c6fc771b8b236433de41e160ca1ebe5ea0605b12 SHA1 d379fd42db9f4accf75b5b9d4570854fd3e9dc46 SHA256 f8c1da73d0a5ca04267aec46e0636754dad747f4354069fad40e054aaacbfed2
 EBUILD tuprolog-2.1.1.ebuild 1158 RMD160 67d6af25e461d64096a82432bc5b5206d6566281 SHA1 fe843f7462451d1217bde223d68b518592ced492 SHA256 11a8bbcc8a7602ad1c5532c5bf3e82ea7d2d7c907f73dd68a0ab6230d909bb4d
-EBUILD tuprolog-2.3.0_alpha.ebuild 1002 RMD160 174458681492266ac4a908fd96bbb8ac69c0afba SHA1 cfc9c7d0aa066ad91600ecf5107e719c69596162 SHA256 14565ceeebba5ba87c30046ded40a38e29899e3b9705d4ad3e865d18bb30b9df
-MISC ChangeLog 4623 RMD160 4abf675df6819d4e4bb6ad0d92bf61e93a7731dd SHA1 a8e4f8ac856fa6db3789de2498d55040ccd794a7 SHA256 e4ca8e660ca0e7856c9c8e066b3cbe421e542a754297ba7bc033fb4fd8a9ea78
+EBUILD tuprolog-2.3.0_alpha.ebuild 1044 RMD160 0e76b9bbfd8bf80b0731945b7a8dc64ffe71584a SHA1 ae066137f20ec3be98757dc62ffd6b3710051ada SHA256 97f99e229ba2f2570caa390a860e45de1a43d8bbe486adb552bf6d2de2d070b4
+MISC ChangeLog 4808 RMD160 d6b03633dd095b20eef9a27c3e3c0a4bbd5adb24 SHA1 514d50dd7f045ea1c21a3b849769f227564a693a SHA256 0682e1af4d9fc7bbd25780cda51778e34fbb938182fbc7a32fe8dcf29d93afaf
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/tuprolog/files/tuprolog-2.3.0_alpha-generics.patch b/dev-lang/tuprolog/files/tuprolog-2.3.0_alpha-generics.patch
new file mode 100644
index 000000000000..2227fa1b89cd
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.3.0_alpha-generics.patch
@@ -0,0 +1,11 @@
+--- tuprolog.orig/src/alice/tuprologx/pj/test/AnotherList.java	2010-01-21 21:29:48.000000000 +1300
++++ tuprolog/src/alice/tuprologx/pj/test/AnotherList.java	2010-11-06 12:39:28.000000000 +1300
+@@ -47,7 +47,7 @@
+       AnotherList lists = PJ.newInstance(AnotherList.class);
+       List<Int> l=lists.nil();          // Creating an empty list []
+       for (int i=10;i>0;i--){
+-          l=lists.add(new Int(i),l);    // Adding elements...[1,2,3,4,5,6,7,8,9,10]
++          l=lists.<Int,List<Int>,List<Int>>add(new Int(i),l);    // Adding elements...[1,2,3,4,5,6,7,8,9,10]
+       }
+       Var<List<Int>> l1 = new Var<List<Int>>("X");
+       Var<List<Int>> l2 = new Var<List<Int>>("Y");
diff --git a/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild b/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild
index b520667eafbf..974e1ad460df 100644
--- a/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild,v 1.3 2010/09/13 07:29:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.3.0_alpha.ebuild,v 1.4 2010/11/05 23:44:34 keri Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -29,6 +29,7 @@ EANT_GENTOO_CLASSPATH="javassist-3"
 
 src_unpack() {
 	unpack ${A}
+	epatch "${FILESDIR}"/${P}-generics.patch
 	epatch "${FILESDIR}"/${P}-javadocs.patch
 
 	cp "${FILESDIR}"/build.xml "${S}"