Add patch to explicitly link with -lm (bug #415717, thanks to ncahill_alt). Add missing dependencies. Update to EAPI4.

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

4 files changed, 81 insertions, 10 deletions

diff --git a/sci-calculators/galculator/ChangeLog b/sci-calculators/galculator/ChangeLog
index ad3301f08b33..80da64172118 100644
--- a/sci-calculators/galculator/ChangeLog
+++ b/sci-calculators/galculator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-calculators/galculator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.31 2012/05/04 06:52:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.32 2012/05/13 15:42:36 tetromino Exp $
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  galculator-1.3.4.ebuild, +files/galculator-1.3.4-libm.patch:
+  Add patch to explicitly link with -lm (bug #415717, thanks to ncahill_alt).
+  Add missing dependencies. Update to EAPI4.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> galculator-1.3.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 5d3876a0c3be..264dcf98cf5d 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX galculator-1.3.4-libm.patch 1236 RMD160 dab6a34369f3a6fb4820c068b166e13c4cafa014 SHA1 8b8826b52cf001133d3fc5e4909b856fde8f3d71 SHA256 c7a53f0f0c71fbba2ac9f0975f5042e1069b9d5c9ef1077b794b0c03711e675c
 DIST galculator-1.3.4.tar.bz2 393759 RMD160 e789e87b78c9b40f55f2a59bd0e2f0ebbda6738c SHA1 85ba3af2cbe1137e6e98b8bb55666bdd8f23cb07 SHA256 9d6c6f13d9249719d1af71f45f97f64d70aefb959d3bfe2cd375e076d4c5943d
-EBUILD galculator-1.3.4.ebuild 802 RMD160 eaf72fb367ada0016885517bcedc5bb5607af658 SHA1 1955699eb60fa568ffb80b0ba0a875841412007b SHA256 0e7eb99f464eac4432e302765fc9accb0793e66072a58e2e9ed09e0750c3d398
-MISC ChangeLog 4769 RMD160 3b8fe448861fac75a76a388b39fb7959301cfbec SHA1 cf3d6be1748d1d171137fa1e6f60daa57283850a SHA256 7976a3370340da04406994952116f9808430ff556aa0ba3b6edca130c4eb5da4
+EBUILD galculator-1.3.4.ebuild 1007 RMD160 25d797b461d4e3dd92ea7e8b243ebb33242e3b6a SHA1 5fe8de1e67c0a5305da76ed9d5862a6cdb2bfe34 SHA256 b41f27b0e74c6f9bdd34519c2a8a9467ccf98eb850f61006595aba566a96db31
+MISC ChangeLog 5018 RMD160 22f8965d62b1242194c2d85fd71bbdd73a80adec SHA1 ea590d5535c4ad68528a083fece4b65e88f9094e SHA256 d14c22e21d859cd9fb0cdcdbff288ecf8111938bdaa7b4ec8e61488e003315f1
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPr9ZyAAoJEJ0WA1zPCt1hFiEH/1BdYpLFQp62fk6O5rf7z2wS
+ou+f5CXmXjqDQx4RN/lVjp1rYW7BY0Q2RmfQH36WTFsYUD2/pCLAdCz3UsLCyT78
+nHPV7bFSB7oDwMfh7MvadfDJjJSg8z1iA9DLqcxTX1XMJbGqnmgu+/t9d9aQJMDq
+XZSmt8pshppeatEWE1xjCEaAgw79zzEtuuInnvHU16AhP/cIoWdFWl7P0gg36s7G
+uowu4mOFrZapcCh9P+j9wUq6uiG/fBQ3HrV2jmIiWsluH2uN6B9XRVDGjtkxfZCJ
+ooKDtlzjiOMWilS0Lpfq8ZJTVeJMoxN3RcO0EAZ+/k7SvHH2xP26LrjV4OJETEE=
+=3Z9P
+-----END PGP SIGNATURE-----
diff --git a/sci-calculators/galculator/files/galculator-1.3.4-libm.patch b/sci-calculators/galculator/files/galculator-1.3.4-libm.patch
new file mode 100644
index 000000000000..161a08089b23
--- /dev/null
+++ b/sci-calculators/galculator/files/galculator-1.3.4-libm.patch
@@ -0,0 +1,43 @@
+From fa663985f73197570af03ab28ac2cbfe703fbaee Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 13 May 2012 11:06:30 -0400
+Subject: [PATCH] Use AC_CHECK_LIBM to add -lm to LDADD if needed
+
+Otherwise, galculator fails to link to libm when GNU gold is used as the linker.
+
+https://sourceforge.net/tracker/?func=detail&aid=3526340&group_id=80471&atid=559874
+---
+ configure.in    |    3 +++
+ src/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 19fddad..bf1c2c0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,9 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ GETTEXT_PACKAGE=galculator
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of gettext package])
+ AC_SUBST(GETTEXT_PACKAGE)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bb35226..c24e135 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,7 +19,7 @@ galculator_SOURCES = \
+ 	ui.c ui.h \
+ 	flex_parser.l flex_parser.h
+ 
+-galculator_LDADD = @PACKAGE_LIBS@
++galculator_LDADD = @PACKAGE_LIBS@ $(LIBM)
+ 
+ galculator_LDFLAGS = -export-dynamic
+ 
+-- 
+1.7.8.6
+
diff --git a/sci-calculators/galculator/galculator-1.3.4.ebuild b/sci-calculators/galculator/galculator-1.3.4.ebuild
index fbf71b93de4b..b44179391461 100644
--- a/sci-calculators/galculator/galculator-1.3.4.ebuild
+++ b/sci-calculators/galculator/galculator-1.3.4.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.3.4.ebuild,v 1.9 2012/05/04 06:52:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.3.4.ebuild,v 1.10 2012/05/13 15:42:36 tetromino Exp $
 
-EAPI=2
+EAPI=4
+
+inherit autotools eutils
 
 DESCRIPTION="GTK+ based algebraic and RPN calculator."
 HOMEPAGE="http://galculator.sourceforge.net/"
@@ -13,17 +15,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="dev-libs/glib:2
+	gnome-base/libglade:2.0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
 	gnome-base/libglade:2.0"
 DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig"
 
 src_prepare() {
 	# Fix tests
 	echo ui/*.glade | tr -t ' ' '\n' >> po/POTFILES.in
-}
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
+	# bug #415717, https://sourceforge.net/tracker/?func=detail&aid=3526340&group_id=80471&atid=559874
+	epatch "${FILESDIR}/${P}-libm.patch"
+	eautoreconf
 }