From 8deb1b043ae749c78b02f0ebf9a5b88d4ab8c755 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 23 Feb 2022 18:28:07 +0100 Subject: [PATCH 1/3] dev-libs/libmspack: sync with `::gentoo` Commit-Ref: f4b02380c6eb5d4829d3909694a93566b789e5d6 Signed-off-by: Mathieu Tortuyaux --- .../dev-libs/libmspack/Manifest | 2 +- .../libmspack-0.9.1_alpha-fix-bigendian.patch | 17 ----- .../libmspack/libmspack-0.10.1_alpha.ebuild | 73 +++++++++++++++++++ ..._alpha-r1.ebuild => libmspack-9999.ebuild} | 9 +-- .../dev-libs/libmspack/metadata.xml | 5 +- 5 files changed, 78 insertions(+), 28 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild rename sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/{libmspack-0.9.1_alpha-r1.ebuild => libmspack-9999.ebuild} (84%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/Manifest index fa7a18545e..698014b976 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/Manifest @@ -1 +1 @@ -DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a +DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch deleted file mode 100644 index c134fa0760..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6 - ---- - configure.ac | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/libmspack/configure.ac b/libmspack/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h]) - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE -+AC_C_BIGENDIAN - AC_TYPE_MODE_T - AC_TYPE_OFF_T - AC_TYPE_SIZE_T diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild new file mode 100644 index 0000000000..7d7b60614f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kyz/libmspack.git" + inherit git-r3 + MY_P="${PN}-9999" +else + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris" + MY_PV="${PV/_alpha/alpha}" + MY_P="${PN}-${MY_PV}" + SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" +fi + +DESCRIPTION="A library for Microsoft compression formats" +HOMEPAGE="https://www.cabextract.org.uk/libmspack/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="debug doc static-libs" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + # Re-create file layout from release tarball + pushd "${WORKDIR}" &>/dev/null || die + cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die + rm -r "${S}" || die + mv "${WORKDIR}"/${PN}-source "${S}" || die + popd &>/dev/null || die + fi + + default + + eautoreconf + + multilib_copy_sources +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(use_enable debug) \ + $(use_enable static-libs static) +} + +multilib_src_test() { + if multilib_is_native_abi; then + default + cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die + fi +} + +multilib_src_install_all() { + DOCS=(AUTHORS ChangeLog NEWS README TODO) + use doc && HTML_DOCS=(doc/*) + default_src_install + if use doc; then + rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die + fi + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild similarity index 84% rename from sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild index 8adf2c3990..da812f6482 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 MY_P="${PN}-9999" else - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris" + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" MY_PV="${PV/_alpha/alpha}" MY_P="${PN}-${MY_PV}" SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" @@ -26,8 +26,6 @@ IUSE="debug doc static-libs" DEPEND="" RDEPEND="" -PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch ) - S="${WORKDIR}/${MY_P}" src_prepare() { @@ -49,7 +47,6 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ - --prefix=/usr/share/oem \ $(use_enable debug) \ $(use_enable static-libs static) } @@ -66,7 +63,7 @@ multilib_src_install_all() { use doc && HTML_DOCS=(doc/*) default_src_install if use doc; then - rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die + rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die fi find "${ED}" -name '*.la' -delete || die diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/metadata.xml index 1e5806295c..ea25c82c21 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/metadata.xml @@ -1,11 +1,8 @@ - + reavertm@gentoo.org Maciej Mrozowski - - Enables building cabrip, chmextract, msexpand and oabextract - From 74ed89937ccafe645777371cb9e714f0099d16bb Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 23 Feb 2022 18:30:09 +0100 Subject: [PATCH 2/3] dev-libs/libmspack: apply flatcar changes * remove useless ebuild * set the prefix to the OEM partition since this is vmware-only Signed-off-by: Mathieu Tortuyaux --- .../libmspack/libmspack-0.10.1_alpha.ebuild | 1 + .../dev-libs/libmspack/libmspack-9999.ebuild | 73 ------------------- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild index 7d7b60614f..0cdeca7571 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild @@ -47,6 +47,7 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE="${S}" econf \ + --prefix=/usr/share/oem \ $(use_enable debug) \ $(use_enable static-libs static) } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild deleted file mode 100644 index da812f6482..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libmspack/libmspack-9999.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kyz/libmspack.git" - inherit git-r3 - MY_P="${PN}-9999" -else - KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - MY_PV="${PV/_alpha/alpha}" - MY_P="${PN}-${MY_PV}" - SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz" -fi - -DESCRIPTION="A library for Microsoft compression formats" -HOMEPAGE="https://www.cabextract.org.uk/libmspack/" - -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="debug doc static-libs" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - # Re-create file layout from release tarball - pushd "${WORKDIR}" &>/dev/null || die - cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die - rm -r "${S}" || die - mv "${WORKDIR}"/${PN}-source "${S}" || die - popd &>/dev/null || die - fi - - default - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable static-libs static) -} - -multilib_src_test() { - if multilib_is_native_abi; then - default - cd "${S}"/test && "${BUILD_DIR}"/test/cabd_test || die - fi -} - -multilib_src_install_all() { - DOCS=(AUTHORS ChangeLog NEWS README TODO) - use doc && HTML_DOCS=(doc/*) - default_src_install - if use doc; then - rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die - fi - - find "${ED}" -name '*.la' -delete || die - if ! use static-libs ; then - find "${ED}" -name "*.a" -delete || die - fi -} From abef07f31a33ce96c7a044e091370a6d3da3c311 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 23 Feb 2022 18:38:40 +0100 Subject: [PATCH 3/3] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- .../coreos-overlay/changelog/updates/2022-02-23-libmspack.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-23-libmspack.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-23-libmspack.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-23-libmspack.md new file mode 100644 index 0000000000..ce0690e374 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-02-23-libmspack.md @@ -0,0 +1 @@ +- libmspack ([0.10.1_alpha](https://github.com/kyz/libmspack/blob/v0.10.1alpha/libmspack/ChangeLog))