From b044edb7b008c76a1143f25e5d45d87ebfb88b45 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sun, 30 Jun 2019 16:13:13 +0100
Subject: [PATCH] Full non-boostrap build

---
 eclipse.yaml | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/eclipse.yaml b/eclipse.yaml
index a2bfb1d..db78eae 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -12,7 +12,7 @@ data:
             - MIT
     dependencies:
         - buildrequires:
-              #eclipse: [2019-06]
+              eclipse: [2019-06]
               tycho: [1.4]
               platform: []
           requires:
@@ -48,7 +48,6 @@ data:
     buildopts:
         rpms:
             macros: |
-                %_with_bootstrap 1
                 %_with_jp_minimal 1
                 %_without_javahl 1
                 %_without_spring 1
@@ -168,12 +167,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-linuxtools.
-#           eclipse:
-#               buildorder: 40
-#               ref: eclipse
-#               arches: [x86_64, ppc64le, aarch64, s390x]
-#               rationale: >
-#                   Module API.
+            eclipse:
+                buildorder: 40
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-abrt:
                 buildorder: 50
                 ref: eclipse
@@ -195,12 +194,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
-#           eclipse-ecf:
-#               buildorder: 30
-#               ref: tycho
-#               arches: [x86_64, ppc64le, aarch64, s390x]
-#               rationale: >
-#                   Runtime dependency of eclipse.
+            eclipse-ecf:
+                buildorder: 30
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
             eclipse-egit:
                 buildorder: 40
                 ref: eclipse
@@ -215,12 +214,12 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-#           eclipse-emf:
-#               buildorder: 20
-#               ref: tycho
-#               arches: [x86_64, ppc64le, aarch64, s390x]
-#               rationale: >
-#                   Runtime dependency of eclipse, eclipse-ecf.
+            eclipse-emf:
+                buildorder: 20
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse, eclipse-ecf.
             eclipse-epp-logging:
                 buildorder: 40
                 ref: eclipse