commit: dd5645220dd57f88938d449282fb6129b8747884 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 29 14:39:19 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Mar 29 14:45:25 2024 +0000 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 <mgorny <AT> 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..000000000000 --- 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..000000000000 --- 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.000000000 +1000 -+++ build2-toolchain-0.13.0/build2/libbuild2/script/regex.cxx 2020-08-10 14:00:05.698012838 +1000 -@@ -5,6 +5,35 @@ - - #include <libbuild2/script/regex.hxx> - -+#if defined(_LIBCPP_VERSION) -+template <> -+void -+std::__1::__match_any_but_newline<build2::script::regex::line_char>::__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..000000000000 --- 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.000000000 +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 deleted file mode 100644 index 32154f060860..000000000000 --- a/dev-cpp/libodb/libodb-2.5.0_beta19.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2022 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} - !<dev-util/build2-0.13.0 -" - -BS="${WORKDIR}/${BUILD2_P}" -S="${WORKDIR}/${MY_P}" - -b() { - local myargs=( - --jobs $(makeopts_jobs) - --verbose 3 - ) - export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}" - set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}" - echo "${@}" - "${@}" || die "${@} failed" -} - -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)" >> \ - 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}" -} diff --git a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild deleted file mode 100644 index 3556b3eb4d7c..000000000000 --- a/dev-cpp/libodb/libodb-2.5.0_beta21.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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} - !<dev-util/build2-0.14.0 -" - -BS="${WORKDIR}/${BUILD2_P}" -S="${WORKDIR}/${MY_P}" - -b() { - local myargs=( - --jobs $(makeopts_jobs) - --verbose 3 - ) - export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}" - set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}" - echo "${@}" - "${@}" || die "${@} failed" -} - -src_prepare() { - pushd "${BS}" || die - eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch - printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ - "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \ - "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \ - 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}" -} diff --git a/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild b/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild deleted file mode 100644 index bb378d985315..000000000000 --- a/dev-cpp/libodb/libodb-2.5.0_beta25.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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="!<dev-util/build2-${BUILD2_PV}" - -b() { - local myargs=( - --jobs $(makeopts_jobs) - --verbose 3 - ) - export LD_LIBRARY_PATH="${BS}/libbutl/libbutl:${BS}/build2/libbuild2:${BS}/build2/libbuild2/bash:${BS}/build2/libbuild2/in:${BS}/build2/libbuild2/bin:${BS}/build2/libbuild2/c:${BS}/build2/libbuild2/cc:${BS}/build2/libbuild2/cxx:${BS}/build2/libbuild2/version:${BS}/libpkgconf/libpkgconf:${LD_LIBRARY_PATH}" - set -- "${BS}"/build2/build2/b-boot "${@}" "${myargs[@]}" - echo "${@}" - "${@}" || die "${@} failed" -} - -src_prepare() { - pushd "${BS}" || die - eapply "${FILESDIR}"/build2-0.13.0_alpha0_pre20200710-nousrlocal.patch - printf 'cxx.libs += %s\ncxx.poptions += %s\n' \ - "-L${EPREFIX}/usr/$(get_libdir) $($(tc-getPKG_CONFIG) sqlite3 --libs)" \ - "$($(tc-getPKG_CONFIG) sqlite3 --cflags)" >> \ - 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}" -} diff --git a/dev-cpp/libodb/metadata.xml b/dev-cpp/libodb/metadata.xml deleted file mode 100644 index 835563982136..000000000000 --- a/dev-cpp/libodb/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - ODB is an open-source, cross-platform, and cross-database - object-relational mapping (ORM) system for C++. It allows you - to persist C++ objects to a relational database without having - to deal with tables, columns, or SQL and without manually - writing any mapping code. ODB supports MySQL, SQLite, - PostgreSQL, Oracle, and Microsoft SQL Server relational - databases as well as C++98/03 and C++11 language standards. It - also comes with optional profiles for Boost and Qt which allow - you to seamlessly use value types, containers, and smart - pointers from these libraries in your persistent C++ classes. - </longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 2c66dbac394a..5504c9f3e931 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -798,12 +798,6 @@ sys-firmware/iwl8000-ucode # Removal on 2024-03-15. Bug #924588. kde-misc/bismuth -# Michał Górny <[email protected]> (2024-02-14) -# A NIH build system with no revdeps. Broken with ccache, clang -# and possibly more. Horrible bootstrap process. -# Removal on 2024-03-15. Bug #924587. -dev-cpp/libodb - # Ulrich Müller <[email protected]> (2024-02-08) # Masked for testing. # Test failure in watchpoints.dem, undefined function FresnelC.
