commit: 9c0d4d7176d520fc1ebcf8ebc486b0f5d92b4d89
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 09:30:45 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 3 09:47:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0d4d71
net-misc/icecast: Fixed openrc init script shebang.
Converted ebuild to EAPI-6.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/{init.d.icecast-2 => icecast.initd} | 4 ++--
net-misc/icecast/icecast-2.4.2.ebuild | 2 +-
net-misc/icecast/icecast-2.4.3.ebuild | 22 ++++++++++++++--------
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/net-misc/icecast/files/init.d.icecast-2
b/net-misc/icecast/files/icecast.initd
similarity index 86%
rename from net-misc/icecast/files/init.d.icecast-2
rename to net-misc/icecast/files/icecast.initd
index bde5877..cb658a3 100644
--- a/net-misc/icecast/files/init.d.icecast-2
+++ b/net-misc/icecast/files/icecast.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
extra_started_commands="reload"
diff --git a/net-misc/icecast/icecast-2.4.2.ebuild
b/net-misc/icecast/icecast-2.4.2.ebuild
index 31271f7..225f05f 100644
--- a/net-misc/icecast/icecast-2.4.2.ebuild
+++ b/net-misc/icecast/icecast-2.4.2.ebuild
@@ -58,7 +58,7 @@ src_install() {
dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
dohtml -A chm,hhc,hhp doc/*
- newinitd "${FILESDIR}"/init.d.icecast-2 icecast
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
insinto /etc/icecast2
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild
b/net-misc/icecast/icecast-2.4.3.ebuild
index caecb9b..e14dda3 100644
--- a/net-misc/icecast/icecast-2.4.3.ebuild
+++ b/net-misc/icecast/icecast-2.4.3.ebuild
@@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit eutils autotools systemd user
+EAPI=6
+inherit autotools systemd user
DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg
(vorbis/theora) and aac streaming"
HOMEPAGE="http://www.icecast.org/";
@@ -32,11 +32,16 @@ pkg_setup() {
enewuser icecast -1 -1 -1 nogroup
}
-src_prepare() {
+PATCHES=(
# bug #368539
- epatch "${FILESDIR}"/${PN}-2.3.3-libkate.patch
+ "${FILESDIR}"/${PN}-2.3.3-libkate.patch
# bug #430434
- epatch "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+ "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
@@ -56,9 +61,10 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
- dohtml -A chm,hhc,hhp doc/*
+ docinto html
+ dodoc doc/*.html
- newinitd "${FILESDIR}"/init.d.icecast-2 icecast
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
insinto /etc/icecast2
@@ -74,7 +80,7 @@ src_install() {
diropts -m0764 -o icecast -g nogroup
dodir /var/log/icecast
keepdir /var/log/icecast
- rm -rf "${D}"/usr/share/doc/icecast
+ rm -r "${D}"/usr/share/doc/icecast || die
}
pkg_postinst() {
