Added patch to fix bad ACLOCAL_AMFLAGS (see bug #234015). Also added amd64 keyword and fixed several QA issues.

Package-Manager: portage-2.2_rc5/cvs/Linux 2.6.26-SENTINEL-1 i686

4 files changed, 31 insertions, 11 deletions

diff --git a/sci-libs/libscigraphica/ChangeLog b/sci-libs/libscigraphica/ChangeLog
index 5a49a449d8f9..6d3a9814a4cc 100644
--- a/sci-libs/libscigraphica/ChangeLog
+++ b/sci-libs/libscigraphica/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/libscigraphica
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libscigraphica/ChangeLog,v 1.2 2006/12/18 07:35:41 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libscigraphica/ChangeLog,v 1.3 2008/08/06 13:29:31 markusle Exp $
+
+  06 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/libscigraphica-2.1.1-aclocal.patch, libscigraphica-2.1.1.ebuild:
+  Added patch to fix bad ACLOCAL_AMFLAGS (see bug #234015). Also added amd64
+  keyword and fixed several QA issues.
 
   18 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   libscigraphica-2.1.1.ebuild:
diff --git a/sci-libs/libscigraphica/Manifest b/sci-libs/libscigraphica/Manifest
index 833449fd2d5c..eab4a0026af3 100644
--- a/sci-libs/libscigraphica/Manifest
+++ b/sci-libs/libscigraphica/Manifest
@@ -1,7 +1,8 @@
+AUX libscigraphica-2.1.1-aclocal.patch 319 RMD160 c9d6ad9f9595008d1724d9f2b0398bf8e173708b SHA1 dd34d85bd5d383ed9597855f4a93e4bb1f815995 SHA256 f1230bef6cbda0be75bba2763f06855c4107ea0db32f762530791a97e19aaabb
 AUX libscigraphica-2.1.1-arrayobject.patch 928 RMD160 b28e460bf6ca64c7f03d4ea5a4d1f76d85dbc6a5 SHA1 1dd25a7984b59a9e8215f23fc63b0781ef0aa0b2 SHA256 09dd4566a4cd1250abadde547c53c82b4c03b8b4c95463ebd38a120d3ea7fe54
 AUX libscigraphica-2.1.1-intl.patch 1773 RMD160 4bee4007fc1f91d1b95548e035c4aa96c318edd5 SHA1 1b132d4752e6dcedfeff921c86fee0c11e21a831 SHA256 0c6d86f15f2554c220c5c3156ead8be5d3cac936d1e3fd47c73864aa1d354df1
 AUX libscigraphica-2.1.1-libart.patch 900 RMD160 e99dee1d634718340e0e3f83f690b04951b6923b SHA1 d4bb0a1c5a5e75788cfac9dfd4d8545b210c35ab SHA256 7832429ea5cf4f6c14f6863f41dd407df6227cd4ebf433a8496464ee3e6b96d2
 DIST libscigraphica-2.1.1.tar.gz 774288 RMD160 1b04a432052ad3edd8e233349ee47f4f99bb1a4a SHA1 dcbadae82501f40ef366c7e543c26b289657dc60 SHA256 d90f05ab696f24addaec53d35996c8be3503a608e7b76b2c4a8af4cd03706fc8
-EBUILD libscigraphica-2.1.1.ebuild 1251 RMD160 f12dae7f6f5019278b28f77fa1f3640033f67ec5 SHA1 37bd4ed99967240f5beb960f50c9e272751bfff5 SHA256 fa52d1dea498dba21d2470cb6bce2f1a958ce42a45055feeb2aa7c6691efedb9
-MISC ChangeLog 746 RMD160 5130f9b786e51c9cd8c714f44a9f3f40c37d2984 SHA1 357244cd9b28e57194639690b2026b2ed315b2fe SHA256 f19c12aad3a5c4e64008cdd9e55171b4c5d747b2302ef99c88b23c37f629bf76
+EBUILD libscigraphica-2.1.1.ebuild 1362 RMD160 07bb9dcaf4d73bee7232ac888a4a18c2cfdbd6b6 SHA1 fbf1374727f58883693cdb48d39b03c3e60be5bd SHA256 16ba72935e4fd89096bd084981ba20eed0bf282dd21bda752957ab4d0c211a42
+MISC ChangeLog 989 RMD160 22fc02b901bd3443f452a65d2c638edd67558099 SHA1 56daf60596bb2c6d6a79fd6aa73ccfd9fee1bd31 SHA256 b7e0340e9d1ca6523f4fa5c350dc44613d7b2f606a5732fc62458d629bac71ba
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-libs/libscigraphica/files/libscigraphica-2.1.1-aclocal.patch b/sci-libs/libscigraphica/files/libscigraphica-2.1.1-aclocal.patch
new file mode 100644
index 000000000000..175ff889f3ee
--- /dev/null
+++ b/sci-libs/libscigraphica/files/libscigraphica-2.1.1-aclocal.patch
@@ -0,0 +1,8 @@
+diff -Naur libscigraphica-2.1.1/Makefile.am libscigraphica-2.1.1.new/Makefile.am
+--- libscigraphica-2.1.1/Makefile.am	2005-06-23 21:40:55.000000000 -0400
++++ libscigraphica-2.1.1.new/Makefile.am	2008-08-06 09:03:44.000000000 -0400
+@@ -54,4 +54,3 @@
+ 	cvs log | perl mkchlog > ChangeLog.cvs
+ 
+ 
+-ACLOCAL_AMFLAGS = -I m4
diff --git a/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild b/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild
index 3edcadbf5d24..759342b95a5c 100644
--- a/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild
+++ b/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild,v 1.2 2006/12/18 07:35:41 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libscigraphica/libscigraphica-2.1.1.ebuild,v 1.3 2008/08/06 13:29:31 markusle Exp $
 
 inherit autotools eutils
 
@@ -8,15 +8,19 @@ DESCRIPTION="Libraries for data analysis and technical graphics"
 SRC_URI="mirror://sourceforge/scigraphica/${P}.tar.gz"
 HOMEPAGE="http://scigraphica.sourceforge.net/"
 
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
-DEPEND=">=x11-libs/gtk+extra-2.1.0
+RDEPEND=">=x11-libs/gtk+extra-2.1.0
 	>=dev-python/numarray-1.3.1
 	>=dev-libs/libxml2-2.4.10
-	>=media-libs/libart_lgpl-2.3
-	>=dev-util/intltool-0.27.2"
+	>=media-libs/libart_lgpl-2.3"
+
+DEPEND="${RDEPEND}
+		dev-util/intltool"
+
 
 src_unpack() {
 
@@ -28,6 +32,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-libart.patch
 	# fixes intltoolization
 	epatch "${FILESDIR}"/${P}-intl.patch
+	# fixes bad AMFLAGS (see bug #234015)
+	epatch "${FILESDIR}"/${P}-aclocal.patch
 
 	cd "${S}"
 	sed -i \
@@ -40,7 +46,7 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog FAQ.compile \
 		INSTALL NEWS README TODO
 }