summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-07-16 17:32:30 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-07-16 17:32:30 +0000
commite00393dabbde7b3cd3a91e7369fd78a8bc9b3502 (patch)
tree6a588aba8d9d0a00c55833611e4ee120044889ea /sci-visualization
parentStable on amd64 wrt bug #328415 (diff)
downloadgentoo-2-e00393dabbde7b3cd3a91e7369fd78a8bc9b3502.tar.gz
gentoo-2-e00393dabbde7b3cd3a91e7369fd78a8bc9b3502.tar.bz2
gentoo-2-e00393dabbde7b3cd3a91e7369fd78a8bc9b3502.zip
Fix install with automake-1.11 wrt bug 328545. Thanks to Diego for reporting
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/hippodraw/ChangeLog7
-rw-r--r--sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch12
-rw-r--r--sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild7
3 files changed, 22 insertions, 4 deletions
diff --git a/sci-visualization/hippodraw/ChangeLog b/sci-visualization/hippodraw/ChangeLog
index e7e204ea5cf6..29f6848d1a8d 100644
--- a/sci-visualization/hippodraw/ChangeLog
+++ b/sci-visualization/hippodraw/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-visualization/hippodraw
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.18 2010/06/02 10:12:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/ChangeLog,v 1.19 2010/07/16 17:32:30 xarthisius Exp $
+
+ 16 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-automake-1.11.patch:
+ Fix install with automake-1.11 wrt bug 328545. Thanks to Diego for
+ reporting
02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
hippodraw-1.21.3-r3.ebuild, +files/hippodraw-1.21.3-gcc45.patch:
diff --git a/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch b/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch
new file mode 100644
index 000000000000..26acbaeac29d
--- /dev/null
+++ b/sci-visualization/hippodraw/files/hippodraw-1.21.3-automake-1.11.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/show_bug.cgi?id=328545
+
+--- pattern/Makefile.am
++++ pattern/Makefile.am
+@@ -17,7 +17,6 @@
+ Factory.h \
+ FactoryException.h \
+ Observer.h \
+- Observer.h \
+ Observable.h \
+ string_convert.h \
+ libhippo.h
diff --git a/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild b/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
index 4cd7ec89d177..fab2dd61ca21 100644
--- a/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild
+++ b/sci-visualization/hippodraw/hippodraw-1.21.3-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/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.4 2010/06/02 10:12:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/hippodraw/hippodraw-1.21.3-r3.ebuild,v 1.5 2010/07/16 17:32:30 xarthisius Exp $
EAPI="3"
@@ -40,7 +40,7 @@ RDEPEND="${CDEPEND}
numpy? ( fits? ( dev-python/pyfits ) )"
RESTRICT_PYTHON_ABIS="3.*"
-S="${WORKDIR}/${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_PN}-${PV}
pkg_setup() {
python_pkg_setup
@@ -55,7 +55,8 @@ src_prepare() {
"${FILESDIR}"/${P}-minuit2.patch \
"${FILESDIR}"/${P}-wcslib.patch \
"${FILESDIR}"/${P}-qt4.patch \
- "${FILESDIR}"/${P}-autoconf-2.64.patch
+ "${FILESDIR}"/${P}-autoconf-2.64.patch \
+ "${FILESDIR}"/${P}-automake-1.11.patch
echo "#!${EPREFIX}/bin/sh" > config/py-compile