From 51536d2fe4697ba9114d611178bb9e20d3d5b729 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Dec 2017 20:48:53 +0000 Subject: gentoo resync : 23.12.2017 --- dev-lang/tuprolog/Manifest | 4 - dev-lang/tuprolog/files/build-3.0.0.xml | 110 ----------------- .../tuprolog-3.0.0-no-dynamic-object-test.patch | 20 --- .../tuprolog/files/tuprolog-3.0.0-no-ikvm.patch | 137 --------------------- .../files/tuprolog-3.0.0-oolibrary-unit-test.patch | 11 -- 5 files changed, 282 deletions(-) delete mode 100644 dev-lang/tuprolog/files/build-3.0.0.xml delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch (limited to 'dev-lang/tuprolog') diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest index 744c2870715f..73a15276f1db 100644 --- a/dev-lang/tuprolog/Manifest +++ b/dev-lang/tuprolog/Manifest @@ -1,12 +1,8 @@ AUX build-2.9.2.xml 2863 BLAKE2B f7c86965edbe1ba6d332b170caab1db5d872174b3b014d25dda12681e8183de1d5de9c3a3a2595d7e6ebd3f44528703f0f7478aa1e4f0fc6b24d182a51f3a88f SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673 -AUX build-3.0.0.xml 2863 BLAKE2B f7c86965edbe1ba6d332b170caab1db5d872174b3b014d25dda12681e8183de1d5de9c3a3a2595d7e6ebd3f44528703f0f7478aa1e4f0fc6b24d182a51f3a88f SHA512 ca4dd0b76ae5a503a07f4c660f8715ff38b1c8e582de52928dad040f42a5fb7a9c774e039d9b7ca4b310b29241da6ab6b43115d741ed6dfbcc8538e384a05673 AUX build-3.0.1.xml 2968 BLAKE2B e403d134a62504c396842f2fad71cf2aec1786c5d7902d7d08398894eb0dfe709617ae137b2249cf81d5c82f14707364b072990b1cc695b9deb49f6cffb96377 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20 AUX build-3.1.0.xml 2968 BLAKE2B e403d134a62504c396842f2fad71cf2aec1786c5d7902d7d08398894eb0dfe709617ae137b2249cf81d5c82f14707364b072990b1cc695b9deb49f6cffb96377 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20 AUX tuprolog-2.9.2-no-dynamic-object-test.patch 758 BLAKE2B 8e4ed5b4a5a12e6140c5bdf4074a02061cc82c50b29dfa7d09fc4b2b44b7a6b580abda565d1c1615ae864fcc7fc6a86b6d71e69e3eabec00e2bf92800da06ee8 SHA512 bbaef70b751fe049680826fb82dc46a339f88d7b8062df0865fddb15de2c991939e7e2fae0f889db0c72d802790287487f442316ad6c9e7fa7276b30083b7365 AUX tuprolog-2.9.2-no-ikvm.patch 3929 BLAKE2B 0a6ec1d96c71762fee02b5701e2c445b000fae37eb335ed2a3fecdaabd4f28fbe894b2768a0c01e298accc267ff233e413370e7e744009b364b8b4888635b71f SHA512 a90b55f74841271a6ae9f4143203a9920adee9f7ab32c814d41f8830b7310919fcf035361f87fcd1ba7f7f0f0efe0c0a29ddff704c0d4d14ed2a41b4f7574a74 -AUX tuprolog-3.0.0-no-dynamic-object-test.patch 752 BLAKE2B 0e422ae5bf163373e65de50949c6d20af643fe161ee9b3341a8cdfc1fe8fb0dced1f494833ffbc102a09de2e7dad2ba71c7d94eae614d5de665a3cd9472b749e SHA512 e4797de5d857ddf9dddd4b0b5b73fd99f5b00915d2494661f115ff6da887d73840efb28d596ae7bb650cc0ef46b24381ed1688ca9d57a8ef554b6a878d8ae580 -AUX tuprolog-3.0.0-no-ikvm.patch 4830 BLAKE2B 860e66b833acfbc93039c93498f5b923bd7e06b458f58d7f7050c9d0b3c306173768edf6ec7354d1b493c6ed347d2598836d47a0bbb3604a62da805bbf55638c SHA512 4ac1b351b3ea3b2f441bdfed6f44ad561d37dcc0f7b41c0cd4919f8dd84e352b24939f0904f6696c3077556eb97b323a45ddd12a10ac866467c5e90e7e2e9500 -AUX tuprolog-3.0.0-oolibrary-unit-test.patch 628 BLAKE2B aaf8d8a154e2fc4bf0bf67581088f7b1fc1ad361d62cbd782726c69810b17c2337fd7dc5ee6bf291aedfeb76a541db4fba88664ccf9d1d90da2ab8e9b7fef5ed SHA512 b898f0d12c458df065d9d1d750e30d8625065f29a9fa3eb1e4def26c8b5e2637cf184d3c2a9ba64a305a7888915ecca891598b746fc30aa410ef88562eab2c13 AUX tuprolog-3.0.1-no-ikvm.patch 4844 BLAKE2B 6518c8821ef06f5b99de779d139b4d23e9e1458622edc267b237e7cb83d64164cd27a321d751423cbd0403a3666096322e80d0fdc6300df51a3ab54d4c1d9412 SHA512 c018d9028a9a4aea6c36057ac2d8b46d41da4961570fff491521c7b6bb816653db54a9e2a1049bd037aede7fa00262089f3787cad4a1e10836aa4f7442c727cd AUX tuprolog-3.0.1-oolibrary-unit-test.patch 762 BLAKE2B 615eb657e9c40a4cec568ae1a8b1868eaaa94d7911386099b65f06dd8002f9d77bce675f79c03db0c900f4b7fb10149b95aa328c582674fefe94ec7af8996d9d SHA512 54e3e9ef7ecc5ff27e687067a057e0c66f37e4d5f268d670210df89435333f7e303e640e12a4afd3c7906e3c52cd2de2466dc81b6cd2113aeb2ee0c7b5ad7a88 AUX tuprolog-3.1.0-no-ikvm.patch 4862 BLAKE2B c5e49ecc13f923157a9287ece06b1ecf1c8a418e449cc9f73ca6a5c2f2bbc7ec567b76ba04a43c6f42fce381941c1f5ee3897a6df20d6600e8d00c550100f9f2 SHA512 ceb45121b4bec54cdd26683ce1e7a63baea9d5c899cd5993d51cbaf8fdbc4b9138f926e164e1dd96eafb2af6b2112c44bf15b1f79c6b9096ac028e02c2dab1a0 diff --git a/dev-lang/tuprolog/files/build-3.0.0.xml b/dev-lang/tuprolog/files/build-3.0.0.xml deleted file mode 100644 index 823c2371d1fd..000000000000 --- a/dev-lang/tuprolog/files/build-3.0.0.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch deleted file mode 100644 index 36e683f8c117..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-10-08 14:34:12.000000000 +0200 -+++ tuprolog-3.0.0/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-10-08 17:30:18.525111794 +0200 -@@ -39,7 +39,7 @@ - SolveInfo goal = engine.solve(new Struct("demo", t)); - assertFalse(goal.isSuccess()); - } -- -+/* - public void testDynamicObjectsRetrival() throws PrologException { - Prolog engine = new Prolog(); - OOLibrary lib = (OOLibrary) engine.getLibrary("alice.tuprolog.lib.OOLibrary"); -@@ -53,7 +53,7 @@ - TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id); - assertEquals(2, counter.getValue()); - } -- -+*/ - - public void test_java_object() throws PrologException, IOException - { diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch deleted file mode 100644 index e0ee85c506c2..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -urN tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java ---- tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java 2016-10-08 14:33:19.000000000 +0200 -+++ tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java 2016-10-08 16:49:12.005214951 +0200 -@@ -9,11 +9,11 @@ - import java.net.URL; - import java.net.URLClassLoader; - import java.util.*; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - import alice.tuprolog.event.LibraryEvent; - import alice.tuprolog.event.WarningEvent; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - /** - * @author Alex Benini -@@ -179,31 +179,7 @@ - } else - // .NET - { -- Assembly asm = null; -- boolean classFound = false; -- className = "cli." -- + className.substring(0, className.indexOf(",")) -- .trim(); -- for (int i = 0; i < paths.length; i++) -- { -- try -- { -- asm = Assembly.LoadFrom(paths[i]); -- loader = new AssemblyCustomClassLoader(asm, urls); -- lib = (Library) Class.forName(className, true, loader).newInstance(); -- if (lib != null) -- { -- classFound = true; -- break; -- } -- } catch (Exception e) -- { -- e.printStackTrace(); -- continue; -- } -- } -- if (!classFound) -- throw new InvalidLibraryException(className, -1, -1); -+ throw new InvalidLibraryException(className, -1, -1); - } - } - -@@ -462,4 +438,4 @@ - return optimizedDirectory; - } - --} -\ No newline at end of file -+} -diff -urN tuprolog-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java ---- tuprolog-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2016-10-08 14:33:19.000000000 +0200 -+++ tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java 2016-10-08 16:49:12.006214951 +0200 -@@ -18,7 +18,7 @@ - package alice.tuprologx.ide; - - import alice.tuprolog.*; --import alice.util.AssemblyCustomClassLoader; -+//import alice.util.AssemblyCustomClassLoader; - - import java.io.File; - import java.net.URL; -@@ -26,7 +26,7 @@ - import java.util.ArrayList; - import java.util.Hashtable; - import java.util.StringTokenizer; --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - /** - * A dynamic manager for tuProlog libraries. -@@ -155,10 +155,7 @@ - // .NET - if(System.getProperty("java.vm.name").equals("IKVM.NET")) - { -- Assembly asm = Assembly.LoadFrom(file.getPath()); -- loader = new AssemblyCustomClassLoader(asm, new URL[]{url}); -- libraryClassname = "cli." + libraryClassname.substring(0, -- libraryClassname.indexOf(",")).trim(); -+ throw new InvalidLibraryException(libraryClassname,-1,-1); - } - // JVM - else -diff -urN tuprolog-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.0/src/alice/util/AssemblyCustomClassLoader.java ---- tuprolog-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2016-10-08 14:33:19.000000000 +0200 -+++ tuprolog-3.0.0/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100 -@@ -1,21 +0,0 @@ --package alice.util; -- --import java.net.URL; -- --public class AssemblyCustomClassLoader extends java.net.URLClassLoader --{ -- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls) -- { -- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm)); -- // explicitly calling addURL() is safer than passing it to the super constructor, -- // because this class loader instance may be used during the URL construction. -- for (URL url : urls) { -- addURL(url); -- } -- } -- -- public void addUrl(URL url) -- { -- addURL(url); -- } --} -\ No newline at end of file -diff -urN tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java ---- tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java 2016-10-08 14:33:19.000000000 +0200 -+++ tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java 2016-10-08 17:03:17.816179576 +0200 -@@ -1,7 +1,7 @@ - package alice.util.proxyGenerator; - import javax.tools.*; - --import cli.System.Reflection.Assembly; -+//import cli.System.Reflection.Assembly; - - import java.lang.reflect.*; - import java.util.*; -@@ -29,7 +29,7 @@ - } - - if(System.getProperty("java.vm.name").equals("IKVM.NET")) -- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools")); -+ throw new UnsupportedOperationException("IKVM.NET not supported!"); - - jc = ToolProvider.getSystemJavaCompiler(); - if (jc == null) { diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch deleted file mode 100644 index f9c13aecb9e7..000000000000 --- a/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/PrologTestCase.java 2016-10-08 14:34:12.000000000 +0200 -+++ tuprolog-3.0.0/test/unit/alice/tuprolog/PrologTestCase.java 2016-10-08 17:43:28.339078761 +0200 -@@ -32,7 +32,7 @@ - assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary")); - Library javaLibrary = new alice.tuprolog.lib.OOLibrary(); - engine.loadLibrary(javaLibrary); -- assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary")); -+ assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary")); - } - - public void testGetLibraryWithName() throws InvalidLibraryException { -- cgit v1.2.3