diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /dev-util/clion | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'dev-util/clion')
| -rw-r--r-- | dev-util/clion/Manifest | 8 | ||||
| -rw-r--r-- | dev-util/clion/clion-2019.2.3.ebuild (renamed from dev-util/clion/clion-2019.2.1.ebuild) | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest index 6da6921bf1aa..f06902dc61dc 100644 --- a/dev-util/clion/Manifest +++ b/dev-util/clion/Manifest @@ -1,7 +1,3 @@ -DIST clion-2019.2.1.tar.gz 493159056 BLAKE2B 8264befab42af1a73f9332a9a1bbfc91e9bf09108b0a544d18296feafd200f6c0013be768a5f7dfba29da689903945d81e54b95291d0952c2336be98b0f6357f SHA512 ed96df5872f0c3d911df15b3d00e045df5726d0d4d70225ace2b41b2e8e7ab3c04f22a8f00e9232472853a5ff5baa62b8b2363fbb6d68ba785a74e34c05d4abc -<<<<<<< HEAD -EBUILD clion-2019.2.1.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642 -======= -EBUILD clion-2019.2.1.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de ->>>>>>> next +DIST clion-2019.2.3.tar.gz 495323742 BLAKE2B b4747a4805ec7d8776e3c52c4f94a2d12c1156eff9c0a65e5e275bed269f472d3e8d410e2ef41b2e1504408cf7dfe3f2b8ccee06c5cdba4c8664ad5e7a1873fd SHA512 34599a92b9522cbc6bee6505a26d24b9d4ac727100b2b30414199ac3ec03f73d81c5811f66b35ad51e846eb6fcf66651c522207bb5f471adbf5c5e25d5e7d7d5 +EBUILD clion-2019.2.3.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871 diff --git a/dev-util/clion/clion-2019.2.1.ebuild b/dev-util/clion/clion-2019.2.3.ebuild index b3360455dab5..fbe93d313de5 100644 --- a/dev-util/clion/clion-2019.2.1.ebuild +++ b/dev-util/clion/clion-2019.2.3.ebuild @@ -9,11 +9,13 @@ DESCRIPTION="A complete toolset for C and C++ development" HOMEPAGE="https://www.jetbrains.com/clion" SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="IDEA - || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )" +LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) + Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 + EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM + LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -RESTRICT="mirror splitdebug" +RESTRICT="bindist mirror splitdebug" IUSE="custom-jdk" # RDEPENDS may cause false positives in repoman. |