gentoo resync : 06.04.2022

3 files changed, 2 insertions, 69 deletions

diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index 4cec062c2b3a..e1297e22dcc3 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -5,6 +5,5 @@ AUX mysql-super-smack-1.3-gen-data.patch 2265 BLAKE2B 42f85a5779968d13262ddf3b72
 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
-EBUILD mysql-super-smack-1.3-r5.ebuild 1533 BLAKE2B a38d6249753a8b8027465b0d960616a6729d3680d198a6e7f8d8d6d606655242137db2b428421ef48de0d7d32007800e296549929627e207ff8cdd8e2c84944f SHA512 edd555b3037c6019a75c29dde46c0215d1ad65d23646c3e180f37669166cce3cca8e5765ada984686fff52027cc7308d42b739e42a6c82a6693ee5b3fc01c00c
+EBUILD mysql-super-smack-1.3-r5.ebuild 1531 BLAKE2B 6c645568599cfed9255a431ba25b643de8afbeda5e2d9526037090c2b45f7da2be4e7f21bb3f320d99f27d50ed5bf0cd554260d6d53b6c71adbd36d1f7eadb71 SHA512 48d3269345eea4d43eb93e2bb95716efa95c7185d5c7638963bd01a095234379609bee3faa0c77567db374ccf8a92982413ab38c195cd518905dee4ee60d1258
 MISC metadata.xml 323 BLAKE2B 9b0447d87c9b774dd35df6f600a65277fa0ff42abaae9abcbdf8cfef461feba9b1d333699d5a210799ee1f5408e1fe7e47faababa5ff63ebcb5833ac68349964 SHA512 d0c11eddb2bd8b7c1d8dc0b30cf6d5f9bf990e5f2846caae2960f973ca9896f5c37049ba1dd95397347fe02c4b8a1a167c88b71f19ff3ee9c27b2ff6d587aa40
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
deleted file mode 100644
index 453fcaa21ab9..000000000000
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOMAKE="1.13"
-
-inherit autotools libtool
-
-MY_PN="super-smack"
-MY_P="${MY_PN}-${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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="+mysql postgres"
-REQUIRED_USE="|| ( mysql postgres )"
-
-COMMON_DEPEND="sys-libs/zlib:=
-		mysql? ( dev-db/mysql-connector-c:= )
-		postgres? ( dev-db/postgresql:*[server] )"
-DEPEND="${COMMON_DEPEND} sys-devel/bison sys-devel/flex"
-RDEPEND="${COMMON_DEPEND} mysql? ( virtual/mysql )"
-
-S="${WORKDIR}/${MY_P}"
-
-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-automake-1.13.patch
-)
-DOCS=( CHANGES INSTALL MANUAL README TUTORIAL )
-
-src_prepare() {
-	# 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
-	mv configure.in configure.ac || die
-	export CXXFLAGS+=" -std=gnu++98"
-	default
-	eautoreconf
-	elibtoolize --patch-only
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(usex mysql --with-mysql "")
-		$(usex postgres --with-pgsql "")
-		--with-datadir=/var/tmp/${MY_PN}
-		--with-smacks-dir=/usr/share/${MY_PN}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/tmp/${MY_PN}
-}
-
-pkg_postinst() {
-	elog "The gen-data binary is now installed as super-smack-gen-data"
-}
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
index e47e1a187676..bd76dac46b7a 100644
--- 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
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+mysql postgres"
 REQUIRED_USE="|| ( mysql postgres )"