From: "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/mira/, sci-biology/mira/files/
Date: Thu, 23 Jun 2011 15:04:50 +0000 (UTC) [thread overview]
Message-ID: <73f514811fefcf2be4be2a75d8018426660f6d5e.mmokrejs@gentoo> (raw)
commit: 73f514811fefcf2be4be2a75d8018426660f6d5e
Author: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Thu Jun 23 15:04:37 2011 +0000
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Thu Jun 23 15:04:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=73f51481
sci-biology/mira: libtool.m4 fix so we can safely run eautoreconf and a version bump
(Portage version: 2.1.9.49/git/Linux i686, unsigned Manifest commit)
---
sci-biology/mira/files/libtool.m4.patch | 13 +++++++++++++
sci-biology/mira/mira-3.2.1-r2.ebuild | 1 +
sci-biology/mira/mira-3.2.1.17-r1.ebuild | 5 ++---
.../{mira-3.2.1-r2.ebuild => mira-3.2.1.18.ebuild} | 4 +++-
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/sci-biology/mira/files/libtool.m4.patch b/sci-biology/mira/files/libtool.m4.patch
new file mode 100644
index 0000000..9cfaeef
--- /dev/null
+++ b/sci-biology/mira/files/libtool.m4.patch
@@ -0,0 +1,13 @@
+--- config/m4/libtool.m4.ori 2011-06-22 12:28:14.000000000 +0200
++++ config/m4/libtool.m4 2011-06-22 12:28:39.000000000 +0200
+@@ -88,10 +88,6 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ltmain"
+
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+ _LT_SETUP
+
+ # Only expand once:
diff --git a/sci-biology/mira/mira-3.2.1-r2.ebuild b/sci-biology/mira/mira-3.2.1-r2.ebuild
index a4de8cc..c110959 100644
--- a/sci-biology/mira/mira-3.2.1-r2.ebuild
+++ b/sci-biology/mira/mira-3.2.1-r2.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.0-asneeded.patch
# http://sourceforge.net/apps/trac/mira-assembler/ticket/47
epatch "${FILESDIR}"/mira_left_clip.readpool.C.patch
+ epatch "${FILESDIR}"/libtool.m4.patch
AT_M4DIR="config/m4" eautoreconf
}
diff --git a/sci-biology/mira/mira-3.2.1.17-r1.ebuild b/sci-biology/mira/mira-3.2.1.17-r1.ebuild
index 9fe96ff..04b3767 100644
--- a/sci-biology/mira/mira-3.2.1.17-r1.ebuild
+++ b/sci-biology/mira/mira-3.2.1.17-r1.ebuild
@@ -16,9 +16,7 @@ SRC_URI="mirror://sourceforge/mira-assembler/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS=""
-# masked because of 'libtool: Version mismatch error. This is libtool 2.4, but the definition of this LT_INIT comes from libtool 2.2.6b. You should recreate aclocal.m4 with macros from libtool 2.4 and run autoconf again.', dyeing at src/examples_programming/
-#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
CDEPEND=">=dev-libs/boost-1.41.0-r3
dev-util/google-perftools"
@@ -33,6 +31,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.0-asneeded.patch
# http://sourceforge.net/apps/trac/mira-assembler/ticket/47
epatch "${FILESDIR}"/mira_left_clip.readpool.C.patch
+ epatch "${FILESDIR}"/libtool.m4.patch
AT_M4DIR="config/m4" eautoreconf
}
diff --git a/sci-biology/mira/mira-3.2.1-r2.ebuild b/sci-biology/mira/mira-3.2.1.18.ebuild
similarity index 87%
copy from sci-biology/mira/mira-3.2.1-r2.ebuild
copy to sci-biology/mira/mira-3.2.1.18.ebuild
index a4de8cc..3ea8ce1 100644
--- a/sci-biology/mira/mira-3.2.1-r2.ebuild
+++ b/sci-biology/mira/mira-3.2.1.18.ebuild
@@ -31,7 +31,9 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0.0-asneeded.patch
# http://sourceforge.net/apps/trac/mira-assembler/ticket/47
epatch "${FILESDIR}"/mira_left_clip.readpool.C.patch
+ epatch "${FILESDIR}"/libtool.m4.patch
AT_M4DIR="config/m4" eautoreconf
+ #epatch "${FILESDIR}"/libtool.patch
}
src_configure() {
@@ -44,7 +46,7 @@ src_configure() {
src_compile() {
base_src_compile
# TODO: resolve docbook incompatibility for building docs
- if use doc; then emake -C doc clean docs || die; fi
+ if use doc; then emake -C doc clean docs || die "This will probably die because upstream did not imrove re-genartion of the docs yet."; fi
}
src_install() {
next reply other threads:[~2011-06-23 15:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 15:04 Martin Mokrejs [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 11:12 [gentoo-commits] proj/sci:master commit in: sci-biology/mira/, sci-biology/mira/files/ Aisha Tammy
2015-07-21 9:02 Martin Mokrejs
2015-06-05 15:23 Martin Mokrejs
2013-02-22 0:37 Martin Mokrejs
2011-12-08 1:39 Martin Mokrejs
2011-05-18 16:10 Martin Mokrejs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73f514811fefcf2be4be2a75d8018426660f6d5e.mmokrejs@gentoo \
--to=mmokrejs@fold.natur.cuni.cz \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox