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
commit6aca83303c771dad63d828b7d5824e3d873ed49a (patch)
tree9700672a77bedb28d14b33d1d13ebd18c0fbe051 /sci-visualization
parentStable on amd64 wrt bug #328415 (diff)
downloadhistorical-6aca83303c771dad63d828b7d5824e3d873ed49a.tar.gz
historical-6aca83303c771dad63d828b7d5824e3d873ed49a.tar.bz2
historical-6aca83303c771dad63d828b7d5824e3d873ed49a.zip
Fix install with automake-1.11 wrt bug 328545. Thanks to Diego for reporting
Package-Manager: portage-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/Manifest17
-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
4 files changed, 37 insertions, 6 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/Manifest b/sci-visualization/hippodraw/Manifest
index 5ef9b1cee5d8..f6e43d4d0463 100644
--- a/sci-visualization/hippodraw/Manifest
+++ b/sci-visualization/hippodraw/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX hippodraw-1.21.3-autoconf-2.64.patch 1729 RMD160 2c0ebb3c3a3387049672e351cea0aa1fe485acf9 SHA1 fd7bcaf5ecc24939c5617759555bd45f14668266 SHA256 e60f8da1021c522e3b6d9e87f2d333fac6787c27baa649482142b78e2a1c7675
+AUX hippodraw-1.21.3-automake-1.11.patch 247 RMD160 99327e652124d4f3d1c4147e03e20b014d6dcedf SHA1 e5c38144508ad07688e15eb432379228ddb1453e SHA256 017615ea0ca6d3d47a3c1a827efa64865c8e5e57161ef49e152e73401107f1ec
AUX hippodraw-1.21.3-gcc4.3.patch 7310 RMD160 7fd794311627f762e476ba0e3cb0190600038e87 SHA1 35abf03f3d704891fa6d4bbf8bd9725045396eb3 SHA256 4945521437e9e8c211b743bcc4f5078629d35c1b56989734ecfbcd21c142d225
AUX hippodraw-1.21.3-gcc4.4.patch 364 RMD160 e4bed68dde832ca010114049026272e047fca603 SHA1 b3a4f0fe5f20c0ec5fbfb3971116d00108c4119b SHA256 6e884d769ac1bf8d2c50370b4abd3f234c43d1fd590a47d91990fe518bb7bfd7
AUX hippodraw-1.21.3-gcc45.patch 8265 RMD160 905578f705091c3cc6070edeb60a8ef86015a77e SHA1 1c11c599843e4d9712b29388fa517de5dd698a1d SHA256 a98804f2dda8407e119accd34428e71b34a103e145ebbfdf3708c3e4eebb1e0e
@@ -9,6 +13,15 @@ AUX hippodraw-1.21.3-test-fix.patch 539 RMD160 3658745e4f8e449e845031ff561c5753a
AUX hippodraw-1.21.3-wcslib.patch 879 RMD160 d339517136249a0a5c56edeb69abe652c82a9b06 SHA1 b7dde32740a1395ea2400be999e3b03edfb628c6 SHA256 49444a17b22b4448944c9b3e419c1fecb5ab551790705a1ac75bf5cd2957b670
DIST HippoDraw-1.21.3.tar.gz 9087353 RMD160 33ab867739feda0caef29da9160c3e410de5fc35 SHA1 6959c564c0c366260b5b7ad81cce6efd2d30846b SHA256 a649dd51b4316ba54fad03cb7b39035ecd2d0efeea0cbff1a17d4790f7df0e28
EBUILD hippodraw-1.21.3-r2.ebuild 3764 RMD160 d2d7d6dea9efdf13ddb0f2a0083296344ecab097 SHA1 bec34b48b2878bc9eac6a5b2da6697a1125d2479 SHA256 040644516fd8e3fac7a7a21a8761b21572358197f69495d47cf9305b13ee1732
-EBUILD hippodraw-1.21.3-r3.ebuild 4879 RMD160 3ce397a16445a3763d44113b1cb47b3f3eec8aa7 SHA1 dbd8eda9e33c5b88d47a4b121d8e840f3b6e65e3 SHA256 3f28e3f42bf9b8acffdbe0e1d05b0a477e9babc7aef3f20adb035023325552c1
-MISC ChangeLog 3729 RMD160 44a61c73d7f805127133ac2c2d24e197573abb2b SHA1 0d6e5ffcb408d250fa478912ee8f5ef7acd5d628 SHA256 105a2f5a664ae23643134065fa034e432d1f53452ca2d2ce81444499fb863c99
+EBUILD hippodraw-1.21.3-r3.ebuild 4921 RMD160 27ddcd8eeb98e8ab5fefec1399ef14540511cbb9 SHA1 4ebe3988df002fb2d29b24f13f8d9c0c93453e9c SHA256 ce85795fb3d7745e67fff0e3789e8ec2343bb372a198b036e6d786b31b412c2b
+MISC ChangeLog 3940 RMD160 cee9270c5dff9d205beee2afe42e10a189765ec5 SHA1 20384a64cc11cb0404bc66c8079a30790cfa78c1 SHA256 c6c47de8eef22904866215fd326191b98e53f14aa0d5ac6a424795ee1338fe3f
MISC metadata.xml 1670 RMD160 8dcfaa588e742cd7c806b2d89f5cdbb229ae785d SHA1 4b7c09771725382bb56d37f8833b49e9ee85ca4f SHA256 612109583191964b5558caaa1748e12761fc4d51c491f9f1bb79e27394bac67d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxAl7gACgkQIiMqcbOVdxQhFwP8C7+mUmvemu6/52LRKuu4mZ8q
+/BUvS+iP71SniRL05MAVr11uxo8X2KQ2cl+1ZWUWFaUkebhHdDGNfj8/bHu6BJRi
+bA/DpG22HYx+lXDRGwZaYsbAIhrJ5BNh7xvKEh7YChOrzdw0V1KFUNLGwZ77aK2S
+hH8b8p/urAQox0Aw99E=
+=PQAN
+-----END PGP SIGNATURE-----
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