From 74fba6004ab33974ceb7687aa800246d7460a18f Mon Sep 17 00:00:00 2001
From: John Helmert III <ajak@gentoo.org>
Date: Tue, 27 Dec 2022 12:24:58 -0600
Subject: sys-fs/reiserfsprogs: EAPI=7 for removal of EAPI=6 from usr-ldscript

Essentially a merge between the ::gentoo and ::musl ebuilds.

Signed-off-by: John Helmert III <ajak@gentoo.org>
---
 .../reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild   | 63 ++++++++++++++++++++++
 sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild   | 63 ----------------------
 2 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
 delete mode 100644 sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild

diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
new file mode 100644
index 00000000..64abc406
--- /dev/null
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic usr-ldscript
+
+DESCRIPTION="Reiserfs Utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
+	https://www.kernel.org/pub/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+# Needed for libuuid
+RDEPEND="sys-apps/util-linux"
+BDEPEND="elibc_musl? ( sys-libs/obstack-standalone )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+	"${FILESDIR}/${PN}-3.6.27-loff_t.patch"
+	"${FILESDIR}/musl-__compar_fn_t.patch"
+	"${FILESDIR}/musl-loff_t.patch"
+	"${FILESDIR}/musl-long_long_min_max.patch"
+	"${FILESDIR}/musl-prints.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -std=gnu89 #427300
+	append-ldflags -lobstack
+
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--sbindir="${EPREFIX}/sbin"
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodir /usr/$(get_libdir)
+	mv "${ED}"/$(get_libdir)/pkgconfig "${ED}"/usr/$(get_libdir) || die
+
+	if use static-libs ; then
+		mv "${ED}"/$(get_libdir)/*a "${ED}"/usr/$(get_libdir) || die
+		gen_usr_ldscript libreiserfscore.so
+	else
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
deleted file mode 100644
index 3cc96f10..00000000
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.27.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic usr-ldscript
-
-DESCRIPTION="Reiserfs Utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/reiserfs/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/reiserfs/${P}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/jeffm/${PN}/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-BDEPEND="
-	elibc_musl? ( sys-libs/obstack-standalone )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.25-no_acl.patch"
-	"${FILESDIR}/${PN}-3.6.27-loff_t.patch"
-)
-
-src_prepare() {
-	default
-
-	if use elibc_musl ; then
-		eapply "${FILESDIR}/musl-__compar_fn_t.patch"
-		eapply "${FILESDIR}/musl-loff_t.patch"
-		eapply "${FILESDIR}/musl-long_long_min_max.patch"
-		eapply "${FILESDIR}/musl-prints.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -std=gnu89 #427300
-	use elibc_musl && append-ldflags -lobstack
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--sbindir="${EPREFIX}/sbin"
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodir /usr/$(get_libdir)
-	mv "${ED}"/$(get_libdir)/pkgconfig "${ED}"/usr/$(get_libdir) || die
-
-	if use static-libs ; then
-		mv "${ED}"/$(get_libdir)/*a "${ED}"/usr/$(get_libdir) || die
-		gen_usr_ldscript libreiserfscore.so
-	else
-		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete
-	fi
-}
-- 
cgit v1.2.3-65-gdbad