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

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 79 insertions, 21 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/Manifest b/sci-chemistry/gelemental/Manifest
index 14c600779f0c..83ce3de36d80 100644
--- a/sci-chemistry/gelemental/Manifest
+++ b/sci-chemistry/gelemental/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX gelemental-1.2.0-gcc4.3.patch 387 RMD160 7cca84abc1290124635806f59c0fa1091ffe227a SHA1 bf8f66745de2015585a9c8b254ab62b9c88f18e9 SHA256 0747ec32d6ee9f6ff75bbf2271f24018b547b6d71b98660d16fac450519c5918
+AUX gelemental-1.2.0-glib-2.32.patch 1235 RMD160 029efb45f2c44477e972fc65c47369455192bd8c SHA1 4edc1263ef727653437b48bcb1607550fd938fd7 SHA256 630d4fcbdc6ccd3313c43324052bfd42a575cccf5e61a39c513369e003326c34
 DIST gelemental-1.2.0.tar.bz2 460757 RMD160 a54b29e853d4861f4fd5adb947816cb0f736d2bc SHA1 5640c8912de555eddf72924c866831249d0fdd28 SHA256 4f2797200af98d74c71db0065506f99a97820392f39f67cf3ef42de6dca3859b
-EBUILD gelemental-1.2.0.ebuild 1219 RMD160 2d87a3fc59ad44d1b116906177e52100bd5dc221 SHA1 2a66bda8db2ff06c145044a927fbec4901c3e54d SHA256 af88d6e251e9ee24b0065f3e51223e3a4557e22ca981a3fb51d3a8845e7fc6a2
-MISC ChangeLog 1183 RMD160 f74073433705c3c39e9316654bea7a5203577824 SHA1 4ac73799c6590da2727a243611765bbce8eb93f9 SHA256 32417c4f1315302b74ea4defac6b66139e88ac0508d693881a54fc410fe6032a
+EBUILD gelemental-1.2.0.ebuild 1141 RMD160 f58370398927475cf227b3c310eb60798fc000d6 SHA1 1ebb05e67c59bdf8e706d751cfc6cdd9b9af53cc SHA256 b391a1029451f145d97378daddf54f8aa48696e62fc01ae4f0d6bd95196c2f50
+MISC ChangeLog 1405 RMD160 b0c387f1e95d25cbdb2d221a6706042146d3ca18 SHA1 b491399ea96245c4ddfed2e7a49fa929860a8de0 SHA256 ec443573e56f7b45e3890ceddfa7e60467fcb74db367c8292d0ad8dd3c4b3912
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/wS+gACgkQgAnW8HDreRYrKwCfQPfaIoFFSyOMvLhCRaWC64t7
+uGoAn2n6JF8DO8TIYmJKI//LOPm3VmfQ
+=d544
+-----END PGP SIGNATURE-----
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() {