[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/
commit: c399e672292aa70bb8ec555c8fedb59ca2d3adb7
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 4 21:10:53 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 4 21:10:53 2021 +
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 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/*
}
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/
commit: 66b8e4266812dbeb6f264fd8bcbc83b7e331ce11
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Nov 25 18:46:02 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Nov 25 18:56:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b8e426
dev-db/wxsqlite3: x86 stable, bug #584026
Package-Manager: portage-2.3.2
dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
index e80c5d0..b83f000 100644
--- a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
LICENSE="wxWinLL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/
commit: ee661429e2fc8cbcd6d033d0a481fa9dda3ef03b
Author: Pacho Ramos gentoo org>
AuthorDate: Tue May 24 19:02:55 2016 +
Commit: Pacho Ramos gentoo org>
CommitDate: Tue May 24 19:12:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee661429
dev-db/wxsqlite3: Drop old version relying on obsolete wxGTK
Package-Manager: portage-2.3.0_rc1
dev-db/wxsqlite3/Manifest| 1 -
dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild | 60
2 files changed, 61 deletions(-)
diff --git a/dev-db/wxsqlite3/Manifest b/dev-db/wxsqlite3/Manifest
index 1c83f80..159f69b 100644
--- a/dev-db/wxsqlite3/Manifest
+++ b/dev-db/wxsqlite3/Manifest
@@ -1,2 +1 @@
-DIST wxsqlite3-3.0.6.1.tar.gz 2707120 SHA256
c1d828782c72b86733ddfc8c1591040db8cb3c814871816374a7989727290996 SHA512
b7f496f7a9f8bbb9aa32049689efba9cc32dae868f56f26837c2dcb4546c88a488955c6d71776b4f9996090680d92e23834d6757ccd77e9507a55dc7e60e2f04
WHIRLPOOL
b459c75929f209a17ca0cc757afe2ed2e4404c9654bd8db6c8fb61571746b6ce20c1623d4c8698569c9a35fd11ed77635e2a408c31701324fa09b84585660412
DIST wxsqlite3-3.2.1.tar.gz 2810940 SHA256
312f2cf63c76a70bae92b78ea6fb7e9485fb23c3ee728daa418babab881939e4 SHA512
c62380815d881e9f08727cf28047d81acabf791429ee1a5df4db4a6e101a5c7c5fe6e314b18e83eda9c330fb62c996db7a560163d25dc8b948a04a970e7be3d6
WHIRLPOOL
2cbf9095f08dddba4671cb5be18b980e8387365e2e7c85fde31a60fd4d6f77ec1fdca07500e29e540bd94dcd439ed55768c47c07c7089cfdaabd37a5601f244b
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild
b/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild
deleted file mode 100644
index 90afd06..000
--- a/dev-db/wxsqlite3/wxsqlite3-3.0.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit eutils multilib wxwidgets
-
-DESCRIPTION="C++ wrapper around the public domain SQLite 3.x database"
-HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/;
-SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
-
-LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- x11-libs/wxGTK:2.8[X,debug=]
- dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P%.1}"
-
-src_prepare() {
- local wxdebug
-
- rm -rf sqlite3 || die
- cp configure28 configure || die
- use debug && wxdebug="d"
- sed \
- -e "s:@WXDEBUG@:${wxdebug}:g" \
- -e "s:@WXVERSION@:${WX_GTK_VER}:g" \
- -e "s:@LIBDIR@:$(get_libdir):g" \
- -e "s:@VERSION@:${PV}:g" \
- "${FILESDIR}"/${P}.pc.in > ${PN}.pc || die
-}
-
-src_configure() {
- econf \
- --enable-shared \
- --enable-unicode \
- --with-wx-config="${WX_CONFIG}" \
- --with-wxshared \
- --with-sqlite3-prefix="${PREFIX}/usr"
-}
-
-src_install() {
- default
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${PN}.pc
-
- dodoc Readme.txt
- dohtml -r docs/html/*
- docinto samples
- dodoc -r samples/*
-}
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/
commit: 8c14a8c7812f8c744abdf425a23bcb065da285e3
Author: Justin Lecher gentoo org>
AuthorDate: Mon Oct 26 07:39:05 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Oct 26 07:39:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c14a8c7
dev-db/wxsqlite3: Drop all debug refs
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563972
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
index 5907456..07e4bd7 100644
--- a/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
@@ -15,23 +15,19 @@ SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
LICENSE="wxWinLL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE=""
DEPEND="
- x11-libs/wxGTK:3.0[X,debug=]
+ x11-libs/wxGTK:3.0[X]
dev-db/sqlite:3"
RDEPEND="${DEPEND}"
#S="${WORKDIR}/${P%.1}"
src_prepare() {
- local wxdebug
-
rm -rf sqlite3 || die
cp configure30 configure || die
- use debug && wxdebug="d"
sed \
- -e "s:@WXDEBUG@:${wxdebug}:g" \
-e "s:@WXVERSION@:${WX_GTK_VER}:g" \
-e "s:@LIBDIR@:$(get_libdir):g" \
-e "s:@VERSION@:${PV}:g" \
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/files/
commit: 705595c9d6e39ace28c9b6802820f41516810b16
Author: Justin Lecher gentoo org>
AuthorDate: Mon Oct 26 11:23:31 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Mon Oct 26 13:35:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705595c9
dev-db/wxsqlite3: Remove residual debug support
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
index c2e0e51..112fa14 100644
--- a/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
+++ b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
@@ -9,6 +9,6 @@ Name: wxsqlite3-@WXVERSION@
Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
Version: @VERSION@
#Requires: sqlite3
-Libs: -L${libdir} -lwxcode_gtk2@WXDEBUG@_wxsqlite3-@WXVERSION@
+Libs: -L${libdir} -lwxcode_gtk2_wxsqlite3-@WXVERSION@
Libs.private: -lpthread
Cflags: -I${includedir}
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/
commit: 4da60ad3eba2636cce8c89339a95c0af66d24027
Author: Justin Lecher gentoo org>
AuthorDate: Sun Oct 25 08:39:03 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Sun Oct 25 09:24:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da60ad3
dev-db/wxsqlite3: Version Bump
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563972
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
dev-db/wxsqlite3/Manifest | 1 +
dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild | 60 +
2 files changed, 61 insertions(+)
diff --git a/dev-db/wxsqlite3/Manifest b/dev-db/wxsqlite3/Manifest
index c971129..1c83f80 100644
--- a/dev-db/wxsqlite3/Manifest
+++ b/dev-db/wxsqlite3/Manifest
@@ -1 +1,2 @@
DIST wxsqlite3-3.0.6.1.tar.gz 2707120 SHA256
c1d828782c72b86733ddfc8c1591040db8cb3c814871816374a7989727290996 SHA512
b7f496f7a9f8bbb9aa32049689efba9cc32dae868f56f26837c2dcb4546c88a488955c6d71776b4f9996090680d92e23834d6757ccd77e9507a55dc7e60e2f04
WHIRLPOOL
b459c75929f209a17ca0cc757afe2ed2e4404c9654bd8db6c8fb61571746b6ce20c1623d4c8698569c9a35fd11ed77635e2a408c31701324fa09b84585660412
+DIST wxsqlite3-3.2.1.tar.gz 2810940 SHA256
312f2cf63c76a70bae92b78ea6fb7e9485fb23c3ee728daa418babab881939e4 SHA512
c62380815d881e9f08727cf28047d81acabf791429ee1a5df4db4a6e101a5c7c5fe6e314b18e83eda9c330fb62c996db7a560163d25dc8b948a04a970e7be3d6
WHIRLPOOL
2cbf9095f08dddba4671cb5be18b980e8387365e2e7c85fde31a60fd4d6f77ec1fdca07500e29e540bd94dcd439ed55768c47c07c7089cfdaabd37a5601f244b
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
b/dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
new file mode 100644
index 000..af7c565
--- /dev/null
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib wxwidgets
+
+DESCRIPTION="C++ wrapper around the public domain SQLite 3.x database"
+HOMEPAGE="http://wxcode.sourceforge.net/components/wxsqlite3/;
+SRC_URI="mirror://sourceforge/wxcode/${P}.tar.gz"
+
+LICENSE="wxWinLL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+ x11-libs/wxGTK:3.0[X,debug=]
+ dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+#S="${WORKDIR}/${P%.1}"
+
+src_prepare() {
+ local wxdebug
+
+ rm -rf sqlite3 || die
+ cp configure30 configure || die
+ use debug && wxdebug="d"
+ sed \
+ -e "s:@WXDEBUG@:${wxdebug}:g" \
+ -e "s:@WXVERSION@:${WX_GTK_VER}:g" \
+ -e "s:@LIBDIR@:$(get_libdir):g" \
+ -e "s:@VERSION@:${PV}:g" \
+ "${FILESDIR}"/${PN}-3.0.6.1.pc.in > ${PN}.pc || die
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --enable-unicode \
+ --with-wx-config="${WX_CONFIG}" \
+ --with-wxshared \
+ --with-sqlite3-prefix="${PREFIX}/usr"
+}
+
+src_install() {
+ default
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ dodoc Readme.txt
+ dohtml -r docs/html/*
+ docinto samples
+ dodoc -r samples/*
+}
[gentoo-commits] repo/gentoo:master commit in: dev-db/wxsqlite3/files/, dev-db/wxsqlite3/
commit: aff9f5d5693c4c0ce39269a69c30322496a3b109
Author: Justin Lecher gentoo org>
AuthorDate: Sun Oct 25 14:55:42 2015 +
Commit: Justin Lecher gentoo org>
CommitDate: Sun Oct 25 15:03:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff9f5d5
dev-db/wxsqlite3: Fix typo in pc file
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher gentoo.org>
dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in | 14 ++
.../{wxsqlite3-3.2.1.ebuild => wxsqlite3-3.2.1-r1.ebuild} | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
new file mode 100644
index 000..c2e0e51
--- /dev/null
+++ b/dev-db/wxsqlite3/files/wxsqlite3-3.2.1.pc.in
@@ -0,0 +1,14 @@
+# Package Information for pkg-config
+
+prefix=/usr
+wxver=@WXVERSION@
+includedir=${prefix}/include/wx-${wxver}/
+libdir=${prefix}/@LIBDIR@
+
+Name: wxsqlite3-@WXVERSION@
+Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
+Version: @VERSION@
+#Requires: sqlite3
+Libs: -L${libdir} -lwxcode_gtk2@WXDEBUG@_wxsqlite3-@WXVERSION@
+Libs.private: -lpthread
+Cflags: -I${includedir}
diff --git a/dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
similarity index 95%
rename from dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
rename to dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
index af7c565..5907456 100644
--- a/dev-db/wxsqlite3/wxsqlite3-3.2.1.ebuild
+++ b/dev-db/wxsqlite3/wxsqlite3-3.2.1-r1.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
-e "s:@WXVERSION@:${WX_GTK_VER}:g" \
-e "s:@LIBDIR@:$(get_libdir):g" \
-e "s:@VERSION@:${PV}:g" \
- "${FILESDIR}"/${PN}-3.0.6.1.pc.in > ${PN}.pc || die
+ "${FILESDIR}"/${P}.pc.in > ${PN}.pc || die
}
src_configure() {
