gentoo resync : 20.03.2022

4 files changed, 60 insertions, 57 deletions

diff --git a/dev-cpp/libgnomecanvasmm/Manifest b/dev-cpp/libgnomecanvasmm/Manifest
index 9622b1c0d3ea..ee1ab0910e41 100644
--- a/dev-cpp/libgnomecanvasmm/Manifest
+++ b/dev-cpp/libgnomecanvasmm/Manifest
@@ -1,3 +1,4 @@
+AUX libgnomecanvasmm-2.26.0-disable-building-examples.patch 412 BLAKE2B e3b8e817a89d0991a0fc9db5ed3c0e478362a36afca566d59e36310f2cdd5822c099183d0260b6c125d483cd10284f504b5c14ee467e553ebfa9dc288198a834 SHA512 562aeefa89bf0028dc42cabe07a7ffcc6cdeacb72bb7cd550e868dbd2936b7912834c60458ead4936a90881c2129df6344d7b80b44559d2cda71cfd528342ba8
 DIST libgnomecanvasmm-2.26.0.tar.bz2 327215 BLAKE2B 87cfc59d0825ad2b345bbeff7ba6ce74744228a359d61c8c6b86cef308827c78410b4633737ab9040f6dbdf7f37ed0ea376d28ab4194266f9c784b8b07d1f76d SHA512 23795c856674b79f82d2e5cffdfdbf67a387fe6a21081fef1d96d0f614a121710c7f1e175612a286f5946a60cea4e8506aef7833a7bdf73084d6266c09aad66b
-EBUILD libgnomecanvasmm-2.26.0-r1.ebuild 1026 BLAKE2B 6f13cb2f7474989ee9a7cbf1c94cdaf8d3fcac23ded3ae2d8a3a02da8c4f6e1d7249d268065dafe48524549d25454e18b4f32544b1c3fa677fdc6aa505f8b0dd SHA512 0c62e7d3ac6b791ec6082db0d8b179f06f1b1603fa5726ddc8e12d02b7badcdfcaf879935cdad74d136bf609c7d18fbf44243e710c13b4e9a6e5e7023a1ec7a1
+EBUILD libgnomecanvasmm-2.26.0-r2.ebuild 829 BLAKE2B 3afed8d013369055d9e813f066b2b953d706f444ea368857986922add47514101ca29282b8082f843f8fa849d5e7292da04b5dd73e34d5743cfb5476f9519a59 SHA512 acc53f7f6bf047525cc6ef1cbe545503af87266ad47ed83da6c41b77518a2a982a637a504e0660f7cd5bcb9cbe1a8879f0584a1ed3af53b8633a2526cd87d441
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
new file mode 100644
index 000000000000..e750a355967f
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/files/libgnomecanvasmm-2.26.0-disable-building-examples.patch
@@ -0,0 +1,13 @@
+don't waste time building the examples
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -195,7 +195,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tools libgnomecanvas docs examples demos
++SUBDIRS = tools libgnomecanvas docs demos
+ DIST_SUBDIRS = $(SUBDIRS) scripts 
+ EXTRA_DIST = libgnomecanvasmm.spec.in \
+ 		  build_shared/Makefile_build.am_fragment \
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
deleted file mode 100644
index d18b3c0b1342..000000000000
--- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for libgnomecanvas"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=gnome-base/libgnomecanvas-2.6
-	>=dev-cpp/gtkmm-2.4:2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	if ! use examples; then
-		# don't waste time building the examples
-		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
-			die "sed Makefile.in failed"
-	fi
-	gnome2_src_prepare
-	append-cxxflags -std=c++11 #568300
-}
-
-src_compile() {
-	gnome2_src_compile
-
-	if use doc; then
-		cd "${S}/docs/reference"
-		emake all
-	fi
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use doc ; then
-		dohtml -r docs/reference/html/*
-	fi
-
-	if use examples; then
-		cp -R examples "${D}/usr/share/doc/${PF}"
-	fi
-}
diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
new file mode 100644
index 000000000000..d403ca365935
--- /dev/null
+++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="C++ bindings for libgnomecanvas"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+RDEPEND="
+	>=gnome-base/libgnomecanvas-2.6
+	>=dev-cpp/gtkmm-2.4:2.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-disable-building-examples.patch )
+
+src_compile() {
+	gnome2_src_compile
+
+	if use doc; then
+		emake -C docs/reference all
+		HTML_DOCS=( docs/reference/html/. )
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm examples/Makefile* examples/*/Makefile* || die
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
+}