[gentoo-commits] repo/gentoo:master commit in: net-misc/ices/, net-misc/ices/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/ices/, net-misc/ices/files/

[Conrad Kostecki]

commit:     44c8a6eaceb96243e64b4f473b73d2972962cb36
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 13 19:14:12 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 20:55:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c8a6ea

net-misc/ices: drop old version

Closes: https://bugs.gentoo.org/781419
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/ices/files/ices.initd  | 17 -----------------
 net-misc/ices/ices-2.0.2.ebuild | 42 -----------------------------------------
 2 files changed, 59 deletions(-)

diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
deleted file mode 100644
index ada3b4943e2..00000000000
--- a/net-misc/ices/files/ices.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting IceS 2"
-	start-stop-daemon --background --start --pidfile /var/run/ices.pid --make-pidfile --exec /usr/bin/ices /etc/ices2/ices.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IceS 2"
-	start-stop-daemon --stop --pidfile /var/run/ices.pid --name ices
-	eend $?
-}

diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
deleted file mode 100644
index 34319a5138b..00000000000
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
-HOMEPAGE="https://icecast.org/ices/"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libshout-2
-	>=media-libs/libvorbis-1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup ices
-	enewuser ices -1 -1 -1 ices
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/ices2
-}
-
-src_install() {
-	default
-	insinto /etc/ices2
-	doins conf/*.xml
-	dohtml 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
-}

[gentoo-commits] repo/gentoo:master commit in: net-misc/ices/, net-misc/ices/files/

[Ionen Wolkens]

commit:     c09e4b7cfb3c84a29dd2c66beb30fb5128078088
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 19:52:48 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 20:44:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09e4b7c

net-misc/ices: fix build with clang/lld and upcoming clang-16

One configure test was broken with (any) clang/lld on multilib profiles
due to passing -L/usr/lib which led to underlinking wrt #740794.

For 16 it's the usual missing header, handled by adjusting the autoconf
test (revbumped in previous commit at same time for other compilers).

Closes: https://bugs.gentoo.org/740794
Closes: https://bugs.gentoo.org/870973
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 net-misc/ices/files/ices-2.0.2-gettimeofday.patch | 15 +++++++++++++++
 net-misc/ices/files/ices-2.0.2-libogg-test.patch  | 17 +++++++++++++++++
 net-misc/ices/ices-2.0.2-r2.ebuild                | 13 +++++++++++++
 3 files changed, 45 insertions(+)

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-r2.ebuild b/net-misc/ices/ices-2.0.2-r2.ebuild
index 5e79e9e7469a..4f8c7a6de887 100644
--- a/net-misc/ices/ices-2.0.2-r2.ebuild
+++ b/net-misc/ices/ices-2.0.2-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
 HOMEPAGE="https://icecast.org/ices/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
@@ -22,6 +24,17 @@ RDEPEND="
 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="${EPREFIX}"/etc/ices2
 }