From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sat, 28 Jul 2018 11:33:13 +0000 (+0200)
Subject: kde-plasma/plasma-pa: Revbump to not automagically depend on gconf.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f321cc6ff55af50a2f39d7e3f97cf6584f62a11;p=gentoo.git

kde-plasma/plasma-pa: Revbump to not automagically depend on gconf.

Bug: https://bugs.gentoo.org/658660
Package-Manager: Portage-2.3.43, Repoman-2.3.10
---

diff --git a/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch
new file mode 100644
index 000000000000..8e58077d478c
--- /dev/null
+++ b/kde-plasma/plasma-pa/files/plasma-pa-5.13.3-automagic_gconf.patch
@@ -0,0 +1,18 @@
+--- plasma-pa-5.13.3/CMakeLists.txt
++++ plasma-pa-5.13.3/CMakeLists.txt
+@@ -18,12 +18,9 @@
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMOptionalAddSubdirectory)
+ 
+-include(FindPkgConfig)
+-pkg_check_modules(GCONF gconf-2.0)
+-pkg_check_modules(GOBJECT gobject-2.0)
+-if (GCONF_FOUND AND GOBJECT_FOUND)
+-    set(HAVE_GCONF TRUE)
+-endif()
++# Don't even try to use gconf.
++# >=pulseaudio-12.0 recommends to no longer use it anyway.
++set(HAVE_GCONF FALSE)
+ 
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+     Core
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
similarity index 94%
rename from kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
index 12b95df456c0..3c1d7097d87d 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.3-r1.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.3-r2.ebuild
@@ -29,4 +29,5 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-wrong-port-avail.patch"
 	"${FILESDIR}/${P}-optional_gconf.patch"
+	"${FILESDIR}/${P}-automagic_gconf.patch"
 )