sci-chemistry/gelemental: Fix for compilation against glib-2.32, #423621; bumped to EAPI=4 and autotools-utils; handle statc-libs

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

3 files changed, 65 insertions, 19 deletions

diff --git a/sci-chemistry/gelemental/ChangeLog b/sci-chemistry/gelemental/ChangeLog
index 6c20ed05f23b..ded790e54169 100644
--- a/sci-chemistry/gelemental/ChangeLog
+++ b/sci-chemistry/gelemental/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/gelemental
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gelemental/ChangeLog,v 1.8 2012/05/04 07:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gelemental/ChangeLog,v 1.9 2012/07/01 13:08:51 jlec Exp $
+
+  01 Jul 2012; Justin Lecher <jlec@gentoo.org> gelemental-1.2.0.ebuild,
+  +files/gelemental-1.2.0-glib-2.32.patch:
+  Fix for compilation against glib-2.32, #423621; bumped to EAPI=4 and
+  autotools-utils; handle statc-libs
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gelemental-1.2.0.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
new file mode 100644
index 000000000000..eab2ad1f194e
--- /dev/null
+++ b/sci-chemistry/gelemental/files/gelemental-1.2.0-glib-2.32.patch
@@ -0,0 +1,46 @@
+ libelemental/misc/extras.cc  |    2 +-
+ libelemental/misc/widgets.cc |    2 +-
+ src/main.cc                  |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libelemental/misc/extras.cc b/libelemental/misc/extras.cc
+index a8e5720..c042604 100644
+--- a/libelemental/misc/extras.cc
++++ b/libelemental/misc/extras.cc
+@@ -21,7 +21,7 @@
+ 
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+ 
+ namespace misc {
+diff --git a/libelemental/misc/widgets.cc b/libelemental/misc/widgets.cc
+index 002310c..941d881 100644
+--- a/libelemental/misc/widgets.cc
++++ b/libelemental/misc/widgets.cc
+@@ -20,7 +20,7 @@
+ #include "macros.hh"
+ #include "widgets.hh"
+ 
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtkmm/alignment.h>
+ #include <gtkmm/image.h>
+ #include <gtkmm/label.h>
+diff --git a/src/main.cc b/src/main.cc
+index 41cfe03..68bbb4c 100644
+--- a/src/main.cc
++++ b/src/main.cc
+@@ -26,8 +26,8 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0.ebuild
index 2fe6d6a07e56..9b2cf23a6fc0 100644
--- a/sci-chemistry/gelemental/gelemental-1.2.0.ebuild
+++ b/sci-chemistry/gelemental/gelemental-1.2.0.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gelemental/gelemental-1.2.0.ebuild,v 1.6 2012/05/04 07:02:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gelemental/gelemental-1.2.0.ebuild,v 1.7 2012/07/01 13:08:51 jlec Exp $
 
-EAPI="1"
+EAPI=4
 
-inherit fdo-mime gnome2-utils eutils
+inherit autotools-utils fdo-mime gnome2-utils eutils
 
-DESCRIPTION="a periodic table viewer that provides detailed information on the
-chemical elements."
-HOMEPAGE="http://www.kdau.com/projects/gelemental"
+DESCRIPTION="Periodic table viewer that provides detailed information on the chemical elements"
+HOMEPAGE="http://freecode.com/projects/gelemental/"
 SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3 MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc"
+IUSE="doc static-libs"
 
 RDEPEND="
 	dev-cpp/gtkmm:2.4
@@ -25,21 +24,17 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-}
+PATCHES=(
+		"${FILESDIR}"/${P}-gcc4.3.patch
+		"${FILESDIR}"/${P}-glib-2.32.patch )
 
-src_compile() {
-	econf --disable-dependency-tracking $(use_enable doc api-docs)
-	emake || die "emake failed."
+src_configure() {
+	local myeconfargs=( $(use_enable doc api-docs) )
+	autotools-utils_src_configure
 }
 
 src_install() {
-	emake apidir="/usr/share/doc/${PF}/html" DESTDIR="${D}" \
-		install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS* README TODO TRANSLATORS
+	autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
 }
 
 pkg_postinst() {