commit: d53a8824d70f17aad3b2a32a4f302a6820aae144
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 21:21:44 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 21 21:23:34 2017 +0000
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=d53a8824
dev-java/sevenzipjbinding: Remove unneeded package, fixes bug #619250
This was only needed by the short-lived Minecraft hMod. It is now
causing issues with metadata generation due to EAPI 2 being banned.
dev-java/sevenzipjbinding/Manifest | 4 -
.../sevenzipjbinding/files/native-lib-load.patch | 13 ---
dev-java/sevenzipjbinding/files/p7zip-fixes.patch | 30 -------
dev-java/sevenzipjbinding/metadata.xml | 12 ---
.../sevenzipjbinding-4.65.1.04_rc.ebuild | 92 ----------------------
5 files changed, 151 deletions(-)
diff --git a/dev-java/sevenzipjbinding/Manifest
b/dev-java/sevenzipjbinding/Manifest
deleted file mode 100644
index 9a842ae5..00000000
--- a/dev-java/sevenzipjbinding/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST p7zip_4.65_src_all.tar.bz2 2501418 SHA256
691cc9419a73a9348319f5b2c3ba2655471bee052c6c7fa57a226800c89ab07f
-DIST sevenzipjbinding-4.65-1.04-rc-extr-only-Linux-amd64.zip 1042549 SHA256
bdd4a5d042b09711582db008573e44ae6c706d6e067473eb7400cde302972ee9
-DIST sevenzipjbinding-4.65.1.04_rc-CMakeLists.txt 30429 SHA256
6dc85ea9a787fff9c9036b8f6658c72cd90ddb03bf3f431cdaf9a1ab4f2174f5
-DIST sevenzipjbinding-4.65.1.04_rc-tests.tar.gz 6176615 SHA256
6325aa98438449cf06ec3bdae856d9128df57d5e63385c91e3562fc1ea003307
diff --git a/dev-java/sevenzipjbinding/files/native-lib-load.patch
b/dev-java/sevenzipjbinding/files/native-lib-load.patch
deleted file mode 100644
index ca9b3bb5..00000000
--- a/dev-java/sevenzipjbinding/files/native-lib-load.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- net/sf/sevenzipjbinding/SevenZip.java.orig 2010-03-06 21:48:58.000000000
+0000
-+++ net/sf/sevenzipjbinding/SevenZip.java 2011-01-02 20:01:57.393194867
+0000
-@@ -334,6 +334,10 @@
- return;
- }
-
-+ System.loadLibrary("7-Zip-JBinding");
-+ nativeInitialization();
-+ if (true) { return; }
-+
- String pathInJAR = platform;
- if (pathInJAR == null) {
- pathInJAR = getPlatformBestMatch();
diff --git a/dev-java/sevenzipjbinding/files/p7zip-fixes.patch
b/dev-java/sevenzipjbinding/files/p7zip-fixes.patch
deleted file mode 100644
index f4cd6cf3..00000000
--- a/dev-java/sevenzipjbinding/files/p7zip-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# These minor but important fixes are applied to p7zip in sevenzipjbinding's
-# source tree. We should always check for other changes when dealing with
-# future releases.
-
-diff -NaurwbB p7zip_4.65/CPP/7zip/Archive/Zip/ZipHandler.cpp
p7zip/CPP/7zip/Archive/Zip/ZipHandler.cpp
---- p7zip_4.65/CPP/7zip/Archive/Zip/ZipHandler.cpp 2009-02-07
16:44:56.000000000 +0000
-+++ p7zip/CPP/7zip/Archive/Zip/ZipHandler.cpp 2011-01-02
20:43:29.414839455 +0000
-@@ -805,6 +805,11 @@
-
- RINOK(extractCallback->PrepareOperation(askMode));
-
-+// SevenZipJBinding BUGFIX
-+#ifndef COMPRESS_MT
-+ UInt32 _numThreads = 1;
-+#endif
-+
- Int32 res;
- RINOK(myDecoder.Decode(
- EXTERNAL_CODECS_VARS
-diff -NaurwbB p7zip_4.65/CPP/7zip/UI/Common/LoadCodecs.cpp
p7zip/CPP/7zip/UI/Common/LoadCodecs.cpp
---- p7zip_4.65/CPP/7zip/UI/Common/LoadCodecs.cpp 2009-02-07
20:58:57.000000000 +0000
-+++ p7zip/CPP/7zip/UI/Common/LoadCodecs.cpp 2011-01-02
20:43:29.428839718 +0000
-@@ -230,6 +230,7 @@
- void CArcInfoEx::AddExts(const wchar_t* ext, const wchar_t* addExt)
- {
- UStringVector exts, addExts;
-+ if (ext)
- SplitString(ext, exts);
- if (addExt != 0)
- SplitString(addExt, addExts);
diff --git a/dev-java/sevenzipjbinding/metadata.xml
b/dev-java/sevenzipjbinding/metadata.xml
deleted file mode 100644
index 64d9ea41..00000000
--- a/dev-java/sevenzipjbinding/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
-<email>j...@gentoo.org</email>
-<name>Java</name>
-</maintainer>
-<longdescription lang="en">
-A Java wrapper around the native 7-Zip library, allowing fast
-extraction of a wide variety of archive formats.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/sevenzipjbinding/sevenzipjbinding-4.65.1.04_rc.ebuild
b/dev-java/sevenzipjbinding/sevenzipjbinding-4.65.1.04_rc.ebuild
deleted file mode 100644
index 8f9f2aaa..00000000
--- a/dev-java/sevenzipjbinding/sevenzipjbinding-4.65.1.04_rc.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils versionator flag-o-matic java-pkg-2 java-pkg-simple cmake-utils
-
-MY_PN="sevenzipjbind"
-P7Z_PV="$(get_version_component_range 1-2)"
-MY_PV="$(replace_version_separator 2 '-')"
-MY_P="${PN}-${MY_PV//_/-}-extr-only-Linux-amd64" # No pure source tarballs.
-
-GITWEB="http://${MY_PN}.git.sourceforge.net/git/gitweb.cgi";
-MAIN_COMMIT="Release-${MY_PV//_/}-extr-only"
-TEST_COMMIT="a2bef9f"
-
-DESCRIPTION="A Java wrapper around the native 7-Zip library"
-HOMEPAGE="http://${MY_PN}.sourceforge.net";
-SRC_URI="mirror://sourceforge/${MY_PN}/7-Zip-JBinding/${MY_PV//_/}-extr-only/${MY_P}.zip
- mirror://sourceforge/p7zip/p7zip_${P7Z_PV}_src_all.tar.bz2
-
${GITWEB}?p=${MY_PN}/${MY_PN};a=blob_plain;f=jbinding-cpp/CMakeLists.txt;hb=${MAIN_COMMIT}
-> ${P}-CMakeLists.txt
- test? (
${GITWEB}?p=${MY_PN}/${MY_PN};a=snapshot;h=${TEST_COMMIT};sf=tgz ->
${P}-tests.tar.gz )"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}"
-JAVA_SRC_DIR="jbinding-java"
-CMAKE_USE_DIR="${S}/jbinding-cpp"
-
-# These are set in the parent CMakeLists.txt, which we don't use.
-mycmakeargs=( "-DJAVA_HEADER_COMPILE=javah"
"-DSEVENZIP_JBINDING_JAR='${S}/${PN}.jar'" )
-
-src_prepare() {
- # Symlink to the tests as they are upstream.
- ln -snf "../${MY_PN}-${TEST_COMMIT}" "${S}/tests" || die
-
- # Ensure the prebuilt binaries aren't used.
- rm -rf "${S}/lib" "${S}/tests/JavaTests/lib" || die
-
- # This is where the build expects to find p7zip.
- ln -snf "../p7zip_${P7Z_PV}" "${S}/p7zip" || die
-
- # Apply the p7zip fixes.
- cd "${S}/p7zip" || die
- epatch "${FILESDIR}/p7zip-fixes.patch"
-
- # Unpack the sources.
- local X; for X in java cpp; do
- mkdir "${S}/jbinding-${X}" || die
- cd "${S}/jbinding-${X}" || die
- unpack "./../${X}-src.zip"
- done
-
- # Patch to load native library from library path.
- cd "${S}/jbinding-java" || die
- epatch "${FILESDIR}/native-lib-load.patch"
-
- # This is only available via git. Why!?
- cp "${DISTDIR}/${P}-CMakeLists.txt" "${S}/jbinding-cpp/CMakeLists.txt"
|| die
-}
-
-src_configure() {
- append-cppflags $(java-pkg_get-jni-cflags)
- cmake-utils_src_configure
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- cmake-utils_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_doso "${CMAKE_BUILD_DIR}/lib7-Zip-JBinding.so"
- dodoc AUTHORS ChangeLog NEWS README ReleaseNotes.txt THANKS || die
-}
-
-src_test() {
- cd tests/JavaTests || die
- local CP="src:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies
junit-4)"
- ejavac -classpath "${CP}" -d src $(find src -name "*.java")
- java -classpath "${CP}" -Djava.library.path="${CMAKE_BUILD_DIR}" \
- org.junit.runner.JUnitCore
net.sf.sevenzipjbinding.junit.AllTestSuite || die
-}
