From d7ea99f5a67784df00463ac1fad035618fe524e3 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 31 Mar 2021 07:38:39 +0100
Subject: sys-fabric/rds-tools: port to EAPI 6 (temporarily), drop base.eclass

EAPI 6 for a short period until we update openib.eclass to allow
us to drop base.eclass.

Signed-off-by: Sam James <sam@gentoo.org>
---
 .../rds-tools/files/rds-tools-2.0.4-qa.patch       |  4 +--
 sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild     | 28 --------------------
 sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild     | 30 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
 create mode 100644 sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild

diff --git a/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
index 0a8e1a575c4a..1be090a4f78d 100644
--- a/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
+++ b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
@@ -1,8 +1,8 @@
 Respect CC,CFLAGS, fix install paths, don't strip binaries
 
 https://bugs.gentoo.org/show_bug.cgi?id=374805
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -1,12 +1,15 @@
 -prefix		= $(DESTDIR)@prefix@
 -exec_prefix	= $(DESTDIR)@exec_prefix@
diff --git a/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
deleted file mode 100644
index 40b339cbe9fa..000000000000
--- a/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OFED_VER="3.12"
-OFED_RC="1"
-OFED_RC_VER="1"
-OFED_SUFFIX="1"
-
-inherit base openib toolchain-funcs
-
-DESCRIPTION="OpenIB userspace rds-tools"
-
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="sys-fabric/libibverbs:${SLOT}"
-RDEPEND="${DEPEND}
-	!sys-fabric/openib-userspace"
-block_other_ofed_versions
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}"/${P}-qa.patch )
-
-pkg_setup() {
-	tc-export CC
-}
diff --git a/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
new file mode 100644
index 000000000000..3a143a8889fe
--- /dev/null
+++ b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+OFED_VER="3.12"
+OFED_RC="1"
+OFED_RC_VER="1"
+OFED_SUFFIX="1"
+
+inherit openib toolchain-funcs
+
+DESCRIPTION="OpenIB userspace rds-tools"
+
+KEYWORDS="amd64 ~x86 ~amd64-linux"
+
+DEPEND="sys-fabric/libibverbs:${SLOT}"
+RDEPEND="
+	${DEPEND}
+	!sys-fabric/openib-userspace
+"
+
+block_other_ofed_versions
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}"/${P}-qa.patch )
+
+pkg_setup() {
+	tc-export CC
+}
-- 
cgit v1.2.3-65-gdbad