commit: 7f74f4e1d7a0e36f31e5677d85616e0fc6073e84 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Feb 17 20:30:13 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Feb 17 21:21:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f74f4e1
dev-java/rxtx: Remove old Package-Manager: portage-2.2.27 dev-java/rxtx/Manifest | 1 - dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff | 23 ----- .../files/rxtx-2.1-7r2-lfd-include-limits.diff | 12 --- dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild | 100 --------------------- 4 files changed, 136 deletions(-) diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest index fa8218a..2131c36 100644 --- a/dev-java/rxtx/Manifest +++ b/dev-java/rxtx/Manifest @@ -1,2 +1 @@ -DIST rxtx-2.1-7r2.zip 1345757 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 SHA512 977f098da9e9618a2bc1d2265f1a59c8bdeb00a228378af0176e2f7fa408fb0dcb309a8168de0febc13fa0e04d9d54c76c267a61b815037b5881100c4025a1ce WHIRLPOOL adafe3f944ed95cf28cefe1efc50f2402bbb475515f8085b6a19283a86df6ffd769387baf422dd89cbd5d5696674c0130cd07c48c72a9b4e2737026d56832fa5 DIST rxtx-2.2pre2.zip 1491209 SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03 SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514 WHIRLPOOL 0c2893c016ae99f918ca3605c83d18ec2b9ea0022628562a36859eaa20001ce6cfa15d7e77b80ee32e259f162ee1512b026a9965ec1402ae35ebed4b473796fc 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 deleted file mode 100644 index 857c834..0000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff +++ /dev/null @@ -1,23 +0,0 @@ -support /dev/ttyACMx devices natively -upstream bug report pending: http://bugzilla.qbang.org/show_bug.cgi?id=139 -http://bugs.gentoo.org/show_bug.cgi?id=301126 -Signed-off: Thilo Bangert <[email protected]> - ---- src/RXTXCommDriver.java.orig 2010-01-15 17:30:46.000000000 +0100 -+++ src/RXTXCommDriver.java 2010-01-15 17:31:56.000000000 +0100 -@@ -519,6 +519,7 @@ - if(osName.equals("Linux")) - { - String[] Temp = { -+ "ttyACM", // linux USB Modems - "ttyS", // linux Serial Ports - "ttySA", // for the IPAQs - "ttyUSB" // for USB frobs -@@ -535,6 +536,7 @@ - "holter", // custom card for heart monitoring - "modem", // linux symbolic link to modem. - "rfcomm", // bluetooth serial device -+ "ttyACM", // linux USB Modems - "ttyircomm", // linux IrCommdevices (IrDA serial emu) - "ttycosa0c", // linux COSA/SRP synchronous serial card - "ttycosa1c", // linux COSA/SRP synchronous serial card 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 deleted file mode 100644 index 3d32f36..0000000 --- a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/lfd/lockdaemon.c b/src/lfd/lockdaemon.c -index bdb8553..d13c5eb 100644 ---- a/src/lfd/lockdaemon.c -+++ b/src/lfd/lockdaemon.c -@@ -30,6 +30,7 @@ - #include <errno.h> - #include <signal.h> - #include <pwd.h> -+#include <limits.h> - - #define FHS - #define LOCKFILEPREFIX "LCK.." diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild deleted file mode 100644 index 149fb25..0000000 --- a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2 - -MY_PV="$(replace_version_separator 2 -)" -MY_PV="$(replace_version_separator 3 r ${MY_PV})" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Native lib providing serial and parallel communication for Java" -HOMEPAGE="http://rxtx.qbang.org/"; -SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"; - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="amd64 x86" -IUSE="doc source lfd" - -RDEPEND=">=virtual/jre-1.4" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - dev-java/ant-core - lfd? ( sys-apps/xinetd ) - source? ( app-arch/zip )" - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # some minor fixes - sed -i -e "s:UTS_RELEASE::g" configure.in - sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in - sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am - - # some patches - epatch "${FILESDIR}/${MY_P}-lfd.diff" \ - "${FILESDIR}/${MY_P}-nouts.diff" \ - "${FILESDIR}/${MY_P}-add-ttyACM.diff" \ - "${FILESDIR}/${MY_P}-lfd-include-limits.diff" - - # update autotools stuff - rm acinclude.m4 - eautoreconf - elibtoolize -} - -src_compile() { - econf $(use_enable lfd lockfile_server) || die "econf failed" - emake || die "emake failed" - - if use lfd; then - # see INSTALL in src/ldf - $(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die "compiling lfd failed" - fi - - if use doc; then - emake docs || die "failed to emake docs" - fi - - #Fix for src zip creation - if use source; then - mkdir -p src_with_pkg/gnu - ln -s ../../src src_with_pkg/gnu/io - fi -} - -src_install() { - java-pkg_dojar RXTXcomm.jar - java-pkg_doso ${CHOST}/.libs/*.so - - dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt - dohtml RMISecurityManager.html - - if use lfd; then - insinto /etc/xinetd.d - newins "${FILESDIR}/lockfiled.xinetd" lfd - dosbin src/lfd/in.lfd - dodoc src/lfd/LockFileServer.rfc - fi - - use doc && java-pkg_dojavadoc api - use source && java-pkg_dosrc src_with_pkg/gnu -} - -pkg_postinst() { - if use lfd; then - elog "Don't forget to enable the LockFileServer" - elog "daemon (lfd) in /etc/xinetd.d/lfd" - else - elog "RXTX uses UUCP style device-locks. You should" - elog "add every user who needs to access serial ports" - elog "to the 'uucp' group:" - elog - elog " usermod -aG uucp <user>" - fi -}
