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

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 7d96a880bd4aa6dfb06169c4cc96fc2cdd8ab321..41aeae00986d54f2c6cefd6e8042bba7b6a023a5 100644 (file)
--- 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/Manifest b/dev-java/rxtx/Manifest
index 0428a2a0ae21d6f8663dbbf294a086c0ed31be58..555e3696b408346a56fbb3cd079874076b7a1ceb 100644 (file)
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,10 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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-include-limits.diff 286 RMD160 4d86d23e28ddf7042c718bb92acf1d4d1b62e434 SHA1 b2110e3561282a80a60b1d645c6317e39432092e SHA256 b0e9ee9cfd6b061d814aafd3b90dc52500c3db24867c1d740299dd543144d7fe
 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
+AUX rxtx-2.2_pre2-add-ttyACM.patch 842 RMD160 87be602fdcb54f2ac2402025d72c3475fdfa4c86 SHA1 3af31ab2bed8734d737ff38c3bf5809bd7c39f49 SHA256 db200f71bb936465616b5f181a4127287d7b9083b07a0981078cbef08c985fe9
 DIST rxtx-2.1-7r2.zip 1345757 RMD160 dc569a654fbef58aa521013e170c0200b8b3668f SHA1 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9
+DIST rxtx-2.2pre2.zip 1491209 RMD160 b92f1aefd01751d0a8212428c67b1af7515292b2 SHA1 ce793281940cb6acbf1461e8f8752e61040b4f6d SHA256 3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880495b03
 EBUILD rxtx-2.1.7.2-r2.ebuild 2382 RMD160 ee63bd8428b2ec0b56782df3df3191a56e084e43 SHA1 e64f75ab86112c0387cdbd68836d47477e4e711c SHA256 b38c767036daf7b72906b3b37e5c69af9eb4b66b011e00d85cce4f609d914002
 EBUILD rxtx-2.1.7.2-r3.ebuild 2472 RMD160 cffc45dff48bc75f8e431573048e4c2bacad81a8 SHA1 d8794c9fdb3a1f9448ce83815d3ffba1bf06229b SHA256 e7b5af6aba2a476a245b09f6e44d883638bbd1078b9e62d493ccb3f576e154a6
-MISC ChangeLog 2578 RMD160 cb26f18a2bb065c5405353a66f623ed97da3dd24 SHA1 c19202bc21e13ca0a0bdad36d0dfde2d9382f8d9 SHA256 cd78185bd03312f0d0ff3654a5ec8d821d3bef5f09f544b3578fe6541888d759
+EBUILD rxtx-2.2_pre2.ebuild 2321 RMD160 72ab5355ffaa286b612ff31777145cfd6b7a7e0d SHA1 55544e15d1a7d26bd43c24971eba38b74782bcfd SHA256 3142ae941efc358ed0bee5c3b92fcd2df94eea6b71f7e55893bbc61947404fda
+MISC ChangeLog 2804 RMD160 9e9ff6da98c4b1b2127aec1e0b88dcd0fcf6929d SHA1 40b45a5b1b387bcf485fb484bd2ee33458aa93fc SHA256 5609966fcb611bdcd9088840d22bdfdb4a8e3db7cc857dce2f726526c125bb63
 MISC metadata.xml 250 RMD160 df44ee5bc96c577fb7a08006ad728df57813da16 SHA1 3d6e62be3be2ef8e4dd763e1593ed0495a8fd406 SHA256 83a968fdd0034f60b9aa197e06151edd9f9e613527beae042fd7853b9ae4fc9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOeuBxAAoJEEqz6FtPBkyjBK8IAKrU+MxFOtI+ZD3McIKLlBCm
+Ww0uCiznBI2pyQG9PDYVF5EvrNcZ2vwAzKmWZGHtvA+0X97OF0YxUUckZAD+PGXS
+eiDTYhR3oLmXfZyMwcd00b1C5uukVEYhvr0Fhc+Gtn8LkmssqzlmYeyvWUaFhush
+hQs8bUJCpm8PuPvh79aOu5gOvII709Z2BZPdF7l12zt/ld1TCui6F2tGe3JE/8vR
+LZF60/3OQ1mMg1Nwp8DOiVsnvlLdsN+A79GhRVIcV+c8GOkdFxWmd81s2Bigp0va
+Upj+WIRxXuiWk2ZbH9HmWs8cjlLWgYu2OCEE4Da9PT/GR4rcUeEd2rZVbT8GQ+E=
+=8PuQ
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..cf1e1d9
--- /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 (file)
index 0000000..4d10874
--- /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
+}