From ded26da61a0b579a31382ae8d4aa2b6e32641dce Mon Sep 17 00:00:00 2001
From: Volker Wegert <gentoo@volker-wegert.de>
Date: Thu, 17 Nov 2022 20:23:23 +0100
Subject: [PATCH] consolidated update of dev-libs/libfguid

---
 dev-libs/libfguid/Manifest                 |  2 +-
 dev-libs/libfguid/libfguid-20180219.ebuild | 25 -------------
 dev-libs/libfguid/libfguid-20180724.ebuild | 40 ++++++++++++++-------
 dev-libs/libfguid/libfguid-20220113.ebuild | 41 ++++++++++++++++++++++
 4 files changed, 70 insertions(+), 38 deletions(-)
 delete mode 100644 dev-libs/libfguid/libfguid-20180219.ebuild
 create mode 100644 dev-libs/libfguid/libfguid-20220113.ebuild

diff --git a/dev-libs/libfguid/Manifest b/dev-libs/libfguid/Manifest
index a1e57fa74..50ea981f1 100644
--- a/dev-libs/libfguid/Manifest
+++ b/dev-libs/libfguid/Manifest
@@ -1,2 +1,2 @@
-DIST libfguid-alpha-20180219.tar.gz 500643 BLAKE2B 584f5d2285e32dddc65684c43eeebbc35d9b98e4cc47996496d5390affb60446ffd8086361f0b1a1f803a91dc312bb3be8e2d6b01a8e1afd7f75a7c154c6842b SHA512 685d27603c02e6192055fe2febb01ca6fffcfd60082b13f57c188271925b4abdd266ce937a367fd016b60d755df071ffe0598328e6a9a62632a1ccfb8f107d58
 DIST libfguid-alpha-20180724.tar.gz 500741 BLAKE2B 8eed6589ed434bd37f7efa242f89f84ac6d091f12770d95f90f654234f5f75ac411a5826d67eb191a7be24b7676f59d787881717377dcc68295ba0d5050782ad SHA512 060f88da38bb8d89a5f2c37dc1e75814e7e2b603c7fe7288bec005e0a9c5508f7ebeb6c24ec566daaad7652462e8773225ec1416cbc856af6962aa6256a1abf9
+DIST libfguid-alpha-20220113.tar.gz 514897 BLAKE2B 7b9c205e04f7977a85032159ee658de4efd5d321cf2e42bc1ceca90adc0949f00a642d064ed777eaee780327881b02989a38e84ec339a81969bebb027ae0f3c5 SHA512 b8cdc333fd740575f1d6a6202463cb72ea014f4c604461f55baf0e8b7dd113e09eb699b9a14874759094fc258a39b1f068f7a59224f45b8c1d44ec9c5f739afb
diff --git a/dev-libs/libfguid/libfguid-20180219.ebuild b/dev-libs/libfguid/libfguid-20180219.ebuild
deleted file mode 100644
index 8982c6f60..000000000
--- a/dev-libs/libfguid/libfguid-20180219.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library for GUID/UUID format"
-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 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-DEPEND="dev-libs/libcerror
-	nls? ( virtual/libiconv
-		virtual/libintl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		--with-libcerror
-}
diff --git a/dev-libs/libfguid/libfguid-20180724.ebuild b/dev-libs/libfguid/libfguid-20180724.ebuild
index 26ead88e1..c0bd7d327 100644
--- a/dev-libs/libfguid/libfguid-20180724.ebuild
+++ b/dev-libs/libfguid/libfguid-20180724.ebuild
@@ -1,25 +1,41 @@
 # 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 GUID/UUID format"
-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/libfguid"
+SRC_URI="https://github.com/libyal/libfguid/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="nls"
 
-DEPEND="dev-libs/libcerror
-	nls? ( virtual/libiconv
-		virtual/libintl )"
+DEPEND="
+	dev-libs/libcerror
+	nls? (
+		virtual/libiconv
+		virtual/libintl
+	)
+"
 RDEPEND="${DEPEND}"
 
-src_configure() {
-	econf $(use_enable nls) \
-		$(use_with nls libiconv-prefix) \
-		$(use_with nls libintl-prefix) \
-		--with-libcerror
+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)
+
+#  --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/dev-libs/libfguid/libfguid-20220113.ebuild b/dev-libs/libfguid/libfguid-20220113.ebuild
new file mode 100644
index 000000000..c0bd7d327
--- /dev/null
+++ b/dev-libs/libfguid/libfguid-20220113.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Library for GUID/UUID format"
+HOMEPAGE="https://github.com/libyal/libfguid"
+SRC_URI="https://github.com/libyal/libfguid/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="nls"
+
+DEPEND="
+	dev-libs/libcerror
+	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)
+
+#  --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
+}