Merge updates from master

3 files changed, 41 insertions, 26 deletions

diff --git a/metadata/repoman/linechecks.yaml b/metadata/repoman/linechecks.yaml
index e8755bfaa92e..4f3e6468a5c9 100644
--- a/metadata/repoman/linechecks.yaml
+++ b/metadata/repoman/linechecks.yaml
@@ -10,7 +10,12 @@
 # but support for third party module will be limited to the plugin API
 #
 
-errors: 
+# Repoman API version (do not edit)
+version: 1
+# minimum
+repoman_version: 2.3.3
+
+errors:
     COPYRIGHT_ERROR: 'Invalid Gentoo Copyright on line: %d'
     LICENSE_ERROR: 'Invalid Gentoo/GPL License on line: %d'
     ID_HEADER_ERROR: 'Stale CVS header on line: %d'
@@ -36,7 +41,7 @@ errors:
     URI_HTTPS: 'Ebuild uses http:// but should use https:// on line: %d'
 
 eclass_export_functions:
-    - ant-tasks 
+    - ant-tasks
     - apache-2
     - apache-module
     - aspell-dict
@@ -46,7 +51,7 @@ eclass_export_functions:
     - cannadic
     - clutter
     - cmake-utils
-    - db 
+    - db
     - distutils
     - elisp
     - embassy
@@ -139,10 +144,10 @@ eclass_export_functions:
     - x-modular
     - xorg-2
     - zproduct
-  
+
 eclass_info_experimental_inherit:
-    autotools: 
-        funcs: 
+    autotools:
+        funcs:
             - eaclocal
             - eautoconf
             - eautoheader
@@ -156,13 +161,13 @@ eclass_info_experimental_inherit:
         #       the autotools functions.
         # subversion - An ESVN_BOOTSTRAP variable may be used to call one of
         #       the autotools functions.
-        exempt_eclasses: 
+        exempt_eclasses:
             - git
             - git-2
             - subversion
             - autotools-utils
     eutils:
-        funcs: 
+        funcs:
             - estack_push
             - estack_pop
             - eshopts_push
@@ -178,7 +183,7 @@ eclass_info_experimental_inherit:
             - usex
         comprehensive: false
     flag-o-matic:
-        funcs: 
+        funcs:
             - 'filter-(ld)?flags'
             - 'strip-flags'
             - 'strip-unsupported-flags'
@@ -186,26 +191,26 @@ eclass_info_experimental_inherit:
             - 'append-libs'
         comprehensive: false
     libtool:
-        funcs: 
+        funcs:
             - elibtoolize
         comprehensive: true
-        exempt_eclasses: 
+        exempt_eclasses:
             - autotools
     multilib:
-        funcs: 
+        funcs:
             - get_libdir
         # These are "eclasses are the whole ebuild" type thing.
-        exempt_eclasses: 
+        exempt_eclasses:
             - autotools
             - libtool
             - multilib-minimal
         comprehensive: false
-    multiprocessing: 
+    multiprocessing:
         funcs:
             - makeopts_jobs
         comprehensive: false
     prefix:
-        funcs: 
+        funcs:
             - eprefixify
         comprehensive: true
     toolchain-funcs:
@@ -224,8 +229,8 @@ eclass_info_experimental_inherit:
 
 # non experimental_inherit
 eclass_info:
-    autotools: 
-        funcs: 
+    autotools:
+        funcs:
             - eaclocal
             - eautoconf
             - eautoheader
@@ -240,13 +245,13 @@ eclass_info:
         #       the autotools functions.
         # subversion - An ESVN_BOOTSTRAP variable may be used to call one of
         #       the autotools functions.
-        exempt_eclasses: 
+        exempt_eclasses:
             - git
             - git-2
             - subversion
             - autotools-utils
     prefix:
-        funcs: 
+        funcs:
             - eprefixify
         comprehensive: true
 
diff --git a/metadata/repoman/qa_data.yaml b/metadata/repoman/qa_data.yaml
index a5176cf8036c..c39aec9dda49 100644
--- a/metadata/repoman/qa_data.yaml
+++ b/metadata/repoman/qa_data.yaml
@@ -1,5 +1,5 @@
 ---
-# This yaml syntax file holds various configuration data for 
+# This yaml syntax file holds various configuration data for
 # the Quality-Assurance checks performed.
 
 # no random drive-by commits please
@@ -9,6 +9,11 @@
 # but support for third party module will be limited to the plugin API
 #
 
+# Repoman API version (do not edit)
+version: 1
+# minimum
+repoman_version: 2.3.3
+
 
 allowed_filename_chars: "a-zA-Z0-9._-+:"
 max_description_length: 80
@@ -155,7 +160,7 @@ qahelp:
     wxwidgets:
         eclassnotused: "Ebuild DEPENDs on x11-libs/wxGTK without inheriting wxwidgets.eclass"
 
-# qawarnings: Non-fatal warnings, 
+# qawarnings: Non-fatal warnings,
 #             all values in here MUST have a corresponding qahelp entry
 # list
 qawarnings:
@@ -210,10 +215,10 @@ ruby_deprecated:
     - ruby_targets_ruby19
     - ruby_targets_ruby20
 
-# suspect_rdepend: Common build only Dependencies 
+# suspect_rdepend: Common build only Dependencies
 #                  not usually run time dependencies
 # list
-suspect_rdepend: 
+suspect_rdepend:
   - app-arch/cabextract
   - app-arch/rpm2targz
   - app-doc/doxygen
@@ -256,8 +261,8 @@ suspect_rdepend:
 
 # suspect_virtual: Dependencies that should usually be made to the virtual
 #                  Not to the final target library
-# dictionary  
-suspect_virtual: 
+# dictionary
+suspect_virtual:
   dev-libs/libusb: virtual/libusb
   dev-libs/libusb-compat: virtual/libusb
   dev-libs/libusbx: virtual/libusb
diff --git a/metadata/repoman/repository.yaml b/metadata/repoman/repository.yaml
index e5d453d0d53e..9352604243c3 100644
--- a/metadata/repoman/repository.yaml
+++ b/metadata/repoman/repository.yaml
@@ -10,6 +10,11 @@
 # but support for third party module will be limited to the plugin API
 #
 
+# Repoman API version (do not edit)
+version: 1
+# minimum
+repoman_version: 2.3.3
+
 # NOTE: for non-gentoo repos, any custom modules added will need their
 # module names to the modules list in order for them to run.
 
@@ -68,4 +73,4 @@ linechecks_modules:
     blankline
     addpredict
     noasneeded
-    
+