diff options
Diffstat (limited to 'dev-db')
37 files changed, 729 insertions, 74 deletions
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest index eb84f291fc88..d8c715780ba6 100644 --- a/dev-db/kyotocabinet/Manifest +++ b/dev-db/kyotocabinet/Manifest @@ -3,7 +3,7 @@ AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 SHA256 9a71b33b33e95 AUX kyotocabinet-1.2.76-flags.patch 894 SHA256 f1b1ab691b56c382464b83dcfd13a41cf6a694ce6ad74d3fef822a41002d7548 SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03 WHIRLPOOL ce032205dbb64987cb3cad63b6283811d85703e4901ce49795cd301fe0e74a08a73354af03b1398325812e80a4a227544f384f5d5b2e75a2865197cf865f6899 AUX kyotocabinet-1.2.76-gcc6.patch 289 SHA256 85e9d7e48c5819ad712194a25a7c7908f966bcd3de2db2f456cb1f4dce4410e7 SHA512 755fe06635309139d55d1ede2e5ec30e37867501ead68abd3218c59ea016b72c9aa4d7d4072e15b53d22755606949dfaafa7b283d33a821d280fe7791ee8ff10 WHIRLPOOL bdc4f5a23b8479a08482dc55460124bbbae3bafa98834c92e3399f093d4400966be01babf4138f375744c465d1bbe99fafebb94d714e1aff71d7d7ee2be007a1 DIST kyotocabinet-1.2.76.tar.gz 951930 SHA256 812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c SHA512 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a WHIRLPOOL db984a6dcef0e3f313e56e5398a0fe75d1014e02dce04c4837d0aa01c0e97eb04eac728f4e9b600acec22a098a1f19ba33d8abb2ee50a8a60ba64afcd6d9c873 -EBUILD kyotocabinet-1.2.76-r1.ebuild 1285 SHA256 0e19f78951c35f35db402b4a5cb5ab2e6f31a03ea39d34bc4e4be950ce3ada05 SHA512 a7fe18f52685252e4895e055a4988c52aa2e74823bc6b7746801de46567ef300e37780d54ef80694a673489817a5551c09e1027d05af1cd34e7074e0a8613c2e WHIRLPOOL 9f2104301f95c1248560022b66140651cccbba938adff8108c7f201857402c8c2f436a56b8a9698db0506fb7999a6b613d2363406a5aa689390688f0922e15a9 +EBUILD kyotocabinet-1.2.76-r1.ebuild 1291 SHA256 5d30ac7ace69cd983cb52b8336f818525ac4154fd407e4e5caf601ae9c0fae6f SHA512 1b56fd8c64a5263e888b5ff69b000cfa6ae849fa6c2d5b3f3cbbc1c876f8721b1f5579e3661203b8e942af7647534f8b4c75d0d77be5b3672f2b12f56ff0cef3 WHIRLPOOL 8a9f38c4299028f03d8fbfe070d97916f888852cb0e65637db9f93d142d0c4ae02acb32cf314b85e2cdca3df3508fb38a3ece60bd6dcf800219d2962de9de48c MISC ChangeLog 2906 SHA256 8ddde6926b42e78e07b1edb549622e7867ddd79fdd135268a3e756770262578e SHA512 409116d7d7ce681e048db6114f1aec47e6460c9ffd4abca0b00cf683f9bf936eb2528b9e4d7eda63fb07bbb66b8abc7ff7da362652416fe2f3801d00b77ac5d9 WHIRLPOOL 909c336b50df6ec364e5c20ed4d23047599354d76839ab8fe855b40d613bf1d7de1cd575aac6e0e76a9721c68319d44a8b831f99633e27e7fd00b61b718095d1 MISC ChangeLog-2015 5230 SHA256 15d8574833ef6bc862bb417b75fa23785587e156bbf1692671323cbf4faaf019 SHA512 d10f964f1484345b400e408cfe1a4b86b1bd1132f42d55eb88b2bcc02cb192613f77280ad033cc7d797a883a2caec1d7f028d6e494d448530125d07a4cf809e6 WHIRLPOOL 1024586afb88d8f88b2d6eb0bb33d854e07ffb78746ff8b40a3829cca1891273f872190d03ea22a72a08fbaea9352f6b1298ad86e6106df28118a6f8f99ad644 MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild index 4b7d4de72a8f..e17656c63b05 100644 --- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild +++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" IUSE="debug doc examples static-libs" DEPEND="sys-libs/zlib[static-libs?] diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index 0b88f7cf56f4..7362305d66fe 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -16,10 +16,10 @@ DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 23f5becec389fc49e7cf0d52c DIST mysql-extras-20170316-1355Z.tar.bz2 308933 SHA256 ebcb4f03413ccf42877558ad365db01bbb5ef2e12620a9be479ffc2514d9830e SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c WHIRLPOOL 701871ff554970adef8e5eb1e2e966a09c4b59ac7931df125f78a4fcfa415e87767184a9d3418013d27410ad0482673942f1df48d5e5de68917f49e1efa96689 DIST mysql-extras-20170830-1210Z.tar.bz2 312079 SHA256 eda0090fb448e22a004e334956278a887843a3b2bf3ed523b80dd4691d4729d4 SHA512 55553de3bb93b09c29ff411c135ff2762edad3498d9e8fb844df349ce8ab864969668f2bbc3ba99e2217cc20f1c9155443794c301ca064d09a1b45ddead567c8 WHIRLPOOL 961073913064ad3f4decf4221bd9f87fd8bd6349c3e13c1c799e5622b9f2353a2981d2577c5a00c026ac006c03a1c609f4527c2d9027610214d2e79bc5be0669 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 SHA256 e2ecfa43d70d9796cfd60dc2448b8e76e4e35ccbbe12b6a4becc8f854e172c12 SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 WHIRLPOOL cae69f01090231bd25a48002e8682b70894d0b4e3ae43083fb062db159a44d4b085edb46f92ed0452d98fccbec7fc0fd1f97eff9fd16b810fc22e845e8923b50 -EBUILD mariadb-10.0.30.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062 -EBUILD mariadb-10.0.32.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2 -EBUILD mariadb-10.1.24.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21 -EBUILD mariadb-10.1.26.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156 +EBUILD mariadb-10.0.30-r1.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062 +EBUILD mariadb-10.0.32-r1.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2 +EBUILD mariadb-10.1.24-r1.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21 +EBUILD mariadb-10.1.26-r1.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156 EBUILD mariadb-10.1.28.ebuild 7320 SHA256 b45d0316aed437a96b46648109783fd9a8d3252d92acadf89e8a763843327e49 SHA512 4868269e57a2951e6f51dafb51fea044902e390aedaf2d1229b85c61fda12f39cf0b01935dcd4ae111b5323b647c9f639cc4fbfe03d20f50b56085babcb275e9 WHIRLPOOL cbaf38b55fcc2d3f2b0ba00fbde07b513077952b33d3679f99a1b48eb5e15638f274753bc1b536570350890d0faa5ccaa3e45934984699d95c3c9fb8fb56f45f EBUILD mariadb-10.2.9.ebuild 33584 SHA256 2493e44d407da15ee064afb0dae082980514d5b8754a4f0cf9cf544a8f435724 SHA512 308a9089edb55264e290aed7fade8ba2e4c9bdb6c83204dbbbfdf3f0b205a64a82874079134d48de958b0755f92d3fc9a1a2e73fefd105c58862c4ca1a327e9b WHIRLPOOL 03a803a33eb343bfef919e4cc5b8aacba74b32ecad01d12dbecbddd71ce26a4a0862d1f539e735bdd91064f3476aca4128bd47852aeee7332b92587766fc72c3 EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f diff --git a/dev-db/mariadb/mariadb-10.0.30.ebuild b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild index a0218bb32389..a0218bb32389 100644 --- a/dev-db/mariadb/mariadb-10.0.30.ebuild +++ b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild diff --git a/dev-db/mariadb/mariadb-10.0.32.ebuild b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild index e02c2cfe240c..e02c2cfe240c 100644 --- a/dev-db/mariadb/mariadb-10.0.32.ebuild +++ b/dev-db/mariadb/mariadb-10.0.32-r1.ebuild diff --git a/dev-db/mariadb/mariadb-10.1.24.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild index 12dfcd871287..12dfcd871287 100644 --- a/dev-db/mariadb/mariadb-10.1.24.ebuild +++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild diff --git a/dev-db/mariadb/mariadb-10.1.26.ebuild b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild index c40f1daf24c5..c40f1daf24c5 100644 --- a/dev-db/mariadb/mariadb-10.1.26.ebuild +++ b/dev-db/mariadb/mariadb-10.1.26-r1.ebuild diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest index 2efcf3f1785b..759a5b3d256c 100644 --- a/dev-db/mydumper/Manifest +++ b/dev-db/mydumper/Manifest @@ -1,8 +1,8 @@ -AUX mydumper-mariadb-include-fix.patch 696 SHA256 b7c2998f31453360d1891e10856210e98672055ecf81b9133eda22564c90af53 SHA512 e4343f00f0f61d63ec8621d42537411158a995e624562f71d322357a7322b46aef8859252e8b8c5c51370247ff70d2cb5187ff33be56e964e54a2e392124fc7c WHIRLPOOL edca806761d639eee3f671dd400ff3d60b5ec66b46b998e7ae771cd21b3eca5bec46aa586505c7062bc8ff2aa8e4fc3ecf0e23fb4b2478878fb82c7944183457 +AUX mydumper-mariadb-define.patch 766 SHA256 3a8df19403d426fe4a42747cea0c165971933037e2861f0b18ce310ad4359e14 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53 WHIRLPOOL 8b899b5e9c8def712ee08b9b0b31620fef49f5d6b1150092d0d380fe458068ed917b7556cb730c5411817ae6d4d2e2332d6985905147c71a429e688a673d52aa DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330 SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83 WHIRLPOOL 867b7efa6ca00dcfbb32f5dda2b63de038d0da3ac1a127059cbfdae9af577fef74868c38dad2bd5b5a9b4de76f7d108fcb6232b27c41d3062f413eac4cac843b DIST mydumper-0.9.3.tar.gz 45320 SHA256 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 WHIRLPOOL 09988aa314ede6e56ce82c6eade9d29770ca2cbc39d4b2f1cd3f8403f9521e1aa5a372fda7992885c1c25743cc59d4c41cdce8d86eb79b8c7725631c2919c9ae EBUILD mydumper-0.6.2.ebuild 949 SHA256 d5de40f9acb0ff0b489b81a763e494d4d3831f7798bde1aa1492d4ed38c9aba2 SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818 WHIRLPOOL 5886604cbeb5eb0a11aa33365fb00cfecbcd79d60db8f39f72dc816c4f4271a42bf06481057a5f6845c710a20e529ad827e6b07a362fa8fab1f31e195a617d8c -EBUILD mydumper-0.9.3.ebuild 1030 SHA256 452452ce20ac7136f8b77d7310197dd728dc2a9432757d4bbffdf92167deaa40 SHA512 9d0514b4d1690855c8e828ee29e767410ab19f6726f10eb381c9bed0a0c42e63fa7eed88fc278e532d951f49652d0675d839e3d14c650eb352831cd5f7eacccf WHIRLPOOL 60584b90fec8bc5bc1c3c28eaa6767862923410f17612d7ca7c2e6f9e36c8b7bef090b79ce6650bd18e4db891b23aab2bb050d21286ebdbce5331f1cc6cdeea8 +EBUILD mydumper-0.9.3-r1.ebuild 1025 SHA256 6f234c291bafd0e79feb96f217915479ed8d84e04efec0556a363d1238114306 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a WHIRLPOOL 392642348de86a4ce5a996b2b25a0fb4268531e15c89350be0dd1766454b81bb74450db850f40d1e8a6a4f8262d3f4de29e4753fab13eed95b227d67374025cf MISC ChangeLog 2725 SHA256 d1ecaf2b0c71e99c461f83588d14e73b773277a4aecf10aeda571f84b4a342f8 SHA512 c9eb636071b042ccae43a5b8af330dfed81f2547467931146ad66a360fae0c058abcab3d9a18451d8e5d323c92fe5c8db1e4325b7b76c54477df94cf290a91c6 WHIRLPOOL ef094c02e8427ec6fcaf2e10b6e10e6dd8eb2045b69831de35711398607e28eaaf5b5c0ac76af0d6040602201c799208901f8c24bb75356614f6d2fbb00d7a41 MISC ChangeLog-2015 1534 SHA256 c65362f5aafb0d2cafc22db7177e28dce95edd3f8bf5d38711440872c3e72c0e SHA512 e269d766dbba9ce8913397f4321d30545bb06e58042619eed88d2de19d69c9f21ec1a0146cc10e9226e6b6394d5b37469754ae1d27cf33a4ddf93a15f1d6ff9b WHIRLPOOL 6640ffed60e7253d2373db39d26c6459803387b55ffa10483d8ce0c69fbb697630e5e33f77904bb5c7e6b8c8c02b317ecf8541d3c958612792e8ed14979a88f3 MISC metadata.xml 448 SHA256 f67c25fe06defd93c231d0c47d8c25dc1b9e9209f3ce8ab50e2b5b3c5da8e9a8 SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353 WHIRLPOOL bf616b518dbc668cbc7d3bc41955253dcca574778a96268bfc8474995b7e658e282fea428940c1e465b7d31d2c9444d7bd3f027febbc13b91b208e8c1b5b51b2 diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch new file mode 100644 index 000000000000..ee39a33be818 --- /dev/null +++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch @@ -0,0 +1,28 @@ +--- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/mydumper.c 2017-10-25 14:53:46.614729185 +0000 +@@ -22,6 +22,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> +--- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 ++++ b/myloader.c 2017-10-25 14:55:34.677729185 +0000 +@@ -19,6 +19,11 @@ + #define _FILE_OFFSET_BITS 64 + + #include <mysql.h> ++ ++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION ++ #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR ++#endif ++ + #include <unistd.h> + #include <stdio.h> + #include <string.h> diff --git a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch deleted file mode 100644 index 0914b3acff6a..000000000000 --- a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/mydumper.c 2017-10-06 17:39:34.962315949 +0000 -@@ -22,6 +22,9 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID) -+ #include <server/mysql_version.h> -+#endif - #include <unistd.h> - #include <stdio.h> - #include <string.h> ---- a/myloader.c 2017-09-07 14:53:02.000000000 +0000 -+++ b/myloader.c 2017-10-06 17:39:28.962315949 +0000 -@@ -19,6 +19,9 @@ - #define _FILE_OFFSET_BITS 64 - - #include <mysql.h> -+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID) -+ #include <server/mysql_version.h> -+#endif - #include <unistd.h> - #include <stdio.h> - #include <string.h> diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild index b4970ec03bf0..f95deef1be62 100644 --- a/dev-db/mydumper/mydumper-0.9.3.ebuild +++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild @@ -23,7 +23,7 @@ DEPEND="${CDEPEND} doc? ( dev-python/sphinx )" RDEPEND="${CDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-mariadb-include-fix.patch" ) +PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" ) src_prepare() { # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!) diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index ef8b0a91ba08..8f548a7da0db 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -1,17 +1,18 @@ AUX mysql++-2.3.2-gcc-4.3.patch 358 SHA256 0251cb84e6a768f2a2a4a280f1aa8988b314770993aceeb204c5d6a7afbb11d1 SHA512 09ef458ea4e85e251bca585fec84b53c5b7937d06b9843ddb7d12fef9250c042a46738f6fa27866e171f0107de48df9b5b22416c0eeb86eebdff583438404a51 WHIRLPOOL ad72c308896c4c2ef1ce54806aa961eb7314847fb45a0ef9af7778ed3cfe11e6e7981dea850aede25f06b800c8a4f663148f2e6ea8df91d8c28b3d840f32a933 AUX mysql++-3.0-gcc-as-needed.patch 7699 SHA256 863c19fccc1136a075f1e86389221f766f28f6a42c9f94f8a6db490ad35e796a SHA512 937cceaa198a42a69fbaad2019de4f825f60cbf2443cb07f85b9fa0555711f7639f47b7aa2442d68b4d6e8c40a99c78a930e76ae26e28900f885d35a7e7679c6 WHIRLPOOL e40d16c9f0763c38760ddab22fd3cdb2d6372579de35b246a47ff3e9ffdf69e9010d3e8ced394e7a8d4eb94fa051e90b9b2417fb9c2578f3108e3960a5b6c319 -AUX mysql++-3.2.1-gold.patch 273 SHA256 ffe1cff166f129ef45f2c4e6f2491e4b9e821ed36df57814831172dc652feeae SHA512 c494c0118c29dbe488621d6da101bbf0dccc9b4d0407189c50ec8d204a0aa5865e78557812553bf636213ea39c86522715fc627c82954593b0f4388f9f24beb6 WHIRLPOOL 5e6e7f372df8da74b270ab08e5d13c5043138c6f87e89e830221a22a00c7743734faeda0eb60d9d3d612385fc4225ea47d535c4d895a6405c18015d33bfb55e8 -AUX mysql++-3.2.3-mariadb-10.2.patch 922 SHA256 18e407dcd9004a8b7c1c238659d0cdd494220a58d5cbbebec278daf41a6cf7f8 SHA512 a346b01095fd61baf73f6a9f93c7ddedc872d79780173adab45faae0c5134cffb5b6cbd8d379fb4f8c670007b961e8dfe0562cfe802cfa8b3a6b86f8d9c0b874 WHIRLPOOL 6f7a7d13ddb9c4fe1df1a218c343fe09442fb70ab881e1b2ef7e554d73dc56aa8d5d2814c382ca25e45e62becfca9537866dcf5f98e36030795e5a1021945c39 +AUX mysql++-3.2.1-gold.patch 196 SHA256 12e44bd91f9470688cb0e0ccfe1823122e5c109c6f08cebf2f077fcd758732eb SHA512 34cd99548f5f23371fd02074017329ec4814c59ab02b114a6fd4c811d30015e1e3192a8d5d6a6847f57a076dd606d44e74d69dae6f5581d5b8d252ea359ce658 WHIRLPOOL 517b75010c912b2886af4b4838820ccafcc1dc20ffdac4483812f39ba4f6486ddea39117ca60a936cfcf41166307a7e1fcf56b9f359ce964654c77d0295466fc +AUX mysql++-3.2.3-as-needed.patch 19502 SHA256 4f88b8a810b0ecf0b172e7791c9590fb2b5a91097064c6a7e42d79c1c0b126c3 SHA512 7b8674d6e1b3ce462e01f2f2d32782c83cdd56ec6288855ea5ff419afc8b139530e1ae4dc104475786856cda4834b11cec3342b8d0447d14f1ae3e77a61580c9 WHIRLPOOL 22c670fef6b425a192df6b7bc61af625623ec5937e86d84940c472d0f148898dd13181675ddb3eab012bf6b6ee8271719d0076fa1884a333e8b6b5e3de4db951 +AUX mysql++-3.2.3-mariadb-10.2.patch 630 SHA256 264bdaa49253ba0d1be78e5755fff41693e9ef8bdc0feb1d1bbd56d5bf531c58 SHA512 550e5adbdaf04dd6460aeafd0e6cad6cd29124c85f4222216574cc41c7df8559b33ce3eda484eba620a7b97c16bc63e56e744770feccf92348ff066173ad8297 WHIRLPOOL d366d427600e3ab6af54ad5f22908862285128f3c0ed2d23e42d65273f2cd68afdb730d6e94ff8023d3f025e52a3205ac222c0b8c741b075cc802d90919dc4ac DIST mysql++-2.3.2.tar.gz 1627115 SHA256 3544b964964bc8981118119e82e4883dc9d1de8a72861a19e6687719ed3efce9 SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7 WHIRLPOOL 2bfc961193baad0053ff9909075db9f5ccfc7c00334483842bc25a94044a1331392f3dc0283bf5f33e69f67c20505bf5b12a01635a0f92716a0c341af5fe637e DIST mysql++-3.1.0.tar.gz 1944101 SHA256 256c39a583e7d60947916851754c626312428e9b1d8af3309e34d64ff8404e92 SHA512 bb57bbf03c80edabff701132877f407ecfa1b76958d7655415c59ec939e80fbe250951a16c3d5ea6988dd2c778b623605cb65bf810501f392be2f6b6ad07ad90 WHIRLPOOL 0b5274e0fbc1b2cb40ade9699ddc46d5837e66f3a506502f4dae5f5de4689ac2ccf3989a674db073a36075c541046b174e80bbac3d7df393bd61ef3bfc99fd32 DIST mysql++-3.2.1.tar.gz 2256735 SHA256 aee521873d4dbb816d15f22ee93b6aced789ce4e3ca59f7c114a79cb72f75d20 SHA512 936021dcf8568d3ee0c935e5c552acc6fd2b57849d1cc60e68b45b690d798d7bfbc1dedc04e21417d1b4c27017b471e4f6cb70de7f1904949b9222090a777de9 WHIRLPOOL 56579d4a1afb5985dc8487d211ea7e5aedfe7acfbcd6130b28b07364e66d6b0142831296a6c6ce2f4de78f45e94572c1ef289db41ee504b05d04f3623d48b2aa DIST mysql++-3.2.2.tar.gz 3257359 SHA256 55667bee79a5981b1a04e57e3a4fd8b03bf330e4e3371b023c2bf5ba0f50ed17 SHA512 eb4250394027f1baafa660711d8221c9eb3a70ff2a37331c58807a97a67b84f792290b24830e851b2421f6ccf2867e9f3597af3af41530256c44521a4c4a55b1 WHIRLPOOL c344e77edf8fb5d09fc82c716441ecc53b00b97076d696c52072c79b0c754b7852959c4adac02240cf37ca9159a8f8174a086d43f7cd36388a2c26f2bec38a12 DIST mysql++-3.2.3.tar.gz 3241023 SHA256 c804c38fe229caab62a48a6d0a5cb279460da319562f41a16ad2f0a0f55b6941 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a WHIRLPOOL ea45deaa9a1c7c94e7790117b5f964d7af2e4b85be90dff444eeac4023295d2c076f1f6e8539182b502200c818b50f08543e0e9c7aa7cd9038b1084e1af64ce3 -EBUILD mysql++-2.3.2.ebuild 1317 SHA256 7ecb90a2e47e9bb9b608439059184e32194e922469d7194ad47651012c190a77 SHA512 1997f7bde76e53456ef0191859ac04391fd9a32a40cb07766a0876f1e4810bd29d8b480e0ba8474dc52ec4680c748448ae798f04e67e5dbfb21701c93b475f3c WHIRLPOOL f421f81daeebd32f1cb451a7bf630f111744a27fb5ec1041d4b6fd57897b102cd210b1c5c13a37646e691fd7d558c14c779653cf57e76cae5ae0c441d150af72 -EBUILD mysql++-3.1.0.ebuild 1238 SHA256 a58b2ab1ede7d02d392168f9d46edc78464dab6663e3cfe2bddadd88d2d061fc SHA512 0915d6f160bb38a02d6bdf7bffc7fc912361db8ccc85c7f3c4c425ff5528b92b38d933f9945fe41f5bd457cc991cd848bf85a96360b82de5a0362391aa8d4fce WHIRLPOOL 885478bfe103b7a701a130dffbfaf57697b5df2b1f7125558e50c04c3a9ecb5e1298f7d3e5fc22fec736759815e44a0eed36b5ce331f6cfb0be43a61b74a4896 -EBUILD mysql++-3.2.1.ebuild 901 SHA256 98f3c2f297749af5ec27cbeb828ea27d2de5a85966fc75b3e3ac9a64ed7ed14d SHA512 136c1c7776514af3013eef5093b5c7a078297ecdd5e08394e02d0554458cc5e234576bfc63e020e6e668a0da179bc1846cd10981793f7b93f00b047eff63fd7e WHIRLPOOL 4cf537d22c8e6cf66810c4b1136452c97cb5d5e6683a642bd42cc4414cc9f7af97772575427d49d03032e55ebec53872f8a5337bebbe2cf957e6699300cb08c9 -EBUILD mysql++-3.2.2.ebuild 853 SHA256 a60801a6ff0712a0f4bdfa52e4f120406db77d625dd62aebde63245f9abd38ef SHA512 ef929d98d318f118fdaeba972dc43b755809563d49537fdb97d23f324dfa63788bf03a22d8c89eafbdeb04c971c6cb8efd58f915d0008cba9094df71494b7254 WHIRLPOOL c85a521d4808affc840eceee6a5775e0af60a23e2264ccd3d1430b83ebfc2d406b63d2075fc34a0590feead9f609c99022fd804bfeb2ba97de489557fce6d415 -EBUILD mysql++-3.2.3.ebuild 1526 SHA256 8de48c5a26bb31516643cfbeb11dbf8c351807064cff3ea4c3d88cc1d530abca SHA512 e2d81dae3b02f03d684d0c66d48e998ab869d77f32168ae886b270fa19c520a6ca5bab09dd7d1427e688df0c574a7cef60dcd6e0117b7a16e17807bd9914dc33 WHIRLPOOL 3196d58d17147bd373973b6ddaccc8208232f6436f7199f65b56a97410bcad7dd5d7c722e6655a5a725f62c5bcca5a0cd9fb08ba2538afc31df5e690e2332f11 +EBUILD mysql++-2.3.2.ebuild 1317 SHA256 42f033874ac812861991722c325050e26b4b1fffd955a370da75eb5650f720b4 SHA512 353023121c04882aad8a0c674ade803111e6922bfb9974d91b65179af23a264d5767404ef2eb77e50a685c89d55509196e21a8c397d98d072ab797458d2a81df WHIRLPOOL b546726ff030c1df8c575682e78550a87623ac4e16ba8a79f707b76d4545618c9a05f711349ecbc282ac4b9434ce2c6778d8b5e76d717c44db558c26de472553 +EBUILD mysql++-3.1.0.ebuild 1238 SHA256 27e8f49720f316ee58622c68d01ef66b1d26202b135a272aba4337fef32c4cc9 SHA512 cbd918e3719d0ddb12da283c9f555cea25737ba38ba0e42912e9f8eb134ddafba3f4e0ff13665d3b9336a039f3ff43adbdb969e4a0a3953283d652836de1d3b1 WHIRLPOOL 6e41acced36016e8b900d7901c4e7ac0165156f26ac45c8c31b3e227293fd431f37a066abf0e024f886e6e9a7a13a1b2adc8f8b18077a166cf623553e31d4f92 +EBUILD mysql++-3.2.1.ebuild 901 SHA256 67ba3f870ba8a37e56af609633964dca2785b1f633fa2b697b46b7197f98a894 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31 WHIRLPOOL ecddc1b71e656efa9a52d3dc6e1a8b9997c0b950b506a11ed7acb7e02ab91ee3ada4d5e42d049b5427cde1aff10cf5ecfff8177218fb741df8157288848fc2d6 +EBUILD mysql++-3.2.2.ebuild 853 SHA256 0a4b12087a9dd4a5ded9e50fc9abc8af8ac9a5a78d5d2222e9a49f7bcf9f7cfb SHA512 f617976eaef20a31071983c10ea89ecff0f8cd440c0a040f6b419fd2e109229d0db4bff08dbbdc01ff17937a7ab46f17560b3c81cf18226d08a3739c92ca475d WHIRLPOOL 578c2d41e9a1c4f9074c7787eb04e624316506eb69d2410379d7cc35f918ee5218844b85d944e3b0878c7ba7dd7f07770d36246a1665689565be59777525300e +EBUILD mysql++-3.2.3.ebuild 1565 SHA256 19f5ec147522c574693ea34651b36b01132056d3a028fc379571271bce8cbaaa SHA512 98660ccefd411d7aa549d05264438be54f0bfdd101c4d85f46a5eea431b9efd4d9ec3385842e5342e8c993a69c12b13a7e655d046d62defa397f9244c9b7634b WHIRLPOOL 430118b61a4c95106518a1e18243fac941decee2d9d3d09be85b0ecf61d6dfa40a102a39cd6417b5e502b247c926e26ab644b75a620b40c7dc26bee15cf8ec11 MISC ChangeLog 2797 SHA256 cfd626e589d5df15494c538d2c8511645be1d89788e63fcfb2e6de55ba424c8b SHA512 fe65c61a75373bf13b88c7db3b597ebe12324ca5730aebf0e6bfa376cd560e49f7c1e76d490f0ab7142fd4ac61c3fe0d83dfc0e908240b46291762df44122ab4 WHIRLPOOL 0e83632797437426fb0954af96973d98c7e4a84938758723b3d9587a18c82811a9eba181f5e64cb11722ec02849a0d07283cc03564344bfaba81a3a882fa5d24 MISC ChangeLog-2015 11700 SHA256 69f7c9e777997bc91e9b69a228017c1259fc1f83aee0b017c22f1a223e352c7f SHA512 511705ac466c3d4cf7f5a26adf8745efc4daaa846e1dc58b78cb23aba5ec4eea7848cd565d2521a68400f197d447535002170619e935342750cfe7b3cf04e853 WHIRLPOOL 3377de4dbae18f26d9c0181ef6e338c129efa232f9431b2a85d43b8e2f9b8c8ebe2061b9b1dfe14b1c12926e50555025d6eee473af167c44e8df4bd255e900c3 MISC metadata.xml 239 SHA256 a35e1476a1677a91f06dd6e4f955fcebc58c3a07f934b5e62fbf801573a5c82b SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b WHIRLPOOL 3ed1945907fa58cbc9997c311d1d0431d481586576ce45b4bc5caf7704ddefe2117305879a97e8021694b86af0d570a34517212b6cc9528224b85e568eee3d75 diff --git a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch index 0f6bb7eb1f79..8e10752b7f0e 100644 --- a/dev-db/mysql++/files/mysql++-3.2.1-gold.patch +++ b/dev-db/mysql++/files/mysql++-3.2.1-gold.patch @@ -1,5 +1,5 @@ ---- a/Makefile.in.orig 2013-09-27 09:51:48.646667442 -0400 -+++ b/Makefile.in 2013-09-27 09:52:22.026603184 -0400 +--- a/Makefile.in ++++ b/Makefile.in @@ -36,7 +36,7 @@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ diff --git a/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch b/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch new file mode 100644 index 000000000000..f4172076eec0 --- /dev/null +++ b/dev-db/mysql++/files/mysql++-3.2.3-as-needed.patch @@ -0,0 +1,254 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -529,87 +529,87 @@ + $(RANLIB) $@ + + ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) +- $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqlsxlat___mac_setfilecmd) + + test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_array_index___mac_setfilecmd) + + test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_cpool___mac_setfilecmd) + + test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_datetime___mac_setfilecmd) + + test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_inttypes___mac_setfilecmd) + + test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_insertpolicy___mac_setfilecmd) + + test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_MANIP_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_manip___mac_setfilecmd) + + test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_null_comparison___mac_setfilecmd) + + test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_query_copy___mac_setfilecmd) + + test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_qssqls___mac_setfilecmd) + + test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_qstream___mac_setfilecmd) + + test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_sqlstream___mac_setfilecmd) + + test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) +- $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_ssqls2___mac_setfilecmd) + + test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_STRING_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_string___mac_setfilecmd) + + test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_TCP_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_tcp___mac_setfilecmd) + + test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_UDS_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_uds___mac_setfilecmd) + + test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TEST_WNP_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__test_wnp___mac_setfilecmd) + +@@ -619,122 +619,122 @@ + $(RANLIB) $@ + + cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(CGI_JPEG_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__cgi_jpeg___mac_setfilecmd) + + cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(CPOOL_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__cpool___mac_setfilecmd) + + dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(DBINFO_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__dbinfo___mac_setfilecmd) + + deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(DEADLOCK_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__deadlock___mac_setfilecmd) + + fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(FIELDINF_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__fieldinf___mac_setfilecmd) + + for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(FOR_EACH_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__for_each___mac_setfilecmd) + + load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__load_jpeg___mac_setfilecmd) + + multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(MULTIQUERY_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__multiquery___mac_setfilecmd) + + resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(RESETDB_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__resetdb___mac_setfilecmd) + + simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SIMPLE1_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__simple1___mac_setfilecmd) + + simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SIMPLE2_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__simple2___mac_setfilecmd) + + simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SIMPLE3_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__simple3___mac_setfilecmd) + + ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS1_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls1___mac_setfilecmd) + + ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS2_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls2___mac_setfilecmd) + + ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS3_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls3___mac_setfilecmd) + + ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS4_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls4___mac_setfilecmd) + + ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS5_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls5___mac_setfilecmd) + + ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(SSQLS6_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__ssqls6___mac_setfilecmd) + + store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(STORE_IF_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__store_if___mac_setfilecmd) + + tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TQUERY1_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__tquery1___mac_setfilecmd) + + tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TQUERY2_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__tquery2___mac_setfilecmd) + + tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TQUERY3_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__tquery3___mac_setfilecmd) + + tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TQUERY4_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__tquery4___mac_setfilecmd) + + transaction$(EXEEXT): $(TRANSACTION_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) +- $(CXX) -o $@ $(TRANSACTION_OBJECTS) -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS) -lmysqlpp_excommon -lmysqlpp $(LIBS) ++ $(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ + + $(__transaction___mac_setfilecmd) + diff --git a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch index f461daac2a43..ff814650e001 100644 --- a/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch +++ b/dev-db/mysql++/files/mysql++-3.2.3-mariadb-10.2.patch @@ -1,6 +1,5 @@ -diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp ---- mysql++-3.2.2-ORIG/lib/dbdriver.cpp 2017-07-14 14:56:06.206629443 +0200 -+++ mysql++-3.2.2/lib/dbdriver.cpp 2017-07-14 15:28:34.690826959 +0200 +--- a/lib/dbdriver.cpp ++++ b/lib/dbdriver.cpp @@ -257,7 +257,11 @@ } @@ -13,9 +12,8 @@ diff -Naur mysql++-3.2.2-ORIG/lib/dbdriver.cpp mysql++-3.2.2/lib/dbdriver.cpp #if MYSQL_VERSION_ID > 40000 // highest flag value varies by version (o <= CLIENT_MULTI_RESULTS) #else -diff -aurN a/lib/common.h b/lib/common.h ---- a/lib/common.h 2016-12-30 18:44:44.000000000 -0500 -+++ b/lib/common.h 2017-09-01 09:12:12.270089396 -0400 +--- a/lib/common.h ++++ b/lib/common.h @@ -130,12 +130,6 @@ #define MYSQLPP_PATH_SEPARATOR '/' #endif diff --git a/dev-db/mysql++/mysql++-2.3.2.ebuild b/dev-db/mysql++/mysql++-2.3.2.ebuild index d6bdd7a79dcb..7167c329599b 100644 --- a/dev-db/mysql++/mysql++-2.3.2.ebuild +++ b/dev-db/mysql++/mysql++-2.3.2.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 @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" -SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" +SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" diff --git a/dev-db/mysql++/mysql++-3.1.0.ebuild b/dev-db/mysql++/mysql++-3.1.0.ebuild index 3a2f4e8e8d4d..b945531b392b 100644 --- a/dev-db/mysql++/mysql++-3.1.0.ebuild +++ b/dev-db/mysql++/mysql++-3.1.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" @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" -SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" +SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/3" diff --git a/dev-db/mysql++/mysql++-3.2.1.ebuild b/dev-db/mysql++/mysql++-3.2.1.ebuild index 35ff9881cab9..1ea7dc61f868 100644 --- a/dev-db/mysql++/mysql++-3.2.1.ebuild +++ b/dev-db/mysql++/mysql++-3.2.1.ebuild @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" -SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" +SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/3" diff --git a/dev-db/mysql++/mysql++-3.2.2.ebuild b/dev-db/mysql++/mysql++-3.2.2.ebuild index c84fd8d97a30..a7f6809512a8 100644 --- a/dev-db/mysql++/mysql++-3.2.2.ebuild +++ b/dev-db/mysql++/mysql++-3.2.2.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" @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" -SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" +SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/3" diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild index 7491c26b1fbc..83594c55eda5 100644 --- a/dev-db/mysql++/mysql++-3.2.3.ebuild +++ b/dev-db/mysql++/mysql++-3.2.3.ebuild @@ -7,7 +7,7 @@ inherit autotools libtool flag-o-matic DESCRIPTION="C++ API interface to the MySQL database" HOMEPAGE="http://tangentsoft.net/mysql++/" -SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz" +SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/3" @@ -17,15 +17,20 @@ IUSE="doc" RDEPEND="virtual/libmysqlclient:=" DEPEND="${RDEPEND}" DOCS=( CREDITS.txt HACKERS.txt Wishlist doc/ssqls-pretty ) +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-gold.patch + "${FILESDIR}"/${PN}-3.2.3-mariadb-10.2.patch + "${FILESDIR}"/${PN}-3.2.3-as-needed.patch +) src_prepare() { # Bug filed upstream about deprecated std::auto_ptr append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations) # Bad symlink for libtool in the archive rm "${S}/ltmain.sh" || die - eapply "${FILESDIR}/${PN}-3.2.1-gold.patch" - eapply "${FILESDIR}/${PN}-3.2.3-mariadb-10.2.patch" - eapply_user + + default + _elibtoolize --auto-ltdl --install --copy --force elibtoolize # Current MySQL libraries are always with threads and slowly being removed diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest index cf63276dfc0f..3c36194a10ab 100644 --- a/dev-db/mysql-cluster/Manifest +++ b/dev-db/mysql-cluster/Manifest @@ -3,8 +3,8 @@ AUX my.cnf-5.6 4504 SHA256 d6bfb754105464643f8f2efa14337c2f78a6a6e7e812e998b2ebc DIST mysql-cluster-gpl-7.2.22.tar.gz 26075142 SHA256 404b80192c488791cedf6251e64bb01310b20f13fcdb28721e108e92985ae999 SHA512 b3370725f17a5b6577c9822097b6c39e4375bdabca2a403bd45dfeb9fd5920c0e213c894eed33dadba69d9c066427ab5065c587869d82bf2e3438d3bdeb1aa8e WHIRLPOOL 1275fc2a181011c5ea2ac392c94027f399a5ce4fd499ff23790bfad142b1c7d67bc421e7c6a4e64e6bb409f04016196417535d5704d21165c1120bf46ab68544 DIST mysql-cluster-gpl-7.3.11.tar.gz 42806929 SHA256 6c8cfc99ccbf47cd4304996559de6fb330e9cdf754bec37ff7347be72e50c646 SHA512 89e5b6e845b71ed6945529b7f515d3af96ec6daf79c0085f1d0ea6e4426f61eb3626b688e5edda668be4615df1b8cec4e71acdf0d21150fa2775c79ea09563e5 WHIRLPOOL f03d3b62da793becd6aab775293e5963697f9b4147bf6d662274f689b1a48692b1f4de0ad196e74cb02a07ce2a69b608a4d420ad5dc153b20888ba69dc361dc4 DIST mysql-extras-20151117-2040Z.tar.bz2 294183 SHA256 2ca16597e869fb0fac4f6e48b779892569698ce83c898df3afaee63131f71833 SHA512 8edbc6a3812d17a2f1a827459867c0747387ff72be86b12fe0e790afca5e4b70e4f23c4098bdb61afa20ef292e2c3b154f16577d5c11999a3e2eec9e43b8d09a WHIRLPOOL f0df653216857527ffa3d31f07ab1c470614b53350f5dbd965ba3bdc398f36f37b506537f1070b03a54203a3847f6557a2ae6757327ce852833fa026de7b518d -EBUILD mysql-cluster-7.2.22.ebuild 4072 SHA256 4542f954fc00d365ec22957fa29d4d08686a1a32756941d58b655b1ea0d3a082 SHA512 a4911a0abc8c7642704a3e40582e1b7d5f5b9fa900d51873c64f902d9f659b5bd4a87be155f92c3af8ffad441c4d9648aca5a5b30e1f9e59fc010435b2f31daf WHIRLPOOL 064279511fd791f3328f3c67df6e32247022efa983e43349d8f0234f6f79dbabb38cb7c4a5b0cad1ecbde4e637242f4a43879f2271d8c21c59178fbc2f56026c -EBUILD mysql-cluster-7.3.11.ebuild 4704 SHA256 cce611435c5d31357ca28cee68df4ed55f78efc6b07a2a903605382f24fab4e2 SHA512 9a3fbc8757b0b8edf84253bd6309718787d4e04959734ba9193c69d94ddfc77dced361e096889f7aa8dc0838b73974a4db25e40b91222d8b35f8d5422f38e715 WHIRLPOOL e6c536bd86fc54e0d9f58386703b7be42a8e04fd0e1fb9de60724d8d12165dfadc38d5090ad8933627e47b87d3685d1be89a0b1f6202112681a0b7885e7620b4 +EBUILD mysql-cluster-7.2.22-r1.ebuild 4072 SHA256 59707164db3dd16798912ec03123fe8089476f6523fe7e399399f303b9eca401 SHA512 80fc2e252b524e981626ba617157b83f17f5c3508f930b6946867146d45795b7af04406d1b06ddab5c7b908751b5cd894bdd65c45f343539ec8700d8bca602a7 WHIRLPOOL 077136326af7652f90d766e5d1d725f33298d20c081e49cfd52e8e0d58b9f32f84df56c5f5390cfe12ea77ceee248a5837959e477f385b657c2c8f3b7edb103f +EBUILD mysql-cluster-7.3.11-r1.ebuild 4704 SHA256 ab09a1942a00f72b4adcc256ffda39757c7c04d6e105d47aeb8ea73b8f575134 SHA512 6b2baae1c3e9c878d4ce37d33afd282cfa11d9479ab37d0f5287571c2c744e4f56d9ccc89118262038b30e706f6e9e9ce7c269ee71530b59d8a4ae55de9e2e70 WHIRLPOOL 4020a60de973e555cdf4b43b0a7de74c55fc86fca2fe796cabd010adb242e1464b8edd8e92c9ef094b3d9ec64cc1c44e092facd1d34678d6f82c51f30f1447ab MISC ChangeLog 4144 SHA256 07b9aaf673d386476ecf94e5efd8f36b29bcd6c03a8ed98477705cf1b8a2a04f SHA512 b6ba5accdb4963a66fd2ec137c5d35850d15a8da7891252eec32c381cbb93ffaa92c36d1c49a0b7545063eb58c3f9b79a75d1e5815d9890a403563601634242e WHIRLPOOL fd6aee40cc89ac8da2e1b33acb992963e6bc60f6f9f722ca5779047abb696c26e7dfcd4c07094887639005eb80f8ec699960399022804cf2320b4efaaccf49aa MISC ChangeLog-2015 2348 SHA256 343f777d9569de16f5ff95232ebc908eabee68ce641474776aaa8665357e498c SHA512 cc53b01580c21a312d77b59e8d653dcf3c2a8576cf8cf664784d94c60d266224155ed5a2b409c457f8104e05be56bfa449ffb526e42226ece9abd2549d481468 WHIRLPOOL 13ef8138e6c990e173c1042a8b146bcdb6d86121636c79f48226c75931bd3f36f0db0c9d55a348be4ef3e9ef3e7d3a4b00cd6450c524bcbb3472a474c48dc65c MISC metadata.xml 1480 SHA256 5f8896f7960f7c265619b41261ff6fccfbcedd29d9a70c4d6f63f960e40d7c50 SHA512 cfb6a753bb071b39f52e8db35b07f70efeae4cb943d57d010a6d42a641c50b6f28b38bf4068536b3c70604da1cb5a428ea5525d0c776ef46cfc4c4c5a37cbbe4 WHIRLPOOL 76bea8ae26e55982611ee7fa24767692327eb53ef386fa11cd128d5e1918e1eb25f639b9a581e83b4c0ce51b8c03630e80ccd3f0a6b1dfb15cc17ba7fc7d6935 diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.ebuild index 264df8423382..09d32b5a664e 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.2.22.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.2.22-r1.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 diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.ebuild index bb3d2a244216..f8fb8c1896af 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.3.11.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.3.11-r1.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 diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest index 1a0722a0a77e..ab126512f0ae 100644 --- a/dev-db/mysql-init-scripts/Manifest +++ b/dev-db/mysql-init-scripts/Manifest @@ -12,7 +12,7 @@ AUX mysqld-wait-ready 1758 SHA256 98d845897c4098e4a3ca62cd3bad26a6fc2565a33737f1 AUX mysqld_at-v2.service 1170 SHA256 e6d19a8414fdf78f1eaaf7f5ec2de57864f9fed86f193870fc0a8f108aec9b3e SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0 WHIRLPOOL 7c42bdd333f578b9a5443ae13383539cc116c0b2f32283c0e09ca20e46076b59f5eea40f6be0dd296fb56de04097ee6eded4ae7d1fb345481eb66a5527ddc254 AUX run-s6 268 SHA256 387eff4eeef85711e052cc5ee7f532f5574e35ff1875c490316b65203009e750 SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3 WHIRLPOOL e7ea48cf98bf7c2a4dd433db0fd64344e62da19f8d7f3b0d092fcd145d69ff1794b432da7a122fef5738684674986e8743141c328e02d1b789a0e4cc8abb32bb EBUILD mysql-init-scripts-2.1-r1.ebuild 1821 SHA256 c9bc91af814c1c774e18c6d420c0922d0c144a8a6257dfc626e57c924f17689a SHA512 22ded8b5a54f56a24f15e9285cb5900dd2cda89b21c78eebc0e7b8fd04ba5cde0b4a50f2d2ba51a520263d3ee97f6f5a0dacd30a754af3c5c992ba498be5d657 WHIRLPOOL 3ee855a1b7aedeff173a233f0a5ce56898524734e60f7f7182d5b4e354042c9b57dd3960551dbee9de71544731480ebcfbad49778ffc723e95165dc1bdcee2a3 -EBUILD mysql-init-scripts-2.2-r1.ebuild 1893 SHA256 a18369bc2ed7fcbac0008d0ef3e1192be9eab0acf589158d9a609371d9e63ad9 SHA512 210347f43ef41525f34b2ec6b856ad2b3c55535b0363283554f027ee8b8ba00e0683c488f5afee98b93a9ab5797844e28d02c46d9d98a679cad4986b33bff582 WHIRLPOOL 7ac5eede920bfc9c8ba5d13c90572f63985659524f5bd4f592287d559298b863efe4331efc5615b12a32977fd7cc9ab32880e23203b4c169fd1612f622c132e1 +EBUILD mysql-init-scripts-2.2-r1.ebuild 1884 SHA256 16775628ffe3f15a6e48e23c61ab225aa8a3ba0b9efcfdc9ead09b996acbc43f SHA512 8b16a6c266ca769516513f63dd4e02295369543a9301d95d1cb9a3dc1ca07ead83299f2f7b11017f06ea225bdde2a2a34994456ff11c674bddc03006986e7c2b WHIRLPOOL 6cd543dfbeabc924938967cf9c129277ee6c566e8a9d6d62b35bc1092e4c295eb2212959f3560c8c8997a0d3e5176b23abe9702d72db5a3d53c2a0f4af1867e9 MISC ChangeLog 5075 SHA256 44ff68e70c3fc274340328cfa85036b4f6f76fc56d9407ce625b5f2899b318b8 SHA512 bdde86bbb6e5411fcac587bbfe3224c860903cde1ea87ef5c47a0f8e21fe70d43601ceb8973c9d4d0f35cd139d361ed40d11f158d4634fff757ffb4c4a96e676 WHIRLPOOL 4fa50bc76b94aceaf16222d44af2efe06d4a1a79645dc1ff095ec7a05ea043395113eabfc0c837539a63513d1e150df4d5042b4d8c1e0e4605ead5f6e42720c9 MISC ChangeLog-2015 10019 SHA256 bc664645c2510ff8077652c36fdd804b29f4f2c2d84915f75323996d02088be4 SHA512 c7112d3e3695c89f06422f7af6e1b9ed723961c43d5d9cdf5a97ed32943faa66f035b0e04a6ea95499a8b596bc710361d7235c5dae780ab7fed6bc7ff979b2b7 WHIRLPOOL 697811e2925bf4501f4be76e7b48b50def027a8ffd1a01b4d726ff0d4b37ec280c1597f5632a8f90bab3680f0596b6a25ae5b3d11e003a2902f1c6c647d1ffbd MISC metadata.xml 243 SHA256 441acc023219e6b01e567b9d627a53793c43f3f2fd1dbe3be0eced9885b70385 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9 WHIRLPOOL f3d0d5ea02babbb1d947f0d274afcdb548af3c4356bc049be314e561f3f6e3ae9503599a44bc8da1e305aa18cb671950adb2fb284060a4b98b67a8a6d16bef73 diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild index 75b8390652f6..f97a9eec6219 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="" DEPEND="" diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 66549983be95..ca4690396016 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -9,9 +9,9 @@ DIST mysql-extras-20170302-1359Z.tar.bz2 306816 SHA256 0375bffa8a7b26caab3a13be2 DIST mysql-extras-20170719-1335Z.tar.bz2 311350 SHA256 725dc29fa4a553cfc0bd07dcc1259e5a38a6d945f757e9f49f554a9a7773abe7 SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 WHIRLPOOL f1606df56f82847a8b4b332c1b61cb695aba2a51aef895fa9596495d89208535f829b8fa69a6e97a26d0b9171d817115b83ce447c8232197353dda258a6d38d0 DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357db46f47b585f6555846d5f1922e85954e93a527a SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba WHIRLPOOL 480c0aa3353076864795f0646a1c833cfeaddeff21e26404e98480f73ff6f4866a9ece39e7dd88e0d1a4ee9c820eb1fd31a46c09bfdb18537f839b0460fc3443 EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611 -EBUILD mysql-5.6.36.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730 -EBUILD mysql-5.6.37.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3 -EBUILD mysql-5.6.38.ebuild 6238 SHA256 6d9a62e5ec21b8921c1abea734b93e0ffc2572979516a988520a8abc0861a34d SHA512 33d8e28a27d890f0664449761d9ac2855a83cae0451915acb84312f5eebde1a68ee3421b4c9e503936218ad27b25faa9e5145173266532e8d7ca90f7e2fb05d9 WHIRLPOOL b33106c5da2a37d7a293842559086ce1dbf5ae22cada4f56eae34886029686f1c9775bae8469e9b4c3985c3d4906d1ea220d3e0a4ee187fa3ded73e18b5daf16 +EBUILD mysql-5.6.36-r1.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730 +EBUILD mysql-5.6.37-r1.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3 +EBUILD mysql-5.6.38.ebuild 6233 SHA256 59e4e3d8a7529b8ad6d382045f283ff4f96b6c48940f82a0eacb57b7cce604c3 SHA512 f20d08986a7259cb402d4f6207f6a67eba1c3257507a083a0f11c14f7741235bd76a3feb17d102ead26e5dd1d36eafa4853f1163632204df72ece15e3743b0bf WHIRLPOOL 33761b4d5dbb9a7a9d36cc8d9abb02e471d2769e0b92bb2ccf199b9a373a6129bf2ef8eeb42585b279022500636df060677f1e16131fc07aa777eabe1921fcb1 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f diff --git a/dev-db/mysql/mysql-5.6.36.ebuild b/dev-db/mysql/mysql-5.6.36-r1.ebuild index 3ced3a4395b2..3ced3a4395b2 100644 --- a/dev-db/mysql/mysql-5.6.36.ebuild +++ b/dev-db/mysql/mysql-5.6.36-r1.ebuild diff --git a/dev-db/mysql/mysql-5.6.37.ebuild b/dev-db/mysql/mysql-5.6.37-r1.ebuild index 016e3491ecf1..016e3491ecf1 100644 --- a/dev-db/mysql/mysql-5.6.37.ebuild +++ b/dev-db/mysql/mysql-5.6.37-r1.ebuild diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild index 35dc3122c0a9..050b1e092c8f 100644 --- a/dev-db/mysql/mysql-5.6.38.ebuild +++ b/dev-db/mysql/mysql-5.6.38.ebuild @@ -16,7 +16,7 @@ inherit mysql-multilib-r1 IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" RDEPEND="${RDEPEND}" diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index 33d9c4c624d8..a21f6dc1d67f 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -2,7 +2,7 @@ AUX my.cnf-5.5 4795 SHA256 fdcc4678723fdac5dba4b5f87299f142ed8f683e800a44d18ae48 AUX my.cnf-5.6 4568 SHA256 4c0657abd5ce47eb84332a85be0a8d808bb8902202722c216c08baa26674e798 SHA512 498826f147ad01615358111511c88f671ff823c400782dbad5f359aff99fa88a7be66e3c3b42fd58a5634f17e12f6a18e1896340f1a5a7acecd75320671c3a10 WHIRLPOOL f9fddb93582129cc332e738f4235a0e22a645cd8a2cbf6fea94666f9ec718093be6cfccf8459c85ada5d34e9bc47612e80b7ac0d9af702033ad1219d3e1801a8 DIST mysql-extras-20170820-2245Z.tar.bz2 312101 SHA256 619afb88752e461434709ed91e91c2104845a9a9ee67ac944212833f4a715ed8 SHA512 34868c8ba3509ed5e3625c973e16f5015390ca9fc656cbcdbe8f5568bc7cab3708bb7c88b1af324ebb66f86433dfee71b90adf6451556fcfc12ad4e7d32256dd WHIRLPOOL f8e08f47bb0789c25dc096c76340b1ca9db8a264d89aca816e3b45e4dd984dc9dea90554c6c114179dc972026c703404aa8521b3c93fb882d7eadd1295635fb9 DIST percona-server-5.6.37-82.2.tar.gz 56296960 SHA256 3cf04b64c8bf5b9cc1ea1a68c54ba77a4709d9c9051314e70a4cbd4c904da702 SHA512 38905c2429bee6e6ba9c35b232c87c27c414726b349ff5a878cc94bbc4a333bbf76019478f8e82a10274ffeea5ac71c4520ff534cc434c4844b496b48801ea4e WHIRLPOOL 9e3988072d00f60af467a21092cc737529bd9250ce4ebbfa20834455791a3fb093b11da8bb845bd62e3fa33ad37e63bfbda483139700bd4147e1b7be64578659 -EBUILD percona-server-5.6.37.82.2.ebuild 7431 SHA256 8696b8c7d0f3647312c818df7af75de1c23a12b0d06985ac7f6f10f10bb12c26 SHA512 42b943f7cb7594e8dd1bef942a86db77fe23896310da6c00aeb57ed2a253db8041f0aecf0c54ef1489fa939675d4027adac20b0fa0642d4e5834cedee52ab32d WHIRLPOOL b3d3e92473e7816fad6bc7fdc5345145306ec1c6ceb1bef7174ce4e69bbfa0f2ee210dcdd945bf7ab5b7d643a1bc0ad4171fb2e67a75414cbe7150c960a3fb96 +EBUILD percona-server-5.6.37.82.2-r1.ebuild 7431 SHA256 8696b8c7d0f3647312c818df7af75de1c23a12b0d06985ac7f6f10f10bb12c26 SHA512 42b943f7cb7594e8dd1bef942a86db77fe23896310da6c00aeb57ed2a253db8041f0aecf0c54ef1489fa939675d4027adac20b0fa0642d4e5834cedee52ab32d WHIRLPOOL b3d3e92473e7816fad6bc7fdc5345145306ec1c6ceb1bef7174ce4e69bbfa0f2ee210dcdd945bf7ab5b7d643a1bc0ad4171fb2e67a75414cbe7150c960a3fb96 MISC ChangeLog 8899 SHA256 25435f089936ab71880a07e1561d3838f0e0413b4d2cf2cf141858d031901f61 SHA512 7dd26f70ade041ac8da7ea727c934aed7622fb54477cf1a6140109e402f991fd352bd561e0f763682ba61d1d4ddc5c6309ebf3cfb629e7d2067c4abf2c01ab0c WHIRLPOOL c3794ce8daa271144c82b48ff24b491f2f169dfbaef20980db6bdec2df25838b633b8c1e0d4b76ebea633c7c11ef85dcd2e2e4cbfecde9008e3ad7836a76f22a MISC ChangeLog-2015 3040 SHA256 66fbbbf27d7181ae09ff7335f029e507e8004ea3aa2ace8c6cd6ad6b6dee4812 SHA512 b1de5efb9da051d6d76b3c65480ecc2266a55baf6071fcf84ca6cda81b6e84075a0bc2654f3a05b787c7827b5420de168e027acf27c460131e67acd9fa71190c WHIRLPOOL 6edd5db667d4d347347d7181670e39ec1ea1d36f39ac7032a5bb9cfafaa544f39b8dc8d429c530f24919d4dd4a347fc167af53cf603c577df90352ec8bfee207 MISC metadata.xml 1505 SHA256 bb735bd3118fae8803888a0567ea6dd9ff39c65b364015be218f16d3f9a1f314 SHA512 0ccb7a31827fa15606e060522daf9364bc843a64cfca8538292e989546e07784ea7a8af54ea7a1b02675c64515a1f2225b22971cda4110610836770d1ff33dd6 WHIRLPOOL 052bc0f6e078fff0f2d44e0ace7bbd814395230cb713090c170f663c8a692162196811d2cdae79c3ef6adf178daa61c30339b735c07594b29685c1268bc54600 diff --git a/dev-db/percona-server/percona-server-5.6.37.82.2.ebuild b/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild index 887e18914445..887e18914445 100644 --- a/dev-db/percona-server/percona-server-5.6.37.82.2.ebuild +++ b/dev-db/percona-server/percona-server-5.6.37.82.2-r1.ebuild diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 281f1134390c..3b0b225dd4e5 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -25,10 +25,10 @@ EBUILD redis-3.0.7-r1.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60 EBUILD redis-3.0.7.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60ab41ed3539655d836c1f036d6 SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb WHIRLPOOL 26d3325a56be5d02fa6571d3bfca3a399c765f7ba2e7d6577b13f0117ea5d4b97c7449d1dd2c3eb942f8711bf5c22ec38dd2db42af455b3e2c1d93be40b54e37 EBUILD redis-3.2.5.ebuild 3578 SHA256 1c935a9f011cf9ceba6a75fb2b0d204817b4aa70cb7bd7e003aa94f98473e627 SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021 WHIRLPOOL ef8f61ee53edbd01e55119105a961bddd4188b92dc55ae54a1ff9a4fe02f0b9139c06abf54864180529a569442785e84592f952e8df0d694f28606835f6d9e07 EBUILD redis-3.2.8-r2.ebuild 3579 SHA256 7e4ea5f0a2396bd4c0a5e0da06c42422ff58b3fc8d165f00f52012f38749045d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282 WHIRLPOOL 227ca8851ce549c4947c9a258071b44a1f4c5c3a779946a1d998fbe468741e9be73a275ce01337ab9a02840e5f7452268abd92d396fe3179746a8f767fda7382 -EBUILD redis-3.2.8-r5.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915 +EBUILD redis-3.2.8-r5.ebuild 3889 SHA256 c37cab58ba606525e3bccc8215043604984c83ea4b2c3c201b3dfede18630644 SHA512 705a4ddc5e79b6031249775d66ad1bfdf418dda66afa3ecc81bcf14d0507f444a67369dd4dfdb16e7fd55abd2e69ff0ad4b14dbeb76a152c560c2efc4acc3184 WHIRLPOOL 92e3f625293c594e54b21631745739e16488bb7dedc1a5357fdbddc7f53efff61e9cc4195823aaf8bddd44cf64fb3a67f725e6c265e5d850a024439a9b81fc29 EBUILD redis-4.0.1-r1.ebuild 3722 SHA256 4305a38f60f529600e36ced799a5c780c32a152e5d4e2efcdbf200bb92b8ab0a SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d WHIRLPOOL cf4a5bd6128143c87808282e24a439d527c6f3efde4308231d8fafd393a41b3869fdebf61c0791ad350ff2665651b4816e46377f8e62820da819d51647cba068 EBUILD redis-4.0.1.ebuild 3507 SHA256 8e8281d3c068e21e6e925ff905603dc645262577eaa898a4c7032ab479ad7dfb SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d WHIRLPOOL 62f2267dceddce78da7b81aa49d40087afb39981743ec02a3337c11202e880fbc9126b49a88dc38cfec8d6bc4391565b1573fcbcab420019cb674271e8b40e4b -EBUILD redis-4.0.2-r1.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba +EBUILD redis-4.0.2-r1.ebuild 3812 SHA256 65da43afcf7fcce58248a2f05f88fb8c0c33e58fc8a806e69d3650e5f7120882 SHA512 472cede0d9384fa3f5711d90f4ce3c59c83b9c2dcb3ce6d758ab9489ec5a1e0252e94dcdf0c240d926cd6a97c106452f89209c155c844089bede2dda90bc5281 WHIRLPOOL 928579df3ee041ed931736f880f16e1c7378a58982773e0df52c1bf54093c60baf332e1fafc0cd60b9fedb1bd3ddb69687ccefc860d42d67ee409f9df980bc46 MISC ChangeLog 9085 SHA256 ed9cb241c3bfe71d3211e01c2a198c4d8e42fbfd42633487141ec65e7c3bd7e4 SHA512 ebcb05824a18732c1daf72785a6ef59305378ea215f3910487fec354771f7a9137d27f0c4bf50a935829f2bd3bce5dbe2bb1a7faf478fc1c8dc01398e435f8b2 WHIRLPOOL e9bce2718149978854fc4adbc99db7daadd1687bf67e68b075ccea02659c71dad7c620a39740d1ac70e0f6a855cc5638b4a3237b85b4719a0ea8100d7524d959 MISC ChangeLog-2015 14790 SHA256 2b26170b052d7ee86954593cf4c8ac44c071e702b546cfb10b5821371efa5bea SHA512 80ece5f6c84ad894aad3290665c6d2099f7c57eee8682fe85d2ab59969099d5f7e229a81968c02f63601b7e40123073394ffeccb58edfa8c374b6148213956f5 WHIRLPOOL c8828bedd95dc6814790355ad42ed2d378831f821c5185a1db2a45c89ebb770a5fbc3453b4893e7d9831ac98a5384fcaecc920cbda97ba5d7c4a98a4121f33b3 MISC metadata.xml 632 SHA256 623fd6b8e252684955a557e3bd26a6fa237dce08702e8373a9eb65207a609a14 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5 WHIRLPOOL 652c5fcb32bf4a79400534743cb5b4803d813daf9ec363ca38c5c1c2c7f3292b16a50e99845274486fbe5c8dda2abe1ce98da28350f18c06a5d508146a7bd172 diff --git a/dev-db/redis/redis-3.2.8-r5.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild index cb1541102b7c..595d249c582b 100644 --- a/dev-db/redis/redis-3.2.8-r5.ebuild +++ b/dev-db/redis/redis-3.2.8-r5.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="+jemalloc tcmalloc luajit test" SLOT="0" diff --git a/dev-db/redis/redis-4.0.2-r1.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild index 1449a3567826..ec32d4140ed7 100644 --- a/dev-db/redis/redis-4.0.2-r1.ebuild +++ b/dev-db/redis/redis-4.0.2-r1.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="+jemalloc tcmalloc luajit test" SLOT="0" diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest index b4a754bc6f5d..98fe38acf414 100644 --- a/dev-db/sqliteman/Manifest +++ b/dev-db/sqliteman/Manifest @@ -1,8 +1,10 @@ AUX sqliteman-1.2.2-lpthread.patch 486 SHA256 af99d278b6d0cda9f84487985afdb427f77edd6eff9a1a62edac906dcfd5487b SHA512 e4598b7f74da7c046571a5b6744d172a9d5d8d35c28ff0bd11b0db68a3fa8ba291ab9634a3622ea5aa383fe6aff75318350665a0a75f68224b6ba97cbc8f3855 WHIRLPOOL 63858a7eb84bdc51ae13d41e1c20c0a29f0b88b853a29560f895b197881acaa9fe3456ef13f585d6746489760c48c5ad05b6f238faf57d1e554f83c0bed762ff AUX sqliteman-1.2.2-qscintilla-2.10.patch 587 SHA256 572ba772bfe151f3f5bc85e21bea645da84aeecc2a91272ff9b3c4dcb6a94fed SHA512 91af0f16af6c0d686d3e184518262de123bb998fc4802108645b15b3288c8aa242a869dec99c350cdfa9982420f4989e54d8287e9c387073361e2bdcf1310472 WHIRLPOOL 93bf44bac8433293d9a20b452fa4324a9a4519fba0eb7b9d0120a5d40e96777c55fe026b827c9b80125f988f95cdf391172f73acccdc4b9db7cff0efd8e6e438 +AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b69fff893d89767a19eda800f0ff SHA512 5169991a0b764fe02782dcc94befe1479bcae631f815c268c9e2a3f02c8efbaceb78ecb87d04eea240623fdfcc475b6b91149a4461974f648f4dea62ba07e309 WHIRLPOOL 2e9832bb24741e3866a6f3c7bd620e88bd45624717a1c6132177d693137b0f9de49e73731fe0eac32c73deae2333fedcdf015347bd840db69257220e48410273 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db +EBUILD sqliteman-1.2.2-r4.ebuild 896 SHA256 7b18ab33b2c667d816d92039e089108f983e8d6094bb7161fe014fe60d698c85 SHA512 e4229ea3c94bbb8a741182b033aae9375d9b2aa422d049a6a13a63e1852b07d513448b0932567bcbc15bcba68b2c3bf98126c1aac80697180dafd87f5a05be6d WHIRLPOOL a712f8f90cb10737c6ae0d60eb93bf7b4f35902b1e5d73f07e8ace15342c55a44c9cbd00528cec6e15f779ad8eb157337afd5a73f219158195187236a0f75b4a MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916 MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1 MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306 diff --git a/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch new file mode 100644 index 000000000000..ebc571a33981 --- /dev/null +++ b/dev-db/sqliteman/files/sqliteman-1.2.2-qt5.patch @@ -0,0 +1,346 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9fd041..f589bfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,28 +101,7 @@ + + +-SET (QT_MT_REQUIRED true) +-SET (QT_MIN_VERSION "4.2.0") ++SET (QT_MIN_VERSION "5.7.1") +-SET( QT_USE_QTSQL TRUE ) +-SET( QT_USE_QTXML TRUE ) +-FIND_PACKAGE( Qt4 REQUIRED ) +-MESSAGE(STATUS Qt4 version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}) +-# suggest Qt upgrade +-if (QT_VERSION_MINOR LESS 3) +- MESSAGE(STATUS "") +- MESSAGE(STATUS "__ BIG FAT WARNING! _______________________________") +- MESSAGE(STATUS "Your Qt version seems older than it should be.") +- MESSAGE(STATUS "Althought will be Sqliteman compilled successfully,") +- MESSAGE(STATUS "it will be limited in its features.") +- MESSAGE(STATUS "There are some important bugs in older Qt versions.") +- MESSAGE(STATUS "Please upgrade to the current Qt version.") +- MESSAGE(STATUS "___________________________________________________") +- MESSAGE(STATUS "") +-endif (QT_VERSION_MINOR LESS 3) +-MESSAGE(STATUS Qt4 includes: ${QT_INCLUDES}) +-MESSAGE(STATUS Qt4 libs: ${QT_LIBRARY_DIR}) +- +-INCLUDE( ${QT_USE_FILE} ) +- ++FIND_PACKAGE( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Sql Widgets ) + + IF (WANT_INTERNAL_QSCINTILLA) + MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") +diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake +index c4592d0..92754b4 100644 +--- a/cmake/modules/FindQScintilla.cmake ++++ b/cmake/modules/FindQScintilla.cmake +@@ -10,22 +10,19 @@ + # + # Redistribution and use is allowed according to the terms of the FreeBSD license. + +-IF(NOT QT4_FOUND) +- INCLUDE(FindQt4) +-ENDIF(NOT QT4_FOUND) +- + SET(QSCINTILLA_FOUND FALSE) + +-IF(QT4_FOUND) +- FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h +- "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci ++IF(Qt5_FOUND) ++ FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h ++ HINTS ${Qt5Core_INCLUDE_DIRS} ++ PATH_SUFFIXES Qsci + ) + +- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2) +- FIND_LIBRARY(QSCINTILLA_LIBRARY +- NAMES ${QSCINTILLA_NAMES} +- PATHS ${QT_LIBRARY_DIR} +- ) ++ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt5 libqscintilla2_qt5) ++ FIND_LIBRARY(QSCINTILLA_LIBRARY ++ NAMES ${QSCINTILLA_NAMES} ++ HINTS ${Qt5Core_LIBRARIES} ++ ) + + IF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR) + +@@ -41,7 +34,7 @@ IF(QT4_FOUND) + ENDIF (CYGWIN) + + ENDIF (QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR) +-ENDIF(QT4_FOUND) ++ENDIF(Qt5_FOUND) + + IF (QSCINTILLA_FOUND) + IF (NOT QScintilla_FIND_QUIETLY) +diff --git a/sqliteman/CMakeLists.txt b/sqliteman/CMakeLists.txt +index c9154a7..13397ee 100644 +--- a/sqliteman/CMakeLists.txt ++++ b/sqliteman/CMakeLists.txt +@@ -139,12 +139,12 @@ IF (WANT_RESOURCES) + ) + ENDIF (WANT_RESOURCES) + SET (SQLITEMAN_RCS ${SQLITEMAN_RCS} api/api.qrc) +-QT4_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} ) ++QT5_ADD_RESOURCES( SQLITEMAN_RC_RCS ${SQLITEMAN_RCS} ) + + +-QT4_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} ) ++QT5_WRAP_UI( SQLITEMAN_UI_HDRS ${SQLITEMAN_UI} ) + +-QT4_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} ) ++QT5_WRAP_CPP( SQLITEMAN_MOC_SRC ${SQLITEMAN_MOC} ) + + INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) + INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/sqliteman ) +@@ -157,10 +157,13 @@ IF (WANT_INTERNAL_QSCINTILLA) + ${CMAKE_SOURCE_DIR}/sqliteman/qscintilla2/Qt4/Qsci + ) + ELSE (WANT_INTERNAL_QSCINTILLA) +- INCLUDE_DIRECTORIES( ${QSCINTILLA_INCLUDE_DIR} ) ++ INCLUDE_DIRECTORIES( ++ ${QSCINTILLA_INCLUDE_DIR} ++ ${Qt5Widgets_INCLUDE_DIRS} ++ ${Qt5Sql_INCLUDE_DIRS} ++ ) + ENDIF (WANT_INTERNAL_QSCINTILLA) + +- + IF (MSVC) + # this is a must to switch off subsystem:console (console window poping up) + # WinMain wrapper from QT_QTMAIN_LIBRARY is used and liner must be modified +@@ -178,6 +181,6 @@ ADD_EXECUTABLE( ${EXE_NAME} ${WIN32_SUBSYSTEM} + ) + +-TARGET_LINK_LIBRARIES( ${EXE_NAME} ${QT_LIBRARIES}) # ${POPULATOR_LIB}) ++TARGET_LINK_LIBRARIES( ${EXE_NAME} Qt5::Widgets Qt5::Sql ) + + IF (WIN32) + # don't use console subsystem +diff --git a/sqliteman/alterviewdialog.h b/sqliteman/alterviewdialog.h +index 31407f9..b014473 100644 +--- a/sqliteman/alterviewdialog.h ++++ b/sqliteman/alterviewdialog.h +@@ -8,11 +8,8 @@ for which a new license (GPL+exception) is in place. + #ifndef ALTERVIEWDIALOG_H + #define ALTERVIEWDIALOG_H + +-#include <qwidget.h> +- + #include "ui_createviewdialog.h" + +- + /*! \brief GUI for view altering + \author Petr Vanek <petr@scribus.info> + */ +@@ -22,10 +19,10 @@ class AlterViewDialog : public QDialog + + public: + AlterViewDialog(const QString & name, const QString & schema, QWidget * parent = 0); +- ~AlterViewDialog(){}; ++ ~AlterViewDialog(){} + + bool update; +- void setText(const QString & text) { ui.sqlEdit->setText(text); }; ++ void setText(const QString & text) { ui.sqlEdit->setText(text); } + + private: + Ui::CreateViewDialog ui; +diff --git a/sqliteman/analyzedialog.h b/sqliteman/analyzedialog.h +index 4b871cf..3f4302e 100644 +--- a/sqliteman/analyzedialog.h ++++ b/sqliteman/analyzedialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef ANALYZEDIALOG_H + #define ANALYZEDIALOG_H + +-#include <qdialog.h> +- + #include "ui_analyzedialog.h" + + +@@ -23,7 +21,7 @@ class AnalyzeDialog : public QDialog + + public: + AnalyzeDialog(QWidget * parent = 0); +- ~AnalyzeDialog(){}; ++ ~AnalyzeDialog(){} + + private: + Ui::AnalyzeDialog ui; +diff --git a/sqliteman/constraintsdialog.h b/sqliteman/constraintsdialog.h +index 6ab19c7..61485bb 100644 +--- a/sqliteman/constraintsdialog.h ++++ b/sqliteman/constraintsdialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef CONSTRAINTSDIALOG_H + #define CONSTRAINTSDIALOG_H + +-#include <qdialog.h> +- + #include "ui_constraintsdialog.h" + + +@@ -23,7 +21,7 @@ class ConstraintsDialog : public QDialog + + public: + ConstraintsDialog(const QString & tabName, const QString & schema, QWidget * parent = 0); +- ~ConstraintsDialog(){}; ++ ~ConstraintsDialog(){} + + bool update; + +diff --git a/sqliteman/createindexdialog.h b/sqliteman/createindexdialog.h +index 9c75b35..186a46a 100644 +--- a/sqliteman/createindexdialog.h ++++ b/sqliteman/createindexdialog.h +@@ -8,8 +8,6 @@ for which a new license (GPL+exception) is in place. + #ifndef INDEXDIALOG_H + #define INDEXDIALOG_H + +-#include <qwidget.h> +- + #include "ui_createindexdialog.h" + + +@@ -27,7 +25,7 @@ class CreateIndexDialog : public QDialog + \param parent standard Qt parent + */ + CreateIndexDialog(const QString & tabName, const QString & schema, QWidget * parent = 0); +- ~CreateIndexDialog(){}; ++ ~CreateIndexDialog(){} + + bool update; + +diff --git a/sqliteman/dataexportdialog.cpp b/sqliteman/dataexportdialog.cpp +index 7ad5d03..ee77b25 100644 +--- a/sqliteman/dataexportdialog.cpp ++++ b/sqliteman/dataexportdialog.cpp +@@ -223,7 +223,7 @@ bool DataExportDialog::exportHTML() + { + out << "<tr>"; + for (int i = 0; i < m_header.size(); ++i) +- out << "<th>" << m_header.at(i) << "</th>"; ++ out << "<th>" << m_header.at(i).toHtmlEscaped() << "</th>"; + out << "</tr>" << endl(); + } + +@@ -234,7 +234,7 @@ bool DataExportDialog::exportHTML() + out << "<tr>"; + QSqlRecord r = m_data->record(i); + for (int j = 0; j < m_header.size(); ++j) +- out << "<td>" << r.value(j).toString() << "</td>"; ++ out << "<td>" << r.value(j).toString().toHtmlEscaped() << "</td>"; + out << "</tr>" << endl(); + } + out << "</table>" << endl() << "</body>" << endl() << "</html>"; +@@ -256,7 +256,7 @@ bool DataExportDialog::exportExcelXML() + { + out << "<ss:Row ss:StyleID=\"1\">" << endl(); + for (int i = 0; i < m_header.size(); ++i) +- out << "<ss:Cell><ss:Data ss:Type=\"String\">" << m_header.at(i) << "</ss:Data></ss:Cell>" << endl(); ++ out << "<ss:Cell><ss:Data ss:Type=\"String\">" << m_header.at(i).toHtmlEscaped() << "</ss:Data></ss:Cell>" << endl(); + out << "</ss:Row>" << endl(); + } + +@@ -267,7 +267,7 @@ bool DataExportDialog::exportExcelXML() + out << "<ss:Row>" << endl(); + QSqlRecord r = m_data->record(i); + for (int j = 0; j < m_header.size(); ++j) +- out << "<ss:Cell><ss:Data ss:Type=\"String\">" << r.value(j).toString() << "</ss:Data></ss:Cell>" << endl(); ++ out << "<ss:Cell><ss:Data ss:Type=\"String\">" << r.value(j).toString().toHtmlEscaped() << "</ss:Data></ss:Cell>" << endl(); + out << "</ss:Row>" << endl(); + } + +diff --git a/sqliteman/populatordialog.cpp b/sqliteman/populatordialog.cpp +index 1e55f63..8e6e246 100644 +--- a/sqliteman/populatordialog.cpp ++++ b/sqliteman/populatordialog.cpp +@@ -7,7 +7,7 @@ for which a new license (GPL+exception) is in place. + #include <QSqlQuery> + #include <QSqlError> + #include <QHeaderView> +-#include <math.h> ++#include <QtMath> + + #include "populatordialog.h" + #include "populatorcolumnwidget.h" +--- a/sqliteman/shortcutmodel.cpp ++++ b/sqliteman/shortcutmodel.cpp +@@ -45,7 +45,7 @@ QVariant ShortcutModel::data(const QModelIndex & index, int role) const + return QVariant(index.column() == 0 ? m_values.at(index.row()).first : m_values.at(index.row()).second); + } + if (role == Qt::BackgroundRole && index.column() == 0 && m_values.at(index.row()).first.isEmpty()) +- return QVariant(Qt::red); ++ return QVariant(QColor(Qt::red)); + return QVariant(); + } + +diff --git a/sqliteman/sqlmodels.cpp b/sqliteman/sqlmodels.cpp +index 178b2e7..82d1f0c 100644 +--- a/sqliteman/sqlmodels.cpp ++++ b/sqliteman/sqlmodels.cpp +@@ -47,7 +47,7 @@ QVariant SqlTableModel::data(const QModelIndex & item, int role) const + + // mark rows prepared for a deletion in this trasnaction + if (role == Qt::BackgroundColorRole && m_deleteCache.contains(item.row())) +- return QVariant(Qt::red); ++ return QVariant(QColor(Qt::red)); + + // nulls + if (m_useNull && curr.isNull()) +diff --git a/sqliteman/sqlparser/tosqlparse.h b/sqliteman/sqlparser/tosqlparse.h +index 3424fa2..678df90 100644 +--- a/sqliteman/sqlparser/tosqlparse.h ++++ b/sqliteman/sqlparser/tosqlparse.h +@@ -50,7 +50,6 @@ This file is based on the TOra source code. http://tora.sf.net + + #include <list> + #include <algorithm> +-// #include <qstring.h> + #include <QString> + + // class toConnection; +diff --git a/sqliteman/tabletree.cpp b/sqliteman/tabletree.cpp +index 339e259..f4ab00c 100644 +--- a/sqliteman/tabletree.cpp ++++ b/sqliteman/tabletree.cpp +@@ -6,6 +6,8 @@ for which a new license (GPL+exception) is in place. + */ + #include <QMouseEvent> + #include <QApplication> ++#include <QDrag> ++#include <QMimeData> + + #include "database.h" + #include "tabletree.h" +diff --git a/sqliteman/vacuumdialog.h b/sqliteman/vacuumdialog.h +index cac27f1..5e25214 100644 +--- a/sqliteman/vacuumdialog.h ++++ b/sqliteman/vacuumdialog.h +@@ -8,7 +8,7 @@ for which a new license (GPL+exception) is in place. + #ifndef VACUUMDIALOG_H + #define VACUUMDIALOG_H + +-#include <qdialog.h> ++#include <QDialog> + + #include "ui_vacuumdialog.h" + +diff --git a/sqliteman/sqliteprocess.h b/sqliteman/sqliteprocess.h +index aaa60ca..5bec5b0 100644 +--- a/sqliteman/sqliteprocess.h ++++ b/sqliteman/sqliteprocess.h +@@ -8,6 +8,7 @@ for which a new license (GPL+exception) is in place. + #ifndef SQLITEPROCESS_H + #define SQLITEPROCESS_H + ++#include <QObject> + #include <QStringList> + + diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild new file mode 100644 index 000000000000..a7645ef0f775 --- /dev/null +++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +QT_VER=5.7.1 +inherit cmake-utils flag-o-matic xdg-utils + +DESCRIPTION="Powerful GUI manager for the Sqlite3 database" +HOMEPAGE="https://sourceforge.net/projects/sqliteman/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtcore-${QT_VER}:5 + >=dev-qt/qtgui-${QT_VER}:5 + >=dev-qt/qtsql-${QT_VER}:5[sqlite] + >=dev-qt/qtwidgets-${QT_VER}:5 + >=x11-libs/qscintilla-2.9.4:=[qt5(+)]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-lpthread.patch" + "${FILESDIR}/${P}-qt5.patch" +) + +src_prepare() { + # remove bundled lib + rm -rf "${S}"/${PN}/qscintilla2 || die + + append-flags -fPIC + cmake-utils_src_prepare +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} |