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

(Portage version: 2.2_rc5/cvs/Linux 2.6.26-SENTINEL-1 i686)

3 files changed, 28 insertions, 9 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/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
 }