summaryrefslogtreecommitdiff
path: root/app-eselect
diff options
context:
space:
mode:
Diffstat (limited to 'app-eselect')
-rw-r--r--app-eselect/Manifest.gzbin11414 -> 8714 bytes
-rw-r--r--app-eselect/eselect-audicle-1.0.1-r110
-rw-r--r--app-eselect/eselect-audicle/Manifest3
-rw-r--r--app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild27
-rw-r--r--app-eselect/eselect-audicle/metadata.xml5
-rw-r--r--app-eselect/eselect-awk-0.29
-rw-r--r--app-eselect/eselect-awk/Manifest3
-rw-r--r--app-eselect/eselect-awk/eselect-awk-0.2.ebuild18
-rw-r--r--app-eselect/eselect-awk/metadata.xml12
-rw-r--r--app-eselect/eselect-blas-0.110
-rw-r--r--app-eselect/eselect-blas/Manifest4
-rw-r--r--app-eselect/eselect-blas/eselect-blas-0.1.ebuild27
-rw-r--r--app-eselect/eselect-blas/files/blas.eselect-0.114
-rw-r--r--app-eselect/eselect-blas/files/blas.eselect.565
-rw-r--r--app-eselect/eselect-blas/metadata.xml8
-rw-r--r--app-eselect/eselect-cblas-0.110
-rw-r--r--app-eselect/eselect-cblas/Manifest4
-rw-r--r--app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild25
-rw-r--r--app-eselect/eselect-cblas/files/cblas.eselect-0.114
-rw-r--r--app-eselect/eselect-cblas/files/cblas.eselect.565
-rw-r--r--app-eselect/eselect-cblas/metadata.xml8
-rw-r--r--app-eselect/eselect-cdparanoia-0.110
-rw-r--r--app-eselect/eselect-cdparanoia/Manifest3
-rw-r--r--app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild24
-rw-r--r--app-eselect/eselect-cdparanoia/files/cdparanoia.eselect-0.112
-rw-r--r--app-eselect/eselect-cdparanoia/metadata.xml8
-rw-r--r--app-eselect/eselect-chuck-1.0.211
-rw-r--r--app-eselect/eselect-chuck/Manifest3
-rw-r--r--app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild23
-rw-r--r--app-eselect/eselect-chuck/metadata.xml5
-rw-r--r--app-eselect/eselect-ctags-1.1810
-rw-r--r--app-eselect/eselect-ctags/Manifest3
-rw-r--r--app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild24
-rw-r--r--app-eselect/eselect-ctags/metadata.xml8
-rw-r--r--app-eselect/eselect-electron-2.110
-rw-r--r--app-eselect/eselect-electron/Manifest3
-rw-r--r--app-eselect/eselect-electron/eselect-electron-2.1.ebuild24
-rw-r--r--app-eselect/eselect-electron/metadata.xml15
-rw-r--r--app-eselect/eselect-emacs-1.1810
-rw-r--r--app-eselect/eselect-emacs/Manifest3
-rw-r--r--app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild24
-rw-r--r--app-eselect/eselect-emacs/metadata.xml8
-rw-r--r--app-eselect/eselect-fontconfig-1.09
-rw-r--r--app-eselect/eselect-fontconfig-1.110
-rw-r--r--app-eselect/eselect-fontconfig-1.1-r110
-rw-r--r--app-eselect/eselect-fontconfig/Manifest6
-rw-r--r--app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild22
-rw-r--r--app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild23
-rw-r--r--app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild24
-rw-r--r--app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0204
-rw-r--r--app-eselect/eselect-fontconfig/metadata.xml8
-rw-r--r--app-eselect/eselect-gnat-1.3-r110
-rw-r--r--app-eselect/eselect-gnat-1.410
-rw-r--r--app-eselect/eselect-gnat-1.4-r110
-rw-r--r--app-eselect/eselect-gnat-1.510
-rw-r--r--app-eselect/eselect-gnat-1.5-r110
-rw-r--r--app-eselect/eselect-gnat/Manifest12
-rw-r--r--app-eselect/eselect-gnat/eselect-gnat-1.3-r1.ebuild35
-rw-r--r--app-eselect/eselect-gnat/eselect-gnat-1.4-r1.ebuild38
-rw-r--r--app-eselect/eselect-gnat/eselect-gnat-1.4.ebuild38
-rw-r--r--app-eselect/eselect-gnat/eselect-gnat-1.5-r1.ebuild38
-rw-r--r--app-eselect/eselect-gnat/eselect-gnat-1.5.ebuild38
-rw-r--r--app-eselect/eselect-gnat/files/gnat-common-1.3-r1.bash222
-rw-r--r--app-eselect/eselect-gnat/files/gnat-common-1.4-r1.bash225
-rw-r--r--app-eselect/eselect-gnat/files/gnat-common-1.5.bash225
-rw-r--r--app-eselect/eselect-gnat/files/gnat.eselect-1.3206
-rw-r--r--app-eselect/eselect-gnat/files/gnat.eselect-1.4229
-rw-r--r--app-eselect/eselect-gnat/files/gnat.eselect-1.5225
-rw-r--r--app-eselect/eselect-gnat/metadata.xml6
-rw-r--r--app-eselect/eselect-gnome-shell-extensions-2018030611
-rw-r--r--app-eselect/eselect-gnome-shell-extensions/Manifest3
-rw-r--r--app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild48
-rw-r--r--app-eselect/eselect-gnome-shell-extensions/metadata.xml8
-rw-r--r--app-eselect/eselect-infinality-1-r111
-rw-r--r--app-eselect/eselect-infinality/Manifest3
-rw-r--r--app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild27
-rw-r--r--app-eselect/eselect-infinality/metadata.xml11
-rw-r--r--app-eselect/eselect-java-0.4.012
-rw-r--r--app-eselect/eselect-java/Manifest3
-rw-r--r--app-eselect/eselect-java/eselect-java-0.4.0.ebuild39
-rw-r--r--app-eselect/eselect-java/metadata.xml8
-rw-r--r--app-eselect/eselect-lapack-0.111
-rw-r--r--app-eselect/eselect-lapack/Manifest4
-rw-r--r--app-eselect/eselect-lapack/eselect-lapack-0.1.ebuild27
-rw-r--r--app-eselect/eselect-lapack/files/lapack.eselect-0.114
-rw-r--r--app-eselect/eselect-lapack/files/lapack.eselect.565
-rw-r--r--app-eselect/eselect-lapack/metadata.xml8
-rw-r--r--app-eselect/eselect-lcdfilter-112
-rw-r--r--app-eselect/eselect-lcdfilter-212
-rw-r--r--app-eselect/eselect-lcdfilter/Manifest5
-rw-r--r--app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild36
-rw-r--r--app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild34
-rw-r--r--app-eselect/eselect-lcdfilter/metadata.xml11
-rw-r--r--app-eselect/eselect-lib-bin-symlink-0.1.112
-rw-r--r--app-eselect/eselect-lib-bin-symlink-999910
-rw-r--r--app-eselect/eselect-lib-bin-symlink/Manifest4
-rw-r--r--app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild17
-rw-r--r--app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild28
-rw-r--r--app-eselect/eselect-lib-bin-symlink/metadata.xml16
-rw-r--r--app-eselect/eselect-lua-110
-rw-r--r--app-eselect/eselect-lua/Manifest3
-rw-r--r--app-eselect/eselect-lua/eselect-lua-1.ebuild22
-rw-r--r--app-eselect/eselect-lua/files/lua.eselect-1150
-rw-r--r--app-eselect/eselect-lua/metadata.xml11
-rw-r--r--app-eselect/eselect-mesa-0.0.10-r110
-rw-r--r--app-eselect/eselect-mesa/Manifest3
-rw-r--r--app-eselect/eselect-mesa/eselect-mesa-0.0.10-r1.ebuild30
-rw-r--r--app-eselect/eselect-mesa/metadata.xml8
-rw-r--r--app-eselect/eselect-metasploit-0.1611
-rw-r--r--app-eselect/eselect-metasploit/Manifest7
-rw-r--r--app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild40
-rw-r--r--app-eselect/eselect-metasploit/files/91metasploit8
-rw-r--r--app-eselect/eselect-metasploit/files/metasploit.eselect-0.13207
-rw-r--r--app-eselect/eselect-metasploit/files/msfloader-0.1641
-rw-r--r--app-eselect/eselect-metasploit/files/msfrpcd.confd16
-rw-r--r--app-eselect/eselect-metasploit/files/msfrpcd.initd21
-rw-r--r--app-eselect/eselect-metasploit/metadata.xml8
-rw-r--r--app-eselect/eselect-miniaudicle-1.0.1-r210
-rw-r--r--app-eselect/eselect-miniaudicle/Manifest4
-rw-r--r--app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild28
-rw-r--r--app-eselect/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch12
-rw-r--r--app-eselect/eselect-miniaudicle/metadata.xml5
-rw-r--r--app-eselect/eselect-mpg123-0.110
-rw-r--r--app-eselect/eselect-mpg123/Manifest3
-rw-r--r--app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild24
-rw-r--r--app-eselect/eselect-mpg123/files/mpg123.eselect-0.112
-rw-r--r--app-eselect/eselect-mpg123/metadata.xml8
-rw-r--r--app-eselect/eselect-mpost-0.310
-rw-r--r--app-eselect/eselect-mpost/Manifest3
-rw-r--r--app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild30
-rw-r--r--app-eselect/eselect-mpost/files/mpost.eselect-0.3147
-rw-r--r--app-eselect/eselect-mpost/metadata.xml8
-rw-r--r--app-eselect/eselect-notify-send-0.110
-rw-r--r--app-eselect/eselect-notify-send/Manifest3
-rw-r--r--app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild24
-rw-r--r--app-eselect/eselect-notify-send/files/notify-send.eselect-0.112
-rw-r--r--app-eselect/eselect-notify-send/metadata.xml7
-rw-r--r--app-eselect/eselect-oodict-2010022810
-rw-r--r--app-eselect/eselect-oodict/Manifest3
-rw-r--r--app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild21
-rw-r--r--app-eselect/eselect-oodict/metadata.xml11
-rw-r--r--app-eselect/eselect-opencascade-08
-rw-r--r--app-eselect/eselect-opencascade/Manifest3
-rw-r--r--app-eselect/eselect-opencascade/eselect-opencascade-0.ebuild28
-rw-r--r--app-eselect/eselect-opencascade/files/eselect-opencascade-0.eselect104
-rw-r--r--app-eselect/eselect-opencascade/metadata.xml8
-rw-r--r--app-eselect/eselect-opencl-1.1.0-r412
-rw-r--r--app-eselect/eselect-opencl/Manifest9
-rw-r--r--app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild68
-rw-r--r--app-eselect/eselect-opencl/metadata.xml13
-rw-r--r--app-eselect/eselect-opengl-1.3.1-r412
-rw-r--r--app-eselect/eselect-opengl/Manifest3
-rw-r--r--app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild79
-rw-r--r--app-eselect/eselect-opengl/metadata.xml13
-rw-r--r--app-eselect/eselect-package-manager-20110108-r110
-rw-r--r--app-eselect/eselect-package-manager/Manifest3
-rw-r--r--app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild20
-rw-r--r--app-eselect/eselect-package-manager/metadata.xml8
-rw-r--r--app-eselect/eselect-pdftex-0.310
-rw-r--r--app-eselect/eselect-pdftex/Manifest3
-rw-r--r--app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild30
-rw-r--r--app-eselect/eselect-pdftex/files/pdftex.eselect-0.3147
-rw-r--r--app-eselect/eselect-pdftex/metadata.xml8
-rw-r--r--app-eselect/eselect-php-0.9.4-r513
-rw-r--r--app-eselect/eselect-php-0.9.513
-rw-r--r--app-eselect/eselect-php-999911
-rw-r--r--app-eselect/eselect-php/Manifest9
-rw-r--r--app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild44
-rw-r--r--app-eselect/eselect-php/eselect-php-0.9.5.ebuild44
-rw-r--r--app-eselect/eselect-php/eselect-php-9999.ebuild49
-rw-r--r--app-eselect/eselect-php/files/php-fpm-launcher7
-rw-r--r--app-eselect/eselect-php/files/php-fpm-launcher-r311
-rw-r--r--app-eselect/eselect-php/files/php-fpm.conf1
-rw-r--r--app-eselect/eselect-php/metadata.xml13
-rw-r--r--app-eselect/eselect-pinentry-0.79
-rw-r--r--app-eselect/eselect-pinentry/Manifest3
-rw-r--r--app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild23
-rw-r--r--app-eselect/eselect-pinentry/files/pinentry.eselect-0.712
-rw-r--r--app-eselect/eselect-pinentry/metadata.xml8
-rw-r--r--app-eselect/eselect-postgresql-2.311
-rw-r--r--app-eselect/eselect-postgresql/Manifest3
-rw-r--r--app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild34
-rw-r--r--app-eselect/eselect-postgresql/metadata.xml12
-rw-r--r--app-eselect/eselect-python-2016051610
-rw-r--r--app-eselect/eselect-python-2017120410
-rw-r--r--app-eselect/eselect-python-9999999910
-rw-r--r--app-eselect/eselect-python/Manifest6
-rw-r--r--app-eselect/eselect-python/eselect-python-20160516.ebuild39
-rw-r--r--app-eselect/eselect-python/eselect-python-20171204.ebuild40
-rw-r--r--app-eselect/eselect-python/eselect-python-99999999.ebuild40
-rw-r--r--app-eselect/eselect-python/metadata.xml8
-rw-r--r--app-eselect/eselect-qtgraphicssystem-1.1.110
-rw-r--r--app-eselect/eselect-qtgraphicssystem/Manifest3
-rw-r--r--app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild21
-rw-r--r--app-eselect/eselect-qtgraphicssystem/metadata.xml11
-rw-r--r--app-eselect/eselect-rails-0.2310
-rw-r--r--app-eselect/eselect-rails-0.2410
-rw-r--r--app-eselect/eselect-rails/Manifest5
-rw-r--r--app-eselect/eselect-rails/eselect-rails-0.23.ebuild29
-rw-r--r--app-eselect/eselect-rails/eselect-rails-0.24.ebuild29
-rw-r--r--app-eselect/eselect-rails/metadata.xml8
-rw-r--r--app-eselect/eselect-renpy-0.79
-rw-r--r--app-eselect/eselect-renpy/Manifest3
-rw-r--r--app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild39
-rw-r--r--app-eselect/eselect-renpy/files/renpy.eselect-0.714
-rw-r--r--app-eselect/eselect-renpy/metadata.xml12
-rw-r--r--app-eselect/eselect-repository-313
-rw-r--r--app-eselect/eselect-repository-413
-rw-r--r--app-eselect/eselect-repository-999912
-rw-r--r--app-eselect/eselect-repository/Manifest6
-rw-r--r--app-eselect/eselect-repository/eselect-repository-3.ebuild40
-rw-r--r--app-eselect/eselect-repository/eselect-repository-4.ebuild40
-rw-r--r--app-eselect/eselect-repository/eselect-repository-9999.ebuild41
-rw-r--r--app-eselect/eselect-repository/metadata.xml12
-rw-r--r--app-eselect/eselect-ruby-2016122610
-rw-r--r--app-eselect/eselect-ruby-2017072310
-rw-r--r--app-eselect/eselect-ruby-2017122510
-rw-r--r--app-eselect/eselect-ruby/Manifest7
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild22
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild22
-rw-r--r--app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild22
-rw-r--r--app-eselect/eselect-ruby/metadata.xml8
-rw-r--r--app-eselect/eselect-rust-0.3_pre2015042810
-rw-r--r--app-eselect/eselect-rust/Manifest3
-rw-r--r--app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild30
-rw-r--r--app-eselect/eselect-rust/metadata.xml10
-rw-r--r--app-eselect/eselect-scala-0.1.110
-rw-r--r--app-eselect/eselect-scala/Manifest3
-rw-r--r--app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild20
-rw-r--r--app-eselect/eselect-scala/metadata.xml11
-rw-r--r--app-eselect/eselect-sh-0.4-r29
-rw-r--r--app-eselect/eselect-sh/Manifest3
-rw-r--r--app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild22
-rw-r--r--app-eselect/eselect-sh/files/sh.eselect-0.4-r213
-rw-r--r--app-eselect/eselect-sh/metadata.xml8
-rw-r--r--app-eselect/eselect-sndpeek-1.0.110
-rw-r--r--app-eselect/eselect-sndpeek/Manifest3
-rw-r--r--app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild22
-rw-r--r--app-eselect/eselect-sndpeek/metadata.xml5
-rw-r--r--app-eselect/eselect-timezone-0.29
-rw-r--r--app-eselect/eselect-timezone/Manifest3
-rw-r--r--app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild18
-rw-r--r--app-eselect/eselect-timezone/metadata.xml8
-rw-r--r--app-eselect/eselect-timidity-2011051310
-rw-r--r--app-eselect/eselect-timidity/Manifest3
-rw-r--r--app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild20
-rw-r--r--app-eselect/eselect-timidity/metadata.xml8
-rw-r--r--app-eselect/eselect-unison-0.310
-rw-r--r--app-eselect/eselect-unison/Manifest3
-rw-r--r--app-eselect/eselect-unison/eselect-unison-0.3.ebuild27
-rw-r--r--app-eselect/eselect-unison/files/unison.eselect-0.3145
-rw-r--r--app-eselect/eselect-unison/metadata.xml8
-rw-r--r--app-eselect/eselect-vdr-0.0.310
-rw-r--r--app-eselect/eselect-vdr/Manifest3
-rw-r--r--app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild22
-rw-r--r--app-eselect/eselect-vdr/metadata.xml8
-rw-r--r--app-eselect/eselect-vi-1.1.910
-rw-r--r--app-eselect/eselect-vi/Manifest3
-rw-r--r--app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild20
-rw-r--r--app-eselect/eselect-vi/metadata.xml8
-rw-r--r--app-eselect/eselect-wine-1.2.210
-rw-r--r--app-eselect/eselect-wine/Manifest3
-rw-r--r--app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild47
-rw-r--r--app-eselect/eselect-wine/metadata.xml15
-rw-r--r--app-eselect/eselect-wxwidgets-2014042311
-rw-r--r--app-eselect/eselect-wxwidgets/Manifest4
-rw-r--r--app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild54
-rw-r--r--app-eselect/eselect-wxwidgets/metadata.xml8
-rw-r--r--app-eselect/eselect-xvmc-0.49
-rw-r--r--app-eselect/eselect-xvmc/Manifest3
-rw-r--r--app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild23
-rw-r--r--app-eselect/eselect-xvmc/files/eselect-xvmc-0.4.eselect198
-rw-r--r--app-eselect/eselect-xvmc/metadata.xml11
-rw-r--r--app-eselect/metadata.xml12
274 files changed, 5860 insertions, 705 deletions
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 8a54eced0348..2379ec2608da 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
Binary files differ
diff --git a/app-eselect/eselect-audicle-1.0.1-r1 b/app-eselect/eselect-audicle-1.0.1-r1
deleted file mode 100644
index 387f09f9f6f6..000000000000
--- a/app-eselect/eselect-audicle-1.0.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages the /usr/bin/audicle symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/audicle.eselect-1.0.1.bz2
-_md5_=2b192cbfe2c6335aa24022a5653c8a9b
diff --git a/app-eselect/eselect-audicle/Manifest b/app-eselect/eselect-audicle/Manifest
new file mode 100644
index 000000000000..a738968288ab
--- /dev/null
+++ b/app-eselect/eselect-audicle/Manifest
@@ -0,0 +1,3 @@
+DIST audicle.eselect-1.0.1.bz2 1266 BLAKE2B 28a9199d1e1dcd781243c4f40409d2afa2f588140b7170185b6a2a97a8bc2800e7fdfd06d82faefd412937d1f5d859d4cccfa900363d02697902e27a6c625600 SHA512 bf60c4d1679ad4d8e5334fc3841c417b78cf836ed9ea313a8d4c4c0be092a6ae1cc85daf8eb545a420803e56f57c334c3f4b529df476f40de99ce365fb75e659
+EBUILD eselect-audicle-1.0.1-r1.ebuild 597 BLAKE2B c6cc05289077bcb4d9dd8b073c59855c5516bb969179d73599a8577a3652f19fde3f5d47a3135672c9a1f6354a132efc2a2ae0536d37fcb0d3fcf021ce09a973 SHA512 8e48ce04d96c2cb72ba3c6167ddb361f9f47cd17ba896331a2f7f24c420e106128aa9b33f12405c56f46a601fac9bbf3312e1cf4d5f290dad6765f4bf3ac8006
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..2e286d365ddf
--- /dev/null
+++ b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages the /usr/bin/audicle symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/audicle.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+ sed -i -e 's/highlight_maker/highlight_marker/' "${WORKDIR}/audicle.eselect-${PV}" || die
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/audicle.eselect-${PV}" audicle.eselect
+}
diff --git a/app-eselect/eselect-audicle/metadata.xml b/app-eselect/eselect-audicle/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-eselect/eselect-audicle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-eselect/eselect-awk-0.2 b/app-eselect/eselect-awk-0.2
deleted file mode 100644
index 6789d68bcb97..000000000000
--- a/app-eselect/eselect-awk-0.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the {,/usr}/bin/awk symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~junghans/distfiles/eselect-awk-0.2.tar.gz
-_md5_=626cbc85ddee947292e878d6e0ad8f3c
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
new file mode 100644
index 000000000000..7f8f285a5894
--- /dev/null
+++ b/app-eselect/eselect-awk/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
+EBUILD eselect-awk-0.2.ebuild 503 BLAKE2B 70874a57fdf4a481c87d90504667b73c25046175a6dcaa77206ebb5c1b5e3829f144e64972675d901b68286a063217e788b694e8399cc6c094a350100c383808 SHA512 ac20cad7374e7acad40ccd2950cc90f9164a1afcad9fc09ccc75176d7e589984c87a10623f3c87dfee865173653a6c053f3ec46e35ab6db9f692de058e2efa23
+MISC metadata.xml 372 BLAKE2B 7d8462555c43bd348728c94113ea20312aca3d126874bfa2d2e8ffcff87df07ba9de74cc9d3c1f2d51b3779ed742a3c05d80549735406ef6f499e4343c468dd2 SHA512 dcd1c89d7c9e64f49ea4531c40482c7911e6b7f2873691d0dbb395ea179bf1a1be3bd4da9633e802e164ac837b5f3212844094c2a4773af7ab415e9005241b1e
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
new file mode 100644
index 000000000000..891e5e6a896a
--- /dev/null
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins awk.eselect
+}
diff --git a/app-eselect/eselect-awk/metadata.xml b/app-eselect/eselect-awk/metadata.xml
new file mode 100644
index 000000000000..9218df9e2c8f
--- /dev/null
+++ b/app-eselect/eselect-awk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>junghans@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/app-eselect/eselect-blas-0.1 b/app-eselect/eselect-blas-0.1
deleted file mode 100644
index 6c7f7e9b398c..000000000000
--- a/app-eselect/eselect-blas-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-admin/eselect-1.0.5
-DESCRIPTION=BLAS module for eselect
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.5
-SLOT=0
-_md5_=502cb0db3cb8b95ea342cfdf395ac589
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
new file mode 100644
index 000000000000..afc0575d6d9c
--- /dev/null
+++ b/app-eselect/eselect-blas/Manifest
@@ -0,0 +1,4 @@
+AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
+AUX blas.eselect.5 2065 BLAKE2B a86cf9f357871021867c30a24fe945435d247b755eec8557c4e6986fab7658ee2ee7246e46c650998a5ce252544f35142ec4d67a8c4e865602d02779e812ac20 SHA512 94264f61bbe29ac027d9ec82b3921e99cc8f7108544682508748e407fbe7d393748cef876c240796adf82122370ac963def90fd8b01a3186049223e3eaf21ffd
+EBUILD eselect-blas-0.1.ebuild 705 BLAKE2B e38600034c9ea73493becd2d2ea98cfc04c8ad7bc048ac48d1ef9fc39872f8ac318f2f5baa8d25d9ad1ab3a4049ed3ea0c99395b168cc049f96db13e388f65df SHA512 46fad0931295638d1fef7f976d16ff1151c95fe9fa209b02239e85c97a1f1d89e541bac67c95ec39a34b9395655c1c81d35605c7e45d1f3401f48be827fec27c
+MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
new file mode 100644
index 000000000000..9409504502f1
--- /dev/null
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="BLAS module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+# Need skel.bash lib
+RDEPEND=">=app-admin/eselect-1.0.5"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="blas"
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/${MODULE}.eselect-${PVR} ${MODULE}.eselect
+ doman "${FILESDIR}"/blas.eselect.5
+}
diff --git a/app-eselect/eselect-blas/files/blas.eselect-0.1 b/app-eselect/eselect-blas/files/blas.eselect-0.1
new file mode 100644
index 000000000000..cb2a03cd8668
--- /dev/null
+++ b/app-eselect/eselect-blas/files/blas.eselect-0.1
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit skel
+
+MODULE="BLAS"
+IFACE="blas"
+
+DESCRIPTION="Manage installed $MODULE implementations"
+MAINTAINER="spyderous@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:46:52 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# vim: set ft=eselect :
diff --git a/app-eselect/eselect-blas/files/blas.eselect.5 b/app-eselect/eselect-blas/files/blas.eselect.5
new file mode 100644
index 000000000000..c9df9fde8d7f
--- /dev/null
+++ b/app-eselect/eselect-blas/files/blas.eselect.5
@@ -0,0 +1,65 @@
+.TH "ESELECT" "5" "June 2006" "Gentoo Linux" "eselect"
+.SH "NAME"
+blas.eselect \- The BLAS management module for Gentoo's eselect
+.SH "SYNOPSIS"
+\fBeselect blas\fR [\fBhelp\fR|\fBusage\fR]
+.br
+\fBeselect blas\fR \fBlist\fR [\fIoptions\fR]
+.br
+\fBeselect blas\fR \fBadd\fR
+.br
+\fBeselect blas\fR \fBset\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+\fBeselect blas\fR \fBshow\fR [\fIoptions\fR]
+
+.SH "DESCRIPTION"
+\fBeselect\fR is Gentoo's configuration and management tool. It features
+modules that care for the individual administrative tasks.
+.SH "ACTION: LIST"
+\fBeselect blas list\fR [\fIoptions\fR]
+.br
+Displays an ordered list of installed BLAS implementations. It distinguishes between versions with different
+Application Binary Interfaces (e.g. x86/AMD64). Furthermore, it also distinguishes
+between interfaces to high-level programming languages. Each line holds
+a number and the implementation's name. An asterisk next to one of the list
+elements denotes an active implementation.
+
+phi / # eselect blas list
+.br
+Installed BLAS for libdir \fBlib\fR
+.br
+ [1] atlas *
+ [2] reference
+
+Possible \fIoptions\fR to the \fBlist\fR action are restrictions to
+handle only certain ABI\-specific library directories. For example,
+
+\fBeselect blas list lib64\fR
+
+lists only BLAS implementations found in \fB/usr/lib64\fR.
+
+.SH "ACTION: SHOW"
+\fBeselect blas show\fR [\fIoptions\fR]
+.br
+Shows your system's currently active BLAS implementations.
+
+phi / # eselect blas show
+.br
+lib: atlas
+.br
+lib64: reference
+
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBshow\fR action to restrict it to given ABIs.
+.SH "ACTION: SET"
+\fBeselect blas set\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+Sets your system's currently active BLAS implementations to \fIimplementation\fR.
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBset\fR action to restrict it to given ABIs.
+
+phi / # eselect blas set atlas
+.SH "AUTHOR"
+Danny van Dyk <kugelfang@gentoo.org>
+.br
+Donnie Berkholz <spyderous@gentoo.org>
diff --git a/app-eselect/eselect-blas/metadata.xml b/app-eselect/eselect-blas/metadata.xml
new file mode 100644
index 000000000000..0c6991d7902b
--- /dev/null
+++ b/app-eselect/eselect-blas/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-cblas-0.1 b/app-eselect/eselect-cblas-0.1
deleted file mode 100644
index 845463088715..000000000000
--- a/app-eselect/eselect-cblas-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-admin/eselect-1.0.5
-DESCRIPTION=C-language BLAS module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.5
-SLOT=0
-_md5_=3eb19f15e982e2c42f2c01c6704dd345
diff --git a/app-eselect/eselect-cblas/Manifest b/app-eselect/eselect-cblas/Manifest
new file mode 100644
index 000000000000..b18ff5c03cad
--- /dev/null
+++ b/app-eselect/eselect-cblas/Manifest
@@ -0,0 +1,4 @@
+AUX cblas.eselect-0.1 352 BLAKE2B 37d0a10ae67971ff3282620343b971e6ab495c69017b9bf37e0d94f7ac1672e9d861d5f86958483a526ed1e0b2b76f2ca61a352238db349370ae298fc435e9ca SHA512 3f030c57d59a48817ee1eeafb3e967395c57f7f46724ffe134fcc58e6b4a3f37cad368fb4ab7f7e3cecf9a91bee4f7e1ef315dfcae6d0abbd80c7f85decc4f76
+AUX cblas.eselect.5 2084 BLAKE2B e53c8453fb20a575affa39a8d8980f4726561aa0ddbf16e59e9ad715c8c0d333bb23a767a415bb726099d2e2fb1ea943ca7421fb09d90c94922aa7a3d06b801d SHA512 1cc53334d65439a00bd3836bfaa5e130d946d0878d6a440974ff218d79aa10d3099edc7a84c94b300d742b96153d535649cd1580e2bd226d784a4dddc4a3cd41
+EBUILD eselect-cblas-0.1.ebuild 735 BLAKE2B dc5b954cb350a68c064a7bc50ae465a7a0869aa67d4481b2c785ce843d5939aec7dae678d6c1fc056df152526311f6b8c1fb38459359f71e464acda97312a807 SHA512 9d7c0798ed731d60193f1d90d5866b0b104f35ac418902d6f3083143f8a79aa019bf2defb62d6928cd28ffb0b5da11c4404c0f551e199cbd1a0f2c3264e92cdd
+MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
new file mode 100644
index 000000000000..91a1679d74ff
--- /dev/null
+++ b/app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="C-language BLAS module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+# Need skel.bash lib
+RDEPEND=">=app-admin/eselect-1.0.5"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="cblas"
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/${MODULE}.eselect-${PVR} ${MODULE}.eselect
+ doman "${FILESDIR}"/cblas.eselect.5
+}
diff --git a/app-eselect/eselect-cblas/files/cblas.eselect-0.1 b/app-eselect/eselect-cblas/files/cblas.eselect-0.1
new file mode 100644
index 000000000000..2fff5981450a
--- /dev/null
+++ b/app-eselect/eselect-cblas/files/cblas.eselect-0.1
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit skel
+
+MODULE="CBLAS"
+IFACE="cblas"
+
+DESCRIPTION="Manage installed $MODULE implementations"
+MAINTAINER="spyderous@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:47:06 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# vim: set ft=eselect :
diff --git a/app-eselect/eselect-cblas/files/cblas.eselect.5 b/app-eselect/eselect-cblas/files/cblas.eselect.5
new file mode 100644
index 000000000000..6409002d74b6
--- /dev/null
+++ b/app-eselect/eselect-cblas/files/cblas.eselect.5
@@ -0,0 +1,65 @@
+.TH "ESELECT" "5" "June 2006" "Gentoo Linux" "eselect"
+.SH "NAME"
+cblas.eselect \- The CBLAS management module for Gentoo's eselect
+.SH "SYNOPSIS"
+\fBeselect cblas\fR [\fBhelp\fR|\fBusage\fR]
+.br
+\fBeselect cblas\fR \fBlist\fR [\fIoptions\fR]
+.br
+\fBeselect cblas\fR \fBadd\fR
+.br
+\fBeselect cblas\fR \fBset\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+\fBeselect cblas\fR \fBshow\fR [\fIoptions\fR]
+
+.SH "DESCRIPTION"
+\fBeselect\fR is Gentoo's configuration and management tool. It features
+modules that care for the individual administrative tasks.
+.SH "ACTION: LIST"
+\fBeselect cblas list\fR [\fIoptions\fR]
+.br
+Displays an ordered list of installed CBLAS implementations. It distinguishes between versions with different
+Application Binary Interfaces (e.g. x86/AMD64). Furthermore, it also distinguishes
+between interfaces to high-level programming languages. Each line holds
+a number and the implementation's name. An asterisk next to one of the list
+elements denotes an active implementation.
+
+phi / # eselect cblas list
+.br
+Installed CBLAS for libdir \fBlib\fR
+.br
+ [1] atlas *
+ [2] reference
+
+Possible \fIoptions\fR to the \fBlist\fR action are restrictions to
+handle only certain ABI\-specific library directories. For example,
+
+\fBeselect cblas list lib64\fR
+
+lists only CBLAS implementations found in \fB/usr/lib64\fR.
+
+.SH "ACTION: SHOW"
+\fBeselect cblas show\fR [\fIoptions\fR]
+.br
+Shows your system's currently active CBLAS implementations.
+
+phi / # eselect cblas show
+.br
+lib: atlas
+.br
+lib64: reference
+
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBshow\fR action to restrict it to given ABIs.
+.SH "ACTION: SET"
+\fBeselect cblas set\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+Sets your system's currently active CBLAS implementations to \fIimplementation\fR.
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBset\fR action to restrict it to given ABIs.
+
+phi / # eselect cblas set atlas
+.SH "AUTHOR"
+Danny van Dyk <kugelfang@gentoo.org>
+.br
+Donnie Berkholz <spyderous@gentoo.org>
diff --git a/app-eselect/eselect-cblas/metadata.xml b/app-eselect/eselect-cblas/metadata.xml
new file mode 100644
index 000000000000..0c6991d7902b
--- /dev/null
+++ b/app-eselect/eselect-cblas/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-cdparanoia-0.1 b/app-eselect/eselect-cdparanoia-0.1
deleted file mode 100644
index 892f6ecc9679..000000000000
--- a/app-eselect/eselect-cdparanoia-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
-DESCRIPTION=Manage /usr/bin/cdparanoia symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/cdparanoia-3.10.2-r5
-SLOT=0
-_md5_=8607cf06b18c20c2a49944610e85788d
diff --git a/app-eselect/eselect-cdparanoia/Manifest b/app-eselect/eselect-cdparanoia/Manifest
new file mode 100644
index 000000000000..b4141d72ab49
--- /dev/null
+++ b/app-eselect/eselect-cdparanoia/Manifest
@@ -0,0 +1,3 @@
+AUX cdparanoia.eselect-0.1 364 BLAKE2B dbdf0c69f8ab295bed4529d7c2178f4c5bb64862d7192eb37c280eba47fd566fdb1ba60109b3e289e35e9a55b4d6fb32dfe06f19ca51d4cc76df6ced769679ce SHA512 000d15d17432e7fd7d1e6c56b3ac6069f6ae20a08e20f0380879695bbba726102469fda8ef862f3e23fd8878b1a986e60f4d8194cf19a85eb39b6bf5378a262e
+EBUILD eselect-cdparanoia-0.1.ebuild 690 BLAKE2B e707e6673f91471a4e7aa5eb245ea4c1d47b04081c140d9bb188c01cd9d6c9c2c2646f98832e6cded98fc4a597d5e3e1216a74bce9eec211bc56d82122e12030 SHA512 3dcc5db8a690e6ce306c8b4a9c11669af3f977a7d2376d32a7ca5c5d2918f8ea5f74388044796b929d27e4d147e91f200ec5395fbb406cac5c98a226681b885f
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
new file mode 100644
index 000000000000..e4a74f076ea6
--- /dev/null
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manage /usr/bin/cdparanoia symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
+ !<media-sound/cdparanoia-3.10.2-r5"
+DEPEND=${RDEPEND}
+
+S=${FILESDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins cdparanoia.eselect-${PV} cdparanoia.eselect
+}
diff --git a/app-eselect/eselect-cdparanoia/files/cdparanoia.eselect-0.1 b/app-eselect/eselect-cdparanoia/files/cdparanoia.eselect-0.1
new file mode 100644
index 000000000000..70e832e601e2
--- /dev/null
+++ b/app-eselect/eselect-cdparanoia/files/cdparanoia.eselect-0.1
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/cdparanoia implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.1"
+
+SYMLINK_PATH=/usr/bin/cdparanoia
+SYMLINK_TARGETS=( cdparanoia-paranoia libcdio-paranoia )
+SYMLINK_DESCRIPTION='cdparanoia binary'
+
+inherit bin-symlink
diff --git a/app-eselect/eselect-cdparanoia/metadata.xml b/app-eselect/eselect-cdparanoia/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/app-eselect/eselect-cdparanoia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-chuck-1.0.2 b/app-eselect/eselect-chuck-1.0.2
deleted file mode 100644
index 47ac07b97eca..000000000000
--- a/app-eselect/eselect-chuck-1.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<=media-sound/chuck-1.2.1.2
-DESCRIPTION=Manages the /usr/bin/chuck symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/chuck.eselect-1.0.2.bz2
-_md5_=f2d7a4c2cf629ccb428d2ff9b2b3a272
diff --git a/app-eselect/eselect-chuck/Manifest b/app-eselect/eselect-chuck/Manifest
new file mode 100644
index 000000000000..fe955e8176fb
--- /dev/null
+++ b/app-eselect/eselect-chuck/Manifest
@@ -0,0 +1,3 @@
+DIST chuck.eselect-1.0.2.bz2 1261 BLAKE2B 9d8171538a8846a8b7ab1d932bd03234e4d2e2e99a5bf951e0cca95b5c5a20612e87f0b1eaa8997f9f7ef14aa5f4749264cd8ba52fc858681f29b060f6cadaf8 SHA512 a89f0ed00a44e81ff16b8668cfa23a0c794efc35bbcf5e2f06eb5fe9a56095948fa8ddf36a8a3371fc7ab255f539b563831b527717b58149d19dc0d3c32ca387
+EBUILD eselect-chuck-1.0.2.ebuild 515 BLAKE2B 172716d82a21a183218c311d99596887a8225f118cdbcf587ed91b480785dc4cd31107355e23a608201ba45a219f1437a8425c5b96c40c0a3179380e1fea9866 SHA512 c8a1ec0edca6a4de99aed2d63649c9e56f52d41d6a1f1d7ab411f72372d599139934ac36d41594db084e3f33df93e79250a1000bde231ec23887938c6d618ff0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
new file mode 100644
index 000000000000..113ad8515a9f
--- /dev/null
+++ b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages the /usr/bin/chuck symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/chuck.eselect-${PVR}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+DEPEND="!<=media-sound/chuck-1.2.1.2"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/chuck.eselect-${PVR}" chuck.eselect || die
+}
diff --git a/app-eselect/eselect-chuck/metadata.xml b/app-eselect/eselect-chuck/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-eselect/eselect-chuck/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-eselect/eselect-ctags-1.18 b/app-eselect/eselect-ctags-1.18
deleted file mode 100644
index 12f168eeec69..000000000000
--- a/app-eselect/eselect-ctags-1.18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages ctags implementations
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=!<app-eselect/eselect-emacs-1.18 >=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=0f3f6c7eb2dd87392da799ce526fa760
diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
new file mode 100644
index 000000000000..cc362c90988c
--- /dev/null
+++ b/app-eselect/eselect-ctags/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
+EBUILD eselect-ctags-1.18.ebuild 790 BLAKE2B b2966459ed74bcfd8cf4915aaed932fc0541358d31704a213da9f6be69252ae613b8e05aa911278b19dc22c32015697c21caa3f7425e9c6da099cea438ca7474 SHA512 004669fe2984e355f45c9806ca0b380299b82479fa2df6c571c297277f447014eabe5d582b72042168a93e64780a35fad13ad84f437d1c468a3b645497727c86
+MISC metadata.xml 251 BLAKE2B bb5fdd6fc58b43ac34ba535ab822795cb5579f40ff49cf5f5a8f3e3f248e101c4a9c97b608f6496d9cf48a4bbfcf93d665c8ca6b8bde9e41623238ea084a379b SHA512 65b7ed1e032f046e0afbc0d0d9da9fcfc4df47d68cd3076cc1f1f645ba0d9a9bce16265dc9b26e666190cd574ee4ac6203b4d7e01a55c5d79081377a52f2860d
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
new file mode 100644
index 000000000000..f5ec6ede5256
--- /dev/null
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="eselect-emacs-${PV}"
+DESCRIPTION="Manages ctags implementations"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="!<app-eselect/eselect-emacs-1.18
+ >=app-admin/eselect-1.2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins {ctags,etags}.eselect
+ doman {ctags,etags}.eselect.5
+}
diff --git a/app-eselect/eselect-ctags/metadata.xml b/app-eselect/eselect-ctags/metadata.xml
new file mode 100644
index 000000000000..a1a37697cb80
--- /dev/null
+++ b/app-eselect/eselect-ctags/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-electron-2.1 b/app-eselect/eselect-electron-2.1
deleted file mode 100644
index 633e3d8b6dbb..000000000000
--- a/app-eselect/eselect-electron-2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Utility to select the default Electron slot
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/elprans/eselect-electron/archive/v2.1.tar.gz -> eselect-electron-2.1.tar.gz
-_md5_=a6b09cbbd6c00702845431d5d49f6b9f
diff --git a/app-eselect/eselect-electron/Manifest b/app-eselect/eselect-electron/Manifest
new file mode 100644
index 000000000000..7dcafc28ee44
--- /dev/null
+++ b/app-eselect/eselect-electron/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-electron-2.1.tar.gz 9658 BLAKE2B c5bcd58f5b82c3c9f4cb1e6cfb26665b7524b0d973a717437a18f5ee66fa5fe30bdd4e82673efc8199dc4a637a0b93ba537a62fc060d68b3bde7370138f815ce SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47
+EBUILD eselect-electron-2.1.ebuild 667 BLAKE2B 04f7602b7a9fd969c1c865561f2fd5052be9e648337fc2ab70e2e90bfd620e9ad8d1c1a23700ee1a3ca0acd19b85725e511f058e44b3d03de983760cb71acb75 SHA512 e187c4b75826f699c8af078b6c3b5818a1d9ddeab512aa102650795d10953c94801499f48a827b24f2c63691a50937ce68fde140e32d14848f83813693722d75
+MISC metadata.xml 455 BLAKE2B dcbd535eb72a88c4a949554a47ba91b4520df72c76bdc29120225968d2ddbe8c61c611766d97a184ff4337e1987c0c6b67edc60e116e3cb4b70101ad0e121fde SHA512 daabe898c9c09b6ff40b7a5454690794eb6487f4c30b76e52c20a70636898c4069802631b000a6ba62149561019e14296e3d13aebacbd5fcf9d301f8e2fab2d9
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
new file mode 100644
index 000000000000..e355c30fd392
--- /dev/null
+++ b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to select the default Electron slot"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins electron.eselect
+ dosym eselect /usr/bin/electron-config
+}
+
+pkg_postinst() {
+ electron-config update
+}
diff --git a/app-eselect/eselect-electron/metadata.xml b/app-eselect/eselect-electron/metadata.xml
new file mode 100644
index 000000000000..b300580fbde4
--- /dev/null
+++ b/app-eselect/eselect-electron/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>elvis@magic.io</email>
+ <name>Elvis Pranskevichus</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">elprans/eselect-electron</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-emacs-1.18 b/app-eselect/eselect-emacs-1.18
deleted file mode 100644
index 307e980c8bf9..000000000000
--- a/app-eselect/eselect-emacs-1.18
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Manage multiple Emacs versions on one system
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=app-admin/eselect-1.2.6 ~app-eselect/eselect-ctags-1.18
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/eselect-emacs-1.18.tar.xz
-_md5_=477d29f60e21fcb6604159fde086f688
diff --git a/app-eselect/eselect-emacs/Manifest b/app-eselect/eselect-emacs/Manifest
new file mode 100644
index 000000000000..ba3370a80dff
--- /dev/null
+++ b/app-eselect/eselect-emacs/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-emacs-1.18.tar.xz 8964 BLAKE2B 218a9cb043bb00b853e3c51230632f9cdd28a0d2f0ca96bfb9f6840615059993edadd1ea3447d3c6b6411a6a4edda6c1ff34428659f3fa09ab306e53b5501885 SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa
+EBUILD eselect-emacs-1.18.ebuild 741 BLAKE2B 28b2bef5386c44432a2327ba17eb5e4f6ec9e0c1cf3d73a1299aee994f4f61677c6bd6781877f383afd2ef859dccd4fbe013d31dddd18e548cd9592aef136cdb SHA512 bd70dcd1c046297e12ce7b23407322f650718a1d7971fc0d1d88b3c173db1b21946fcd8c1f50c3d5fdfec632cd2327cd9f75714966e765c124c8401a47682b09
+MISC metadata.xml 251 BLAKE2B bb5fdd6fc58b43ac34ba535ab822795cb5579f40ff49cf5f5a8f3e3f248e101c4a9c97b608f6496d9cf48a4bbfcf93d665c8ca6b8bde9e41623238ea084a379b SHA512 65b7ed1e032f046e0afbc0d0d9da9fcfc4df47d68cd3076cc1f1f645ba0d9a9bce16265dc9b26e666190cd574ee4ac6203b4d7e01a55c5d79081377a52f2860d
diff --git a/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
new file mode 100644
index 000000000000..d8737f799264
--- /dev/null
+++ b/app-eselect/eselect-emacs/eselect-emacs-1.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manage multiple Emacs versions on one system"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=app-admin/eselect-1.2.6
+ ~app-eselect/eselect-ctags-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins {emacs,gnuclient}.eselect
+ doman {emacs,gnuclient}.eselect.5
+ dodoc ChangeLog
+}
diff --git a/app-eselect/eselect-emacs/metadata.xml b/app-eselect/eselect-emacs/metadata.xml
new file mode 100644
index 000000000000..a1a37697cb80
--- /dev/null
+++ b/app-eselect/eselect-emacs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-fontconfig-1.0 b/app-eselect/eselect-fontconfig-1.0
deleted file mode 100644
index c1a3a78d52f9..000000000000
--- a/app-eselect/eselect-fontconfig-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
-EAPI=0
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect >=media-libs/fontconfig-2.4
-SLOT=0
-_md5_=1edbc7b1ac3c3e51e67c70e34964a6aa
diff --git a/app-eselect/eselect-fontconfig-1.1 b/app-eselect/eselect-fontconfig-1.1
deleted file mode 100644
index 3a7bab97327e..000000000000
--- a/app-eselect/eselect-fontconfig-1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
-EAPI=0
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
-SLOT=0
-SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=daac56d59a6d4ecf520a95969b524ec3
diff --git a/app-eselect/eselect-fontconfig-1.1-r1 b/app-eselect/eselect-fontconfig-1.1-r1
deleted file mode 100644
index 26ed25191ec0..000000000000
--- a/app-eselect/eselect-fontconfig-1.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
-EAPI=7
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
-SLOT=0
-SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=8e171132f100fccab39ca5d5177e6746
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
new file mode 100644
index 000000000000..c306f8aef133
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -0,0 +1,6 @@
+AUX fontconfig.eselect-1.0 4394 BLAKE2B 47b3570309471efbe4c0c5bfe64949a2933ff6067fe2766e03eccd3b2de6ea044debbe3de92ca6384db76ee9d25d8a541be9a1e65e24b7e0c468e6cf0fca1d9e SHA512 5ca29ddbb672193eac8edc1acdefee0f7924aaba23d8ce40317d3dacd339e820462382d3fdf233c2cf4e4b258a2956e7b86ec6f4f541876789ab234aeaa81f42
+DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
+EBUILD eselect-fontconfig-1.0.ebuild 547 BLAKE2B b70e0ed2e214ebd2d1cce70b0973ab1e0dee2f69d0b2f04676d1c691972f7d62a6d811ebabb7cadd214201ba0bcd17dc4c644070234b5687c23c56efd4dc6572 SHA512 db69bba98ea30fa5d61696e0ab25b74528c5c27a8410be24ed0efccc9955e7cec91f397b6c901c3f1300e80ce38b9c80c2f81e0a135f6233d8a8ef47f9ae7d83
+EBUILD eselect-fontconfig-1.1-r1.ebuild 779 BLAKE2B a300a7e60a70603450461d0fe4739598c107f261bc7ed6216aee65a6ddcb0e58dc36c522c36aad11be2502d1abaca3d04debc9db877d826bd53c48fac5965dd1 SHA512 9252f2c55633f6eb6166d9331296ace0be9664ebbdde8561df9ee134a9f979b6dcf6f4ad74cd23eefdcb9b9dccf5432aa4423f447cbd7a37e8c3d957f32082f9
+EBUILD eselect-fontconfig-1.1.ebuild 778 BLAKE2B 5692e983a9ac116d9d09f42a5d560cd6a777c8a851b53c7823b9feef836a8f6e118b56ebc4b449c570e6b0897bd49656ab0063b8bbeced0d284fc8bc52b94af5 SHA512 606b9b8e27c9a42e456123d551df54f3a2b1ae943c2cea185fd6b3711c2b4d24167d7934a009e0e2a067bc3af7ef9a88c29ec16a0ed87ffb9b033b7021629992
+MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
new file mode 100644
index 000000000000..38ec0133ff1c
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect
+ >=media-libs/fontconfig-2.4"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${FILESDIR}/fontconfig.eselect-${PV}" fontconfig.eselect || die
+}
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
new file mode 100644
index 000000000000..a62e8774588d
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=media-libs/fontconfig-2.4"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect
+}
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
new file mode 100644
index 000000000000..a60067efe42b
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=media-libs/fontconfig-2.4"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${S}"/fontconfig.eselect-${PV} fontconfig.eselect || die
+}
diff --git a/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0 b/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0
new file mode 100644
index 000000000000..0215fe300388
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/files/fontconfig.eselect-1.0
@@ -0,0 +1,204 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage fontconfig /etc/fonts/conf.d/ symlinks"
+MAINTAINER="fonts@gentoo.org"
+VERSION="1.0"
+
+find_targets() {
+ local targets bc x i=0
+ bcdirs[i]="${ROOT}/etc/fonts/conf.avail/*.conf"
+
+ if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
+ for x in ${ES_FONTCONFIG_DIRS} ; do
+ bcdirs[$((++i))]="${x}/*"
+ done
+ fi
+
+ for bc in ${bcdirs[@]} ; do
+ [[ -e ${bc} && ${bc} != *~ ]] && targets="${targets}\n$(basename ${bc})"
+ done
+
+ echo -ne ${targets} | sort -u
+}
+
+is_enabled() {
+ bcdir="${ROOT}/etc/fonts/conf.d"
+
+ [[ -e ${bcdir}/${1} ]] || return 1
+ return 0
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available fontconfig .conf files"
+}
+
+do_list() {
+ local opts
+ targets=( $(find_targets) )
+ write_list_start "Available fontconfig .conf files ( $(highlight '*') is enabled ):"
+
+ if [[ -n "${targets[@]}" ]] ; then
+ for (( n = 0 ; n < ${#targets[@]} ; ++n )) ; do
+ is_enabled ${opts:-} ${targets[${n}]} && \
+ targets[${n}]="${targets[${n}]} $(highlight '*')"
+ done
+ write_numbered_list "${targets[@]}"
+ else
+ write_kv_list_entry "(none found)" ""
+ fi
+
+ return 0
+}
+
+### enable action ###
+
+describe_enable() {
+ echo "Enable specified fontconfig .conf file(s)"
+}
+
+describe_enable_parameters() {
+ echo "<target>"
+}
+
+describe_enable_options() {
+ echo "<target> : Target name or number (from 'list' action)"
+}
+
+do_enable() {
+ local bc bcdir="${ROOT}/etc/fonts/conf.d"
+
+ [[ -z ${1} ]] && die -q "You didn't specify any .conf files to enable"
+
+ # create directory if necessary
+ if [[ ! -d ${bcdir} && -w $(dirname ${bcdir}) ]] ; then
+ mkdir ${bcdir} || die -q "Failed to create ${bcdir}"
+ elif [[ ! -d ${bcdir} ]] ; then
+ die -q "You don't have permission to create ${bcdir}"
+ fi
+
+ # make sure we have proper permissions
+ [[ -w ${bcdir} ]] || \
+ die -q "You don't have permission to write to ${bcdir}"
+
+ targets=( $(find_targets) )
+
+ for bc in $@ ; do
+ local file target=${bc}
+
+ is_number "${target}" && \
+ target=${targets[$(( ${target} - 1 ))]}
+
+ [[ -z "${target}" ]] && \
+ die -q "Target \"${bc}\" doesn't appear to be valid!"
+
+ bc=${target}
+
+ # ignore any unrecognized options
+ [[ ${bc} == --* ]] && continue
+
+ # what form is the argument in?
+ case "${bc}" in
+ # absolute path
+ /*)
+ file="${ROOT}/${bc}"
+ ;;
+ # relative path
+ */*)
+ file="${ROOT}/${PWD}/${bc}"
+ ;;
+ # no path
+ *)
+ # CWD
+ if [[ -f ${bc} ]] ; then
+ file="${ROOT}/${PWD}/${bc}"
+ # assume /etc/fonts/conf.avail
+ elif [[ -f ${ROOT}/etc/fonts/conf.avail/${bc} ]]
+ then
+ file="${ROOT}/etc/fonts/conf.avail/${bc}"
+ else
+ if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
+ for x in ${ES_FONTCONFIG_DIRS} ; do
+ [[ -f ${x}/${bc} ]] && file="${x}/${bc}"
+ done
+ fi
+
+ [[ -e ${file} ]] || \
+ file="${ROOT}/etc/fonts/conf.avail/${bc}"
+ fi
+ ;;
+ esac
+
+ # does it exist?
+ if [[ ! -e ${file} ]] ; then
+ write_error_msg "${file} doesn't exist"
+ continue
+ fi
+
+ # already installed?
+ if [[ -e ${bcdir}/$(basename ${bc}) ]] ; then
+ write_error_msg "$(basename ${bc}) is already installed"
+ continue
+ fi
+
+ # finally, create the symlink
+ ln -s "${file}" "${bcdir}" || \
+ die -q "Failed to create symlink from '${file}' to '${bcdir}'"
+ done
+}
+
+### disable action ###
+
+describe_disable() {
+ echo "Disable specified fontconfig .conf file(s)"
+}
+
+describe_disable_parameters() {
+ echo "<target>"
+}
+
+describe_disable_options() {
+ echo "<target> : Target name or number (from 'list' action)"
+}
+
+
+do_disable() {
+ local bc bcdir="${ROOT}/etc/fonts/conf.d"
+
+ [[ -z ${1} ]] && die -q "You didn't specify any .conf files to disable"
+
+ targets=( $(find_targets) )
+
+ for bc in $@ ; do
+ local file target=${bc}
+
+ is_number "${target}" && \
+ target=${targets[$(( ${target} - 1 ))]}
+
+ [[ -z "${target}" ]] && \
+ die -q "Target \"${bc}\" doesn't appear to be valid!"
+
+ bc=${target}
+ file="${bcdir}/${bc}"
+
+ # ignore any unrecognized options
+ [[ ${bc} == --* ]] && continue
+
+ # is in installed?
+ if [[ ! -e ${file} ]] ; then
+ write_error_msg "${bc} is not installed"
+ continue
+ fi
+
+ # remove it if we have permissions
+ if [[ -w $(dirname ${file}) ]] ; then
+ rm "${file}" || die -q "Failed to remove ${file}"
+ else
+ die -q "You don't have permission to remove ${file}"
+ fi
+ done
+}
+
+# vim: set ft=eselect :
diff --git a/app-eselect/eselect-fontconfig/metadata.xml b/app-eselect/eselect-fontconfig/metadata.xml
new file mode 100644
index 000000000000..cc081897d48c
--- /dev/null
+++ b/app-eselect/eselect-fontconfig/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-gnat-1.3-r1 b/app-eselect/eselect-gnat-1.3-r1
deleted file mode 100644
index 4d274f4401a9..000000000000
--- a/app-eselect/eselect-gnat-1.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=gnat module for eselect
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dca65d06bcb6a8e05d16581ca834b189
diff --git a/app-eselect/eselect-gnat-1.4 b/app-eselect/eselect-gnat-1.4
deleted file mode 100644
index 59732c38361e..000000000000
--- a/app-eselect/eselect-gnat-1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=gnat module for eselect
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5118587a5424e0a3e35e70570616c9e9
diff --git a/app-eselect/eselect-gnat-1.4-r1 b/app-eselect/eselect-gnat-1.4-r1
deleted file mode 100644
index a09ca169a27f..000000000000
--- a/app-eselect/eselect-gnat-1.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=gnat module for eselect
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c64e5046d3533a9042fa1297c829d64
diff --git a/app-eselect/eselect-gnat-1.5 b/app-eselect/eselect-gnat-1.5
deleted file mode 100644
index b2365a3d3982..000000000000
--- a/app-eselect/eselect-gnat-1.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=gnat module for eselect
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~amd64 ~ppc ~x86 ~sparc
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.5
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83647444331a5d3c35a165bbff783439
diff --git a/app-eselect/eselect-gnat-1.5-r1 b/app-eselect/eselect-gnat-1.5-r1
deleted file mode 100644
index e5d51d208c4d..000000000000
--- a/app-eselect/eselect-gnat-1.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=gnat module for eselect
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~sparc
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.5
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d512ceaacb57a876e80ae799bbbe7a3b
diff --git a/app-eselect/eselect-gnat/Manifest b/app-eselect/eselect-gnat/Manifest
new file mode 100644
index 000000000000..20ebcbffab65
--- /dev/null
+++ b/app-eselect/eselect-gnat/Manifest
@@ -0,0 +1,12 @@
+AUX gnat-common-1.3-r1.bash 6725 BLAKE2B ff2ad420f428ce186f8c1dbf2b3a1957bc5054d89de630194d2a0c7a96cb801068343a44f3a8341e2e8c158bbf11c0770cb908b9fc2261455d6bebb470e67629 SHA512 431aba32979fec9ea76232ff66add372945f829c5cd4a4feea609d025a6d97b459812c9e1484fd54dce8b89d3fad2ab5f55315485be4617f53ca49b226ee28c3
+AUX gnat-common-1.4-r1.bash 6681 BLAKE2B 31bf44cab573ca1487730cd97e1d1de6c8ac53ecfe7be99b4067d9d86b7aee19b10cb5a6508f84b506ccb27e31c9e454c8e0fc74936b0ac5cd7f836784f6a4cb SHA512 590f91db9fd2c52333f0749edf94cd7d994aa1704c1e32dc00b2325daa3c605f0ea26d9b94387f443c86ac121b8d6f1fe571c173332b12998c2f27dde28a8e25
+AUX gnat-common-1.5.bash 6681 BLAKE2B 5cebcd6cdbe50a5fc650c64f57ff02e55a3a35969e1946c18f517e1962eedc1deb39e4e9342c638a91e124b9b4002f0f747bdd5b3a0b978b051e9164cef88463 SHA512 b190a7b14bc12c6f8a7e702d735e8f42f7b0bd63112ddb2cfb6738c417c146a9d4391266f390403967301eacfeec15360d17d645b87596220e35d20f6354d0d0
+AUX gnat.eselect-1.3 5246 BLAKE2B 4deeb59306907c1275fccf3563de641a4a5a452d69d987c561984a252f6170a0f8f12d743a77a280cf0f66376f3a2cf8db9888da2f26079788720813c15b8be5 SHA512 e884847e1e736be0d6c12bb11d6f203f618040cce9e9c82007f8ec3b1e2d40f78b3e75535eb6f64e6a137c63128eaeb5ccce6113adfc9cb025c078e1af709cd3
+AUX gnat.eselect-1.4 5969 BLAKE2B 95e93b34985a398788fc0da9387b5c9f92d4c3a898bb1cdf454c89777c8973f7d8a5852470a00bdd3fed9a2c267194791fc7a9d7311253b5d0381db774f52622 SHA512 a001a13f3d2b2c4488ea622021d733c8dfeb25e65e7a9576450fca08368d89da1c8314d547d0aeb6c7ce78076bd58a2a9e6b266311fe3f58cf3bf80a1fed5402
+AUX gnat.eselect-1.5 5899 BLAKE2B c3f4d8682c1d119f0113e86a37e0ec62eef77a9cae616edbf07386de7cd65776adfeabfe6e64cb4ad936792595212e6a4a2335280c9e43307bf840be44e08aea SHA512 5da16c411a85d0f3e534e4f2754b69ea43b7c7e0f830f631b63d72499b87f9c83636f003f30c2af016fb91870a35dd7cbe120d716507dae1e9bf1a1a628fa08f
+EBUILD eselect-gnat-1.3-r1.ebuild 690 BLAKE2B b324d69a4cd9e0c6e319488c15239d67690e4ccd099fda39f00d5f460c4ab7c6833e4a486595beb613e2ee99db6a5d8fabe20e5f05a149fb3188e7209cdaf527 SHA512 03f464778716d4cbcf6d6fe51f155706c71c61b5df7779482d460831962e8db0d695232d508d20d9366f8a2c146a8d0ad20777b657a1cd210dade1313d338e91
+EBUILD eselect-gnat-1.4-r1.ebuild 793 BLAKE2B 3ebad57a54ffae2f9225135f6293285d3c90f7900c218fe094f6f5d86b951cf7e9ab0bb70122a45a1b109d0857febdb0db404492a1b8213a71845397aa063d52 SHA512 a3c540b99da39052188efaa890d58e0c116d5f216543e24dd6731c5749ae875fa24c1cbd15d46999b63f25dea61fb92ee5c0818a50db7bf8d821d88e97e2f41d
+EBUILD eselect-gnat-1.4.ebuild 793 BLAKE2B e4d6c174d74c622c569ff384b2bee5bcb98d2ca1e30741e1159aee6ed9615cad537c17705abfdf44b92efd3179c483c876622d09bd16b31722d2d018ccfb425d SHA512 2bf96e840b64f79ccba6a2dc5dd6565b3d29ffaab0c728ac9ced970daeae108e06b2c45b870324682c3eea8d2f54d4df0caed8743c37dab049d7bc1b1539a76e
+EBUILD eselect-gnat-1.5-r1.ebuild 812 BLAKE2B b4516a059ea50542240d417964c875cff5d2d57a2077c68559ec67811f96f653777e3e6e9637db6c911163c5c60ca1fc07a9473495563661b51af6e423b817b5 SHA512 3ab0e5e084c28475ad8bb7c4e0aa775b00a5a1c972d64f4f7cd1779a5acb97497449cd9eade5a57e88f988d8b0d5829914b7397ce3190989ece1b1247f11d8e2
+EBUILD eselect-gnat-1.5.ebuild 808 BLAKE2B 1245e8b57e0c86aef49091643acbaf1dd676e8c4104b090f56b220fd27ba700569bcd25850441b485b2205a45040559d997a9efd7d2e47553eae6be05abe6727 SHA512 83db89788fd1594f3655dcca9ed626f457da1b6e1771401029b6dc2ffdf861e250daa3e3b6886f1624b4002919cf33890448480e74387729cb4967ce450e1102
+MISC metadata.xml 252 BLAKE2B 3f0617eb1d6e14087350a9a54b5dd0caecfede4cc0df9087be014103ed44c836a74abf88dc0dfa8689402e88a94c9c14f0afb105a92d735fd2743ea0f5499293 SHA512 fe0cf16be4ef184cd8dfe3a4ca09a9eb04ff7c954efa447e3587e573a644224528b148226843524ae30aae177782703f166cf115e184bfda24da9f0605c8323a
diff --git a/app-eselect/eselect-gnat/eselect-gnat-1.3-r1.ebuild b/app-eselect/eselect-gnat/eselect-gnat-1.3-r1.ebuild
new file mode 100644
index 000000000000..c05adffcd12e
--- /dev/null
+++ b/app-eselect/eselect-gnat/eselect-gnat-1.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="gnat module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+RDEPEND="app-admin/eselect"
+
+S="${WORKDIR}"
+
+MODULEDIR="/usr/share/eselect/modules"
+
+# NOTE!!
+# This path is duplicated in gnat-eselect module,
+# adjust in both locations!
+LIBDIR="/usr/share/gnat/lib"
+
+src_install() {
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/gnat.eselect-${PV} gnat.eselect
+ dodir ${LIBDIR}
+ insinto ${LIBDIR}
+ newins "${FILESDIR}"/gnat-common-${PVR}.bash gnat-common.bash
+}
diff --git a/app-eselect/eselect-gnat/eselect-gnat-1.4-r1.ebuild b/app-eselect/eselect-gnat/eselect-gnat-1.4-r1.ebuild
new file mode 100644
index 000000000000..c5e81999f4c6
--- /dev/null
+++ b/app-eselect/eselect-gnat/eselect-gnat-1.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="gnat module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+RDEPEND="app-admin/eselect"
+
+S="${WORKDIR}"
+
+MODULEDIR="/usr/share/eselect/modules"
+
+# NOTE!!
+# This path is duplicated in gnat-eselect module,
+# adjust in both locations!
+LIBDIR="/usr/share/gnat/lib"
+
+src_install() {
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/gnat.eselect-${PV} gnat.eselect
+ dodir ${LIBDIR}
+ insinto ${LIBDIR}
+ # !ATTN!
+ # Make sure to adjust version of installed file to a proper one if there is
+ # a change!
+ newins "${FILESDIR}"/gnat-common-${PVR}.bash gnat-common.bash
+}
diff --git a/app-eselect/eselect-gnat/eselect-gnat-1.4.ebuild b/app-eselect/eselect-gnat/eselect-gnat-1.4.ebuild
new file mode 100644
index 000000000000..73a6543927f5
--- /dev/null
+++ b/app-eselect/eselect-gnat/eselect-gnat-1.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="gnat module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+RDEPEND="app-admin/eselect"
+
+S="${WORKDIR}"
+
+MODULEDIR="/usr/share/eselect/modules"
+
+# NOTE!!
+# This path is duplicated in gnat-eselect module,
+# adjust in both locations!
+LIBDIR="/usr/share/gnat/lib"
+
+src_install() {
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/gnat.eselect-${PV} gnat.eselect
+ dodir ${LIBDIR}
+ insinto ${LIBDIR}
+ # !ATTN!
+ # Make sure to adjust version of installed file to a proper one if there is
+ # a change!
+ newins "${FILESDIR}"/gnat-common-1.3-r1.bash gnat-common.bash
+}
diff --git a/app-eselect/eselect-gnat/eselect-gnat-1.5-r1.ebuild b/app-eselect/eselect-gnat/eselect-gnat-1.5-r1.ebuild
new file mode 100644
index 000000000000..c3ec41a07026
--- /dev/null
+++ b/app-eselect/eselect-gnat/eselect-gnat-1.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="gnat module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~sparc"
+
+IUSE=""
+RDEPEND=">=app-admin/eselect-1.2.5"
+
+S="${WORKDIR}"
+
+MODULEDIR="/usr/share/eselect/modules"
+
+# NOTE!!
+# This path is duplicated in gnat-eselect module,
+# adjust in both locations!
+LIBDIR="/usr/share/gnat/lib"
+
+src_install() {
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/gnat.eselect-${PV} gnat.eselect
+ dodir ${LIBDIR}
+ insinto ${LIBDIR}
+ # !ATTN!
+ # Make sure to adjust version of installed file to a proper one if there is
+ # a change!
+ newins "${FILESDIR}"/gnat-common-${PV}.bash gnat-common.bash
+}
diff --git a/app-eselect/eselect-gnat/eselect-gnat-1.5.ebuild b/app-eselect/eselect-gnat/eselect-gnat-1.5.ebuild
new file mode 100644
index 000000000000..fe933b324b5d
--- /dev/null
+++ b/app-eselect/eselect-gnat/eselect-gnat-1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="gnat module for eselect"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+
+IUSE=""
+RDEPEND=">=app-admin/eselect-1.2.5"
+
+S="${WORKDIR}"
+
+MODULEDIR="/usr/share/eselect/modules"
+
+# NOTE!!
+# This path is duplicated in gnat-eselect module,
+# adjust in both locations!
+LIBDIR="/usr/share/gnat/lib"
+
+src_install() {
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/gnat.eselect-${PV} gnat.eselect
+ dodir ${LIBDIR}
+ insinto ${LIBDIR}
+ # !ATTN!
+ # Make sure to adjust version of installed file to a proper one if there is
+ # a change!
+ newins "${FILESDIR}"/gnat-common-1.4-r1.bash gnat-common.bash
+}
diff --git a/app-eselect/eselect-gnat/files/gnat-common-1.3-r1.bash b/app-eselect/eselect-gnat/files/gnat-common-1.3-r1.bash
new file mode 100644
index 000000000000..d65994515022
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat-common-1.3-r1.bash
@@ -0,0 +1,222 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Original Author: George Shapovalov <george@gentoo.org>
+# Purpose: Contains common vars/locations and functions for use by gnat.eclass,
+# gnat.eselect and gnatbuild.eclass.
+#
+# NOTE!!!
+# This code should just define vars (try to limit these!) and simple functions.
+# No bash extensions!!
+# That is, no portage or eclass constructs are allowed!
+#
+
+
+
+# ----------------------------------
+# Globals
+
+# Environmantal stuff (for env update)
+SPECSDIR="/usr/share/gnat/eselect"
+ENVDIR="/etc/env.d"
+MARKER="55gnat-"
+
+# User configurable settings
+SETTINGSDIR="/etc/ada"
+PRIMELIST="${SETTINGSDIR}/primary_compilers"
+
+## Lib install locations
+##
+## Gnat profile dependent files go under under ${LibTop}/${Gnat_Profile}/${PN}
+## and common files go unde SpecsDir, DataDir
+#PREFIX=/usr
+## Replace %LIBDIR% below with $(get_libdir) in eclasses and ebuilds (top level Ok, inherit multilib)
+## or $(profile2libdir ${profile}) in this code, eselect module or anywhere
+## outside portage (as profile will be available only during actual execution, this only should
+## be done inside corresponding functions).
+#AdalibSpecsDir=${PREFIX}/include/ada
+#AdalibDataDir=${PREFIX}/share/ada
+#AdalibLibTop=${PREFIX}/%LIBDIR%/ada
+
+
+# ------------------------------------
+# Helpers
+#
+
+# get_all_profile_components splits gnat profile and returns pace separated list of its components:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu gcc 4.1
+# args:
+# $1 - the string to split
+get_all_profile_components() {
+ local GnatSLOT=${1##*-}
+ local remainder=${1%-*}
+ local GnatPkg=${remainder##*-}
+ remainder=${remainder%-gnat-*}
+ echo "${remainder} ${GnatPkg} ${GnatSLOT}"
+}
+
+# similar to above, returns only SLOT component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> 4.1
+# args:
+# $1 - the string to extract the slot from
+get_gnat_SLOT() {
+ echo "${1##*-}"
+}
+
+# returns only Pkg component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> gcc
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Pkg() {
+ local remainder=${1%-*}
+ echo "${remainder##*-}"
+}
+
+# returns only Arch component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Arch() {
+ echo ${1%-gnat-*}
+}
+
+
+
+## -------------------------------------------
+# gnat profile and lib detection functions
+
+
+# create a list of all gnat env.d files
+# for now use trivial implementation - store name of active profile in the
+# env file name, so it gets called 55gnat-${ARCH}-${PN}-${SLOT}
+get_env_list() {
+ for fn in ${ENVDIR}/${MARKER}*; do
+ echo $(basename ${fn})
+ done
+}
+
+
+
+# find all installed compilers and return a list
+find_all_compilers() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ ! -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find installed primary compilers and return a list
+find_primary_compilers() {
+ [[ ! -f ${PRIMELIST} ]] && exit
+ for fn in $(cat ${PRIMELIST}); do
+ [[ -f ${SPECSDIR}/${fn} ]] && echo ${fn};
+ done
+}
+
+# find installed libs and return a list
+find_all_libs() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find libs that have been built for a given profile
+# Arguments:
+# $1 - gnat profile for which to detect active libs
+find_libs4profile() {
+ libs=( $(find_all_libs) )
+
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [[ -f ${SPECSDIR}/${libs[$i]}/$1 ]] && echo "${libs[$i]}"
+ done
+}
+
+
+
+
+## -----------------------
+# main action - central part of do_set and helpers
+
+
+# extracts values of the passed var definition from given spec file
+# params:
+# $1: spec file (as generated by gnabuild.eclass)
+# $2: variable name
+get_var_from_spec() {
+ local var=$(grep -e "^ *$2=" $1|cut -d= -f2)
+ echo ${var}
+}
+
+
+# Cycle through given libs and form a ':' separated list of settings for the given
+# var. Returned string starts with ':' if there is any non-empty setting,
+# otherwise returns empty string. Repeating settings are omitted, that is
+# unique entry is added only first time it is encountered. No need to have some
+# common dir listed many times in PATH for example.
+#
+# params:
+# $1 - name of env var to process
+# $2 - name of gnat profile
+# $3.. - list of libs to check (to avoid its composition every time)
+# - the list is expanded to list of args at the point of call
+get_lib_var_settings() {
+ local envVar=$1
+ local toset=$2
+ #echo "get_lib_var_settings params:$@" >> /tmp/eselect-gnat.rep
+ if [[ "none" != ${3} ]]; then
+ local envString
+ local specLine
+ while [[ -n $3 ]]; do
+ specLine=$(get_var_from_spec ${SPECSDIR}/$3/${toset} ${envVar})
+ #echo "$3:${specLine}." >> /tmp/eselect-gnat.rep
+ if [[ -n ${specLine} ]] && [[ ! ${envString} =~ ${specLine} ]]; then
+ envString="${envString}:${specLine}"
+ fi
+ shift
+ done
+ echo "${envString}"
+ fi
+}
+
+
+
+# The action!
+# Part common for do_set and do_update of gnat.eselect, also used in gnat.eclass
+# to set environment during lib build and installation
+#
+# params:
+# $1 - profile to set (toset param inside)
+# $2 - envfile
+
+generate_envFile() {
+ local toset=$1
+ local envfile=$2
+
+ local binpath="$(get_var_from_spec ${SPECSDIR}/${toset} binpath)"
+ local libexecpath="$(get_var_from_spec ${SPECSDIR}/${toset} libexecpath)"
+ local libs=( $(find_libs4profile ${toset}) )
+ #echo "generate_envFile: ${libs[@]}" >> /tmp/eselect-gnat.rep
+ if (( 0 == ${#libs[@]} )); then
+ libs="none"
+ fi
+
+ local MyPath="${binpath}:${libexecpath}$(get_lib_var_settings PATH ${toset} ${libs[@]})"
+ echo "PATH=${MyPath}" > "${envfile}"
+ echo "ROOTPATH=${MyPath}" >> "${envfile}"
+ echo "MANPATH=$(get_var_from_spec ${SPECSDIR}/${toset} manpath)$(get_lib_var_settings MANPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "INFOPATH=$(get_var_from_spec ${SPECSDIR}/${toset} infopath)$(get_lib_var_settings INFOPATH ${toset} ${libs[@]})" >> "${envfile}"
+ # the next three use the common base
+ local libBase=$(get_var_from_spec ${SPECSDIR}/${toset} ldpath)
+ echo "LDPATH=${libBase}:${libBase}/adalib$(get_lib_var_settings LDPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_INCLUDE_PATH=${libBase}/adainclude$(get_lib_var_settings ADA_INCLUDE_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_OBJECTS_PATH=${libBase}/adalib$(get_lib_var_settings ADA_OBJECTS_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ # ADA_PROJECT_PATH may not be set in any of the installed packages,
+ # we should only create this line if cumulative var is non-empty
+ My_ProjectPath=$(get_lib_var_settings ADA_PROJECT_PATH ${toset} ${libs[@]})
+ if [[ -n ${My_ProjectPath} ]]; then
+ echo "ADA_PROJECT_PATH=${My_ProjectPath}" >> "${envfile}"
+ fi
+}
+
diff --git a/app-eselect/eselect-gnat/files/gnat-common-1.4-r1.bash b/app-eselect/eselect-gnat/files/gnat-common-1.4-r1.bash
new file mode 100644
index 000000000000..5f3c0c8bf8b7
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat-common-1.4-r1.bash
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Author: George Shapovalov <george@gentoo.org>
+# Purpose: Contains common vars/locations and functions for use by gnat.eclass,
+# gnat.eselect and gnatbuild.eclass.
+#
+# NOTE!!!
+# This code should just define vars (try to limit these!) and simple functions.
+# No bash extensions!!
+# That is, no portage or eclass constructs are allowed!
+#
+
+
+
+# ----------------------------------
+# Globals
+
+# Environmantal stuff (for env update)
+SPECSDIR="/usr/share/gnat/eselect"
+ENVDIR="/etc/env.d"
+MARKER="55gnat-"
+
+# User configurable settings
+SETTINGSDIR="/etc/ada"
+PRIMELIST="${SETTINGSDIR}/primary_compilers"
+
+## Lib install locations
+##
+## Gnat profile dependent files go under under ${LibTop}/${Gnat_Profile}/${PN}
+## and common files go unde SpecsDir, DataDir
+#PREFIX=/usr
+## Replace %LIBDIR% below with $(get_libdir) in eclasses and ebuilds (top level Ok, inherit multilib)
+## or $(profile2libdir ${profile}) in this code, eselect module or anywhere
+## outside portage (as profile will be available only during actual execution, this only should
+## be done inside corresponding functions).
+#AdalibSpecsDir=${PREFIX}/include/ada
+#AdalibDataDir=${PREFIX}/share/ada
+#AdalibLibTop=${PREFIX}/%LIBDIR%/ada
+
+
+# ------------------------------------
+# Helpers
+#
+
+# get_all_profile_components splits gnat profile and returns pace separated list of its components:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu gcc 4.1
+# args:
+# $1 - the string to split
+get_all_profile_components() {
+ local GnatSLOT=${1##*-}
+ local remainder=${1%-*}
+ local GnatPkg=${remainder##*-}
+ remainder=${remainder%-gnat-*}
+ echo "${remainder} ${GnatPkg} ${GnatSLOT}"
+}
+
+# similar to above, returns only SLOT component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> 4.1
+# args:
+# $1 - the string to extract the slot from
+get_gnat_SLOT() {
+ echo "${1##*-}"
+}
+
+# returns only Pkg component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> gcc
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Pkg() {
+ local remainder=${1%-*}
+ echo "${remainder##*-}"
+}
+
+# returns only Arch component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Arch() {
+ echo ${1%-gnat-*}
+}
+
+
+
+## -------------------------------------------
+# gnat profile and lib detection functions
+
+
+# create a list of all gnat env.d files
+# for now use trivial implementation - store name of active profile in the
+# env file name, so it gets called 55gnat-${ARCH}-${PN}-${SLOT}
+get_env_list() {
+ for fn in ${ENVDIR}/${MARKER}*; do
+ echo $(basename ${fn})
+ done
+}
+
+
+
+# find all installed compilers and return a list
+find_all_compilers() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ ! -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find installed primary compilers and return a list
+find_primary_compilers() {
+ [[ ! -f ${PRIMELIST} ]] && exit
+ for fn in $(cat ${PRIMELIST}); do
+ [[ -f ${SPECSDIR}/${fn} ]] && echo ${fn};
+ done
+}
+
+# find installed libs and return a list
+find_all_libs() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find libs that have been built for a given profile
+# Arguments:
+# $1 - gnat profile for which to detect active libs
+find_libs4profile() {
+ libs=( $(find_all_libs) )
+
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [[ -f ${SPECSDIR}/${libs[$i]}/$1 ]] && echo "${libs[$i]}"
+ done
+}
+
+
+
+
+## -----------------------
+# main action - central part of do_set and helpers
+
+
+# extracts values of the passed var definition from given spec file
+# params:
+# $1: spec file (as generated by gnabuild.eclass)
+# $2: variable name
+get_var_from_spec() {
+ local var=$(grep -e "^ *$2=" $1|cut -d= -f2)
+ echo ${var}
+}
+
+
+# Cycle through given libs and form a ':' separated list of settings for the given
+# var. Repeating settings are omitted, that is unique entry is added only first
+# time it is encountered.
+#
+# params:
+# $1 - name of env var to process
+# $2 - name of gnat profile
+# $3.. - list of libs to check (to avoid its composition every time)
+# - the list is expanded to list of args at the point of call
+get_lib_var_settings() {
+ local envVar=$1
+ local toset=$2
+ #echo "get_lib_var_settings params:$@" >> /tmp/eselect-gnat.rep
+ if [[ "none" != ${3} ]]; then
+ local envString
+ local specLine=$(get_var_from_spec ${SPECSDIR}/$3/${toset} ${envVar})
+ if [[ -n ${specLine} ]]; then
+ envString="${specLine}"
+ fi
+ shift
+ #
+ while [[ -n $3 ]]; do
+ specLine=$(get_var_from_spec ${SPECSDIR}/$3/${toset} ${envVar})
+ #echo "$3:${specLine}." >> /tmp/eselect-gnat.rep
+ if [[ -n ${specLine} ]] && [[ ! ${envString} =~ ${specLine} ]]; then
+ envString="${envString}:${specLine}"
+ fi
+ shift
+ done
+ echo "${envString}"
+ fi
+}
+
+
+
+# The action!
+# Part common for do_set and do_update of gnat.eselect, also used in gnat.eclass
+# to set environment during lib build and installation
+#
+# params:
+# $1 - profile to set (toset param inside)
+# $2 - envfile
+
+generate_envFile() {
+ local toset=$1
+ local envfile=$2
+
+ local binpath="$(get_var_from_spec ${SPECSDIR}/${toset} binpath)"
+ local libexecpath="$(get_var_from_spec ${SPECSDIR}/${toset} libexecpath)"
+ local libs=( $(find_libs4profile ${toset}) )
+ #echo "generate_envFile: ${libs[@]}" >> /tmp/eselect-gnat.rep
+ if (( 0 == ${#libs[@]} )); then
+ libs="none"
+ fi
+
+ local MyPath="${binpath}:${libexecpath}:$(get_lib_var_settings PATH ${toset} ${libs[@]})"
+ echo "PATH=${MyPath}" > "${envfile}"
+ echo "ROOTPATH=${MyPath}" >> "${envfile}"
+ echo "MANPATH=$(get_var_from_spec ${SPECSDIR}/${toset} manpath):$(get_lib_var_settings MANPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "INFOPATH=$(get_var_from_spec ${SPECSDIR}/${toset} infopath):$(get_lib_var_settings INFOPATH ${toset} ${libs[@]})" >> "${envfile}"
+ # the next three use the common base
+ local libBase=$(get_var_from_spec ${SPECSDIR}/${toset} ldpath)
+ echo "LDPATH=${libBase}:${libBase}/adalib:$(get_lib_var_settings LDPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_INCLUDE_PATH=${libBase}/adainclude:$(get_lib_var_settings ADA_INCLUDE_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_OBJECTS_PATH=${libBase}/adalib:$(get_lib_var_settings ADA_OBJECTS_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ # ADA_PROJECT_PATH may not be set in any of the installed packages,
+ # we should only create this line if cumulative var is non-empty
+ My_ProjectPath=$(get_lib_var_settings ADA_PROJECT_PATH ${toset} ${libs[@]})
+ if [[ -n ${My_ProjectPath} ]]; then
+ echo "ADA_PROJECT_PATH=${My_ProjectPath}" >> "${envfile}"
+ fi
+}
+
diff --git a/app-eselect/eselect-gnat/files/gnat-common-1.5.bash b/app-eselect/eselect-gnat/files/gnat-common-1.5.bash
new file mode 100644
index 000000000000..05af905579ae
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat-common-1.5.bash
@@ -0,0 +1,225 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Author: George Shapovalov <george@gentoo.org>
+# Purpose: Contains common vars/locations and functions for use by gnat.eclass,
+# gnat.eselect and gnatbuild.eclass.
+#
+# NOTE!!!
+# This code should just define vars (try to limit these!) and simple functions.
+# No bash extensions!!
+# That is, no portage or eclass constructs are allowed!
+#
+
+
+
+# ----------------------------------
+# Globals
+
+# Environmantal stuff (for env update)
+SPECSDIR="/usr/share/gnat/eselect"
+ENVDIR="/etc/env.d"
+MARKER="55gnat-"
+
+# User configurable settings
+SETTINGSDIR="/etc/ada"
+PRIMELIST="${SETTINGSDIR}/primary_compilers"
+
+## Lib install locations
+##
+## Gnat profile dependent files go under under ${LibTop}/${Gnat_Profile}/${PN}
+## and common files go unde SpecsDir, DataDir
+#PREFIX=/usr
+## Replace %LIBDIR% below with $(get_libdir) in eclasses and ebuilds (top level Ok, inherit multilib)
+## or $(profile2libdir ${profile}) in this code, eselect module or anywhere
+## outside portage (as profile will be available only during actual execution, this only should
+## be done inside corresponding functions).
+#AdalibSpecsDir=${PREFIX}/include/ada
+#AdalibDataDir=${PREFIX}/share/ada
+#AdalibLibTop=${PREFIX}/%LIBDIR%/ada
+
+
+# ------------------------------------
+# Helpers
+#
+
+# get_all_profile_components splits gnat profile and returns pace separated list of its components:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu gcc 4.1
+# args:
+# $1 - the string to split
+get_all_profile_components() {
+ local GnatSLOT=${1##*-}
+ local remainder=${1%-*}
+ local GnatPkg=${remainder##*-}
+ remainder=${remainder%-gnat-*}
+ echo "${remainder} ${GnatPkg} ${GnatSLOT}"
+}
+
+# similar to above, returns only SLOT component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> 4.1
+# args:
+# $1 - the string to extract the slot from
+get_gnat_SLOT() {
+ echo "${1##*-}"
+}
+
+# returns only Pkg component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> gcc
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Pkg() {
+ local remainder=${1%-*}
+ echo "${remainder##*-}"
+}
+
+# returns only Arch component:
+# x86_64-pc-linux-gnu-gnat-gcc-4.1 -> x86_64-pc-linux-gnu
+# args:
+# $1 - the string to extract the slot from
+get_gnat_Arch() {
+ echo ${1%-gnat-*}
+}
+
+
+
+## -------------------------------------------
+# gnat profile and lib detection functions
+
+
+# create a list of all gnat env.d files
+# for now use trivial implementation - store name of active profile in the
+# env file name, so it gets called 55gnat-${ARCH}-${PN}-${SLOT}
+get_env_list() {
+ for fn in ${ENVDIR}/${MARKER}*; do
+ echo $(basename ${fn})
+ done
+}
+
+
+
+# find all installed compilers and return a list
+find_all_compilers() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ ! -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find installed primary compilers and return a list
+find_primary_compilers() {
+ [[ ! -f ${PRIMELIST} ]] && exit
+ for fn in $(cat ${PRIMELIST}); do
+ [[ -f ${SPECSDIR}/${fn} ]] && echo ${fn};
+ done
+}
+
+# find installed libs and return a list
+find_all_libs() {
+ [[ ! -d ${SPECSDIR} ]] && exit
+ for fn in ${SPECSDIR}/*; do
+ [[ -d ${fn} ]] && echo $(basename ${fn});
+ done
+}
+
+# find libs that have been built for a given profile
+# Arguments:
+# $1 - gnat profile for which to detect active libs
+find_libs4profile() {
+ libs=( $(find_all_libs) )
+
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [[ -f ${SPECSDIR}/${libs[$i]}/$1 ]] && echo "${libs[$i]}"
+ done
+}
+
+
+
+
+## -----------------------
+# main action - central part of do_set and helpers
+
+
+# extracts values of the passed var definition from given spec file
+# params:
+# $1: spec file (as generated by gnabuild.eclass)
+# $2: variable name
+get_var_from_spec() {
+ local var=$(grep -e "^ *$2=" $1|cut -d= -f2)
+ echo ${var}
+}
+
+
+# Cycle through given libs and form a ':' separated list of settings for the given
+# var. Repeating settings are omitted, that is unique entry is added only first
+# time it is encountered.
+#
+# params:
+# $1 - name of env var to process
+# $2 - name of gnat profile
+# $3.. - list of libs to check (to avoid its composition every time)
+# - the list is expanded to list of args at the point of call
+get_lib_var_settings() {
+ local envVar=$1
+ local toset=$2
+ #echo "get_lib_var_settings params:$@" >> /tmp/eselect-gnat.rep
+ if [[ "none" != ${3} ]]; then
+ local envString
+ local specLine=$(get_var_from_spec ${SPECSDIR}/$3/${toset} ${envVar})
+ if [[ -n ${specLine} ]]; then
+ envString="${specLine}"
+ fi
+ shift
+ #
+ while [[ -n $3 ]]; do
+ specLine=$(get_var_from_spec ${SPECSDIR}/$3/${toset} ${envVar})
+ #echo "$3:${specLine}." >> /tmp/eselect-gnat.rep
+ if [[ -n ${specLine} ]] && [[ ! ${envString} =~ ${specLine} ]]; then
+ envString="${envString}:${specLine}"
+ fi
+ shift
+ done
+ echo "${envString}"
+ fi
+}
+
+
+
+# The action!
+# Part common for do_set and do_update of gnat.eselect, also used in gnat.eclass
+# to set environment during lib build and installation
+#
+# params:
+# $1 - profile to set (toset param inside)
+# $2 - envfile
+
+generate_envFile() {
+ local toset=$1
+ local envfile=$2
+
+ local binpath="$(get_var_from_spec ${SPECSDIR}/${toset} binpath)"
+ local libexecpath="$(get_var_from_spec ${SPECSDIR}/${toset} libexecpath)"
+ local libs=( $(find_libs4profile ${toset}) )
+ #echo "generate_envFile: ${libs[@]}" >> /tmp/eselect-gnat.rep
+ if (( 0 == ${#libs[@]} )); then
+ libs="none"
+ fi
+
+ local MyPath="${binpath}:${libexecpath}:$(get_lib_var_settings PATH ${toset} ${libs[@]})"
+ echo "PATH=${MyPath}" > "${envfile}"
+ echo "ROOTPATH=${MyPath}" >> "${envfile}"
+ echo "MANPATH=$(get_var_from_spec ${SPECSDIR}/${toset} manpath):$(get_lib_var_settings MANPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "INFOPATH=$(get_var_from_spec ${SPECSDIR}/${toset} infopath):$(get_lib_var_settings INFOPATH ${toset} ${libs[@]})" >> "${envfile}"
+ # the next three use the common base
+ local libBase=$(get_var_from_spec ${SPECSDIR}/${toset} ldpath)
+ echo "LDPATH=${libBase}:${libBase}/adalib:$(get_lib_var_settings LDPATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_INCLUDE_PATH=${libBase}/adainclude:$(get_lib_var_settings ADA_INCLUDE_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ echo "ADA_OBJECTS_PATH=${libBase}/adalib:$(get_lib_var_settings ADA_OBJECTS_PATH ${toset} ${libs[@]})" >> "${envfile}"
+ # ADA_PROJECT_PATH may not be set in any of the installed packages,
+ # we should only create this line if cumulative var is non-empty
+ My_ProjectPath=$(get_lib_var_settings ADA_PROJECT_PATH ${toset} ${libs[@]})
+ if [[ -n ${My_ProjectPath} ]]; then
+ echo "ADA_PROJECT_PATH=${My_ProjectPath}" >> "${envfile}"
+ fi
+}
+
diff --git a/app-eselect/eselect-gnat/files/gnat.eselect-1.3 b/app-eselect/eselect-gnat/files/gnat.eselect-1.3
new file mode 100644
index 000000000000..548926524747
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat.eselect-1.3
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the installed gnat compilers"
+MAINTAINER="ada@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:48:57 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# "inheriting" common stuff
+# this crude sourcing has to stay the way it is, as common code
+# cannot be part of some eclass (bug #192505)
+. /usr/share/gnat/lib/gnat-common.bash
+
+
+### Phylosophy
+# Each gnat installs a "specs" file named ${ARCH}-${PN}-${SLOT} under ${SPECSDIR}
+# Each lib creates a dir with its name under ${SPECSDIR} and populates it with
+# similar specs files (same name scheme)
+# Recognizing gnat specs from lib specs is then eazy - test entry for being a
+# dir, then just check what gnat profiles are installed for each lib..
+# doset then creates env file that combines settings for gnat and for the
+# corresponding profile of each installed lib..
+
+
+### Helpers
+
+# return *the* name of the active profile, checking that we do not have multiple
+# env files.
+# There can be only one!
+get_current_gnat() {
+ local profiles=( $(get_env_list) )
+
+ if [ ${profiles[@]} == "${MARKER}*" ]; then exit; fi
+
+ if (( 1 == ${#profiles[@]} )); then
+ local active=${profiles[0]#${MARKER}}
+ else
+ die -q "${ENVDIR} contains multiple gnat profiles, please cleanup!"
+ fi
+
+ if [ -f ${SPECSDIR}/${active} ]; then
+ echo ${active}
+ else
+ die -q "the active env.d profile does not correspond to any installed gnat!"
+ fi
+}
+
+# check if the passed arg represents the installed gnat and return it or
+# not_found
+# takes args:
+# $1 - list ID to check
+get_name_from_list() {
+ compiler=$1
+
+ compilers=( $(find_all_compilers) )
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ if [[ ${compilers[$i]} == ${compiler} ]] ; then
+ echo ${compiler}
+ return
+ fi
+ done
+
+ echo "(not-found)"
+}
+
+
+# removes env files (for compiler and libs)
+# params:
+# $1: the name of profile for which to remove env file
+unset_env() {
+ rm -f ${ENVDIR}/${MARKER}$1 &> /dev/null
+}
+
+
+### show action ###
+
+describe_show() {
+ echo "Show the active gnat compiler/profile and installed libs"
+}
+
+do_show() {
+ write_list_start "Current gnat version:"
+ active=$(get_current_gnat)
+ if [ ! -z ${active} ] ; then # not sure why [ -n ] does not do the same
+ write_kv_list_entry "$active" ""
+ libs=( $(find_libs4profile ${active}) )
+ write_list_start "Active libs:"
+ write_numbered_list "${libs[@]}"
+ else
+ write_kv_list_entry "(none set)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List installed gnat compilers and libs"
+}
+
+do_list() {
+ compilers=( $(find_all_compilers ) )
+ active=$(get_current_gnat)
+
+ write_list_start "Available gnat compilers:"
+
+ if [[ -n ${compilers[@]} ]] ; then
+ local i
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ linkversion=${compilers[${i}]}
+
+ [[ $linkversion == $active ]] && \
+ compilers[${i}]="${compilers[${i}]} $(highlight '*' )"
+ done
+ write_numbered_list "${compilers[@]}"
+
+ # now the libs
+ libs=( $(find_all_libs) )
+ write_list_start "Installed libs:"
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [ -f ${SPECSDIR}/${libs[$i]}/${active} ] && \
+ libs[${i}]="${libs[${i}]} $(highlight '*' )"
+ done
+ write_numbered_list "${libs[@]}"
+ else
+ write_kv_list_entry "(none found)" ""
+ fi
+}
+
+
+### set action ###
+
+describe_set() {
+ echo "Set active gnat compiler"
+}
+
+# The set action. Parameters:
+# $1 - name of profile to set, obligatory, passed by eselect
+# $2 - optional, name of env file to generate. Used from gnat.eclass.
+do_set() {
+ if [[ -z ${1} ]] ; then
+ # no parameter
+ die -q "You didn't tell me which gnat to use"
+ fi
+
+ local toset=$(get_name_from_list $1)
+ if [[ ${toset} == "(not-found)" ]] ; then
+ die -q "I don't recognise the selection"
+ fi
+
+ # the action!
+ # in this implementation simply create an appropriate env file
+ local active=$(get_current_gnat)
+ if [[ -z ${2} ]] ; then
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+
+ # now we need to remove an old env file, which is guaranteed to
+ # be unique by get_current_gnat above
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ fi
+ # just for a good measure remove the one we are going to write
+ unset_env ${toset}
+ else
+ local envfile="$2"
+ fi
+
+ generate_envFile ${toset} ${envfile}
+
+ # force update environment
+ # should be replaced with "do_action env update" when #172472 gets resolved
+ env-update &> /dev/null
+}
+
+
+
+### update action ###
+#
+# This action regenerates the /etc/env.d file for the current profile. Basically
+# the same as set, only it does not take any parameters. It should be called from ebuilds
+# installing Ada libs
+
+describe_update() {
+ echo "Update active gnat profile picking up new libs."
+}
+
+do_update() {
+ local toset=$(get_current_gnat)
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+ generate_envFile ${toset} ${envfile}
+ do_action env update &> /dev/null
+}
+
+### unset action ###
+
+describe_unset() {
+ echo "Remove settings for currently active gnat"
+}
+
+do_unset() {
+ local active=$(get_current_gnat)
+ # check whether we have any profile set before removing anything..
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ do_action env update &> /dev/null
+ fi
+}
diff --git a/app-eselect/eselect-gnat/files/gnat.eselect-1.4 b/app-eselect/eselect-gnat/files/gnat.eselect-1.4
new file mode 100644
index 000000000000..f2a72092c53a
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat.eselect-1.4
@@ -0,0 +1,229 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the installed gnat compilers"
+MAINTAINER="ada@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:48:57 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# "inheriting" common stuff
+# this crude sourcing has to stay the way it is, as common code
+# cannot be part of some eclass (bug #192505)
+. /usr/share/gnat/lib/gnat-common.bash
+
+
+### Phylosophy
+# Each gnat installs a "specs" file named ${ARCH}-${PN}-${SLOT} under ${SPECSDIR}
+# Each lib creates a dir with its name under ${SPECSDIR} and populates it with
+# similar specs files (same name scheme)
+# Recognizing gnat specs from lib specs is then eazy - test entry for being a
+# dir, then just check what gnat profiles are installed for each lib..
+# doset then creates env file that combines settings for gnat and for the
+# corresponding profile of each installed lib..
+
+
+### Helpers
+
+# return *the* name of the active profile, checking that we do not have multiple
+# env files.
+# There can be only one!
+get_current_gnat() {
+ local profiles=( $(get_env_list) )
+
+ if [ ${profiles[@]} == "${MARKER}*" ]; then exit; fi
+
+ if (( 1 == ${#profiles[@]} )); then
+ local active=${profiles[0]#${MARKER}}
+ else
+ die -q "${ENVDIR} contains multiple gnat profiles, please cleanup!"
+ fi
+
+ echo ${active}
+# disabling this check, as we want to use get_current_gnat with empty profile
+# as an indication that last gnat in SLOT was removed
+# if [ -f ${SPECSDIR}/${active} ]; then
+# echo ${active}
+# else
+# die -q "the active env.d profile does not correspond to any installed gnat!"
+# fi
+}
+
+# validity check that was removed from get_current_gnat, in case we need it
+# somewhere..
+# Arguments:
+# $1 - name of the gnat profiel to check
+profile_is_valid() {
+ if [[ -n $1 ]] ; then
+ [[ -f ${SPECSDIR}/$1 ]] || return 1
+ fi
+}
+
+# check if the passed arg represents the installed gnat and return it or
+# not_found
+# takes args:
+# $1 - list ID to check
+get_name_from_list() {
+ compiler=$1
+
+ compilers=( $(find_all_compilers) )
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ if [[ ${compilers[$i]} == ${compiler} ]] ; then
+ echo ${compiler}
+ return
+ fi
+ done
+
+ echo "(not-found)"
+}
+
+
+# removes env files (for compiler and libs)
+# params:
+# $1: the name of profile for which to remove env file
+unset_env() {
+ rm -f ${ENVDIR}/${MARKER}$1 &> /dev/null
+}
+
+
+### show action ###
+
+describe_show() {
+ echo "Show the active gnat compiler/profile and installed libs"
+}
+
+do_show() {
+ active=$(get_current_gnat)
+ if $(profile_is_valid ${active}); then
+ write_list_start "Current gnat version:"
+ if [[ -n ${active} ]] ; then
+ write_kv_list_entry "$active" ""
+ libs=( $(find_libs4profile ${active}) )
+ write_list_start "Active libs:"
+ write_numbered_list "${libs[@]}"
+ else
+ write_kv_list_entry "(none set)" ""
+ fi
+ else
+ write_error_msg "The active profile in ${ENVDIR} is not valid! Please set a valid profile!"
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List installed gnat compilers and libs"
+}
+
+do_list() {
+ compilers=( $(find_all_compilers ) )
+ active=$(get_current_gnat)
+
+ write_list_start "Available gnat compilers:"
+
+ if [[ -n ${compilers[@]} ]] ; then
+ local i
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ linkversion=${compilers[${i}]}
+
+ [[ $linkversion == $active ]] && \
+ compilers[${i}]="${compilers[${i}]} $(highlight '*' )"
+ done
+ write_numbered_list "${compilers[@]}"
+
+ # now the libs
+ libs=( $(find_all_libs) )
+ write_list_start "Installed libs:"
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [ -f ${SPECSDIR}/${libs[$i]}/${active} ] && \
+ libs[${i}]="${libs[${i}]} $(highlight '*' )"
+ done
+ write_numbered_list "${libs[@]}"
+ else
+ write_kv_list_entry "(none found)" ""
+ fi
+}
+
+
+### set action ###
+
+describe_set() {
+ echo "Set active gnat compiler"
+}
+
+# The set action. Parameters:
+# $1 - name of profile to set, obligatory, passed by eselect
+# $2 - optional, name of env file to generate. Used from gnat.eclass.
+do_set() {
+ if [[ -z ${1} ]] ; then
+ # no parameter
+ die -q "You didn't tell me which gnat to use"
+ fi
+
+ local toset=$(get_name_from_list $1)
+ if [[ ${toset} == "(not-found)" ]] ; then
+ die -q "I don't recognise the selection"
+ fi
+
+ # the action!
+ # in this implementation simply create an appropriate env file
+ local active=$(get_current_gnat)
+ if [[ -z ${2} ]] ; then
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+
+ # now we need to remove an old env file, which is guaranteed to
+ # be unique by get_current_gnat above
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ fi
+ # just for a good measure remove the one we are going to write
+ unset_env ${toset}
+ else
+ local envfile="$2"
+ fi
+
+ generate_envFile ${toset} ${envfile}
+
+ # force update environment
+ # should be replaced with "do_action env update" when #172472 gets resolved
+ env-update &> /dev/null
+}
+
+
+
+### update action ###
+#
+# This action regenerates the /etc/env.d file for the current profile. Basically
+# the same as set, only it does not take any parameters. It should be called from ebuilds
+# installing Ada libs or in the pkg_postrm in gnatbuild.eclass, to clean up the
+# profile if last gnat in SLOT was removed.
+
+describe_update() {
+ echo "Update active gnat profile picking up new libs."
+}
+
+do_update() {
+ local toset=$(get_current_gnat)
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+ # now check whether to update or unset the profile
+ if $(profile_is_valid ${toset}); then
+ generate_envFile ${toset} ${envfile}
+ else
+ unset_env ${toset}
+ fi
+ do_action env update &> /dev/null
+}
+
+### unset action ###
+
+describe_unset() {
+ echo "Remove settings for currently active gnat"
+}
+
+do_unset() {
+ local active=$(get_current_gnat)
+ # check whether we have any profile set before removing anything..
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ do_action env update &> /dev/null
+ fi
+}
diff --git a/app-eselect/eselect-gnat/files/gnat.eselect-1.5 b/app-eselect/eselect-gnat/files/gnat.eselect-1.5
new file mode 100644
index 000000000000..fa312feccbbe
--- /dev/null
+++ b/app-eselect/eselect-gnat/files/gnat.eselect-1.5
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the installed gnat compilers"
+MAINTAINER="ada@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:48:57 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# "inheriting" common stuff
+# this crude sourcing has to stay the way it is, as common code
+# cannot be part of some eclass (bug #192505)
+. /usr/share/gnat/lib/gnat-common.bash
+
+
+### Phylosophy
+# Each gnat installs a "specs" file named ${ARCH}-${PN}-${SLOT} under ${SPECSDIR}
+# Each lib creates a dir with its name under ${SPECSDIR} and populates it with
+# similar specs files (same name scheme)
+# Recognizing gnat specs from lib specs is then eazy - test entry for being a
+# dir, then just check what gnat profiles are installed for each lib..
+# doset then creates env file that combines settings for gnat and for the
+# corresponding profile of each installed lib..
+
+
+### Helpers
+
+# return *the* name of the active profile, checking that we do not have multiple
+# env files.
+# There can be only one!
+get_current_gnat() {
+ local profiles=( $(get_env_list) )
+
+ if [ ${profiles[@]} == "${MARKER}*" ]; then exit; fi
+
+ if (( 1 == ${#profiles[@]} )); then
+ local active=${profiles[0]#${MARKER}}
+ else
+ die -q "${ENVDIR} contains multiple gnat profiles, please cleanup!"
+ fi
+
+ echo ${active}
+# disabling this check, as we want to use get_current_gnat with empty profile
+# as an indication that last gnat in SLOT was removed
+# if [ -f ${SPECSDIR}/${active} ]; then
+# echo ${active}
+# else
+# die -q "the active env.d profile does not correspond to any installed gnat!"
+# fi
+}
+
+# validity check that was removed from get_current_gnat, in case we need it
+# somewhere..
+# Arguments:
+# $1 - name of the gnat profiel to check
+profile_is_valid() {
+ if [[ -n $1 ]] ; then
+ [[ -f ${SPECSDIR}/$1 ]] || return 1
+ fi
+}
+
+# check if the passed arg represents the installed gnat and return it or
+# not_found
+# takes args:
+# $1 - list ID to check
+get_name_from_list() {
+ compiler=$1
+
+ compilers=( $(find_all_compilers) )
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ if [[ ${compilers[$i]} == ${compiler} ]] ; then
+ echo ${compiler}
+ return
+ fi
+ done
+
+ echo "(not-found)"
+}
+
+
+# removes env files (for compiler and libs)
+# params:
+# $1: the name of profile for which to remove env file
+unset_env() {
+ rm -f ${ENVDIR}/${MARKER}$1 &> /dev/null
+}
+
+
+### show action ###
+
+describe_show() {
+ echo "Show the active gnat compiler/profile and installed libs"
+}
+
+do_show() {
+ active=$(get_current_gnat)
+ if $(profile_is_valid ${active}); then
+ write_list_start "Current gnat version:"
+ if [[ -n ${active} ]] ; then
+ write_kv_list_entry "$active" ""
+ libs=( $(find_libs4profile ${active}) )
+ write_list_start "Active libs:"
+ write_numbered_list "${libs[@]}"
+ else
+ write_kv_list_entry "(none set)" ""
+ fi
+ else
+ write_error_msg "The active profile in ${ENVDIR} is not valid! Please set a valid profile!"
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List installed gnat compilers and libs"
+}
+
+do_list() {
+ compilers=( $(find_all_compilers ) )
+ active=$(get_current_gnat)
+
+ write_list_start "Available gnat compilers:"
+
+ local i
+ for (( i = 0 ; i < ${#compilers[@]} ; i = i + 1 )) ; do
+ linkversion=${compilers[${i}]}
+
+ [[ $linkversion == $active ]] && \
+ compilers[${i}]=$(highlight_marker "${compilers[${i}]}")
+ done
+ write_numbered_list -m "(none)" "${compilers[@]}"
+
+ # now the libs
+ libs=( $(find_all_libs) )
+ write_list_start "Installed libs:"
+ for (( i = 0 ; i < ${#libs[@]} ; i = i + 1 )) ; do
+ [ -f ${SPECSDIR}/${libs[$i]}/${active} ] && \
+ libs[${i}]=$(highlight_marker "${libs[${i}]}")
+ done
+ write_numbered_list -m "(no libs)" "${libs[@]}"
+}
+
+
+### set action ###
+
+describe_set() {
+ echo "Set active gnat compiler"
+}
+
+# The set action. Parameters:
+# $1 - name of profile to set, obligatory, passed by eselect
+# $2 - optional, name of env file to generate. Used from gnat.eclass.
+do_set() {
+ if [[ -z ${1} ]] ; then
+ # no parameter
+ die -q "You didn't tell me which gnat to use"
+ fi
+
+ local toset=$(get_name_from_list $1)
+ if [[ ${toset} == "(not-found)" ]] ; then
+ die -q "I don't recognise the selection"
+ fi
+
+ # the action!
+ # in this implementation simply create an appropriate env file
+ local active=$(get_current_gnat)
+ if [[ -z ${2} ]] ; then
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+
+ # now we need to remove an old env file, which is guaranteed to
+ # be unique by get_current_gnat above
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ fi
+ # just for a good measure remove the one we are going to write
+ unset_env ${toset}
+ else
+ local envfile="$2"
+ fi
+
+ generate_envFile ${toset} ${envfile}
+
+ # force update environment
+ # should be replaced with "do_action env update" when #172472 gets resolved
+ env-update &> /dev/null
+}
+
+
+
+### update action ###
+#
+# This action regenerates the /etc/env.d file for the current profile. Basically
+# the same as set, only it does not take any parameters. It should be called from ebuilds
+# installing Ada libs or in the pkg_postrm in gnatbuild.eclass, to clean up the
+# profile if last gnat in SLOT was removed.
+
+describe_update() {
+ echo "Update active gnat profile picking up new libs."
+}
+
+do_update() {
+ local toset=$(get_current_gnat)
+ local envfile="${ENVDIR}/${MARKER}${toset}"
+ # now check whether to update or unset the profile
+ if $(profile_is_valid ${toset}); then
+ generate_envFile ${toset} ${envfile}
+ else
+ unset_env ${toset}
+ fi
+ do_action env update &> /dev/null
+}
+
+### unset action ###
+
+describe_unset() {
+ echo "Remove settings for currently active gnat"
+}
+
+do_unset() {
+ local active=$(get_current_gnat)
+ # check whether we have any profile set before removing anything..
+ if [[ -n ${active} ]] ; then
+ unset_env ${active}
+ do_action env update &> /dev/null
+ fi
+}
diff --git a/app-eselect/eselect-gnat/metadata.xml b/app-eselect/eselect-gnat/metadata.xml
new file mode 100644
index 000000000000..70aa7cdf2d3f
--- /dev/null
+++ b/app-eselect/eselect-gnat/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!--maintainer-needed-->
+<longdescription>The eselect module for the supported gnat compilers.</longdescription>
+</pkgmetadata>
diff --git a/app-eselect/eselect-gnome-shell-extensions-20180306 b/app-eselect/eselect-gnome-shell-extensions-20180306
deleted file mode 100644
index 2d2ea7e3e531..000000000000
--- a/app-eselect/eselect-gnome-shell-extensions-20180306
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-schemas gnome-base/gnome-shell app-arch/xz-utils
-DESCRIPTION=Manages system defaults for GNOME Shell extensions
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-schemas gnome-base/gnome-shell dev-lang/perl dev-perl/JSON
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~leio/distfiles/eselect-gnome-shell-extensions-20180306.tar.xz
-_md5_=d0185b16970447b14c967db09b454ec1
diff --git a/app-eselect/eselect-gnome-shell-extensions/Manifest b/app-eselect/eselect-gnome-shell-extensions/Manifest
new file mode 100644
index 000000000000..a2526ef9272f
--- /dev/null
+++ b/app-eselect/eselect-gnome-shell-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-gnome-shell-extensions-20180306.tar.xz 2676 BLAKE2B 846e282f99828ce795ba98557bb97301f576895c46e98ae0c079dfee8461146756c85573c1ce24e4ca3690d2ea8383dd988e40d3fe271a32b1987e027b47e3ae SHA512 2c0b9119219d8f3c54201f9865e1a9dd6889ccf26537802c591e89adb545f38aca13fa6b1119fe52d4183daf4adb6d2b1053b252d2756778b31626688092196d
+EBUILD eselect-gnome-shell-extensions-20180306.ebuild 1581 BLAKE2B 9355c0f010daa96bdf7d49702588fd2c9ef9375120434d64435b88deafe961329ec080f981a8b69ad081710c849140a1b24cce259495953e57f2edb4e5984d9f SHA512 242c02f1fb2d0f60d23b6336d4bce8e3750872cbfccf05b67eb9577f967c571ed0d2e5efabe1ae5aefdacc0ae8db84b4fa3779e6205d490c43802afb70b3bad2
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
new file mode 100644
index 000000000000..ab57eba3daec
--- /dev/null
+++ b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages system defaults for GNOME Shell extensions"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# gnome-shell schemas are used in pkg_postinst
+COMMON_DEPEND="app-admin/eselect
+ >=dev-libs/glib-2.26:2
+ gnome-base/gsettings-desktop-schemas
+ gnome-base/gnome-shell"
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ dev-perl/JSON"
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils"
+
+src_install() {
+ insinto "/usr/share/eselect/modules"
+ doins gnome-shell-extensions.eselect
+ keepdir "/etc/eselect/gnome-shell-extensions"
+ # The actual gschema override file will be created in pkg_postinst.
+ dosym "../../../../etc/eselect/gnome-shell-extensions/${PN}.gschema.override" \
+ "/usr/share/glib-2.0/schemas/${PN}.gschema.override"
+}
+
+pkg_postinst() {
+ einfo "Updating list of installed extensions"
+ eselect gnome-shell-extensions update || die
+ local keyname="disabled-extensions"
+ has_version ">=gnome-base/gnome-shell-3.1.90" &&
+ keyname="enabled-extensions"
+ elog
+ elog "eselect gnome-shell-extensions manages the system default value of"
+ elog "the org.gnome.shell ${keyname} key. To override the default"
+ elog "for an individual user, use the gsettings command, e.g."
+ elog "\$ gsettings set org.gnome.shell ${keyname} \"['foo', 'bar']\""
+ elog "To undo per-user changes and use the system default, do"
+ elog "\$ gsettings reset org.gnome.shell ${keyname}"
+ elog
+}
diff --git a/app-eselect/eselect-gnome-shell-extensions/metadata.xml b/app-eselect/eselect-gnome-shell-extensions/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-eselect/eselect-gnome-shell-extensions/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-infinality-1-r1 b/app-eselect/eselect-infinality-1-r1
deleted file mode 100644
index 3e41948531f4..000000000000
--- a/app-eselect/eselect-infinality-1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Eselect module to choose an infinality font configuration style
-EAPI=6
-HOMEPAGE=https://github.com/yngwin/eselect-infinality
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/yngwin/eselect-infinality/tarball/v1 -> eselect-infinality-1.tar.gz
-_eclasses_=readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=63809b4be36662b1922aa2d363035505
diff --git a/app-eselect/eselect-infinality/Manifest b/app-eselect/eselect-infinality/Manifest
new file mode 100644
index 000000000000..404e6980f64a
--- /dev/null
+++ b/app-eselect/eselect-infinality/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-infinality-1.tar.gz 8274 BLAKE2B be4696f34c908a5e6e55546dbaf63a753e936f06074face5f8c9964f89015ee7be88c935c32d36a255c9e7ed71e967d4591ee0ad598f5cbfafc809149e728b3b SHA512 0bff25817b68125c670ffb2782704604415f233711974c47935bd5dac80b164ca471cea1fea193886b30d0eec60a4a208f0ede6bd1a40488c2458a7dd9fe127d
+EBUILD eselect-infinality-1-r1.ebuild 698 BLAKE2B e3a20c706cfda7f0319751def8f49a03236cecf22ed068d7b3815d43be35d2a538616d176315f184ca4aa8b53e2a494b84d9eb5324c4284b3c5f514800e4f559 SHA512 81afb855c952f12c56aa6d3d46d027d1d8c9791ce5213706e5acb5017ab0dfd0fafe95d0d10a6b783d2c87e40da91b861083442d0fe214a0720d9604e1d210d3
+MISC metadata.xml 338 BLAKE2B 19f8bbc98dc95fbdf49922713afa90c1e1fbfaaf7c96fdd7862720be12de546f68155d2a3e76e7547a4530e8e0ef13e7c411d8cda9d4f8869536481da71d3d40 SHA512 f4a839e992f958b55552878bcde35f45bb7f8130b5fae9b382793e3aaba710230cf703b965eb0007ea5cad31e2702d88536c32d19cd30e05fb60bb359e965351
diff --git a/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild b/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
new file mode 100644
index 000000000000..a6353e254a52
--- /dev/null
+++ b/app-eselect/eselect-infinality/eselect-infinality-1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot readme.gentoo-r1
+
+DESCRIPTION="Eselect module to choose an infinality font configuration style"
+HOMEPAGE="https://github.com/yngwin/eselect-infinality"
+SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+DEPEND=""
+
+DOC_CONTENTS="Use eselect infinality to select a font configuration style.
+This is supposed to be used in pair with eselect lcdfilter."
+
+src_install() {
+ dodoc README.rst
+ readme.gentoo_create_doc
+ insinto "/usr/share/eselect/modules"
+ doins infinality.eselect
+}
diff --git a/app-eselect/eselect-infinality/metadata.xml b/app-eselect/eselect-infinality/metadata.xml
new file mode 100644
index 000000000000..a36c1da3023a
--- /dev/null
+++ b/app-eselect/eselect-infinality/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">yngwin/eselect-infinality</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-java-0.4.0 b/app-eselect/eselect-java-0.4.0
deleted file mode 100644
index 56bca73d69ab..000000000000
--- a/app-eselect/eselect-java-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A set of eselect modules for Java
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!app-eselect/eselect-ecj !app-eselect/eselect-maven !<dev-java/java-config-2.2 app-admin/eselect
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/eselect-java.git/snapshot/eselect-java-0.4.0.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f29df9165cfbbaa78aa189fa5884c024
diff --git a/app-eselect/eselect-java/Manifest b/app-eselect/eselect-java/Manifest
new file mode 100644
index 000000000000..961c2804a116
--- /dev/null
+++ b/app-eselect/eselect-java/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-java-0.4.0.tar.xz 13412 BLAKE2B da3df5c342b1632d1cc597909283cfcb7cb71d4bff04c2aa3253110f06b8addc5121efe1a50409f2b297c70c4f816a385a0199e68821acb6c48e3065d3097b37 SHA512 a1bdb2554e4dc78d980cab80591f6e0c537f983ae78d2ca98bda8f5292cf749fa5a9983dc51c6576176566f2fcc255ca40b04c26bd1b5d7f1db2d12b76048567
+EBUILD eselect-java-0.4.0.ebuild 1218 BLAKE2B 54fce6af63f039aaaae41e3de9eb42368844f996e43cd516bb16b5cd9da81c2d836a28cb121156a60a2770916c146b4b2155f6053690ce06985921e82f332287 SHA512 87b63b6d4a179224bffa364c4c759fbe29121315bd4a2991bd086dacaa80a335f72c33db9c8752d2429f2521be1bfdc402857609f415cfb69561a3e1c7b5dd67
+MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
new file mode 100644
index 000000000000..9826dca5a463
--- /dev/null
+++ b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A set of eselect modules for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ !app-eselect/eselect-ecj
+ !app-eselect/eselect-maven
+ !<dev-java/java-config-2.2
+ app-admin/eselect"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+pkg_postinst() {
+ local REMOVED=0
+
+ rm -v "${EROOT}"usr/lib*/nsbrowser/plugins/javaplugin.so 2>/dev/null && REMOVED=1
+ rm -v "${EROOT}"etc/java-config-2/current-icedtea-web-vm 2>/dev/null && REMOVED=1
+
+ if [[ ${REMOVED} = 1 ]]; then
+ elog "The eselect java-nsplugin module has been removed and your configuration"
+ elog "has been cleaned up. From now on, you may only install either Oracle or"
+ elog "IcedTea's plugin but not both. Note you can use IcedTea's plugin with an"
+ elog "Oracle VM. See the README installed with icedtea-web for more details."
+ fi
+}
diff --git a/app-eselect/eselect-java/metadata.xml b/app-eselect/eselect-java/metadata.xml
new file mode 100644
index 000000000000..2444066aa02b
--- /dev/null
+++ b/app-eselect/eselect-java/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-lapack-0.1 b/app-eselect/eselect-lapack-0.1
deleted file mode 100644
index 4423c40ea023..000000000000
--- a/app-eselect/eselect-lapack-0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-admin/eselect-1.0.5
-DESCRIPTION=LAPACK module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.5
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5f50e6c814dad2bd20be0b0d6b379c0
diff --git a/app-eselect/eselect-lapack/Manifest b/app-eselect/eselect-lapack/Manifest
new file mode 100644
index 000000000000..fe3abdee05ea
--- /dev/null
+++ b/app-eselect/eselect-lapack/Manifest
@@ -0,0 +1,4 @@
+AUX lapack.eselect-0.1 354 BLAKE2B db08d71fb50a5d6715e642a1581f8b0598a61f298916d2136e57d526cd58db4d48730856d8294ce13f25a7b4bde2c3e6d8b3cbfcffe0288f2e354dd11c0c6619 SHA512 06e859b2ae6f93286a266f642aa374ed83b21c940ac25f9650973e6edb6e5fb75e9da39dba86e8f0f8a4ab2779b7a49065a6d4cc278e9becf6e8d35a34c47d9d
+AUX lapack.eselect.5 2103 BLAKE2B 367f10c0e6fc6acdc8b5eaf8215660a78f8895082c40853f47f5c3df4a107d918c86f8184b766d4e4f7554bdc724f3efce7a4d2e0eec58c4079fee8efe1a5490 SHA512 e393bf70301002df11d9b5ece21e5f6b15aab9dc0612315b74882ec5e255595b12ae05c408243b26563f477a7e77480d66f42be0582103e4967d4e12cfdc7f21
+EBUILD eselect-lapack-0.1.ebuild 713 BLAKE2B 6e7bcc316dc462ebdfa1529186213b67bd2314b805c86843a32caede6725d31d0e00b1c73ac1077300cd79e15ce4282d9a38255a7047e8f051bb7882934fa1f6 SHA512 96ae382d6ad9c98de0f11dd7678944f398be09c06d0832e84c79bba3c400457b9e8dc38343cbe1e2a77f7b85142b591a2fd26a397c8b215c03a4b85df03e8b69
+MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.1.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.1.ebuild
new file mode 100644
index 000000000000..5fab452e10c8
--- /dev/null
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="LAPACK module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+# Need skel.bash lib
+RDEPEND=">=app-admin/eselect-1.0.5"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="lapack"
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}"/${MODULE}.eselect-${PVR} ${MODULE}.eselect
+ doman "${FILESDIR}"/lapack.eselect.5
+}
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect-0.1 b/app-eselect/eselect-lapack/files/lapack.eselect-0.1
new file mode 100644
index 000000000000..a01ad15ab498
--- /dev/null
+++ b/app-eselect/eselect-lapack/files/lapack.eselect-0.1
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit skel
+
+MODULE="LAPACK"
+IFACE="lapack"
+
+DESCRIPTION="Manage installed $MODULE implementations"
+MAINTAINER="spyderous@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:49:51 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# vim: set ft=eselect :
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect.5 b/app-eselect/eselect-lapack/files/lapack.eselect.5
new file mode 100644
index 000000000000..92730a7ac852
--- /dev/null
+++ b/app-eselect/eselect-lapack/files/lapack.eselect.5
@@ -0,0 +1,65 @@
+.TH "ESELECT" "5" "June 2006" "Gentoo Linux" "eselect"
+.SH "NAME"
+lapack.eselect \- The LAPACK management module for Gentoo's eselect
+.SH "SYNOPSIS"
+\fBeselect lapack\fR [\fBhelp\fR|\fBusage\fR]
+.br
+\fBeselect lapack\fR \fBlist\fR [\fIoptions\fR]
+.br
+\fBeselect lapack\fR \fBadd\fR
+.br
+\fBeselect lapack\fR \fBset\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+\fBeselect lapack\fR \fBshow\fR [\fIoptions\fR]
+
+.SH "DESCRIPTION"
+\fBeselect\fR is Gentoo's configuration and management tool. It features
+modules that care for the individual administrative tasks.
+.SH "ACTION: LIST"
+\fBeselect lapack list\fR [\fIoptions\fR]
+.br
+Displays an ordered list of installed LAPACK implementations. It distinguishes between versions with different
+Application Binary Interfaces (e.g. x86/AMD64). Furthermore, it also distinguishes
+between interfaces to high-level programming languages. Each line holds
+a number and the implementation's name. An asterisk next to one of the list
+elements denotes an active implementation.
+
+phi / # eselect lapack list
+.br
+Installed LAPACK for libdir \fBlib\fR
+.br
+ [1] atlas *
+ [2] reference
+
+Possible \fIoptions\fR to the \fBlist\fR action are restrictions to
+handle only certain ABI\-specific library directories. For example,
+
+\fBeselect lapack list lib64\fR
+
+lists only LAPACK implementations found in \fB/usr/lib64\fR.
+
+.SH "ACTION: SHOW"
+\fBeselect lapack show\fR [\fIoptions\fR]
+.br
+Shows your system's currently active LAPACK implementations.
+
+phi / # eselect lapack show
+.br
+lib: atlas
+.br
+lib64: reference
+
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBshow\fR action to restrict it to given ABIs.
+.SH "ACTION: SET"
+\fBeselect lapack set\fR \fIimplementation\fR [\fIoptions\fR]
+.br
+Sets your system's currently active LAPACK implementations to \fIimplementation\fR.
+The same \fIoptions\fR that apply to the \fBlist\fR action can be used
+with the \fBset\fR action to restrict it to given ABIs.
+
+phi / # eselect lapack set atlas
+.SH "AUTHOR"
+Danny van Dyk <kugelfang@gentoo.org>
+.br
+Donnie Berkholz <spyderous@gentoo.org>
diff --git a/app-eselect/eselect-lapack/metadata.xml b/app-eselect/eselect-lapack/metadata.xml
new file mode 100644
index 000000000000..0c6991d7902b
--- /dev/null
+++ b/app-eselect/eselect-lapack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-lcdfilter-1 b/app-eselect/eselect-lcdfilter-1
deleted file mode 100644
index 424cce616ee0..000000000000
--- a/app-eselect/eselect-lcdfilter-1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Eselect module to choose Freetype infinality-enhanced LCD filtering settings
-EAPI=4
-HOMEPAGE=https://github.com/yngwin/eselect-lcdfilter
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-PDEPEND=media-libs/freetype[infinality]
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/yngwin/eselect-lcdfilter/tarball/v1 -> eselect-lcdfilter-1.tar.gz
-_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=c532b57646d7ed5f57f80176ac8b1f29
diff --git a/app-eselect/eselect-lcdfilter-2 b/app-eselect/eselect-lcdfilter-2
deleted file mode 100644
index b4020bbbe5dd..000000000000
--- a/app-eselect/eselect-lcdfilter-2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Eselect module to choose Freetype infinality-enhanced LCD filtering settings
-EAPI=6
-HOMEPAGE=https://github.com/yngwin/eselect-lcdfilter
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=media-libs/freetype[infinality]
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/yngwin/eselect-lcdfilter/tarball/v2 -> eselect-lcdfilter-2.tar.gz
-_eclasses_=readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=d542143bc173cdcc5fdc7de55a88a02d
diff --git a/app-eselect/eselect-lcdfilter/Manifest b/app-eselect/eselect-lcdfilter/Manifest
new file mode 100644
index 000000000000..2e582f45c255
--- /dev/null
+++ b/app-eselect/eselect-lcdfilter/Manifest
@@ -0,0 +1,5 @@
+DIST eselect-lcdfilter-1.tar.gz 17206 BLAKE2B 8ac9b6b85819104dd9ce25a08e28694497218372a63f65000591546aa51de94ad6dd03530f62e1e5b5bc8abf0090b9695e8cce04c6a2d37684d489fff983be5f SHA512 1f86fb2cc21ff9cc9b79c50578a02f7c461ae203533cc817dc733d0dde9ad43763267bb1703b9495ba6f46989e0446bb1cba39aaa705d3b605118f62cb0d2dfc
+DIST eselect-lcdfilter-2.tar.gz 18365 BLAKE2B 25acb2f29c3248711fbe5cfd9ba9fa7489de246ff1a4b07121d45987650e89389bb12a299520181c2012ea74fd8f4b87b8d33dcf0ab1dfea8beebb5b8928580c SHA512 e17c475c860f0a3ad7249d21ca11c52f3226852ba042b83058baf6823242c4f8be0042aad52029757944fce6d816df386b928f2005ab87e0778d3ecb26ceec92
+EBUILD eselect-lcdfilter-1.ebuild 994 BLAKE2B 687b7600c746fc51a2be57749142f5a32b7e043aa5a4a85ac2781459f31c316bd1351e803e5fb1f9d779c87950330caecc4c4d861669fefbd7e8fb366c298f60 SHA512 871e6671cc69ddab4d230af7203c149627d21730819435710590c1e5f0094882c6a15cbbe6c7ae5561c2a4c5c1a942de7971d0c9aea1e12659fa5016af93cacf
+EBUILD eselect-lcdfilter-2.ebuild 1017 BLAKE2B 4415986a1891825048e5efc214468e7d7676d332606e0886700501a88ad29e51e5b837df40dcdea061460de15d85b12a6469dbc1afe87e111bf1b6bb8b1c3901 SHA512 2d09f0f3269ab196d6a3293e8a92de964d6a87559f76963d13ffdc197826ea54e541a91f09eaa35c8e68e8ef8a360fd3598cccd43bcfa2c0cb576260fbc594a0
+MISC metadata.xml 337 BLAKE2B 9228fb77b981e77d2998e14e342da38e1c6f8a3211ff0907ff63004ba38d7347fd5e7ba76e3da1d7d619bc2e4a24e86ac8b9d22cc7f329b8af28603a0abb23b5 SHA512 4f60f1456c6e04af05a9f716dfed68d56462dcb599a50f6c4de38f6621d13eea013740e5dac04e1f0a8da5775eb429954f5dfe85bed6f7bbbad6e6a768cb5b12
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
new file mode 100644
index 000000000000..867bf778f3da
--- /dev/null
+++ b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit vcs-snapshot
+
+DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
+HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
+SRC_URI="${HOMEPAGE}/tarball/v1 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect"
+PDEPEND="media-libs/freetype[infinality]"
+
+src_install() {
+ dodoc README.rst infinality-settings.sh
+
+ insinto "/usr/share/eselect/modules"
+ doins lcdfilter.eselect
+
+ insinto "/usr/share/${PN}"
+ doins -r env.d
+}
+
+pkg_postinst() {
+ elog "Use eselect lcdfilter to select an lcdfiltering font style."
+ elog "You can customize /usr/share/${PN}/env.d/custom"
+ elog "with your own settings. See /usr/share/doc/${PF}/infinality-settings.sh"
+ elog "for an explanation and examples of the variables."
+ elog "This module is supposed to be used in pair with eselect infinality."
+}
diff --git a/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
new file mode 100644
index 000000000000..6f0ea6b5c257
--- /dev/null
+++ b/app-eselect/eselect-lcdfilter/eselect-lcdfilter-2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot readme.gentoo-r1
+
+DESCRIPTION="Eselect module to choose Freetype infinality-enhanced LCD filtering settings"
+HOMEPAGE="https://github.com/yngwin/eselect-lcdfilter"
+SRC_URI="${HOMEPAGE}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+PDEPEND="media-libs/freetype[infinality]"
+
+DOC_CONTENTS="Use eselect lcdfilter to select an lcdfiltering font style.
+ You can customize ${EPREFIX}/usr/share/"${PN}"/env.d/custom with your own settings.
+ See ${EPREFIX}/usr/share/doc/"${PF}"/infinality-settings.sh for an explanation and
+ examples of the variables. This module is supposed to be used in pair with
+ eselect infinality."
+
+src_install() {
+ dodoc README.rst infinality-settings.sh
+ readme.gentoo_create_doc
+
+ insinto "/usr/share/eselect/modules"
+ doins lcdfilter.eselect
+
+ insinto "/usr/share/${PN}"
+ doins -r env.d
+}
diff --git a/app-eselect/eselect-lcdfilter/metadata.xml b/app-eselect/eselect-lcdfilter/metadata.xml
new file mode 100644
index 000000000000..f856a70079fb
--- /dev/null
+++ b/app-eselect/eselect-lcdfilter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">yngwin/eselect-lcdfilter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-lib-bin-symlink-0.1.1 b/app-eselect/eselect-lib-bin-symlink-0.1.1
deleted file mode 100644
index 5261acde8a15..000000000000
--- a/app-eselect/eselect-lib-bin-symlink-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=An eselect library to manage executable symlinks
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://www.bitbucket.org/mgorny/eselect-lib-bin-symlink/downloads/eselect-lib-bin-symlink-0.1.1.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32ab5e0825151baa7f49908c0e27cb3e
diff --git a/app-eselect/eselect-lib-bin-symlink-9999 b/app-eselect/eselect-lib-bin-symlink-9999
deleted file mode 100644
index 14ad3961607c..000000000000
--- a/app-eselect/eselect-lib-bin-symlink-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An eselect library to manage executable symlinks
-EAPI=5
-HOMEPAGE=https://bitbucket.org/mgorny/eselect-lib-bin-symlink/
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e84e8d9fca51f155d08ab49b15459e7d
diff --git a/app-eselect/eselect-lib-bin-symlink/Manifest b/app-eselect/eselect-lib-bin-symlink/Manifest
new file mode 100644
index 000000000000..6662df4f27f2
--- /dev/null
+++ b/app-eselect/eselect-lib-bin-symlink/Manifest
@@ -0,0 +1,4 @@
+DIST eselect-lib-bin-symlink-0.1.1.tar.bz2 45376 BLAKE2B 59ffe0897a57115debf185344eb7fef5177394337c02dde6f67e79114e53f411edd5e5854c86beb4884eca6a51282a0dc09ee94e82cb0d0d0fd7e54a99e660ed SHA512 16b56153aa61534997f42641656c3feaf27243fece8cdd42e93ed0be5dabedafc316af8111cd7ff0e321666de8deb1a35e86032cd9590060f677ac7e68fd48bd
+EBUILD eselect-lib-bin-symlink-0.1.1.ebuild 656 BLAKE2B 224c90c5714a5aca835065726779806e7873e4029aa33134ea2e4b0e65dc370daa35dd590d190295691c435c81e69579a3563d10e99cee3b6d7ad76ded7d4aa1 SHA512 721c447737d131b1b09223362c43481798d8fd3ba8fb7b47d8da1b032db205b4bf42c1651cbb55a886fbac4de247176cf58d1226b85fcce5bb0702da3712fa02
+EBUILD eselect-lib-bin-symlink-9999.ebuild 793 BLAKE2B cfe551ad8b6a12317abca16a4728c40812dd751712358911a16c387f7788eee1e8b8e08de6b3046cc1ef929e2dc08167a10557d698752047bdb9d68f1bf031d9 SHA512 e77554398060f689c0b427070a4b2b475674c16dc443bcfa1e13c11be8b54d050b8aa4e50a73d8fe8d7baa3ac5f811fa03ec5afa511d65d2f9457d5fc685a68c
+MISC metadata.xml 563 BLAKE2B c794d406f73c06b4c05fa441274f145600677f1b82256cc1621540510f6246934ee00f90e40ce170aded4e97ac2b77c5982ab4d1df1e0d27873bd4498212124f SHA512 35b31f23ebe0f3d08726edc4a876162907a8031d9907d67d775534b4d7719330701a94859a5dd79457cfc50ee9be3cc9a7829c7a0dcfd751dba2e68d2f75b6cb
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
new file mode 100644
index 000000000000..c5aa1b731e78
--- /dev/null
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-0.1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An eselect library to manage executable symlinks"
+HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild
new file mode 100644
index 000000000000..59ad25638407
--- /dev/null
+++ b/app-eselect/eselect-lib-bin-symlink/eselect-lib-bin-symlink-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#if LIVE
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+AUTOTOOLS_AUTORECONF=1
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="An eselect library to manage executable symlinks"
+HOMEPAGE="https://bitbucket.org/mgorny/eselect-lib-bin-symlink/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+#if LIVE
+
+KEYWORDS=
+SRC_URI=
+#endif
diff --git a/app-eselect/eselect-lib-bin-symlink/metadata.xml b/app-eselect/eselect-lib-bin-symlink/metadata.xml
new file mode 100644
index 000000000000..4c2bf0965d1b
--- /dev/null
+++ b/app-eselect/eselect-lib-bin-symlink/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <bugs-to>https://bitbucket.org/mgorny/eselect-lib-bin-symlink/issues/</bugs-to>
+ <remote-id type="bitbucket">mgorny/eselect-lib-bin-symlink</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-lua-1 b/app-eselect/eselect-lua-1
deleted file mode 100644
index 7c5a5050277f..000000000000
--- a/app-eselect/eselect-lua-1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-admin/eselect-1.2.4
-DESCRIPTION=Lua eselect module
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4
-SLOT=0
-_md5_=ad43066ad7d95b31fe83aa6c08f4d417
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
new file mode 100644
index 000000000000..cb110c078f2e
--- /dev/null
+++ b/app-eselect/eselect-lua/Manifest
@@ -0,0 +1,3 @@
+AUX lua.eselect-1 3217 BLAKE2B c3f2723afd8177878443bad6fbb51d16a0b90a9f439fe0f2dd150105488db540481136e2ff5f3d2a0b71bdcc88e95f6751a63c7c0a6bea4c32445f8871aa4163 SHA512 653aa84caf8a3706206099de78d8e1b2bbd41cda40dd7dac2b022c85a1988d864a80f490389db3fc2450555d301f965189df132a964a4425ee2bab6c2b7be220
+EBUILD eselect-lua-1.ebuild 616 BLAKE2B c3ac751c67c1b50706999d006e0d964b0c7add201dee570cc799ebf09d61e13f93e347be2ce8f38aa2fd78cadacb99dd83612404e7d151b2b11658191415bf98 SHA512 73a32b0ea684562ae695449eec2da60a9ea46e29d5f85a701741d96e56e9fab037f3ca425fa70eb984ce5c08fc5eb038ae3b6deb090ee44c962d5658b47fab4d
+MISC metadata.xml 318 BLAKE2B db169d8920d5070857d050647cf7d131f17039316e52b4032d573a7f9863af9ea6741bb31fc0a25c78d63863a27a4643131ea8aaae227bdc5bacbcbae6d41fd4 SHA512 48b3aa36f683baa2dca029f1d8ac46a951860f7d67c55d99c330acc09f1b407da2b640dfdf045ef497f254f83b493f0de36c5bca9309e39af4a8d4376af82f92
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-1.ebuild
new file mode 100644
index 000000000000..59e798cd1b8d
--- /dev/null
+++ b/app-eselect/eselect-lua/eselect-lua-1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Lua eselect module"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=app-admin/eselect-1.2.4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/eselect/modules/
+ newins "${FILESDIR}"/lua.eselect-${PV} lua.eselect
+}
diff --git a/app-eselect/eselect-lua/files/lua.eselect-1 b/app-eselect/eselect-lua/files/lua.eselect-1
new file mode 100644
index 000000000000..d6f951098354
--- /dev/null
+++ b/app-eselect/eselect-lua/files/lua.eselect-1
@@ -0,0 +1,150 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 2014-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit config multilib
+
+DESCRIPTION="Manage lua symlinks"
+MAINTAINER="mabi@gentoo.org"
+
+HEADER_FILES="lauxlib.h luaconf.h lua.h lua.hpp lualib.h"
+
+remove_symlinks() {
+ rm -f "${EROOT}"/usr/bin/{lua,luac} &>/dev/null
+ for dir in $(get_libdirs) ; do
+ rm -f "${EROOT}"${dir}/liblua.so &>/dev/null && \
+ rm -f "${EROOT}"${dir}/pkgconfig/lua.pc &>/dev/null
+ done
+ for f in $HEADER_FILES ; do
+ rm -f "${EROOT}"/usr/include/$f
+ done
+ rm -f "${EROOT}"/usr/share/man/man1/{lua,luac}.1{,.gz,.bz2,.lzma} &>/dev/null
+}
+
+set_symlinks() {
+ local ver=$1
+ ln -s "${EROOT}"/usr/bin/lua{$ver,}
+ ln -s "${EROOT}"/usr/bin/luac{$ver,}
+ for dir in $(get_libdirs) ; do
+ ln -s "${dir}"/liblua{$ver,}.so
+ ln -s "${dir}"/pkgconfig/lua{$ver,}.pc
+ done
+ for orig in "${EROOT}"/usr/share/man/man1/lua*$ver.1* ; do
+ ln -s "${orig}" "${orig//$ver}"
+ done
+ for f in $HEADER_FILES ; do
+ ln -s "${EROOT}"/usr/include/lua$ver/$f "${EROOT}"/usr/include
+ done
+}
+
+get_libdirs() {
+ local dir libdirs
+ for dir in $(list_libdirs); do
+ [[ -L ${EROOT}/usr/${dir} ]] && continue
+ ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue
+
+ libdirs+=' '${EPREFIX}/usr/${dir}
+ done
+ echo ${libdirs:-${EPREFIX}/usr/lib}
+}
+
+find_targets() {
+ local dirs
+ local prefix="${EROOT}/usr/bin/lua"
+ for f in ${prefix}5* ; do
+ dirs="${dirs} ${f##$prefix}"
+ done
+ echo $dirs
+}
+
+resolv_target() {
+ local targets=( $(find_targets) )
+ if is_number $1; then
+ [[ $1 -le ${#targets[@]} && $1 -gt 0 ]] && echo "${targets[ $(( $1 - 1 )) ]}"
+ elif has $1 ${targets[@]}; then
+ echo $1
+ fi
+}
+
+get_active_version() {
+ readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\d.-]*\):\1:p"
+}
+
+## Actual actions
+
+## set action
+
+describe_set() {
+ echo "Sets the current version of lua"
+}
+
+describe_set_parameters() {
+ echo '<target>'
+}
+
+describe_set_options() {
+ echo 'target: Target name or number (from "list" action)'
+}
+
+
+do_set() {
+ local target=$(resolv_target $1)
+ if [[ -z "${target}" ]]; then
+ die -q "You need to specify a version"
+ fi
+ remove_symlinks
+ set_symlinks $target
+}
+
+## List action
+
+describe_list() {
+ echo 'Lists available lua versions'
+}
+
+do_list() {
+ local targets
+ local a
+ targets=( $(find_targets) )
+ a=$(get_active_version)
+ for (( i = 0; i < ${#targets[@]}; i++ )) ; do
+ [[ $a == ${targets[i]} ]] && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_numbered_list -m '(none found)' "${targets[@]}"
+}
+
+## Show action
+
+describe_show() {
+ echo 'Show the active lua version'
+}
+
+do_show() {
+ get_active_version
+}
+
+## update action
+
+describe_update() {
+ echo 'Automatically update the lua version'
+}
+
+describe_update_options() {
+ echo 'ifunset : Do not override existing implementation'
+}
+
+do_update() {
+ [[ -n ${1} && ! ( ${1} == ifunset || ${1} == '--if-unset' ) ]] && \
+ die -q 'Usage error'
+
+ [[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -n $(get_active_version) ]] && \
+ return
+
+ remove_symlinks
+
+ local targets=( $(find_targets) )
+ if [[ -n ${#targets[@]} ]] ; then
+ local target=${targets[${#targets[@]} - 1]}
+ set_symlinks $target || echo 'Nothing to update'
+ fi
+}
diff --git a/app-eselect/eselect-lua/metadata.xml b/app-eselect/eselect-lua/metadata.xml
new file mode 100644
index 000000000000..34308d2edfe1
--- /dev/null
+++ b/app-eselect/eselect-lua/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
+ </maintainer>
+ <longdescription lang="en">
+ Lua eselect module
+ </longdescription>
+</pkgmetadata>
diff --git a/app-eselect/eselect-mesa-0.0.10-r1 b/app-eselect/eselect-mesa-0.0.10-r1
deleted file mode 100644
index 2f9dc7452613..000000000000
--- a/app-eselect/eselect-mesa-0.0.10-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Utility to change the Mesa OpenGL driver being used
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4 >=app-shells/bash-4
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-mesa-0.0.10.tar.gz
-_md5_=5b3820d148f92dada97c32d3b0628a04
diff --git a/app-eselect/eselect-mesa/Manifest b/app-eselect/eselect-mesa/Manifest
new file mode 100644
index 000000000000..7d6427a12e24
--- /dev/null
+++ b/app-eselect/eselect-mesa/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-mesa-0.0.10.tar.gz 2214 BLAKE2B 6ce6303f372eb4ddd610bbd14a66fd2a1d596a8bfea6b353cb45600bc710bc4420452d00995778a06cd2f95b4b1c6366a15ffec2a03ac5c927d4cbbba92387b3 SHA512 c039ca769a436ccb5a7f0271532d3bc988f29ba31784fc74d1a4dd230e4f9c6db7ef3b9b40a1341202d9641eca9278a73c74e13091f2370065dca7d3707d91c3
+EBUILD eselect-mesa-0.0.10-r1.ebuild 781 BLAKE2B 1bc634a3092ffc5828451df4fd090ca9c0674af3653a00662ef7467e07f705c79ac4ba8fa01b97bd05716905e36e1838f133307e02c87a1dbd6121c6e8431954 SHA512 3698b9df795434b6ebb36ca27aa995f9c7fdb033a8f31077b3874837145ea832973884a40b5376e380a8290d6fd0cbbb2f98c3a223db8a0222f9618a916f0923
+MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/app-eselect/eselect-mesa/eselect-mesa-0.0.10-r1.ebuild b/app-eselect/eselect-mesa/eselect-mesa-0.0.10-r1.ebuild
new file mode 100644
index 000000000000..041b0f20e056
--- /dev/null
+++ b/app-eselect/eselect-mesa/eselect-mesa-0.0.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to change the Mesa OpenGL driver being used"
+HOMEPAGE="https://www.gentoo.org/"
+
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.4
+ >=app-shells/bash-4"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins mesa.eselect
+}
+
+pkg_postinst() {
+ if has_version ">=media-libs/mesa-7.9" && \
+ ! [ -f "${EROOT}"/usr/share/mesa/eselect-mesa.conf ]; then
+ eerror "Rebuild media-libs/mesa for ${PN} to work."
+ fi
+}
diff --git a/app-eselect/eselect-mesa/metadata.xml b/app-eselect/eselect-mesa/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/app-eselect/eselect-mesa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-metasploit-0.16 b/app-eselect/eselect-metasploit-0.16
deleted file mode 100644
index 487f6e37b005..000000000000
--- a/app-eselect/eselect-metasploit-0.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
-DESCRIPTION=eselect module for metasploit
-EAPI=5
-HOMEPAGE=http://www.pentoo.ch/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
-SLOT=0
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fb0a03501932a94ec32ca99cbdb8c53b
diff --git a/app-eselect/eselect-metasploit/Manifest b/app-eselect/eselect-metasploit/Manifest
new file mode 100644
index 000000000000..72b339f9c2e6
--- /dev/null
+++ b/app-eselect/eselect-metasploit/Manifest
@@ -0,0 +1,7 @@
+AUX 91metasploit 301 BLAKE2B b5dc4ea9b50299ee88135f4aac951f4407da990faa6f1bff796fcd16d7a15a114dfbea1082f63e5b869d1f66eb869b55ce5c33ea1816282852b5da72870037a8 SHA512 60c1633dba13a5614649f51e9c4b79dde9944bac3c81dba26b5e97d3589985ba66d05c73093b68bef2af150932d534fc3d17c223de1c68a13b266ba219c55f9b
+AUX metasploit.eselect-0.13 5200 BLAKE2B 1b58496e503e6a877e1314b6ed5092a43886bb015f74cbb6d980dd2b8140ecc7871ac33fbb150f55b62014cc9d1187e6c0fb1464b92817254ac1a123baad4d59 SHA512 73d94d02995f3328a61e566d9d6da58c062393a4b8ae48f57c4fa09fe2e3d06e4b9a5dd069c6504cb77a0dcd924e4a13c83857bb8a640d0d7568c99ae0e6655c
+AUX msfloader-0.16 1156 BLAKE2B afc03dcb975b7e9e2928e54da9b81d3fc4970d1ea61d044e0dfd51fe842621935c9a5fc9994c365d4d568801a1a3adaaf94192ecd32dd3671a010e88a4996bda SHA512 8b16f37892fa59df912c6a67413b505f1e192c88d57635ba0f91d768c4a55ab856471ce78f4f21c990d0b250736bdae8129a70b7459e9a82ce291fe631e1361d
+AUX msfrpcd.confd 370 BLAKE2B b692c006e181927c4dba7f159f4fcf85e316004ad09a4ffc107189d186837924b3ad64ad614e9e45742dedcf53a046e36096e5fb6bc60b99ad2104a96c1a4371 SHA512 88a52427233bc82dc36d8f627edee84ba6675cddcc4539bb3a28cfe6fd7fba673875d62a150dfa5314756f11a6b1a95453966b31a2ae1f9820c6ef936d463f90
+AUX msfrpcd.initd 470 BLAKE2B 760f4d87365c1cc4c23a305710eaa96447a8c3ac87a4c02133542b4a051f4b669f828f5cdeecbfac7e29f3a6f41febfe35296264804ffd4ce111a1d8bb63d2d5 SHA512 315eff30ff8826f87243d100f9a7fa28e7e4689bb4593bdc4fa0a4f8fa1216556e8921f39c912bb544c7304c84a6421e6289f8aca177ae401989f35e2b8fe441
+EBUILD eselect-metasploit-0.16.ebuild 912 BLAKE2B eb259546e04f19100afc4502980eef636ef5a91cd7c41073dbf5b5fc9c8686d0692941fef5277c75e724f44c10d01ca5bd664680a663da7aa8d5404a46547d26 SHA512 970d64ffbe097e3cf18f08df0fe63826d21b24c0929635ec236fcb5cbed760e965ff7e20573297bb84583e51388a7ac08eaf4fac2d4fa46f098bcbddc71de0c6
+MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild
new file mode 100644
index 000000000000..4746a34aa7d3
--- /dev/null
+++ b/app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="eselect module for metasploit"
+HOMEPAGE="http://www.pentoo.ch/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect
+ !<net-analyzer/metasploit-4.6"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+ #force to use the outdated bundled version of metasm
+ doenvd "${FILESDIR}"/91metasploit
+
+ newinitd "${FILESDIR}"/msfrpcd.initd msfrpcd
+ newconfd "${FILESDIR}"/msfrpcd.confd msfrpcd
+
+ insinto /usr/share/eselect/modules
+ newins "${FILESDIR}/metasploit.eselect-0.13" metasploit.eselect
+
+ newbin "${FILESDIR}"/msfloader-${PV} msfloader
+}
+
+pkg_postinst() {
+ "${EROOT}"/usr/bin/eselect metasploit set --use-old 1
+ elog "To switch between installed slots, execute as root:"
+ elog " # eselect metasploit set [slot number]"
+}
diff --git a/app-eselect/eselect-metasploit/files/91metasploit b/app-eselect/eselect-metasploit/files/91metasploit
new file mode 100644
index 000000000000..ce58b5043ddd
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/91metasploit
@@ -0,0 +1,8 @@
+MSF_DATABASE_CONFIG=/usr/lib/metasploit/config/database.yml
+
+# needed because MSF ships an old version of metasm
+# which isn't compatible with the new one
+MSF_LOCAL_LIB="/usr/lib/metasploit/lib/metasm"
+
+# needed because MSF doesn't know where it is since the alzheimer's
+MSF_ROOT=/usr/lib/metasploit
diff --git a/app-eselect/eselect-metasploit/files/metasploit.eselect-0.13 b/app-eselect/eselect-metasploit/files/metasploit.eselect-0.13
new file mode 100644
index 000000000000..be4f780e935d
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/metasploit.eselect-0.13
@@ -0,0 +1,207 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 2005-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2 or later
+# $
+
+DESCRIPTION="Control which metaploit version is active"
+MAINTAINER="zerochaos@pentoo.ch"
+
+###WARNING: don't even think of using this insanity for a reference (but it works,mostly)
+#base idea from kernel.eselect, get_libdir from php.eselect with --use-old from opencl.eselect
+#all modified randomly until it worked, entropy is wonderful
+###/WARNING
+
+inherit multilib
+
+get_libdir() {
+ local dir
+ if has lib64 $(list_libdirs); then
+ echo lib64
+ return
+ fi
+ echo lib
+}
+
+MSFPATH="/usr/$(get_libdir)/metasploit"
+
+# find a list of metasploit symlink targets and sort them
+find_targets() {
+ local f
+ for f in "${EROOT}${MSFPATH}"[[:digit:]]*; do
+ [[ -d ${f} ]] && basename "${f}"
+ done | LC_ALL=C sort
+}
+
+# remove the metasploit symlink
+remove_symlink() {
+ for i in $(qlist metasploit | grep $(canonicalise "${EROOT}${MSFPATH}")/msf)
+ do
+ if [ -L /usr/bin/$(echo ${i} | awk -F'/' '{print $5}') ]; then
+ unlink /usr/bin/$(echo ${i} | awk -F'/' '{print $5}') || die -q "failed to unlink ${i}"
+ fi
+ done
+ if [ -L ${EROOT}${MSFPATH} ]; then
+ unlink "${EROOT}${MSFPATH}" || die -q "failed to unlink ${EROOT}${MSFPATH}"
+ elif [ -e ${EROOT}${MSFPATH} ]; then
+ die -q "${EROOT}${MSFPATH} exists but is not a symlink"
+ fi
+}
+
+# set the metasploit symlink
+set_symlink() {
+ local target=$1
+
+ if is_number "${target}"; then
+ local targets=( $(find_targets) )
+ target=${targets[target-1]}
+ fi
+
+ if [[ -z ${target} ]]; then
+ die -q "Target \"$1\" doesn't appear to be valid!"
+ elif [[ -d ${EROOT}/usr/$(get_libdir)/${target} ]]; then
+ ln -s "${target}" "${EROOT}${MSFPATH}"
+ for i in $(qlist metasploit | grep /usr/$(get_libdir)/${target}/msf)
+ do
+ ln -s /usr/bin/msfloader /usr/bin/$(echo ${i} | awk -F'/' '{print $5}')
+ done
+ #this elif looks like it is trying to support setting by slot only,
+ #but that isn't supported by the rest of the script... fix or remove?
+ elif [[ -d ${EROOT}${MSFPATH}${target} ]]; then
+ ln -s "metasploit${target}" "${EROOT}${MSFPATH}"
+ for i in $(qlist metasploit | grep /usr/$(get_libdir)/${target}/msf)
+ do
+ ln -s /usr/bin/msfloader /usr/bin/$(echo ${i} | awk -F'/' '{print $5}')
+ done
+ else
+ die -q "Target \"$1\" doesn't appear to be valid!"
+ fi
+}
+
+# wrapper to safely set the symlink
+set_symlink_safe() {
+ if [[ -L ${EROOT}${MSFPATH} ]]; then
+ # existing symlink
+ remove_symlink || die -q "Couldn't remove existing symlink"
+ set_symlink "$1" || die -q "Couldn't set a new symlink"
+ #um, why is there an env-update here?
+ env-update
+ elif [[ -e ${EROOT}${MSFPATH} ]]; then
+ # we have something strange
+ die -q "${EROOT}${MSFPATH} exists but is not a symlink"
+ else
+ set_symlink "$1" || die -q "Couldn't set a new symlink"
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current metasploit symlink"
+}
+
+do_show() {
+ write_list_start "Current metasploit symlink:"
+ if [[ -L ${EROOT}${MSFPATH} ]]; then
+ local metasploit=$(canonicalise "${EROOT}${MSFPATH}")
+ write_kv_list_entry "${metasploit%/}" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available metasploit symlink targets"
+}
+
+do_list() {
+ local i targets=( $(find_targets) )
+
+ write_list_start "Available metasploit symlink targets:"
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ [[ ${targets[i]} = \
+ $(basename "$(canonicalise "${EROOT}${MSFPATH}")") ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new metasploit symlink target"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+describe_set_options() {
+ echo "<target> : Target name or number (from 'list' action)"
+ echo "--use-old : If an implementation is already set, use that one instead"
+}
+
+do_set() {
+ local action="error"
+ local current=$(basename "$(canonicalise "${EROOT}${MSFPATH}")")
+ local available=( $(find_targets) )
+ local new
+ local opt
+
+ while [[ ${#@} -gt 0 ]] ; do
+ opt=$1
+ shift
+ case ${opt} in
+ --use-old)
+ if [[ -n "${current}" ]] && has "${current}" "${available[@]}"; then
+ action="old-implementation"
+ fi
+ ;;
+ metasploit*)
+ if [[ "${action}" != "old-implementation" ]] ; then
+ action="set-implementation"
+ fi
+
+ if has ${opt} ${available[@]}; then
+ new="${opt}"
+ else
+ echo "You need to emerge ${opt} before you try to eselect it"
+ fi
+ ;;
+ *)
+ if [[ "${action}" != "old-implementation" ]] ; then
+ action="set-implementation"
+ fi
+
+ if is_number ${opt} ; then
+ #targets=( $(get_implementations) )
+ new=${available[opt - 1]}
+ if [[ -z ${new} ]] ; then
+ die -q "Unrecognized option: ${opt}"
+ fi
+ else
+ die -q "Unrecognized option: ${opt}"
+ fi
+ ;;
+ esac
+ done
+
+ case ${action} in
+ old-implementation)
+ set_symlink_safe ${current}
+ return $?
+ ;;
+ set-implementation)
+ if [[ -n ${new} ]] ; then
+ set_symlink_safe ${new}
+ return $?
+ else
+ die -q "Please specify an implementation to set"
+ fi
+ ;;
+ *)
+ die -q "Invalid usage of set action."
+ ;;
+ esac
+}
diff --git a/app-eselect/eselect-metasploit/files/msfloader-0.16 b/app-eselect/eselect-metasploit/files/msfloader-0.16
new file mode 100644
index 000000000000..231275a9b1f6
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/msfloader-0.16
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+#todo:
+#add in optional auto starting/stopping of postgres
+
+#read the desired version of ruby from the eselected version of msf
+header="$(head -n1 /usr/lib/metasploit/msfconsole)"
+ruby="${header:2}"
+
+#normally msf makes this dir, however, this script runs first
+if [ ! -d ~/.msf4 ]; then
+ mkdir ~/.msf4
+fi
+
+#we cannot control if msf* exits normally so always start with cleanup
+if [ -f ~/.msf4/Gemfile ]; then
+ rm ~/.msf4/Gemfile
+fi
+if ls -A ~/.msf4/*.gemspec > /dev/zero 2>&1; then
+ rm ~/.msf4/*.gemspec
+fi
+
+#fetch the latest Gemfile and gemspecsfrom the selected version of msf
+cp /usr/lib/metasploit/Gemfile ~/.msf4/
+if ls -A /usr/lib/metasploit/*.gemspec > /dev/zero 2>&1; then
+ cp /usr/lib/metasploit/*.gemspec ~/.msf4/
+fi
+
+#ensure Gemfile.lock is up to date
+BUNDLE_GEMFILE=~/.msf4/Gemfile ${ruby} -S bundle check > /dev/null 2>&1
+if [ "$?" != "0" ]; then
+ if [ -f ~/.msf4/Gemfile.lock ]; then
+ rm ~/.msf4/Gemfile.lock
+ else
+ echo "Something went wrong, please open a bug for metasploit on https://bugs.gentoo.org"
+ fi
+fi
+
+#ready to go
+BUNDLE_GEMFILE=~/.msf4/Gemfile ${ruby} -S bundle exec /usr/lib/metasploit/$(basename $0) "$@"
+#profit
diff --git a/app-eselect/eselect-metasploit/files/msfrpcd.confd b/app-eselect/eselect-metasploit/files/msfrpcd.confd
new file mode 100644
index 000000000000..d097e6cdfb71
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/msfrpcd.confd
@@ -0,0 +1,16 @@
+# Config file for /etc/init.d/metasploit
+
+# Bind to the following IP instead of the loopback address
+IPADDR=127.0.0.1
+
+# Bind to the following TCP port instead of default 55555
+PORT=55553
+
+# Use the following username instead of msf
+USER="msf"
+
+# Use the following password instead of msf
+PASS="secure"
+
+# All options
+MSF_OPTS="-U $USER -P $PASS -S -a $IPADDR -p $PORT"
diff --git a/app-eselect/eselect-metasploit/files/msfrpcd.initd b/app-eselect/eselect-metasploit/files/msfrpcd.initd
new file mode 100644
index 000000000000..8963eef82bf4
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/msfrpcd.initd
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION=
+PIDFILE=/var/run/msfrpcd${VERSION}.pid
+
+start() {
+ ebegin "Starting msfrpcd"
+ start-stop-daemon --start --quiet --background \
+ --exec /usr/bin/msfrpcd \
+ --pidfile ${PIDFILE} \
+ --make-pidfile -- -f ${MSF_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping msfrpcd"
+ start-stop-daemon --stop --quiet -s 9 --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/app-eselect/eselect-metasploit/metadata.xml b/app-eselect/eselect-metasploit/metadata.xml
new file mode 100644
index 000000000000..0bd171786a1f
--- /dev/null
+++ b/app-eselect/eselect-metasploit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zerochaos@gentoo.org</email>
+<name>Rick Farina</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-miniaudicle-1.0.1-r2 b/app-eselect/eselect-miniaudicle-1.0.1-r2
deleted file mode 100644
index 754af6d7a1ac..000000000000
--- a/app-eselect/eselect-miniaudicle-1.0.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages the /usr/bin/miniAudicle symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/miniaudicle.eselect-1.0.1.bz2
-_md5_=b03d6268e4ab222ced9c98419873175e
diff --git a/app-eselect/eselect-miniaudicle/Manifest b/app-eselect/eselect-miniaudicle/Manifest
new file mode 100644
index 000000000000..9b8e711e8d1e
--- /dev/null
+++ b/app-eselect/eselect-miniaudicle/Manifest
@@ -0,0 +1,4 @@
+AUX miniaudicle-1.0.1_list.patch 609 BLAKE2B 62ddbbe8e038abc5f0052a92bd87b76d2360ce4cc66c7fb103fe70070ec88734d8ca3123eecba03c4e29e63057696bad8df4be6ad1748eeb27f5aeb20d43f375 SHA512 891564338f5e8abb27168cf73636c68b9ff2fcd2a4397c59386686d77196df7df5f51c48c09d1472ff1fa6805c75768ad304cba7180e1b9912ba8a262111e2d0
+DIST miniaudicle.eselect-1.0.1.bz2 1284 BLAKE2B a38ae814fd968a6c00d44fe2e178a33f06664ac7ac090a8ed57a8ddac67dcc07bb76360ddcd0dbcac8bda600c12c32e815065a9f7b2c96929edbdb517548c912 SHA512 259a9e566fcdaae04ed845c1fc797faba422dd562da3721d6d07c1b6ea6de856f7e9fe4dfe5c6895b464231c3e9dfa7fa8718a49085fc3e8f79b9e4c4c340085
+EBUILD eselect-miniaudicle-1.0.1-r2.ebuild 631 BLAKE2B 68af7bf03cbfc146c498059284303ff6c779827970e0281fd0564c3bde9a565284c0197650c76c3cdd7b2439f4d4ebdf767164a6d53e3caeef1d4e46569f390b SHA512 1b0c527cd639630c251026322bb6f15c06f98e02f0839d77e39516b07a2f0e7f102fdf69a66ee8bef14e0722a34e91b0fed2e4065bc774f30ad56a0dcd436973
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..d97143730b2f
--- /dev/null
+++ b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # Fixes listing as described in bug 320189, not upstream yet
+ eapply "${FILESDIR}"/miniaudicle-1.0.1_list.patch
+ default
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/miniaudicle.eselect-${PV}" miniaudicle.eselect
+}
diff --git a/app-eselect/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch b/app-eselect/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch
new file mode 100644
index 000000000000..bd14b175e2f7
--- /dev/null
+++ b/app-eselect/eselect-miniaudicle/files/miniaudicle-1.0.1_list.patch
@@ -0,0 +1,12 @@
+--- a/miniaudicle.eselect-1.0.1.orig 2010-07-14 23:21:11.000000000 -0400
++++ b/miniaudicle.eselect-1.0.1 2010-07-14 23:22:22.000000000 -0400
+@@ -73,7 +73,7 @@
+ targets=( $(find_targets ) )
+ write_list_start "Available miniAudicle audio engines:"
+ for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+- [[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/miniAudicle ) ) ]] && \
++ [[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/miniAudicle- ) ) ]] && \
+ targets[${i}]=$(highlight_maker "${targets[${i}]}")
+ done
+ write_numbered_list -m "(none found)" "${targets[@]}"
+
diff --git a/app-eselect/eselect-miniaudicle/metadata.xml b/app-eselect/eselect-miniaudicle/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-eselect/eselect-miniaudicle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-eselect/eselect-mpg123-0.1 b/app-eselect/eselect-mpg123-0.1
deleted file mode 100644
index 769ad44b33ee..000000000000
--- a/app-eselect/eselect-mpg123-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r1
-DESCRIPTION=Manage /usr/bin/mpg123 symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<media-sound/mpg123-1.14.4-r1
-SLOT=0
-_md5_=b69148054e8301949f809f0f8ca2590f
diff --git a/app-eselect/eselect-mpg123/Manifest b/app-eselect/eselect-mpg123/Manifest
new file mode 100644
index 000000000000..f01255189e70
--- /dev/null
+++ b/app-eselect/eselect-mpg123/Manifest
@@ -0,0 +1,3 @@
+AUX mpg123.eselect-0.1 343 BLAKE2B 192ca6ef608cbdcab5b5c866515b25dd5e7110479fef2741fc6deed0b809dff3519ef36451cd017f03063381dca5d04023f4d885c5f9db9ee83075059640326f SHA512 b11891308231ff322c0028eca8fcbac999a74c31a26e5e0376195276fc52c210febc21a46a78b23a1ca6099abb27e5ef401d4b3f50de3c98eba3631dabee3593
+EBUILD eselect-mpg123-0.1.ebuild 614 BLAKE2B f3143b7a97b156b90e2e3efaee0d43e36a45eea890a4567f0df550ac38400fab513c02441e629415648f7a3471a56f71a3d2cae650e59fc48a7ad4b9b7da65c6 SHA512 3f5815a9c069868c845fb3040b72e01f230e18d27a0a4d5c5db103fbe49593fb5f68d9b5d5b66fd0a8673865ff9fbb211450ec41eeb5635c2d981ea4124e1863
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
new file mode 100644
index 000000000000..1834b66879c7
--- /dev/null
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manage /usr/bin/mpg123 symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
+ !<media-sound/mpg123-1.14.4-r1"
+DEPEND=${RDEPEND}
+
+S=${FILESDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins mpg123.eselect-${PV} mpg123.eselect
+}
diff --git a/app-eselect/eselect-mpg123/files/mpg123.eselect-0.1 b/app-eselect/eselect-mpg123/files/mpg123.eselect-0.1
new file mode 100644
index 000000000000..fbca7e97a2f9
--- /dev/null
+++ b/app-eselect/eselect-mpg123/files/mpg123.eselect-0.1
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/mpg123 implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.1"
+
+SYMLINK_PATH=/usr/bin/mpg123
+SYMLINK_TARGETS=( mpg123-mpg123 mpg321-mpg123 )
+SYMLINK_DESCRIPTION='mpg123 binary'
+
+inherit bin-symlink
diff --git a/app-eselect/eselect-mpg123/metadata.xml b/app-eselect/eselect-mpg123/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/app-eselect/eselect-mpg123/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-mpost-0.3 b/app-eselect/eselect-mpost-0.3
deleted file mode 100644
index e3dc3a2a484b..000000000000
--- a/app-eselect/eselect-mpost-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=mpost module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=app-text/texlive-core-2008
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0229e356d0ab3250215d491fdb40d4db
diff --git a/app-eselect/eselect-mpost/Manifest b/app-eselect/eselect-mpost/Manifest
new file mode 100644
index 000000000000..e24ee84600e4
--- /dev/null
+++ b/app-eselect/eselect-mpost/Manifest
@@ -0,0 +1,3 @@
+AUX mpost.eselect-0.3 3728 BLAKE2B 24404fd63aa87c430319512d2598ff37c2f342d7966606fd7a861ba8016103257859384932261f7705a26db3ef197ecf89471b2c28829921ce2e77dc2e2d92f1 SHA512 b2cd807c3ebf7933410dddc9a56129a6ecb284cb163510aac7340ca44ce4dd42e69953b24e002da3898b3961f2a661a27615fefec79b5ffed04dac5637c41b01
+EBUILD eselect-mpost-0.3.ebuild 750 BLAKE2B 43ecf0faedbf6cea4f7ce8530a9d3bbcc009ef05836b13b830715972e70fcf30681046f02f2d18d64efb5d2d18e9abc9c1d5cbf2c8f043c5519cc0a0b212d158 SHA512 59ba90f7fb2ee6c32fc96da262f76f64a95ee9ed6f892d6750247797ed83a679d92df1477386837e65ca1553917012880a5c9c5c80e6d7b902db79929bfb1cb3
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
new file mode 100644
index 000000000000..2d44f0282075
--- /dev/null
+++ b/app-eselect/eselect-mpost/eselect-mpost-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="mpost module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# Depend on texlive-core-2008 that allows usage of this module, otherwise it
+# will not work so nicely.
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=app-text/texlive-core-2008"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="mpost"
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
+ || die "failed to install"
+}
diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.3 b/app-eselect/eselect-mpost/files/mpost.eselect-0.3
new file mode 100644
index 000000000000..4b772d175000
--- /dev/null
+++ b/app-eselect/eselect-mpost/files/mpost.eselect-0.3
@@ -0,0 +1,147 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/mpost implementations"
+MAINTAINER="ml@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:51:56 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# find a list of mpost symlink targets, best first
+find_targets() {
+ local f
+ for f in "${ROOT}"/usr/bin/mpost-*; do
+ if [[ -f ${f} ]] ; then
+ echo "${f##*/mpost-}"
+ fi
+ done | sort
+}
+
+# find version number of currently symlinked version
+identify_target() {
+ local f
+ f="$(canonicalise "${ROOT}"/usr/bin/mpost)"
+ echo "${f##*/mpost-}"
+}
+
+# try to remove the mpost symlink
+remove_symlinks() {
+ rm -f "${ROOT}"/usr/bin/mpost &>/dev/null
+}
+
+# set the mpost symlink
+set_symlinks() {
+ local target="${1}" targets
+ if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+ targets=( $(find_targets ) )
+ target=${targets[$(( ${target} - 1 ))]}
+ fi
+ if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then
+ remove_symlinks
+ ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \
+ die "Could not set ${target} /usr/bin/mpost symlink"
+ echo "Updating TeX formats"
+ "${ROOT}"/usr/bin/fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly."
+ else
+ die -q "Target \"${target}\" doesn't appear to be valid!"
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current mpost version"
+}
+
+do_show() {
+ [[ -z "${@}" ]] || die -q "Too many parameters"
+
+ write_list_start "Current mpost version:"
+ if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
+ write_kv_list_entry "$(identify_target)" ""
+ elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
+ write_kv_list_entry "(not a symlink)" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available mpost versions"
+}
+
+do_list() {
+ [[ -z "${@}" ]] || die -q "Too many parameters"
+
+ local i targets current
+ targets=( $(find_targets ) )
+ current=$(identify_target)
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ [[ ${targets[i]} = ${current} ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_list_start "Available mpost versions:"
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new mpost version"
+}
+
+describe_set_options() {
+ echo "target : Target version number or index from 'list' action"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+do_set() {
+ if [[ -z "${1}" ]] ; then
+ die -q "You didn't give me a version number"
+
+ elif [[ -n "${2}" ]] ; then
+ die -q "Too many parameters"
+
+ elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
+ if ! remove_symlinks ; then
+ die -q "Can't remove existing version symlink"
+ elif ! set_symlinks "${1}" ; then
+ die -q "Can't set new version"
+ fi
+
+ elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
+ die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
+ else
+ set_symlinks "${1}" || die -q "Can't set new version"
+ fi
+}
+
+### update action ###
+
+describe_update() {
+ echo "Automatically update the mpost version number"
+}
+
+describe_update_options() {
+ echo "--if-unset : Do not override currently selected version"
+}
+
+do_update() {
+ [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+ die -q "Usage error"
+
+ if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then
+ [[ ${1} == "--if-unset" ]] && return
+ remove_symlinks || die -q "Can't remove existing symlink"
+ fi
+ if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then
+ die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually"
+ elif ! [[ -z $(find_targets ) ]] ; then
+ set_symlinks 1 || die -q "Can't set a new version"
+ fi
+}
diff --git a/app-eselect/eselect-mpost/metadata.xml b/app-eselect/eselect-mpost/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-eselect/eselect-mpost/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-notify-send-0.1 b/app-eselect/eselect-notify-send-0.1
deleted file mode 100644
index 0d71e39c399f..000000000000
--- a/app-eselect/eselect-notify-send-0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<x11-libs/libnotify-0.7.5-r1
-DESCRIPTION=Manage /usr/bin/notify-send symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1 !<x11-libs/libnotify-0.7.5-r1
-SLOT=0
-_md5_=1439c711fbaa5bac1450cd802f360553
diff --git a/app-eselect/eselect-notify-send/Manifest b/app-eselect/eselect-notify-send/Manifest
new file mode 100644
index 000000000000..9aa82b854c9e
--- /dev/null
+++ b/app-eselect/eselect-notify-send/Manifest
@@ -0,0 +1,3 @@
+AUX notify-send.eselect-0.1 368 BLAKE2B 444bbdd72f8334ed024d8c4c283842fda2fc3d1ac719a69960007d454da8209edd5dd0a6e65d168c4da1c8e0ce15e2aa284b4be491f8b9a14ff498c047d8a85e SHA512 13624909369f3f0563e6aabf1d7e7fe1a7f4fa59d705dd18aa73cc87cc346d4c62ed5566c45b87802452e45b59a4342d428a32125d17ad4629b0f8292fac4757
+EBUILD eselect-notify-send-0.1.ebuild 650 BLAKE2B 572c222f2baec03cbd9eb7088b1073d5a41b5791770286f7be104c364c538b45bb1c9df585f6d812e4296c4441ec8f29ab9c292cc99db04c3e93f7e8412db36f SHA512 00d5301dbbcb0f1a2cced20ce10e4850c07a44aedd9d3c988e92b2df0d4a301ca3f4c4e1d286f95a5a793920e62b0bdf3cd64e16899ff7a6fc764445ab2e0567
+MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
new file mode 100644
index 000000000000..da0e7a78fa07
--- /dev/null
+++ b/app-eselect/eselect-notify-send/eselect-notify-send-0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manage /usr/bin/notify-send symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
+ !<x11-libs/libnotify-0.7.5-r1"
+DEPEND=${RDEPEND}
+
+S=${FILESDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins notify-send.eselect-${PV} notify-send.eselect
+}
diff --git a/app-eselect/eselect-notify-send/files/notify-send.eselect-0.1 b/app-eselect/eselect-notify-send/files/notify-send.eselect-0.1
new file mode 100644
index 000000000000..61f42f601468
--- /dev/null
+++ b/app-eselect/eselect-notify-send/files/notify-send.eselect-0.1
@@ -0,0 +1,12 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/notify-send implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.1"
+
+SYMLINK_PATH=/usr/bin/notify-send
+SYMLINK_TARGETS=( libnotify-notify-send tinynotify-send )
+SYMLINK_DESCRIPTION='notify-send binary'
+
+inherit bin-symlink
diff --git a/app-eselect/eselect-notify-send/metadata.xml b/app-eselect/eselect-notify-send/metadata.xml
new file mode 100644
index 000000000000..95e86c12108a
--- /dev/null
+++ b/app-eselect/eselect-notify-send/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-oodict-20100228 b/app-eselect/eselect-oodict-20100228
deleted file mode 100644
index 04702dfb257b..000000000000
--- a/app-eselect/eselect-oodict-20100228
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages configuration of dictionaries for OpenOffice.Org
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2
-SLOT=0
-SRC_URI=mirror://gentoo/oodict.eselect-20100228.bz2
-_md5_=bbd52e22126267dcd46763e88e12ac01
diff --git a/app-eselect/eselect-oodict/Manifest b/app-eselect/eselect-oodict/Manifest
new file mode 100644
index 000000000000..3ef8d0702b67
--- /dev/null
+++ b/app-eselect/eselect-oodict/Manifest
@@ -0,0 +1,3 @@
+DIST oodict.eselect-20100228.bz2 3802 BLAKE2B d545d42ae99a25a5d66d573a1434df84cdb56cdf61c155db5017a180ab8beef806c38cb4061cbde872455e029cdd9f65f131eaf7920c138dbbda168dd3344e0f SHA512 7aa1e3081b9629ea5932dc679bed7956887cc7f3dcb7e6399d42f8d3ed30b565a1487eef15293f4046b38b6bf8a7844e6d7050e01337550044977366a795f753
+EBUILD eselect-oodict-20100228.ebuild 532 BLAKE2B feec0b2fa25068111030d08fa9ba773d4b55c178602a76a8d60d62f70f0634ef952d1e2bb31af74f5deab3d307dcf6a472d5003a810882e263cd4f45af978559 SHA512 24a2dab59744b5edf16437a38c1d4bb73c79b8fa739420f30d37e4f484fdc61d942ec2cdeba015c79bee6f6f935e573b68373236f232604c51d2e1d65206ae68
+MISC metadata.xml 354 BLAKE2B 1523bc23bf9b7f945abaa4b568fdddb1561af94ed0d70f5abe1bb4428b3d34287ffca5805f7a9e5487b7ead890bf9c377d2f71d04280baff0e894b88b3c8cc87 SHA512 0b5d112a649f59f7e9fd15e91d67e6b7f837bf34c9870d96e963508a56218c2498aac001f9d5ccc4af9328be9ea4de2a2dd6e042c347dc7c3d69697e2ea6fbb1
diff --git a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
new file mode 100644
index 000000000000..099c65f597af
--- /dev/null
+++ b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org"
+HOMEPAGE="https://www.gentoo.org/"
+
+SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}"/oodict.eselect-${PVR} oodict.eselect
+}
diff --git a/app-eselect/eselect-oodict/metadata.xml b/app-eselect/eselect-oodict/metadata.xml
new file mode 100644
index 000000000000..261bcb860752
--- /dev/null
+++ b/app-eselect/eselect-oodict/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
+ <longdescription>
+ Manages configuration of dictionaries for OpenOffice.Org.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-eselect/eselect-opencascade-0 b/app-eselect/eselect-opencascade-0
deleted file mode 100644
index 441c37dc604e..000000000000
--- a/app-eselect/eselect-opencascade-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install postrm
-DESCRIPTION=Manages opencascade env file
-EAPI=4
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-_md5_=16b0340094a2c3adb669d2cf4ca25af8
diff --git a/app-eselect/eselect-opencascade/Manifest b/app-eselect/eselect-opencascade/Manifest
new file mode 100644
index 000000000000..af56735d828c
--- /dev/null
+++ b/app-eselect/eselect-opencascade/Manifest
@@ -0,0 +1,3 @@
+AUX eselect-opencascade-0.eselect 2593 BLAKE2B 62028bf8198ac687ac28cc665ac68a849a0094a21ddaa5e50133bf13b6a803a066ba676db320d723c4d12dab9592ee4a1a71a01f7c2b49193593dc0311e6754e SHA512 046d1932acecd4ed635f2199b89698eb59d1d34e4605ede7aae7fe45dd347b5ba58bffd53cf54fe3dd4b8f9dd443f37ca7f7d7a7d33f566a01506a4dffe717da
+EBUILD eselect-opencascade-0.ebuild 515 BLAKE2B decc1631506f8885458c8db09c85b2f0d3dcd5487251eabb31481a6ab671fb754ca6d196a14af1948f0467bf6dc305413feaefc7952f692ebd8857a85d384c91 SHA512 0db0b61fae1c8ce3ea370e658cb3e71e50376eab902f4ba64b64d2ade49f81608055a29494215435ca3b64bc5b47887816eef6811e4278f5b59cb35b12532bdf
+MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-eselect/eselect-opencascade/eselect-opencascade-0.ebuild b/app-eselect/eselect-opencascade/eselect-opencascade-0.ebuild
new file mode 100644
index 000000000000..c0ef1e3ddc24
--- /dev/null
+++ b/app-eselect/eselect-opencascade/eselect-opencascade-0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Manages opencascade env file"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+ dodir /etc/env.d/opencascade
+ insinto /usr/share/eselect/modules
+ newins "${FILESDIR}"/${P}.eselect opencascade.eselect
+}
+
+pkg_postrm() {
+ rm -v "${EROOT}"etc/env.d/51opencascade
+}
diff --git a/app-eselect/eselect-opencascade/files/eselect-opencascade-0.eselect b/app-eselect/eselect-opencascade/files/eselect-opencascade-0.eselect
new file mode 100644
index 000000000000..da97cb4a8c33
--- /dev/null
+++ b/app-eselect/eselect-opencascade/files/eselect-opencascade-0.eselect
@@ -0,0 +1,104 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright (c) 2006-2013 Gentoo Foundation
+#
+# This file is part of the 'eselect' tools framework.
+#
+# eselect is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 2 of the License, or (at your option) any later
+# version.
+#
+# eselect is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# eselect. If not, see <http://www.gnu.org/licenses/>.
+
+MODULE=opencascade
+TARGET=${EROOT}/etc/env.d/51${MODULE}
+CONFDIR=${EROOT}/etc/env.d/${MODULE}
+
+inherit tests path-manipulation
+
+find_implems() {
+ local -a implems
+ for file in "${CONFDIR}"/* ; do
+ [[ -f ${file} ]] || continue
+ implems=(${implems[@]} "${file##*/}")
+ done
+ echo ${implems[@]}
+}
+
+is_active() {
+ local f
+ [[ $# -eq 1 ]] || die "Need exactly 1 arguments!"
+ [[ -L ${TARGET} ]] || return 1
+ f=$(canonicalise ${TARGET})
+ [[ -e ${f} ]] || return 1
+ [[ ${f##*/} == ${1} ]]
+}
+
+# switch_implem $implem
+# switches $iface combination to $implem
+switch_implem() {
+ [[ $# -eq 1 ]] || die "Need exactly 1 arguments!"
+ $(is_active ${1}) && return
+ [[ -L ${TARGET} ]] && rm -f ${TARGET}
+ ln -s ${MODULE}/${1} ${TARGET}
+ env-update
+ echo "If you intend to use the selected opencascade in"
+ echo "an already running shell, please remember to do:"
+ echo
+ echo ". /etc/profile"
+}
+
+do_list() {
+ local implem i
+ write_list_start "Installed $MODULE"
+ for implem in $(find_implems) ; do
+ (( i++ ))
+ is_active ${implem##*/} \
+ && implem=$(highlight_marker "${implem}")
+ write_numbered_list_entry $i "${implem}"
+ done
+}
+
+describe_set() {
+ echo "Activate one of the installed $MODULE implementations"
+}
+
+describe_set_parameters() {
+ echo "<implementation>"
+}
+
+describe_set_options() {
+ echo "implementation : implementation name or number (from 'list' action)"
+}
+
+do_set() {
+ [[ $# -ne 1 ]] && die -q "Please specify exactly 1 implementation!"
+ local -a implems
+
+ implems=( $(find_implems) )
+
+ if is_number ${1} ; then
+ new_implem=${implems[$(( ${1} - 1 ))]}
+ else
+ new_implem=${1}
+ fi
+ echo $new_implem
+ switch_implem ${new_implem}
+}
+
+describe_show() {
+ echo "Print the currently active $MODULE implementation"
+}
+
+do_show() {
+ local f n
+ [[ -L ${TARGET} ]] || return 1
+ f=$(canonicalise ${TARGET})
+ [[ -f ${f} ]] || return 1
+ echo ${f##*/}
+}
diff --git a/app-eselect/eselect-opencascade/metadata.xml b/app-eselect/eselect-opencascade/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/app-eselect/eselect-opencascade/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-opencl-1.1.0-r4 b/app-eselect/eselect-opencl-1.1.0-r4
deleted file mode 100644
index 9cbb1e209221..000000000000
--- a/app-eselect/eselect-opencl-1.1.0-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Utility to change the OpenCL implementation being used
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~xarthisius/distfiles/eselect-opencl-1.1.0-r1.tar.xz https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip http://packages.gentooexperimental.org/opencl-cpp-headers.tar
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3f96aa488b33fcb435ce6530e8b15745
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
new file mode 100644
index 000000000000..052c4374965e
--- /dev/null
+++ b/app-eselect/eselect-opencl/Manifest
@@ -0,0 +1,9 @@
+DIST eselect-opencl-1.1.0-r1.tar.xz 3276 BLAKE2B d1475ebedbe29cbb0de054d170d7de62000445954006a46946fa58a7c75e9445fe6bc67c7da204a0e0364d6b3df043c42ab8bc29b2d50d4fe392f3c37d4e87f8 SHA512 b2be1e2035fda4e119f03e9ef84fbf1f09fc0bd5475d3fe30d2330dac76180930451d78dbb9e158c34dee9ce524076434254757b594e84dea96341e52ef13c14
+DIST opencl-cpp-headers.tar 716800 BLAKE2B 591bf2e36c8940a6a73da028ac74df4f64737ebce4686b961e6cc13336547590e91c05e6e24c0aab9000d2ab90261885571f3bf85e1797110865532738565586 SHA512 b04c653f213b3cc99f0bbe3c589cf8b2f8f6144d61a85a284a60de92fd5148ff3d45204b4c6a08c205fc307300743bcf4654be2b8b18dd970b5d645ac2eec2f5
+DIST opencl10.zip 21701 BLAKE2B 7b4e2fe1985e3e6374aa628ae34884b2d130bdd57c5e3af2d6849c32f72ef69b50471b3f8ecb6dc0e75ffc828a692cb84a8d99f0e8721dab8d2100f9380ce27e SHA512 ce3ad95d7314df4b55284d48c54fb7dfca0a218d0e36a732414b53dc7bdcc53199167b6810a3e3ebdd8abf91a4904acd471733b9130e3a38ec0b3e9ba918b691
+DIST opencl11.zip 25496 BLAKE2B abd8aefddb31408e71e36b8610cde7b568debca99e99f310e5b30de73778a18520e52c535d52f63596edf80f7dcda4f9fc6f7c300b4c560f5d79a3b851dcf88a SHA512 c66664e940a51ceb951a78895df87a5dc3139e76b3f847af43c54400d37f243a390b94aab290d32044e19bdba63d0ee8af94955af9a83326c7ab353242496fcc
+DIST opencl12.zip 33311 BLAKE2B 0f0c62856162ec1cfd42c1b53979079e0f8fd389fd2b3e05676e029705c29a65e3b84d6bc822aaedd9d15959bc07adfbd444aafb827f09f12b4dd625e868c902 SHA512 af7bb5865372a900a5b79086a54709abc99f6a3afe105adb6fdd276e30ef5c5be576421c206768e0b19e82f83e33727b6f246dfc71a0ee1d847e52d6db6130a8
+DIST opencl20.zip 34892 BLAKE2B a71a00a99825ebdde2ddba0c23de3af8880fb44ac235f399ed58936c9193ae79429219661daccac2d7d6daeb87c514308ec6b782db33899e60a2ae912d0876f7 SHA512 e4c6f68db91e0946de5a0f2aecd8fbc152f316350088a386cad9de37b377b6e8c362e93e3c2b09b3dce5f4659c753764ec8906b50a86a5107d2c29e6ffcfe71f
+DIST opencl21.zip 35514 BLAKE2B 21d23d9104712df47f7734b3c3b6f1669c88b5c75ca21fe6ad2ef21db83620c0585cc0b8d567d9fd7a755d579e7d291cf20577d025f857339ad191a1d65ee461 SHA512 2b6eafc26ff522407f06509197f5eefbb321806ac3f65bb881db4532da6c0e00b9c397468d55881578b116a1c8d05a0599f9f5727f62eb545394a2cecf5d95c0
+EBUILD eselect-opencl-1.1.0-r4.ebuild 2322 BLAKE2B d7604164a55bf3bf91569b96fc628603153e0a557d8bd1e42ba7e9134618af17a8387981673ce28cf40e76c7b86fd27ea0537932d314abe662f1013a4d49c567 SHA512 d45601f812aa4c4be5cd49308e118dbf9b5e44aff65dc31f08655985354cf42269a17866d0cc5df991206054a3db39dca38bbba5a0222fecef4df07c772bcbcf
+MISC metadata.xml 411 BLAKE2B 8e2f9f95305134a1b09c18ced983fa2449d0c79a7b3d16993e28aeb70c4712d3f1650e85f40abd50a78f833af3b4f81ba4beccd9ffe91c739fcf9717bd02495f SHA512 7a2cbbea3ab5fbc33c2a8196c50949f5e7a207525d371447c1b44847081cd8a849b7e25034c759e738e9b3d252f13f07d2f730f38e5ce168da604c5fc4907c09
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..8f2c592a733d
--- /dev/null
+++ b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Utility to change the OpenCL implementation being used"
+HOMEPAGE="https://www.gentoo.org/"
+
+# Source:
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_platform.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl_gl_ext.h
+# http://www.khronos.org/registry/cl/api/${CL_ABI}/cl.hpp
+
+# Using copy by Mario Kicherer #496418
+
+SRC_URI="
+ https://dev.gentoo.org/~xarthisius/distfiles/${P}-r1.tar.xz
+ https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip
+ https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip
+ https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip
+ https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip
+ https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip
+ http://packages.gentooexperimental.org/opencl-cpp-headers.tar
+ "
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+pkg_postinst() {
+ local impl="$(eselect opencl show)"
+ if [[ -n "${impl}" && "${impl}" != '(none)' ]] ; then
+ eselect opencl set "${impl}"
+ fi
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins opencl.eselect
+ #doman opencl.eselect.5
+
+ local headers=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl_egl.h )
+
+ # We install all versions of OpenCL headers
+ for CL_ABI in 1.0 1.1 1.2 2.0 2.1; do
+ mkdir -p "${ED}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}"
+ for f in ${headers[@]}; do
+ cp "${WORKDIR}"/OpenCL-Headers-opencl${CL_ABI/./}/${f} "${ED}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/${f}" > /dev/null
+ done
+ done
+
+ for i in 1.1 1.2 2.1; do
+ cp "${WORKDIR}"/$i/cl.hpp "${ED}/usr/$(get_libdir)/OpenCL/global/include/CL-${CL_ABI}/"
+ done
+ # Create symlinks to newest. Maybe this should be switchable?
+ for f in ${headers[@]}; do
+ dosym "${ED}/usr/$(get_libdir)/OpenCL/global/include/CL-1.2/${f}" "/usr/include/CL/${f}"
+ done
+}
diff --git a/app-eselect/eselect-opencl/metadata.xml b/app-eselect/eselect-opencl/metadata.xml
new file mode 100644
index 000000000000..c52f3dd39335
--- /dev/null
+++ b/app-eselect/eselect-opencl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Utility to switch OpenCL implementations between various providers.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">anyc/opencl-headers</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-opengl-1.3.1-r4 b/app-eselect/eselect-opengl-1.3.1-r4
deleted file mode 100644
index 780ac6996db6..000000000000
--- a/app-eselect/eselect-opengl-1.3.1-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Utility to change the OpenGL interface being used
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4 !<media-libs/mesa-10.3.4-r1 !=media-libs/mesa-10.3.5 !=media-libs/mesa-10.3.7-r1 !<x11-proto/glproto-1.4.17-r1 !<=x11-base/xorg-server-1.12.4-r5 !=x11-base/xorg-server-1.15.2-r1 !=x11-base/xorg-server-1.15.2-r2 !~x11-base/xorg-server-1.16.3 !=x11-base/xorg-server-1.16.4 !=x11-base/xorg-server-1.16.4-r3 !~x11-base/xorg-server-1.17.0 !=x11-base/xorg-server-1.17.1 !<x11-drivers/ati-drivers-14.9-r2 !=x11-drivers/ati-drivers-14.12
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/opengl.eselect-1.3.1.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d8b6374d22e583821eb734d0e938adf
diff --git a/app-eselect/eselect-opengl/Manifest b/app-eselect/eselect-opengl/Manifest
new file mode 100644
index 000000000000..8debd5b5bd0d
--- /dev/null
+++ b/app-eselect/eselect-opengl/Manifest
@@ -0,0 +1,3 @@
+DIST opengl.eselect-1.3.1.xz 2588 BLAKE2B 5be8bd3efc510a3e55a666136e0f4e8a3214b347981db1413f84268e788a4d708b83eeccddc75766dd4cc29cf99b6930062b274a6ecf79c5c5f8a5817c7af32f SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532
+EBUILD eselect-opengl-1.3.1-r4.ebuild 2187 BLAKE2B 28586f78a51907215bc15091a4e13610521ba53357fb96d0a75950b1a2e7256ca1502c7195288e65ba45d0106f844c4280c2a8a870de4237046802ba84521951 SHA512 2320f4707e00fe63a48481f772f789db59c9c0350c2cfa1076cb914614cfc5cba27eaeef6ca32127352c6a891de5266ea6f885d3744fe863cfc5ff1f33018eb7
+MISC metadata.xml 437 BLAKE2B da333685e92af6504ddf471c1d87e13c09e7240941851196758247e7eb276d67ef798f661f2ae62f3456c3c6897d35caee4f328af8b3d7e3ae53e9b1e2c17d21 SHA512 4e1c5f16407ad8a0eb5212d6396bd708047da78f3a97a395b80f60cb21f375f308624f01a8b2bff28ad8bdfca04ac2a3f573f3d5c0f679fdad30b4c0b2751552
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
new file mode 100644
index 000000000000..1206be17c265
--- /dev/null
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="https://www.gentoo.org/"
+
+# Source:
+# http://www.opengl.org/registry/api/glext.h
+# http://www.opengl.org/registry/api/glxext.h
+GLEXT="85"
+GLXEXT="34"
+
+MIRROR="https://dev.gentoo.org/~mattst88/distfiles"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
+# ${MIRROR}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+ >=app-admin/eselect-1.2.4
+ !<media-libs/mesa-10.3.4-r1
+ !=media-libs/mesa-10.3.5
+ !=media-libs/mesa-10.3.7-r1
+ !<x11-proto/glproto-1.4.17-r1
+ !<=x11-base/xorg-server-1.12.4-r5
+ !=x11-base/xorg-server-1.15.2-r1
+ !=x11-base/xorg-server-1.15.2-r2
+ !~x11-base/xorg-server-1.16.3
+ !=x11-base/xorg-server-1.16.4
+ !=x11-base/xorg-server-1.16.4-r3
+ !~x11-base/xorg-server-1.17.0
+ !=x11-base/xorg-server-1.17.1
+ !<x11-drivers/ati-drivers-14.9-r2
+ !=x11-drivers/ati-drivers-14.12"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+ # we may be moving the config file, so get it early
+ OLD_IMPL=$(eselect opengl show)
+}
+
+pkg_postinst() {
+ if path_exists "${EROOT}"/usr/lib*/opengl; then
+ # delete broken symlinks
+ find "${EROOT}"/usr/lib*/opengl -xtype l -delete
+ # delete empty leftover directories (they confuse eselect)
+ find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} +
+ fi
+
+ if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
+ eselect opengl set "${OLD_IMPL}"
+ fi
+ if [[ -f ${EROOT}/etc/env.d/03opengl ]]; then
+ # remove the old file, moved now
+ rm -vf "${EROOT}"/etc/env.d/03opengl
+ fi
+}
+
+src_prepare() {
+ # don't die on Darwin users
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/libGL\.so/libGL.dylib/' opengl.eselect-${PV} || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/eselect/modules"
+ newins opengl.eselect-${PV} opengl.eselect
+# doman opengl.eselect.5
+}
diff --git a/app-eselect/eselect-opengl/metadata.xml b/app-eselect/eselect-opengl/metadata.xml
new file mode 100644
index 000000000000..dfe0fc036771
--- /dev/null
+++ b/app-eselect/eselect-opengl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+</maintainer>
+<longdescription>Utility to switch opengl implementations between various providers.</longdescription>
+</pkgmetadata>
diff --git a/app-eselect/eselect-package-manager-20110108-r1 b/app-eselect/eselect-package-manager-20110108-r1
deleted file mode 100644
index 5b0868bf5cf3..000000000000
--- a/app-eselect/eselect-package-manager-20110108-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages PACKAGE_MANAGER environment variable
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=app-admin/eselect-1.1.1
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-package-manager-20110108.tar.bz2
-_md5_=c990e3dcb64102249425164c0290d18f
diff --git a/app-eselect/eselect-package-manager/Manifest b/app-eselect/eselect-package-manager/Manifest
new file mode 100644
index 000000000000..5f7c45b841a7
--- /dev/null
+++ b/app-eselect/eselect-package-manager/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-package-manager-20110108.tar.bz2 1273 BLAKE2B 453e258a8de1cfc77f66bd3f07b9bca191c36d6cce47a6d0f43f5682bf60de8b898576b998acdf6b9b9e5c7307ce6199797c9649cbd5917eca18624e32717425 SHA512 3fd7d9b33c4d2e3ca4c580e9e55e0033a2bbcc6718e0a2706c9725a125c219bbc937f6347b65fedd58cbad9f00e5c757025c6efba0bf4e7ba131c16134c33962
+EBUILD eselect-package-manager-20110108-r1.ebuild 547 BLAKE2B 153edd86b8ece7e6951654d887961dc1507aac675704ea516f4ba152b8790b8c36a8c7cbc9d12ffaf30b4e5f68be1c66743354edf4b3015f0c112e7993a3511c SHA512 f8037179761ff96d945515071aa462d55040557f5fb4a0619fd66012c4d478b12f232e2b79227a1a2f580f2eb7adab24a6dfcfcfc2da03e8a68054e40c607d51
+MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
new file mode 100644
index 000000000000..6d052668ff26
--- /dev/null
+++ b/app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages PACKAGE_MANAGER environment variable"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=">=app-admin/eselect-1.1.1"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins package-manager.eselect
+ doman package-manager.eselect.5
+}
diff --git a/app-eselect/eselect-package-manager/metadata.xml b/app-eselect/eselect-package-manager/metadata.xml
new file mode 100644
index 000000000000..1935b3149bde
--- /dev/null
+++ b/app-eselect/eselect-package-manager/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>eselect@gentoo.org</email>
+ <name>eselect configuration and management tool</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-pdftex-0.3 b/app-eselect/eselect-pdftex-0.3
deleted file mode 100644
index ed0af9684512..000000000000
--- a/app-eselect/eselect-pdftex-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=pdftex module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=app-text/texlive-core-2008
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=023fd8b3f630dc83265238f489dbcb17
diff --git a/app-eselect/eselect-pdftex/Manifest b/app-eselect/eselect-pdftex/Manifest
new file mode 100644
index 000000000000..a24b8a7b0ee2
--- /dev/null
+++ b/app-eselect/eselect-pdftex/Manifest
@@ -0,0 +1,3 @@
+AUX pdftex.eselect-0.3 3756 BLAKE2B d63f515ddae49219141093f8bba3830b4d1daaa0d0bf176537b0a0156bf65d3868bd467e337b6bdfff7e04a54cd54d2d4204141d0b2324630fcfef5c6110a7b4 SHA512 6821ae3dda5fdc35f9d8a41e789870e38c525cfafba0079fa912048a74b873236382367e5752ef3e7115799a9bd22e2b2147a5d778e5a2b688d86e550d534b2d
+EBUILD eselect-pdftex-0.3.ebuild 752 BLAKE2B 92c346bbed05c32a07cf71221b89cb8dfe50d915ecc997a44ef4a51bc4091bb51447a5f98d162be36dfb47b6975e9db987422559b766a9361e84f402d2691ea4 SHA512 a8b7c8d0c2aa90de2b3d3ffb456a6f60985404aa518afc5604e40d292c1f7502134e84207120732e3d28b2ceee931ee5b424bda323682932708d353e7f10d930
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
new file mode 100644
index 000000000000..6fed1c5bec95
--- /dev/null
+++ b/app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="pdftex module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# Depend on texlive-core-2008 that allows usage of this module, otherwise it
+# will not work so nicely.
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=app-text/texlive-core-2008"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="pdftex"
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
+ || die "failed to install"
+}
diff --git a/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3 b/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3
new file mode 100644
index 000000000000..f382c8f876bf
--- /dev/null
+++ b/app-eselect/eselect-pdftex/files/pdftex.eselect-0.3
@@ -0,0 +1,147 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/pdftex implementations"
+MAINTAINER="tex@gentoo.org"
+SVN_DATE='$Date: 2015/03/31 16:53:36 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# find a list of pdftex symlink targets, best first
+find_targets() {
+ local f
+ for f in "${ROOT}"/usr/bin/pdftex-*; do
+ if [[ -f ${f} ]] ; then
+ echo "${f##*/pdftex-}"
+ fi
+ done | sort
+}
+
+# find version number of currently symlinked version
+identify_target() {
+ local f
+ f="$(canonicalise "${ROOT}"/usr/bin/pdftex)"
+ echo "${f##*/pdftex-}"
+}
+
+# try to remove the pdftex symlink
+remove_symlinks() {
+ rm -f "${ROOT}"/usr/bin/pdftex &>/dev/null
+}
+
+# set the pdftex symlink
+set_symlinks() {
+ local target="${1}" targets
+ if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+ targets=( $(find_targets ) )
+ target=${targets[$(( ${target} - 1 ))]}
+ fi
+ if [[ -f "${ROOT}/usr/bin/pdftex-${target}" ]] ; then
+ remove_symlinks
+ ln -s "pdftex-${target}" "${ROOT}/usr/bin/pdftex" || \
+ die "Could not set ${target} /usr/bin/pdftex symlink"
+ echo "Updating TeX formats"
+ "${ROOT}"/usr/bin/fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, pdftex may not work properly."
+ else
+ die -q "Target \"${target}\" doesn't appear to be valid!"
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current pdftex version"
+}
+
+do_show() {
+ [[ -z "${@}" ]] || die -q "Too many parameters"
+
+ write_list_start "Current pdftex verson:"
+ if [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
+ write_kv_list_entry "$(identify_target)" ""
+ elif [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
+ write_kv_list_entry "(not a symlink)" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available pdftex versions"
+}
+
+do_list() {
+ [[ -z "${@}" ]] || die -q "Too many parameters"
+
+ local i targets current
+ targets=( $(find_targets ) )
+ current=$(identify_target)
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ [[ ${targets[i]} = ${current} ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_list_start "Available pdftex versions:"
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new pdftex version"
+}
+
+describe_set_options() {
+ echo "target : Target version number or index from 'list' action"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+do_set() {
+ if [[ -z "${1}" ]] ; then
+ die -q "You didn't give me a version number"
+
+ elif [[ -n "${2}" ]] ; then
+ die -q "Too many parameters"
+
+ elif [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
+ if ! remove_symlinks ; then
+ die -q "Can't remove existing version symlink"
+ elif ! set_symlinks "${1}" ; then
+ die -q "Can't set new version"
+ fi
+
+ elif [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
+ die -q "${ROOT}/usr/bin/pdftex seems to be from an old ebuild, please remove manually"
+ else
+ set_symlinks "${1}" || die -q "Can't set new version"
+ fi
+}
+
+### update action ###
+
+describe_update() {
+ echo "Automatically update the pdftex version number"
+}
+
+describe_update_options() {
+ echo "--if-unset : Do not override currently selected version"
+}
+
+do_update() {
+ [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+ die -q "Usage error"
+
+ if [[ -L "${ROOT}/usr/bin/pdftex" ]] ; then
+ [[ ${1} == "--if-unset" ]] && return
+ remove_symlinks || die -q "Can't remove existing symlink"
+ fi
+ if [[ -e "${ROOT}/usr/bin/pdftex" ]] ; then
+ die -q "${ROOT}/usr/bin/pdftex seems to be from an old ebuild, please remove manually"
+ elif ! [[ -z $(find_targets ) ]] ; then
+ set_symlinks 1 || die -q "Can't set a new version"
+ fi
+}
diff --git a/app-eselect/eselect-pdftex/metadata.xml b/app-eselect/eselect-pdftex/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-eselect/eselect-pdftex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-php-0.9.4-r5 b/app-eselect/eselect-php-0.9.4-r5
deleted file mode 100644
index 66e7caa9cb12..000000000000
--- a/app-eselect/eselect-php-0.9.4-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PHP eselect module
-EAPI=6
-HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
-IUSE=fpm apache2
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.4.tar.xz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c8734a49a0dbbeeb7dd8df82025796f0
diff --git a/app-eselect/eselect-php-0.9.5 b/app-eselect/eselect-php-0.9.5
deleted file mode 100644
index 8ce3c3369cd8..000000000000
--- a/app-eselect/eselect-php-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=PHP eselect module
-EAPI=6
-HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
-IUSE=fpm apache2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.5.tar.xz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a8a0d04eef0168367d46095c74a4edad
diff --git a/app-eselect/eselect-php-9999 b/app-eselect/eselect-php-9999
deleted file mode 100644
index 1499310aa808..000000000000
--- a/app-eselect/eselect-php-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=PHP eselect module
-EAPI=6
-HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
-IUSE=fpm apache2
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] )
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2238dafe35ba53ce800990c336004b2d
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
new file mode 100644
index 000000000000..6007e43c50d3
--- /dev/null
+++ b/app-eselect/eselect-php/Manifest
@@ -0,0 +1,9 @@
+AUX php-fpm-launcher 134 BLAKE2B fdbb99bbbd0d171975aff6f55ba7c41fe152c330cfb05dff81ab033d2490af27c52b8e43e5ed1ae80ee3c6ba8a1471adb01778d6b76bdd7776845f7c93e12428 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29
+AUX php-fpm-launcher-r3 223 BLAKE2B 80c90d2388118e6dbdceacebbc87de145e94e34a6d9691b6c3179df4f05631d904c1c3e5647dd080ff2080c346bffcb71bee96d4d4123f6c4d3be0120161c960 SHA512 9dfd36f88457a57a31c17cb251a8aeeef505f811f9ac59c5715532c3780b543034a6a9d356f4111fab1998883299ece0a68508dd3e154bc54de84ce6805bf351
+AUX php-fpm.conf 29 BLAKE2B 505e957038315f8668a558f91eac2ad8ae6bc3e87db238001042ddfe7d817c1589891235d88edc91e213215b7a632fa9358795290599223097ac66f546085c1c SHA512 824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f
+DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e
+DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119
+EBUILD eselect-php-0.9.4-r5.ebuild 1384 BLAKE2B 1b0897342edf83455aec8da3beb5dcc34c7bda36af5f810940f7dd9bef307ebab7f7462ef4b6d6dbd88daea25eeb5571975623e43471263b8c40d2091920137a SHA512 d98d4b84cea9fe34f4a0e7ea03e7ad3e135f07e447c148e1c025292ca2a684d75a005a9376c93f54299aedc925ade090f70de72d7060d6b08ee76a5ff3354754
+EBUILD eselect-php-0.9.5.ebuild 1392 BLAKE2B 453096b9bc1e6e624220bb93457ad8740a2a1e2b544f3f1588b48048cf9b86875689ce826ffe53638956513f21368e33b99d432a510af8e999c1370f748b3bfc SHA512 c441ff53824454e2ec2639a64b59b85e54afd876d936a61395ad49e5eeb92392e9528de1f8816d3c3a314e36dfa4afff37cb0138a33ecf1f471bd74d187da04c
+EBUILD eselect-php-9999.ebuild 1306 BLAKE2B 45c8551979e6c5cd4623cfbd77aff888462ddd18121892b6891459e2281581382c0c6738370f859f5dbd21fcf7ead4056afd78de587b8387bc79cefd689d88b3 SHA512 9982c8bda294445cf3496da2d58f0126278924165cf66967d31628a2eb907c258e50d460e3c1daf5b9c042386730452d2c02a096d1f45c86d10c6538e8afeec7
+MISC metadata.xml 387 BLAKE2B 956f8e21e799bd346de09b2814c359c3c28a37dcad3bf42a11e58e33acfe26354069fce71e3ecb687dac83e176500c2127cb8dda5651e083e27aad92cb385862 SHA512 80a043e0836a1ac58120f1471e997face2f60117e3a83d490ad259a05cfdc39098c457573e3550c9fc3a7712f28b9faacd427c076e8f46ed3476e42f58f8f1b5
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
new file mode 100644
index 000000000000..b1278cc79505
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+src_configure(){
+ # We expect localstatedir to be "var"ish, not "var/lib"ish, because
+ # that's what PHP upstream expects. See for example the FPM
+ # configuration where they put logs in @localstatedir@/log.
+ #
+ # The libdir is passed explicitly in case the /usr/lib symlink
+ # is not present (bug 624528).
+ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --localstatedir="${EPREFIX}/var" \
+ --with-piddir="${EPREFIX}/run" \
+ $(use_enable apache2) \
+ $(use_enable fpm)
+}
+
+src_install() {
+ default
+
+ if use fpm ; then
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
+ exeinto /usr/libexec
+ doexe "${T}"/php-fpm-launcher
+ fi
+}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
new file mode 100644
index 000000000000..7e467246c7d8
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+src_configure(){
+ # We expect localstatedir to be "var"ish, not "var/lib"ish, because
+ # that's what PHP upstream expects. See for example the FPM
+ # configuration where they put logs in @localstatedir@/log.
+ #
+ # The libdir is passed explicitly in case the /usr/lib symlink
+ # is not present (bug 624528).
+ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --localstatedir="${EPREFIX}/var" \
+ --with-piddir="${EPREFIX}/run" \
+ $(use_enable apache2) \
+ $(use_enable fpm)
+}
+
+src_install() {
+ default
+
+ if use fpm ; then
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
+ exeinto /usr/libexec
+ doexe "${T}"/php-fpm-launcher
+ fi
+}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
new file mode 100644
index 000000000000..e6b5ef3d8804
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd git-r3 autotools
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect-php.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+src_prepare() {
+ eapply_user
+ eautoreconf
+}
+
+src_configure(){
+ # We expect localstatedir to be "var"ish, not "var/lib"ish, because
+ # that's what PHP upstream expects. See for example the FPM
+ # configuration where they put logs in @localstatedir@/log.
+ #
+ # The libdir is passed explicitly in case the /usr/lib symlink
+ # is not present (bug 624528).
+ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --localstatedir="${EPREFIX}/var" \
+ --with-piddir="${EPREFIX}/run" \
+ $(use_enable apache2) \
+ $(use_enable fpm)
+}
+
+src_install() {
+ default
+
+ if use fpm ; then
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
+ exeinto /usr/libexec
+ doexe "${T}"/php-fpm-launcher
+ fi
+}
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher b/app-eselect/eselect-php/files/php-fpm-launcher
new file mode 100644
index 000000000000..7a1c1c9f918b
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+PHPSLOT="${1}"
+[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)"
+shift
+
+exec /usr/lib/${PHPSLOT}/bin/php-fpm "${@}"
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3
new file mode 100644
index 000000000000..a2b6eabc4da5
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher-r3
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# If there are no arguments, then "shift" will fail (bug 626496).
+if [ $# -eq 0 ]; then
+ PHP_SLOT=$(eselect php show fpm)
+else
+ PHP_SLOT=$1
+ shift
+fi
+
+exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}"
diff --git a/app-eselect/eselect-php/files/php-fpm.conf b/app-eselect/eselect-php/files/php-fpm.conf
new file mode 100644
index 000000000000..801e74f1e620
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm.conf
@@ -0,0 +1 @@
+d /run/php-fpm 755 root root
diff --git a/app-eselect/eselect-php/metadata.xml b/app-eselect/eselect-php/metadata.xml
new file mode 100644
index 000000000000..be945bac7771
--- /dev/null
+++ b/app-eselect/eselect-php/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">PHP eselect module
+ </longdescription>
+ <use>
+ <flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-eselect/eselect-pinentry-0.7 b/app-eselect/eselect-pinentry-0.7
deleted file mode 100644
index e0320d63d129..000000000000
--- a/app-eselect/eselect-pinentry-0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manage /usr/bin/pinentry symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1
-SLOT=0
-_md5_=b431011284b6edb61bde128d2996b583
diff --git a/app-eselect/eselect-pinentry/Manifest b/app-eselect/eselect-pinentry/Manifest
new file mode 100644
index 000000000000..d07e6317be56
--- /dev/null
+++ b/app-eselect/eselect-pinentry/Manifest
@@ -0,0 +1,3 @@
+AUX pinentry.eselect-0.7 406 BLAKE2B 99f9d0d0dabe57f863d2d814ee0b27956b0f14827a6ba0aa5d06c6580e6e55e359f7ad3fdf56e9d8ee087e79d46f2d9c8c874064b2dc6947d0f4b2f7a0c80533 SHA512 752be6cc5612799fdfaf765e9476e69d845065834a3a471838a94f1955d645473ac56db6e51b6f45b9a251b32c36ba0b149cd72145665972243abbbfe4a5941d
+EBUILD eselect-pinentry-0.7.ebuild 690 BLAKE2B b5099433ec629b94754791d729b0a765552b8942ebc5a88d33975f161d11f4d5a9c31c5873df3df288bfe69c3e4f1d74718ddd8fd6b05c2977f503c429f95049 SHA512 eef0626a8598a5c0096bcea7cffd7de58b4c9760a86178151daf30d53fbad3ab1b327f03c153abcc5a88ebd5cecf389d4425d47d92eb1509f68b9622d599784e
+MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
new file mode 100644
index 000000000000..3ac7fc482efd
--- /dev/null
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manage /usr/bin/pinentry symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
+
+S="${FILESDIR}"
+
+src_install() {
+ default
+ insinto /usr/share/eselect/modules
+ newins pinentry.eselect-${PV} pinentry.eselect
+}
diff --git a/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7 b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
new file mode 100644
index 000000000000..ec49ca1a602a
--- /dev/null
+++ b/app-eselect/eselect-pinentry/files/pinentry.eselect-0.7
@@ -0,0 +1,12 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/pinentry implementation"
+MAINTAINER="ssuominen@gentoo.org"
+VERSION="0.7"
+
+SYMLINK_PATH=/usr/bin/pinentry
+SYMLINK_TARGETS=( pinentry-gnome3 pinentry-qt pinentry-gtk-2 pinentry-qt4 pinentry-curses pinentry-tty )
+SYMLINK_DESCRIPTION='pinentry binary'
+
+inherit bin-symlink
diff --git a/app-eselect/eselect-pinentry/metadata.xml b/app-eselect/eselect-pinentry/metadata.xml
new file mode 100644
index 000000000000..f1c3d59fb213
--- /dev/null
+++ b/app-eselect/eselect-pinentry/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-postgresql-2.3 b/app-eselect/eselect-postgresql-2.3
deleted file mode 100644
index 1a0db3eda34a..000000000000
--- a/app-eselect/eselect-postgresql-2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Utility to select the default PostgreSQL slot
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.3.tbz2
-_md5_=6fe1a92bd2582bf6a1cc1830d2d4aae4
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
new file mode 100644
index 000000000000..e5b9ac7d69c8
--- /dev/null
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
+EBUILD eselect-postgresql-2.3.ebuild 923 BLAKE2B 337e9da82b5732a0f824577dc5ee291c4949808018ea94316af850893a80bbc45eea52ea1ff7ad1db02fc4eeb388023ba3c923a4993ad196d4e9870fe4366ea0 SHA512 3342c576a6f4672ab3289a02c5ad00bf4075de3ba7e3148dd30ab99e9ee9fa345cfc0c0b9f81c2931293f8a209205ccd06f1019a21e9b2a78567c075ada6ebca
+MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
new file mode 100644
index 000000000000..18d367b4ed37
--- /dev/null
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to select the default PostgreSQL slot"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RDEPEND="app-admin/eselect"
+
+# All dev-db/postgresql ebuilds from 10.0 on are well supported. Earlier
+# ebuilds may present some quality of life issues.
+PDEPEND="
+ !<dev-db/postgresql-9.6.2-r1:9.6
+ !<dev-db/postgresql-9.5.6-r1:9.5
+ !<dev-db/postgresql-9.4.11-r1:9.4
+ !<dev-db/postgresql-9.3.16-r1:9.3
+ !<dev-db/postgresql-9.2.20-r1
+"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins postgresql.eselect
+
+ dosym eselect /usr/bin/postgresql-config
+}
+
+pkg_postinst() {
+ postgresql-config update
+}
diff --git a/app-eselect/eselect-postgresql/metadata.xml b/app-eselect/eselect-postgresql/metadata.xml
new file mode 100644
index 000000000000..0f879f1a7905
--- /dev/null
+++ b/app-eselect/eselect-postgresql/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer restrict="&gt;=app-eselect/eselect-postgresql-1.0.0" type="person">
+ <email>titanofold@gentoo.org</email>
+ <name>Aaron W. Swenson</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>pgsql-bugs@gentoo.org</email>
+ <name>PostgreSQL and Related Package Development</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-python-20160516 b/app-eselect/eselect-python-20160516
deleted file mode 100644
index aadc36023d5a..000000000000
--- a/app-eselect/eselect-python-20160516
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=Eselect module for management of multiple Python versions
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~floppym/dist/eselect-python-20160516.tar.bz2
-_md5_=452b2c63268958d7bcfccd59b224a5b2
diff --git a/app-eselect/eselect-python-20171204 b/app-eselect/eselect-python-20171204
deleted file mode 100644
index fd0f7891d8fd..000000000000
--- a/app-eselect/eselect-python-20171204
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare
-DESCRIPTION=Eselect module for management of multiple Python versions
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mgorny/dist/eselect-python-20171204.tar.bz2
-_md5_=b783181a134b8c47a21a06a9978688c1
diff --git a/app-eselect/eselect-python-99999999 b/app-eselect/eselect-python-99999999
deleted file mode 100644
index c8c89d4a0fbf..000000000000
--- a/app-eselect/eselect-python-99999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare unpack
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Eselect module for management of multiple Python versions
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/Python/
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3 >=dev-lang/python-exec-2.4.2
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=994817049dd18ffbc9a1e9f115873f30
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
new file mode 100644
index 000000000000..95e7f13c0cb9
--- /dev/null
+++ b/app-eselect/eselect-python/Manifest
@@ -0,0 +1,6 @@
+DIST eselect-python-20160516.tar.bz2 46549 BLAKE2B f8703ed35d9607a940fca1bb1d9612de62a04dd1fb065fa31db7438ee08b766b5ef84a4ef10f3f58654acb7fda4bc5e32abceccd0ecec632b364e4a55834ba2d SHA512 0ac310e13bca9e3cdfdd55820cc2956cacf28ade99c1b5048edadd48c6a04c2ae1037207aaac74fcd75e809cf993f88b52e463979b68bd123fe925e491a7030a
+DIST eselect-python-20171204.tar.bz2 46655 BLAKE2B f0bc46c796a1b9e01f964994219b9c7831f99844a12e97429b40482e28a590a2d825f7b6fbca27b0ca1ce616e5cfb388272af686ea2de65fda69da0319fddeda SHA512 f89183ca992bc38f2308a3217602d5ce6ec4b3b5b614f2aec48fb5b3b7e50a2e44dd18af36a7cfbd4b45d05346f2be97605e35fd274558e9173c6974681c8fa9
+EBUILD eselect-python-20160516.ebuild 1089 BLAKE2B f530b036157ee01b3950033151d752b6544881c785b95e75a5a653bb6f7568e185d39aa5b8c2e00eab650e93e9b6184b4d2ec5bf90ac09417f452932caf2a119 SHA512 24ae15fd8f95adecb4d7b09a3008dda42507df30484ca60988117c364f3f3c2eafee23e5b56660960cb7c4eee09672b4fe3ca7a8d49e42e2398f68bcffad0502
+EBUILD eselect-python-20171204.ebuild 1097 BLAKE2B aba4e4bdf7a42648e0de794efb149cd1009d1eb04f3425ebfea426096e905f13fec3fcf58c2d4ae077db345caa359567fca4921f919aded50bae2e3a58192729 SHA512 bd0330ef77f0b1b6ccb76734fb58cc43a96ac490e08e4871b21e1425c67ec2c7ac5a06f08a21ad5c21f3970ddc91940766dedd3047d2e1f17583df25bcfcec6b
+EBUILD eselect-python-99999999.ebuild 1111 BLAKE2B 32d94580e545a8853b66bf9c30977c52c45adfb98e1de9f0aed108bbd088f8f6de1a7367285161b26d88125ab2dc8bd74f985f4677b2d6abf64ab42da9f5b55a SHA512 33d648c0e8f7ecfeb3e5f5d9838887a64bcb2aea9b3c40381d5306c72cd71c823cb55f9baf1129bb80c0cc7f9ff5223d6799aad9d863a974d484baa9960658a7
+MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/app-eselect/eselect-python/eselect-python-20160516.ebuild b/app-eselect/eselect-python/eselect-python-20160516.ebuild
new file mode 100644
index 000000000000..7d3e622fb11b
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20160516.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# python-exec-2.4.2 for working -l option
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=dev-lang/python-exec-2.4.2"
+
+src_prepare() {
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+ local py
+
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+
+ if has_version "=dev-lang/python-3*"; then
+ eselect python update "--python3" --if-unset
+ fi
+}
diff --git a/app-eselect/eselect-python/eselect-python-20171204.ebuild b/app-eselect/eselect-python/eselect-python-20171204.ebuild
new file mode 100644
index 000000000000..a53d884a70dc
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20171204.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# python-exec-2.4.2 for working -l option
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=dev-lang/python-exec-2.4.2"
+
+src_prepare() {
+ default
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+ local py
+
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+
+ if has_version "=dev-lang/python-3*"; then
+ eselect python update "--python3" --if-unset
+ fi
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
new file mode 100644
index 000000000000..bcf52199d557
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://www.gentoo.org/proj/en/Python/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+# python-exec-2.4.2 for working -l option
+RDEPEND=">=app-admin/eselect-1.2.3
+ >=dev-lang/python-exec-2.4.2"
+
+src_prepare() {
+ default
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+ local py
+
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+
+ if has_version "=dev-lang/python-3*"; then
+ eselect python update "--python3" --if-unset
+ fi
+}
diff --git a/app-eselect/eselect-python/metadata.xml b/app-eselect/eselect-python/metadata.xml
new file mode 100644
index 000000000000..7f4f33c6dbc9
--- /dev/null
+++ b/app-eselect/eselect-python/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-qtgraphicssystem-1.1.1 b/app-eselect/eselect-qtgraphicssystem-1.1.1
deleted file mode 100644
index b57cfba2dfc2..000000000000
--- a/app-eselect/eselect-qtgraphicssystem-1.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utility to change the active Qt Graphics System
-EAPI=4
-HOMEPAGE=https://github.com/gentoo/eselect-qtgraphicssystem
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.4
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~wired/distfiles/eselect-qtgraphicssystem-1.1.1.tar.bz2
-_md5_=6daead9ccbda3f2582c92743b49d59d9
diff --git a/app-eselect/eselect-qtgraphicssystem/Manifest b/app-eselect/eselect-qtgraphicssystem/Manifest
new file mode 100644
index 000000000000..5f893e03476e
--- /dev/null
+++ b/app-eselect/eselect-qtgraphicssystem/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-qtgraphicssystem-1.1.1.tar.bz2 1621 BLAKE2B 1c58c8241e80d3897d059a1cf7aa1a1339d6d71255a8ff93df4517295f7f0d93aa5b90b9b15577b6e16e24d733cfa10285a5eab02e43b881f3c5ba54a802fc48 SHA512 9c8b5c1d40094b74401de2b0ae74ff2421f3fdd0bf51e5e4c06717064dfee9c03ed9a2ce913b7e8f54c6ad0b5ec11f392cb7fe7fa26822b1370b3e15d5389a66
+EBUILD eselect-qtgraphicssystem-1.1.1.ebuild 646 BLAKE2B c9eb7634464756fb08b0a52f7f14f1b4edc5985e90cb59c58fc2e0ce7e46c422cbd8b5ef781f3a4d4e491edda2eaadbdefc9f2b8d175045efb55f64ff5b5d5fc SHA512 0ba22095486c1c4817c944bca83e08eef2932a0c5acce447012f910194fea305b0d7fea4f3a4f9b2764e5bfcc3934e7da6e0d83e69f10f58decaaaacd7794f6a
+MISC metadata.xml 353 BLAKE2B a76028795c7773871b791adfb13d2082f7bd78980fbcb01ba83ed0adcc169c586c8eefea93967b848d52999d2e9266d50f6e11845550d63019d03941e862a8cc SHA512 720a84adfabb1d6e8ea192d54cc1e68211ea1818326df5cc320247003fa5b9eefa4ef164006d0a6d2e18c6eb416280e13dbdbcfd3b2b240d46b5ddf1733146f5
diff --git a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
new file mode 100644
index 000000000000..b82a885ed5b9
--- /dev/null
+++ b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Utility to change the active Qt Graphics System"
+HOMEPAGE="https://github.com/gentoo/eselect-qtgraphicssystem"
+SRC_URI="https://dev.gentoo.org/~wired/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.4"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins qtgraphicssystem.eselect
+}
diff --git a/app-eselect/eselect-qtgraphicssystem/metadata.xml b/app-eselect/eselect-qtgraphicssystem/metadata.xml
new file mode 100644
index 000000000000..ed30fbaf34d7
--- /dev/null
+++ b/app-eselect/eselect-qtgraphicssystem/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gentoo/eselect-qtgraphicssystem</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-rails-0.23 b/app-eselect/eselect-rails-0.23
deleted file mode 100644
index 8dae48fbbbc5..000000000000
--- a/app-eselect/eselect-rails-0.23
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages Ruby on Rails symlinks
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/eselect-rails-0.23.tar.xz
-_md5_=419b7f299a020cdd41099455c3bcfe41
diff --git a/app-eselect/eselect-rails-0.24 b/app-eselect/eselect-rails-0.24
deleted file mode 100644
index e38ef5acf2ff..000000000000
--- a/app-eselect/eselect-rails-0.24
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages Ruby on Rails symlinks
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/eselect-rails-0.24.tar.xz
-_md5_=a6bdd64aaa844868f4259df1a7c05d25
diff --git a/app-eselect/eselect-rails/Manifest b/app-eselect/eselect-rails/Manifest
new file mode 100644
index 000000000000..6e6416678a1c
--- /dev/null
+++ b/app-eselect/eselect-rails/Manifest
@@ -0,0 +1,5 @@
+DIST eselect-rails-0.23.tar.xz 1596 BLAKE2B d958e870c63d32517d681d5e815616506cf318004e5d4f00d0ff6db4e0927a405b295bb0ede5e13664fe510f7cf9324eb63042abe283f0386bc9600552a32193 SHA512 34a2d8a2b613eb3a3e20515fdf916c4b7e862322816d78a32a9243fcc56bea1c154892df7f27eb5e640560b1e63b273b02807669155184ad28f085d2f84dd3b8
+DIST eselect-rails-0.24.tar.xz 1600 BLAKE2B 84ef0f6d9ba78b652567cb36a6835ef0a793122864b46afe9643a73d98300466a6c81845bd36ff834967ba7ad0ae99fc3b4a6327298f28f29ebfc273b40155aa SHA512 df36b71865e41d61a9e5e497402cc819b5c7266a5df3fa6b960ae7a4d2fe4ddaa686d6971968b41e8a0c65bcb229a4d3a953d30c9f8a54b271478730e88a8dd3
+EBUILD eselect-rails-0.23.ebuild 721 BLAKE2B 49b77a5247ae51c29a479264707ab5e29fb0ec026e6faac8d7dfaf839b6c540336fd57a7bad638686ae336e6b259afab4034018c770b024185c5cc5c7775162a SHA512 c1ad714b120dc82883ba311b14586290ae288166ab81cde1dd5bfd178f43daa2633dddaf10765f99772e7dd6becc2ea024863030c5e03eedc4b9ec480fd9f2eb
+EBUILD eselect-rails-0.24.ebuild 722 BLAKE2B de2511b460b8e4a3d7ebcc54c554e3aac69906bb244777b6b47a27e8c3cb8312f8bd72b05333ba5f221e75e049dd86151e7a9cba34846d8b8dc3d50f52733889 SHA512 a3571bc7e4e80b8957ef21c49ced47e776c1a8cb3d4c59c746e97ce477e09a9158283935fa3c403742be1e0ed336640a31bd26551188d58f7cb4bc1f0f36417a
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-rails/eselect-rails-0.23.ebuild b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild
new file mode 100644
index 000000000000..fb08d778d1d1
--- /dev/null
+++ b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages Ruby on Rails symlinks"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.0"
+
+S=${WORKDIR}
+
+src_prepare() {
+ default
+
+ # Fix/Add Prefix support
+ sed -i -e 's/\${ROOT}/${EROOT}/' *.eselect || die
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins *.eselect || die "doins failed"
+}
diff --git a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
new file mode 100644
index 000000000000..4aed52bf3363
--- /dev/null
+++ b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages Ruby on Rails symlinks"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.0"
+
+S=${WORKDIR}
+
+src_prepare() {
+ default
+
+ # Fix/Add Prefix support
+ sed -i -e 's/\${ROOT}/${EROOT}/' *.eselect || die
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins *.eselect || die "doins failed"
+}
diff --git a/app-eselect/eselect-rails/metadata.xml b/app-eselect/eselect-rails/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/app-eselect/eselect-rails/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-renpy-0.7 b/app-eselect/eselect-renpy-0.7
deleted file mode 100644
index 4088cd7fbca4..000000000000
--- a/app-eselect/eselect-renpy-0.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DESCRIPTION=Manages renpy symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-lib-bin-symlink !<games-engines/renpy-6.99.12-r2
-SLOT=0
-_md5_=77e8cc8f3f9e9322e9610ce3c5d66d02
diff --git a/app-eselect/eselect-renpy/Manifest b/app-eselect/eselect-renpy/Manifest
new file mode 100644
index 000000000000..d8b9a70fd67e
--- /dev/null
+++ b/app-eselect/eselect-renpy/Manifest
@@ -0,0 +1,3 @@
+AUX renpy.eselect-0.7 335 BLAKE2B a00e5083ee8e0175c6617ad31af25ea5005371b84c2ad22b3982a6aa1fd15eac6ed627303d53ae352fdad507aab5085cc685d7e9358cc80be43243d367ebecb6 SHA512 fcf95cadd2d38ad675bf7d728a0d922e3f582afc6637baf2c6392289cca17cf63749d9e397a0732986df3b4db204a5c18f4911aad7d95171bb9d119370282d00
+EBUILD eselect-renpy-0.7.ebuild 682 BLAKE2B eeb022db87e88135b60b2cf6c5a0631ca145796019682109051b12b003b33e53d345b5c547e2939d71e38f8b430aad16be0615f3132cb9118247f3d90a5c7725 SHA512 736af8b20927c24abe61519b2cb9b3926b5c0d5e17d687a5f1e632da68ad3719c928ebe8ec8c523a921fdc11a4d3d748e8f2e172be52d04adbc0d32c1b50c556
+MISC metadata.xml 364 BLAKE2B 057ff91da9295621f1c3b34e4858892514837e453e90a83b7108efbfef234a8e9ee5bb06bebf195e5e48a1ad36c428c05a8b1225ba15847414c318682a2203c6 SHA512 8b3ee6db4ec0d3c0a1e10ed14a6500c3cf743ed84b91fdabd1b98861141b87a23b32ed76ef31385ade1cb2d80b5d2a273b85e6dc6b4b39f0bd1072787064c9e3
diff --git a/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild b/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild
new file mode 100644
index 000000000000..1f7c3d96da07
--- /dev/null
+++ b/app-eselect/eselect-renpy/eselect-renpy-0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages renpy symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ app-eselect/eselect-lib-bin-symlink
+ !<games-engines/renpy-6.99.12-r2"
+
+S=${WORKDIR}
+
+pkg_setup() { :; }
+
+src_prepare() {
+ sed \
+ -e "s|@BINDIR@|${EROOT}usr/bin|" \
+ "${FILESDIR}"/renpy.eselect-${PV} > "${WORKDIR}"/renpy.eselect || die
+ eapply_user
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins renpy.eselect
+}
+
+pkg_preinst() { :; }
+
+pkg_postinst() { :; }
diff --git a/app-eselect/eselect-renpy/files/renpy.eselect-0.7 b/app-eselect/eselect-renpy/files/renpy.eselect-0.7
new file mode 100644
index 000000000000..67199267bc57
--- /dev/null
+++ b/app-eselect/eselect-renpy/files/renpy.eselect-0.7
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage default renpy version"
+MAINTAINER="bircoph@gentoo.org"
+VERSION="0.7"
+
+SYMLINK_PATH="@BINDIR@/renpy"
+SYMLINK_TARGETS=( renpy-6.99 )
+SYMLINK_DESCRIPTION='default renpy'
+SYMLINK_CRUCIAL=1
+
+inherit bin-symlink
+
diff --git a/app-eselect/eselect-renpy/metadata.xml b/app-eselect/eselect-renpy/metadata.xml
new file mode 100644
index 000000000000..3d9228cdbf8a
--- /dev/null
+++ b/app-eselect/eselect-renpy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-repository-3 b/app-eselect/eselect-repository-3
deleted file mode 100644
index 61db0c083fb2..000000000000
--- a/app-eselect/eselect-repository-3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 arm x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v3.tar.gz -> eselect-repository-3.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e57a0e82818a750bc55465b332f7d49d
diff --git a/app-eselect/eselect-repository-4 b/app-eselect/eselect-repository-4
deleted file mode 100644
index b5c07d381fbd..000000000000
--- a/app-eselect/eselect-repository-4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mgorny/eselect-repository/archive/v4.tar.gz -> eselect-repository-4.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b241f99bb7dd46fc8b3b5e1df0c463a6
diff --git a/app-eselect/eselect-repository-9999 b/app-eselect/eselect-repository-9999
deleted file mode 100644
index 969b8d56f23d..000000000000
--- a/app-eselect/eselect-repository-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Manage repos.conf via eselect
-EAPI=6
-HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-admin/eselect dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e600adcac646199c8f20a523e6f2e3ef
diff --git a/app-eselect/eselect-repository/Manifest b/app-eselect/eselect-repository/Manifest
new file mode 100644
index 000000000000..dce91aa28b35
--- /dev/null
+++ b/app-eselect/eselect-repository/Manifest
@@ -0,0 +1,6 @@
+DIST eselect-repository-3.tar.gz 5448 BLAKE2B 36a079f2a876709a2cc045e0c113f44f9feaa491c49d3773eb3e123ee7e7a7ffa2ad05060ffa62ac39ff8091a64ff995ea948f3c784ffbb7d8ddca5e468364d3 SHA512 ac3396a6d14fcc7d4df1f9b058bc3025875707f3febdf4d1e03122445d0e6273759b8a66443525c94daaf19f91b411c469aabc0e0082cd53980886a91f38a062
+DIST eselect-repository-4.tar.gz 5535 BLAKE2B 4dce6c0136ec9394c9bf4128ec26ab67260d4b96a165825ae7b15b8476d10d23fcc5190946fc54013d6eb8e4f18988b07df4c849ba50844571986a6823511547 SHA512 0d3c204d73bb4314bc24fdf6cd837f2a56ac00d1d11fbec7f072af874bc468777676bba40e0cc17553f6dec7a907f10865f9c356a6390372e0734173465ac483
+EBUILD eselect-repository-3.ebuild 906 BLAKE2B 0823c79e3eece3ff4faa02e68d7af7aad48f65c7008c555e401bf4ae904799641133c59b4ded810dca973a931fd48cbd0a86902e58cecff41c79cab3d85fc3e7 SHA512 8e0160a730c6538ed4d2dd2857d50f2de7286914b3ae132b0748540b151bf01a75c72da21aff390b5364122489ceef940a5eb3261d6dbc9c3d0c76f1f71d8e38
+EBUILD eselect-repository-4.ebuild 909 BLAKE2B 45ef0c881971775d33d8a208af55005f6cba842e06f8bd5cb4ead9e08c27403cc4450643accdec6dd25ccbe5027a3254be5c5b7cf4a96e3f029c5dc59184c87f SHA512 05a99c022ac39f66e6844607ffa4faf3581b1474ddc5285db9954998f6c5a9efa47875f6b395277b70c269722c7eab90c2541682014e2cb992fdd3f81d8e934a
+EBUILD eselect-repository-9999.ebuild 884 BLAKE2B ef691a37c5b3e0180e5ccb56e0417bbfee46edeb78d652247e30db0162bbf77cd90ce438abb09d0060eee17ea7620b24f4789ddc6e6761f96e810668a99809a6 SHA512 1f97605e8a8f2762b83b28266f2b40a0db3a253e135ae829178d5abac6158406a97e40f459d6477870372ff350a1e620dac353d96deb342f7aa3ce8db97512ec
+MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
diff --git a/app-eselect/eselect-repository/eselect-repository-3.ebuild b/app-eselect/eselect-repository/eselect-repository-3.ebuild
new file mode 100644
index 000000000000..b060bbdb688d
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ app-admin/eselect
+ dev-python/lxml[${PYTHON_USEDEP}]
+ net-misc/wget"
+
+src_compile() {
+ MAKEARGS=(
+ PREFIX="${EPREFIX}/usr"
+ SYSCONFDIR="${EPREFIX}/etc"
+ SHAREDSTATEDIR="${EPREFIX}/var"
+ ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+ )
+
+ emake "${MAKEARGS[@]}"
+ python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ keepdir /var/db/repos
+ einstalldocs
+}
diff --git a/app-eselect/eselect-repository/eselect-repository-4.ebuild b/app-eselect/eselect-repository/eselect-repository-4.ebuild
new file mode 100644
index 000000000000..8b88032d1ad9
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ app-admin/eselect
+ dev-python/lxml[${PYTHON_USEDEP}]
+ net-misc/wget"
+
+src_compile() {
+ MAKEARGS=(
+ PREFIX="${EPREFIX}/usr"
+ SYSCONFDIR="${EPREFIX}/etc"
+ SHAREDSTATEDIR="${EPREFIX}/var"
+ ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+ )
+
+ emake "${MAKEARGS[@]}"
+ python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ keepdir /var/db/repos
+ einstalldocs
+}
diff --git a/app-eselect/eselect-repository/eselect-repository-9999.ebuild b/app-eselect/eselect-repository/eselect-repository-9999.ebuild
new file mode 100644
index 000000000000..3b84ea378340
--- /dev/null
+++ b/app-eselect/eselect-repository/eselect-repository-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/mgorny/eselect-repository.git"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit git-r3 python-single-r1
+
+DESCRIPTION="Manage repos.conf via eselect"
+HOMEPAGE="https://github.com/mgorny/eselect-repository"
+SRC_URI=""
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ app-admin/eselect
+ dev-python/lxml[${PYTHON_USEDEP}]
+ net-misc/wget"
+
+src_compile() {
+ MAKEARGS=(
+ PREFIX="${EPREFIX}/usr"
+ SYSCONFDIR="${EPREFIX}/etc"
+ SHAREDSTATEDIR="${EPREFIX}/var"
+ ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
+ )
+
+ emake "${MAKEARGS[@]}"
+ python_fix_shebang eselect-repo-helper
+}
+
+src_install() {
+ emake "${MAKEARGS[@]}" DESTDIR="${D}" install
+ keepdir /var/db/repos
+ einstalldocs
+}
diff --git a/app-eselect/eselect-repository/metadata.xml b/app-eselect/eselect-repository/metadata.xml
new file mode 100644
index 000000000000..684b0b02f001
--- /dev/null
+++ b/app-eselect/eselect-repository/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mgorny/eselect-repository</remote-id>
+ </upstream>
+ <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-eselect/eselect-ruby-20161226 b/app-eselect/eselect-ruby-20161226
deleted file mode 100644
index bbf8b9d38fbd..000000000000
--- a/app-eselect/eselect-ruby-20161226
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages multiple Ruby versions
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-20161226.xz
-_md5_=1e2a51965e0618def9c81bdd53345b61
diff --git a/app-eselect/eselect-ruby-20170723 b/app-eselect/eselect-ruby-20170723
deleted file mode 100644
index c8aa43169c0e..000000000000
--- a/app-eselect/eselect-ruby-20170723
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages multiple Ruby versions
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20170723.xz
-_md5_=740354b60a5fe9d7de8c6394a5f5f8f1
diff --git a/app-eselect/eselect-ruby-20171225 b/app-eselect/eselect-ruby-20171225
deleted file mode 100644
index e9856a6183ca..000000000000
--- a/app-eselect/eselect-ruby-20171225
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages multiple Ruby versions
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20171225.xz
-_md5_=6af4a379eaef0f5442be6df1abddb96a
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
new file mode 100644
index 000000000000..9434e56fc201
--- /dev/null
+++ b/app-eselect/eselect-ruby/Manifest
@@ -0,0 +1,7 @@
+DIST ruby.eselect-20161226.xz 1900 BLAKE2B 698f004e548924ca7c58dfceccc3d21029d6460d21dd67e4466e3a8c4bfdc3a7976c51754ba376c5acbbec7c1146368b532f1cda079f8b5f6f86b7b08c700214 SHA512 69cf17e42d9908fdfc9b08a3ca2c1f406a5968fc1c22663cc4b2388ad29d3bdb8aec4f0210ce9d5c118514aea81a4465a299347dd702f859ba8660fcb3882f17
+DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
+DIST ruby.eselect-20171225.xz 1972 BLAKE2B 919a5d3847fd38dd86352623dca38523a323b0450f3fb2f04c5fb426e905431a6ef2e221c7221b67b9c4a989253ef2cda70a1dd2df710eb9331234bcefcc0dd6 SHA512 3398de77c5a836119f52980d26702c891af1bc7f83596829591d268cb252843242c2e00c42e10cfe3468a4b92e47e6d551108d21d1e322edda7e4756a1b5ad86
+EBUILD eselect-ruby-20161226.ebuild 701 BLAKE2B eef3dab91ba6daaa5b240d531a8feeae69049afb14cf715d2080085e8069f4e79e2ae80a39f6c8786a73d5c97ddcc6b05b94ae28febd27b9a30ba7da91dcb026 SHA512 894f7ebb1e56082a4d52986cb4d3d603c6930c008967016cd8dd8c64324bd74ce1e8eab9b0b10af2840e61a3739a3b26ff1fb0edf14057115a340b583099b3fe
+EBUILD eselect-ruby-20170723.ebuild 698 BLAKE2B 456eb599d151f9196283beab846496bef3866740dc78ffae09e0ed8880829274d3b19b944120d39bfc43829fa6f1b4ed036f7411059008df2bbe2487d8e20e29 SHA512 0fe7b8f8931b0b16da8a2ba8b8e76d86ddd169b8a16f208006abb3dff6cbd6d85f9223a3ce38f128ba3b7e3e0a68b80ca43d3f717aa26995f4f3c4b4af5a5b8d
+EBUILD eselect-ruby-20171225.ebuild 707 BLAKE2B dc9eb32a9b6734361961492814dcb3c5af2524c79ee191f1fcafc76553ae18d7f54be4d99a760d67004fe46c0c84f2dfebc8249eacf823a14bf28a17d9b94ae2 SHA512 3b6e39cdec4c229bfc4488b0046cd9cbb80ba766838577403e9e6b0b0d224c26cfe64a80c021bd41afab87b71418a3eac411dc96c2de7cdee51f5d319257a4bb
+MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
new file mode 100644
index 000000000000..48a1fd35f9d1
--- /dev/null
+++ b/app-eselect/eselect-ruby/eselect-ruby-20161226.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
+}
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
new file mode 100644
index 000000000000..e4ec8714eca4
--- /dev/null
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
+}
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild
new file mode 100644
index 000000000000..427ac228334a
--- /dev/null
+++ b/app-eselect/eselect-ruby/eselect-ruby-20171225.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die
+}
diff --git a/app-eselect/eselect-ruby/metadata.xml b/app-eselect/eselect-ruby/metadata.xml
new file mode 100644
index 000000000000..28ab0c15f206
--- /dev/null
+++ b/app-eselect/eselect-ruby/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-rust-0.3_pre20150428 b/app-eselect/eselect-rust-0.3_pre20150428
deleted file mode 100644
index 169eb72e0d9a..000000000000
--- a/app-eselect/eselect-rust-0.3_pre20150428
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst preinst prerm
-DESCRIPTION=eselect module for rust
-EAPI=5
-HOMEPAGE=https://github.com/jauhien/eselect-rust
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://github.com/jauhien/eselect-rust/archive/0.3_pre20150428.tar.gz -> eselect-rust-0.3_pre20150428.tar.gz
-_md5_=0093ab8f77b584c700b0fe19ae87a32d
diff --git a/app-eselect/eselect-rust/Manifest b/app-eselect/eselect-rust/Manifest
new file mode 100644
index 000000000000..63b15aa1ff76
--- /dev/null
+++ b/app-eselect/eselect-rust/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-rust-0.3_pre20150428.tar.gz 64722 BLAKE2B 17794065dd1a54a2caf73ac49271343a0bf21f96e7d6acbf5a2dfdf44354056f75d33656c2551ff06fdfe28d6245b161612fe57e3bddb1d3dbec52b801cd1c05 SHA512 214a6eb4b1f9bfcaed1a5fe92ec9633a82316716ffda8db2d2f88bfcbdae17ef7c026091de3927efad5c3624bb7003166d2ebadea6dd8828a0f1c41e0d3f16e7
+EBUILD eselect-rust-0.3_pre20150428.ebuild 629 BLAKE2B 8a196e76002b17d81ccfb7277b6f3d41ba73be25d85d62a859526e9c58313737a005b2fae3f65ad8c06994de460786549debb0b4e32d2d55094c9fde52cc3a55 SHA512 c88b14344b42f1abf68efdcc5649f9f594d15d005bff90d51fa689afd5acbe758debfc0a5ca0d35d0469934067970d74b19788e0366f9841231de91243219b9f
+MISC metadata.xml 301 BLAKE2B b569454ab084e600cd974251af1ec665c54a5f37b03d6fdfd43384a36d0c738482ca4605031a8e6a000de46c7d1f756338417b313dd0212e2b0671dc7839a94d SHA512 63b1c2f65bc5f26653ee98ca2722f5da05f1a8b3d430b5921b685c7506c3d685c36d0bc2c2eb293529ffda32d50e1a59783c24d2399c1f647b1bdedb68d48616
diff --git a/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild b/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
new file mode 100644
index 000000000000..def5806c4e30
--- /dev/null
+++ b/app-eselect/eselect-rust/eselect-rust-0.3_pre20150428.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="eselect module for rust"
+HOMEPAGE="https://github.com/jauhien/eselect-rust"
+SRC_URI="https://github.com/jauhien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="app-admin/eselect"
+
+pkg_preinst() {
+ if has_version 'app-eselect/eselect-rust' ; then
+ eselect rust unset
+ fi
+}
+
+pkg_postinst() {
+ if has_version 'dev-lang/rust' || has_version 'dev-lang/rust-bin' ; then
+ eselect rust update --if-unset
+ fi
+}
+
+pkg_prerm() {
+ eselect rust unset
+}
diff --git a/app-eselect/eselect-rust/metadata.xml b/app-eselect/eselect-rust/metadata.xml
new file mode 100644
index 000000000000..10efdddc421b
--- /dev/null
+++ b/app-eselect/eselect-rust/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>rust@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jauhien/eselect-rust</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-scala-0.1.1 b/app-eselect/eselect-scala-0.1.1
deleted file mode 100644
index 6e3df12739fa..000000000000
--- a/app-eselect/eselect-scala-0.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages multiple Scala versions
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~gienah/distfiles/eselect-scala-0.1.1.tar.gz
-_md5_=9cdc34d79203043caaff752237d0718b
diff --git a/app-eselect/eselect-scala/Manifest b/app-eselect/eselect-scala/Manifest
new file mode 100644
index 000000000000..9e67e8774684
--- /dev/null
+++ b/app-eselect/eselect-scala/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-scala-0.1.1.tar.gz 1781 BLAKE2B 42f4723c33c7f44345d545c3d2503fc32b433afa8add4488d4a48b7f7a9d0250040a8768c3d4c7a3572d8d386c4820779d0c9bca975ca5cd92a820bb579b8c79 SHA512 2de1b6067c385d1fb0fa0c708467ebd5d491c3ee532888ad497008fe7f78a8f4be9843af444d71107e05c111579ed83015094c3eca5d6f2c338855af4b722363
+EBUILD eselect-scala-0.1.1.ebuild 462 BLAKE2B c92727e5692a005a9a9784834a72baad7b3327c79e2bec574f8190345320e714702806f285fdf55a4d7ca48da969e6966e4a41b8d57ddf03024649c72657cc10 SHA512 978041c6cad13d16d569009cdb62084b46d79c3fcc16be15983ea70903b5227234e6417312e372fd89febca1176a061558a87872c5cf4dd3bfcf1dabac3f9346
+MISC metadata.xml 310 BLAKE2B 0b539883678be15dc41458c5c63d3d3228e56fcd1264dd8eb8767efa4f8623fd8d6fe5f52f40c50d31e62805cb46622abe3acd599e0114bfe66ef21f8f4de453 SHA512 0fc994f744babc8dabfce3c5ca8c9fdcef3c164cf481c8e317468615e34089f605772b9216ed2ecf0dbd80c1309b7da9e48c617514137cbb9b8cec44a1fbba4c
diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
new file mode 100644
index 000000000000..28a48e34aca6
--- /dev/null
+++ b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages multiple Scala versions"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~gienah/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins scala.eselect
+}
diff --git a/app-eselect/eselect-scala/metadata.xml b/app-eselect/eselect-scala/metadata.xml
new file mode 100644
index 000000000000..d4ca24982e1b
--- /dev/null
+++ b/app-eselect/eselect-scala/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>gienah@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-sh-0.4-r2 b/app-eselect/eselect-sh-0.4-r2
deleted file mode 100644
index 199d654832a0..000000000000
--- a/app-eselect/eselect-sh-0.4-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /bin/sh (POSIX shell) symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-eselect/eselect-lib-bin-symlink
-SLOT=0
-_md5_=e3613c2522c7d8b3ea8a52ab47b7ba29
diff --git a/app-eselect/eselect-sh/Manifest b/app-eselect/eselect-sh/Manifest
new file mode 100644
index 000000000000..60c21f472465
--- /dev/null
+++ b/app-eselect/eselect-sh/Manifest
@@ -0,0 +1,3 @@
+AUX sh.eselect-0.4-r2 347 BLAKE2B a67b9287c40f2f5d96e3a849f889e092a3861423db7bbe5653fddfd5583a7475edee2eb071792b92980269ce19cae24ca774404e95c51a42b6b67f960d9a38ad SHA512 ab8ff220613e1de75e6ffc4bd0b021e55f80658d0071af9fc1036d28f81cdea35e209869803c33e89ea90fb3c980f511b91bf4e64d56f530e92af5fccff522be
+EBUILD eselect-sh-0.4-r2.ebuild 592 BLAKE2B cad627c381dfbb92f63fef89cf1e2c7892e3d208f5df1cbaaf3c29bb4bd92714cb30c7c96ff18f628597e761294cfa8fc6855e149b1fe6bb53d0e65c4dad4650 SHA512 1068617a36137b7c4b40204f8ab616dcb256a1014ab5e49baa762e8a84ab523fc9274e5b741475b9287d2a69e2f2601a2b82010a8335a5e581eaadca1bcda509
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
new file mode 100644
index 000000000000..54480df6acdf
--- /dev/null
+++ b/app-eselect/eselect-sh/eselect-sh-0.4-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages the /bin/sh (POSIX shell) symlink"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-eselect/eselect-lib-bin-symlink"
+
+S=${FILESDIR}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins sh.eselect-${PVR} sh.eselect
+}
diff --git a/app-eselect/eselect-sh/files/sh.eselect-0.4-r2 b/app-eselect/eselect-sh/files/sh.eselect-0.4-r2
new file mode 100644
index 000000000000..7e7ae94de2da
--- /dev/null
+++ b/app-eselect/eselect-sh/files/sh.eselect-0.4-r2
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /bin/sh (POSIX shell) implementations"
+MAINTAINER="mgorny@gentoo.org"
+VERSION="0.4"
+
+SYMLINK_PATH=/bin/sh
+SYMLINK_TARGETS=( bash dash posh mksh )
+SYMLINK_DESCRIPTION='POSIX shell'
+SYMLINK_CRUCIAL=1
+
+inherit bin-symlink
diff --git a/app-eselect/eselect-sh/metadata.xml b/app-eselect/eselect-sh/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-eselect/eselect-sh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-sndpeek-1.0.1 b/app-eselect/eselect-sndpeek-1.0.1
deleted file mode 100644
index 2fb6080b4205..000000000000
--- a/app-eselect/eselect-sndpeek-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /usr/bin/sndpeek symlink
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/sndpeek.eselect-1.0.1.bz2
-_md5_=dd5b523654b959e63069ba4749eeebfd
diff --git a/app-eselect/eselect-sndpeek/Manifest b/app-eselect/eselect-sndpeek/Manifest
new file mode 100644
index 000000000000..d040bdba30eb
--- /dev/null
+++ b/app-eselect/eselect-sndpeek/Manifest
@@ -0,0 +1,3 @@
+DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
+EBUILD eselect-sndpeek-1.0.1.ebuild 480 BLAKE2B 324369818e822d79413350bcb1fc7b4ce9257469969a067e87989cd545a3c47046a2eb9564e4f05cf20b326ddeff1f390943ecb989a8b6ca0223183d3ce00e40 SHA512 e0c7c4058f5162753da6a5e5826a373e5007243a0de46fe6948849e8b2ec2f64b9da986edd5f66f016c87819d6cc61128ead193870f060f6adb35b033747bea7
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
new file mode 100644
index 000000000000..7e8d5ff92fe3
--- /dev/null
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect
+}
diff --git a/app-eselect/eselect-sndpeek/metadata.xml b/app-eselect/eselect-sndpeek/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-eselect/eselect-sndpeek/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-eselect/eselect-timezone-0.2 b/app-eselect/eselect-timezone-0.2
deleted file mode 100644
index 25761fbb85b2..000000000000
--- a/app-eselect/eselect-timezone-0.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages timezone selection
-EAPI=6
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~junghans/distfiles/eselect-timezone-0.2.tar.xz
-_md5_=86dd26217df95b358c4a1ee86b43b6ce
diff --git a/app-eselect/eselect-timezone/Manifest b/app-eselect/eselect-timezone/Manifest
new file mode 100644
index 000000000000..0471e075a1a3
--- /dev/null
+++ b/app-eselect/eselect-timezone/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-timezone-0.2.tar.xz 1400 BLAKE2B 22d19159629dda57f7372ae31283693d5993c17096c1f0057060ecbb731274bb856c292b0b1dd91751f17a0226502ddf942bafa0c2fdc544d1ed1480cc8193c9 SHA512 757dc88b94fde547af2026c0759c9109f803f7144e843be9d79e9eef0bcbe8f2273a5585448dc1d810d89f4f4be7f6d8974e7dc35f6dc8069f8090775bdf8b52
+EBUILD eselect-timezone-0.2.ebuild 394 BLAKE2B 74cc5aad9ede6f556a49293e49ef93b8f0eb9ae69859bd5015c31cfbacfeeb2fce6cc6cccc22609c99aa271c4d4ef97c0a2d8514b9b9e65d67debb104cf71f76 SHA512 6048be243e69f740f6afcc4ea392a971548e8eac923bef8150283ebb0b7910ecd83566ecd2341e102281f3ec1d97bc8ce3f0ac8e9f3b24ad8464a6d9b0fcebe4
+MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
new file mode 100644
index 000000000000..b05c2756b374
--- /dev/null
+++ b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages timezone selection"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins timezone.eselect
+}
diff --git a/app-eselect/eselect-timezone/metadata.xml b/app-eselect/eselect-timezone/metadata.xml
new file mode 100644
index 000000000000..ef6b5dcd53aa
--- /dev/null
+++ b/app-eselect/eselect-timezone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>junghans@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-timidity-20110513 b/app-eselect/eselect-timidity-20110513
deleted file mode 100644
index 7a3999add7fa..000000000000
--- a/app-eselect/eselect-timidity-20110513
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages configuration of TiMidity++ patchsets
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=c3908ee01b6c1f0865f0a5e7e42013d8
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
new file mode 100644
index 000000000000..da44b59fd00d
--- /dev/null
+++ b/app-eselect/eselect-timidity/Manifest
@@ -0,0 +1,3 @@
+DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
+EBUILD eselect-timidity-20110513.ebuild 529 BLAKE2B 1abe0a50e471a19add8986fd633dc5c218a31f68c51cf8f40489f90d0083668e3feed7e8b8e70c41598f01cb626f9d59e52ef55eb1e21f4548fbf0a3b1ac64aa SHA512 3dc17f82dde049a967633a13a1226788b130a15ca8b6341bcd13a95d8d47baa038dc3ec62b86dd8f09ab275e9e98dfdfa3c91ab8c021a3e1bc93c9e69f3a0c3a
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
new file mode 100644
index 000000000000..8ff781184fe7
--- /dev/null
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages configuration of TiMidity++ patchsets"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect
+}
diff --git a/app-eselect/eselect-timidity/metadata.xml b/app-eselect/eselect-timidity/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/app-eselect/eselect-timidity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-unison-0.3 b/app-eselect/eselect-unison-0.3
deleted file mode 100644
index 9234ee1a3854..000000000000
--- a/app-eselect/eselect-unison-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=unison module for eselect
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5a0a69bf2a7881bf574e89cbf9342a9
diff --git a/app-eselect/eselect-unison/Manifest b/app-eselect/eselect-unison/Manifest
new file mode 100644
index 000000000000..3af2f7b6409f
--- /dev/null
+++ b/app-eselect/eselect-unison/Manifest
@@ -0,0 +1,3 @@
+AUX unison.eselect-0.3 3503 BLAKE2B 4aa6a2325277d6e76cb5f751ea582aea33cb8aadb57555e3da11a3276deb42137830b78a58da14ea91e2f638718138d08da5936551c6933c8d83e587d7a97e8b SHA512 67c8d9109e83643534219eb8c78bf797abf7e77751605dcfb7da6f48c5e26a1fffc36c991aef222b51427305e9b704c8e9aff23234994dc1424849673df91bf0
+EBUILD eselect-unison-0.3.ebuild 595 BLAKE2B 5284ff851825be73fab23e0a144932fe9b814fa6ab53066e8fa193298c8f1397ae810fe136b3dd58e12c39ceef922adf6c1f922d53ef8cbb58833c5694c3f8b2 SHA512 ed16e404d880a11f1a8252ed214daece8cf0126913d52ebc84b4e84dc1683275fbdfa3bb1dde895605291478cadad37cc9f1e24ecced83133e42ff834bf10e5d
+MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/app-eselect/eselect-unison/eselect-unison-0.3.ebuild b/app-eselect/eselect-unison/eselect-unison-0.3.ebuild
new file mode 100644
index 000000000000..bef307805fc3
--- /dev/null
+++ b/app-eselect/eselect-unison/eselect-unison-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="unison module for eselect"
+HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_install() {
+ local MODULEDIR="/usr/share/eselect/modules"
+ local MODULE="unison"
+ dodir ${MODULEDIR}
+ insinto ${MODULEDIR}
+ newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \
+ || die "failed to install"
+}
diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.3 b/app-eselect/eselect-unison/files/unison.eselect-0.3
new file mode 100644
index 000000000000..263c0fa7bc80
--- /dev/null
+++ b/app-eselect/eselect-unison/files/unison.eselect-0.3
@@ -0,0 +1,145 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage /usr/bin/unison versions"
+MAINTAINER="ml@gentoo.org"
+VERSION="0.3"
+
+# find a list of unison symlink targets, best first
+find_targets() {
+ local f
+ for f in "${EROOT}"/usr/bin/unison-[0-9]*; do
+ if [[ -f ${f} ]] ; then
+ echo "${f##*/unison-}"
+ fi
+ done | tac
+}
+
+# find version number of currently symlinked version
+identify_target() {
+ local f
+ f="$(canonicalise "${EROOT}"/usr/bin/unison)"
+ echo "${f##*/unison-}"
+}
+
+# try to remove the unison symlink
+remove_symlinks() {
+ rm -f "${EROOT}"/usr/bin/unison &>/dev/null
+}
+
+# set the unison symlink
+set_symlinks() {
+ local target="${1}" targets
+ if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+ targets=( $(find_targets) )
+ target=${targets[target - 1]}
+ fi
+ if [[ -f "${EROOT}/usr/bin/unison-${target}" ]] ; then
+ remove_symlinks
+ ln -s "unison-${target}" "${EROOT}/usr/bin/unison" || \
+ die "Could not set ${target} /usr/bin/unison symlink"
+ else
+ die -q "Target \"${target}\" doesn't appear to be valid!"
+ fi
+}
+
+### show action ###
+
+describe_show() {
+ echo "Show the current unison version"
+}
+
+do_show() {
+ [[ -z "${@}" ]] || die -q "Too many parameters"
+
+ write_list_start "Current unison verson:"
+ if [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+ write_kv_list_entry "$(identify_target)" ""
+ elif [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+ write_kv_list_entry "(not a symlink)" ""
+ else
+ write_kv_list_entry "(unset)" ""
+ fi
+}
+
+### list action ###
+
+describe_list() {
+ echo "List available unison versions"
+}
+
+do_list() {
+ [[ $# -eq 0 ]] || die -q "Too many parameters"
+
+ local i targets current
+ targets=( $(find_targets ) )
+ current=$(identify_target)
+ for (( i = 0; i < ${#targets[@]}; i++ )); do
+ [[ ${targets[i]} = ${current} ]] \
+ && targets[i]=$(highlight_marker "${targets[i]}")
+ done
+ write_list_start "Available unison versions:"
+ write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+ echo "Set a new unison version"
+}
+
+describe_set_options() {
+ echo "target : Target version number or index from 'list' action"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+do_set() {
+ if [[ -z "${1}" ]] ; then
+ die -q "You didn't give me a version number"
+
+ elif [[ -n "${2}" ]] ; then
+ die -q "Too many parameters"
+
+ elif [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+ if ! remove_symlinks ; then
+ die -q "Can't remove existing version symlink"
+ elif ! set_symlinks "${1}" ; then
+ die -q "Can't set new version"
+ fi
+
+ elif [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+ die -q "${EROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
+
+ else
+ set_symlinks "${1}" || die -q "Can't set new version"
+ fi
+}
+
+### update action ###
+
+describe_update() {
+ echo "Automatically update the unison version number"
+}
+
+describe_update_options() {
+ echo "--if-unset : Do not override currently selected version"
+}
+
+do_update() {
+ [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+ die -q "Usage error"
+
+ if [[ -L "${EROOT}/usr/bin/unison" ]] ; then
+ [[ ${1} == "--if-unset" ]] && return
+ remove_symlinks || die -q "Can't remove existing symlink"
+ fi
+ if [[ -e "${EROOT}/usr/bin/unison" ]] ; then
+ die -q "${EROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually"
+ elif ! [[ -z $(find_targets ) ]] ; then
+ set_symlinks 1 || die -q "Can't set a new version"
+ fi
+}
diff --git a/app-eselect/eselect-unison/metadata.xml b/app-eselect/eselect-unison/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/app-eselect/eselect-unison/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-vdr-0.0.3 b/app-eselect/eselect-vdr-0.0.3
deleted file mode 100644
index a5f205a9235c..000000000000
--- a/app-eselect/eselect-vdr-0.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the VDR plugins
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-vdr-0.0.3.tar.bz2
-_md5_=d73d618c8dac9c7240666fd7c6895677
diff --git a/app-eselect/eselect-vdr/Manifest b/app-eselect/eselect-vdr/Manifest
new file mode 100644
index 000000000000..c0c2c8c50522
--- /dev/null
+++ b/app-eselect/eselect-vdr/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-vdr-0.0.3.tar.bz2 1899 BLAKE2B 837b1b2736b6ebf386f7a284a155d0d12509df97b4fc424926a1cdb0350358b5ba5cc73eea3069166c16f33c7707e54a6298b645f27e2f5a57f8879a5e349aed SHA512 6cd1c43271106d3dbe59c12148b0364c11a9767cb9ebb76e1647f707573d8fb875dfaa3ebd0b76523270e20c7ce4afd17d05dca0ef1dc4331366f49895498631
+EBUILD eselect-vdr-0.0.3.ebuild 503 BLAKE2B eaa1828b816445c3d87303fbb6ec77d4721ef23e500f243f737122fa49eacd6a04dbc944f48612b8fe8ae26d0e8354a1416e9c43f82d03426a4bdf75718827c5 SHA512 b77ea824749c1c70f49fac3f63a1f492ec2e2e1fdf06b217302edf7dc0e13846147fd25f9f2650956bd2bb9c11a323bd6f7d825376d80840a261fbd5ebd725f2
+MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
new file mode 100644
index 000000000000..9cdc6760fea9
--- /dev/null
+++ b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages the VDR plugins"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins vdr-plugin.eselect || die "Could not install eselect module"
+
+ dosym eselect /usr/bin/vdr-plugin-config
+}
diff --git a/app-eselect/eselect-vdr/metadata.xml b/app-eselect/eselect-vdr/metadata.xml
new file mode 100644
index 000000000000..984a01fab265
--- /dev/null
+++ b/app-eselect/eselect-vdr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-vi-1.1.9 b/app-eselect/eselect-vi-1.1.9
deleted file mode 100644
index 7602f8341d07..000000000000
--- a/app-eselect/eselect-vi-1.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages the /usr/bin/vi symlink
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.6
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=bdeac3b9c5b61b00f3546de64f688f75
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
new file mode 100644
index 000000000000..ec228b8caec0
--- /dev/null
+++ b/app-eselect/eselect-vi/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
+EBUILD eselect-vi-1.1.9.ebuild 639 BLAKE2B 1d8c212ef6da44f36c5e43485f13743141b32a8ff30a595ba404be5ecef8acece5d098f0c328a73c65015d0e58062d2f94aa95de60b46b4a54a949576c70632f SHA512 95e703b9f5fd0a5e68d706f4ab9794014b579adf886a7ba017525d93dfa6d8aade98664eba2d51fcc219f708ce51836eef5a37a4c5d42e0ab550647419bd6379
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
new file mode 100644
index 000000000000..a9de862b0ca9
--- /dev/null
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages the /usr/bin/vi symlink"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.6"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins vi.eselect || die
+}
diff --git a/app-eselect/eselect-vi/metadata.xml b/app-eselect/eselect-vi/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-eselect/eselect-vi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-wine-1.2.2 b/app-eselect/eselect-wine-1.2.2
deleted file mode 100644
index 5c20906c7ec8..000000000000
--- a/app-eselect/eselect-wine-1.2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst prerm
-DESCRIPTION=Manage active wine version
-EAPI=6
-HOMEPAGE=https://bitbucket.org/NP-Hardass/eselect-wine
-KEYWORDS=-* amd64 x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-admin/eselect dev-util/desktop-file-utils !!app-emulation/wine:0
-SLOT=0
-SRC_URI=https://bitbucket.org/NP-Hardass/eselect-wine/raw/v1.2.2/wine.eselect -> wine.eselect-1.2.2
-_md5_=67f2198373cc7d95f67dd73adb9030d1
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
new file mode 100644
index 000000000000..407591648a29
--- /dev/null
+++ b/app-eselect/eselect-wine/Manifest
@@ -0,0 +1,3 @@
+DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
+EBUILD eselect-wine-1.2.2.ebuild 1286 BLAKE2B 86ade3478746b9d2efa245f2a0ea10d1cecc9c299984e73a2b64ac2618b9f0c144d78e46b2468050499e9fdd12aa5b2c22ab2fc3baa408c4b173e23a9ac1c61c SHA512 c4e2d6854998c7c6b4216412d2430bfa704e19c21110bc50a2039c68aad3be6136f8999b01fbd6219f9a8007e305d402000e92215419fe04fc58cd44a6b4d74b
+MISC metadata.xml 435 BLAKE2B 7f91f4c92092f4d3dc799dda56a3b8ec46a40adabd3161624fedab9bc66b8b2f61ef376338cc0c467b1f7d9b580c463b83f9623d23360525b16f28d65f8c5ac4 SHA512 a0be824eab346069bdca0b7f1856798b3469cc72829cb0850bec061e7679f9c68a3adf3331c4e5aedb3ac9253436997b9b6e75c79966c32abbf9048e16086e17
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
new file mode 100644
index 000000000000..b65240008ca5
--- /dev/null
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manage active wine version"
+HOMEPAGE="https://bitbucket.org/NP-Hardass/eselect-wine"
+SRC_URI="https://bitbucket.org/NP-Hardass/${PN}/raw/v${PV}/wine.eselect -> wine.eselect-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/eselect
+ dev-util/desktop-file-utils
+ !!app-emulation/wine:0"
+
+S=${WORKDIR}
+
+src_install() {
+ keepdir /etc/eselect/wine
+
+ insinto /usr/share/eselect/modules
+ newins "${DISTDIR}"/wine.eselect-${PV} wine.eselect
+}
+
+pkg_postinst() {
+ # <eselect-wine-v0.3_rc7 installed symlinks with leading double-slashes.
+ # In /usr/include this breaks gcc build.
+ # https://bugs.gentoo.org/434180
+ if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
+ ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected."
+ ewarn "Re-setting wine symlinks..."
+ eselect wine update --if-unset
+ fi
+}
+
+pkg_prerm() {
+ # Avoid conflicts with wine[-multislot] installed later
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then
+ elog "${PN} is being uninstalled, removing symlinks"
+ eselect wine unset --all || die
+ else
+ einfo "${PN} is being updated/reinstalled, not modifying symlinks"
+ fi
+}
diff --git a/app-eselect/eselect-wine/metadata.xml b/app-eselect/eselect-wine/metadata.xml
new file mode 100644
index 000000000000..1ded1127484f
--- /dev/null
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>NP-Hardass@gentoo.org</email>
+ <name>NP-Hardass</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>gentoo@eroen.eu</email>
+ <name>eroen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">NP-Hardass/eselect-wine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-eselect/eselect-wxwidgets-20140423 b/app-eselect/eselect-wxwidgets-20140423
deleted file mode 100644
index c59a93d5b5ad..000000000000
--- a/app-eselect/eselect-wxwidgets-20140423
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DESCRIPTION=Eselect module and wrappers for wxWidgets
-EAPI=5
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~junghans/dist/eselect-wxwidgets-20140423.tar.xz https://dev.gentoo.org/~mgorny/dist/eselect-wxwidgets-files.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=957da911dfd14a0919b96b55d97fa069
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
new file mode 100644
index 000000000000..ef19d09baadf
--- /dev/null
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -0,0 +1,4 @@
+DIST eselect-wxwidgets-20140423.tar.xz 6792 BLAKE2B ee94e98b9f2473b8e8356ecab483224c027f26a170e02fa8b4e94f18227abb2f1a8f2acd6c5b33dcbf22d4cdadb0421ae487890f9501410559510f3b28ded6c0 SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e
+DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
+EBUILD eselect-wxwidgets-20140423.ebuild 1499 BLAKE2B 67ca1342b5bba824cd21912c888c0c0641b6e8fa333634be6f4b6b9dfd21cddc5a4e83196e6125ef961c20805f7aa51fe3674aec9d110d7188f954f360601aea SHA512 f4c146ecbe27446cfe523aec052b93cf4f05771b188ffa6796013df6a8f62a682919c1c8f51b501d3d9409d768881b6ee700b74365f9dc54733ae3a4b3ac4736
+MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
new file mode 100644
index 000000000000..1dc14bd7a17e
--- /dev/null
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib
+
+WXWRAP_VER=1.4
+
+DESCRIPTION="Eselect module and wrappers for wxWidgets"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="app-admin/eselect"
+
+src_prepare() {
+ cp "${WORKDIR}"/eselect-wxwidgets-files/{wx-config,wxrc}-${WXWRAP_VER} . || die
+ sed \
+ -e "/^LIBDIR=/s:lib:$(get_libdir):" \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ -i {wx-config,wxrc}-${WXWRAP_VER} || die
+}
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ doins wxwidgets.eselect
+
+ insinto /usr/share/aclocal
+ newins "${WORKDIR}"/eselect-wxwidgets-files/wxwin.m4-3.0 wxwin.m4
+
+ newbin wx-config-${WXWRAP_VER} wx-config
+ newbin wxrc-${WXWRAP_VER} wxrc
+
+ keepdir /var/lib/wxwidgets
+ keepdir /usr/share/bakefile/presets
+}
+
+pkg_postinst() {
+ if [[ ! -e ${EROOT}/var/lib/wxwidgets/current ]]; then
+ echo 'WXCONFIG="none"' > "${EROOT}"/var/lib/wxwidgets/current
+ fi
+
+ echo
+ elog "This eselect module only controls the version of wxGTK used when"
+ elog "building packages outside of portage. If you are not doing development"
+ elog "with wxWidgets or bakefile you will never need to use it."
+ echo
+}
diff --git a/app-eselect/eselect-wxwidgets/metadata.xml b/app-eselect/eselect-wxwidgets/metadata.xml
new file mode 100644
index 000000000000..0c7ee856e108
--- /dev/null
+++ b/app-eselect/eselect-wxwidgets/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>wxwidgets@gentoo.org</email>
+ <name>Gentoo wxWidgets Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/eselect-xvmc-0.4 b/app-eselect/eselect-xvmc-0.4
deleted file mode 100644
index 3e05028238e4..000000000000
--- a/app-eselect/eselect-xvmc-0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages XvMC implementations
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-admin/eselect
-SLOT=0
-_md5_=6dc796b466bd9d57676afbb5f3450818
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
new file mode 100644
index 000000000000..eb3f2db1686d
--- /dev/null
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -0,0 +1,3 @@
+AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
+EBUILD eselect-xvmc-0.4.ebuild 551 BLAKE2B 1b389fba3f0dc4c52b77273409d306a6a32e6656b1fccea7a87158d29b230adb2ed88e5ac2ae2a383209fe5cff352575990213c282976142ed6b451db05e2ed2 SHA512 cbad3bc700aadabfd33e54ef7e5755c5deabfebb71a41a4703951c940ee3633ea55416ce78cf3cb02a36c8497ff974492a211d65015f5ed0fa93cef241b63149
+MISC metadata.xml 331 BLAKE2B 94766ef6054386b5218ddab7910b2b9f4fa8904ba9d6738871a4c4fafec2433b42d489c8e156447ad473831fe55af2e75cd6e385305af8c40459ffa8ca1faa9f SHA512 f4c7dc245325bf6b4b37c893183e3dd9c43c9f05046e231f31f7fcfce8ee9e4108c0f4aa231b7d8f0fb4206fdb80186cd54dfe03ea7a037f6a5d4a61cf3b0d0b
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
new file mode 100644
index 000000000000..06c08baaf0d3
--- /dev/null
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Manages XvMC implementations"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect"
+
+S="${FILESDIR}"
+
+src_install() {
+ insinto /usr/share/eselect/modules
+ newins "${FILESDIR}"/${P}.eselect xvmc.eselect
+}
diff --git a/app-eselect/eselect-xvmc/files/eselect-xvmc-0.4.eselect b/app-eselect/eselect-xvmc/files/eselect-xvmc-0.4.eselect
new file mode 100644
index 000000000000..9c06d5ec4e64
--- /dev/null
+++ b/app-eselect/eselect-xvmc/files/eselect-xvmc-0.4.eselect
@@ -0,0 +1,198 @@
+# -*-eselect-*- vim: ft=eselect
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the XvMC implementation used by your system"
+MAINTAINER="{cardoe,junghans}@gentoo.org"
+VERSION="0.4"
+
+init_XVMC_vars() {
+ get_libname() {
+ case ${OSTYPE} in
+ darwin*) echo ${1:+.}${1}.dylib ;;
+ *) echo .so${1:+.}${1} ;;
+ esac
+ }
+
+ XVMCLIBS=(
+ "libXvMCNVIDIA_dynamic$(get_libname 1)"
+ "libXvMC$(get_libname 1)"
+ "libviaXvMC$(get_libname 1)"
+ "libviaXvMCPro$(get_libname 1)"
+ "libchromeXvMC$(get_libname 1)"
+ "libchromeXvMCPro$(get_libname 1)"
+ "libXvMCVIA$(get_libname)"
+ "libXvMCVIAPro$(get_libname)"
+ "libI810XvMC$(get_libname 1)"
+ "/usr/lib/libIntelXvMC$(get_libname)"
+ "libAMDXvBA$(get_libname 1)"
+ )
+
+ XVMCPRETTY=(
+ "nvidia"
+ "xorg-x11"
+ "via"
+ "via-pro"
+ "openchrome"
+ "openchrome-pro"
+ "unichrome"
+ "unichrome-pro"
+ "intel-i810"
+ "intel-i915/i965"
+ "ati"
+ )
+}
+
+get_implementation_indices() {
+ local ret n
+ for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+ [[ -e "${EROOT}/usr/lib/${XVMCLIBS[n]##*/}" ]] && ret+=($n)
+ done
+
+ echo ${ret[@]}
+}
+
+get_current_implementation_index() {
+ local n
+ if [[ -f "${EROOT}/etc/X11/XvMCConfig" ]]; then
+ local current=$(< "${EROOT}/etc/X11/XvMCConfig")
+ for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+ if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
+ echo "${n}"
+ return
+ fi
+ done
+ fi
+
+ echo "-1"
+}
+
+set_new_implementation() {
+ echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
+ touch "${EROOT}/etc/X11/XvMCConfig" 2>&1 > /dev/null
+ if [[ $? -eq 0 ]]; then
+ echo "${XVMCLIBS[$1]}" > "${EROOT}/etc/X11/XvMCConfig"
+ chmod 644 "${EROOT}/etc/X11/XvMCConfig"
+ [[ ${EROOT} == "/" ]] && chown 0:0 "${EROOT}/etc/X11/XvMCConfig"
+ echo " done"
+ else
+ echo " failed!"
+ echo "Insufficient privileges"
+ fi
+}
+
+### list action
+
+## {{{ list stuff
+describe_list() {
+ echo "List Available XvMC implementations"
+}
+
+do_list() {
+ local output n
+ init_XVMC_vars
+ local avail=( $(get_implementation_indices) )
+ local current=$(get_current_implementation_index)
+ write_list_start \
+ "Available XvMC implementations ($(highlight '*') is current):"
+
+ for n in "${avail[@]}"; do
+ output[n]=${XVMCPRETTY[n]}
+ [[ ${current} -eq ${n} ]] \
+ && output[n]=$(highlight_marker "${output[n]}")
+ done
+ write_numbered_list -m "(none found)" "${output[@]}"
+
+ return 0
+}
+## }}}
+
+### show action
+
+## {{{ show stuff
+describe_show() {
+ echo "Print the current XvMC implementation."
+}
+
+do_show() {
+ init_XVMC_vars
+ local current=$(get_current_implementation_index)
+ write_list_start "Current XvMC implementation:"
+
+ if [[ ${current} -ne -1 ]]; then
+ echo "${XVMCPRETTY[current]}"
+ return 0
+ else
+ echo "(none)"
+ return 2
+ fi
+}
+## }}}
+
+### set action
+
+## {{{ set stuff
+describe_set() {
+ echo "Select the XvMC implementation"
+}
+
+describe_set_parameters() {
+ echo "<target>"
+}
+
+describe_set_options() {
+ echo "<target> : XvMC implementation to activate"
+ echo "--use-old : If an implementation is already set, use that one instead"
+}
+
+do_set() {
+ init_XVMC_vars
+ local current=$(get_current_implementation_index)
+ local avail=( $(get_implementation_indices) )
+ local n new action
+
+ while [[ ${#@} -gt 0 ]]; do
+ local opt=${1}
+ shift
+ case ${opt} in
+ --use-old)
+ if [[ ${current} -gt -1 ]]; then
+ (( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation"
+ fi
+ ;;
+ *)
+ [[ -z ${action} ]] && action="set-implementation"
+
+ if is_number ${opt} ; then
+ new=${avail[opt - 1]}
+ if [[ -z ${new} ]]; then
+ die -q "Unrecognized option: ${opt}"
+ fi
+ elif has ${opt} ${XVMCPRETTY[@]}; then
+ for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do
+ [[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n}
+ done
+ else
+ die -q "Unrecognized option: ${opt}"
+ fi
+ ;;
+ esac
+ done
+
+ case ${action} in
+ old-implementation)
+ set_new_implementation ${current}
+ return $?
+ ;;
+ set-implementation)
+ if [[ -n ${new} ]]; then
+ set_new_implementation ${new}
+ return $?
+ else
+ die -q "Please specify an implementation to set"
+ fi
+ ;;
+ *)
+ die -q "Invalid usage of set action."
+ esac
+}
diff --git a/app-eselect/eselect-xvmc/metadata.xml b/app-eselect/eselect-xvmc/metadata.xml
new file mode 100644
index 000000000000..10bc494a7e79
--- /dev/null
+++ b/app-eselect/eselect-xvmc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>junghans@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>cardoe@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-eselect/metadata.xml b/app-eselect/metadata.xml
new file mode 100644
index 000000000000..f2c8283ce7c6
--- /dev/null
+++ b/app-eselect/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-eselect category contains modules for the eselect
+ configuration and administration tool.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-eselect enthält Module für das Konfigurations-
+ und Verwaltungswerkzeug eselect.
+ </longdescription>
+</catmetadata>