Fixup for libtool-2.2 wrt bug #226525. Thanks Rafał Mużyło <galtgendo@o2.pl>.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

3 files changed, 10 insertions, 100 deletions

diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index cd55719f5d33..6195fcacb942 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/rxtx
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.11 2007/11/28 20:10:06 drac Exp $
+# 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 $
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -rxtx-2.1.7.2-r1.ebuild, rxtx-2.1.7.2-r2.ebuild:
+  Fixup for libtool-2.2 wrt bug #226525. Thanks Rafał Mużyło
+  <galtgendo@o2.pl>.
 
   28 Nov 2007; Samuli Suominen <drac@gentoo.org> rxtx-2.1.7.2-r2.ebuild:
   amd64 stable wrt #195288
diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r1.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r1.ebuild
deleted file mode 100644
index fdebe9ad6d4e..000000000000
--- a/dev-java/rxtx/rxtx-2.1.7.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.3 2007/11/02 03:40:20 wltjr 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:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am
-
-	# some patches
-	epatch "${FILESDIR}/${MY_P}-lfd.diff"
-	epatch "${FILESDIR}/${MY_P}-nouts.diff"
-
-	# update autotools stuff
-	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
-}
diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r2.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r2.ebuild
index 70d3aaead8d1..78ad06d16b79 100644
--- a/dev-java/rxtx/rxtx-2.1.7.2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.1.7.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r2.ebuild,v 1.3 2007/11/28 20:10:06 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.1.7.2-r2.ebuild,v 1.4 2008/07/05 09:53:14 loki_val Exp $
 
 inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2
 
@@ -41,6 +41,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${MY_P}-nouts.diff"
 
 	# update autotools stuff
+	rm acinclude.m4
 	eautoreconf
 	elibtoolize
 }