gentoo resync : 23.09.2020

4 files changed, 68 insertions, 21 deletions

diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
index 3111557b5072..141c63bb3889 100644
--- a/dev-embedded/dc-tool-ip/Manifest
+++ b/dev-embedded/dc-tool-ip/Manifest
@@ -1,5 +1,6 @@
-AUX 1.0.4-bfd-update.patch 909 BLAKE2B 02a5b3be9db1c98e01cbda6e75de14bcefa4c8abb4400855be4effa046adfd6382612a1c4c33d2999b8eca45aec40256dcf3c7d864947c3174fe6688a7a092d7 SHA512 a1a24436104012ec5c56028dd4f7b16d9bcf23923d64d3ba14fd9a6b413770d1ccaaa91d56f62e49afbe77bfb0fdc3bb4eeba12d24b547f0f8598a4f3f6ceb8c
+AUX dc-tool-ip-1.0.4-bfd-update.patch 836 BLAKE2B 3922fa68372b32793007615cdd4a87c7ae09692940781933c8246843795c8a6b7d6b1de1dd60c7130274c7ac9e097f18fab98a256965f9a765a335cc7e1a75ff SHA512 6e63013efc503e68a80d5e0911d74813b8ea18607f4740111e3da1b535b464437085a0f358ded4b640c8d9e5e81ebe7cf8a0fd50dc211d8739fca95f3c668d7d
 AUX dc-tool-ip-1.0.4-headers.patch 487 BLAKE2B bfe1eee99d73a0a37428fa8015f3b073762b3f295f83066de09e3cf7efd00aa904d16c9f1cd111be7c8eaa41c755a93024fa8e0210f87d7f4be09c0181a1eb31 SHA512 a83b3d0f214de12fc25ef250f106e325d39e78afacb56db31a7f4c6033e8c848b934260c589967cb6fe1751ca401584b1b66f3593b4cbc2d7c2bcc108d8ab4c2
+AUX dc-tool-ip-1.0.4-makefile.patch 1125 BLAKE2B 5a60e4257d1fe420855b33dbd66db0a9ed389b85563ff6d3c9cd0e11735e30842cd1ff24ab0dd7186f782a54065a4d74c238241c17b7359b86bcc61ef9429fd1 SHA512 7007f4f7e5f0e2eb02b7188e5cbfe2f92b3ab0ffb48883570cc80de21423bf7a50d7e14967d97b217fa0d04152e3b9b81f4f508cdbc94975573c2e2357e16b5d
 DIST dcload-ip-1.0.4-src.tar.gz 104758 BLAKE2B 4c8c52077b047da81341a133272a5569de9e6b304942c181da01a617a00243ace2847bbd380ac723710d91dc43d6de134d3a34e083ef9fa61471ba49ce5021f3 SHA512 c58f574bf13dd44a00395060af4c718593471242366d09dddb234490d20a6e0322a2c3853613aa1c8a5269802cf6434407d3f6c62c934e8b66f8fc1e86a12536
-EBUILD dc-tool-ip-1.0.4.ebuild 970 BLAKE2B 58708d998ae1c0eb9cdb8d839d457dba421d6df4f43d5c01e4e2bf14910445db7530db58afff29bb5bda61491657646e7fd6d7c2fa849c755d86960a9d993539 SHA512 3d1960b451f08bb823f5755c2c1d3298579bb1edcc0d9a3f3e2f7df7264fa02b3fbce3a4265d33f2e8ed27a1760086ca6247f1b2ab0bd77bddc1d49d9480bd53
+EBUILD dc-tool-ip-1.0.4.ebuild 840 BLAKE2B 75623e288bfc987893e1e4717e8332edaea1e2ccc6f23afd0322389ceb8ea0208bb446f36a6b117ca3ebb192e657ce55060397f80801ce85b3ea34c1bcfa39bb SHA512 57bd72222ab622f0f90d4bbf62cc3c2581a80f920857cd14f15d25db927681dd38e24c4ccbf1fc593adb23e8c9fc8f5fac0dcec6705af395fbb4f608f4f1b12e
 MISC metadata.xml 328 BLAKE2B 9964bd2ac60606daf86e3106759f41dcc9475b4f4b5f4c8d3cd4b673c9565bac27b364fafeb5d54053dc548afa784f166a846ef6f7f517d8460a41d3c699b4ab SHA512 fb2b6c7f3cd9c73e6ddbeb92effeeb1d6a2a58884eae0ea33913227403f1fbeda9b9691ec09f0f1f89e092e4f669b43a2e056008ecc397eaec0c9534e6fa49a3
diff --git a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
index fc9a8492d5ea..ff03cd024553 100644
--- a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
+++ b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="ethernet program loader for the Dreamcast"
+DESCRIPTION="Ethernet program loader for the Dreamcast"
 HOMEPAGE="http://cadcdev.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cadcdev/dcload-ip-${PV}-src.tar.gz"
 
@@ -14,18 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-S=${WORKDIR}/dcload-ip-${PV}
+RDEPEND="sys-libs/binutils-libs"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-bfd-update.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
+S="${WORKDIR}/dcload-ip-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bfd-update.patch
+	"${FILESDIR}"/${P}-headers.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
+
+src_configure() {
+	tc-export CC
 	append-cppflags -DPACKAGE -DPACKAGE_VERSION #465952
-	sed -i \
-		-e "/^HOSTCC/s:gcc:$(tc-getCC):" \
-		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e 's:-L/usr/local/dcdev/lib:$(LDFLAGS):' \
-		-e 's:/usr/local/dcdev/include:.:' \
-		Makefile.cfg || die "sed"
 }
 
 src_compile() {
@@ -34,9 +36,8 @@ src_compile() {
 
 src_install() {
 	dobin host-src/tool/dc-tool
+
 	dodoc README NETWORK CHANGES
 	dodoc -r make-cd
-	if use doc ; then
-		dodoc -r example-src
-	fi
+	use doc && dodoc -r example-src
 }
diff --git a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-bfd-update.patch
index 62da02f12e98..2b3b32d7e3f4 100644
--- a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch
+++ b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-bfd-update.patch
@@ -1,5 +1,5 @@
---- host-src/tool/dc-tool.c.orig	2004-11-13 19:38:50.007151024 -0500
-+++ host-src/tool/dc-tool.c	2004-11-13 19:38:58.320887144 -0500
+--- a/host-src/tool/dc-tool.c
++++ b/host-src/tool/dc-tool.c
 @@ -431,13 +431,13 @@
  		if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_LOAD)) {
  		    printf("Section %s, ",section->name);
diff --git a/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch
new file mode 100644
index 000000000000..ae902dcc2a6b
--- /dev/null
+++ b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-makefile.patch
@@ -0,0 +1,45 @@
+--- a/host-src/tool/Makefile
++++ b/host-src/tool/Makefile
+@@ -1,18 +1,13 @@
+ include ../../Makefile.cfg
+ 
+-CC	= $(HOSTCC)
+-CFLAGS	= $(HOSTCFLAGS) -DDREAMCAST_IP=\"$(DREAMCAST_IP)\" -DHAVE_GETOPT
+-INCLUDE	= -I$(BFDINCLUDE)
++CPPFLAGS += -DDREAMCAST_IP=\"$(DREAMCAST_IP)\" -DHAVE_GETOPT
+ 
+ OBJECTS	= dc-tool.o syscalls.o
+ 
+-.c.o:
+-	$(CC) $(CFLAGS) $(INCLUDE) -o $@ -c $< 
+-
+ all: dc-tool
+ 
+ dc-tool: $(OBJECTS)
+-	$(CC) -o $@ $(OBJECTS) $(BFDLIB)
++	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(BFDLIB)
+ 
+ .PHONY : install
+ install: dc-tool
+--- a/Makefile.cfg
++++ b/Makefile.cfg
+@@ -8,8 +8,8 @@
+ # the ones in your system
+ 
+ # these must point to your sh-elf bfd, not the system one
+-BFDLIB		= -L/usr/local/dcdev/lib -lbfd -liberty
+-BFDINCLUDE	= /usr/local/dcdev/include
++BFDLIB		= -lbfd -liberty
++BFDINCLUDE	= 
+ 
+ # cygwin
+ # these must point to your sh-elf bfd, not the system one
+@@ -24,7 +24,7 @@
+ 
+ # you generally shouldn't change this unless you are making forked
+ # versions (or test versions)
+-VERFLAGS	= -DDCLOAD_VERSION=\"1.0.4\"
++CPPFLAGS += -DDCLOAD_VERSION=\"1.0.4\"
+ TARGETCFLAGS	+= $(VERFLAGS)
+ HOSTCFLAGS	+= $(VERFLAGS)
+