From 5c154d688906a433f52bc358a9f5a56be12e17db Mon Sep 17 00:00:00 2001 From: Volker Wegert Date: Sun, 20 Nov 2022 22:39:07 +0100 Subject: [PATCH 1/2] re-applied changes to libbfio --- app-forensics/libbfio/Manifest | 3 +- app-forensics/libbfio/libbfio-20191230.ebuild | 43 ------------ app-forensics/libbfio/libbfio-20201229.ebuild | 43 ------------ app-forensics/libbfio/libbfio-20220120.ebuild | 59 ++++++++++++++++ app-forensics/libbfio/libbfio-20221025.ebuild | 70 ++++++++++++------- 5 files changed, 103 insertions(+), 115 deletions(-) delete mode 100644 app-forensics/libbfio/libbfio-20191230.ebuild delete mode 100644 app-forensics/libbfio/libbfio-20201229.ebuild create mode 100644 app-forensics/libbfio/libbfio-20220120.ebuild diff --git a/app-forensics/libbfio/Manifest b/app-forensics/libbfio/Manifest index f2cf44a29..cb20ffb30 100644 --- a/app-forensics/libbfio/Manifest +++ b/app-forensics/libbfio/Manifest @@ -1,3 +1,2 @@ -DIST libbfio-alpha-20191230.tar.gz 2004155 BLAKE2B 1e1330b4982b896912722c89b54d60e20994aaf5157451d9379b7345a2638236970a1c050fdb5977b84105e1791777c4692cb4a9c1eef405bbe11ff5fdb2cc7e SHA512 4054f853fb072bfff6eca58da1c47e1458ffdf4ca2734349b78fa145745c2cd12635cb244487d84aabc7768f2eb3f63dfcfe6d0afe7b45096674a61cda6f258f -DIST libbfio-alpha-20201229.tar.gz 2014489 BLAKE2B 87a17ac853eb486efe3a2f44f424a7e59e52d3e1ed2f7b4c728399f0ed3b0220827a844eeecda829f34cdbd7f94c8e4518b4000a029ddc481ea24d83be8b7963 SHA512 8e82e7ae22e094f438e1fa032d1675554b6f9f24caa64ddefa09e3b9e55c6b7981cce8ae01904128fd5ed2e5cf26298734b1fe8fad798f66a5b48cb04fc1ced1 +DIST libbfio-alpha-20220120.tar.gz 2040045 BLAKE2B 8c36316ab3c648bbdd03d96d621444c6b26efb7e627d9337bd346261debaaaf1705d7ac1b043fb97dc2ceaaec620432aeb4bbc333b441e429436a7b1505b1dab SHA512 8e0b8bc3b60145c42fd9c20a9ea04d022f6a44c07dc0f39b21945c2149a2f6201fd22d6ffa590e7d6bcfa95138aff202670ce794a2fe6afdac672a1a6ef65bcf DIST libbfio-alpha-20221025.tar.gz 2049863 BLAKE2B a091726da9ae1047d27aa3c8fe0a210f419f29c3679c4d9a7af141e35d3e28017b3340e3e5c3a440c90d9450d827111fd4f2e1634c9ce56721d066a5a4c94037 SHA512 ab4be7faae7172b74f117e422f3b72a0705fbfe91f3bf7fb8b5796fae8428ca7d242487eb61b3cf08867209c64949c544a4ed21bf7feb6908fd187e3e4fadd50 diff --git a/app-forensics/libbfio/libbfio-20191230.ebuild b/app-forensics/libbfio/libbfio-20191230.ebuild deleted file mode 100644 index aad3a143f..000000000 --- a/app-forensics/libbfio/libbfio-20191230.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Library for providing a basic file input/output abstraction layer" -HOMEPAGE="https://github.com/libyal/libbfio" -#upstream removed the release -#SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" -SRC_URI="https://pentoo.org/~zero/distfiles/${PN}-alpha-${PV}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls unicode" - -DEPEND="dev-libs/libcerror - dev-libs/libcthreads - dev-libs/libcdata - dev-libs/libclocale - dev-libs/libcnotify - dev-libs/libcsplit - dev-libs/libuna - dev-libs/libcfile - dev-libs/libcpath - " -RDEPEND="${DEPEND}" - -src_configure() { - econf $(use_enable nls) \ - $(use_with nls libiconv-prefix) \ - $(use_with nls libintl-prefix) \ - $(use_enable unicode wide-character-type) -# --with-libcerror \ -# --with-libcthreads \ -# --with-libcdata \ -# --with-libclocale \ -# --with-libcnotify \ -# --with-libcsplit \ -# --with-libuna \ -# --with-libcfile \ -# --with-libcpath -} diff --git a/app-forensics/libbfio/libbfio-20201229.ebuild b/app-forensics/libbfio/libbfio-20201229.ebuild deleted file mode 100644 index 6b1a25819..000000000 --- a/app-forensics/libbfio/libbfio-20201229.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Library for providing a basic file input/output abstraction layer" -HOMEPAGE="https://github.com/libyal/libbfio" -SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" -#upstream removed the release -#SRC_URI="https://pentoo.org/~zero/distfiles/${PN}-alpha-${PV}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="nls unicode" - -DEPEND="dev-libs/libcerror - dev-libs/libcthreads - dev-libs/libcdata - dev-libs/libclocale - dev-libs/libcnotify - dev-libs/libcsplit - dev-libs/libuna - dev-libs/libcfile - dev-libs/libcpath - " -RDEPEND="${DEPEND}" - -src_configure() { - econf $(use_enable nls) \ - $(use_with nls libiconv-prefix) \ - $(use_with nls libintl-prefix) \ - $(use_enable unicode wide-character-type) -# --with-libcerror \ -# --with-libcthreads \ -# --with-libcdata \ -# --with-libclocale \ -# --with-libcnotify \ -# --with-libcsplit \ -# --with-libuna \ -# --with-libcfile \ -# --with-libcpath -} diff --git a/app-forensics/libbfio/libbfio-20220120.ebuild b/app-forensics/libbfio/libbfio-20220120.ebuild new file mode 100644 index 000000000..9abb4e290 --- /dev/null +++ b/app-forensics/libbfio/libbfio-20220120.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library for providing a basic file input/output abstraction layer" +HOMEPAGE="https://github.com/libyal/libbfio" +SRC_URI="https://github.com/libyal/libbfio/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" + +# It would make more sense to put this package in dev-libs/ instead of app-forensics/, +# but this is where it is in the main Gentoo repository, so we'll just stick with that. + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="nls +threads unicode debug" + +DEPEND=" + dev-libs/libcdata[nls=] + dev-libs/libcerror[nls=] + dev-libs/libcfile[nls=,unicode=] + dev-libs/libclocale[nls=,unicode=] + dev-libs/libcnotify[nls=] + dev-libs/libcpath[nls=,unicode=] + dev-libs/libcsplit[nls=,unicode=] + dev-libs/libcthreads[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 ) \ + $(use_enable threads multi-threading-support) + +# --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 +} diff --git a/app-forensics/libbfio/libbfio-20221025.ebuild b/app-forensics/libbfio/libbfio-20221025.ebuild index 6b1a25819..9abb4e290 100644 --- a/app-forensics/libbfio/libbfio-20221025.ebuild +++ b/app-forensics/libbfio/libbfio-20221025.ebuild @@ -1,43 +1,59 @@ # 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 providing a basic file input/output abstraction layer" HOMEPAGE="https://github.com/libyal/libbfio" -SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" -#upstream removed the release -#SRC_URI="https://pentoo.org/~zero/distfiles/${PN}-alpha-${PV}.tar.gz" +SRC_URI="https://github.com/libyal/libbfio/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz" + +# It would make more sense to put this package in dev-libs/ instead of app-forensics/, +# but this is where it is in the main Gentoo repository, so we'll just stick with that. LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="nls unicode" +KEYWORDS="amd64 ~arm64 x86" +IUSE="nls +threads unicode debug" -DEPEND="dev-libs/libcerror - dev-libs/libcthreads - dev-libs/libcdata - dev-libs/libclocale - dev-libs/libcnotify - dev-libs/libcsplit - dev-libs/libuna - dev-libs/libcfile - dev-libs/libcpath - " +DEPEND=" + dev-libs/libcdata[nls=] + dev-libs/libcerror[nls=] + dev-libs/libcfile[nls=,unicode=] + dev-libs/libclocale[nls=,unicode=] + dev-libs/libcnotify[nls=] + dev-libs/libcpath[nls=,unicode=] + dev-libs/libcsplit[nls=,unicode=] + dev-libs/libcthreads[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) \ + econf \ + $(use_enable nls) \ $(use_with nls libiconv-prefix) \ $(use_with nls libintl-prefix) \ - $(use_enable unicode wide-character-type) -# --with-libcerror \ -# --with-libcthreads \ -# --with-libcdata \ -# --with-libclocale \ -# --with-libcnotify \ -# --with-libcsplit \ -# --with-libuna \ -# --with-libcfile \ -# --with-libcpath + $(use_enable unicode wide-character-type) \ + $(use_enable debug verbose-output ) \ + $(use_enable debug debug-output ) \ + $(use_enable threads multi-threading-support) + +# --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 } From 0043f14a9b632655a7ea9e6defd4db44efef5cc3 Mon Sep 17 00:00:00 2001 From: Volker Wegert Date: Fri, 2 Dec 2022 21:00:17 +0100 Subject: [PATCH 2/2] remove .la files before installing --- app-forensics/libbfio/libbfio-20220120.ebuild | 6 ++++++ app-forensics/libbfio/libbfio-20221025.ebuild | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/app-forensics/libbfio/libbfio-20220120.ebuild b/app-forensics/libbfio/libbfio-20220120.ebuild index 9abb4e290..7503003f3 100644 --- a/app-forensics/libbfio/libbfio-20220120.ebuild +++ b/app-forensics/libbfio/libbfio-20220120.ebuild @@ -57,3 +57,9 @@ src_configure() { # [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/app-forensics/libbfio/libbfio-20221025.ebuild b/app-forensics/libbfio/libbfio-20221025.ebuild index 9abb4e290..7503003f3 100644 --- a/app-forensics/libbfio/libbfio-20221025.ebuild +++ b/app-forensics/libbfio/libbfio-20221025.ebuild @@ -57,3 +57,9 @@ src_configure() { # [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 +}