gentoo resync : 21.08.2021

6 files changed, 36 insertions, 47 deletions

diff --git a/games-arcade/opentyrian/Manifest b/games-arcade/opentyrian/Manifest
index fcfb985acc07..1f17fe244912 100644
--- a/games-arcade/opentyrian/Manifest
+++ b/games-arcade/opentyrian/Manifest
@@ -1,7 +1,7 @@
-AUX 2.1.20130907-cflag-idiocy.diff 583 BLAKE2B 2b0da43af2c1ccb5f508573413d1c047186c8d596bd709aefcdee1fe79936774e1c1c01863bffeed6e1c5506f2897021c5f70988cef59d6c1d7397b8150b5f4e SHA512 fd12ebaabd2191baa248019b122acad205f1803b0abde19ae54d410550529bff93d42dfe26543d295efe3b4c6cd74e1d77681467dc8321832561b07bda92d9c4
-AUX 2.1.20130907-datapath.diff 886 BLAKE2B a388fdbe60a5c1abb4bea213af34854e470b80f2648352e9be0beec88081450e04069da5bfc5b817a720e5fd6a98f5643695b9e5dd9823ce7397da4b0349075b SHA512 dcc5bf8e1c1384e7615112bf60f317f8bd3bae11e1fff1bce80a8a638fc6b719f4787f69d01f64dab2aecab4ef3007cb708e1b2891b6cb7c6213b2d495924d2a
-AUX 2.1.20130907-gcc10.patch 12090 BLAKE2B c15003d42e00d057470b655581ba299ee8e3c2e681a025a4c670479dba6016ef98c5db8def4845fe01acfe5c73d1ae3412b3b90969c5b02c3bfc161a0de99e28 SHA512 89d25a1a01e71f18487a27ca0d6665478d4d037f6008d3fa0d96d583124f03be4d9b7f97eaacd6fa46173b3ccee047dc258b0a247c0464693d4ee278a7636924
+AUX opentyrian-2.1.20130907-cflags.patch 381 BLAKE2B 7b3132b2441273ce7cc3210c9b35363065f8bf473a0687e4f8af2501a5942d566d7de06b8802c940d4e0dc1cede5b4fc22f4f2a0b9a26725f890ddf3126b1240 SHA512 30f38c3d89ab1ec2afdfc5cebfa18c9d277e00e24a001bf1f18f7a7b85ebc50c73cf8176d2cfcc1a71cf1484e4504b7b2b5961d13789315153d9e309c638e634
+AUX opentyrian-2.1.20130907-datapath.patch 478 BLAKE2B 3757ef355bd97f89835ee7e47174f5bfd4955ff051f187a898cd41b042c77d100d056bfc4601c08edc211fa859d5aa93a2048dbe09b65adf66b2bcd858199c07 SHA512 7411458e9782eb9d108a5489f755fad119be400789e9898ff60c240aece93709ab442cb0b3580143e9fb72565123673cc7deb5a8346cee1113f01ec5d933da47
+AUX opentyrian-2.1.20130907-gcc10.patch 11759 BLAKE2B a55047a54154d71d65b76f327a29a23e7fb84b53010e33381d7dff82f7f760bca55b11b390f4d6c02b966fc212475de70e218496d2d3b8641b446c25ab795de7 SHA512 a55a5bccba9221db0401610b586931e8822a20a330335e9446e49b0a87ca9bd28165b245270e2742bd72952822a79c869247368f63d4710c2d898c13a2eb8129
 DIST opentyrian-2.1.20130907-src.tar.gz 297517 BLAKE2B 9d6d357cdda59da22ed039be0a5038cf744045dcb30fe0528137a5ac70a4cd512b24eeee3fe233b4ff2a819bf2aa4187e5109d88c72d18db7e1d64e8ad8db5d8 SHA512 1a560f2061496fbbb57b6334ab207b00a6b2e6a4d6164c6df6ad535ae9d0435c32c3db51d3ce2a0a79eb66d72723d112c1993f59b781750f9bd97afb643a0b67
 DIST tyrian21.zip 4754048 BLAKE2B 6bef66fbc34a4d2d865fe7088a6942a29348153d0d10347860952a152b882fd9eef1748fbfa9fd32d030593d2f8c21e1cd227dd6ca540488ba5093b95a95fb33 SHA512 639aa773778386c14ce508feb4729512d00f80182a3bb0fe8bba4ee38bce91da1867ca93f1a7e5e30ff127da077eed275d8dd6ba82042b627b84f1606e2d6bce
-EBUILD opentyrian-2.1.20130907-r2.ebuild 1293 BLAKE2B 8a840fde51696b720c92da68e9c5f7fc6570f0545fa82920f10695ced01b9787f9fdcb1729fd8fa5eb1162677830ef31b3d8ed6ca118dfaf9a013f9260f261d4 SHA512 bb96aa8b47bde5cedb1c3d4d0fbd92e32c9a81ce265752c97a4affbca8f212780a70399ebaf5914b1a223fe045d9ecbba81eb04363b7c7259e646b1d00b4f73c
+EBUILD opentyrian-2.1.20130907-r3.ebuild 1296 BLAKE2B 8ee3f2d8f05f69b72f5cd08bb5a2908ffe737fe081cea59b37053c2088d051ea35ad65c2e85582570b4dbb4e83e2a01c8c74b2c4b2d63426a8e7c857ca11f664 SHA512 0171020bc5ff84ec8b67c94ad0f4544025ee14ed23fd33ba6810f56f222bb711665c741059b41ce4951191dce054be801df154e5cdd431fc91528a44e6385b14
 MISC metadata.xml 349 BLAKE2B 7cfb26abb3fdecbe6212017ab12564d5b761c55e9bc3b007713e60b5aa34da14ff39b6c509e0617f951e56304f1b76bad14d3866712ee028cc23b6d090725db4 SHA512 6bad0ede531b7c8b77a21c749de3b4b32ce6ee111bf3fb00536b9075239ef458c036e57303f1a6a6bb9c6e730fa19c0a12ffec4eef384a0a24002cfdaae18ef5
diff --git a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff b/games-arcade/opentyrian/files/2.1.20130907-datapath.diff
deleted file mode 100644
index 5b0143ed9a50..000000000000
--- a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile
---- opentyrian-2.1.20130907.ORIG/Makefile	2013-12-08 17:40:23.470846371 +0000
-+++ opentyrian-2.1.20130907/Makefile	2013-12-08 17:40:49.355847165 +0000
-@@ -49,6 +49,10 @@
- ALL_LDFLAGS += $(LDFLAGS)
- LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS)
- 
-+ifneq ($(DATA_PATH), )
-+	CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
-+endif
-+
- # RULES ####################################################
- 
- .PHONY : all release clean
-diff -uNr opentyrian-2.1.20130907.ORIG/src/file.c opentyrian-2.1.20130907/src/file.c
---- opentyrian-2.1.20130907.ORIG/src/file.c	2013-12-08 17:40:23.468846371 +0000
-+++ opentyrian-2.1.20130907/src/file.c	2013-12-08 17:40:49.355847165 +0000
-@@ -34,7 +34,7 @@
- #ifdef TARGET_MACOSX
- 		tyrian_game_folder(),
- #endif
--		"/usr/share/opentyrian/data"
-+		DATA_PATH
- 	};
- 	
- 	static const char *dir = NULL;
diff --git a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-cflags.patch
index 39ccf1c79f66..3654e22ef45e 100644
--- a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff
+++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-cflags.patch
@@ -1,6 +1,5 @@
-diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile
---- opentyrian-2.1.20130907.ORIG/Makefile	2013-12-08 17:38:06.982842189 +0000
-+++ opentyrian-2.1.20130907/Makefile	2013-12-08 17:38:26.843842798 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -21,11 +21,6 @@
  
  # FLAGS ####################################################
diff --git a/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch
new file mode 100644
index 000000000000..8ebf427d0797
--- /dev/null
+++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-datapath.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -49,6 +49,10 @@
+ ALL_LDFLAGS += $(LDFLAGS)
+ LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS)
+ 
++ifneq ($(DATA_PATH), )
++	CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
++endif
++
+ # RULES ####################################################
+ 
+ .PHONY : all release clean
+--- a/src/file.c
++++ b/src/file.c
+@@ -34,7 +34,7 @@
+ #ifdef TARGET_MACOSX
+ 		tyrian_game_folder(),
+ #endif
+-		"/usr/share/opentyrian/data"
++		DATA_PATH
+ 	};
+ 	
+ 	static const char *dir = NULL;
diff --git a/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-gcc10.patch
index 5b0c911a2ac2..6f0bfcf64cf3 100644
--- a/games-arcade/opentyrian/files/2.1.20130907-gcc10.patch
+++ b/games-arcade/opentyrian/files/opentyrian-2.1.20130907-gcc10.patch
@@ -4,13 +4,6 @@ Date: Sun, 14 Jun 2020 14:11:00 -0600
 Subject: [PATCH] Move definitions that don't need to be exposed from opl.h to
  opl.c
 
----
- src/opl.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++-
- src/opl.h | 157 ++----------------------------------------------------
- 2 files changed, 154 insertions(+), 156 deletions(-)
-
-diff --git a/src/opl.c b/src/opl.c
-index a4071c5..f15474c 100644
 --- a/src/opl.c
 +++ b/src/opl.c
 @@ -23,12 +23,161 @@
@@ -177,8 +170,6 @@ index a4071c5..f15474c 100644
  
  static Bit32u generator_add;	// should be a chip parameter
  
-diff --git a/src/opl.h b/src/opl.h
-index c8e643b..cbb56ad 100644
 --- a/src/opl.h
 +++ b/src/opl.h
 @@ -25,11 +25,8 @@
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r3.ebuild
index 74fce946ff85..1161edc3135f 100644
--- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r2.ebuild
+++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,19 +14,20 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/libsdl[video]
+DEPEND="media-libs/libsdl[joystick,video]
 	media-libs/sdl-net"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
 PATCHES=(
-	"${FILESDIR}/${PV}-datapath.diff"
-	"${FILESDIR}/${PV}-cflag-idiocy.diff"
-	"${FILESDIR}/${PV}-gcc10.patch"
+	"${FILESDIR}/${P}-datapath.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-gcc10.patch"
 )
 
 src_prepare() {
 	default
+
 	rm "${WORKDIR}"/tyrian21/{*.exe,dpmi16bi.ovl,loudness.awe} || die "Failed to remove win32 binaries"
 }