summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Wijsman <tomwij@gentoo.org>2013-05-13 13:30:11 +0000
committerTom Wijsman <tomwij@gentoo.org>2013-05-13 13:30:11 +0000
commit62db7be7d84d96ee5bf86e71dcc901c55ba46114 (patch)
tree987926a31f8207e943e56fc5effce58cf9555e0f /dev-java
parentRun tests serially wrt bug #464284. (diff)
downloadgentoo-2-62db7be7d84d96ee5bf86e71dcc901c55ba46114.tar.gz
gentoo-2-62db7be7d84d96ee5bf86e71dcc901c55ba46114.tar.bz2
gentoo-2-62db7be7d84d96ee5bf86e71dcc901c55ba46114.zip
Support sys-devel/automake:1.13 by replacing obsolete macro. Fixes bug #469322.
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/rxtx/ChangeLog10
-rw-r--r--dev-java/rxtx/rxtx-2.2_pre2.ebuild11
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index 642e7e808c3a..a08e8243242b 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/rxtx
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.18 2011/09/22 07:33:53 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.19 2013/05/13 13:30:11 tomwij Exp $
+
+ 13 May 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml,
+ rxtx-2.2_pre2.ebuild:
+ Support sys-devel/automake:1.13 by replacing obsolete macro. Fixes bug
+ #469322.
22 Sep 2011; Tim Harder <radhermit@gentoo.org>
files/rxtx-2.2_pre2-add-ttyACM.patch:
@@ -86,4 +91,3 @@
+rxtx-2.1.7_pre17.ebuild:
Initial import. Ebuild contributed by Nikolas Coukouma <otto@atrus.org>. Fixes
#72580.
-
diff --git a/dev-java/rxtx/rxtx-2.2_pre2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
index 4d108748f26c..06dd4281567a 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.2_pre2.ebuild,v 1.1 2011/09/22 07:14:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/rxtx-2.2_pre2.ebuild,v 1.2 2013/05/13 13:30:11 tomwij Exp $
EAPI="4"
@@ -30,9 +30,10 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
# some minor fixes
- sed -i -e "s:UTS_RELEASE::g" configure.in
- sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in
- sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am
+ sed -i -e "s:UTS_RELEASE::g" configure.in || die
+ sed -i -e "s:|1.5\*:|1.5*|1.6*|1.7*:g" configure.in || die
+ sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in || die
+ sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
# some patches
epatch "${FILESDIR}/${PN}-2.1-7r2-lfd.diff"