summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2023-01-27 11:47:00 +0100
committerJakov Smolić <jsmolic@gentoo.org>2023-01-27 12:07:04 +0100
commit683d7f5cd27facf36ba9104eecbddc910e69a8dd (patch)
tree06ab5e1c5448ab076ac6e81f4b8ad7d024234333
parentdev-php/phptal: treeclean (diff)
downloadgentoo-683d7f5cd27facf36ba9104eecbddc910e69a8dd.tar.gz
gentoo-683d7f5cd27facf36ba9104eecbddc910e69a8dd.tar.bz2
gentoo-683d7f5cd27facf36ba9104eecbddc910e69a8dd.zip
dev-db/mysql-super-smack: treeclean
Closes: https://bugs.gentoo.org/677528 Closes: https://bugs.gentoo.org/807835 Closes: https://bugs.gentoo.org/864364 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
-rw-r--r--dev-db/mysql-super-smack/Manifest1
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch13
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch255
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch45
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch20
-rw-r--r--dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch9
-rw-r--r--dev-db/mysql-super-smack/metadata.xml11
-rw-r--r--dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild70
-rw-r--r--profiles/package.mask6
9 files changed, 0 insertions, 430 deletions
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
deleted file mode 100644
index 04d531521671..000000000000
--- a/dev-db/mysql-super-smack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST super-smack-1.3.tar.gz 155375 BLAKE2B aabcd6ab6c7da0e847c734bd57b7228a0c37f41aac789e63a8285b5a0fb43360101728ff6a2dc84b63cf9c0b5361770aa909382f9e2f50abdc2ea1e8407f835b SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch
deleted file mode 100644
index 02399905a11e..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.2.destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- super-smack-1.2/Makefile.am.orig 2004-02-23 19:57:22.000000000 -0800
-+++ super-smack-1.2/Makefile.am 2004-02-23 19:57:40.000000000 -0800
-@@ -23,8 +23,8 @@
- DATADIR= @DATADIR@
-
- install-data-local:
-- $(mkinstalldirs) $(SMACKS_DIR) $(DATADIR)
-- cp -rp $(srcdir)/smacks/* $(SMACKS_DIR)
-+ $(mkinstalldirs) $(DESTDIR)$(SMACKS_DIR) $(DESTDIR)$(DATADIR)
-+ cp -rp $(srcdir)/smacks/* $(DESTDIR)$(SMACKS_DIR)
-
-
- dist-hook:
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
deleted file mode 100644
index 97e1e1aaccc6..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
+++ /dev/null
@@ -1,255 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -16,9 +16,9 @@
-
- # Process this file with autoconf to produce a configure script.
-
--AC_INIT()
-+AC_INIT([super-smack], [1.1])
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(super-smack, 1.1)
-+AM_INIT_AUTOMAKE
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-
- # Checks for programs.
-@@ -31,6 +31,14 @@
- AM_PROG_LEX
- AC_PROG_YACC
-
-+AH_TEMPLATE([HAVE_CRYPT], [Define if we have a crypt()])
-+AH_TEMPLATE([HAVE_MYSQL], [MySQL Support])
-+AH_TEMPLATE([HAVE_ORACLE], [PostgreSQL Support])
-+AH_TEMPLATE([HAVE_PGSQL], [Oracle Support])
-+AH_TEMPLATE([SMACK_DATADIR], [Sample .smack data files])
-+
-+AC_CONFIG_MACRO_DIRS([m4])
-+
- # get super-smack datadir
- AC_ARG_WITH(datadir,
- [ --with-datadir=DIR Specify default smack datadir],
-diff -aurwN a/m4/crypt.m4 b/m4/crypt.m4
---- a/m4/crypt.m4
-+++ b/m4/crypt.m4
-@@ -0,0 +1,5 @@
-+AC_DEFUN([AC_FUNC_CRYPT], [
-+ AC_CHECK_LIB(crypt, crypt)
-+ AC_CHECK_FUNC(crypt, AC_DEFINE(HAVE_CRYPT))
-+])
-+
-diff -aruwN a/m4/lex.m4 b/m4/lex.m4
---- a/m4/lex.m4
-+++ b/m4/lex.m4
-@@ -0,0 +1,6 @@
-+AC_DEFUN([AM_PROG_LEX],
-+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
-+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
-+AC_PROG_LEX
-+AC_DECL_YYTEXT])
-+
-diff -aurwN a/m4/libz.m4 b/m4/libz.m4
---- a/m4/libz.m4
-+++ b/m4/libz.m4
-@@ -0,0 +1,4 @@
-+AC_DEFUN([AC_LIB_Z], [
-+ AC_CHECK_LIB(z, compress)
-+])
-+
-diff -aurwN a/m4/mysql.m4 b/m4/mysql.m4
---- a/m4/mysql.m4
-+++ b/m4/mysql.m4
-@@ -0,0 +1,76 @@
-+#serial 1
-+AC_DEFUN([AC_LIB_MYSQL], [
-+ AC_ARG_WITH(mysql-lib,
-+ [ --with-mysql-lib=DIR Look for MySQL client library in DIR],
-+ mysql_lib=$withval, mysql_lib="")
-+
-+ if test "x$want_mysql" = "xyes"
-+ then
-+ AC_MSG_CHECKING([for libmysqlclient])
-+ AC_MSG_RESULT()
-+
-+ mysql_ok=no
-+
-+ SAVE_LIBS=$LIBS
-+
-+ mysql_lib="$mysql_lib /usr/lib /usr/lib/mysql \
-+ /usr/local/lib /usr/local/lib/mysql \
-+ /usr/local/mysql/lib"
-+
-+ for dir in $mysql_lib; do
-+ if test "x$mysql_found" != "xyes"
-+ then
-+ if test -f "$dir/libmysqlclient.so" ;
-+ then
-+ LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
-+ MYSQL_LIB="-L$dir -lmysqlclient $LIBZ_LIB"
-+ AC_SUBST(MYSQL_LIB)
-+ AC_CHECK_LIB(mysqlclient, mysql_real_connect,
-+ mysql_ok=yes, mysql_ok=no)
-+ fi
-+ fi
-+ done
-+
-+ if test "x$mysql_ok" != "xyes"
-+ then
-+ AC_MSG_ERROR([Could not find libmysqlclient in '$mysql_lib'])
-+ fi
-+ fi
-+])
-+
-+AC_DEFUN([AC_HEADER_MYSQL], [
-+ AC_ARG_WITH(mysql-include,
-+ [ --with-mysql-include=DIR
-+ Look for MySQL include files in DIR],
-+ mysql_include=$withval, mysql_include="")
-+
-+ if test "x$want_mysql" = "xyes"
-+ then
-+ AC_MSG_CHECKING([for mysql.h])
-+ AC_MSG_RESULT()
-+
-+ mysql_found=no
-+
-+ mysql_include="$mysql_include /usr/include /usr/include/mysql \
-+ /usr/local/include /usr/local/include/mysql \
-+ /usr/local/mysql/include"
-+
-+ for dir in $mysql_include; do
-+ if test "x$mysql_found" != "xyes"
-+ then
-+ if test -f "$dir/mysql.h"
-+ then
-+ MYSQL_INCLUDE="-I$dir"
-+ AC_SUBST(MYSQL_INCLUDE)
-+ mysql_found=yes
-+ fi
-+ fi
-+ done
-+
-+ if test "x$mysql_found" != "xyes"
-+ then
-+ AC_MSG_ERROR([Could not find mysql.h in '$mysql_include'])
-+ fi
-+ fi
-+])
-+
-diff -aurwN a/m4/oracle.m4 b/m4/oracle.m4
---- a/m4/oracle.m4
-+++ b/m4/oracle.m4
-@@ -0,0 +1,10 @@
-+AC_DEFUN([AC_LIB_ORACLE], [
-+ ORACLE_LIB=""
-+ AC_SUBST(ORACLE_LIB)
-+])
-+
-+AC_DEFUN([AC_HEADER_ORACLE], [
-+ ORACLE_INCLUDE=""
-+ AC_SUBST(ORACLE_INCLUDE)
-+])
-+
-diff -aurwN a/m4/postgresql.m4 b/m4/postgresql.m4
---- a/m4/postgresql.m4
-+++ b/m4/postgresql.m4
-@@ -0,0 +1,75 @@
-+AC_DEFUN([AC_LIB_PGSQL], [
-+ AC_ARG_WITH(pgsql-lib,
-+ [ --with-pgsql-lib=DIR Look for PostgreSQL client library in DIR],
-+ pgsql_lib=$withval, pgsql_lib="")
-+
-+ if test "x$want_pgsql" = "xyes"
-+ then
-+ AC_MSG_CHECKING([for libpq])
-+ AC_MSG_RESULT()
-+
-+ pgsql_ok=no
-+
-+ SAVE_LIBS=$LIBS
-+
-+ pgsql_lib="$pgsql_lib /usr/lib /usr/lib/pgsql \
-+ /usr/local/lib /usr/local/lib/pgsql \
-+ /usr/local/pgsql/lib"
-+
-+ for dir in $pgsql_lib; do
-+ if test "x$pgsql_found" != "xyes"
-+ then
-+ if test -f "$dir/libpq.so"
-+ then
-+ LIBS="-L$dir $SAVE_LIBS"
-+ PGSQL_LIB="-L$dir -lpq"
-+ AC_SUBST(PGSQL_LIB)
-+ AC_CHECK_LIB(pq, PQconnectdb,
-+ pgsql_ok=yes, pgsql_ok=no)
-+ fi
-+ fi
-+ done
-+
-+ if test "x$pgsql_ok" != "xyes"
-+ then
-+ AC_MSG_ERROR([Could not find libpq in '$pgsql_lib'])
-+ fi
-+ fi
-+])
-+
-+AC_DEFUN([AC_HEADER_PGSQL], [
-+ AC_ARG_WITH(pgsql-include,
-+ [ --with-pgsql-include=DIR
-+ Look for PostgreSQL include files in DIR],
-+ pgsql_include=$withval, pgsql_include="")
-+
-+ if test "x$want_pgsql" = "xyes"
-+ then
-+ AC_MSG_CHECKING([for libpq-fe.h])
-+ AC_MSG_RESULT()
-+
-+ pgsql_found=no
-+
-+ pgsql_include="$pgsql_include /usr/include /usr/include/pgsql \
-+ /usr/local/include /usr/local/include/pgsql \
-+ /usr/local/pgsql/include"
-+
-+ for dir in $pgsql_include; do
-+ if test "x$pgsql_found" != "xyes"
-+ then
-+ if test -f "$dir/libpq-fe.h"
-+ then
-+ PGSQL_INCLUDE="-I$dir"
-+ AC_SUBST(PGSQL_INCLUDE)
-+ pgsql_found=yes
-+ fi
-+ fi
-+ done
-+
-+ if test "x$pgsql_found" != "xyes"
-+ then
-+ AC_MSG_ERROR([Could not find libpq-fe.h in '$pgsql_include'])
-+ fi
-+ fi
-+])
-+
-diff -aurwN a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,7 +16,8 @@
-
- # Process this file with automake to create Makefile.in
-
--INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+AM_CPPFLAGS = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-+BUILT_SOURCES = super-smack-yacc.hh
-
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client
- bin_PROGRAMS=super-smack super-smack-gen-data
-diff -aurN a/src/super-smack-lex.ll b/src/super-smack-lex.ll
---- a/src/super-smack-lex.ll
-+++ b/src/super-smack-lex.ll
-@@ -6,7 +6,7 @@
- #include <ctype.h>
- #include "query.h"
- #include "parse.h"
-- #include "super-smack-yacc.h"
-+ #include "super-smack-yacc.hh"
-
- static string q_str = "";
- %}
-
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch
deleted file mode 100644
index 37abfe35ec97..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-gen-data.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuar super-smack-1.3.orig/smacks/select-key.smack super-smack-1.3/smacks/select-key.smack
---- super-smack-1.3.orig/smacks/select-key.smack 2005-05-30 03:04:38.000000000 -0700
-+++ super-smack-1.3/smacks/select-key.smack 2008-11-13 22:27:48.125627179 -0800
-@@ -24,7 +24,7 @@
- min_rows "90000"; // the table must have at least that many rows
- data_file "words.dat"; // if the table is empty, load the data from
- //this file
-- gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
-+ gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
- // if the file above does not exist, generate it with the above shell command
- // you can replace this command with anything that prints comma-delimited
- // data to stdout, just make sure you have the right number of columns
-diff -Nuar super-smack-1.3.orig/smacks/update-select.smack super-smack-1.3/smacks/update-select.smack
---- super-smack-1.3.orig/smacks/update-select.smack 2005-05-30 03:04:51.000000000 -0700
-+++ super-smack-1.3/smacks/update-select.smack 2008-11-13 22:27:45.070167829 -0800
-@@ -24,7 +24,7 @@
- min_rows "90000"; // the table must have at least that many rows
- data_file "words.dat"; // if the table is empty, load the data from
- //this file
-- gen_data_file "gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
-+ gen_data_file "super-smack-gen-data -n 90000 -f %12-12s%n,%25-25s,%n,%d";
- // if the file above does not exist, generate it with the above command
- }
-
-diff -Nuar super-smack-1.3.orig/src/Makefile.am super-smack-1.3/src/Makefile.am
---- super-smack-1.3.orig/src/Makefile.am 2001-02-24 03:44:30.000000000 -0800
-+++ super-smack-1.3/src/Makefile.am 2008-11-13 22:27:37.693573246 -0800
-@@ -19,7 +19,7 @@
- INCLUDES = @MYSQL_INCLUDE@ @PGSQL_INCLUDE@ @ORACLE_INCLUDE@
-
- noinst_PROGRAMS=test-dictionary test-client test_tcp_client
--bin_PROGRAMS=super-smack gen-data
-+bin_PROGRAMS=super-smack super-smack-gen-data
- test_dictionary_SOURCES=test-dictionary.cc \
- dictionary.cc dictionary.h \
- die.cc die.h \
-@@ -57,7 +57,7 @@
- tcp_client.h tcp_client.cc
- super_smack_LDADD = @MYSQL_LIB@ @PGSQL_LIB@ @ORACLE_LIB@
-
--gen_data_SOURCES=gen-data.cc die.cc die.h
-+super_smack_gen_data_SOURCES=gen-data.cc die.cc die.h
-
- # yacc needs to generate a y.tab.h
- YFLAGS = -d
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch
deleted file mode 100644
index c2c5db0c56f0..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.amd64.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- supesmack-1.3/src/query.cc.orig 2005-04-30 14:51:29.000000000 +0100
-+++ supesmack-1.3/src/query.cc 2006-08-15 22:06:06.000000000 +0100
-@@ -197,7 +197,7 @@
- {
- string s((*i).first);
- int str_len = (*i).first.length();
-- if((unsigned)p + str_len + 3 *sizeof(int) < (unsigned)p_end )
-+ if((unsigned long)p + str_len + 3 *sizeof(int) < (unsigned long)p_end )
- {
- *p++ = (char) str_len;
- const char* q_type_name = s.c_str();
-@@ -216,7 +216,7 @@
- die(0, "report buffer overflow -- too many query types");
- }
-
-- len = (unsigned)p - (unsigned)buf;
-+ len = (unsigned long)p - (unsigned long)buf;
- *(buf) = num_recs;
-
- if(write(fd, buf, len) != len)
diff --git a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch
deleted file mode 100644
index ec99b5da2217..000000000000
--- a/dev-db/mysql-super-smack/files/mysql-super-smack-1.3.gcc4.3.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/dictionary.h.orig 2008-10-31 19:12:51.000000000 +0100
-+++ b/src/dictionary.h 2008-10-31 19:13:12.000000000 +0100
-@@ -23,6 +23,7 @@
-
- #include <string>
- #include <vector>
-+#include <cstring>
- #include <time.h>
- #include <stdlib.h>
diff --git a/dev-db/mysql-super-smack/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
deleted file mode 100644
index 80c2abfd5594..000000000000
--- a/dev-db/mysql-super-smack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
- <maintainer type="project">
- <email>mysql-bugs@gentoo.org</email>
- <name>MySQL</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
deleted file mode 100644
index bd76dac46b7a..000000000000
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="super-smack-${PV}"
-
-DESCRIPTION="Benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
-HOMEPAGE="http://vegan.net/tony/supersmack/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres"
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="
- sys-libs/zlib:=
- mysql? ( dev-db/mysql-connector-c:= )
- postgres? ( dev-db/postgresql:*[server] )"
-RDEPEND="
- ${DEPEND}
- mysql? ( virtual/mysql )"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.destdir.patch
- "${FILESDIR}"/${PN}-1.3.amd64.patch
- "${FILESDIR}"/${PN}-1.3.gcc4.3.patch
- "${FILESDIR}"/${PN}-1.3-gen-data.patch
- "${FILESDIR}"/${PN}-1.3-autotools.patch
-)
-
-src_prepare() {
- default
- # Clean up files so eautoreconf does not pick up any
- # deprecated autotools macros.
- rm acinclude.m4 aclocal.m4 acconfig.h config.status config.h || die
-
- eautoreconf
-}
-
-src_configure() {
- append-cxxflags -std=gnu++98
-
- local myeconfargs=(
- $(usev mysql --with-mysql)
- $(usev postgres --with-pgsql)
- --with-datadir="${EPREFIX}"/var/tmp/super-smack
- --with-smacks-dir="${EPREFIX}"/usr/share/super-smack
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- dodoc MANUAL TUTORIAL
-
- keepdir /var/tmp/super-smack
-}
-
-pkg_postinst() {
- elog "The gen-data binary is now installed as super-smack-gen-data"
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index b6caf1f6e831..40000547632b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -819,12 +819,6 @@ sci-libs/votca-tools
sci-libs/libgenome
sci-libs/libmems
-# Michał Górny <mgorny@gentoo.org> (2022-12-21)
-# Fails to build both against MySQL and PostgreSQL. Homepage gone.
-# Last bumped in 2005.
-# Removal on 2023-01-20. Bug #677528, #807835.
-dev-db/mysql-super-smack
-
# Georgy Yakovlev <gyakovlev@gentoo.org> (2022-12-19)
# This version currently is not compatible with kernel build (yet)
~dev-util/bindgen-0.63.0