gcab: upgraded package to upstream
Upgraded app-arch/gcab to version 1.4 on amd64, arm
BUG=chromium:1135855
TEST=Pushed to test device (puff) and tried out gcab binary. Other than
it reporting a different --version, I couldn't find any change. Tried
archive creation and extraction.
Change-Id: I807e26b7d4c0dded8b167dc16363f21a8cc060b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2497349
Reviewed-by: Daniel Campello <campello@chromium.org>
Tested-by: David Lattimore <dml@chromium.org>
Commit-Queue: David Lattimore <dml@chromium.org>
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index f24f36f..8922b04 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -1 +1 @@
-DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
+DIST gcab-1.4.tar.xz 78240 BLAKE2B 8b857c116fab636db93463cee7d6b809c3c7b2bdf3896b7b5b5b66ebf270b284b356710933ec17584143bcef5c1f5c555811dd05ea98399f327047476a33fc16 SHA512 66a2e0d0a5888c555153356ce808f602053e71b76af19794db7e3bbf9516fe791805068838b4e208698cd645ada7a08610ac95f846fa81e00a9b955016306299
diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
deleted file mode 100644
index 10a1719..0000000
--- a/app-arch/gcab/files/1.2-optional-vapi.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-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.4.ebuild
similarity index 78%
rename from app-arch/gcab/gcab-1.2.ebuild
rename to app-arch/gcab/gcab-1.4.ebuild
index a2fe1c4..7288321 100644
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
VALA_USE_DEPEND="vapigen"
-inherit gnome.org meson vala
+inherit gnome.org meson vala xdg
DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
HOMEPAGE="https://wiki.gnome.org/msitools"
@@ -17,11 +17,13 @@
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.62.0:2
sys-libs/zlib
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/meson-0.50.0
dev-util/glib-utils
gtk-doc? ( >=dev-util/gtk-doc-1.14
app-text/docbook-xml-dtd:4.3 )
@@ -32,19 +34,19 @@
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
-
src_prepare() {
+ xdg_src_prepare
use vala && vala_src_prepare
- default
}
src_configure() {
local emesonargs=(
$(meson_use gtk-doc docs)
$(meson_use introspection)
+ -Dnls=true
$(meson_use vala vapi)
$(meson_use test tests)
+ -Dinstalled_tests=false
)
meson_src_configure
}
diff --git a/metadata/md5-cache/app-arch/gcab-1.2 b/metadata/md5-cache/app-arch/gcab-1.2
deleted file mode 100644
index 77abacb..0000000
--- a/metadata/md5-cache/app-arch/gcab-1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.44:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= ) 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? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/msitools
-IUSE=gtk-doc +introspection test vala
-KEYWORDS=*
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gcab/1.2/gcab-1.2.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a ltprune 2729691420b6deeda2a90b1f1183fb55 meson b5ee7a05833ab91225acf30ffdeed006 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2f3804278870542119da624a5eded505 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e39d1da9e989ff20f4c2fbe8df32dd4f
diff --git a/metadata/md5-cache/app-arch/gcab-1.4 b/metadata/md5-cache/app-arch/gcab-1.4
new file mode 100644
index 0000000..cdb4600
--- /dev/null
+++ b/metadata/md5-cache/app-arch/gcab-1.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.50.0 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? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/msitools
+IUSE=gtk-doc +introspection test vala
+KEYWORDS=*
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.62.0:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gcab/1.4/gcab-1.4.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome.org 532d56d07b9eace4831aaa817d2b756a meson b5ee7a05833ab91225acf30ffdeed006 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 2f3804278870542119da624a5eded505 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=88c830e3b9ac09e7135abe5d12d690f0
