From 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2017 11:17:21 +0000 Subject: gentoo resync : 20.12.2017 --- dev-db/Manifest.gz | Bin 21961 -> 21954 bytes dev-db/bucardo/Manifest | 2 +- dev-db/bucardo/bucardo-5.4.1.ebuild | 4 +- dev-db/hyperdex/Manifest | 10 +- dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild | 2 +- dev-db/hyperdex/hyperdex-1.7.1.ebuild | 2 +- dev-db/hyperdex/hyperdex-1.8.0.ebuild | 2 +- dev-db/hyperdex/hyperdex-1.8.1.ebuild | 2 +- dev-db/hyperdex/hyperdex-9999.ebuild | 2 +- dev-db/percona-server/Manifest | 2 + .../percona-server-5.6.38.83.0.ebuild | 243 +++++++++++++++++++++ dev-db/pg_top/Manifest | 2 +- dev-db/pg_top/pg_top-3.7.0.ebuild | 4 +- dev-db/pgadmin3/Manifest | 2 +- dev-db/pgadmin3/pgadmin3-1.22.2.ebuild | 2 +- dev-db/postgis/Manifest | 10 +- dev-db/postgis/postgis-2.1.8-r1.ebuild | 2 +- dev-db/postgis/postgis-2.3.3.ebuild | 2 +- dev-db/postgis/postgis-2.4.0.ebuild | 2 +- dev-db/postgis/postgis-2.4.2.ebuild | 4 +- dev-db/postgis/postgis-9999.ebuild | 2 +- dev-db/redis/Manifest | 6 + .../redis/files/redis-sentinel-4.0.6-config.patch | 9 + dev-db/redis/files/redis-sentinel.confd | 16 ++ dev-db/redis/files/redis-sentinel.initd | 22 ++ dev-db/redis/files/redis.logrotate | 6 + dev-db/redis/redis-4.0.6.ebuild | 141 ++++++++++++ 27 files changed, 474 insertions(+), 29 deletions(-) create mode 100644 dev-db/percona-server/percona-server-5.6.38.83.0.ebuild create mode 100644 dev-db/redis/files/redis-sentinel-4.0.6-config.patch create mode 100644 dev-db/redis/files/redis-sentinel.confd create mode 100644 dev-db/redis/files/redis-sentinel.initd create mode 100644 dev-db/redis/files/redis.logrotate create mode 100644 dev-db/redis/redis-4.0.6.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index b06f52546b1e..0083bb7d5986 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/bucardo/Manifest b/dev-db/bucardo/Manifest index 8b564d40d7fb..97972e05ee0d 100644 --- a/dev-db/bucardo/Manifest +++ b/dev-db/bucardo/Manifest @@ -5,5 +5,5 @@ DIST Bucardo-5.4.1.tar.gz 327848 BLAKE2B d6fccd311c2e0ba99ef5614eff70caa4e69e0cb EBUILD bucardo-5.1.1-r1.ebuild 638 BLAKE2B f203e9dc57f3220881448ecef5524581dccf1f352eb3a699547dd585d9212981753e10148cd5cc97e5ec9de1c24e19775405c9f58076747f98e3956ea11e5e90 SHA512 fb1212b86ccb4de9741890c11e88fcca972647800bcd2d6143fa741ca6f77db041c096113a40bd58180ebea469b7df248ad3077c397a0cc4cb63f6fed0132f21 EBUILD bucardo-5.2.0.ebuild 638 BLAKE2B f203e9dc57f3220881448ecef5524581dccf1f352eb3a699547dd585d9212981753e10148cd5cc97e5ec9de1c24e19775405c9f58076747f98e3956ea11e5e90 SHA512 fb1212b86ccb4de9741890c11e88fcca972647800bcd2d6143fa741ca6f77db041c096113a40bd58180ebea469b7df248ad3077c397a0cc4cb63f6fed0132f21 EBUILD bucardo-5.3.1.ebuild 638 BLAKE2B 3c4721c5e5baf7fbf415723d47c845ab825f6f534b76988a82d8498a05428681fc9f13fad4ea83fd9f9dfdd8598a27a1d7d0119ab7cb01ca7d4cf0ca430c0ce0 SHA512 355f1d5a53b36f5be2d70c678ce1761dc2cbde50c2f4406a5db259c64168d203a0a03b6d8cb1e900ceadb04c801fb50f44afc3afcc0223249eaa5dc48c840aa9 -EBUILD bucardo-5.4.1.ebuild 638 BLAKE2B 3c4721c5e5baf7fbf415723d47c845ab825f6f534b76988a82d8498a05428681fc9f13fad4ea83fd9f9dfdd8598a27a1d7d0119ab7cb01ca7d4cf0ca430c0ce0 SHA512 355f1d5a53b36f5be2d70c678ce1761dc2cbde50c2f4406a5db259c64168d203a0a03b6d8cb1e900ceadb04c801fb50f44afc3afcc0223249eaa5dc48c840aa9 +EBUILD bucardo-5.4.1.ebuild 637 BLAKE2B a140bcfe188f89fb12b82974ecb72a9227f0268c1d998a8919465f7208be24ce54ce82d8d598c2f3f74c2a71300bcee8ea0c7644f5f56d897de45bb8e8e0fcc8 SHA512 31fca057140e1b9a9df09c9397af7195b7679f3834d68b055c50ba6cbec584cc682522d5df1ff55fac046f45f5188393bb9a0915860e0684a7c96d9532690c17 MISC metadata.xml 280 BLAKE2B 75bfaba3095bd67dfa80654885579e51053fd130ae4e3ad61ac75192eebad9fe8d08cbdf63773dad3837ef2805e0594d0823655966fde8876ba5919e01f0e698 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f diff --git a/dev-db/bucardo/bucardo-5.4.1.ebuild b/dev-db/bucardo/bucardo-5.4.1.ebuild index d28a6ecfc9d9..54e6d1adb7b8 100644 --- a/dev-db/bucardo/bucardo-5.4.1.ebuild +++ b/dev-db/bucardo/bucardo-5.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="http://bucardo.org/downloads/${MY_PN}-${PV}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" #IUSE="test" doesn't work without extra data IUSE="" diff --git a/dev-db/hyperdex/Manifest b/dev-db/hyperdex/Manifest index fc34c58bb4d0..280f0ccfa771 100644 --- a/dev-db/hyperdex/Manifest +++ b/dev-db/hyperdex/Manifest @@ -5,9 +5,9 @@ DIST hyperdex-1.6.0.tar.gz 1490273 BLAKE2B bc8e83fa73f44695d82c2e7fb936b3cf34749 DIST hyperdex-1.7.1.tar.gz 1517677 BLAKE2B 45c2789736a6f609f2c327f31f1e248b05abb46d766b565f35609be1ca78f680e2cedd017336fc82c844d17034197c14230bbf07d30228001c6cd45bcd509e15 SHA512 41bf8cc49081ba41917c737facfa7b5e29bcf73f510ae5743356828643bd7292ac8c610915985e52f6609c4a80cf70e7d515504bbe0a85383c74d7e288f2dc5b DIST hyperdex-1.8.0.tar.gz 1516389 BLAKE2B 7636349a3d81cc2592fed5d6db7c7bbaacdc0d1f6e4cb4965f111fe04ef8232337d6f1f4ce5a4d335daaab58e4171073fff079afd1822d8d57aadd6927c7da58 SHA512 e667552f16899edf57a08f3704e762e33b33aa9508ee486187b5c6fd6f01ab9cb61cd65444a676386554cebb2e4d191b4181df4c9b399821e5d244791bf3cb12 DIST hyperdex-1.8.1.tar.gz 1516446 BLAKE2B aa2e011b8fdda57d73662164dac30984b3b633dc27bdbd70e415859386559cc41874ff6da0faabac4c28518455464fb960f285f50fd8e76cb9f40e938c9e328c SHA512 28a9b1a1f99d4159fb2d453fb7f740d4926ac2275488c8676a70d45879be5b1ef9b1e84720f86ef4f058706558899f2e3229fc7140349dadc3974754a03ac13e -EBUILD hyperdex-1.6.0-r1.ebuild 1495 BLAKE2B 4709ed806ae6bce3e4cf17e1574d9588cbffab882a62a40b01b0e29c12b8718631c25437adb2f361adab8a278244c9dd2e640469fdd218030c5100caf9974605 SHA512 9b062654809c5bdd6c53f7cca813f88d1d3e1675e54522aa3ad7957f278b932f6ff98d800b63984ad24548abb4724107b7fd1ead15f899dc548e5553e463c807 -EBUILD hyperdex-1.7.1.ebuild 1495 BLAKE2B 4709ed806ae6bce3e4cf17e1574d9588cbffab882a62a40b01b0e29c12b8718631c25437adb2f361adab8a278244c9dd2e640469fdd218030c5100caf9974605 SHA512 9b062654809c5bdd6c53f7cca813f88d1d3e1675e54522aa3ad7957f278b932f6ff98d800b63984ad24548abb4724107b7fd1ead15f899dc548e5553e463c807 -EBUILD hyperdex-1.8.0.ebuild 1594 BLAKE2B 47568f022fa8933db3bca8c563f838fbece6be18a54528f48ade2b5a0956b490b94e8d6984b2abb5593aabb558367a2019d7113041044e5599f07e24d6f669df SHA512 1a797b399c474392d7170349964fcf6a3592ff5f3678627b96fda458db15de30515819ae2df55a9c852c9aea00cfbc37a6bfc0aa849d0001a226dcbab70cb517 -EBUILD hyperdex-1.8.1.ebuild 1594 BLAKE2B 47568f022fa8933db3bca8c563f838fbece6be18a54528f48ade2b5a0956b490b94e8d6984b2abb5593aabb558367a2019d7113041044e5599f07e24d6f669df SHA512 1a797b399c474392d7170349964fcf6a3592ff5f3678627b96fda458db15de30515819ae2df55a9c852c9aea00cfbc37a6bfc0aa849d0001a226dcbab70cb517 -EBUILD hyperdex-9999.ebuild 1431 BLAKE2B 375a49af61d7560c55a083f42835ad1cd192fde044b1039683d5482d2c2ea0bf78116a89cbc93ac614d12fe37990684318efeac65d54e3daf9f8f07dd90ca09b SHA512 36982995c3e8ba96613dcadc3736218f0baf039f52ac66d49bb7dd3fe0d1a6638a8c86a8ffdf5a604b4293128b694c6289c13540517bfbed2f58249c2c44c338 +EBUILD hyperdex-1.6.0-r1.ebuild 1497 BLAKE2B e9a1e01ea9d604d6255c515ff4ad26f010be49537fe6b341f95fc313c53093976b45a828d6343cc7272ed9782e1529b8797c4b0753b8518527d4897ca34f5b0b SHA512 08966755f65cc5307d0caaf4543056b111ca1927642c5b9d3273d236802b5c154ece90951519ba129495d80d95d0d9b7719863980b1a4e8cfc03a54cd6ac0418 +EBUILD hyperdex-1.7.1.ebuild 1497 BLAKE2B e9a1e01ea9d604d6255c515ff4ad26f010be49537fe6b341f95fc313c53093976b45a828d6343cc7272ed9782e1529b8797c4b0753b8518527d4897ca34f5b0b SHA512 08966755f65cc5307d0caaf4543056b111ca1927642c5b9d3273d236802b5c154ece90951519ba129495d80d95d0d9b7719863980b1a4e8cfc03a54cd6ac0418 +EBUILD hyperdex-1.8.0.ebuild 1596 BLAKE2B 8b302e59a9555aa19ac9c8bade8bdeb16141449a24204ba891f64dbd55d502cf25be329faeddb0e404f86251cf917f142ddab28243581c288c07f5ed297b8989 SHA512 1f66116c040ff29dc248c65d53ab33d5e92726c1ecc4bd3dc51307fad594e64fa3eccdee6821f458f081bb7c33a19ba28d9498b4bebf149dae842f5ade31e330 +EBUILD hyperdex-1.8.1.ebuild 1596 BLAKE2B 8b302e59a9555aa19ac9c8bade8bdeb16141449a24204ba891f64dbd55d502cf25be329faeddb0e404f86251cf917f142ddab28243581c288c07f5ed297b8989 SHA512 1f66116c040ff29dc248c65d53ab33d5e92726c1ecc4bd3dc51307fad594e64fa3eccdee6821f458f081bb7c33a19ba28d9498b4bebf149dae842f5ade31e330 +EBUILD hyperdex-9999.ebuild 1433 BLAKE2B 40a874a8b4d9fe5d727091f6f3775d13d7d92abae383f6352fb0e29783e5e081c63415dfd839a59eff26dc8a8d88dc8efeaea432855ca3301dd87d4015b74c79 SHA512 41f608776b4ee8068beea39066a4f7bd45c54583b11e483113c78f2b84c4ba49b064d1c717dae40721325e0856fabfd43d91a3a369035454a6d8d00fab05ad16 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild index 785eef7c7353..ba8e0bd4d3de 100644 --- a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild @@ -34,7 +34,7 @@ DEPEND=" dev-libs/replicant dev-libs/libmacaroons dev-libs/libtreadstone - dev-libs/json-c + dev-libs/json-c:= python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" diff --git a/dev-db/hyperdex/hyperdex-1.7.1.ebuild b/dev-db/hyperdex/hyperdex-1.7.1.ebuild index 785eef7c7353..ba8e0bd4d3de 100644 --- a/dev-db/hyperdex/hyperdex-1.7.1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.7.1.ebuild @@ -34,7 +34,7 @@ DEPEND=" dev-libs/replicant dev-libs/libmacaroons dev-libs/libtreadstone - dev-libs/json-c + dev-libs/json-c:= python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" diff --git a/dev-db/hyperdex/hyperdex-1.8.0.ebuild b/dev-db/hyperdex/hyperdex-1.8.0.ebuild index 6d245f6659b3..107843edc025 100644 --- a/dev-db/hyperdex/hyperdex-1.8.0.ebuild +++ b/dev-db/hyperdex/hyperdex-1.8.0.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-libs/replicant-0.8 >=dev-libs/libmacaroons-0.3 >=dev-libs/libtreadstone-0.2 - dev-libs/json-c + dev-libs/json-c:= python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" diff --git a/dev-db/hyperdex/hyperdex-1.8.1.ebuild b/dev-db/hyperdex/hyperdex-1.8.1.ebuild index 6d245f6659b3..107843edc025 100644 --- a/dev-db/hyperdex/hyperdex-1.8.1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.8.1.ebuild @@ -35,7 +35,7 @@ DEPEND=" >=dev-libs/replicant-0.8 >=dev-libs/libmacaroons-0.3 >=dev-libs/libtreadstone-0.2 - dev-libs/json-c + dev-libs/json-c:= python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" diff --git a/dev-db/hyperdex/hyperdex-9999.ebuild b/dev-db/hyperdex/hyperdex-9999.ebuild index 92491ebb675a..d1d8b48d8504 100644 --- a/dev-db/hyperdex/hyperdex-9999.ebuild +++ b/dev-db/hyperdex/hyperdex-9999.ebuild @@ -31,7 +31,7 @@ DEPEND=" dev-libs/busybee dev-libs/popt dev-libs/replicant - dev-libs/json-c + dev-libs/json-c:= python? ( ${PYTHON_DEPS} )" RDEPEND="${DEPEND}" diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index 552ea64d8477..6df6df3ab1f7 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -2,5 +2,7 @@ AUX my.cnf-5.5 4795 BLAKE2B 0b8e6af4bcbefd600a85b7a12ca66af07d0a261a02da5067fbf1 AUX my.cnf-5.6 4568 BLAKE2B 633cc45bcc751046ef766dcabd1c8db2cd474f13cde436d41698a810787bc52cc8c11aee79c49ed884f4b01ea26fad11f9ffab08471eb10d6752007fd44d372b SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10 DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda DIST percona-server-5.6.37-82.2.tar.gz 56296960 BLAKE2B 70d0c40c96be3c3f674466d2406b5622a7a37cc59d9daee7f0315ce6dd2ce13751f48d440646a0f377ca86aecd6bc749d050ab4f58bfa7400bcd35167ab8d480 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e +DIST percona-server-5.6.38-83.0.tar.gz 56390422 BLAKE2B 2c5ae8c021c95da210402b79314698b7286ca7791c35f059260537b19660e33bd6a06701f24f121b7b051faab38b41b037ea3d1305d281abaadd07c3c432a13d SHA512 25b3dbee188e0608f3783acdf70eb3ded276ff25dae3ee879a70e3eefc8df5ac15e3b5fbe310537f84ccde9434de51ac5927322de13f6b89e0530ebbd7d36f6d EBUILD percona-server-5.6.37.82.2-r2.ebuild 8859 BLAKE2B 162163f63ec4f4c6c82f914bdc4cf8912fdb32714037f08ef4fb4e3d1374edc87a7a8d0098c26193eaf8c963c3892730ad3fff98073b8a465d773499f857a451 SHA512 d896ab7598c072e39e7cbe322d019350052bf0a9dbd296bd6e7ba0d1ff81d5d80d279b6c4a8f5d497f7588800de91cd314db43a300b413cfe0c36fb5d280adea +EBUILD percona-server-5.6.38.83.0.ebuild 8518 BLAKE2B 090fe3f392cdf68e08a104ae9a52756a7ecd75faa827d8deecf4800ff47a4cd1deb04d9e1f63baccc978d324dda7689630fb1ca8e891e045463391ba49279e05 SHA512 6ba3fa470caa12748ef162bb38c7c9544b3731549311c6f54e53df3dd096215d93b53f13a9db9526ea3cc2455b3fd62d201b0b53eb0b2a5a362983bdc18e1392 MISC metadata.xml 1505 BLAKE2B 63c11ed734843c7f07a7b71525f21113828cf7bea4fe9f15cbfde952f5e27fbeb8ad1942306a3224478c1a2d19f2ea22d26ee124db19fa7122d573095f98847e SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6 diff --git a/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild b/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild new file mode 100644 index 000000000000..ebb378805f4a --- /dev/null +++ b/dev-db/percona-server/percona-server-5.6.38.83.0.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +MY_EXTRAS_VER="20171121-1518Z" +SUBSLOT="18" +PYTHON_COMPAT=( python2_7 ) +# Build fails with ninja +CMAKE_MAKEFILE_GENERATOR="emake" +inherit linux-info python-any-r1 mysql-multilib-r1 toolchain-funcs + +IUSE="numa pam tokudb tokudb-backup-plugin" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" +HOMEPAGE="https://www.percona.com/software/percona-server" +DESCRIPTION="An enhanced, drop-in replacement for MySQL from the Percona team" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +COMMON_DEPEND="numa? ( sys-process/numactl:= ) + server? ( pam? ( virtual/pam:0= ) ) + tokudb? ( app-arch/snappy ) + tokudb-backup-plugin? ( dev-util/valgrind ) + " + +DEPEND="${COMMON_DEPEND} + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + test? ( + $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') + dev-perl/JSON + )" +RDEPEND="${COMMON_DEPEND}" + +REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )" + +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" + +PATCHES=( + "${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch + "${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch + "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-5.6.20.patch + "${MY_PATCH_DIR}"/20006_all_cmake_elib-percona-5.6.34.patch + "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch + "${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch + "${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch + "${MY_PATCH_DIR}"/20018_all_percona-server-5.6.25-without-clientlibs-tools.patch +) + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt + +pkg_pretend() { + mysql-multilib-r1_pkg_pretend + + if use numa; then + local CONFIG_CHECK="~NUMA" + + local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;" + WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support" + + check_extra_config + fi +} + +python_check_deps() { + has_version "dev-python/mysql-python[${PYTHON_USEDEP}]" +} + +src_prepare() { + mysql-multilib-r1_src_prepare + if use libressl ; then + sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ + "${S}/cmake/ssl.cmake" || die + fi +} + +src_configure() { + local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITH_NUMA=$(usex numa) + -DWITH_PAM=$(usex pam) + $(mysql-cmake_use_plugin tokudb TOKUDB) + ) + if use tokudb ; then + # TokuDB Backup plugin requires valgrind unconditionally + MYSQL_CMAKE_NATIVE_DEFINES+=( + $(usex tokudb-backup-plugin '' -DTOKUDB_BACKUP_DISABLED=1) + ) + fi + mysql-multilib-r1_src_configure +} + +# Official test instructions: +# USE='extraengine perl openssl static-libs' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild percona-server-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + return 0 + fi + + local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might right out of order + mkdir -p "${T}"/var-tests{,/log} + + # These are failing in Percona 5.6 for now and are believed to be + # false positives: + # + # main.information_schema, binlog.binlog_statement_insert_delayed, + # main.mysqld--help-notwin, binlog.binlog_mysqlbinlog_filter + # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers + # engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate + # engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 + # engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.percona_bug1289599 + # Looks to be a syntax error in the test file itself + # + # main.variables main.myisam main.merge_recover + # fails due to ulimit not able to open enough files (needs 5000) + # + # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam + # Called with bad parameters should be reported upstream + # + + local t + + for t in main.mysql_client_test \ + binlog.binlog_statement_insert_delayed main.information_schema \ + main.mysqld--help-notwin binlog.binlog_mysqlbinlog_filter \ + perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \ + funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \ + main.variables main.myisam main.merge_recover \ + engines/funcs.db_alter_character_set engines/funcs.db_alter_character_set_collate \ + engines/funcs.db_alter_collate_ascii engines/funcs.db_alter_collate_utf8 \ + engines/funcs.db_create_character_set engines/funcs.db_create_character_set_collate \ + main.percona_bug1289599 main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do + mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" + done + + if use numa && use kernel_linux ; then + # bug 584880 + if ! linux_config_exists || ! linux_chkconfig_present NUMA ; then + for t in sys_vars.innodb_buffer_pool_populate_basic ; do + mysql-multilib-r1_disable_test "$t" "Test $t requires system with NUMA support" + done + fi + fi + + if ! use extraengine ; then + # bug 401673, 530766 + for t in federated.federated_plugin ; do + mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" + done + fi + + # Run mysql tests + pushd "${TESTDIR}" || die + + # Set file limits higher so tests run + if ! ulimit -n 16500 1>/dev/null 2>&1; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + python_setup + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ + --testcase-timeout=30 --reorder + retstatus_tests=$? + [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" + + popd || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + if [[ -n "$failures" ]]; then + has usersandbox $FEATURES && eerror "Some tests may have failed due to FEATURES=usersandbox" + die "Test failures: $failures" + fi + + einfo "Tests successfully completed" +} diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest index ff828df34bad..d2e1bfbf55fc 100644 --- a/dev-db/pg_top/Manifest +++ b/dev-db/pg_top/Manifest @@ -3,5 +3,5 @@ AUX pg_top-3.7.0.patch 749 BLAKE2B 26d3d391e33a55b5af857ec3262b5f37e97a64262c050 DIST pg_top-3.6.2.tar.bz2 220985 BLAKE2B 93676f5e35b0048e4bcaee6385e7f6d291ca8b3740f7226715acf254fcc24bd4cc921a078f679e22e599e22f79fc3e2de5b971c918b6bc7e6eff2fd6e7a72df2 SHA512 0e7f33cccd7a1debce4965a11ff3d5d6868aace53651ca1c486f061728034f0ab3901ddfbded022c9297d3393eaea32585ca779334954c87fd0c13c8fa523074 DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 87a29d0237aad48b683c17ba56fdbc4a90f854f4f497057ffc978be1797d978f02694781e83d296fca82e03c8bc737f7cfd74e996987eea0bd8d6a66ae433ce0 SHA512 509cd3ce65a9b549097eaab5ae27106fa469cdeb4f37950564654f3df01390e1a771c8fa4f5858c3e4c1e76470b6c0fd9b07e8268564f59285e30bf824d7c4ec EBUILD pg_top-3.6.2-r1.ebuild 623 BLAKE2B f90f6ce762622e85de0883da662d3eacb12ff5de78209f519af8535312d573778d00367ae6d5414113d17bd47206423973e84d235f1c91a63d0e262536959748 SHA512 3c6d2bdfc87807147247418b9a8b1178a5df5159cb4d8b0e0c12ba8ea7f8c14f491ebb207614eba4f6e9a8857dd5be509aa138a166dd44a1cf2fa9acb69ccd57 -EBUILD pg_top-3.7.0.ebuild 623 BLAKE2B e347ef86e693e992f8049cfc4c7caf9363500ed37de8a99c43bc6434f709c340e00251eb2db6c20551ee18791bc7eaa29170d157bb240d606d90ffc6ecbad496 SHA512 9518ba816b4856cbdaa744faaa49a2bf785bfadc479a4b1a9d91d8b804ae9605fe5c33768bbe4241b55e0cf61d85c831d10a5ea38b41a3a34495fc69c9676b50 +EBUILD pg_top-3.7.0.ebuild 622 BLAKE2B 1965ba9d41b5706c49aa2324081744a1d7be369d4d5f7e8d1e1643fc6ecaedc7ba2e6020b0b961c739f635ab9abf1132f68e34dc7093b4d3bcb48ab476296cd5 SHA512 cccdd4044b79f6546321beb5bcf9da3ad59252befbd87d19e84045524404714345c04eceb9fdfe93154c3da4a900e529f90d68b670c6d51208c755f6a8f0ce56 MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc diff --git a/dev-db/pg_top/pg_top-3.7.0.ebuild b/dev-db/pg_top/pg_top-3.7.0.ebuild index 7531d3439336..d452275d840a 100644 --- a/dev-db/pg_top/pg_top-3.7.0.ebuild +++ b/dev-db/pg_top/pg_top-3.7.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/3504/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="debug" RDEPEND="dev-db/postgresql" diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest index 6cd3bdd4b2f0..7614e7acf0d7 100644 --- a/dev-db/pgadmin3/Manifest +++ b/dev-db/pgadmin3/Manifest @@ -5,5 +5,5 @@ DIST pgadmin3-1.22.1.tar.gz 14667770 BLAKE2B 3222b1a13ebe42e08b1e2aa9a5d893725eb DIST pgadmin3-1.22.2.tar.gz 14788481 BLAKE2B fd38ae523bfc554138f56a99ee5fe0aaf2446d3b77416552861d4c3d3d939e553ee160264720af3095f91d270b6c719e078ec29b998c2f4a13739ed34c4c0312 SHA512 dcfc72cc2e33dbf1c9d1ce287f9d1d46eb047c99a165372cb74ef1716098f90f2ce2a8d0cd21b511a1ac8c0569dc7b3c0593208a74641f5a8f29dc9c04e40bbd EBUILD pgadmin3-1.22.1-r1.ebuild 1232 BLAKE2B cead84fe90bc24b0b900f8686b907d54b8408709df3bd0fda134391bde0c22b0f154fdcde8a5d8907771cb525a92ca19f4da0b81ec849040732a27f809e1e293 SHA512 b062550f8bc6856906984eef98cdf57ec191c7008a0b70f12f10a89811b98125d3a690cb48bf419990b4f6bcc9346517e518bb8975cb10c18a9f151d890028eb EBUILD pgadmin3-1.22.1-r2.ebuild 918 BLAKE2B 1badd757ff29baf2b42a8f6ffc50bb4f742dbda4405674ab50947bf4b9db0d7a304ba5f37ba628b6c3c7e16929d77b1bd271227938436f6d0fb4e9690dc5c6f4 SHA512 029c492b94913695c6d1ee1ce5508e284ebe112ecb960a5dcae7eeb8a8b7e48b6ba8af8ecf00fbd80ff2a9bed8867faa04b26b05d9ee3c4b828b378edaa55739 -EBUILD pgadmin3-1.22.2.ebuild 982 BLAKE2B 9670a9b377381c3bf8737f5572126c8ed5523509cc4f7ee154f12ffc8f7c6b0ea3f0e270df05a9e2671c73e817d9add060043c601d50dd0e5ed0ce302313210f SHA512 ad39f85a87a0f90ce8d2646de9bfb1eb311d4b79d90b7f33abe3ceb551fe9b50753b124b48c6d965eab4134f5c57da4e157f5493165a1d50431b5fc23f52d6f9 +EBUILD pgadmin3-1.22.2.ebuild 981 BLAKE2B d16df45b1ddf9b03e0e281dc82c3e28ce424417b515f53de5afea81f5a6794618b7ee06e43d0b14bcf798c80706b53443287c6bd9d3c4bae3b7c0475720f064a SHA512 f31b44e32b66e66d3aac07031d735a40a9032f478f903823f073f384b6d27ccec95ff5d70f085a399f1c921c00f9b1a751f59d7daf46c1ce270f23706233be47 MISC metadata.xml 368 BLAKE2B ea267a284f54ca0becf05f4a7579a167ee591178e17e3922d1c493bdb24fcd63400f2146625108a0d42f7816c75bdd7b1c836c8c354f2058c4fad15c8a0f2a6b SHA512 435f2da400e35d133390ec90860cfe1dd135281156ae1ed6c28e32b4e9f67d93cdb5e7e9ffa183244984e689a131838e6301a50d5366216bccc2df5cd97b54ea diff --git a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild index efce58f103c6..1b47814e56f5 100644 --- a/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild +++ b/dev-db/pgadmin3/pgadmin3-1.22.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.pgadmin.org/" SRC_URI="mirror://postgresql/pgadmin/pgadmin3/v${PV}/src/${P}.tar.gz" LICENSE="POSTGRESQL" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd" SLOT="0" IUSE="debug +databasedesigner" diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index da9fbd4afa1b..c820c542e065 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -7,9 +7,9 @@ DIST postgis-2.1.8.tar.gz 6811272 BLAKE2B f39debafea797fec2595b1ba2256ce3ed19875 DIST postgis-2.3.3.tar.gz 11342032 BLAKE2B d50eb0b43f56c31768c40083677e54f547e183287feaab6b21d223b49bb19c3599031f186f0f783b9c9c948e7ed0bcd4a0918e65e61babad35f6c37eacc8f981 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c DIST postgis-2.4.0.tar.gz 12576979 BLAKE2B 2d0312ca9202f92f55700e78881ecdd7128064393b1e7197dd658f8fcee676723c048fa2c7f199aa9d61a5638c0ad0129b6d2dc61d6324caeec3b7163f0f4edc SHA512 813e8e9feb75b58673afaec2dda3b5d8fc586a0f483c553795c8ae2b917bb67a9741e8c901787a0b914c327848323239346f1d816aa60b47d5a7065596de0067 DIST postgis-2.4.2.tar.gz 12470881 BLAKE2B 116bb5d1c8f6066d537cac950254923a681babac456d155139dbdd2853b80499f4f9445dad985b94bffffd1d1285a6c78fee0fccb24e301d18147f3cd9230416 SHA512 e268572d5cd009754ef05f5d2eedcac7e362fa47199459c637cd4d9050d2b648d4b2b3746cde0dce5a42be2606a432b64dc905f193e12cf0869e3dd6f820b425 -EBUILD postgis-2.1.8-r1.ebuild 7353 BLAKE2B 7adca64f0cc190038b5948146302c46d0edaf36fc5160553b4bf2869e072f4251eaf703a002805a97ab434a76848479ce214225690e38dfee204792aa5adb8f7 SHA512 f7341c7ec07f6fefa9b904aa915bef8ac309cd17595f246e26efdc0d932476bee7cc6264c8bdd98b02b0637c2cd24ce31a2aa7799ccf8f4f9d19b6192584a856 -EBUILD postgis-2.3.3.ebuild 2734 BLAKE2B aa3ff6c701fc8c5d3e6fd705aa5f84b5958e0c94ea58fe418d4c1fd81a9e2cf860ff77c49cc901862c97c61d5f932aac3ca9fc390694352a81f64ecc32bbdc1b SHA512 04b648cf53497cfb0f5fcdd7a3c033a01f62180f60d82d427d9a163a09484be8c09a63e188237abab37e5028fa36ac2075094d19e96211d50238bb8b95e1234f -EBUILD postgis-2.4.0.ebuild 2737 BLAKE2B 1872a15d348ac99130543694a1367e0c81f279eedb4873804677cc2cce43fd21a90ab7b279e0d19c8cf954bf2ec12c2f35152a941c58d081d9ca0046d14437f7 SHA512 2bd729a3fb41cac6e283f045741de3fdfb5789849b025cdb76ff9ace385309a2838c6e001a110e853d0f98992d411265634af0526c7f7891ffe4a7269fb35cf6 -EBUILD postgis-2.4.2.ebuild 3059 BLAKE2B 08e595433c969f4fc085fd4793b4ae7dec82afb5f9fd8b976b37de21d08a4358476b52d7661e82c6b10f175e6e031ef0d0bd06c4e678673ff5e284365c727949 SHA512 342528e62312b31f92a6bd042b14275ca931259990af38eda13215fe491ea6c30a43ae79158406b84e8349b694794971b9e9ac69bfc1a8a8e87ad1f843f28fd9 -EBUILD postgis-9999.ebuild 2645 BLAKE2B 68887860a167e8b3a6c5ddd41198ff95d91987e2610244e250cf766f92a8e43f24123cc8d81a8d79098b24aab65872049a7bdbc6879c665190a9df763670af37 SHA512 fc23662b423b3a07d6bd79c36d83677f3bc09975b93259a20b8d46d19eb95542456df9785e21c40d44c6c833cddc08cb34c1b9c214323d2b1661b33262c49e10 +EBUILD postgis-2.1.8-r1.ebuild 7355 BLAKE2B 2558aea2a69722d1d2c67713fdd839991dd8530af69d9fcc6c109dfce8a164efd57bfcfbe0423accc243a3d826152d5c9e9062789712dd8bd569c715a69361e6 SHA512 e9d76347fe6962406190a4005fa8b17e7c9d02e58c0374de25441014def93923e726c6943e0e482a3992b9c3f42a36186ba486d00a60ff64e4d4051471ac554a +EBUILD postgis-2.3.3.ebuild 2736 BLAKE2B 73c2720eefa27ee1f4443ac028b0552d8686d78e6f493d6f1c8cb32dd68a373256151a2898d1c08dff597b7a42c09b027e7a320288bc6e42746be5523b072e90 SHA512 1f0dc5ad11cddbe1ac8c9a361180aa224cc7709e67ea94cf0e14338014221d2838055f45b3fbf91cac1e0c7f330209f026f66b1d1c10bec789caf98fa38e5a27 +EBUILD postgis-2.4.0.ebuild 2739 BLAKE2B fef6b6ce675926a548d124386eedabe6e509412ed053ad02fd56dbb39798de1e100f24153875a9a78641c21b43642cd97bb79d23cd775db9a3842598527f91a5 SHA512 e22ddc46b7c604909375b9ca4ec6eae5b986690ac3e9b2df276a0c9b900692df6d9d7287d11efd51ad97e6706bcdf940aff91d3c9116e499c9c67d20f26300b1 +EBUILD postgis-2.4.2.ebuild 3060 BLAKE2B c9775cc4ccf349c31d7902969cef84779955b13d8499f02f457d3ea67a2c232b65ebcc196cea9d85018314950133787911e044b189e999abe3eab799ed6c464e SHA512 b33106a8c0f6f84ff103bb039dce95f69bf5836362b121f00b08737499c44e28c238b85e80b52407786bf6e5b76838f30ade1bf15f5349b1b5a1f809441c3925 +EBUILD postgis-9999.ebuild 2647 BLAKE2B b379c0ebfd30c407817139b72264bbb70c0cae3ba281b2f2ffda38c61c851bb363266e2675437e32dd3ffc80a6c1dca4608e34833d7a729cbd6997eb2501411d SHA512 4b654b604752b9e30ea0662e89429e0deb74e1ce6cfb8beef34f8bf33ea2aeb28e07398828fc5ddc3d27a520258313cb552b7ef24069ca5b9001a4db7aaa1cec MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada diff --git a/dev-db/postgis/postgis-2.1.8-r1.ebuild b/dev-db/postgis/postgis-2.1.8-r1.ebuild index 7b1340edd962..9774fabdbc3e 100644 --- a/dev-db/postgis/postgis-2.1.8-r1.ebuild +++ b/dev-db/postgis/postgis-2.1.8-r1.ebuild @@ -24,7 +24,7 @@ RDEPEND=" dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] ) - dev-libs/json-c + dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 diff --git a/dev-db/postgis/postgis-2.3.3.ebuild b/dev-db/postgis/postgis-2.3.3.ebuild index 87001946ec62..1655d70d7c37 100644 --- a/dev-db/postgis/postgis-2.3.3.ebuild +++ b/dev-db/postgis/postgis-2.3.3.ebuild @@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test" RDEPEND=" ${POSTGRES_DEP} - dev-libs/json-c + dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 diff --git a/dev-db/postgis/postgis-2.4.0.ebuild b/dev-db/postgis/postgis-2.4.0.ebuild index 18cd48cf4505..1f6443716a46 100644 --- a/dev-db/postgis/postgis-2.4.0.ebuild +++ b/dev-db/postgis/postgis-2.4.0.ebuild @@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test" RDEPEND=" ${POSTGRES_DEP} - dev-libs/json-c + dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 diff --git a/dev-db/postgis/postgis-2.4.2.ebuild b/dev-db/postgis/postgis-2.4.2.ebuild index eb28a8841e0e..dca731bcd115 100644 --- a/dev-db/postgis/postgis-2.4.2.ebuild +++ b/dev-db/postgis/postgis-2.4.2.ebuild @@ -17,12 +17,12 @@ HOMEPAGE="http://postgis.net" SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux" IUSE="address-standardizer doc gtk static-libs mapbox test topology" RDEPEND=" ${POSTGRES_DEP} - dev-libs/json-c + dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild index c112970c7060..0010979ad4bf 100644 --- a/dev-db/postgis/postgis-9999.ebuild +++ b/dev-db/postgis/postgis-9999.ebuild @@ -22,7 +22,7 @@ IUSE="doc gtk static-libs test" RDEPEND=" ${POSTGRES_DEP} - dev-libs/json-c + dev-libs/json-c:= dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index c3621c62bc94..c47f42ba3088 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -8,10 +8,14 @@ AUX redis-3.2.3-sharedlua.patch 2535 BLAKE2B 4affacfc27ee228f5050eb9133bee892b91 AUX redis-3.2.5-shared.patch 754 BLAKE2B cb119c20e219ab7c38bceffa9f7b3e59dc4eafe49bf28c652793c24044065a2de1c07e94baa24e9ba7e45840daf7d926667214e6ec468a99ac4637337949d6b5 SHA512 dcb0755a0cc24b4dc21c7a20891df5fa0c643beb8f411779548893ac9681c41510ecba79b0ba031d7eeeccbf5b15ae32be04241b197524de4f8f9aafa02ccaab AUX redis-4.0.1-shared.patch 866 BLAKE2B 55531d6437ba89e37674377795ed8f7b4a34982571358d3ac73071951929ba96f101dfc9f9336f04d3851b4d360023c50d7832d9ae5ba9cfa405f317ec70b983 SHA512 f58ae83d3370949187325b1f1f75feb7d85d3112ae65e7cd330d193490c42aa6288f05cd4d2309dbde5d32015a067ec831255a3dab937cd0889970c8eecfb3f1 AUX redis-4.0.1-sharedlua.patch 2568 BLAKE2B dc943602aba26455b94536571ee6be2969cbdf04da63805db0da0de5c5da3eb5fe16bb3c9e282020cf5a0d2cb9ac02244614fb8929847ce930c2ed25f4c4b8ff SHA512 c7c08b67c09425876da513bbeb52667fe5917b56a43749a914dac356fa37c091b696765eabca100f2506cf461107abdbf22bce075879a8aa82a0e8d54f696fee +AUX redis-sentinel-4.0.6-config.patch 285 BLAKE2B 97b8fb6c2af74e6d2736e9dcdd9faa579800fecec53752168fc5e5e43c509fc00a1192215b5fef89af915456e5ab0d7c438df51e2b214399a4482f7683525a8b SHA512 12fd77b38fbcc3bf4b25f519a8f40e43c5d2f32be341155f5e6d08f2a4513043917452d45a20608dc56c0e92e324cef8480d42d670752056c821b4ffca93e2b1 +AUX redis-sentinel.confd 470 BLAKE2B f77fd7e35c753e35aafa6e773dcc00d2779bc29d8579334078bd6124aab436dff671ae790c0b0e3cefdd4082fe212b4b71501b529176cb0a1e5f8c8cdcf1387e SHA512 ea455f8c73c21bc46127ea5c7b99dc5707ad41160e5fd61367555dd2e3fd5c1518026257651e7d371a60a64b682b6839dd37580f75308c73239edeba49d6b372 +AUX redis-sentinel.initd 648 BLAKE2B eaea4a047dfa61a325fa2bfeb30b422220d4fad699a693b9141a74575dc153ad3db2dafa3fa06ef195914a32f2a6aacfb3fc2e3b80ebe6b75316700fbd84221d SHA512 dfd1dadedf9b7376667d1966072c28e5e23e17592bf66753eae4bbc084225714f30c6450001f643c1561ff3a2eb2e50f719d32ff34f5419040ff42a2c4fbd70d AUX redis.confd 450 BLAKE2B 99d00c43c6496c66c6abbebf8703ebffd13f688382b3634feed97b5c1af6cc4c4e356b79bf71f39b0bf82596ea1f9dedf36077b2669e1c88d94ef31d4bd9964b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b AUX redis.confd-r1 511 BLAKE2B 911e6f7ca70013d4feefb6ec7ee3f98220f303d48c95f27c2558efee00559cf2b9ae8c0303f85d2b081aac8f636de326b52e3493a9be2c027ec7d97114f856da SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133 AUX redis.initd-4 780 BLAKE2B 3bd1629bc43194d90b5f0af4e2abd4998fed6f9c5c64d410d8e1a6432b7d8d23f64ba90a2db63ab630f67cceb1ebd53deea5fed94109917adb53fdd48aa3f407 SHA512 779a35db0f603956c9ab7827f1d0a0b20d5dcab041aafca2055dfd413056de5e572c9996929ef9bf3c54b5f56e4a3a20f2eaaec306b5790252b46ebae30e74b6 AUX redis.initd-5 696 BLAKE2B 11b2a50a74c9aea57b01ee7be7d3e1d70ca21db994c35b6d386115eb4f9c329ad6f77b80ce46c17e026a440e532e976c3e1a1f7c550e9f50cc812ef557c5f8d9 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d +AUX redis.logrotate 105 BLAKE2B 1281fd86d399b40aaaa69d1fe170b2c49523c074e14b12907428b676b03d510b680363dd5041428d5fddecb91a510baf53dfa57df66d697ba4846f1e49ab59fe SHA512 9cbd27732c7f8270bf9b8563df0964af142d1ac4e97417e495fcb02e730e93fdfafac9370188a2fce040d55d6c3704e284a50b6300616a3f13a03a6e25c1ae49 AUX redis.service-2 253 BLAKE2B 0b78b45eaed3c7adbc68703968e1c843eeff785261cf7f4636df215d742c717d6fe95bb24e0aa947d64962ad20adacd48a4dd59b98eae479e7a33c1a0f2af7e1 SHA512 b42b73bb54ccc0d16adafb91aabe010092f548ec7979d8a0ed1c4563d9fca378eeb74c0c556f7565a32199ed30ca8a13d6b610d9cda39fd23da1428a410f62cc AUX redis.tmpfiles 61 BLAKE2B 1c3bf8aa105940c408163f61c63ed16b86de7a979cb5143d15700cac329970f351cb9b9377aa82e6f4dae377b00c1710a1e0f54334f007cfed64551f761034d4 SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 DIST redis-3.0.7.tar.gz 1375200 BLAKE2B 74088cb128e5d8e32427845b6bb267957b7df7ee091b1110260b26cc61649892bdb3ec79ae09fa4aca302c5708f26e3e05c6fb1e821ff468d982c274fa2792b4 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 @@ -19,6 +23,7 @@ DIST redis-3.2.5.tar.gz 1544040 BLAKE2B a67b46feacddcc7e4cafd91fb5d295a972f3a09d DIST redis-3.2.8.tar.gz 1547237 BLAKE2B fb03e263ad7b135dff38e018d9b830c4992cf331efc7c23c10b087c47e597abedb52f259d4dd9a9ee1d661685157fc29a2022d74bc21d406bb10c9b7dfab8b7e SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba DIST redis-4.0.1.tar.gz 1711660 BLAKE2B 0b8881baa78908df4adcc1aabfa0ea9554900f8b54d204ffa054752ba4355da2b56408501ede81a69cc1f34ebbb9fc984335738ea9f343ddcd4e9fb9a0d64c8e SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 +DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813 EBUILD redis-3.0.7-r1.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb EBUILD redis-3.0.7.ebuild 3312 BLAKE2B f7eb238c4cfb353330436453849d12ef8c1e0d083f7af2a7a7813cf5db478281499dc36757a3f1bad06e65cfc7decd604edeb087b02485e6922ddf30bc13e88f SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb EBUILD redis-3.2.5.ebuild 3578 BLAKE2B 140d00e2acb3c78d6f089689b911e77df1a0b4cac32dfac312040639fc1935a8a08fdf97be95fbbe83862de22ef43d08d137e58716db1523b57ac5d90122a64e SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021 @@ -27,4 +32,5 @@ EBUILD redis-3.2.8-r5.ebuild 3888 BLAKE2B 4c401fc170fa05deefe65bbc037187fc462134 EBUILD redis-4.0.1-r1.ebuild 3722 BLAKE2B 9f99ed17dbac2e4249e425293b769b87bbce62865e6cbfed53eba91578c14c1e97c636f460b3c2738162f89a771fb833bc3158db1f4ac41440b244ffd855b49c SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d EBUILD redis-4.0.1.ebuild 3507 BLAKE2B 4418b445f34274ae86edd3033552935fd8e740ab0c1029cdf9f43f2fcc7bf0e1fdaf0fa07d6504af4c4975af09fe2ea808ce0e515d8f5a4809cb84b664f6672c SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d EBUILD redis-4.0.2-r1.ebuild 3811 BLAKE2B 682e3b620d22745548e4a59e2cc98d1824f810ff599ee03aa6f3e875cd7e553f3d7396eb39794277f131ee42305676e44eda1154aaeb0a3a613efab80f93e8de SHA512 97a989279fa570cfae86f50c177cac18f78ab9bde12696e8e2b903ee9f80573ee4a017d4f8cf1fb90c5197badc10f995992e61999890e434fb8c5b7b50c2c010 +EBUILD redis-4.0.6.ebuild 4074 BLAKE2B 8c650824c8216e360014750cfe64d205dc02d33b6997b31f4e1a282836c670e97c2c4158818b226a98a3b0cb1954def0ac356c5f154e93e6d41356fb68ec6550 SHA512 f864f88c8ce91cfb73448e4427b82d7a76276dfad851004e9b13f96c395e369a101d878cfba65f277aae878885b58202d0b52c0d37a160419aa55904ad8cb7f7 MISC metadata.xml 632 BLAKE2B a81542eb7374b9e3ca2c963586f330ee2f5fa5ef39ebef21baadd9bcc65c1edd285485982ff87da6132960930faa1d9c6d7b0b49f9e6d02f273c71c8468d8612 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5 diff --git a/dev-db/redis/files/redis-sentinel-4.0.6-config.patch b/dev-db/redis/files/redis-sentinel-4.0.6-config.patch new file mode 100644 index 000000000000..f2a75814951c --- /dev/null +++ b/dev-db/redis/files/redis-sentinel-4.0.6-config.patch @@ -0,0 +1,9 @@ +diff --git a/sentinel.conf b/sentinel.conf +index 0e1b266..869a4b9 100644 +--- a/sentinel.conf ++++ b/sentinel.conf +@@ -194,3 +194,4 @@ sentinel failover-timeout mymaster 180000 + # + # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh + ++logfile "/var/log/redis/sentinel.log" diff --git a/dev-db/redis/files/redis-sentinel.confd b/dev-db/redis/files/redis-sentinel.confd new file mode 100644 index 000000000000..f465a5c3e91f --- /dev/null +++ b/dev-db/redis/files/redis-sentinel.confd @@ -0,0 +1,16 @@ +# Redis-sentinel user. +REDIS_SENTINEL_USER="redis" + +# Redis-sentinel group. +REDIS_SENTINEL_GROUP="redis" + +# Redis-sentinel configuration file. +REDIS_SENTINEL_CONF="/etc/sentinel.conf" + +# Redis-sentinel working directory. +REDIS_SENTINEL_DIR="/tmp" + +# Specify the network service that corresponds to the "bind" setting +# in your sentinel.conf. For example, if you bind to 127.0.0.1, this should +# be set to "net.lo" which provides the loopback interface. +rc_need="net.lo" diff --git a/dev-db/redis/files/redis-sentinel.initd b/dev-db/redis/files/redis-sentinel.initd new file mode 100644 index 000000000000..6a22d08db697 --- /dev/null +++ b/dev-db/redis/files/redis-sentinel.initd @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +: ${REDIS_SENTINEL_DIR:=/tmp} +: ${REDIS_SENTINEL_CONF:=/etc/sentinel.conf} +: ${REDIS_SENTINEL_USER:=redis} +: ${REDIS_SENTINEL_GROUP:=redis} +: ${REDIS_SENTINEL_TIMEOUT:=30} + +command="/usr/sbin/redis-sentinel" +command_args="${REDIS_SENTINEL_CONF}" +command_background="true" +command_user="${REDIS_SENTINEL_USER}:${REDIS_SENTINEL_GROUP}" +pidfile="/run/${RC_SVCNAME}.pid" +retry="${REDIS_SENTINEL_TIMEOUT}" +start_stop_daemon_args="--chdir \"${REDIS_SENTINEL_DIR}\"" + +depend() { + use localmount logger + after keepalived redis +} diff --git a/dev-db/redis/files/redis.logrotate b/dev-db/redis/files/redis.logrotate new file mode 100644 index 000000000000..2df390c2d1b4 --- /dev/null +++ b/dev-db/redis/files/redis.logrotate @@ -0,0 +1,6 @@ +/var/log/redis/redis.log /var/log/redis/sentinel.log { + compress + delaycompress + notifempty + missingok +} diff --git a/dev-db/redis/redis-4.0.6.ebuild b/dev-db/redis/redis-4.0.6.ebuild new file mode 100644 index 000000000000..92f1b4d63f31 --- /dev/null +++ b/dev-db/redis/redis-4.0.6.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic systemd toolchain-funcs user + +DESCRIPTION="A persistent caching system, key-value and data structures database" +HOMEPAGE="http://redis.io/" +SRC_URI="http://download.redis.io/releases/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="+jemalloc tcmalloc luajit test" +SLOT="0" + +# Redis does NOT build with Lua 5.2 or newer at this time. +# This should link correctly with both unslotted & slotted Lua, without +# changes. +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) + tcmalloc? ( dev-util/google-perftools ) + jemalloc? ( >=dev-libs/jemalloc-3.2 )" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + >=sys-devel/autoconf-2.63 + test? ( dev-lang/tcl:0= )" + +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +S="${WORKDIR}/${PN}-${PV/_/-}" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} + +src_prepare() { + eapply \ + "${FILESDIR}"/${PN}-3.2.3-config.patch \ + "${FILESDIR}"/${PN}-4.0.1-shared.patch \ + "${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \ + "${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch + eapply_user + + # 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 + has_version 'dev-lang/lua:5.1' \ + && LUAPKGCONFIG=lua5.1 \ + || LUAPKGCONFIG=lua + 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,${LUAPKGCONFIG},g" \ + configure.ac || die "Sed failed for configure.ac" + eautoreconf +} + +src_configure() { + econf \ + $(use_with 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() { + tc-export CC AR RANLIB + + local myconf="" + + if use tcmalloc; then + myconf="${myconf} USE_TCMALLOC=yes" + elif use jemalloc; then + myconf="${myconf} JEMALLOC_SHARED=yes" + else + myconf="${myconf} MALLOC=yes" + fi + + emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" +} + +src_install() { + insinto /etc/ + doins redis.conf sentinel.conf + use prefix || fowners redis:redis /etc/{redis,sentinel}.conf + fperms 0644 /etc/{redis,sentinel}.conf + + newconfd "${FILESDIR}/redis.confd-r1" redis + newinitd "${FILESDIR}/redis.initd-5" redis + + systemd_newunit "${FILESDIR}/redis.service-2" redis.service + systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf + + newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel + newinitd "${FILESDIR}/redis-sentinel.initd" 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 +} -- cgit v1.2.3