commit: 281e52813fe3e1e4f657f0ea753eeae826199a30 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 30 02:24:54 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 30 02:24:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281e5281
app-emulation/softgun: cleanup EAPI 4 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> app-emulation/softgun/Manifest | 1 - .../softgun/files/softgun-0.21-make.patch | 68 ---------------------- app-emulation/softgun/softgun-0.21.ebuild | 32 ---------- 3 files changed, 101 deletions(-) diff --git a/app-emulation/softgun/Manifest b/app-emulation/softgun/Manifest index 3284509fa94..849e9260fef 100644 --- a/app-emulation/softgun/Manifest +++ b/app-emulation/softgun/Manifest @@ -1,2 +1 @@ -DIST softgun-0.21.tgz 1126433 BLAKE2B 367ef0b200efc46c9727fc5e465f8e7ba036804ef29ff782955cb4b58ade9100279a16fb3cf0d1d9321d5a5db01a6ac0a4d69cd50b700d9a7a04b1ca798fe5d8 SHA512 145c6e8407e57353212dcb7ab8193c9b5d5c7fa6271dfbe3f4637c236b07989ef61729f55850da14639dc7d7d64ad5b68c73783e634dc5d2763865977c62ca8a DIST softgun-0.22.tgz 1239881 BLAKE2B 34bbb67ee0f359fd75e19ec455ccb674e613a25b7a68fa638b7b9c4c2021fbbebe1aee5a4e4184e2e5a92d4ae81fe95acd68f7c68ae3700b2284e64f5b785a30 SHA512 5c13840874b09aab6c0921d705c0ea94da87cc1a80d2fcbc9f329ade25f33bb2c8eba2fe284b4c3b41e70b8f258a45fc83caa296880bfa3e7870994de587e591 diff --git a/app-emulation/softgun/files/softgun-0.21-make.patch b/app-emulation/softgun/files/softgun-0.21-make.patch deleted file mode 100644 index bb3ded406a0..00000000000 --- a/app-emulation/softgun/files/softgun-0.21-make.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- softgun-0.21/config.mk -+++ softgun-0.21/config.mk -@@ -9,7 +9,7 @@ bindir=$(prefix)/bin - libdir=$(prefix)/lib/softgun/ - - #CFLAGS=-Wall -pg -O1 -g --CFLAGS=-Wall -O9 -g -fomit-frame-pointer -fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable -+CFLAGS+=-fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable - DEFS=-D_GNU_SOURCE - INCLUDES:=-I$(top_srcdir) -I. - -@@ -19,13 +19,13 @@ - SHAREDLDFLAGS=-nostdlib -shared - CYGWIN=$(findstring CYGWIN,$(shell uname)) - ifeq ($(shell uname),Linux) --LDFLAGS=-lpthread -lrt -lm -lz -lasound -+LDLIBS=-lpthread -ldl -lrt -lm -lz -lasound - else - ifeq ($(shell uname),FreeBSD) -- LDFLAGS=-lpthread -lm -lz -lSDL -+ LDLIBS=-lpthread -lm -lz -lSDL - else - ifeq ($(CYGWIN),CYGWIN) -- LDFLAGS=-lpthread -lrt -lm -lz -+ LDLIBS=-lpthread -lrt -lm -lz - else - $(error "Unknown architecture $(shell uname)") - endif ---- softgun-0.21/Makefile -+++ softgun-0.21/Makefile -@@ -116,7 +116,7 @@ - - - softgun: $(OBJS) -- $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS) - - boards/libboards.a: - $(MAKE) -C boards libboards.a ---- softgun-0.21/printer/module.mk -+++ softgun-0.21/printer/module.mk -@@ -5,5 +5,5 @@ - INSTALL_BINS += pcl3gui2png - - pcl3gui2png: $(PRINTER_OBJS) printer/pcl3gui2png.c -- $(CC) -o $@ $(PRINTER_OBJS) printer/pcl3gui2png.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ - ---- softgun-0.21/tools/Makefile -+++ softgun-0.21/tools/Makefile -@@ -2,7 +2,7 @@ include ../config.mk - - ifeq ($(shell uname),Linux) - sg_tunctl: tunctl.c -- $(CC) $(CFLAGS) tunctl.c -o sg_tunctl -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ - - install: - install -m 0755 sg_tunctl $(bindir) -@@ -14,7 +14,7 @@ install: - endif - - to_c_array: to_c_array.c -- $(CC) $(CFLAGS) to_c_array.c -o to_c_array -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ - - - clean: diff --git a/app-emulation/softgun/softgun-0.21.ebuild b/app-emulation/softgun/softgun-0.21.ebuild deleted file mode 100644 index ceb15acaf31..00000000000 --- a/app-emulation/softgun/softgun-0.21.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit toolchain-funcs eutils - -DESCRIPTION="ARM software emulator" -HOMEPAGE="http://softgun.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.21-make.patch - sed -i \ - -e "/^CFLAGS/s:-O9.*-Werror:${CFLAGS}:" \ - config.mk || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dodir /usr/bin - emake install prefix="${D}/usr" - dodoc README configs/*.sg -}
