diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-07-07 14:31:24 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-07-07 14:31:24 +0000 |
| commit | ac5527f208ccf408fe8c3f9f1a518d4e0f3228da (patch) | |
| tree | 071379edfb62e1ba01c2a460b75ddeae46acf936 /dev-libs/cyrus-sasl | |
| parent | version bump (diff) | |
| download | historical-ac5527f208ccf408fe8c3f9f1a518d4e0f3228da.tar.gz historical-ac5527f208ccf408fe8c3f9f1a518d4e0f3228da.tar.bz2 historical-ac5527f208ccf408fe8c3f9f1a518d4e0f3228da.zip | |
Pass --enable-sql for non-native build only when SQLite is enabled (since MySQL and PgSQL are not multilib ATM), bug #516514.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-libs/cyrus-sasl')
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/Manifest | 32 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild | 4 |
3 files changed, 23 insertions, 19 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 93ec7866507a..b74c873e010b 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.301 2014/06/19 07:20:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.302 2014/07/07 14:31:18 mgorny Exp $ + + 07 Jul 2014; Michał Górny <mgorny@gentoo.org> cyrus-sasl-2.1.26-r7.ebuild: + Pass --enable-sql for non-native build only when SQLite is enabled (since + MySQL and PgSQL are not multilib ATM), bug #516514. 19 Jun 2014; Michał Górny <mgorny@gentoo.org> cyrus-sasl-2.1.26-r7.ebuild: Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index acffea02314c..93b177c5f5b7 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -58,25 +58,25 @@ EBUILD cyrus-sasl-2.1.23-r7.ebuild 9000 SHA256 fdb90f669d149cb2c6bf89ed8a1c33703 EBUILD cyrus-sasl-2.1.26-r3.ebuild 7244 SHA256 f4d4a688a48092cd723490c1064d6f45d47300b615ba18019552a198f05cbfd7 SHA512 e6b2149ac6f78886a9e6f97e9bd8d13b18d79ab7b07a2fa05933d9b6a172fe6ecaad5e3ba837f84e310a2ed45c52cf659f923184b400f4232480fec9c1e27dac WHIRLPOOL 60a34f2bc44da24cd136835eef4009328449074a2f7ec90ce2bcc54f49640fd31662b033d84ba4bb56c8a65105fab32b77c8f102f04fe7c6b2ca317e78419e90 EBUILD cyrus-sasl-2.1.26-r4.ebuild 7306 SHA256 7b620becb18c820c926ca413dc42fd787397e949cb6c56b9a5e102e0ef875a44 SHA512 56a2941b39d3c9df5e6bb464f71f6af543cab8721938876b20da68b5fbe69e7ce509a944b6072c9e705f9f4e9d305149799a7a02a5c6379deb773338ef983118 WHIRLPOOL 22c1e5af4abfd1bdb16f4a469f4f0a1797840195d677cc6edf5eb4337d1d86b02365dceb13b156ccf64d6673181e286e65435c8336965feba7e7a3ff362b4553 EBUILD cyrus-sasl-2.1.26-r5.ebuild 7242 SHA256 d117d25a761eae7d9ea567b0493245461be6ab58317ffc94c193ba4359ba689c SHA512 004aae190a75e049bc02660395bd94f793608d8d1d1eea41efc790796b86e0cb31c8f3608e731a9a4340b2f3aec69fe3c341b00d376a14c754df2935acca6a5a WHIRLPOOL 0f7b4acb1d123bbcf4d5847eea1e3d4e88be57940f6f88437ab15ff8ba3be563d2d7b319d15627fe2ef2beaa88d825249e2816445d308ef33d2d149af33666ad -EBUILD cyrus-sasl-2.1.26-r7.ebuild 7700 SHA256 89b46daf5b7944d4579bc5af2cd71916d850e33645ab56698c08d2a6c8dfc7a7 SHA512 26264f5eb68a10f4a223879acc09a346a802a39c09d84cffce5162d8befbc09c69b4652197d9fd898526f228d2019ccda003c1426e72c3069411590a9528328c WHIRLPOOL 6932712ed9272aec0a826229de5775e1ed2ffe3bd4c7d80d18c35b1a107c72f848193846392271097289b0f0a5b5490091ba4ab07f6e76338301543702a0f500 -MISC ChangeLog 49352 SHA256 ca5c10e893ca53d567b29ecf9b6f373510c042b03436e6509f469293abe5557f SHA512 977526709f4d688be49aafedcfb8e57194f86d085ceca3ec5c690865e4fdae96c3d8ca8a20d76a134195a37b488c8bd77c3201f41f3e3c7b9bdfc711e7e10923 WHIRLPOOL aa1419aaae916bc8dcf405b556a495381549423278ebdb4555d9ff03ed95ee09b37017d777a1abc4a88ab3dbab4d1de21ab9ffa44ab7d11e71d6ba95db1eaf94 +EBUILD cyrus-sasl-2.1.26-r7.ebuild 7736 SHA256 edbd8bcd1fc2d0d627dfddcdb872f7dad9db2aa574737759b6aff5af44890d52 SHA512 91aa22c4f005bbcae95054daaacbebda77f72b9b57d5712edc3494fbdb3feab5fc7c653ca6ff52cfafdca587ab6e2bccc9b3dae58784105cda215030a443b424 WHIRLPOOL de3c79e5b7af7e2324ca377a24c9d7145d7cda47d4b31eb44cb614f122b709f5b3f4e2e3ba22a5995d66aa0f9ef0a4b70eaa9f4818e0d08e58e0045ff48b6501 +MISC ChangeLog 49562 SHA256 541dc07f02c19b04d0026d680be6e73a388bcc5280d9953ad0b66674ecbc5716 SHA512 30b4dee6c38e068c07be231603f0f036ab6c9ac34e0bf492fc807ffe37c934674bab4e91d2661ff1175eb360eb34e1187a85c23156c343f2068c403b2ee62138 WHIRLPOOL 340af4ecc6d9bcf5aa79365743a0d0ecca1966edd29101db9b85045d12de1ee83435f22b5e221d0de87b00c1564d5d5bb35352deb3d1f0e96a8b4098d07e53d9 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJToo9EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTuq9AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO3uwQAJuRpU3FbcVpEC/EXuhyggyo -r4E36tw94l5X6v6S9AnM/uFYrP6ceC812PydC0encAHToncF0hyVl8wEbejOlmYz -fTfpxikz08Bog79KF2rUVq+Jei7j7I94+YU3KZE2JDA5UTWMFGqAOEcjfuqg2zUE -oap2cSlX3RVSGS8YjKPRTmIB+TULnAV7tt7nMdBWv3Plq5G9YC38RDNoz/Ujr0lY -Vj/r3b/4deapJfe4eJ3LBMxovmCzl8gk9EXXEavEAhVMUim1Qw3ScfV3tBG77PT8 -QeAsTlyUj6WPPuGfyRtUgf4dGHtwGBFyrFiOZqsiA6UObaTkTwctBf+t0Y0Pl2Fm -MRbJqt/Y8zo2Mgi81dptTMxXO7G9bEufZ0nPcisBjNnWqO1NbEX0YiU988GpOKo2 -HsznGi7r7PNxI4KLyM8toCXCUStv05ES2AanrRim6LRKyLHWap1pfe7XvKA1JTjx -l2hybgft4+0dtzXt0DYR9pkLOSaJ8k8+EEFEiZr9Vjn8kYOOQxeA9uqLSI5J/mTw -p5wdW+zN6UrAdxnwa8kJtyobbwTdVAamUREumuBEbFq64yll0kC5RO9J8Hy5Jioo -D6dstZe0bmWrhHms18Zz9TqJsph6AyJnsPSvsdN73yDwPxNab1weAYR9FPM773yh -GUb89dxvPiFhsqkIf0OF -=0sFy +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6vkP/RZI54PgJejWqfqZMu9zSWzA +RypJJsKjRNBUZzb/8JrA4k98Q+u8mYv7GOTqeqaSamc8/oZ/AiPWWp0Jh/pERqHu +DQs5xAb2IeLVtDexHjHMaVE/wmgkd0AiTghtR/5QtR0qsTd9GG2u8Hxw0NG7479o +T30BEEaXCcYzpFQcKKAzhWMlee0qPYaz56byN4tL3QTR375Yx6fjULm0KiGyYQpu +atOkd219ik9/QOH3hLNpbPx3/EYduDcrbRHTXs1yBrCXEYpMnRLTJnQrmjI5cA5S +/V2iXly278WQbJEVnkTA9YgEKxkdpHpWz5hVGVZ3jBYFUvniAiCjQiEJOO9fUNY7 +qIDoLIjmreLRgj0dLJFwFMakswUCum+Cvjg/wQiZj+0JoC/kp0pDxT8+cBEGbD3s +qzlUKoi2OyNdqXoYmzysNwSiyBTkxUJar8OdaThHWMckQxtapscAkkpCSt7ABUVR +if+ZbBLwf6TCRAvMAbwY3Bxa+6AGjAO7KeNkJrFonwGqrteQ0QQa8sf6jxRJJfbh +FzwotW3SfxqVp+sFwIayl5KQQBu67WsEQe0tFzhavyl0KcYJrzyhdD5sNum4ojkG +bHy/WStwmAl3a00x0e9bZNirBvDAQ118X0rizE4eV8wQUAOShCpQmlzFEIOnCaSe +RSw1nju+8U5WjzE5FjCd +=pe7Q -----END PGP SIGNATURE----- diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild index 2235cd2e36c6..1ae9e4b13a75 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.2 2014/06/19 07:20:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.3 2014/07/07 14:31:18 mgorny Exp $ EAPI=5 @@ -99,7 +99,7 @@ multilib_src_configure() { myconf+=( --without-des ) fi - if use mysql || use postgres || use sqlite ; then + if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then myconf+=( --enable-sql ) else myconf+=( --disable-sql ) |