From: Keri Harris Date: Sun, 11 Jan 2015 14:12:07 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77e3535536139b16e803150dff7c11eecca01705;p=gentoo.git Version bump Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA138F5ED --- diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog index 6fc9b5ba10e9..e81dc3c1f4e3 100644 --- a/dev-lang/tuprolog/ChangeLog +++ b/dev-lang/tuprolog/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/tuprolog -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.54 2014/11/09 17:38:09 keri Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.55 2015/01/11 14:11:56 keri Exp $ + +*tuprolog-2.9.0 (11 Jan 2015) + + 11 Jan 2015; +tuprolog-2.9.0.ebuild, + +files/tuprolog-2.9.0-no-ikvm.patch, files/build.xml: + Version bump 09 Nov 2014; tuprolog-2.7.2.ebuild, +files/tuprolog-2.7.2-no-ikvm.patch: diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest index 08785001c5e0..86e17ffe3479 100644 --- a/dev-lang/tuprolog/Manifest +++ b/dev-lang/tuprolog/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX build.xml 2413 SHA256 b0db72e40147db8b9c021bdbb693fadd6cdf508dcd5702f862abef6939308189 SHA512 929429f13d26f8c652008db8249055a06c21118585d27404eccda283e8a992e5e541dff0df1222a421c781f7a67d4c64dbcb58b89d54636741e1ef810b2f424d WHIRLPOOL 34edd22911973f95aae0225444b44ab7bb69c76384c3151cc75743f3327645adb732b897f0b96e28712df647143339e4b5b5ed4d6be2fd744374830fe736f95f +AUX build.xml 2586 SHA256 eceeb6e5901078235c6d9e3b834afb2790fba35679efd95d93417829c4b1fc54 SHA512 4b83b1cf90f60094530d7a9a413823a6e1b1e7a26b862b5297570b7851f3e6f52a0c485b240d89957982b68e26cce1fe0a82205feac3778cc4874fdd94f972da WHIRLPOOL e8fae32f0344dcc72fc815c246139678fbc6efefdb76728000ebfad2f798910b031c6223bf880493f3b60f5b0e5f826685520415c40a103b4f5b14fb0ccfbbfe AUX tuprolog-2.3.1_beta-javadocs.patch 9848 SHA256 1fe5fdc8e5ed4af7051e724d84795986cf57309402eeb748d56283f36c806cc5 SHA512 ac91902fffa1cbcb03e5faa39a92850cf025ef18f67475c410c15ec773f9123f31f76d6fd2226c0865b6c80bb6400d177add05efbd24956f3ac8d2eb30921bf4 WHIRLPOOL d4135d2cc3697814aa3ff8c636aca9fd971980044c573080c851889157cdffcd9eaef9648a0ca524533f8b0253ef937823eed0751b45b63f741c1cbe5c4755a3 AUX tuprolog-2.4.0_rc5-javadocs.patch 12383 SHA256 68eba3d741371af2246fc1869c06a5c75b2d477d330066487465976f720efcf0 SHA512 80e433039f2aa3861ab621a779fd8c379bc5598dd15359d901de673c2d7e129b5c407bec37d940e597023ab966f3f557923a2b3860b14a7b2dadecae83ca949f WHIRLPOOL 95cbeed01ef56adac101fba01b75c6aa27dee146aa780039455f463ee306616a07f226c76571468466ff85485011f3c6387a1422ec96a914fa8755f0e105e88e AUX tuprolog-2.5.0-javadocs.patch 12506 SHA256 77146c866bbe70f094a3df2fcf55ac144cb37c5b6a42c3caac55b54c5cc6afa2 SHA512 53139c26bd74e32e795be023d3ed2a8f345badfa21db766daa97f55a159252e66f8dfebb799aa00889c0d016eb8f00b4b7483e9625b6eeee63d3f62aa94508ce WHIRLPOOL db11f7b35981ed48e86df0160ca3d9c15d4cf99bcb36adfacc41c275c993cdaaf6c4888ac7523bfbe936b71e42cfa1f6868191bebd88ddd761fa115ea3023846 @@ -9,22 +9,25 @@ AUX tuprolog-2.6.0-javadocs.patch 18311 SHA256 9055e8344fd26f23f2e5512308303fafc AUX tuprolog-2.7.0-javadocs.patch 17772 SHA256 ff42e28a66aba379a71fc799fefa72f317efac638422cf48d345e6db02f3dc92 SHA512 6f93d5414b8ac30d7c774dfa89ac8b86fed55ed0dd38efe3dc49bcc83c0b708036ec2ca4407886f262c3d137241869ccdb734214f3fa4a8faea56776517a679f WHIRLPOOL 2ff92961d240776d860f76a05ca74973775bd3c274fc900ed7f8049b4abae18dab2ca90ff2c2def1912ce207cd2afb0dab66cf7aa4913385c5f7cbacece690f4 AUX tuprolog-2.7.2-javadocs.patch 19652 SHA256 7c034db0ce01ba841e43f3be4c14a0d7306f41e267d966f6d2ac1b8a325701f1 SHA512 658f92bdc1a739e02cdef46358d60ce3cacfa33b816a9d95fa098fbf0b9e6c692464edaab385b940ff6e9bed7cce7e9f1aa38836f9587f68e8f3390719b0c0c2 WHIRLPOOL 8fc986bf8fb05dcae960509206290b016d6f2ca5819fd15a0dd0b453c3d9d9797dd1ca423e93bb5a0d98a82e09b48deea7ec7abfcdf9b9d4a825753c05a03326 AUX tuprolog-2.7.2-no-ikvm.patch 3825 SHA256 330e1a25e07c48290f440cb169c18c97a7a72a782b1384848b813963502bca1c SHA512 a1f1faa8e6392cbf2b9fb4d61a7698e610b2ecd2ac2753629a31e409a167e5a03a4ab8603a1c78ef51374d75a2670a4dec5fcb0fab2c4c946196a240bdf58066 WHIRLPOOL f1bf4cfe33c0577e139d10ebc6a259ebac4ba138b8509cb444975182c53ca779ac6d00836d81d3f9d028a9f5f2fa1166e2c7cd518089a526567f1a9627271202 +AUX tuprolog-2.9.0-no-ikvm.patch 3929 SHA256 a3f74a551dd9710ab1069d8d1f3dcbfd39b8fc52777b45100094e9e06c4f6d8b SHA512 a90b55f74841271a6ae9f4143203a9920adee9f7ab32c814d41f8830b7310919fcf035361f87fcd1ba7f7f0f0efe0c0a29ddff704c0d4d14ed2a41b4f7574a74 WHIRLPOOL 54d57bbf90a708d2118728e698be70513724fde6163e718bfe4c0ae52777eadccb7fa34319814efdbc9fcee3516c0e69b37b68276d52c6ccb2d6309cdc24dfbf DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04 DIST tuprolog-2.6.0.tar.gz 8366655 SHA256 5c9416c72ddde806720c1bce122a8bb12cab04a9af35a42b88067e1b145bf0c5 SHA512 5253f0d65787e9f090a8b4da8df007da269492098686fa5847e8d624a6656d1820b36c5b096e51d6f40480fea02a64793797c23161627942f076fc5eae414b82 WHIRLPOOL 81de4453dd6b62558260f31ab2e3af1f2a256934cc8a24a9e18723bd95ef646b206941169a3d69994f26f20c65c00b14022392f35ccb8573d8a7cbc7af16b353 DIST tuprolog-2.7.0.tar.gz 9005490 SHA256 93cec171d48e40a695baafcce419b75fc3d7b6e5ef06b0e787b4823e09f571a7 SHA512 88a9edb5c26317ea82e114a7e82d933d99f85ca89f1244d92de66e7eae11c8c61ed771c104a70ec210c1a65dca2b3ca2c3aba077d3afab4b250b62d14e83c7e4 WHIRLPOOL 3f4c76bea53b899d7be6fa93a9b24c5aaab84bd5ba4c65ca2a988e3a8acaeb1f2d0205c3a60720fbbf02a54d52bb6e7c39b5504ae9777d80d8f238b7c3c7050a DIST tuprolog-2.7.2.tar.gz 9104934 SHA256 8b0c653d3c9d701197f13d8dec6e45548565cddfd052a5bec9578f4e6a50f21e SHA512 c327893e0fcf777b6ad8951b3baf88bc9527bf88e9d06ac54af04e777e6c0fc255b15f492c2cf483859d3a1966897d5969e1496370b88287b96e83d92babc722 WHIRLPOOL cf5082d0ca07f8bc59e678c27b1fb8aaa8879f6b15dc887949cb61760dfd721ba4a6fd5b05fb979ea94e6ab607dfcff5707be47d5ac657623556426e734ca395 +DIST tuprolog-2.9.0.tar.gz 4841110 SHA256 e789c7f1777a4f57698ac4756d03574f8fd5be4cebb1d5226722c35df75e163f SHA512 be15c99c40f750f3d1d4b70ae7ced9fe3792e8747876b6190ec1a01dd287e0fa34f88671f99f9e3fd7249e6fd44da7c4dadce0cd111b44b24e0e43d31c85165e WHIRLPOOL ada10ff775dc5e55d5c55c4dc920f5a4e7f8654891a10cf815734649e384fe6351921b807c54f6a6e8503fcbd0cbd9ee7f1569140bb5eba7e77e4da85f907203 EBUILD tuprolog-2.4.0_rc5.ebuild 1224 SHA256 aa9d7e1abae601aac541a55a6fbbe63c4e3dfa52c817a59b6be0e0d691643f08 SHA512 920d9d28b65084cd39dab2799b9cef465774cda0a6f33a9b44a03ae72ee4e5b56d3bffbe422cccf9c00e10cf7044972f0164ff553d7b64f9a7f0fca68fb19a98 WHIRLPOOL d34be506bf5635ce6aaa2fb2f15b632cf6aa7da06927514f82c1872a289f1828dc9b8533da1e165dd39405bd9afd1e35b5b88e3aae7812c0e3342782d6948aee EBUILD tuprolog-2.5.0.ebuild 1172 SHA256 1e1be70850ad3bec284380d68b567d40e315e983008ceb7a64140ce0a09ef822 SHA512 42b91b0532939a87be26565b23f6dea1c29c3f5392a0a9ae368627b274ca34ef5597205d4cd8662be856be1a356ea3c37178207baeb4883efd641412d1f3b492 WHIRLPOOL f0a3fdb0e570b1f7f19919d7f53fe80e25291a9e1b3335935e20f212d852dc86bb7091b34a9a0c2653e8e19c33b0245af0d2df34c0ad00b8ff5b190596ad1db2 EBUILD tuprolog-2.6.0.ebuild 1245 SHA256 574ce101701dec35c72ce77b421cd54703983d14b6158baa2366139aa15e6c61 SHA512 89e2bd20e1f6ec7255525d1728153d0070a3bf64a39d13183cf10ca61970b485ef605aefd3b72833dd86c70226b58b178be304cd5dde78abc6caa3b56b3370d9 WHIRLPOOL 24d9362597119b4ea519e9d75e4c5565f488a336664af2455edcc9793d137dd041a6fa5d31409438594ad3457b15c2914197aeddc43812e9fb41b5d1ac093ec4 EBUILD tuprolog-2.7.0.ebuild 1235 SHA256 cbe4133c91aa2fd27976c5246f9e75bc49b4d6fac81bae05cbe9c18ab2c871ce SHA512 d9a193d8473851a24ebc06d7bc4a805b5ba49acbc00e61c62a599e4fcfe600d051048e17c5796b9594d4fe07e1d06b3ec1651855febea95848b546577fd5075e WHIRLPOOL ed8f9eb482f66856be08739339704675fe8cb0d46deea6817483ed8bd1eaef597038c5d70eda26a1c3adddf6ff536067cffaa2c5c257fbd70cded29e315240f1 EBUILD tuprolog-2.7.2.ebuild 1276 SHA256 681b6e6097cbf01eb2eb3e1c73019667c1b154b5b6e7ef74a913f96bdcecab1c SHA512 a561a382722a3ade102bc1f9b2832e23a6e5db06706b7c52345049aa616bc4aa7419f7a10787b5a031b62d56d21f116a1f1aa03bb7fea69d327c0539dd0e776c WHIRLPOOL b19a2e97983a43ceb06d7a65656a6d559e372a1b9ceaf7473d6fe909b8997ba66fcb13e1addb0bec16a77f7bc361928bf9fa857f4bf6645ec6b0ba7d2f7ec04c -MISC ChangeLog 7544 SHA256 a3df1ee8cddf60d381069f0dd165b40ed1460765c490c99a432febd056ae7fcf SHA512 9191483dbf78c311f9ec8b8805dd08e02cfe5d56618bad73ca4e58f78b6bb1fa626f37402c0952fd1be0cb26b1852799b5e477b1d3540b373f67906bb15a33af WHIRLPOOL 3305831995c5f9476435abb0a1c18c0b6ee405176f83b038812b5697b8adbbde0ba0d97e4f60193a4072e615ec8e01628427733bcef122b65f2988d9a9d1c812 +EBUILD tuprolog-2.9.0.ebuild 1262 SHA256 246d970f4f08e5f16452ffd82fb0ca50c88c42c59eafc9e52b352c9407b9fa7e SHA512 840893a55b3c03e9fcd30c538d9b85f24d53be69877a1ca740a5d4de465a19c6a4e8a3d4598938302a661456a84cc582b71b63ae9e2bb2bb6500d9c7bd72c892 WHIRLPOOL a4431da42d23bf48a025634b3200bc7f08becc5ad034ac9779c2b066a09c4232489dc74551d885ecdd227225aff83bf9aa7ffdb80d1a7afb845b2ba904069860 +MISC ChangeLog 7704 SHA256 ac099edb4c980cb81ab895e1f6715d48cbf525d93705b6fa3b5848bd82882306 SHA512 0bb646521b12040d795ad30f7b74bbc6e38cd7c1e495965fef5ddd951b21351255feb1d3b3adfe87b271e69d92a26e9e7b360ccd4b389bb3cc331f1c12678d5c WHIRLPOOL 2b8cff10deba01bb1ed05ed9d428733e143834e234821a97beb2c64d61006749cc138a80890bbfcba3cb799882a69832eebb318b53c3760abf15f2f57f847672 MISC metadata.xml 159 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba SHA512 532979c6de159980035c56482b05558c2b59c97dc99d83903988d8a535512e209110273f7123fcb0b1ce8aeed34b368fc7a309e68f3a6b510296d547b0134137 WHIRLPOOL 24bf1d6894c0450424190af0e967c7f947cfa9a3a4b6cbe29c0a54ea4f857e252fb6ee5d14b3503b52f066dca47b4b7add3b7a57c5391de468ea49d589a2fe37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRfpmQACgkQrwS/tqE49e1lIwCfUqSBTtLEceFP5b2HbpMaKgFi -ED4AoJEL9g8TadFvVV7OahGQW1jd5ZXA -=1ZyF +iEYEAREIAAYFAlSyhDQACgkQrwS/tqE49e3AWQCfVEfKmVGVDlr7DLqG0IUAHppM +0moAoKU0q7/rniwSd7UoOh4+kq3B1yZ5 +=hgGW -----END PGP SIGNATURE----- diff --git a/dev-lang/tuprolog/files/build.xml b/dev-lang/tuprolog/files/build.xml index a59295990c43..f5b946fd56d6 100644 --- a/dev-lang/tuprolog/files/build.xml +++ b/dev-lang/tuprolog/files/build.xml @@ -38,6 +38,11 @@ + + + + + diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch new file mode 100644 index 000000000000..d94dc66bbac5 --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch @@ -0,0 +1,116 @@ +diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java +--- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 ++++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java 2015-01-11 14:48:57.000000000 +0100 +@@ -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-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java +--- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 ++++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java 2015-01-11 14:46:23.000000000 +0100 +@@ -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-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java +--- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2014-09-29 18:14:21.000000000 +0200 ++++ tuprolog-2.9.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 --git a/dev-lang/tuprolog/tuprolog-2.9.0.ebuild b/dev-lang/tuprolog/tuprolog-2.9.0.ebuild new file mode 100644 index 000000000000..aea7502007cc --- /dev/null +++ b/dev-lang/tuprolog/tuprolog-2.9.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.9.0.ebuild,v 1.1 2015/01/11 14:11:56 keri Exp $ + +EAPI=3 + +inherit eutils 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="mirror://gentoo/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" + +RDEPEND=">=virtual/jdk-1.7 + >=dev-java/javassist-3" + +DEPEND="${RDEPEND} + dev-java/ant-core + test? ( + dev-java/ant-junit4 + dev-java/hamcrest-core + )" + +S="${WORKDIR}"/${P} + +EANT_GENTOO_CLASSPATH="javassist-3" + +src_prepare() { + epatch "${FILESDIR}"/${P}-no-ikvm.patch + + cp "${FILESDIR}"/build.xml "${S}" || die + sed -i -e "s|test/unit|test|" "${S}"/build.xml \ + || die "sed build.xml failed" +} + +src_compile() { + eant jar $(use_doc) +} + +src_test() { + cd "${S}"/dist + java-pkg_jar-from junit-4 + java-pkg_jar-from hamcrest-core + cd "${S}" + ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar 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 + fi +}