| 1 |
commit: 9c0d4d7176d520fc1ebcf8ebc486b0f5d92b4d89 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 09:30:45 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 09:47:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0d4d71 |
| 7 |
|
| 8 |
net-misc/icecast: Fixed openrc init script shebang. |
| 9 |
|
| 10 |
Converted ebuild to EAPI-6. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/{init.d.icecast-2 => icecast.initd} | 4 ++-- |
| 16 |
net-misc/icecast/icecast-2.4.2.ebuild | 2 +- |
| 17 |
net-misc/icecast/icecast-2.4.3.ebuild | 22 ++++++++++++++-------- |
| 18 |
3 files changed, 17 insertions(+), 11 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-misc/icecast/files/init.d.icecast-2 b/net-misc/icecast/files/icecast.initd |
| 21 |
similarity index 86% |
| 22 |
rename from net-misc/icecast/files/init.d.icecast-2 |
| 23 |
rename to net-misc/icecast/files/icecast.initd |
| 24 |
index bde5877..cb658a3 100644 |
| 25 |
--- a/net-misc/icecast/files/init.d.icecast-2 |
| 26 |
+++ b/net-misc/icecast/files/icecast.initd |
| 27 |
@@ -1,5 +1,5 @@ |
| 28 |
-#!/sbin/runscript |
| 29 |
-# Copyright 1999-2014 Gentoo Foundation |
| 30 |
+#!/sbin/openrc-run |
| 31 |
+# Copyright 1999-2016 Gentoo Foundation |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
|
| 34 |
extra_started_commands="reload" |
| 35 |
|
| 36 |
diff --git a/net-misc/icecast/icecast-2.4.2.ebuild b/net-misc/icecast/icecast-2.4.2.ebuild |
| 37 |
index 31271f7..225f05f 100644 |
| 38 |
--- a/net-misc/icecast/icecast-2.4.2.ebuild |
| 39 |
+++ b/net-misc/icecast/icecast-2.4.2.ebuild |
| 40 |
@@ -58,7 +58,7 @@ src_install() { |
| 41 |
dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist |
| 42 |
dohtml -A chm,hhc,hhp doc/* |
| 43 |
|
| 44 |
- newinitd "${FILESDIR}"/init.d.icecast-2 icecast |
| 45 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 46 |
systemd_dounit "${FILESDIR}"/${PN}.service |
| 47 |
|
| 48 |
insinto /etc/icecast2 |
| 49 |
|
| 50 |
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild b/net-misc/icecast/icecast-2.4.3.ebuild |
| 51 |
index caecb9b..e14dda3 100644 |
| 52 |
--- a/net-misc/icecast/icecast-2.4.3.ebuild |
| 53 |
+++ b/net-misc/icecast/icecast-2.4.3.ebuild |
| 54 |
@@ -2,8 +2,8 @@ |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Id$ |
| 57 |
|
| 58 |
-EAPI=5 |
| 59 |
-inherit eutils autotools systemd user |
| 60 |
+EAPI=6 |
| 61 |
+inherit autotools systemd user |
| 62 |
|
| 63 |
DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming" |
| 64 |
HOMEPAGE="http://www.icecast.org/" |
| 65 |
@@ -32,11 +32,16 @@ pkg_setup() { |
| 66 |
enewuser icecast -1 -1 -1 nogroup |
| 67 |
} |
| 68 |
|
| 69 |
-src_prepare() { |
| 70 |
+PATCHES=( |
| 71 |
# bug #368539 |
| 72 |
- epatch "${FILESDIR}"/${PN}-2.3.3-libkate.patch |
| 73 |
+ "${FILESDIR}"/${PN}-2.3.3-libkate.patch |
| 74 |
# bug #430434 |
| 75 |
- epatch "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch |
| 76 |
+ "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch |
| 77 |
+) |
| 78 |
+ |
| 79 |
+src_prepare() { |
| 80 |
+ default |
| 81 |
+ mv configure.{in,ac} || die |
| 82 |
eautoreconf |
| 83 |
} |
| 84 |
|
| 85 |
@@ -56,9 +61,10 @@ src_configure() { |
| 86 |
src_install() { |
| 87 |
emake DESTDIR="${D}" install |
| 88 |
dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist |
| 89 |
- dohtml -A chm,hhc,hhp doc/* |
| 90 |
+ docinto html |
| 91 |
+ dodoc doc/*.html |
| 92 |
|
| 93 |
- newinitd "${FILESDIR}"/init.d.icecast-2 icecast |
| 94 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 95 |
systemd_dounit "${FILESDIR}"/${PN}.service |
| 96 |
|
| 97 |
insinto /etc/icecast2 |
| 98 |
@@ -74,7 +80,7 @@ src_install() { |
| 99 |
diropts -m0764 -o icecast -g nogroup |
| 100 |
dodir /var/log/icecast |
| 101 |
keepdir /var/log/icecast |
| 102 |
- rm -rf "${D}"/usr/share/doc/icecast |
| 103 |
+ rm -r "${D}"/usr/share/doc/icecast || die |
| 104 |
} |
| 105 |
|
| 106 |
pkg_postinst() { |
Archives