From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 22 Jan 2021 20:28:19 +0000
Subject: gentoo resync : 22.01.2021

---
 net-misc/liveice/Manifest                          |  3 +-
 net-misc/liveice/files/liveice-2000530-build.patch | 38 ++++++++++++++++++++++
 net-misc/liveice/liveice-2000530-r2.ebuild         | 18 +++++-----
 3 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 net-misc/liveice/files/liveice-2000530-build.patch

(limited to 'net-misc/liveice')

diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index 12926702f742..61158e5b7fb0 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,3 +1,4 @@
+AUX liveice-2000530-build.patch 1014 BLAKE2B ad5654c354de6ab5f17f647ad9ff754f6a658c54b09af6e6d16a3d1ecc83b4eafefc24b10b1e68c3d75c988b0a4910720fb3e8e4cd5c0d9aa9195649dd05abe4 SHA512 d10b1fc45a530f1d4c8bf8de249b6f5bc25370e243b7316ab0314b8f991057c1c677babb760dda8eb6b712cee327f056a7ddeb8d2f7ad9939cd1e869d543a573
 DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r2.ebuild 764 BLAKE2B 16a180483f6aa6eb7b84f55489554baaf062fd7b30faf52037e4c46f3f4c26b7e3c87661c82eb05dde4ad1ba4871a212573b72e667f629429198b417dc46f494 SHA512 ef914182851b028cd0bf9b98b45cb23028e83b957810b7f1f7d0784cc75e07a34f7a444c00e93eb399255493fd753a8fca89ab3c64e87f0477d9370783830188
+EBUILD liveice-2000530-r2.ebuild 639 BLAKE2B 5bc570e6b28550dcfbb40fae26ed5786874ddb3fa86738745132467569bb16280830152ccb8d27faa087ffc6411345095c999594524304655fc6e9656b7a34ff SHA512 e6e42f65a0f45fe200612770fc34c24dd46564e6a45ce921e64cd0cba46c14d6bf63a3e935c6ad19cf8049e2620dbdf957acceb83e2b5c5b311f2e6258556631
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/liveice/files/liveice-2000530-build.patch b/net-misc/liveice/files/liveice-2000530-build.patch
new file mode 100644
index 000000000000..14ab084c3d06
--- /dev/null
+++ b/net-misc/liveice/files/liveice-2000530-build.patch
@@ -0,0 +1,38 @@
+--- liveice/configure.in
++++ liveice/configure.in
+@@ -39,6 +39,7 @@
+ 
+ dnl Replace `main' with a function in -lresolv:
+ AC_CHECK_LIB(curses, refresh)
++AC_SEARCH_LIBS(nodelay, tinfo ncurses curses)
+ 
+ 
+ dnl Checks for header files.
+--- liveice/Makefile.in
++++ liveice/Makefile.in
+@@ -1,6 +1,6 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LDFLAGS = @LIBS@ 
++LIBS = @LIBS@ 
+ SHELL=/bin/sh
+ 
+ srcdir = @srcdir@
+@@ -18,7 +18,7 @@
+ 
+ DEFS = -I. @DEFS@
+ 
+-COMPILE_CFLAGS=$(CFLAGS) $(DEFS) 
++COMPILE_CFLAGS=$(CFLAGS) $(LDFLAGS) $(DEFS) 
+ 
+ .PHONY: clean distclean install installdirs
+ 
+@@ -33,7 +33,7 @@
+ 	rm -f Makefile configure config.log config.cache config.h config.status
+ 
+ liveice: setup.o streams.o encoders.o serverlib.o mpeg.o mixer.o display.o playlist.o wav.o audio_proc.o controls.o meta_data.o url.o liveice.h liveice.c 
+-	$(CC) $(COMPILE_CFLAGS) -o liveice $(OBJS) $(LDFLAGS) liveice.c
++	$(CC) $(COMPILE_CFLAGS) -o liveice $(OBJS) $(LIBS) liveice.c
+ 
+ setup.o: setup.c
+ 	$(CC) $(COMPILE_CFLAGS) -c -o setup.o setup.c
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild
index ab5dbb3d5095..9b714278e0a2 100644
--- a/net-misc/liveice/liveice-2000530-r2.ebuild
+++ b/net-misc/liveice/liveice-2000530-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Live Source Client For IceCast"
 HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
@@ -17,20 +17,18 @@ RDEPEND="media-sound/lame
 	media-sound/mpg123"
 DEPEND=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
 
 src_prepare() {
 	default
-	# cannot use LDFLAGS directly as the Makefile uses it for LIBS
-	sed -i Makefile.in \
-		-e 's|-o liveice|$(LLFLAGS) &|' \
-		|| die "sed Makefile.in"
+	eautoreconf
 	tc-export CC
 }
 
-src_compile() {
-	emake LLFLAGS="${LDFLAGS}"
-}
 src_install() {
 	dobin liveice
 	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
-- 
cgit v1.2.3