From cfc88be2700a4430f4fa5eedbbd863ad263ad679 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Sun, 23 Jan 2022 16:10:37 +0100 Subject: dev-lang/tuprolog: remove old version Package-Manager: Portage-3.0.28, Repoman-3.0.2 Signed-off-by: Keri Harris --- dev-lang/tuprolog/Manifest | 1 - .../tuprolog/files/tuprolog-3.1.0-no-ikvm.patch | 137 --------------------- .../tuprolog/files/tuprolog-3.1.0-test-suite.patch | 13 -- dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild | 67 ---------- 4 files changed, 218 deletions(-) delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch delete mode 100644 dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch delete mode 100644 dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild (limited to 'dev-lang/tuprolog') diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest index 3153148ca024..de0037b24b81 100644 --- a/dev-lang/tuprolog/Manifest +++ b/dev-lang/tuprolog/Manifest @@ -1,3 +1,2 @@ -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 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 b8f444cac75e..000000000000 --- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 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 -} -- cgit v1.2.3-65-gdbad