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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 12 insertions, 103 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/Manifest b/dev-java/rxtx/Manifest
index ae60602ee69b..8ba1ee32c6a2 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -2,7 +2,6 @@ AUX lockfiled.xinetd 202 RMD160 da27001f9265cefaff35a31931515f088ecea1a9 SHA1 4b
 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-r1.ebuild 2309 RMD160 a1c8d8bcfca69b0b20306f787b2d49d232a01931 SHA1 7a79dc2950a040fb7555778ae40a6866a339619c SHA256 c8d9e1e3d8128a5a8895512eb4f93331cf9bd37d170eaf138346eca096ba8499
-EBUILD rxtx-2.1.7.2-r2.ebuild 2361 RMD160 e27b0e048298b99ccb033949c2cdc23c50a95cd7 SHA1 4524d8919c2f2aad5d262c77ccbfa49025b346b6 SHA256 8da2357f0771207ae41a6427a2ee4d4652eab46eb5a69fc9d0b53fe5a58a3ea7
-MISC ChangeLog 1861 RMD160 c08f0ce83e24335283ff5dfa64e482fa44be7656 SHA1 a9d7a7b10007b227fe03c46be3bd80aa0b93d433 SHA256 3f62d9439696f6640b59f8f6b0f34528cc455783bc3244746c042734e43db262
+EBUILD rxtx-2.1.7.2-r2.ebuild 2382 RMD160 ee63bd8428b2ec0b56782df3df3191a56e084e43 SHA1 e64f75ab86112c0387cdbd68836d47477e4e711c SHA256 b38c767036daf7b72906b3b37e5c69af9eb4b66b011e00d85cce4f609d914002
+MISC ChangeLog 2055 RMD160 1ef2f311c4dc4ab41c4503aadaced1bef816f86a SHA1 94ebc546c47c342d4d29b4d355da7b9aa8f5288a SHA256 fc24261fd09bbdfd721d70010ea7e1a4a24f8d8d7da56e7ba3bd07a2acdf6ecb
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
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
 }