commit: 8a0c5e51b3b2f1fa38d3fb3939167b2eff720854 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Nov 25 06:51:56 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Nov 25 08:40:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0c5e51
dev-java/snappy: drop 1.1.7.8-r1 Bug: https://bugs.gentoo.org/916063 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/snappy/Manifest | 1 - .../snappy/files/1.1.7.8-remove-perl-usage.patch | 38 ----- dev-java/snappy/files/1.x-build.xml | 185 --------------------- dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 97 ----------- 4 files changed, 321 deletions(-) diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest index 756b691e7d6d..7f89f0c9d934 100644 --- a/dev-java/snappy/Manifest +++ b/dev-java/snappy/Manifest @@ -1,3 +1,2 @@ DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b DIST snappy-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea -DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691 diff --git a/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch b/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch deleted file mode 100644 index 0c64240f12a3..000000000000 --- a/dev-java/snappy/files/1.1.7.8-remove-perl-usage.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1413a33ef00e722bacab2e17297b89bb55b2bd49 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <[email protected]> -Date: Tue, 21 Dec 2021 07:33:52 -0800 -Subject: [PATCH] Makefile: Eliminate usage of the `perl` command - -dev-lang/perl is not an implicit system dependency, so we cannot assume -its existence during build time. The Makefile uses the `perl` command -to generate the name of the JAR being built with it, but the ebuild uses -Ant and a custom build.xml to build the JAR, and it uses the Makefile to -build only the JNI part, thus the name of JAR in the Makefile will not -be used. For this reason, this package can still be built and installed -without dev-lang/perl. However, a QA notice for absent `perl` command -will appear in this case. Rather than declaring dev-lang/perl as a -dependency, it might be better to eliminate usage of the `perl` command -if it is never used in any meaningful way. - -Signed-off-by: Yuan Liao <[email protected]> ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a7bd87c..d1d3d32 100644 ---- a/Makefile -+++ b/Makefile -@@ -138,7 +138,8 @@ NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) - NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH) - NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - --snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") -+#snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d") -+snappy-jar-version:=snappy - - native: jni-header snappy-header $(NATIVE_DLL) - native-nocmake: jni-header $(NATIVE_DLL) --- -2.32.0 - diff --git a/dev-java/snappy/files/1.x-build.xml b/dev-java/snappy/files/1.x-build.xml deleted file mode 100644 index 21d93bfcc1c6..000000000000 --- a/dev-java/snappy/files/1.x-build.xml +++ /dev/null @@ -1,185 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="snappy-java-from-maven" default="package" basedir="."> - - <property file="${user.home}/.m2/maven.properties" /> - <property file="maven-build.properties" /> - - <property name="maven.build.finalName" value="snappy" /> - <property name="maven.build.dir" value="target" /> - <property name="maven.build.outputDir" value="${maven.build.dir}/classes" /> - <property name="maven.build.srcDir.0" value="src/main/java" /> - <property name="maven.build.resourceDir.0" value="src/main/java" /> - <property name="maven.build.resourceDir.1" value="src/main/resources" /> - <property name="maven.build.resourceDir.2" value="." /> - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" /> - <property name="maven.build.testDir.0" value="src/test/java" /> - <property name="maven.build.testResourceDir.0" value="src/test/java" /> - <property name="maven.build.testResourceDir.1" value="src/test/resources" /> - <property name="maven.test.reports" value="${maven.build.dir}/test-reports" /> - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" /> - - <property name="maven.repo.local" value="${user.home}/.m2/repository" /> - <property name="maven.settings.offline" value="false" /> - <property name="maven.settings.interactiveMode" value="true" /> - - <!-- ====================================================================== --> - <!-- Defining classpaths --> - <!-- ====================================================================== --> - - <path id="build.classpath"> - </path> - <path id="build.test.classpath"> - </path> - - <!-- ====================================================================== --> - <!-- Cleaning up target --> - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> - <delete dir="${maven.build.dir}" /> - </target> - - <!-- ====================================================================== --> - <!-- Compilation target --> - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> - <mkdir dir="${maven.build.outputDir}" /> - <javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6"> - <src> - <pathelement location="${maven.build.srcDir.0}" /> - </src> - <classpath refid="build.classpath" /> - </javac> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.0}"> - <include name="org/xerial/snappy/VERSION" /> - </fileset> - </copy> - <copy todir="${maven.build.outputDir}"> - <fileset dir="${maven.build.resourceDir.1}"> - <include name="org/xerial/snappy/*.bytecode" /> - <include name="org/xerial/snappy/native/**" /> - </fileset> - </copy> - <mkdir dir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java" /> - <copy todir="${maven.build.outputDir}/META-INF/maven/org.xerial.snappy/snappy-java"> - <fileset dir="${maven.build.resourceDir.2}"> - <include name="LICENSE*" /> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip"> - <mkdir dir="${maven.build.testOutputDir}" /> - <javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6"> - <src> - <pathelement location="${maven.build.testDir.0}" /> - </src> - <classpath> - <path refid="build.test.classpath" /> - <pathelement location="${maven.build.outputDir}" /> - </classpath> - </javac> - <copy todir="${maven.build.testOutputDir}"> - <fileset dir="${maven.build.testResourceDir.0}"> - <exclude name="**/*.java" /> - </fileset> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" depends="compile-tests, junit-missing" unless="junit.skipped" description="Run the test cases"> - <mkdir dir="${maven.test.reports}" /> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="." /> - <formatter type="xml" /> - <formatter type="plain" usefile="false" /> - <classpath> - <path refid="build.test.classpath" /> - <pathelement location="${maven.build.outputDir}" /> - <pathelement location="${maven.build.testOutputDir}" /> - </classpath> - <batchtest todir="${maven.test.reports}" unless="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/Test*.java" /> - <include name="**/*Test.java" /> - <include name="**/*TestCase.java" /> - <exclude name="**/*Abstract*Test.java" /> - </fileset> - </batchtest> - <batchtest todir="${maven.test.reports}" if="test"> - <fileset dir="${maven.build.testDir.0}"> - <include name="**/${test}.java" /> - <exclude name="**/*Abstract*Test.java" /> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" /> - </target> - - <target name="test-junit-status" depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}" /> - <isfalse value="${maven.test.skip}" /> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}" /> - <istrue value="${maven.test.skip}" /> - </or> - </condition> - </target> - - <target name="junit-missing" depends="test-junit-status" if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> - <!-- Javadoc target --> - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> - <javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="public" old="false" verbose="false" locale="en_US" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="UTF-8" linksource="false" breakiterator="false" /> - </target> - - <!-- ====================================================================== --> - <!-- Package target --> - <!-- ====================================================================== --> - - <target name="package" depends="compile,test" description="Package the application"> - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="true" basedir="${maven.build.outputDir}" excludes="**/package.html" /> - </target> - - <!-- ====================================================================== --> - <!-- A dummy target for the package named after the type it creates --> - <!-- ====================================================================== --> - - <target name="jar" depends="package" description="Builds the jar for the application" /> - - <!-- ====================================================================== --> - <!-- Download dependencies target --> - <!-- ====================================================================== --> - - <target name="test-offline"> - <condition property="maven.mode.offline"> - <equals arg1="${maven.settings.offline}" arg2="true" /> - </condition> - </target> - -</project> diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild deleted file mode 100644 index 37b8dcf972f5..000000000000 --- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.xerial.snappy:snappy-java:1.1.7.8" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN="${PN}-java" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Snappy compressor/decompressor for Java" -HOMEPAGE="https://github.com/xerial/snappy-java/"; -SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be -# packaged. Some extra steps are required before running the tests: -# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar -# 3. Set ALLOW_TEST="all" -RESTRICT="test" - -CDEPEND="dev-java/osgi-core:0 - app-arch/snappy - dev-libs/bitshuffle" - -DEPEND=">=virtual/jdk-1.8:* - ${CDEPEND} - test? ( - dev-java/ant-junit4:0 - dev-java/commons-io:1 - dev-java/commons-lang:2.1 - dev-java/plexus-classworlds:0 - dev-java/xerial-core:0 - )" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_CLASSPATH_TAGS="javac javadoc" -EANT_GENTOO_CLASSPATH="osgi-core" -EANT_TEST_GENTOO_CLASSPATH=" - ${EANT_GENTOO_CLASSPATH} - commons-io-1 - commons-lang-2.1 - plexus-classworlds - xerial-core -" - -src_prepare() { - cp "${FILESDIR}/1.x-build.xml" build.xml || die - rm -r src/main/resources/org/xerial/snappy/native || die - eapply "${FILESDIR}/${PV}-java-version-target.patch" - eapply "${FILESDIR}/${PV}-remove-perl-usage.patch" - eapply "${FILESDIR}/${PV}-unbundle-snappy.patch" - eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch" - eapply "${FILESDIR}/${PV}-gentoo.patch" - java-pkg-2_src_prepare -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - JAVA_SOURCE="$(java-pkg_get-source)" \ - JAVA_TARGET="$(java-pkg_get-target)" - java-pkg-2_src_compile -} - -src_test() { - cp -r src/test/resources/org/xerial/snappy/* \ - src/test/java/org/xerial/snappy || die - java-pkg-2_src_test -} - -src_install() { - local jniext=.so - if [[ ${CHOST} == *-darwin* ]] ; then - jniext=.jnilib - # avoid install_name check failure - install_name_tool -id "@loader_path/libsnappyjava${jniext}" \ - "target/libsnappyjava${jniext}" - fi - java-pkg_doso "target/libsnappyjava${jniext}" - java-pkg_dojar "target/${PN}.jar" - - use source && java-pkg_dosrc src/main/java/* - use doc && java-pkg_dojavadoc target/site/apidocs -}
