gentoo resync : 14.07.2018

4 files changed, 135 insertions, 0 deletions

diff --git a/dev-java/gnu-hylafax/Manifest b/dev-java/gnu-hylafax/Manifest
new file mode 100644
index 000000000000..e2d57fd3ae83
--- /dev/null
+++ b/dev-java/gnu-hylafax/Manifest
@@ -0,0 +1,4 @@
+AUX gnu-hylafax-1.0.3-ClientPool.patch 1940 BLAKE2B 73c2b714938577e0916839b68d29e3a2b2bdff6eb1890af28f5c977889eb6cf4a10efc5e902361a31a05d0f636a23ead43ea9b06a10766475300a212cb39b1f6 SHA512 3c38ad5ea49b7db4870ed5e5e0742499e540481402d685d3d33f3650b33a6f900dc97a6d253fad5b22c1778c080e613b89671a2cf0a2257a9eaef921414e8597
+DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 BLAKE2B b17facac17157fddfa27c40f58738d51904e2858a5ec80fe36a39038d7301df8d9cd10bbe5fc537d340e9e3c2e69ae590f92ce2fa7e2b004218bc1fd84013624 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2
+EBUILD gnu-hylafax-1.0.3-r2.ebuild 1050 BLAKE2B 0e79c7203e34a4772880f5577ac0021d275116a062b4727f23ab66610e98bd7acbe5665ad3ec60dc69d214f0b9735e28b33b5b50ed151f1770c2b3f29deef729 SHA512 30f77fbb4e5b22fd18992143d01ce5c84239105bd82f5f0c0b0ce7ce9acc8db497a36188d39a6a17ee767daa4183592b145f54e6321baa2b54e62e015b414203
+MISC metadata.xml 317 BLAKE2B cc9118b2e5a41c9751856bf5bd36f48231440205835fa1dd6efd8dcb61efb4f7421c1b8f4e87e6f5c59fd3465215fbe00d7c22daea0ac41aa4085a124254e389 SHA512 f5e653f1ec56bcd9824f63d24fe9af1cae1ed854a5650ac458912cca536c8f98a64dc40f6563bf0e328020281a65049a52a58bb6b411828e1e23745161c765c4
diff --git a/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
new file mode 100644
index 000000000000..51bae74646ed
--- /dev/null
+++ b/dev-java/gnu-hylafax/files/gnu-hylafax-1.0.3-ClientPool.patch
@@ -0,0 +1,70 @@
+--- gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java.orig	2015-04-14 18:20:17.113435400 +0000
++++ gnu-hylafax-pool/main/java/gnu/hylafax/pool/ClientPool.java	2015-04-14 18:20:58.310438791 +0000
+@@ -32,7 +32,7 @@
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ 
+-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
++import java.util.concurrent.ConcurrentLinkedQueue;
+ 
+ public class ClientPool implements gnu.hylafax.ClientPool {
+ 
+@@ -42,7 +42,7 @@
+ 
+     private HashMap clientMap;
+ 
+-    private LinkedQueue clients;
++    private ConcurrentLinkedQueue clients;
+ 
+     private ClientPoolConfiguration configuration;
+ 
+@@ -66,7 +66,7 @@
+ 
+     public ClientPool(ClientPoolConfiguration configuration) {
+ 	this.configuration = configuration;
+-	clients = new LinkedQueue();
++	clients = new ConcurrentLinkedQueue();
+ 	clientMap = new HashMap();
+ 	workingClients = new HashSet();
+ 	workingClientsToClose = new HashSet();
+@@ -163,8 +163,7 @@
+ 			    blocked = true;
+ 			}
+ 
+-			client = (PooledClient) clients.poll(getConfiguration()
+-				.getRetryInterval());
++			client = (PooledClient) clients.poll();
+ 			if (client == null)
+ 			    log.warn("No Clients Available.");
+ 			else if (!clientAdded)
+@@ -172,10 +171,10 @@
+ 		    }
+ 
+ 		} else {
+-		    client = (PooledClient) clients.take();
++		    client = (PooledClient) clients.poll();
+ 		}
+ 	    }
+-	} catch (InterruptedException e) {
++	} catch (Exception e) {
+ 	    throw new ClientPoolException(
+ 		    "Interrupted Thread and No Free Connection Available.");
+ 	}
+@@ -294,7 +293,7 @@
+ 		    destroyClient(client);
+ 		    addClient();
+ 		} else {
+-		    clients.put(client);
++		    clients.offer(client);
+ 		    size++;
+ 		}
+ 	    }
+@@ -306,7 +305,7 @@
+ 
+ 	    log.debug("Released Client.");
+ 
+-	} catch (InterruptedException e) {
++	} catch (Exception e) {
+ 	    log.warn("Was Interrupted.", e);
+ 	    destroyClient(client);
+ 	} finally {
diff --git a/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..31cf502872d3
--- /dev/null
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API designed to implement the client protocol portion of the hfaxd server"
+HOMEPAGE="http://gnu-hylafax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}-bin.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-logging:0
+		dev-java/commons-cli:1
+		dev-java/oracle-javamail:0
+		dev-java/java-getopt:1
+		dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="
+	commons-logging
+	commons-cli-1
+	oracle-javamail
+	java-getopt-1
+	log4j"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-ClientPool.patch #546502
+)
+
+java_prepare() {
+	rm -rv "${S}"/lib || die
+	find -name "pom.xml" -delete || die
+
+	# tarball contains the same sources in gnu-.../sources and gnu-.../main/
+	rm -r gnu-hylafax-*/sources || die
+
+	epatch "${PATCHES[@]}"
+}
diff --git a/dev-java/gnu-hylafax/metadata.xml b/dev-java/gnu-hylafax/metadata.xml
new file mode 100644
index 000000000000..84d73dab5436
--- /dev/null
+++ b/dev-java/gnu-hylafax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnu-hylafax</remote-id>
+	</upstream>
+</pkgmetadata>