5 files changed, 64 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 01cdd4e8afdb..dc3d0d942e9d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index e1bf577ac405..97502dd41d1a 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -5,5 +5,9 @@ DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c224
 DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
 EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
 EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968
+<<<<<<< HEAD
+EBUILD bless-0.6.2.ebuild 1089 BLAKE2B 9f655705a567c69a2918ae0af95a2e3f7862eafa2a4d808606ad75c83dbb6ad69e3abdd34a72e9f8e74a119442905bab41b1648047ffdcc5568bf12407d77310 SHA512 480cc2c321892ee1d49325a4b2686c607a314dd347d3218ae7992fe9af770b3545f8af77bbdeb370166fbc2e4b11a21cc542b15121987e6406c652d36136ae0f
+=======
 EBUILD bless-0.6.2-r1.ebuild 1091 BLAKE2B a26ddc20916d8500116c05252dca058f4145eac973d27e697863984121b3d2f477eade47412deb48cdb918886e7bacb4654946bd6f0ec7c31eaedc5151b66c6f SHA512 def48401109372031c03507ffc869a995d82b93c293b8e10fd503f1d9e87ff00b6988c15a19f774793fe7be1983cc1a4ede0c79c5b894ba0dba9950fc093f5c3
+>>>>>>> next
 MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9
diff --git a/dev-util/bless/bless-0.6.2.ebuild b/dev-util/bless/bless-0.6.2.ebuild
new file mode 100644
index 000000000000..d2f0d9b79759
--- /dev/null
+++ b/dev-util/bless/bless-0.6.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 mono-env
+
+DESCRIPTION="GTK# Hex Editor"
+HOMEPAGE="https://github.com/afrantzis/Bless/"
+SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
+# EGIT_COMMIT="v${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	>=dev-lang/mono-1.1.14
+	>=dev-dotnet/gtk-sharp-2.12.21
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=sys-devel/gettext-0.15
+	virtual/pkgconfig
+"
+
+# See bug 278162
+# Waiting on nunit ebuild entering the tree
+RESTRICT="test"
+
+pkg_setup() {
+	mono-env_pkg_setup
+}
+
+src_prepare() {
+	eautoreconf
+	# The autoreconf expects INSTALL to have been copied over by autoconf
+	touch "${S}/INSTALL"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-unix-specific \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific."
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 0a66402463ed..6da6921bf1aa 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,7 @@
 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
 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.1.ebuild
index fbe93d313de5..b3360455dab5 100644
--- a/dev-util/clion/clion-2019.2.1.ebuild
+++ b/dev-util/clion/clion-2019.2.1.ebuild
@@ -9,13 +9,11 @@ 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 )
-	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"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror splitdebug"
+RESTRICT="mirror splitdebug"
 IUSE="custom-jdk"
 
 # RDEPENDS may cause false positives in repoman.