Revert "Renamed gentoolkitmod module gentoolkit while enforcing absolute imports."

This reverts commit 0f08e6088b.

doc/conf.py

@@ -107,20 +107,7 @@ release = '0.16.3'
 
 master_doc = 'contents'
 templates_path = ['_templates']
-exclude_patterns = [
-    '_build',
-    '_incl/*',
-    'ref/cli/_includes/*.rst',
-    # The references below are just for documents which contain redirect links
-    # and are not present in any doctree.
-    'ref/modules/all/salt.modules.cmdmod.rst',
-    'ref/modules/all/salt.modules.debconfmod.rst',
-    'ref/modules/all/salt.modules.djangomod.rst',
-    'ref/modules/all/salt.modules.virtualenv_mod.rst',
-    'ref/states/all/salt.states.debconfmod.rst',
-    'ref/states/all/salt.states.virtualenv_mod.rst',
-    'ref/modules/all/salt.modules.gentoolkitmod.rst'
-]
+exclude_patterns = ['_build', '_incl/*', 'ref/cli/_includes/*.rst']
 
 extensions = [
     'saltdocs',

doc/ref/modules/all/index.rst

@@ -57,7 +57,7 @@ Full list of builtin execution modules
     freebsdservice
     freebsd_sysctl
     gem
-    gentoolkit
+    gentoolkitmod
     gentoo_service
     git
     glance

doc/ref/modules/all/salt.modules.gentoolkit.rst

@@ -1,6 +0,0 @@
-=======================
-salt.modules.gentoolkit
-=======================
-
-.. automodule:: salt.modules.gentoolkit
-    :members:

doc/ref/modules/all/salt.modules.gentoolkitmod.rst

@@ -1 +1,6 @@
-Please see :doc:`salt.modules.gentoolkit`.
+==========================
+salt.modules.gentoolkitmod
+==========================
+
+.. automodule:: salt.modules.gentoolkitmod
+    :members:

salt/modules/gentoolkitmod.py

@@ -3,16 +3,16 @@ Support for Gentoolkit
 
 '''
 
-# Import python libs
-from __future__ import absolute_import
 import os
 
+HAS_GENTOOLKIT = False
+
 # Import third party libs
 try:
     from gentoolkit.eclean import search, clean, cli, exclude as excludemod
     HAS_GENTOOLKIT = True
 except ImportError:
-    HAS_GENTOOLKIT = False
+    pass
 
 
 def __virtual__():
@@ -20,7 +20,7 @@ def __virtual__():
     Only work on Gentoo systems with gentoolkit installed
     '''
     if __grains__['os'] == 'Gentoo' and HAS_GENTOOLKIT:
-        return True
+        return 'gentoolkit'
     return False
 
 
@@ -122,8 +122,8 @@ def eclean_dist(destructive=False, package_names=False, size_limit=0,
     else:
         try:
             exclude = _parse_exclude(exclude_file)
-        except excludemod.ParseExcludeFileException as exc:
-            ret = {exc: 'Invalid exclusion file: {0}'.format(exclude_file)}
+        except excludemod.ParseExcludeFileException as e:
+            ret = {e: 'Invalid exclusion file: {0}'.format(exclude_file)}
             return ret
 
     if time_limit != 0:
@@ -194,8 +194,8 @@ def eclean_pkg(destructive=False, package_names=False, time_limit=0,
     else:
         try:
             exclude = _parse_exclude(exclude_file)
-        except excludemod.ParseExcludeFileException as exc:
-            ret = {exc: 'Invalid exclusion file: {0}'.format(exclude_file)}
+        except excludemod.ParseExcludeFileException as e:
+            ret = {e: 'Invalid exclusion file: {0}'.format(exclude_file)}
             return ret
 
     if time_limit != 0: