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

[David Seifert]

commit:     c399e672292aa70bb8ec555c8fedb59ca2d3adb7
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  4 21:10:53 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr  4 21:10:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c399e672

dev-db/wxsqlite3: Port to EAPI 7

Bug: https://bugs.gentoo.org/689798
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild | 32 ++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild 
b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
index 5287794cfeb..ce749755002 100644
--- a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 WX_GTK_VER="3.0"
-
-inherit eutils multilib wxwidgets
+inherit wxwidgets
 
 DESCRIPTION="C++ wrapper around the public domain SQLite 3.x database"
 HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/";
@@ -14,17 +13,16 @@ SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
 LICENSE="wxWinLL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="
-       x11-libs/wxGTK:3.0[X]
+RDEPEND="
+       x11-libs/wxGTK:${WX_GTK_VER}[X]
        dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-#S="${WORKDIR}/${P%.1}"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-       rm -rf sqlite3 || die
+       default
+
+       rm -r sqlite3 || die
        cp configure30 configure || die
        sed \
                -e "s:@WXVERSION@:${WX_GTK_VER}:g" \
@@ -34,22 +32,22 @@ src_prepare() {
 }
 
 src_configure() {
+       setup-wxwidgets
        econf \
                --enable-shared \
                --enable-unicode \
                --with-wx-config="${WX_CONFIG}" \
                --with-wxshared \
-               --with-sqlite3-prefix="${PREFIX}/usr"
+               --with-sqlite3-prefix="${ESYSROOT}"/usr
 }
 
 src_install() {
+       HTML_DOCS=( docs/html/. )
        default
 
+       dodoc Readme.txt
+       dodoc -r samples
+
        insinto /usr/$(get_libdir)/pkgconfig
        doins ${PN}.pc
-
-       dodoc Readme.txt
-       dohtml -r docs/html/*
-       docinto samples
-       dodoc -r samples/*
 }