gentoo resync : 02.02.2022

5 files changed, 4 insertions, 225 deletions

diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 3540d31981f1..fac737da4883 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,9 +1,5 @@
 AUX build-3.x.xml 2968 BLAKE2B e403d134a62504c396842f2fad71cf2aec1786c5d7902d7d08398894eb0dfe709617ae137b2249cf81d5c82f14707364b072990b1cc695b9deb49f6cffb96377 SHA512 4e65ba93141f8c47b2be9f534b05be3c4fa33428df73a23148b8f0f675f617071ad6c14c8aaa1f1ed6de03832f3e26b0b065b2f67834199244fbe55b398f0f20
-AUX tuprolog-3.1.0-no-ikvm.patch 4862 BLAKE2B c5e49ecc13f923157a9287ece06b1ecf1c8a418e449cc9f73ca6a5c2f2bbc7ec567b76ba04a43c6f42fce381941c1f5ee3897a6df20d6600e8d00c550100f9f2 SHA512 ceb45121b4bec54cdd26683ce1e7a63baea9d5c899cd5993d51cbaf8fdbc4b9138f926e164e1dd96eafb2af6b2112c44bf15b1f79c6b9096ac028e02c2dab1a0
-AUX tuprolog-3.1.0-test-suite.patch 518 BLAKE2B 08cfea93b9675826bacb9f7a9970120a02fed2826d8edfa025dfaf4ee03f3bceba32cb197178a9edb1bf2d41354d6ca22c25e3a851578d61735c63c54cd5e6c2 SHA512 58d3ea5c0bb4606c72fa1bb7a1d92974fe9e5229e9674212f8fdbf53d09a345090fda96bf05dd867c01484577bd5f28a56813c8808e072c7c03282afc6d9933a
-DIST tuprolog-3.1.0.tar.gz 7201383 BLAKE2B 9d8b610240611cd5b3d0dae104a44c72bb5e7c0512e4dbf3e178204d9d36e461219cd869ca1e16e3054ca3e1ee34d3b2c6fa5c659df16f54e3266c7c826af8d6 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf
 DIST tuprolog-3.2.0-gentoo-patchset-0.tar.gz 1813 BLAKE2B 4ed7ffbb752a821a2b2842cfdbc1f4ec92d14b35a1c5a722207b45ec9dbdc44588acc010fb6386e8ed2e7d30d3bc8d425f0f74e8cc953cb7afad8305904e1499 SHA512 454757fc01f3f697510426e7a2a41b57350c1e3f980e381e197616e10eaf88339155226096f1d417397b9bc6f4964a45b3d547c6794ad23a4a014b06212b08f0
 DIST tuprolog-3.2.0.tar.gz 6242286 BLAKE2B 77a3d3f886673aca72fffd9bb60657efcbe7ea5bb0f84eea7a72df513295d572c8116472f8d544240fac676ac9a6a0fcecfc3166e6426ef7d8af80eac4ba8d85 SHA512 e27bd989d66bae26c646cb69670fb75232ebdd18d1dbb9d600f9847921ecd56d17221736b3ec15c087857509272ce89af8bc44924130430db3860870a06bb499
-EBUILD tuprolog-3.1.0-r1.ebuild 1353 BLAKE2B c3032b16a92139d3ee84fdf477ebc6629eb21093f09b4c27524d96db5cc976666831041b73668e63a83e556c84cb310ff2329dbb3dc416cd0ff43f23384d54dd SHA512 404ed50d2778ab5756ad7f2c8c0df3a2e424b3830fd3ec0a451cef94d324c673766476a83f8af52ca16a939c4a7bec593abfc8316f1fe47ff411c36535370d0d
-EBUILD tuprolog-3.2.0.ebuild 1435 BLAKE2B 89ae88afae7fbbdb919aeda77daf29824ed3f01ab2c0266744dccecdde5dcefde57be7882f2aa98bf9483b7ef632dc33a37800364dfdead1b8b9433452cc45d2 SHA512 b8482dffbcc336ec1a1610a61223eac6c29939794c8a06f525609395c6a1186cbb49d6b16693ee27cd8384283b03a4ce437438f58c1d9866d597b7b7d65873f7
+EBUILD tuprolog-3.2.0.ebuild 1429 BLAKE2B 99b19c6683a4166bb177edfe8c029f6174056b1a87fd21102eb29a112214d65daee40a299373708f7f193e157fcc22d9ed7af98ecb51653c3386b56ff9db6898 SHA512 d2945a82fb72f10d49c90aca0ec1cda94941865ea6a61470d7f9b7e2748f5dc5e311347dbb952cb3801a9bfad780ea4ca8271b71fa22a199fc077938e3dd9e36
 MISC metadata.xml 319 BLAKE2B ca131e483438742de5ab07f1e8c3891664ecf893ef477c917688fab8968cc5a790be3512f70027c86cfa03372d1234da3b737a1d68351c95e8902bd0eff59020 SHA512 5ed1bafbb0e39e5e97b32be26dbcb18f32063f60ed0db7ec99d08cd37d36dea037f257df5e3f63ff0dfa4bb8af2b41615d0f7bb1f937fa1449ef245d652eb5df
diff --git a/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
deleted file mode 100644
index eb20dacd4430..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urN tuprolog-3.1.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.1.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-3.1.0.orig/src/alice/tuprolog/LibraryManager.java	2017-10-08 17:06:55.710627376 +0200
-+++ tuprolog-3.1.0/src/alice/tuprolog/LibraryManager.java	2017-10-08 17:18:20.817598723 +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;
- 	}
- 
--}
-\ Manca newline alla fine del file
-+}
-diff -urN tuprolog-3.1.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.1.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-3.1.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2017-10-08 17:06:55.796627373 +0200
-+++ tuprolog-3.1.0/src/alice/tuprologx/ide/LibraryManager.java	2017-10-08 17:20:18.378593806 +0200
-@@ -19,7 +19,7 @@
- 

- import alice.tuprolog.*;

- import alice.tuprolog.InvalidLibraryException;

--import alice.util.AssemblyCustomClassLoader;

-+//import alice.util.AssemblyCustomClassLoader;

- 

- import java.io.File;

- import java.net.URL;

-@@ -27,7 +27,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.

-@@ -156,10 +156,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.1.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.1.0/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-3.1.0.orig/src/alice/util/AssemblyCustomClassLoader.java	2017-10-08 17:06:55.863627370 +0200
-+++ tuprolog-3.1.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);

--  }

--}
-\ Manca newline alla fine del file
-diff -urN tuprolog-3.1.0.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.1.0/src/alice/util/proxyGenerator/Generator.java
---- tuprolog-3.1.0.orig/src/alice/util/proxyGenerator/Generator.java	2017-10-08 17:06:55.877627369 +0200
-+++ tuprolog-3.1.0/src/alice/util/proxyGenerator/Generator.java	2017-10-08 17:18:20.819598723 +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.1.0-test-suite.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
deleted file mode 100644
index 5be70460b6d2..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tuprolog-3.1.0.orig/test/unit/alice/tuprolog/TuPrologTestSuite.java	2020-07-18 15:41:48.236891336 +0200
-+++ tuprolog-3.1.0/test/unit/alice/tuprolog/TuPrologTestSuite.java	2020-07-18 15:42:11.458890364 +0200
-@@ -22,10 +22,8 @@
- 				ParserTestCase.class,
- 				SpyEventTestCase.class, 
- 				VarTestCase.class, 
--				TestVarIsEqual.class, 
- 				JavaDynamicClassLoaderTestCase.class,
- 				ISOIOLibraryTestCase.class,
--				SocketLibTestCase.class,
- 				ThreadLibraryTestCase.class
- })
- public class TuPrologTestSuite {}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
deleted file mode 100644
index be88f6b7c258..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}.tar.gz"
-
-LICENSE="LGPL-3 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
-	 dev-java/javassist:3
-	 dev-java/commons-lang:3.6"
-
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-		dev-java/hamcrest-core:1.3
-	)"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.6"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-ikvm.patch
-	eapply "${FILESDIR}"/${P}-test-suite.patch
-	eapply_user
-
-	cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit:4
-	java-pkg_jar-from hamcrest-core:1.3
-	cd "${S}"
-	ANT_TASKS="ant-junit4" eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dojar dist/2p.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/* || die
-		dodoc doc/tuprolog-guide.pdf
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc doc/examples/*.pl
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.2.0.ebuild b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
index 74d456f6683d..5d5a4d21798e 100644
--- a/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,11 @@ SRC_URI="https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}.tar.gz
 
 LICENSE="LGPL-3 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=virtual/jdk-1.8:=
+RDEPEND="virtual/jdk:1.8
 	dev-java/javassist:3
 	dev-java/commons-lang:3.6
 	dev-java/gson:2.6"