From 7cc2946a0b4aa41e9a9177ae6c575cf6873b9751 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Fri, 27 Jan 2023 14:25:54 +0800 Subject: [PATCH] libcfile: fix https://github.com/pentoo/pentoo-overlay/pull/1299 --- dev-libs/libcfile/Manifest | 2 +- dev-libs/libcfile/libcfile-20200216.ebuild | 37 ------------- dev-libs/libcfile/libcfile-20201229.ebuild | 48 ++++++++++++----- dev-libs/libcfile/libcfile-20220106.ebuild | 61 ++++++++++++++++++++++ 4 files changed, 98 insertions(+), 50 deletions(-) delete mode 100644 dev-libs/libcfile/libcfile-20200216.ebuild create mode 100644 dev-libs/libcfile/libcfile-20220106.ebuild diff --git a/dev-libs/libcfile/Manifest b/dev-libs/libcfile/Manifest index 09d338ba3..e4adce620 100644 --- a/dev-libs/libcfile/Manifest +++ b/dev-libs/libcfile/Manifest @@ -1,2 +1,2 @@ -DIST libcfile-alpha-20200216.tar.gz 1011938 BLAKE2B eb7714485166073ccdcda18ab6e3a20a43499044c72e23c6918246815d56636b7294bc6409507626b99d90dbe08d289e0cffc960d4f028b4288519570f71818c SHA512 d082916a5fc6753a0e0a6e44d3c6735cefc031d57e4a6d8a03abfbe7e34b01225648a1fddc1f7dc2812c475d6eeb1bab77fd6734a9341304279bea52851ab928 DIST libcfile-alpha-20201229.tar.gz 1018012 BLAKE2B 1382f4588ba98d0a50d96de5fc0904cabc770dc6433e1f0c03a8acfbcf2c0b9c34202eec7f4debc0cdc75b399b00a0cb4c4b56947b27bbe1534e9c5a84723559 SHA512 748971ee2da9b35c5beaa8cc1d741a8cc8abc841f84bc177eb9c2ea3064e70d6de909e033eca308ee6f59588ee968073fddffd98afe3786259f6bef14fc1f74b +DIST libcfile-alpha-20220106.tar.gz 1041634 BLAKE2B c4b7d762e29f3732639c039065d1cea1077f5921afb0b93a8309f5eb974f8b98265da2b4b550021d6060063c0f0a784702fb9b04c38a2163ea440a86780033e8 SHA512 50af19aba6315b9c105cb4655fd2f286f8ec9f1a5a7f3a8bebb0d3427bcc10b1b4838071b22d4c8463885663e72d59eef0f9f0351824b934d45f82139554b809 diff --git a/dev-libs/libcfile/libcfile-20200216.ebuild b/dev-libs/libcfile/libcfile-20200216.ebuild deleted file mode 100644 index 501dbd088..000000000 --- a/dev-libs/libcfile/libcfile-20200216.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Library for cross-platform C file functions" -HOMEPAGE="https://github.com/libyal/${PN}" -SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="nls unicode debug" - -DEPEND="dev-libs/libcerror - dev-libs/libclocale - dev-libs/libcnotify - dev-libs/libuna - nls? ( virtual/libiconv - virtual/libintl )" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable nls) \ - $(use_with nls libiconv-prefix) \ - $(use_with nls libintl-prefix) \ - $(use_enable unicode wide-character-type) \ - $(use_enable debug verbose-output ) \ - $(use_enable debug debug-output ) -} diff --git a/dev-libs/libcfile/libcfile-20201229.ebuild b/dev-libs/libcfile/libcfile-20201229.ebuild index 501dbd088..f90ed97bd 100644 --- a/dev-libs/libcfile/libcfile-20201229.ebuild +++ b/dev-libs/libcfile/libcfile-20201229.ebuild @@ -1,37 +1,61 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="Library for cross-platform C file functions" -HOMEPAGE="https://github.com/libyal/${PN}" -SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" +HOMEPAGE="https://github.com/libyal/libcfile" +SRC_URI="https://github.com/libyal/libcfile/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="nls unicode debug" -DEPEND="dev-libs/libcerror - dev-libs/libclocale - dev-libs/libcnotify - dev-libs/libuna - nls? ( virtual/libiconv - virtual/libintl )" +# This library has a circular build-time dependency on libuna. According to upstream, this is +# a non-issue as long as we use the pre-assembled download tarballs because they contain all +# required sources (see https://github.com/libyal/libuna/issues/7). In this case, we set a +# unilateral dependency libfile --> libuna and hope for the best. (Dependent packages should +# include both packages as dependency.) +DEPEND=" + dev-libs/libcerror[nls=] + dev-libs/libclocale[nls=,unicode=] + dev-libs/libcnotify[nls=] + dev-libs/libuna[nls=,unicode=] + nls? ( + virtual/libiconv + virtual/libintl + ) +" RDEPEND="${DEPEND}" src_prepare() { - default + #makefile was created with 1.16, let's regenerate it eautoreconf + eapply_user } src_configure() { - econf $(use_enable nls) \ + econf \ + $(use_enable nls) \ $(use_with nls libiconv-prefix) \ $(use_with nls libintl-prefix) \ $(use_enable unicode wide-character-type) \ $(use_enable debug verbose-output ) \ $(use_enable debug debug-output ) + +# --disable-shared-libs disable shared library support +# not supported in the ebuild at the moment - kind of defeats the entire process + +# --enable-winapi enable WINAPI support for cross-compilation +# [default=auto-detect] +# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us +} + +src_install() { + default + # see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/libcfile/libcfile-20220106.ebuild b/dev-libs/libcfile/libcfile-20220106.ebuild new file mode 100644 index 000000000..f90ed97bd --- /dev/null +++ b/dev-libs/libcfile/libcfile-20220106.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library for cross-platform C file functions" +HOMEPAGE="https://github.com/libyal/libcfile" +SRC_URI="https://github.com/libyal/libcfile/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="nls unicode debug" + +# This library has a circular build-time dependency on libuna. According to upstream, this is +# a non-issue as long as we use the pre-assembled download tarballs because they contain all +# required sources (see https://github.com/libyal/libuna/issues/7). In this case, we set a +# unilateral dependency libfile --> libuna and hope for the best. (Dependent packages should +# include both packages as dependency.) +DEPEND=" + dev-libs/libcerror[nls=] + dev-libs/libclocale[nls=,unicode=] + dev-libs/libcnotify[nls=] + dev-libs/libuna[nls=,unicode=] + nls? ( + virtual/libiconv + virtual/libintl + ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + #makefile was created with 1.16, let's regenerate it + eautoreconf + eapply_user +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_with nls libiconv-prefix) \ + $(use_with nls libintl-prefix) \ + $(use_enable unicode wide-character-type) \ + $(use_enable debug verbose-output ) \ + $(use_enable debug debug-output ) + +# --disable-shared-libs disable shared library support +# not supported in the ebuild at the moment - kind of defeats the entire process + +# --enable-winapi enable WINAPI support for cross-compilation +# [default=auto-detect] +# not supported in the ebuild at the moment - requires windows.h, does not make much sense for us +} + +src_install() { + default + # see https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303 + find "${ED}" -name '*.la' -delete || die +}