Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

4 files changed, 94 insertions, 9 deletions

diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog
index d52ee81b037a..0c73ed9e7bac 100644
--- a/app-emulation/free42/ChangeLog
+++ b/app-emulation/free42/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/free42
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.19 2014/06/23 21:49:31 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.20 2014/06/24 08:47:11 nimiux Exp $
+
+*free42-1.5.3a (24 Jun 2014)
+
+  24 Jun 2014; Chema Alonso <nimiux@gentoo.org> +free42-1.5.3a.ebuild,
+  +files/free42-1.5.3a-fix-makefile.patch:
+  Version bump
 
   23 Jun 2014; Chema Alonso <nimiux@gentoo.org> -free42-1.4.75.ebuild,
   -files/free42-1.4.75-fix-alsa.patch:
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 4668b491853d..6d30750ee51f 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -3,18 +3,21 @@ Hash: SHA256
 
 AUX free42-1.4.77-fix-alsa.patch 12854 SHA256 d67a3a158db61dac3b6c3d9505f73eee2aeb8ebf8f2b3e7ad11611bf7eb39cd5 SHA512 af56b6bc0609f46814c57bf6e7eece2eca27a553efd30677c4a4220cae5106a535ff3043f6832d141ba4dc7ba26ce3484e169bffba1f9dccce3b148f7cd25857 WHIRLPOOL 0982edfbd52a72b2ab28346e228935567fe17581cace05dec69ec55cfa946e8e3f334488e6f40605d4f066796b28e1d5bdfc5b18e5a36b55ce58fa66e4ad8738
 AUX free42-1.4.77-fix-makefile.patch 1122 SHA256 6af946956c01f659bedfe1cda8d4f39fd920825b058c84d31c34db154a88ad46 SHA512 5de42ca34e255aff7179b34bd545b2bf5d32c9d62489cd652573488897990778a89608a831e994e9a552d14ba2498870331e5e06345ab4c3863de7fd416dba8b WHIRLPOOL c8a142ae068a299c470f7041e501ecae63a520267e4dec68f8a97e1c1e5aeba7c5f2cdcf244e3cde3cd79b93ae09c958bc27e1893281049dc03a48535d64e978
+AUX free42-1.5.3a-fix-makefile.patch 1045 SHA256 4cf95a73f6dd315912920bcee9c8199428bf45ee6bd352dc6803993e1f30fdfb SHA512 379bff28a6982d7fa2baed339f780b19c12b11b547a3b84b8a9b03c08df1b16061b28b340737f207b628f8b3b071eb2971d5daa2588f581073e081f7fe731382 WHIRLPOOL e14ab479ef46d9fb72d587458a2c9bdd11c03d9aec4a2b875768deae47085e046ed30c3c37bb4353856f0eabf86c1e2c6e7807d8afcc93705865cd446e68b892
 DIST free42-1.4.77.tgz 1096936 SHA256 b500b90eeee486af297a0b04a4ee611d36a41f99f5a5b71ed2d98ce9831addc5 SHA512 ab2ed1703ce5210c904bd5eda8c416a30588a80b18648fadb16c01ef7c5487a71851cf238e0130402d2536a3068d6ee3eb585e60d99479ca0e1ca5a8ea968651 WHIRLPOOL 2bfd040c82d59a5af0b2391d81756332d9f606d7200239d3d4e06d4e2e8b09b1480b1f76facdafb26056151ac0c654d93068c60071760fc69f72efea03f58659
+DIST free42-1.5.3a.tgz 8150063 SHA256 3212a32fc7958ed2d53452adf2301c4747b4774154a4ecaceb478b67d31bfce6 SHA512 61f07f8899aac7619d5d9bbeca224f3e06feb9b548adacebf207e1e1e139fd5b4f30f7c11ca5956bb2f71221ea46c15028d6116d67b9130204288cda603b1c5c WHIRLPOOL 45310aa0b16680f5569fc90b65b21264d7b0e2d8fafab0935fb8e6e2170f4a30080eb9eb6f9561e853dca290a49f8668007d005c5cdafd61d1dc5436506abfab
 EBUILD free42-1.4.77.ebuild 1081 SHA256 17a03739d1e2f57d840041350bc5855cd3367d81fbcfc9c63e3527537ca901c2 SHA512 db3316cb5914598433ffedcf20ff954a7b0217a30e2636cfc837aa650e7a1201806802b56992a7e5d2bb5f920afa0b6c50d742581eb47aafe900823c91fabc4f WHIRLPOOL a1320c17f230086d0f0a501417a14a351071667401221575c0a941456017869d8675b474ed0a8bfae52a010110972059d53a39294586314478be777ce41c5bbb
-MISC ChangeLog 2741 SHA256 3f16c2d5d91e082736fefc32b76db5cb3c1adefb88513b5ecf6e785cae1573d4 SHA512 87f591c88860ae3cca2f8d054d0a4a8808e666472ed98ed60fffe0285df2ed39c2c1f4c423c85b99c8e42f1eb89d25ea28a4c383931545ea3c120ca13a3b734a WHIRLPOOL c675b3fca5abed2bd7845f23d1fd5561fcc2297a33c28f5cf00cce8173414e80f51b2bfe6e0e9dbd73e07de3644dc36e04d266dfdfe6dadbe7949562af95892b
+EBUILD free42-1.5.3a.ebuild 1037 SHA256 2bbf1ec956a8e186dfe7d32603fef879e152e2ce4094f0db3c781d3383c94ba6 SHA512 b812f1f814e7e58f1f07a8b336bdf9af359d8c13c5d2712797b14211d8440e01b06b44bb20d3e9e7756b88bf2db53f9a7e9d07d3eabfb30299d38b54f56043ba WHIRLPOOL 3264f20fcb3adf7f7fd8b2f1e81f3be2bcd1990642c5150c6cf21bc731895b6517a8d144d50de1d137ff1c33bf8f4c690cca886f279add93c6610493f5b17716
+MISC ChangeLog 2901 SHA256 fd8df7a1d627ad4d865242cd513b195505dd7f04defc1991f4fb482defbf0112 SHA512 df1fcfd1e57981571bf62a023e42aca7cb30db6bd237d51597fbcdf130c3b1d11e1b7ef249f403a41bff62324c421bfeb3826e4231a413cdb5e103ff9ea5baa8 WHIRLPOOL f387ffea840b9be7bd0cf9fdbcb7967174260f21287707733528dc0b59ad9cc946fbc25ab0a8d2e5dd7c18911af663a8255bbdd45ade1332ab70fa50d8ffa975
 MISC metadata.xml 540 SHA256 1dfb1cbb7947a8e42c92ccfed144fd5bf71d34d31bed4cc7de3b7b940f0b7192 SHA512 e6b1c3521732649216949ee826b69abc66a9b7b87242e4a908211678dd5828e84f92f4a4af2ecbe4b75ecd7e483da18bea484fd555215c8a37c11ef04df8236c WHIRLPOOL f8bd8cc0dbbb19b13e62217c513509771b3245c6b49d592d6cf26da1f25b71cdb62f8a0563c94d365f83aa79c80e1de306b1e18f19c5c603de389a20ffe7a802
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTqKErAAoJEA2sAkrWKOU2DI8H/0DwzDTtrfClanBhLpUTHQuM
-rK8lxcU4qbPVaX+qoazs+ZPouT9E8dYMSsh66CbwOlPAiDptjBhxNTOUGA+Zk82T
-8S0GqS3XqxX8kXol2RUFcO69BnnY8cDTOI3peNGLIidm5t9e5n0ApHVQjvFqWozs
-SbamhP3A2RJU/7aC+57DUrWLcTtqRnC827zMGCGkLLvEwQpr2lLQ9hbBrepT6ev8
-1y6jv+RsRMuqakvD6dWSvPd/0Ll6FqCCdHgR41NiYkNYxfq9+LwtT/UlyR3p80cF
-FFmzEK1ANDqpKPLOvo2y2jDMAFq7sllnuv2D+sEjQ4aG1Ef4DQBzOndbLMYgyKg=
-=Q6/m
+iQEcBAEBCAAGBQJTqTtQAAoJEA2sAkrWKOU2oQoH/3vIA1UbJU/Xl414ksKxMbg9
+3LTBBoo/BsmkztHBJ1sS2mymPsDbdy+qgjG8yp8inIpn4/lHkg9gDYx+aT40TBHs
+3cJ9e913EN9JPN9Vg/Kc1Dwfrlne9xm/4je1cgNuPHwD9aQljNCu/EUrB80vF+JF
+zksp7gFNW1FqAWZD8T3I8KR7GhxeSPjoC0gA2wItG/K7Lmwj0fpK5873M22a1Bll
+/UqFoWYwKPpXINCu2FJiFuEAIogHbHzvxI7LD3rLMcHdWGn27hQzAv9W2q5BZGB4
+X8dpmXllGqVM6frnFl5QPeX7eII4LTKOaRKeILwFwMW3MLVr0g7RsN69YjOoZC4=
+=gD0k
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch
new file mode 100644
index 000000000000..8f73b4405e7f
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch
@@ -0,0 +1,30 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2014-06-21 19:46:55.000000000 +0200
++++ b/gtk/Makefile	2014-06-24 00:03:38.719906032 +0200
+@@ -19,7 +19,6 @@
+ 	    -Wall \
+ 	    -Wno-parentheses \
+ 	    -Wno-write-strings \
+-	    -g \
+ 	    -I/usr/X11R6/include \
+ 	    -fno-exceptions \
+ 	    -fno-rtti \
+@@ -30,14 +29,11 @@
+ 	    -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	    -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+ 	    -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
+-	    -D_WCHAR_T_DEFINED
++	    -D_WCHAR_T_DEFINED \
++	    ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0)
+-
+-ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
+-endif
++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
++LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0)
+ 
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
diff --git a/app-emulation/free42/free42-1.5.3a.ebuild b/app-emulation/free42/free42-1.5.3a.ebuild
new file mode 100644
index 000000000000..2e4b44051140
--- /dev/null
+++ b/app-emulation/free42/free42-1.5.3a.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.3a.ebuild,v 1.1 2014/06/24 08:47:11 nimiux Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${PN}-nologo-${PV}"
+
+src_prepare() {
+	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
+		"${S}/gtk/shell_main.cc" || die
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+}
+
+src_install() {
+	dodoc CREDITS HISTORY README TODO
+	dobin gtk/free42dec
+}