add /dev/ttyACM type devices to list of know serial ports (#301126)

(Portage version: 2.2_rc62/cvs/Linux i686)

3 files changed, 130 insertions, 2 deletions

diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 6195fcacb942..456212c0d238 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/rxtx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.12 2008/07/05 09:53:14 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.13 2010/02/12 10:07:12 bangert Exp $
+
+*rxtx-2.1.7.2-r3 (12 Feb 2010)
+
+  12 Feb 2010; Thilo Bangert <bangert@gentoo.org>
+  +files/rxtx-2.1-7r2-add-ttyACM.diff, +rxtx-2.1.7.2-r3.ebuild:
+  add /dev/ttyACM type devices to list of know serial ports (#301126)
 
   05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
   -rxtx-2.1.7.2-r1.ebuild, rxtx-2.1.7.2-r2.ebuild:
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
new file mode 100644
index 000000000000..857c8342c371
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-add-ttyACM.diff
@@ -0,0 +1,23 @@
+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 <bangert@gentoo.org>
+
+--- 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/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
new file mode 100644
index 000000000000..0dbcb929bca1
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild,v 1.1 2010/02/12 10:07:12 bangert Exp $
+
+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.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"
+	epatch "${FILESDIR}/${MY_P}-nouts.diff"
+	epatch "${FILESDIR}/${MY_P}-add-ttyACM.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
+}