Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-admin/consul-template/Manifest2
-rw-r--r--app-admin/consul-template/consul-template-0.12.2.ebuild4
-rw-r--r--media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch40
-rw-r--r--media-tv/tvheadend/metadata.xml2
-rw-r--r--media-tv/tvheadend/tvheadend-3.4.27.ebuild4
-rw-r--r--media-tv/tvheadend/tvheadend-4.0.6.ebuild30
-rw-r--r--media-tv/tvheadend/tvheadend-4.0.8.ebuild117
-rw-r--r--media-tv/tvheadend/tvheadend-9999.ebuild39
-rw-r--r--www-apps/icingaweb2/icingaweb2-2.1.2.ebuild7
9 files changed, 173 insertions, 72 deletions
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index a598b3f0a5bc..c8215bc09624 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -6,6 +6,7 @@ DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4
DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
DIST etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz 2171596 SHA256 72f642f10d014dff089b7a0fe66168639d30ed0e1586cec43a88b2bd7311cc11 SHA512 cc1d75d73c46f7c8438ddec8f0cf6829936e4ecb58efcaae958f818bbdd777751b393406e6c89784d9234080766ea67d71e660aa973f409ce4319768e76f4dad WHIRLPOOL 7f645f6ae41769e8bf0e4f35e4ac399df385bd1693f3c49d0f3e2859cfbf58e0cbd6f9be8c7de101e37720514828e56ae996cbf8a89e665a867ae083457bf9e8
DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435
DIST go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz 8209 SHA256 d2283d24b1ea8e7b9520c022eb2530150eed03b6e72f698c9371658654777fea SHA512 2b2cf5ee8adf3dc3e106b3882812ecf925e4bfa7a43962eab70e106fdb46d6928414e1da741f713e1001b50a3ccefb7a1814997f6c3a4f5a1956fba7c40abbb4 WHIRLPOOL fddaa5ce23e418c7e099ba089256f591115e4667e86450454be6040502d94faa52160f6f77f1805299ff82e44a04d225165ef4d98a11f342c2ede0ccf35c3dfc
DIST go-ini-1.8.6.tar.gz 26600 SHA256 66a1328c8dfc21a3b1657177e60681b2b6fa0ab4fce4b6e861c059bff0507511 SHA512 802c4ad56a2ba2f1a543bed8bdd1970557d973d10d3eff7fc69a406af52484943f7d20f91ccfca4cc8364ac438da7b464b05fae30f04b930717cb58f5fc55676 WHIRLPOOL f6a34a8a7bb07b7fc1aaa43ac422eb5e6c1c6b081b065023cc37584ceecd74489001b25af39d70de22e28919bcb410dda7b0fb52cef914889a023db22947208f
DIST go-jmespath-0.2.2.tar.gz 47588 SHA256 d0a918ec689c3997077960c30d2ab6c1f93e3722684940d19286f85274cf56dd SHA512 93d1b64f6a0c658d832c065ddcd006b1d521a71c154a55a818a20063a9f9777640fa077a29e476c4e31f0b208a3c765a32aacf65d44d65d80702dccb7faed2a6 WHIRLPOOL 3f07a5f76117a9c54fe6a6ab6c94d29dff15176909904ba437a48f743e7b4189238428e1ca0080c572a3105855bf740769d65e6d1bb0014e12d335601bdafb43
@@ -15,6 +16,7 @@ DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32
DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
+DIST go-net-0_pre20150804.tar.gz 539435 SHA256 77fb87becd3ddb68ff06acd3a1bf1246b390e7489b3e25a9ee9314f7457ccf60 SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3 WHIRLPOOL a63befad593737449f393d7f4490b1680d8cba808f6163b9723b0d1d228480cdcbf9e2fb091ffc96f9121aabde1e24b06f3ddcb7b30e4bffa6e39dece5a8b3e0
DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
diff --git a/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
index ab46d48dd0dd..6e7190dce9b9 100644
--- a/app-admin/consul-template/consul-template-0.12.2.ebuild
+++ b/app-admin/consul-template/consul-template-0.12.2.ebuild
@@ -39,6 +39,8 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/coreos/etcd/archive/5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz -> etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz
https://github.com/go-ini/ini/archive/v1.8.6.tar.gz -> go-ini-1.8.6.tar.gz
https://github.com/go-sql-driver/mysql/archive/v1.2.tar.gz -> go-sql-driver-mysql-1.2.tar.gz
+ https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
+ https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
https://github.com/hashicorp/go-gatedio/archive/8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz -> go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz
https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
@@ -62,6 +64,8 @@ pkg_setup() {
get_archive_go_package() {
local archive=${1} uri x
case ${archive} in
+ go-crypto-*) echo "crypto-* golang.org/x/crypto"; return;;
+ go-net-*) echo "net-* golang.org/x/net"; return;;
go-sys-*) echo "sys-* golang.org/x/sys"; return;;
go-yaml-v2-*) echo "yaml-* gopkg.in/yaml.v2"; return;;
esac
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
deleted file mode 100644
index 91187869a209..000000000000
--- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl <oliver@schinagl.nl>
-Date: Sat, 26 Sep 2015 22:36:08 +0200
-Subject: [PATCH] Use glibc version iconv
-
-Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
----
- Makefile | 2 +-
- configure | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07d6965..0ec0259 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ else
- LDFLAGS += -ldl -lpthread -lm
- endif
- ifeq ($(CONFIG_LIBICONV),yes)
--LDFLAGS += -liconv
-+LDFLAGS +=
- endif
- ifeq ($(PLATFORM), darwin)
- LDFLAGS += -framework CoreServices
-diff --git a/configure b/configure
-index 487456b..a6cce11 100755
---- a/configure
-+++ b/configure
-@@ -214,7 +214,7 @@ int test(void)
- iconv_t ic = iconv_open("ASCII", "ASCII");
- return 0;
- }
--' -liconv
-+'
-
- if enabled_or_auto dvben50221; then
- check_cc_snippet libdvben50221 '
---
-2.4.6
-
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 29aa5fc1d916..31bcdfe8fa63 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -14,13 +14,11 @@
<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
<flag name="constcw">Enable support for the constcw protocol</flag>
<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
- <flag name="epoll">Enable epoll Linux system call</flag>
<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
<flag name="iptv">Enable support for Internet Protocol TV</flag>
<flag name="satip">Enable support for IP-based Satellite TV</flag>
<flag name="timeshift">Enable TimeShift support</flag>
<flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
- <flag name="ccache">Use <pkg>dev-util/ccache</pkg></flag>
<flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
<flag name="imagecache">Enable support for image caching</flag>
<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 0a8d85fee552..03f12f27b6ac 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -49,6 +49,10 @@ src_prepare() {
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+
+ # imdb changed the search url, bug #536072
+ sed -e 's:akas.imdb.org:akas.imdb.com:' \
+ -i src/webui/static/app/epg.js || die 'sed failed!'
}
src_configure() {
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index ec2928533253..087ea471ce64 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -6,37 +6,39 @@ EAPI=5
inherit eutils linux-info systemd toolchain-funcs user
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 )"
+ dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
RDEPEND="dev-libs/openssl:=
+ virtual/libiconv
avahi? ( net-dns/avahi )
- capmt? ( virtual/linuxtv-dvb-headers )
- ccache? ( dev-util/ccache sys-libs/zlib )
dbus? ( sys-apps/dbus )
- dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:= )
)
hdhomerun? ( media-libs/libhdhomerun )
- iconv? ( virtual/libiconv )
- imagecache? ( net-misc/curl )
uriparser? ( dev-libs/uriparser )
- zlib? ( sys-libs/zlib )
- xmltv? ( media-tv/xmltv )"
+ zlib? ( sys-libs/zlib )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
+ dvb? ( virtual/linuxtv-dvb-headers )
+ capmt? ( virtual/linuxtv-dvb-headers )
virtual/pkgconfig"
+RDEPEND+="
+ xmltv? ( media-tv/xmltv )"
+
CONFIG_CHECK="~INOTIFY_USER"
DOCS=( README.md )
@@ -47,7 +49,7 @@ src_unpack() {
if use dvbscan; then
mkdir "${S}/data/dvb-scan" || die
cd "${T}" || die
- unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
+ unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
rmdir "${S}/data/dvb-scan" || die
mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
@@ -63,23 +65,19 @@ pkg_setup() {
src_prepare() {
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
- epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
}
src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
+ --disable-ccache \
$(use_enable avahi) \
- $(use_enable ccache) \
$(use_enable capmt) \
$(use_enable constcw) \
$(use_enable cwc) \
$(use_enable dbus) \
$(use_enable dvb linuxdvb) \
$(use_enable dvbscan) \
- $(use_enable epoll) \
- --disable-kqueue \
$(use_enable ffmpeg libav) \
$(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \
diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
new file mode 100644
index 000000000000..087ea471ce64
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+RDEPEND="dev-libs/openssl:=
+ virtual/libiconv
+ avahi? ( net-dns/avahi )
+ dbus? ( sys-apps/dbus )
+ ffmpeg? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:= )
+ )
+ hdhomerun? ( media-libs/libhdhomerun )
+ uriparser? ( dev-libs/uriparser )
+ zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+ dvb? ( virtual/linuxtv-dvb-headers )
+ capmt? ( virtual/linuxtv-dvb-headers )
+ virtual/pkgconfig"
+
+RDEPEND+="
+ xmltv? ( media-tv/xmltv )"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+
+ if use dvbscan; then
+ mkdir "${S}/data/dvb-scan" || die
+ cd "${T}" || die
+ unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
+ rmdir "${S}/data/dvb-scan" || die
+ mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
+
+ # This is needed to prevent make from removing files
+ touch "${S}/data/dvb-scan/.stamp" || die
+ fi
+}
+
+pkg_setup() {
+ enewuser tvheadend -1 -1 /dev/null video
+}
+
+src_prepare() {
+ # remove '-Werror' wrt bug #438424
+ sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+}
+
+src_configure() {
+ econf --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share \
+ --disable-ccache \
+ $(use_enable avahi) \
+ $(use_enable capmt) \
+ $(use_enable constcw) \
+ $(use_enable cwc) \
+ $(use_enable dbus) \
+ $(use_enable dvb linuxdvb) \
+ $(use_enable dvbscan) \
+ $(use_enable ffmpeg libav) \
+ $(use_enable hdhomerun hdhomerun_client) \
+ $(use_enable imagecache) \
+ $(use_enable inotify) \
+ $(use_enable iptv) \
+ $(use_enable satip satip_server) \
+ $(use_enable satip satip_client) \
+ $(use_enable timeshift) \
+ $(use_enable uriparser) \
+ $(use_enable zlib)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}/tvheadend.initd" tvheadend
+ newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+
+ systemd_dounit "${FILESDIR}/tvheadend.service"
+
+ dodir /etc/tvheadend
+ fperms 0700 /etc/tvheadend
+ fowners tvheadend:video /etc/tvheadend
+}
+
+pkg_postinst() {
+ elog "The Tvheadend web interface can be reached at:"
+ elog "http://localhost:9981/"
+ elog
+ elog "Make sure that you change the default username"
+ elog "and password via the Configuration / Access control"
+ elog "tab in the web interface."
+}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 495a3d139734..731463da2f41 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils git-2 linux-info systemd toolchain-funcs user
+inherit eutils git-r3 linux-info systemd toolchain-funcs user
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
@@ -14,18 +14,26 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
-DEPEND="dev-libs/openssl:0=
+RDEPEND="dev-libs/openssl:=
+ virtual/libiconv
avahi? ( net-dns/avahi )
- ccache? ( dev-util/ccache )
- dvb? ( virtual/linuxtv-dvb-headers )
- ffmpeg? ( virtual/ffmpeg )
+ dbus? ( sys-apps/dbus )
+ ffmpeg? (
+ !libav? ( media-video/ffmpeg:0= )
+ libav? ( media-video/libav:= )
+ )
+ hdhomerun? ( media-libs/libhdhomerun )
uriparser? ( dev-libs/uriparser )
- zlib? ( sys-libs/zlib )
+ zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+ dvb? ( virtual/linuxtv-dvb-headers )
+ capmt? ( virtual/linuxtv-dvb-headers )
virtual/pkgconfig"
-RDEPEND="${DEPEND}
+RDEPEND+="
dvbscan? ( media-tv/linuxtv-dvb-apps )
xmltv? ( media-tv/xmltv )"
@@ -45,13 +53,24 @@ src_prepare() {
src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
- $(use_enable avahi) \
- $(use_enable ccache) \
+ --disable-hdhomerun_static \
+ --disable-libffmpeg_static \
+ --disable-ccache \
--disable-dvbscan \
+ $(use_enable avahi) \
+ $(use_enable capmt) \
+ $(use_enable constcw) \
+ $(use_enable cwc) \
+ $(use_enable dbus) \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \
+ $(use_enable hdhomerun hdhomerun_client) \
$(use_enable imagecache) \
$(use_enable inotify) \
+ $(use_enable iptv) \
+ $(use_enable satip satip_server) \
+ $(use_enable satip satip_client) \
+ $(use_enable timeshift) \
$(use_enable uriparser) \
$(use_enable zlib)
}
diff --git a/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
index d713714186ee..81d827688cc8 100644
--- a/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.1.2.ebuild
@@ -21,11 +21,10 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
nginx? ( >=www-servers/nginx-1.7.0:* )"
RDEPEND="${DEPEND}"
+want_apache2
+
pkg_setup() {
- if use apache2 ; then
- want_apache2
- depend.apache_pkg_setup
- fi
+ depend.apache_pkg_setup
enewgroup icingaweb2
enewgroup icingacmd