gentoo resync : 05.12.2021

3 files changed, 62 insertions, 0 deletions

diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 6181413ce8b1..55e066d32c67 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -1,6 +1,8 @@
 AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683fb58c04fe3bf6f4fb6fd02ed98b7c8d2e4f5a768366bfec66a9d77b9575a7ce08fb68c526d69e922b758191a06c7dc SHA512 cc6daffb087df7cd75986de69240e19a762db8a8c42621d1b8b5fe869bdabe676e3748b2387212362eb2854d7f7dd74bd085671372d453eecaa8cd38f91962d0
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
+AUX tdfsb-0.0.10-void-return.patch 527 BLAKE2B 8632b350581b0f0e1c2b2fd0e8fbe46bcbff4db2e301d8a8c6cc2d57221b597e4851727441f15e02fa2d1e32bfbac0f68f02a05f4b8ca42cb6fe2d39366e4a72 SHA512 9e0dc3a212bc2f85460e2427694fd1470641fd98d295de20134a2570d09d5e827e0dc518e6d23e816c32b046c6a7b786dbfdd5045f20aa8647f021df5e57e824
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
 EBUILD tdfsb-0.0.10-r1.ebuild 912 BLAKE2B 443a10a1f4d1c809a7621825dfff9c971c1e0605d9e4e202ddc66ea05948b721663ded0b0544bb3ae058d218f0e9616f79b4fd531aea366627940fb7055be480 SHA512 663d753dedbee16270eb526f8f3f6b425b475fb8f3288fc523d506054c10fcef32d0ac9e8e3a5f80bc7c39095870286cc7270ef75e8d0d5bebc6aa3ad30bd453
+EBUILD tdfsb-0.0.10-r2.ebuild 949 BLAKE2B dd4c7d4a78ddc0aacadd17705fa8f6143f7d198d235551c57de3f4f113f45d4c25b9e3dcc46af4ad0d0d9097db3d43460d966d08bee4b777ead897d9517008cf SHA512 7f0fc7f5c80b09ef24399a6637fd6d10243fd12ce45266f49e5150e4abee07330e1394537f61c9fe202d54afc92d73741172f5b53945453d0f17177b35209172
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
new file mode 100644
index 000000000000..f092363f01cd
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-void-return.patch
@@ -0,0 +1,13 @@
+As the code below the altered block shows, this was redundant to begin with.
+
+--- a/tdfsb.c
++++ b/tdfsb.c
+@@ -2794,8 +2794,6 @@
+                             else
+                             {
+                                 strcpy(TDFSB_CURRENTPATH,temp_trunc);        
+-                                TDFSB_FUNC_IDLE=nullDisplay; TDFSB_FUNC_DISP=noDisplay; 
+-                                return;
+                             }
+ 			    TDFSB_FUNC_IDLE=nullDisplay;
+                             TDFSB_FUNC_DISP=noDisplay;
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
new file mode 100644
index 000000000000..cae3e543ef20
--- /dev/null
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SDL based graphical file browser"
+HOMEPAGE="https://www.determinate.net/webdata/seg/tdfsb.html"
+SRC_URI="https://www.determinate.net/webdata/data/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/freeglut
+	media-libs/sdl-image
+	media-libs/smpeg
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-debugging.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-void-return.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "s|-O2|${CFLAGS} ${LDFLAGS}|" \
+		-e "s:gcc:$(tc-getCC):" "${S}"/compile.sh || die
+}
+
+src_compile() {
+	./compile.sh || die "compile failed"
+}
+
+src_install() {
+	dobin tdfsb
+	dodoc ChangeLog README
+}