Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/gcab/, app-arch/gcab/files/
Date: Wed, 01 Jan 2020 16:07:01
Message-Id: 1577894799.7bbc81104deae05e8ef8968882a878a99e2dff2d.leio@gentoo
1 commit: 7bbc81104deae05e8ef8968882a878a99e2dff2d
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 1 15:47:24 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 16:06:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbc8110
7
8 app-arch/gcab: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 app-arch/gcab/Manifest | 1 -
14 app-arch/gcab/files/1.2-optional-vapi.patch | 44 -------------------------
15 app-arch/gcab/gcab-1.2.ebuild | 50 -----------------------------
16 3 files changed, 95 deletions(-)
17
18 diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
19 index 7a4087fdca9..4e1c6c55822 100644
20 --- a/app-arch/gcab/Manifest
21 +++ b/app-arch/gcab/Manifest
22 @@ -1,3 +1,2 @@
23 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
24 -DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
25 DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
26
27 diff --git a/app-arch/gcab/files/1.2-optional-vapi.patch b/app-arch/gcab/files/1.2-optional-vapi.patch
28 deleted file mode 100644
29 index 10a171926cb..00000000000
30 --- a/app-arch/gcab/files/1.2-optional-vapi.patch
31 +++ /dev/null
32 @@ -1,44 +0,0 @@
33 -From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
34 -From: Mart Raudsepp <leio@g.o>
35 -Date: Tue, 12 Feb 2019 11:44:10 +0200
36 -Subject: [PATCH] build-sys: Support disabling vapi generation independent of
37 - introspection
38 -
39 ----
40 - libgcab/meson.build | 12 +++++++-----
41 - meson_options.txt | 1 +
42 - 2 files changed, 8 insertions(+), 5 deletions(-)
43 -
44 -diff --git a/libgcab/meson.build b/libgcab/meson.build
45 -index f939617..3c4ac68 100644
46 ---- a/libgcab/meson.build
47 -+++ b/libgcab/meson.build
48 -@@ -93,9 +93,11 @@ if get_option('introspection')
49 - ],
50 - install : true
51 - )
52 -- gnome.generate_vapi('libgcab-1.0',
53 -- sources: gir[0],
54 -- packages : ['gio-2.0'],
55 -- install : true,
56 -- )
57 -+ if get_option('vapi')
58 -+ gnome.generate_vapi('libgcab-1.0',
59 -+ sources: gir[0],
60 -+ packages : ['gio-2.0'],
61 -+ install : true,
62 -+ )
63 -+ endif
64 - endif
65 -diff --git a/meson_options.txt b/meson_options.txt
66 -index bbcbbea..b7ade3f 100644
67 ---- a/meson_options.txt
68 -+++ b/meson_options.txt
69 -@@ -1,3 +1,4 @@
70 - option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
71 - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
72 -+option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
73 - option('tests', type : 'boolean', value : true, description : 'enable tests')
74 ---
75 -2.17.0
76 -
77
78 diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
79 deleted file mode 100644
80 index 870507f4b16..00000000000
81 --- a/app-arch/gcab/gcab-1.2.ebuild
82 +++ /dev/null
83 @@ -1,50 +0,0 @@
84 -# Copyright 1999-2019 Gentoo Authors
85 -# Distributed under the terms of the GNU General Public License v2
86 -
87 -EAPI=6
88 -VALA_USE_DEPEND="vapigen"
89 -
90 -inherit gnome.org meson vala xdg
91 -
92 -DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
93 -HOMEPAGE="https://wiki.gnome.org/msitools"
94 -
95 -LICENSE="LGPL-2.1+"
96 -SLOT="0"
97 -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
98 -
99 -IUSE="gtk-doc +introspection test vala"
100 -REQUIRED_USE="vala? ( introspection )"
101 -
102 -RDEPEND="
103 - >=dev-libs/glib-2.44:2
104 - sys-libs/zlib
105 - introspection? ( >=dev-libs/gobject-introspection-1.54:= )
106 -"
107 -DEPEND="${RDEPEND}
108 - dev-util/glib-utils
109 - gtk-doc? ( >=dev-util/gtk-doc-1.14
110 - app-text/docbook-xml-dtd:4.3 )
111 - >=sys-devel/gettext-0.19.8
112 - virtual/pkgconfig
113 - vala? ( $(vala_depend) )
114 -"
115 -
116 -RESTRICT="!test? ( test )"
117 -
118 -PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
119 -
120 -src_prepare() {
121 - xdg_src_prepare
122 - use vala && vala_src_prepare
123 -}
124 -
125 -src_configure() {
126 - local emesonargs=(
127 - $(meson_use gtk-doc docs)
128 - $(meson_use introspection)
129 - $(meson_use vala vapi)
130 - $(meson_use test tests)
131 - )
132 - meson_src_configure
133 -}