diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
tree | 9f1f0dee23e13658e52f49437befe78427148c51 /dev-db/mariadb | |
parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) |
gentoo resync : 10.02.2020
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r-- | dev-db/mariadb/Manifest | 24 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.1.38-r1.ebuild | 11 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.1.43.ebuild | 11 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.1.44.ebuild | 11 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.2.22-r1.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.2.29.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.2.31.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.3.20.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.3.22.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.4.10.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-10.4.12.ebuild | 1 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-5.5.66.ebuild | 11 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-5.5.67.ebuild | 11 |
13 files changed, 37 insertions, 49 deletions
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index bb041611f590..bc5f8668a5a3 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -19,16 +19,16 @@ DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae9 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa DIST mysql-extras-20200203-1749Z.tar.bz2 344999 BLAKE2B 46441f3c210c87b8ce1df89e9480d0bd5be216b0a1380c3ca330294e787bf2fb2b7078438f032dd0381363e756312d7634350a0b02c00b3145d4787a9ad65cad SHA512 210d240efef4d7bb64d356cae240039d9bd65e2bd4af47e01131ab5bf48779f4c0519e50d212d50db998e6b9bf9d73f1a03b0bbf4f7d6dc6f978660c8ac8a21f -EBUILD mariadb-10.1.38-r1.ebuild 29479 BLAKE2B 7f89c988240a3450ab95234155b18430b271e6af0656711bb0514cf21635d3fc541a05189455345a55bcc071f30ea1a401826d945d177eab043db0ad7db5d5b4 SHA512 4bee8f11cde366979a57898986540ff8736f2e81770e2c1b33af91414c51a13b19af297c2831c6680c3f36f33eb0b2276d637ef5858d8803fee09d520b46094d -EBUILD mariadb-10.1.43.ebuild 29882 BLAKE2B e67075c31a1585036ff4d82ddc7ce00119ee9a46170144acd59e1106c0c1cd05cb1e38b9e7eee77dcfaf320ccf3615845e1751cca242d7376d1c535a587d7c72 SHA512 8072069e496ea9300352264d71c998bcd926bfabca50607afd1b3bc47be265e31fd137737b6e85b7d2d4c2dc8d41d1f054ca846d94fe548eb1dda5a06f3b5b82 -EBUILD mariadb-10.1.44.ebuild 30055 BLAKE2B 78c0c30940f69b4d38b9975c68a80c856a3e4a03169276ce53457c2aa7ccc76872718d6b09e31302ec22b0e3107da51d7b69b828709fd38af92ca5b1e19c2bf5 SHA512 7d3697d4708496c673f289986470487074e26c4776199af68cc818bedfe1e327bc25b6db5e197a27d6dc16573d58de5a69db6bdf2b4ba142b12f3fad7d4c8a25 -EBUILD mariadb-10.2.22-r1.ebuild 32530 BLAKE2B 2a6a9aa24f06052d8dda82a1c1dfdc836122e5e9e248c621bc69b80732beaaee86aff666e2bcdf1eb7cf7f15628f11c785d84d99980c4d0459c792d0e8d9e2c4 SHA512 62cac25905993280f8b8d24e80751261513bb129401d01ebd51cda9fe196109473bbbe760a126d0949d7466279b1eff3892ab394c031cd7ab4a8ccc3ae3a3667 -EBUILD mariadb-10.2.29.ebuild 33103 BLAKE2B fdf29163bd6297d9627a3d767e33ab8c43e9df5a88a3bc6d9ecf1e45523ed55014f6febb304cee3dfb17d0ed195f6f9f457dc1eaf5da91779220569c6a95b246 SHA512 ab764d0c158718ceb3081b8c21bc9b370171bf6382fae8f5286ee9ed1df738163a96f8ae746a3eeab52ab52bf6e3e4477f27ae3c9f32b5c618377292dc9ac913 -EBUILD mariadb-10.2.31.ebuild 33168 BLAKE2B b14bc65948b416c35ea83c46098438a035103ff9543d7a3a57b93515b24277a2c98968c963c85ed4915fdcb067100b428ddaeee8a8ca8e675810050b13fd8b50 SHA512 a16e16e16b5a81f328babfc2e388e536bbbef84e9a951422cb7ce6d686ba6a60c8593bd1bbe314259f271dc4e6a0463a91fb5334b3a8faa97f5ed95369e567a3 -EBUILD mariadb-10.3.20.ebuild 32731 BLAKE2B 2e8437c3af728e5a3dc02a825f025231bc4a6f3ae5b72066afdcf033fdaa807847b86167ecdf9719213061e2937c97300f72989e45f9adbcb74ef597939c25c0 SHA512 0e84837c35c84eaef8d0afb6630c8caff7d036671ab9871ccc2b30aa3ffe2a24f8a363f5f9364755bb69c1290f2995366164a249fb4c61f902d2e41aa2571612 -EBUILD mariadb-10.3.22.ebuild 32792 BLAKE2B cb2943720dded3ae11d6f78788773de117bea20bb6c4e7ee3419be87d49b294938458955f5164a371cd4968c38775f08af9d2db6b756b36920ccdceb5af5ebed SHA512 90f229b5d6144582dadf3f86d797833dd7c543e8b0e044e79f791a26ddd40889124f1803066683b92b0359b9b9cf17b761e663519853abd849f0ecf238894628 -EBUILD mariadb-10.4.10.ebuild 33383 BLAKE2B 43b890bcb0b23b7d40faecd424a968248524453ccc486dcba474a1b5959503a51252ff3dab70c5dfb6238f20b9cdcb281dbea9d728d1cd31d7a3cb3c5c419ea3 SHA512 acfdec61923f7cd5e837e52c6854ee7104278ea2157df5993de38811dda81f3db0644dd7002995367981ca4142e35fe9fed0e58d83ffb71f4528477976d93a63 -EBUILD mariadb-10.4.12.ebuild 33408 BLAKE2B 4d20837d26495e50d278d5f614b186dbf4746e50b2485cfa8d60768040fcc2df03cdd95f10cb8b1790ae8b0e10e3f721c10bae68f490807a293d13380a4e83ee SHA512 bfb4bcd43bece2a18b5535efe2e5d459cebe9d7785c277e1ffeafe7130a2767cc76f3e1071f3bc09f76c046adb19836f0c769be3eb85a8948071e7c3b30e4698 -EBUILD mariadb-5.5.66.ebuild 27262 BLAKE2B 323891d4180b27a079bf96952c36880d8531eb273ce4a8ba2d16d2b3f85a85514a29381d849b89dfe97a534b3eb600ec5a85e006dfaccb3cd76a51c9a35c2f92 SHA512 e52d96c624a69a98b362f9c5d498eb62cd6b635660871deb62b2426638513319714a2e7992f60b3535872cc342f7307b053d79901df16e5573d33786100e9d3d -EBUILD mariadb-5.5.67.ebuild 27262 BLAKE2B 6f15df960825f8f6c79abcea0e93a2b0e9162bacf086d4e3fd49b550ab092963059205075483f58de97f15a7004e54c2fc81324abde14e869a23df0c22dafc6d SHA512 145c8f2a90134e397f6ee7ac74ccf4bebd84d7d25f65407f8b45428e8f770c00aad8a392997d58c0e8291168884b03b40d7a6ad03114182eb140d03d5a3712e4 +EBUILD mariadb-10.1.38-r1.ebuild 29425 BLAKE2B adca2a4ddace1c70d950dc10a8ddf1e4ab8e51aaad24f0e2ac6886801f0748472d8964301be8a0046a7debdbab9d689ab9d2717e179c651bf3f68ca6c85018b4 SHA512 cb66388307e9385515bc64cd8150a94ddf9fbdf0156a06bac5a16d8eb4b1aaa99595f356443fde8aa31925bbd5f70fad07e26b0da4d73a063d9e9a92e1673557 +EBUILD mariadb-10.1.43.ebuild 29828 BLAKE2B 4af76e5d7bd95e0dde67a8dd5350f3555a7f0d1d33d2cdf673f0e02be40783410828ccf747ec8f941e844b9b564eca7fbe1052a82b625898cf7428af0b6dcde4 SHA512 d74ae31259d7abeed6fd6ee46d6909bc4f4a27aec747d1d1c0dd984bba1be26b3d8e9b2124b98b0870f077102810571bb7b678c40bcec24d7e8e001c919f24df +EBUILD mariadb-10.1.44.ebuild 30001 BLAKE2B b38e6e8b73e9ea82bafb8b330a2dc037cf133f09aea91cc81cd0ff6e734e9fe0a1e3a29fdba46857e3fc672ce84dd0da650894fa0f3d466f534e148053381328 SHA512 4b1643a02f04d15f59a8d01a296e4ab2258b3c48e8664e13b84fcf83eb4c53d0395122f1a17debeded783211c000af9b9f5ea63f07ffd7520a151213c7e212de +EBUILD mariadb-10.2.22-r1.ebuild 32488 BLAKE2B 700e423468afc5d55f448f02b87cf85331a8cf7aecb816a780a03ad5f4ffef5f7124495c44dfcb753c566a8eb0c62828e44b838a2a8ec7ad5f90e5572b9d04b4 SHA512 9103b4bbcae28a9810b71f99263584b3924ebfc9e6b734b0e549f739839123e9808b629addd25357bb8422639f7797d228ff50440b152fc57275ef1f066ee022 +EBUILD mariadb-10.2.29.ebuild 33061 BLAKE2B 86efbf55d679547e49266dbcf8970204ea61d2ccda4fd8b7f6a43ee2200b0a2726ece5d5447aff2a512374ba673e928e77a0aac6f02a12085df34f7e65e2674e SHA512 b783d1588016be85f07e05c53c8e3df53e272dc623f4413a38eade664d2e866607835861bd7ce4fc68e8e2af528e9bd296b14125a526dc04b314fa29d6509170 +EBUILD mariadb-10.2.31.ebuild 33126 BLAKE2B 94dd1581fd1056f183163ee71303ca0efb575923d4cd70fa22e27de462884b189fd5b07218af1512a4158279d93eca68042fcf5bd5e478fee6a52cb695c56f49 SHA512 aa3aaa76a1d7ae8b9d0f6c8b28b825945fc316972c7f7f20f8e76b1ca7b3f5404fb9a08409b19a847377f41e0d568935bd1b7484c9a59dd9ac6bc77b26ecc843 +EBUILD mariadb-10.3.20.ebuild 32689 BLAKE2B cf0e23e1523fc695950a24b357af396a06e9895ddd28a18137b91ea7ff8adf9bc4569d9b485d5c664e100a08e5336b98d254eb5c322430d1caf3e6fb1133d6ee SHA512 c8093db3250d10b53326499d4a86f5117b5250210d3582d82bc815485ddf730ad58a511e6f31c5245478951a0919738ed15a4afabbdbe219169a6fc537d6089e +EBUILD mariadb-10.3.22.ebuild 32750 BLAKE2B f1b37c53cd989850da3054e391b19d4db3b9620b0be4e05757fba7904536d6e4b7c084a096d3e36ad97d152a4f6368eb2658a4eca15a00a9b53512b2e2f8e8cd SHA512 81bcf52fe9dc2261ca7345b26c5b271bc6a142954027dca90d30d226965e1f2bc511e051208c379f5364145f61dd88a8ba5d83b285c5e73db3dbee9aa8174fc4 +EBUILD mariadb-10.4.10.ebuild 33341 BLAKE2B d9466512cd2e2a93b458f32e4d1eb23723f1b21a124df13da9d4c4230248502bfb01fdd0f80a5d72a99491ddbc6471e39192b5a86e9ac4259e15d99ad47b97d3 SHA512 811ae5618a55a0c05ac27c9994df49369638f86983c4e2a9aa37a23a921183fa2d9560ef4380272bb716b82aca67113eb2055776d72ec07ea1ca51d65aac25e1 +EBUILD mariadb-10.4.12.ebuild 33366 BLAKE2B 4159e530ac2dcf92030cc6b287e9d7a486a60d4a572e47577ca0a41ca5eee2fbb550c7951c0622a4e67e60dd1f8885f0e60de7d5194b43fa2f3173e1fb5b5d76 SHA512 d30e7c00fd7aaca444bf61beec449082a172f68970d17bb76a853c188975ac9b060dfa835607deede2e3c0bc93cba63c6f8c9902d4032b95a915c6d3792d70ca +EBUILD mariadb-5.5.66.ebuild 27208 BLAKE2B 9cc3e203340f55ec1c0208b9be44431f8b4da6849bdb888e17839d83813476666a4886332f4ce0aae278428ac3671908534a1d585abf5afe6869429f4fbcc7a5 SHA512 96e8b41aa12da84c78c92aa724b92833749e80b678e5a56b6f32d6e5534643daacf6bf40085a8dd8cc338b4b2dc11842e5eeb5868394af47f5cfb7d2ac6b67a3 +EBUILD mariadb-5.5.67.ebuild 27208 BLAKE2B 1af7c586d794029c64b9bfc8ab94f9510f2ced4b43f02dbc16a0903d5f81a4d9804243012fc2e17d05ad506c7e2fd60013d2600d9363d4f779ab3812555d970f SHA512 4beaf095836c4812f5c6e36dfcd943d93a19a9aed9a3b553ecc180fa3c3f54867c69fc02a8ce4ce57b199da76fe40ef604d20558afd85fa85a62be5bf9197296 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97 diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild index bd01fadd2b56..07de6ddfdd2c 100644 --- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild @@ -288,8 +288,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -301,15 +300,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild index efd07a576537..d131c0c4cb07 100644 --- a/dev-db/mariadb/mariadb-10.1.43.ebuild +++ b/dev-db/mariadb/mariadb-10.1.43.ebuild @@ -293,8 +293,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -306,15 +305,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild index 4e0e9491bb2a..b68568b59247 100644 --- a/dev-db/mariadb/mariadb-10.1.44.ebuild +++ b/dev-db/mariadb/mariadb-10.1.44.ebuild @@ -297,8 +297,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -310,15 +309,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild index ce87ebab1b39..79d8b88b16d4 100644 --- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild @@ -326,7 +326,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild index 7b99a2969bbd..fc259fc3c054 100644 --- a/dev-db/mariadb/mariadb-10.2.29.ebuild +++ b/dev-db/mariadb/mariadb-10.2.29.ebuild @@ -335,7 +335,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.2.31.ebuild b/dev-db/mariadb/mariadb-10.2.31.ebuild index b95e1279e5c7..8e713f24f7cd 100644 --- a/dev-db/mariadb/mariadb-10.2.31.ebuild +++ b/dev-db/mariadb/mariadb-10.2.31.ebuild @@ -336,7 +336,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild index 7fb13269e69d..cc2498f533dd 100644 --- a/dev-db/mariadb/mariadb-10.3.20.ebuild +++ b/dev-db/mariadb/mariadb-10.3.20.ebuild @@ -325,7 +325,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.3.22.ebuild b/dev-db/mariadb/mariadb-10.3.22.ebuild index cf26f76d0451..f65deda16f81 100644 --- a/dev-db/mariadb/mariadb-10.3.22.ebuild +++ b/dev-db/mariadb/mariadb-10.3.22.ebuild @@ -326,7 +326,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild index c479a1ae70d5..c5d00cd5a4e2 100644 --- a/dev-db/mariadb/mariadb-10.4.10.ebuild +++ b/dev-db/mariadb/mariadb-10.4.10.ebuild @@ -335,7 +335,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild index 13396dc69603..10c241797c7d 100644 --- a/dev-db/mariadb/mariadb-10.4.12.ebuild +++ b/dev-db/mariadb/mariadb-10.4.12.ebuild @@ -336,7 +336,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild index 2cd8c6360ff0..17ef7180271b 100644 --- a/dev-db/mariadb/mariadb-5.5.66.ebuild +++ b/dev-db/mariadb/mariadb-5.5.66.ebuild @@ -254,8 +254,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -266,15 +265,15 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild index 414400eba524..fbd7f924edf8 100644 --- a/dev-db/mariadb/mariadb-5.5.67.ebuild +++ b/dev-db/mariadb/mariadb-5.5.67.ebuild @@ -254,8 +254,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -266,15 +265,15 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) |