From ccf84bcd604130256d1377cd58f0a634ae6ee20f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2017 04:06:07 +0000 Subject: gentoo resync : 28.12.2017 --- app-emulation/Manifest.gz | Bin 19018 -> 19018 bytes app-emulation/free42/Manifest | 8 +-- .../files/free42-2.0.7-fix-build-intel-lib.patch | 12 ----- .../free42/files/free42-2.0.7-fix-makefile.patch | 58 --------------------- .../files/free42-2.0.8-fix-build-intel-lib.patch | 12 +++++ .../free42/files/free42-2.0.8-fix-makefile.patch | 58 +++++++++++++++++++++ app-emulation/free42/free42-2.0.7.ebuild | 49 ----------------- app-emulation/free42/free42-2.0.8.ebuild | 49 +++++++++++++++++ 8 files changed, 123 insertions(+), 123 deletions(-) delete mode 100644 app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch delete mode 100644 app-emulation/free42/files/free42-2.0.7-fix-makefile.patch create mode 100644 app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch create mode 100644 app-emulation/free42/files/free42-2.0.8-fix-makefile.patch delete mode 100644 app-emulation/free42/free42-2.0.7.ebuild create mode 100644 app-emulation/free42/free42-2.0.8.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index a2f248b8fa22..2d4e638c040d 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index fdab1d1e350f..0d8cdedb62fc 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -1,9 +1,9 @@ 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.7-fix-build-intel-lib.patch 690 BLAKE2B c593eea5d157e967c09828e0c93c578cb6954b02c16adc19ef0b8185d11107cc236bb67098bc97da38cd5261b6a080081a8ed91ea9ae4bf6fce19dd0827eb033 SHA512 7c5b720be88acec3fdd3091b3cefeb67612487fbbbf50a4bb8b8b5734b3ac903e0183df8471f7730c82f74ae251180e9d90fe8a1246d9856067e892f08d11505 -AUX free42-2.0.7-fix-makefile.patch 1742 BLAKE2B a6dcc6bfb4d408a1b35a7a3f1dd2101135703d6ee2ed898d87c9bd730a114fd9ef584c47162ebd740e97b837bd4fe708c52994b5b5b0529101cd93d397314bc9 SHA512 c14e9f625a1fe86c5e56e2b1dc42bcf3a6fd5352d70691af95813a51bfbfde88035d221b1ddebf1a3013528407bb4992ad3d3f2e97b48d8606dfa5e96c121647 +AUX free42-2.0.8-fix-build-intel-lib.patch 690 BLAKE2B e7a5f572ec87593ddca5fb91b08a10d67a516233eb2fedf9442fd7a69603230e6db97b67f65d3b699ef326cb834ac34ce388aea4dca6fbc90c4de1dae53d981b SHA512 9c8ff817e64022e2b476518387e0ded4b3353401c3d2a0a09f68c0142721b91c2dce4bbd6a5bd397d6a768d1eb5ff37d1686161b01709d964f0cc86783c42779 +AUX free42-2.0.8-fix-makefile.patch 1742 BLAKE2B 900cafe1140e32f7b8c3a281f9d0d789d4bb54b720a21780b4a7796d0746417178b2a0b577d3973d3f9a3f9d4c6f0a50fe1f6ee208ce33022efe645deb8a3eeb SHA512 cc5c147fa0f209f2b69b4825f964733f33e6c984308f3652042782bf607dfa6074dffc0b8e2463fa0d3d9c36ae10735cefc16221d3aa0cfe46aa7b464a253dd6 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d -DIST free42-nologo-2.0.7.tgz 7354850 BLAKE2B 6be2f2ea912a1d47bdf8c9016e8a32e5203d982e34cbe5ef6624eac078297cd967cf08ae2bdeb7c6ad158f96e77032f449a47f01c3c8d8e312f6d46e20237cf0 SHA512 1adfccb37bdf35ecd57a6da1633ceb3bcfd0681efbc34fc9a4e4580ce235e35db9281de0d9ba659ecd33ef2b3a17eae596047b6790ffbf3e5e5ebfad600dcb8b +DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900 -EBUILD free42-2.0.7.ebuild 1040 BLAKE2B 3b04a83622ee7b6f0bbfd79137c6ea82dcce5438155b409a6161c878f5b6d794e4fb45cb01faf3ae53ad634cd37280ff415ae86ce64b48f9b9feb93c9413803b SHA512 c69790682e684bc136cd095bd093e8ac23e7fbff77081c88a395e3317473edc8fec1f2356ef50bd0d5e78f84086b2d28fc3bf8e4c668065190b141f995b8cc03 +EBUILD free42-2.0.8.ebuild 1040 BLAKE2B 3b04a83622ee7b6f0bbfd79137c6ea82dcce5438155b409a6161c878f5b6d794e4fb45cb01faf3ae53ad634cd37280ff415ae86ce64b48f9b9feb93c9413803b SHA512 c69790682e684bc136cd095bd093e8ac23e7fbff77081c88a395e3317473edc8fec1f2356ef50bd0d5e78f84086b2d28fc3bf8e4c668065190b141f995b8cc03 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb diff --git a/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.7-fix-build-intel-lib.patch deleted file mode 100644 index 04fc844599ef..000000000000 --- a/app-emulation/free42/files/free42-2.0.7-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-11-29 06:03:45.000000000 +0100 -+++ b/gtk/build-intel-lib.sh 2017-12-10 13:57:27.485971521 +0100 -@@ -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.7-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch deleted file mode 100644 index ccf18766bae2..000000000000 --- a/app-emulation/free42/files/free42-2.0.7-fix-makefile.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nuar a/gtk/Makefile b/gtk/Makefile ---- a/gtk/Makefile 2017-11-29 06:03:45.000000000 +0100 -+++ b/gtk/Makefile 2017-12-10 14:01:06.715970583 +0100 -@@ -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/files/free42-2.0.8-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch new file mode 100644 index 000000000000..df2736f01e32 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch @@ -0,0 +1,12 @@ +diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh +--- a/gtk/build-intel-lib.sh 2017-12-26 19:48:08.000000000 +0100 ++++ b/gtk/build-intel-lib.sh 2017-12-26 21:09:52.949997834 +0100 +@@ -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.8-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch new file mode 100644 index 000000000000..2cb44245c3b4 --- /dev/null +++ b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch @@ -0,0 +1,58 @@ +diff -Nuar a/gtk/Makefile b/gtk/Makefile +--- a/gtk/Makefile 2017-12-26 19:48:08.000000000 +0100 ++++ b/gtk/Makefile 2017-12-26 21:07:20.279998488 +0100 +@@ -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.7.ebuild b/app-emulation/free42/free42-2.0.7.ebuild deleted file mode 100644 index 6e2ba52edf22..000000000000 --- a/app-emulation/free42/free42-2.0.7.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 - dobin gtk/free42dec -} diff --git a/app-emulation/free42/free42-2.0.8.ebuild b/app-emulation/free42/free42-2.0.8.ebuild new file mode 100644 index 000000000000..6e2ba52edf22 --- /dev/null +++ b/app-emulation/free42/free42-2.0.8.ebuild @@ -0,0 +1,49 @@ +# 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 + dobin gtk/free42dec +} -- cgit v1.2.3