From 94b0ab8fdb2c79347ffb43a1a6b105bd41fb112e Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 5 Apr 2022 09:23:00 +0200 Subject: [PATCH] app-arch/msitools: update msitools from sfc repo Package-Manager: Portage-3.0.30, Repoman-3.0.3 --- app-arch/msitools/ChangeLog | 11 +++- app-arch/msitools/Manifest | 8 +-- .../msitools-0.101-bats-dependency.patch | 21 ++++++++ app-arch/msitools/metadata.xml | 18 +++++++ app-arch/msitools/msitools-0.101.ebuild | 54 +++++++++++++++++++ app-arch/msitools/msitools-0.99-r1.ebuild | 52 ------------------ 6 files changed, 107 insertions(+), 57 deletions(-) create mode 100644 app-arch/msitools/files/msitools-0.101-bats-dependency.patch create mode 100644 app-arch/msitools/metadata.xml create mode 100644 app-arch/msitools/msitools-0.101.ebuild delete mode 100644 app-arch/msitools/msitools-0.99-r1.ebuild diff --git a/app-arch/msitools/ChangeLog b/app-arch/msitools/ChangeLog index 96156748..09eab21d 100644 --- a/app-arch/msitools/ChangeLog +++ b/app-arch/msitools/ChangeLog @@ -1,7 +1,14 @@ -# ChangeLog for dev-util/msitools -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# ChangeLog for app-arch/msitools +# Copyright 1999-2022 Gentoo Authors; Distributed under the GPL v2 # $Header: $ +*msitools-0.101 (05 Apr 2022) + + 05 Apr 2022; Mario Fetka + +files/msitools-0.101-bats-dependency.patch, +metadata.xml, + +msitools-0.101.ebuild, -msitools-0.99-r1.ebuild: + app-arch/msitools: update msitools from sfc repo + 17 Oct 2015; Mario Fetka msitools-0.94.ebuild: add deeps diff --git a/app-arch/msitools/Manifest b/app-arch/msitools/Manifest index 6699665f..318bba46 100644 --- a/app-arch/msitools/Manifest +++ b/app-arch/msitools/Manifest @@ -1,3 +1,5 @@ -DIST msitools-0.99.tar.xz 956292 BLAKE2B 294108ae633a252f2251fa60b14a8b2a9e9de9c59f7fc8c5e82bc389d4d14f7489ff746e0cbb984f25e37a051137c1ba621385dc1a36fc3320924747d0729039 SHA512 29c6006591cdf9f8dec1a19c398fbb719879275de43d880ca4cc9fa8b8985021064523050eab4ca68d1c243603070a5d56102cd792d4dc78e75b1bdca08b2247 -EBUILD msitools-0.99-r1.ebuild 1023 BLAKE2B 88b2eb4e4b2d3855500ab9e58d427d7e5cab43d2d903d48866e4d282634836ca08f15c9f99d19144d876b62726f2d055e61b58a9d53537eb83cb233a6eaf63bd SHA512 97a10c99f7e9c38a0dde64fe3c23497d6b7d6831688385aa405784d09d7bad84ebfbb6978d0d4efd8302d34a90b457144d79ff3bd22b187ee2177843316c54eb -MISC ChangeLog 633 BLAKE2B 3d7d8b5795fa25d823bc68ad958cc7c80107a8ef0b92b85dae91db4980b6622c611eec2fe0c1cf7ca7a0c9b9608403e9ab7d72087d47258e6cd180d95bc09798 SHA512 ff8ce034fe657deff4a9791c608096490de5887b1753ff1fdcf191a59acb8ee3bbbb4863f8dc1bfe27e628e9cf4c043096895156a29b6f99191779499733a336 +AUX msitools-0.101-bats-dependency.patch 603 BLAKE2B a86c862e2592ab88e39ba5848d91398fdb9279d3996de0354ea3afd2a7858c3f16aa06de1d19d76db3c27f5302c012d6fd249ef5ca7984cd51a156506246d976 SHA512 3494c83dffc56efe52e7ef5e050ab389cfcd92b1ca540b9bb3dd7ece0c9025e0a3c0c540b5fcb076e204561fb37ff40aae6fab11e316edd4b3d449d939b9932b +DIST msitools-v0.101.tar.bz2 672943 BLAKE2B 34b5ea63f67e99140ac6ac89e4a23f389ad1d0debe1da045a32121e85e5f4d9401011ecb3b8db78953169b7c7e73faf8929c2a0712270460b0c433e93fe8fb8b SHA512 481c2b66c6dc14b967919d60bf0440a379c09e0893eca513a52a2b52bf8ee03e9c76243bc70b758c964c783df018b5ba03b95daca971840033db7c436ab9caad +EBUILD msitools-0.101.ebuild 996 BLAKE2B 3b5470f5a491469c7822c20a3c90dc7a25133405f0a2532e1f5686eee5026f6654fad1a0c94b215c71f9c57ad7b2a35deba378767050bfa270f6cf598174e79c SHA512 132fb44fe967e7f85b42eb71537fb23dce2ddc02012b2b0a2d578e543ed246d0d442f84194f94034211940bc84a8fff845c88b5ac32b9e4451e4092b1175d7b0 +MISC ChangeLog 878 BLAKE2B b5a3ac68d529e324a0caf473d64ddb21040806d50ccaf4b2bc3ea91314b928dedd69822a09476ed76b1da56955ff605d3d96a13fa643ece86417006f2c42445d SHA512 abdc80c9220f9054edcd40efb8d1064c9c9d32cf1c012436aad9f36de1855cd4d4570c60b4298033fea02a898bfd5a1a3ff8bbc0d74390da2f41ea35e5f3aaaa +MISC metadata.xml 815 BLAKE2B 065062781ffd3feecbe20de9449cafcab2b5ddff85978a14c13f2564929471b08183f6560b03cb8afc0adbdc028f367edfd02124aa73b83a8dc28a4fc7908db0 SHA512 b3d69b3cdaa6e6c4f7fda5e0305e15c107df9d7e62bf70c49cd6aefabe39c55cd50cd0e2e2d2da025d4fcde805cc492bfc26fceba6e8e535e4e389ed3939f35e diff --git a/app-arch/msitools/files/msitools-0.101-bats-dependency.patch b/app-arch/msitools/files/msitools-0.101-bats-dependency.patch new file mode 100644 index 00000000..f59cf1a9 --- /dev/null +++ b/app-arch/msitools/files/msitools-0.101-bats-dependency.patch @@ -0,0 +1,21 @@ +From 3fcf81bbde215349283391fd3d01cc901029427a Mon Sep 17 00:00:00 2001 +search system for bats as well + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/meson.build ++++ b/meson.build +@@ -9,7 +9,7 @@ gnome = import('gnome') + + perl = find_program('perl') + bison = find_program('bison') +-bats = find_program('subprojects/bats-core/bin/bats') ++bats = find_program(['bats', 'subprojects/bats-core/bin/bats']) + glib = dependency('glib-2.0', version: '>= 2.12') + gobject = dependency('gobject-2.0', version: '>= 0.9.4') + gio = dependency('gio-2.0', version: '>= 2.14') +-- +2.31.1 + diff --git a/app-arch/msitools/metadata.xml b/app-arch/msitools/metadata.xml new file mode 100644 index 00000000..a1cdc3f3 --- /dev/null +++ b/app-arch/msitools/metadata.xml @@ -0,0 +1,18 @@ + + + + + mario.fetka@gmail.com + Primary maintainer + + + exampleproject@gentoo.org + Geos One Linamh Project + + + msitools is a set of programs to inspect and build Windows Installer (.MSI) files. It is based on libmsi, + a portable library to read and write .MSI files. libmsi in turn is a port of (and a subset of) Wine's + implementation of the Windows Installer. msitools plans to be a solution for packaging and deployment + of cross-compiled Windows applications. + + diff --git a/app-arch/msitools/msitools-0.101.ebuild b/app-arch/msitools/msitools-0.101.ebuild new file mode 100644 index 00000000..22f965eb --- /dev/null +++ b/app-arch/msitools/msitools-0.101.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson vala + +DESCRIPTION="Set of programs to inspect and build Windows Installer (.MSI) files" +HOMEPAGE="https://wiki.gnome.org/msitools" +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="+introspection" +REQUIRED_USE=" + introspection +" + +BDEPEND=" + dev-lang/perl + sys-devel/bison + dev-util/bats +" + +RDEPEND=" + introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) +" +DEPEND="${RDEPEND} + dev-libs/glib + dev-libs/gobject-introspection-common + dev-libs/vala-common + gnome-extra/libgsf + app-arch/gcab[vala] + >=dev-util/gtk-doc-am-1.13 + >=virtual/pkgconfig-0-r1 +" + +PATCHES=( + "${FILESDIR}"/${P}-bats-dependency.patch +) + +src_prepare() { + vala_src_prepare + default +} + +src_configure() { + local emesonargs=( + $(meson_use introspection) + ) + meson_src_configure +} diff --git a/app-arch/msitools/msitools-0.99-r1.ebuild b/app-arch/msitools/msitools-0.99-r1.ebuild deleted file mode 100644 index a36f5e7a..00000000 --- a/app-arch/msitools/msitools-0.99-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2019 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vala -inherit autotools -inherit ltprune - -DESCRIPTION="Set of programs to inspect and build Windows Installer (.MSI) files" -HOMEPAGE="https://wiki.gnome.org/msitools" -LICENSE="LGPL-2+" - -SLOT="0" -#SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.xz" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE='nls rpath gnu-ld' - -# sys-apps/util-linux[libuuid] -# app-arch/gcab[vala] -RDEPEND=( - "dev-libs/glib:2 - dev-libs/libxml2 - gnome-extra/libgsf[introspection] - $(vala_depend) - sys-apps/util-linux - app-arch/gcab[vala] - gnome-extra/libgsf" -) -DEPEND_A="$RDEPEND" - -src_prepare() { - eapply_user - vala_src_prepare - eautoreconf -} - -src_configure() { - local my_econf_args=( - --enable-shared - --disable-static - $(use_enable nls) - $(use_enable rpath) - ) - econf "${my_econf_args[@]}" -} - -src_install() { - default - prune_libtool_files -}