From 00cc63e7a0aa8e3b40a69340fadc70a5f68f9d11 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sat, 26 Jun 2010 20:25:17 +0000 Subject: [PATCH] Fixed compilation with USE=lfd and stable on amd64 wrt bug #309111 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- dev-java/rxtx/ChangeLog | 6 +++++- dev-java/rxtx/Manifest | 15 +++++++++++++-- .../files/rxtx-2.1-7r2-lfd-include-limits.diff | 12 ++++++++++++ dev-java/rxtx/rxtx-2.1.7.2-r3.ebuild | 11 ++++++----- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 dev-java/rxtx/files/rxtx-2.1-7r2-lfd-include-limits.diff 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 + +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/Manifest b/dev-java/rxtx/Manifest index 59b22a1bbfa9..5f7265644683 100644 --- a/dev-java/rxtx/Manifest +++ b/dev-java/rxtx/Manifest @@ -1,9 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + 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 DIST rxtx-2.1-7r2.zip 1345757 RMD160 dc569a654fbef58aa521013e170c0200b8b3668f SHA1 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613 SHA256 31db3852a86105766758975519b27d262407c96cacad4f34ad0de5aae26addd9 EBUILD rxtx-2.1.7.2-r2.ebuild 2382 RMD160 ee63bd8428b2ec0b56782df3df3191a56e084e43 SHA1 e64f75ab86112c0387cdbd68836d47477e4e711c SHA256 b38c767036daf7b72906b3b37e5c69af9eb4b66b011e00d85cce4f609d914002 -EBUILD rxtx-2.1.7.2-r3.ebuild 2429 RMD160 566c7ffb6da6eac1350947b59c1aeff234cffbcc SHA1 f498d7585fba4e22d4d9d7310c3859496dd35018 SHA256 ce7580b6e96b77b597b817f4d0d2c69fb2dabe549e15dbed5b6bce628757d901 -MISC ChangeLog 2271 RMD160 5514bb57dd4aa5d17e3e838c5d4b1d324268db4a SHA1 ef829ad826260dfce5704a9c90980e207794dc8b SHA256 0f73bec081ecbb0d9de00f782cc72bba758cc514f52486a3b1fe76fa953cb86c +EBUILD rxtx-2.1.7.2-r3.ebuild 2470 RMD160 09bf66d1f7493d92874ddf28f24a1820ee54015a SHA1 d8c3e9a28163f2ec478bcd2942009c95a7a4d0d0 SHA256 465efbc454df52f6cb1f39a8c5822880d362da0d84487ec5b2098937e91ed0d4 +MISC ChangeLog 2464 RMD160 85bfba3a4981ecba5806f1931aed9a623da917c4 SHA1 50072650c440cea1c0efc87591f798276fe5a114 SHA256 e24ce665baaa1ff5e5fc758a307b40f6271aed05ae7955ced5cd2f155092d267 MISC metadata.xml 250 RMD160 df44ee5bc96c577fb7a08006ad728df57813da16 SHA1 3d6e62be3be2ef8e4dd763e1593ed0495a8fd406 SHA256 83a968fdd0034f60b9aa197e06151edd9f9e613527beae042fd7853b9ae4fc9d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iF4EAREIAAYFAkwmYksACgkQmWq1bYTyC0MHLwD9HxOJ/VpRhwYJLCTWloPa5zx5 +RnBDXjCdZqk3NyvybjYBALBqu7wBO83iTQlQVD62rQTxNFlAAWcowWvpmRHQusta +=JlmD +-----END PGP SIGNATURE----- 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 + #include + #include ++#include + + #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 -- 2.26.2