[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-03-10 Thread Miroslav Šulc
commit: f6de32bc043af3f4802e9dd4f09acd30e465e0c6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Feb 26 14:04:34 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Mar 10 21:10:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6de32bc

dev-java/snappy: drop 1.1.10.5

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5.ebuild | 125 -
 1 file changed, 125 deletions(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
deleted file mode 100644
index 9f690d9c4df7..
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 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:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
-
-DESCRIPTION="Snappy compressor/decompressor for Java"
-HOMEPAGE="https://github.com/xerial/snappy-java/;
-# ::gentoo does not have hadoop-common packaged. Currently we bundle the 
binary version.
-# It's used for testing only and does not get installed.
-HCV="3.3.5"
-SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   test? ( 
https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar
 )"
-S="${WORKDIR}/snappy-java-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-CP_DEPEND="dev-java/osgi-core:0"
-
-CDEPEND="
-   app-arch/snappy
-   dev-libs/bitshuffle
-"
-
-DEPEND=">=virtual/jdk-1.8:*
-   ${CP_DEPEND}
-   ${CDEPEND}
-   test? (
-   dev-java/ant-junit4:0
-   dev-java/commons-io:1
-   dev-java/commons-lang:3.6
-   dev-java/plexus-classworlds:0
-   dev-java/xerial-core:0
-   )"
-
-RDEPEND=">=virtual/jre-1.8:*
-   ${CP_DEPEND}
-   ${CDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/1.1.7.8-java-version-target.patch"
-   "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
-   "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
-   "${FILESDIR}/1.1.7.8-gentoo.patch"
-   "${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
-   "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
-)
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-   commons-io-1
-   commons-lang-3.6
-   junit-4
-   plexus-classworlds
-   xerial-core
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-check_env() {
-   if use test; then
-   # this is needed only for tests
-   CHECKREQS_MEMORY="2560M"
-   check-reqs_pkg_pretend
-   fi
-}
-
-pkg_pretend() {
-   check_env
-}
-
-pkg_setup() {
-   check_env
-   java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-   default
-   java-pkg-2_src_prepare
-   # remove pre-compiled sofiles
-   rm -r src/main/resources/org/xerial/snappy/native || die
-   rm -r src/test/resources/lib || die
-}
-
-src_compile() {
-   emake \
-   CXX="$(tc-getCXX)" \
-   JAVA_SOURCE="$(java-pkg_get-source)" \
-   JAVA_TARGET="$(java-pkg_get-target)"
-
-   java-pkg-simple_src_compile
-}
-
-src_test() {
-   JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
-   JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
-   local vm_version="$(java-config -g PROVIDES_VERSION)"
-   if ver_test "${vm_version}" -ge 17; then
-   java-pkg-simple_src_test
-   else
-   einfo "Tests need jdk-17 to pass."
-   fi
-}
-
-src_install() {
-   java-pkg-simple_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}"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-03-10 Thread Arthur Zamarin
commit: 8a812e7c57d99249c82c52ce5d0db334e7385fbb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Mar 10 08:53:14 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Mar 10 08:53:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a812e7c

dev-java/snappy: Stabilize 1.1.10.5-r1 x86, #922766

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index 83f112e34a65..6e719db54841 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-03-02 Thread Sam James
commit: 4c82888f9d65099a68d2af4687f1998896d7886a
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 06:11:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 06:11:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c82888f

dev-java/snappy: Stabilize 1.1.10.5-r1 arm64, #922766

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index e62e034435de..83f112e34a65 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-02-25 Thread Sam James
commit: fc17f7df3b8c0ddecca6fd8392573075eb97e84c
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 23:06:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 23:06:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc17f7df

dev-java/snappy: Stabilize 1.1.10.5-r1 ppc64, #922766

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index 82270174a90f..e62e034435de 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-02-25 Thread Jakov Smolić
commit: 851ef0ca4b0858d0ef1176cdb330fde5a87871d9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Feb 25 19:19:35 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Feb 25 19:19:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851ef0ca

dev-java/snappy: Stabilize 1.1.10.5-r1 amd64, #922766

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index 76373ffd1ba2..82270174a90f 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-02-20 Thread Ionen Wolkens
commit: 124a055bdf41b7a98b536a70a8c078810ed6f33e
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Feb 17 06:08:12 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 20 20:58:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124a055b

dev-java/snappy: Keyword 1.1.10.5-r1 ppc64, #922770

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index 04498e81e490..76373ffd1ba2 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-02-02 Thread Arthur Zamarin
commit: c2f5da5802ee297cb340155150735401d966f429
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb  2 13:46:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb  2 13:46:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f5da58

dev-java/snappy: Keyword 1.1.10.5-r1 x86, #922770

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
index a5c51f55f8ce..04498e81e490 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2024-01-23 Thread Miroslav Šulc
commit: 479407d69f0948a09340d151ccfdcd8579e13f01
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Dec 24 18:47:46 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jan 23 09:42:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479407d6

dev-java/snappy: 1.1.10.5-r1 for >=dev-java/ant-1.10.14

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5-r1.ebuild | 125 ++
 1 file changed, 125 insertions(+)

diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
new file mode 100644
index ..a5c51f55f8ce
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
@@ -0,0 +1,125 @@
+# 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.xerial.snappy:snappy-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/;
+# ::gentoo does not have hadoop-common packaged. Currently we bundle the 
binary version.
+# It's used for testing only and does not get installed.
+HCV="3.3.5"
+SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   test? ( 
https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar
 )"
+S="${WORKDIR}/snappy-java-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+CDEPEND="
+   app-arch/snappy
+   dev-libs/bitshuffle
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+   ${CP_DEPEND}
+   ${CDEPEND}
+   test? (
+   >=dev-java/ant-1.10.14:0[junit4]
+   dev-java/commons-io:1
+   dev-java/commons-lang:3.6
+   dev-java/plexus-classworlds:0
+   dev-java/xerial-core:0
+   )"
+
+RDEPEND=">=virtual/jre-1.8:*
+   ${CP_DEPEND}
+   ${CDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/1.1.7.8-java-version-target.patch"
+   "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
+   "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
+   "${FILESDIR}/1.1.7.8-gentoo.patch"
+   "${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
+   "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
+)
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+   commons-io-1
+   commons-lang-3.6
+   junit-4
+   plexus-classworlds
+   xerial-core
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+   if use test; then
+   # this is needed only for tests
+   CHECKREQS_MEMORY="2560M"
+   check-reqs_pkg_pretend
+   fi
+}
+
+pkg_pretend() {
+   check_env
+}
+
+pkg_setup() {
+   check_env
+   java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+   default
+   java-pkg-2_src_prepare
+   # remove pre-compiled sofiles
+   rm -r src/main/resources/org/xerial/snappy/native || die
+   rm -r src/test/resources/lib || die
+}
+
+src_compile() {
+   emake \
+   CXX="$(tc-getCXX)" \
+   JAVA_SOURCE="$(java-pkg_get-source)" \
+   JAVA_TARGET="$(java-pkg_get-target)"
+
+   java-pkg-simple_src_compile
+}
+
+src_test() {
+   JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
+   JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
+   local vm_version="$(java-config -g PROVIDES_VERSION)"
+   if ver_test "${vm_version}" -ge 17; then
+   java-pkg-simple_src_test
+   else
+   einfo "Tests need jdk-17 to pass."
+   fi
+}
+
+src_install() {
+   java-pkg-simple_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}"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/

2023-12-01 Thread Miroslav Šulc
commit: 829bb1d396ef2b3496730c64014df72bbf017728
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Dec  1 15:10:06 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec  2 07:49:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829bb1d3

dev-java/snappy: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34077
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../snappy/files/1.1.7.8-unbundle-snappy.patch | 54 --
 1 file changed, 54 deletions(-)

diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch 
b/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
deleted file mode 100644
index 6113019be3ea..
--- a/dev-java/snappy/files/1.1.7.8-unbundle-snappy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 100644
 a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,8 @@
- 
- SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
-@@ -100,7 +101,8 @@
- 
- $(SRC)/org/xerial/snappy/BitShuffleNative.h: 
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
- 
--$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_GIT_UNPACKED)
- 
- # aarch64 can use big-endian optimzied code
- ifeq ($(OS_ARCH),aarch64)
-@@ -122,7 +124,7 @@
-   $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
-+  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
- # Workaround for strip Protocol error when using VirtualBox on Mac
-   cp $@ /tmp/$(@F)
-   $(STRIP) /tmp/$(@F)
-@@ -140,9 +142,9 @@
- #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)
--snappy: native $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL)
-+native-nocmake: $(NATIVE_DLL)
-+snappy: native
- 
- native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
- 
-@@ -151,6 +153,7 @@
-   cp $(SNAPPY_OUT)/$(LIBNAME) $@
-   @mkdir -p $(NATIVE_TARGET_DIR)
-   cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME)
-+  cp $< $(TARGET)/
- 
- package: $(TARGET)/$(snappy-jar-version).jar
- 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/, dev-java/snappy/files/

2023-11-25 Thread Miroslav Šulc
commit: 8a0c5e51b3b2f1fa38d3fb3939167b2eff720854
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Nov 25 06:51:56 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Nov 25 08:40:16 2023 +
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  pogatzki.net>
Signed-off-by: Miroslav Šulc  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..
--- 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 
-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 

- 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..
--- a/dev-java/snappy/files/1.x-build.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-
-
-
-
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-  

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-11-24 Thread Sam James
commit: ae7e829ddaaf78b5075109121f455a12c5a40997
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 25 03:59:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 25 03:59:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7e829d

dev-java/snappy: Stabilize 1.1.10.5 arm64, #917560

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
index 729413276b35..9f690d9c4df7 100644
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/

2023-11-24 Thread Miroslav Šulc
commit: 6e1961f6557bb67f929888e2b3e677fadc378494
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Nov 23 17:13:58 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov 24 10:22:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1961f6

dev-java/snappy: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33953
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../snappy-1.1.10.1-SnappyOutputStreamTest.patch   | 26 --
 1 file changed, 26 deletions(-)

diff --git a/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch 
b/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
deleted file mode 100644
index add60f632e55..
--- a/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-1) 
batchingOfWritesShouldNotAffectCompressedDataSize(org.xerial.snappy.SnappyOutputStreamTest)
-java.lang.AssertionError: expected:<91080> but was:<91051>
-   at org.junit.Assert.fail(Assert.java:89)
-   at org.junit.Assert.failNotEquals(Assert.java:835)
-   at org.junit.Assert.assertEquals(Assert.java:647)
-   at org.junit.Assert.assertEquals(Assert.java:633)
-   at 
org.xerial.snappy.SnappyOutputStreamTest.batchingOfWritesShouldNotAffectCompressedDataSize(SnappyOutputStreamTest.java:171)
 a/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
-+++ b/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
-@@ -34,6 +34,7 @@ import java.lang.ref.WeakReference;
- import java.nio.ByteOrder;
- 
- import org.junit.Test;
-+import org.junit.Ignore;
- import org.xerial.snappy.buffer.BufferAllocatorFactory;
- import org.xerial.snappy.buffer.CachedBufferAllocator;
- import org.xerial.snappy.buffer.DefaultBufferAllocator;
-@@ -153,7 +154,7 @@ public class SnappyOutputStreamTest
- return b.toByteArray();
- }
- 
--@Test
-+@Ignore @Test
- public void batchingOfWritesShouldNotAffectCompressedDataSize()
- throws Exception
- {



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-11-22 Thread Arthur Zamarin
commit: 9a40f21f647ec978cc414c42e15ce4619f1f6e5b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 22 11:15:33 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 22 11:15:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a40f21f

dev-java/snappy: Stabilize 1.1.10.5 x86, #917560

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
index b73911c78272..729413276b35 100644
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-11-19 Thread Miroslav Šulc
commit: 1fde251d486b6fb247371baed7494ad4ba0a0e6c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Nov 18 16:54:09 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 19 10:43:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fde251d

dev-java/snappy: drop 1.1.10.1-r1

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33890
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest  |   1 -
 dev-java/snappy/snappy-1.1.10.1-r1.ebuild | 125 --
 2 files changed, 126 deletions(-)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 4e8925da8277..756b691e7d6d 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,4 +1,3 @@
 DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 
66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8
 SHA512 
f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
-DIST snappy-1.1.10.1.tar.gz 3386807 BLAKE2B 
977bd6c0aee2708952e3e4a434c819d7cc1ae3ac9320639b5bf5fc80551905ada85a001d3aa2d6384cc78839615335acb7378d50f60a5c3e86345b8e28aa6911
 SHA512 
8226a3e3a6ec9e0f4fae2d4b8ebf276e5225db8c8f0619a02db7490d3425260693afdc20c48e6e17a37621116067b47972cbcb02bd6617cb9face07d28fe5061
 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/snappy-1.1.10.1-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
deleted file mode 100644
index 0800c4eddc1c..
--- a/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2023 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:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
-
-DESCRIPTION="Snappy compressor/decompressor for Java"
-HOMEPAGE="https://github.com/xerial/snappy-java/;
-# ::gentoo does not have hadoop-common packaged. Currently we bundle the 
binary version.
-# It's used for testing only and does not get installed.
-HCV="3.3.5"
-SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   test? ( 
https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar
 )"
-S="${WORKDIR}/snappy-java-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
-
-CP_DEPEND="dev-java/osgi-core:0"
-
-CDEPEND="
-   app-arch/snappy
-   dev-libs/bitshuffle
-"
-
-DEPEND=">=virtual/jdk-1.8:*
-   ${CP_DEPEND}
-   ${CDEPEND}
-   test? (
-   dev-java/ant-junit4:0
-   dev-java/commons-io:1
-   dev-java/commons-lang:3.6
-   dev-java/plexus-classworlds:0
-   dev-java/xerial-core:0
-   )"
-
-RDEPEND=">=virtual/jre-1.8:*
-   ${CP_DEPEND}
-   ${CDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/1.1.7.8-java-version-target.patch"
-   "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
-   "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
-   "${FILESDIR}/1.1.7.8-gentoo.patch"
-   "${FILESDIR}/snappy-1.1.10.1-SnappyOutputStreamTest.patch"
-   "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
-)
-
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
-   commons-io-1
-   commons-lang-3.6
-   junit-4
-   plexus-classworlds
-   xerial-core
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-check_env() {
-   if use test; then
-   # this is needed only for tests
-   CHECKREQS_MEMORY="2560M"
-   check-reqs_pkg_pretend
-   fi
-}
-
-pkg_pretend() {
-   check_env
-}
-
-pkg_setup() {
-   check_env
-   java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-   default
-   java-pkg-2_src_prepare
-   # remove pre-compiled sofiles
-   rm -r src/main/resources/org/xerial/snappy/native || die
-   rm -r src/test/resources/lib || die
-}
-
-src_compile() {
-   emake \
-   CXX="$(tc-getCXX)" \
-   JAVA_SOURCE="$(java-pkg_get-source)" \
-   

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-11-18 Thread Sam James
commit: 084d02dff163abf5e24e3fd5eb3560fbf822ccbd
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 18 14:49:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 18 14:49:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084d02df

dev-java/snappy: Stabilize 1.1.10.5 amd64, #917560

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
index 41aed2fd96fd..aba833f6adaf 100644
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-11-18 Thread Sam James
commit: 54d5977533aa1b3e7a0e580b5e8b40374f43cdcb
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 18 14:49:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 18 14:49:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54d59775

dev-java/snappy: Stabilize 1.1.10.5 ppc64, #917560

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
index aba833f6adaf..b73911c78272 100644
--- a/dev-java/snappy/snappy-1.1.10.5.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.5.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-10-26 Thread Sam James
commit: 4a93853d98b199f4cd0a3c0912a80f8f3743d34a
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 26 22:38:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 26 22:38:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a93853d

dev-java/snappy: Stabilize 1.1.10.1-r1 ppc64, #916061

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.1-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
index 40d0c9d6c229..0800c4eddc1c 100644
--- a/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/, dev-java/snappy/files/

2023-10-22 Thread Miroslav Šulc
commit: ee696b689615b4e1fd5944d945bbff82e36b09af
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Oct 21 06:52:31 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct 22 07:23:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee696b68

dev-java/snappy: add 1.1.10.5 - CVE-2023-43642

Bug: https://bugs.gentoo.org/916063
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33438
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest   |   1 +
 .../snappy-1.1.10.5-SnappyOutputStreamTest.patch   |  30 +
 dev-java/snappy/snappy-1.1.10.5.ebuild | 125 +
 3 files changed, 156 insertions(+)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 779d3dce..4e8925da8277 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,3 +1,4 @@
 DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 
66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8
 SHA512 
f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
 DIST snappy-1.1.10.1.tar.gz 3386807 BLAKE2B 
977bd6c0aee2708952e3e4a434c819d7cc1ae3ac9320639b5bf5fc80551905ada85a001d3aa2d6384cc78839615335acb7378d50f60a5c3e86345b8e28aa6911
 SHA512 
8226a3e3a6ec9e0f4fae2d4b8ebf276e5225db8c8f0619a02db7490d3425260693afdc20c48e6e17a37621116067b47972cbcb02bd6617cb9face07d28fe5061
+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/snappy-1.1.10.5-SnappyOutputStreamTest.patch 
b/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
new file mode 100644
index ..43272e9d4a7f
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
@@ -0,0 +1,30 @@
+There was 1 failure:
+1) 
batchingOfWritesShouldNotAffectCompressedDataSize(org.xerial.snappy.SnappyOutputStreamTest)
+java.lang.AssertionError: expected:<91080> but was:<91051>
+at org.junit.Assert.fail(Assert.java:89)
+at org.junit.Assert.failNotEquals(Assert.java:835)
+at org.junit.Assert.assertEquals(Assert.java:647)
+at org.junit.Assert.assertEquals(Assert.java:633)
+at 
org.xerial.snappy.SnappyOutputStreamTest.batchingOfWritesShouldNotAffectCompressedDataSize(SnappyOutputStreamTest.java:183)
+
+FAILURES!!!
+Tests run: 104,  Failures: 1
+--- a/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
 b/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
+@@ -34,6 +34,7 @@ import java.lang.ref.WeakReference;
+ import java.nio.ByteOrder;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.junit.Assert;
+ import org.xerial.snappy.buffer.BufferAllocatorFactory;
+ import org.xerial.snappy.buffer.CachedBufferAllocator;
+@@ -165,7 +166,7 @@ public class SnappyOutputStreamTest
+ return b.toByteArray();
+ }
+ 
+-@Test
++@Test @Ignore
+ public void batchingOfWritesShouldNotAffectCompressedDataSize()
+ throws Exception
+ {

diff --git a/dev-java/snappy/snappy-1.1.10.5.ebuild 
b/dev-java/snappy/snappy-1.1.10.5.ebuild
new file mode 100644
index ..41aed2fd96fd
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.10.5.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 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:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/;
+# ::gentoo does not have hadoop-common packaged. Currently we bundle the 
binary version.
+# It's used for testing only and does not get installed.
+HCV="3.3.5"
+SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   test? ( 
https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar
 )"
+S="${WORKDIR}/snappy-java-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+CDEPEND="
+   app-arch/snappy
+   dev-libs/bitshuffle
+"
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2023-10-21 Thread Sam James
commit: 3294f5d7dab3f8290079bd1cd743b71fb46ebeb0
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 21 11:58:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 21 11:58:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3294f5d7

dev-java/snappy: Stabilize 1.1.10.1-r1 amd64, #916061

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.10.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.10.1-r1.ebuild 
b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
index 9097dcb28f01..40d0c9d6c229 100644
--- a/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/snappy-java-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/

2023-10-01 Thread Miroslav Šulc
commit: 9fcef6d71f67f917d61d241421fa60c7e60b8988
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Sep 21 13:28:28 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Oct  1 07:40:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fcef6d7

dev-java/snappy: depend on commons-lang:3.6

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch | 11 +++
 .../{snappy-1.1.10.1.ebuild => snappy-1.1.10.1-r1.ebuild} |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch 
b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
new file mode 100644
index ..064482eabb7f
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
@@ -0,0 +1,11 @@
+--- 
a/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
 
b/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
+@@ -2,7 +2,7 @@ package org.xerial.snappy;
+ 
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang.SystemUtils;
++import org.apache.commons.lang3.SystemUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.io.compress.SnappyCodec;
+ import org.junit.AfterClass;

diff --git a/dev-java/snappy/snappy-1.1.10.1.ebuild 
b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
similarity index 96%
rename from dev-java/snappy/snappy-1.1.10.1.ebuild
rename to dev-java/snappy/snappy-1.1.10.1-r1.ebuild
index 2813bcdd4901..9097dcb28f01 100644
--- a/dev-java/snappy/snappy-1.1.10.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.8:*
test? (
dev-java/ant-junit4:0
dev-java/commons-io:1
-   dev-java/commons-lang:2.1
+   dev-java/commons-lang:3.6
dev-java/plexus-classworlds:0
dev-java/xerial-core:0
)"
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
"${FILESDIR}/1.1.7.8-gentoo.patch"
"${FILESDIR}/snappy-1.1.10.1-SnappyOutputStreamTest.patch"
+   "${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
 )
 
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -57,7 +58,7 @@ JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="
commons-io-1
-   commons-lang-2.1
+   commons-lang-3.6
junit-4
plexus-classworlds
xerial-core



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/, dev-java/snappy/files/

2023-09-21 Thread Miroslav Šulc
commit: 5fbc771aba4be60c25e01147b4c2790b4eb5ef0e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jun 16 14:55:12 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep 21 06:39:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fbc771a

dev-java/snappy: add 1.1.10.1 - CVE-2023-34453, CVE-2023-34454, CVE-2023-34455

Bug: https://bugs.gentoo.org/908557
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/31515
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest   |   2 +
 .../snappy-1.1.10.1-SnappyOutputStreamTest.patch   |  26 +
 .../files/snappy-1.1.10.1-unbundle-snappy.patch|  51 +
 dev-java/snappy/snappy-1.1.10.1.ebuild | 124 +
 4 files changed, 203 insertions(+)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 26534254a308..779d3dce 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1 +1,3 @@
+DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 
66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8
 SHA512 
f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
+DIST snappy-1.1.10.1.tar.gz 3386807 BLAKE2B 
977bd6c0aee2708952e3e4a434c819d7cc1ae3ac9320639b5bf5fc80551905ada85a001d3aa2d6384cc78839615335acb7378d50f60a5c3e86345b8e28aa6911
 SHA512 
8226a3e3a6ec9e0f4fae2d4b8ebf276e5225db8c8f0619a02db7490d3425260693afdc20c48e6e17a37621116067b47972cbcb02bd6617cb9face07d28fe5061
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 
871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96
 SHA512 
8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691

diff --git a/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch 
b/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
new file mode 100644
index ..add60f632e55
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.1-SnappyOutputStreamTest.patch
@@ -0,0 +1,26 @@
+1) 
batchingOfWritesShouldNotAffectCompressedDataSize(org.xerial.snappy.SnappyOutputStreamTest)
+java.lang.AssertionError: expected:<91080> but was:<91051>
+   at org.junit.Assert.fail(Assert.java:89)
+   at org.junit.Assert.failNotEquals(Assert.java:835)
+   at org.junit.Assert.assertEquals(Assert.java:647)
+   at org.junit.Assert.assertEquals(Assert.java:633)
+   at 
org.xerial.snappy.SnappyOutputStreamTest.batchingOfWritesShouldNotAffectCompressedDataSize(SnappyOutputStreamTest.java:171)
+--- a/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
 b/src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
+@@ -34,6 +34,7 @@ import java.lang.ref.WeakReference;
+ import java.nio.ByteOrder;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xerial.snappy.buffer.BufferAllocatorFactory;
+ import org.xerial.snappy.buffer.CachedBufferAllocator;
+ import org.xerial.snappy.buffer.DefaultBufferAllocator;
+@@ -153,7 +154,7 @@ public class SnappyOutputStreamTest
+ return b.toByteArray();
+ }
+ 
+-@Test
++@Ignore @Test
+ public void batchingOfWritesShouldNotAffectCompressedDataSize()
+ throws Exception
+ {

diff --git a/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch 
b/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch
new file mode 100644
index ..d516495bb6a7
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch
@@ -0,0 +1,51 @@
+--- a/Makefile
 b/Makefile
+@@ -10,7 +10,7 @@ all: snappy
+ 
+ SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch)
+ SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz
+-SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy-c.cc snappy.cc
++SNAPPY_CC:=
+ SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
+ SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
+ SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
+@@ -102,7 +102,8 @@ 
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xeria
+ 
+ $(SRC)/org/xerial/snappy/BitShuffleNative.h: 
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
+ 
+-$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
++$(SNAPPY_SRC):
++# $(SNAPPY_GIT_UNPACKED)
+ 
+ # aarch64 can use big-endian optimzied code
+ ifeq ($(OS_ARCH),aarch64)
+@@ -124,7 +125,7 @@ $(SNAPPY_OUT)/BitShuffleNative.o: 
$(SRC)/org/xerial/snappy/BitShuffleNative.cpp
+   $(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
++  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
+ # Workaround for strip Protocol error when using VirtualBox on Mac
+  

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-09-16 Thread Arthur Zamarin
commit: 32206f6aac8d12c2de91f5b5c096921417e02e5b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Sep 16 18:52:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 16 18:58:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32206f6a

dev-java/snappy: drop 1.1.7.8

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27175
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 97 ---
 1 file changed, 97 deletions(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
deleted file mode 100644
index bb7a64023a0a..
--- a/dev-java/snappy/snappy-1.1.7.8.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-api: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-api"
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-09-16 Thread Arthur Zamarin
commit: 00c5a1a65b37b6ce35b9752c837c8f6aa4d1888b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Sep 16 18:16:54 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Sep 16 18:16:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c5a1a6

dev-java/snappy: Stabilize 1.1.7.8-r1 ppc64, #869272

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild 
b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
index a6734953941b..37b8dcf972f5 100644
--- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-09-14 Thread Sam James
commit: 96c8a8a376e7264e0b099b2a61ffda976a13b74e
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 14 21:03:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 14 21:04:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c8a8a3

dev-java/snappy: Stabilize 1.1.7.8-r1 arm64, #869272

Signed-off-by: Sam James  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild 
b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
index 8d35ecece414..a6734953941b 100644
--- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-09-09 Thread Jakov Smolić
commit: b078658ca50a58a6e3a3a7532b1d920ca1acaceb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Sep  9 08:07:27 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Sep  9 08:07:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b078658c

dev-java/snappy: Stabilize 1.1.7.8-r1 amd64, #869272

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild 
b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
index a0190bc964ba..e459732ba679 100644
--- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-09-09 Thread Jakov Smolić
commit: b8228726750321e261384ba7a78e9a37178718bd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Sep  9 08:08:12 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Sep  9 08:08:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8228726

dev-java/snappy: Stabilize 1.1.7.8-r1 x86, #869272

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild 
b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
index e459732ba679..8d35ecece414 100644
--- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-08-10 Thread Florian Schmaus
commit: 3b57788ec350b22fec8d7cea18f5f0ea388df910
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun 22 05:56:57 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Aug 10 08:21:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b57788e

dev-java/snappy: dependency switch to osgi-core

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8-r1.ebuild | 97 
 1 file changed, 97 insertions(+)

diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild 
b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
new file mode 100644
index ..a0190bc964ba
--- /dev/null
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -0,0 +1,97 @@
+# 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-03-18 Thread Miroslav Šulc
commit: a520309cd16c557aef697fe5a47763d62b13f45c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Mar 12 16:47:27 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 18 08:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a520309c

dev-java/snappy: Enable tests on arm, arm64 and ppc64

Closes: https://bugs.gentoo.org/834139
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24511
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
index 4b6b87f13883..bb7a64023a0a 100644
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -23,27 +23,21 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 # 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. arm, arm64 and ppc64 only: Install test dependencies that are unkeyworded
-# 4. Set ALLOW_TEST="all"
+# 3. Set ALLOW_TEST="all"
 RESTRICT="test"
 
 CDEPEND="dev-java/osgi-core-api:0
app-arch/snappy
dev-libs/bitshuffle"
 
-# Some test dependencies are unsatisfied on arm, arm64, and ppc64
 DEPEND=">=virtual/jdk-1.8:*
${CDEPEND}
test? (
dev-java/ant-junit4:0
dev-java/commons-io:1
-   !arm? (
-   dev-java/commons-lang:2.1
-   )
-   !arm? ( !arm64? ( !ppc64? (
-   dev-java/plexus-classworlds:0
-   dev-java/xerial-core:0
-   ) ) )
+   dev-java/commons-lang:2.1
+   dev-java/plexus-classworlds:0
+   dev-java/xerial-core:0
)"
 
 RDEPEND=">=virtual/jre-1.8:*



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-03-12 Thread Arthur Zamarin
commit: 49c394ff5369e06d6c842922282e0e62e1087d10
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar 12 09:42:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 12 09:42:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c394ff

dev-java/snappy: Stabilize 1.1.7.8 arm64, #834097

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
index 46cc7aa23ba3..4b6b87f13883 100644
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-03-09 Thread Jakov Smolić
commit: 167b4958f4fb302836c099f7ddbc4bfc8151f145
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  9 10:23:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  9 10:23:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167b4958

dev-java/snappy: Stabilize 1.1.7.8 amd64, #834097

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
index a68461ff73b8..0caa651818af 100644
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-03-09 Thread Jakov Smolić
commit: 66403ecd844e4d4f6753d9eabd98e5435c509a08
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Mar  9 10:23:38 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Mar  9 10:23:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66403ecd

dev-java/snappy: Stabilize 1.1.7.8 x86, #834097

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
index 0caa651818af..46cc7aa23ba3 100644
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2022-03-09 Thread Agostino Sarubbo
commit: c160f6514100f8f43f04445099e1e78773c0d773
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar  9 09:20:17 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar  9 09:20:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c160f651

dev-java/snappy: ppc64 stable wrt bug #834097

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/snappy/snappy-1.1.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild 
b/dev-java/snappy/snappy-1.1.7.8.ebuild
index 63853626e97c..a68461ff73b8 100644
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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:



[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/

2022-02-08 Thread Miroslav Šulc
commit: 2f0ca3b79e73e42ae17220fae0e025337425fdf2
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Feb  7 15:19:20 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Feb  8 08:10:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0ca3b7

dev-java/snappy: Drop 1.1.0.1

Closes: https://bugs.gentoo.org/831269
Closes: https://bugs.gentoo.org/741190
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24114
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest   |  1 -
 dev-java/snappy/files/1.1.0.1-gentoo.patch | 14 -
 .../snappy/files/1.1.0.1-unbundle-snappy.patch | 51 ---
 dev-java/snappy/snappy-1.1.0.1.ebuild  | 72 --
 4 files changed, 138 deletions(-)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 7c04b3f1d2a6..26534254a308 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,2 +1 @@
-DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 
65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62
 SHA512 
32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 
871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96
 SHA512 
8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691

diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch 
b/dev-java/snappy/files/1.1.0.1-gentoo.patch
deleted file mode 100644
index 61403dd9167f..
--- a/dev-java/snappy/files/1.1.0.1-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 04f0435..0249d09 100644
 a/Makefile
-+++ b/Makefile
-@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : 
$(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
--  $(STRIP) $@
-+  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
- 
- clean-native: 
-   rm -rf $(SNAPPY_OUT)

diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch 
b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
deleted file mode 100644
index 17fb2e1583ed..
--- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0821c87..04f0435 100644
 a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,8 @@ all: snappy
- 
- SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) 
SnappyNative.o)
-@@ -46,7 +47,8 @@ 
src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou
-   $(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
-   cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
- 
--$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_UNPACKED)
- 
- $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
-   @mkdir -p $(@D)
-@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : 
$(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) 
-+  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
-   $(STRIP) $@
- 
- clean-native: 
-@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
- 
- snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 
'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; 
}')
- 
--native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
--snappy: native $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL) 
-+snappy: native
- 
- $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
-   @mkdir -p $(@D)
-   cp $< $@
-   @mkdir -p $(NATIVE_TARGET_DIR)
-   cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
-+  cp $< $(TARGET)/
- 
- 
- $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)

diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild 
b/dev-java/snappy/snappy-1.1.0.1.ebuild
deleted file mode 100644
index 443002b9ab82..
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/

2022-02-07 Thread Miroslav Šulc
commit: 77bf00d28f1a424b8ab2fae483927df1cd1b5bf8
Author: Yuan Liao  gmail  com>
AuthorDate: Mon Dec 20 16:55:39 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb  7 07:59:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bf00d2

dev-java/snappy: Add 1.1.7.8

Signed-off-by: Yuan Liao  gmail.com>
Closes: 
https://github.com/gentoo/gentoo/pull/23438/commits/1c957771ab63735f4981bb3ee5243e442c802655
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest   |   1 +
 dev-java/snappy/files/1.1.7.8-gentoo.patch |  28 ++
 .../snappy/files/1.1.7.8-java-version-target.patch |  47 ++
 .../snappy/files/1.1.7.8-remove-perl-usage.patch   |  38 
 .../snappy/files/1.1.7.8-unbundle-bitshuffle.patch |  26 ++
 .../snappy/files/1.1.7.8-unbundle-snappy.patch |  54 +++
 dev-java/snappy/snappy-1.1.7.8.ebuild  | 103 +
 7 files changed, 297 insertions(+)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 3b685046ec3a..7c04b3f1d2a6 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1 +1,2 @@
 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 
65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62
 SHA512 
32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
+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-gentoo.patch 
b/dev-java/snappy/files/1.1.7.8-gentoo.patch
new file mode 100644
index ..b4a58e6482be
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-gentoo.patch
@@ -0,0 +1,28 @@
+--- a/Makefile
 b/Makefile
+@@ -124,11 +124,7 @@
+   $(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
+-  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle
+-# Workaround for strip Protocol error when using VirtualBox on Mac
+-  cp $@ /tmp/$(@F)
+-  $(STRIP) /tmp/$(@F)
+-  cp /tmp/$(@F) $@
++  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle 
$(LDFLAGS)
+ 
+ clean-native:
+   rm -rf $(SNAPPY_OUT)
+--- a/Makefile.common
 b/Makefile.common
+@@ -274,8 +274,8 @@
+ 
+ CXX:= $($(os_arch)_CXX)
+ STRIP := $($(os_arch)_STRIP)
+-CXXFLAGS:= $($(os_arch)_CXXFLAGS)
+-LINKFLAGS := $($(os_arch)_LINKFLAGS)
++CXXFLAGS:= $($(os_arch)_CXXFLAGS) $(CXXFLAGS)
++LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS)
+ LIBNAME   := $($(os_arch)_LIBNAME)
+ SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS)
+ 

diff --git a/dev-java/snappy/files/1.1.7.8-java-version-target.patch 
b/dev-java/snappy/files/1.1.7.8-java-version-target.patch
new file mode 100644
index ..a852d0bdb807
--- /dev/null
+++ b/dev-java/snappy/files/1.1.7.8-java-version-target.patch
@@ -0,0 +1,47 @@
+From e7d1d0167426790ba9b1d28ffa11e0d0c523f3b5 Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+Date: Sun, 6 Feb 2022 08:29:20 -0800
+Subject: [PATCH] Allow Java version target to be specified using variable
+
+Signed-off-by: Yuan Liao 
+---
+ Makefile| 4 ++--
+ Makefile.common | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1d82a8a..8eaa319 100644
+--- a/Makefile
 b/Makefile
+@@ -92,13 +92,13 @@ snappy-header: $(SNAPPY_CMAKE_CACHE)
+ 
+ $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: 
$(SRC)/org/xerial/snappy/SnappyNative.java
+   @mkdir -p $(TARGET)/jni-classes
+-  $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d 
$(TARGET)/jni-classes -sourcepath $(SRC) $<
++  $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h 
$(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
+ 
+ $(SRC)/org/xerial/snappy/SnappyNative.h: 
$(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
+ 
+ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: 
$(SRC)/org/xerial/snappy/BitShuffleNative.java
+   @mkdir -p $(TARGET)/jni-classes
+-  $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d 
$(TARGET)/jni-classes -sourcepath $(SRC) $<
++  $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h 
$(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
+ 
+ $(SRC)/org/xerial/snappy/BitShuffleNative.h: 
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class
+ 
+diff --git a/Makefile.common b/Makefile.common
+index 534bc4f..86d839b 100755
+--- a/Makefile.common
 b/Makefile.common
+@@ -10,6 +10,8 @@ endif
+ JAVA  := "$$JAVA_HOME/bin/java"
+ JAVAC := "$$JAVA_HOME/bin/javac"

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/

2022-01-16 Thread Miroslav Šulc
commit: 792d74198a8ee14a065f72cf7e5b7ce61c678574
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jan 15 18:42:35 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jan 16 08:31:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792d7419

dev-java/snappy: Drop 1.0.3_rc3

Closes: https://bugs.gentoo.org/736960
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23810
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/snappy/Manifest   |  1 -
 dev-java/snappy/files/1.0.3_rc3-gentoo.patch   | 14 -
 .../snappy/files/1.0.3_rc3-unbundle-snappy.patch   | 52 -
 dev-java/snappy/snappy-1.0.3_rc3.ebuild| 65 --
 4 files changed, 132 deletions(-)

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index f27830f5a911..3b685046ec3a 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,2 +1 @@
-DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B 
a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948
 SHA512 
eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64
 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 
65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62
 SHA512 
32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e

diff --git a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch 
b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
deleted file mode 100644
index 58a17b0dbd04..
--- a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a9d5cdc..8026741 100644
 a/Makefile
-+++ b/Makefile
-@@ -44,8 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : 
$(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
--  $(STRIP) $@
-+  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
- 
- clean-native: 
-   rm -rf $(SNAPPY_OUT)

diff --git a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch 
b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
deleted file mode 100644
index 4885e7b5df80..
--- a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b67855a..a9d5cdc 100644
 a/Makefile
-+++ b/Makefile
-@@ -7,7 +7,8 @@ all: snappy
- 
- SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
- SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz 
--SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
-+SNAPPY_CC:=
- SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
- SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
- SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) 
SnappyNative.o)
-@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h
- $(SRC)/org/xerial/snappy/SnappyNative.h: 
$(SRC)/org/xerial/snappy/SnappyNative.java
-   $(JAVAH) -classpath $(TARGET)/classes -o $@ 
org.xerial.snappy.SnappyNative
- 
--$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
-+$(SNAPPY_SRC):
-+# $(SNAPPY_UNPACKED)
- 
- $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
-   @mkdir -p $(@D)
-@@ -42,7 +44,7 @@ $(SNAPPY_OUT)/SnappyNative.o : 
$(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
- 
- 
- $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
--  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) 
-+  $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
-   $(STRIP) $@
- 
- clean-native: 
-@@ -57,15 +59,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
- 
- snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 
'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; 
}')
- 
--native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
--snappy: $(TARGET)/$(snappy-jar-version).jar
-+native: $(NATIVE_DLL) 
-+snappy: native
- 
- $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) 
-   @mkdir -p $(@D)
-   cp $< $@
-   @mkdir -p $(NATIVE_TARGET_DIR)
-   cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
--
-+  cp $< $(TARGET)
- 
- $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
-   $(MVN) package -Dmaven.test.skip=true

diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild 
b/dev-java/snappy/snappy-1.0.3_rc3.ebuild
deleted file mode 100644
index 3d2afabf6e0d..
--- a/dev-java/snappy/snappy-1.0.3_rc3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit 

[gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/

2021-03-13 Thread Fabian Groffen
commit: d02c4bd0c03b2824f55cfff124de93ebccde8c2e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Mar 13 12:21:40 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Mar 13 12:21:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02c4bd0

dev-java/snappy-1.1.0.1: fix for and marked ~x64-macos

Closes: https://bugs.gentoo.org/638284
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-java/snappy/snappy-1.1.0.1.ebuild | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild 
b/dev-java/snappy/snappy-1.1.0.1.ebuild
index 60983950c43..443002b9ab8 100644
--- a/dev-java/snappy/snappy-1.1.0.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-$
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE=""
 
 CDEPEND="dev-java/osgi-core-api:0
@@ -53,7 +53,14 @@ src_compile() {
 }
 
 src_install() {
-   java-pkg_doso "${S}"/target/libsnappyjava.so
+   local jniext=.so
+   if [[ ${CHOST} == *-darwin* ]] ; then
+   jniext=.jnilib
+   # avoid install_name check failure
+   install_name_tool -id @loader_path/libsnappyjava${jniext} \
+   "${S}"/target/libsnappyjava${jniext}
+   fi
+   java-pkg_doso "${S}"/target/libsnappyjava${jniext}
java-pkg_dojar "${S}/target/${PN}.jar"
 
use source && java-pkg_dosrc "${S}"/src/main/java/*