sci-mathematics/wxmaxima: Add LINGUAS support and various other fixes, thanks Julian Ospald (hasufell) for the patch, #463624

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 53 insertions, 19 deletions

diff --git a/sci-mathematics/wxmaxima/ChangeLog b/sci-mathematics/wxmaxima/ChangeLog
index dd9091b8127e..4853fd0ad11c 100644
--- a/sci-mathematics/wxmaxima/ChangeLog
+++ b/sci-mathematics/wxmaxima/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/wxmaxima
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.40 2012/09/16 15:57:30 grozin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/ChangeLog,v 1.41 2013/04/09 06:40:05 jlec Exp $
+
+  09 Apr 2013; Justin Lecher <jlec@gentoo.org> wxmaxima-12.09.0.ebuild,
+  metadata.xml:
+  Add LINGUAS support and various other fixes, thanks Julian Ospald (hasufell)
+  for the patch, #463624
 
 *wxmaxima-12.09.0 (16 Sep 2012)
 
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index f7b55d0cf50d..96a3b903dbec 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST wxMaxima-0.8.2.tar.gz 930011 SHA256 36c47638c323b5ec3f77ba96694481aca978fb76c48baef9c782fee3b6f1c186
 DIST wxMaxima-12.01.0.tar.gz 1470402 SHA256 358cdafe81b7e7290f6bb8c93580b0e2f0ae5a4d148a476e5af375aa9bf77054
 DIST wxMaxima-12.04.0.tar.gz 1490662 SHA256 60110507e0a63738a1f420b22697eaac9bea3866122e072dcd697077e8744824 SHA512 3a6a275960948df8356bbebc8dcb16979abaf59bd039a0cfe52bf307250feb628df21a5b3bc0756cc5b1537d7fbd40e753398f5f8229f8670f26ce783416e290 WHIRLPOOL bfed4b4f606407a0ab3b27a8d72149984b09690fde2aa52be4aaff1851156c544a58346c2f22e42856fc853a262496b3665bc992e896cef1cdbb1636613efe9f
@@ -5,6 +8,13 @@ DIST wxMaxima-12.09.0.tar.gz 1554561 SHA256 5803ab62fc791bcb87f0d0f38357dba6fccc
 EBUILD wxmaxima-0.8.2.ebuild 1480 SHA256 080765600d2fb90429333a8da47b694a9476e09abebcfd555eb5acda8cbdeebd SHA512 93a74e707c67b5b9ef70b1c60db907453bf471c9f5a9b8415c616b9d89201c876324b4fdd678b21034a5d3bed66aa5bf316b56ebe8891003430f0f05be1db278 WHIRLPOOL f445fc4b7c2addc2920e68e832f78b070cad573bdb8d760a2b8922af85795304de73a70f30b7c4916444c2f794bc8345d5fbc3cecf9caba1ed743293f75e2988
 EBUILD wxmaxima-12.01.0.ebuild 1447 SHA256 d3a75fc6632eccd65ab025394cba0e77e107ac425d00d9f29cd47a760f466146 SHA512 84625617b3d1e4302979180360f7c5d82e838d30464c6c548bf998fb90328165d0c36cf045e6e45d304c2a91c6e8c36ced926cb63b2a7835b93824b9bf1f2b5e WHIRLPOOL ecbe950a28f5dae3ed3c35e73b3d02c34f8be5466363f6890133971d8a04b3771559db4a3a3134347932c87c19fc5aa0d8f7c1b20b0b0e054551754a4069553c
 EBUILD wxmaxima-12.04.0.ebuild 1446 SHA256 9cb3e68b6b63251ec777971165bfb4886faea448ffcc18e139115ffa0151f1b4 SHA512 b5f936604adc5640e7d27316f3c8b8ae42632d996e5a5481fbaf326a0a3dfef2910657511471265c7b411c7870aedfede32765fbd3defd0d71b537a2abb3753b WHIRLPOOL 3eb514d2a7885d4ac4d8fb8e61b4b88dd2db8b8c6606adb5fe8d0d64a80951f4c7e09d1fde6180c6b5787d60994e2c4cba98f26bfb828aaa5b76499c46bbc07e
-EBUILD wxmaxima-12.09.0.ebuild 1444 SHA256 94dc0fcc9f9fcb24f64c048bee154fd6810a4dba884231e6b638e116d0b6208a SHA512 221a02da81f280ab7af014a2960555a4179a74a90312f965fd9a67529c5480300bea8090cff5f0b3d56648332d08a168e7cc8b900966764ba08e4c753e40f25d WHIRLPOOL a3d0c61c2044d3c072a85ac0ec67cb81ab2036a1cfd24295488c704bb3ef32188110ce38a32e937337b4bed84e058790714caaa30570066264c1545c24edc153
-MISC ChangeLog 6106 SHA256 a3923b8126440ce47592cb49cfb2f7781efdd790a3cbc711e04a5d027023da88 SHA512 9ca99ffd19d35075a911a73123bae47fae874b2ebe2920d174d10b3b305f8f05996137c80b7c1e9a0b123e716c319e33e7df96c8c0bb8768e639aa133f0427ef WHIRLPOOL a41f86a680701a44693362dbd07e3249bf888406175428700ddbab4394f81535f6fdeb28aba4e2865f726d37c38511cb98ddb32c481e0abbeab73219d0b3d9bd
-MISC metadata.xml 517 SHA256 84060fc148aeee241cd08b55666c2c0783203d5085b8b3ebe2d95a6b6e198b71 SHA512 33f5e7ad3df112e86dba1225d5b736662aa3fed0341d300c1cd8f34e6e8be075b65c087e42e77908132d49e29b4c310969a1d532a821967ed6bfb244329d49a0 WHIRLPOOL 3a50a4342ae21af5a859fbd6f227c874c26e6b7f52d9466daf78306e26aa65ae8dabecf7748f6efb9d53c5147b07ce2d882f0b62a4a5a5b5e85396afa7a0aa18
+EBUILD wxmaxima-12.09.0.ebuild 1779 SHA256 1d5353e6096727293e45703ccebadbf4ea1123f22fef478255ab2219abe8a046 SHA512 aeedfda6f9c17507eb6a724284569db0bc9d952fb04414f54697dfedcc478366f9eead791846b213315f3726755fc7c029edad7ff9f72eaa9680228686c16e0c WHIRLPOOL 02fdc5bfea297bdf7b67689da59157ba8b08e24db1b7dc4374a0536d49b5e5b90971d3277a4987c88f4e6c5d9cd59d40c4881f4009f82f3ec7b7e8aef6ba977d
+MISC ChangeLog 6297 SHA256 17c4a8d2bcb134a2d33a646cd000d0fece4b02fad81c738c3aab79fed259c4b8 SHA512 8d84859bbb09d66816df26c9ff72e6b5d41333282cf184a82277be0abace63e294c239af4d8dab3f452bc2f3a75441324e345b03d0ec78130bb933f88b4497fb WHIRLPOOL a42ba3c07e07a466d09fb6b2878cb73e3bd0a4fe6dd2618d42a16e17971391ea354a93b2d5681217f25defeb6fc941a753eca47bcec4c9721316102b0cfc1437
+MISC metadata.xml 521 SHA256 ce0fc6c43fdb47f9b2cf33e3ef1188a8d673b94c7b0f8aa7a96c9db0b743d28d SHA512 83684d7a926b56f815285dededba3388428521fd747131cf0d8077daed79eb75deac48f6673c5ecc20ce1c8908bb03a2f35b6cd21b4d659714877fa25044a4f9 WHIRLPOOL f1ad234b802913f2a58a415d0ea0cdcc4567d6af2a73aea9a54249af74a65ce0e52383d64e13dd2530fc994a32142774f00c752beed135b4c057df15fbe94fd8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlFjt8YACgkQgAnW8HDreRaSJQCcDdjGHlJ0+/ujDI6Cpu2IXJmy
+ibMAoMGTqCdO3v19a3/M8Z7GJ++/OPt3
+=Q5Ei
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/wxmaxima/metadata.xml b/sci-mathematics/wxmaxima/metadata.xml
index 1abfd4dd7951..e7440d19a252 100644
--- a/sci-mathematics/wxmaxima/metadata.xml
+++ b/sci-mathematics/wxmaxima/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
 wxMaxima is a wxWidgets GUI for the computer algebra system maxima.
 Most of maxima functions are accessible through menus, some have
 dialogs. The input line has command history (up-key, down-key) and
diff --git a/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild
index 890a6a5e7cae..c3784e17a861 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild
@@ -1,10 +1,12 @@
-# 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-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild,v 1.1 2012/09/16 15:57:30 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/wxmaxima/wxmaxima-12.09.0.ebuild,v 1.2 2013/04/09 06:40:05 jlec Exp $
+
+EAPI=5
 
-EAPI=4
 WX_GTK_VER="2.8"
-inherit eutils wxwidgets fdo-mime
+
+inherit eutils gnome2-utils wxwidgets fdo-mime
 
 MYP=wxMaxima-${PV}
 
@@ -15,10 +17,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MYP}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="unicode"
 
-DEPEND="dev-libs/libxml2:2
-	x11-libs/wxGTK:2.8"
+DEPEND="
+	dev-libs/libxml2:2
+	x11-libs/wxGTK:${WX_GTK_VER}"
 RDEPEND="${DEPEND}
 	media-fonts/jsmath
 	sci-visualization/gnuplot[wxwidgets]
@@ -27,6 +29,8 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
+	local i
+
 	# consistent package names
 	sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
 		-i Makefile.in data/Makefile.in || die "sed failed"
@@ -34,28 +38,43 @@ src_prepare() {
 	sed -e 's:share/wxMaxima:share/wxmaxima:g' \
 		-i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Config.cpp \
 		|| die "sed failed"
+
+	# correct gettext behavior
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(cd "${S}"/locales ; echo *.mo) ; do
+			if ! has ${i%.mo} ${LINGUAS} ; then
+				sed -i \
+					-e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
+					-e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
+					locales/Makefile.in || die
+			fi
+		done
+	fi
 }
 
 src_configure() {
 	econf \
-		--enable-dnd \
 		--enable-printing \
-		--with-wx-config=${WX_CONFIG} \
-		$(use_enable unicode unicode-glyphs)
+		--with-wx-config=${WX_CONFIG}
 }
 
 src_install () {
 	default
-	doicon data/wxmaxima.png
+	doicon -s 128 data/wxmaxima.png
 	make_desktop_entry wxmaxima wxMaxima wxmaxima
-	dodir /usr/share/doc/${PF}
 	dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }