Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/files/, dev-java/snappy/
Date: Tue, 08 Feb 2022 08:10:35
Message-Id: 1644307822.2f0ca3b79e73e42ae17220fae0e025337425fdf2.fordfrog@gentoo
1 commit: 2f0ca3b79e73e42ae17220fae0e025337425fdf2
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Mon Feb 7 15:19:20 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 08:10:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0ca3b7
7
8 dev-java/snappy: Drop 1.1.0.1
9
10 Closes: https://bugs.gentoo.org/831269
11 Closes: https://bugs.gentoo.org/741190
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
14 Closes: https://github.com/gentoo/gentoo/pull/24114
15 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17 dev-java/snappy/Manifest | 1 -
18 dev-java/snappy/files/1.1.0.1-gentoo.patch | 14 -----
19 .../snappy/files/1.1.0.1-unbundle-snappy.patch | 51 ---------------
20 dev-java/snappy/snappy-1.1.0.1.ebuild | 72 ----------------------
21 4 files changed, 138 deletions(-)
22
23 diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
24 index 7c04b3f1d2a6..26534254a308 100644
25 --- a/dev-java/snappy/Manifest
26 +++ b/dev-java/snappy/Manifest
27 @@ -1,2 +1 @@
28 -DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e
29 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
30
31 diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch
32 deleted file mode 100644
33 index 61403dd9167f..000000000000
34 --- a/dev-java/snappy/files/1.1.0.1-gentoo.patch
35 +++ /dev/null
36 @@ -1,14 +0,0 @@
37 -diff --git a/Makefile b/Makefile
38 -index 04f0435..0249d09 100644
39 ---- a/Makefile
40 -+++ b/Makefile
41 -@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
42 -
43 -
44 - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
45 -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
46 -- $(STRIP) $@
47 -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS)
48 -
49 - clean-native:
50 - rm -rf $(SNAPPY_OUT)
51
52 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
53 deleted file mode 100644
54 index 17fb2e1583ed..000000000000
55 --- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch
56 +++ /dev/null
57 @@ -1,51 +0,0 @@
58 -diff --git a/Makefile b/Makefile
59 -index 0821c87..04f0435 100644
60 ---- a/Makefile
61 -+++ b/Makefile
62 -@@ -7,7 +7,8 @@ all: snappy
63 -
64 - SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch)
65 - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz
66 --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
67 -+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc
68 -+SNAPPY_CC:=
69 - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION)
70 - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
71 - SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o)
72 -@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou
73 - $(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $<
74 - cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@
75 -
76 --$(SNAPPY_SRC): $(SNAPPY_UNPACKED)
77 -+$(SNAPPY_SRC):
78 -+# $(SNAPPY_UNPACKED)
79 -
80 - $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
81 - @mkdir -p $(@D)
82 -@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/
83 -
84 -
85 - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ)
86 -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS)
87 -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy
88 - $(STRIP) $@
89 -
90 - clean-native:
91 -@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
92 -
93 - snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
94 -
95 --native: $(SNAPPY_UNPACKED) $(NATIVE_DLL)
96 --snappy: native $(TARGET)/$(snappy-jar-version).jar
97 -+native: $(NATIVE_DLL)
98 -+snappy: native
99 -
100 - $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
101 - @mkdir -p $(@D)
102 - cp $< $@
103 - @mkdir -p $(NATIVE_TARGET_DIR)
104 - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME)
105 -+ cp $< $(TARGET)/
106 -
107 -
108 - $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL)
109
110 diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild
111 deleted file mode 100644
112 index 443002b9ab82..000000000000
113 --- a/dev-java/snappy/snappy-1.1.0.1.ebuild
114 +++ /dev/null
115 @@ -1,72 +0,0 @@
116 -# Copyright 1999-2021 Gentoo Authors
117 -# Distributed under the terms of the GNU General Public License v2
118 -
119 -EAPI="5"
120 -
121 -JAVA_PKG_IUSE="doc source test"
122 -
123 -inherit java-pkg-2 java-ant-2
124 -
125 -MY_PN="${PN}-java"
126 -MY_P="${MY_PN}-${PV}"
127 -
128 -DESCRIPTION="Snappy compressor/decompressor for Java"
129 -HOMEPAGE="https://github.com/xerial/snappy-java/"
130 -SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-${PV}.tar.gz"
131 -
132 -LICENSE="Apache-2.0"
133 -SLOT="1.1"
134 -KEYWORDS="~amd64 ~x86 ~x64-macos"
135 -IUSE=""
136 -
137 -CDEPEND="dev-java/osgi-core-api:0
138 - app-arch/snappy"
139 -
140 -DEPEND=">=virtual/jdk-1.6
141 - test? (
142 - dev-java/junit:4
143 - dev-java/xerial-core:0
144 - dev-java/plexus-classworlds:0
145 - )
146 - ${CDEPEND}"
147 -
148 -RDEPEND=">=virtual/jre-1.6
149 - ${CDEPEND}"
150 -
151 -S="${WORKDIR}/${MY_P}"
152 -
153 -JAVA_ANT_REWRITE_CLASSPATH="true"
154 -EANT_GENTOO_CLASSPATH="osgi-core-api"
155 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core,plexus-classworlds"
156 -EANT_TEST_ANT_TASKS="ant-junit"
157 -
158 -java_prepare() {
159 - cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die
160 - rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die
161 - epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch
162 - epatch "${FILESDIR}"/${PV}-gentoo.patch
163 -}
164 -
165 -src_compile() {
166 - emake
167 - java-pkg-2_src_compile
168 -}
169 -
170 -src_install() {
171 - local jniext=.so
172 - if [[ ${CHOST} == *-darwin* ]] ; then
173 - jniext=.jnilib
174 - # avoid install_name check failure
175 - install_name_tool -id @loader_path/libsnappyjava${jniext} \
176 - "${S}"/target/libsnappyjava${jniext}
177 - fi
178 - java-pkg_doso "${S}"/target/libsnappyjava${jniext}
179 - java-pkg_dojar "${S}/target/${PN}.jar"
180 -
181 - use source && java-pkg_dosrc "${S}"/src/main/java/*
182 - use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
183 -}
184 -
185 -src_test() {
186 - java-pkg-2_src_test
187 -}
Report Message
Find on MARC Find on Google Groups