[gentoo-dev] [PATCH 1/3] db-use.eclass: Drop support for EAPI 5 and 6

[gentoo-dev] [PATCH 1/3] db-use.eclass: Drop support for EAPI 5 and 6

[James Le Cuirot]

The last consumers have been dropped from the gentoo repo.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 eclass/db-use.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass
index 55e72286fda4..3e5d6f63fa2e 100644
--- a/eclass/db-use.eclass
+++ b/eclass/db-use.eclass
@@ -8,7 +8,7 @@
 # maintainer-needed@gentoo.org
 # @AUTHOR:
 # Paul de Vrieze <pauldv@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: This is a common location for functions that aid the use of sys-libs/db
 # @DESCRIPTION:
 # This eclass is designed to provide helpful functions for depending on
@@ -16,7 +16,6 @@
 
 # multilib is used for get_libname in all EAPI
 case ${EAPI} in
-	5|6) inherit eapi7-ver ;& # fallthrough
 	7|8) inherit multilib ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
-- 
2.38.1

[gentoo-dev] [PATCH 2/3] db-use.eclass: Use ESYSROOT rather than EPREFIX where appropriate

[James Le Cuirot]

EPREFIX would be appropriate for values used at runtime.

db_findver and db_libname check for the presence of files or directories
at build time.

db_includedir returns a header directory, which would almost certainly
only be used at build time.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 eclass/db-use.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass
index 3e5d6f63fa2e..99f31a17a738 100644
--- a/eclass/db-use.eclass
+++ b/eclass/db-use.eclass
@@ -52,7 +52,7 @@ db_findver() {
 
 	PKG="$(best_version $1)"
 	VER="$(ver_cut 1-2 "${PKG/*db-/}")"
-	if [ -d "${EPREFIX}"/usr/include/db$(db_ver_to_slot "$VER") ]; then
+	if [ -d "${ESYSROOT}"/usr/include/db$(db_ver_to_slot "$VER") ]; then
 		#einfo "Found db version ${VER}" >&2
 		echo -n "$VER"
 		return 0
@@ -71,8 +71,8 @@ db_includedir() {
 		VER="$(db_findver sys-libs/db)" || return 1
 		VER="$(db_ver_to_slot "$VER")"
 		echo "include version ${VER}" >&2
-		if [ -d "${EPREFIX}/usr/include/db${VER}" ]; then
-			echo -n "${EPREFIX}/usr/include/db${VER}"
+		if [ -d "${ESYSROOT}/usr/include/db${VER}" ]; then
+			echo -n "${ESYSROOT}/usr/include/db${VER}"
 			return 0
 		else
 			eerror "sys-libs/db package requested, but headers not found" >&2
@@ -83,8 +83,8 @@ db_includedir() {
 		for x in $@
 		do
 			if VER=$(db_findver "=sys-libs/db-${x}*") &&
-			   [ -d "${EPREFIX}/usr/include/db$(db_ver_to_slot $VER)" ]; then
-				echo -n "${EPREFIX}/usr/include/db$(db_ver_to_slot $VER)"
+			   [ -d "${ESYSROOT}/usr/include/db$(db_ver_to_slot $VER)" ]; then
+				echo -n "${ESYSROOT}/usr/include/db$(db_ver_to_slot $VER)"
 				return 0
 			fi
 		done
@@ -102,7 +102,7 @@ db_includedir() {
 db_libname() {
 	if [ $# -eq 0 ]; then
 		VER="$(db_findver sys-libs/db)" || return 1
-		if [ -e "${EPREFIX}/usr/$(get_libdir)/libdb-${VER}$(get_libname)" ]; then
+		if [ -e "${ESYSROOT}/usr/$(get_libdir)/libdb-${VER}$(get_libname)" ]; then
 			echo -n "db-${VER}"
 			return 0
 		else
@@ -114,7 +114,7 @@ db_libname() {
 		for x in $@
 		do
 			if VER=$(db_findver "=sys-libs/db-${x}*"); then
-				if [ -e "${EPREFIX}/usr/$(get_libdir)/libdb-${VER}$(get_libname)" ]; then
+				if [ -e "${ESYSROOT}/usr/$(get_libdir)/libdb-${VER}$(get_libname)" ]; then
 					echo -n "db-${VER}"
 					return 0
 				fi
-- 
2.38.1

[gentoo-dev] [PATCH 3/3] dev-libs/apr-util: Don't prefix db_includedir with SYSROOT

[James Le Cuirot]

The function will do it for you now, although with ESYSROOT rather than
SYSROOT, which was incorrect.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
 dev-libs/apr-util/apr-util-1.6.1-r10.ebuild | 2 +-
 dev-libs/apr-util/apr-util-1.6.1-r8.ebuild  | 2 +-
 dev-libs/apr-util/apr-util-1.6.1-r9.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
index 0e42903cdab1..198a64cbc507 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r10.ebuild
@@ -96,7 +96,7 @@ src_configure() {
 			# We use $T for the libdir because otherwise it'd simply be the normal
 			# system libdir.  That's pointless as the compiler will search it for
 			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+			--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
 		)
 	else
 		myconf+=( --without-berkeley-db )
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
index 6209149b702b..b768137d1819 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r8.ebuild
@@ -95,7 +95,7 @@ src_configure() {
 			# We use $T for the libdir because otherwise it'd simply be the normal
 			# system libdir.  That's pointless as the compiler will search it for
 			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+			--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
 		)
 	else
 		myconf+=( --without-berkeley-db )
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
index facb1b2e7b80..42ff0c6607ef 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
@@ -96,7 +96,7 @@ src_configure() {
 			# We use $T for the libdir because otherwise it'd simply be the normal
 			# system libdir.  That's pointless as the compiler will search it for
 			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+			--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
 		)
 	else
 		myconf+=( --without-berkeley-db )
-- 
2.38.1