version bump, migrated to java-pkg-2, added lockfileserver support, solving bugs #120962 and #149787.

Package-Manager: portage-2.1.2_rc1

8 files changed, 263 insertions, 15 deletions

diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 0a4b33db8a1f..ad928eebde1d 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/rxtx
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.2 2005/05/17 18:15:44 luckyduck Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.3 2006/10/30 00:33:13 sbriesen Exp $
+
+*rxtx-2.1.7.2 (30 Oct 2006)
+
+  30 Oct 2006; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/rxtx-2.1-7r2-lfd.diff, +files/rxtx-2.1-7r2-nouts.diff,
+  +files/lockfiled.xinetd, +rxtx-2.1.7.2.ebuild:
+  version bump, migrated to java-pkg-2, added lockfileserver support, solving
+  bugs #120962 and #149787.
 
   17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> rxtx-2.1.7_pre17.ebuild:
   stable on amd64 and x86
diff --git a/dev-java/rxtx/Manifest b/dev-java/rxtx/Manifest
index 56a58bdabfd8..8a1bfa3d5185 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -1,14 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2737e7393831906dbc36061deca6bf0a ChangeLog 526
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+AUX lockfiled.xinetd 202 RMD160 da27001f9265cefaff35a31931515f088ecea1a9 SHA1 4bfecd3d8a23c1256983638abcc1a8b1883a5a90 SHA256 5016c083c1eee98483e16187b79e762db43b50b4177c7420196a91ed64bfe940
+MD5 221d7c3099b6afc998aebb14499273d5 files/lockfiled.xinetd 202
+RMD160 da27001f9265cefaff35a31931515f088ecea1a9 files/lockfiled.xinetd 202
+SHA256 5016c083c1eee98483e16187b79e762db43b50b4177c7420196a91ed64bfe940 files/lockfiled.xinetd 202
+AUX rxtx-2.1-7r2-lfd.diff 497 RMD160 273ec40878a09d7d54ea164a9233bd10a9ac2b85 SHA1 cc4a79cdbe5c5ee858cde517f77676c5587e3ab7 SHA256 83bedeb80858fa7671c102cca3d8f95e59046a081f9da1213efafacd0371322b
+MD5 ddd549c6404c77dbf9db09455158f4a4 files/rxtx-2.1-7r2-lfd.diff 497
+RMD160 273ec40878a09d7d54ea164a9233bd10a9ac2b85 files/rxtx-2.1-7r2-lfd.diff 497
+SHA256 83bedeb80858fa7671c102cca3d8f95e59046a081f9da1213efafacd0371322b files/rxtx-2.1-7r2-lfd.diff 497
+AUX rxtx-2.1-7r2-nouts.diff 3583 RMD160 355948dfbf04e89f8ee95e3b17dfccb96de5bb4c SHA1 7468ef8e6d9f98b8d5cef48276304ccd8389384b SHA256 bdea39bd623d71ebffd0412476f7b9cd680c7e61ab546bda06dfa517bf175faf
+MD5 5e28106b992669a074e1965f327314c4 files/rxtx-2.1-7r2-nouts.diff 3583
+RMD160 355948dfbf04e89f8ee95e3b17dfccb96de5bb4c files/rxtx-2.1-7r2-nouts.diff 3583
+SHA256 bdea39bd623d71ebffd0412476f7b9cd680c7e61ab546bda06dfa517bf175faf files/rxtx-2.1-7r2-nouts.diff 3583
+DIST rxtx-2.1-7pre17.tar.gz 985729 RMD160 ddde109e7f760f6f69dcb6d95ff03dacf52d7949 SHA1 76f41bb70681996943429482a0e87f35d5999968 SHA256 f6662f1ce05685da0a662236e432f9c3b865a7b4d8707004a48e38346149a6e3
+DIST rxtx-2.1-7r2.zip 1345757 RMD160 dc569a654fbef58aa521013e170c0200b8b3668f SHA1 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9
+EBUILD rxtx-2.1.7.2.ebuild 2093 RMD160 b82c5570ad753eac53031cca36d3182969500f47 SHA1 36627c19afc5c550c05da54bc069e82df2972c8f SHA256 81659b8f32d1160e674c7d5f5df065ba79589362545c3c97d633a356bf622477
+MD5 51eafd5346edbc3381b8bbb5d45ed368 rxtx-2.1.7.2.ebuild 2093
+RMD160 b82c5570ad753eac53031cca36d3182969500f47 rxtx-2.1.7.2.ebuild 2093
+SHA256 81659b8f32d1160e674c7d5f5df065ba79589362545c3c97d633a356bf622477 rxtx-2.1.7.2.ebuild 2093
+EBUILD rxtx-2.1.7_pre17.ebuild 829 RMD160 93daf211839a3096b4a54f099240343e56054f5e SHA1 e8f565b13641f19cad7693e34dd3aed3ac84cd28 SHA256 6d7f47ac8d70d01cec3f0c8ed052767430e9384d8c69ccb1650dedbbe09f65d2
 MD5 b8c9132db49f953bbfdb5b92717192bd rxtx-2.1.7_pre17.ebuild 829
-MD5 3b9201b3a03e120d1bbe4376c3a0fbd6 files/digest-rxtx-2.1.7_pre17 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCijTl06ebR+OMO78RAvgdAJ9eSmVSjRlag0gd8t8FKWudL/uvVACaAiHH
-8bXzDPjBnD29M2/7Rb7oFJU=
-=oyBT
------END PGP SIGNATURE-----
+RMD160 93daf211839a3096b4a54f099240343e56054f5e rxtx-2.1.7_pre17.ebuild 829
+SHA256 6d7f47ac8d70d01cec3f0c8ed052767430e9384d8c69ccb1650dedbbe09f65d2 rxtx-2.1.7_pre17.ebuild 829
+MISC ChangeLog 829 RMD160 27622f1d96d73d742f7caacc593ddbc6ffc3d471 SHA1 8fdcc9506779248eaca4233a6462aace6d6e219d SHA256 14b534476056b8f52a72433b9dca6999e7618877ccc42575434c756faf33e062
+MD5 da6b21cce5908ab38a82bd0a5ad3d76f ChangeLog 829
+RMD160 27622f1d96d73d742f7caacc593ddbc6ffc3d471 ChangeLog 829
+SHA256 14b534476056b8f52a72433b9dca6999e7618877ccc42575434c756faf33e062 ChangeLog 829
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 cdedf6125376afd68eb691fa15780e1f files/digest-rxtx-2.1.7.2 232
+RMD160 c45af3cb92e7f78eb705dcd8b6174d49fdc0169d files/digest-rxtx-2.1.7.2 232
+SHA256 466364d474eee464d6b037cbf8299771c4e557116867a0375101f6bb3df1ecee files/digest-rxtx-2.1.7.2 232
+MD5 8d902524f8f6bba3881b1216703e39be files/digest-rxtx-2.1.7_pre17 247
+RMD160 ee94abe7e8d9c18eefc102c3b9d085906c05f1b6 files/digest-rxtx-2.1.7_pre17 247
+SHA256 590e44a40b8b73dd1aa9496b27a4a2b8ce45e418ced97864b6862031fb6094f2 files/digest-rxtx-2.1.7_pre17 247
diff --git a/dev-java/rxtx/files/digest-rxtx-2.1.7.2 b/dev-java/rxtx/files/digest-rxtx-2.1.7.2
new file mode 100644
index 000000000000..335acf61aa6b
--- /dev/null
+++ b/dev-java/rxtx/files/digest-rxtx-2.1.7.2
@@ -0,0 +1,3 @@
+MD5 9290b4832d46199f8d798a531209640b rxtx-2.1-7r2.zip 1345757
+RMD160 dc569a654fbef58aa521013e170c0200b8b3668f rxtx-2.1-7r2.zip 1345757
+SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 rxtx-2.1-7r2.zip 1345757
diff --git a/dev-java/rxtx/files/digest-rxtx-2.1.7_pre17 b/dev-java/rxtx/files/digest-rxtx-2.1.7_pre17
index 2caf74f4ced8..e3a52b478f38 100644
--- a/dev-java/rxtx/files/digest-rxtx-2.1.7_pre17
+++ b/dev-java/rxtx/files/digest-rxtx-2.1.7_pre17
@@ -1 +1,3 @@
 MD5 1ae2a0fc82bfb3f7a911f2313c8cad44 rxtx-2.1-7pre17.tar.gz 985729
+RMD160 ddde109e7f760f6f69dcb6d95ff03dacf52d7949 rxtx-2.1-7pre17.tar.gz 985729
+SHA256 f6662f1ce05685da0a662236e432f9c3b865a7b4d8707004a48e38346149a6e3 rxtx-2.1-7pre17.tar.gz 985729
diff --git a/dev-java/rxtx/files/lockfiled.xinetd b/dev-java/rxtx/files/lockfiled.xinetd
new file mode 100644
index 000000000000..8d6e95a5e444
--- /dev/null
+++ b/dev-java/rxtx/files/lockfiled.xinetd
@@ -0,0 +1,13 @@
+service lfd
+{
+	port		= 50001
+	bind		= localhost
+	type		= UNLISTED
+	flags		= REUSE
+	socket_type	= stream
+	wait		= no
+	user		= uucp
+	server		= /usr/sbin/in.lfd
+	log_on_failure	+= USERID
+	disable		= yes
+}
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
new file mode 100644
index 000000000000..496d732ae2fa
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd.diff
@@ -0,0 +1,14 @@
+--- src/lfd/lockdaemon.c.orig	2004-10-12 10:59:28.000000000 +0200
++++ src/lfd/lockdaemon.c	2006-10-29 22:46:58.000000000 +0100
+@@ -248,9 +248,8 @@
+ 
+ 	if ( check_group_uucp() )
+ 	{
+-		syslog( LOG_INFO, "check_lock_status: No permission to create lock file.
+-
+-		please see: How can I use Lock Files with rxtx? in INSTALL\n" );
++		syslog( LOG_INFO, "check_lock_status: No permission to create lock file.\n\n"
++			"please see: How can I use Lock Files with rxtx? in INSTALL\n" );
+ 		return 1;
+ 	}
+ 
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
new file mode 100644
index 000000000000..fb05955c65f1
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-nouts.diff
@@ -0,0 +1,90 @@
+--- src/I2CImp.c.orig	2004-10-17 16:23:02.000000000 +0200
++++ src/I2CImp.c	2006-10-26 21:25:32.000000000 +0200
+@@ -87,6 +87,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -98,6 +99,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RawImp.c.orig	2004-10-16 18:20:35.000000000 +0200
++++ src/RawImp.c	2006-10-26 21:25:59.000000000 +0200
+@@ -231,6 +231,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -242,6 +243,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/RS485Imp.c.orig	2004-10-16 18:20:35.000000000 +0200
++++ src/RS485Imp.c	2006-10-26 21:26:23.000000000 +0200
+@@ -87,6 +87,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #if defined(__linux__) 
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -98,6 +99,7 @@
+ 		fprintf(stderr, "\n\n\nRXTX WARNING:  This library was compiled to run with OS release %s and you are currently running OS release %s.  In some cases this can be a problem.  Try recompiling RXTX if you notice strange behavior.  If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* __linux__ */
+ #endif /* WIN32 */
+ }
+--- src/SerialImp.c.orig	2006-01-29 23:19:04.000000000 +0100
++++ src/SerialImp.c	2006-10-26 21:26:59.000000000 +0200
+@@ -280,6 +280,7 @@
+ 	gettimeofday(&seloop, NULL);
+ #endif /* DEBUG_TIMING */
+ #if defined(DEBUG) && defined(__linux__)
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -295,6 +296,7 @@
+ 		getchar();
+ 	}
+ 	LEAVE( "RXTXPort:Initialize" );
++#endif
+ #endif /* DEBUG && __linux__ */
+ }
+ 
+--- src/SerialImp.cpp.orig	2004-10-12 10:59:27.000000000 +0200
++++ src/SerialImp.cpp	2006-10-26 21:27:44.000000000 +0200
+@@ -102,6 +102,7 @@
+ 	if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
+ #endif /* !__FreeBSD__ */
+ #ifdef DEBUG
++#if 0
+ 	/* Lets let people who upgraded kernels know they may have problems */
+ 	if (uname (&name) == -1)
+ 	{
+@@ -114,6 +115,7 @@
+ 			name.release);
+ 		getchar();
+ 	}
++#endif
+ #endif /* DEBUG */
+ #endif /* __BEOS__ */
+ #endif /* WIN32 */
diff --git a/dev-java/rxtx/rxtx-2.1.7.2.ebuild b/dev-java/rxtx/rxtx-2.1.7.2.ebuild
new file mode 100644
index 000000000000..35c00da18a87
--- /dev/null
+++ b/dev-java/rxtx/rxtx-2.1.7.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/10/30 00:33:13 sbriesen Exp $
+
+inherit autotools java-pkg-2
+
+MY_PV="2.1-7r2"
+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
+	${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	lfd? ( sys-apps/xinetd )
+	source? ( app-arch/zip )"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+
+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:\(\$(JAVADOC)\):\1 -d apidocs:g" Makefile.am
+
+	# some patches
+	epatch "${FILESDIR}/${MY_P}-lfd.diff"
+	epatch "${FILESDIR}/${MY_P}-nouts.diff"
+
+	# update autotools stuff
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+	use lfd && myconf="--enable-lockfile_server"
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+
+	if use lfd; then
+		cd src/lfd
+		emake || die "emake lfd failed"
+		cd "${S}"
+	fi
+
+	use doc && emake docs
+}
+
+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
+		newsbin src/lfd/lfd in.lfd
+		newins "${FILESDIR}/lockfiled.xinetd" lfd
+		dodoc src/lfd/LockFileServer.rfc
+	fi
+
+	use doc && java-pkg_dohtml -r apidocs/
+	use source && java-pkg_dosrc src/.
+}
+
+pkg_postinst() {
+	einfo
+	if use lfd; then
+		einfo "Don't forget to enable the LockFileServer"
+		einfo "daemon (lfd) in /etc/xinetd.d/lfd"
+	else
+		einfo "RXTX uses UUCP style device-locks. You should"
+		einfo "add every user who needs to access serial ports"
+		einfo "to the 'uucp' group:"
+		einfo
+		einfo "    usermod -aG uucp <user>"
+	fi
+	einfo
+}