From a0f09b2c947909b614c52fcfbdce964469404101 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Sep 2022 10:24:06 +0100 Subject: gentoo auto-resync : 05:09:2022 - 10:24:06 --- dev-java/Manifest.gz | Bin 52590 -> 52586 bytes dev-java/jffi/Manifest | 7 - dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch | 14 -- dev-java/jffi/files/jffi-1.2.8-makefile.patch | 52 -------- dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 ---- dev-java/jffi/jffi-1.2.9-r1.ebuild | 131 ------------------- dev-java/jffi/jffi-1.3.6.ebuild | 98 -------------- dev-java/jython/Manifest | 1 - dev-java/jython/jython-2.7.0-r6.ebuild | 156 ----------------------- 9 files changed, 485 deletions(-) delete mode 100644 dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch delete mode 100644 dev-java/jffi/files/jffi-1.2.8-makefile.patch delete mode 100644 dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch delete mode 100644 dev-java/jffi/jffi-1.2.9-r1.ebuild delete mode 100644 dev-java/jffi/jffi-1.3.6.ebuild delete mode 100644 dev-java/jython/jython-2.7.0-r6.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index a1fde60b896d..5e9bf6d12aac 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index f198d0f9e445..168085968725 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -1,12 +1,5 @@ -AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 -AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253 -AUX jffi-1.3.6-GNUmakefile.patch 740 BLAKE2B baeea64e4fadd0d76aa9d4a38fe48115365a3dd1bb9aecbf4e5c9f676de2e8928896e6423437190ccd01e38fd1a32c254ebd1f6a8965215e957b3b8f973628fb SHA512 315272b6a4762d5df76f5dbaef1a542c6a1808166883b245b85c9813ad665d9e30298693ddf079c10770f7757c75bb7ecd7c6ca73c3bb6444d2597a8a06124e3 AUX jffi-1.3.8-GNUmakefile.patch 805 BLAKE2B 9c9c1f8daeca9527dd364c303311554004ed6f0b7964bfa68f004bfd6f3aa39fb817d88afc82c4710226c25d752c55c2e43002fe7557d6c7c705a60bf4903543 SHA512 f1ff970c7dd8630a8fcadb1689034a28dd407f3c7efc4df4b6dad2c458da55e71f8b646bed4e11dab089c28c7af0e6eacc067ab68c0ddd856a1102b235cd02b7 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 -DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4 -DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10 -EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41 -EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb EBUILD jffi-1.3.9-r1.ebuild 3285 BLAKE2B df02b9374bbc00966b973dc761d28f6f635a92d0c619c2777559e299c2bc30cec58ff2813d92cce13c950685dd05bee3de9be8b0058363b3ebf65b3c1cf1c948 SHA512 d02a840a1182cb3de7a0a82a9dd804d6f7237e61fa50f4cd2055aaf43aa945dcce74a2e9e7a315a5c2e51ff85b6cabe0ad7236665865fef0880235fd64c70e37 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9 diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch deleted file mode 100644 index ac3843a0053a..000000000000 --- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/test/java/com/kenai/jffi/NumberTest.java -+++ b/src/test/java/com/kenai/jffi/NumberTest.java -@@ -234,9 +234,8 @@ - private void returnF32(InvokerType type) { - LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type); - float[] values = { 0f, 1.0f, -2.0f }; -- for (int i = 0; i < values.length; ++i) { -- assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f); -- } -+ float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) }; -+ assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f); - } - - @Test public void returnDefaultF64() { diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch deleted file mode 100644 index cdc28a662b51..000000000000 --- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/jni/GNUmakefile -+++ b/jni/GNUmakefile -@@ -41,6 +41,7 @@ - JFFI_BUILD_DIR = $(BUILD_DIR)/jffi - - ifeq ($(USE_SYSTEM_LIBFFI),1) -+ LIBFFI = - LIBFFI_LIBS ?= $(shell pkg-config --libs libffi) - LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi) - else -@@ -64,9 +65,8 @@ - OFLAGS = -O2 $(JFLAGS) - - # MacOS headers aren't completely warning free, so turn them off --WERROR = -Werror - ifneq ($(OS),darwin) -- WFLAGS += -Wundef $(WERROR) -+ WFLAGS += -Wundef - endif - WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter - PICFLAGS = -fPIC -@@ -279,7 +279,7 @@ - @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)" - @echo "OBJS=$(OBJS)" - --$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) -+$(LIBJFFI): $(OBJS) $(LIBFFI) - $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS) - $(STRIP) $@ - -@@ -291,7 +291,7 @@ - @mkdir -p $(@D) - @$(CC) $(CFLAGS) -o $@ -c $< - --$(OBJS) : $(LIBFFI_LIBS) -+$(OBJS) : $(LIBFFI) - - ifeq ($(OS), darwin) - build_ffi = \ ---- a/libtest/GNUmakefile -+++ b/libtest/GNUmakefile -@@ -44,8 +44,8 @@ - # Compiler/linker flags from: - # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html - JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing --OFLAGS = -O2 $(JFLAGS) --WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses -+OFLAGS = $(JFLAGS) -+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses - PICFLAGS = -fPIC - SOFLAGS = -shared -Wl,-O1 - LDFLAGS += $(SOFLAGS) diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch deleted file mode 100644 index 2dd5e9d8791a..000000000000 --- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/jni/GNUmakefile b/jni/GNUmakefile -index c0f298c..457626f 100755 ---- a/jni/GNUmakefile -+++ b/jni/GNUmakefile -@@ -278,16 +278,16 @@ debug: - @echo "OBJS=$(OBJS)" - - $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) -- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) -+ $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS) - $(STRIP) $@ - - $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h) -- @mkdir -p $(@D) -- @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ -+ mkdir -p $(@D) -+ $(CCACHE) $(CC) $(CFLAGS) -c $< -o $@ - - $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h) -- @mkdir -p $(@D) -- @$(CC) $(CFLAGS) -o $@ -c $< -+ mkdir -p $(@D) -+ $(CC) $(CFLAGS) -o $@ -c $< - - $(OBJS) : $(LIBFFI) - diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild deleted file mode 100644 index ef103551c7d9..000000000000 --- a/dev-java/jffi/jffi-1.2.9-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="An optimized Java interface to libffi" -HOMEPAGE="https://github.com/jnr/jffi" -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-3 )" -SLOT="1.2" -KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos" - -CDEPEND="dev-libs/libffi:0=" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -# java 1.8 is needed because javah is called which is not in newer jdks -DEPEND="${CDEPEND} - virtual/jdk:1.8 - test? ( - dev-java/ant-junit4:0 - dev-java/junit:4 - )" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.8-makefile.patch - "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch -) - -RESTRICT="test" - -src_prepare() { - default - - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die - - # misc fixes for Darwin - if [[ ${CHOST} == *-darwin* ]] ; then - local uarch - # don't do multiarch - # avoid using Xcode stuff - # use Prefix' headers - # don't mess with deployment target - # set install_name - use x64-macos && uarch=x86_64 - use ppc-macos && uarch=ppc - sed -i \ - -e "/ARCHES +=/s/=.*$/= ${uarch}/" \ - -e "/XCODE=/s:=.*$:=${EPREFIX}:" \ - -e "/MACSDK/s/^/#/" \ - -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \ - -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \ - jni/GNUmakefile || die - fi - - java-pkg_clean -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -src_compile() { - # generate Version.java - cat > src/main/java/com/kenai/jffi/Version.java <<-EOF - package com.kenai.jffi; - public final class Version { - private Version() {} - public static final int MAJOR = $(ver_cut 1); - public static final int MINOR = $(ver_cut 2); - public static final int MICRO = $(ver_cut 3); - } - EOF - - java-pkg-2_src_compile - - # generate headers - mkdir -p build/jni - javah -d build/jni -classpath target/classes \ - com.kenai.jffi.Foreign \ - com.kenai.jffi.ObjectBuffer \ - com.kenai.jffi.Version \ - || die - - #build native library. - local args=( - SRC_DIR=jni - JNI_DIR=jni - BUILD_DIR=build/jni - VERSION=$(ver_cut 1-2) - USE_SYSTEM_LIBFFI=1 - CCACHE= - -f jni/GNUmakefile - ) - emake "${args[@]}" -} - -EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4" - -src_test() { - # build native test library - emake BUILD_DIR=build -f libtest/GNUmakefile - - _JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \ - java-pkg-2_src_test -} - -src_install() { - local libname=".so" - - [[ ${CHOST} == *-darwin* ]] && libname=.jnilib - java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname} - - # must by after _doso to have JAVA_PKG_LIBDEST set - cat > boot.properties <<-EOF - jffi.boot.library.path = ${JAVA_PKG_LIBDEST} - EOF - jar -uf target/${PN}.jar boot.properties || die - - java-pkg_dojar target/${PN}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild deleted file mode 100644 index f34b51d92cc2..000000000000 --- a/dev-java/jffi/jffi-1.3.6.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.github.jnr:jffi:1.3.6" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java Foreign Function Interface" -HOMEPAGE="https://github.com/jnr/jffi" -SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.2" -KEYWORDS="amd64 arm64 ~ppc64 x86" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch ) -DOCS=( LICENSE README.md ) - -S="${WORKDIR}/${PN}-${P}" - -JAVA_SRC_DIR="src/main/java" - -# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/build.xml#L26 -JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - default - cat > src/main/java/com/kenai/jffi/Version.java <<-EOF - package com.kenai.jffi; - import java.lang.annotation.Native; - public final class Version { - private Version() {} - @Native - public static final int MAJOR = $(ver_cut 1); - @Native - public static final int MINOR = $(ver_cut 2); - @Native - public static final int MICRO = $(ver_cut 3); - } - EOF -} - -src_compile() { - java-pkg-simple_src_compile - - # generate headers - mkdir -p build/jni - javac -h build/jni -classpath target/classes \ - ${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \ - || die - - #build native library. - local args=( - SRC_DIR=jni - JNI_DIR=jni - BUILD_DIR=build/jni - VERSION=$(ver_cut 1-2) - USE_SYSTEM_LIBFFI=1 - CCACHE= - -f jni/GNUmakefile - ) - emake "${args[@]}" -} - -src_test() { - # build native test library - emake BUILD_DIR=build -f libtest/GNUmakefile - - # https://github.com/jnr/jffi/issues/60 - LC_ALL=C java-pkg-simple_src_test -} - -src_install() { - default - - local libname=".so" - java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname} - - # must be after _doso to have JAVA_PKG_LIBDEST set - cat > boot.properties <<-EOF - jffi.boot.library.path = ${JAVA_PKG_LIBDEST} - EOF - jar -uf ${PN}.jar boot.properties || die - - java-pkg-simple_src_install -} diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest index 5529cf0e3769..f7aa4e5a205b 100644 --- a/dev-java/jython/Manifest +++ b/dev-java/jython/Manifest @@ -6,6 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 -EBUILD jython-2.7.0-r6.ebuild 4449 BLAKE2B 0bd29ed489b2132082f09bb91077092ed158eb0ca85d592b0e336a1ea56393f4f6001f4a4cc04627e816e65866fdd593ed0f5c0c967a87bbd1053f33be1b83d1 SHA512 d7f5e41ef217b5b56570fb1188f48e636a73b86216ac8d7472c9c9fe120d6fb9b3ff361aad09c66848ba1c34668102279f012823d2c5ab8f9ff351b27d313c15 EBUILD jython-2.7.0-r7.ebuild 4449 BLAKE2B 693cd28b66fdc95153c2b9197f3228598bd4176d5425d20fcb119990db039d6ce7751020fc09ddb9e27de05b8f2b505feb57bae14227f09849b7ec32d6e6c338 SHA512 ea98dad5c25a6f27a1ad0d9f9aaeb68a8a681fbec05e7a92a7ccdb5f9978b0b6df72b00d6c446d5c595416e9ee37f2438d4991993a0b61a46cab980d26b57525 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464 diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild deleted file mode 100644 index d2b1a1703775..000000000000 --- a/dev-java/jython/jython-2.7.0-r6.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.python:jython:2.7.0" - -inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="An implementation of Python written in Java" -HOMEPAGE="https://www.jython.org" -SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="examples test" - -CP_DEPEND="dev-java/antlr:3 - dev-java/netty:0 - dev-java/asm:9 - dev-java/commons-compress:0 - dev-java/guava:0 - dev-java/jffi:1.2 - dev-java/jline:2 - dev-java/icu4j:70 - dev-java/jnr-constants:0 - dev-java/jnr-posix:3.0 - dev-java/jnr-netdb:1.0 - dev-java/stringtemplate:0 - dev-java/xerces:2 - java-virtuals/servlet-api:3.0" -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.8:*" -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.8:* - dev-java/ant-core:0 - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" -BDEPEND="app-arch/unzip" - -S=${WORKDIR} - -RESTRICT="test" - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" java" - -EANT_BUILD_TARGET="developer-build" -EANT_TEST_EXTRA_ARGS="-Dpython.home=dist" - -# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed. -# Uncomment and add to CDEPEND if you want either of them -#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present" -#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch - "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch - "${FILESDIR}"/${PN}-2.7_beta1-ant.patch - "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch - "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch - "${FILESDIR}"/${PN}-2.7.0-build.xml.patch - "${FILESDIR}"/CVE-2016-4000.patch -) - -src_prepare() { - default - - find \( -name '*.jar' -o -name '*.class' \ - -o -name '*.pyc' -o -name '*.exe' \) -delete - - # needed for launchertest - chmod +x tests/shell/test-jython.sh || die - - # https://bugs.gentoo.org/show_bug.cgi?id=833785 - sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \ - -i src/org/python/core/Py{,BaseCode,Unicode}.java || die - - java-pkg-2_src_prepare -} - -src_configure() { - # apparently this can cause problems - append-flags -fno-stack-protector - - EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)" - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)" -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local instdir=/usr/share/${PN}-${SLOT} - - java-pkg_newjar dist/${PN}-dev.jar - - java-pkg_register-optional-dependency jdbc-mysql - java-pkg_register-optional-dependency jdbc-postgresql - - insinto ${instdir} - doins -r dist/{Lib,registry} - - dodoc ACKNOWLEDGMENTS NEWS README.txt - - use doc && java-pkg_dohtml -r dist/Doc/javadoc - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples Demo/* - - local java_args=( - -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT} - -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT} - -Dpython.cachedir="\${HOME}/.jythoncachedir" - ) - - java-pkg_dolauncher jython${SLOT} \ - --main org.python.util.jython \ - --java_args "${java_args[*]}" - - # we need a wrapper to help python_optimize - cat <<-EOF > "${T}"/jython - exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \ - -Dpython.home="${ED}${instdir}" \ - -Dpython.cachedir="${T}/.jythoncachedir" \ - -Duser.home="${T}" \ - org.python.util.jython "\${@}" - EOF - chmod +x "${T}"/jython || die - - local -x PYTHON="${T}"/jython - # we can't get the path from the interpreter since it does some - # magic that fails on non-installed copy... - _python_export jython${SLOT} EPYTHON - - # compile tests (everything else is compiled already) - # we're keeping it quiet since jython reports errors verbosely - # and some of the tests are supposed to trigger compile errors - python_optimize "${ED}${instdir}"/Lib/test &>/dev/null - - # for python-exec - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages" - python_domodule epython.py - - # some of the class files end up with newer timestamps than the files they - # were generated from, make sure this doesn't happen - find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch -} -- cgit v1.2.3