gentoo auto-resync : 07:10:2022 - 01:22:59

4 files changed, 61 insertions, 8 deletions

diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index b7f0a692d796..8cb866147ef7 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,4 +1,6 @@
+AUX ices-2.0.2-gettimeofday.patch 524 BLAKE2B 11cf4f70c587b54b997ee10e87932ebcc2a4a3ed9d20a9a0754286aee5b0543d2521c7d937f6aa1be4b061674c885b8284658c99e1171d3883985c955893b475 SHA512 8e1b7e34db13c44e12189f3a788805fbde07f0ed8b430ed7d9f26fe8bdd77acdaaddbcbec21daf4039b5a769e5b113458255bb2235584d3dc5219dec793b0242
+AUX ices-2.0.2-libogg-test.patch 495 BLAKE2B 3912ffb0e4a124a836a4f22d9238014dc0d8ef298cb5866bc04458707def42d52ed63f33646817454120fd47bfaad181ea05064d6d68baa0833307b0591a89de SHA512 d43a998890a8fce58b9cca5ffe7d19878d1dd2a9d88984bcbe90271c4d8b60ad49078195edcf84b9994cbaeaad95bfb30467776bc5a4bb9a38a91e8eab40c51e
 AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
-EBUILD ices-2.0.2-r1.ebuild 835 BLAKE2B b3b27868fee36daa93078f030352758504ff9b60085fef4a1cbe73524c5ff2f7d83192832684f2f1f4bfe63f160daaeb884053796ca3a20804f0ed98a676705e SHA512 f95065d4985d16f908af3f15a316ef91705382e7de190464e0a63c851997f7fbfeb9896847cd7c85d8b8ddb661a1ad2122e0eebbd7d60635c796a57f86802855
+EBUILD ices-2.0.2-r2.ebuild 1056 BLAKE2B 0523357d4cc9ca020c523c7ec1a31f1fc88cfc28aab56612bb5a8c6328a63c8916a4f8b9402c2f8d218a9282afe6a44f3d797cc5832cacbfb4be694e02c47121 SHA512 ec36aa4e90b5e1e05a5ffb097356034da089c3b886c22fb8a5a585d0a642a742407f46454e0d91a6b53818e53384afaed2ade009ce0e8d32d8f1b2207c778b96
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/net-misc/ices/files/ices-2.0.2-gettimeofday.patch b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch
new file mode 100644
index 000000000000..ba5e7ca1c4a5
--- /dev/null
+++ b/net-misc/ices/files/ices-2.0.2-gettimeofday.patch
@@ -0,0 +1,15 @@
+Uses gettimeofday but won't include sys/time.h without HAVE_SYS_TIME_H
+leading to failure with -Werror=implicit-function-declaration (clang16).
+
+sys/timeb.h is for deprecated ftime() and should not be used.
+
+https://bugs.gentoo.org/870973
+--- a/configure.in
++++ b/configure.in
+@@ -51,5 +51,5 @@
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([stropts.h sys/timeb.h sys/select.h])
++AC_CHECK_HEADERS([stropts.h sys/time.h sys/select.h])
+ 
+ dnl ================================================================
diff --git a/net-misc/ices/files/ices-2.0.2-libogg-test.patch b/net-misc/ices/files/ices-2.0.2-libogg-test.patch
new file mode 100644
index 000000000000..78a334b93096
--- /dev/null
+++ b/net-misc/ices/files/ices-2.0.2-libogg-test.patch
@@ -0,0 +1,17 @@
+clang/lld will try to use the given -L/usr/lib + 32bit files and potentially
+fail the the test on 64bit, carries on but leads to ogg underlinking.
+
+Quickfix, ideally this should use pkg-config and hard-fail if not found.
+
+https://bugs.gentoo.org/740794
+--- a/m4/ogg.m4
++++ b/m4/ogg.m4
+@@ -24,8 +24,4 @@
+ fi
+ 
+-XIPH_GCC_WARNING([-I$ogg_prefix/include],,
+-    [ OGG_CFLAGS="-I$ogg_prefix/include"
+-      OGG_LDFLAGS="-L$ogg_prefix/lib"
+-      ])
+ AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
+ [dnl
diff --git a/net-misc/ices/ices-2.0.2-r1.ebuild b/net-misc/ices/ices-2.0.2-r2.ebuild
index 001620dd1b72..4f8c7a6de887 100644
--- a/net-misc/ices/ices-2.0.2-r1.ebuild
+++ b/net-misc/ices/ices-2.0.2-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
 HOMEPAGE="https://icecast.org/ices/"
@@ -15,25 +17,42 @@ RDEPEND="
 	acct-group/ices
 	acct-user/ices
 	dev-libs/libxml2
-	>=media-libs/libshout-2
-	>=media-libs/libvorbis-1
-"
+	media-libs/alsa-lib
+	media-libs/libogg
+	media-libs/libshout
+	media-libs/libvorbis"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libogg-test.patch
+	"${FILESDIR}"/${P}-gettimeofday.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf #740794,870973
+}
+
 src_configure() {
-	econf --sysconfdir=/etc/ices2
+	econf --sysconfdir="${EPREFIX}"/etc/ices2
 }
 
 src_install() {
 	default
+
 	insinto /etc/ices2
 	doins conf/*.xml
+
 	docinto html
 	dodoc doc/*.{html,css}
+
 	newinitd "${FILESDIR}"/ices.initd-r1 ices
+
 	keepdir /var/log/ices
 	fperms 660 /var/log/ices
 	fowners ices:ices /var/log/ices
-	rm -rf "${D}"/usr/share/ices
+
+	rm -r "${ED}"/usr/share/ices || die
 }