From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64BC6138334 for ; Mon, 14 Oct 2019 17:39:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DC5AE07FE; Mon, 14 Oct 2019 17:39:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 66F35E07FE for ; Mon, 14 Oct 2019 17:39:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAB1434BD1F for ; Mon, 14 Oct 2019 17:39:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6AD0720 for ; Mon, 14 Oct 2019 17:39:54 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1571074762.25825b340147a29ea280241281fecea9722e9661.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/granite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/granite/granite-5.2.5-r1.ebuild X-VCS-Directories: dev-libs/granite/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 25825b340147a29ea280241281fecea9722e9661 X-VCS-Branch: master Date: Mon, 14 Oct 2019 17:39:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b793b96-d4c4-48e0-830a-53004e1c065b X-Archives-Hash: 626a72fc2b2efad66cd0f4124d6e0692 commit: 25825b340147a29ea280241281fecea9722e9661 Author: Bernardo Meurer gmail com> AuthorDate: Mon Oct 14 03:53:14 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Mon Oct 14 17:39:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25825b34 dev-libs/granite: multiple fixes * Make introspection conditional on the USE flag (solves an issue with stabilization) * Replace xdg_utils with xdg and since the latter exports the necessary stages * Adds back the doc USE flag, which was left during the 5.2.5 bump since I couldn't get it to work * Restrict !test Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Bernardo Meurer standard.ai> Closes: https://github.com/gentoo/gentoo/pull/13294 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/granite/granite-5.2.5-r1.ebuild | 79 ++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) 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 00000000000..6f3451adc54 --- /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 +}