gentoo resync : 14.07.2018

6 files changed, 225 insertions, 0 deletions

diff --git a/app-emulation/softgun/Manifest b/app-emulation/softgun/Manifest
new file mode 100644
index 000000000000..eb1e0a91dae4
--- /dev/null
+++ b/app-emulation/softgun/Manifest
@@ -0,0 +1,7 @@
+AUX softgun-0.21-make.patch 1862 BLAKE2B f8ea2542ac3e49f325f33b55f182146504b7e0f2b23be0a4aecd3385f1ceb410f2090299aeaa66f53f3a669f92658301a013c4eed8c1b474333b73c9ac98e242 SHA512 023cb1ba898df7db1f6c5d7771feec0cc9751bea879cf7d84fe1d1b05c8d09a600b2fcf98ce560760ace1cd555a4ff4ec62283d61b79ba55eb5cf2a9218169c1
+AUX softgun-0.22-make.patch 2157 BLAKE2B aa09e9a16fb39e9f85b369db98e2d89ea342a02e141ff35c0b6a42a61f35e89928b9a00498157ca2080b94a61bf8b53ab80209132135a84855a89679b86e6a35 SHA512 0ae2fcb89b279799f28fef49b60eaef7d7f4ed145bb24cf7f4543574077672918aa8fbdd85ba6ae4a2af49629de8bebd3f4cbf98d7ed7b5aef3f14e37ec18b50
+DIST softgun-0.21.tgz 1126433 BLAKE2B 367ef0b200efc46c9727fc5e465f8e7ba036804ef29ff782955cb4b58ade9100279a16fb3cf0d1d9321d5a5db01a6ac0a4d69cd50b700d9a7a04b1ca798fe5d8 SHA512 145c6e8407e57353212dcb7ab8193c9b5d5c7fa6271dfbe3f4637c236b07989ef61729f55850da14639dc7d7d64ad5b68c73783e634dc5d2763865977c62ca8a
+DIST softgun-0.22.tgz 1239881 BLAKE2B 34bbb67ee0f359fd75e19ec455ccb674e613a25b7a68fa638b7b9c4c2021fbbebe1aee5a4e4184e2e5a92d4ae81fe95acd68f7c68ae3700b2284e64f5b785a30 SHA512 5c13840874b09aab6c0921d705c0ea94da87cc1a80d2fcbc9f329ade25f33bb2c8eba2fe284b4c3b41e70b8f258a45fc83caa296880bfa3e7870994de587e591
+EBUILD softgun-0.21.ebuild 611 BLAKE2B 9b076994fea1aca46b9093b82c9b2e1e7903094b1c9ecde30dc8e183df369ba1e646e50e354792cf6e362a078745eedc32a1eaae3e776d819b501a141d7282f3 SHA512 79f10859c31cccb5cc267cbcae91f03c20a0289a3c32cfc8e519ba3e0b983b21676b3c3561cfcb3670301ed3efd0d4b3c92db7894fa702054cf0d67c294b590c
+EBUILD softgun-0.22.ebuild 577 BLAKE2B ed7ce18e40b302139b06169a9b1e06b0421fb77b6e0b2dd8f41bf0670ee658ee15a44fdf067b1f60253131eedf9904bdef7701aedc18e31c52f57630931d3a80 SHA512 f12b6f70834a97381ad08ba2bf2345f666bd9005712d4ea1c8fdce62e973e81b95b1a6cdd2c15ba93de05a4c433f5700edbfdc930046bcac26d513be3f588424
+MISC metadata.xml 336 BLAKE2B 541655644eea5e65982c57a718a91d92e7f432a555f12d4dfeaab3438d3dc52464c01ad09901bddf712754e3707eee5923297f274fac645ef2ecc4467f48add2 SHA512 cb971bed5c426cf0e7ebdd24de23364f35c060a23fc2f92c86f8697cdfdf5e5950644ce0a4d6237655fa9ff23c911c1825b63bb5c0ee9950bf928ab407d080ab
diff --git a/app-emulation/softgun/files/softgun-0.21-make.patch b/app-emulation/softgun/files/softgun-0.21-make.patch
new file mode 100644
index 000000000000..bb3ded406a0a
--- /dev/null
+++ b/app-emulation/softgun/files/softgun-0.21-make.patch
@@ -0,0 +1,68 @@
+--- 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/files/softgun-0.22-make.patch b/app-emulation/softgun/files/softgun-0.22-make.patch
new file mode 100644
index 000000000000..9d1ea9b38e0d
--- /dev/null
+++ b/app-emulation/softgun/files/softgun-0.22-make.patch
@@ -0,0 +1,75 @@
+--- softgun-0.22/config.mk
++++ softgun-0.22/config.mk
+@@ -9,7 +9,7 @@ bindir=$(prefix)/bin
+ libdir=$(prefix)/lib/softgun/
+ 
+ #CFLAGS=-Wall -pg -O0 -DPROFILE 
+-CFLAGS=-Wall -O9 -g -fomit-frame-pointer -fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable 
+-DEFS=-D_GNU_SOURCE
++CFLAGS+=-Wall -fno-strict-overflow -Wstrict-overflow=3 -Wno-unused-but-set-variable -fno-strict-aliasing
++DEFS=$(CPPFLAGS) -D_GNU_SOURCE
+ INCLUDES:=-I$(top_srcdir) -I.
+ 
+@@ -17,15 +17,16 @@ INCLUDES:=-I$(top_srcdir) -I.
+ # to omit stack protection symbol in object file
+ SHAREDCFLAGS=-fPIC -nostdlib  -D_SHARED_
+ SHAREDLDFLAGS=-nostdlib -shared
+-CYGWIN=$(findstring CYGWIN,$(shell uname))
+-ifeq ($(shell uname),Linux)
+-LDFLAGS=-lpthread -lrt -lm -lz -lasound 
++UNAME=$(shell uname)
++CYGWIN=$(findstring CYGWIN,$(UNAME))
++ifeq ($(UNAME),Linux)
++LDLIBS=-lpthread -ldl -lrt -lm -lz -lasound
+ else
+- ifeq ($(shell uname),FreeBSD)
+- LDFLAGS=-lpthread -lm -lz -lSDL
++ ifeq ($(UNAME),FreeBSD)
++ 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.22/Makefile
++++ softgun-0.22/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.22/printer/module.mk
++++ softgun-0.22/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.22/tools/Makefile
++++ softgun-0.22/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/metadata.xml b/app-emulation/softgun/metadata.xml
new file mode 100644
index 000000000000..a1d277727e3a
--- /dev/null
+++ b/app-emulation/softgun/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>arm@gentoo.org</email>
+		<name>Gentoo Linux ARM Development</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">softgun</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emulation/softgun/softgun-0.21.ebuild b/app-emulation/softgun/softgun-0.21.ebuild
new file mode 100644
index 000000000000..ceb15acaf31c
--- /dev/null
+++ b/app-emulation/softgun/softgun-0.21.ebuild
@@ -0,0 +1,32 @@
+# 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
+}
diff --git a/app-emulation/softgun/softgun-0.22.ebuild b/app-emulation/softgun/softgun-0.22.ebuild
new file mode 100644
index 000000000000..15758fcf1687
--- /dev/null
+++ b/app-emulation/softgun/softgun-0.22.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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=""
+
+DEPEND="media-libs/alsa-lib"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.22-make.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake install prefix="${D}/usr"
+	dodoc README configs/*.sg
+}