commit: 8b89ef5368a9ea7980f2afff2684885af574180b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Sep 12 06:30:14 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 07:19:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b89ef53
dev-java: Rename dev-java/{snappy -> snappy-java}
according to MAVEN_ID and SRC_URI
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/38562/commits/1291545e8f0077c1b4db46a32f3f17c0ad190cef
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{kafka-clients-1.1.1.ebuild => kafka-clients-1.1.1-r1.ebuild} | 7 +++----
dev-java/snappy-java/Manifest | 2 ++
dev-java/{snappy => snappy-java}/files/1.1.7.8-gentoo.patch | 0
.../files/1.1.7.8-java-version-target.patch | 0
.../files/1.1.7.8-unbundle-bitshuffle.patch | 0
.../files/snappy-1.1.10.1-commons-lang3.patch | 0
.../files/snappy-1.1.10.1-unbundle-snappy.patch | 0
.../files/snappy-1.1.10.5-SnappyOutputStreamTest.patch | 0
dev-java/{snappy => snappy-java}/metadata.xml | 0
.../snappy-java-1.1.10.5-r1.ebuild} | 4 ++--
dev-java/snappy/Manifest | 2 --
11 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
b/dev-java/kafka-clients/kafka-clients-1.1.1-r1.ebuild
similarity index 90%
rename from dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
rename to dev-java/kafka-clients/kafka-clients-1.1.1-r1.ebuild
index 88b5337e7ba3..131b3e8523f4 100644
--- a/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
+++ b/dev-java/kafka-clients/kafka-clients-1.1.1-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
@@ -11,6 +11,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Apache Kafka distributed event streaming platform"
HOMEPAGE="https://kafka.apache.org/";
SRC_URI="https://archive.apache.org/dist/kafka/${PV}/kafka-${PV}-src.tgz";
+S="${WORKDIR}/kafka-${PV}-src/clients"
LICENSE="Apache-2.0"
SLOT="0"
@@ -19,7 +20,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/lz4-java-1.4.1:0
>=dev-java/slf4j-api-1.7.25:0
- >=dev-java/snappy-1.1.7.1:1.1
+ >=dev-java/snappy-java-1.1.7.1:1.1
"
DEPEND="
@@ -32,6 +33,4 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}/kafka-${PV}-src/clients"
-
JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/snappy-java/Manifest b/dev-java/snappy-java/Manifest
new file mode 100644
index 000000000000..40c322428f65
--- /dev/null
+++ b/dev-java/snappy-java/Manifest
@@ -0,0 +1,2 @@
+DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B
66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8
SHA512
f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
+DIST snappy-java-1.1.10.5.tar.gz 3917442 BLAKE2B
0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329
SHA512
f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
diff --git a/dev-java/snappy/files/1.1.7.8-gentoo.patch
b/dev-java/snappy-java/files/1.1.7.8-gentoo.patch
similarity index 100%
rename from dev-java/snappy/files/1.1.7.8-gentoo.patch
rename to dev-java/snappy-java/files/1.1.7.8-gentoo.patch
diff --git a/dev-java/snappy/files/1.1.7.8-java-version-target.patch
b/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
similarity index 100%
rename from dev-java/snappy/files/1.1.7.8-java-version-target.patch
rename to dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch
b/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
similarity index 100%
rename from dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch
rename to dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
b/dev-java/snappy-java/files/snappy-1.1.10.1-commons-lang3.patch
similarity index 100%
rename from dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
rename to dev-java/snappy-java/files/snappy-1.1.10.1-commons-lang3.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch
b/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
similarity index 100%
rename from dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch
rename to dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
b/dev-java/snappy-java/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
similarity index 100%
rename from dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
rename to
dev-java/snappy-java/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
diff --git a/dev-java/snappy/metadata.xml b/dev-java/snappy-java/metadata.xml
similarity index 100%
rename from dev-java/snappy/metadata.xml
rename to dev-java/snappy-java/metadata.xml
diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
b/dev-java/snappy-java/snappy-java-1.1.10.5-r1.ebuild
similarity index 98%
rename from dev-java/snappy/snappy-1.1.10.5-r1.ebuild
rename to dev-java/snappy-java/snappy-java-1.1.10.5-r1.ebuild
index 6e719db54841..a1b198e8cf62 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.5-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/xerial/snappy-java/";
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}"
+S="${WORKDIR}/${P}"
LICENSE="Apache-2.0"
SLOT="1.1"
@@ -26,7 +26,7 @@ CP_DEPEND="dev-java/osgi-core:0"
CDEPEND="
app-arch/snappy
- dev-libs/bitshuffle
+ >=dev-libs/bitshuffle-0.3.5-r1
"
DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
deleted file mode 100644
index 7f89f0c9d934..000000000000
--- a/dev-java/snappy/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
