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--dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild2
-rw-r--r--dev-qt/qtdemo/qtdemo-4.8.7.ebuild2
-rw-r--r--eclass/games-mods.eclass5
-rw-r--r--eclass/kde4-base.eclass12
-rw-r--r--eclass/kde4-functions.eclass14
-rw-r--r--kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild4
-rw-r--r--kde-apps/konsolepart/konsolepart-4.14.3.ebuild20
-rw-r--r--kde-apps/kopete/kopete-17.04.3.ebuild8
-rw-r--r--kde-apps/kopete/kopete-17.08.0.ebuild8
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild3
-rw-r--r--kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild99
-rw-r--r--kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild99
-rw-r--r--media-libs/phonon/phonon-4.9.1-r1.ebuild3
-rw-r--r--media-libs/phonon/phonon-9999.ebuild3
-rw-r--r--net-dns/knot/Manifest1
-rw-r--r--net-dns/knot/knot-2.5.4.ebuild101
-rw-r--r--profiles/prefix/darwin/package.use.mask4
17 files changed, 187 insertions, 201 deletions
diff --git a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
index d37a099bf4a6..a49456b792d0 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.6-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- phonon? ( media-libs/phonon[aqua=,qt4] )
+ phonon? ( media-libs/phonon[qt4] )
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index 58b778819e4c..e8c4d393d6e1 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -25,7 +25,7 @@ DEPEND="
declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?,${MULTILIB_USEDEP}] )
multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
- phonon? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,${MULTILIB_USEDEP}] )
+ phonon? ( >=media-libs/phonon-4.8.3-r1[qt4,${MULTILIB_USEDEP}] )
webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
"
diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass
index 8c7e72beed58..f2e4a25841fc 100644
--- a/eclass/games-mods.eclass
+++ b/eclass/games-mods.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Variables to specify in an ebuild which uses this eclass:
@@ -197,7 +197,8 @@ games-mods_dosyms() {
games-mods_make_initd() {
cat <<EOF > "${T}"/${MOD_DED_BIN}
#!/sbin/openrc-run
-$(head -n 2 ${PORTDIR}/header.txt)
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# Generated by games-mods.eclass
depend() {
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a7a2301317c2..07b188d044f0 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -384,10 +384,8 @@ unset kdelibsuse
kdedepend="
dev-util/automoc
virtual/pkgconfig
- !aqua? (
- >=x11-libs/libXtst-1.1.0
- x11-proto/xf86vidmodeproto
- )
+ >=x11-libs/libXtst-1.1.0
+ x11-proto/xf86vidmodeproto
"
kderdepend=""
@@ -440,12 +438,6 @@ case ${KDE_SELINUX_MODULE} in
;;
esac
-# We always need the aqua useflag because otherwise we cannot = refer to it inside
-# add_kdebase_dep. This was always kind of a bug, but came to light with EAPI=5
-# (where referring to a use flag not in IUSE masks the ebuild).
-# The only alternative would be to prohibit using add_kdebase_dep if KDE_REQUIRED=never
-IUSE+=" aqua"
-
case ${KDE_REQUIRED} in
always)
[[ -n ${kdecommondepend} ]] && COMMONDEPEND+=" ${kdecommondepend}"
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index fc37db293c07..4fdd299948d2 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,6 +296,10 @@ add_kdeapps_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -313,9 +317,7 @@ add_kdeapps_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- #FIXME
- # Drop aqua= from kf5 packages
- echo " >=kde-apps/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-apps/${1}-${ver}:4${use}"
}
# @FUNCTION: add_kdebase_dep
@@ -332,6 +334,10 @@ add_kdebase_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -351,7 +357,7 @@ add_kdebase_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-base/${1}-${ver}:4${use}"
}
# local function to enable specified translations for specified directory
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
index 77ce31dd66b1..88a155725b6b 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="test"
DEPEND="
virtual/jpeg:0
- !aqua? ( x11-libs/libXcursor )
+ x11-libs/libXcursor
bzip2? ( app-arch/bzip2 )
exif? ( media-gfx/exiv2:= )
openexr? ( media-libs/openexr:= )
@@ -29,7 +29,7 @@ RDEPEND="${DEPEND}
kde-apps/kdialog:*
kde-frameworks/kdelibs:4[bzip2?,lzma?]
virtual/ssh
- !aqua? ( !kernel_SunOS? ( virtual/eject ) )
+ !kernel_SunOS? ( virtual/eject )
"
KMEXTRA="
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index b44fb70b00b5..5e62afdfe679 100644
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -15,20 +15,16 @@ KEYWORDS="amd64 x86"
IUSE="debug"
COMMONDEPEND="
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libxklavier-3.2
- x11-libs/libXrender
- x11-libs/libXtst
- )
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libxklavier-3.2
+ x11-libs/libXrender
+ x11-libs/libXtst
"
DEPEND="${COMMONDEPEND}
- !aqua? (
- x11-apps/bdftopcf
- x11-proto/kbproto
- x11-proto/renderproto
- )
+ x11-apps/bdftopcf
+ x11-proto/kbproto
+ x11-proto/renderproto
"
RDEPEND="${COMMONDEPEND}
!<kde-apps/konsole-4.14.3-r2
diff --git a/kde-apps/kopete/kopete-17.04.3.ebuild b/kde-apps/kopete/kopete-17.04.3.ebuild
index f81bf0cdcf2f..0638ae9eed21 100644
--- a/kde-apps/kopete/kopete-17.04.3.ebuild
+++ b/kde-apps/kopete/kopete-17.04.3.ebuild
@@ -71,10 +71,8 @@ COMMONDEPEND="
kde-frameworks/kdelibs:4[zeroconf?]
media-libs/phonon[qt4]
media-libs/qimageblitz[-qt5(-)]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
cryptography? (
|| (
$(add_kdeapps_dep kdepim-common-libs)
@@ -117,8 +115,8 @@ RDEPEND="${COMMONDEPEND}
winpopup? ( net-fs/samba )
"
DEPEND="${COMMONDEPEND}
+ x11-proto/scrnsaverproto
jingle? ( dev-libs/jsoncpp )
- !aqua? ( x11-proto/scrnsaverproto )
"
PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
diff --git a/kde-apps/kopete/kopete-17.08.0.ebuild b/kde-apps/kopete/kopete-17.08.0.ebuild
index 7b7ed8c5dce4..bcc421a01cba 100644
--- a/kde-apps/kopete/kopete-17.08.0.ebuild
+++ b/kde-apps/kopete/kopete-17.08.0.ebuild
@@ -71,10 +71,8 @@ COMMONDEPEND="
kde-frameworks/kdelibs:4[zeroconf?]
media-libs/phonon[qt4]
media-libs/qimageblitz[-qt5(-)]
- !aqua? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- )
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
cryptography? (
|| (
$(add_kdeapps_dep kdepim-common-libs)
@@ -117,8 +115,8 @@ RDEPEND="${COMMONDEPEND}
winpopup? ( net-fs/samba )
"
DEPEND="${COMMONDEPEND}
+ x11-proto/scrnsaverproto
jingle? ( dev-libs/jsoncpp )
- !aqua? ( x11-proto/scrnsaverproto )
"
PATCHES=( "${FILESDIR}/${PN}-17.04.0-kde4qgpgme.patch" )
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild
index a1079a589999..6cb0dc2df747 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild
@@ -52,8 +52,9 @@ src_configure() {
src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
+ # ECMPoQmToolsTest is broken, bug #627806
local myctestargs=(
- -E "(ECMToolchainAndroidTest)"
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
)
kde5_src_test
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
index ae2a79fe6688..cf9f89776e1d 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.34.ebuild
@@ -47,29 +47,25 @@ COMMONDEPEND="
media-libs/phonon[qt4]
sys-libs/zlib
virtual/jpeg:0
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXcursor
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
x11-misc/shared-mime-info
+ !kernel_SunOS? ( || (
+ sys-libs/libutempter
+ >=sys-freebsd/freebsd-lib-9.0
+ ) )
acl? ( virtual/acl )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
bzip2? ( app-arch/bzip2 )
crypt? ( app-crypt/qca:2[qt4] )
fam? ( virtual/fam )
@@ -98,14 +94,12 @@ RDEPEND="${COMMONDEPEND}
app-misc/ca-certificates
kde-frameworks/kdelibs-env:4
sys-apps/dbus[X]
- !aqua? (
- x11-apps/iceauth
- x11-apps/rgb
- x11-misc/xdg-utils
- udisks? ( sys-fs/udisks:2 )
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
+ x11-apps/iceauth
+ x11-apps/rgb
+ x11-misc/xdg-utils
udev? ( app-misc/media-player-info )
+ udisks? ( sys-fs/udisks:2 )
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
"
PDEPEND="
x11-misc/xdg-utils
@@ -141,36 +135,6 @@ src_prepare() {
plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
|| die "failed to sed out QT_QTOPENGL_FOUND"
fi
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
}
src_configure() {
@@ -236,25 +200,6 @@ src_install() {
dohtml -r ${P}-apidocs/*
fi
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
# We don't package it, so don't install headers
rm -r "${ED}"/usr/include/KDE/Nepomuk || die
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
index e6a574ab2126..f7eb7c73bd1d 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.35.ebuild
@@ -47,29 +47,25 @@ COMMONDEPEND="
media-libs/phonon[qt4]
sys-libs/zlib
virtual/jpeg:0
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXcursor
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
x11-misc/shared-mime-info
+ !kernel_SunOS? ( || (
+ sys-libs/libutempter
+ >=sys-freebsd/freebsd-lib-9.0
+ ) )
acl? ( virtual/acl )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
bzip2? ( app-arch/bzip2 )
fam? ( virtual/fam )
jpeg2k? ( media-libs/jasper:= )
@@ -101,15 +97,13 @@ RDEPEND="${COMMONDEPEND}
app-misc/ca-certificates
kde-frameworks/kdelibs-env:4
sys-apps/dbus[X]
- !aqua? (
- x11-apps/iceauth
- x11-apps/rgb
- x11-misc/xdg-utils
- udisks? ( sys-fs/udisks:2 )
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
+ x11-apps/iceauth
+ x11-apps/rgb
+ x11-misc/xdg-utils
plasma? ( !sci-libs/plasma )
udev? ( app-misc/media-player-info )
+ udisks? ( sys-fs/udisks:2 )
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
"
PDEPEND="
x11-misc/xdg-utils
@@ -146,36 +140,6 @@ src_prepare() {
plasma/CMakeLists.txt plasma/tests/CMakeLists.txt includes/CMakeLists.txt \
|| die "failed to sed out QT_QTOPENGL_FOUND"
fi
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- eapply "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
}
src_configure() {
@@ -243,25 +207,6 @@ src_install() {
dohtml -r ${P}-apidocs/*
fi
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
# We don't package it, so don't install headers
rm -r "${ED}"/usr/include/KDE/Nepomuk || die
diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 38d15b515910..2474f3bab8db 100644
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://phonon.kde.org/"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
+IUSE="debug designer gstreamer pulseaudio qt4 +qt5 +vlc"
REQUIRED_USE="|| ( qt4 qt5 )"
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
qt5? ( kde-frameworks/extra-cmake-modules:5 )
"
PDEPEND="
- aqua? ( media-libs/phonon-qt7 )
gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5?] )
vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5?] )
"
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 33202cf975a2..e39cec4c2f67 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://phonon.kde.org/"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="aqua debug designer gstreamer pulseaudio qt4 +vlc"
+IUSE="debug designer gstreamer pulseaudio qt4 +vlc"
RDEPEND="
!!dev-qt/qtphonon:4
@@ -43,7 +43,6 @@ DEPEND="${RDEPEND}
kde-frameworks/extra-cmake-modules:5
"
PDEPEND="
- aqua? ( media-libs/phonon-qt7 )
gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt4?,qt5(+)] )
vlc? ( >=media-libs/phonon-vlc-0.9.0[qt4?,qt5(+)] )
"
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index efad0f337d15..e46d1d73819a 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,2 +1,3 @@
DIST knot-2.4.5.tar.xz 1111536 SHA256 87ce8ccc83511c5a1f4eadd3f0122f2f5ae86fb68e9b72f0700c6f5340ba95cb SHA512 db4919dbe2dc688f401e6611d784d47e1d40a0f8ec8c8cd6240d89ab9dd2ce7dd1976ac7cb24c712ed8aa074e0026ff0a10e9d6d5e685929d271ae554d9a1cff WHIRLPOOL cdfdf0bc2591df8436f8ab0959581129cb1a4d86138f6bb75b507d83280c7d567eb794e3b76b8374d4087721de53e4afd7566411b8e51fa2655e9e5462357ef4
DIST knot-2.5.3.tar.xz 1073372 SHA256 d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e SHA512 c93bfdd42c3f1e5b74de7a5bb46841bee75d5153b4c72eb876f11e193a290484620ea8f877bd039c40fc665a9d5d07905a712e8e085c3267da5db5208aa71f08 WHIRLPOOL c6fa2cd7dde2cd0ee54a7fc68fdd441d6af03777c788adaf2534bc944a0a5f8f0445b2cc1f80502c905e1f55baf0f65db37b66a097e46ec9fa0c960767398278
+DIST knot-2.5.4.tar.xz 1071596 SHA256 3fde76e9084b75df374709cb73a8289f77c6a95b7ccff8584d7423566faa24f0 SHA512 8b41a1ef0f9633815c38267130eba8c30c8c543ad6d74e0f63db42975d419938aa9cf4a921a7af966944fbd582f0e1364c6a05c79bc01a19674ed7ce0e66ef30 WHIRLPOOL 2f26b03837c59fb28294d6fabd658fef2527bbe118f6ffd299fde16d8af9d6dbd16209207f912cab51fc3319ba7733eb27594f54006bf534cdfcfaea54664777
diff --git a/net-dns/knot/knot-2.5.4.ebuild b/net-dns/knot/knot-2.5.4.ebuild
new file mode 100644
index 000000000000..ce1ab4d0f5d9
--- /dev/null
+++ b/net-dns/knot/knot-2.5.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="High-performance authoritative-only DNS server"
+HOMEPAGE="https://www.knot-dns.cz/"
+SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+KNOT_MODULES=(
+ "+dnsproxy"
+ "dnstap"
+ "+noudp"
+ "+onlinesign"
+ "rosedb"
+ "+rrl"
+ "+stats"
+ "+synthrecord"
+ "+whoami"
+)
+IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
+
+RDEPEND="
+ >=dev-db/lmdb-0.9.15
+ dev-libs/libedit
+ >=dev-libs/userspace-rcu-0.5.4
+ dev-python/lmdb
+ >=net-libs/gnutls-3.3:=
+ caps? ( >=sys-libs/libcap-ng-0.6.4 )
+ dnstap? (
+ dev-libs/fstrm
+ dev-libs/protobuf-c
+ )
+ idn? (
+ !libidn2? ( net-dns/libidn )
+ libidn2? ( >=net-dns/libidn2-2.0.0 )
+ )
+ systemd? ( >=sys-apps/systemd-229 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+ local my_conf=()
+ for u in "${KNOT_MODULES[@]#+}"; do
+ my_conf+=("$(use_with $u module-$u)")
+ done
+
+ econf \
+ --with-storage="${EPREFIX}/var/lib/${PN}" \
+ --with-rundir="${EPREFIX}/var/run/${PN}" \
+ $(use_enable fastparser) \
+ $(use_enable dnstap) \
+ $(use_enable doc documentation) \
+ $(use_enable utils utilities) \
+ --enable-systemd=$(usex systemd) \
+ $(use_with idn libidn) \
+ "${my_conf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ emake -C doc html
+ HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
+ fi
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ default
+
+ rmdir "${D}var/run/${PN}" "${D}var/run/" || die
+ keepdir /var/lib/${PN}
+
+ newinitd "${FILESDIR}/knot.init" knot
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/knot-1.service" knot
+ fi
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ enewgroup knot 53
+ enewuser knot 53 -1 /var/lib/knot knot
+}
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index 690a8d0e985a..d83ac53d383f 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Sep 2017)
+# Required media-libs/phonon no longer provides USE=aqua
+dev-qt/qtdemo phonon
+
# Fabian Groffen <grobian@gentoo.org> (06 Apr 2016)
# dev-libs/re2 needs love, bug #563932
app-misc/sphinx re2