git: merge conflict resolved

Tools/gnuplot/build-yaml

@@ -1,9 +1,5 @@
 #!/usr/bin/env modbuild
 
-pbuild::pre_configure() {
-	pbuild::add_configure_args '--with-latex=no'
-	pbuild::add_configure_args '--with-qt=no'
-}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8

Tools/gnuplot/files/config.yaml

@@ -1,13 +1,14 @@
+---
 format: 1
 gnuplot:
   defaults:
     group: Tools
-    overlay: base 
+    overlay: base
     relstage: stable
     systems: [rhel8, rhel7, rhel6]
     docfiles: [Copyright, NEWS, README]
     urls:
-      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz 
+      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz
   shasums:
     gnuplot-5.4.10.tar.gz: 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c
     gnuplot-5.4.9.tar.gz: a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97
@@ -27,7 +28,16 @@ gnuplot:
   versions:
     5.4.{0,1,2,3,4,5,8,9};5.2.{0,4,6,7,8};5.0.0;4.6.3:
     5.4.10:
+      config:
+        relstage: stable
+    6.0.0:
       config:
         relstage: unstable
-
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']
+    6.0.1:
+      config:
+        relstage: unstable
+        systems: [rhel*]
+        configure_args: ['--with-latex=no', '--with-qt=no']