gentoo resync : 28.04.2018

5 files changed, 60 insertions, 50 deletions

diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest
index 86f600d451bd..4e5efd348f38 100644
--- a/games-arcade/sdl-sopwith/Manifest
+++ b/games-arcade/sdl-sopwith/Manifest
@@ -1,5 +1,6 @@
-AUX sdl-sopwith-1.7.5-nogtk.patch 972 BLAKE2B 291d51ad0f4d12acb4773ea13b817875886cc78f3e0d0d2278a1c95a5989f6837ae1f0dbda689c4c5f28b70462250a8e38da33ccfdf7459587f1f0e456593581 SHA512 2ae4ae6ace64af55d46fe543c7573d5306c1c410e0e21c6ab58cb893cdb79c8c5e6ac49a4203671c3697c2590d85f0e6d776ae43ed29a76acf2e6669efa81c17
-AUX sdl-sopwith-1.7.5-video-fix.patch 670 BLAKE2B f7dadaefaf9e9c992459dee597a1e2ad069f46a4bbc2f210af2e6d3b04c0a005889375550fa43d4a55dbd98ad72d94a0bdb58322f452c0cb77a1864181267b2e SHA512 0ecfd8c7cd3161c1b398a27330e4ce26d52e8c42add2ab0bade235d41c716a522eb7499f2960a2ce0748585045b15f5580054acddf5f8707d6f4552d4db7c701
+AUX sdl-sopwith-1.7.5-nogtk.patch 984 BLAKE2B 7478a4ef1b23322f9a89209223dca44c7e663e1530d2ae74eac7f7b72e7435ed28dbe6cf866aa0555c23b98d396f1e1b2c303a578dfe963b1d417bfbefcd6dc8 SHA512 10340a42b1da8e633505f9273976ab781e22529090f55932402fd3ff58c493c32cb66ebd5196f65a832cb6d0d98b941010670b74e2af202f2f6352e4fb6e1f18
+AUX sdl-sopwith-1.7.5-video-fix.patch 674 BLAKE2B d89107969ab7e8c97f460e49bd40cae2b9ba52d3c67905d83bbcf5c155ea68bcf0be0661617cedb79795be5247d780f890e9d92f645be360aa1b1f06c09bf0c3 SHA512 024958855d22d038fc9b00d1daa311360211b2b1f3510f0c2dbe43104a2aee8907a764bb2b11b0d367b248bafc7a4a4afebdf6fe116430733ba8ffb7ba6917ef
 DIST sopwith-1.7.5.tar.gz 280883 BLAKE2B 57a2d6cf90d1bba1ac5dedbcebaa7b2f58004cee1ee7682d43be800184809e7949603490e93944d8aa1e4b9e6d33f24a9bdb386dadda945b9f9f3b9c4e8ed48c SHA512 ea78706d0190648be269142a29d10340c5181563959b0a329b802b9d9128a9dcb1e01760737269ec22883adf5b6c02c5049c8fc7b44e4eaa9f381b87abc7acae
-EBUILD sdl-sopwith-1.7.5-r1.ebuild 832 BLAKE2B 1977b93505b3a92c0713ce7c0939b23970f6a21b7f309416c7053b218e03384152654cdd568cc65a81fca132bfcdd4cf019e879503cff9802fb7c81118264baf SHA512 ee457bbda4ff3e359aab95b2130154008ee5726ab19e3db72d4b7127d6aa4b935b8fb75773c8985c7a5abce3c8a4789ed14b60c3388065cb189351cf7b17cee4
+DIST sopwith.png 675 BLAKE2B a380311db8861a75d8cbb035616523d1a21a220be758bda931340f65d658af0e844b0247e478da746d654249cd7a28ab9b681fc82b9798f909b379f38242d03f SHA512 7bcfec11930a623ff9077203640b4415e222570d32ffecdb943f5c78ed8fb11db4fefa42298b895c4aa29b46f963a82cdb90492beaf89a04d119e6e756f5ec57
+EBUILD sdl-sopwith-1.7.5-r2.ebuild 1033 BLAKE2B ec5a77ad3b6d2fb76c14ddc64d11672e278282a1d314a53079c5b2a52487defbad1d305ef84d8dd8176414c50a7ea77faac0c9d124e3db7f9903fe47d9edb544 SHA512 239d6a09d3eb99b044e51fc5c7bed5d7d9ae27a5dc879a38a48490da67cb65f893ee981c18552ed4de723ee752568618ef27adf84a78f38b6e8e759194986574
 MISC metadata.xml 334 BLAKE2B 42211acca53017e9d0c385214962d41899d10fdc4af43e7c016bb729d1576569bbd9ebb00ee1c41655283ffe0d8ae411fb121b51ab15f3ad32285bb7b310698f SHA512 3f9e062ee8d945112f164669980a7c8a8bf5982c6f0f889d100319b7959564752502b6a7b6cc30665829f6865e0f0a81a083cbf462182f5918e9386e6aafca39
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
index e4fb1715d8d4..a5dbc59f3c72 100644
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
+++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
@@ -1,5 +1,5 @@
---- configure.in.old
-+++ configure.in
+--- a/configure.in.old
++++ b/configure.in
 @@ -61,11 +61,6 @@
  	SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl"
  ],)
@@ -21,8 +21,8 @@
  
  dnl generate Makefiles
  
---- src/Makefile.am.old
-+++ src/Makefile.am
+--- a/src/Makefile.am.old
++++ b/src/Makefile.am
 @@ -6,7 +6,7 @@
  bin_PROGRAMS = @SOPWITH_BINS@
  EXTRA_PROGRAMS = sopwith gtksopwith psopwith
@@ -32,8 +32,8 @@
  
  COMMON_SRC =       \
  video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- src/sdl/Makefile.am.old
-+++ src/sdl/Makefile.am
+--- a/src/sdl/Makefile.am.old
++++ b/src/sdl/Makefile.am
 @@ -1,4 +1,4 @@
 -CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
 +AM_CFLAGS = @SDL_CFLAGS@ -I..
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
index feab635518f1..e9da16c43905 100644
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
+++ b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
@@ -1,8 +1,8 @@
 Upstream patch: fix segfault while video device detection.
 Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504
 
---- src/sdl/video.c.orig	2013-02-21 11:48:57.000000000 -0400
-+++ src/sdl/video.c	2013-02-21 11:49:35.000000000 -0400
+--- a/src/sdl/video.c.orig	2013-02-21 11:48:57.000000000 -0400
++++ b/src/sdl/video.c	2013-02-21 11:49:35.000000000 -0400
 @@ -364,11 +364,17 @@
  	int n;
  	int w, h;
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
deleted file mode 100644
index b6d2a802bccb..000000000000
--- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools toolchain-funcs games
-
-MY_P=${P/sdl-/}
-DESCRIPTION="Port of the classic Sopwith game using LibSDL"
-HOMEPAGE="http://sdl-sopwith.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.3[video]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm acconfig.h
-	epatch "${FILESDIR}"/${P}-nogtk.patch
-	# bug 458504
-	epatch "${FILESDIR}"/${P}-video-fix.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt
-	rm -rf "${D}/usr/games/share/"
-	prepgamesdirs
-}
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
new file mode 100644
index 000000000000..72ea6fb30eba
--- /dev/null
+++ b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop toolchain-funcs
+
+MY_P="${P/sdl-/}"
+DESCRIPTION="Port of the classic Sopwith game using LibSDL"
+HOMEPAGE="http://sdl-sopwith.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	https://src.fedoraproject.org/rpms/sopwith/raw/master/f/sopwith.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.1.3[video]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm acconfig.h || die
+
+	eapply "${FILESDIR}"/${P}-nogtk.patch
+	# bug 458504
+	eapply "${FILESDIR}"/${P}-video-fix.patch
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt
+	rm -rf "${ED}/usr/share/doc/sopwith"
+
+	newicon "${DISTDIR}"/sopwith.png ${PN}.png
+	make_desktop_entry sopwith "Sopwith" ${PN}
+}