[gentoo-commits] repo/gentoo:master commit in: dev-db/gigabase/files/, profiles/, dev-db/gigabase/

[Jakov Smolić]

commit:     e5c5783e0386f0a998945698232e7970108249d5
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 08:10:32 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 08:10:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c5783e

dev-db/gigabase: treeclean

Closes: https://bugs.gentoo.org/521272
Closes: https://bugs.gentoo.org/729684
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-db/gigabase/Manifest                           |   1 -
 dev-db/gigabase/files/gigabase-3.83-cpp14.patch    |  34 ----
 .../files/gigabase-3.83-fix-build-system.patch     |  63 -------
 .../files/gigabase-3.83-fix-dereferencing.patch    | 182 ---------------------
 dev-db/gigabase/gigabase-3.83-r2.ebuild            |  61 -------
 dev-db/gigabase/metadata.xml                       |  27 ---
 profiles/package.mask                              |   6 -
 7 files changed, 374 deletions(-)

diff --git a/dev-db/gigabase/Manifest b/dev-db/gigabase/Manifest
deleted file mode 100644
index 1f22a68d7a31..000000000000
--- a/dev-db/gigabase/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gigabase-3.83.tar.gz 1746301 BLAKE2B f9168a7182f2a152a36a9bda12c91f3f2507f17a28e3cac9a58ed25795fdee73e397021ef46f3ad75dffb2f76b81c47d3d8d4cc900b1345619939e450daa6e9a SHA512 df2eab9b8ceae831c24a25f010cf06ebdd38fdf2f7478116b0d769092d6e4575c5c95222562410752df462a8bf3cc2f205c05d3adfaeb1634e82f443529957e5

diff --git a/dev-db/gigabase/files/gigabase-3.83-cpp14.patch b/dev-db/gigabase/files/gigabase-3.83-cpp14.patch
deleted file mode 100644
index 47d2a1a540ff..000000000000
--- a/dev-db/gigabase/files/gigabase-3.83-cpp14.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch fixes GCC6 (C++14) compilation errors. It replaces two invalid macro
-calls with correct code in one place. It also removes redefinitions of fmax and
-fmin functions which exist in standard library since C++11.
-Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=594550
-
---- a/testddl.cpp
-+++ b/testddl.cpp
-@@ -102,8 +102,13 @@
- 
- REGISTER(Record);
- 
-+#if __cplusplus < 201103L
- USER_FUNC(sin);
- USER_FUNC(cos);
-+#else
-+static dbUserFunction fsin_descriptor((double (*)(double))&sin, STRLITERAL("sin"));
-+static dbUserFunction fcos_descriptor((double (*)(double))&cos, STRLITERAL("cos"));
-+#endif
- 
- int __cdecl main()
- {
---- a/testtimeseries.cpp
-+++ b/testtimeseries.cpp
-@@ -47,8 +47,10 @@
- REGISTER(Stock);
- 
- inline int random(unsigned mod) { return rand() % mod; }
-+#if __cplusplus < 201103L
- inline float fmax(float x, float y) { return x > y ? x : y; }
- inline float fmin(float x, float y) { return x < y ? x : y; }
-+#endif
- 
- int main(int argc, char* argv[])
- {

diff --git a/dev-db/gigabase/files/gigabase-3.83-fix-build-system.patch b/dev-db/gigabase/files/gigabase-3.83-fix-build-system.patch
deleted file mode 100644
index d807bc9a7fdb..000000000000
--- a/dev-db/gigabase/files/gigabase-3.83-fix-build-system.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Fix build system to respect DESTDIR and rename subsql to subsql-gdb,
-in order to avoid name clash with FastDB version of subsql.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -21,7 +21,7 @@
- # Place where to copy Gigabase library
- libdir = @libdir@
- 
--# Place where to copy Gigabase subsql utility
-+# Place where to copy Gigabase subsql-gdb utility
- bindir = @bindir@
- 
- VERSION = 2
-@@ -42,7 +42,7 @@
- 
- GB_LIB = libgigabase$(SUFF).${LIBEXT}
- CLI_LIB = libcli$(SUFF).${LIBEXT}
--EXES = subsql
-+EXES = subsql-gdb
- 
- EXAMPLES = guess testdb testjoin testddl testperf testspat testperf2 testsync testiref testtrav testidx testidx2 clitest testblob testleak testsession testtimeseries testtl
- WEB_EXAMPLES = cgistub bugdb clidb
-@@ -90,8 +90,8 @@
- clitest: clitest.o $(CLI_LIB)
- 	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o clitest clitest.o $(CLI_LIB) $(SOCKLIBS)
- 
--subsql: subsql.o $(GB_LIB)
--	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o subsql subsql.o $(GB_LIB) $(SOCKLIBS)
-+subsql-gdb: subsql.o $(GB_LIB)
-+	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o subsql-gdb subsql.o $(GB_LIB) $(SOCKLIBS)
- 
- bugdb: bugdb.o $(GB_LIB)
- 	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o bugdb bugdb.o $(GB_LIB) $(SOCKLIBS)
-@@ -153,18 +153,18 @@
- testleak: testleak.o $(GB_LIB)
- 	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o testleak testleak.o $(GB_LIB) $(SLHACK)
- 
--install: subsql $(GB_LIB) $(CLI_LIB)
--	mkdir -p $(includedir)
--	cp $(INCS) $(CLI_INCS) $(includedir)
--	mkdir -p $(libdir)
--	$(LIBTOOL) --mode=install $(INSTALL) $(GB_LIB) $(CLI_LIB) $(libdir)
--	mkdir -p $(bindir)
--	if test -x .libs/subsql ; then \
--		cp .libs/subsql $(bindir); \
-+install: subsql-gdb $(GB_LIB) $(CLI_LIB)
-+	mkdir -p $(DESTDIR)$(includedir)
-+	cp $(INCS) $(CLI_INCS) $(DESTDIR)$(includedir)
-+	mkdir -p $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL) $(GB_LIB) $(CLI_LIB) $(DESTDIR)$(libdir)
-+	mkdir -p $(DESTDIR)$(bindir)
-+	if test -x .libs/subsql-gdb ; then \
-+		cp .libs/subsql-gdb $(DESTDIR)$(bindir); \
- 	else \
--		cp subsql $(bindir); \
-+		cp subsql-gdb $(DESTDIR)$(bindir); \
- 	fi
--#	strip $(bindir)/subsql
-+#	strip $(bindir)/subsql-gdb
- 
- clean:
- 	rm -f *.o *.lo core *~

diff --git a/dev-db/gigabase/files/gigabase-3.83-fix-dereferencing.patch b/dev-db/gigabase/files/gigabase-3.83-fix-dereferencing.patch
deleted file mode 100644
index d2f0669d24fa..000000000000
--- a/dev-db/gigabase/files/gigabase-3.83-fix-dereferencing.patch
+++ /dev/null
@@ -1,182 +0,0 @@
---- a/session.cpp
-+++ b/session.cpp
-@@ -131,7 +131,7 @@
-         throw CursorException("Cursor is not opened");
-     }
-     fillBuffer(sizeof(oid_t));
--    oid_t currOid = *(oid_t*)&sockBuf[bufPos];
-+    oid_t currOid = *(oid_t*)(sockBuf + bufPos);
-     bufPos += sizeof(oid_t);
-     if (currObj != NULL) { 
-         delete[] currObj;
-@@ -139,7 +139,7 @@
-     }
-     if (currOid != 0) { 
-         fillBuffer(sizeof(int));
--        size_t size = *(int*)&sockBuf[bufPos];
-+        size_t size = *(int*)(sockBuf + bufPos);
-         if (size <= SOCKET_BUFFER_SIZE) { 
-             fillBuffer(size);
-             if (record != NULL) { 
---- a/database.cpp
-+++ b/database.cpp
-@@ -739,40 +739,55 @@
-         return;
- 
-       case dbvmInvokeMethodBool:
--        execute(expr->ref.base, iattr, sattr);
--        expr->ref.field->method->invoke(sattr.base, &sattr.bvalue);
--        sattr.bvalue = *(bool*)&sattr.bvalue;
--        iattr.free(sattr);
--        return;
-+      { 
-+          bool val;
-+          execute(expr->ref.base, iattr, sattr);
-+          expr->ref.field->method->invoke(sattr.base, &val);
-+          sattr.bvalue = val;
-+          iattr.free(sattr);
-+          return;
-+      }
-       case dbvmInvokeMethodInt1:
--        execute(expr->ref.base, iattr, sattr);
--        expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
--        sattr.ivalue = *(int1*)&sattr.ivalue;
--        iattr.free(sattr);
--        return;
-+      {
-+          int1 val;
-+          execute(expr->ref.base, iattr, sattr);
-+          expr->ref.field->method->invoke(sattr.base, &val);
-+          sattr.ivalue = val;
-+          iattr.free(sattr);
-+          return;
-+      }
-       case dbvmInvokeMethodInt2:
--        execute(expr->ref.base, iattr, sattr);
--        expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
--        sattr.ivalue = *(int2*)&sattr.ivalue;
--        iattr.free(sattr);
--        return;
-+      {
-+          int2 val;
-+          execute(expr->ref.base, iattr, sattr);
-+          expr->ref.field->method->invoke(sattr.base, &val);
-+          sattr.ivalue = val;
-+          iattr.free(sattr);
-+          return;
-+      }
-       case dbvmInvokeMethodInt4:
--        execute(expr->ref.base, iattr, sattr);
--        expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
--        sattr.ivalue = *(int4*)&sattr.ivalue;
--        iattr.free(sattr);
--        return;
-+      {
-+          int4 val;
-+          execute(expr->ref.base, iattr, sattr);
-+          expr->ref.field->method->invoke(sattr.base, &val);
-+          sattr.ivalue = val;
-+          iattr.free(sattr);
-+          return;
-+      }
-       case dbvmInvokeMethodInt8:
-         execute(expr->ref.base, iattr, sattr);
-         expr->ref.field->method->invoke(sattr.base, &sattr.ivalue);
-         iattr.free(sattr);
-         return;
-       case dbvmInvokeMethodReal4:
--        execute(expr->ref.base, iattr, sattr);
--        expr->ref.field->method->invoke(sattr.base, &sattr.fvalue);
--        sattr.fvalue = *(real4*)&sattr.fvalue;
--        iattr.free(sattr);
--        return;
-+      {
-+          real4 val;
-+          execute(expr->ref.base, iattr, sattr);
-+          expr->ref.field->method->invoke(sattr.base, &val);
-+          sattr.fvalue = val;
-+          iattr.free(sattr);
-+          return;
-+      }
-       case dbvmInvokeMethodReal8:
-         execute(expr->ref.base, iattr, sattr);
-         expr->ref.field->method->invoke(sattr.base, &sattr.fvalue);
-@@ -792,28 +807,43 @@
-         return;
-  
-       case dbvmInvokeSelfMethodBool:
--        expr->ref.field->method->invoke(iattr.record, &sattr.bvalue);
--        sattr.bvalue = *(bool*)&sattr.bvalue;
--        return;
-+      {
-+          bool val;
-+          expr->ref.field->method->invoke(iattr.record, &val);
-+          sattr.bvalue = val;
-+          return;
-+      }
-       case dbvmInvokeSelfMethodInt1:
--        expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
--        sattr.ivalue = *(int1*)&sattr.ivalue;
--        return;
-+      {
-+          int1 val;
-+          expr->ref.field->method->invoke(iattr.record, &val);
-+          sattr.ivalue = val;
-+          return;
-+      }
-       case dbvmInvokeSelfMethodInt2:
--        expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
--        sattr.ivalue = *(int2*)&sattr.ivalue;
--        return;
-+      {
-+          int2 val;
-+          expr->ref.field->method->invoke(iattr.record, &val);
-+          sattr.ivalue = val;
-+          return;
-+      }
-       case dbvmInvokeSelfMethodInt4:
--        expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
--        sattr.ivalue = *(int4*)&sattr.ivalue;
--        return;
-+      {
-+          int4 val;
-+          expr->ref.field->method->invoke(iattr.record, &val);
-+          sattr.ivalue = val;
-+          return;
-+      }
-       case dbvmInvokeSelfMethodInt8:
-         expr->ref.field->method->invoke(iattr.record, &sattr.ivalue);
-         return;
-       case dbvmInvokeSelfMethodReal4:
--        expr->ref.field->method->invoke(iattr.record, &sattr.fvalue);
--        sattr.fvalue = *(real4*)&sattr.fvalue;
--        return;
-+      {
-+          real4 val;
-+          expr->ref.field->method->invoke(iattr.record, &val);
-+          sattr.fvalue = *(real4*)&sattr.fvalue;
-+          return;
-+      }
-       case dbvmInvokeSelfMethodReal8:
-         expr->ref.field->method->invoke(iattr.record, &sattr.fvalue);
-         return;
---- a/server.cpp
-+++ b/server.cpp
-@@ -2097,7 +2097,7 @@
-                 bufUsed = 0;
-             }
-             oid_t oid = cursor.getOid();
--            *(oid_t*)&buf[bufUsed] = oid;
-+            *(oid_t*)(buf + bufUsed) = oid;
-             bufUsed += sizeof(oid_t);
-             dbRecord* record = db->getRow(tie, oid);
-             size_t size = record->size;
-@@ -2129,7 +2129,7 @@
-             bufUsed = 0;
-         }
-     }
--    *(oid_t*)&buf[bufUsed] = 0;
-+    *(oid_t*)(buf + bufUsed) = 0;
-     return session->sock->write(buf, bufUsed + sizeof(oid_t));
- }
- 

diff --git a/dev-db/gigabase/gigabase-3.83-r2.ebuild b/dev-db/gigabase/gigabase-3.83-r2.ebuild
deleted file mode 100644
index 75d58541c23b..000000000000
--- a/dev-db/gigabase/gigabase-3.83-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
-HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
-SRC_URI="mirror://sourceforge/gigabase/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-dereferencing.patch"
-	"${FILESDIR}/${P}-cpp14.patch" # fix #594550
-	"${FILESDIR}/${P}-fix-build-system.patch"
-)
-
-src_configure() {
-	# bug #855230
-	append-flags -fno-strict-aliasing
-
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doxygen.cfg || die
-		HTML_DOCS=( GigaBASE.htm docs/html/. )
-	fi
-}
-
-src_test() {
-	local t
-	for t in testddl testidx testidx2 testiref testleak testperf \
-	 testperf2 testspat testtl testsync testtimeseries; do
-		./${t} || die
-	done
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	elog "The subsql binary has been renamed to subsql-gdb,"
-	elog "to avoid a name clash with the FastDB version of subsql"
-}

diff --git a/dev-db/gigabase/metadata.xml b/dev-db/gigabase/metadata.xml
deleted file mode 100644
index 525e79d7da7b..000000000000
--- a/dev-db/gigabase/metadata.xml
+++ /dev/null
@@ -1,27 +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">
-	Object-Relational Database Management System GigaBASE inherits most of the
-	features of FastDB, but uses page pool instead of direct mapping of file on
-	virtual memory. So GigaBASE is able to handle database, which size
-	significantly exceeds size of computer physical memory. Convenient and
-	flexible C++ interface makes development of application for GigaBASE very
-	easy and automatic scheme evaluation simplifies maintenance and modification
-	of the system. GigaBASE merges best features of relational (simple data
-	structure and non-procedural query language) and object-oriented (direct
-	object references, user defined types and methods) databases. GigaBASE is
-	primary oriented on application requiring fast data retrieving by means of
-	indices and direct object references, such as Web Server databases
-	applications. SUBSQL utility can be used for database browsing and
-	inspection, performing online backups, database recovery, importing data to
-	and exporting data from database. GigaBASE will perform automatic recovery
-	after system or application crash, you should not worry about it. The only
-	thing you can have to do manually is stopping all database application if
-	one of them is crashed leaving database blocked.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gigabase</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 698420c6d0a3..4b66de0dd1fd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -491,12 +491,6 @@ sci-libs/io_lib
 # Removal on 2022-08-18.
 kde-misc/plasma-applet-weather-widget
 
-# Sam James <sam@g.o> (2022-07-17)
-# Code quality issues, out of date by several versions in Gentoo,
-# unmaintained, and several open bugs: bugs #521272, #729684, #855230.
-# Removal on 2022-08-17.
-dev-db/gigabase
-
 # Hans de Graaff <graaff@g.o> (2022-07-16)
 # No longer supported upstream. Use a newer ruby version instead.
 # Masked for removal in 30 days.