gentoo resync : 28.04.2021

3 files changed, 57 insertions, 20 deletions

diff --git a/dev-cpp/gconfmm/Manifest b/dev-cpp/gconfmm/Manifest
index e4238468c636..73233c023875 100644
--- a/dev-cpp/gconfmm/Manifest
+++ b/dev-cpp/gconfmm/Manifest
@@ -1,3 +1,4 @@
+AUX gconfmm-2.28.3-no-extern-c-glib-includes.patch 1337 BLAKE2B ed3ff729cf81f04ec4b3615b376a8750c1c321ef05ee8560eae9ef4e3fd6974285060d9b11714a0325b0dfa51f976a725c59adb0919fa46ab6cca1cff6d9abde SHA512 993f3856fbe1dd69f8329aa7277f98d421433c6d9bdcaed3257a8f8639001c83c61ce9fb8184964802aefbba974ea02b70abfdf06504372794750b9e8b7d657b
 DIST gconfmm-2.28.3.tar.bz2 471125 BLAKE2B 834d63ee91ee6849970ce612c387957607bb3e723afb06b0ee8dad0336ae81c3a4c40a81846d6abbb425b5f3f0cbad026189d563a814d8acd1010f3b1dbdfa93 SHA512 0fd3a43373dfdf514eca61537c19dafd4ad582d2ec6bb325652766fba90ed723feff6daf93effcdf20f917c573131d58c16f1a826194f653864a701bb8a57097
-EBUILD gconfmm-2.28.3-r1.ebuild 720 BLAKE2B bcd3ed3d4f219bc5e886b3e2afd38b0f1cf6e25daf42e00111f15bb7d9e3d45382c3134c667820c7b31df3d8aa3612079da313968138757e8fb99b5029219845 SHA512 67eae5c969a0ae1536779269b31717cd641101b0cb1bf078a70ab928c8178d708c1264e607112c6ab37c16d4ac547359b87284b4962c910f39d5269fd27aaf2e
+EBUILD gconfmm-2.28.3-r1.ebuild 630 BLAKE2B 77d40d7a4eff4c1a872c6e2b991e3814d06ab43c1b734a1de8a3ba890d7c60447b7752ff08dffbaa2dab470f304287a2dd54a43980e7506e149462d6f8f423d5 SHA512 f9a3100656e717200ad16a5f94a1892f0f86bf00432155dcb595d2c80b4a15f44f615ab74020d61ecd3258574a2e5910f230d859c688203da14edb62a32f5872
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch b/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch
new file mode 100644
index 000000000000..b05face5b0a0
--- /dev/null
+++ b/dev-cpp/gconfmm/files/gconfmm-2.28.3-no-extern-c-glib-includes.patch
@@ -0,0 +1,44 @@
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/callback.h gconfmm-2.28.3/gconf/gconfmm/callback.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/callback.h	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/callback.h	2021-02-13 09:21:06.167235506 -0500
+@@ -22,10 +22,7 @@
+ #ifndef GCONFMM_CALLBACK_H
+ #define GCONFMM_CALLBACK_H
+ 
+-extern "C"
+-{
+ #include <gconf/gconf-client.h>
+-}
+ 
+ #include <glibmm/object.h>
+ #include <gconfmm/entry.h>
+diff -Naur gconfmm-2.28.3-original/gconf/gconfmm/schema.h gconfmm-2.28.3/gconf/gconfmm/schema.h
+--- gconfmm-2.28.3-original/gconf/gconfmm/schema.h	2011-10-21 04:51:27.000000000 -0400
++++ gconfmm-2.28.3/gconf/gconfmm/schema.h	2021-02-13 09:21:24.616354041 -0500
+@@ -31,10 +31,8 @@
+ #include <gconfmm/value.h>
+ 
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
+diff -Naur gconfmm-2.28.3-original/gconf/src/schema.hg gconfmm-2.28.3/gconf/src/schema.hg
+--- gconfmm-2.28.3-original/gconf/src/schema.hg	2011-10-18 11:33:49.000000000 -0400
++++ gconfmm-2.28.3/gconf/src/schema.hg	2021-02-13 09:21:58.002568546 -0500
+@@ -24,10 +24,8 @@
+ 
+ _DEFS(gconfmm,gconf)
+ 
+-extern "C" {
+-    // TODO: do not include this.
++// TODO: do not include this.
+ #include <gconf/gconf-schema.h>
+-}
+ 
+ namespace Gnome
+ {
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index 5fc75bb2c584..745c74a92947 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME_TARBALL_SUFFIX="bz2"
 
 inherit flag-o-matic gnome2
@@ -14,27 +12,21 @@ HOMEPAGE="https://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
 
-RDEPEND="
+DEPEND="
 	>=gnome-base/gconf-2.4:2
-	>=dev-cpp/glibmm-2.12:2[doc?]
+	>=dev-cpp/glibmm-2.12:2
 	>=dev-cpp/gtkmm-2.4:2.4
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-extern-c-glib-includes.patch
+)
 
 src_configure() {
 	append-cxxflags -std=c++11 #568580
 	gnome2_src_configure \
-		$(use_enable doc documentation)
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/*
-	fi
+		--disable-documentation
 }