From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97C8713933E for ; Wed, 30 Jun 2021 09:36:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61FC7E083B; Wed, 30 Jun 2021 09:35:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 363A9E083B for ; Wed, 30 Jun 2021 09:35:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8EF5E33BEF1 for ; Wed, 30 Jun 2021 09:35:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D62C87C2 for ; Wed, 30 Jun 2021 09:35:54 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1625045727.24d17f870a14b664bf4b5cd41971f64f463bc6af.flow@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/sqlite-jdbc/, dev-java/sqlite-jdbc/files/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/sqlite-jdbc/Manifest dev-java/sqlite-jdbc/files/sqlite-jdbc-loadLibrary.patch dev-java/sqlite-jdbc/metadata.xml dev-java/sqlite-jdbc/sqlite-jdbc-3.7.2.ebuild X-VCS-Directories: dev-java/sqlite-jdbc/ dev-java/sqlite-jdbc/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 24d17f870a14b664bf4b5cd41971f64f463bc6af X-VCS-Branch: master Date: Wed, 30 Jun 2021 09:35:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43694f6c-9a2e-4aec-8fba-966b51ea8559 X-Archives-Hash: 456098fd91bcc50b75db54de711c5cea commit: 24d17f870a14b664bf4b5cd41971f64f463bc6af Author: Florian Schmaus gentoo org> AuthorDate: Wed Jun 30 09:34:43 2021 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jun 30 09:35:27 2021 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=24d17f87 dev-java/sqlite-jdbc: treeclean Reason: failed sourcing ebuild: eutils: EAPI 2 not supported, (eutils.eclass, line 32: called die) Bug: https://bugs.gentoo.org/759889 Signed-off-by: Florian Schmaus gentoo.org> dev-java/sqlite-jdbc/Manifest | 1 - .../files/sqlite-jdbc-loadLibrary.patch | 35 -------------- dev-java/sqlite-jdbc/metadata.xml | 13 ------ dev-java/sqlite-jdbc/sqlite-jdbc-3.7.2.ebuild | 53 ---------------------- 4 files changed, 102 deletions(-) diff --git a/dev-java/sqlite-jdbc/Manifest b/dev-java/sqlite-jdbc/Manifest deleted file mode 100644 index f0ac9925..00000000 --- a/dev-java/sqlite-jdbc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sqlite-jdbc-3.7.2-sources.jar 3122366 SHA256 8eee6aaa532a8ebc855be5218534c5cbddb95e852d31a8b3379ba465e5ade20c diff --git a/dev-java/sqlite-jdbc/files/sqlite-jdbc-loadLibrary.patch b/dev-java/sqlite-jdbc/files/sqlite-jdbc-loadLibrary.patch deleted file mode 100644 index a4cd9136..00000000 --- a/dev-java/sqlite-jdbc/files/sqlite-jdbc-loadLibrary.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- org/sqlite/SQLiteJDBCLoader.java.orig 2010-08-27 18:01:32.000000000 +0100 -+++ org/sqlite/SQLiteJDBCLoader.java 2011-11-20 21:12:06.756000652 +0000 -@@ -188,6 +188,17 @@ - return false; - } - -+ private static synchronized boolean loadNativeLibraryPath(String name) { -+ try { -+ System.loadLibrary(name); -+ return true; -+ } -+ catch (UnsatisfiedLinkError e) { -+ System.err.println(e); -+ return false; -+ } -+ } -+ - private static void loadSQLiteNativeLibrary() { - if (extracted) - return; -@@ -201,6 +212,14 @@ - // Try loading library from org.sqlite.lib.path library path */ - String sqliteNativeLibraryPath = System.getProperty("org.sqlite.lib.path"); - String sqliteNativeLibraryName = System.getProperty("org.sqlite.lib.name"); -+ -+ if (sqliteNativeLibraryPath == null) { -+ if (loadNativeLibraryPath(sqliteNativeLibraryName == null ? "sqlitejdbc" : sqliteNativeLibraryName)) { -+ extracted = true; -+ return; -+ } -+ } -+ - if (sqliteNativeLibraryName == null) - sqliteNativeLibraryName = System.mapLibraryName("sqlitejdbc"); - diff --git a/dev-java/sqlite-jdbc/metadata.xml b/dev-java/sqlite-jdbc/metadata.xml deleted file mode 100644 index 3153c18d..00000000 --- a/dev-java/sqlite-jdbc/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - -java@gentoo.org -Java - - -SQLite JDBC driver developed by Taro L. Saito is an extension of -Zentus's SQLite JDBC driver that enables Java to access SQLite -database files. - - diff --git a/dev-java/sqlite-jdbc/sqlite-jdbc-3.7.2.ebuild b/dev-java/sqlite-jdbc/sqlite-jdbc-3.7.2.ebuild deleted file mode 100644 index 19e0d1f1..00000000 --- a/dev-java/sqlite-jdbc/sqlite-jdbc-3.7.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -JAVA_PKG_IUSE="doc source" -JAVA_PKG_WANT_BOOTCLASSPATH="1.5" - -inherit eutils toolchain-funcs java-pkg-2 java-pkg-simple - -DESCRIPTION="SQLite JDBC driver from the Xerial project" -HOMEPAGE="http://www.xerial.org/trac/Xerial/wiki/SQLiteJDBC" -SRC_URI="http://www.xerial.org/maven/repository/artifact/org/xerial/${PN}/${PV}/${P}-sources.jar" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=virtual/jdk-1.6 - dev-db/sqlite:3" - -RDEPEND=">=virtual/jre-1.6 - dev-db/sqlite:3" - -S="${WORKDIR}" -SONAME="libsqlitejdbc.so" - -java_prepare() { - # Allow the native library to be loaded from the path. - epatch "${FILESDIR}/sqlite-jdbc-loadLibrary.patch" - - # Delete pure Java stuff. - rm -rv org/ibex org/sqlite/NestedDB.* || die - - # Delete binaries. - rm -rv native || die - find -name "*.class" -exec rm -v {} \; -} - -src_compile() { - JAVAC_ARGS="-Xbootclasspath/p:$(java-pkg_get-bootclasspath 1.5)" java-pkg-simple_src_compile - - javah -classpath target/classes -jni -o NativeDB.h org.sqlite.NativeDB || die - $(tc-getCC) $(java-pkg_get-jni-cflags) ${CFLAGS} ${LDFLAGS} \ - -I. -fPIC -shared -Wl,-z -Wl,defs -Wl,-soname="${SONAME}" \ - -o "${SONAME}" org/sqlite/NativeDB.c -lsqlite3 || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_doso "${SONAME}" -}