10 files changed, 17 insertions, 14 deletions
diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index bf354b41d133..35740d4ef048 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 904427dc046c..5d7c7debd7d4 100644
--- a/dev-libs/apr/apr-1.6.5.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 1a7fe29b7a21..fc5639976512 100644
--- a/dev-libs/apr/apr-1.7.0.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 416007a6e5ed..f9b990276fc1 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -56,6 +56,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
+		--disable-pdf-docs
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable gtk3)
 		$(use_enable vte)
diff --git a/dev-util/geany/geany-1.35.ebuild b/dev-util/geany/geany-1.35.ebuild
index 79034d53feb2..9d0c528efc2b 100644
--- a/dev-util/geany/geany-1.35.ebuild
+++ b/dev-util/geany/geany-1.35.ebuild
@@ -58,6 +58,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
+		--disable-pdf-docs
 		$(use_enable gtk3)
 		$(use_enable vte)
 	)
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index 79034d53feb2..9d0c528efc2b 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -58,6 +58,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
+		--disable-pdf-docs
 		$(use_enable gtk3)
 		$(use_enable vte)
 	)
diff --git a/www-client/otter/otter-0.9.99.3.ebuild b/www-client/otter/otter-0.9.99.3.ebuild
index a354d54d965f..1262034bd2cb 100644
--- a/www-client/otter/otter-0.9.99.3.ebuild
+++ b/www-client/otter/otter-0.9.99.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/www-client/otter/otter-1.0.01.ebuild b/www-client/otter/otter-1.0.01.ebuild
index 6b95bdb7e7ad..a2f202cc6df7 100644
--- a/www-client/otter/otter-1.0.01.ebuild
+++ b/www-client/otter/otter-1.0.01.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit cmake-utils desktop gnome2-utils xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild
index 4cd684266975..dd20d3231ae6 100644
--- a/www-client/otter/otter-9999.ebuild
+++ b/www-client/otter/otter-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils cmake-utils git-r3 gnome2-utils xdg-utils
+EAPI=7
+inherit cmake-utils desktop git-r3 xdg-utils
 
 DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="http://otter-browser.org/"
+HOMEPAGE="https://otter-browser.org/"
 EGIT_REPO_URI="https://github.com/OtterBrowser/otter-browser"
 
 LICENSE="GPL-3"
@@ -61,11 +61,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index d145e1256629..8670c83e868f 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"