Version bump, fixes crash with gtk+-3.6 (bug #463459, thanks to Mads and Viktor Yu. Kovalskiy). Update license.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 54 insertions, 23 deletions

diff --git a/sci-calculators/galculator/ChangeLog b/sci-calculators/galculator/ChangeLog
index bb2b704ab870..b42327c34460 100644
--- a/sci-calculators/galculator/ChangeLog
+++ b/sci-calculators/galculator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-calculators/galculator
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.41 2013/04/01 17:55:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.42 2013/05/01 04:13:20 tetromino Exp $
+
+*galculator-2.1.2 (01 May 2013)
+
+  01 May 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  galculator-1.3.4.ebuild, galculator-2.1.ebuild, +galculator-2.1.2.ebuild:
+  Version bump, fixes crash with gtk+-3.6 (bug #463459, thanks to Mads and
+  Viktor Yu. Kovalskiy). Update license.
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> galculator-2.1.ebuild:
   Stable for alpha, wrt bug #458984
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 10f12575e8c7..71dfd304fb98 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -2,26 +2,22 @@
 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
+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.tar.bz2 404488 SHA256 f3ae03601a123287cddf6f79e79cf37bbe5ce87a98997e0fd623f1cd08e6f6be SHA512 47bfcb67bd5cc9aa2974ac862f252daff207ad20975304af56d96465cfb01aa8d4fad729b87f4c2f5a8a821b5cad376b494fea433fac4a7b460713c6bf3f2237 WHIRLPOOL 7b2251d559bc5180ef170e4d50f9afd6b103e50d01d81ad185f5705c7fb19c0804bb50d35a5f800c4f7e00c946fc522138b5e56f4e8af28f4cceab8b55a510d7
-EBUILD galculator-1.3.4.ebuild 1007 SHA256 b41f27b0e74c6f9bdd34519c2a8a9467ccf98eb850f61006595aba566a96db31 SHA512 4ba3b9864367ed10e9fb77941d951f7c54329c3bc6526425fa78c1ac2582cf59496955a1bbbebbe83d492359619ae9aac897b6a8cf7776f5cafad0bb2cc0afe4 WHIRLPOOL 98351c2ecb0c1a6c35150568c5f8a35c2289a7eae10fab97f8852c2b77e3314c223e5e8ce55918f2006ac6ca3ab18c5b38936944d4eb9bab00ed5b6c9fea6fab
-EBUILD galculator-2.1.ebuild 882 SHA256 9857634ca931b3b796d8378ca5c1d6c38704193f1da0bceecb9302f71317ac64 SHA512 feef5ebd4a9af1e52e04b650c668d7f3f56488c5dbe54950812be1dc62b3310387c8d6f7eee34098d80ff24c7bab87c7339738aed133ec45d8786d65ec74958c WHIRLPOOL 24d12471539e0063b000608375c37d00fb7c0be5120815dc55b41b1a96d24980e6933be8e19ac81ce90915cbfa28b61cb8507de830fa04ff7326a08144614c62
-MISC ChangeLog 6060 SHA256 dc589d2cb814d58e54bd1675c9fef2e2a34cfbc88ce3e3f1b62b9da29c61f326 SHA512 36d8639f3027c2e4e43b262c5387eca4f7bac26d0a4f196d510dd62490bccc473eecf14465b0f17175e80b296e195042f77c97a249c7393cc2d4358cfeac70b6 WHIRLPOOL 89954908ec0dcec1475eb6b3464c527576bc9e510e3db51da2e6bf8eae59499ca6e1922c692817f7d90af120c1232502361c1601bfc8915f45b5ea7f11582191
+EBUILD galculator-1.3.4.ebuild 1008 SHA256 3a4117cd8da6d36db914d0f1140f99a08741bf62d21b24682c4fac0819fbc762 SHA512 4ee6e1f37c239a7188e1b450684fbdeb05f8fe1b92335be642c92b68bd9dc6660581ccd508a608a096fdc60730fee9cffab6f0e8cb44fbb5eef2caea94e6d5bb WHIRLPOOL cc8c6edd134147f780534726f3736566d3748b587046a0e271cf1b98b3c862989fe56f56c7e6bb076fc787e518b0bdb7447dea6d09bd38e274b759673372b6f7
+EBUILD galculator-2.1.2.ebuild 765 SHA256 c1735dc3ffedeb5fd74f06566d8030fe84116f31e74f41f78c71bc439bbf3e00 SHA512 ab47d26c6590db6b3fa4b69e193a22223e2f275f84e3c262774e3c2fef0bb56b5b45a1518eb1ae74f0df263f4a8c720d2284ba5f5ba06ae9578bd986651a588a WHIRLPOOL 789b2d2fc0406918905d2199d80a317f919a41fc8e230d40cce124f70942fbe998e0a901b77131219440b2e0015a880e5381adb20ef852b1402b5226d298ac11
+EBUILD galculator-2.1.ebuild 889 SHA256 fe8685614c036a0441c531f6c23d4dcec57475a5e28f03ea777d3ab0d71367da SHA512 6ce27f7718eeaea384e48b29209ed746154a90de218d2d46ec3dadfbc5395b4d608f297ac2a9d8d0914cb6777cddd65d804878e74d521c46aa8a0674ec347ec5 WHIRLPOOL 4023324018eadc3f3025b357d0edc812e6ad701b528a8bcfc3eb12511931672c8c5b90713913f1ad7111aab28b6a0d7c8841b5ed69391542ba3bd06997305314
+MISC ChangeLog 6351 SHA256 b6c3bac191d57218ca199f54fb842137b9d8bbc63814a061fadb98cc7e795faf SHA512 b6a83e670f9e98e9ede26ffcc27a5aaffa721e0c5dd23b5f90dd7146156924f63264a26b8308b949d28a9f868a45a5895ec07c459ee45a9645ac1987f03c45d4 WHIRLPOOL 7cd4ec98eb31c3925bb8e8b8e86394767edf6243ab1633ca6e59e9ec6f30e83e47459c1dd9981f4f2f48e229bb51b4b20f6c59d9d333ff927618d509336fd0fe
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWconAAoJELp701BxlEWfw+gP/0ZLg9HHOamV2CN2I7n3PLWT
-jc11VMwh5a9aZK/cM/UXFjf9lagcJhc7Uxg11R0OHZdwT7Ux0nGp6+pSHhLLOxdU
-XrSLZk45kCyIU3T7lhvuzY8DlWQFTJE2w3xGs66oOuKnSVNpr6xpKKNn4gTBxDGo
-6qosKeHk1tLz6Kb4NbS0zn3aj+U8o938s/Byv1C3mM0hTkapg2CSh4r8BFPNqm7G
-4U8quF+LYwiGFLSMLOT0OwqLUBrmsyb8j4uVZnJz3LD1VfaFKv6QZFCsMQr4eIE0
-H0ATXfVtSct0uVZfRY/RBDh/OSnoBVlpDsEJvVNL7QheIUS2NzM1J9Yrv/6QkxEg
-WuFSGNWJCZ6lX25JiVLbPfHUEG2iVYbG1nuP/+aav5lvYAtjnrvQbqsqh8v/xYRZ
-o6eYwyroF2k1xUBr3LICJPCYNbbiMjOy4GWcuMF2vjuCw92yl+9HrwcO9HbjIhia
-mVbNWpWWqkbXY0aPfnQwwn/sNpl4RGWHuGibmollW7PEuB3K7i7Tfm0gWcM4uvjN
-pL0U/o4/Uh0IkljFIB+v9kX/UrwtGxRu+mLsyJN7RoLMhvMTVrOQDNjE+aK4GeEw
-fsGkXx8qhdF8D9xCkJPF9Pnpzn3pCPJTFFisVnMtQTtl0n9jhFwqeL5E7xZWcjYW
-F7eP9qi3sz+VUSSV1siN
-=i5+P
+iQEcBAEBCAAGBQJRgJZhAAoJEJ0WA1zPCt1hd64H/397kjORFU+ee5AU2zPWGSht
+QEbNwxwa0WB/L7Og2Yd1OdWPmQcog3wJN3/mh8lFo85eNGgBFSeUMgEi2QWe8OxZ
+qll6H+2uTUwxRUmd026Xx7epqEKfFFQ+MV/AfaUVAXp2ppllzmLq24ptvuQPKefE
+4Xr7N9gq7nD5Ccfx5ge0s05RNvaolWFMN7GLyT48xquFeMueqwCYyQOcEskTacNS
+wDAP5oL+A4iFrj3Ur9EFQo+fYClN2fLrwgv9kEW5s8nD1NpeLwZRF7fsWmcrnpVq
+wpRf47bI6km/al8vhl0Hn/PjNaTHIcdonJiGcBHHMpcTe/8JEydIUB7taHb1sX0=
+=ppSC
 -----END PGP SIGNATURE-----
diff --git a/sci-calculators/galculator/galculator-1.3.4.ebuild b/sci-calculators/galculator/galculator-1.3.4.ebuild
index b44179391461..09d83bb40104 100644
--- a/sci-calculators/galculator/galculator-1.3.4.ebuild
+++ b/sci-calculators/galculator/galculator-1.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.10 2012/05/13 15:42:36 tetromino Exp $
+# $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
 
@@ -10,7 +10,7 @@ DESCRIPTION="GTK+ based algebraic and RPN calculator."
 HOMEPAGE="http://galculator.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/sci-calculators/galculator/galculator-2.1.2.ebuild b/sci-calculators/galculator/galculator-2.1.2.ebuild
new file mode 100644
index 000000000000..f5498309f78e
--- /dev/null
+++ b/sci-calculators/galculator/galculator-2.1.2.ebuild
@@ -0,0 +1,28 @@
+# 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-2.1.2.ebuild,v 1.1 2013/05/01 04:13:20 tetromino 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 ~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"
diff --git a/sci-calculators/galculator/galculator-2.1.ebuild b/sci-calculators/galculator/galculator-2.1.ebuild
index 2b1046f750e7..2ae43168ce7d 100644
--- a/sci-calculators/galculator/galculator-2.1.ebuild
+++ b/sci-calculators/galculator/galculator-2.1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.1.ebuild,v 1.5 2013/04/01 17:55:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-2.1.ebuild,v 1.6 2013/05/01 04:13:20 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG=no
@@ -11,7 +11,7 @@ DESCRIPTION="GTK+ based algebraic and RPN calculator"
 HOMEPAGE="http://galculator.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""