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

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 133 insertions, 3 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/Manifest b/dev-java/rxtx/Manifest
index 80f36e2a8e66..59b22a1bbfa9 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,7 +1,9 @@
 AUX lockfiled.xinetd 202 RMD160 da27001f9265cefaff35a31931515f088ecea1a9 SHA1 4bfecd3d8a23c1256983638abcc1a8b1883a5a90 SHA256 5016c083c1eee98483e16187b79e762db43b50b4177c7420196a91ed64bfe940
+AUX rxtx-2.1-7r2-add-ttyACM.diff 979 RMD160 aadeee8f0a42bcde710dd070ca0938ce165dfcfe SHA1 d94940c21712dc569053e96ace08b158861f620f SHA256 7742e2a5b1712a87e7273da38daf04cab199baa3c6aff30d64c56f736f45a6e8
 AUX rxtx-2.1-7r2-lfd.diff 497 RMD160 273ec40878a09d7d54ea164a9233bd10a9ac2b85 SHA1 cc4a79cdbe5c5ee858cde517f77676c5587e3ab7 SHA256 83bedeb80858fa7671c102cca3d8f95e59046a081f9da1213efafacd0371322b
 AUX rxtx-2.1-7r2-nouts.diff 3583 RMD160 355948dfbf04e89f8ee95e3b17dfccb96de5bb4c SHA1 7468ef8e6d9f98b8d5cef48276304ccd8389384b SHA256 bdea39bd623d71ebffd0412476f7b9cd680c7e61ab546bda06dfa517bf175faf
 DIST rxtx-2.1-7r2.zip 1345757 RMD160 dc569a654fbef58aa521013e170c0200b8b3668f SHA1 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9
 EBUILD rxtx-2.1.7.2-r2.ebuild 2382 RMD160 ee63bd8428b2ec0b56782df3df3191a56e084e43 SHA1 e64f75ab86112c0387cdbd68836d47477e4e711c SHA256 b38c767036daf7b72906b3b37e5c69af9eb4b66b011e00d85cce4f609d914002
-MISC ChangeLog 2055 RMD160 1ef2f311c4dc4ab41c4503aadaced1bef816f86a SHA1 94ebc546c47c342d4d29b4d355da7b9aa8f5288a SHA256 fc24261fd09bbdfd721d70010ea7e1a4a24f8d8d7da56e7ba3bd07a2acdf6ecb
+EBUILD rxtx-2.1.7.2-r3.ebuild 2429 RMD160 566c7ffb6da6eac1350947b59c1aeff234cffbcc SHA1 f498d7585fba4e22d4d9d7310c3859496dd35018 SHA256 ce7580b6e96b77b597b817f4d0d2c69fb2dabe549e15dbed5b6bce628757d901
+MISC ChangeLog 2271 RMD160 5514bb57dd4aa5d17e3e838c5d4b1d324268db4a SHA1 ef829ad826260dfce5704a9c90980e207794dc8b SHA256 0f73bec081ecbb0d9de00f782cc72bba758cc514f52486a3b1fe76fa953cb86c
 MISC metadata.xml 250 RMD160 df44ee5bc96c577fb7a08006ad728df57813da16 SHA1 3d6e62be3be2ef8e4dd763e1593ed0495a8fd406 SHA256 83a968fdd0034f60b9aa197e06151edd9f9e613527beae042fd7853b9ae4fc9d
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
+}