gentoo resync : 09.03.2018

7 files changed, 4 insertions, 127 deletions

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 5aa32728afc9..94db7b08278b 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,13 +1,9 @@
 AUX free42-2.0.10-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
 AUX free42-2.0.10-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
-AUX free42-2.0.15-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
-AUX free42-2.0.15-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
-AUX free42-2.0.6-fix-build-intel-lib.patch 690 BLAKE2B 0d8de8c32f92c01174e420e0dc74880bd3c3316c36dc947f84803a8f61ad491a0de9d27fa45ed7c72992b4e22c5e204bce27d47ec976048c4eff655d14312839 SHA512 624cf0af83f02b3a43231739de3d84e76cbdfe49becd219c9211cbc8ba7fc7d3474fc465edbf7e707f1474844e109d5d30361c7e15e3799db48bf0dda068d5ed
-AUX free42-2.0.6-fix-makefile.patch 1742 BLAKE2B 239bbb40c70a3627cf08859397bace5ecd6bbd215cc06f6d82862b908169af4851002fbb3cb7059aa553c3b7da266e5b0b2a1dede891a4f085822a2e731a9399 SHA512 d3add6369d6f2b5d4690355d93cfff903866f24aeed7d73246a79b4ba7b2551fec4ec61cf2d8c80d089194bf39f0c3a1faa4c6d1829f81b6c636b8f5d132b2bd
+AUX free42-2.0.17-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
+AUX free42-2.0.17-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
-DIST free42-nologo-2.0.15.tgz 7389800 BLAKE2B f78a925459f7eea3347d5394cdde47cd7318770895ea0c375b14c5855ff9d08db86c72324122c15792db8e457fa6bfb8039a911de240e23269bf87def58381cf SHA512 533528b651b408156fb069e4969f35a1d365be84a7fc63d0d40a35ace75592dd88cc20def3dff2de4b7a7e3eeaeab99bb89ad333135be90dab13b52ac6af804b
-DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
+DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872
 EBUILD free42-2.0.10.ebuild 1042 BLAKE2B 7019cd43b5bf6029a900fa386aa6300185a279d6b746d36211413da76107309f425257273b70db78f89349adf37a2b14f31369059d3562e8ab6f015ae6b2c34b SHA512 2556155fff2e04f13be2561dc46b1dd4f8f860a5d29c5062635c767c8a163eac795a736e4f948134faeaab88f6d7b7574e52b8242bbd1ffd0dd3f3f84235ec01
-EBUILD free42-2.0.15.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
-EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900
+EBUILD free42-2.0.17.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch
index a321b1d714b8..a321b1d714b8 100644
--- a/app-emulation/free42/files/free42-2.0.15-fix-build-intel-lib.patch
+++ b/app-emulation/free42/files/free42-2.0.17-fix-build-intel-lib.patch
diff --git a/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch
index 7642316920f4..7642316920f4 100644
--- a/app-emulation/free42/files/free42-2.0.15-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-2.0.17-fix-makefile.patch
diff --git a/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch
deleted file mode 100644
index 6464714a001d..000000000000
--- a/app-emulation/free42/files/free42-2.0.6-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
---- a/gtk/build-intel-lib.sh	2017-04-01 20:02:45.000000000 +0200
-+++ b/gtk/build-intel-lib.sh	2017-04-04 13:55:43.719038089 +0200
-@@ -4,7 +4,7 @@
- cd IntelRDFPMathLib20U1
- patch -p0 <../intel-lib-linux.patch
- cd LIBRARY
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch
deleted file mode 100644
index d64efb21a6d9..000000000000
--- a/app-emulation/free42/files/free42-2.0.6-fix-makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nuar a/gtk/Makefile b/gtk/Makefile
---- a/gtk/Makefile	2017-04-01 20:02:45.000000000 +0200
-+++ b/gtk/Makefile	2017-04-04 13:59:04.969034463 +0200
-@@ -15,11 +15,11 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- ###############################################################################
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
- 	 -Wall \
- 	 -Wno-parentheses \
- 	 -Wno-write-strings \
--	 -g \
-+	 -Wno-error=narrowing \
- 	 -I/usr/X11R6/include \
- 	 $(shell pkg-config --cflags gtk+-2.0) \
- 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +27,25 @@
- 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
- 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
- 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+	 ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
- 	 -fno-exceptions \
- 	 -fno-rtti \
--	 -D_WCHAR_T_DEFINED
-+	 -D_WCHAR_T_DEFINED \
-+	 ${CXXFLAGS}
- 
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
-+MYLDFLAGS = -L/usr/X11R6/lib
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
- ifeq "$(shell uname -s)" "Linux"
--LDFLAGS += -Wl,--hash-style=both
-+MYLDFLAGS += -Wl,--hash-style=both
- LIBS += -lpthread
- endif
- 
-+MYLDFLAGS += ${LDFLAGS}
-+
- 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 \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +87,7 @@
- endif
- 
- $(EXE): $(OBJS)
--	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
-+	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
- 
- $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
- 
diff --git a/app-emulation/free42/free42-2.0.15.ebuild b/app-emulation/free42/free42-2.0.17.ebuild
index ce44a72c5aed..ce44a72c5aed 100644
--- a/app-emulation/free42/free42-2.0.15.ebuild
+++ b/app-emulation/free42/free42-2.0.17.ebuild
diff --git a/app-emulation/free42/free42-2.0.6.ebuild b/app-emulation/free42/free42-2.0.6.ebuild
deleted file mode 100644
index e46232096899..000000000000
--- a/app-emulation/free42/free42-2.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PV="${PN}-nologo-${PV}"
-
-DESCRIPTION="An HP-42S Calculator Simulator"
-HOMEPAGE="http://thomasokken.com/free42/"
-SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.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}/${MY_PV}"
-
-src_prepare() {
-	default
-	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
-		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}"/${P}-fix-makefile.patch
-	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
-}
-
-src_compile() {
-	local myconf
-	use alsa && myconf="AUDIO_ALSA=yes"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
-}
-
-src_install() {
-	dodoc CREDITS HISTORY README TODO
-	dobin gtk/free42dec
-}