Version bump

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686

4 files changed, 23 insertions, 21 deletions

diff --git a/sci-mathematics/gsl-shell/ChangeLog b/sci-mathematics/gsl-shell/ChangeLog
index d72e6f5dc2d5..183dec97e462 100644
--- a/sci-mathematics/gsl-shell/ChangeLog
+++ b/sci-mathematics/gsl-shell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/gsl-shell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.5 2012/09/26 14:50:50 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/ChangeLog,v 1.6 2012/11/30 17:34:03 grozin Exp $
+
+*gsl-shell-2.2.0 (30 Nov 2012)
+
+  30 Nov 2012; Andrey Grozin <grozin@gentoo.org> -gsl-shell-2.2.0_beta1.ebuild,
+  +gsl-shell-2.2.0.ebuild, files/gsl-shell-font.patch:
+  Version bump
 
   26 Sep 2012; Andrey Grozin <grozin@gentoo.org> gsl-shell-2.2.0_beta1.ebuild:
   Fixing a stupid typo
diff --git a/sci-mathematics/gsl-shell/Manifest b/sci-mathematics/gsl-shell/Manifest
index 5af347e858aa..f487e3d8518a 100644
--- a/sci-mathematics/gsl-shell/Manifest
+++ b/sci-mathematics/gsl-shell/Manifest
@@ -1,8 +1,8 @@
-AUX gsl-shell-font.patch 665 SHA256 bdd4035013ac338018bb0c964c1b749e7c7c2c035e8887a481719e661b2399c1 SHA512 0a25aa7137bb08d60f708d376e0b17e4d90dffbc56f2405424e2443629862a84fc08619e47a6fa627296a782cfc089e6f929f3a99eaea1fac2b4647e9497efb9 WHIRLPOOL 638794f2874d4f9642a75197de0b02e3fc228357ff7ae37e7a6789cd2c11b261a23db466e77205ed28179b230d7fca27c6df4b7130f3d43b608a2d9015a6f44b
+AUX gsl-shell-font.patch 643 SHA256 41fcdae34ad50d9af430314520458833943dc7e218ec707e14f115b190208321 SHA512 feeb151ff96c02b523f284acbaf214480b92cac42af497f6210726ff2a3b837c6792733ad5c2ac4be58fea68c18c5d10bf7db711336e32c9998c1456bfa3cbff WHIRLPOOL e7816c93202c0c60a18598630174c4af7200a64cfc4ec9944b3ea8c3a3a5452faf00431b2e20f83e840c063f82c1a0ee65a7de554fafa9a21446a4c5da651ae2
 AUX gsl-shell-nogui.patch 809 SHA256 6243647228918d4cdde4e1360ca0b7a7b4577b35044043db5d48a84333aea15d SHA512 b43d8009fef20ef847e098d4279b415ab26643970157b4fd49be1e255e1e8f59862159c2cb6054726d988c2d8b3bd6935673a509c803f486388a333040cde409 WHIRLPOOL ca0c1822b51fc7d0c78c6249790af8ae0018618055fa4ef1e8e775d3dd685aa26258c0120a79903dd40ef721a35f60b09beefe0ef31c626aa9738e376214ef21
 AUX gsl-shell-strip.patch 361 SHA256 b055fda96fa65658ff73143c5ab2242fabf2ff90e9a01da57758cf073f48de86 SHA512 ecb78c52f34d678ecec5ca5f6ee9c85cf954866347501aaf2fd31133357d8085bbbaf3d6118ae2cd20e8375927ae9c1958732bfab09bf308bde7fc3255fa35bf WHIRLPOOL 56ceab90c029426a1697a77c37049b275996d8ebbbf13d5f7e5a20d2dd8c5167ba3a034ff6071b3dab741ef1286d1692b84e3e99b5cd223af98fd74712f08f0d
 AUX gsl-shell-usr.patch 250 SHA256 e0199baa0018dc68f1eef3d51d6fcd8f501725ee9f368446a1312608e6dbed28 SHA512 e10df17a16969ad700e7f16c8fcf694e9c5f2d346e6db7ad5d616122c5160d9ea3d894354aef4214e48233a17e101b20b51c939fdbcb29b25169a4c6c07bc0c3 WHIRLPOOL f586cb39b7e585a0949a61dffe36274285f64f22d428439c1c281e942d9a8cd3dee660a79891d4615402a90e7ddc7b113a36ded05f917ca8cf1e634f42f7b1ae
-DIST gsl-shell-2.2.0-beta1.tar.gz 3118614 SHA256 abd28a452db9185334891093eff8a0cfe7daa6f8a5f5cf5a6f85e5bb8b209712 SHA512 3f97731ac96eaa283be34a38e5895a453226e0e3d7521bc764814e8cba89ddaecbbbff6b9c8363383f445a34e675b82a5cb8a71caded24ddc44c1036bfdf1722 WHIRLPOOL 428e3f789e0aa9b41d368acb7c1834bbbe1d87aa141effaca169f3413566e739b23e400c06a7a7dc2436f902336ea7dddcdf10cf53913115849582a999d380df
-EBUILD gsl-shell-2.2.0_beta1.ebuild 1550 SHA256 1eda9858b95cd1f6083cb1ea7734d2f5b233b1eafe1f8b9c65c16856277c6ddc SHA512 77f0125d5adcf0a22f87295748bbd2a2baefaa4c55ed934210c94e6943a9a3782a4c2c4647403d0b96433aa377f6d9da48d0028a712a41c5175d9cb01025d060 WHIRLPOOL 596240bbf97d3906eb3ef74f2090428d2162a34d047bda1f6d0524ad7fcb81253f448673df542fcffc55925298cf888eb8359981ecfa9020baf67a2bb0ad3337
-MISC ChangeLog 1016 SHA256 73795e65fab8e1224d1725f86553312236675add9252233b3e9d045cdc6c7c22 SHA512 5a875bfa772432fa886280bd16f06b721bdbd8afe51905f704c235b71e4e13e835189274f8666615e907895a424b85b4a5204b36c5e5b1f8f1d07228b5604f0d WHIRLPOOL 276f6a68fc3814b94c6c344e30be70d37883dfda60d99177aa88a7fc641595f548474b3d0672c5b3f9b69bd23e0f820aa812bcd225c6cfe324d6fe3c24a3fdd7
+DIST gsl-shell-2.2.0.tar.gz 3138063 SHA256 e05bcc78ea3c70d209b12a3db5c86b5ed23e50617d68cb0081046382973b2d33 SHA512 1394cbafecd55ddf5c8c992273f1fa400825b21202cd53ac548a99e34a9183ba4a5dcb2ef10ef9a7930f78ed4e6343b8d2a5d34c38a8e7766300b5bf73596d89 WHIRLPOOL 9bbfa55c988611fa0c771fc6c49473e139eff936f4f22b4b419c409e8450c733a57f2d9bbbc799f754654ff5cf5b303ab263bb502ef712ad439564c6e3b28fef
+EBUILD gsl-shell-2.2.0.ebuild 1492 SHA256 13b4b45b78ddce3aab3fc3e8e2306e165a135f1070eab22b14c7489b760cd637 SHA512 38c893d6e82bc0f8eeeeb036e8e8ee68adf8effb8eeb2df495f47a56fae2665b4e5e724465c183c49c065a9640ed520e102cfcd20bca54f9fc9bc1b49172850a WHIRLPOOL 31872d98602f4c6d2824499c23417a97cad72eed29fcd189c902f64820b8a4f0c5c386f3e3e6db7ea9ac38425ade2f59515f39f1a3a9814b0255511a950db0f7
+MISC ChangeLog 1199 SHA256 ab5614c1cbb8a0067ec4ff0076b97dd8f04a207c947f495cd98e4e6546967810 SHA512 9d96a99998e4dba3d6c9479efd4e996c636bdd6a6b74ca1b38fb52ca79f6c2f62e89dbadb63c1d17fd43dcd86b038d54e0b74635cd16fcf558df615c75fb8a5d WHIRLPOOL e8e527a47282d54c913046c3939e484f9eb31bae4cfe15476c99b1c7aa7acbda1e3008ddda71c477932010be0dd2d2661cdd301f072c7766c9f4fb78fbb2b345
 MISC metadata.xml 827 SHA256 d2543b251374761d9c167a544656ad1164bf09e67c0774686c4ce47834739441 SHA512 0bb6d572f8def7438bacc3f883dac17b24382c7a3e10ca2a4843bd03db600399f40090cb1f6631d4759a6cc7d2709029d581bcc29f8373e713e95b86c3ff6e75 WHIRLPOOL cbc5d970895409148686055e3ee5b4ee879c0ad7e33ce166d375c76a6546dd23f9515144421398e4e88f99714190e30a2327286c79158a1d7831576bb864095c
diff --git a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
index 0511b26b8af8..d8879497c4cd 100644
--- a/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
+++ b/sci-mathematics/gsl-shell/files/gsl-shell-font.patch
@@ -1,13 +1,10 @@
 diff -r -U1 gsl-shell.orig/agg-plot/support_x11.cpp gsl-shell/agg-plot/support_x11.cpp
---- gsl-shell.orig/agg-plot/support_x11.cpp	2012-09-12 01:13:31.000000000 +0700
-+++ gsl-shell/agg-plot/support_x11.cpp	2012-09-26 16:07:10.000000000 +0700
-@@ -4,3 +4,3 @@
- 
+--- gsl-shell.orig/agg-plot/support_x11.cpp	2012-11-27 04:55:38.000000000 +0700
++++ gsl-shell/agg-plot/support_x11.cpp	2012-11-30 23:02:31.000000000 +0700
+@@ -9,4 +9,4 @@
+ #else
 -const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont/FreeSans.ttf", "ttf-dejavu/DejaVuSans.ttf", 0};
+-#define TTF_SYSTEM_DIR "/usr/share/fonts/truetype/"
 +const char *ttf_names[] = {"ubuntu-font-family/Ubuntu-R.ttf", "freefont-ttf/FreeSans.ttf", "dejavu/DejaVuSans.ttf", 0};
- 
-@@ -8,3 +8,3 @@
- {
--    const char* ttf_dir = "/usr/share/fonts/truetype/";
-+    const char* ttf_dir = "/usr/share/fonts/";
-     unsigned len = strlen(ttf_dir);
++#define TTF_SYSTEM_DIR "/usr/share/fonts/"
+ #define CONSOLE_FONT_NAME "monospace"
diff --git a/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild
index 5c950e666049..4896cf682781 100644
--- a/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild
+++ b/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0_beta1.ebuild,v 1.5 2012/09/26 14:50:50 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gsl-shell/gsl-shell-2.2.0.ebuild,v 1.1 2012/11/30 17:34:03 grozin Exp $
 
 EAPI=4
-inherit eutils versionator
+inherit eutils
 
 DESCRIPTION="Lua interactive shell for sci-libs/gsl"
 HOMEPAGE="http://www.nongnu.org/gsl-shell/"
-MY_P=$(version_format_string '${PN}-$1.$2.$3-$4')
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc fox"
 
 DEPEND=">=sci-libs/gsl-1.14
@@ -24,7 +23,7 @@ DEPEND=">=sci-libs/gsl-1.14
 	fox? ( x11-libs/fox:1.6 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
+S="${WORKDIR}"/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-font.patch "${FILESDIR}"/${PN}-strip.patch "${FILESDIR}"/${PN}-usr.patch