Version bump, drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 44 insertions, 88 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/Manifest b/sci-calculators/galculator/Manifest
index 76549f16e6f9..c363b8d915f4 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX galculator-1.3.4-libm.patch 1236 SHA256 c7a53f0f0c71fbba2ac9f0975f5042e1069b9d5c9ef1077b794b0c03711e675c SHA512 60c3debce0f908dc41d4c9a469f3c1954149cb926d94a7bac03ba706d289e3a550dabf41a2fc8947931aff5c2cebd3f75c09a17f0f71f51e683b3a3fe1fc99f3 WHIRLPOOL cc2cba0bf4a9c3de224fd447ee7bb877057d9f79f5d19854af28ae483f921c22953930fb2cc5d21f110a65a66c4a036fe0a57785e9b0f20e7ad42cb219979c18
-DIST galculator-1.3.4.tar.bz2 393759 SHA256 9d6c6f13d9249719d1af71f45f97f64d70aefb959d3bfe2cd375e076d4c5943d SHA512 cff1307ebaaa2cbefc26d9c8ce9b502ff0a845c224962971bc5c93da952d3562d43c8599a0bf45b2c362df9c29674a88d889e7cfb77f424d6e282c7b2838d920 WHIRLPOOL 446f3681a5a15897a270bbdf9afdfc406243d3ee4c47d768d09106b0744ad73ce70446565e95a75f3eff546a55636db9a831e8f65d56379de9af29e5079809ca
 DIST galculator-2.1.2.tar.bz2 427684 SHA256 23e7e8d02ec49bf06e061e7fa56c779fd0f353ec294c30fd88858786d8e4a79b SHA512 e327ca9e6845a3022b4a2bcdaccf68c60d569f839f5cc3706886ff952fbac369f4022887ed4d5b39d6631c67f9de895db4cae4b0f39a681ef9b29747228d81b1 WHIRLPOOL 255a159841ad0bd523fd6933d4b8f3a27cbe14f4465c9db19d68046dd4eed2b1eddeb596795a5782c2114b36f093ab2f51afbd5356b931b50689debb4e88ec48
+DIST galculator-2.1.3.tar.bz2 466288 SHA256 91ac62d6d74da910cb79c68f7bf3f4505ac0efe51091150c4ea54fe1c1306235 SHA512 782b5a672fa40bab01dc39fb32e79e8da08993bace6c37768db2ca11a2bb996fdc07e773a0f70b7bba73c018de6ea6e3f71afc3885ccbc94d345fef62cdfa74a WHIRLPOOL 188c80101d41e93b6ddfaf4c65aadcb65c5639e4cf0c2cd75dba77f7dd4d405164ce0fb5af48c7a5599de7574e06e39d047d42424454310555500f304bd3daf2
 DIST galculator-2.1.tar.bz2 404488 SHA256 f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be SHA512 47bfcb67bd5cc9aa2974ac862f252daff207ad20975304af56d96465cfb01aa8d4fad729b87f4c2f5a8a821b5cad376b494fea433fac4a7b460713c6bf3f2237 WHIRLPOOL 7b2251d559bc5180ef170e4d50f9afd6b103e50d01d81ad185f5705c7fb19c0804bb50d35a5f800c4f7e00c946fc522138b5e56f4e8af28f4cceab8b55a510d7
-EBUILD galculator-1.3.4.ebuild 1008 SHA256 3a4117cd8da6d36db914d0f1140f99a08741bf62d21b24682c4fac0819fbc762 SHA512 4ee6e1f37c239a7188e1b450684fbdeb05f8fe1b92335be642c92b68bd9dc6660581ccd508a608a096fdc60730fee9cffab6f0e8cb44fbb5eef2caea94e6d5bb WHIRLPOOL cc8c6edd134147f780534726f3736566d3748b587046a0e271cf1b98b3c862989fe56f56c7e6bb076fc787e518b0bdb7447dea6d09bd38e274b759673372b6f7
 EBUILD galculator-2.1.2.ebuild 764 SHA256 89851515d98f2fc331e908a4e8649ccc8368c1209612145cc02d372e3047a157 SHA512 3d6221239d5d81358a538a572c00a12447d0b09682de74d07c6e55a26de4704592b9e737e259f2543c432709d98c22ac175a4bb2362c5c0a1a52f478ed83ccbe WHIRLPOOL 18410931e18aafc43a25e85ca4933665964edff1c95c21b3d37be6d2b8423ccbfbcffbeadebf575f04efeb1166adf233b4f3e9ce289ca6376b16c4f4ed147d90
+EBUILD galculator-2.1.3.ebuild 770 SHA256 136374345cc2e989165613141a7f3a2b1a25971c27bf5f586a38795043baef1c SHA512 5599ecf560f57f131977f8499763531c80bf31305defeb34d9a1ccd3063a45501e731a474b5c620cadf737b447de394b40c8705002c464ac32b303dad60eac9e WHIRLPOOL eb51f629b30e276712f54ef2d29b9fe05d1d2772d52217f989a203fb42a33eb6e7b33197515e5f2ea952566da9f4b1a15b55e91e8a8dfe1a18a4e788572d06da
 EBUILD galculator-2.1.ebuild 889 SHA256 fe8685614c036a0441c531f6c23d4dcec57475a5e28f03ea777d3ab0d71367da SHA512 6ce27f7718eeaea384e48b29209ed746154a90de218d2d46ec3dadfbc5395b4d608f297ac2a9d8d0914cb6777cddd65d804878e74d521c46aa8a0674ec347ec5 WHIRLPOOL 4023324018eadc3f3025b357d0edc812e6ad701b528a8bcfc3eb12511931672c8c5b90713913f1ad7111aab28b6a0d7c8841b5ed69391542ba3bd06997305314
-MISC ChangeLog 6841 SHA256 8dc76f1f475d545998ea70051992da68dff65e60adc1d1917655bad0b0363ed9 SHA512 8b2d68194ba157479b25ce6b184e85ee382c0a7070e548d900436d6a8314581ca8d2eaf1798a167071b958762c624ac5892f5079895f3f74ebe1b8842e27aa80 WHIRLPOOL eedaf754933219be7442bb78e7cc1f6844fbe69294c9e31e2b7e4f6b656223ae280cc30c15bdcadb04dbce6a794816ac352022925af0bc31040ac69b2fbb1316
+MISC ChangeLog 7036 SHA256 a520551278177426cd0c36a910b1c19bde0eff1b417c791d91737ec2ebada4a6 SHA512 a9a9b7ac75f6d4f02d346e138ed7ca5393d799dd8410fc86270fe59988077aabd0b22397e132680e176a82d5efcd76939aedd3ba3bc30a276a4efc96ab1872bd WHIRLPOOL 5c5a6f2509b53b2a8d7c96567a6b807f5cdf0d9afd291c8c3529a8a40987f4b8b15dff9ee70ee19759cfe8e80d51e89d31ddb28cad7460811f53d7734fd62d08
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJJsEACgkQCaWpQKGI+9QJPwCeP+KIsFRJ8RT5x/3+hvKTslwV
-zH8AnjcjEERfKTK2VmkMSY/Zmytq+q4w
-=AhkC
+iEYEAREIAAYFAlNJpTYACgkQCaWpQKGI+9Qn4wCffvKamHMdKor/WUBWVnOtQbiq
+MqEAn062snVH1A+oJpinHu6q8P4jjeSF
+=UZph
 -----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
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"