[gentoo-commits] repo/gentoo:master commit in: dev-db/opendbx/

["Sam James" <sam@gentoo.org>]

commit:     f8dc7a062800b34c10c063f99f697c0d15a49721
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 11:08:51 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 10 11:29:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8dc7a06

dev-db/opendbx: EAPI 8, wire up (restricted) tests

Closes: https://bugs.gentoo.org/891689
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...dbx-1.4.6-r5.ebuild => opendbx-1.4.6-r6.ebuild} | 46 ++++++++++++++--------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
similarity index 74%
rename from dev-db/opendbx/opendbx-1.4.6-r5.ebuild
rename to dev-db/opendbx/opendbx-1.4.6-r6.ebuild
index a84c00e4f96d..5a24ad4af48d 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r5.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools flag-o-matic
 
@@ -12,26 +12,35 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="firebird +man +mysql oracle postgres sqlite"
-RESTRICT="firebird? ( bindist )"
+IUSE="firebird +man +mysql oracle postgres sqlite test"
+# The test programs need manual/interactive use.
+RESTRICT="
+	firebird? ( bindist )
+	!test? ( test )
+	test
+"
+REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
 
 RDEPEND="mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( dev-db/sqlite:3 )
 	oracle? ( dev-db/oracle-instantclient[sdk] )
 	firebird? ( dev-db/firebird )"
-DEPEND="${RDEPEND}
-	man? ( app-doc/doxygen
-		app-text/docbook2X )"
-
-REQUIRED_USE="|| ( firebird mysql oracle postgres sqlite )"
-
-PATCHES=( "${FILESDIR}/${PN}-doxy.patch"
-	"${FILESDIR}/${PN}-man-optional.patch" )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	man? (
+		app-doc/doxygen
+		app-text/docbook2X
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-doxy.patch"
+	"${FILESDIR}/${PN}-man-optional.patch"
+)
 
 pkg_setup() {
-	if use oracle && [[ ! -d ${ORACLE_HOME} ]]
-	then
+	if use oracle && [[ ! -d ${ORACLE_HOME} ]]; then
 		die "Oracle support requested, but ORACLE_HOME not set to a valid directory!"
 	fi
 }
@@ -50,8 +59,8 @@ src_configure() {
 	use postgres && backends="${backends} pgsql"
 	use sqlite && backends="${backends} sqlite3"
 
-	use mysql && append-cppflags -I/usr/include/mysql
-	use firebird && append-cppflags -I/opt/firebird/include
+	use mysql && append-cppflags -I"${ESYSROOT}"/usr/include/mysql
+	use firebird && append-cppflags -I"${ESYSROOT}"/opt/firebird/include
 
 	if use oracle ; then
 		# Traditionally, OCI header files are provided in:
@@ -71,7 +80,10 @@ src_configure() {
 	# bug #788304
 	append-cxxflags -std=c++14
 
-	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
+	econf \
+		--with-backends="${backends}" \
+		--enable-manpages="$(usex man yes no)" \
+		$(use_enable test)
 }
 
 src_compile() {