gentoo resync : 17.07.2021

3 files changed, 12 insertions, 33 deletions

diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 8f61d2eb07fb..82f32c5e4b9c 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,5 +1,4 @@
-AUX ices.initd 328 BLAKE2B c2084fe4a4885cddc5b5c449144029575889801dff93cbb41933341a07eefc39731b66d749ebec24cdf077163211e490ad8e92c66efe6c4e489b5d78a3f91a4c SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282
 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.ebuild 861 BLAKE2B d29f4dd5774c568ea6d180621f971bc01c09788bddfa67b3e12b70926ba71546afaedb24c0995497996ceb114a85d8d9fba788d70486278e607f09393248b352 SHA512 30755da6e5409c9f61f79f27938e6fe4f044a13fa667e7901f7bb2824faa596a4b507e033a65405192884b76e6e891f89c957209d37b12ba64c489a6016e20ba
+EBUILD ices-2.0.2-r1.ebuild 835 BLAKE2B b3b27868fee36daa93078f030352758504ff9b60085fef4a1cbe73524c5ff2f7d83192832684f2f1f4bfe63f160daaeb884053796ca3a20804f0ed98a676705e SHA512 f95065d4985d16f908af3f15a316ef91705382e7de190464e0a63c851997f7fbfeb9896847cd7c85d8b8ddb661a1ad2122e0eebbd7d60635c796a57f86802855
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
deleted file mode 100644
index ada3b4943e28..000000000000
--- 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-r1.ebuild
index 34319a5138bc..001620dd1b72 100644
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ b/net-misc/ices/ices-2.0.2-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit user
+EAPI=7
 
 DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
 HOMEPAGE="https://icecast.org/ices/"
@@ -12,18 +10,16 @@ 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
+RDEPEND="
+	acct-group/ices
+	acct-user/ices
+	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
-}
+	>=media-libs/libvorbis-1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf --sysconfdir=/etc/ices2
@@ -33,7 +29,8 @@ src_install() {
 	default
 	insinto /etc/ices2
 	doins conf/*.xml
-	dohtml doc/*.{html,css}
+	docinto html
+	dodoc doc/*.{html,css}
 	newinitd "${FILESDIR}"/ices.initd-r1 ices
 	keepdir /var/log/ices
 	fperms 660 /var/log/ices