From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-db/Manifest.gz | Bin 15920 -> 15922 bytes dev-db/innotop/Manifest | 2 - dev-db/innotop/innotop-1.12.0.ebuild | 27 -- dev-db/mysql-connector-c++/Manifest | 2 +- .../mysql-connector-c++-1.1.12-r1.ebuild | 62 --- .../mysql-connector-c++-1.1.12-r2.ebuild | 54 +++ dev-db/mytop/Manifest | 2 +- dev-db/mytop/mytop-1.9.1-r1.ebuild | 35 ++ dev-db/mytop/mytop-1.9.1.ebuild | 35 -- dev-db/percona-server/Manifest | 2 +- .../files/percona-server-8.0.26.16-gcc-12.patch | 13 + dev-db/percona-toolkit/Manifest | 17 +- .../percona-toolkit-2.2.20-fix-package-name.patch | 13 - .../percona-toolkit-2.2.7-no-versioncheck.patch | 216 ---------- ...oolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch | 33 -- .../percona-toolkit/percona-toolkit-2.2.20.ebuild | 44 -- .../percona-toolkit/percona-toolkit-3.0.13.ebuild | 51 --- .../percona-toolkit/percona-toolkit-3.0.9.ebuild | 49 --- .../percona-toolkit-3.1.0-r1.ebuild | 52 --- .../percona-toolkit/percona-toolkit-3.2.1.ebuild | 51 --- .../percona-toolkit/percona-toolkit-3.3.0.ebuild | 51 --- .../percona-toolkit/percona-toolkit-3.3.1.ebuild | 4 +- dev-db/pgbadger/Manifest | 10 +- dev-db/pgbadger/pgbadger-11.0.ebuild | 24 -- dev-db/pgbadger/pgbadger-11.3.ebuild | 24 -- dev-db/pgbadger/pgbadger-11.4.ebuild | 24 -- dev-db/pgbadger/pgbadger-11.6.ebuild | 24 -- dev-db/pgbadger/pgbadger-11.8.ebuild | 24 ++ dev-db/postgresql/Manifest | 4 +- dev-db/postgresql/postgresql-15_beta1-r1.ebuild | 464 --------------------- dev-db/postgresql/postgresql-15_beta2.ebuild | 464 +++++++++++++++++++++ dev-db/redis/Manifest | 16 +- dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch | 47 +++ dev-db/redis/metadata.xml | 8 + dev-db/redis/redis-5.0.14.ebuild | 1 + dev-db/redis/redis-6.0.16.ebuild | 1 + dev-db/redis/redis-6.2.6.ebuild | 1 + dev-db/redis/redis-7.0.0-r2.ebuild | 183 -------- dev-db/redis/redis-7.0.0.ebuild | 201 --------- dev-db/redis/redis-7.0.1-r1.ebuild | 5 +- dev-db/redis/redis-7.0.2.ebuild | 3 +- dev-db/sqlcl-bin/Manifest | 4 +- dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild | 33 -- dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild | 33 ++ dev-db/sqlmap/Manifest | 2 + dev-db/sqlmap/sqlmap-1.6.6.ebuild | 60 +++ dev-db/tora/Manifest | 8 +- dev-db/tora/files/tora-3.2-missing-header.patch | 21 - dev-db/tora/files/tora-3.2-qt-5.11.0.patch | 69 --- dev-db/tora/files/tora-3.2-qt-includes.patch | 61 +++ dev-db/tora/metadata.xml | 19 +- dev-db/tora/tora-3.2-r1.ebuild | 96 ----- dev-db/tora/tora-3.2-r2.ebuild | 87 ++++ dev-db/tora/tora-9999.ebuild | 91 ---- 54 files changed, 924 insertions(+), 2003 deletions(-) delete mode 100644 dev-db/innotop/innotop-1.12.0.ebuild delete mode 100644 dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild create mode 100644 dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild create mode 100644 dev-db/mytop/mytop-1.9.1-r1.ebuild delete mode 100644 dev-db/mytop/mytop-1.9.1.ebuild delete mode 100644 dev-db/percona-toolkit/files/percona-toolkit-2.2.20-fix-package-name.patch delete mode 100644 dev-db/percona-toolkit/files/percona-toolkit-2.2.7-no-versioncheck.patch delete mode 100644 dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch delete mode 100644 dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.2.1.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.3.0.ebuild delete mode 100644 dev-db/pgbadger/pgbadger-11.0.ebuild delete mode 100644 dev-db/pgbadger/pgbadger-11.3.ebuild delete mode 100644 dev-db/pgbadger/pgbadger-11.4.ebuild delete mode 100644 dev-db/pgbadger/pgbadger-11.6.ebuild create mode 100644 dev-db/pgbadger/pgbadger-11.8.ebuild delete mode 100644 dev-db/postgresql/postgresql-15_beta1-r1.ebuild create mode 100644 dev-db/postgresql/postgresql-15_beta2.ebuild create mode 100644 dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch delete mode 100644 dev-db/redis/redis-7.0.0-r2.ebuild delete mode 100644 dev-db/redis/redis-7.0.0.ebuild delete mode 100644 dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild create mode 100644 dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild create mode 100644 dev-db/sqlmap/sqlmap-1.6.6.ebuild delete mode 100644 dev-db/tora/files/tora-3.2-missing-header.patch delete mode 100644 dev-db/tora/files/tora-3.2-qt-5.11.0.patch create mode 100644 dev-db/tora/files/tora-3.2-qt-includes.patch delete mode 100644 dev-db/tora/tora-3.2-r1.ebuild create mode 100644 dev-db/tora/tora-3.2-r2.ebuild delete mode 100644 dev-db/tora/tora-9999.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index b8724147d593..fc497095ad42 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/innotop/Manifest b/dev-db/innotop/Manifest index d37a049c4169..c015dedbe850 100644 --- a/dev-db/innotop/Manifest +++ b/dev-db/innotop/Manifest @@ -1,5 +1,3 @@ -DIST innotop-1.12.0.tar.gz 182854 BLAKE2B 1470f21fe7882e920966a856365586c37461c955f0d07ea72a9bffa16b1a112fe5daa2dec585f888c90570d28f9af4e88885a36910bf892cc4f69abd044a4494 SHA512 bc650cd8fb5e5b83f12ccccc852802d676500d7241fe0beaa2a67c3dcca90ab06f329f0a6750789b6097ab201630b9ecf494159086d904ce7c1cfe7aefb5a635 DIST innotop-1.13.0.tar.gz 189278 BLAKE2B 0e7334c983aa441c130ded820e76afb72a324b52dc6b444fb5e5813dc09c19a656d42b449b43af682d61620305062929d87a78db4298e17bed36eca62ff6f53a SHA512 827a6ec36355af023d24b85afdaabac44ef0c33c853c133d39f0725b2da3585cf1bc7b21e501d436a28ac6b798d9d502b4a81c2c9c28373abf91543519b4f45a -EBUILD innotop-1.12.0.ebuild 633 BLAKE2B 7f987ee26b6f469700f107f5b27b5b15e81790656c326c36fec36c3429dac8aa9c982fc62700bf6004103419e1a96c43aa90be83ce01eaf5d6fd8d3937d0224f SHA512 978a673305506a4abf085f6fa5eb9dc2d895e0f550b1f757589cdd3a512ce8ddb881932b478a6096a6a4ddc38c5608286ad0704eb6681069b4df77c845f71931 EBUILD innotop-1.13.0.ebuild 633 BLAKE2B 0cad7292de8e0a57dde2ac431d0dd8003ab599805901fe2f4b3a4e28b6acf797606faf8b3b481c51af0645a34c98e0345ba5b97eff4314c43a5154d57c657a63 SHA512 beafdee5a672ab87dc60af15610a5d7149eddc726407eac6baf324e2dbb3b629b9c911210ac2bc483815b6be4713be8cea0ac53b937bc02a0e325aac233cc4c3 MISC metadata.xml 324 BLAKE2B d8c3d48ad46b0da46cc0368f68409961426f387b4fc1d359c729ca25689d911ef7f1414d7f2a2e1057dbe4a6372280e01e0cdfebe2d664890eaff2b3833f50ab SHA512 ce552a2c3e193a8d97baa8d5b3daa59e55904beb27b1de5ae60d6926ed547028625254a6c9ba1c0d98514915a80f8661bba51573e0b9d92781c6da84c251bcab diff --git a/dev-db/innotop/innotop-1.12.0.ebuild b/dev-db/innotop/innotop-1.12.0.ebuild deleted file mode 100644 index d1f0d89c491b..000000000000 --- a/dev-db/innotop/innotop-1.12.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="A text-mode MySQL and InnoDB monitor like mytop, but with many more features" -HOMEPAGE="https://github.com/innotop/innotop" -SRC_URI="https://github.com/innotop/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-2 )" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -SLOT="0" -IUSE="" - -DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes" - -DIST_TEST="do parallel" - -src_install() { - perl-module_src_install -} diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index 69a762a97e6f..e4d4fc0c9b29 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -3,6 +3,6 @@ AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab AUX mysql-connector-c++-8.0.27-fix-build.patch 3170 BLAKE2B acadbb354505f4b40e3121134c93cabd6e13dfbbc5268ea5aadcfdd01a96fad3d682a1b2d77b0a63eeea31c7737f852d624f2505100e52016b6f98c5b2feca01 SHA512 413ca9ed5965eb9805639a8ba252d60486eb7aa038db7d2b993457e940ed61f3073d8008ee53b0e84798e9c059f84bb2c2de272412a1a256c1e6b81e43b75535 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4 DIST mysql-connector-c++-8.0.27-src.tar.gz 4004836 BLAKE2B e581c679d8d9a31d2570b9cf1968b4e793cfccbd4cafdc5a9c9d17a465c16faa1492b2da7bdc1679d97474c27b6353274a390668f77d3cb47f72598eb3a967fa SHA512 3da7109efd2d1af813931b923218de9a85afe20d23e2654eecfa5524431f5b11ebdb8421b14563300b66ab61714e284cc15407a3b28a87922c9a8c79b2804bf3 -EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1577 BLAKE2B f6ce709f290cc74ab7a1dc4283d307dd405556265d0ea13bf04ed96e0e00ac1cb7c2988b01ba95d5508819da441b0a03b3e535970dcfb5d6cc4a3b494c8b5f1f SHA512 a3f894dd1c68e0876f50a1f18184f5ed6ce97d2a117b35749a58d2abeaeae8cf9fc84c6bb0b8db90cec9d308cc5e93ac59bda553eaf2705b5c2e137d127fa3f2 +EBUILD mysql-connector-c++-1.1.12-r2.ebuild 1305 BLAKE2B 62cf36d8a5c5fe823ddfa7897cacef3d082d8a247ffaa8292f7599d0637bdad37e751fba3018b27746f6ce9077906507e947aefed932a89eacefaa3a0e76ecc5 SHA512 c4f7defd6e3fbcb891bd9e4a8529d081b05376329ef8556d206bc33c13f4d718be35d93158900d86c116cde96027c14500d36e92ba3714e7cccc469591281940 EBUILD mysql-connector-c++-8.0.27.ebuild 973 BLAKE2B 956082e0b535dd644bbf81dd2392785f7bc53c07bfc2e4c4136b0adb249b3d199a151a8a40551379e039d6d2b18e2b1fe3dcef9c594f03677dcee3abdebfc560 SHA512 07d72d46a68a61368bd923fb2ac1664e3660af9bd7f049f00a36f78775cccdc123ea28b52a5ccee2389b65fbfb28b1af130555671819eadbac5c006e4ccbe693 MISC metadata.xml 379 BLAKE2B c33f69c8b5aa23c867d8312fc2fffec9d22a2fa3f8f1d93f235282fb4f68869599ad8a49e46290679eea3faf1536fe13224af9dcc5eec625374bc7e28ab591fa SHA512 26cc6101cc8240e26c3491dfafc1c7ddda626e7de3ccfc235c02e92f0226c9e11109dcaeddfa934dc02dbdf99215e5899cac606f50a647d90937770e88670d67 diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild deleted file mode 100644 index 889a975cea72..000000000000 --- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake-utils flag-o-matic - -DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" -HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" -URI_DIR="Connector-C++" -SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz" - -LICENSE="Artistic GPL-2" -SLOT="0/7" -KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86" -IUSE="debug examples gcov static-libs" - -DEPEND="dev-db/mysql-connector-c:= - dev-libs/boost:= - dev-libs/openssl:0= - ! '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \ + "${ED}"/usr/bin/mytop || die +} diff --git a/dev-db/mytop/mytop-1.9.1.ebuild b/dev-db/mytop/mytop-1.9.1.ebuild deleted file mode 100644 index 004f5b3371ee..000000000000 --- a/dev-db/mytop/mytop-1.9.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-module - -DESCRIPTION="mytop - a top clone for mysql" -HOMEPAGE="http://www.mysqlfanboy.com/mytop-3/" -SRC_URI="http://www.mysqlfanboy.com/mytop-3/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ppc sparc x86" -SLOT="0" -IUSE="" - -RDEPEND="dev-perl/DBD-mysql - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -PATCHES=( "${FILESDIR}/${PN}-1.9.1-global-status.patch" - "${FILESDIR}/${PN}-1.9.1-queries-vs-questions-mysql-5.0.76.patch" - ) -SRC_TEST="do" - -src_install() { - perl-module_src_install - sed -i -r\ - -e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \ - "${D}"/usr/bin/mytop -} diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index da8a92e0aa91..6b410a44e4ed 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,7 +1,7 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782 AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdcef0583b25f28c2ebeee264732f4402198b1918e5ec5b4b1091dbda2d321baf31fe87eae00792b20042260969b3 SHA512 62aa589833126c2b78528e103f2de11ba0e339615cb00170a0f9f53bbb123a4bf99f2041819440297ab6cc34cf57333488e6ae12082fa5dcbe1b0ddef5f6108d AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d -AUX percona-server-8.0.26.16-gcc-12.patch 814 BLAKE2B 16ef00f0f78f8b9f9c5dcc0f4b1f51b17d835a64cc67a4aa38ef630477c71b26f28f06bc5d527e43a46b3052753e763db48f70de58e7341174e4d543cd163657 SHA512 10ca0b694b4b11949781f4340e234e27cec508e1909ab7b5b1b882b94674aaa0bb87ed03a1b98a06253ec0cd4361dee28679c84f1977c350640fb21bdf24a389 +AUX percona-server-8.0.26.16-gcc-12.patch 1381 BLAKE2B 04ddb2969f759e7ea2df5d3684513083251dae606fc140d3477513327f28264fb7d217a809249fa5eef75aa2a25ee2ee936ae457492caa9e85dbc7f5522032cb SHA512 0f4666a8660124210c60536bb9ca6e49b2d5bcb5f209d85438352a97dfc9995e230113efaa6e1ad5ece56608439967e243ea8008bf196f28545c4157b79fb805 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668 DIST percona-server-8.0.25-15.tar.gz 531072362 BLAKE2B aa6867a8ac72325596393723cf8735329f638cfe11f790c7690dc5f45dcf01f99f9f999c551b2ad6b9f287f8763e8b262fef7c9327b82882493b576acd8d7a69 SHA512 500fc4ab5d275d7d1d2b048920d22d725074450d9f356b4ea739a4c276bfe767db76e2b52a358867d77805ef288cfdb80ab6e230bfa77a84b97536bf153c443f DIST percona-server-8.0.25.15-patches-01.tar.xz 7624 BLAKE2B b06495859f3df546bc42e69ec77007a335103020313524ed728309764fea8ca2ea6f246938852ab2fb5ea12b4d901af5ebb9abff4d99b7e56d6ffd501d10bd38 SHA512 69b2d478046666d7c5dbffe662f4e000fd1c2c8789bcaeea72b8bb229ad85d8cd54a293c74440f93c56dc07a06143553ff989711787e6cd610a8e23bb353a1df diff --git a/dev-db/percona-server/files/percona-server-8.0.26.16-gcc-12.patch b/dev-db/percona-server/files/percona-server-8.0.26.16-gcc-12.patch index 1780d7e478f5..d465e94effed 100644 --- a/dev-db/percona-server/files/percona-server-8.0.26.16-gcc-12.patch +++ b/dev-db/percona-server/files/percona-server-8.0.26.16-gcc-12.patch @@ -1,5 +1,6 @@ https://bugs.gentoo.org/842168 https://bugs.gentoo.org/853085 +https://bugs.gentoo.org/855170 --- a/client/logger.cc +++ b/client/logger.cc @@ -27,6 +27,7 @@ @@ -30,3 +31,15 @@ https://bugs.gentoo.org/853085 #include #include "plugin/auth_ldap/include/plugin_log.h" +diff --git a/router/src/harness/include/mysql/harness/net_ts/executor.h b/router/src/harness/include/mysql/harness/net_ts/executor.h +index 5cf514b..ec61168 100644 +--- a/router/src/harness/include/mysql/harness/net_ts/executor.h ++++ b/router/src/harness/include/mysql/harness/net_ts/executor.h +@@ -36,6 +36,7 @@ + #include + #include // decay_t, enable_if + #include ++#include + + #include "mysql/harness/net_ts/netfwd.h" + #include "mysql/harness/stdx/type_traits.h" // conjunction, void_t diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest index 3acfce88f8e9..81704ae97cdd 100644 --- a/dev-db/percona-toolkit/Manifest +++ b/dev-db/percona-toolkit/Manifest @@ -1,20 +1,5 @@ -AUX percona-toolkit-2.2.20-fix-package-name.patch 334 BLAKE2B 3a36f40823194db89de326453d3a2b069edcd67fb50f1a65c27550002b0bf5f5c8631bf65fde8a4f83b7b90db434670c582a1a752b57ddb6c2acaecfc0ba8698 SHA512 eb87fa7d333160d0620ff56fb7e413024f573d05583b68a06aa0156f9a0332ce104ea38e9394d7a842bb5ab05349d77ec4ca3a5fdf28abd582241604f2337e09 -AUX percona-toolkit-2.2.7-no-versioncheck.patch 9310 BLAKE2B 8d102dcab97bc87ad1a98ffd7b600d7453eb449ba919908b5a5063b53a127562bbd419d19dd716a9b6c199a1a38055fd5593817ddfe5200892c4529146c6435b SHA512 6d571c017254e8ea37d128f1623cc4e813ebbfc611cbb84403540c786abc62ee9ba625ec914b101953e5d1d09431f9caa91e270684e00ec6e002b2777b105df9 AUX percona-toolkit-3.0.10-slave-delay-fix.patch 1593 BLAKE2B 94bc49d581fbd453f650fe81b704ae042f3219495373c09bd750241cbdb3a1917e582927d3682072a1ac6369e2a564ee41bb16c25f662cab16748af1772c11b2 SHA512 40268aa6241416b80e6c076083a0ba2f75fb330529dc5de01438536cd6ce352b4dbee642cad1e1219441ababb054243731afdba0e4f8642dea20c0f1dada5646 AUX percona-toolkit-3.0.7-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c2ba89c78cb35db2a9121b86ba3a66896d0ef0175c9d6f47cf6eff0908847564ecc810243a3fdc0b893fbc3b2bd2131ec932f93a8694ad SHA512 a681b7f32f1acb509f01fe6c8e99106708729b8f8f5fe5fba0f2131b4380cfd22462f37bf0fbb95213b89d17375f0252b961d0257fb310295fe0e6e002b66e28 -AUX percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch 1430 BLAKE2B b874324b2970b28e781343ace4415399e041b188da5aae6909bb8121d32bfdd28202eb4039b7b70541346caa3f958a5bbaf0841f2a4d3d5a3c7503059c4e26ee SHA512 31b637c6dfae567e2b0dd41a50a535db57bdca04e606a8147aaf13724779ec8a5fdda350ed0bebe27b1ffe53b784e7bc5a231cb4f66dc6fd33b089bdd87aa7ff -DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679 -DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3 -DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53 -DIST percona-toolkit-3.1.0.tar.gz 18106856 BLAKE2B 4a08e70a03d80e86e2fd7ba4ac77be9568643faf46bb653ef9e18015b95d36936034369a8adf9de4e09d2ca6cd25a845b140d6dd2c41027597f08d74f328ad26 SHA512 6dd2de997fe9627897dad453277544142cbdcba41bf30de21ee10c292c671bc089df0e299a8e386af082511c57ac53621b8e11f4ae43e98ea41eeca0c76f652f -DIST percona-toolkit-3.2.1.tar.gz 15521123 BLAKE2B 7f8222a2afe2c0700d8f965bb5f8d2ef99c1136b977454ef04133fa8dfeb0192c49552dfde90a2d4d69116c2ba7c4a998fc330f64546691982946624bf24efef SHA512 17fd9f10d2d5671c3ce75dfeba501b9c34b216844b8d8ceb03fadbfb6396cedb7b672d52af7a831739a417d6fcc5b538b4772ffdb9b55816d94fac87e88ba472 -DIST percona-toolkit-3.3.0.tar.gz 15342520 BLAKE2B fcafede75cf15ad61efe18eac057cedab11e570cc6a17d48345cd046638b6b1c89b8f233f26cd051301ea0d6bdd03996b4007fc09a84cd44464beb3ca7150b70 SHA512 87bb5bcccabf782eafc0e363f3a5d75e9e28d5edd9d4278df5f455c90207296dc9035f85311567bd210109a2796484010d8a11fa4d4a5bee09f228aedb6b3bb2 DIST percona-toolkit-3.3.1.tar.gz 15348084 BLAKE2B 1bae3bc96144d23d51afca624b4ff4c7d5e118db857b5bf7721b8fa3fbc43e0ed87c52113e694e5defa0c70643a018ce1a7d2e437f097bac407344456f70ca1f SHA512 ee82613e15746820739042d34cf7cac0ba7e9f2825234ba39d7bfb8e0a52ab9b8d23ca47cb6a6afe2525c01f69fc81130a3be67b8a191c98d0d43e960a736cb0 -EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b -EBUILD percona-toolkit-3.0.13.ebuild 1325 BLAKE2B c8dc51ce757c3165957190266fa484bf74451644cdc62a464d8276fd6d3523a2b2864caa27b766c7e90b1c02c81d940ebd706e876922020c0feb878eb3083d26 SHA512 152841e2bd6be6e7015be3c929e1ecef678bf4456b9beba1ace9dac5f129e02d7373b460bb445ab0c69e10c351602907d33dcddb14faf624013790f9cfe54753 -EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982 -EBUILD percona-toolkit-3.1.0-r1.ebuild 1389 BLAKE2B 43f48d8cbaa1bebcef5c8d9100f2d270931ee2ac0d5649b1aa66bd2f0fb6c56238d5eb30b5a3d1b2bbe4915470976af3e80f04aa97e173a5214f182d41772953 SHA512 fb554bae9ebc93863faf381a59ab0ce64f41c0374061c34d5b6c34e8728ee771a2c90ea852adb8857211adf52cdfd9e48072fcf079a68c20f3554788775bdffd -EBUILD percona-toolkit-3.2.1.ebuild 1327 BLAKE2B 721af4c15c6c1bacae62569f8320698899ac7c26d6694790d4457ea65b2ec12c476d2d3d80e42d8f9f589e4aa8d5c81b76c29484e6f9cf68387bf00cbd2e8000 SHA512 c159ad4696e2fe86b012a24ee3a69da0fe7134c248786936d0f1bca1b0e3672825dd10c1ee485d187d26fa3f0870c453fbbf67de89b28cf770ed640fe9b2b265 -EBUILD percona-toolkit-3.3.0.ebuild 1327 BLAKE2B bb75b25d57fdd2994bc049e55e98060645995111384cd47c9d7c9ee21d7813be85e21622af3e95f08912cd1adc18a990376b611f32c2ebabea5a6659d61e5658 SHA512 61683cb1082708ade2edfc15a8e68c42795582891b9c4d930981d76ddd0473bdac64105d3d25b230380067a9ce7ef4453e7558a1bdbad5f3439eac3cfd8aeefd -EBUILD percona-toolkit-3.3.1.ebuild 1327 BLAKE2B bb75b25d57fdd2994bc049e55e98060645995111384cd47c9d7c9ee21d7813be85e21622af3e95f08912cd1adc18a990376b611f32c2ebabea5a6659d61e5658 SHA512 61683cb1082708ade2edfc15a8e68c42795582891b9c4d930981d76ddd0473bdac64105d3d25b230380067a9ce7ef4453e7558a1bdbad5f3439eac3cfd8aeefd +EBUILD percona-toolkit-3.3.1.ebuild 1325 BLAKE2B 202541352285cd7a6a8696e66b25755a0c16885c4ab394cf9fa4742dab7361b58a8ef15828368de28683df2647d880293a19b3f0b411f06428c1b577c6257277 SHA512 5b241a88b0af49240253b5bba7192c7646da0152a0b2224842475c45b37b3c8056311d3d92e35e7e34687f86fab262a422647bc237149b175f793f55054dee64 MISC metadata.xml 724 BLAKE2B ba24ec13af4de15c27dfbfc3c72138b736cfe28b0d9c126cdcdc33d7ced612728a43de00b75d6fa8be5b0bbec3ebaa58ed5c80925b3bcade9acb01fb3d9bbf34 SHA512 7ac5e2e7d45bf8d744d390844b21fd955387580da6afc5a495b1e861025dfe3c20da6218ae9a2caf37695087db2c4987e324481e2f1cef2ff442966658ecb9b5 diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.20-fix-package-name.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.20-fix-package-name.patch deleted file mode 100644 index 9865e1ba1a7a..000000000000 --- a/dev-db/percona-toolkit/files/percona-toolkit-2.2.20-fix-package-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -Source https://github.com/percona/percona-toolkit/pull/84 -Adapted to current version ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -1,7 +1,7 @@ - use ExtUtils::MakeMaker; - - WriteMakefile( -- NAME => 'percona-toolkit', -+ NAME => 'Percona::Toolkit', - VERSION => '2.2.20', - EXE_FILES => [ ], - MAN1PODS => { diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.7-no-versioncheck.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.7-no-versioncheck.patch deleted file mode 100644 index d6d38177b18f..000000000000 --- a/dev-db/percona-toolkit/files/percona-toolkit-2.2.7-no-versioncheck.patch +++ /dev/null @@ -1,216 +0,0 @@ -diff -rupN old/percona-toolkit-2.2.7/bin/pt-archiver new/percona-toolkit-2.2.7/bin/pt-archiver ---- old/percona-toolkit-2.2.7/bin/pt-archiver 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-archiver 2014-05-21 18:13:49.148631547 +0200 -@@ -7465,8 +7465,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-config-diff new/percona-toolkit-2.2.7/bin/pt-config-diff ---- old/percona-toolkit-2.2.7/bin/pt-config-diff 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-config-diff 2014-05-21 18:13:38.012402960 +0200 -@@ -5563,8 +5563,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-deadlock-logger new/percona-toolkit-2.2.7/bin/pt-deadlock-logger ---- old/percona-toolkit-2.2.7/bin/pt-deadlock-logger 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-deadlock-logger 2014-05-21 18:11:18.923569703 +0200 -@@ -5332,8 +5332,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-diskstats new/percona-toolkit-2.2.7/bin/pt-diskstats ---- old/percona-toolkit-2.2.7/bin/pt-diskstats 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-diskstats 2014-05-21 18:11:04.041268359 +0200 -@@ -5468,8 +5468,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-duplicate-key-checker new/percona-toolkit-2.2.7/bin/pt-duplicate-key-checker ---- old/percona-toolkit-2.2.7/bin/pt-duplicate-key-checker 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-duplicate-key-checker 2014-05-21 18:12:51.993462828 +0200 -@@ -5430,8 +5430,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-find new/percona-toolkit-2.2.7/bin/pt-find ---- old/percona-toolkit-2.2.7/bin/pt-find 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-find 2014-05-21 18:09:46.496705351 +0200 -@@ -4440,8 +4440,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-fk-error-logger new/percona-toolkit-2.2.7/bin/pt-fk-error-logger ---- old/percona-toolkit-2.2.7/bin/pt-fk-error-logger 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-fk-error-logger 2014-05-21 18:12:39.277202489 +0200 -@@ -4335,8 +4335,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-heartbeat new/percona-toolkit-2.2.7/bin/pt-heartbeat ---- old/percona-toolkit-2.2.7/bin/pt-heartbeat 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-heartbeat 2014-05-21 18:09:29.885373476 +0200 -@@ -6019,8 +6019,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-index-usage new/percona-toolkit-2.2.7/bin/pt-index-usage ---- old/percona-toolkit-2.2.7/bin/pt-index-usage 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-index-usage 2014-05-21 18:08:58.139739567 +0200 -@@ -7348,8 +7348,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-kill new/percona-toolkit-2.2.7/bin/pt-kill ---- old/percona-toolkit-2.2.7/bin/pt-kill 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-kill 2014-05-21 18:11:45.264103271 +0200 -@@ -7626,8 +7626,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-online-schema-change new/percona-toolkit-2.2.7/bin/pt-online-schema-change ---- old/percona-toolkit-2.2.7/bin/pt-online-schema-change 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-online-schema-change 2014-05-21 18:13:04.843724091 +0200 -@@ -11298,8 +11298,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-query-digest new/percona-toolkit-2.2.7/bin/pt-query-digest ---- old/percona-toolkit-2.2.7/bin/pt-query-digest 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-query-digest 2014-05-21 18:12:23.127872894 +0200 -@@ -16265,8 +16265,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-slave-delay new/percona-toolkit-2.2.7/bin/pt-slave-delay ---- old/percona-toolkit-2.2.7/bin/pt-slave-delay 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-slave-delay 2014-05-21 18:08:11.586811388 +0200 -@@ -4698,8 +4698,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-slave-restart new/percona-toolkit-2.2.7/bin/pt-slave-restart ---- old/percona-toolkit-2.2.7/bin/pt-slave-restart 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-slave-restart 2014-05-21 18:11:32.423843497 +0200 -@@ -5638,8 +5638,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-table-checksum new/percona-toolkit-2.2.7/bin/pt-table-checksum ---- old/percona-toolkit-2.2.7/bin/pt-table-checksum 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-table-checksum 2014-05-21 18:14:03.377924135 +0200 -@@ -12314,8 +12314,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-table-sync new/percona-toolkit-2.2.7/bin/pt-table-sync ---- old/percona-toolkit-2.2.7/bin/pt-table-sync 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-table-sync 2014-05-21 18:10:18.476350097 +0200 -@@ -12501,8 +12501,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-upgrade new/percona-toolkit-2.2.7/bin/pt-upgrade ---- old/percona-toolkit-2.2.7/bin/pt-upgrade 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-upgrade 2014-05-21 18:08:38.344342935 +0200 -@@ -11003,8 +11003,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two -diff -rupN old/percona-toolkit-2.2.7/bin/pt-variable-advisor new/percona-toolkit-2.2.7/bin/pt-variable-advisor ---- old/percona-toolkit-2.2.7/bin/pt-variable-advisor 2014-02-20 08:20:28.000000000 +0100 -+++ new/percona-toolkit-2.2.7/bin/pt-variable-advisor 2014-05-21 18:10:01.967017827 +0200 -@@ -5968,8 +5968,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two diff --git a/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch b/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch deleted file mode 100644 index 0596365423f9..000000000000 --- a/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change -index 7ecec11..afdd7dd 100755 ---- a/bin/pt-online-schema-change -+++ b/bin/pt-online-schema-change -@@ -8948,15 +8948,6 @@ sub main { - Quoter => $q, - ); - -- my $vp = VersionParser->new($cxn->dbh()); -- if ($vp->cmp('8.0.14') > -1 && $vp->flavor() !~ m/maria/i) { -- my $msg = "There is an error in MySQL that makes the server to die when trying to ". -- "rename a table with FKs. See https://bugs.mysql.com/bug.php?id=96145\n". -- "Since pt-online-schema change needs to rename the old <-> new tables as the final " . -- "step, and the requested table has FKs, it cannot be executed under the current MySQL version"; -- _die($msg, NO_MINIMUM_REQUIREMENTS); -- } -- - if ( ($alter_fk_method || '') eq 'none' ) { - print "Not updating foreign keys because " - . "--alter-foreign-keys-method=none. Foreign keys " -@@ -9872,12 +9863,6 @@ sub main { - } - } - -- if ($vp->cmp('8.0') > -1 && $vp->flavor() !~ m/maria/i && $alter_fk_method eq 'drop_swap') { -- my $msg = "--alter-foreign-keys-method=drop_swap doesn't work with MySQL 8.0+\n". -- "See https://bugs.mysql.com/bug.php?id=89441"; -- _die($msg, INVALID_PARAMETERS); -- } -- - # --plugin hook - if ( $plugin && $plugin->can('after_copy_rows') ) { - $plugin->after_copy_rows(); diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild deleted file mode 100644 index 7b08f6262ae9..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-2.2.20.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -src_prepare() { - # Bug #501904 - CVE-2014-2029 - # sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* - eapply -p2 "${FILESDIR}"/${PN}-2.2.7-no-versioncheck.patch - eapply -p1 "${FILESDIR}"/${PN}-2.2.20-fix-package-name.patch - - default -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild deleted file mode 100644 index 63fd079079bc..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.13.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild deleted file mode 100644 index 8cb91309b313..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.9.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild deleted file mode 100644 index bc039dc30467..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch - "${FILESDIR}"/${PN}-3.1.0-drop-swap-gentoo-mariadb-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.2.1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.2.1.ebuild deleted file mode 100644 index 90f65e5dffb6..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.2.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.3.0.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.3.0.ebuild deleted file mode 100644 index 2baf33ca254c..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.3.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild index 2baf33ca254c..fb56ea929b99 100644 --- a/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild +++ b/dev-db/percona-toolkit/percona-toolkit-3.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.g LICENSE="|| ( GPL-2 Artistic )" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" # Package warrants IUSE doc IUSE="" diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest index 0a1c459569e0..b6afa5d9b574 100644 --- a/dev-db/pgbadger/Manifest +++ b/dev-db/pgbadger/Manifest @@ -1,11 +1,5 @@ -DIST pgbadger-11.0.tar.gz 1661028 BLAKE2B d83be01017d69b83cf288b23fe5066d5c691b630ce748fe42b33514346183f7b8f18efceeefe0533e534c669e986c30388a6df5b620ea654ae89b3dc3c08d342 SHA512 167534d61cb28df6cb7eae7efe788d3f6bbad1c614468e905a9b678a76b3a2dfc0eb192b595ac4dc332cd694e820f1603b79d83bc934b7dfe3d226019f6a9c15 -DIST pgbadger-11.3.tar.gz 2297407 BLAKE2B 7e0814c570a3e5fbf79132c99e3134ee944c8239b956d4638a144c551a45b1903a27ee730f93e0dd040c3b8b8c3ec7d1b22228bf2390fa1585f8e4907cb9ae90 SHA512 0af40e68391d6cc783c5895eea01d266bdb22672bd9142e6029ec428f68ee13e0d0deaced4cb80ccd5b608bf04a72a9964c95d2cc9ad933c7412dbf888fc788a -DIST pgbadger-11.4.tar.gz 2299574 BLAKE2B bb18cd73117ac58330cca2a5f3b525f962d7c0d30a0c28881ff977424dc1ee84f7754a1d4bae200739e60b51015ccad0552573b98d06a3e5932af0056c01ed9f SHA512 c945d6b6fd564640ef9f13fc0927acbed12c4329d05a44e12858a944b3df97677af8c92e62c4572b5e02279ee5d0ce84cf9e66d294f909b4cfcf311e86ba7557 DIST pgbadger-11.5.tar.gz 2305597 BLAKE2B 1e88e52ac5861343e7122784f3ec1ecc38e67a2737db49a05661de473c990992f924c887eb86e34d3ca80d329c01af4a60893af5436d8a291bbeae0d7fdc0e81 SHA512 ed02066250539d339d5aaaab784522eac37580873e8a5adde5b565cf6d11447fad469cc23b4ab88425b0322521b4ededd1f5a24670b0b9fdbd65aaa31e4e4088 -DIST pgbadger-11.6.tar.gz 2974369 BLAKE2B 2b9e6e03bf785f92864adbfd3d1e6edc4ac899db1172ddc5bcf5c58b072a33b58de68042a3be111fa0f993cbda353742de3e795a7e104e656373b638de6bced9 SHA512 f13c48e3503f17f8d2c37f39409953baf32e87e05ec77e44097648fb5d57f6e6d3e2af45fb703e44d184ea150db80132c868860b5f2cd023911d5fdf8fc6550d -EBUILD pgbadger-11.0.ebuild 453 BLAKE2B 6e4f4131043bc154aea391b570ee80a2ab45826e4d7cd9f5bee9b0ac5483fe325f12669838fe73440371d99d06257283c8f83f680c394a8ade65f9a78890e677 SHA512 21664a5d220fca4d55b4f0b18a2d7e3d47dd8f19e03a99901a52f6633af6f1687f2c5d49c5518b48c24bc90d052467107c4dd990d6fb195f7cc5b4c3474be936 -EBUILD pgbadger-11.3.ebuild 454 BLAKE2B 09f5ee2d91971960935689d17451b26f6ad0c45e85b8e38ad8e27b0dc70bc8545aa8a81144cc61983ba0add98726098522a7e207bf2e2f5af90b6d7c7e9b11c7 SHA512 a05e5a1c68536e40f4755e76340581a07a3c20653af34af871e92f23598b887d0993c11d4ad9bb932f4c1538ccd8a1045d534dea8b589a95a7905d7b23a76ca9 -EBUILD pgbadger-11.4.ebuild 454 BLAKE2B 09f5ee2d91971960935689d17451b26f6ad0c45e85b8e38ad8e27b0dc70bc8545aa8a81144cc61983ba0add98726098522a7e207bf2e2f5af90b6d7c7e9b11c7 SHA512 a05e5a1c68536e40f4755e76340581a07a3c20653af34af871e92f23598b887d0993c11d4ad9bb932f4c1538ccd8a1045d534dea8b589a95a7905d7b23a76ca9 +DIST pgbadger-11.8.tar.gz 2987593 BLAKE2B f6f5aeaba4aa2d982a3b71463bd6a02e47078d2491a703bdbeb81b349790807eaca91794be7b850dfea86615f9e8142f0513af2f68e3ff3fd0908ac50645bf18 SHA512 78082a4c9c4ca1836825d5b1718555951f29630b26eff20f30dab03d3cb30395107d6854e09f47143fb099ccfdb8d7c9319bc80f787792a33cdda70abef7bb38 EBUILD pgbadger-11.5.ebuild 453 BLAKE2B 2332b2fda3b6a22617380ce112722492a982dd0da2aba7917d02db9e5b216e94fc64461c05269089f2fd09c796732a9091e1177511d805fe02a1aaa8e42e5f01 SHA512 7d6aab2031377402fb51c50f6adce3ad6b157612ac906a9e5feb64c3a5e26e120f05e24afbdb399ee088b7f3a22b5b9737335b7c899fc8b5118e3da842306769 -EBUILD pgbadger-11.6.ebuild 451 BLAKE2B 671b81738e8ee3c00ae70d6078fdd018fc7975171e8c4cb93f93dd08d54c0d0fadb8b96860b6e2382232587206a3da4a35ac43ba1bc8b80914d2293fd5222447 SHA512 c248b106165a303773fc28d6718966bbb651f78d616151654cdf400d4bbde1da422eb67fed27ba05bdc725676ea953ee2f16197979718ff54ee9ee79f04ba57a +EBUILD pgbadger-11.8.ebuild 451 BLAKE2B d504a46fd1944398f6fc86c70a51ade480648ec70fffbcd53e4a9e1746343e1c6b96fff027e018aee2bc6af9c8ba3d1d37a605b56085fa50a677e2b741f3e6c0 SHA512 d0b233fd11c046ed7d6a84a81be1c399ea69f271e6ee9bee61518beb49b3fdbcc268787ff080b6d8abeeb98afaa2fa085bfcd26edccb4fb401edaca02d3d0d3c MISC metadata.xml 414 BLAKE2B 42f020ca08e7604b1c1b3e1d19ca62b4a19dc306c733fcd25e4536faf83dc1d6f0f61c2060ebaf8fea33b1818a4d98822e702f4b8b341b2d622e380af39ce535 SHA512 f9ccf0f1896c38e5fef1f51c73abad9b2169166d62ed8ff356d6a2ea7ce8fd253248e99a43286d5fd82a78128c579eea9601e2bb18b51d28fa613c2274de8bde diff --git a/dev-db/pgbadger/pgbadger-11.0.ebuild b/dev-db/pgbadger/pgbadger-11.0.ebuild deleted file mode 100644 index e45fe665314b..000000000000 --- a/dev-db/pgbadger/pgbadger-11.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-module - -DESCRIPTION="pgBadger is a PostgreSQL log analyzer" -HOMEPAGE="https://pgbadger.darold.net/" -SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64" - -DEPEND=" - dev-perl/JSON-XS - dev-perl/Text-CSV_XS -" -RDEPEND="${DEPEND}" - -src_test() { - prove || die -} diff --git a/dev-db/pgbadger/pgbadger-11.3.ebuild b/dev-db/pgbadger/pgbadger-11.3.ebuild deleted file mode 100644 index d7d9c0862e63..000000000000 --- a/dev-db/pgbadger/pgbadger-11.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-module - -DESCRIPTION="pgBadger is a PostgreSQL log analyzer" -HOMEPAGE="https://pgbadger.darold.net/" -SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-perl/JSON-XS - dev-perl/Text-CSV_XS -" -RDEPEND="${DEPEND}" - -src_test() { - prove || die -} diff --git a/dev-db/pgbadger/pgbadger-11.4.ebuild b/dev-db/pgbadger/pgbadger-11.4.ebuild deleted file mode 100644 index d7d9c0862e63..000000000000 --- a/dev-db/pgbadger/pgbadger-11.4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-module - -DESCRIPTION="pgBadger is a PostgreSQL log analyzer" -HOMEPAGE="https://pgbadger.darold.net/" -SRC_URI="https://github.com/darold/pgbadger/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-perl/JSON-XS - dev-perl/Text-CSV_XS -" -RDEPEND="${DEPEND}" - -src_test() { - prove || die -} diff --git a/dev-db/pgbadger/pgbadger-11.6.ebuild b/dev-db/pgbadger/pgbadger-11.6.ebuild deleted file mode 100644 index 87183b3e26a4..000000000000 --- a/dev-db/pgbadger/pgbadger-11.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit perl-module - -DESCRIPTION="pgBadger is a PostgreSQL log analyzer" -HOMEPAGE="https://pgbadger.darold.net/" -SRC_URI="https://github.com/darold/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-perl/JSON-XS - dev-perl/Text-CSV_XS -" -RDEPEND="${DEPEND}" - -src_test() { - prove || die -} diff --git a/dev-db/pgbadger/pgbadger-11.8.ebuild b/dev-db/pgbadger/pgbadger-11.8.ebuild new file mode 100644 index 000000000000..31a09daa2bfd --- /dev/null +++ b/dev-db/pgbadger/pgbadger-11.8.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +DESCRIPTION="pgBadger is a PostgreSQL log analyzer" +HOMEPAGE="https://pgbadger.darold.net/" +SRC_URI="https://github.com/darold/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + dev-perl/JSON-XS + dev-perl/Text-CSV_XS +" +RDEPEND="${DEPEND}" + +src_test() { + prove || die +} diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest index 8ce77b381b55..13ee5122b0f4 100644 --- a/dev-db/postgresql/Manifest +++ b/dev-db/postgresql/Manifest @@ -27,7 +27,7 @@ DIST postgresql-13.7.tar.bz2 21364433 BLAKE2B 2d8a505f6de4eb31cae415529eeac750a6 DIST postgresql-14.1.tar.bz2 21887101 BLAKE2B a496dfd513c52339d1b3cb72773f9611721fd7c5d2a702d6fd71f650a1d41c3d7bf6574eba23671c7f9f11718e007f51f9547949bdc3d7fe1ea2248ebfb8d70b SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd DIST postgresql-14.2.tar.bz2 21964841 BLAKE2B 6460533a40064404f18642147b949cf7c85d036c45ede478fb9af8919895ee7b09dc78b89ed08a292226911f07cfc9e46d7f2d42e0aaea546c5e97a291d599b9 SHA512 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b DIST postgresql-14.4.tar.bz2 22094218 BLAKE2B 05b65083d826ed2f451b31b29b4b247dfd76b3d24ef05f6be128ee9e58d521d506a3ec4ae4839cbb74d8e217dfae81a95bd97894a778ef3c47b907b85b1fb25e SHA512 dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb -DIST postgresql-15beta1.tar.bz2 23518203 BLAKE2B 54398d2f6972e7640cbb1211b86c642b205b33ca879d6db7a93ef8a39e294e69a7d8bb0bc7ec5df3455e5a01a5aac63815506ad55b78bf5698d2a77e943031bf SHA512 ced71f4dca02803788890c71a192b0516a41b5bc5b8113623e52183eb143905185affa93b5399b27113e112b9669dbca20cb5783f96e31ff1f5ccd2f8ddc55d3 +DIST postgresql-15beta2.tar.bz2 23511057 BLAKE2B d1e6d8ce67998d4295587780c2cb75f33b930556e11fd95bbd4d828086f63faed6bbddbb809ebc1fddf0980c83c7cf51e3d37f110d7bb68959dab34f61b5b8c9 SHA512 139bf4f95e2bc8942666009c6680d2b61d8ea2898e9e7eb3a0afb118f0bf6acfac5f21676525cccd82e9ee5c43ad79e07e23a55333e1318426d8b9bc95a4f00d EBUILD postgresql-10.19-r1.ebuild 13408 BLAKE2B 242cefd43604dfa557e83172783731f608a350467b1e546a935d1507acb54a2a714bc67175ce5846f82577516b07f4f74de59ae59481363c6c8cf40cb090e5e3 SHA512 2f02d8194f9a1eb51a69e6b8bf1f5b6bf461ce7b77dd983d13d2ccda3c10c1daab2a24c6472c7bd367548eeef53b5ce2dbcb77cfc3a00104787d426c140dbc09 EBUILD postgresql-10.20-r1.ebuild 13416 BLAKE2B d70e618b0bc07941ff8dd794a64c3cf94798f470c24b0222f505e5c36188ccf51477e1c9a35e71dd753250a7f5fe744297a017289006bcffe2b38ddd3c744179 SHA512 aa03b4ac07f61e75b71ea664546f0a6011d6afe93e6e487c36a634156441422465f6e2680587f8ff3bde2fba04f071c60ab35502099a8657e942a5b24f76754c EBUILD postgresql-10.21.ebuild 13419 BLAKE2B a7ee8b15038673ecc77165bfe85bb4235b250cc29e2fe876e16483cc0e051990a0e275156ce0dccace75637e2dbd65e157a07076e0025321581d1eba017df40f SHA512 a7b5a64b2177bfa85e66589ffdaff8b52373f55f63dd3760060b077c70fce87b1a350969e944031d6246d4fac0ad839f1025d44d23ec9597e4a74a004f9de3e0 @@ -43,6 +43,6 @@ EBUILD postgresql-13.7.ebuild 13870 BLAKE2B 20258249b38c7d6785a520e1905d07b9893e EBUILD postgresql-14.1-r1.ebuild 13911 BLAKE2B 579d9eb3d1b3ecbbaabfe44c2fefc590ebc7cc3a638e7affc9e4c5235c0da9cfccbd5b21b91cca5455924adbb5cca033b7d0fbfcc444119dce2ce570741f580c SHA512 4a9839e479f1c851f28b9d8738b65ec973346a650190c94b3968bbfa2dd45807a24efeba806a973dff83a7dc90f685616d659735528eff4113b9fbf658c64642 EBUILD postgresql-14.2-r1.ebuild 13844 BLAKE2B 96791ac26849a47c86282170d2bec9c1b0c2c794664f2429154d1f34ceb3f12c59fbf6ac54e12ecf3dc025f884520260dec8e317f8a28df83878c366e1d9d0f9 SHA512 717076f2136ee41a43825b30733801edc2717222b0dc103ccba74f2b600a3b36d51a9b669cd91adff7c2a2954138bc544738b30936906dda2340671299635108 EBUILD postgresql-14.4.ebuild 13799 BLAKE2B 40af950a78f56c80e6ea14e3930e67408b53985a7298d857c634dabfe7b15f34cfd6b2c8559c4ae5000f59e5ad19b53000bf4eea1abed345f1697bee711178e9 SHA512 295043db0513669e2e23d6cf1ed36d78da2df4db21bd9dcb8d39497738b1638238b0ce0b7992ae0adda37fbfa8b440a60dd2ba3610a291a1fba923e0e9aa0a76 -EBUILD postgresql-15_beta1-r1.ebuild 13665 BLAKE2B ce6a7544e317469603a81dbab5072a8d142bc2b3ada6f9dc7a72606176f64a1a8f9678e6734893ce320a6795839a8f9aee0d95e82044947999de51a63cc7a922 SHA512 5eb71847b3744f1f8145531e97a10089482631d28121d652fb91ddd2900cb7d4ffb70de58cd3c94fe312fe0777ea2a33f821f0967efe6aa9ea531b0a7cf214ef +EBUILD postgresql-15_beta2.ebuild 13665 BLAKE2B ce6a7544e317469603a81dbab5072a8d142bc2b3ada6f9dc7a72606176f64a1a8f9678e6734893ce320a6795839a8f9aee0d95e82044947999de51a63cc7a922 SHA512 5eb71847b3744f1f8145531e97a10089482631d28121d652fb91ddd2900cb7d4ffb70de58cd3c94fe312fe0777ea2a33f821f0967efe6aa9ea531b0a7cf214ef EBUILD postgresql-9999.ebuild 14102 BLAKE2B 821a52a05174b6b4d9c539d01563a45a0edded846b1533b5cc87ccfd45fcfd56bf2e77c49ec8ee1f5cf79d7174f0aaade405591e70aa5d7d81c068fc33fee923 SHA512 e1d8c3ce0347b9db2ba4aeec48cf08d99e522eb5663ae0b84b510baf07be4a06c83a9b6c951952a949a7c3984e373048db0f518ce234117d54ce773fc735ccb2 MISC metadata.xml 571 BLAKE2B 52be4b6368dba1986339957137ed30eb80bd55407eabb4aa01bb7585e164050a1516e47ff8cde0ae89d79338f074d9b3ac3d46581f6ae5f548ff4f0e6a41c090 SHA512 058797d4559a0fd76b7f1e6af249c8f1e101b1e1d1e073506b80a9912b46776de4ff94c73de25020e3e4887940f004423f47e7cecdb96641d4df80f4d65bad28 diff --git a/dev-db/postgresql/postgresql-15_beta1-r1.ebuild b/dev-db/postgresql/postgresql-15_beta1-r1.ebuild deleted file mode 100644 index 0207dd4f4251..000000000000 --- a/dev-db/postgresql/postgresql-15_beta1-r1.ebuild +++ /dev/null @@ -1,464 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10,11} ) - -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles - -KEYWORDS="" - -SLOT=$(ver_cut 1) - -MY_PV=${PV/_/} -S="${WORKDIR}/${PN}-${MY_PV}" - -SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" - -LICENSE="POSTGRESQL GPL-2" -DESCRIPTION="PostgreSQL RDBMS" -HOMEPAGE="https://www.postgresql.org/" - -IUSE="debug doc icu kerberos ldap llvm lz4 nls pam - perl python +readline selinux +server systemd ssl static-libs tcl - threads uuid xml zlib zstd" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" ->=app-eselect/eselect-postgresql-2.0 -acct-group/postgres -acct-user/postgres -sys-apps/less -virtual/libintl -icu? ( dev-libs/icu:= ) -kerberos? ( virtual/krb5 ) -ldap? ( net-nds/openldap:= ) -llvm? ( - sys-devel/llvm:= - sys-devel/clang:= -) -lz4? ( app-arch/lz4 ) -pam? ( sys-libs/pam ) -perl? ( >=dev-lang/perl-5.8:= ) -python? ( ${PYTHON_DEPS} ) -readline? ( sys-libs/readline:0= ) -server? ( systemd? ( sys-apps/systemd ) ) -ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) -tcl? ( >=dev-lang/tcl-8:0= ) -xml? ( dev-libs/libxml2 dev-libs/libxslt ) -zlib? ( sys-libs/zlib ) -zstd? ( app-arch/zstd ) -" - -# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no -# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems, -# the libc includes UUID functions. -UTIL_LINUX_LIBC=( elibc_{glibc,musl} ) - -nest_usedep() { - local front back - while [[ ${#} -gt 1 ]]; do - front+="${1}? ( " - back+=" )" - shift - done - echo "${front}${1}${back}" -} - -CDEPEND+=" -uuid? ( - ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )} - $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid) -)" - -DEPEND="${CDEPEND} -sys-devel/bison -sys-devel/flex -nls? ( sys-devel/gettext ) -xml? ( virtual/pkgconfig ) -" - -RDEPEND="${CDEPEND} -selinux? ( sec-policy/selinux-postgresql ) -" - -pkg_setup() { - use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Set proper run directory - sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \ - -i src/include/pg_config_manual.h || die - - # Rely on $PATH being in the proper order so that the correct - # install program is used for modules utilizing PGXS in both - # hardened and non-hardened environments. (Bug #528786) - sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die - - use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch" - - if use pam ; then - sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \ - -i src/backend/libpq/auth.c || \ - die 'PGSQL_PAM_SERVICE rename failed.' - fi - - eapply_user -} - -src_configure() { - case ${CHOST} in - *-darwin*|*-solaris*) - use nls && append-libs intl - ;; - esac - - export LDFLAGS_SL="${LDFLAGS}" - export LDFLAGS_EX="${LDFLAGS}" - - local PO="${EPREFIX}" - - local i uuid_config="" - if use uuid; then - for i in ${UTIL_LINUX_LIBC[@]}; do - use ${i} && uuid_config="--with-uuid=e2fs" - done - [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp" - fi - - local myconf="\ - --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \ - --datadir="${PO}/usr/share/postgresql-${SLOT}" \ - --includedir="${PO}/usr/include/postgresql-${SLOT}" \ - --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ - --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ - --with-system-tzdata="${PO}/usr/share/zoneinfo" \ - $(use_enable debug) \ - $(use_enable threads thread-safety) \ - $(use_with icu) \ - $(use_with kerberos gssapi) \ - $(use_with ldap) \ - $(use_with llvm) \ - $(use_with lz4) \ - $(use_with pam) \ - $(use_with perl) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with ssl openssl) \ - $(usex server "$(use_with systemd)" '--without-systemd') \ - $(use_with tcl) \ - ${uuid_config} \ - $(use_with xml libxml) \ - $(use_with xml libxslt) \ - $(use_with zlib) \ - $(use_with zstd) \ - $(use_enable nls)" - if use alpha; then - myconf+=" --disable-spinlocks" - else - # Should be the default but just in case - myconf+=" --enable-spinlocks" - fi - econf ${myconf} -} - -src_compile() { - emake - emake -C contrib -} - -src_install() { - emake DESTDIR="${D}" install - emake DESTDIR="${D}" install -C contrib - - dodoc README HISTORY - - # man pages are already built, but if we have the target make them, - # they'll be generated from source before being installed so we - # manually install man pages. - # We use ${SLOT} instead of doman for postgresql.eselect - insinto /usr/share/postgresql-${SLOT}/man/ - doins -r doc/src/sgml/man{1,3,7} - if ! use server; then - # Remove man pages for non-existent binaries - serverman=( - initdb - pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby} - pg_{test_{fsync,timing},upgrade,waldump} - post{gres,master} - ) - for m in ${serverman[@]} ; do - rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1" - done - fi - docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7} - - # Create slot specific man pages - local bn f mansec slotted_name - for mansec in 1 3 7 ; do - local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}" - - mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir" - pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed" - - for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do - bn=$(basename "${f}") - slotted_name=${bn%.${mansec}}${SLOT}.${mansec} - case ${bn} in - TABLE.7|WITH.7) - echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name} - ;; - *) - echo ".so ${rel_manpath}/${bn}" > ${slotted_name} - ;; - esac - done - - popd > /dev/null - done - - insinto /etc/postgresql-${SLOT} - newins src/bin/psql/psqlrc.sample psqlrc - - # Don't delete libpg{port,common}.a (Bug #571046). They're always - # needed by extensions utilizing PGXS. - use static-libs || \ - find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \ - -delete - - # Make slot specific links to programs - local f bn - for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \ - -mindepth 1 -maxdepth 1) - do - bn=$(basename "${f}") - dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \ - "/usr/bin/${bn}${SLOT/.}" - done - - if use doc ; then - docinto html - dodoc doc/src/sgml/html/* - fi - - if use server; then - sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ - "${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT} - - sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ - "${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT} - - if use systemd; then - sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ - "${FILESDIR}/${PN}.service-9.6-r1" | \ - systemd_newunit - ${PN}-${SLOT}.service - newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir - newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf - fi - - use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session - - if use prefix ; then - keepdir /run/postgresql - fperms 1775 /run/postgresql - fi - fi -} - -pkg_postinst() { - use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf - postgresql-config update - - elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT}/etc/postgresql-${SLOT}/" - - if use server ; then - elog - elog "Gentoo specific documentation:" - elog "https://wiki.gentoo.org/wiki/PostgreSQL" - elog - elog "Official documentation:" - elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" - elog - elog "The default location of the Unix-domain socket is:" - elog " ${EROOT}/run/postgresql/" - elog - elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" - elog "so that it contains your preferred locale in:" - elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" - elog - elog "Then, execute the following command to setup the initial database" - elog "environment:" - elog " emerge --config =${CATEGORY}/${PF}" - - if [[ -n ${REPLACING_VERSIONS} ]] ; then - ewarn "If your system is using 'pg_stat_statements' and you are running a" - ewarn "version of PostgreSQL ${SLOT}, we advise that you execute" - ewarn "the following command after upgrading:" - ewarn - ewarn "ALTER EXTENSION pg_stat_statements UPDATE;" - fi - fi -} - -pkg_prerm() { - if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then - ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?" - ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL" - - ebegin "Resuming removal in 10 seconds (Control-C to cancel)" - sleep 10 - eend 0 - fi -} - -pkg_postrm() { - postgresql-config update -} - -pkg_config() { - use server || die "USE flag 'server' not enabled. Nothing to configure." - - [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" - [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" - - # environment.bz2 may not contain the same locale as the current system - # locale. Unset and source from the current system locale. - if [ -f "${EROOT}/etc/env.d/02locale" ]; then - unset LANG - unset LC_CTYPE - unset LC_NUMERIC - unset LC_TIME - unset LC_COLLATE - unset LC_MONETARY - unset LC_MESSAGES - unset LC_ALL - source "${EROOT}/etc/env.d/02locale" - [ -n "${LANG}" ] && export LANG - [ -n "${LC_CTYPE}" ] && export LC_CTYPE - [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC - [ -n "${LC_TIME}" ] && export LC_TIME - [ -n "${LC_COLLATE}" ] && export LC_COLLATE - [ -n "${LC_MONETARY}" ] && export LC_MONETARY - [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES - [ -n "${LC_ALL}" ] && export LC_ALL - fi - - einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" - einfo - einfo "Information on options that can be passed to initdb are found at:" - einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" - einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html" - einfo - einfo "PG_INITDB_OPTS is currently set to:" - if [[ -z "${PG_INITDB_OPTS}" ]] ; then - einfo " (none)" - else - einfo " ${PG_INITDB_OPTS}" - fi - einfo - einfo "Configuration files will be installed to:" - einfo " ${PGDATA}" - einfo - einfo "The database cluster will be created in:" - einfo " ${DATA_DIR}" - einfo - - ebegin "Continuing initialization in 5 seconds (Control-C to cancel)" - sleep 5 - eend 0 - - if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then - eerror "The given directory, '${DATA_DIR}', is not empty." - eerror "Modify DATA_DIR to point to an empty directory." - die "${DATA_DIR} is not empty." - fi - - einfo "Creating the data directory ..." - if [[ ${EUID} == 0 ]] ; then - mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs" - mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR" - chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown" - fi - - einfo "Initializing the database ..." - - if [[ ${EUID} == 0 ]] ; then - su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" - else - "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} - fi - - if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then - mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}" - ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}" - fi - - # unix_socket_directory has no effect in postgresql.conf as it's - # overridden in the initscript - sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf - - cat <<- EOF >> "${PGDATA%/}"/postgresql.conf - # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522 - # On the off-chance that you might need to work with UTF-8 encoded - # characters in PL/Perl - plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";' - EOF - - einfo "The autovacuum function, which was in contrib, has been moved to the main" - einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled" - einfo "by default. You can disable it in the cluster's:" - einfo " ${PGDATA%/}/postgresql.conf" - einfo - if ! use systemd; then - einfo "The PostgreSQL server, by default, will log events to:" - einfo " ${DATA_DIR%/}/postmaster.log" - einfo - fi - if use prefix ; then - einfo "The location of the configuration files have moved to:" - einfo " ${PGDATA}" - einfo "To start the server:" - einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'" - einfo "To stop:" - einfo " pg_ctl stop -D ${DATA_DIR}" - einfo - einfo "Or move the configuration files back:" - einfo "mv ${PGDATA}*.conf ${DATA_DIR}" - elif use systemd; then - einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" - einfo "instead of 'pg_ctl'." - else - einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" - einfo "instead of 'pg_ctl'." - fi -} - -src_test() { - if use server && [[ ${UID} -ne 0 ]] ; then - # Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set - # LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage. - local old_ctype=${LC_CTYPE} - export LC_CTYPE=${LC_COLLATE} - emake check - export LC_CTYPE=${old_ctype} - einfo "If you think other tests besides the regression tests are necessary, please" - einfo "submit a bug including a patch for this ebuild to enable them." - else - use server || \ - ewarn 'Tests cannot be run without the "server" use flag enabled.' - [[ ${UID} -eq 0 ]] || \ - ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.' - - ewarn 'Skipping.' - fi -} diff --git a/dev-db/postgresql/postgresql-15_beta2.ebuild b/dev-db/postgresql/postgresql-15_beta2.ebuild new file mode 100644 index 000000000000..0207dd4f4251 --- /dev/null +++ b/dev-db/postgresql/postgresql-15_beta2.ebuild @@ -0,0 +1,464 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10,11} ) + +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles + +KEYWORDS="" + +SLOT=$(ver_cut 1) + +MY_PV=${PV/_/} +S="${WORKDIR}/${PN}-${MY_PV}" + +SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" + +LICENSE="POSTGRESQL GPL-2" +DESCRIPTION="PostgreSQL RDBMS" +HOMEPAGE="https://www.postgresql.org/" + +IUSE="debug doc icu kerberos ldap llvm lz4 nls pam + perl python +readline selinux +server systemd ssl static-libs tcl + threads uuid xml zlib zstd" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +CDEPEND=" +>=app-eselect/eselect-postgresql-2.0 +acct-group/postgres +acct-user/postgres +sys-apps/less +virtual/libintl +icu? ( dev-libs/icu:= ) +kerberos? ( virtual/krb5 ) +ldap? ( net-nds/openldap:= ) +llvm? ( + sys-devel/llvm:= + sys-devel/clang:= +) +lz4? ( app-arch/lz4 ) +pam? ( sys-libs/pam ) +perl? ( >=dev-lang/perl-5.8:= ) +python? ( ${PYTHON_DEPS} ) +readline? ( sys-libs/readline:0= ) +server? ( systemd? ( sys-apps/systemd ) ) +ssl? ( >=dev-libs/openssl-0.9.6-r1:0= ) +tcl? ( >=dev-lang/tcl-8:0= ) +xml? ( dev-libs/libxml2 dev-libs/libxslt ) +zlib? ( sys-libs/zlib ) +zstd? ( app-arch/zstd ) +" + +# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no +# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems, +# the libc includes UUID functions. +UTIL_LINUX_LIBC=( elibc_{glibc,musl} ) + +nest_usedep() { + local front back + while [[ ${#} -gt 1 ]]; do + front+="${1}? ( " + back+=" )" + shift + done + echo "${front}${1}${back}" +} + +CDEPEND+=" +uuid? ( + ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )} + $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} dev-libs/ossp-uuid) +)" + +DEPEND="${CDEPEND} +sys-devel/bison +sys-devel/flex +nls? ( sys-devel/gettext ) +xml? ( virtual/pkgconfig ) +" + +RDEPEND="${CDEPEND} +selinux? ( sec-policy/selinux-postgresql ) +" + +pkg_setup() { + use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + # Set proper run directory + sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \ + -i src/include/pg_config_manual.h || die + + # Rely on $PATH being in the proper order so that the correct + # install program is used for modules utilizing PGXS in both + # hardened and non-hardened environments. (Bug #528786) + sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die + + use server || eapply "${FILESDIR}/${PN}-14_rc1-no-server.patch" + + if use pam ; then + sed "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \ + -i src/backend/libpq/auth.c || \ + die 'PGSQL_PAM_SERVICE rename failed.' + fi + + eapply_user +} + +src_configure() { + case ${CHOST} in + *-darwin*|*-solaris*) + use nls && append-libs intl + ;; + esac + + export LDFLAGS_SL="${LDFLAGS}" + export LDFLAGS_EX="${LDFLAGS}" + + local PO="${EPREFIX}" + + local i uuid_config="" + if use uuid; then + for i in ${UTIL_LINUX_LIBC[@]}; do + use ${i} && uuid_config="--with-uuid=e2fs" + done + [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp" + fi + + local myconf="\ + --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \ + --datadir="${PO}/usr/share/postgresql-${SLOT}" \ + --includedir="${PO}/usr/include/postgresql-${SLOT}" \ + --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \ + --sysconfdir="${PO}/etc/postgresql-${SLOT}" \ + --with-system-tzdata="${PO}/usr/share/zoneinfo" \ + $(use_enable debug) \ + $(use_enable threads thread-safety) \ + $(use_with icu) \ + $(use_with kerberos gssapi) \ + $(use_with ldap) \ + $(use_with llvm) \ + $(use_with lz4) \ + $(use_with pam) \ + $(use_with perl) \ + $(use_with python) \ + $(use_with readline) \ + $(use_with ssl openssl) \ + $(usex server "$(use_with systemd)" '--without-systemd') \ + $(use_with tcl) \ + ${uuid_config} \ + $(use_with xml libxml) \ + $(use_with xml libxslt) \ + $(use_with zlib) \ + $(use_with zstd) \ + $(use_enable nls)" + if use alpha; then + myconf+=" --disable-spinlocks" + else + # Should be the default but just in case + myconf+=" --enable-spinlocks" + fi + econf ${myconf} +} + +src_compile() { + emake + emake -C contrib +} + +src_install() { + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install -C contrib + + dodoc README HISTORY + + # man pages are already built, but if we have the target make them, + # they'll be generated from source before being installed so we + # manually install man pages. + # We use ${SLOT} instead of doman for postgresql.eselect + insinto /usr/share/postgresql-${SLOT}/man/ + doins -r doc/src/sgml/man{1,3,7} + if ! use server; then + # Remove man pages for non-existent binaries + serverman=( + initdb + pg_{archivecleanup,controldata,ctl,resetwal,rewind,standby} + pg_{test_{fsync,timing},upgrade,waldump} + post{gres,master} + ) + for m in ${serverman[@]} ; do + rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1" + done + fi + docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7} + + # Create slot specific man pages + local bn f mansec slotted_name + for mansec in 1 3 7 ; do + local rel_manpath="../../postgresql-${SLOT}/man/man${mansec}" + + mkdir -p "${ED}"/usr/share/man/man${mansec} || die "making man dir" + pushd "${ED}"/usr/share/man/man${mansec} > /dev/null || die "pushd failed" + + for f in "${ED}/usr/share/postgresql-${SLOT}/man/man${mansec}"/* ; do + bn=$(basename "${f}") + slotted_name=${bn%.${mansec}}${SLOT}.${mansec} + case ${bn} in + TABLE.7|WITH.7) + echo ".so ${rel_manpath}/SELECT.7" > ${slotted_name} + ;; + *) + echo ".so ${rel_manpath}/${bn}" > ${slotted_name} + ;; + esac + done + + popd > /dev/null + done + + insinto /etc/postgresql-${SLOT} + newins src/bin/psql/psqlrc.sample psqlrc + + # Don't delete libpg{port,common}.a (Bug #571046). They're always + # needed by extensions utilizing PGXS. + use static-libs || \ + find "${ED}" -name '*.a' ! -name libpgport.a ! -name libpgcommon.a \ + -delete + + # Make slot specific links to programs + local f bn + for f in $(find "${ED}/usr/$(get_libdir)/postgresql-${SLOT}/bin" \ + -mindepth 1 -maxdepth 1) + do + bn=$(basename "${f}") + dosym "../$(get_libdir)/postgresql-${SLOT}/bin/${bn}" \ + "/usr/bin/${bn}${SLOT/.}" + done + + if use doc ; then + docinto html + dodoc doc/src/sgml/html/* + fi + + if use server; then + sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ + "${FILESDIR}/${PN}.confd-9.3" | newconfd - ${PN}-${SLOT} + + sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ + "${FILESDIR}/${PN}.init-9.3-r1" | newinitd - ${PN}-${SLOT} + + if use systemd; then + sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ + "${FILESDIR}/${PN}.service-9.6-r1" | \ + systemd_newunit - ${PN}-${SLOT}.service + newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + fi + + use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session + + if use prefix ; then + keepdir /run/postgresql + fperms 1775 /run/postgresql + fi + fi +} + +pkg_postinst() { + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf + postgresql-config update + + elog "If you need a global psqlrc-file, you can place it in:" + elog " ${EROOT}/etc/postgresql-${SLOT}/" + + if use server ; then + elog + elog "Gentoo specific documentation:" + elog "https://wiki.gentoo.org/wiki/PostgreSQL" + elog + elog "Official documentation:" + elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" + elog + elog "The default location of the Unix-domain socket is:" + elog " ${EROOT}/run/postgresql/" + elog + elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" + elog "so that it contains your preferred locale in:" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" + elog + elog "Then, execute the following command to setup the initial database" + elog "environment:" + elog " emerge --config =${CATEGORY}/${PF}" + + if [[ -n ${REPLACING_VERSIONS} ]] ; then + ewarn "If your system is using 'pg_stat_statements' and you are running a" + ewarn "version of PostgreSQL ${SLOT}, we advise that you execute" + ewarn "the following command after upgrading:" + ewarn + ewarn "ALTER EXTENSION pg_stat_statements UPDATE;" + fi + fi +} + +pkg_prerm() { + if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then + ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?" + ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL" + + ebegin "Resuming removal in 10 seconds (Control-C to cancel)" + sleep 10 + eend 0 + fi +} + +pkg_postrm() { + postgresql-config update +} + +pkg_config() { + use server || die "USE flag 'server' not enabled. Nothing to configure." + + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" + [[ -z "${DATA_DIR}" ]] \ + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" + + # environment.bz2 may not contain the same locale as the current system + # locale. Unset and source from the current system locale. + if [ -f "${EROOT}/etc/env.d/02locale" ]; then + unset LANG + unset LC_CTYPE + unset LC_NUMERIC + unset LC_TIME + unset LC_COLLATE + unset LC_MONETARY + unset LC_MESSAGES + unset LC_ALL + source "${EROOT}/etc/env.d/02locale" + [ -n "${LANG}" ] && export LANG + [ -n "${LC_CTYPE}" ] && export LC_CTYPE + [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC + [ -n "${LC_TIME}" ] && export LC_TIME + [ -n "${LC_COLLATE}" ] && export LC_COLLATE + [ -n "${LC_MONETARY}" ] && export LC_MONETARY + [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES + [ -n "${LC_ALL}" ] && export LC_ALL + fi + + einfo "You can modify the paths and options passed to initdb by editing:" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" + einfo + einfo "Information on options that can be passed to initdb are found at:" + einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" + einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html" + einfo + einfo "PG_INITDB_OPTS is currently set to:" + if [[ -z "${PG_INITDB_OPTS}" ]] ; then + einfo " (none)" + else + einfo " ${PG_INITDB_OPTS}" + fi + einfo + einfo "Configuration files will be installed to:" + einfo " ${PGDATA}" + einfo + einfo "The database cluster will be created in:" + einfo " ${DATA_DIR}" + einfo + + ebegin "Continuing initialization in 5 seconds (Control-C to cancel)" + sleep 5 + eend 0 + + if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then + eerror "The given directory, '${DATA_DIR}', is not empty." + eerror "Modify DATA_DIR to point to an empty directory." + die "${DATA_DIR} is not empty." + fi + + einfo "Creating the data directory ..." + if [[ ${EUID} == 0 ]] ; then + mkdir -p "$(dirname ${DATA_DIR%/})" || die "Couldn't parent dirs" + mkdir -m 0700 "${DATA_DIR%/}" || die "Couldn't make DATA_DIR" + chown -h postgres:postgres "${DATA_DIR%/}" || die "Couldn't chown" + fi + + einfo "Initializing the database ..." + + if [[ ${EUID} == 0 ]] ; then + su - postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + else + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + fi + + if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then + mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}" + ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}" + fi + + # unix_socket_directory has no effect in postgresql.conf as it's + # overridden in the initscript + sed '/^#unix_socket_directories/,+1d' -i "${PGDATA%/}"/postgresql.conf + + cat <<- EOF >> "${PGDATA%/}"/postgresql.conf + # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522 + # On the off-chance that you might need to work with UTF-8 encoded + # characters in PL/Perl + plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";' + EOF + + einfo "The autovacuum function, which was in contrib, has been moved to the main" + einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled" + einfo "by default. You can disable it in the cluster's:" + einfo " ${PGDATA%/}/postgresql.conf" + einfo + if ! use systemd; then + einfo "The PostgreSQL server, by default, will log events to:" + einfo " ${DATA_DIR%/}/postmaster.log" + einfo + fi + if use prefix ; then + einfo "The location of the configuration files have moved to:" + einfo " ${PGDATA}" + einfo "To start the server:" + einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'" + einfo "To stop:" + einfo " pg_ctl stop -D ${DATA_DIR}" + einfo + einfo "Or move the configuration files back:" + einfo "mv ${PGDATA}*.conf ${DATA_DIR}" + elif use systemd; then + einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" + einfo "instead of 'pg_ctl'." + else + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "instead of 'pg_ctl'." + fi +} + +src_test() { + if use server && [[ ${UID} -ne 0 ]] ; then + # Some ICU tests fail if LC_CTYPE and LC_COLLATE aren't the same. We set + # LC_CTYPE to be equal to LC_COLLATE since LC_COLLATE is set by Portage. + local old_ctype=${LC_CTYPE} + export LC_CTYPE=${LC_COLLATE} + emake check + export LC_CTYPE=${old_ctype} + einfo "If you think other tests besides the regression tests are necessary, please" + einfo "submit a bug including a patch for this ebuild to enable them." + else + use server || \ + ewarn 'Tests cannot be run without the "server" use flag enabled.' + [[ ${UID} -eq 0 ]] || \ + ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.' + + ewarn 'Skipping.' + fi +} diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index e3c872638248..ec36be1e1bf8 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -1,6 +1,7 @@ AUX configure.ac-3.2 1882 BLAKE2B b8bc3e04c3203977218ee1d6d68e9f841b84fe82ab8803027034237275fb548cde282748a2f96bc25532e61f8e25a50cba9e165aac578d5db634a7ffc587ee9e SHA512 13d9f16cde8a95c96bcd726056d670d390dea6e2752ac607bc68eefb6214f0ab18b0e27d3283f2b219febd2da82e6489bd434215c9380c3c85c711aa00cb2be5 AUX configure.ac-7.0 1523 BLAKE2B fc05fd3fd13bf192d2a52096c89bfb87d6660c19b9c88f0c2d5541262626338146870441f361d5d6b9d19133e7c01d912b2f99d4db39e66627ddf2158e860a98 SHA512 de1c16ad2b89a99a34a0b3f2e341efe69bd879efbddeee44d96398ba2a1ef9896c69a9aed13fc24b25992f61019d3c9026c57504cffd4e5910ca2606d5a48d1e AUX redis-3.2.3-config.patch 1495 BLAKE2B 9f3c04dfd97845dcd364b75e2e5f543bc40ec0221a5ce19ab3c194e55ceaf24f13c307276f616d9a7742662d9e4fa76152c7036f7728f787bbac55f2b1a00999 SHA512 d71c918ea4952ecb55cc4c87649745ee468587c289d60bd1bee87a2948a6e882d42afe36bb113392b5aaab17d315732cabfc472804204d3a043305a5488a4124 +AUX redis-5.0-luajit-2.1-fix.patch 1885 BLAKE2B 290cf1ad1e01fd8b1e57b972822a97eff224f4540ea09e1e2d80a72d26a40e1861c2bb386da3edb1961a413e73761553286bbcdfba8c064ad74f22748bb3999f SHA512 79147fdefaee4e5ed508299274856cd42e817c73a5d055ec4d6ab03c7b9c1f57a62b9651ffc3173d795f05e39827c88fbe41b9bc20355933150c6a549738b1ec AUX redis-5.0-shared.patch 883 BLAKE2B 71a490d5c40d873db7d363c4f3cab966bf8e92fa84bcb7209344b79b3bfc4c6f8df5224c8ae0e5d9ee8dbd62d9e288e90934809e91fd6f63c7d1dd4a518170a9 SHA512 f1d1e37a4786a84e9543956e21644a1dcfdc52742299119ba1547b9fb56a92fdef3ca518d94a1db8a88222b661ac7849a4db0bf7ba38b1ae65f286e7df90f0c1 AUX redis-5.0-sharedlua.patch 2642 BLAKE2B f86d3c932a8c0f05e2d65725037a0780152b95835f88395cc74765902c3184a4e1ed0a3802f54345e91a70b6ac013419c6d3412df8fd2397ed300ff1e7210724 SHA512 971944ff03563bcc91c9f29316af2b0eb691c9d0e27d9e4f3fad30dc4e4afe34c077ccdbf5f93ebd78ea6571f809a801721376059780a30467274a7be5ca6425 AUX redis-5.0.8-ppc-atomic.patch 495 BLAKE2B a995c1b1e327416705151dd888b98fe02fdea8126359f3ffa2cce4d5794d7677ffc4dc7f628d076bc0ed341dac4010ffb9409ee25113fe9cac2298658e94802e SHA512 f4f2c2aad5d09e9fafa58946fdc79aa49d8f16ce6d389dd653522295dc397796c58c87f4fb92016af8c261aa4b00a7eab09d33a19eded496807444d234a9abd9 @@ -26,15 +27,12 @@ DIST redis-5.0.14.tar.gz 2000179 BLAKE2B 77d3ed09a81450dbf806edd017785b82c50bb05 DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d372484c95d2af8b24ec902a8086b9c3f4e53513df982fe135963432bfb527334926dd494e50d2cc618ab813f39 SHA512 83bb72448f9943e3d015cb4d961eb2eae21602ef1f90ca52ca8ab7c6918b0ab979db9f61f3981df27b2286894f4864f4588c3a52fa988e30e9419b0967998845 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953 -DIST redis-7.0.0.tar.gz 2943054 BLAKE2B 561cf591bacac51fddc375a1c725c385f9b0b4b4bb7fca7d889ee1b7760cf5ea986e26613a0f69fda9b6f8a02d02e055514d374be7913e26724e3857967fea22 SHA512 12ac925708c54b00b34c365dee39cb207fbe3cb3c99e8daad965e122b6e3a6543e3ca80e23e6a56f5dff6371d4f2b9c149ee51800ed540e1f1b9154a118ea07b DIST redis-7.0.1.tar.gz 2955839 BLAKE2B 67ff36e5e78ab9a90d4404d0f0bddbe9b539166c826d8a1b314bb32cdece7d40caf5eff57302cd641548ed3b1e19aff1b657ed31a20233550636708b6386c2db SHA512 e61d27695fd2d439f204612b97a3ea245ebf92d418949460f7144026191ade4fac1647717bbb48a2b3e238856f0392af08b4fdb4358d04f2ccd1088ff9d3dac4 DIST redis-7.0.2.tar.gz 2956784 BLAKE2B 418f6114662c9b9b67dc7f28f89f58fefee3eb5fec84a6193ca50034366c963986a56d1c96dadfdd88a88ea1ddd4542ed910b89c8a81c95b38aa4f7bdc5ae571 SHA512 bc8d679ecaad0220318b87be70476653f42b76815af61ff6f4e8885f5a5d17d41cea754fbf448f9e18e9a9f90227c5ac198fa9bc523370752f590ba01418a1b0 -EBUILD redis-5.0.14.ebuild 4792 BLAKE2B 091edcb9ac825bab031bec34d954e07f78702678ae02e23a24bd9544c43a51f91c270e8507827d1f7d69a7055f3a0e431745bbf61f9c9645ef108d7517fb9be7 SHA512 85e2c3496115c98f8b116b1e960e429cdac3acf83333c98ad880f692774e76212fd81ac40b97770ed8fc0691232f0b7f94581ad90c32fb8041e5829813cf7abd -EBUILD redis-6.0.16.ebuild 5596 BLAKE2B 31fd97d2956903c97fd4a2997b488f2b4367871337cf4bb3d48141ff5534d550615a225aae8fe26182ee6037672f1920499676bbc605df3db185bad21fdc2f30 SHA512 916e2e80dda60b3a128aad7b53fc8d8a9fc8a44e4d5de5e00fbc68155111d2b4c69456f4217e11b6e53b1b27c76e871c181c91dd43b42b5c96027d7370e601ce -EBUILD redis-6.2.6.ebuild 5352 BLAKE2B 2b0ac88bc478e1578a479a60bc8e20cfca0dc9e13333fd6e012aec87248866baea31671ed2dd61f90c2d765a0f256df45b3f2ea27f76767fbc766626ef413d9f SHA512 559291c386b7867e40de1af5a3ffd88c89555c7fbc110025853a583c8246bcd17f343e1c2166ae1c41ce6254588917bfd0f15710442ace4f0e531e8c2e63ec4d +EBUILD redis-5.0.14.ebuild 4838 BLAKE2B 2c43196d200f0ca86eaa5c29cfec20ff717726d572402ff8a6afd6dd660edb7b5716a0fcf58fa960365802d837bfe5d0bc96f18144517b82afac1f264875f59b SHA512 a3df8b7b0e00199f67801c711015ea9b415903dce574b4d119c74201aed28d9f2afd81062c12b33f3770380daef250ed8c51125cde98a70f5ae63ad534e6f855 +EBUILD redis-6.0.16.ebuild 5642 BLAKE2B 72f2aea7b428ea59a05d51f8f10e7447408757f3cf322cd2d37ed605812816f135baac4507543254de0d1f3d89a2da9d261d2012b6c3805b4a87fab064465e32 SHA512 1f6c69e96eb98e4389d55cee8dbd40ad0cab84aad60edc65df2b940968392ed052a489ad25662e44a5c14a5c878f08b2566097d0c20c200f8c74b0b2d5f327ee +EBUILD redis-6.2.6.ebuild 5398 BLAKE2B ea426c3c1f29e7e471fcd0435dd494713111d63d585f870e0d6c86e662e4023bacac5134c95c52ead1fcc3a8886db83a42a2f719fa035f46dde3dd333c725c92 SHA512 2b066233d5211973a19fc7d7c1d01892e818a560be746754166dcd836c46c370a61e0e92592452345c98d00dd455cb9af6bd2eff0f6375d9fcef15e46e433b1e EBUILD redis-6.2.7-r1.ebuild 5482 BLAKE2B 820c3b7261a84cc6ae2313ef9adad5a43787b308b36b20525ee3ec3d1587095b979ebb4a00775c37aa6f54b2520de7fe204582120436fef94717fc7d101001e6 SHA512 2d28ededbd610a0d9d8d61229c67ebc747464b77214daff069a2acdea45d86170de1fe70cd465aa444dad72d7e466e46d8397c82643857a11d9347b0ecdf6396 -EBUILD redis-7.0.0-r2.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7 -EBUILD redis-7.0.0.ebuild 5664 BLAKE2B 1313598911fb74f6de7fdfc8e58061b2bee2d71125241216781b59c04e35b2d3bec09a9692c29d068f0e9e1a376129479a9c72961a280a390977fd3a8a397812 SHA512 e8ac856a3fd91b080941a486163b74abed1e715de7e8b2fe35338ec89dbafb335b65b7e6dc255c4f250afa7563e64075587a9b4c6dd505aedce5161dc68b1ee0 -EBUILD redis-7.0.1-r1.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7 -EBUILD redis-7.0.2.ebuild 4789 BLAKE2B 64af7c02d2782a4eeafcf370c583fd7ee510a479d7eaff0298633e4c5f6f5d086338427af559d527b847af49617bd01d2373e130b119f25448360798af00cf25 SHA512 4d084698dbe6dbdc9e0e40dae6cb25f79a3d5fba5b73f9651a1f705fed65eb8c0074be69ef3ec3578997762dc839e01b179244db3de4f94343a3af28d7758ac7 -MISC metadata.xml 365 BLAKE2B a2a33da17b877c0e66732b18af4c41e78ad7f60403f7d63b43d16797228c2fe0b3e2af2d0ff56af23baa944ae489163732d84e0921335919f5cea26c589e12ea SHA512 54a8b9cb42305881b12ef37c4da78ba3760ab2de4b8f2663b099eba7188deaeae08f5649a0c101d6acae63cf20c20d4c5d33274dc3ec6ced80bed68114f32db2 +EBUILD redis-7.0.1-r1.ebuild 4829 BLAKE2B 5530e81a11e62fa3118c7d89a956483856409527d0d28d48ed05dc05996c36389ae9910690808fe1e74e4741852c47e48f36ec23357988821b588827fbfb53ad SHA512 69cb7349fba737e14f4d93e8b5b5f4aaf9dae13b6661e6355103ce95c252bbf624444983e2f9373c1bfd40b35303652c752b8fc8616d3aca917eb16eca450181 +EBUILD redis-7.0.2.ebuild 4836 BLAKE2B d80fa0129b047a147ecb11c343ccf5b300d3026a9f8dece4740843341f84d53b3d675090c35f75afe3e0fd5b02546a5f2ae15ac4f2a113ecf4370c4c43fdc2c7 SHA512 21d2332d96868e95d48cbebe3e9f42c433194f198db6c27361356f61927eaad0d6c3cc21a83d1b16affa40ecdf2cfbc56328682311b3e84d596b260ab2672350 +MISC metadata.xml 616 BLAKE2B 7d97d6490b18f6505729b0ec0c06fafbc8be3fb81c4f0b3aedcb44bbf557ca53c4465d0dac11e52396853e471d426b117e0d4c34407806e8bd31149e12ddad87 SHA512 8ff1a9be0ff3a6c09bb6f77cc83937c0e045ae666cec3994d9f3bf290260337faeeb2d28266e789d1812b4dc481a19afd198c0a207ee107afd2368b9d176fb70 diff --git a/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch new file mode 100644 index 000000000000..968fc865da86 --- /dev/null +++ b/dev-db/redis/files/redis-5.0-luajit-2.1-fix.patch @@ -0,0 +1,47 @@ +Backported from https://github.com/openresty/lua-cjson + +Upstream-commit: 638ac2741a7f ("optimize: improved forward-compatibility with older versions of Lua/LuaJIT.") +Link: https://github.com/openresty/lua-cjson/commit/638ac2741a7f274979ac3fe2e1ea5fd6487702fe +Upstream-PR: https://github.com/openresty/lua-cjson/pull/32 +See-also: https://www.freelists.org/post/luajit/ANN-LuaJIT210beta3,3 + +diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c +index c26c0d7b8..af9e4ca54 100644 +--- a/deps/lua/src/lua_cjson.c ++++ b/deps/lua/src/lua_cjson.c +@@ -1293,11 +1293,13 @@ static int json_decode(lua_State *l) + /* ===== INITIALISATION ===== */ + + #if !defined(LUA_VERSION_NUM) || LUA_VERSION_NUM < 502 +-/* Compatibility for Lua 5.1. ++/* Compatibility for Lua 5.1 and older LuaJIT. + * +- * luaL_setfuncs() is used to create a module table where the functions have +- * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */ +-static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) ++ * compat_luaL_setfuncs() is used to create a module table where the functions ++ * have json_config_t as their first upvalue. Code borrowed from Lua 5.2 ++ * source's luaL_setfuncs(). ++ */ ++static void compat_luaL_setfuncs(lua_State *l, const luaL_Reg *reg, int nup) + { + int i; + +@@ -1310,6 +1312,8 @@ static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup) + } + lua_pop(l, nup); /* remove upvalues */ + } ++#else ++#define compat_luaL_setfuncs(L, reg, nup) luaL_setfuncs(L, reg, nup) + #endif + + /* Call target function in protected mode with all supplied args. +@@ -1365,7 +1369,7 @@ static int lua_cjson_new(lua_State *l) + + /* Register functions with config data as upvalue */ + json_create_config(l); +- luaL_setfuncs(l, reg, 1); ++ compat_luaL_setfuncs(l, reg, 1); + + /* Set cjson.null */ + lua_pushlightuserdata(l, NULL); diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml index 9810bc7e7552..af76c7ccd1a5 100644 --- a/dev-db/redis/metadata.xml +++ b/dev-db/redis/metadata.xml @@ -1,10 +1,18 @@ + + arkamar@atlas.cz + Petr Vaněk + sam@gentoo.org Sam James + + proxy-maint@gentoo.org + Proxy Maintainers + Use tcmalloc from dev-util/google-perftools for allocations. diff --git a/dev-db/redis/redis-5.0.14.ebuild b/dev-db/redis/redis-5.0.14.ebuild index b12534f6948d..5064cb59f2ec 100644 --- a/dev-db/redis/redis-5.0.14.ebuild +++ b/dev-db/redis/redis-5.0.14.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.0-sharedlua.patch "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch + "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch ) src_prepare() { diff --git a/dev-db/redis/redis-6.0.16.ebuild b/dev-db/redis/redis-6.0.16.ebuild index 45e59b644a37..9c1f2e88c2da 100644 --- a/dev-db/redis/redis-6.0.16.ebuild +++ b/dev-db/redis/redis-6.0.16.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.12-sharedlua.patch "${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch + "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch ) src_prepare() { diff --git a/dev-db/redis/redis-6.2.6.ebuild b/dev-db/redis/redis-6.2.6.ebuild index 5f9d87086347..364e49a7adb2 100644 --- a/dev-db/redis/redis-6.2.6.ebuild +++ b/dev-db/redis/redis-6.2.6.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.2.1-sharedlua.patch "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch "${FILESDIR}"/${PN}-sentinel-5.0-config.patch + "${FILESDIR}"/${PN}-5.0-luajit-2.1-fix.patch ) src_prepare() { diff --git a/dev-db/redis/redis-7.0.0-r2.ebuild b/dev-db/redis/redis-7.0.0-r2.ebuild deleted file mode 100644 index c8c1359e41d5..000000000000 --- a/dev-db/redis/redis-7.0.0-r2.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated -# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable - -inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="A persistent caching system, key-value, and data structures database" -HOMEPAGE="https://redis.io" -SRC_URI="https://download.redis.io/releases/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc ssl systemd tcmalloc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - jemalloc? ( >=dev-libs/jemalloc-5.1:= ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd:= ) - tcmalloc? ( dev-util/google-perftools ) -" - -RDEPEND=" - ${COMMON_DEPEND} - acct-group/redis - acct-user/redis -" - -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" - -# Tcl is only needed in the CHOST test env -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-lang/tcl:0= - ssl? ( dev-tcltk/tls ) - )" - -REQUIRED_USE="?? ( jemalloc tcmalloc )" - -PATCHES=( - "${FILESDIR}"/${PN}-6.2.1-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch -) - -src_prepare() { - default - - # Append cflag for lua_cjson - # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 - append-cflags "-DENABLE_CJSON_GLOBAL" - - # now we will rewrite present Makefiles - local makefiles="" MKF - for MKF in $(find -name 'Makefile' | cut -b 3-); do - mv "${MKF}" "${MKF}.in" - sed -i -e 's:$(CC):@CC@:g' \ - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ - -e 's: $(DEBUG)::g' \ - -e 's:$(OBJARCH)::g' \ - -e 's:ARCH:TARCH:g' \ - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ - "${MKF}.in" \ - || die "Sed failed for ${MKF}" - makefiles+=" ${MKF}" - done - # autodetection of compiler and settings; generates the modified Makefiles - cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die - - sed -i \ - -e "/^AC_INIT/s|, __PV__, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf - - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 - # also, don't define ANSI/c99 for lua twice - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die -} - -src_compile() { - local myconf="" - - if use jemalloc; then - myconf+="MALLOC=jemalloc" - elif use tcmalloc; then - myconf+="MALLOC=tcmalloc" - else - myconf+="MALLOC=libc" - fi - - if use ssl; then - myconf+=" BUILD_TLS=yes" - fi - - export USE_SYSTEMD=$(usex systemd) - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - local runtestargs=( - --clients "$(makeopts_jobs)" # see bug #649868 - ) - - if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then - ewarn "oom-score-adj related tests will be skipped." \ - "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." - - runtestargs+=( - # unit/oom-score-adj was introduced in version 6.2.0 - --skipunit unit/oom-score-adj # see bug #756382 - - # Following test was added in version 7.0.0 to unit/introspection. - # It also tries to adjust OOM score. - --skiptest "CONFIG SET rollback on apply error" - ) - fi - - if use ssl; then - edo ./utils/gen-test-certs.sh - runtestargs+=( --tls ) - fi - - edo ./runtest "${runtestargs[@]}" -} - -src_install() { - insinto /etc/redis - doins redis.conf sentinel.conf - use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf - fperms 0750 /etc/redis - fperms 0644 /etc/redis/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r2" redis - newinitd "${FILESDIR}/redis.initd-6" redis - - systemd_newunit "${FILESDIR}/redis.service-4" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md - - dobin src/redis-cli - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb - fperms 0750 /usr/sbin/redis-benchmark - dosym redis-server /usr/sbin/redis-sentinel - - if use prefix; then - diropts -m0750 - else - diropts -m0750 -o redis -g redis - fi - keepdir /var/{log,lib}/redis -} - -pkg_postinst() { - tmpfiles_process redis.conf - - ewarn "The default redis configuration file location changed to:" - ewarn " /etc/redis/{redis,sentinel}.conf" - ewarn "Please apply your changes to the new configuration files." -} diff --git a/dev-db/redis/redis-7.0.0.ebuild b/dev-db/redis/redis-7.0.0.ebuild deleted file mode 100644 index 617c6726205d..000000000000 --- a/dev-db/redis/redis-7.0.0.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Redis does NOT build with Lua 5.2 or newer at this time: -# - 5.3 and 5.4 give: -# lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" -# - 5.2 fails with: -# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' -# because lua_open became lua_newstate in 5.2 -LUA_COMPAT=( lua5-1 luajit ) - -# Upstream have deviated too far from vanilla Lua, adding their own APIs -# like lua_enablereadonlytable, but we still need the eclass and such -# for bug #841422. -inherit autotools edo flag-o-matic lua-single multiprocessing systemd tmpfiles toolchain-funcs - -DESCRIPTION="A persistent caching system, key-value, and data structures database" -HOMEPAGE="https://redis.io" -SRC_URI="https://download.redis.io/releases/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc selinux ssl systemd tcmalloc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - ${LUA_DEPS} - jemalloc? ( >=dev-libs/jemalloc-5.1:= ) - ssl? ( dev-libs/openssl:0= ) - systemd? ( sys-apps/systemd:= ) - tcmalloc? ( dev-util/google-perftools ) -" - -RDEPEND=" - ${COMMON_DEPEND} - acct-group/redis - acct-user/redis - selinux? ( sec-policy/selinux-redis ) -" - -BDEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig -" - -# Tcl is only needed in the CHOST test env -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-lang/tcl:0= - ssl? ( dev-tcltk/tls ) - )" - -REQUIRED_USE="?? ( jemalloc tcmalloc ) - ${LUA_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.2.1-config.patch - "${FILESDIR}"/${PN}-5.0-shared.patch - "${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch - "${FILESDIR}"/${PN}-sentinel-5.0-config.patch -) - -src_prepare() { - default - - # Copy lua modules into build dir - #cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die - #cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die - # Append cflag for lua_cjson - # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 - append-cflags "-DENABLE_CJSON_GLOBAL" - - # now we will rewrite present Makefiles - local makefiles="" MKF - for MKF in $(find -name 'Makefile' | cut -b 3-); do - mv "${MKF}" "${MKF}.in" - sed -i -e 's:$(CC):@CC@:g' \ - -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ - -e 's: $(DEBUG)::g' \ - -e 's:$(OBJARCH)::g' \ - -e 's:ARCH:TARCH:g' \ - -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ - "${MKF}.in" \ - || die "Sed failed for ${MKF}" - makefiles+=" ${MKF}" - done - # autodetection of compiler and settings; generates the modified Makefiles - cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die - - # Use the correct pkgconfig name for Lua. - # The upstream configure script handles luajit specially, and is not - # affected by these changes. - sed -i \ - -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ - -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ - -e "/PKG_CHECK_MODULES.*\/s,lua5.1,${ELUA},g" \ - configure.ac || die "Sed failed for configure.ac" - eautoreconf -} - -src_configure() { - econf #$(use_with lua_single_target_luajit luajit) - - # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 - # also, don't define ANSI/c99 for lua twice - sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die -} - -src_compile() { - local myconf="" - - if use jemalloc; then - myconf+="MALLOC=jemalloc" - elif use tcmalloc; then - myconf+="MALLOC=tcmalloc" - else - myconf+="MALLOC=libc" - fi - - if use ssl; then - myconf+=" BUILD_TLS=yes" - fi - - export USE_SYSTEMD=$(usex systemd) - - tc-export AR CC RANLIB - emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}" -} - -src_test() { - local runtestargs=( - --clients "$(makeopts_jobs)" # see bug #649868 - ) - - if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then - ewarn "oom-score-adj related tests will be skipped." \ - "They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382." - - runtestargs+=( - # unit/oom-score-adj was introduced in version 6.2.0 - --skipunit unit/oom-score-adj # see bug #756382 - - # Following test was added in version 7.0.0 to unit/introspection. - # It also tries to adjust OOM score. - --skiptest "CONFIG SET rollback on apply error" - ) - fi - - if use ssl; then - edo ./utils/gen-test-certs.sh - runtestargs+=( --tls ) - fi - - edo ./runtest "${runtestargs[@]}" -} - -src_install() { - insinto /etc/redis - doins redis.conf sentinel.conf - use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf - fperms 0750 /etc/redis - fperms 0644 /etc/redis/{redis,sentinel}.conf - - newconfd "${FILESDIR}/redis.confd-r2" redis - newinitd "${FILESDIR}/redis.initd-6" redis - - systemd_newunit "${FILESDIR}/redis.service-4" redis.service - newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf - - newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel - newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${PN}.logrotate" ${PN} - - dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md - - dobin src/redis-cli - dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb - fperms 0750 /usr/sbin/redis-benchmark - dosym redis-server /usr/sbin/redis-sentinel - - if use prefix; then - diropts -m0750 - else - diropts -m0750 -o redis -g redis - fi - keepdir /var/{log,lib}/redis -} - -pkg_postinst() { - tmpfiles_process redis.conf - - ewarn "The default redis configuration file location changed to:" - ewarn " /etc/redis/{redis,sentinel}.conf" - ewarn "Please apply your changes to the new configuration files." -} diff --git a/dev-db/redis/redis-7.0.1-r1.ebuild b/dev-db/redis/redis-7.0.1-r1.ebuild index c8c1359e41d5..f43853ced40b 100644 --- a/dev-db/redis/redis-7.0.1-r1.ebuild +++ b/dev-db/redis/redis-7.0.1-r1.ebuild @@ -14,8 +14,8 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc ssl systemd tcmalloc test" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" COMMON_DEPEND=" @@ -29,6 +29,7 @@ RDEPEND=" ${COMMON_DEPEND} acct-group/redis acct-user/redis + selinux? ( sec-policy/selinux-redis ) " BDEPEND=" diff --git a/dev-db/redis/redis-7.0.2.ebuild b/dev-db/redis/redis-7.0.2.ebuild index c8c1359e41d5..3e4ee296d8aa 100644 --- a/dev-db/redis/redis-7.0.2.ebuild +++ b/dev-db/redis/redis-7.0.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://download.redis.io/releases/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="+jemalloc ssl systemd tcmalloc test" +IUSE="+jemalloc selinux ssl systemd tcmalloc test" RESTRICT="!test? ( test )" COMMON_DEPEND=" @@ -29,6 +29,7 @@ RDEPEND=" ${COMMON_DEPEND} acct-group/redis acct-user/redis + selinux? ( sec-policy/selinux-redis ) " BDEPEND=" diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest index 0e69f9ee1b91..cf92fef26bd2 100644 --- a/dev-db/sqlcl-bin/Manifest +++ b/dev-db/sqlcl-bin/Manifest @@ -1,3 +1,3 @@ -DIST sqlcl-22.1.1.131.0820.zip 40620046 BLAKE2B f09898832eba3ae3f371c7535c589a9cbf83f5caa6a91c4af0df0ad8348819686a633459ff680b58c215bfaf163eb6fc5e9faa00ad128a4cc4309f41986134e8 SHA512 a2af4737dc892676f302869301d1ebbb0fbcf2633e574f75e697abe37d84ba8b70879f85ebe71960c4376f6f17db0752b71358aa563c054fb3a80fd33468136d -EBUILD sqlcl-bin-22.1.1.131.0820.ebuild 763 BLAKE2B e0e9c2e92a5562d5676ff87c7c81b76bae4c627ce6c93c132aa38198c6979ecae4e293f387a6e8bc88b1481184ba8cd3c87c032b9fa73ab52ee75595f50da71e SHA512 883b870e92223ab4aec8b017294025a5c8ef0278ac44b896edf33ab7facbdbd12a45c515377821e51c18ed75a7d0d23a0a328538a41c6668e6ee8ddea2515c08 +DIST sqlcl-22.2.0.172.1718.zip 41321573 BLAKE2B 43e5413a07de69f5cddad8825b71957c44f0e9f6126f05206b9c3528fb66fa91fe1097eab57c76b9e733c55651444b4f1b9c7bc1c30c0e33fc3df20026272878 SHA512 107c40074b3bc1e73cc174fd5758140cedb652447c2adaecc3f4820f0a777ce1c43c16fe9551a1516245008f3a5ee74404a5da2d424e6e9d63db127e71492514 +EBUILD sqlcl-bin-22.2.0.172.1718.ebuild 763 BLAKE2B e0e9c2e92a5562d5676ff87c7c81b76bae4c627ce6c93c132aa38198c6979ecae4e293f387a6e8bc88b1481184ba8cd3c87c032b9fa73ab52ee75595f50da71e SHA512 883b870e92223ab4aec8b017294025a5c8ef0278ac44b896edf33ab7facbdbd12a45c515377821e51c18ed75a7d0d23a0a328538a41c6668e6ee8ddea2515c08 MISC metadata.xml 402 BLAKE2B ab9053ca959660812f1e1bc536950c0278d23c2906ff0a82483241f16960d2ae6ecd3eff091666df8fef38fdb073a6e3d0a5c8a7c7926426fead769365df49a5 SHA512 785e5acc8811d310b7cd5dc52fe3de6a22d7a92fa81a12db8a16b1df75a83f47ffea4e2fe21a712dabc5c1fff8da4d6f2e49ae0597373fd6e106aa13e81323d3 diff --git a/dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild deleted file mode 100644 index 9788f57e0b28..000000000000 --- a/dev-db/sqlcl-bin/sqlcl-bin-22.1.1.131.0820.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN/-bin}" -MY_P="${MY_PN}-${PV}" - -inherit java-pkg-2 - -DESCRIPTION="Oracle SQLcl is the new SQL*Plus" -HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html" -SRC_URI="https://download.oracle.com/otn_software/java/sqldeveloper/${MY_P}.zip" -RESTRICT="mirror" - -LICENSE="OTN" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="app-arch/unzip" -RDEPEND="dev-db/oracle-instantclient - dev-java/java-config:2 - >=virtual/jre-11" - -S="${WORKDIR}" - -src_install() { - java-pkg_dojar sqlcl/lib/*.jar sqlcl/lib/ext/*.jar - - java-pkg_dolauncher "${MY_PN}" \ - --main oracle.dbtools.raptor.scriptrunner.cmdline.SqlCli \ - --java_args '-client -Xss30M' -} diff --git a/dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild new file mode 100644 index 000000000000..9788f57e0b28 --- /dev/null +++ b/dev-db/sqlcl-bin/sqlcl-bin-22.2.0.172.1718.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN/-bin}" +MY_P="${MY_PN}-${PV}" + +inherit java-pkg-2 + +DESCRIPTION="Oracle SQLcl is the new SQL*Plus" +HOMEPAGE="https://www.oracle.com/database/technologies/appdev/sqlcl.html" +SRC_URI="https://download.oracle.com/otn_software/java/sqldeveloper/${MY_P}.zip" +RESTRICT="mirror" + +LICENSE="OTN" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="app-arch/unzip" +RDEPEND="dev-db/oracle-instantclient + dev-java/java-config:2 + >=virtual/jre-11" + +S="${WORKDIR}" + +src_install() { + java-pkg_dojar sqlcl/lib/*.jar sqlcl/lib/ext/*.jar + + java-pkg_dolauncher "${MY_PN}" \ + --main oracle.dbtools.raptor.scriptrunner.cmdline.SqlCli \ + --java_args '-client -Xss30M' +} diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest index 72775d85c36d..f3fa7f4280b7 100644 --- a/dev-db/sqlmap/Manifest +++ b/dev-db/sqlmap/Manifest @@ -2,8 +2,10 @@ AUX sqlmap.bash-completion 5757 BLAKE2B f602d99b6b0a30cf405b390eaef355f7a4b4fa42 DIST sqlmap-1.6.2.tar.gz 7258723 BLAKE2B cc972eda5351683904e4c9d4f7e0ab9c127c22de597397e976060808812032b2041f68ab2d737784e499a20a7ca930167427390ca178269d744ee71738e5c270 SHA512 a3057486f5096fb2a242296b4ceeb1c500246fbd322c3e52f71e72cd91d1c676ca6f7746becf887625e45d0b14443a669410b28bd6a995124a6e8006c4534976 DIST sqlmap-1.6.4.tar.gz 7203746 BLAKE2B 8e55805a59dbc7fa4a4be03d5edf34160858e624047dafe63d6280bfb59c83fef0bfe3f74b775adad3cbe3be312dad166c79c758fe18418d32788c22b2233d16 SHA512 304c8213ae4b1858066765fa5e6409e97ac90de46b319683e7daf6c89f610de04cac400a7044633aeb014648b7b57c880c3a2646b40049b93f84a626c12994d2 DIST sqlmap-1.6.5.tar.gz 7204055 BLAKE2B 0ab5ff3ab8f27e0f944c65d84e9d66627dd09c22fd59a18002481a26db804d737702acf71768dfd44f88008fe82369c155144e9df58935e7feed644394299d89 SHA512 6812ab822119c0071077d87bbc7dd032560c6b85dedd6a568e63e12f885156959a89fa67045545a1433ab0ad6f4ad1f0335980adbc54a1af654d999ac07cee6d +DIST sqlmap-1.6.6.tar.gz 7204158 BLAKE2B 40e4a896855270b98c89fc0a5d6060af51ec7d24da101688dbf2ec470741129a6193330be45e3ddd8d450bdfbcf4ccdf29bac47ba9e1d27eddf76490fc0777dc SHA512 9d680754ad82db660770d29b96c74a20c271dec8feff19f57f20c726a1776c86f685e538bb33c026ec49d48fadf981eb41cf6dd970c6100dc7a0c9dcd39c43cf EBUILD sqlmap-1.6.2.ebuild 1331 BLAKE2B 40fdcfd802252b9a996da8be8a90d45925f1a06099a49d3c0cdd5af232b440003483fbc6e001e706149497ae224723fd2e32fd65953bd14074a7f2a82b8a5785 SHA512 31b004012264cc0a58dcfdc611df346382f1b613a90b08aa2a344a2b87b5025b90c10877c666452e5428f9bc8161bc6c78eb0782542fac0dea2e33686c18cf28 EBUILD sqlmap-1.6.4.ebuild 1331 BLAKE2B 25be58350d9376ef9afedbd84a9c5081afc97588b54ae728c29b26a47aaf9fb96281c2c57532f992354101dc51b077d498cf731afda741856af22b336fa7c6d0 SHA512 0388de4592528c68067f074c44ddabe3a6cdf598fbc9886c15089c5161e26b7755cbb7869dcff75e4944765fc798974c0411c3e1ede146eb5f93079236dbdb26 EBUILD sqlmap-1.6.5.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0 +EBUILD sqlmap-1.6.6.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0 EBUILD sqlmap-9999.ebuild 1331 BLAKE2B 7e9ed70fc509dd8251ff7652b7b53415b3ef43139fc04b4ad0ea6458db3048aff5eb1b44410d5f60d77f6a238eb234413b9e0d69043927afba5b559553af21c7 SHA512 ad034e9044054aec4796c7efbb090d2066124d670c83753f63ec16777d3b150c8763ed60dd46d39bfb74374b1aca84e27ff5fa14b0e94c2ec03efb43081b4ea0 MISC metadata.xml 714 BLAKE2B e1afbf31fcc7a0ed38af080c7b85248b0ca50ac6865252fff3eb8aacafae02380d833e3852601c7a5733d5947ea19818c7db303f49465fea337b4cd6cc373ff2 SHA512 0349fb06cca9483950d5325c4fea54b07c1621ae25296c6a743d235b95eaabf0533eb0396bbf1c72963097eda7b7f8d829a7a675dabd6a8a6ce4a2ab0fc96b16 diff --git a/dev-db/sqlmap/sqlmap-1.6.6.ebuild b/dev-db/sqlmap/sqlmap-1.6.6.ebuild new file mode 100644 index 000000000000..7fe00f1370cf --- /dev/null +++ b/dev-db/sqlmap/sqlmap-1.6.6.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="sqlite" + +inherit bash-completion-r1 python-single-r1 wrapper + +DESCRIPTION="An automatic SQL injection and database takeover tool" +HOMEPAGE="https://sqlmap.org/" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap" +else + SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +# sqlmap (GPL-2+) +# ansitrm (BSD) +# beautifulsoup (BSD) +# bottle (MIT) +# chardet (LGPL-2.1+) +# clientform (BSD) +# colorama (BSD) +# fcrypt (BSD-2) +# identitywaf (MIT) +# keepalive (LGPL-2.1+) +# magic (MIT) +# multipartpost (LGPL-2.1+) +# ordereddict (MIT) +# prettyprint (BSD-2) +# pydes (public-domain) +# six (MIT) +# socks (BSD) +# termcolor (BSD) +# wininetpton (public-domain) +LICENSE="BSD BSD-2 GPL-2+ LGPL-2.1+ MIT public-domain" +SLOT="0" + +RDEPEND="${PYTHON_DEPS}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DOCS=( doc/ README.md ) + +src_install () { + einstalldocs + + insinto /usr/share/${PN}/ + doins -r * + python_optimize "${ED}"/usr/share/${PN} + + make_wrapper ${PN} \ + "${EPYTHON} ${EPREFIX}/usr/share/${PN}/sqlmap.py" + + newbashcomp "${FILESDIR}"/sqlmap.bash-completion sqlmap +} diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest index 7f651451eecf..511496d69c71 100644 --- a/dev-db/tora/Manifest +++ b/dev-db/tora/Manifest @@ -1,6 +1,4 @@ -AUX tora-3.2-missing-header.patch 547 BLAKE2B 6f3ce8bb09de2bc3793fe6c76c166d0b8d0c1da389d9c0132b83ca2af70623b5f72b6fa0e05d098d03a1e2547af9d2585c4e53c3b4a281c87f67782abe2c3211 SHA512 f3f11c336a2c139a46495f75009762b8bba0d20a1bed3c2f710ed6e94a421e0d3b17241e16919349430a761bc7ddde460af06cdd357741166328fe2b5e4216ec -AUX tora-3.2-qt-5.11.0.patch 1891 BLAKE2B 4617847e8ede3cbb25dfb3a5121f7664bf36bbe7ec46088565769ef7548b163f31b98a20c850b638ddc5a01d6d42346745c29ef38268e5f34e589a6323433288 SHA512 e03be4fc995020abe63dc9c7b4a24a5e9e9b8e9f3c70355bfebe3696e0dcc4cf88643ac58cf263580873838cfe77f2f594be89e7a475e98b434a88bf9c390eb3 +AUX tora-3.2-qt-includes.patch 1405 BLAKE2B f42d2fd5e39d6de51b3c6555dcb395b0b419d6685b6ce70389c4335f511a52abcfba5c51dc0454b0ddc91ba328dda50cc5727a1c84266c860a9d8781dae67a32 SHA512 1901e7501f8cf79ed74623fd5a5cc948e131cb5f75a9a55b0a712b6980c584a25e909bf7a17575b4604258ba444da7d47fddea34e6267cf73cc078e1547adf9f DIST tora-3.2.tar.gz 12762547 BLAKE2B 9e52013cc4122a8c6278392fd2251bad941fa48dbbc6e3c72a98bb2bad173d0262877afc44eca689c3110f69883c246441844f7884e309e000f1068b23c6b918 SHA512 005f9bc42a7c7ee9676ad60cdcb7b8fb9862a8ff0be9ffeb7911d96da7f233553b68e4089d23161871b479702ae8a8dc8bc63bd8d9aa75677bdd6c166ce86f7a -EBUILD tora-3.2-r1.ebuild 2343 BLAKE2B 8547018de38570f3134674267568a8df381b1fd8a2f81012d54d3d66d05b5d1a47485a1d331137554bb04a56d62ae95a1a55407ec3c440f64eecd84f5d3a2f22 SHA512 50fe4a0321f1c19b79a886bdec28815c3369c1d948d6832555043da02f77ff44dee177a59654daff99ae547beaa9b5e12cb536b82e363448d16584c8d7a98c46 -EBUILD tora-9999.ebuild 2265 BLAKE2B 87e3e2dbb03a8da2015281e545d9a991bcceaa0eb58a8a4eb2e97afd92e91c4525c21fb07225b7ab9fbf2d69f7fa4de2abb8eccd197780be2f10e32c331c6b77 SHA512 9603b441a35a397cc7a76c06f847cf81f9afd78c9af8233681140d5eb8ccc3a4f609d448cf73442171e3cbb56712a4161e801d370a07f8b0a2c638d27d1cfbeb -MISC metadata.xml 760 BLAKE2B 2147e376e24a47dd88b4275e028cb3d0a2692f6a571f5437adfd9228c009fe3c17d1670cdb818188a56142259007ce4f9210b5d98b6c761a37efd37a3ae2dcd7 SHA512 2f7fd6658f5f5d2b574ad60ce8e174868a973c7a6a7a82ffbe0479184c8fe7bceeee24c0cd3984f475b81bb93dea2216000c8e96e1dc0c0d097ba83ffd91133c +EBUILD tora-3.2-r2.ebuild 2170 BLAKE2B 48ebf249349d7d288f3a78e09574bc197c2c483799849d118dfbf4422a3bdad6087c9e6d8bca5d4021cd2bf5d008cb2f91b5391d4d9d1b69cd6018798b96df53 SHA512 91070d06f01e66a2b55aecee4c2643e6b229a6cc1a6cb3b455711b6ab8db03a2cda6888d6ad5c8705305f7c3d5e241c7484c6e216612d233f97d78e867cd24ba +MISC metadata.xml 537 BLAKE2B 369f7db2a065ddec2d206a0a6ff9111503a92bd1b7b30e43a49e5f3d8bcdd0a52fa407508622162df306d71119c50b595f06b00ce0d56241fff37570124704b7 SHA512 fe6753906e05c28e20b81bb59e8282ad347cccd4b96531ac611ca2632302b1150b9c8c0518c1686bc25eb37c166e838d305edd58044a60d7e8395648d26e55b7 diff --git a/dev-db/tora/files/tora-3.2-missing-header.patch b/dev-db/tora/files/tora-3.2-missing-header.patch deleted file mode 100644 index 272054b77793..000000000000 --- a/dev-db/tora/files/tora-3.2-missing-header.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 503fb876bd5664b455d234ba21294735a8972c91 Mon Sep 17 00:00:00 2001 -From: Ivan Brezina -Date: Wed, 5 Jul 2017 10:07:14 +0200 -Subject: [PATCH] linux fix - ---- - src/editor/tosqltext.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/editor/tosqltext.cpp b/src/editor/tosqltext.cpp -index c329daf0..60935c12 100644 ---- a/src/editor/tosqltext.cpp -+++ b/src/editor/tosqltext.cpp -@@ -50,6 +50,7 @@ - #include - #endif - -+#include - #include - #include - #include diff --git a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch b/dev-db/tora/files/tora-3.2-qt-5.11.0.patch deleted file mode 100644 index d9e50eeaf5b8..000000000000 --- a/dev-db/tora/files/tora-3.2-qt-5.11.0.patch +++ /dev/null @@ -1,69 +0,0 @@ -From afbff9ec3b93f0e90f02953d1bdd859a0f9a72ab Mon Sep 17 00:00:00 2001 -From: ibre5041 -Date: Wed, 30 May 2018 23:22:05 +0200 -Subject: [PATCH] fix for bug #96 - missing #include - ---- - src/tools/tobrowser.cpp | 1 + - src/tools/toscript.cpp | 1 + - src/tools/tosecurity.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/tools/tobrowser.cpp b/src/tools/tobrowser.cpp -index 895be336..69a4c6b6 100644 ---- a/src/tools/tobrowser.cpp -+++ b/src/tools/tobrowser.cpp -@@ -65,6 +65,7 @@ - #include - #include - #include -+#include - - #include "icons/addindex.xpm" - #include "icons/addtable.xpm" -diff --git a/src/tools/toscript.cpp b/src/tools/toscript.cpp -index bc74fc8c..aff26158 100644 ---- a/src/tools/toscript.cpp -+++ b/src/tools/toscript.cpp -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - - #include "icons/execute.xpm" - #include "icons/toscript.xpm" -diff --git a/src/tools/tosecurity.cpp b/src/tools/tosecurity.cpp -index 17f5c3b0..b2694928 100644 ---- a/src/tools/tosecurity.cpp -+++ b/src/tools/tosecurity.cpp -@@ -46,6 +46,7 @@ - - #include - #include -+#include - - #include "icons/addrole.xpm" - #include "icons/adduser.xpm" - -From 1852446c42c36d71b856fe09e1444b52052ca86d Mon Sep 17 00:00:00 2001 -From: Ivan Brezina -Date: Wed, 27 Jun 2018 19:11:09 +0200 -Subject: [PATCH] fix for bug #101 - ---- - src/widgets/tohelp.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/widgets/tohelp.cpp b/src/widgets/tohelp.cpp -index 69e3c6a1..4ffd6cea 100644 ---- a/src/widgets/tohelp.cpp -+++ b/src/widgets/tohelp.cpp -@@ -43,6 +43,7 @@ - #include "core/toconfiguration.h" - #include "ts_log/ts_log_utils.h" - -+#include - #include - #include - diff --git a/dev-db/tora/files/tora-3.2-qt-includes.patch b/dev-db/tora/files/tora-3.2-qt-includes.patch new file mode 100644 index 000000000000..6126cdf71ca9 --- /dev/null +++ b/dev-db/tora/files/tora-3.2-qt-includes.patch @@ -0,0 +1,61 @@ +--- a/src/editor/tosqltext.cpp ++++ b/src/editor/tosqltext.cpp +@@ -50,6 +50,7 @@ + #include + #endif + ++#include + #include + #include + #include +--- a/src/main/tooraclesetting.cpp ++++ b/src/main/tooraclesetting.cpp +@@ -45,6 +45,8 @@ + #include "core/toqvalue.h" + #include "core/toquery.h" + ++#include ++ + toOracleSetting::toOracleSetting(QWidget *parent) + : QWidget(parent) + , toSettingTab("database.html#oracle") +--- a/src/tools/tobrowser.cpp ++++ b/src/tools/tobrowser.cpp +@@ -65,6 +65,7 @@ + #include + #include + #include ++#include + + #include "icons/addindex.xpm" + #include "icons/addtable.xpm" +--- a/src/tools/toscript.cpp ++++ b/src/tools/toscript.cpp +@@ -56,6 +56,7 @@ + #include + #include + #include ++#include + + #include "icons/execute.xpm" + #include "icons/toscript.xpm" +--- a/src/tools/tosecurity.cpp ++++ b/src/tools/tosecurity.cpp +@@ -46,6 +46,7 @@ + + #include + #include ++#include + + #include "icons/addrole.xpm" + #include "icons/adduser.xpm" +--- a/src/widgets/tohelp.cpp ++++ b/src/widgets/tohelp.cpp +@@ -43,6 +43,7 @@ + #include "core/toconfiguration.h" + #include "ts_log/ts_log_utils.h" + ++#include + #include + #include + diff --git a/dev-db/tora/metadata.xml b/dev-db/tora/metadata.xml index 808b6f98bd88..390a3d3661db 100644 --- a/dev-db/tora/metadata.xml +++ b/dev-db/tora/metadata.xml @@ -1,20 +1,13 @@ - - ikonta@yandex.ru - Sergey Starikoff - - - proxy-maint@gentoo.org - Proxy Maintainers - + - TOra is a Toolkit for Oracle which aims to help the DBA or developer of - database application. Features PL/SQL debugger, SQL worksheet with syntax - highlighting, DB browser and a comprehensive set of DBA tools. Also works - with mySQL and postgreSQL. - + TOra is a Toolkit for Oracle which aims to help the DBA or developer of + database application. Features PL/SQL debugger, SQL worksheet with syntax + highlighting, DB browser and a comprehensive set of DBA tools. Also works + with mySQL and postgreSQL. + tora diff --git a/dev-db/tora/tora-3.2-r1.ebuild b/dev-db/tora/tora-3.2-r1.ebuild deleted file mode 100644 index b653ad25405a..000000000000 --- a/dev-db/tora/tora-3.2-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop xdg-utils - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/tora-tool/tora" - inherit git-r3 -else - SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" -HOMEPAGE="https://github.com/tora-tool/tora/wiki" -IUSE="doc mysql oracle +postgres" -REQUIRED_USE="|| ( mysql oracle postgres )" - -SLOT="0" -LICENSE="GPL-2" - -RDEPEND=" - dev-libs/ferrisloki - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5[mysql?,postgres?] - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( dev-db/oracle-instantclient ) - postgres? ( dev-db/postgresql:* ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -PATCHES=( - "${FILESDIR}/${P}-missing-header.patch" - "${FILESDIR}/${P}-qt-5.11.0.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - # fixed in master, only care about recent qscintilla lib name: - sed -e "/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/" \ - -i cmake/modules/FindQScintilla.cmake || die "Failed to fix FindQScintilla.cmake" - - rm -r extlibs/{loki,qscintilla2} || die # ferrisloki, bug #383109 - - sed -e "/COPYING/ d" \ - -i CMakeLists.txt || die "Removal of COPYING file failed" - - # bug 547520 - grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ - die 'Removal of $$ORIGIN failed' -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DB2=OFF - -DQT5_BUILD=ON - -DWANT_INTERNAL_LOKI=OFF - -DWANT_INTERNAL_QSCINTILLA=OFF - -DWANT_RPM=OFF - -DLOKI_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir ferrisloki)/libferrisloki.so" - -DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki)/FerrisLoki" - $(cmake-utils_use_find_package doc Doxygen) - -DENABLE_ORACLE=$(usex oracle) - -DUSE_PCH=OFF - -DENABLE_PGSQL=$(usex postgres) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - doicon src/icons/${PN}.xpm || die - domenu src/${PN}.desktop || die -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/dev-db/tora/tora-3.2-r2.ebuild b/dev-db/tora/tora-3.2-r2.ebuild new file mode 100644 index 000000000000..7bd8e475a41e --- /dev/null +++ b/dev-db/tora/tora-3.2-r2.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop toolchain-funcs xdg + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/tora-tool/tora" + inherit git-r3 +else + SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" +HOMEPAGE="https://github.com/tora-tool/tora/wiki" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc mysql oracle +postgres" +REQUIRED_USE="|| ( mysql oracle postgres )" + +RDEPEND=" + dev-libs/ferrisloki + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5[mysql?,postgres?] + dev-qt/qtwidgets:5 + >=x11-libs/qscintilla-2.10.1:=[qt5(+)] + oracle? ( dev-db/oracle-instantclient ) + postgres? ( dev-db/postgresql:* ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( "${FILESDIR}"/${P}-qt-includes.patch ) + +src_prepare() { + cmake_src_prepare + + # fixed in master, only care about recent qscintilla lib name: + sed -e "/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/" \ + -i cmake/modules/FindQScintilla.cmake || die "Failed to fix FindQScintilla.cmake" + + rm -r extlibs/{loki,qscintilla2} || die # ferrisloki, bug #383109 + + sed -e "/COPYING/ d" \ + -i CMakeLists.txt || die "Removal of COPYING file failed" + + # bug 547520 + grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ + die 'Removal of $$ORIGIN failed' +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DB2=OFF + -DQT5_BUILD=ON + -DWANT_INTERNAL_LOKI=OFF + -DWANT_INTERNAL_QSCINTILLA=OFF + -DWANT_RPM=OFF + -DLOKI_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir ferrisloki || die)/libferrisloki.so" + -DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki || die)/FerrisLoki" + $(cmake_use_find_package doc Doxygen) + -DENABLE_ORACLE=$(usex oracle) + -DUSE_PCH=OFF + -DENABLE_PGSQL=$(usex postgres) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + doicon src/icons/tora.xpm || die + domenu src/tora.desktop || die +} diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild deleted file mode 100644 index d1bf824895be..000000000000 --- a/dev-db/tora/tora-9999.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils desktop xdg-utils - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/tora-tool/tora" - inherit git-r3 -else - SRC_URI="https://github.com/tora-tool/tora/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="SQL IDE for Oracle, MySQL and PostgreSQL dbs" -HOMEPAGE="https://github.com/tora-tool/tora/wiki" -IUSE="doc mysql oracle pch +postgres" -REQUIRED_USE="|| ( mysql oracle postgres )" - -SLOT="0" -LICENSE="GPL-2" - -RDEPEND=" - dev-libs/ferrisloki - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5[mysql?,postgres?] - dev-qt/qtwidgets:5 - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - oracle? ( dev-db/oracle-instantclient ) - postgres? ( dev-db/postgresql:* ) -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" - -src_prepare() { - cmake-utils_src_prepare - - # fixed in master, only care about recent qscintilla lib name: - sed -e "/FIND_LIBRARY(QSCINTILLA_LIBRARY/s/qt5scintilla2/qscintilla2_qt5/" \ - -i cmake/modules/FindQScintilla.cmake || die "Failed to fix FindQScintilla.cmake" - - rm -r extlibs/{loki,qscintilla2} || die # ferrisloki, bug #383109 - - sed -e "/COPYING/ d" \ - -i CMakeLists.txt || die "Removal of COPYING file failed" - - # bug 547520 - grep -rlZ '$$ORIGIN' . | xargs -0 sed -i 's|:$$ORIGIN[^:"]*||' || \ - die 'Removal of $$ORIGIN failed' -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DB2=OFF - -DQT5_BUILD=ON - -DWANT_INTERNAL_LOKI=OFF - -DWANT_INTERNAL_QSCINTILLA=OFF - -DWANT_RPM=OFF - -DLOKI_LIBRARY="$($(tc-getPKG_CONFIG) --variable=libdir ferrisloki)/libferrisloki.so" - -DLOKI_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --variable=includedir ferrisloki)/FerrisLoki" - $(cmake-utils_use_find_package doc Doxygen) - -DENABLE_ORACLE=$(usex oracle) - -DUSE_PCH=$(usex pch) - -DENABLE_PGSQL=$(usex postgres) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - doicon src/icons/${PN}.xpm || die - domenu src/${PN}.desktop || die -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} -- cgit v1.2.3