[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-java/jdbc-jaybird/

[Michał Górny]

commit:     17eddbb1a4c113dede33bf8b207301c21a623466
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 30 07:01:31 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 07:14:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17eddbb1

dev-java/jdbc-jaybird: Remove last-rited pkg

 dev-java/jdbc-jaybird/Manifest                  |   1 -
 dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild | 125 ------------------------
 dev-java/jdbc-jaybird/metadata.xml              |  19 ----
 profiles/package.mask                           |   6 --
 4 files changed, 151 deletions(-)

diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
deleted file mode 100644
index 2502905fe59..00000000000
--- a/dev-java/jdbc-jaybird/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Jaybird-2.2.9-src.zip 9833669 SHA256 46b807c85efd3531aef612b5d7a71e570c02e344cf73d67890c1194d3a250828 SHA512 487e64658553f60fa2a1f9b6d7136504119bac2905c6480cac01a94ce2c6e70b82449ee9a1b9b1ee96a12646ef69064d542401fc62564662f14531dea3790e6e WHIRLPOOL f3197921d0eca901662353ab5150ba62b72ac40ccf884f78f229fadac2239bc56964d5ae452d0dcddf82099b66a71c734beaffe6b8a4b3d9bffec98061d7dc0a

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
deleted file mode 100644
index 8d0f26b16d9..00000000000
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.9.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source examples test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="${PN/jdbc-/}"
-DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
-HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
-SRC_URI="https://github.com/FirebirdSQL/${MY_PN}/archive/v${PV}.zip -> Jaybird-${PV}-src.zip"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jni"
-
-CDEPEND="dev-java/junit:4
-	dev-java/antlr:3.5
-	dev-java/log4j:0
-	dev-java/glassfish-connector-api:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip
-	jni? ( dev-java/cpptasks )
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-java_prepare() {
-	# prevent test/sources/javadoc from being built unless wanted
-	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
-		"${S}/build/archive.xml" || die
-	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
-		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
-		"${S}/build/compile.xml" || die
-
-	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
-	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
-
-	cd "${S}/lib/"
-	rm -v *.jar
-
-	cd "${S}/src/lib/"
-	rm -v *.jar *.zip
-
-	java-pkg_jar-from --build-only glassfish-connector-api \
-		glassfish-connector-api.jar connector-api-1.5.jar
-
-	# the build.xml unpacks this and uses stuff
-	touch empty
-	jar cf mini-j2ee.jar empty
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="antlr-3.5,glassfish-connector-api,log4j"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="javadocs"
-
-src_compile() {
-	java-pkg_filter-compiler jikes
-	use jni && ANT_TASKS="cpptasks"
-
-	# This is nonsense, I know, but it works.
-	if use test; then
-		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-	fi
-
-	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
-		$(use jni && echo "compile-native")
-}
-
-src_install() {
-	cd "${S}/output/lib/"
-	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
-
-	for jar in full; do
-		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	done
-	if use test; then
-		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
-	fi
-
-	if use jni; then
-		cd "${S}/output/native"
-		sodest="/usr/lib/"
-		local so_arch
-		if use amd64; then
-			so_arch="x64"
-		elif use x86; then
-			so_arch="x86"
-		fi
-		java-pkg_doso libjaybird22_${so_arch}.so || die \
-			"java-pkg_doso ${sodest}libjaybird22.so failed"
-	fi
-
-	cd "${S}"
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -r examples || die "installing examples failed"
-	fi
-
-	use source && java-pkg_dosrc "${S}"/src/*/org
-
-	cd "${S}/output"
-	use doc && java-pkg_dohtml -r docs/
-	dodoc etc/default.mf
-	dohtml etc/*.html
-}
-
-src_test() {
-	#
-	# Warning about timeouts without Firebird installed and running Locally
-	#
-	ewarn "You will experience long timeouts when running junit tests"
-	ewarn "without Firebird installed and running locally. The tests will"
-	ewarn "complete without Firebird, but network timeouts prolong the"
-	ewarn "testing phase considerably."
-	ANT_TASKS="ant-junit" eant all-tests-pure-java
-}

diff --git a/dev-java/jdbc-jaybird/metadata.xml b/dev-java/jdbc-jaybird/metadata.xml
deleted file mode 100644
index a88051b8635..00000000000
--- a/dev-java/jdbc-jaybird/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-	Jaybird is a JCA/JDBC driver suite for the Firebird database server.
-	This package includes both a type 2 and 4 JDBC driver.
-	</longdescription>
-	<use>
-		<flag name="jni">Build/Install JDBC Type 2 native components</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">firebird</remote-id>
-		<remote-id type="github">FirebirdSQL/jaybird</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index be5bc880222..e266de9eafe 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -524,12 +524,6 @@ dev-ruby/toml
 # ruby21-only, no maintainer, fails tests
 www-apps/jekyll-paginate
 
-# Patrice Clement <monsieurp@g.o> (20 Jun 2017)
-# Fails to build with Java 8. Project is active on Github yet ebuild has never
-# been marked stable.
-# Masked for removal in 30 days.
-dev-java/jdbc-jaybird
-
 # Thomas Deutschmann <whissi@g.o> (17 Jun 2017)
 # Unmaintained in Gentoo repository; Multiple vulnerabilities
 # People using VMware in Gentoo should switch to Gentoo's VMware overlay