Version bump, drop old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 38 insertions, 81 deletions

diff --git a/sci-calculators/galculator/ChangeLog b/sci-calculators/galculator/ChangeLog
index 0693d1aa4661..15597854f579 100644
--- a/sci-calculators/galculator/ChangeLog
+++ b/sci-calculators/galculator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/galculator
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.47 2014/02/22 22:37:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.48 2014/04/12 20:42:28 pacho Exp $
+
+*galculator-2.1.3 (12 Apr 2014)
+
+  12 Apr 2014; Pacho Ramos <pacho@gentoo.org> +galculator-2.1.3.ebuild,
+  -files/galculator-1.3.4-libm.patch, -galculator-1.3.4.ebuild:
+  Version bump, drop old
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> galculator-2.1.2.ebuild:
   Fix wrong commit, bug 502160
diff --git a/sci-calculators/galculator/files/galculator-1.3.4-libm.patch b/sci-calculators/galculator/files/galculator-1.3.4-libm.patch
deleted file mode 100644
index 161a08089b23..000000000000
--- a/sci-calculators/galculator/files/galculator-1.3.4-libm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 09d83bb40104..000000000000
--- a/sci-calculators/galculator/galculator-1.3.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 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.11 2013/05/01 04:13:20 tetromino Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="GTK+ based algebraic and RPN calculator."
-HOMEPAGE="http://galculator.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-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
-
-	# bug #415717, https://sourceforge.net/tracker/?func=detail&aid=3526340&group_id=80471&atid=559874
-	epatch "${FILESDIR}/${P}-libm.patch"
-	eautoreconf
-}
diff --git a/sci-calculators/galculator/galculator-2.1.3.ebuild b/sci-calculators/galculator/galculator-2.1.3.ebuild
new file mode 100644
index 000000000000..d972684b9890
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-2.1.3.ebuild,v 1.1 2014/04/12 20:42:28 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG=no
+
+inherit gnome2
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator"
+HOMEPAGE="http://galculator.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/shortcuts"