diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest index db8fb161eae43..f19c6fe1c13e3 100644 --- a/dev-java/hamcrest/Manifest +++ b/dev-java/hamcrest/Manifest @@ -1 +1,2 @@ DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a +DIST hamcrest-3.0.tar.gz 880513 BLAKE2B f2240a08d6d54e14a8e5441311127fc09f78c8a38a7dcf56d888827f716090cbf15e4a4a563ee56d5afc22574ca1d081276d0173e9361effd20ea3f5389e37a7 SHA512 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5 diff --git a/dev-java/hamcrest/hamcrest-3.0.ebuild b/dev-java/hamcrest/hamcrest-3.0.ebuild new file mode 100644 index 0000000000000..ff3a7d92fbcbb --- /dev/null +++ b/dev-java/hamcrest/hamcrest-3.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.hamcrest:hamcrest:3.0" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core API and libraries of hamcrest matcher framework." +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/JavaHamcrest-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +DOCS=( {CHANGES,README}.md ) + +JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest" +JAVA_SRC_DIR="hamcrest/src/main/java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="hamcrest/src/test/java" diff --git a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild similarity index 91% rename from dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild rename to dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild index 964fad44dbd04..9ffb25cf41d10 100644 --- a/dev-libs/bitshuffle/bitshuffle-0.3.5.ebuild +++ b/dev-libs/bitshuffle/bitshuffle-0.3.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,6 +17,10 @@ DEPEND=" app-arch/lz4 " +RDEPEND=" + app-arch/lz4 +" + src_prepare() { cp "${FILESDIR}/${P}-Makefile" "Makefile" || die "Failed to copy Makefile" default diff --git a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile index f38d0cc5f1499..6ccea469dbae8 100644 --- a/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile +++ b/dev-libs/bitshuffle/files/bitshuffle-0.3.5-Makefile @@ -26,8 +26,10 @@ OBJS = \ src/bitshuffle_core.o \ src/iochain.o +LIBS := -llz4 + $(SOFILE): $(OBJS) - $(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^ + $(CC) $(CFLAGS) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(SONAME) $^ $(LIBS) %.o: %.c $(CC) $(CFLAGS) -Isrc -c $< -o $@