Non-maintainer version bump (bug #277262). Update HOMEPAGE and bump to EAPI 4.

(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

3 files changed, 131 insertions, 2 deletions

diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 7d96a880bd4a..41aeae00986d 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/rxtx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.15 2010/07/07 14:40:33 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.16 2011/09/22 07:14:51 radhermit Exp $
+
+*rxtx-2.2_pre2 (22 Sep 2011)
+
+  22 Sep 2011; Tim Harder <radhermit@gentoo.org> +rxtx-2.2_pre2.ebuild,
+  +files/rxtx-2.2_pre2-add-ttyACM.patch:
+  Non-maintainer version bump (bug #277262). Update HOMEPAGE and bump to EAPI
+  4.
 
   07 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   rxtx-2.1.7.2-r3.ebuild:
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
new file mode 100644
index 000000000000..cf1e1d9bfea0
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
@@ -0,0 +1,21 @@
+--- rxtx-2.2pre2/CNI/RXTXCommDriver.java.orig	2010-02-12 09:13:00.032700879 -0800
++++ rxtx-2.2pre2/CNI/RXTXCommDriver.java	2010-02-12 09:13:57.504441037 -0800
+@@ -556,8 +556,10 @@
+ 					if(osName.equals("Linux"))
+ 					{
+ 						String[] Temp = {
++						"ttyACM", // linux USB modems
+ 						"ttyS", // linux Serial Ports
+ 						"ttySA" // for the IPAQs
++						"ttyUSB", //linux USB serial converters
+ 						};
+ 						CandidatePortPrefixes=Temp;
+ 					}
+@@ -573,6 +575,7 @@
+ 						"ttyircomm", // linux IrCommdevices (IrDA serial emu)
+ 						"ttycosa0c", // linux COSA/SRP synchronous serial card
+ 						"ttycosa1c", // linux COSA/SRP synchronous serial card
++						"ttyACM", // linux USB modems
+ 						"ttyC", // linux cyclades cards
+ 						"ttyCH",// linux Chase Research AT/PCI-Fast serial card
+ 						"ttyD", // linux Digiboard serial card
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
new file mode 100644
index 000000000000..4d108748f26c
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.2_pre2.ebuild,v 1.1 2011/09/22 07:14:51 radhermit Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs versionator autotools java-pkg-2
+
+MY_PV="$(delete_version_separator 2)"
+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_prepare() {
+	# 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}/${PN}-2.1-7r2-lfd.diff"
+	epatch "${FILESDIR}/${PN}-2.1-7r2-nouts.diff"
+	epatch "${FILESDIR}/${P}-add-ttyACM.patch"
+
+	# update autotools stuff
+	rm acinclude.m4
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable lfd lockfile_server)
+}
+
+src_compile() {
+	emake
+
+	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
+	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
+}