gentoo resync : 03.11.2019

5 files changed, 81 insertions, 111 deletions

diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index 608f6d7abc20..fcb46cafe4ec 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,5 +1,3 @@
-DIST granite-0.5.0.tar.gz 365015 BLAKE2B 47b88d0b08a300fecc561161e1722cc1a544f58580d21244b6584f6aba7756afe6548dd663620fe9a09406fc0be2766b1d1093a21d262a5ab001992f309239ed SHA512 6042f40c1338768281ab3e6ad0bfdd8c5c69fc4951a069b0779a22b8999b35110ea8f09cf025dd88bafef7eca6cc0d076a608d55f01c078186e150908f8e4650
 DIST granite-5.2.5.tar.gz 392987 BLAKE2B 507c3b810b750257a66195b45842a7664eb544f86a8606124d30d277c03680296f1ace7a9233d6e094ad5ce3357564e13b61d946f8ed926ccf22a5d9b5e98648 SHA512 64a08293bc4b33d77206c7070b4e2002dd8e2da8a358e43074b681a9228790dcb342d3a705cfc0309a7e1e7f498a2a656e972c2fee085ba99fb5214e33758fc3
-EBUILD granite-0.5.0.ebuild 1233 BLAKE2B df2d0807d42020aa0179cf75b6ed3e6ce8f4c86fd17ee98ffc75220ddf08cc6cde6e472e7088ea493b843aaeabbfba863516873bd23a398e5a8e3531c880d6c7 SHA512 7cb63a7489f868bec6c6617d173f9faebc7012ca28a5f7ce5624f15eb9c3d6e9e8fea68913ec88d016162abea69f491ecb854414a4a8b9c87b49d12c3b89bdf8
-EBUILD granite-5.2.5.ebuild 878 BLAKE2B 3f2bc70da0a84f0fe0dada47d656a1950a80a8e9bd1e2a2027e8808ae42d7d9951f6f53ea938e815926a09fed12cfe0c54f826adbc54eb1c6d9c14e9a846bf58 SHA512 d3c18dfa50a11ece4d3c14e8368252b9f32834e15aef25f2175bfde2db18eeba6be1cfef6251fb46def4f63b93cf71fdb928666c5fef50dafea34d5d65495c0a
-MISC metadata.xml 835 BLAKE2B 20ae3ed5c84b3340f2e70a4c95bd80c1b769db96371c64fa8aa15e34591c2e206ba2a814cef4346613f173a48f43863e3fe64ea4a208840f7ff7ec7355e69ef1 SHA512 3d4e7730d8010f143314237e3c1b49f947ce00a1e60b9eb0c2ef46d0a8c3e2b4a5775c28b817b96234e6eddfa205c38d6ce270603a4567fdf308999a98ced416
+EBUILD granite-5.2.5-r1.ebuild 1867 BLAKE2B 3731912ee305d02bf85b53b83f2d45a342494ec21ee668a774cf1426f51ed41e55fdc4d66e38670bb38b64c7945be7d108946a29abd6d3e168e0afff05eced7a SHA512 ff7953d1d51b4317e8043d5afbec2931cb097d36dd71b39cb516f8dff16910d90a9fdc499b5d09edb104e52158f5cbf3b4ac73d79486b84f169f992159b23647
+MISC metadata.xml 695 BLAKE2B 251666b8d527fe7308162cc3cb8f9930df967e9eb57673cff6ba7306c65d3cd7082f42cddcd40f920bb8f0ba838cc57c652690b98e86784df2cc0d3fecc0906e SHA512 e90e892b32e3439be4ad4b3aea593878f4c7c158e97fda4c657fdc6b1f56ba31b18bc516e2db40b0a766820dba0bab255fc361d5ac86147c6f422b39de51c835
diff --git a/dev-libs/granite/granite-0.5.0.ebuild b/dev-libs/granite/granite-0.5.0.ebuild
deleted file mode 100644
index abb46af52627..000000000000
--- a/dev-libs/granite/granite-0.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION=0.32
-
-inherit gnome2-utils vala cmake-utils versionator
-
-DESCRIPTION="Elementary OS library that extends Gtk+"
-HOMEPAGE="https://github.com/elementary/granite"
-SRC_URI="https://github.com/elementary/${PN}/archive/$(get_version_component_range 1-2).tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="demo nls test"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libgee:0.8[introspection]
-	>=x11-libs/gtk+-3.14:3[introspection]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/"${PN}"-"$(get_version_component_range 1-2)"
-
-src_prepare() {
-
-	# Disable building of the demo application (if needed)
-	use demo || cmake_comment_add_subdirectory demo
-
-	# Disable generation of the translations (if needed)
-	use nls || cmake_comment_add_subdirectory po
-
-	cmake-utils_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DVALA_EXECUTABLE=${VALAC}
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/dev-libs/granite/granite-5.2.5-r1.ebuild b/dev-libs/granite/granite-5.2.5-r1.ebuild
new file mode 100644
index 000000000000..dc1cb86a0666
--- /dev/null
+++ b/dev-libs/granite/granite-5.2.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION=0.40
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+inherit meson vala xdg
+
+DESCRIPTION="Elementary OS library that extends GTK+"
+HOMEPAGE="https://github.com/elementary/granite"
+SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="doc +introspection test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+	doc? (
+		dev-lang/vala[valadoc]
+		dev-util/gtk-doc
+	)
+"
+DEPEND="
+	>=dev-libs/glib-2.50:2
+	dev-libs/libgee:0.8[introspection=]
+	>=x11-libs/gtk+-3.22:3[introspection=]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	vala_src_prepare
+	if use doc; then
+		sed -i \
+			"s/find_program('valadoc')/find_program('valadoc-$(vala_best_api_version)')/g" \
+			doc/meson.build || die "Failed to replace valadoc"
+		local doc_sed_list=(
+			"lib/Widgets/AboutDialog.vala"
+			"lib/Widgets/AlertView.vala"
+			"lib/Widgets/AsyncImage.vala"
+			"lib/Widgets/Avatar.vala"
+			"lib/Widgets/CellRendererBadge.vala"
+			"lib/Widgets/DynamicNotebook.vala"
+			"lib/Widgets/MessageDialog.vala"
+			"lib/Widgets/ModeButton.vala"
+			"lib/Widgets/OverlayBar.vala"
+			"lib/Widgets/SeekBar.vala"
+			"lib/Widgets/StorageBar.vala"
+			"lib/Widgets/Toast.vala"
+			"lib/Widgets/Welcome.vala"
+		)
+		for src_file in "${doc_sed_list[@]}"; do
+			sed -ie "s@{{../doc@{{${BUILD_DIR}/doc@g" \
+				"./${src_file}" || die "Failed to fix docs for ./${src_file}"
+		done
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc documentation)
+	)
+	meson_src_configure
+
+	if use doc; then
+		cp -r ./doc/images "${BUILD_DIR}/doc/" || die "Failed to copy doc images"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/doc/granite/html/." )
+	meson_src_install
+}
diff --git a/dev-libs/granite/granite-5.2.5.ebuild b/dev-libs/granite/granite-5.2.5.ebuild
deleted file mode 100644
index 3a143613f480..000000000000
--- a/dev-libs/granite/granite-5.2.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VALA_MIN_API_VERSION=0.40
-
-inherit meson vala xdg-utils
-
-DESCRIPTION="Elementary OS library that extends GTK+"
-HOMEPAGE="https://github.com/elementary/granite"
-SRC_URI="https://github.com/elementary/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
-# FIXME: Figure out issues with enabling doc.
-# See https://github.com/gentoo/gentoo/pull/12690#issuecomment-525027164
-IUSE="test"
-
-BDEPEND="
-	$(vala_depend)
-	>=dev-util/meson-0.48.2
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/glib-2.50:2
-	dev-libs/libgee:0.8[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	vala_src_prepare
-	eapply_user
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-libs/granite/metadata.xml b/dev-libs/granite/metadata.xml
index 9c251c8633e2..9a1a6cde3148 100644
--- a/dev-libs/granite/metadata.xml
+++ b/dev-libs/granite/metadata.xml
@@ -14,9 +14,6 @@
 		it provides complex widgets and convenience functions designed for
 		use in apps built for elementary OS.
 	</longdescription>
-	<use>
-		<flag name="demo">Build the Granite demo application (to present all available UI features provided by the library)</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">elementary/granite</remote-id>
 	</upstream>