commit: 4fd429dd2c0b2a2fd2c519553560f1e7e3a02d1e Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Wed Feb 8 21:33:35 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 15 05:50:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd429dd
dev-db/mariadb: add 10.11.1 No keywords for now Closes: https://bugs.gentoo.org/833760 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29498 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-db/mariadb/Manifest | 2 ++ .../{mariadb-10.6.12.ebuild => mariadb-10.11.1.ebuild} | 18 +++++++++--------- dev-db/mariadb/mariadb-10.4.28.ebuild | 4 ++++ dev-db/mariadb/mariadb-10.5.19.ebuild | 4 ++++ dev-db/mariadb/mariadb-10.6.12.ebuild | 4 ++++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 595204070e2b..58cac721a7f3 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,3 +1,5 @@ +DIST mariadb-10.11.1-patches-01.tar.xz 5240 BLAKE2B af13dfe4de4dff670550ce8e7d55df9905cb66c88adafa662eff684d64e2f137b5912afc3051334811e9a178087f02f684cfbbf2d68d999325cb0c293b4ab08f SHA512 34281a5e5d26d7284e2032ee298b0e9ee7ece5880ba204763013d4abba3eea81df9d6c928c5388c6ff5cec2cb972545ef105940165e936c252179e5c6db5e37a +DIST mariadb-10.11.1.tar.gz 96005902 BLAKE2B d9bb2d91dee1a17012da808f384fe9b8cfe628bb2fe567e131b0fcff72e4bb81f793502627dc12613b4cd6f1e459442722512e634d032aca01fa84fcb1041b85 SHA512 8d327adca024535ced5cffb2c9e8c9feaa346b9e52834cf24b0ad1df2b4da62d2d026d18daf8a534838a6bbcdf9b2d00f6d1384defd8f45258784ea2cc9928e9 DIST mariadb-10.3.36-patches-01.tar.xz 4548 BLAKE2B 24ae803afe38f406a37380e4d49d7e8434b7b549c9633fdd24bd35a23bf8b5d72fa6e8174c4ddc8dda9a994bd2fd2feecddcb5650029067dcbc578ea525e48cb SHA512 8fd0c6ed0fe6c99ff2219c1f4a6abe24050f91bcf808e1bcc0be3e194244440d5fe5717a0dc4c4c3ef12642b9d722197b780f9fb999ed8770a748d2c0e40ea4b DIST mariadb-10.3.36.tar.gz 73944352 BLAKE2B 75090969802783de59ed73338a9a77c70f4dafa14b03334edd5f48593c89b39e752548f34c81875e93263c0b7f2648e83962ef568b07ea11160faf880a9800ed SHA512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a DIST mariadb-10.3.37.tar.gz 74314608 BLAKE2B cef3218cb48aeba788289888bcd642ddc3cf690151c5754eea8df907204547681cdbbf251b9100cd5df0ccd18359c6c42c9314959a729d42bdad1c42a283006b SHA512 24df11d03a5a445fbdcd6240ff7036854678d79db12edc79f4db8d36204e2ea37e3716d4d07bee235fd0bc95b308a12dec4dc5517e3c01fa4967e0a076b7c65a diff --git a/dev-db/mariadb/mariadb-10.6.12.ebuild b/dev-db/mariadb/mariadb-10.11.1.ebuild similarity index 98% copy from dev-db/mariadb/mariadb-10.6.12.ebuild copy to dev-db/mariadb/mariadb-10.11.1.ebuild index fb81b2593337..a44a08b76b80 100644 --- a/dev-db/mariadb/mariadb-10.6.12.ebuild +++ b/dev-db/mariadb/mariadb-10.11.1.ebuild @@ -11,7 +11,7 @@ inherit systemd flag-o-matic prefix toolchain-funcs \ HOMEPAGE="https://mariadb.org/"; SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz - https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.12-patches-01.tar.xz"; + https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.11.1-patches-01.tar.xz"; DESCRIPTION="An enhanced, drop-in replacement for MySQL" LICENSE="GPL-2 LGPL-2.1+" @@ -28,7 +28,8 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase @@ -37,6 +38,7 @@ S="${WORKDIR}/mysql" # Be warned, *DEPEND are version-dependant # These are used for both runtime and compiletime COMMON_DEPEND=" + dev-libs/libfmt:= >=dev-libs/libpcre2-10.34:= >=sys-apps/texinfo-4.7-r1 sys-libs/ncurses:0= @@ -96,18 +98,16 @@ DEPEND="${COMMON_DEPEND} static? ( sys-libs/ncurses[static-libs] ) " RDEPEND="${COMMON_DEPEND} - !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster - !dev-db/mariadb:0 - !dev-db/mariadb:5.5 - !dev-db/mariadb:10.1 - !dev-db/mariadb:10.2 + !dev-db/mysql !dev-db/percona-server !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !dev-db/mariadb:10.5 + !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 - !<virtual/mysql-5.6-r11 - !<virtual/libmysqlclient-18-r1 + !dev-db/mariadb:10.9 + !dev-db/mariadb:10.10 + !dev-db/mariadb:11.0 selinux? ( sec-policy/selinux-mysql ) server? ( columnstore? ( dev-db/mariadb-connector-c ) diff --git a/dev-db/mariadb/mariadb-10.4.28.ebuild b/dev-db/mariadb/mariadb-10.4.28.ebuild index 22ec07a296a0..0314edf3a4b5 100644 --- a/dev-db/mariadb/mariadb-10.4.28.ebuild +++ b/dev-db/mariadb/mariadb-10.4.28.ebuild @@ -101,6 +101,10 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 + !dev-db/mariadb:10.9 + !dev-db/mariadb:10.10 + !dev-db/mariadb:10.11 + !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 ${COMMON_DEPEND} diff --git a/dev-db/mariadb/mariadb-10.5.19.ebuild b/dev-db/mariadb/mariadb-10.5.19.ebuild index 395e5ebb4369..40f8490bb7fa 100644 --- a/dev-db/mariadb/mariadb-10.5.19.ebuild +++ b/dev-db/mariadb/mariadb-10.5.19.ebuild @@ -108,6 +108,10 @@ RDEPEND="${COMMON_DEPEND} !dev-db/mariadb:10.6 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 + !dev-db/mariadb:10.9 + !dev-db/mariadb:10.10 + !dev-db/mariadb:10.11 + !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) diff --git a/dev-db/mariadb/mariadb-10.6.12.ebuild b/dev-db/mariadb/mariadb-10.6.12.ebuild index fb81b2593337..5b8eb8830c99 100644 --- a/dev-db/mariadb/mariadb-10.6.12.ebuild +++ b/dev-db/mariadb/mariadb-10.6.12.ebuild @@ -106,6 +106,10 @@ RDEPEND="${COMMON_DEPEND} !dev-db/mariadb:10.5 !dev-db/mariadb:10.7 !dev-db/mariadb:10.8 + !dev-db/mariadb:10.9 + !dev-db/mariadb:10.10 + !dev-db/mariadb:10.11 + !dev-db/mariadb:11.0 !<virtual/mysql-5.6-r11 !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql )
