Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/rxtx/, dev-java/rxtx/files/
Date: Wed, 17 Feb 2016 21:21:55
Message-Id: 1455744101.7f74f4e1d7a0e36f31e5677d85616e0fc6073e84.chewi@gentoo
1 commit: 7f74f4e1d7a0e36f31e5677d85616e0fc6073e84
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 17 20:30:13 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 17 21:21:41 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f74f4e1
7
8 dev-java/rxtx: Remove old
9
10 Package-Manager: portage-2.2.27
11
12 dev-java/rxtx/Manifest | 1 -
13 dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff | 23 -----
14 .../files/rxtx-2.1-7r2-lfd-include-limits.diff | 12 ---
15 dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild | 100 ---------------------
16 4 files changed, 136 deletions(-)
17
18 diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
19 index fa8218a..2131c36 100644
20 --- a/dev-java/rxtx/Manifest
21 +++ b/dev-java/rxtx/Manifest
22 @@ -1,2 +1 @@
23 -DIST rxtx-2.1-7r2.zip 1345757 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 SHA512 977f098da9e9618a2bc1d2265f1a59c8bdeb00a228378af0176e2f7fa408fb0dcb309a8168de0febc13fa0e04d9d54c76c267a61b815037b5881100c4025a1ce WHIRLPOOL adafe3f944ed95cf28cefe1efc50f2402bbb475515f8085b6a19283a86df6ffd769387baf422dd89cbd5d5696674c0130cd07c48c72a9b4e2737026d56832fa5
24 DIST rxtx-2.2pre2.zip 1491209 SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 WHIRLPOOL 0c2893c016ae99f918ca3605c83d18ec2b9ea0022628562a36859eaa20001ce6cfa15d7e77b80ee32e259f162ee1512b026a9965ec1402ae35ebed4b473796fc
25
26 diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
27 deleted file mode 100644
28 index 857c834..0000000
29 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
30 +++ /dev/null
31 @@ -1,23 +0,0 @@
32 -support /dev/ttyACMx devices natively
33 -upstream bug report pending: http://bugzilla.qbang.org/show_bug.cgi?id=139
34 -http://bugs.gentoo.org/show_bug.cgi?id=301126
35 -Signed-off: Thilo Bangert <bangert@g.o>
36 -
37 ---- src/RXTXCommDriver.java.orig 2010-01-15 17:30:46.000000000 +0100
38 -+++ src/RXTXCommDriver.java 2010-01-15 17:31:56.000000000 +0100
39 -@@ -519,6 +519,7 @@
40 - if(osName.equals("Linux"))
41 - {
42 - String[] Temp = {
43 -+ "ttyACM", // linux USB Modems
44 - "ttyS", // linux Serial Ports
45 - "ttySA", // for the IPAQs
46 - "ttyUSB" // for USB frobs
47 -@@ -535,6 +536,7 @@
48 - "holter", // custom card for heart monitoring
49 - "modem", // linux symbolic link to modem.
50 - "rfcomm", // bluetooth serial device
51 -+ "ttyACM", // linux USB Modems
52 - "ttyircomm", // linux IrCommdevices (IrDA serial emu)
53 - "ttycosa0c", // linux COSA/SRP synchronous serial card
54 - "ttycosa1c", // linux COSA/SRP synchronous serial card
55
56 diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
57 deleted file mode 100644
58 index 3d32f36..0000000
59 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
60 +++ /dev/null
61 @@ -1,12 +0,0 @@
62 -diff --git a/src/lfd/lockdaemon.c b/src/lfd/lockdaemon.c
63 -index bdb8553..d13c5eb 100644
64 ---- a/src/lfd/lockdaemon.c
65 -+++ b/src/lfd/lockdaemon.c
66 -@@ -30,6 +30,7 @@
67 - #include <errno.h>
68 - #include <signal.h>
69 - #include <pwd.h>
70 -+#include <limits.h>
71 -
72 - #define FHS
73 - #define LOCKFILEPREFIX "LCK.."
74
75 diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
76 deleted file mode 100644
77 index 149fb25..0000000
78 --- a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
79 +++ /dev/null
80 @@ -1,100 +0,0 @@
81 -# Copyright 1999-2011 Gentoo Foundation
82 -# Distributed under the terms of the GNU General Public License v2
83 -# $Id$
84 -
85 -inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2
86 -
87 -MY_PV="$(replace_version_separator 2 -)"
88 -MY_PV="$(replace_version_separator 3 r ${MY_PV})"
89 -MY_P="${PN}-${MY_PV}"
90 -
91 -DESCRIPTION="Native lib providing serial and parallel communication for Java"
92 -HOMEPAGE="http://rxtx.qbang.org/"
93 -SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
94 -
95 -LICENSE="LGPL-2"
96 -SLOT="2"
97 -KEYWORDS="amd64 x86"
98 -IUSE="doc source lfd"
99 -
100 -RDEPEND=">=virtual/jre-1.4"
101 -
102 -DEPEND=">=virtual/jdk-1.4
103 - app-arch/unzip
104 - dev-java/ant-core
105 - lfd? ( sys-apps/xinetd )
106 - source? ( app-arch/zip )"
107 -
108 -S="${WORKDIR}/${MY_P}"
109 -
110 -src_unpack() {
111 - unpack ${A}
112 - cd "${S}"
113 -
114 - # some minor fixes
115 - sed -i -e "s:UTS_RELEASE::g" configure.in
116 - sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in
117 - sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am
118 -
119 - # some patches
120 - epatch "${FILESDIR}/${MY_P}-lfd.diff" \
121 - "${FILESDIR}/${MY_P}-nouts.diff" \
122 - "${FILESDIR}/${MY_P}-add-ttyACM.diff" \
123 - "${FILESDIR}/${MY_P}-lfd-include-limits.diff"
124 -
125 - # update autotools stuff
126 - rm acinclude.m4
127 - eautoreconf
128 - elibtoolize
129 -}
130 -
131 -src_compile() {
132 - econf $(use_enable lfd lockfile_server) || die "econf failed"
133 - emake || die "emake failed"
134 -
135 - if use lfd; then
136 - # see INSTALL in src/ldf
137 - $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed"
138 - fi
139 -
140 - if use doc; then
141 - emake docs || die "failed to emake docs"
142 - fi
143 -
144 - #Fix for src zip creation
145 - if use source; then
146 - mkdir -p src_with_pkg/gnu
147 - ln -s ../../src src_with_pkg/gnu/io
148 - fi
149 -}
150 -
151 -src_install() {
152 - java-pkg_dojar RXTXcomm.jar
153 - java-pkg_doso ${CHOST}/.libs/*.so
154 -
155 - dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
156 - dohtml RMISecurityManager.html
157 -
158 - if use lfd; then
159 - insinto /etc/xinetd.d
160 - newins "${FILESDIR}/lockfiled.xinetd" lfd
161 - dosbin src/lfd/in.lfd
162 - dodoc src/lfd/LockFileServer.rfc
163 - fi
164 -
165 - use doc && java-pkg_dojavadoc api
166 - use source && java-pkg_dosrc src_with_pkg/gnu
167 -}
168 -
169 -pkg_postinst() {
170 - if use lfd; then
171 - elog "Don't forget to enable the LockFileServer"
172 - elog "daemon (lfd) in /etc/xinetd.d/lfd"
173 - else
174 - elog "RXTX uses UUCP style device-locks. You should"
175 - elog "add every user who needs to access serial ports"
176 - elog "to the 'uucp' group:"
177 - elog
178 - elog " usermod -aG uucp <user>"
179 - fi
180 -}