fix(map.jinja): fix useflags regex (gentoo)

* fix(map.jinja): fix useflags regex

When using version inside useflag, the sls_block macro with ebuildpkg regex result in a range error.
Replacing the version argument with uses seem to work as escapes don't really work there.

fix(map.jinja): replace all problematic lines
fix(map.jinja): update available targets

```
----------
          ID: php_install_imagick_dev-php-pecl-imagick
    Function: pkg.installed
        Name: dev-php/pecl-imagick
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib64/python3.6/site-packages/salt/state.py", line 1933, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python3.6/site-packages/salt/loader.py", line 1951, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 1563, in installed
                  **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 651, in _find_install_targets
                  for name, version in desired.items()
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 652, in <listcomp>
                  if not (name in cur_pkgs and (version is None or _fulfills_version_string(cur_pkgs[name], version)))
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 216, in _fulfills_version_string
                  fullfills_all = fullfills_all and _fulfills_version_spec([installed_version], operator, version_string, ignore_epoch=ignore_epoch)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 234, in _fulfills_version_spec
                  if (oper == '==' and fnmatch.fnmatch(ver, desired_version)) \
                File "/usr/lib64/python3.6/fnmatch.py", line 36, in fnmatch
                  return fnmatchcase(name, pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 70, in fnmatchcase
                  match = _compile_pattern(pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 46, in _compile_pattern
                  return re.compile(res).match
                File "/usr/lib64/python3.6/re.py", line 233, in compile
                  return _compile(pattern, flags)
                File "/usr/lib64/python3.6/re.py", line 301, in _compile
                  p = sre_compile.compile(pattern, flags)
                File "/usr/lib64/python3.6/sre_compile.py", line 562, in compile
                  p = sre_parse.parse(p, flags)
                File "/usr/lib64/python3.6/sre_parse.py", line 855, in parse
                  p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, 0)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 765, in _parse
                  p = _parse_sub(source, state, sub_verbose, nested + 1)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 553, in _parse
                  raise source.error(msg, len(this) + 1 + len(that))
              sre_constants.error: bad character range 7-3 at position 20
     Started: 14:28:26.927898
    Duration: 6321.149 ms
     Changes:
```

* Use single-quoting

Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>

php/map.jinja

@@ -2679,7 +2679,7 @@
                 },
     }, merge=True) %}
 {%- else %}
-    {%- set useversion = php_version | replace(".", "-") -%}
+    {%- set useversion = php_version | replace('.', '-') -%}
     {#- Red Hat Softwarecollection prefix lookup belongs to the Red Hat part
        further down but has to go here due to Jinja parsing rules. -#}
     {%- if salt['pillar.get']('php:use_scl_repo', False) -%}
@@ -2820,24 +2820,31 @@
             },
             'Gentoo' : {
                 'pkgs': {
+                    'adodb': 'dev-php/adodb',
                     'apache2': [{'name': 'dev-lang/php','version': ':' + php_version + '[apache2]'}],
-                    'apc': [{'name': 'dev-php/pecl-apcu_bc','version': '[php_targets_php' + useversion + ']'}],
-                    'apcu': [{'name': 'dev-php/pecl-apcu','version': '[php_targets_php' + useversion + ']'}],
+                    'apc': [{'name': 'dev-php/pecl-apcu_bc','uses': '[php_targets_php' + useversion + ']'}],
+                    'apcu': [{'name': 'dev-php/pecl-apcu', 'uses': '[php_targets_php' + useversion + ']'}],
                     'bcmath': [{'name': 'dev-lang/php','version': ':' + php_version + '[bcmath]'}],
                     'bz2': [{'name': 'dev-lang/php','version': ':' + php_version + '[bzip2]'}],
                     'cache-lite': 'dev-php/PEAR-Cache_Lite',
                     'cgi': [{'name': 'dev-lang/php','version': ':' + php_version + '[cgi]'}],
                     'cli': [{'name': 'dev-lang/php','version': ':' + php_version + '[cli]'}],
+                    'composer': 'dev-php/composer',
                     'composer_bin': 'composer',
                     'console-table': 'dev-php/PEAR-Console_Table',
+                    'ctype': [{'name': 'dev-lang/php','version': ':' + php_version + '[ctype]'}],
                     'curl': [{'name': 'dev-lang/php','version': ':' + php_version + '[curl]'}],
                     'ext_conf_path': '/etc/php/fpm-php' + php_version + '/ext',
+                    'fileinfo': [{'name': 'dev-lang/php','version': ':' + php_version + '[fileinfo]'}],
+                    'filter': [{'name': 'dev-lang/php','version': ':' + php_version + '[filter]'}],
                     'fpm': [{'name': 'dev-lang/php','version': ':' + php_version + '[fpm]'}],
                     'gd': [{'name': 'dev-lang/php','version': ':' + php_version + '[gd]'}],
-                    'geoip': [{'name': 'dev-php/pecl-geoip','version': '[php_targets_php' + useversion + ']'}],
+                    'geoip': [{'name': 'dev-php/pecl-geoip','uses': '[php_targets_php' + useversion + ']'}],
                     'gettext': 'dev-php/PEAR-File_Gettext',
                     'gmp': [{'name': 'dev-lang/php','version': ':' + php_version + '[gmp]'}],
-                    'imagick': [{'name': 'dev-php/pecl-imagick','version': '[php_targets_php' + useversion + ']'}],
+                    'hash': [{'name': 'dev-lang/php','version': ':' + php_version + '[hash]'}],
+                    'iconv': [{'name': 'dev-lang/php','version': ':' + php_version + '[iconv]'}],
+                    'imagick': [{'name': 'dev-php/pecl-imagick','uses': '[php_targets_php' + useversion + ']'}],
                     'imap': [{'name': 'dev-lang/php','version': ':' + php_version + '[imap]'}],
                     'intl': [{'name': 'dev-lang/php','version': ':' + php_version + '[intl]'}],
                     'json': [{'name': 'dev-lang/php','version': ':' + php_version + '[json]'}],
@@ -2845,32 +2852,36 @@
                     'local_bin': '/usr/local/bin',
                     'auth-sasl': 'dev-php/PEAR-Auth_SASL',
                     'mail': 'dev-php/PHPMailer',
-                    'memcache': [{'name': 'dev-php/pecl-memcache','version': '[php_targets_php' + useversion + ']'}],
-                    'memcached': [{'name': 'dev-php/pecl-memcached','version': '[php_targets_php' + useversion + ']'}],
-                    'mongo': [{'name': 'dev-php/pecl-mongo','version': '[php_targets_php' + useversion + ']'}],
-                    'mongodb': [{'name': 'dev-php/pecl-mongodb','version': '[php_targets_php' + useversion + ']'}],
+                    'memcache': [{'name': 'dev-php/pecl-memcache','uses': '[php_targets_php' + useversion + ']'}],
+                    'memcached': [{'name': 'dev-php/pecl-memcached','uses': '[php_targets_php' + useversion + ']'}],
+                    'mcrypt': [{'name': 'dev-php/pecl-mcrypt','uses': '[php_targets_php' + useversion + ']'}],
+                    'mongo': [{'name': 'dev-php/pecl-mongo','uses': '[php_targets_php' + useversion + ']'}],
+                    'mongodb': [{'name': 'dev-php/pecl-mongodb','uses': '[php_targets_php' + useversion + ']'}],
                     'mysqlnd': [{'name': 'dev-lang/php','version': ':' + php_version + '[mysql]'}],
                     'mysql': [{'name': 'dev-lang/php','version': ':' + php_version + '[mysqli]'}],
                     'net-smtp': 'dev-php/PEAR-Net_SMTP',
                     'net4': 'dev-php/PEAR-Net_IPv4',
                     'net6': 'dev-php/PEAR-Net_IPv6',
-                    'oauth': [{'name': 'dev-php/pecl-oauth','version': '[php_targets_php' + useversion + ']'}],
+                    'oauth': [{'name': 'dev-php/pecl-oauth','uses': '[php_targets_php' + useversion + ']'}],
                     'opcache': [{'name': 'dev-lang/php','version': ':' + php_version + '[opcache]'}],
                     'pear': 'dev-php/pear',
                     'pgsql': [{'name': 'dev-lang/php','version': ':' + php_version + '[postgres]'}],
                     'php': [{'name': 'dev-lang/php','version': ':' + php_version}],
                     'pspell': [{'name': 'dev-lang/php','version': ':' + php_version + '[spell]'}],
-                    'redis': [{'name': 'dev-php/pecl-redis','version': '[php_targets_php' + useversion + ']'}],
+                    'redis': [{'name': 'dev-php/pecl-redis','uses': '[php_targets_php' + useversion + ']'}],
+                    'session': [{'name': 'dev-lang/php','version': ':' + php_version + '[session]'}],
                     'snmp': [{'name': 'dev-lang/php','version': ':' + php_version + '[snmp]'}],
                     'soap': [{'name': 'dev-lang/php','version': ':' + php_version + '[soap]'}],
-                    'ssh2': [{'name': 'dev-php/pecl-ssh2','version': '[php_targets_php' + useversion + ']'}],
+                    'ssh2': [{'name': 'dev-php/pecl-ssh2','uses': '[php_targets_php' + useversion + ']'}],
                     'sqlite': [{'name': 'dev-lang/php','version': ':' + php_version + '[sqlite]'}],
-                    'sybase': [{'name': 'dev-lang/php','version': ':' + php_version + '[sybase-ct]'}],
                     'tcpdf': 'dev-php/tcpdf',
                     'temp_dir': '/tmp',
                     'tidy': [{'name': 'dev-lang/php','version': ':' + php_version + '[tidy]'}],
-                    'xdebug': [{'name': 'dev-lang/php','version': ':' + php_version + '[debug]'}],
+                    'tokenizer': [{'name': 'dev-lang/php','version': ':' + php_version + '[tokenizer]'}],
+                    'uuid': [{'name': 'dev-php/pecl-uuid','uses': '[php_targets_php' + useversion + ']'}],
+                    'xdebug': [{'name': 'dev-php/xdebug','uses': '[php_targets_php' + useversion + ']'}],
                     'xml': [{'name': 'dev-lang/php','version': ':' + php_version + '[xml]'}],
+                    'xmlwriter': [{'name': 'dev-lang/php','version': ':' + php_version + '[xmlwriter]'}],
                     'xsl': [{'name': 'dev-lang/php','version': ':' + php_version + '[xslt]'}],
                     'zip': [{'name': 'dev-lang/php','version': ':' + php_version + '[zip]'}],
                 },