[gentoo-commits] proj/sci:master commit in: dev-cpp/growler-link/, dev-cpp/growler-link/files/

[gentoo-commits] proj/sci:master commit in: dev-cpp/growler-link/, dev-cpp/growler-link/files/

[Justin Lecher]

commit:     3458b955e8f14b93f045eff8f4557791903d8c11
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 25 16:04:53 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 16:04:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3458b955

dev-cpp/growler-link: Fix for gcc-4.7; correct fortran-2.eclass usage; move to autotools-utils.eclass

Package-Manager: portage-2.2.0_alpha141

---
 dev-cpp/growler-link/ChangeLog                 |    7 +++++-
 dev-cpp/growler-link/files/0.3.7-gcc4.7.patch  |   15 ++++++++++++
 dev-cpp/growler-link/growler-link-0.3.7.ebuild |   28 ++++++++++-------------
 dev-cpp/growler-link/metadata.xml              |   12 +++++-----
 4 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/dev-cpp/growler-link/ChangeLog b/dev-cpp/growler-link/ChangeLog
index a9c6f42..52cf45f 100644
--- a/dev-cpp/growler-link/ChangeLog
+++ b/dev-cpp/growler-link/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-cpp/growler-link
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Oct 2012; Justin Lecher <jlec@gentoo.org> +files/0.3.7-gcc4.7.patch,
+  growler-link-0.3.7.ebuild, metadata.xml:
+  Fix for gcc-4.7; correct fortran-2.eclass usage; move to
+  autotools-utils.eclass
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> growler-link-0.3.7.ebuild:
   Sort inherit and/or USE
 

diff --git a/dev-cpp/growler-link/files/0.3.7-gcc4.7.patch b/dev-cpp/growler-link/files/0.3.7-gcc4.7.patch
new file mode 100644
index 0000000..f3939be
--- /dev/null
+++ b/dev-cpp/growler-link/files/0.3.7-gcc4.7.patch
@@ -0,0 +1,15 @@
+ lib/strings.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/strings.cxx b/lib/strings.cxx
+index 1efa4fd..09488d8 100644
+--- a/lib/strings.cxx
++++ b/lib/strings.cxx
+@@ -26,6 +26,7 @@
+ #include <cstdio>
+ #include <cerrno>
+ #include <stdexcept>
++#include <unistd.h>
+ 
+ using namespace std;
+ 

diff --git a/dev-cpp/growler-link/growler-link-0.3.7.ebuild b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
index fcca83f..3a44bb1 100644
--- a/dev-cpp/growler-link/growler-link-0.3.7.ebuild
+++ b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit eutils fortran-2
+inherit autotools-utils fortran-2
 
 DESCRIPTION="The lowest-level Growler library"
 HOMEPAGE="http://www.nas.nasa.gov/~bgreen/growler/"
@@ -16,24 +16,20 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc fortran static tcpd"
 
 RDEPEND="
-	virtual/fortran
 	dev-libs/boost
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${RDEPEND}
-		doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )"
 
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gcc4.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-gcc4.patch
+	"${FILESDIR}"/${PV}-gcc4.7.patch )
 
 src_configure() {
-	econf \
-		$(use_enable doc) \
-		$(use_enable tcpd) \
-		$(use_enable static) \
-		$(use_enable fortran)
+	local myeconfargs=(
+		$(use_enable doc)
+		$(use_enable tcpd)
+		$(use_enable static)
+		)
+	autotools-utils_src_configure
 }

diff --git a/dev-cpp/growler-link/metadata.xml b/dev-cpp/growler-link/metadata.xml
index 2194751..4d3fa58 100644
--- a/dev-cpp/growler-link/metadata.xml
+++ b/dev-cpp/growler-link/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cpp</herd>
-<maintainer>
-<email>bryan.d.green@nasa.gov</email>
-<name>Bryan Green</name>
-</maintainer>
-<longdescription>
+	<herd>cpp</herd>
+	<maintainer>
+		<email>bryan.d.green@nasa.gov</email>
+		<name>Bryan Green</name>
+	</maintainer>
+	<longdescription>
 Growler-Link is the lowest-level Growler package.  It provides basic support for
 dynamic linking, components and modules, as well as several other of Growler's
 commonly used API's, such as Clogger.