diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-05-28 19:23:24 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-05-28 19:23:24 +0000 |
| commit | 5daea41187327e6418a0b731f1936cb534e6bc51 (patch) | |
| tree | 30da9bfdf851b73a654c80abb35eb66784f6046b /dev-util/cmake | |
| parent | Version bump, bug #549474 (diff) | |
| download | historical-5daea41187327e6418a0b731f1936cb534e6bc51.tar.gz historical-5daea41187327e6418a0b731f1936cb534e6bc51.tar.bz2 historical-5daea41187327e6418a0b731f1936cb534e6bc51.zip | |
Remove REQUIRED_USE to improve user experience when both qt4 and qt5 USE flags are enabled (in this case, qt5 will be preferred).
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 30 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.2.2.ebuild | 4 |
3 files changed, 21 insertions, 19 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 3fd3a03c421e..58c198e46eb2 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.307 2015/05/28 19:08:02 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.308 2015/05/28 19:23:13 kensington Exp $ + + 28 May 2015; Michael Palimaka <kensington@gentoo.org> cmake-3.2.2.ebuild: + Remove REQUIRED_USE to improve user experience when both qt4 and qt5 USE flags + are enabled (in this case, qt5 will be preferred). 28 May 2015; Michael Palimaka <kensington@gentoo.org> cmake-3.2.1.ebuild, cmake-3.2.2.ebuild, metadata.xml: diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 6adaaea9e34c..b14c010dfdb5 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -40,24 +40,24 @@ EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b8476447 EBUILD cmake-3.0.2.ebuild 5156 SHA256 6c841ac46ae5769e22ac16b6af6b1cf234266d3d640507cf0379619ed2582649 SHA512 05f7cee174b3373ca62bafbaee1461e84418a4065895c69c5462f667a0236bbd2d90f4f5a4eb624dc24335c1481f689f223b6d8f84be633939840781ef0058fc WHIRLPOOL 1504c0f74e9d463a590338c4eeac5430c011a6f390f0121a88efc8b2cf88033133f86c7c6836faf66a943974898e01aedb34561c98f750341265f57cf7e1ca93 EBUILD cmake-3.1.0.ebuild 5099 SHA256 b8af207aee127c21224279e8bdbf9a5cf62760f74d3e192c50719bfad0e5a63b SHA512 5ae290035da81569ac4019e327881fbe42aeca31f25bb62740f3afef8ef1b5308e66fabb5a9f5c4159d5065112131efc606d85e1e456bddfcaa60344c2543956 WHIRLPOOL 0fb06a7127411a0ced9eb316dc602714c21b80dd560c3234ec43e4e8bfd21da77c7fd972737ab07f5713f99efa60862a68ae1dce48bed7dc949dbb22bad6e88b EBUILD cmake-3.2.1.ebuild 5281 SHA256 40bbc0fc3493abfdc8891841abc97337e7d99d6970763201d4fd9cf05b7d1b27 SHA512 822b1702ed2acd1ecae745eee81538b955e66d9cf0f8ea5c20c33b3abd020b887276b79d8908f8b4ad36c96428a3b0140a20c2b700f94500da593e8368a60275 WHIRLPOOL 9c2fe1965ad07080715964f71f31387c8bc98cbd8cce1fa8ab07952afa6754f28e83f1d9000f8a0a4aef7e13fc35cc5e255940567137dff1ccfcc3c98543d37f -EBUILD cmake-3.2.2.ebuild 5281 SHA256 b89686728a3769c46dc98d2ef292bb0d454042e4fe86d6018675a6464d6873f4 SHA512 9c0db2224a460aa48b40b9faeba757881340f49e709294a621fa70cfadd20db4f376aaa52bf7387691fce932299e3c40a0422970658d82404607a8c5e9d23882 WHIRLPOOL 57e7bfe1766d3d2eb6f64fc5aacd84471702f8b54e23ede43e3bbffc4087d7aa31346a7057f4c05d5827d8a103d1a23dfd7a746f10b23b16f9eb30f4d6c163f5 -MISC ChangeLog 49870 SHA256 864e89ea6f167e5255104a8d196cb485a3ea4f28e995c54508f2ecac8717f93c SHA512 41caf787711dc9d7618c79aeeb86b2faae8030b9260908be9fd6213b0520d68f08a520b84c45d234f864c4e761ee9e0d1fba41c7a2026af56c3e037738579e09 WHIRLPOOL c354af24156d18473b49a0714717be783e1e360f0c4fd05b0e42cfa7ff52419e0ebb9dd436a8b98cba655f4ca2095a73e18b6b671eeb658a68793491d82c17ae +EBUILD cmake-3.2.2.ebuild 5250 SHA256 35e9b9bed8efc4bdcf9f9eb7cf3dc1038d9b17ea5d2a843cf365a5a8334b21e3 SHA512 e879ac79a24ba5a2f3dbfd2f04c5e01697b35b6e28f7a339a7dfb70441b51ac67b2f4b71e2c4e6014956b18061bd1858a7bc12f80fe088e0e7b01c659d390ca9 WHIRLPOOL b802694af69f3f38ddd28627877d9ddfe6f24b3e7d9cab058b6b836ca6118cc8edf755c9a7826c5ab98521e59d373324317a6881bca139f7c9b050d0993b55aa +MISC ChangeLog 50081 SHA256 4abb770e1b541cf0caee2b640d734f933faca062f1e4b70d3b55bcb5a02ba10b SHA512 c414cee312c90151b38f4c0fe0b446900aef5a3fdfbdb112d0efbc4af1e1257311b6dda7f72cb8177e7b206b2a68be9d01b00daddaeac5f25900e0c9c39afcab WHIRLPOOL 3780fbd453b25d82a8ef00c691278bc2a5e78656d7eacf8767781008a26581ffa009464a144ad04425b9e2ee5e43c84183be122be03695095b186a7dc74f352a MISC metadata.xml 280 SHA256 9c11fcc54fc2212abdf8d07008cdb7cd8c1352fb59aeabebf58ee6aa89fdd8c5 SHA512 7b3012e7dcac7f1a9d0bf66616fd5c43884d236d1d617993a6ad8b142af0a0609c7c87fd6f1f60e0187c4138246e63733bdce51ddc0ccf31523427e96b9c737c WHIRLPOOL 122044a3ae23a55d2a218478e9c309e9c373e0f00f22a1d97d4c9178cbfa63f4a250a1eff9e2ba6f7e3c80c457fc232e5219ce685347103324bb2b15c59cf4a1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJiBAEBCABMBQJVZ2eTRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 +iQJiBAEBCABMBQJVZ2siRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh -7MEyEACmtAuuGNhLtlEWNtiZUC0H2X2GY8/qbEcv7jujrmL98/8/Y1nKfBdNgkxj -7Up3k9oLO/7andI/Me3jPxl76rKClFPKmp8PvCAOfM+8MSbks01NxKN8RLeiC+WF -yz1aUbqpI8ogfSt+SHnwCKw0XMqURDbxP1fPVncALk8iaWJ6Fgnn4WOgN+NVzu3r -QzHwVd6M/wpQOW63X2C/TAckyX6sPjbD/lfDKiF8PnE5XTijiFK10WArKqo9SAL6 -2d10YW3lGnTTEyN0QAlG7m1okzpCcDJl0LSPk/U30sUHq2GPtX6KsguEu2mMwdbi -DZCk7uQtEcpqpQbEJtWO+Gpe4u4hNhMkjmVhp9Vgl8nxvgOUG++oiV0v51Vbxilr -GxG7ZDlKkeSdGUVRmhOqK/iJwJspMdqac6ctaAG5khbn3j37GKYKYJCjzyRAwmN5 -jRWlhtyo9RindEm6jQgaRekQmIIolGDyvrNkMx0GJMwfTSgZrJ7LFW80EFz1dHG4 -pvVDyGM4pqsHOD2v2oOrJ50SnbMP2ieTv1mTrhEAlCWohLh0gTNcG26gbZVWVyX8 -3xIW9DUWR1Y0mbie87faFE2GOQEUfdPef8WKsA9v0uREhIyIOHOAGFahCCnaUD53 -NoIm6HAgnUKnjiVIIosZ/3qqitXpcCVvl0swYBF13YlmPo6A6A== -=pabJ +7FDiD/9nZDYSONbvGp7XRUY5vGTVwM5RZlQStmdcaC9+uU+E58mISPm64/ZKGaKD +4doMdtI/GguOwjxDg/ZvD38vdfQguq48HxSHubKwIsg7v6mR2PfbZUKq9ovxQpbp +sNOMklQbwJ7a0MlNSXqJIc5s1BIUN7/ArRcELHap6FzuGNLQW9OKmxs/DEBNW3j2 +0F2xko5TrDZJMfcBmFd5mt9+Fn3j2gXa8idW4dKvKCS1ABuZL/+v33XiZglMJ5fM +rpMuOa7TvmSnVlDtZA0GAuEHBb2hGPugsp+ozPQlcRkKbgtNzkz1J6oAyFMpWLW7 +G7jNwWskQz+f0gN1xExeb7sAhYv4uAwo3tyiJy6eEFDX3SvEjPQXOfdyfVUi7sxH +ppVF1AxsMa1snLNDLCFyfg2uiYF8XJrC8MJsiGbhHlOE+1jh3eutVmU8iIBLHajl +zyorg4DyUacjbijW8Ab6h7hA0qsv8rekjd72WuFadWnp7JWPBwyWBY/9P4TN8wfm +IXQaj9m1/PtdygooKoS8EEshIcPQ1yZ74S5GmZRS/eKZzuMDkpPlIxX9qpk0dbET +0ihSFYS4JrkB4x/7/5QiU9PLliIAeNuws6VkyMOMQnipJmmLBCddfUDWJ5Cy3WWD +s12MpAYROwqiZUzAU5rTPk1ezRccENUnPj5oTKHwksCrkvS+zg== +=7sPr -----END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild index fa47be1c71a8..6313c610ef2b 100644 --- a/dev-util/cmake/cmake-3.2.2.ebuild +++ b/dev-util/cmake/cmake-3.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.3 2015/05/28 19:08:02 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.2.2.ebuild,v 1.4 2015/05/28 19:23:13 kensington Exp $ EAPI=5 @@ -16,8 +16,6 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" -REQUIRED_USE="?? ( qt4 qt5 )" - RDEPEND=" >=app-arch/libarchive-2.8.0:= >=dev-libs/expat-2.0.1 |