[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb/, profiles/, dev-cpp/libodb/files/

2024-03-29 Thread Michał Górny 
commit: dd5645220dd57f88938d449282fb6129b8747884
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 29 14:39:19 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 29 14:45:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd564522

dev-cpp/libodb: Remove last-rited pkg

Closes: https://bugs.gentoo.org/924587
Signed-off-by: Michał Górny  gentoo.org>

 dev-cpp/libodb/Manifest|   6 --
 ...mol-vtable-for-match_any_but_newline-exec.patch |  38 ---
 ...ild2-0.13.0_alpha0_pre20200710-nousrlocal.patch |  52 --
 dev-cpp/libodb/libodb-2.5.0_beta19.ebuild  | 112 
 dev-cpp/libodb/libodb-2.5.0_beta21.ebuild  | 111 
 dev-cpp/libodb/libodb-2.5.0_beta25.ebuild  | 113 -
 dev-cpp/libodb/metadata.xml|  17 
 profiles/package.mask  |   6 --
 8 files changed, 455 deletions(-)

diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
deleted file mode 100644
index 7ea7c38bcc61..
--- a/dev-cpp/libodb/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
-DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
-DIST build2-toolchain-0.15.0.tar.xz 5122496 BLAKE2B 
6170ccf7e251e189369873ae81a4c24fdfd7b3beb38728da0c40284a8e6329d1dd152e861bbb5d2dbc0b4931af6e72c191c52abe98111c5dbf7922df888b046e
 SHA512 
3dba63813a227a1542bcec52406c98e6d61fb366f0fe2617fac130906d0811d00356330bcd03faabf83f30604044f92e40476669a4b04060f83ede7a4db88ecb
-DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B 
d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb
 SHA512 
0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
-DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 
5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941
 SHA512 
68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
-DIST libodb-2.5.0-b.25.tar.gz 100681 BLAKE2B 
8fbb1a4db2fc994ae490f7e72be2109e0973fb6f29a6435535446e8769d7e123e85b4e6a56566e96485c9b36116a0580f2b2d32b68116e39f1a63baa63618842
 SHA512 
f99eba87130f7c3ed0b707e1f4efdb839c97c221fee24056d955072767c36106297abe76e5f82054cf5bc3bf0fda631e7c92e4943645d6ff2be57831006505ef

diff --git 
a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 
b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
deleted file mode 100644
index 00b685600c8e..
--- 
a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 
2020-06-10 19:25:37.0 +1000
-+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx  2020-08-10 
14:00:05.698012838 +1000
-@@ -5,6 +5,35 @@
- 
- #include 
- 
-+#if defined(_LIBCPP_VERSION)
-+template <>
-+void
-+std::__1::__match_any_but_newline::__exec(__state&
 __s) const
-+{
-+  if (__s.__current_ != __s.__last_)
-+  {
-+switch (*__s.__current_)
-+{
-+  case '\r':
-+  case '\n':
-+__s.__do_ = __state::__reject;
-+__s.__node_ = nullptr;
-+break;
-+  default:
-+__s.__do_ = __state::__accept_and_consume;
-+++__s.__current_;
-+__s.__node_ = this->first();
-+break;
-+}
-+  }
-+  else
-+  {
-+__s.__do_ = __state::__reject;
-+__s.__node_ = nullptr;
-+  }
-+}
-+#endif
-+
- using namespace std;
- 
- namespace build2

diff --git 
a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 
b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
deleted file mode 100644
index c3717856b6b7..
--- a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+++ /dev/null
@@ -1,52 +0,0 @@
 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx
  2020-07-10 20:12:57.0 +1000
-+++ 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx
   2020-07-14

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb-sqlite/

2023-12-19 Thread Sam James 
commit: 15ce2a687ddc3acccde171d6103304b6684d1f4c
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 03:20:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 03:26:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ce2a68

dev-cpp/libodb-sqlite: add 2.5.0_beta25

While at it, add some small bump instructions to start.

Bug: https://bugs.gentoo.org/916146
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/libodb-sqlite/Manifest |   2 +
 .../libodb-sqlite-2.5.0_beta25.ebuild  | 124 +
 2 files changed, 126 insertions(+)

diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
index beffdc9e332d..c8662032c79d 100644
--- a/dev-cpp/libodb-sqlite/Manifest
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -1,4 +1,6 @@
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
 DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
+DIST build2-toolchain-0.15.0.tar.xz 5122496 BLAKE2B 
6170ccf7e251e189369873ae81a4c24fdfd7b3beb38728da0c40284a8e6329d1dd152e861bbb5d2dbc0b4931af6e72c191c52abe98111c5dbf7922df888b046e
 SHA512 
3dba63813a227a1542bcec52406c98e6d61fb366f0fe2617fac130906d0811d00356330bcd03faabf83f30604044f92e40476669a4b04060f83ede7a4db88ecb
 DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B 
e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0
 SHA512 
be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
 DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B 
f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce
 SHA512 
a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f
+DIST libodb-sqlite-2.5.0-b.25.tar.gz 77096 BLAKE2B 
594e805428c4b6f20cefa9838175831278166e6d5612be4a79da972ca85ca95f6f8b18adadfd11ba4adcb7751f83bea8b5e3ce1f6e7ae76c5b361fcabfc633be
 SHA512 
886119c8524939fa7c094afc157ada1797dca338d6e1a488aca8552615e2050c9d555e3784226e2d28faee58019a8e51b990ee9df1af1bdfe00d591d7268d673

diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild 
b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild
new file mode 100644
index ..c1b349bd0db1
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta25.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+# Compare BUILD2_PV with the version in the tarball in the 'manifest' file.
+# e.g. from 2.5.0_beta25's manifest:
+# +depends: * build2 >= 0.15.0
+# +depends: * bpkg >= 0.15.0
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.15.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+SRC_URI="
+   https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz
+"
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   dev-cpp/libodb
+   dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+   ${DEPEND}
+   !> \
+   ${i} \
+   || die
+   done
+
+   cd "${BS}" || die
+   eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+   sed \
+   -e 's:libsqlite3[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+
+   if has_version dev-util/pkgconf; then
+   for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+   printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+   "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+   "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
+   "${i}" \
+   || die
+   done
+   sed \
+   -e 's:libpkgconf[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb/

2023-12-19 Thread Sam James 
commit: e07c1f02f6a1f542b8a7a58031d79f3a4fcc2fd0
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 03:14:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 03:26:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e07c1f02

dev-cpp/libodb: add 2.5.0_beta25

While at it, add some small bump instructions to start.

Bug: https://bugs.gentoo.org/916146
Signed-off-by: Sam James  gentoo.org>

 dev-cpp/libodb/Manifest   |   2 +
 dev-cpp/libodb/libodb-2.5.0_beta25.ebuild | 113 ++
 2 files changed, 115 insertions(+)

diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
index 8d523e99383f..7ea7c38bcc61 100644
--- a/dev-cpp/libodb/Manifest
+++ b/dev-cpp/libodb/Manifest
@@ -1,4 +1,6 @@
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
 DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
+DIST build2-toolchain-0.15.0.tar.xz 5122496 BLAKE2B 
6170ccf7e251e189369873ae81a4c24fdfd7b3beb38728da0c40284a8e6329d1dd152e861bbb5d2dbc0b4931af6e72c191c52abe98111c5dbf7922df888b046e
 SHA512 
3dba63813a227a1542bcec52406c98e6d61fb366f0fe2617fac130906d0811d00356330bcd03faabf83f30604044f92e40476669a4b04060f83ede7a4db88ecb
 DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B 
d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb
 SHA512 
0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
 DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 
5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941
 SHA512 
68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e
+DIST libodb-2.5.0-b.25.tar.gz 100681 BLAKE2B 
8fbb1a4db2fc994ae490f7e72be2109e0973fb6f29a6435535446e8769d7e123e85b4e6a56566e96485c9b36116a0580f2b2d32b68116e39f1a63baa63618842
 SHA512 
f99eba87130f7c3ed0b707e1f4efdb839c97c221fee24056d955072767c36106297abe76e5f82054cf5bc3bf0fda631e7c92e4943645d6ff2be57831006505ef

diff --git a/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild 
b/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild
new file mode 100644
index ..bb378d985315
--- /dev/null
+++ b/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+# Compare BUILD2_PV with the version in the tarball in the 'manifest' file.
+# e.g. from 2.5.0_beta25's manifest:
+# +depends: * build2 >= 0.15.0
+# +depends: * bpkg >= 0.15.0
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.15.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+SRC_URI="
+   https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz
+"
+BS="${WORKDIR}/${BUILD2_P}"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!> \
+   libodb-sqlite/buildfile \
+   || die
+   sed \
+   -e 's:libsqlite3[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+
+   if has_version dev-util/pkgconf; then
+   for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+   printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+   "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+   "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
+   "${i}" \
+   || die
+   done
+   sed \
+   -e 's:libpkgconf[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+   fi
+   popd || die
+
+   default
+}
+
+src_configure() {
+   pushd "${BS}" || die
+   emake -C build2 -f bootstrap.gmake \
+   CXX=$(tc-getCXX) \
+   CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}"
+   popd || die
+
+   b configure \
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb-sqlite/

2022-03-26 Thread Mark Wright 
commit: 8a7b23c7dde966fe988b00bb6113d562e4307464
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Mar 27 00:56:33 2022 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Mar 27 00:59:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7b23c7

dev-cpp/libodb-sqlite: Bump to 2.5.0_beta21

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright  gentoo.org>

 dev-cpp/libodb-sqlite/Manifest |   2 +
 .../libodb-sqlite-2.5.0_beta21.ebuild  | 117 +
 2 files changed, 119 insertions(+)

diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
index 1e13937d4668..beffdc9e332d 100644
--- a/dev-cpp/libodb-sqlite/Manifest
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -1,2 +1,4 @@
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
 DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B 
e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0
 SHA512 
be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901
+DIST libodb-sqlite-2.5.0-b.21.tar.gz 79975 BLAKE2B 
f9dca03ba909276ed137c15cbe32a8227b688f8b1c2d3e98b7040f3463359400fd5116088ae77722651589788e2d8e1367bc135ed2104dbc2d624ff4910f3fce
 SHA512 
a84ea3847c64e5beffcb1f3958583bc02d371a4eb354ad32d0083b01e27362905bdcf09913c9b4cd6fc977eeaba95fd46cf953332e4fd0d673ca2f7521c71a1f

diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild 
b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
new file mode 100644
index ..996133e1f47f
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta21.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz;
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   dev-cpp/libodb
+   dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+   !> \
+   ${i} \
+   || die
+   done
+
+   cd "${BS}" || die
+   eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+   sed \
+   -e 's:libsqlite3[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+
+   if has_version dev-util/pkgconf; then
+   for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+   printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+   "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+   "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
+   "${i}" \
+   || die
+   done
+   sed \
+   -e 's:libpkgconf[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+   fi
+
+   cd "${S}" || die
+   default
+}
+
+src_configure() {
+   pushd ${BS} || die
+   emake -C build2 -f bootstrap.gmake \
+   CXX=$(tc-getCXX) \
+   CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}"
+   popd || die
+
+   b configure \
+   config.cxx="$(tc-getCXX)" \
+   config.cxx.coptions="${CXXFLAGS}" \
+   config.cxx.loptions="${LDFLAGS}" \
+   config.c="$(tc-getCC)" \
+   config.cc.coptions="${CFLAGS}" \
+   config.cc.loptions="${LDFLAGS}" \
+   config.bin.ar="$(tc-getAR)" \
+   config.bin.ranlib="$(tc-getRANLIB)" \
+   config.bin.lib=shared \
+   config.install.root="${EPREFIX}"/usr \
+   config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+   config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb/

2022-03-26 Thread Mark Wright 
commit: 7ce16389d2002908328d2408bb33f4e1c7132027
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Mar 27 00:52:22 2022 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Mar 27 00:59:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce16389

dev-cpp/libodb: Bump to 2.5.0_beta21

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright  gentoo.org>

 dev-cpp/libodb/Manifest   |   2 +
 dev-cpp/libodb/libodb-2.5.0_beta21.ebuild | 111 ++
 2 files changed, 113 insertions(+)

diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
index b7102edd0e66..8d523e99383f 100644
--- a/dev-cpp/libodb/Manifest
+++ b/dev-cpp/libodb/Manifest
@@ -1,2 +1,4 @@
 DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST build2-toolchain-0.14.0.tar.xz 4687616 BLAKE2B 
98b2ec93c18027cbb3294650b3ad5d3dc97c1f06a6580437eac2db0297d3517cf327179f3a7c6efc611bffed5d028a034382d408ca58a976311d50a26534323c
 SHA512 
d238a4ddfce8506b51b3b775738e818e7e0b36961a09ae0912c0c8688057b8393afebd4c0a28c6e6827c2e72ad5b82bc5e1231f798a66c2bb86b2b1e4ece73ef
 DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B 
d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb
 SHA512 
0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b
+DIST libodb-2.5.0-b.21.tar.gz 101775 BLAKE2B 
5417c5dd4540ab6014005803ec505e9dfc8f30125f573bac045306470eb8947fe800717fc02d8af138f7dd50bb82d19f01099f28421733809ccd1858bdc0f941
 SHA512 
68fa486b3a6f1254fb57e480bdf8e1d008fe38f29c47d5a4648ff44dc964dd7f3ee9d07510d742db15120f272aa6152bf08ca9d7689e4b34b0f5e5910ea71c0e

diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild 
b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
new file mode 100644
index ..3556b3eb4d7c
--- /dev/null
+++ b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.14.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz;
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+   !> \
+   libodb-sqlite/buildfile \
+   || die
+   sed \
+   -e 's:libsqlite3[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+
+   if has_version dev-util/pkgconf; then
+   for i in build2/build2/buildfile build2/libbuild2/buildfile; do
+   printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
+   "$($(tc-getPKG_CONFIG) libpkgconf --libs)" \
+   "$($(tc-getPKG_CONFIG) libpkgconf --cflags)" >> 
\
+   "${i}" \
+   || die
+   done
+   sed \
+   -e 's:libpkgconf[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+   fi
+   popd || die
+
+   default
+}
+
+src_configure() {
+   pushd "${BS}" || die
+   emake -C build2 -f bootstrap.gmake \
+   CXX=$(tc-getCXX) \
+   CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}"
+   popd || die
+
+   b configure \
+   config.cxx="$(tc-getCXX)" \
+   config.cxx.coptions="${CXXFLAGS}" \
+   config.cxx.loptions="${LDFLAGS}" \
+   config.c="$(tc-getCC)" \
+   config.cc.coptions="${CFLAGS}" \
+   config.cc.loptions="${LDFLAGS}" \
+   config.bin.ar="$(tc-getAR)" \
+   config.bin.ranlib="$(tc-getRANLIB)" \
+   config.bin.lib=shared \
+   config.install.root="${EPREFIX}"/usr \
+   config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+   config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_compile() {
+   b update-for-install
+   use test && b update-for-test
+}
+
+src_test() {
+   b test
+}
+
+src_install() {
+   b install \
+   config.install.chroot="${D}"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb/, dev-cpp/libodb/files/

2022-03-26 Thread Mark Wright 
commit: 3d03e75f4c8c09002eb62d9849207de0e92f000a
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Mar 27 00:17:07 2022 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Mar 27 00:23:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d03e75f

dev-cpp/libodb: Move config.install.chroot="${D}" to src_install.

Closes: https://bugs.gentoo.org/836043
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright  gentoo.org>

 ...mol-vtable-for-match_any_but_newline-exec.patch | 38 ++
 dev-cpp/libodb/libodb-2.5.0_beta19.ebuild  |  7 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git 
a/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 
b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index ..00b685600c8e
--- /dev/null
+++ 
b/dev-cpp/libodb/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 
2020-06-10 19:25:37.0 +1000
 build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx  2020-08-10 
14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+ 
+ #include 
+ 
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline::__exec(__state&
 __s) const
++{
++  if (__s.__current_ != __s.__last_)
++  {
++switch (*__s.__current_)
++{
++  case '\r':
++  case '\n':
++__s.__do_ = __state::__reject;
++__s.__node_ = nullptr;
++break;
++  default:
++__s.__do_ = __state::__accept_and_consume;
++++__s.__current_;
++__s.__node_ = this->first();
++break;
++}
++  }
++  else
++  {
++__s.__do_ = __state::__reject;
++__s.__node_ = nullptr;
++  }
++}
++#endif
++
+ using namespace std;
+ 
+ namespace build2

diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild 
b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
index df3cbb7b3e1e..32154f060860 100644
--- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,7 @@ b() {
 src_prepare() {
pushd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+   eapply 
"${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
printf 'cxx.libs += %s\ncxx.poptions += %s\n' \
"-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 
--libs)" \
"$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \
@@ -91,7 +92,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
-   config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -107,5 +107,6 @@ src_test() {
 }
 
 src_install() {
-   b install
+   b install \
+   config.install.chroot="${D}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb-sqlite/files/, dev-cpp/libodb-sqlite/

2022-03-26 Thread Mark Wright 
commit: 8107eb8df72295b074f999339b97257efdec82e6
Author: Mark Wright  gentoo  org>
AuthorDate: Sun Mar 27 00:19:56 2022 +
Commit: Mark Wright  gentoo  org>
CommitDate: Sun Mar 27 00:23:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8107eb8d

dev-cpp/libodb-sqlite: Move config.install.chroot="${D}" to src_install.

Closes: https://bugs.gentoo.org/836044
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mark Wright  gentoo.org>

 ...mol-vtable-for-match_any_but_newline-exec.patch | 38 ++
 .../libodb-sqlite-2.5.0_beta19.ebuild  |  7 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git 
a/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
 
b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
new file mode 100644
index ..00b685600c8e
--- /dev/null
+++ 
b/dev-cpp/libodb-sqlite/files/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
@@ -0,0 +1,38 @@
+--- build2-toolchain-0.13.0-orig/build2/libbuild2/script/regex.cxx 
2020-06-10 19:25:37.0 +1000
 build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx  2020-08-10 
14:00:05.698012838 +1000
+@@ -5,6 +5,35 @@
+ 
+ #include 
+ 
++#if defined(_LIBCPP_VERSION)
++template <>
++void
++std::__1::__match_any_but_newline::__exec(__state&
 __s) const
++{
++  if (__s.__current_ != __s.__last_)
++  {
++switch (*__s.__current_)
++{
++  case '\r':
++  case '\n':
++__s.__do_ = __state::__reject;
++__s.__node_ = nullptr;
++break;
++  default:
++__s.__do_ = __state::__accept_and_consume;
++++__s.__current_;
++__s.__node_ = this->first();
++break;
++}
++  }
++  else
++  {
++__s.__do_ = __state::__reject;
++__s.__node_ = nullptr;
++  }
++}
++#endif
++
+ using namespace std;
+ 
+ namespace build2

diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild 
b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
index a8f86d0c81e3..667455d569ee 100644
--- a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,6 +56,7 @@ src_prepare() {
 
cd "${BS}" || die
eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
+   eapply 
"${FILESDIR}"/build2-0.13.0-libcpp-undefined-symol-vtable-for-match_any_but_newline-exec.patch
sed \
-e 's:libsqlite3[/]\?::' \
-i buildfile build/bootstrap.build \
@@ -97,7 +98,6 @@ src_configure() {
config.bin.ar="$(tc-getAR)" \
config.bin.ranlib="$(tc-getRANLIB)" \
config.bin.lib=shared \
-   config.install.chroot="${D}" \
config.install.root="${EPREFIX}"/usr \
config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
config.install.doc="${EPREFIX}"/usr/share/doc/${PF}
@@ -113,5 +113,6 @@ src_test() {
 }
 
 src_install() {
-   b install
+   b install \
+   config.install.chroot="${D}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb/, dev-cpp/libodb/files/

2020-07-21 Thread Mark Wright 
commit: 696d1bba2fa3c3aeded11b85771493a116c3
Author: Mark Wright  gentoo  org>
AuthorDate: Tue Jul 21 10:41:04 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Tue Jul 21 10:56:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696d1bba

dev-cpp/libodb: Add for dev-util/build2

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright  gentoo.org>

 dev-cpp/libodb/Manifest|   2 +
 ...ild2-0.13.0_alpha0_pre20200710-nousrlocal.patch |  52 ++
 dev-cpp/libodb/libodb-2.5.0_beta19.ebuild  | 111 +
 dev-cpp/libodb/metadata.xml|  20 
 4 files changed, 185 insertions(+)

diff --git a/dev-cpp/libodb/Manifest b/dev-cpp/libodb/Manifest
new file mode 100644
index 000..b7102edd0e6
--- /dev/null
+++ b/dev-cpp/libodb/Manifest
@@ -0,0 +1,2 @@
+DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST libodb-2.5.0-b.19.tar.gz 101239 BLAKE2B 
d6c32e4e5bbacafbecf9e992f91604dac4bb50359d41709b81116f09ce805cd2a3388cf14b47acc60d9b5a52867de0725c1dbbc7603dda8ffaf64589b3057ecb
 SHA512 
0a3e70afd2c2ba573676e1a2630986215b4c8e57a004f7d2f2227f301b6c58f739397a0efc8877902baf88b93aff83c9b67c9f5b5e87cc570d64bb76b7b8f66b

diff --git 
a/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 
b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
new file mode 100644
index 000..c3717856b6b
--- /dev/null
+++ b/dev-cpp/libodb/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
@@ -0,0 +1,52 @@
+--- 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx
  2020-07-10 20:12:57.0 +1000
 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx
   2020-07-14 14:33:58.939950579 +1000
+@@ -323,8 +323,6 @@
+ 
+ #ifndef _WIN32
+ static const dir_path usr_inc ("/usr/include");
+-static const dir_path usr_loc_lib ("/usr/local/lib");
+-static const dir_path usr_loc_inc ("/usr/local/include");
+ #  ifdef __APPLE__
+ static const dir_path a_usr_inc (
+   "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
+@@ -486,7 +484,6 @@
+ auto& ls (lib_dirs.first);
+ 
+ bool ui  (find (is.begin (), is.end (), usr_inc) != is.end ());
+-bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
+ 
+ #ifdef __APPLE__
+ // On Mac OS starting from 10.14 there is no longer /usr/include.
+@@ -509,7 +506,7 @@
+ //
+ // Is Apple's /usr/include.
+ //
+-if (!ui && !uli)
++if (!ui)
+ {
+   for (const dir_path& d: is)
+   {
+@@ -521,22 +518,16 @@
+   }
+ }
+ #endif
+-if (ui || uli)
++if (ui)
+ {
+-  bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
+-
+   // Many platforms don't search in /usr/local/lib by default (but do
+   // for headers in /usr/local/include). So add it as the last option.
+   //
+-  if (!ull && exists (usr_loc_lib, true /* ignore_error */))
+-ls.push_back (usr_loc_lib);
+ 
+   // FreeBSD is at least consistent: it searches in neither. Quoting
+   // its wiki: "FreeBSD can't even find libraries that it installed."
+   // So let's help it a bit.
+   //
+-  if (!uli && exists (usr_loc_inc, true /* ignore_error */))
+-is.push_back (usr_loc_inc);
+ }
+   }
+ #endif

diff --git a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild 
b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
new file mode 100644
index 000..df3cbb7b3e1
--- /dev/null
+++ b/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.13.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz;
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+   !> \
+   libodb-sqlite/buildfile \
+   || die
+   sed \
+   -e 's:libsqlite3[/]\?::' \
+   -i buildfile build/bootstrap.build \
+   || die
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-cpp/libodb-sqlite/files/, dev-cpp/libodb-sqlite/

2020-07-21 Thread Mark Wright 
commit: 0313417f6c230e8392b630963377b84fcb33deab
Author: Mark Wright  gentoo  org>
AuthorDate: Tue Jul 21 10:42:11 2020 +
Commit: Mark Wright  gentoo  org>
CommitDate: Tue Jul 21 10:56:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0313417f

dev-cpp/libodb-sqlite: Add for dev-util/build2

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Mark Wright  gentoo.org>

 dev-cpp/libodb-sqlite/Manifest |   2 +
 ...ild2-0.13.0_alpha0_pre20200710-nousrlocal.patch |  52 +
 .../libodb-sqlite-2.5.0_beta19.ebuild  | 117 +
 dev-cpp/libodb-sqlite/metadata.xml |  20 
 4 files changed, 191 insertions(+)

diff --git a/dev-cpp/libodb-sqlite/Manifest b/dev-cpp/libodb-sqlite/Manifest
new file mode 100644
index 000..1e13937d466
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/Manifest
@@ -0,0 +1,2 @@
+DIST build2-toolchain-0.13.0.tar.xz 4218940 BLAKE2B 
ed27290df21e5db843325b3e42c43c6934ce8f2b9b157538b921f9cfe3a7dccc3b56e261053373553cbd7fbff39e912ffe2282f812d0e6f158749ed5748d5e33
 SHA512 
0485872acd40beb700739b2995f76efcc9811dd52a38ee049576e45fcb5a7d7ae9c718beca8aeab9ab3f1c5e0270d3946f2335f88ec19476577c195417c2dbd4
+DIST libodb-sqlite-2.5.0-b.19.tar.gz 74822 BLAKE2B 
e9a5d3be8b453bcdc026b6349572c3bd88eb468329216bee535f4e1ac72bfe6c88b485efe2476303600209df42023099fdda88b410d9295e8cab73ed9dd03fc0
 SHA512 
be6dbc731d9f45dfc7e9246f404edad78d59c9d38cff6599aed56d60d4f0e8391336e2da3608f66d74559f0a8d34243eb38e7e6a1221188959321810193ae901

diff --git 
a/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch 
b/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
new file mode 100644
index 000..c3717856b6b
--- /dev/null
+++ 
b/dev-cpp/libodb-sqlite/files/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch
@@ -0,0 +1,52 @@
+--- 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d-orig/build2/libbuild2/cc/module.cxx
  2020-07-10 20:12:57.0 +1000
 
build2-toolchain-e135a3112b15c88f0601583ca068f8adea7b605d/build2/libbuild2/cc/module.cxx
   2020-07-14 14:33:58.939950579 +1000
+@@ -323,8 +323,6 @@
+ 
+ #ifndef _WIN32
+ static const dir_path usr_inc ("/usr/include");
+-static const dir_path usr_loc_lib ("/usr/local/lib");
+-static const dir_path usr_loc_inc ("/usr/local/include");
+ #  ifdef __APPLE__
+ static const dir_path a_usr_inc (
+   "/Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk/usr/include");
+@@ -486,7 +484,6 @@
+ auto& ls (lib_dirs.first);
+ 
+ bool ui  (find (is.begin (), is.end (), usr_inc) != is.end ());
+-bool uli (find (is.begin (), is.end (), usr_loc_inc) != is.end ());
+ 
+ #ifdef __APPLE__
+ // On Mac OS starting from 10.14 there is no longer /usr/include.
+@@ -509,7 +506,7 @@
+ //
+ // Is Apple's /usr/include.
+ //
+-if (!ui && !uli)
++if (!ui)
+ {
+   for (const dir_path& d: is)
+   {
+@@ -521,22 +518,16 @@
+   }
+ }
+ #endif
+-if (ui || uli)
++if (ui)
+ {
+-  bool ull (find (ls.begin (), ls.end (), usr_loc_lib) != ls.end ());
+-
+   // Many platforms don't search in /usr/local/lib by default (but do
+   // for headers in /usr/local/include). So add it as the last option.
+   //
+-  if (!ull && exists (usr_loc_lib, true /* ignore_error */))
+-ls.push_back (usr_loc_lib);
+ 
+   // FreeBSD is at least consistent: it searches in neither. Quoting
+   // its wiki: "FreeBSD can't even find libraries that it installed."
+   // So let's help it a bit.
+   //
+-  if (!uli && exists (usr_loc_inc, true /* ignore_error */))
+-is.push_back (usr_loc_inc);
+ }
+   }
+ #endif

diff --git a/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild 
b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
new file mode 100644
index 000..a8f86d0c81e
--- /dev/null
+++ b/dev-cpp/libodb-sqlite/libodb-sqlite-2.5.0_beta19.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+BUILD2_PN=build2-toolchain
+BUILD2_PV="0.13.0"
+BUILD2_P="${BUILD2_PN}-${BUILD2_PV}"
+
+inherit toolchain-funcs multiprocessing
+SRC_URI="https://pkg.cppget.org/1/beta/odb/${MY_P}.tar.gz
+   https://download.build2.org/${BUILD2_PV}/${BUILD2_P}.tar.xz;
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Common ODB runtime library"
+HOMEPAGE="https://codesynthesis.com/products/odb/;
+
+LICENSE="|| ( Code-Synthesis-ODB GPL-2 )"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+   dev-cpp/libodb
+   dev-db/sqlite:3
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+   !> \
+   ${i} \
+   ||