gentoo resync : 05.04.2019

5 files changed, 158 insertions, 69 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 4b41ee5ae0c0..2f2ef1b0023e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,9 @@
+AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
+AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-DIST devhelp-3.26.1.tar.xz 613508 BLAKE2B a84d6bb55a81f0beda0603f343022b997e263934fc48ccc95503e156a0ee0984e1c945af785971c45f197865147c63be354ace72582d3575692dd5eed7e1e724 SHA512 76beec8846703004202229853a7a208b31bf56e2f10c102a3bb6e88fb9e54aded027e6ab9620706629dcb02cf5973f1d4fe88d217a7b3b8cb0efc948b02ca660
 DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02 SHA512 a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
+DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
-EBUILD devhelp-3.26.1.ebuild 1720 BLAKE2B a3f309bbee7533f0f4e2f9002578a6f311ab5ed8cb134b5b73a5c7639068a4479479b64c1ec8b0b43cc0b7468cd9d8c6549cac84d97c2b9b79a6986b7cf7af81 SHA512 fb626b2203dd6dac9257eb135cecfa98a315094c5ef2c3faa0604f4d0cdd57571783ad1e7f54a72d33bbbab2398d1e85f029ae3049453a2bbc2399159cd6ad28
 EBUILD devhelp-3.28.1.ebuild 1783 BLAKE2B 06084e4718a94e83d7a8a005f37a021ae7c7d918ef05d531e7f5b01f05d2dc5c3c7dc67262a4e2057ea22a46521c6323fc67d200f21756a5b910f52f3a155a7a SHA512 3e2489ccda475a4c95b0f4f95445036ff88693ca43d11e67b142ccd899064eecac45ef391ce892aeaa11909e94ba962abffa316e4536f41f06bf795680977466
+EBUILD devhelp-3.30.1.ebuild 1854 BLAKE2B dd7a2c7877853ca21744d9d8c5f1048c81b83b912feea173dbe3d1f4fdd0f1bb8556388dd46fc847054a8bbf50e5ec3c18516c3987a02c9bf00eb59dea249667 SHA512 2dc6cbec979f03abb684d974778c2d5d9ae3e5e1edb15a2d5315141f955254bda52a81eacb285876724d8113ad26d84ba59c2d4b2f103134f2985b34da9b2776
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.26.1.ebuild b/dev-util/devhelp/devhelp-3.26.1.ebuild
deleted file mode 100644
index 76edd828bd88..000000000000
--- a/dev-util/devhelp/devhelp-3.26.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-4" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2[dbus]
-	>=x11-libs/gtk+-3.22:3
-	>=net-libs/webkit-gtk-2.6.0:4
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-#  dev-libs/appstream-glib
-#  sys-devel/autoconf-archive
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		${myconf}
-}
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
new file mode 100644
index 000000000000..478d603945ee
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
+IUSE="gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=net-libs/webkit-gtk-2.20:4[introspection?]
+	>=gui-libs/amtk-5.0:5
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-optional-introspection.patch
+	"${FILESDIR}"/${PV}-optional-gedit.patch
+)
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dflatpak_build=false
+		$(meson_use gedit gedit_plugin)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
new file mode 100644
index 000000000000..09e4405a50e0
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
@@ -0,0 +1,37 @@
+From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:47:49 +0200
+Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
+
+---
+ meson.build       | 4 +++-
+ meson_options.txt | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a0def09c..2d1d3e0a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
+ ##### end CFLAGS
+ 
+ subdir('data')
+-subdir('plugins/gedit-plugin')
++if get_option('gedit_plugin')
++  subdir('plugins/gedit-plugin')
++endif
+ subdir('po')
+ subdir('help')
+ subdir('devhelp')
+diff --git a/meson_options.txt b/meson_options.txt
+index 2eaa7ff9..8fdb5a89 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
++option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
+ option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
new file mode 100644
index 000000000000..b5afa8a2b874
--- /dev/null
+++ b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
@@ -0,0 +1,38 @@
+From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 22 Mar 2019 19:44:40 +0200
+Subject: [PATCH 1/2] build: Add optionality for introspection build
+
+---
+ devhelp/meson.build | 2 ++
+ meson_options.txt   | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/devhelp/meson.build b/devhelp/meson.build
+index ea217895..f88fcb07 100644
+--- a/devhelp/meson.build
++++ b/devhelp/meson.build
+@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
+         requires : LIBDEVHELP_DEPS_STR
+ )
+ 
++if get_option('introspection')
+ GNOME.generate_gir(
+         libdevhelp,
+         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
+@@ -139,3 +140,4 @@ GNOME.generate_gir(
+         include_directories : ROOT_INCLUDE_DIR,
+         install : true
+ )
++endif
+diff --git a/meson_options.txt b/meson_options.txt
+index a10fc603..2eaa7ff9 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+ option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
+ option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
++option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
+-- 
+2.17.0
+