commit: ad94d90fa3849239b889e939d395cc0d7a75cd2c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Tue Feb 12 10:00:19 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Tue Feb 12 11:09:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad94d90f
app-arch/gcab: bump to 1.2 Closes: https://bugs.gentoo.org/677454 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> app-arch/gcab/Manifest | 1 + app-arch/gcab/files/1.2-optional-vapi.patch | 44 +++++++++++++++++++++++++ app-arch/gcab/gcab-1.2.ebuild | 50 +++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest index 9959cfa87c8..67cbaefc29f 100644 --- a/app-arch/gcab/Manifest +++ b/app-arch/gcab/Manifest @@ -1 +1,2 @@ DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2 +DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64 diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch new file mode 100644 index 00000000000..10a171926cb --- /dev/null +++ b/app-arch/gcab/files/1.2-optional-vapi.patch @@ -0,0 +1,44 @@ +From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <[email protected]> +Date: Tue, 12 Feb 2019 11:44:10 +0200 +Subject: [PATCH] build-sys: Support disabling vapi generation independent of + introspection + +--- + libgcab/meson.build | 12 +++++++----- + meson_options.txt | 1 + + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/libgcab/meson.build b/libgcab/meson.build +index f939617..3c4ac68 100644 +--- a/libgcab/meson.build ++++ b/libgcab/meson.build +@@ -93,9 +93,11 @@ if get_option('introspection') + ], + install : true + ) +- gnome.generate_vapi('libgcab-1.0', +- sources: gir[0], +- packages : ['gio-2.0'], +- install : true, +- ) ++ if get_option('vapi') ++ gnome.generate_vapi('libgcab-1.0', ++ sources: gir[0], ++ packages : ['gio-2.0'], ++ install : true, ++ ) ++ endif + endif +diff --git a/meson_options.txt b/meson_options.txt +index bbcbbea..b7ade3f 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ + option('docs', type : 'boolean', value : true, description : 'enable developer documentation') + option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') ++option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)') + option('tests', type : 'boolean', value : true, description : 'enable tests') +-- +2.17.0 + diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild new file mode 100644 index 00000000000..ec4cb4e72be --- /dev/null +++ b/app-arch/gcab/gcab-1.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_USE_DEPEND="vapigen" + +inherit gnome.org meson vala + +DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files" +HOMEPAGE="https://wiki.gnome.org/msitools"; + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + +IUSE="gtk-doc +introspection test vala" +REQUIRED_USE="vala? ( introspection )" + +RDEPEND=" + >=dev-libs/glib-2.44:2 + sys-libs/zlib + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +DEPEND="${RDEPEND} + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.14 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1 + +src_prepare() { + use vala && vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + $(meson_use gtk-doc docs) + $(meson_use introspection) + $(meson_use vala vapi) + $(meson_use test tests) + ) + meson_src_configure +}
