gentoo resync : 25.03.2022

4 files changed, 335 insertions, 6 deletions

diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index 3640a6687222..4cec062c2b3a 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -1,8 +1,10 @@
 AUX mysql-super-smack-1.2.destdir.patch 420 BLAKE2B be3b49d142a32f6ed00edbd6085d20f202f1d3061ad2e1463f2ea7be434ae1114bd9b776a03840ae9e4baff209b43a25b089a0e3863181273146e462dfcb3e7c SHA512 9319fb29af0e91bedc969a0c5f02bcac386274aa179af7ef3130b18ac9bfa36a0a422a76e50abb777323cac242283c1b680051689a6269ab7e567b5ae53a216b
 AUX mysql-super-smack-1.3-automake-1.13.patch 7680 BLAKE2B 99a28b7c857575b8e824d0e3f5ae87668a47e1e234315ad3657c5e388051164bcc03cadc9f80d9eac82f2b4f79864a595944a2ec896885b52044264ca3529755 SHA512 b74994f03b136c7642423ee5eb1346134ed127a9ca0996df83ed777f49f9dff3efe93889bc3a375868afec38be20303ffbede98dcfd3b6ec5921f0e417b5a000
+AUX mysql-super-smack-1.3-autotools.patch 6988 BLAKE2B aaf6d8cedd4a01f2f11cd80b953ea6787fa2e218ee452b009e49c1e16b05f3548072f0e65a6eed6effbcb29c65f8d576181b30e7f503242f4b0d835e79020be1 SHA512 9aa29299b945b84e6979c0c9f0184c7e0ffafdcb63ead926b05a11c3f12f6e88b1bd3157e24c6623da26bc5d5d2a5eeb20c0870286db2b4708981c9b3a27c8d3
 AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b726d4522912bc29c4d81fce41fe61caeab85c7fa93be5c3497dc21a0acabc67e59446cc941deb6fb98ac2154cf7f84214b500ff6 SHA512 6a08a3ccc158e7c8e0500a8d3231d0b1fc0d0f4a41e2a5bf40426e480c6fc373b0fa7ff5c08b5d40afe559a34b97fd00412c43fe9212047f2c4d063b98ac2154
 AUX mysql-super-smack-1.3.amd64.patch 702 BLAKE2B e986f6c487d05c9de0ee3f3a397a2c63d21c05209efc48e8fa173975b88839baa6100150d0cdd6df42b7435cc8a411b5235cf92a586850ae3d57cb564a8b95a8 SHA512 5ac9c130534d5cea6caa70f6373850181ae81c68c1eb3cb9e7a774bdeeafdf822582fe9cb548b9eb1268a2b4edc516461b95238454abefcdd25677066d720da9
 AUX mysql-super-smack-1.3.gcc4.3.patch 241 BLAKE2B 5f7dae8deb353e6129cedc5a085b933928caf3731b3ad673a56366886ece5cd8b60fdc78657bc3b0925dd171fbeba7e6df24261524efbc6f40ef9b473a11cf9f SHA512 500d8e7ee919b5359b14d22a2e9d26c0ed8cd0936376cd5179be3a92f99c753dd4b3a6cdee417468721a60aa727e09763aff64ce055e43c7ccd52b4937aaff30
 DIST super-smack-1.3.tar.gz 155375 BLAKE2B aabcd6ab6c7da0e847c734bd57b7228a0c37f41aac789e63a8285b5a0fb43360101728ff6a2dc84b63cf9c0b5361770aa909382f9e2f50abdc2ea1e8407f835b SHA512 5343fa78bdf483c1019c9e25d1fdb15581342d49b863a536eb1cf8c38bde5641fdf135fe5a8ec87f74051fd9766b2f5e4f09f963afe2eb1cd7ea41edfa260920
 EBUILD mysql-super-smack-1.3-r4.ebuild 1654 BLAKE2B 3650bff6eae5f0e512f9971b6b8ce99c16fdf8068aba0c83d8de264e1561c319ac7f433741fb5b08d31569ec16615d6b58c2d73685dcd814b9db3d636f26ac68 SHA512 f5b78b4d4a81d6d6b7bf75d05bdb555f4ec59ecf594cb5706f11c2ae24f8760c43d87c43c9b18e4f8bbf08de0b08f629ce81fa95567030952f356ab5306730ed
-MISC metadata.xml 319 BLAKE2B 101e797ba4616414281cfd6869070b696b224aabfa5fdc6215f6d4597133a67b9db84d3f246cad312dc4c3b4323a921f8887df4abe7993e32c14cf6912614499 SHA512 6585f781b8d569fd1bb926dc0cbd4350b5a6e2cb0640c2523ed3483276c8d4b411ddeff7f7f3e9a4363551a3a8910a5e32bb075f25c545275c83ce92a90c49dc
+EBUILD mysql-super-smack-1.3-r5.ebuild 1533 BLAKE2B a38d6249753a8b8027465b0d960616a6729d3680d198a6e7f8d8d6d606655242137db2b428421ef48de0d7d32007800e296549929627e207ff8cdd8e2c84944f SHA512 edd555b3037c6019a75c29dde46c0215d1ad65d23646c3e180f37669166cce3cca8e5765ada984686fff52027cc7308d42b739e42a6c82a6693ee5b3fc01c00c
+MISC metadata.xml 323 BLAKE2B 9b0447d87c9b774dd35df6f600a65277fa0ff42abaae9abcbdf8cfef461feba9b1d333699d5a210799ee1f5408e1fe7e47faababa5ff63ebcb5833ac68349964 SHA512 d0c11eddb2bd8b7c1d8dc0b30cf6d5f9bf990e5f2846caae2960f973ca9896f5c37049ba1dd95397347fe02c4b8a1a167c88b71f19ff3ee9c27b2ff6d587aa40
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
new file mode 100644
index 000000000000..97e1e1aaccc6
--- /dev/null
+++ b/dev-db/mysql-super-smack/files/mysql-super-smack-1.3-autotools.patch
@@ -0,0 +1,255 @@
+--- 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/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
index ee3ef09ebf87..80c2abfd5594 100644
--- a/dev-db/mysql-super-smack/metadata.xml
+++ b/dev-db/mysql-super-smack/metadata.xml
@@ -1,9 +1,11 @@
 <?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>
+	<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
new file mode 100644
index 000000000000..e47e1a187676
--- /dev/null
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r5.ebuild
@@ -0,0 +1,70 @@
+# 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"
+}