[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/

[José María Alonso]

commit:     e5a1125db5fc54b0675459cd9e3101566214f225
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 21:47:26 2017 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 21:47:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a1125d

app-emulation/free42: Drops old version 1.5.15

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-emulation/free42/Manifest                      |  1 -
 .../files/free42-1.5.15-fix-build-intel-lib.patch  | 12 -----
 .../free42/files/free42-1.5.15-fix-makefile.patch  | 58 ----------------------
 app-emulation/free42/free42-1.5.15.ebuild          | 47 ------------------
 app-emulation/free42/metadata.xml                  | 30 +++++------
 5 files changed, 15 insertions(+), 133 deletions(-)

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 9d7011700d1..21cdbba3ae3 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,2 +1 @@
-DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769
 DIST free42-nologo-2.0.6.tgz 7348647 SHA256 862135da3066576d71dbfedc1e41e97230e656ef2f0db3a5b87ba96650c12b9a SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d WHIRLPOOL 5740055edfbafc6f91ba9d3a8b1dc259511dc99b1e5d06a78cf03976b71928c5423d57cd023c9d878108394f3b0992a3bf532f06e69089b976a8ca789dcae9ed

diff --git a/app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-1.5.15-fix-build-intel-lib.patch
deleted file mode 100644
index 6464714a001..00000000000
--- a/app-emulation/free42/files/free42-1.5.15-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-1.5.15-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.15-fix-makefile.patch
deleted file mode 100644
index d64efb21a6d..00000000000
--- a/app-emulation/free42/files/free42-1.5.15-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-1.5.15.ebuild b/app-emulation/free42/free42-1.5.15.ebuild
deleted file mode 100644
index b765ac09719..00000000000
--- a/app-emulation/free42/free42-1.5.15.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}"
-
-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
-}

diff --git a/app-emulation/free42/metadata.xml b/app-emulation/free42/metadata.xml
index 6a06bd3b7db..8cd4a7ec831 100644
--- a/app-emulation/free42/metadata.xml
+++ b/app-emulation/free42/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-	    <email>nimiux@g.o</email>
-	    <name>Chema Alonso</name>
-    </maintainer>
-    <longdescription lang="en">
-        An HP-42S Calculator Simulator
-    </longdescription>
-    <longdescription lang="es">
-        Un simulador de la calculadora HP-42S
-    </longdescription>
-	<use>
-		<flag name="alsa">
-		   Adds support for Advanced Linux Sound Architecture
-		</flag>
-	</use>
+  <maintainer type="person">
+    <email>nimiux@g.o</email>
+    <name>Chema Alonso</name>
+  </maintainer>
+  <longdescription lang="en">
+     An HP-42S Calculator Simulator
+  </longdescription>
+  <longdescription lang="es">
+    Un simulador de la calculadora HP-42S
+  </longdescription>
+  <use>
+    <flag name="alsa">
+      Adds support for Advanced Linux Sound Architecture
+    </flag>
+  </use>
 </pkgmetadata>