Remove dev-java/concurrent-util dependency. Patch sources to get them to compile...

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

diff --git a/dev-java/gnu-hylafax/ChangeLog b/dev-java/gnu-hylafax/ChangeLog
index 276e7d90a7a6e95dba4c1d298a495c8b25876e69..51693168a6356561ea42251a03cb2d07c85713af 100644 (file)
--- a/dev-java/gnu-hylafax/ChangeLog
+++ b/dev-java/gnu-hylafax/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-hylafax
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/ChangeLog,v 1.1 2015/03/22 08:27:39 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/ChangeLog,v 1.2 2015/04/14 18:25:45 monsieurp Exp $
+
+*gnu-hylafax-1.0.3-r1 (14 Apr 2015)
+
+  14 Apr 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/gnu-hylafax-1.0.3-ClientPool.patch, +gnu-hylafax-1.0.3-r1.ebuild:
+  Remove dev-java/concurrent-util dependency. Patch sources to get them to
+  compile using java.util.concurrent instead. Fix bug 546502.
 
 *gnu-hylafax-1.0.3 (22 Mar 2015)
 

diff --git a/dev-java/gnu-hylafax/Manifest b/dev-java/gnu-hylafax/Manifest
index b153b112ce581c17161a5239890af58351860443..1968b350860cf229f0a5be73764d8298317e1d95 100644 (file)
--- a/dev-java/gnu-hylafax/Manifest
+++ b/dev-java/gnu-hylafax/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnu-hylafax-1.0.3-ClientPool.patch 1940 SHA256 898e5fb098f7d5931ee3bdcfdb30a209af94a5b79e701e7349e190f5e609ce0c SHA512 3c38ad5ea49b7db4870ed5e5e0742499e540481402d685d3d33f3650b33a6f900dc97a6d253fad5b22c1778c080e613b89671a2cf0a2257a9eaef921414e8597 WHIRLPOOL 36af3ec2685f6173636377158036d046108611544f9782624750d39a3cc651885c425ee1267ecb7bc2ee6f34ec51d963f28b958c09162f9dd56c4876ac5b09db
 DIST gnu-hylafax-1.0.3-bin.tar.gz 1742697 SHA256 1e35853af20d74e1c3acbc460ef7fb04f76fc52be11ff0b560abe14b3c4f0a61 SHA512 7af66dac5a1b98eddc3d60aa439809f4e683a39a795ca50d0f99f92d4fb17704ab5c7528218be1f4698bca0749efd46c5ec3510e8a10a68b1b77faf1997dc4a2 WHIRLPOOL 2081d2238ca8ec5709ce7520547370b6a8431e33e33fb318612eb43cced6edfb1fc02836cca4bfc1d7c3edc24a3ea63bc53ac34cd573da436f10031c7f7b1ccf
+EBUILD gnu-hylafax-1.0.3-r1.ebuild 1137 SHA256 a2a4a0351340b041a501a353732c1b195f67efbbf4f195542275e3d216815503 SHA512 06876c2c451f4ed96c826dfc59fc622fc0e4e16d01c9d27c08fd7ae247b12eba70dc5218fac740a4742fb65f73e9a705c811bbd415894ba1bf8aa51fa023776e WHIRLPOOL 0a689ecd94fcc078d8546a8780fbd192f88ec773ba62a305e63990723a168a7fb7407e225b3f2d48b1e76a7bd0500b4cecd6a5f988aacec6970c27344b890cf0
 EBUILD gnu-hylafax-1.0.3.ebuild 1112 SHA256 e53d56c6809965709068ff91a3a07240d938a7fe81362524d9c8e4c7bd6af8bb SHA512 da963a0be7fb43be46f0c2e6e130392964b0483d590d28769c8167170663225d622a551f1c616c5d990c448ab56b6ac7382842e4a360321a8a78926353644bb1 WHIRLPOOL 8b949ac617785bb965179c1d7a2fcd66de02631c3b2dc0267c0be1b9770bffdcd7137653e9555afc641af5c9914657cff9c27deca59eb322da98c502d226cfb7
-MISC ChangeLog 368 SHA256 3eb7375cf9fc3d1a48322a580a928ad075727dfd8b2c8b6d0c53e24a2a5fbb57 SHA512 d18e8468fb8c502509d0467b46e865fac8942e6d9bea190399b2f572f6546f3d62afd8ab5751bce66d858a769db089e94bb75f05c3629edb13043341411b2f18 WHIRLPOOL f6b4af77f05e8497a82d4e66b65984ea9259a98c09e0862cd52df12433a29e555bd6d9a84fbb775ca13d6c6a7b042c23a88d249ab1ec6e93865bb0c90a8eecff
+MISC ChangeLog 676 SHA256 2646a27626a7a0de7e2ec680b898e2279f70199058d423cd73ad73d5aea4fe2c SHA512 f58e18d486b9aaccf8d43683d6d8f8dbfa6e97617752d6b138ffa94514c5f8d595ee833eed31a3c072839426c2256b8d5e29b8374b220e197828e8a614adb541 WHIRLPOOL f3f7b0422eac4084596526560a9ee9194a8291f96662e29783e01a68fce47d7562d7d99a3f1c076aa3ad01d1656946c9b8bfaaa68770597dba211a2e2814926f
 MISC metadata.xml 159 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 SHA512 f5bc77a4e168cdb5a9f9c347f6f437b16bd28978351ec692d4f7e406ba93479424e2272de70fe85d2e0668172de8ccd3aa096f49d5912ed91d17bea11756865b WHIRLPOOL b0cba2d5917cc20d7409ccfedc345ab38c71df76c5c030df578d6db718f8a60dcfc1927c20e7062fafc62e955a90ec9f21cdcef6d7a566fddf374ce766ca64cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVDnz/AAoJEKCEBkJ3xQHtfv4H/3XuHc5HNyOkngurZyh1Uvpy
-+mXLHdxixRqiZoXYdZHB5hty3s+UjeVLwOZKlYcvR8NBu6ui/i2XmP5TPU8IetmL
-Y/+tANxh2pZE3US3IfpXRsRWWghIjPmlDP3PkS/RYrq81StnJ9xkQWRzq1zAnITa
-wBXPsa2JgnCc3z4Q2xDpescfEW0M1nQFiTmu1IK5fd7YS9bRwM+OeFYNyZh8zjLk
-Ygn6BlpQPUcXkd9MSzyV0sptu2KpNzm+rTQkIyuReJBKteyS3svNJUk3LuxAXRrl
-lvL6gUCANOoSxI46iNjiA6wPNwxUwufquieZU8+/ZrKXx0kdhBOvSwZW4gen2/w=
-=MK9d
+iQEcBAEBCAAGBQJVLVvaAAoJEJGRpfGTSRu4vd4IAJ4CId9hov6VTgjmUWJsf3kR
+flT66XwR8WZAwN9ubeUw/EH+4sqaqMcycmt0cV753muv/LNSLt0vExQ+4vhD8b+j
+Yk0no7IqDGnu6W+By0gb3U79BMsaRoffSYVzoSYf222CwtKybJL+e4zZiz+ya8kA
+x9SwGY4pE2gXNFa7/rrxQe9Q1mkExMRZsIHseJiTQQqxEGlR3sXQAdf7WO4jqI06
+7lcnF9mKKvi0p2KTGM+rhr8crulVpdjPppHR4W4YUOe4xNtMcfezWESWFCrBKw15
+8jaCf/fELwIag1BcTzW2ybdbClcQ4lGFI59cRm1qOW72bjAu2rmpr+iNQD4A5Is=
+=wpKL
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..51bae74
--- /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-r1.ebuild b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r1.ebuild
new file mode 100644 (file)
index 0000000..4b7c00e
--- /dev/null
+++ b/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-hylafax/gnu-hylafax-1.0.3-r1.ebuild,v 1.1 2015/04/14 18:25:45 monsieurp Exp $
+
+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
+               java-virtuals/javamail:0
+               dev-java/java-getopt:1
+               dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+       ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+       ${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_GENTOO_CLASSPATH="commons-logging,commons-cli-1,javamail,java-getopt-1,log4j"
+
+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
+
+       # bug 546502
+       epatch "${FILESDIR}"/"${P}"-ClientPool.patch
+}