3 files changed, 5 insertions, 77 deletions
diff --git a/app-emulation/free42/ChangeLog b/app-emulation/free42/ChangeLog
index 43d88e5bc0fb..c7921f82f999 100644
--- a/app-emulation/free42/ChangeLog
+++ b/app-emulation/free42/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/free42
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.30 2015/01/26 10:16:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/ChangeLog,v 1.31 2015/03/25 22:06:14 nimiux Exp $
+
+  25 Mar 2015; Chema Alonso <nimiux@gentoo.org> -free42-1.5.4.ebuild,
+  -files/free42-1.5.4-fix-makefile.patch:
+  Drop old
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> free42-1.5.5.ebuild:
   Stable for x86, wrt bug #534848
diff --git a/app-emulation/free42/files/free42-1.5.4-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.4-fix-makefile.patch
deleted file mode 100644
index 8f73b4405e7f..000000000000
--- a/app-emulation/free42/files/free42-1.5.4-fix-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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.4.ebuild b/app-emulation/free42/free42-1.5.4.ebuild
deleted file mode 100644
index 4fac12a1af06..000000000000
--- a/app-emulation/free42/free42-1.5.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.4.ebuild,v 1.3 2014/10/30 09:57:57 ago 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}"
-
-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
-}