summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2010-06-26 20:25:17 +0000
committerChristoph Mende <angelos@gentoo.org>2010-06-26 20:25:17 +0000
commit8a1f8b085143eba9adef7a65e984f67bf6671f90 (patch)
tree916fb8c0ac697b420ffa60fb74dc53fd85c43fe2 /dev-java/rxtx
parentRemove old. (diff)
downloadgentoo-2-8a1f8b085143eba9adef7a65e984f67bf6671f90.tar.gz
gentoo-2-8a1f8b085143eba9adef7a65e984f67bf6671f90.tar.bz2
gentoo-2-8a1f8b085143eba9adef7a65e984f67bf6671f90.zip
Fixed compilation with USE=lfd and stable on amd64 wrt bug #309111
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/rxtx')
-rw-r--r--dev-java/rxtx/ChangeLog6
-rw-r--r--dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff12
-rw-r--r--dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild11
3 files changed, 23 insertions, 6 deletions
diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 456212c0d238..5982c95d336e 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,10 @@
# 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.13 2010/02/12 10:07:12 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.14 2010/06/26 20:25:17 angelos Exp $
+
+ 26 Jun 2010; Christoph Mende <angelos@gentoo.org>
+ +files/rxtx-2.1-7r2-lfd-include-limits.diff, rxtx-2.1.7.2-r3.ebuild:
+ Fixed compilation with USE=lfd and stable on amd64 wrt bug #309111
*rxtx-2.1.7.2-r3 (12 Feb 2010)
diff --git a/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
new file mode 100644
index 000000000000..3d32f360d188
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff
@@ -0,0 +1,12 @@
+diff --git a/src/lfd/lockdaemon.c b/src/lfd/lockdaemon.c
+index bdb8553..d13c5eb 100644
+--- a/src/lfd/lockdaemon.c
++++ b/src/lfd/lockdaemon.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <pwd.h>
++#include <limits.h>
+
+ #define FHS
+ #define LOCKFILEPREFIX "LCK.."
diff --git a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
index 0dbcb929bca1..fbbac86c3a70 100644
--- a/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
+++ b/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/02/12 10:07:12 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild,v 1.2 2010/06/26 20:25:17 angelos Exp $
inherit flag-o-matic toolchain-funcs versionator autotools java-pkg-2
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc source lfd"
RDEPEND=">=virtual/jre-1.4"
@@ -37,9 +37,10 @@ src_unpack() {
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"
- epatch "${FILESDIR}/${MY_P}-add-ttyACM.diff"
+ epatch "${FILESDIR}/${MY_P}-lfd.diff" \
+ "${FILESDIR}/${MY_P}-nouts.diff" \
+ "${FILESDIR}/${MY_P}-add-ttyACM.diff" \
+ "${FILESDIR}/${MY_P}-lfd-include-limits.diff"
# update autotools stuff
rm acinclude.m4