summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-04-18 06:22:29 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-04-18 06:22:29 +0000
commitc75a8875cccd65aa74892faf3a46725672ddfe02 (patch)
tree259f18cac59be86e0f27b46425359683f1c17c27 /metadata
parentMerge updates from master (diff)
downloadgentoo-c75a8875cccd65aa74892faf3a46725672ddfe02.tar.gz
gentoo-c75a8875cccd65aa74892faf3a46725672ddfe02.tar.bz2
gentoo-c75a8875cccd65aa74892faf3a46725672ddfe02.zip
2021-04-18 06:22:22 UTC
Diffstat (limited to 'metadata')
-rw-r--r--metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r64
-rw-r--r--metadata/md5-cache/app-admin/ec2-ami-tools-1.5.74
-rw-r--r--metadata/md5-cache/app-admin/gam-server-0.1.10-r24
-rw-r--r--metadata/md5-cache/app-admin/puppet-6.19.16
-rw-r--r--metadata/md5-cache/app-admin/puppet-7.4.06
-rw-r--r--metadata/md5-cache/app-admin/puppet-7.5.06
-rw-r--r--metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r16
-rw-r--r--metadata/md5-cache/app-admin/webalizer-2.23.086
-rw-r--r--metadata/md5-cache/app-arch/zpaq-extras-37
-rw-r--r--metadata/md5-cache/app-backup/backuppc-3.3.1-r56
-rw-r--r--metadata/md5-cache/app-backup/reoback-1.0_p3-r16
-rw-r--r--metadata/md5-cache/app-backup/tsm-8.1.6.0-r16
-rw-r--r--metadata/md5-cache/app-benchmarks/dbench-4.04
-rw-r--r--metadata/md5-cache/app-crypt/rainbowcrack-1.85
-rw-r--r--metadata/md5-cache/app-dicts/wordnet-3.0-r44
-rw-r--r--metadata/md5-cache/app-dicts/wordnet-3.0-r54
-rw-r--r--metadata/md5-cache/app-doc/csound-manual-6.15-r15
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-18.1.036
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-19.2.4.26
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-20.2.56
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-21.2.8-r26
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-22.2.96
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-23.46
-rw-r--r--metadata/md5-cache/app-doc/elisp-manual-24.56
-rw-r--r--metadata/md5-cache/app-doc/psmark-2.16
-rw-r--r--metadata/md5-cache/app-editors/amyedit-1.0-r34
-rw-r--r--metadata/md5-cache/app-editors/elvis-2.2.0-r66
-rw-r--r--metadata/md5-cache/app-editors/hexedit-1.2.134
-rw-r--r--metadata/md5-cache/app-editors/jedit-5.2.0-r16
-rw-r--r--metadata/md5-cache/app-editors/jedit-5.4.06
-rw-r--r--metadata/md5-cache/app-editors/levee-3.5a6
-rw-r--r--metadata/md5-cache/app-editors/nedit-5.6-r16
-rw-r--r--metadata/md5-cache/app-editors/ted-2.236
-rw-r--r--metadata/md5-cache/app-editors/xemacs-21.4.24-r24
-rw-r--r--metadata/md5-cache/app-editors/xemacs-21.5.34-r54
-rw-r--r--metadata/md5-cache/app-emacs/blogmax-201703216
-rw-r--r--metadata/md5-cache/app-emulation/dlx-1.5.207
-rw-r--r--metadata/md5-cache/app-emulation/edumips64-1.26
-rw-r--r--metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p11206
-rw-r--r--metadata/md5-cache/app-forensics/ovaldi-5.10.1.76
-rw-r--r--metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r14
-rw-r--r--metadata/md5-cache/app-i18n/unicode-data-12.0.04
-rw-r--r--metadata/md5-cache/app-i18n/unicode-data-12.1.04
-rw-r--r--metadata/md5-cache/app-laptop/tpb-0.6.4-r16
-rw-r--r--metadata/md5-cache/app-misc/actkbd-0.2.8-r26
-rw-r--r--metadata/md5-cache/app-misc/beanstalkd-1.106
-rw-r--r--metadata/md5-cache/app-misc/beanstalkd-1.116
-rw-r--r--metadata/md5-cache/app-misc/cdargs-1.35-r24
-rw-r--r--metadata/md5-cache/app-misc/ckermit-8.0.211-r46
-rw-r--r--metadata/md5-cache/app-misc/detox-1.2.0-r36
-rw-r--r--metadata/md5-cache/app-misc/fdutils-5.5.200602276
-rw-r--r--metadata/md5-cache/app-misc/fdutils-5.5.20060227-r16
-rw-r--r--metadata/md5-cache/app-misc/gcal-3.6.36
-rw-r--r--metadata/md5-cache/app-misc/gnuit-4.9.5-r26
-rw-r--r--metadata/md5-cache/app-misc/hexcompare-1.0.46
-rw-r--r--metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r16
-rw-r--r--metadata/md5-cache/app-misc/kanatest-0.4.84
-rw-r--r--metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r36
-rw-r--r--metadata/md5-cache/app-misc/mmv-1.01b_p18-r16
-rw-r--r--metadata/md5-cache/app-misc/realpath-1.186
-rw-r--r--metadata/md5-cache/app-misc/rundeck-bin-2.6.86
-rw-r--r--metadata/md5-cache/app-misc/sphinx-2.2.116
-rw-r--r--metadata/md5-cache/app-misc/sphinx-2.2.11-r16
-rw-r--r--metadata/md5-cache/app-misc/sphinx-2.2.11-r26
-rw-r--r--metadata/md5-cache/app-misc/srm-1.2.154
-rw-r--r--metadata/md5-cache/app-misc/tdfsb-0.0.10-r16
-rw-r--r--metadata/md5-cache/app-misc/wcd-5.2.76
-rw-r--r--metadata/md5-cache/app-mobilephone/vmoconv-1.0-r16
-rw-r--r--metadata/md5-cache/app-office/ical-3.0-r24
-rw-r--r--metadata/md5-cache/app-office/projectlibre-bin-1.6.26
-rw-r--r--metadata/md5-cache/app-pda/barry-0.18.36
-rw-r--r--metadata/md5-cache/app-portage/getdelta-0.7.9-r26
-rw-r--r--metadata/md5-cache/app-shells/posh-0.14.13
-rw-r--r--metadata/md5-cache/app-shells/tcsh-6.22.026
-rw-r--r--metadata/md5-cache/app-text/antiword-0.37-r16
-rw-r--r--metadata/md5-cache/app-text/blahtexml-0.96
-rw-r--r--metadata/md5-cache/app-text/bogosort-0.4.2-r16
-rw-r--r--metadata/md5-cache/app-text/chasen-2.4.4-r36
-rw-r--r--metadata/md5-cache/app-text/code2html-0.9.1-r26
-rw-r--r--metadata/md5-cache/app-text/htmltidy-20090325-r26
-rw-r--r--metadata/md5-cache/app-text/languagetool-4.55
-rw-r--r--metadata/md5-cache/app-text/languagetool-4.65
-rw-r--r--metadata/md5-cache/app-text/opensp-1.5.2-r36
-rw-r--r--metadata/md5-cache/app-text/opensp-1.5.2-r66
-rw-r--r--metadata/md5-cache/app-text/paps-0.6.8-r24
-rw-r--r--metadata/md5-cache/app-text/pep-2.8-r24
-rw-r--r--metadata/md5-cache/app-text/refbase-0.9.6_p201802235
-rw-r--r--metadata/md5-cache/app-text/spellutils-0.76
-rw-r--r--metadata/md5-cache/app-text/talkfilters-2.3.8-r16
-rw-r--r--metadata/md5-cache/app-text/tkman-2.2-r16
-rw-r--r--metadata/md5-cache/app-text/ttf2pt1-3.4.4-r16
-rw-r--r--metadata/md5-cache/app-text/vilistextum-2.6.9-r16
-rw-r--r--metadata/md5-cache/app-text/vilistextum-2.8.0.20191023-r16
-rw-r--r--metadata/md5-cache/app-text/vilistextum-2.8.0.202004116
-rw-r--r--metadata/md5-cache/app-text/xlhtml-0.5.1_p64
-rw-r--r--metadata/md5-cache/app-vim/breakpts-4.0-r26
-rw-r--r--metadata/md5-cache/app-vim/colorschemes-20140623-r16
-rw-r--r--metadata/md5-cache/app-vim/taglist-4.66
-rw-r--r--metadata/md5-cache/app-vim/vimpython-1.13-r35
-rw-r--r--metadata/md5-cache/dev-cpp/antlr-cpp-4.7.25
-rw-r--r--metadata/md5-cache/dev-cpp/muParser-2.2.6.16
-rw-r--r--metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r15
-rw-r--r--metadata/md5-cache/dev-cpp/nlohmann_json-3.7.05
-rw-r--r--metadata/md5-cache/dev-cpp/nlohmann_json-3.7.35
-rw-r--r--metadata/md5-cache/dev-cpp/tclap-1.2.24
-rw-r--r--metadata/md5-cache/dev-db/apgdiff-2.48
-rw-r--r--metadata/md5-cache/dev-db/cdb-0.75-r410
-rw-r--r--metadata/md5-cache/dev-db/henplus-0.9.8-r14
-rw-r--r--metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r26
-rw-r--r--metadata/md5-cache/dev-db/libodbc++-0.2.5-r26
-rw-r--r--metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r24
-rw-r--r--metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.14
-rw-r--r--metadata/md5-cache/dev-dotnet/monocalendar-0.7.25
-rw-r--r--metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305-r14
-rw-r--r--metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.04
-rw-r--r--metadata/md5-cache/dev-embedded/pk2cmd-1.206
-rw-r--r--metadata/md5-cache/dev-embedded/sunxi-tools-1.26
-rw-r--r--metadata/md5-cache/dev-embedded/urjtag-0.10-r16
-rw-r--r--metadata/md5-cache/dev-games/flatzebra-0.1.66
-rw-r--r--metadata/md5-cache/dev-games/hdl_dump-0.8.6.200609016
-rw-r--r--metadata/md5-cache/dev-games/higan-ananke-0946
-rw-r--r--metadata/md5-cache/dev-games/mercator-0.3.36
-rw-r--r--metadata/md5-cache/dev-games/ode-0.11.16
-rw-r--r--metadata/md5-cache/dev-games/ode-0.126
-rw-r--r--metadata/md5-cache/dev-games/ode-0.14-r14
-rw-r--r--metadata/md5-cache/dev-games/poker-eval-138.06
-rw-r--r--metadata/md5-cache/dev-games/wfmath-1.0.26
-rw-r--r--metadata/md5-cache/dev-java/antlr-3.26
-rw-r--r--metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r25
-rw-r--r--metadata/md5-cache/dev-java/batik-1.96
-rw-r--r--metadata/md5-cache/dev-java/browserlauncher2-1.3-r16
-rw-r--r--metadata/md5-cache/dev-java/bsf-2.4.0-r24
-rw-r--r--metadata/md5-cache/dev-java/cdi-api-1.26
-rw-r--r--metadata/md5-cache/dev-java/colt-1.2.0-r34
-rw-r--r--metadata/md5-cache/dev-java/commons-collections-3.2.1-r14
-rw-r--r--metadata/md5-cache/dev-java/commons-configuration-1.6-r26
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-1.8.1-r26
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-2.1-r16
-rw-r--r--metadata/md5-cache/dev-java/commons-digester-3.2-r26
-rw-r--r--metadata/md5-cache/dev-java/commons-el-1.0-r36
-rw-r--r--metadata/md5-cache/dev-java/commons-fileupload-1.36
-rw-r--r--metadata/md5-cache/dev-java/commons-net-3.26
-rw-r--r--metadata/md5-cache/dev-java/commons-pool-1.66
-rw-r--r--metadata/md5-cache/dev-java/fop-2.0-r36
-rw-r--r--metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.46
-rw-r--r--metadata/md5-cache/dev-java/gnu-classpath-0.98-r66
-rw-r--r--metadata/md5-cache/dev-java/icedtea-sound-1.0.16
-rw-r--r--metadata/md5-cache/dev-java/ini4j-0.5.26
-rw-r--r--metadata/md5-cache/dev-java/j2ssh-0.2.96
-rw-r--r--metadata/md5-cache/dev-java/jamvm-2.0.0-r16
-rw-r--r--metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r16
-rw-r--r--metadata/md5-cache/dev-java/javolution-4.0.2-r16
-rw-r--r--metadata/md5-cache/dev-java/jcmdline-1.0.2-r26
-rw-r--r--metadata/md5-cache/dev-java/jdbc-mysql-5.1.266
-rw-r--r--metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p12056
-rw-r--r--metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p12066
-rw-r--r--metadata/md5-cache/dev-java/jdom-2.0.6-r46
-rw-r--r--metadata/md5-cache/dev-java/jffi-1.2.96
-rw-r--r--metadata/md5-cache/dev-java/jflex-1.6.16
-rw-r--r--metadata/md5-cache/dev-java/jid3-0.46-r26
-rw-r--r--metadata/md5-cache/dev-java/jinput-2.0.6-r16
-rw-r--r--metadata/md5-cache/dev-java/jisp-2.5.1-r34
-rw-r--r--metadata/md5-cache/dev-java/l2fprod-common-7.3-r26
-rw-r--r--metadata/md5-cache/dev-java/metainf-services-1.66
-rw-r--r--metadata/md5-cache/dev-java/metainf-services-1.76
-rw-r--r--metadata/md5-cache/dev-java/nekohtml-1.9.18-r16
-rw-r--r--metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r14
-rw-r--r--metadata/md5-cache/dev-java/skinlf-6.7-r16
-rw-r--r--metadata/md5-cache/dev-java/spymemcached-2.9.1-r16
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-3.2.1-r16
-rw-r--r--metadata/md5-cache/dev-java/stringtemplate-4.0.86
-rw-r--r--metadata/md5-cache/dev-java/sun-jai-bin-1.1.35
-rw-r--r--metadata/md5-cache/dev-java/swt-3.8.2-r36
-rw-r--r--metadata/md5-cache/dev-java/swt-4.2-r46
-rw-r--r--metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r44
-rw-r--r--metadata/md5-cache/dev-lang/cfortran-4.4-r36
-rw-r--r--metadata/md5-cache/dev-lang/gprolog-1.4.56
-rw-r--r--metadata/md5-cache/dev-lang/lazarus-1.0.126
-rw-r--r--metadata/md5-cache/dev-lang/logtalk-3.36.06
-rw-r--r--metadata/md5-cache/dev-lang/lua-5.1.5-r46
-rw-r--r--metadata/md5-cache/dev-lang/pcc-99998
-rw-r--r--metadata/md5-cache/dev-lang/smlnj-110.826
-rw-r--r--metadata/md5-cache/dev-lang/tcl-8.5.17-r14
-rw-r--r--metadata/md5-cache/dev-libs/OpenNI-1.5.7.106
-rw-r--r--metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r16
-rw-r--r--metadata/md5-cache/dev-libs/OpenNI-99996
-rw-r--r--metadata/md5-cache/dev-libs/OpenNI2-2.2_beta26
-rw-r--r--metadata/md5-cache/dev-libs/OpenNI2-99996
-rw-r--r--metadata/md5-cache/dev-libs/libb64-2.0.0.14
-rw-r--r--metadata/md5-cache/dev-libs/libdbh-5.0.194
-rw-r--r--metadata/md5-cache/dev-libs/libmemcached-1.0.18-r34
-rw-r--r--metadata/md5-cache/dev-libs/libunibreak-4.14
-rw-r--r--metadata/md5-cache/dev-libs/libunibreak-4.24
-rw-r--r--metadata/md5-cache/dev-libs/libunibreak-4.34
-rw-r--r--metadata/md5-cache/dev-libs/libyaml-0.2.25
-rw-r--r--metadata/md5-cache/dev-libs/nmeap-0.3-r17
-rw-r--r--metadata/md5-cache/dev-libs/snowball-stemmer-0.201403256
-rw-r--r--metadata/md5-cache/dev-libs/spsdeclib-5.1-r15
-rw-r--r--metadata/md5-cache/dev-libs/tinyxml-2.6.2-r44
-rw-r--r--metadata/md5-cache/dev-libs/tntnet-2.2.14
-rw-r--r--metadata/md5-cache/dev-lisp/asdf-3.1.56
-rw-r--r--metadata/md5-cache/dev-lisp/gcl-2.6.106
-rw-r--r--metadata/md5-cache/dev-lisp/gcl-2.6.126
-rw-r--r--metadata/md5-cache/dev-lua/lgi-0.9.2-r1006
-rw-r--r--metadata/md5-cache/dev-perl/BerkeleyDB-0.550.04
-rw-r--r--metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r36
-rw-r--r--metadata/md5-cache/dev-perl/PortageXS-0.02.10-r44
-rw-r--r--metadata/md5-cache/dev-perl/PortageXS-0.2.10-r54
-rw-r--r--metadata/md5-cache/dev-perl/PortageXS-0.2.12-r14
-rw-r--r--metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r16
-rw-r--r--metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r36
-rw-r--r--metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r14
-rw-r--r--metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r36
-rw-r--r--metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha16
-rw-r--r--metadata/md5-cache/dev-python/simplegeneric-0.8.1-r15
-rw-r--r--metadata/md5-cache/dev-ruby/asciidoctor-2.0.1212
-rw-r--r--metadata/md5-cache/dev-ruby/haml-5.1.24
-rw-r--r--metadata/md5-cache/dev-ruby/haml-5.1.2-r117
-rw-r--r--metadata/md5-cache/dev-ruby/hpricot-0.8.6-r54
-rw-r--r--metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r24
-rw-r--r--metadata/md5-cache/dev-ruby/rack-ssl-1.4.14
-rw-r--r--metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r24
-rw-r--r--metadata/md5-cache/dev-scheme/guile-1.8.8-r36
-rw-r--r--metadata/md5-cache/dev-scheme/kawa-1.14-r26
-rw-r--r--metadata/md5-cache/dev-scheme/scheme48-1.9.2-r16
-rw-r--r--metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p36
-rw-r--r--metadata/md5-cache/dev-tcltk/blt-2.4z-r134
-rw-r--r--metadata/md5-cache/dev-tcltk/blt-2.4z-r144
-rw-r--r--metadata/md5-cache/dev-tcltk/expect-5.45.44
-rw-r--r--metadata/md5-cache/dev-tcltk/tclx-8.4.16
-rw-r--r--metadata/md5-cache/dev-tcltk/tclx-8.4.43
-rw-r--r--metadata/md5-cache/dev-tcltk/tclxml-3.2-r26
-rw-r--r--metadata/md5-cache/dev-tcltk/tclxml-3.2.72
-rw-r--r--metadata/md5-cache/dev-tcltk/tdom-0.8.3-r44
-rw-r--r--metadata/md5-cache/dev-tcltk/tdom-0.9.14
-rw-r--r--metadata/md5-cache/dev-tcltk/tix-8.4.3-r16
-rw-r--r--metadata/md5-cache/dev-tcltk/tkimg-1.4.116
-rw-r--r--metadata/md5-cache/dev-tcltk/tkimg-1.4.126
-rw-r--r--metadata/md5-cache/dev-tcltk/tkimg-1.4.136
-rw-r--r--metadata/md5-cache/dev-tcltk/tkimg-1.4.96
-rw-r--r--metadata/md5-cache/dev-tex/foiltex-2.1.4b6
-rw-r--r--metadata/md5-cache/dev-tex/sketch-0.3.75
-rw-r--r--metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r16
-rw-r--r--metadata/md5-cache/dev-util/babeltrace-1.2.46
-rw-r--r--metadata/md5-cache/dev-util/ddd-3.3.12-r44
-rw-r--r--metadata/md5-cache/dev-util/debhelper-13.2.15
-rw-r--r--metadata/md5-cache/dev-util/emilpro-3-r44
-rw-r--r--metadata/md5-cache/dev-util/emilpro-99994
-rw-r--r--metadata/md5-cache/dev-util/findbugs-3.0.16
-rw-r--r--metadata/md5-cache/dev-util/its4-1.1.1-r16
-rw-r--r--metadata/md5-cache/dev-util/mutrace-0.2-r16
-rw-r--r--metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r14
-rw-r--r--metadata/md5-cache/dev-util/omake-0.10.26
-rw-r--r--metadata/md5-cache/dev-util/omake-0.10.36
-rw-r--r--metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc16
-rw-r--r--metadata/md5-cache/dev-util/pkgconfig-0.28-r26
-rw-r--r--metadata/md5-cache/dev-util/pkgconfig-0.28-r36
-rw-r--r--metadata/md5-cache/dev-util/premake-4.3-r16
-rw-r--r--metadata/md5-cache/dev-util/rats-2.46
-rw-r--r--metadata/md5-cache/dev-util/regexxer-0.10-r14
-rw-r--r--metadata/md5-cache/dev-util/splint-3.1.2-r24
-rw-r--r--metadata/md5-cache/dev-util/txt2regex-0.8-r36
-rw-r--r--metadata/md5-cache/dev-util/visual-regexp-3.0-r16
-rw-r--r--metadata/md5-cache/dev-util/visual-regexp-3.16
-rw-r--r--metadata/md5-cache/dev-vcs/cvsspam-0.2.126
-rw-r--r--metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r14
-rw-r--r--metadata/md5-cache/dev-vcs/rcs-5.9.36
-rw-r--r--metadata/md5-cache/dev-vcs/rcs-5.9.46
-rw-r--r--metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r38
-rw-r--r--metadata/md5-cache/games-action/trine2-2.01.425-r28
-rw-r--r--metadata/md5-cache/games-board/scid-4.6.2-r16
-rw-r--r--metadata/md5-cache/games-emulation/caps-200711156
-rw-r--r--metadata/md5-cache/games-emulation/emutos-0.9.124
-rw-r--r--metadata/md5-cache/games-engines/residualvm-0.2.1-r16
-rw-r--r--metadata/md5-cache/games-fps/ut2003-demo-2206-r54
-rw-r--r--metadata/md5-cache/games-fps/ut2004-data-3186-r57
-rw-r--r--metadata/md5-cache/games-misc/exult-sound-0-r24
-rw-r--r--metadata/md5-cache/games-puzzle/glightoff-1.0.0-r16
-rw-r--r--metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r1016
-rw-r--r--metadata/md5-cache/games-roguelike/stone-soup-0.26.06
-rw-r--r--metadata/md5-cache/games-roguelike/stone-soup-0.26.16
-rw-r--r--metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r16
-rw-r--r--metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.231218
-rw-r--r--metadata/md5-cache/games-rpg/egoboo-2.8.1-r16
-rw-r--r--metadata/md5-cache/games-server/etqw-ded-1.5-r16
-rw-r--r--metadata/md5-cache/games-simulation/bcs-demo-1.3-r18
-rw-r--r--metadata/md5-cache/gnome-extra/libgda-5.2.96
-rw-r--r--metadata/md5-cache/gnustep-apps/gemas-0.46
-rw-r--r--metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r16
-rw-r--r--metadata/md5-cache/gnustep-libs/pantomime-1.2.24
-rw-r--r--metadata/md5-cache/mail-client/mailx-support-20060102-r26
-rw-r--r--metadata/md5-cache/mail-client/mutt-2.0.4-r16
-rw-r--r--metadata/md5-cache/mail-client/mutt-2.0.56
-rw-r--r--metadata/md5-cache/mail-client/mutt-2.0.66
-rw-r--r--metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r16
-rw-r--r--metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r16
-rw-r--r--metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r16
-rw-r--r--metadata/md5-cache/mail-filter/libspf2-1.2.106
-rw-r--r--metadata/md5-cache/mail-filter/popfile-1.1.3-r16
-rw-r--r--metadata/md5-cache/mail-filter/rblcheck-1.5-r26
-rw-r--r--metadata/md5-cache/mail-filter/spamdyke-4.3.06
-rw-r--r--metadata/md5-cache/mail-filter/spamdyke-5.0.16
-rw-r--r--metadata/md5-cache/media-fonts/fgdc-emergency-2.205
-rw-r--r--metadata/md5-cache/media-fonts/fira-code-45
-rw-r--r--metadata/md5-cache/media-fonts/fira-code-5.25
-rw-r--r--metadata/md5-cache/media-fonts/oldstandard-2.25
-rw-r--r--metadata/md5-cache/media-fonts/pothana2k-2006-r15
-rw-r--r--metadata/md5-cache/media-fonts/roboto-2.1385
-rw-r--r--metadata/md5-cache/media-gfx/fondu-20060102-r16
-rw-r--r--metadata/md5-cache/media-gfx/freewrl-3.0.0-r16
-rw-r--r--metadata/md5-cache/media-gfx/freewrl-99996
-rw-r--r--metadata/md5-cache/media-gfx/gimageview-0.2.27-r46
-rw-r--r--metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r44
-rw-r--r--metadata/md5-cache/media-gfx/png2ico-2002.12.086
-rw-r--r--metadata/md5-cache/media-gfx/pngnq-1.14
-rw-r--r--metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r14
-rw-r--r--metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r16
-rw-r--r--metadata/md5-cache/media-gfx/xsane-0.999-r36
-rw-r--r--metadata/md5-cache/media-gfx/xzgv-0.9.16
-rw-r--r--metadata/md5-cache/media-libs/cal3d-0.11.0-r16
-rw-r--r--metadata/md5-cache/media-libs/flickcurl-1.264
-rw-r--r--metadata/md5-cache/media-libs/freeimage-3.18.0-r15
-rw-r--r--metadata/md5-cache/media-libs/freeimage-3.18.0-r25
-rw-r--r--metadata/md5-cache/media-libs/gmtk-1.0.96
-rw-r--r--metadata/md5-cache/media-libs/libcaca-0.99_beta19-r14
-rw-r--r--metadata/md5-cache/media-libs/libmpeg3-1.8-r14
-rw-r--r--metadata/md5-cache/media-libs/libpano13-2.9.194
-rw-r--r--metadata/md5-cache/media-libs/libsdl-1.2.15-r94
-rw-r--r--metadata/md5-cache/media-libs/opencollada-1.6.684
-rw-r--r--metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r24
-rw-r--r--metadata/md5-cache/media-libs/pnglite-0.1.176
-rw-r--r--metadata/md5-cache/media-libs/quesoglc-0.7.26
-rw-r--r--metadata/md5-cache/media-libs/sbc-1.54
-rw-r--r--metadata/md5-cache/media-libs/sdl-image-1.2.12-r26
-rw-r--r--metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r16
-rw-r--r--metadata/md5-cache/media-libs/smpeg-0.4.4-r104
-rw-r--r--metadata/md5-cache/media-libs/smpeg2-2.0.0-r34
-rw-r--r--metadata/md5-cache/media-libs/zvbi-0.2.35-r16
-rw-r--r--metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r16
-rw-r--r--metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r16
-rw-r--r--metadata/md5-cache/media-radio/direwolf-1.46
-rw-r--r--metadata/md5-cache/media-sound/abcmidi-2020.06.075
-rw-r--r--metadata/md5-cache/media-sound/cdcd-0.6.6-r24
-rw-r--r--metadata/md5-cache/media-sound/din-506
-rw-r--r--metadata/md5-cache/media-sound/din-50.16
-rw-r--r--metadata/md5-cache/media-sound/gigedit-1.1.1-r16
-rw-r--r--metadata/md5-cache/media-sound/gigedit-99996
-rw-r--r--metadata/md5-cache/media-sound/gnump3d-3.0-r28
-rw-r--r--metadata/md5-cache/media-sound/mp3val-0.1.86
-rw-r--r--metadata/md5-cache/media-sound/music-file-organizer-1.0.37
-rw-r--r--metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r26
-rw-r--r--metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r16
-rw-r--r--metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r86
-rw-r--r--metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r26
-rw-r--r--metadata/md5-cache/media-tv/dvbtune-0.5-r16
-rw-r--r--metadata/md5-cache/media-tv/gtk-v4l-0.46
-rw-r--r--metadata/md5-cache/media-video/bbtools-1.96
-rw-r--r--metadata/md5-cache/media-video/dvbsnoop-1.4.50-r16
-rw-r--r--metadata/md5-cache/media-video/dvdrip-0.98.11-r46
-rw-r--r--metadata/md5-cache/media-video/isight-firmware-tools-1.6-r16
-rw-r--r--metadata/md5-cache/media-video/lsdvd-0.174
-rw-r--r--metadata/md5-cache/media-video/lxdvdrip-1.776
-rw-r--r--metadata/md5-cache/media-video/mpeg-tools-1.5b-r56
-rw-r--r--metadata/md5-cache/media-video/mpgtx-1.3.1-r26
-rw-r--r--metadata/md5-cache/media-video/mplayer-sh-0.8.6-r26
-rw-r--r--metadata/md5-cache/media-video/mplayer-sh-0.8.76
-rw-r--r--metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160217-r16
-rw-r--r--metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r26
-rw-r--r--metadata/md5-cache/media-video/raspberrypi-omxplayer-99996
-rw-r--r--metadata/md5-cache/media-video/snappy-1.0-r14
-rw-r--r--metadata/md5-cache/media-video/vstrip-0.8f7
-rw-r--r--metadata/md5-cache/media-video/xvattr-1.3-r36
-rw-r--r--metadata/md5-cache/net-analyzer/openbsd-netcat-1.1907
-rw-r--r--metadata/md5-cache/net-analyzer/openbsd-netcat-1.1957
-rw-r--r--metadata/md5-cache/net-irc/cgiirc-0.5.106
-rw-r--r--metadata/md5-cache/net-libs/axtls-2.1.5-r1004
-rw-r--r--metadata/md5-cache/net-libs/libnetfilter_acct-1.0.26
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.31-r24
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.31.24
-rw-r--r--metadata/md5-cache/net-mail/notmuch-0.31.34
-rw-r--r--metadata/md5-cache/net-misc/ena-driver-2.0.3-r15
-rw-r--r--metadata/md5-cache/net-misc/ena-driver-2.2.3-r15
-rw-r--r--metadata/md5-cache/net-misc/npapi-sdk-0.27.24
-rw-r--r--metadata/md5-cache/net-misc/npapi-sdk-99995
-rw-r--r--metadata/md5-cache/net-misc/teamviewer-15.15.54
-rw-r--r--metadata/md5-cache/net-p2p/freenet-0.7.5_p14846
-rw-r--r--metadata/md5-cache/net-p2p/freenet-0.7.5_p14866
-rw-r--r--metadata/md5-cache/net-p2p/freenet-0.7.5_p14886
-rw-r--r--metadata/md5-cache/net-p2p/retroshare-0.6.5-r25
-rw-r--r--metadata/md5-cache/net-print/libinklevel-0.9.24
-rw-r--r--metadata/md5-cache/net-vpn/badvpn-1.999.1276
-rw-r--r--metadata/md5-cache/net-vpn/badvpn-1.999.1296
-rw-r--r--metadata/md5-cache/net-vpn/badvpn-1.999.1306
-rw-r--r--metadata/md5-cache/net-wireless/unifi-6.0.455
-rw-r--r--metadata/md5-cache/net-wireless/unifi-6.1.715
-rw-r--r--metadata/md5-cache/net-wireless/unifi-6.2.175
-rw-r--r--metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.06
-rw-r--r--metadata/md5-cache/perl-core/libnet-1.270.04
-rw-r--r--metadata/md5-cache/sci-astronomy/xephem-3.7.76
-rw-r--r--metadata/md5-cache/sci-biology/fasta-36.3.5e6
-rw-r--r--metadata/md5-cache/sci-biology/mrbayes-3.1.2-r26
-rw-r--r--metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r26
-rw-r--r--metadata/md5-cache/sci-biology/plink-1.90_pre1405146
-rw-r--r--metadata/md5-cache/sci-biology/psipred-3.56
-rw-r--r--metadata/md5-cache/sci-biology/rmblast-1.2-r16
-rw-r--r--metadata/md5-cache/sci-biology/velvet-1.2.106
-rw-r--r--metadata/md5-cache/sci-biology/wise-2.4.0_alpha6
-rw-r--r--metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r16
-rw-r--r--metadata/md5-cache/sci-chemistry/easychem-0.6-r16
-rw-r--r--metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r112
-rw-r--r--metadata/md5-cache/sci-chemistry/molscript-2.1.2-r26
-rw-r--r--metadata/md5-cache/sci-chemistry/mustang-3.2.26
-rw-r--r--metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.206
-rw-r--r--metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r26
-rw-r--r--metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r24
-rw-r--r--metadata/md5-cache/sci-electronics/gsmc-1.1-r24
-rw-r--r--metadata/md5-cache/sci-electronics/gspeakers-0.11-r24
-rw-r--r--metadata/md5-cache/sci-electronics/irsim-9.7.936
-rw-r--r--metadata/md5-cache/sci-electronics/magic-7.5.202-r16
-rw-r--r--metadata/md5-cache/sci-electronics/magic-8.0.2076
-rw-r--r--metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r26
-rw-r--r--metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r36
-rw-r--r--metadata/md5-cache/sci-electronics/spice-3.5.5-r26
-rw-r--r--metadata/md5-cache/sci-electronics/splat-1.4.26
-rw-r--r--metadata/md5-cache/sci-geosciences/bt747-2.1.7-r26
-rw-r--r--metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.97
-rw-r--r--metadata/md5-cache/sci-geosciences/swmm-5.0.0226
-rw-r--r--metadata/md5-cache/sci-libs/cbflib-0.9.3.34
-rw-r--r--metadata/md5-cache/sci-libs/cdd+-077a6
-rw-r--r--metadata/md5-cache/sci-libs/cdf-3.5.0.26
-rw-r--r--metadata/md5-cache/sci-libs/cgcode-1.0-r26
-rw-r--r--metadata/md5-cache/sci-libs/djbfft-0.76-r26
-rw-r--r--metadata/md5-cache/sci-libs/gsl-1.166
-rw-r--r--metadata/md5-cache/sci-libs/inchi-1.046
-rw-r--r--metadata/md5-cache/sci-libs/libbufr-0004056
-rw-r--r--metadata/md5-cache/sci-libs/libnova-0.16.05
-rw-r--r--metadata/md5-cache/sci-libs/qrupdate-1.1.2-r16
-rw-r--r--metadata/md5-cache/sci-libs/scotch-6.0.4-r26
-rw-r--r--metadata/md5-cache/sci-libs/silo-4.10.2-r16
-rw-r--r--metadata/md5-cache/sci-libs/superlu-4.3-r22
-rw-r--r--metadata/md5-cache/sci-mathematics/ent-1012026
-rw-r--r--metadata/md5-cache/sci-mathematics/gmp-ecm-99994
-rw-r--r--metadata/md5-cache/sci-mathematics/gretl-1.9.906
-rw-r--r--metadata/md5-cache/sci-mathematics/singular-4.0.26
-rw-r--r--metadata/md5-cache/sci-mathematics/spin-6.4.56
-rw-r--r--metadata/md5-cache/sci-mathematics/twelf-1.7.1-r16
-rw-r--r--metadata/md5-cache/sci-mathematics/yafu-99994
-rw-r--r--metadata/md5-cache/sci-misc/ViSP-images-3.3.04
-rw-r--r--metadata/md5-cache/sci-visualization/epix-1.2.11-r34
-rw-r--r--metadata/md5-cache/sci-visualization/ggobi-2.1.116
-rw-r--r--metadata/md5-cache/sci-visualization/gri-2.12.23-r16
-rw-r--r--metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r16
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-106
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-6-r16
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-86
-rw-r--r--metadata/md5-cache/sys-apps/darwin-miscutils-96
-rw-r--r--metadata/md5-cache/sys-apps/edac-utils-0.186
-rw-r--r--metadata/md5-cache/sys-apps/epoch-1.2.16
-rw-r--r--metadata/md5-cache/sys-apps/epoch-1.2.26
-rw-r--r--metadata/md5-cache/sys-apps/epoch-1.3.06
-rw-r--r--metadata/md5-cache/sys-apps/epoch-99996
-rw-r--r--metadata/md5-cache/sys-apps/fxload-20081013-r16
-rw-r--r--metadata/md5-cache/sys-apps/input-utils-1.26
-rw-r--r--metadata/md5-cache/sys-apps/input-utils-1.32
-rw-r--r--metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.105
-rw-r--r--metadata/md5-cache/sys-apps/lmctfy-0.5.0-r14
-rw-r--r--metadata/md5-cache/sys-apps/lnxhc-1.2-r16
-rw-r--r--metadata/md5-cache/sys-apps/lshw-02.18b6
-rw-r--r--metadata/md5-cache/sys-apps/lshw-02.18b-r16
-rw-r--r--metadata/md5-cache/sys-apps/most-5.0.0a-r16
-rw-r--r--metadata/md5-cache/sys-apps/paxctl-0.96
-rw-r--r--metadata/md5-cache/sys-apps/pick-4.0.012
-rw-r--r--metadata/md5-cache/sys-apps/prctl-1.6-r14
-rw-r--r--metadata/md5-cache/sys-apps/s6-2.1.3.03
-rw-r--r--metadata/md5-cache/sys-apps/spu-tools-2.3.0.1366
-rw-r--r--metadata/md5-cache/sys-apps/superdiag-1.4.0.202011204
-rw-r--r--metadata/md5-cache/sys-apps/timer_entropyd-0.36
-rw-r--r--metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p201302146
-rw-r--r--metadata/md5-cache/sys-apps/usb_modeswitch-2.5.26
-rw-r--r--metadata/md5-cache/sys-apps/usbmon-6-r16
-rw-r--r--metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r18
-rw-r--r--metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.18
-rw-r--r--metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.08
-rw-r--r--metadata/md5-cache/sys-apps/zorroutils-0.056
-rw-r--r--metadata/md5-cache/sys-auth/nss_ldap-265-r56
-rw-r--r--metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.06
-rw-r--r--metadata/md5-cache/sys-block/arcconf-2.01.22270-r14
-rw-r--r--metadata/md5-cache/sys-block/blktrace-1.1.06
-rw-r--r--metadata/md5-cache/sys-block/raid-check-20140719-r16
-rw-r--r--metadata/md5-cache/sys-block/scsirastools-1.5.74
-rw-r--r--metadata/md5-cache/sys-block/scsirastools-1.6.44
-rw-r--r--metadata/md5-cache/sys-boot/colo-1.226
-rw-r--r--metadata/md5-cache/sys-cluster/charm-6.8.26
-rw-r--r--metadata/md5-cache/sys-cluster/ipvsadm-1.27-r16
-rw-r--r--metadata/md5-cache/sys-cluster/ipvsadm-1.28-r16
-rw-r--r--metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r26
-rw-r--r--metadata/md5-cache/sys-cluster/torque-4.1.7-r16
-rw-r--r--metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r16
-rw-r--r--metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.96
-rw-r--r--metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.26
-rw-r--r--metadata/md5-cache/sys-devel/bin86-0.16.20-r26
-rw-r--r--metadata/md5-cache/sys-devel/bin86-0.16.216
-rw-r--r--metadata/md5-cache/sys-devel/crossdev-202011294
-rw-r--r--metadata/md5-cache/sys-devel/crossdev-999999995
-rw-r--r--metadata/md5-cache/sys-fabric/libibverbs-1.1.74
-rw-r--r--metadata/md5-cache/sys-fabric/librdmacm-1.0.184
-rw-r--r--metadata/md5-cache/sys-fabric/opensm-3.3.17-r14
-rw-r--r--metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.46
-rw-r--r--metadata/md5-cache/sys-fs/libeatmydata-105-r23
-rw-r--r--metadata/md5-cache/sys-kernel/mips-sources-4.14.2276
-rw-r--r--metadata/md5-cache/sys-kernel/mips-sources-4.19.1836
-rw-r--r--metadata/md5-cache/sys-kernel/mips-sources-5.4.1086
-rw-r--r--metadata/md5-cache/sys-libs/csu-85-r13
-rw-r--r--metadata/md5-cache/sys-libs/efivar-376
-rw-r--r--metadata/md5-cache/sys-libs/freeipmi-1.5.74
-rw-r--r--metadata/md5-cache/sys-libs/libaal-1.0.7-r13
-rw-r--r--metadata/md5-cache/sys-libs/libaal-1.0.7-r23
-rw-r--r--metadata/md5-cache/sys-libs/libhx-3.24-r15
-rw-r--r--metadata/md5-cache/sys-libs/libhx-3.255
-rw-r--r--metadata/md5-cache/sys-libs/libselinux-3.1-r16
-rw-r--r--metadata/md5-cache/sys-libs/libselinux-3.26
-rw-r--r--metadata/md5-cache/sys-libs/libselinux-99996
-rw-r--r--metadata/md5-cache/sys-libs/libsemanage-3.1-r16
-rw-r--r--metadata/md5-cache/sys-libs/libsemanage-3.26
-rw-r--r--metadata/md5-cache/sys-libs/libsemanage-99996
-rw-r--r--metadata/md5-cache/sys-libs/libsepol-3.16
-rw-r--r--metadata/md5-cache/sys-libs/libsepol-3.26
-rw-r--r--metadata/md5-cache/sys-libs/libsepol-99996
-rw-r--r--metadata/md5-cache/sys-libs/libstatgrab-0.915
-rw-r--r--metadata/md5-cache/sys-libs/libstatgrab-0.925
-rw-r--r--metadata/md5-cache/sys-libs/talloc-2.3.14
-rw-r--r--metadata/md5-cache/sys-libs/talloc-2.3.24
-rw-r--r--metadata/md5-cache/sys-power/acpitool-0.5.1-r16
-rw-r--r--metadata/md5-cache/sys-power/pmtools-20110323-r16
-rw-r--r--metadata/md5-cache/sys-power/powernowd-1.00-r46
-rw-r--r--metadata/md5-cache/sys-process/top-apple-736
-rw-r--r--metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r26
-rw-r--r--metadata/md5-cache/www-apache/mod_auth_radius-1.5.86
-rw-r--r--metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r16
-rw-r--r--metadata/md5-cache/www-apache/mod_authnz_external-3.3.26
-rw-r--r--metadata/md5-cache/www-apache/mod_bw-0.9.2-r16
-rw-r--r--metadata/md5-cache/www-apache/mod_caucho-4.0.476
-rw-r--r--metadata/md5-cache/www-apache/mod_dnssd-0.6-r16
-rw-r--r--metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r16
-rw-r--r--metadata/md5-cache/www-apache/mod_log_sql-1.101-r26
-rw-r--r--metadata/md5-cache/www-apache/mod_rpaf-0.6-r16
-rw-r--r--metadata/md5-cache/www-apps/cvsweb-3.0.6-r16
-rw-r--r--metadata/md5-cache/www-apps/dotproject-2.1.7-r16
-rw-r--r--metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.75
-rw-r--r--metadata/md5-cache/www-client/jd-2.8.5_p1208264
-rw-r--r--metadata/md5-cache/www-client/jd-2.8.9_p1502264
-rw-r--r--metadata/md5-cache/www-client/netrik-1.16.1-r14
-rw-r--r--metadata/md5-cache/www-misc/litmus-0.134
-rw-r--r--metadata/md5-cache/www-plugins/pdfjs-2.4.4564
-rw-r--r--metadata/md5-cache/www-plugins/pdfjs-2.5.2074
-rw-r--r--metadata/md5-cache/www-servers/monkeyd-1.6.9-r16
-rw-r--r--metadata/md5-cache/www-servers/monkeyd-99996
-rw-r--r--metadata/md5-cache/www-servers/resin-4.0.48-r14
-rw-r--r--metadata/md5-cache/x11-libs/goocanvas-1.0.06
-rw-r--r--metadata/md5-cache/x11-libs/mx-1.4.7-r24
-rw-r--r--metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p16
-rw-r--r--metadata/md5-cache/x11-misc/3dfb-0.6.1-r16
-rw-r--r--metadata/md5-cache/x11-misc/dmenu-4.66
-rw-r--r--metadata/md5-cache/x11-misc/grun-0.9.3-r16
-rw-r--r--metadata/md5-cache/x11-misc/kbdd-0.7.14
-rw-r--r--metadata/md5-cache/x11-misc/openbox-menu-0.8.06
-rw-r--r--metadata/md5-cache/x11-misc/slim-1.3.6-r54
-rw-r--r--metadata/md5-cache/x11-misc/whaw-0.26
-rw-r--r--metadata/md5-cache/x11-misc/xcape-1.16
-rw-r--r--metadata/md5-cache/x11-misc/xdock-0.3.04
-rw-r--r--metadata/md5-cache/x11-misc/xrestop-0.44
-rw-r--r--metadata/md5-cache/x11-misc/xssstate-1.16
-rw-r--r--metadata/md5-cache/x11-plugins/asapm-3.1-r14
-rw-r--r--metadata/md5-cache/x11-plugins/docker-1.5-r16
-rw-r--r--metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.34
-rw-r--r--metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r16
-rw-r--r--metadata/md5-cache/x11-plugins/wmmand-1.3.2-r16
-rw-r--r--metadata/md5-cache/x11-themes/gartoon-redux-1.10-r16
-rw-r--r--metadata/md5-cache/x11-themes/gnustep-neos-theme-0.14
-rw-r--r--metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r24
-rw-r--r--metadata/md5-cache/x11-themes/light-themes-20.10-r24
-rw-r--r--metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r44
-rw-r--r--metadata/pkg_desc_index6
-rw-r--r--metadata/timestamp.chk2
584 files changed, 1622 insertions, 1603 deletions
diff --git a/metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6 b/metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
index d113f0cb0f77..ed5a8a77b5da 100644
--- a/metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
+++ b/metadata/md5-cache/app-accessibility/mbrola-3.0.1h-r6
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Speech synthesizer based on the concatenation of diphones. Includes samples
EAPI=7
HOMEPAGE=http://tcts.fpms.ac.be/synthesis/mbrola.html
@@ -9,4 +9,4 @@ LICENSE=MBROLA
RESTRICT=strip
SLOT=0
SRC_URI=http://tcts.fpms.ac.be/synthesis/mbrola/bin/pclinux/mbr301h.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us1/us1-980512.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us1/us2-980812.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/us3/us3-990208.zip l10n_de? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/de1/de1-980227.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de2/de2-990106.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de3/de3-000307.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de4/de4.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de5/de5.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/de8/de8.zip ) l10n_es? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/es1/es1-980610.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/es2/es2-989825.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/es4/es4.zip ) l10n_fr? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr1/fr1-990204.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr2/fr2-980806.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr3/fr3-990324.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/fr6/fr6-010330.zip ) l10n_it? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/it3/it3-010304.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/it4/it4-010926.zip ) l10n_la? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/la1/la1.zip ) l10n_pl? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/pl1/pl1.zip ) l10n_ro? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/ro1/ro1-980317.zip ) l10n_sv? ( http://tcts.fpms.ac.be/synthesis/mbrola/dba/sw1/sw1-980623.zip http://tcts.fpms.ac.be/synthesis/mbrola/dba/sw2/sw2-140102.zip )
-_md5_=4212b32f5c0052771c54747d7d5cfa9a
+_md5_=5e8e71a371615fa188a59eb551a8eb96
diff --git a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7 b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
index 026630e30735..880d2a06aa95 100644
--- a/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
+++ b/metadata/md5-cache/app-admin/ec2-ami-tools-1.5.7
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst prepare
-DEPEND=app-arch/unzip
DESCRIPTION=Command-line tools that serve as client interface to the Amazon EC2 web service
EAPI=7
HOMEPAGE=https://aws.amazon.com/en/tools/
@@ -10,4 +10,4 @@ RDEPEND=|| ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) virtual/rubygems virtual/ruby
SLOT=0
SRC_URI=http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools-1.5.7.zip
_eclasses_=ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-single dd06178c43afcd54225a7d0fca6342a8
-_md5_=71167792e10af8cb0fc30d385264462a
+_md5_=183a2eeef06b7df1780b7cfde49c7ab7
diff --git a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2 b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
index 601b2cc034ec..d0b1d2d19b4c 100644
--- a/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
+++ b/metadata/md5-cache/app-admin/gam-server-0.1.10-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin
DESCRIPTION=Library providing the FAM File Alteration Monitor API
EAPI=5
HOMEPAGE=https://www.gnome.org/~veillard/gamin/
-INHERIT=autotools eutils flag-o-matic libtool multilib gnome.org
+INHERIT=autotools epatch flag-o-matic multilib gnome.org
IUSE=debug kernel_linux
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x86-solaris
LICENSE=LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admi
SLOT=0
SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3
-_md5_=b71f20fff7dbdc37a4df8ba1731f0ec7
+_md5_=1beeb887a3658fae0dab57d83c42e4f8
diff --git a/metadata/md5-cache/app-admin/puppet-6.19.1 b/metadata/md5-cache/app-admin/puppet-6.19.1
index b302725c86c5..46eb4903aa61 100644
--- a/metadata/md5-cache/app-admin/puppet-6.19.1
+++ b/metadata/md5-cache/app-admin/puppet-6.19.1
@@ -3,7 +3,7 @@ DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=https://puppet.com/
-INHERIT=eutils ruby-fakegem eapi7-ver
+INHERIT=epatch ruby-fakegem
IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
LICENSE=Apache-2.0 GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.19.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e eapi7-ver f9ec87e93172b25ce65a85303dc06964
-_md5_=5b4ab026ca1101e238be6e8e15daf799
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
+_md5_=7d98379afdf6a8e637434669911efbe3
diff --git a/metadata/md5-cache/app-admin/puppet-7.4.0 b/metadata/md5-cache/app-admin/puppet-7.4.0
index 551326e4d0fa..83188be7fa47 100644
--- a/metadata/md5-cache/app-admin/puppet-7.4.0
+++ b/metadata/md5-cache/app-admin/puppet-7.4.0
@@ -3,7 +3,7 @@ DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=https://puppet.com/
-INHERIT=eutils ruby-fakegem eapi7-ver
+INHERIT=epatch ruby-fakegem
IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
LICENSE=Apache-2.0 GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.4.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e eapi7-ver f9ec87e93172b25ce65a85303dc06964
-_md5_=a91a0cec166bf50aa9695145e94df7a2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
+_md5_=b961238463006b50b78eeb9ca6b93db1
diff --git a/metadata/md5-cache/app-admin/puppet-7.5.0 b/metadata/md5-cache/app-admin/puppet-7.5.0
index 6883b1511ef3..4f044133f223 100644
--- a/metadata/md5-cache/app-admin/puppet-7.5.0
+++ b/metadata/md5-cache/app-admin/puppet-7.5.0
@@ -3,7 +3,7 @@ DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/hiera[ruby_targets_ruby25(-)] dev
DESCRIPTION=A system automation and configuration management software.
EAPI=6
HOMEPAGE=https://puppet.com/
-INHERIT=eutils ruby-fakegem eapi7-ver
+INHERIT=epatch ruby-fakegem
IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
LICENSE=Apache-2.0 GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.5.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e eapi7-ver f9ec87e93172b25ce65a85303dc06964
-_md5_=d8eb39ba544a2bdfeee9c5cc75266ce0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
+_md5_=6dcdc347bd336531ee69364668ca680d
diff --git a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1 b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1
index 5522b4437314..f014a780efb3 100644
--- a/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1
+++ b/metadata/md5-cache/app-admin/system-tools-backends-2.10.2-r1
@@ -3,11 +3,11 @@ DEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/db
DESCRIPTION=Tools aimed to make easy the administration of UNIX systems
EAPI=5
HOMEPAGE=https://projects.gnome.org/gst/
-INHERIT=eutils gnome2 readme.gentoo user
+INHERIT=epatch gnome2 readme.gentoo user
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=!<app-admin/gnome-system-tools-1.1.91 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.15.2:2 >=dev-perl/Net-DBus-0.33.4 dev-lang/perl >=sys-auth/polkit-0.94 userland_GNU? ( sys-apps/shadow )
SLOT=0
SRC_URI=mirror://gnome/sources/system-tools-backends/2.10/system-tools-backends-2.10.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 readme.gentoo a97aee298f128902ba03cf0ff69f9446 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=018263c474f45bce1b337cdd0c7d25d5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 readme.gentoo a97aee298f128902ba03cf0ff69f9446 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=73ce348d04730bfefc992cb25fbae0a7
diff --git a/metadata/md5-cache/app-admin/webalizer-2.23.08 b/metadata/md5-cache/app-admin/webalizer-2.23.08
index d7d4822d5ab6..f1404302e4c8 100644
--- a/metadata/md5-cache/app-admin/webalizer-2.23.08
+++ b/metadata/md5-cache/app-admin/webalizer-2.23.08
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/db-4.2:* >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2:0= >=me
DESCRIPTION=Webserver log file analyzer
EAPI=5
HOMEPAGE=http://www.webalizer.org/
-INHERIT=versionator eutils webapp db-use
+INHERIT=versionator epatch webapp db-use
IUSE=bzip2 xtended geoip nls vhosts
KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/db-4.2:* >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2:0= >=media-libs/gd-1.8.3[png] dev-libs/geoip bzip2? ( app-arch/bzip2 ) >=app-admin/webapp-config-1.50.15
SLOT=0
SRC_URI=ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-08-src.tar.bz2 xtended? ( http://patrickfrei.ch/webalizer/rb30/webalizer-2.23-08-RB30-patch.tar.gz ) https://dev.gentoo.org/~blueness/webalizer/webalizer.conf.gz ftp://ftp.mrunix.net/pub/webalizer/geodb//webalizer-geodb-20140201.tgz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e webapp 990ad6a000cf18d1ef87117e8c7b0a54 eapi7-ver f9ec87e93172b25ce65a85303dc06964 db-use 063d3e7add942762a8203b52ec3066c2
-_md5_=066658ef6ca694cf29b12255fd0b3ad8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d epatch 9f813bb3c47cf2e60619a663b87c5f4e webapp 990ad6a000cf18d1ef87117e8c7b0a54 eapi7-ver f9ec87e93172b25ce65a85303dc06964 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 db-use 063d3e7add942762a8203b52ec3066c2
+_md5_=e2acfc2858fe35b76e66820b9477c2d5
diff --git a/metadata/md5-cache/app-arch/zpaq-extras-3 b/metadata/md5-cache/app-arch/zpaq-extras-3
index b5174cc7d2cb..21abf568543f 100644
--- a/metadata/md5-cache/app-arch/zpaq-extras-3
+++ b/metadata/md5-cache/app-arch/zpaq-extras-3
@@ -1,12 +1,13 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile configure install unpack
-DEPEND=app-arch/unzip
DESCRIPTION=A set of additional compression profiles for app-arch/zpaq
EAPI=7
HOMEPAGE=http://mattmahoney.net/dc/zpaq.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=>=app-arch/zpaq-6.19
SLOT=0
SRC_URI=http://mattmahoney.net/dc/bwt_j3.zip http://mattmahoney.net/dc/bwt_slowmode1.zip http://mattmahoney.net/dc/exe_j1.zip http://mattmahoney.net/dc/jpg_test2.zip http://mattmahoney.net/dc/min.zip http://mattmahoney.net/dc/fast.cfg -> zpaq-fast.cfg http://mattmahoney.net/dc/mid.cfg -> zpaq-mid.cfg http://mattmahoney.net/dc/max.cfg -> zpaq-max.cfg http://mattmahoney.net/dc/bmp_j4c.zip http://mattmahoney.net/dc/lz1.zip http://mattmahoney.net/dc/lazy100.zip http://mattmahoney.net/dc/lazy210.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=67fbf012096c71cb5736a797659fc3a9
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=15877b2e21b1c6c504e7df7b3f1768a8
diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
index 9c209dd18f28..1f638d170583 100644
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
+++ b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
@@ -3,12 +3,12 @@ DEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd =www-servers/ap
DESCRIPTION=High-performance backups to a server's disk
EAPI=5
HOMEPAGE=http://backuppc.sourceforge.net/
-INHERIT=depend.apache eutils user systemd
+INHERIT=depend.apache epatch user systemd
IUSE=rss samba
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
SLOT=0
SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=d8f94c6786f934899e2da3a3a53d97fa
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=0227817508357a7980dccda71add9de7
diff --git a/metadata/md5-cache/app-backup/reoback-1.0_p3-r1 b/metadata/md5-cache/app-backup/reoback-1.0_p3-r1
index 54fc376ff68d..6ac0f4cd5f98 100644
--- a/metadata/md5-cache/app-backup/reoback-1.0_p3-r1
+++ b/metadata/md5-cache/app-backup/reoback-1.0_p3-r1
@@ -3,11 +3,11 @@ DEPEND=>=app-arch/tar-1.13
DESCRIPTION=Reoback Backup Solution
EAPI=5
HOMEPAGE=http://reoback.sourceforge.net/
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/perl-5.6.1
SLOT=0
SRC_URI=mirror://sourceforge/reoback/reoback-1.0_r3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a65e0eea5a4b34f9e7959bebe0db3738
+_eclasses_=vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b438fe89c942f8d750f1a90076cd0c00
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1 b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
index a77595717aad..ccd1a0f1e58b 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0-r1
@@ -3,7 +3,7 @@ DEPEND=acct-group/tsm >=app-arch/rpm2targz-9.0.0.3g virtual/pkgconfig
DESCRIPTION=IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API
EAPI=6
HOMEPAGE=https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
-INHERIT=versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
+INHERIT=versionator readme.gentoo-r1 rpm systemd pax-utils
IUSE=acl java +tsm-cit +tsm-hw
KEYWORDS=-* amd64
LICENSE=Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C || ( BSD GPL-2+ ) gSOAP libpng tsm
@@ -11,5 +11,5 @@ RDEPEND=acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-
RESTRICT=strip
SLOT=0
SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 rpm 760ff223c2c4299b68ea901e24c4cabd systemd fdf0d765c3f11f91fe54f8def9a8c0e6 pax-utils d3fc79d3d50544347e324864f95206e2
-_md5_=b9dc6c9c2c4a658e5fc213d02ca6e34d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd systemd fdf0d765c3f11f91fe54f8def9a8c0e6 pax-utils d3fc79d3d50544347e324864f95206e2
+_md5_=ec4089e2c21f55df6caaf5c65119802a
diff --git a/metadata/md5-cache/app-benchmarks/dbench-4.0 b/metadata/md5-cache/app-benchmarks/dbench-4.0
index 7f3c5d848136..775196d6b9cf 100644
--- a/metadata/md5-cache/app-benchmarks/dbench-4.0
+++ b/metadata/md5-cache/app-benchmarks/dbench-4.0
@@ -3,11 +3,11 @@ DEPEND=dev-libs/popt sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || (
DESCRIPTION=Popular filesystem benchmark
EAPI=5
HOMEPAGE=https://www.samba.org/ftp/tridge/dbench/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=autotools toolchain-funcs
KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=dev-libs/popt
SLOT=0
SRC_URI=https://www.samba.org/ftp/pub/tridge/dbench/dbench-4.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=039cb8a812d1bb145886d4ff4511378c
+_md5_=f6691e2e4445aba2f5de34201cbec12d
diff --git a/metadata/md5-cache/app-crypt/rainbowcrack-1.8 b/metadata/md5-cache/app-crypt/rainbowcrack-1.8
index 4e5e48b51f0b..44c50b83c317 100644
--- a/metadata/md5-cache/app-crypt/rainbowcrack-1.8
+++ b/metadata/md5-cache/app-crypt/rainbowcrack-1.8
@@ -1,12 +1,13 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Hash cracker that precomputes plaintext - ciphertext pairs in advance
EAPI=7
HOMEPAGE=https://project-rainbowcrack.com/
+INHERIT=wrapper
KEYWORDS=-* amd64
LICENSE=all-rights-reserved
RESTRICT=bindist mirror
SLOT=0
SRC_URI=https://project-rainbowcrack.com/rainbowcrack-1.8-linux64.zip
_eclasses_=wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=87887b5ee819db51e3fbfcd6e70565af
+_md5_=5cee69e9d3e42912da949a75df375682
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r4 b/metadata/md5-cache/app-dicts/wordnet-3.0-r4
index ab35b94b6893..a00631a347f1 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r4
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r4
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patc
DESCRIPTION=A lexical database for the English language
EAPI=5
HOMEPAGE=https://wordnet.princeton.edu/
-INHERIT=autotools eutils flag-o-matic multilib
+INHERIT=autotools epatch flag-o-matic multilib
IUSE=doc
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Princeton
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
SLOT=0
SRC_URI=ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=e2c3fb536032d6fc2c0ff3558d0936cc
+_md5_=ba67c1fe493d9a8c37f2cdf976b88c10
diff --git a/metadata/md5-cache/app-dicts/wordnet-3.0-r5 b/metadata/md5-cache/app-dicts/wordnet-3.0-r5
index 819d5d0bd30e..e2dd762441d9 100644
--- a/metadata/md5-cache/app-dicts/wordnet-3.0-r5
+++ b/metadata/md5-cache/app-dicts/wordnet-3.0-r5
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-lang/tk:0= sys-devel/gnuconfig >=app-portage/elt-patc
DESCRIPTION=A lexical database for the English language
EAPI=6
HOMEPAGE=https://wordnet.princeton.edu/
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools epatch flag-o-matic
IUSE=doc
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Princeton
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-lang/tk:0=
SLOT=0
SRC_URI=http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=0f31437df3c4f97738eb7c7a8c98b3ed
+_md5_=3fe69a24da9e10e5d1c72eb3e99b84fd
diff --git a/metadata/md5-cache/app-doc/csound-manual-6.15-r1 b/metadata/md5-cache/app-doc/csound-manual-6.15-r1
index c95bd3b5feea..88d02f8ff0a7 100644
--- a/metadata/md5-cache/app-doc/csound-manual-6.15-r1
+++ b/metadata/md5-cache/app-doc/csound-manual-6.15-r1
@@ -1,6 +1,5 @@
-BDEPEND=media-libs/libpng:0
+BDEPEND=app-arch/unzip media-libs/libpng:0
DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
DESCRIPTION=The Csound reference manual
EAPI=7
HOMEPAGE=http://csounds.com/
@@ -9,4 +8,4 @@ KEYWORDS=amd64 x86
LICENSE=FDL-1.2+
SLOT=0
SRC_URI=https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_pdf.zip l10n_fr? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual-fr_pdf.zip ) html? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual_html.zip l10n_fr? ( https://github.com/csound/csound/releases/download/6.15.0/Csound6.15.0_manual-fr_html.zip ) )
-_md5_=7fe270ef078a7a285e0c94294a35f856
+_md5_=ba3428e40fe2e151232d7d159f13b6ca
diff --git a/metadata/md5-cache/app-doc/elisp-manual-18.1.03 b/metadata/md5-cache/app-doc/elisp-manual-18.1.03
index 745d3feecdb9..786b4113ecd5 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-18.1.03
+++ b/metadata/md5-cache/app-doc/elisp-manual-18.1.03
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ~ppc x86
LICENSE=Texinfo-manual
SLOT=18
SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/elisp-manual-18-1.03.tar.gz https://dev.gentoo.org/~ulm/emacs/elisp-manual-18.1.03-patches.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=83b2a435770a04cebbac488a14d7ead5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=178ce72cd28700979fc136235c491933
diff --git a/metadata/md5-cache/app-doc/elisp-manual-19.2.4.2 b/metadata/md5-cache/app-doc/elisp-manual-19.2.4.2
index fe4a620486d3..226e48a81546 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-19.2.4.2
+++ b/metadata/md5-cache/app-doc/elisp-manual-19.2.4.2
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=Texinfo-manual
SLOT=19
SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/elisp-manual-19-2.4.2.tar.gz https://dev.gentoo.org/~ulm/emacs/elisp-manual-19.2.4.2-patches.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=548052c43a12b57fe3e460b66f1940c9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=0a818d1ae8a756698a7ced7893b1b8e5
diff --git a/metadata/md5-cache/app-doc/elisp-manual-20.2.5 b/metadata/md5-cache/app-doc/elisp-manual-20.2.5
index a12e0af7f383..b23377674c7e 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-20.2.5
+++ b/metadata/md5-cache/app-doc/elisp-manual-20.2.5
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=Texinfo-manual
SLOT=20
SRC_URI=ftp://ftp.gnu.org/old-gnu/emacs/elisp-manual-20-2.5.tar.gz https://dev.gentoo.org/~ulm/emacs/elisp-manual-20.2.5-patches.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=cd4fb17066a3df0fbeb2569456101c92
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e0bd53f34809d924d3586da2c605b2d3
diff --git a/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2 b/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
index 2987b42a2d51..e770ec9f108c 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
+++ b/metadata/md5-cache/app-doc/elisp-manual-21.2.8-r2
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86
LICENSE=FDL-1.1+
SLOT=21
SRC_URI=mirror://gnu/emacs/elisp-manual-21-2.8.tar.gz https://dev.gentoo.org/~ulm/emacs/elisp-manual-21.2.8-patches.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=409e2a815da36c3c749d8770cb7e1ab6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=56c867e8c62d4e7abff14f87e3690315
diff --git a/metadata/md5-cache/app-doc/elisp-manual-22.2.9 b/metadata/md5-cache/app-doc/elisp-manual-22.2.9
index 4b4efb5f6fcc..71d8644fb7e1 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-22.2.9
+++ b/metadata/md5-cache/app-doc/elisp-manual-22.2.9
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86
LICENSE=FDL-1.2+
SLOT=22
SRC_URI=https://dev.gentoo.org/~ulm/emacs/elisp-manual-22-2.9.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=cf515870a71078b3c63d8098e18a44b6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=d60f84f6bcca2a48119105e4a20a0774
diff --git a/metadata/md5-cache/app-doc/elisp-manual-23.4 b/metadata/md5-cache/app-doc/elisp-manual-23.4
index b89cdb456f2d..2b16961e783d 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-23.4
+++ b/metadata/md5-cache/app-doc/elisp-manual-23.4
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86
LICENSE=FDL-1.3+
SLOT=23
SRC_URI=https://dev.gentoo.org/~ulm/emacs/elisp-manual-23.4.tar.xz https://dev.gentoo.org/~ulm/emacs/elisp-manual-23.4-patches-1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=fd0e38c52199fc9bf2c8c68de4b50c29
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=561773918a4e5799cb370e5926ce41d6
diff --git a/metadata/md5-cache/app-doc/elisp-manual-24.5 b/metadata/md5-cache/app-doc/elisp-manual-24.5
index 8c6622a3b564..e729acdf9d16 100644
--- a/metadata/md5-cache/app-doc/elisp-manual-24.5
+++ b/metadata/md5-cache/app-doc/elisp-manual-24.5
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo
DESCRIPTION=The GNU Emacs Lisp Reference Manual
EAPI=5
HOMEPAGE=https://www.gnu.org/software/emacs/manual/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86
LICENSE=FDL-1.3+
SLOT=24
SRC_URI=https://dev.gentoo.org/~ulm/emacs/elisp-manual-24.5.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=def49afc6e6ce0db3d5066a5835da9b5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=9d8922ece1fb9d43b5b02d07b3877b24
diff --git a/metadata/md5-cache/app-doc/psmark-2.1 b/metadata/md5-cache/app-doc/psmark-2.1
index 71dbb3e0b2c8..d549652d7da5 100644
--- a/metadata/md5-cache/app-doc/psmark-2.1
+++ b/metadata/md5-cache/app-doc/psmark-2.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Prints watermark-like text on any PostScript document
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.antitachyon.com/download/psmark-v2.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d8e6da184fc53b10b4f76ed4c874b821
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=3b01e954daa40b79bbbf8fb160ec195a
diff --git a/metadata/md5-cache/app-editors/amyedit-1.0-r3 b/metadata/md5-cache/app-editors/amyedit-1.0-r3
index d3c2f7f0cdfc..275811863586 100644
--- a/metadata/md5-cache/app-editors/amyedit-1.0-r3
+++ b/metadata/md5-cache/app-editors/amyedit-1.0-r3
@@ -3,11 +3,11 @@ DEPEND=>=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2:
DESCRIPTION=AmyEdit is a LaTeX editor
EAPI=5
HOMEPAGE=http://amyedit.sf.net
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools epatch flag-o-matic
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=>=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2:2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell
SLOT=0
SRC_URI=mirror://sourceforge/amyedit/amyedit-1.0.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=0704b2975fabba72660fb11873a5c03e
+_md5_=13773db42cfa028da9795385092624af
diff --git a/metadata/md5-cache/app-editors/elvis-2.2.0-r6 b/metadata/md5-cache/app-editors/elvis-2.2.0-r6
index ebacbe0cdb51..1e91f4a63ee9 100644
--- a/metadata/md5-cache/app-editors/elvis-2.2.0-r6
+++ b/metadata/md5-cache/app-editors/elvis-2.2.0-r6
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libX
DESCRIPTION=A vi/ex clone
EAPI=5
HOMEPAGE=ftp://ftp.cs.pdx.edu/pub/elvis/
-INHERIT=eutils versionator toolchain-funcs
+INHERIT=epatch versionator toolchain-funcs
IUSE=X
KEYWORDS=amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris
LICENSE=Artistic
RDEPEND=>=sys-libs/ncurses-5.7-r7:0= X? ( >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXpm-3.5.4.2 >=x11-libs/libXft-2.1.8.2 ) app-eselect/eselect-vi
SLOT=0
SRC_URI=ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=9404cf7f5d14cc6474b2a9ab2a5b3fb5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ac010cdb98470e530c8d770919857aee
diff --git a/metadata/md5-cache/app-editors/hexedit-1.2.13 b/metadata/md5-cache/app-editors/hexedit-1.2.13
index 2701af0c6e54..c85ba2c08731 100644
--- a/metadata/md5-cache/app-editors/hexedit-1.2.13
+++ b/metadata/md5-cache/app-editors/hexedit-1.2.13
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:= sys-devel/gnuconfig >=app-portage/elt-patches-20170815
DESCRIPTION=View and edit files in hex or ASCII
EAPI=5
HOMEPAGE=http://rigaux.org/hexedit.html
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:=
SLOT=0
SRC_URI=http://rigaux.org/hexedit-1.2.13.src.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=714a97a5c83e15e0ce9e22490b9a9492
+_md5_=9c63038aa622799b83717f3d3dd36d31
diff --git a/metadata/md5-cache/app-editors/jedit-5.2.0-r1 b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
index 5131ec0bc273..acdcc6977d81 100644
--- a/metadata/md5-cache/app-editors/jedit-5.2.0-r1
+++ b/metadata/md5-cache/app-editors/jedit-5.2.0-r1
@@ -3,7 +3,7 @@ DEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apac
DESCRIPTION=Programmer's editor written in Java
EAPI=5
HOMEPAGE=http://www.jedit.org
-INHERIT=eutils java-pkg-2 java-ant-2 xdg-utils
+INHERIT=epatch java-pkg-2 java-ant-2 xdg-utils
IUSE=elibc_FreeBSD doc test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=BSD GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/bsh:0 dev-java/jsr305:0 dev-java/ant-contrib:0 dev-java/ant-apa
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/jedit/jedit5.2.0source.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ff8940f95f10102543d9607885e1735
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=60971ccb24560362fe0e3ee5e1e5130d
diff --git a/metadata/md5-cache/app-editors/jedit-5.4.0 b/metadata/md5-cache/app-editors/jedit-5.4.0
index ac8a319b57d5..6808bed32170 100644
--- a/metadata/md5-cache/app-editors/jedit-5.4.0
+++ b/metadata/md5-cache/app-editors/jedit-5.4.0
@@ -3,7 +3,7 @@ DEPEND=dev-java/jsr305:0 >=virtual/jdk-1.8 dev-java/ant-contrib:0 dev-java/ant-a
DESCRIPTION=Programmer's editor written in Java
EAPI=6
HOMEPAGE=http://www.jedit.org
-INHERIT=eutils java-pkg-2 java-ant-2 xdg-utils
+INHERIT=desktop java-pkg-2 java-ant-2 xdg-utils
IUSE=elibc_FreeBSD doc test elibc_FreeBSD
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=BSD GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/jedit/jedit5.4.0source.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0ff5c85cacae62dc4bc23d0340f2ce2
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 eapi7-ver f9ec87e93172b25ce65a85303dc06964 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=11b4062c812b07c4842204bd4814cefa
diff --git a/metadata/md5-cache/app-editors/levee-3.5a b/metadata/md5-cache/app-editors/levee-3.5a
index b3d00f3b6eb8..45c200e704dd 100644
--- a/metadata/md5-cache/app-editors/levee-3.5a
+++ b/metadata/md5-cache/app-editors/levee-3.5a
@@ -3,11 +3,11 @@ DEPEND=!app-text/lv sys-libs/ncurses:0= virtual/pkgconfig
DESCRIPTION=Really tiny vi clone, for things like rescue disks
EAPI=5
HOMEPAGE=http://www.pell.chi.il.us/~orc/Code/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=levee
RDEPEND=!app-text/lv sys-libs/ncurses:0=
SLOT=0
SRC_URI=http://www.pell.chi.il.us/~orc/Code/levee/levee-3.5a.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ac370e24bb09a617dc85d29a999f49f6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=4281aada473bb19c807b820346ca0763
diff --git a/metadata/md5-cache/app-editors/nedit-5.6-r1 b/metadata/md5-cache/app-editors/nedit-5.6-r1
index e092f0988011..7d5daf411756 100644
--- a/metadata/md5-cache/app-editors/nedit-5.6-r1
+++ b/metadata/md5-cache/app-editors/nedit-5.6-r1
@@ -3,11 +3,11 @@ DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 || ( dev-util/yacc
DESCRIPTION=Multi-purpose text editor for the X Window System
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/nedit
-INHERIT=eutils toolchain-funcs
+INHERIT=desktop epatch toolchain-funcs
KEYWORDS=~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/nedit/nedit-source/nedit-5.6a-src.tar.gz https://dev.gentoo.org/~jlec/distfiles/nedit.png.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f7b4cdf084c427bcffbcbed7ec7bbfa0
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=c4f5c485f70dc3ade28f01c12be03b38
diff --git a/metadata/md5-cache/app-editors/ted-2.23 b/metadata/md5-cache/app-editors/ted-2.23
index 3c79c54ff77f..b0ffc2048e9b 100644
--- a/metadata/md5-cache/app-editors/ted-2.23
+++ b/metadata/md5-cache/app-editors/ted-2.23
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 media-libs/tiff:= virtual/jpeg:= media-libs/libpng:= x11-
DESCRIPTION=X-based rich text editor
EAPI=5
HOMEPAGE=https://www.nllgg.nl/Ted/
-INHERIT=eutils toolchain-funcs xdg-utils
+INHERIT=epatch toolchain-funcs xdg-utils
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 media-libs/tiff:= virtual/jpeg:= media-libs/libpng:= x11-libs/libXft x11-libs/libXpm
SLOT=0
SRC_URI=ftp://ftp.nluug.nl/pub/editors/ted/ted-2.23.src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=72f9c9df5c332448a878fa178579519e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=f108e838a425de334cace7c942ea3ccc
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r2 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r2
index 23b69a5b338d..74f6da3cb57e 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24-r2
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.24-r2
@@ -4,7 +4,7 @@ DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-l
DESCRIPTION=highly customizable open source text editor and application development system
EAPI=7
HOMEPAGE=http://www.xemacs.org/
-INHERIT=autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+INHERIT=autotools flag-o-matic toolchain-funcs xdg-utils desktop
IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb
KEYWORDS=~alpha amd64 arm64 ~hppa ppc ppc64 sparc x86
LICENSE=GPL-2+
@@ -13,4 +13,4 @@ RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-
SLOT=0
SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba desktop c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=324ec719e016683261b739e006304a97
+_md5_=c7dc1171a3e7971fb3cd2b820637a3b3
diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.34-r5 b/metadata/md5-cache/app-editors/xemacs-21.5.34-r5
index c3343eb5b21e..d9497391af65 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.5.34-r5
+++ b/metadata/md5-cache/app-editors/xemacs-21.5.34-r5
@@ -4,7 +4,7 @@ DEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1.
DESCRIPTION=highly customizable open source text editor and application development system
EAPI=7
HOMEPAGE=http://www.xemacs.org/
-INHERIT=autotools eutils flag-o-matic multilib xdg-utils desktop
+INHERIT=autotools flag-o-matic xdg-utils desktop
IUSE=alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb
KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-3+
@@ -13,4 +13,4 @@ RDEPEND=berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) gdbm? ( >=sys-libs/gdbm-1
SLOT=0
SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.34.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba desktop c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=034206b3dbce0cf61b0cb323ec4d9ab6
+_md5_=f60907a4720ac6f5b4c4b6bf3632477b
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index d017f37e43bf..64b6e340a414 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20170321
+++ b/metadata/md5-cache/app-emacs/blogmax-20170321
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
DESCRIPTION=Blogging in Emacs
EAPI=7
HOMEPAGE=https://billstclair.com/blogmax/index.html
-INHERIT=elisp eutils readme.gentoo-r1
+INHERIT=elisp edos2unix readme.gentoo-r1
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-1+
RDEPEND=>=app-editors/emacs-23.1:*
SLOT=0
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=elisp-common 36f97076abd90f943a34f8bcd58b5bcc elisp 023dd24ad9e6d5e62907e7007f548ca3 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
-_md5_=171de8a465e5289d045eeb8fe7048cf0
+_eclasses_=elisp-common 36f97076abd90f943a34f8bcd58b5bcc elisp 023dd24ad9e6d5e62907e7007f548ca3 edos2unix 33e347e171066657f91f8b0c72ec8773 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
+_md5_=075344a425db39cf3b846fd1641cc561
diff --git a/metadata/md5-cache/app-emulation/dlx-1.5.20 b/metadata/md5-cache/app-emulation/dlx-1.5.20
index 58b9a98a7642..bd97bbc22f66 100644
--- a/metadata/md5-cache/app-emulation/dlx-1.5.20
+++ b/metadata/md5-cache/app-emulation/dlx-1.5.20
@@ -1,11 +1,12 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
DESCRIPTION=DLX Simulator
EAPI=7
HOMEPAGE=https://www.davidviner.com/dlx
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2+
SLOT=0
SRC_URI=https://www.davidviner.com/zip/dlx/dlx.zip -> dlx-1.5.20.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d88e8c7a41db8b070d607478ff6b448f
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=4d6d230f37743845ed3da28bad222fd0
diff --git a/metadata/md5-cache/app-emulation/edumips64-1.2 b/metadata/md5-cache/app-emulation/edumips64-1.2
index 1289c7a07ad8..7ecd7928da93 100644
--- a/metadata/md5-cache/app-emulation/edumips64-1.2
+++ b/metadata/md5-cache/app-emulation/edumips64-1.2
@@ -3,7 +3,7 @@ DEPEND=dev-python/sphinx dev-java/javatoolkit dev-java/javahelp:0 >=virtual/jdk-
DESCRIPTION=A visual and cross-platform MIPS64 CPU Simulator
EAPI=5
HOMEPAGE=https://www.edumips.org
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc test elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/edumips64/edumips64-1.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=ae91b0b9a54a5e3aa386f3c1a753341d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=f7a9d3cf54c817d9250a06ebdd88d4af
diff --git a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120 b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
index 48f16b1bd71d..6828d345dbcf 100644
--- a/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
+++ b/metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
@@ -3,12 +3,12 @@ DEPEND=app-arch/rpm2targz >=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=XenServer Virtual Machine Tools
EAPI=5
HOMEPAGE=https://www.citrix.com/
-INHERIT=eutils rpm linux-info
+INHERIT=epatch rpm linux-info
IUSE=xenstore kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3 LGPL-2.1
RDEPEND=!xenstore? ( app-emulation/xen-tools ) xenstore? ( !app-emulation/xen-tools )
SLOT=0
SRC_URI=http://updates.vmd.citrix.com/XenServer/6.2.0/rhel4x/SRPMS/xe-guest-utilities-6.2.0-1120.src.rpm
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=61158e01a8f3e256b1f3fc30744443e8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=6bcc82be513b43073839ebd5f4b31934
diff --git a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7 b/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7
index 997ac8d8d3d7..98601071858b 100644
--- a/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7
+++ b/metadata/md5-cache/app-forensics/ovaldi-5.10.1.7
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c
DESCRIPTION=Free implementation of OVAL
EAPI=5
HOMEPAGE=http://oval.mitre.org/language/interpreter.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=acl ldap selinux
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=dev-libs/libgcrypt:0 dev-libs/libpcre dev-libs/xalan-c dev-libs/xerces-c sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) ldap? ( net-nds/openldap ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://sourceforge/ovaldi/ovaldi-5.10.1.7-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=573e65bf2325d8dd44a4ba76158ba72f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=a249dd8e82272b73ad133a3a6c29945c
diff --git a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1 b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
index 202dd9760567..f92b0e35b1f5 100644
--- a/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
+++ b/metadata/md5-cache/app-i18n/scim-anthy-1.2.7-r1
@@ -3,7 +3,7 @@ DEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl )
DESCRIPTION=Japanese input method Anthy IMEngine for SCIM
EAPI=6
HOMEPAGE=http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=+gtk3 nls kasumi
KEYWORDS=~alpha amd64 ~arm ppc sparc x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=app-i18n/scim-1.2[gtk3=] >=app-i18n/anthy-5900 nls? ( virtual/libintl
SLOT=0
SRC_URI=mirror://sourceforge.jp/scim-imengine/37309/scim-anthy-1.2.7.tar.gz https://dev.gentoo.org/~juippis/distfiles/tmp/scim-anthy-1.2.7-gtk2_build.patch gtk3? ( https://dev.gentoo.org/~heroxbd/scim-anthy-1.2.7-patches.tar.xz )
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6a994d7ba83cabf94cda7f4a06fdf739
+_md5_=d1636730bb0302f6c75b4009172542d1
diff --git a/metadata/md5-cache/app-i18n/unicode-data-12.0.0 b/metadata/md5-cache/app-i18n/unicode-data-12.0.0
index b6ba3c93193f..4a3e4d50a231 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-12.0.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-12.0.0
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Unicode data from unicode.org
EAPI=7
HOMEPAGE=http://www.unicode.org/ucd/
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=unicode
SLOT=0
SRC_URI=http://www.unicode.org/Public/zipped/12.0.0/UCD.zip -> unicode-data-12.0.0-UCD.zip http://www.unicode.org/Public/zipped/12.0.0/Unihan.zip -> unicode-data-12.0.0-Unihan.zip
-_md5_=b1e39f221907d0c56080f2de9618d8ae
+_md5_=1d8133e8cf3ea0ec7157f49e29654009
diff --git a/metadata/md5-cache/app-i18n/unicode-data-12.1.0 b/metadata/md5-cache/app-i18n/unicode-data-12.1.0
index bd6e1eada810..6fb589010dcd 100644
--- a/metadata/md5-cache/app-i18n/unicode-data-12.1.0
+++ b/metadata/md5-cache/app-i18n/unicode-data-12.1.0
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Unicode data from unicode.org
EAPI=7
HOMEPAGE=https://www.unicode.org/ucd/
@@ -7,4 +7,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=unicode
SLOT=0
SRC_URI=https://www.unicode.org/Public/zipped/12.1.0/UCD.zip -> unicode-data-12.1.0-UCD.zip https://www.unicode.org/Public/zipped/12.1.0/Unihan.zip -> unicode-data-12.1.0-Unihan.zip
-_md5_=6f13193987332dd9410cb7775c79f029
+_md5_=40e4c40a88688729e6b9a302b969a185
diff --git a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1 b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
index f2dd3bbbba06..689ab02cc66d 100644
--- a/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
+++ b/metadata/md5-cache/app-laptop/tpb-0.6.4-r1
@@ -3,12 +3,12 @@ DEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
DESCRIPTION=IBM ThinkPad buttons utility
EAPI=5
HOMEPAGE=https://savannah.nongnu.org/projects/tpb/
-INHERIT=linux-info eutils
+INHERIT=linux-info epatch
IUSE=nls xosd kernel_linux
KEYWORDS=amd64 -ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXt x11-libs/libXext xosd? ( >=x11-libs/xosd-2.2.0 )
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/tpb/tpb-0.6.4.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a3f76a90131031f7f3a7c408ba96bb43
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f205023eb41d31263c0a052f0a472a50
diff --git a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2 b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
index 9a459a201c40..ad7556a813ba 100644
--- a/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
+++ b/metadata/md5-cache/app-misc/actkbd-0.2.8-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare setup
DESCRIPTION=A keyboard shortcut daemon
EAPI=5
HOMEPAGE=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/
-INHERIT=linux-info eutils toolchain-funcs
+INHERIT=linux-info epatch toolchain-funcs
IUSE=kernel_linux
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/actkbd-0.2.8.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=479d3fb46f1b83f33d7b60050bdc34cb
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=8bc3b339c053e233fab8fb7d46dbd77e
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.10 b/metadata/md5-cache/app-misc/beanstalkd-1.10
index ae03a9806b2b..c2def4f0e02f 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.10
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.10
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
DESCRIPTION=A simple, fast work queue
EAPI=5
HOMEPAGE=http://kr.github.io/beanstalkd/
-INHERIT=eutils systemd toolchain-funcs user
+INHERIT=systemd toolchain-funcs user
KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x64-macos
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=6c92a121c12baf5b0964844c42e980b2
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=b97e705b38b35bf228862d10e4d2240e
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.11 b/metadata/md5-cache/app-misc/beanstalkd-1.11
index ad81d19e2c9f..332aaaa72f95 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.11
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.11
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
DESCRIPTION=A simple, fast work queue
EAPI=5
HOMEPAGE=http://kr.github.io/beanstalkd/
-INHERIT=eutils systemd toolchain-funcs user
+INHERIT=systemd toolchain-funcs user
KEYWORDS=~amd64 ~mips ~x86 ~amd64-linux ~x64-macos
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/kr/beanstalkd/archive/v1.11.tar.gz -> beanstalkd-1.11.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=91c76278eebbd9e549f3604875f1bd77
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=f73e922f527879a21e58d5d9282e8888
diff --git a/metadata/md5-cache/app-misc/cdargs-1.35-r2 b/metadata/md5-cache/app-misc/cdargs-1.35-r2
index 06d6d69f761c..02131e9d9b04 100644
--- a/metadata/md5-cache/app-misc/cdargs-1.35-r2
+++ b/metadata/md5-cache/app-misc/cdargs-1.35-r2
@@ -3,7 +3,7 @@ DEPEND=sys-libs/ncurses:0= emacs? ( >=app-editors/emacs-23.1:* ) sys-devel/gnuco
DESCRIPTION=Bookmarks and browser for the shell builtin cd command
EAPI=5
HOMEPAGE=http://www.skamphausen.de/cgi-bin/ska/CDargs
-INHERIT=autotools elisp-common eutils
+INHERIT=autotools elisp-common epatch
IUSE=emacs
KEYWORDS=amd64 ppc ~sparc x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0= emacs? ( >=app-editors/emacs-23.1:* )
SLOT=0
SRC_URI=http://www.skamphausen.de/software/cdargs/cdargs-1.35.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
-_md5_=cecbe30c4bf8d80065f7814ea57eda96
+_md5_=fe280e2c187b26d6400016eba460d7ac
diff --git a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4 b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
index c9ff1ba9e56d..b438c91e3795 100644
--- a/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
+++ b/metadata/md5-cache/app-misc/ckermit-8.0.211-r4
@@ -3,12 +3,12 @@ DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) ncurses? ( virtual/pkgconfig )
DESCRIPTION=combined serial and network communication software package
EAPI=5
HOMEPAGE=http://www.kermitproject.org/
-INHERIT=versionator eutils flag-o-matic toolchain-funcs
+INHERIT=versionator epatch flag-o-matic toolchain-funcs
IUSE=ncurses
KEYWORDS=amd64 arm ~hppa ppc ppc64 x86
LICENSE=Kermit
RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:= ) net-dialup/lrzsz
SLOT=0
SRC_URI=ftp://kermit.columbia.edu/kermit/archives/cku211.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=049f20960f56bb76a26f3469604eb143
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=5d6e6011a64c50c50726cf4130977426
diff --git a/metadata/md5-cache/app-misc/detox-1.2.0-r3 b/metadata/md5-cache/app-misc/detox-1.2.0-r3
index 3cebf33c0c88..d1580f582947 100644
--- a/metadata/md5-cache/app-misc/detox-1.2.0-r3
+++ b/metadata/md5-cache/app-misc/detox-1.2.0-r3
@@ -3,11 +3,11 @@ DEPEND=dev-libs/popt !dev-python/detox sys-devel/flex sys-devel/bison
DESCRIPTION=Safely remove spaces and strange characters from filenames
EAPI=5
HOMEPAGE=http://detox.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-libs/popt !dev-python/detox
SLOT=0
SRC_URI=mirror://sourceforge/detox/detox-1.2.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a5f75e8f9a2fd19523996ada55d79bb9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=6336398813f7d290d7f2c06c692ed78c
diff --git a/metadata/md5-cache/app-misc/fdutils-5.5.20060227 b/metadata/md5-cache/app-misc/fdutils-5.5.20060227
index 51c796c8bf9a..8b9ff6bc5900 100644
--- a/metadata/md5-cache/app-misc/fdutils-5.5.20060227
+++ b/metadata/md5-cache/app-misc/fdutils-5.5.20060227
@@ -3,12 +3,12 @@ DEPEND=>=sys-fs/mtools-4 sys-apps/texinfo virtual/os-headers doc? ( virtual/texi
DESCRIPTION=utilities for configuring and debugging the Linux floppy driver
EAPI=5
HOMEPAGE=https://fdutils.linux.lu
-INHERIT=eutils
+INHERIT=epatch
IUSE=doc
KEYWORDS=~amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=sys-fs/mtools-4
SLOT=0
SRC_URI=mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227.orig.tar.gz mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227-6.debian.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=c5bb7ffbf2ad3e6c5cb373a9f2899aec
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=911cc4210aa065607359cbece96c0cf2
diff --git a/metadata/md5-cache/app-misc/fdutils-5.5.20060227-r1 b/metadata/md5-cache/app-misc/fdutils-5.5.20060227-r1
index 6a6deca82ebe..a427ff2f45aa 100644
--- a/metadata/md5-cache/app-misc/fdutils-5.5.20060227-r1
+++ b/metadata/md5-cache/app-misc/fdutils-5.5.20060227-r1
@@ -3,12 +3,12 @@ DEPEND=>=sys-fs/mtools-4 sys-apps/texinfo virtual/os-headers doc? ( virtual/texi
DESCRIPTION=utilities for configuring and debugging the Linux floppy driver
EAPI=5
HOMEPAGE=https://fdutils.linux.lu
-INHERIT=eutils
+INHERIT=epatch
IUSE=doc
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=sys-fs/mtools-4
SLOT=0
SRC_URI=mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227.orig.tar.gz mirror://debian/pool/main/f/fdutils/fdutils_5.5-20060227-8.debian.tar.xz https://dev.gentoo.org/~robbat2/distfiles/fdutils-5.5-20060227_20081027.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a7e6489cebc40b4604664e8b6b317d8f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e6deafb9305b2d6003aeabfd61aa50e2
diff --git a/metadata/md5-cache/app-misc/gcal-3.6.3 b/metadata/md5-cache/app-misc/gcal-3.6.3
index 1fbc0ad88f17..dfb94fc53005 100644
--- a/metadata/md5-cache/app-misc/gcal-3.6.3
+++ b/metadata/md5-cache/app-misc/gcal-3.6.3
@@ -3,12 +3,12 @@ DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
DESCRIPTION=The GNU Calendar - a replacement for cal
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gcal/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
IUSE=ncurses nls unicode
KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-3+
RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/gcal/gcal-3.6.3.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=82a2985c9e120a99e99eb1c3bd2259ee
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=d878a41616c3124ba74792614f5d759e
diff --git a/metadata/md5-cache/app-misc/gnuit-4.9.5-r2 b/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
index 737ccb903d2d..6c016884dddc 100644
--- a/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
+++ b/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install postinst prepare
DESCRIPTION=GNU Interactive Tools - increase speed and efficiency of most daily tasks
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gnuit/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-3 FDL-1.3
SLOT=0
SRC_URI=mirror://gnu/gnuit/gnuit-4.9.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=94cb00f06ee72addacb954b615aeadae
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e83b1ee239cdad958922e10477db018c
diff --git a/metadata/md5-cache/app-misc/hexcompare-1.0.4 b/metadata/md5-cache/app-misc/hexcompare-1.0.4
index d4856420a253..2b1e135afd62 100644
--- a/metadata/md5-cache/app-misc/hexcompare-1.0.4
+++ b/metadata/md5-cache/app-misc/hexcompare-1.0.4
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0
DESCRIPTION=ncurses-based visual comparison of binary files
EAPI=5
HOMEPAGE=http://hexcompare.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=sys-libs/ncurses:0
SLOT=0
SRC_URI=mirror://sourceforge/hexcompare/hexcompare-1.0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=719993e90ee5fe97e2212c5331a68914
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=b0733dad407d300296e3ef296499e667
diff --git a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1 b/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1
index 31ada36f9ec2..2f9996b56ccb 100644
--- a/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1
+++ b/metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install prepare setup
DESCRIPTION=Server software for IRTrans
EAPI=7
HOMEPAGE=http://www.irtrans.de
-INHERIT=eutils flag-o-matic toolchain-funcs mono-env
+INHERIT=wrapper flag-o-matic toolchain-funcs mono-env
IUSE=mono
KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD GPL-2
@@ -10,5 +10,5 @@ RDEPEND=mono? ( >=dev-lang/mono-2.10.5 )
RESTRICT=strip
SLOT=0
SRC_URI=http://ftp.disconnected-by-peer.at/irtrans/irserver-src-6.09.04.tar.gz http://ftp.disconnected-by-peer.at/irtrans/irserver-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-6.09.04.tar.gz http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-6.09.04.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e flag-o-matic c0964e43ba712cb933da5f65b958fa88 mono-env 1f24c032c78290b0d9a07d5b343051a7
-_md5_=ace21329f1c8076591b5873c4cf28636
+_eclasses_=wrapper 4251d4c84c25f59094fd557e0063a974 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 mono-env 1f24c032c78290b0d9a07d5b343051a7
+_md5_=9069485c01b8dee6da32d87f3402c25d
diff --git a/metadata/md5-cache/app-misc/kanatest-0.4.8 b/metadata/md5-cache/app-misc/kanatest-0.4.8
index ba7323ce043f..53674cc4a027 100644
--- a/metadata/md5-cache/app-misc/kanatest-0.4.8
+++ b/metadata/md5-cache/app-misc/kanatest-0.4.8
@@ -3,11 +3,11 @@ DEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:= virtual/pkgconfig sys-devel/gn
DESCRIPTION=Visual flashcard tool for memorizing the Japanese Hiragana and Katakana alphabet
EAPI=5
HOMEPAGE=http://www.clayo.org/kanatest
-INHERIT=autotools eutils gnome2-utils
+INHERIT=autotools epatch gnome2-utils
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2 GPL-2+
RDEPEND=>=x11-libs/gtk+-2.12:2= dev-libs/libxml2:=
SLOT=0
SRC_URI=http://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
-_md5_=966ae3e4cc91f968301c6dd7ed8a2977
+_md5_=aae20f42a727d637ed16fa84f0beef92
diff --git a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3 b/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
index 363bf36b052d..4843fc21892d 100644
--- a/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
+++ b/metadata/md5-cache/app-misc/logitech-applet-0.4_pre1-r3
@@ -3,11 +3,11 @@ DEPEND=virtual/libusb:0
DESCRIPTION=Control utility for some special features of some special Logitech USB mice!
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:0
SLOT=0
SRC_URI=mirror://gentoo/logitech_applet-0.4test1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=4ae5ba5cebecf114d5bd4995b627e69f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=2639dd1c03664fb275780ccc5737c1aa
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1 b/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
index a02794d296b8..57a5a92416d6 100644
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
+++ b/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Move/copy/append/link multiple files according to a set of wildcard patterns
EAPI=6
HOMEPAGE=https://packages.debian.org/unstable/utils/mmv
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
KEYWORDS=~alpha amd64 ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=LGPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz mirror://debian/pool/main/m/mmv/mmv_1.01b-18.debian.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=68900a8fb283371ebcad146dc22b5291
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=45bf1a172aa1420d3c676de98311c317
diff --git a/metadata/md5-cache/app-misc/realpath-1.18 b/metadata/md5-cache/app-misc/realpath-1.18
index e5bcfad79b80..609623425f88 100644
--- a/metadata/md5-cache/app-misc/realpath-1.18
+++ b/metadata/md5-cache/app-misc/realpath-1.18
@@ -3,12 +3,12 @@ DEPEND=nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) elibc_mintlib? ( virt
DESCRIPTION=Return the canonicalized absolute pathname
EAPI=5
HOMEPAGE=http://packages.debian.org/unstable/utils/realpath
-INHERIT=eutils flag-o-matic multilib prefix toolchain-funcs
+INHERIT=epatch flag-o-matic prefix
IUSE=nls
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=988dfcff59567cd97902811343e4b27b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=db21fe4233304e1c407ffb387b32aeb3
diff --git a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8 b/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
index 0c36998f3bee..15cd1e5ada79 100644
--- a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
+++ b/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
@@ -3,12 +3,12 @@ DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=Job Scheduler and Runbook Automation
EAPI=5
HOMEPAGE=http://www.rundeck.org
-INHERIT=eutils java-pkg-2 rpm user
+INHERIT=epatch java-pkg-2 rpm user
IUSE=elibc_FreeBSD
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=http://download.rundeck.org/rpm/rundeck-2.6.8-1.20.GA.noarch.rpm http://download.rundeck.org/rpm/rundeck-config-2.6.8-1.20.GA.noarch.rpm
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 rpm 760ff223c2c4299b68ea901e24c4cabd user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=1733d05f8b2dee530d7a2b2fa9558f9f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 rpm 760ff223c2c4299b68ea901e24c4cabd user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=7a7340557206bc57daae02b23abac7ca
diff --git a/metadata/md5-cache/app-misc/sphinx-2.2.11 b/metadata/md5-cache/app-misc/sphinx-2.2.11
index 482d5896c63a..0574f2516fd3 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.2.11
+++ b/metadata/md5-cache/app-misc/sphinx-2.2.11
@@ -3,12 +3,12 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automak
DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
EAPI=5
HOMEPAGE=http://www.sphinxsearch.com/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=epatch autotools toolchain-funcs
IUSE=debug +id64 mysql odbc postgres re2 stemmer syslog xml
KEYWORDS=amd64 ~arm ~ia64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2
RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) odbc? ( dev-db/unixODBC ) re2? ( dev-libs/re2 ) stemmer? ( dev-libs/snowball-stemmer ) xml? ( dev-libs/expat ) virtual/libiconv
SLOT=0
SRC_URI=http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=b2e864bc505dc439941af0379ffa8661
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=b6446b4e80960354e58b57f9e1c73fef
diff --git a/metadata/md5-cache/app-misc/sphinx-2.2.11-r1 b/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
index ad6f1262e58e..49160d480015 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
+++ b/metadata/md5-cache/app-misc/sphinx-2.2.11-r1
@@ -3,7 +3,7 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automak
DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
EAPI=6
HOMEPAGE=http://www.sphinxsearch.com/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=epatch autotools toolchain-funcs
IUSE=debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml
KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-
REQUIRED_USE=mysql? ( !mariadb ) mariadb? ( !mysql )
SLOT=0
SRC_URI=http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=b16019089f6b200c785f6548408e17d5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=fd4cf37c1e05373973aeccf4f32fe9aa
diff --git a/metadata/md5-cache/app-misc/sphinx-2.2.11-r2 b/metadata/md5-cache/app-misc/sphinx-2.2.11-r2
index f031b9e1b121..553eab8da31a 100644
--- a/metadata/md5-cache/app-misc/sphinx-2.2.11-r2
+++ b/metadata/md5-cache/app-misc/sphinx-2.2.11-r2
@@ -3,7 +3,7 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automak
DESCRIPTION=Full-text search engine with support for MySQL and PostgreSQL
EAPI=6
HOMEPAGE=http://www.sphinxsearch.com/
-INHERIT=eutils autotools toolchain-funcs
+INHERIT=epatch autotools toolchain-funcs
IUSE=debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml
KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=mysql? ( dev-db/mysql-connector-c ) mariadb? ( dev-db/mariadb-connector-
REQUIRED_USE=mysql? ( !mariadb ) mariadb? ( !mysql )
SLOT=0
SRC_URI=http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=69c404d30e82a6028443183e24fe3788
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=5d0f8c195631864389bc62d54cb81281
diff --git a/metadata/md5-cache/app-misc/srm-1.2.15 b/metadata/md5-cache/app-misc/srm-1.2.15
index c9ab1a729252..a4a3aedbb21f 100644
--- a/metadata/md5-cache/app-misc/srm-1.2.15
+++ b/metadata/md5-cache/app-misc/srm-1.2.15
@@ -3,11 +3,11 @@ DEPEND=!app-misc/secure-delete sys-kernel/linux-headers sys-devel/gnuconfig >=ap
DESCRIPTION=A command-line compatible rm which destroys file contents before unlinking
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/srm/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=debug
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=MIT
SLOT=0
SRC_URI=mirror://sourceforge/srm/srm-1.2.15.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=71708df52e1be6963d3734a260036c62
+_md5_=5892f535ddaad1fff84ef25a833c11f2
diff --git a/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1 b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
index 8e6f2db598c5..84a9352839ba 100644
--- a/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
+++ b/metadata/md5-cache/app-misc/tdfsb-0.0.10-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11
DESCRIPTION=SDL based graphical file browser
EAPI=5
HOMEPAGE=http://www.determinate.net/webdata/seg/tdfsb.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~alpha amd64 ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=media-libs/freeglut media-libs/sdl-image media-libs/smpeg virtual/glu x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu
SLOT=0
SRC_URI=http://www.determinate.net/webdata/data/tdfsb-0.0.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=97955301b874a7c557522d9be7c4ca83
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=b08f746dfa82cc66ad0207ce06a85b8f
diff --git a/metadata/md5-cache/app-misc/wcd-5.2.7 b/metadata/md5-cache/app-misc/wcd-5.2.7
index 2a62531befda..7c8409d11050 100644
--- a/metadata/md5-cache/app-misc/wcd-5.2.7
+++ b/metadata/md5-cache/app-misc/wcd-5.2.7
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/gh
DESCRIPTION=Wherever Change Directory
EAPI=5
HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=nls unicode
KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring )
SLOT=0
SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.2.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=0b9e68919e8252e4b5065088c09c52f6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=213bc33787f7baca2ec882faad3eea64
diff --git a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1 b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
index 9bbe46d21a74..9b60626ceb3b 100644
--- a/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
+++ b/metadata/md5-cache/app-mobilephone/vmoconv-1.0-r1
@@ -3,11 +3,11 @@ DEPEND=media-sound/gsm sys-devel/gnuconfig >=app-portage/elt-patches-20170815 ||
DESCRIPTION=A tool that converts Siemens phones VMO and VMI audio files to gsm and wav
EAPI=5
HOMEPAGE=http://triq.net/obex/
-INHERIT=eutils autotools
+INHERIT=epatch autotools
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-sound/gsm
SLOT=0
SRC_URI=http://triq.net/obexftp/vmoconv-1.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=1732a34a9a343fc678fc95d04e2ffed5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=106443890b515364815b5c514a784a49
diff --git a/metadata/md5-cache/app-office/ical-3.0-r2 b/metadata/md5-cache/app-office/ical-3.0-r2
index e14b003cf595..4b8d9b5310de 100644
--- a/metadata/md5-cache/app-office/ical-3.0-r2
+++ b/metadata/md5-cache/app-office/ical-3.0-r2
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0 dev-lang/tk:0 sys-devel/gnuconfig >=app-portage/elt-patche
DESCRIPTION=Tk-based Calendar program
EAPI=5
HOMEPAGE=https://launchpad.net/ical-tcl
-INHERIT=autotools eutils multilib virtualx
+INHERIT=autotools eutils epatch multilib virtualx
IUSE=test
KEYWORDS=amd64 ppc x86
LICENSE=HPND
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://launchpad.net/ical-tcl/3.x/3.0/+download/ical-3.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=14e3f5e46e0d21f05ee0d3609eca23e1
+_md5_=4b17c3398e59f7207665b59001cccbcf
diff --git a/metadata/md5-cache/app-office/projectlibre-bin-1.6.2 b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
index 7bb9253a3bea..bb1c0ddc801a 100644
--- a/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
+++ b/metadata/md5-cache/app-office/projectlibre-bin-1.6.2
@@ -3,11 +3,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=An open source desktop alternative to Microsoft Project
EAPI=6
HOMEPAGE=http://www.projectlibre.org/
-INHERIT=eutils xdg
+INHERIT=desktop xdg
KEYWORDS=~amd64 ~x86
LICENSE=CPAL-1.0
RDEPEND=>=virtual/jre-1.8
SLOT=0
SRC_URI=mirror://sourceforge/projectlibre/projectlibre-1.6.2.tar.gz mirror://gentoo/projectlibre.png
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=0d2146f2b5b81b07464a81f728dd1e39
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=09a2b44cc91d9cf84ed8d9a14d014781
diff --git a/metadata/md5-cache/app-pda/barry-0.18.3 b/metadata/md5-cache/app-pda/barry-0.18.3
index 2f416a3fe181..0b7f7af1d653 100644
--- a/metadata/md5-cache/app-pda/barry-0.18.3
+++ b/metadata/md5-cache/app-pda/barry-0.18.3
@@ -3,12 +3,12 @@ DEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=
DESCRIPTION=Sync, backup, program management, and charging for BlackBerry devices
EAPI=5
HOMEPAGE=http://www.netdirect.ca/software/packages/barry/
-INHERIT=bash-completion-r1 eutils flag-o-matic gnome2-utils ltprune udev
+INHERIT=bash-completion-r1 desktop epatch flag-o-matic gnome2-utils ltprune udev
IUSE=boost doc gui nls static-libs
KEYWORDS=~amd64 ~x86
LICENSE=CC-BY-SA-3.0 GPL-2
RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
SLOT=0
SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=408612c273004c67681d69942eacf6b0
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 udev 452708c3f55cf6e918b045adb949a9e6
+_md5_=6eeede480d297669e6d62a012609aae1
diff --git a/metadata/md5-cache/app-portage/getdelta-0.7.9-r2 b/metadata/md5-cache/app-portage/getdelta-0.7.9-r2
index 8f06988951d4..b20ba7d1e36e 100644
--- a/metadata/md5-cache/app-portage/getdelta-0.7.9-r2
+++ b/metadata/md5-cache/app-portage/getdelta-0.7.9-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst prepare
DESCRIPTION=dynamic deltup client
EAPI=5
HOMEPAGE=http://linux01.gwdg.de/~nlissne/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~alpha ~amd64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=app-portage/deltup dev-util/bdelta
SLOT=0
SRC_URI=http://linux01.gwdg.de/~nlissne/getdelta-0.7.8.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=7e11205d0be8e3c6f2d00ccb01e74692
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=99b49220d90f9e8146b75b6afc543621
diff --git a/metadata/md5-cache/app-shells/posh-0.14.1 b/metadata/md5-cache/app-shells/posh-0.14.1
index 0367832f9efd..cd2512817291 100644
--- a/metadata/md5-cache/app-shells/posh-0.14.1
+++ b/metadata/md5-cache/app-shells/posh-0.14.1
@@ -1,6 +1,5 @@
BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure prepare
-DEPEND=app-arch/xz-utils
DESCRIPTION=Reimplementation of Bourne shell based on pdksh
EAPI=7
HOMEPAGE=https://salsa.debian.org/clint/posh
@@ -10,4 +9,4 @@ LICENSE=GPL-2+ BSD public-domain
SLOT=0
SRC_URI=https://salsa.debian.org/clint/posh/-/archive/debian/0.14.1/posh-debian-0.14.1.tar.bz2
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=0ef20ed9e3d7013cc58c33dcd77f6b5a
+_md5_=32eb906fd55a98b747c6cc0b3171e5ee
diff --git a/metadata/md5-cache/app-shells/tcsh-6.22.02 b/metadata/md5-cache/app-shells/tcsh-6.22.02
index f75e75a057e2..1a20d3d81928 100644
--- a/metadata/md5-cache/app-shells/tcsh-6.22.02
+++ b/metadata/md5-cache/app-shells/tcsh-6.22.02
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv sys-devel/gettext doc? ( dev-l
DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
EAPI=6
HOMEPAGE=https://www.tcsh.org/
-INHERIT=eutils flag-o-matic autotools prefix
+INHERIT=epatch flag-o-matic autotools prefix
IUSE=nls doc
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv
RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.22.02.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=073edecccdc79d3486676716717ffed8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=96d0411cecf59a00b73fb1222116f16e
diff --git a/metadata/md5-cache/app-text/antiword-0.37-r1 b/metadata/md5-cache/app-text/antiword-0.37-r1
index aadaf328a5f5..d8c7d2564ad5 100644
--- a/metadata/md5-cache/app-text/antiword-0.37-r1
+++ b/metadata/md5-cache/app-text/antiword-0.37-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=free MS Word reader
EAPI=5
HOMEPAGE=http://www.winfield.demon.nl
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=kde
KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz https://dev.gentoo.org/~grobian/distfiles/antiword-gentoo-patches-r2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d5ed9501cf71e1a8f06d1a5e6a0108bb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=946a282da14a1dad055efba6bc0dbbf1
diff --git a/metadata/md5-cache/app-text/blahtexml-0.9 b/metadata/md5-cache/app-text/blahtexml-0.9
index ab4feafda352..785d2a4f578e 100644
--- a/metadata/md5-cache/app-text/blahtexml-0.9
+++ b/metadata/md5-cache/app-text/blahtexml-0.9
@@ -3,12 +3,12 @@ DEPEND=dev-libs/xerces-c virtual/pkgconfig doc? ( app-text/texlive-core dev-libs
DESCRIPTION=TeX-to-MathML converter
EAPI=5
HOMEPAGE=http://gva.noekeon.org/blahtexml
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=doc
KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86
LICENSE=BSD CC-BY-3.0 ZLIB
RDEPEND=dev-libs/xerces-c
SLOT=0
SRC_URI=http://gva.noekeon.org/blahtexml/blahtexml-0.9-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ffe0ee423bf53a5f6f8c9e59c7490d33
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=8f364fdc6979fd779046dacee749608d
diff --git a/metadata/md5-cache/app-text/bogosort-0.4.2-r1 b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
index b950d7870474..413554fff57d 100644
--- a/metadata/md5-cache/app-text/bogosort-0.4.2-r1
+++ b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=A file sorting program which uses the bogosort algorithm
EAPI=5
HOMEPAGE=http://www.lysator.liu.se/~qha/bogosort/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ulrik.haugen.se/pub/unix/bogosort/bogosort-0.4.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=3248c203ae92e952848413112ddf535b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=5c59e1925da676197a4a5dea3f6cc411
diff --git a/metadata/md5-cache/app-text/chasen-2.4.4-r3 b/metadata/md5-cache/app-text/chasen-2.4.4-r3
index 21f9695827f0..b8619dcac9ee 100644
--- a/metadata/md5-cache/app-text/chasen-2.4.4-r3
+++ b/metadata/md5-cache/app-text/chasen-2.4.4-r3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/darts-0.32 dev-lang/perl:=[-build(-)]
DESCRIPTION=Japanese Morphological Analysis System, ChaSen
EAPI=5
HOMEPAGE=http://chasen-legacy.sourceforge.jp/
-INHERIT=eutils ltprune perl-module
+INHERIT=epatch ltprune perl-module
IUSE=perl static-libs
KEYWORDS=amd64 ppc ~ppc64 x86 ~sparc-solaris
LICENSE=BSD
@@ -11,5 +11,5 @@ PDEPEND=>=app-dicts/ipadic-2.7.0
RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=d8be9bab283cacad5ea1f6195e0ab458
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=0332c3b5b0ad2fb2d6537296831189f0
diff --git a/metadata/md5-cache/app-text/code2html-0.9.1-r2 b/metadata/md5-cache/app-text/code2html-0.9.1-r2
index fa4f877655ec..6b35a6c7f9af 100644
--- a/metadata/md5-cache/app-text/code2html-0.9.1-r2
+++ b/metadata/md5-cache/app-text/code2html-0.9.1-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Converts source files to colored HTML output
EAPI=5
HOMEPAGE=http://www.palfrader.org/code2html/
-INHERIT=eutils prefix
+INHERIT=epatch prefix
KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=MIT
RDEPEND=>=dev-lang/perl-5
SLOT=0
SRC_URI=http://www.palfrader.org/code2html/all/code2html-0.9.1.tar.gz mirror://gentoo/code2html-0.9.1-gentoo_patches.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=d78cb3ca5b3befda1522107eff2a4fd6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=21d858d799ddd26d9c539e8685399f16
diff --git a/metadata/md5-cache/app-text/htmltidy-20090325-r2 b/metadata/md5-cache/app-text/htmltidy-20090325-r2
index 54d32da139cf..5088f85211d9 100644
--- a/metadata/md5-cache/app-text/htmltidy-20090325-r2
+++ b/metadata/md5-cache/app-text/htmltidy-20090325-r2
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20
DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
EAPI=5
HOMEPAGE=http://tidy.sourceforge.net/
-INHERIT=eutils autotools
+INHERIT=epatch autotools
IUSE=debug doc static-libs
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=7b2a057c34632df2aa8bf0d84d75a8a8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=b61f478ff253cc88d2b0d5bc244f5d1b
diff --git a/metadata/md5-cache/app-text/languagetool-4.5 b/metadata/md5-cache/app-text/languagetool-4.5
index 6a29c0373a58..7bd660be47fd 100644
--- a/metadata/md5-cache/app-text/languagetool-4.5
+++ b/metadata/md5-cache/app-text/languagetool-4.5
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=A proof-reading tool for many languages
EAPI=7
HOMEPAGE=https://www.languagetool.org/
@@ -11,4 +12,4 @@ RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4
SLOT=0
SRC_URI=https://www.languagetool.org/download/LanguageTool-4.5.zip
_eclasses_=java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
-_md5_=2c27b5fefd55f57e7bd73ced6d8c1f64
+_md5_=4af852df277303b01f8259a84398adcf
diff --git a/metadata/md5-cache/app-text/languagetool-4.6 b/metadata/md5-cache/app-text/languagetool-4.6
index 28fbbf52e6d1..55110fbe2be5 100644
--- a/metadata/md5-cache/app-text/languagetool-4.6
+++ b/metadata/md5-cache/app-text/languagetool-4.6
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=A proof-reading tool for many languages
EAPI=7
HOMEPAGE=https://www.languagetool.org/
@@ -11,4 +12,4 @@ RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4
SLOT=0
SRC_URI=https://www.languagetool.org/download/LanguageTool-4.6.zip
_eclasses_=java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=14bd3759a2686ca8fed7235a84b8bc44
+_md5_=2c7d7c9acf29c691c30482d3e4126abe
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index 489d37fbf127..52eb024429dd 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -3,7 +3,7 @@ DEPEND=net-libs/libnsl:0= nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-t
DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
EAPI=5
HOMEPAGE=http://openjade.sourceforge.net/
-INHERIT=eutils flag-o-matic ltprune
+INHERIT=epatch flag-o-matic ltprune
IUSE=doc nls static-libs test
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=net-libs/libnsl:0=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=7f4d16c161b98506147c6f789c2379eb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=370c868c25defbe3d922cfc2920b4b1a
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
index 17378de43927..b7b272b11a84 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r6
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -3,7 +3,7 @@ DEPEND=elibc_glibc? ( net-libs/libnsl:0= ) nls? ( sys-devel/gettext ) doc? ( app
DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
EAPI=5
HOMEPAGE=http://openjade.sourceforge.net/
-INHERIT=eutils flag-o-matic autotools ltprune
+INHERIT=epatch flag-o-matic autotools ltprune
IUSE=doc elibc_glibc nls static-libs test
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=elibc_glibc? ( net-libs/libnsl:0= )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f4b47019ea9dcd8a7a4cf00ab2409d7c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=f5afcdbd7001464fc542e0a92ee31552
diff --git a/metadata/md5-cache/app-text/paps-0.6.8-r2 b/metadata/md5-cache/app-text/paps-0.6.8-r2
index bb852ec0df8d..864e587c3c11 100644
--- a/metadata/md5-cache/app-text/paps-0.6.8-r2
+++ b/metadata/md5-cache/app-text/paps-0.6.8-r2
@@ -3,11 +3,11 @@ DEPEND=x11-libs/pango virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-pa
DESCRIPTION=Unicode-aware text to PostScript converter
EAPI=5
HOMEPAGE=http://paps.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=amd64 x86
LICENSE=LGPL-2
RDEPEND=x11-libs/pango
SLOT=0
SRC_URI=mirror://sourceforge/paps/paps-0.6.8.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6dc28524d1b3ac393955f178a90cb688
+_md5_=4de5fbb566278fdba82a0494195d92a3
diff --git a/metadata/md5-cache/app-text/pep-2.8-r2 b/metadata/md5-cache/app-text/pep-2.8-r2
index ec64d8c62c8c..716f01c782ff 100644
--- a/metadata/md5-cache/app-text/pep-2.8-r2
+++ b/metadata/md5-cache/app-text/pep-2.8-r2
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=General purpose filter and file cleaning program
EAPI=7
HOMEPAGE=https://hannemyr.com/enjoy/pep.html
@@ -9,4 +9,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=https://hannemyr.com/enjoy/pep28.zip -> pep-2.8.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=cfa7356d88fada480caa7ed4eea71612
+_md5_=093e06d5ecc7a595bedf195dbce7ae0d
diff --git a/metadata/md5-cache/app-text/refbase-0.9.6_p20180223 b/metadata/md5-cache/app-text/refbase-0.9.6_p20180223
index 08b910e98ae8..d971fc95516b 100644
--- a/metadata/md5-cache/app-text/refbase-0.9.6_p20180223
+++ b/metadata/md5-cache/app-text/refbase-0.9.6_p20180223
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst prerm setup
-DEPEND=app-arch/unzip >=app-admin/webapp-config-1.50.15
+DEPEND=>=app-admin/webapp-config-1.50.15
DESCRIPTION=Web-based solution for managing scientific literature, references and citations
EAPI=7
HOMEPAGE=http://www.refbase.net/
@@ -11,4 +12,4 @@ RDEPEND=>=dev-lang/php-5.3[mysql,mysqli(+),session] virtual/httpd-php app-admin/
SLOT=0.9.6_p20180223
SRC_URI=https://sourceforge.net/code-snapshots/svn/r/re/refbase/code/refbase-code-r1422-branches-bleeding-edge.zip -> refbase-0.9.6_p20180223.zip
_eclasses_=webapp 990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=3ecc11f6a99a55b6faecdc1fafe6ead3
+_md5_=cbcfcb36380a69a0753136adf0ec22dc
diff --git a/metadata/md5-cache/app-text/spellutils-0.7 b/metadata/md5-cache/app-text/spellutils-0.7
index 44c6f2aee71a..c0801a30a937 100644
--- a/metadata/md5-cache/app-text/spellutils-0.7
+++ b/metadata/md5-cache/app-text/spellutils-0.7
@@ -3,11 +3,11 @@ DEPEND=nls? ( virtual/libintl )
DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)
EAPI=5
HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=nls
KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=18e123f025320b6214a13402159b6829
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=88e8a9bb951bdce6a769d2da8db8e275
diff --git a/metadata/md5-cache/app-text/talkfilters-2.3.8-r1 b/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
index 620daac8cc85..6869ac000b1a 100644
--- a/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
+++ b/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Convert ordinary English text into text that mimics a stereotyped dialect
EAPI=5
HOMEPAGE=http://www.hyperrealm.com/talkfilters/talkfilters.html
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.hyperrealm.com/talkfilters/talkfilters-2.3.8.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=5622308a5dbef5528878153c405eb6fa
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=326668ac8bb886212faa128ebdf99e3d
diff --git a/metadata/md5-cache/app-text/tkman-2.2-r1 b/metadata/md5-cache/app-text/tkman-2.2-r1
index 3607ca61992d..2424728b9476 100644
--- a/metadata/md5-cache/app-text/tkman-2.2-r1
+++ b/metadata/md5-cache/app-text/tkman-2.2-r1
@@ -3,11 +3,11 @@ DEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
DESCRIPTION=TkMan man and info page browser
EAPI=5
HOMEPAGE=http://tkman.sourceforge.net/
-INHERIT=eutils
+INHERIT=desktop epatch
KEYWORDS=~amd64 ppc sparc x86
LICENSE=Artistic
RDEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
SLOT=0
SRC_URI=mirror://sourceforge/tkman/tkman-2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=70402333ec7a581bd5d883a17834e070
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=17c7849934b6e3d3b184f089a46dc0b7
diff --git a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1 b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
index bb188932a535..966a0f93d87b 100644
--- a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
+++ b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
@@ -3,11 +3,11 @@ DEPEND=>=media-libs/freetype-2.5.1:2
DESCRIPTION=True Type Font to Postscript Type 1 Converter
EAPI=5
HOMEPAGE=http://ttf2pt1.sourceforge.net/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=amd64 ppc sparc x86
LICENSE=ttf2pt1
RDEPEND=>=media-libs/freetype-2.5.1:2
SLOT=0
SRC_URI=mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=9b08c56327fb9591fcda117b79f7e899
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=c3af08cf7009da346080bf94028d6fc7
diff --git a/metadata/md5-cache/app-text/vilistextum-2.6.9-r1 b/metadata/md5-cache/app-text/vilistextum-2.6.9-r1
index f7f81a552fe3..ad30e74ee8d7 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.6.9-r1
+++ b/metadata/md5-cache/app-text/vilistextum-2.6.9-r1
@@ -3,11 +3,11 @@ DEPEND=virtual/libiconv sys-devel/gnuconfig >=app-portage/elt-patches-20170815 |
DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
EAPI=5
HOMEPAGE=https://bhaak.net/vilistextum/
-INHERIT=eutils autotools
+INHERIT=epatch autotools
IUSE=unicode
KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=https://bhaak.net/vilistextum/vilistextum-2.6.9.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=efe276e7b11c969671f47d36fb9f5fd7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=14a49480999a03de6d12979c7b1fa81c
diff --git a/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023-r1 b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023-r1
index 10a7e40ee720..af845df37695 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023-r1
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023-r1
@@ -4,11 +4,11 @@ DEPEND=virtual/libiconv
DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
EAPI=7
HOMEPAGE=https://bhaak.net/vilistextum/
-INHERIT=autotools flag-o-matic
+INHERIT=autotools
IUSE=unicode
KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/bhaak/vilistextum/archive/f299bb5e5f661c345c4b85a3e8de9ad8615ad17a.tar.gz -> vilistextum-2.8.0.20191023.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=b8de5657ece3613088a9d193a8f73622
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=2afc0a1bbf3586e60ff463a459410068
diff --git a/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411 b/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
index a47865679a0c..a0bc81e29127 100644
--- a/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20200411
@@ -4,12 +4,12 @@ DEPEND=virtual/libiconv
DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
EAPI=7
HOMEPAGE=https://bhaak.net/vilistextum/
-INHERIT=autotools flag-o-matic
+INHERIT=autotools
IUSE=unicode
KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/bhaak/vilistextum/archive/06cc8a637efd9097af4f138b1b7c755120ffaa88.tar.gz -> vilistextum-2.8.0.20200411.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=cee07535abebbb6381e5eab1a587615b
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=5aa60a321285772a75433065601b0694
diff --git a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6 b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
index 90934feaea11..06d3e96f0363 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
@@ -3,10 +3,10 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
DESCRIPTION=Convert MS Excel and Powerpoint files to HTML
EAPI=5
HOMEPAGE=http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/
-INHERIT=autotools eutils vcs-clean
+INHERIT=autotools epatch vcs-clean
KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1.orig.tar.gz mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1-6.diff.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=5a02ed0f245231c222848fd9fdf8ee57
+_md5_=fbc4e0531dba347e977e3b0a8349de22
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r2 b/metadata/md5-cache/app-vim/breakpts-4.0-r2
index 140a29eb0d72..ab08f657d3f1 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r2
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r2
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: sets vim breakpoints visually
EAPI=7
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
+INHERIT=vim-plugin
KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=8142 -> breakpts-4.0.zip
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a59ea1334da51d96b7ce61008011eae2
+_md5_=22eedc9ddb91eace8abede60c7b8cd2a
diff --git a/metadata/md5-cache/app-vim/colorschemes-20140623-r1 b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
index e31d3dcfa90c..563f05c5b4d9 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20140623-r1
+++ b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: a collection of color schemes from vim.org
EAPI=5
HOMEPAGE=https://www.vim.org/
-INHERIT=vim-plugin eutils
+INHERIT=edos2unix epatch vim-plugin
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=b3d21ad192ba0e200c5fd4542e13bfab
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590
+_md5_=d3bc28732db6309a9528174c49a717d8
diff --git a/metadata/md5-cache/app-vim/taglist-4.6 b/metadata/md5-cache/app-vim/taglist-4.6
index ff8dabce2e83..b80f7761098d 100644
--- a/metadata/md5-cache/app-vim/taglist-4.6
+++ b/metadata/md5-cache/app-vim/taglist-4.6
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: ctags-based source code browser
EAPI=5
HOMEPAGE=http://vim-taglist.sourceforge.net/
-INHERIT=vim-plugin eutils
+INHERIT=vim-plugin epatch
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=vim
RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d1db00700845c2cf68e99a97ff388aeb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=cad2fbf6e1ccd7b5844f19f7031a4818
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r3 b/metadata/md5-cache/app-vim/vimpython-1.13-r3
index f0f514c45032..fa3573073f90 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r3
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r3
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: A set of menus/shortcuts to work with Python files
EAPI=7
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=30
@@ -12,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
SLOT=0
SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 vim-doc dd0828b15877b2a09c07f4719e45891f vim-plugin 3160d9cb05ef44497be1485db0fe7590 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a
-_md5_=60cd83e3a61a0403fd6eb4966a404e22
+_md5_=ad4db0aaaec2a1e0c03a82a9707621f7
diff --git a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2 b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
index 3ca7d2415329..ca06ca825db3 100644
--- a/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
+++ b/metadata/md5-cache/dev-cpp/antlr-cpp-4.7.2
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=app-arch/unzip dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip
DESCRIPTION=The ANTLR 4 C++ Runtime
EAPI=7
HOMEPAGE=https://www.antlr.org/
@@ -10,4 +9,4 @@ LICENSE=BSD
SLOT=4
SRC_URI=https://www.antlr.org/download/antlr4-cpp-runtime-4.7.2-source.zip -> antlr-cpp-4.7.2.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=91bf8dfc4d3eef0289f34d11abcc28ef
+_md5_=a413c0642082e7864e14e1d99e2f1321
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.2.6.1 b/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
index c719aee09dea..258cfa44a146 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare test
DESCRIPTION=Library for parsing mathematical expressions
EAPI=5
HOMEPAGE=http://muparser.beltoforion.de/
-INHERIT=eutils
+INHERIT=epatch
IUSE=doc test
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/beltoforion/muparser/archive/v2.2.6.1.tar.gz -> muParser-2.2.6.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ef78bae56da531f5043fdcbb359f91f7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=754fe1a22e57c14f4ffafc17d074be4d
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
index 31c8b90cdc39..82386eb1494f 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=JSON for Modern C++
EAPI=7
HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
@@ -12,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/nlohmann/json/archive/v3.6.1.tar.gz -> nlohmann_json-3.6.1.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=f7c0b8bcc56a7939802138416fcdf412
+_md5_=5d0eb8874253995a2e39bfb48c148620
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
index 8f2cf935f5ab..9d79ce81584b 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.0
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=JSON for Modern C++
EAPI=7
HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
@@ -12,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/nlohmann/json/archive/v3.7.0.tar.gz -> nlohmann_json-3.7.0.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=17067ecb8b9bc1590c7559f9c9287893
+_md5_=5de5e0be665cbce9a591a50c04206840
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
index dabe563df24c..3a90a4c7a165 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.7.3
@@ -1,6 +1,5 @@
-BDEPEND=dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=JSON for Modern C++
EAPI=7
HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
@@ -12,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/nlohmann/json/archive/v3.7.3.tar.gz -> nlohmann_json-3.7.3.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=a3bad4646d66d2816f67e01bfb8166fe
+_md5_=404989b9f86f133c3276c3201a8c09c0
diff --git a/metadata/md5-cache/dev-cpp/tclap-1.2.2 b/metadata/md5-cache/dev-cpp/tclap-1.2.2
index d5c7d8b3d3fa..26ce9a8cfc63 100644
--- a/metadata/md5-cache/dev-cpp/tclap-1.2.2
+++ b/metadata/md5-cache/dev-cpp/tclap-1.2.2
@@ -1,5 +1,5 @@
+BDEPEND=doc? ( app-doc/doxygen )
DEFINED_PHASES=configure install test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Simple templatized C++ library for parsing command line arguments
EAPI=7
HOMEPAGE=http://tclap.sourceforge.net
@@ -8,4 +8,4 @@ KEYWORDS=amd64 ~arm arm64 ppc x86 ~amd64-linux
LICENSE=MIT
SLOT=0
SRC_URI=mirror://sourceforge/tclap/tclap-1.2.2.tar.gz
-_md5_=a9b520534f3bfb0230415213b0652ac2
+_md5_=81e56fd1c3e2b0b9ba2d136301422cfc
diff --git a/metadata/md5-cache/dev-db/apgdiff-2.4 b/metadata/md5-cache/dev-db/apgdiff-2.4
index f3f885254c10..bab90b455cae 100644
--- a/metadata/md5-cache/dev-db/apgdiff-2.4
+++ b/metadata/md5-cache/dev-db/apgdiff-2.4
@@ -1,9 +1,9 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/zip:0 test? ( dev-java/hamcrest-core:0 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 >=dev-java/ant-core-1.7.0:0 >=dev-java/ant-junit-1.7.0:0 app-arch/unzip:0 test? ( dev-java/hamcrest-core:0 >=dev-java/junit-4.4:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=A simple PostgreSQL diff tool that is useful for schema upgrades
EAPI=5
HOMEPAGE=https://apgdiff.com
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=MIT
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://apgdiff.com/download/apgdiff-2.4-src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=85caa393b21c1987b40f465f39c0e27c
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=14c0c8041be6f9c0e16752f849991b41
diff --git a/metadata/md5-cache/dev-db/cdb-0.75-r4 b/metadata/md5-cache/dev-db/cdb-0.75-r4
index 4ecda4c18561..35a9257b1827 100644
--- a/metadata/md5-cache/dev-db/cdb-0.75-r4
+++ b/metadata/md5-cache/dev-db/cdb-0.75-r4
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
+DEPEND=!dev-db/tinycdb
DESCRIPTION=Fast, reliable, simple package for creating and reading constant databases
EAPI=5
HOMEPAGE=http://cr.yp.to/cdb.html
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
-RDEPEND=>=sys-apps/sed-4 !dev-db/tinycdb
+RDEPEND=!dev-db/tinycdb
SLOT=0
SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=6fc047d78f1de30b3387c7ee6f3161af
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=8d1c6daed035c1cae088266b747e7b68
diff --git a/metadata/md5-cache/dev-db/henplus-0.9.8-r1 b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
index 9d18b8da077f..f32001bcc0f9 100644
--- a/metadata/md5-cache/dev-db/henplus-0.9.8-r1
+++ b/metadata/md5-cache/dev-db/henplus-0.9.8-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=de
DESCRIPTION=Java-based multisession SQL shell for databases with JDBC support
EAPI=5
HOMEPAGE=http://henplus.sf.net
-INHERIT=java-pkg-2 eutils java-ant-2
+INHERIT=java-pkg-2 epatch java-ant-2
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-cli:1 dev-java/libreadline-java:0 >=d
SLOT=0
SRC_URI=mirror://sourceforge/henplus/henplus-0.9.8.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=7a814decd2bebd017e8ee3d9017035c4
+_md5_=050c95969aa6be22d72fd0a3a9473baf
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
index 7f910cbedb53..dde77620f514 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
@@ -3,7 +3,7 @@ DEPEND=java-virtuals/servlet-api:2.5 >=virtual/jdk-1.5 app-arch/unzip test? ( de
DESCRIPTION=The leading SQL relational database engine written in Java
EAPI=5
HOMEPAGE=http://hsqldb.org
-INHERIT=eutils user versionator java-pkg-2 java-ant-2
+INHERIT=epatch user versionator java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD GPL-2
@@ -11,5 +11,5 @@ RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=2718cb76eb522285492691255f28ec22
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=c6e23f7b60b765ee628705a71c0b2c19
diff --git a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r2 b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r2
index d47d53c80742..47838205b94f 100644
--- a/metadata/md5-cache/dev-db/libodbc++-0.2.5-r2
+++ b/metadata/md5-cache/dev-db/libodbc++-0.2.5-r2
@@ -3,12 +3,12 @@ DEPEND=dev-db/unixODBC sys-libs/ncurses
DESCRIPTION=Provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC
EAPI=5
HOMEPAGE=http://libodbcxx.sourceforge.net/
-INHERIT=eutils flag-o-matic
+INHERIT=epatch flag-o-matic
IUSE=static-libs
KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-db/unixODBC sys-libs/ncurses
SLOT=0
SRC_URI=mirror://sourceforge/libodbcxx/libodbc++-0.2.5.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=15f0a292a0123748903b9e0c6f9f58fc
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=b2b41bf8922a1ecf1b89c70bd4e29580
diff --git a/metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2 b/metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
index 792b5bdabfe5..9ee7c2d5d717 100644
--- a/metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
+++ b/metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
@@ -3,11 +3,11 @@ DEPEND=dev-lang/mono sys-apps/dbus virtual/pkgconfig sys-devel/gnuconfig >=app-p
DESCRIPTION=D-Bus for .NET
EAPI=5
HOMEPAGE=https://github.com/mono/dbus-sharp
-INHERIT=autotools mono-env eutils
+INHERIT=autotools mono-env epatch
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=dev-lang/mono sys-apps/dbus
SLOT=1.0
SRC_URI=https://github.com/downloads/mono/dbus-sharp/dbus-sharp-0.7.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 mono-env 1f24c032c78290b0d9a07d5b343051a7
-_md5_=0531a3cfc64b9fde15c43287273eb293
+_md5_=2758bbe4605488d812147c156f20d371
diff --git a/metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.1 b/metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.1
index d4f0c8d7c57f..fa16ff9648e3 100644
--- a/metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.1
+++ b/metadata/md5-cache/dev-dotnet/dbus-sharp-0.8.1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/mono sys-apps/dbus virtual/pkgconfig sys-devel/gnuconfig >=app-p
DESCRIPTION=D-Bus for .NET
EAPI=5
HOMEPAGE=https://github.com/mono/dbus-sharp
-INHERIT=autotools mono-env eutils
+INHERIT=autotools mono-env
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=dev-lang/mono sys-apps/dbus
SLOT=2.0
SRC_URI=https://github.com/mono/dbus-sharp/releases/download/v0.8.1/dbus-sharp-0.8.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 mono-env 1f24c032c78290b0d9a07d5b343051a7
-_md5_=82a055cddf0ccb0ddb68359ef3b142f3
+_md5_=49a4e03fec8145e0a6f86d5039a4d0f4
diff --git a/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2 b/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
index d484301cdff6..dcff35e68c35 100644
--- a/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
+++ b/metadata/md5-cache/dev-dotnet/monocalendar-0.7.2
@@ -3,10 +3,11 @@ DEPEND=>=dev-lang/mono-1.2.1
DESCRIPTION=iCal clone for .NET
EAPI=7
HOMEPAGE=http://www.monocalendar.com/
+INHERIT=mono wrapper
KEYWORDS=~amd64 x86
LICENSE=GPL-2+
RDEPEND=>=dev-lang/mono-1.2.1
SLOT=0
SRC_URI=mirror://sourceforge/monocalendar/monocalendar-source-0.7.2.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e mono 6b9c26a7a64b4530f483c30a494ac0a1 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1c54a9afbd83fcf9d58d072e18743442
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 mono 6b9c26a7a64b4530f483c30a494ac0a1 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=2fc545e1f7651a4c31c8857859e43694
diff --git a/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305-r1 b/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305-r1
index deb8d05f9d94..1d72badb9f3e 100644
--- a/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305-r1
+++ b/metadata/md5-cache/dev-dotnet/notify-sharp-0.4.0_pre20090305-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/mono-1.1.13 >=dev-dotnet/gtk-sharp-2.10.1 >=dev-dotnet/dbus-sh
DESCRIPTION=a C# client implementation for Desktop Notifications
EAPI=5
HOMEPAGE=http://www.ndesk.org/NotifySharp
-INHERIT=autotools eutils mono-env
+INHERIT=autotools epatch mono-env
IUSE=doc
KEYWORDS=amd64 x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/mono-1.1.13 >=dev-dotnet/gtk-sharp-2.10.1 >=dev-dotnet/dbus-s
SLOT=0
SRC_URI=mirror://gentoo/notify-sharp-20090305.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 mono-env 1f24c032c78290b0d9a07d5b343051a7
-_md5_=f2f2fa6163296a62f1a368a6b5687ab9
+_md5_=73800419ff9e85d5863d3b06fd4a29f4
diff --git a/metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0 b/metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0
index 1f8c95f91add..e1eeb610a84d 100644
--- a/metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0
+++ b/metadata/md5-cache/dev-embedded/freaklabs-boards-1.0.0
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
DESCRIPTION=Arduino hardware definitions for freaklabs boards
EAPI=7
HOMEPAGE=https://freaklabs.org/chibiarduino/
@@ -8,4 +8,4 @@ LICENSE=BSD
PDEPEND=dev-embedded/arduino
SLOT=0
SRC_URI=https://freaklabs.org/pub/chibiArduino/boards/freaklabs-v1.0.0-manual%20install.zip -> freaklabs-v1.0.0-manual-install.zip
-_md5_=fd33c11f179f7813fb5b36b13fe24eb1
+_md5_=61c5ad4997f401df5877b95832d4f4c3
diff --git a/metadata/md5-cache/dev-embedded/pk2cmd-1.20 b/metadata/md5-cache/dev-embedded/pk2cmd-1.20
index 4426f838b8c5..e0189d78d8b5 100644
--- a/metadata/md5-cache/dev-embedded/pk2cmd-1.20
+++ b/metadata/md5-cache/dev-embedded/pk2cmd-1.20
@@ -3,11 +3,11 @@ DEPEND=virtual/libusb:0
DESCRIPTION=An application for working with the Microchip PicKit2 PIC programmer
EAPI=5
HOMEPAGE=http://www.microchip.com/pickit2
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ppc ppc64 ~x86
LICENSE=MicroChip-PK2
RDEPEND=virtual/libusb:0
SLOT=0
SRC_URI=http://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=93e9079a35e1837adea4608fa26309a8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ee55e53e060398162c1e59f364d961f1
diff --git a/metadata/md5-cache/dev-embedded/sunxi-tools-1.2 b/metadata/md5-cache/dev-embedded/sunxi-tools-1.2
index d0749bad648d..451820713e62 100644
--- a/metadata/md5-cache/dev-embedded/sunxi-tools-1.2
+++ b/metadata/md5-cache/dev-embedded/sunxi-tools-1.2
@@ -3,10 +3,10 @@ DEPEND=virtual/libusb
DESCRIPTION=Tools for Allwinner A10 devices.
EAPI=5
HOMEPAGE=http://linux-sunxi.org/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.2.tar.gz -> sunxi-tools-1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=35593c1b42d43737beadf1376be94676
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d99fb241493dc4b2b0e509a6396c88a9
diff --git a/metadata/md5-cache/dev-embedded/urjtag-0.10-r1 b/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
index b2516565e9c8..c54de8e8a21c 100644
--- a/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
+++ b/metadata/md5-cache/dev-embedded/urjtag-0.10-r1
@@ -3,12 +3,12 @@ DEPEND=ftdi? ( dev-embedded/libftdi:0 ) readline? ( sys-libs/readline:= ) usb? (
DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
EAPI=5
HOMEPAGE=http://urjtag.sourceforge.net/
-INHERIT=eutils ltprune multilib
+INHERIT=ltprune
IUSE=ftdi readline usb
KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 ) !dev-embedded/jtag
SLOT=0
SRC_URI=mirror://sourceforge/urjtag/urjtag-0.10.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f52ef50248edab4383fe0191a4e478e7
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=eb3d286c0ec835aa6cd4123d2658e64e
diff --git a/metadata/md5-cache/dev-games/flatzebra-0.1.6 b/metadata/md5-cache/dev-games/flatzebra-0.1.6
index 68c1597a8117..585add7a1d2e 100644
--- a/metadata/md5-cache/dev-games/flatzebra-0.1.6
+++ b/metadata/md5-cache/dev-games/flatzebra-0.1.6
@@ -3,12 +3,12 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtua
DESCRIPTION=A generic game engine for 2D double-buffering animation
EAPI=5
HOMEPAGE=https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=static-libs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
SLOT=0
SRC_URI=https://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=cd4e36ca98a02c2e3ffa087f9b92d3c4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=64919511c91e63f87691b11aedd37eac
diff --git a/metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901 b/metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901
index 38a036f84e23..8b1bc15c01d2 100644
--- a/metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901
+++ b/metadata/md5-cache/dev-games/hdl_dump-0.8.6.20060901
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=game installer for playstation 2 HD Loader
EAPI=5
HOMEPAGE=http://www.psx-scene.com/hdldump/
-INHERIT=eutils toolchain-funcs versionator
+INHERIT=epatch toolchain-funcs versionator
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.psx-scene.com/hdldump/hdl_dumx-0.8.6-20060901-src.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=292f52a7aa77bffb47eccf8d9b800b6d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=0f1e37076f890e827bfcebc905d8b442
diff --git a/metadata/md5-cache/dev-games/higan-ananke-094 b/metadata/md5-cache/dev-games/higan-ananke-094
index 26e82e6e4ae6..f0b6b7d425aa 100644
--- a/metadata/md5-cache/dev-games/higan-ananke-094
+++ b/metadata/md5-cache/dev-games/higan-ananke-094
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=A higan helper library needed for extra rom load options
EAPI=5
HOMEPAGE=http://byuu.org/higan/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://byuu.org/files/higan_v094-source.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f3393e29b8757cf8233ff4d2dbf47d88
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=3794d743ccdfe5f11b282d70f7b8bd68
diff --git a/metadata/md5-cache/dev-games/mercator-0.3.3 b/metadata/md5-cache/dev-games/mercator-0.3.3
index 2d9a48f2ed37..1c5fb2712c4b 100644
--- a/metadata/md5-cache/dev-games/mercator-0.3.3
+++ b/metadata/md5-cache/dev-games/mercator-0.3.3
@@ -3,12 +3,12 @@ DEPEND=>=dev-games/wfmath-1 doc? ( app-doc/doxygen ) virtual/pkgconfig
DESCRIPTION=WorldForge library primarily aimed at terrain
EAPI=5
HOMEPAGE=https://www.worldforge.org/index.php/components/mercator/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=doc
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=dev-games/wfmath-1
SLOT=0
SRC_URI=mirror://sourceforge/worldforge/mercator-0.3.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=9a0ebe58a8c23f465491b3d25e488f13
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=3a3abdbffa3e7745fab2ad1640ca2a2b
diff --git a/metadata/md5-cache/dev-games/ode-0.11.1 b/metadata/md5-cache/dev-games/ode-0.11.1
index 0fa02c3dc4ad..036f96321a1c 100644
--- a/metadata/md5-cache/dev-games/ode-0.11.1
+++ b/metadata/md5-cache/dev-games/ode-0.11.1
@@ -3,12 +3,12 @@ DEPEND=examples? ( virtual/opengl ) doc? ( app-doc/doxygen )
DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=debug doc double-precision examples gyroscopic static-libs
KEYWORDS=amd64 x86
LICENSE=|| ( LGPL-2.1 BSD )
RDEPEND=examples? ( virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/opende/ode-0.11.1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=df3620074d16f8fb7612d9ae97483709
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=940cc71e2de9cb5eb05868f29f9da2c2
diff --git a/metadata/md5-cache/dev-games/ode-0.12 b/metadata/md5-cache/dev-games/ode-0.12
index f99009dce8de..7d87b7f39c52 100644
--- a/metadata/md5-cache/dev-games/ode-0.12
+++ b/metadata/md5-cache/dev-games/ode-0.12
@@ -3,12 +3,12 @@ DEPEND=examples? ( virtual/opengl ) doc? ( app-doc/doxygen )
DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=debug doc double-precision examples gyroscopic static-libs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-2.1 BSD )
RDEPEND=examples? ( virtual/opengl )
SLOT=0
SRC_URI=mirror://sourceforge/opende/ode-0.12.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ef9af16a2279d0abb4d75cb7fa9c4a45
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=b26bbce92b7e3bc1342f58ca1db76223
diff --git a/metadata/md5-cache/dev-games/ode-0.14-r1 b/metadata/md5-cache/dev-games/ode-0.14-r1
index 9b8fbf6db570..8151ad995a0e 100644
--- a/metadata/md5-cache/dev-games/ode-0.14-r1
+++ b/metadata/md5-cache/dev-games/ode-0.14-r1
@@ -3,7 +3,7 @@ DEPEND=examples? ( virtual/glu virtual/opengl ) doc? ( app-doc/doxygen ) sys-dev
DESCRIPTION=Open Dynamics Engine SDK
EAPI=5
HOMEPAGE=http://ode.org/
-INHERIT=autotools eutils ltprune
+INHERIT=autotools epatch ltprune
IUSE=debug doc double-precision examples gyroscopic static-libs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( LGPL-2.1+ BSD )
@@ -11,4 +11,4 @@ RDEPEND=examples? ( virtual/glu virtual/opengl )
SLOT=0/6
SRC_URI=https://bitbucket.org/odedevs/ode/downloads/ode-0.14.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a7cf4d40658c168c5e6a0af81f39849c
+_md5_=f3bfe85f959a84b197eb39ab3a3ec4ce
diff --git a/metadata/md5-cache/dev-games/poker-eval-138.0 b/metadata/md5-cache/dev-games/poker-eval-138.0
index 4bdd69193fff..dc00b7c6bc33 100644
--- a/metadata/md5-cache/dev-games/poker-eval-138.0
+++ b/metadata/md5-cache/dev-games/poker-eval-138.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
DESCRIPTION=A fast C library for evaluating poker hands
EAPI=5
HOMEPAGE=http://gna.org/projects/pokersource/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=static-libs
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://download.gna.org/pokersource/sources/poker-eval-138.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=85a13f9596fb4e1ff8c369cfb0dba9f5
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=7234daec77284534e0ae3cbf17b818d9
diff --git a/metadata/md5-cache/dev-games/wfmath-1.0.2 b/metadata/md5-cache/dev-games/wfmath-1.0.2
index eaf02b511440..ecb6523d06f1 100644
--- a/metadata/md5-cache/dev-games/wfmath-1.0.2
+++ b/metadata/md5-cache/dev-games/wfmath-1.0.2
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen ) virtual/pkgconfig
DESCRIPTION=Worldforge math library
EAPI=5
HOMEPAGE=http://www.worldforge.org/dev/eng/libraries/wfmath
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=doc static-libs
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/worldforge/wfmath-1.0.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ceb11c4c6ec8fd70759c75945505dd8c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=e15cc6c5286c740621f0225a089e79f8
diff --git a/metadata/md5-cache/dev-java/antlr-3.2 b/metadata/md5-cache/dev-java/antlr-3.2
index 1c6090916394..236f47eb6b00 100644
--- a/metadata/md5-cache/dev-java/antlr-3.2
+++ b/metadata/md5-cache/dev-java/antlr-3.2
@@ -3,7 +3,7 @@ DEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jdk-1.6 t
DESCRIPTION=A parser generator for many languages
EAPI=5
HOMEPAGE=https://www.antlr3.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=doc test elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 dev-java/stringtemplate:0 >=virtual/jre-1.6
RESTRICT=!test? ( test )
SLOT=3
SRC_URI=https://www.antlr3.org/download/antlr-3.2.tar.gz https://www.antlr3.org/download/antlr-3.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=4496f50527a9e75ee811e52590c6493a
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=10f18d1ad5a2642f00c66be5ce606723
diff --git a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2 b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2
index 4546d58337dc..d45aaa141281 100644
--- a/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2
+++ b/metadata/md5-cache/dev-java/apple-java-extensions-bin-1.5-r2
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=Apple eAWT and eIO APIs for Java on Mac OS X
EAPI=7
HOMEPAGE=http://developer.apple.com/samplecode/AppleJavaExtensions/
@@ -11,4 +12,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=http://developer.apple.com/samplecode/AppleJavaExtensions/AppleJavaExtensions.zip -> apple-java-extensions-bin-1.5.zip
_eclasses_=java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
-_md5_=e0c458eae0377e11a916bce713ff9437
+_md5_=8f75938ec571972f0ceff3204e4ac07f
diff --git a/metadata/md5-cache/dev-java/batik-1.9 b/metadata/md5-cache/dev-java/batik-1.9
index 0f7cbb971f04..59aa12667b53 100644
--- a/metadata/md5-cache/dev-java/batik-1.9
+++ b/metadata/md5-cache/dev-java/batik-1.9
@@ -3,12 +3,12 @@ DEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0
DESCRIPTION=Java based SVG toolkit
EAPI=5
HOMEPAGE=https://xmlgraphics.apache.org/batik/
-INHERIT=java-pkg-2 java-ant-2 eutils
+INHERIT=java-pkg-2 java-ant-2 epatch
IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=tcl? ( dev-java/jacl:0 ) python? ( dev-java/jython:2.7 ) dev-java/xalan:0 dev-java/rhino:1.6 dev-java/ant-core:0 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
SLOT=1.9
SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.9.tar.gz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=e13f44adff2045fbedb3e2b378db5d45
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=338e256f593ff733b6548dbe496b7a81
diff --git a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1 b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
index 7e65675f59ff..2c3eaf0dae5e 100644
--- a/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
+++ b/metadata/md5-cache/dev-java/browserlauncher2-1.3-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source?
DESCRIPTION=A library that facilitates opening a browser from a Java application
EAPI=5
HOMEPAGE=http://browserlaunch2.sourceforge.net/
-INHERIT=versionator eutils java-pkg-2 java-ant-2
+INHERIT=versionator java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=mirror://sourceforge/browserlaunch2/BrowserLauncher2-all-1_3.jar
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=056a7e762172a7d19845b67f854ad4ef
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=71a77b3bc70e575e987926eb92f4298b
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index 3cf5b93bad08..21aae3a1f60b 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -3,7 +3,7 @@ DEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? (
DESCRIPTION=Bean Script Framework
EAPI=5
HOMEPAGE=http://commons.apache.org/bsf/
-INHERIT=java-pkg-2 eutils java-ant-2
+INHERIT=java-pkg-2 epatch java-ant-2
IUSE=javascript python tcl elibc_FreeBSD doc examples source elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -11,4 +11,4 @@ RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl?
SLOT=2.3
SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=704470d942a3f59259979f47f5af2b0a
+_md5_=3adbb1c06dc3758660e387b8d7ff6837
diff --git a/metadata/md5-cache/dev-java/cdi-api-1.2 b/metadata/md5-cache/dev-java/cdi-api-1.2
index b93a8559c878..3cb345f2c366 100644
--- a/metadata/md5-cache/dev-java/cdi-api-1.2
+++ b/metadata/md5-cache/dev-java/cdi-api-1.2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/javax-inject:0 dev-java/glassfi
DESCRIPTION=Contexts and Dependency Injection for the Java EE platform
EAPI=5
HOMEPAGE=http://www.cdi-spec.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 dev-java/javax-inject:0 dev-java/glassfish-interceptor-api:0 dev-java/tomcat-servlet-api:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.2
SRC_URI=https://repo1.maven.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=c8b290a8f7447ddb716ee18f507db8d6
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=184d43da5917c156129aafd5d6ba57b7
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index 03255f053e7e..79c52d50b106 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Java Libraries for High Performance Scientific and Technical Computing
EAPI=5
HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
-INHERIT=java-pkg-2 java-ant-2 eutils
+INHERIT=java-pkg-2 java-ant-2 epatch
IUSE=elibc_FreeBSD source doc elibc_FreeBSD
KEYWORDS=amd64 ~ppc64 x86
LICENSE=colt
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
SLOT=0
SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=781551ead868c012ad6700aeda7d9cb3
+_md5_=3f0bfb487d19b49e97898d868ef08ed4
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
index 62aac70f3297..9108f2113bb6 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 test-framework? ( dev-java/junit:0 dev-java/ant-junit:0
DESCRIPTION=Jakarta-Commons Collections Component
EAPI=5
HOMEPAGE=http://commons.apache.org/collections/
-INHERIT=java-pkg-2 java-ant-2 java-utils-2 eutils
+INHERIT=java-pkg-2 java-ant-2 java-utils-2 epatch
IUSE=test-framework elibc_FreeBSD doc source test elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=91470b8eca2b91f40554282cbeeb8cce
+_md5_=e7735564a0e4a1f96780ad29234cd239
diff --git a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2 b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
index 63bffabec62f..9a56825e71b9 100644
--- a/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
+++ b/metadata/md5-cache/dev-java/commons-configuration-1.6-r2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/commo
DESCRIPTION=Generic interface for reading configuration data from a variety of sources
EAPI=5
HOMEPAGE=http://commons.apache.org/configuration/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/commons-beanutils-1.7.0:1.7 >=dev-java/comm
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/commons/configuration/source/commons-configuration-1.6-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=88bee06e21f24580fae2b1a7b1cfbe34
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=2ff836049931a66442730975676dee62
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index 1d224e0466e2..862d944b96f9 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-jav
DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
EAPI=5
HOMEPAGE=http://commons.apache.org/digester/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=854e05e28977f2a66ee001c98a33e6ce
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=5a16d407129f4ee525c3e9ca54ad6cb0
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
index 3b31234c15e6..4b0c21a25fee 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-colle
DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
EAPI=5
HOMEPAGE=http://commons.apache.org/digester/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-coll
RESTRICT=!test? ( test ) !test? ( test )
SLOT=2.1
SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=5b2b3bbc2c35d4cba73f564cc5bdbd08
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=7e2e07707d9e4d4bb3979c895f57d000
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r2 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
index a7ea7d16df26..f07e33d55335 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-j
DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects
EAPI=5
HOMEPAGE=http://commons.apache.org/digester/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-
RESTRICT=!test? ( test ) !test? ( test )
SLOT=3.2
SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=e55c359a6450415af0aa4a37ba7ce9a0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=28f2ea2ebe2a0ea9c2cb8854c60ecca3
diff --git a/metadata/md5-cache/dev-java/commons-el-1.0-r3 b/metadata/md5-cache/dev-java/commons-el-1.0-r3
index 28ff9f0382fd..3d2122c85230 100644
--- a/metadata/md5-cache/dev-java/commons-el-1.0-r3
+++ b/metadata/md5-cache/dev-java/commons-el-1.0-r3
@@ -3,12 +3,12 @@ DEPEND=java-virtuals/servlet-api:2.5 >=virtual/jdk-1.4 >=dev-java/java-config-2.
DESCRIPTION=EL is the JSP 2.0 Expression Language Interpreter from Apache
EAPI=5
HOMEPAGE=http://commons.apache.org/el/
-INHERIT=eutils java-pkg-2 java-ant-2 java-osgi
+INHERIT=epatch java-pkg-2 java-ant-2 java-osgi
IUSE=elibc_FreeBSD source elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-1.1
RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://apache/jakarta/commons/el/source/commons-el-1.0-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
-_md5_=4cf831fcaa935ff30a082cb6b86aefd1
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
+_md5_=f48a1c3c1222fea9287b84c00aa91073
diff --git a/metadata/md5-cache/dev-java/commons-fileupload-1.3 b/metadata/md5-cache/dev-java/commons-fileupload-1.3
index d1f85643cd11..68eaa343e239 100644
--- a/metadata/md5-cache/dev-java/commons-fileupload-1.3
+++ b/metadata/md5-cache/dev-java/commons-fileupload-1.3
@@ -3,7 +3,7 @@ DEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.5
DESCRIPTION=High-performance file upload capability to your servlets and web applications
EAPI=5
HOMEPAGE=http://commons.apache.org/fileupload/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/portletapi:1 java-virtuals/servlet-api:2.
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/fileupload/source/commons-fileupload-1.3-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=483b6b4739391c1910eefef426937c70
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=e39d999c61c6f1a87873b82806d074b4
diff --git a/metadata/md5-cache/dev-java/commons-net-3.2 b/metadata/md5-cache/dev-java/commons-net-3.2
index 7df7f623176d..28c038b42d4a 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.2
+++ b/metadata/md5-cache/dev-java/commons-net-3.2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Java library emulating the client side of many basic Internet protocols
EAPI=5
HOMEPAGE=http://commons.apache.org/net/
-INHERIT=eutils java-pkg-2 java-ant-2 java-osgi
+INHERIT=java-pkg-2 java-ant-2 java-osgi
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/commons/net/source/commons-net-3.2-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
-_md5_=83e44a6db425e35b8a035d9a26978992
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
+_md5_=cdc09f58afae1fb7406b340f2b790873
diff --git a/metadata/md5-cache/dev-java/commons-pool-1.6 b/metadata/md5-cache/dev-java/commons-pool-1.6
index 00d817f7adb9..72918d9d1567 100644
--- a/metadata/md5-cache/dev-java/commons-pool-1.6
+++ b/metadata/md5-cache/dev-java/commons-pool-1.6
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit dev-java/junit:0 ) >=dev-jav
DESCRIPTION=Provides general purpose object pooling API
EAPI=5
HOMEPAGE=http://commons.apache.org/pool/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://apache/commons/pool/source/commons-pool-1.6-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=43462b6e4177df27c73c8153af36031f
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=1730e2cf05a729aefb821136b3bf2f18
diff --git a/metadata/md5-cache/dev-java/fop-2.0-r3 b/metadata/md5-cache/dev-java/fop-2.0-r3
index 69614223e2d1..360fdfc8e3f4 100644
--- a/metadata/md5-cache/dev-java/fop-2.0-r3
+++ b/metadata/md5-cache/dev-java/fop-2.0-r3
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/batik:1.9 dev-java/ant-core:0 d
DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
EAPI=5
HOMEPAGE=https://xmlgraphics.apache.org/fop/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.9 dev-java/ant-core:0 dev-java/fontbo
RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=820d9369eb588b0bb275bb11797aeead
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=4d301c13a39302d4307da4bd25cd2837
diff --git a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4 b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
index c6a89616522a..568792f41f76 100644
--- a/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
+++ b/metadata/md5-cache/dev-java/freehep-graphicsio-emf-2.4
@@ -3,7 +3,7 @@ DEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0 ~
DESCRIPTION=High Energy Physics Java library - FreeHEP Enhanced Metafile Format Driver
EAPI=5
HOMEPAGE=http://java.freehep.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0 LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-java/freehep-graphics2d-2.4:0 ~dev-java/freehep-graphicsbase-2.4:0
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/freehep/freehep-vectorgraphics/archive/freehep-vectorgraphics-2.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=0e411570d26ba876ac7b9dabb7106cde
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=2ee1f0979dbbf8679a1475d6b2f2fd4d
diff --git a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6 b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
index 1a7b3d0223b7..165a4f8f57a1 100644
--- a/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
+++ b/metadata/md5-cache/dev-java/gnu-classpath-0.98-r6
@@ -3,7 +3,7 @@ DEPEND=app-arch/zip gtk? ( x11-base/xorg-proto x11-libs/libXrender >=x11-libs/li
DESCRIPTION=Free core class libraries for use with Java VMs and compilers
EAPI=5
HOMEPAGE=https://www.gnu.org/software/classpath
-INHERIT=eutils java-pkg-2 multilib
+INHERIT=epatch java-pkg-2 multilib
IUSE=alsa debug doc dssi examples gconf +gjdoc gmp gtk xml elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2-with-linking-exception
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 alsa? ( media-libs/alsa-lib ) dssi? ( >=media-libs/dss
REQUIRED_USE=doc? ( gjdoc )
SLOT=0.98
SRC_URI=mirror://gnu/classpath/classpath-0.98.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
-_md5_=f12dfd365b842612d2e09cdc9db73a99
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
+_md5_=fa64c51164cfb4ccf6304f23bfe05222
diff --git a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1 b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
index 2ac7b60f4305..8fb473c49b57 100644
--- a/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
+++ b/metadata/md5-cache/dev-java/icedtea-sound-1.0.1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= app-arch/zip >=dev-
DESCRIPTION=Plugins for javax.sound
EAPI=5
HOMEPAGE=http://icedtea.classpath.org
-INHERIT=eutils java-pkg-2 prefix
+INHERIT=java-pkg-2 prefix
IUSE=+doc test elibc_FreeBSD
KEYWORDS=amd64 ~arm arm64 ppc64 x86
LICENSE=GPL-2-with-linking-exception
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jdk-1.6.0 >=media-sound/pulseaudio-0.9.11:= >=dev-java/java-co
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://icedtea.classpath.org/download/source/icedtea-sound-1.0.1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=3d16676df51eaf1c169c2eb9573b926a
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=0aeae8c9c32353ff40d6d877d78ce834
diff --git a/metadata/md5-cache/dev-java/ini4j-0.5.2 b/metadata/md5-cache/dev-java/ini4j-0.5.2
index 1f939cb9423b..6d8756dfca01 100644
--- a/metadata/md5-cache/dev-java/ini4j-0.5.2
+++ b/metadata/md5-cache/dev-java/ini4j-0.5.2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Simple Java API Windows style .ini file handling
EAPI=6
HOMEPAGE=http://ini4j.sourceforge.net/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=http://central.maven.org/maven2/org/ini4j/ini4j/0.5.2/ini4j-0.5.2-sources.jar -> ini4j-0.5.2.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=fc9fe85a1fcc671f3c4cdb4f8013751b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=6c1edca822d875977aa9209a7c603cb8
diff --git a/metadata/md5-cache/dev-java/j2ssh-0.2.9 b/metadata/md5-cache/dev-java/j2ssh-0.2.9
index 867a3ffebf42..fc02ceb4837e 100644
--- a/metadata/md5-cache/dev-java/j2ssh-0.2.9
+++ b/metadata/md5-cache/dev-java/j2ssh-0.2.9
@@ -3,12 +3,12 @@ DEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jdk-1.5 >=dev-ja
DESCRIPTION=Java implementation of the SSH protocol
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/sshtools/ http://www.sshtools.com/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD source doc examples elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-java/commons-logging:0 dev-java/ant-core:0 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/sshtools/j2ssh-0.2.9-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=65769b0364e3ee7c0db17f26080b60a9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=015ae0c581fd4a60f600fb132ad0620b
diff --git a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1 b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
index 288a4e673a7b..430a3d067f4b 100644
--- a/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
+++ b/metadata/md5-cache/dev-java/jamvm-2.0.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:
DESCRIPTION=An extremely small and specification-compliant virtual machine
EAPI=5
HOMEPAGE=http://jamvm.sourceforge.net/
-INHERIT=eutils flag-o-matic multilib java-vm-2 autotools toolchain-funcs
+INHERIT=epatch flag-o-matic multilib java-vm-2 autotools toolchain-funcs
IUSE=debug libffi
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* ) libffi? ( dev-libs/libffi:= ) ppc64? ( dev-libs/libffi:= ) sparc? ( dev-libs/libffi:= ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
SLOT=0
SRC_URI=mirror://sourceforge/jamvm/jamvm-2.0.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 pax-utils d3fc79d3d50544347e324864f95206e2 prefix de7d8e2b10085ed5ff09ad70e4753e5c xdg-utils ff2ff954e6b17929574eee4efc5152ba java-vm-2 1b9686c0df06500159478dfaf5c21338 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=c79f341798f5101427d0c68d076d21da
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 pax-utils d3fc79d3d50544347e324864f95206e2 prefix de7d8e2b10085ed5ff09ad70e4753e5c xdg-utils ff2ff954e6b17929574eee4efc5152ba java-vm-2 1b9686c0df06500159478dfaf5c21338 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=be939036b780d975907600f881e7959c
diff --git a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1 b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
index 0d6cb16e5687..29f3b4cb2ad1 100644
--- a/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
+++ b/metadata/md5-cache/dev-java/java-service-wrapper-3.5.25-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2
DESCRIPTION=A wrapper that makes it possible to install a Java Application as daemon
EAPI=5
HOMEPAGE=http://wrapper.tanukisoftware.org/
-INHERIT=eutils java-pkg-2 java-ant-2 toolchain-funcs
+INHERIT=epatch java-pkg-2 java-ant-2 toolchain-funcs
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=tanuki-community
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=http://wrapper.tanukisoftware.org/download/3.5.25/wrapper_3.5.25_src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=af94d0082ad76a6635b70bace52704ed
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=e5692b2332ebf6333d79be5fc2aef1c0
diff --git a/metadata/md5-cache/dev-java/javolution-4.0.2-r1 b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
index 1c192fd490b0..653b077dc2fd 100644
--- a/metadata/md5-cache/dev-java/javolution-4.0.2-r1
+++ b/metadata/md5-cache/dev-java/javolution-4.0.2-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source?
DESCRIPTION=Java Solution for Real-Time and Embedded Systems
EAPI=5
HOMEPAGE=http://javolution.org
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=4
SRC_URI=http://javolution.org/javolution-4.0.2-src.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=4405b9dc1094e9afc3ffc96c3eec51d8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=750f6a87a3738160a99fa049db8104b8
diff --git a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2 b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
index 9b99261e5fff..cf80ed2a35c8 100644
--- a/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
+++ b/metadata/md5-cache/dev-java/jcmdline-1.0.2-r2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source?
DESCRIPTION=Library for parsing/handling of command line parameters
EAPI=5
HOMEPAGE=http://jcmdline.sourceforge.net/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=MPL-1.1
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1.0
SRC_URI=mirror://sourceforge/jcmdline/jcmdline-1.0.2.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=42ec54722bba09657be42910b5eb9dc2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=7bd6ede50c41436f6e29aa68d14cf807
diff --git a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26 b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
index 67552453f041..277002157137 100644
--- a/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
+++ b/metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
DESCRIPTION=MySQL JDBC driver
EAPI=5
HOMEPAGE=https://www.mysql.com/products/connector/j/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=c3p0 log4j elibc_FreeBSD source elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=GPL-2-with-MySQL-FLOSS-exception
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 dev-java/slf4j-api:0 log4j? ( dev-java/log4j:0 ) c3p0?
RESTRICT=test
SLOT=0
SRC_URI=https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.26.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=9c61322c78f475824bc116166004b9ae
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=4befef6dba193f639b0f1cf514477f1c
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
index 426da3061112..ad1df10230f4 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1205
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheet
DESCRIPTION=JDBC Driver for PostgreSQL
EAPI=5
HOMEPAGE=https://jdbc.postgresql.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=POSTGRESQL
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=test
SLOT=0
SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1205.src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=985370d9d78137686d40158383120e51
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=10eed3e238227b6c39120bfcff5d5ef9
diff --git a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206 b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
index 8fc88ce4c40f..0bf682a521ac 100644
--- a/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
+++ b/metadata/md5-cache/dev-java/jdbc-postgresql-9.4_p1206
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheet
DESCRIPTION=JDBC Driver for PostgreSQL
EAPI=5
HOMEPAGE=https://jdbc.postgresql.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=POSTGRESQL
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=test
SLOT=0
SRC_URI=https://jdbc.postgresql.org/download/postgresql-jdbc-9.4-1206.src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=9dfcf21018db9588a7cf2ffe63abb3d9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=a73d93444143accf11cb2ec9872073b0
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index a98ceb99f7cf..4711cae3dfc0 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -3,7 +3,7 @@ DEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jdk-1.
DESCRIPTION=Java API to manipulate XML data
EAPI=5
HOMEPAGE=http://www.jdom.org
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
LICENSE=Apache-1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1
RESTRICT=!test? ( test )
SLOT=2
SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=eef5363560cd09f8ed6bb263254a8b1e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=d97911fc1c41a9c1f4efc1d35779f121
diff --git a/metadata/md5-cache/dev-java/jffi-1.2.9 b/metadata/md5-cache/dev-java/jffi-1.2.9
index e69019c5945e..23df40ea71c5 100644
--- a/metadata/md5-cache/dev-java/jffi-1.2.9
+++ b/metadata/md5-cache/dev-java/jffi-1.2.9
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libffi:0= >=virtual/jdk-1.6 virtual/pkgconfig test? ( dev-java/a
DESCRIPTION=An optimized Java interface to libffi
EAPI=5
HOMEPAGE=https://github.com/jnr/jffi
-INHERIT=eutils java-pkg-2 java-ant-2 versionator
+INHERIT=epatch java-pkg-2 java-ant-2 versionator
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=|| ( Apache-2.0 LGPL-3 )
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libffi:0= >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sou
RESTRICT=test
SLOT=1.2
SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=773ea6a7ceceb9535bb9fcefba08793e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=45b2cdf926d500ed13202625e10400f9
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1 b/metadata/md5-cache/dev-java/jflex-1.6.1
index 33414ebd5914..f5a28f2585e8 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-ja
DESCRIPTION=JFlex is a lexical analyzer generator for Java
EAPI=5
HOMEPAGE=https://www.jflex.de/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=examples test vim-syntax elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.6 vim-syntax? ( || ( app-editors/vim app-editors/gvim )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=114c9c0826804ecbbb50b61b5bd008ed
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=ae646125e171c4267a46024d7af5d1a0
diff --git a/metadata/md5-cache/dev-java/jid3-0.46-r2 b/metadata/md5-cache/dev-java/jid3-0.46-r2
index 3af629fa6924..ef44ac5059ef 100644
--- a/metadata/md5-cache/dev-java/jid3-0.46-r2
+++ b/metadata/md5-cache/dev-java/jid3-0.46-r2
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.4 test? ( =dev-java/junit-3.8* ) >=dev-java/java-config-2
DESCRIPTION=ID3 Class Library Implementation
EAPI=5
HOMEPAGE=http://jid3.blinkenlights.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=http://jid3.blinkenlights.org/release/jid3_0.46.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=53352187f7bcf7f51fefe8b6c8453fcb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=5001cd1685f984d1b167ab43934d8fd2
diff --git a/metadata/md5-cache/dev-java/jinput-2.0.6-r1 b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
index 72d51e9bcd7a..033ac3f6eec6 100644
--- a/metadata/md5-cache/dev-java/jinput-2.0.6-r1
+++ b/metadata/md5-cache/dev-java/jinput-2.0.6-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 sourc
DESCRIPTION=An implementation of an API for game controller discovery and polled input
EAPI=5
HOMEPAGE=https://java.net/projects/jinput
-INHERIT=eutils toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
+INHERIT=epatch toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 dev-java/jutils:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://github.com/jinput/jinput/archive/790b666.tar.gz -> jinput-2.0.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=e2e7421d277298fc52fc9780d292d116
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
+_md5_=98f1b796f76ef346da6b7d26c43f6033
diff --git a/metadata/md5-cache/dev-java/jisp-2.5.1-r3 b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
index 57bc0e2b7434..846d9f3fcdac 100644
--- a/metadata/md5-cache/dev-java/jisp-2.5.1-r3
+++ b/metadata/md5-cache/dev-java/jisp-2.5.1-r3
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Java Indexed Serialization Package: A small, embedded database engine
EAPI=5
HOMEPAGE=http://www.coyotegulch.com/products/jisp/
-INHERIT=java-pkg-2 java-pkg-simple eutils
+INHERIT=java-pkg-2 java-pkg-simple epatch
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=SVFL
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
SLOT=2.5
SRC_URI=http://gentooexperimental.org/distfiles/jisp-2.5.1-source.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=b8c0de2246ab614591bde4786c5c07e6
+_md5_=095f9ce71d109596698ff8134da387a2
diff --git a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2 b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
index 91e1625dd965..ee06a9391460 100644
--- a/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
+++ b/metadata/md5-cache/dev-java/l2fprod-common-7.3-r2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 dev-java/jreleaseinfo:0 dev-java/nachocalendar:0 dev-ja
DESCRIPTION=Java/Swing GUI components and libraries for building desktop applications
EAPI=5
HOMEPAGE=http://common.l2fprod.com/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.4 dev-java/nachocalendar:0 dev-java/jcalendar:1.2 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=mirror://gentoo/l2fprod-common-7.3.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=02cb1a664a1a35bf6650d895ee8af74e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=c624d87edd8341be30ee1d3a4ce21787
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.6 b/metadata/md5-cache/dev-java/metainf-services-1.6
index 04106cdd869d..0fd3f6195722 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.6
+++ b/metadata/md5-cache/dev-java/metainf-services-1.6
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
DESCRIPTION=Generates META-INF/services files automatically
EAPI=5
HOMEPAGE=http://metainf-services.kohsuke.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=f79e64abbaca065377eea9c82b583245
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=6e92fec7a8b8f14f72930580076fb96a
diff --git a/metadata/md5-cache/dev-java/metainf-services-1.7 b/metadata/md5-cache/dev-java/metainf-services-1.7
index 195125e1b2c8..b45c27939fca 100644
--- a/metadata/md5-cache/dev-java/metainf-services-1.7
+++ b/metadata/md5-cache/dev-java/metainf-services-1.7
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8
DESCRIPTION=Generates META-INF/services files automatically
EAPI=5
HOMEPAGE=http://metainf-services.kohsuke.org/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
SLOT=0
SRC_URI=https://github.com/kohsuke/metainf-services/archive/metainf-services-1.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=0f3ab79241926a177e59063f163ace6d
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=92307743afd2ceddac394c5d71fce2aa
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
index 0ef1ab40119a..4308f12a36c8 100644
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-j
DESCRIPTION=A simple HTML scanner and tag balancer using standard XML interfaces
EAPI=5
HOMEPAGE=http://nekohtml.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2 eutils
+INHERIT=java-pkg-2 java-ant-2 epatch
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.2.0-r3
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=10cbb9ff7c8cb8442faec9a992af7263
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=fc005ec780604720b069a2105a3ffc34
diff --git a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1 b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
index 5e7a859329c8..03388330bedd 100644
--- a/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
+++ b/metadata/md5-cache/dev-java/sblim-cim-client-2.2.1-r1
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.5 test? ( dev-java/ant-junit ) >=dev-java/
DESCRIPTION=A WBEM services client that includes an SLP client for CIM service discovery
EAPI=5
HOMEPAGE=http://sblim.wiki.sourceforge.net/CimClient
-INHERIT=java-pkg-2 java-ant-2 eutils
+INHERIT=java-pkg-2 java-ant-2 epatch
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=CPL-1.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=2
SRC_URI=mirror://sourceforge/sblim/sblim-cim-client2-2.2.1-src.zip
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=e1222fd6299cc29eaadcbc937f5b7558
+_md5_=8dec0201cb8d61f05f6650cda595956c
diff --git a/metadata/md5-cache/dev-java/skinlf-6.7-r1 b/metadata/md5-cache/dev-java/skinlf-6.7-r1
index 4cb0498c44e2..0bedacc99dfb 100644
--- a/metadata/md5-cache/dev-java/skinlf-6.7-r1
+++ b/metadata/md5-cache/dev-java/skinlf-6.7-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.4 app-arch/unzip:0 dev-java/laf-plugin:0 dev-java/xalan:0
DESCRIPTION=Skin Look and Feel - Skinning Engine for the Swing toolkit
EAPI=5
HOMEPAGE=http://skinlf.l2fprod.com/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD examples source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=Apache-1.1
RDEPEND=>=virtual/jre-1.4 dev-java/laf-plugin:0 dev-java/xalan:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=c4e1711f20020e01ef1e89d26078d4f5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=464072f0b55189a5247512d28c7edae6
diff --git a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1 b/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
index 6f78d3748443..b1fb089d1d3c 100644
--- a/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
+++ b/metadata/md5-cache/dev-java/spymemcached-2.9.1-r1
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-c
DESCRIPTION=A simple, asynchronous, single-threaded memcached client written in java
EAPI=5
HOMEPAGE=https://code.google.com/p/spymemcached/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=java-pkg-2 java-pkg-simple
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=MIT
RDEPEND=>=virtual/jre-1.5 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://spymemcached.googlecode.com/files/spymemcached-2.9.1-sources.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=410acf131707a404ea3256ebb344d3a0
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=c8887b00b5d9e64fea0a82e20b4173a2
diff --git a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1 b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
index 134f443b5b17..225397d1de00 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
+++ b/metadata/md5-cache/dev-java/stringtemplate-3.2.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jdk-1.6 test? ( >=dev-java/junit-4.
DESCRIPTION=A Java template engine
EAPI=5
HOMEPAGE=https://www.stringtemplate.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=dev-java/antlr-2.7.7-r7:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/antlr/stringtemplate3/archive/3.2.1.tar.gz -> stringtemplate-3.2.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=d4317457ab09aef66737231b957d00b8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=0644286884435754050998591ab04980
diff --git a/metadata/md5-cache/dev-java/stringtemplate-4.0.8 b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
index 3a53838f326c..2b01b9bb10c0 100644
--- a/metadata/md5-cache/dev-java/stringtemplate-4.0.8
+++ b/metadata/md5-cache/dev-java/stringtemplate-4.0.8
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0
DESCRIPTION=A Java template engine
EAPI=5
HOMEPAGE=https://www.stringtemplate.org/
-INHERIT=eutils java-pkg-2 java-pkg-simple
+INHERIT=epatch java-pkg-2 java-pkg-simple
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
RESTRICT=!test? ( test )
SLOT=4
SRC_URI=https://github.com/antlr/stringtemplate4/archive/4.0.8.tar.gz -> stringtemplate-4.0.8.tar.gz http://www.antlr3.org/download/antlr-3.5.2-complete.jar
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
-_md5_=0274414cd84225ebac07c474ad51eb5f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-pkg-simple c85bf2d75a5f53e7b39fc9104701ebfb
+_md5_=5699e38d2e5b0f2c257e078ebbc31fa7
diff --git a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3 b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
index 2260f1dac723..73fa8aabc1e5 100644
--- a/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
+++ b/metadata/md5-cache/dev-java/sun-jai-bin-1.1.3
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install postinst preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
+DEPEND=>=dev-java/java-config-2.2.0-r3
DESCRIPTION=JAI is a class library for managing images
EAPI=7
HOMEPAGE=https://jai.dev.java.net/
@@ -12,4 +13,4 @@ RESTRICT=bindist mirror
SLOT=0
SRC_URI=http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib-linux-i586.tar.gz
_eclasses_=java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
-_md5_=1352b9ebbec7df3f9c25297c7df66334
+_md5_=562c54835282d8b128ce37ce50f40f52
diff --git a/metadata/md5-cache/dev-java/swt-3.8.2-r3 b/metadata/md5-cache/dev-java/swt-3.8.2-r3
index 54e3162412e9..7fc1a831bc42 100644
--- a/metadata/md5-cache/dev-java/swt-3.8.2-r3
+++ b/metadata/md5-cache/dev-java/swt-3.8.2-r3
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-lib
DESCRIPTION=GTK based SWT Library
EAPI=5
HOMEPAGE=http://www.eclipse.org/
-INHERIT=eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+INHERIT=epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi
IUSE=cairo opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
KEYWORDS=amd64 ppc64 x86
LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
SLOT=3.8
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/swt-3.8.2-gtk-linux-x86.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
-_md5_=6387652b0ed2f832288fb16c09faafb7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
+_md5_=7098b10c480a6147fe994a7891cbb76b
diff --git a/metadata/md5-cache/dev-java/swt-4.2-r4 b/metadata/md5-cache/dev-java/swt-4.2-r4
index a498e551e5b8..c9c2d7005d42 100644
--- a/metadata/md5-cache/dev-java/swt-4.2-r4
+++ b/metadata/md5-cache/dev-java/swt-4.2-r4
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-li
DESCRIPTION=GTK based SWT Library
EAPI=5
HOMEPAGE=http://www.eclipse.org/
-INHERIT=eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+INHERIT=epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
IUSE=cairo opengl elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=CPL-1.0 LGPL-2.1 MPL-1.1
RDEPEND=>=dev-libs/atk-1.10.2 >=dev-libs/glib-2.32 >=x11-libs/gtk+-2.6.8:2 x11-libs/libXtst cairo? ( >=x11-libs/cairo-1.4.14 ) opengl? ( virtual/glu virtual/opengl ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3
SLOT=4.2
SRC_URI=amd64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86_64.zip ) ppc? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) ppc64? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-ppc64.zip ) x86? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip ) x86-fbsd? ( http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/swt-4.2-gtk-linux-x86.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
-_md5_=e175e4440e4337c5743a2d9b53a38602
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 java-osgi 303099c377fa3ce30c97f39ebecb351f
+_md5_=0b07673cff59e48aa3ae274c3e03f822
diff --git a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4 b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
index 52eff03aa0f7..6f8e4817ac3b 100644
--- a/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
+++ b/metadata/md5-cache/dev-java/werken-xpath-0.9.4_beta-r4
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java/
DESCRIPTION=W3C XPath-Rec implementation for DOM4J
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/werken-xpath/
-INHERIT=java-pkg-2 java-ant-2 eutils versionator
+INHERIT=java-pkg-2 java-ant-2 epatch versionator
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=JDOM
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.4 dev-java/jdom:0 >=dev-java/antlr-2.7.7-r7:0 >=dev-java
SLOT=0
SRC_URI=mirror://gentoo/werken.xpath-0.9.4-beta-src.tar.gz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=dfd0bc1fc52c6fe27e9506525c85dd26
+_md5_=1cd6f83f158d8d02ea2d5dc7ae2caa21
diff --git a/metadata/md5-cache/dev-lang/cfortran-4.4-r3 b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
index df313c4803d3..8c50971fc706 100644
--- a/metadata/md5-cache/dev-lang/cfortran-4.4-r3
+++ b/metadata/md5-cache/dev-lang/cfortran-4.4-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=Header file allowing to call Fortran routines from C and C++
EAPI=5
HOMEPAGE=https://www-zeus.desy.de/~burow/cfortran/
-INHERIT=eutils
+INHERIT=epatch
IUSE=examples
KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/c/cfortran/cfortran_4.4.orig.tar.gz mirror://debian/pool/main/c/cfortran/cfortran_4.4-14.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=826a321b6be72a082a760680bde512e2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=6843986791251669eeff7f06d1dd568c
diff --git a/metadata/md5-cache/dev-lang/gprolog-1.4.5 b/metadata/md5-cache/dev-lang/gprolog-1.4.5
index 476bc0b360bf..4e832f39ad98 100644
--- a/metadata/md5-cache/dev-lang/gprolog-1.4.5
+++ b/metadata/md5-cache/dev-lang/gprolog-1.4.5
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=A native Prolog compiler with constraint solving over finite domains (FD)
EAPI=6
HOMEPAGE=http://www.gprolog.org/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=debug doc examples
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=|| ( GPL-2+ LGPL-3+ )
SLOT=0
SRC_URI=http://www.gprolog.org/gprolog-1.4.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=57fa0e5e73e7b78b37bcaabbe0e66222
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=2018098e04d14143a9fe0e557056a87f
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.0.12 b/metadata/md5-cache/dev-lang/lazarus-1.0.12
index 2b1ae799a79d..1240fab81cfa 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.0.12
+++ b/metadata/md5-cache/dev-lang/lazarus-1.0.12
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/b
DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
EAPI=5
HOMEPAGE=https://www.lazarus-ide.org/
-INHERIT=eutils
+INHERIT=desktop epatch
IUSE=minimal
KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2.1-with-linking-exception
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 !=gnome-base
RESTRICT=strip
SLOT=0
SRC_URI=https://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%201.0.12/lazarus-1.0.12-0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=8b666378b50d24b2a6ee64743e44e6c4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=5c227da4dba117fb56dd55755b67a6fa
diff --git a/metadata/md5-cache/dev-lang/logtalk-3.36.0 b/metadata/md5-cache/dev-lang/logtalk-3.36.0
index a1c190f6311f..d00c204661e8 100644
--- a/metadata/md5-cache/dev-lang/logtalk-3.36.0
+++ b/metadata/md5-cache/dev-lang/logtalk-3.36.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst postrm prepare
DESCRIPTION=Open source object-oriented logic programming language
EAPI=6
HOMEPAGE=https://logtalk.org
-INHERIT=eutils xdg-utils
+INHERIT=epatch xdg-utils
IUSE=fop xslt
KEYWORDS=amd64 ppc x86
LICENSE=Apache-2.0
RDEPEND=xslt? ( dev-libs/libxslt ) fop? ( dev-java/fop )
SLOT=0
SRC_URI=https://logtalk.org/files/logtalk-3.36.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=a68fc50779f3c6c4cbfd6a71be2156d4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=462d181d706d9d0e084cc3cd08c6ee68
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r4 b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
index 598d4a9561f6..0f484ce410ee 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r4
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r4
@@ -3,7 +3,7 @@ DEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)
DESCRIPTION=A powerful light-weight programming language designed for extending applications
EAPI=5
HOMEPAGE=http://www.lua.org/
-INHERIT=eutils multilib multilib-minimal portability toolchain-funcs versionator
+INHERIT=epatch multilib multilib-minimal portability toolchain-funcs versionator
IUSE=+deprecated emacs readline static abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -11,5 +11,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability c10bdc40668533b1faf15b1d89df0303 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=00ace17b9bacb8d424ed7f31b6a07a87
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability c10bdc40668533b1faf15b1d89df0303 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=abd701fede35303c41bbf004aef557ff
diff --git a/metadata/md5-cache/dev-lang/pcc-9999 b/metadata/md5-cache/dev-lang/pcc-9999
index db0b66b2b5da..599615f9d0e0 100644
--- a/metadata/md5-cache/dev-lang/pcc-9999
+++ b/metadata/md5-cache/dev-lang/pcc-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare unpack
+DEFINED_PHASES=configure install prepare unpack
DEPEND=>=dev-libs/pcc-libs-9999 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
DESCRIPTION=pcc portable c compiler
EAPI=5
HOMEPAGE=http://pcc.ludd.ltu.se
-INHERIT=eutils versionator autotools cvs
+INHERIT=autotools cvs
LICENSE=BSD
PROPERTIES=live
RDEPEND=>=dev-libs/pcc-libs-9999
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 cvs 8f8740beb4ce1deaae8393cfc28d2ed1
-_md5_=cc8a039323a36bd16c12c61ac018d276
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 cvs 8f8740beb4ce1deaae8393cfc28d2ed1
+_md5_=e07be81a4d5fd86c31fc26fc8750a10c
diff --git a/metadata/md5-cache/dev-lang/smlnj-110.82 b/metadata/md5-cache/dev-lang/smlnj-110.82
index a2ae3d8376f9..dee79969e636 100644
--- a/metadata/md5-cache/dev-lang/smlnj-110.82
+++ b/metadata/md5-cache/dev-lang/smlnj-110.82
@@ -3,11 +3,11 @@ DEPEND=pax_kernel? ( sys-apps/elfix )
DESCRIPTION=Standard ML of New Jersey compiler and libraries
EAPI=6
HOMEPAGE=http://www.smlnj.org
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
IUSE=pax_kernel
KEYWORDS=-* ~amd64 ~ppc ~x86
LICENSE=BSD
SLOT=0
SRC_URI=amd64? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) ppc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.ppc-unix.tgz -> smlnj-110.82-boot.ppc-unix.tgz ) sparc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.sparc-unix.tgz -> smlnj-110.82-boot.sparc-unix.tgz ) x86? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) http://smlnj.cs.uchicago.edu/dist/working/110.82/doc.tgz -> smlnj-110.82-doc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/config.tgz -> smlnj-110.82-config.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cm.tgz -> smlnj-110.82-cm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/compiler.tgz -> smlnj-110.82-compiler.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/runtime.tgz -> smlnj-110.82-runtime.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/system.tgz -> smlnj-110.82-system.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/MLRISC.tgz -> smlnj-110.82-MLRISC.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-lib.tgz -> smlnj-110.82-smlnj-lib.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/old-basis.tgz -> smlnj-110.82-old-basis.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ckit.tgz -> smlnj-110.82-ckit.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/nlffi.tgz -> smlnj-110.82-nlffi.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cml.tgz -> smlnj-110.82-cml.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/eXene.tgz -> smlnj-110.82-eXene.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lpt.tgz -> smlnj-110.82-ml-lpt.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lex.tgz -> smlnj-110.82-ml-lex.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-yacc.tgz -> smlnj-110.82-ml-yacc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-burg.tgz -> smlnj-110.82-ml-burg.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/pgraph.tgz -> smlnj-110.82-pgraph.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/trace-debug-profile.tgz -> smlnj-110.82-trace-debug-profile.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/heap2asm.tgz -> smlnj-110.82-heap2asm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-c.tgz -> smlnj-110.82-smlnj-c.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=68adb367f59002d68ed599e2dfd4ad6d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=f94ad2dd3b1820c3be25985cd66abc3e
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
index d67e9a972603..f285f30d9e3f 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r1
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
DESCRIPTION=Tool Command Language
EAPI=5
HOMEPAGE=http://www.tcl.tk/
-INHERIT=autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal
+INHERIT=autotools epatch flag-o-matic multilib toolchain-funcs versionator multilib-minimal
IUSE=debug threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
LICENSE=tcltk
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
SLOT=0/8.5
SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 versionator d3fb3ba33acc3bbbdc4d7970227c100d multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=589ed11ad6bef223db299aba1ccc31da
+_md5_=6b6f2230be913a345f09d1cb191d74f0
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
index b61edae3d41f..1bc218fece86 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10
@@ -3,12 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl?
DESCRIPTION=OpenNI SDK
EAPI=5
HOMEPAGE=https://github.com/OpenNI/OpenNI
-INHERIT=toolchain-funcs eutils multilib java-pkg-opt-2
+INHERIT=toolchain-funcs epatch multilib java-pkg-opt-2
IUSE=doc java opengl elibc_FreeBSD java
KEYWORDS=~amd64 ~arm
LICENSE=Apache-2.0
RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=013cfef4386d9d452599891a10cb84cd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=5cb6c17faace52bdafa7047b3b830842
diff --git a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1 b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
index e40375a7aff5..da092fc4cd88 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
+++ b/metadata/md5-cache/dev-libs/OpenNI-1.5.7.10-r1
@@ -3,12 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl?
DESCRIPTION=OpenNI SDK
EAPI=5
HOMEPAGE=https://github.com/OpenNI/OpenNI
-INHERIT=toolchain-funcs eutils multilib java-pkg-opt-2
+INHERIT=toolchain-funcs epatch multilib java-pkg-opt-2
IUSE=doc java opengl elibc_FreeBSD java
KEYWORDS=~amd64 ~arm
LICENSE=Apache-2.0
RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=https://github.com/OpenNI/OpenNI/archive/Stable-1.5.7.10.tar.gz -> OpenNI-1.5.7.10.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=101107b64d77af1e39b10e79c729e28e
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=c719f0d94a2195d210caf8f5aa89ad06
diff --git a/metadata/md5-cache/dev-libs/OpenNI-9999 b/metadata/md5-cache/dev-libs/OpenNI-9999
index aed5458d6d5c..14cd9eb2dbb8 100644
--- a/metadata/md5-cache/dev-libs/OpenNI-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI-9999
@@ -3,11 +3,11 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl?
DESCRIPTION=OpenNI SDK
EAPI=5
HOMEPAGE=https://github.com/OpenNI/OpenNI
-INHERIT=git-r3 toolchain-funcs eutils multilib java-pkg-opt-2
+INHERIT=git-r3 toolchain-funcs epatch multilib java-pkg-opt-2
IUSE=doc java opengl elibc_FreeBSD java
LICENSE=Apache-2.0
PROPERTIES=live
RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 dev-libs/tinyxml opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
-_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=6875528ac3a38ac67026e0e1a8861df6
+_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=311f400f4eee811133c8f34a042075d0
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2 b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
index 3590a4bc7c65..3b8fc3328d35 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
+++ b/metadata/md5-cache/dev-libs/OpenNI2-2.2_beta2
@@ -3,12 +3,12 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/free
DESCRIPTION=OpenNI2 SDK
EAPI=5
HOMEPAGE=https://structure.io/openni
-INHERIT=toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
+INHERIT=toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic
IUSE=doc java neon opengl static-libs elibc_FreeBSD java
KEYWORDS=~amd64 ~arm
LICENSE=Apache-2.0
RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=https://github.com/occipital/OpenNI2/archive/2.2-beta2.tar.gz -> OpenNI2-2.2_beta2.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=a81fe7476f03739a5ae2eb3e2f5832bd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=b11b2eff6cb93d49105f176e0c3cb760
diff --git a/metadata/md5-cache/dev-libs/OpenNI2-9999 b/metadata/md5-cache/dev-libs/OpenNI2-9999
index 8898ea5b40bc..afe0e128fa9d 100644
--- a/metadata/md5-cache/dev-libs/OpenNI2-9999
+++ b/metadata/md5-cache/dev-libs/OpenNI2-9999
@@ -3,11 +3,11 @@ DEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/free
DESCRIPTION=OpenNI2 SDK
EAPI=5
HOMEPAGE=https://structure.io/openni
-INHERIT=git-r3 toolchain-funcs eutils multilib java-pkg-opt-2 flag-o-matic
+INHERIT=git-r3 toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic
IUSE=doc java neon opengl static-libs elibc_FreeBSD java
LICENSE=Apache-2.0
PROPERTIES=live
RDEPEND=virtual/libusb:1 virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( >=virtual/jre-1.5:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
-_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=37a029a605283168245e73d7e654ecf6
+_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=2c5aa2703b715cec4a5c9b1066507398
diff --git a/metadata/md5-cache/dev-libs/libb64-2.0.0.1 b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
index 071becb6478e..09970b20f7b9 100644
--- a/metadata/md5-cache/dev-libs/libb64-2.0.0.1
+++ b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
DESCRIPTION=Fast Base64 encoding/decoding routines
EAPI=7
HOMEPAGE=https://github.com/libb64/libb64/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
LICENSE=CC-PD
SLOT=0/2.0.0.1
SRC_URI=https://github.com/libb64/libb64/archive/v2.0.0.1.tar.gz -> libb64-2.0.0.1.tar.gz
-_md5_=f0cf3bc7d9dee210df3eccb3b705470a
+_md5_=200f04878d679c33d23bf334cb35233b
diff --git a/metadata/md5-cache/dev-libs/libdbh-5.0.19 b/metadata/md5-cache/dev-libs/libdbh-5.0.19
index 667c8050ae89..bbdf62005139 100644
--- a/metadata/md5-cache/dev-libs/libdbh-5.0.19
+++ b/metadata/md5-cache/dev-libs/libdbh-5.0.19
@@ -3,10 +3,10 @@ DEPEND=dev-util/gtk-doc-am virtual/pkgconfig sys-devel/gnuconfig >=app-portage/e
DESCRIPTION=a small library to create and manage 64-bit disk based hash tables
EAPI=5
HOMEPAGE=https://www.gnu.org/software/libdbh/
-INHERIT=autotools
+INHERIT=autotools eutils
KEYWORDS=amd64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://sourceforge/dbh/dbh/5.0.19/libdbh2-5.0.19.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f07381f96d1932d8dc363f788596d707
+_md5_=680eea673053ccf0cb1400d9c4341361
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
index 331fa32943bd..42b0cfa67f66 100644
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
+++ b/metadata/md5-cache/dev-libs/libmemcached-1.0.18-r3
@@ -3,7 +3,7 @@ DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/lib
DESCRIPTION=a C client library to the memcached server
EAPI=5
HOMEPAGE=https://libmemcached.org/libMemcached.html
-INHERIT=autotools eutils multilib
+INHERIT=autotools epatch multilib
IUSE=debug hsieh +libevent sasl static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ffe64804cea3404a4fa59486cc5e6444
+_md5_=a332b156e9d3451415fee57527a5cd1e
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.1 b/metadata/md5-cache/dev-libs/libunibreak-4.1
index 8ba4aefc0fd9..a3208c123361 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.1
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.1
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
DESCRIPTION=Line and word breaking library
EAPI=7
HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -10,4 +10,4 @@ RDEPEND=!dev-libs/liblinebreak
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_1/libunibreak-4.1.tar.gz
-_md5_=2ba362703227602bcd72a1a6c5695790
+_md5_=6a2098e2b058da7d050478f545197d13
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.2 b/metadata/md5-cache/dev-libs/libunibreak-4.2
index 0ce9edcfb7b2..6465af35363b 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.2
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.2
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
DESCRIPTION=Line and word breaking library
EAPI=7
HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -10,4 +10,4 @@ RDEPEND=!dev-libs/liblinebreak
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_2-1/libunibreak-4.2-1.tar.gz
-_md5_=3d486c44009fc07fb7a4960c8970140d
+_md5_=857ef1d665ec1249e713b9cc5389da4b
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.3 b/metadata/md5-cache/dev-libs/libunibreak-4.3
index 9696ae55a38f..1cdd3d9960cc 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.3
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.3
@@ -1,5 +1,5 @@
+BDEPEND=man? ( app-doc/doxygen )
DEFINED_PHASES=compile configure install prepare
-DEPEND=man? ( app-doc/doxygen )
DESCRIPTION=Line and word breaking library
EAPI=7
HOMEPAGE=http://vimgadgets.sourceforge.net/libunibreak/
@@ -9,4 +9,4 @@ LICENSE=ZLIB
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_3/libunibreak-4.3.tar.gz
-_md5_=b9329bb9d04b30c1c47442164916e107
+_md5_=ceff9715729c3909a1845ee74b571e8e
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.2.2 b/metadata/md5-cache/dev-libs/libyaml-0.2.2
index 7ead2d93ed91..4f5626325e36 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.2.2
+++ b/metadata/md5-cache/dev-libs/libyaml-0.2.2
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=YAML 1.1 parser and emitter written in C
EAPI=7
HOMEPAGE=https://github.com/yaml/libyaml
@@ -12,4 +11,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/yaml/libyaml/archive/0.2.2.tar.gz -> libyaml-0.2.2.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=28cfd717844d4fe68fd9198ecf60e372
+_md5_=8583e735da06e702b580a3afd7805f5d
diff --git a/metadata/md5-cache/dev-libs/nmeap-0.3-r1 b/metadata/md5-cache/dev-libs/nmeap-0.3-r1
index 7fc7b19163e9..8243b5f6b5c2 100644
--- a/metadata/md5-cache/dev-libs/nmeap-0.3-r1
+++ b/metadata/md5-cache/dev-libs/nmeap-0.3-r1
@@ -1,12 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
DEFINED_PHASES=compile install prepare
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Extensible NMEA-0183 (GPS) data parser in standard C
EAPI=7
HOMEPAGE=http://nmeap.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=amd64 ppc x86
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/nmeap/nmeap-0.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=9a25fd7315b127bfe88a4d6b6a8caec1
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d63e1c5381acbae50e650305834a92fa
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index 4111ffea8cd0..08dcbb9e8be3 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=All you need to include the snowball stemming algorithms into a C project
EAPI=5
HOMEPAGE=https://snowballstem.org/
-INHERIT=eutils toolchain-funcs versionator
+INHERIT=epatch toolchain-funcs versionator
IUSE=static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris
LICENSE=BSD-2
SLOT=0
SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=dc532e6c18911177ef96b91d67c2846d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=a9f66f47e67f665547b3439adf58bec6
diff --git a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1 b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
index 68f413ba01b3..7903a374bb11 100644
--- a/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
+++ b/metadata/md5-cache/dev-libs/spsdeclib-5.1-r1
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=install prepare unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Kryoflux SPS Decoder Library
EAPI=7
HOMEPAGE=https://www.kryoflux.com/
@@ -10,4 +9,4 @@ LICENSE=Kryoflux-MAME
SLOT=0
SRC_URI=https://www.kryoflux.com/download/spsdeclib_5.1_source.zip
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8a4bee90b17f452e8d9535efd9c368ee
+_md5_=41973fcff0ba5c13c5e796cd46bafc4d
diff --git a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4 b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
index 6e7c97b40eb4..26f41eac2b2e 100644
--- a/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
+++ b/metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
@@ -1,5 +1,5 @@
+BDEPEND=doc? ( app-doc/doxygen )
DEFINED_PHASES=install prepare
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Simple and small C++ XML parser
EAPI=7
HOMEPAGE=http://www.grinninglizard.com/tinyxml/index.html
@@ -10,4 +10,4 @@ LICENSE=ZLIB
SLOT=0
SRC_URI=mirror://sourceforge/tinyxml/tinyxml_2_6_2.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=5bfb9c3ccf34be4639739b2636f225be
+_md5_=f260ef77480b390676d6f9ffc1686517
diff --git a/metadata/md5-cache/dev-libs/tntnet-2.2.1 b/metadata/md5-cache/dev-libs/tntnet-2.2.1
index a3847483064e..744a9f7a6d82 100644
--- a/metadata/md5-cache/dev-libs/tntnet-2.2.1
+++ b/metadata/md5-cache/dev-libs/tntnet-2.2.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-l
DESCRIPTION=Modular, multithreaded web application server extensible with C++
EAPI=5
HOMEPAGE=http://www.tntnet.org/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=doc gnutls server ssl examples
KEYWORDS=amd64 ~sparc x86
LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/cxxtools-2.2.1 sys-libs/zlib[minizip] ssl? ( gnutls? ( >=net-
SLOT=0
SRC_URI=http://www.tntnet.org/download/tntnet-2.2.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=46e4f8608df1508a2951a09321e8a653
+_md5_=074f38c4607ce5e3655ee8cbc51dafa0
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.1.5 b/metadata/md5-cache/dev-lisp/asdf-3.1.5
index 4f3493a917ac..38e36915e394 100644
--- a/metadata/md5-cache/dev-lisp/asdf-3.1.5
+++ b/metadata/md5-cache/dev-lisp/asdf-3.1.5
@@ -3,12 +3,12 @@ DEPEND=!dev-lisp/cl-asdf !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
EAPI=5
HOMEPAGE=http://common-lisp.net/project/asdf/
-INHERIT=eutils prefix
+INHERIT=prefix
IUSE=doc
KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
LICENSE=MIT
PDEPEND=~dev-lisp/uiop-3.1.5
SLOT=0/3.1.5
SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=dc2dc522740154ee2dd468934b68afe6
+_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=b0c345304bf7c5644646884bdb349c40
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.10 b/metadata/md5-cache/dev-lisp/gcl-2.6.10
index f67609bb4b51..72c2283cd7fa 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.10
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.10
@@ -3,7 +3,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= ) a
DESCRIPTION=GNU Common Lisp
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gcl/gcl.html
-INHERIT=elisp-common eutils flag-o-matic
+INHERIT=elisp-common epatch flag-o-matic
IUSE=+ansi athena emacs +readline tk X
KEYWORDS=amd64 ~arm x86
LICENSE=LGPL-2 GPL-2
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
RESTRICT=strip
SLOT=0
SRC_URI=mirror://gnu/gcl/gcl-2.6.10.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.10-fedora.tar.bz2
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=784dfc8d754e43a36dc2c042b5145f8f
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=467e912dc9bec5f5192d7e4d7e5e4078
diff --git a/metadata/md5-cache/dev-lisp/gcl-2.6.12 b/metadata/md5-cache/dev-lisp/gcl-2.6.12
index 19b020c0deda..94468c9d79bd 100644
--- a/metadata/md5-cache/dev-lisp/gcl-2.6.12
+++ b/metadata/md5-cache/dev-lisp/gcl-2.6.12
@@ -3,7 +3,7 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= ) a
DESCRIPTION=GNU Common Lisp
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gcl/gcl.html
-INHERIT=elisp-common eutils flag-o-matic
+INHERIT=elisp-common epatch flag-o-matic
IUSE=+ansi athena emacs +readline tk X
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=LGPL-2 GPL-2
@@ -11,5 +11,5 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) readline? ( sys-libs/readline:= )
RESTRICT=strip
SLOT=0
SRC_URI=mirror://gnu/gcl/gcl-2.6.12.tar.gz https://dev.gentoo.org/~grozin/gcl-2.6.12-fedora.tar.bz2
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=683a39a62bea51a52c5226b965dfc10b
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=ad513d630fc7a0cd303f8e3180b2d36c
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100 b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
index f07825389cb7..f4a411edce7a 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.2-r100
@@ -4,7 +4,7 @@ DEPEND=lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/
DESCRIPTION=Lua bindings using gobject-introspection
EAPI=7
HOMEPAGE=https://github.com/pavouk/lgi
-INHERIT=lua eutils toolchain-funcs flag-o-matic virtualx
+INHERIT=lua toolchain-funcs virtualx
IUSE=examples test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_targets_lua5-3 lua_targets_lua5-4
KEYWORDS=amd64 arm ppc ppc64 x86
LICENSE=MIT
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-2 lua_t
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/pavouk/lgi/archive/0.9.2.tar.gz -> lgi-0.9.2.tar.gz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua 117840f7c4855d27ccde1c6cca990331 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=88ed069c9e0d1c55012e76f012214f67
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua 117840f7c4855d27ccde1c6cca990331 virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=ab98022277e61687626609bf61385f75
diff --git a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0 b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
index fee3cbf02776..e67d6ad34128 100644
--- a/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
+++ b/metadata/md5-cache/dev-perl/BerkeleyDB-0.550.0
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/db-2.0:* virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-buil
DESCRIPTION=This module provides Berkeley DB interface for Perl
EAPI=5
HOMEPAGE=https://metacpan.org/release/BerkeleyDB
-INHERIT=perl-module eutils db-use
+INHERIT=perl-module epatch db-use
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=sys-libs/db-2.0:* dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.55.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 eapi7-ver f9ec87e93172b25ce65a85303dc06964 db-use 063d3e7add942762a8203b52ec3066c2
-_md5_=a0aecb12de0e959a25da2180fa68e571
+_md5_=22b3f42266786b2393f19c7da8b176c4
diff --git a/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r3 b/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r3
index 5c203b1d1a8f..e0643a686d23 100644
--- a/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r3
+++ b/metadata/md5-cache/dev-perl/Panotools-Script-0.280.0-r3
@@ -3,12 +3,12 @@ DEPEND=dev-lang/perl
DESCRIPTION=A perl module for reading, writing, and manipulating hugin script files
EAPI=6
HOMEPAGE=https://metacpan.org/release/Panotools-Script
-INHERIT=eutils perl-module
+INHERIT=desktop perl-module
IUSE=gui
KEYWORDS=~amd64 ~x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/URI dev-perl/libwww-perl >=dev-perl/Image-Size-2.900.0 >=media-libs/exiftool-6 gui? ( gnome-extra/zenity ) dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/B/BP/BPOSTLE/Panotools-Script-0.28.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=62e2288ccdca4119258ad892687e490a
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=42f233cf1bf5398a812b4468519dc341
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4 b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
index 8e446351de51..0d66dc3519a6 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.02.10-r4
@@ -3,7 +3,7 @@ DEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-pe
DESCRIPTION=Portage abstraction layer for perl
EAPI=5
HOMEPAGE=http://download.mpsna.de/opensource/PortageXS/
-INHERIT=perl-module eutils prefix
+INHERIT=perl-module epatch prefix
IUSE=minimal
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=35a60d77665b24a3613426213f35d4db
+_md5_=7f461f1c0525c73357cf84b95d196695
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5 b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
index 1138008ec8b7..22220dadef8c 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.10-r5
@@ -3,7 +3,7 @@ DEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-pe
DESCRIPTION=Portage abstraction layer for perl
EAPI=5
HOMEPAGE=http://download.mpsna.de/opensource/PortageXS/
-INHERIT=perl-module eutils prefix
+INHERIT=perl-module epatch prefix
IUSE=minimal
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter !minimal? ( dev-p
SLOT=0
SRC_URI=http://download.mpsna.de/opensource/PortageXS/PortageXS-0.02.10.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=e0c2b1e53e47684cb91ea293d666867c
+_md5_=5294737c89fed3bcb567c1a863413707
diff --git a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1 b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
index 5ce8fa326d93..91f088b37e21 100644
--- a/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
+++ b/metadata/md5-cache/dev-perl/PortageXS-0.2.12-r1
@@ -3,7 +3,7 @@ DEPEND=dev-perl/Module-Build virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImpor
DESCRIPTION=Portage abstraction layer for perl
EAPI=5
HOMEPAGE=http://search.cpan.org/~kentnl/PortageXS
-INHERIT=perl-module eutils prefix
+INHERIT=perl-module epatch prefix
IUSE=minimal
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/PortageXS-0.2.12.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=4b63232bdd4581bec6d16b8c5a352425
+_md5_=bf7580b6faaa8ff463d1feaac92627b8
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
index 6bb3171d6227..6f77d150e377 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r1
@@ -3,11 +3,11 @@ DEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
DESCRIPTION=Manipulate the mouse cursor programmatically
EAPI=5
HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
-INHERIT=eutils perl-module
+INHERIT=edos2unix perl-module
KEYWORDS=amd64 ~ia64 sparc x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/Tk dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=e4c34b29836f7aa3a2eead0b9e468430
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=158212a696da918ff52ffb9b6da1dc7e
diff --git a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3 b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
index 42a834205077..7d519f9196a2 100644
--- a/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
+++ b/metadata/md5-cache/dev-perl/Tk-CursorControl-0.400.0-r3
@@ -3,7 +3,7 @@ DEPEND=dev-perl/Tk dev-lang/perl test? ( x11-base/xorg-server[xvfb] x11-apps/xho
DESCRIPTION=Manipulate the mouse cursor programmatically
EAPI=6
HOMEPAGE=https://metacpan.org/release/Tk-CursorControl
-INHERIT=eutils perl-module virtualx
+INHERIT=edos2unix perl-module virtualx
IUSE=test
KEYWORDS=~amd64 ~ia64 ~sparc ~x86
LICENSE=|| ( Artistic GPL-1+ )
@@ -11,5 +11,5 @@ RDEPEND=dev-perl/Tk dev-lang/perl:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DU/DUNNIGANJ/Tk-CursorControl-0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=a90eb3946e09e07f9f03284c89b821d9
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=8e8ee0db7ee2fcefe07888222657229d
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1 b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
index 2d8ede6f8b34..b9e30a283f3c 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
+++ b/metadata/md5-cache/dev-perl/XML-SAX-0.990.0-r1
@@ -3,11 +3,11 @@ DEPEND=dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/l
DESCRIPTION=Perl module for using and building Perl SAX2 XML parsers, filters, and drivers
EAPI=5
HOMEPAGE=https://metacpan.org/release/XML-SAX
-INHERIT=perl-module eutils
+INHERIT=perl-module epatch
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/XML-SAX-Base >=dev-perl/XML-NamespaceSupport-1.40.0 >=dev-libs/libxml2-2.4.1 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-0.99.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=60c556aae69893ecfd124b2242287394
+_md5_=7ade0bbed9602a2934511d4094405c72
diff --git a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3 b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
index f99cc8745f68..bf5222be7e56 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
+++ b/metadata/md5-cache/dev-php/PEAR-HTTP-1.4.1-r3
@@ -3,7 +3,7 @@ DEPEND=test? ( dev-php/PEAR-PEAR )
DESCRIPTION=Miscellaneous HTTP utilities
EAPI=6
HOMEPAGE=https://pear.php.net/package/HTTP
-INHERIT=php-pear-r2 eutils
+INHERIT=php-pear-r2 edos2unix
IUSE=test
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=dev-php/pear-1.8.1
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://pear.php.net/get/HTTP-1.4.1.tgz
-_eclasses_=php-pear-r2 4a7c293febeea04349068d5716ad29ff desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=65189fa58f51670444c4b411fa248111
+_eclasses_=php-pear-r2 4a7c293febeea04349068d5716ad29ff edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=ecc5ef04ab025548faa370aa69b48be9
diff --git a/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1 b/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
index 997367c0831e..8bd9a74cfc0f 100644
--- a/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
+++ b/metadata/md5-cache/dev-python/cheetah-docs-0.9.16_alpha1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
DESCRIPTION=Documentation for Cheetah templates
EAPI=5
HOMEPAGE=https://www.cheetahtemplate.org/
-INHERIT=eutils vcs-clean
+INHERIT=vcs-clean
KEYWORDS=~amd64 ~ia64 ppc x86
LICENSE=OPL
RESTRICT=binchecks strip
SLOT=0
SRC_URI=mirror://sourceforge/cheetahtemplate/CheetahDocs-0.9.16a1.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=419a80ab323a188d3e77799da9646b06
+_eclasses_=vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8bd55964bff575d8912ae211c868283d
diff --git a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1 b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
index bcc63168e947..542e26678db2 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -1,6 +1,5 @@
-BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=app-arch/unzip python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip
DESCRIPTION=Simple generic functions for Python
EAPI=7
HOMEPAGE=https://pypi.org/project/simplegeneric/
@@ -13,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
SLOT=0
SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 d8655e1387589a2e1930339b1627d5c1
-_md5_=9547312ea5abe0d9eb09b8fc0973323e
+_md5_=116f4b0138e42669bf36e7172ee5f2b9
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
index c8a15561f66a..4648f2a2b5c3 100644
--- a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.12
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby25(-)] dev-ruby/asciimath[ruby_targets_ruby25(-)] dev-ruby/coderay[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] dev-ruby/erubis[ruby_targets_ruby25(-)] dev-ruby/haml[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] dev-ruby/rouge[ruby_targets_ruby25(-)] dev-ruby/slim[ruby_targets_ruby25(-)] dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby26(-)] dev-ruby/asciimath[ruby_targets_ruby26(-)] dev-ruby/coderay[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] dev-ruby/erubis[ruby_targets_ruby26(-)] dev-ruby/haml[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/rouge[ruby_targets_ruby26(-)] dev-ruby/slim[ruby_targets_ruby26(-)] dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby25(-)] dev-ruby/asciimath[ruby_targets_ruby25(-)] dev-ruby/coderay[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] dev-ruby/erubis[ruby_targets_ruby25(-)] dev-ruby/haml[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] dev-ruby/rouge[ruby_targets_ruby25(-)] dev-ruby/slim[ruby_targets_ruby25(-)] dev-ruby/tilt[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-util/cucumber[ruby_targets_ruby26(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby26(-)] dev-ruby/asciimath[ruby_targets_ruby26(-)] dev-ruby/coderay[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] dev-ruby/erubis[ruby_targets_ruby26(-)] dev-ruby/haml[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/rouge[ruby_targets_ruby26(-)] dev-ruby/slim[ruby_targets_ruby26(-)] dev-ruby/tilt[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] dev-ruby/rspec-expectations:*[ruby_targets_ruby27(-)] dev-ruby/asciimath[ruby_targets_ruby27(-)] dev-ruby/coderay[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] dev-ruby/erubis[ruby_targets_ruby27(-)] dev-ruby/haml[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] dev-ruby/rouge[ruby_targets_ruby27(-)] dev-ruby/slim[ruby_targets_ruby27(-)] dev-ruby/tilt[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
EAPI=7
HOMEPAGE=https://github.com/asciidoctor/asciidoctor
INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.12.tar.gz -> asciidoctor-2.0.12.tar.gz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
-_md5_=29e822f4782a8b33b890dc71c19cd566
+_md5_=db3cfcfdcdcf80a0b956c23ce553d337
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.2 b/metadata/md5-cache/dev-ruby/haml-5.1.2
index 0e3d5563fcc6..9e74d5641386 100644
--- a/metadata/md5-cache/dev-ruby/haml-5.1.2
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
DESCRIPTION=A ruby web page templating engine
EAPI=7
-HOMEPAGE=http://haml.info/
+HOMEPAGE=https://haml.info/
INHERIT=ruby-fakegem
IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=5
SRC_URI=https://github.com/haml/haml/archive/v5.1.2.tar.gz -> haml-5.1.2.tar.gz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
-_md5_=259dea1789bddb2f18e3240f76f69e94
+_md5_=1c59c2feda3bb9adcdac0fc64668e1c2
diff --git a/metadata/md5-cache/dev-ruby/haml-5.1.2-r1 b/metadata/md5-cache/dev-ruby/haml-5.1.2-r1
new file mode 100644
index 000000000000..2b8faf216f1f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/haml-5.1.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25(-)] dev-ruby/tilt:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/nokogiri[ruby_targets_ruby25(-)] dev-ruby/railties:6.0[ruby_targets_ruby25(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby25(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby25(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/nokogiri[ruby_targets_ruby26(-)] dev-ruby/railties:6.0[ruby_targets_ruby26(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby26(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby27(-)] dev-ruby/nokogiri[ruby_targets_ruby27(-)] dev-ruby/railties:6.0[ruby_targets_ruby27(-)] dev-ruby/activemodel:6.0[ruby_targets_ruby27(-)] dev-ruby/actionpack:6.0[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] >=dev-ruby/maruku-0.7.2-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A ruby web page templating engine
+EAPI=7
+HOMEPAGE=https://haml.info/
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!!<dev-ruby/haml-4.0.7-r2 ruby_targets_ruby25? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby25(-)] dev-ruby/tilt:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby26(-)] dev-ruby/tilt:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/temple-0.8.0[ruby_targets_ruby27(-)] dev-ruby/tilt:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://github.com/haml/haml/archive/v5.1.2.tar.gz -> haml-5.1.2.tar.gz
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
+_md5_=f88e44540b5905ab19ecfac6325f503c
diff --git a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5 b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
index 4e9d1c40d3e7..3d46342d67ca 100644
--- a/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
+++ b/metadata/md5-cache/dev-ruby/hpricot-0.8.6-r5
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25(-)] dev-ruby/rdo
DESCRIPTION=A fast and liberal HTML parser for Ruby
EAPI=5
HOMEPAGE=https://wiki.github.com/hpricot/hpricot
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem epatch
IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/hpricot-0.8.6.gem
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
-_md5_=f4c5237f7cf92873aaf89ba5934957e7
+_md5_=40f776ca5a1d9f0e3f81d34457449b6e
diff --git a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2 b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
index ac3283ccd2a8..4e832e61c9be 100644
--- a/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
+++ b/metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r2
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets
DESCRIPTION=Ruby/NTLM HTTP provides NTLM authentication over http
EAPI=5
HOMEPAGE=http://www.mindflowsolutions.net/
-INHERIT=ruby-fakegem eutils
+INHERIT=ruby-fakegem epatch
IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=BSD-2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/ntlm-http-0.1.1.gem
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e
-_md5_=7603899087c793d20febe5722fb5cc45
+_md5_=96fdcfe49212069ceaa513c3182088ef
diff --git a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1 b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
index 8dbf7676384c..81891141afe9 100644
--- a/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
+++ b/metadata/md5-cache/dev-ruby/rack-ssl-1.4.1
@@ -3,7 +3,7 @@ DEPEND=test? ( ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] )
DESCRIPTION=Force SSL/TLS in your app
EAPI=5
HOMEPAGE=https://github.com/josh/rack-ssl/
-INHERIT=ruby-fakegem eutils versionator
+INHERIT=ruby-fakegem versionator
IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=1.4
SRC_URI=https://github.com/josh/rack-ssl/archive/v1.4.1.tar.gz -> rack-ssl-1.4.1-git.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd ruby-fakegem d9894561694732185fbcad470b121f2e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=4ccd2804902cf8b23d4aebe658d742bf
+_md5_=7c39b7cc9ca9a72d4a6036d413d53c8a
diff --git a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2 b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
index de1eca4b22f4..073ebfa22634 100644
--- a/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
+++ b/metadata/md5-cache/dev-ruby/ruby-sdl-2.1.2-r2
@@ -3,7 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.5 truetype? ( >=media-libs/sdl-ttf-2.0.6 ) image?
DESCRIPTION=Ruby/SDL: Ruby bindings for SDL
EAPI=5
HOMEPAGE=https://www.kmc.gr.jp/~ohai/rubysdl.en.html
-INHERIT=eutils ruby-ng
+INHERIT=ruby-ng
IUSE=image mixer truetype mpeg sge ruby_targets_ruby25 ruby_targets_ruby26
KEYWORDS=amd64 ~ppc x86
LICENSE=LGPL-2.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
SLOT=0
SRC_URI=https://github.com/ohai/rubysdl/archive/rel-2-1-2.tar.gz -> ruby-sdl-2.1.2.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd
-_md5_=5b0a733e19c3bf37adca015810643a56
+_md5_=2536b637a90dfde929ff64f5cc0a08e2
diff --git a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3 b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
index f01e00b4592b..830d07d6ba2e 100644
--- a/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
+++ b/metadata/md5-cache/dev-scheme/guile-1.8.8-r3
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncur
DESCRIPTION=Scheme interpreter
EAPI=5
HOMEPAGE=https://www.gnu.org/software/guile/
-INHERIT=eutils autotools flag-o-matic elisp-common
+INHERIT=epatch autotools flag-o-matic elisp-common
IUSE=debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/gmp-4.1:0= dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncu
RESTRICT=!regex? ( test )
SLOT=12/8
SRC_URI=mirror://gnu/guile/guile-1.8.8.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
-_md5_=ece47657ee04d041a15b23fcc8bfa3d4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
+_md5_=f7e32f9dd7c369757479bdf98d95d5f9
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.14-r2 b/metadata/md5-cache/dev-scheme/kawa-1.14-r2
index b128c118cf5a..aa916a89d2e8 100644
--- a/metadata/md5-cache/dev-scheme/kawa-1.14-r2
+++ b/metadata/md5-cache/dev-scheme/kawa-1.14-r2
@@ -3,12 +3,12 @@ DEPEND=frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) servlets? ( jav
DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
EAPI=6
HOMEPAGE=https://www.gnu.org/software/kawa/
-INHERIT=eutils java-pkg-2
+INHERIT=epatch java-pkg-2
IUSE=+awt +frontend jemacs krl +sax servlets +swing +xml xqtests elibc_FreeBSD source
KEYWORDS=x86
LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
RDEPEND=frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) servlets? ( java-virtuals/servlet-api:3.0 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gnu/kawa/kawa-1.14.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_3.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
-_md5_=774b66c79275428ea49deb48fc3364f4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888
+_md5_=6216e8615d9c43f6ad228e99a2a6d657
diff --git a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1 b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
index 6a08f564abbf..3a23d80a8fec 100644
--- a/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
+++ b/metadata/md5-cache/dev-scheme/scheme48-1.9.2-r1
@@ -3,12 +3,12 @@ DEPEND=emacs? ( >=app-editors/emacs-23.1:* )
DESCRIPTION=Scheme48 is an implementation of the Scheme Programming Language
EAPI=5
HOMEPAGE=http://www.s48.org/
-INHERIT=elisp-common multilib eutils flag-o-matic
+INHERIT=elisp-common epatch flag-o-matic
IUSE=doc emacs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=emacs? ( >=app-editors/emacs-23.1:* )
SLOT=0
SRC_URI=http://www.s48.org/1.9.2/scheme48-1.9.2.tgz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=7627a60623febe4ea4a607e907dbf6f2
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=32fed8a5378d66a75dba2923064c6b6b
diff --git a/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3 b/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
index 402791641c87..dff4bde44d83 100644
--- a/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
+++ b/metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3
@@ -3,12 +3,12 @@ DEPEND=app-arch/cpio
DESCRIPTION=R6RS-compliant Scheme implementation for real-time applications
EAPI=5
HOMEPAGE=https://code.google.com/p/ypsilon/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=examples threads
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=app-arch/cpio
SLOT=0
SRC_URI=https://ypsilon.googlecode.com/files/ypsilon-0.9.6.update3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=537bcb8a7f841939d7216971807ae421
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=247d173e4f47230625ab1638c2f1ec3d
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.4z-r13 b/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
index debaa92a408c..0a87027c49b2 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
+++ b/metadata/md5-cache/dev-tcltk/blt-2.4z-r13
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 ) sys-devel
DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc commands
EAPI=5
HOMEPAGE=http://blt.sourceforge.net/ http://jos.decoster.googlepages.com/bltfortk8.5.2
-INHERIT=autotools eutils flag-o-matic multilib toolchain-funcs
+INHERIT=autotools epatch flag-o-matic multilib toolchain-funcs
IUSE=jpeg static-libs X
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=3a656293254baf5372f0e5ef9477370f
+_md5_=5276a5c1a22034fefab4e8e174e7df6e
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.4z-r14 b/metadata/md5-cache/dev-tcltk/blt-2.4z-r14
index e1e8b3c5cf26..90443096cc92 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.4z-r14
+++ b/metadata/md5-cache/dev-tcltk/blt-2.4z-r14
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 ) sys-devel
DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc commands
EAPI=6
HOMEPAGE=http://blt.sourceforge.net/ http://jos.decoster.googlepages.com/bltfortk8.5.2
-INHERIT=autotools eutils flag-o-matic multilib toolchain-funcs
+INHERIT=autotools epatch flag-o-matic multilib toolchain-funcs
IUSE=jpeg static-libs X
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tk:0= jpeg? ( virtual/jpeg:0= ) X? ( x11-libs/libX11 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blt2.4z-8.5.2.tar.gz http://jos.decoster.googlepages.com/blt2.4z-8.5.2.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=f30b35afe19b5b9518c55d69bc0295fa
+_md5_=7b10b032512e3f68998744a99589184f
diff --git a/metadata/md5-cache/dev-tcltk/expect-5.45.4 b/metadata/md5-cache/dev-tcltk/expect-5.45.4
index fdfad7e4f703..9f64711ac228 100644
--- a/metadata/md5-cache/dev-tcltk/expect-5.45.4
+++ b/metadata/md5-cache/dev-tcltk/expect-5.45.4
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/tcl-8.2:0[threads?] sys-devel/gnuconfig >=app-portage/elt-patc
DESCRIPTION=tool for automating interactive applications
EAPI=6
HOMEPAGE=https://core.tcl-lang.org/expect/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=debug doc threads
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
LICENSE=BSD
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/tcl-8.2:0[threads?]
SLOT=0
SRC_URI=mirror://sourceforge/expect/expect5.45.4.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=631d3c851bfcbb7191497c06af0fc20f
+_md5_=51259008a9d657d46d96456c0ea9c54d
diff --git a/metadata/md5-cache/dev-tcltk/tclx-8.4.1 b/metadata/md5-cache/dev-tcltk/tclx-8.4.1
index fa9a16d8690f..c4707074055b 100644
--- a/metadata/md5-cache/dev-tcltk/tclx-8.4.1
+++ b/metadata/md5-cache/dev-tcltk/tclx-8.4.1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= tk? ( dev-lang/tk:0= )
DESCRIPTION=A set of extensions to TCL
EAPI=5
HOMEPAGE=http://tclx.sourceforge.net
-INHERIT=eutils multilib versionator
+INHERIT=epatch multilib versionator
IUSE=tk threads
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/tcl:0= tk? ( dev-lang/tk:0= )
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tclx/tclx8.4.1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=9a66c02000ce4222089e55f935fccf96
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=6e377a1fbc57102b516021cf2819000f
diff --git a/metadata/md5-cache/dev-tcltk/tclx-8.4.4 b/metadata/md5-cache/dev-tcltk/tclx-8.4.4
index 239b15453463..486f0785cf4d 100644
--- a/metadata/md5-cache/dev-tcltk/tclx-8.4.4
+++ b/metadata/md5-cache/dev-tcltk/tclx-8.4.4
@@ -3,6 +3,7 @@ DEPEND=dev-lang/tcl:0=
DESCRIPTION=A set of extensions to TCL
EAPI=7
HOMEPAGE=http://tclx.sourceforge.net
+INHERIT=multilib
IUSE=threads
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -11,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/flightaware/tclx/archive/v8.4.4.tar.gz -> tclx-8.4.4.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4fe252f2d72d6aa95e9cab1eb898cc47
+_md5_=ba5374311bfd0eabfa66f1fc48d912e2
diff --git a/metadata/md5-cache/dev-tcltk/tclxml-3.2-r2 b/metadata/md5-cache/dev-tcltk/tclxml-3.2-r2
index 3f0c2695da9d..faefab2c1d81 100644
--- a/metadata/md5-cache/dev-tcltk/tclxml-3.2-r2
+++ b/metadata/md5-cache/dev-tcltk/tclxml-3.2-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tclt
DESCRIPTION=Pure Tcl implementation of an XML parser
EAPI=5
HOMEPAGE=http://tclxml.sourceforge.net/
-INHERIT=eutils multilib
+INHERIT=epatch multilib
IUSE=debug threads
KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/tcl-8.2:0 >=dev-libs/libxml2-2.6.9 dev-libs/libxslt >=dev-tcl
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tclxml/tclxml-3.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=4fea80e8bce170dae8ace9dd625799f0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=c7d3424aade10084a5ddccb2c05b0c60
diff --git a/metadata/md5-cache/dev-tcltk/tclxml-3.2.7 b/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
index 1373964affc1..f8ffc01ac599 100644
--- a/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
+++ b/metadata/md5-cache/dev-tcltk/tclxml-3.2.7
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/wjoye/tclxml/archive/v3.2.7.tar.gz -> tclxml-3.2.7.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e8f67263d9ee1f754dba20484b2d9bd5
+_md5_=26c7d8d946c16952f418eb0df9178955
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4 b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
index 61ec1dbe3b7c..e14c80507e41 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.8.3-r4
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-libs/expat sys-devel/gnuconfig >=app-portage/elt-patc
DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
EAPI=5
HOMEPAGE=https://tdom.github.com/
-INHERIT=autotools eutils flag-o-matic multilib toolchain-funcs
+INHERIT=autotools epatch flag-o-matic multilib toolchain-funcs
IUSE=static-libs threads
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=MPL-1.1
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-libs/expat
SLOT=0
SRC_URI=https://github.com/downloads/tDOM/tdom/tDOM-0.8.3.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=45b15215b276bac655f718248e930f6d
+_md5_=d63a2df92a88f5564b96754e18a988fb
diff --git a/metadata/md5-cache/dev-tcltk/tdom-0.9.1 b/metadata/md5-cache/dev-tcltk/tdom-0.9.1
index cc6b954a59e8..0821f97333aa 100644
--- a/metadata/md5-cache/dev-tcltk/tdom-0.9.1
+++ b/metadata/md5-cache/dev-tcltk/tdom-0.9.1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/tcl:0= dev-libs/expat sys-devel/gnuconfig >=app-portage/elt-patc
DESCRIPTION=A XML/DOM/XPath/XSLT Implementation for Tcl
EAPI=6
HOMEPAGE=https://core.tcl.tk/tdom/
-INHERIT=autotools flag-o-matic multilib toolchain-funcs
+INHERIT=autotools flag-o-matic toolchain-funcs
IUSE=static-libs threads
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=MPL-1.1
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/tcl:0= dev-libs/expat
SLOT=0
SRC_URI=http://tdom.org/downloads/tdom-0.9.1-src.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=5cff87a6f8bd2c60c4100a849a082353
+_md5_=2f28fe351b9dbaadd79ffb8b6ed368de
diff --git a/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1 b/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
index 1b7d6934d801..59fc27d5b09f 100644
--- a/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
+++ b/metadata/md5-cache/dev-tcltk/tix-8.4.3-r1
@@ -3,12 +3,12 @@ DEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
DESCRIPTION=A widget library for Tcl/Tk
EAPI=5
HOMEPAGE=http://tix.sourceforge.net/
-INHERIT=eutils multilib
+INHERIT=epatch multilib
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=BSD
RDEPEND=dev-lang/tk:0= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tix/Tix8.4.3-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=760b7c68d5f906ed676c64dc92b9a2f4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=ced3d91b1cbe1a97565e557c4b5f13f4
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.11 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.11
index a6adbe7a621c..6dd66c7d7b48 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.11
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.11
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/lib
DESCRIPTION=Adds a lot of image formats to Tcl/Tk
EAPI=7
HOMEPAGE=http://tkimg.sourceforge.net/
-INHERIT=autotools eutils multilib prefix toolchain-funcs virtualx
+INHERIT=autotools edos2unix prefix toolchain-funcs virtualx
IUSE=doc test static-libs test
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/li
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.11/Img-1.4.11-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.11-patchset-1.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=3210875c1a3f17d3b45f6705a9c9ffd9
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=d8a7d25845bd19a5a04082619cdf9253
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.12 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.12
index e32119eb6934..dc29e988d6f7 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.12
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.12
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/lib
DESCRIPTION=Adds a lot of image formats to Tcl/Tk
EAPI=7
HOMEPAGE=http://tkimg.sourceforge.net/
-INHERIT=autotools eutils multilib prefix toolchain-funcs virtualx
+INHERIT=autotools edos2unix prefix toolchain-funcs virtualx
IUSE=doc test static-libs test
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/li
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.12/Img-1.4.12-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.12-patchset-1.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=fc9bc6839e994cae827283215949ce67
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=dd9ed95c9433d2acd4f5226b8d5ed8d5
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.13 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.13
index 49eba68f6b57..2d56a6fb225b 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.13
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.13
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tk:= dev-tcltk/tcllib media-libs/tiff:0= media-libs/libpng:0= sy
DESCRIPTION=Adds a lot of image formats to Tcl/Tk
EAPI=7
HOMEPAGE=http://tkimg.sourceforge.net/
-INHERIT=autotools eutils multilib prefix toolchain-funcs virtualx
+INHERIT=autotools edos2unix prefix toolchain-funcs virtualx
IUSE=doc test static-libs test
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tk:= dev-tcltk/tcllib media-libs/tiff:0= media-libs/libpng:0= s
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.13/Img-1.4.13-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.12-patchset-1.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=c980fedf7c0515da54370a1bb1b2e39f
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=f401df558bf60558cd920bc75c612287
diff --git a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9 b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
index 43ae7438b752..a5e07945b7b9 100644
--- a/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
+++ b/metadata/md5-cache/dev-tcltk/tkimg-1.4.9
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/lib
DESCRIPTION=Adds a lot of image formats to Tcl/Tk
EAPI=7
HOMEPAGE=http://tkimg.sourceforge.net/
-INHERIT=autotools eutils multilib prefix toolchain-funcs virtualx
+INHERIT=autotools edos2unix prefix toolchain-funcs virtualx
IUSE=doc test static-libs test
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tk:= >=dev-tcltk/tcllib-1.11 media-libs/tiff:0= >=media-libs/li
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/tkimg/tkimg/1.4/tkimg%201.4.9/Img-1.4.9-Source.tar.gz https://dev.gentoo.org/~tupone/distfiles/tkimg-1.4.7-patchset-1.tar.xz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
-_md5_=361703321514ac31ff6ea2f11b2372e2
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 prefix de7d8e2b10085ed5ff09ad70e4753e5c virtualx d828f8a6cfc731f2683d0967d3f2f95a
+_md5_=d04ec5b5af58175c2d9df84d7b298d77
diff --git a/metadata/md5-cache/dev-tex/foiltex-2.1.4b b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
index 95041784f44b..02b4d15034bb 100644
--- a/metadata/md5-cache/dev-tex/foiltex-2.1.4b
+++ b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
@@ -1,12 +1,14 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
DESCRIPTION=LaTeX package used to create foils and slides
EAPI=7
HOMEPAGE=ftp://ftp.dante.de/tex-archive/help/Catalogue/entries/foiltex.html
+INHERIT=latex-package
KEYWORDS=amd64 ppc x86
LICENSE=FoilTeX
RDEPEND=virtual/latex-base
SLOT=0
SRC_URI=mirror://gentoo/foiltex-2.1.4b.zip
_eclasses_=latex-package e5f296c98696dd02059bc6a5a03282e2
-_md5_=0ce5e0c4f16b1e19740a0b644fee36ef
+_md5_=e854080020895f8f0ed658159e54564f
diff --git a/metadata/md5-cache/dev-tex/sketch-0.3.7 b/metadata/md5-cache/dev-tex/sketch-0.3.7
index 446ec047c514..031b997dc0cf 100644
--- a/metadata/md5-cache/dev-tex/sketch-0.3.7
+++ b/metadata/md5-cache/dev-tex/sketch-0.3.7
@@ -3,10 +3,11 @@ DEPEND=dev-lang/perl
DESCRIPTION=Produces drawings of two- or three-dimensional solid objects and scenes for TeX
EAPI=7
HOMEPAGE=https://www.frontiernet.net/~eugene.ressler/
+INHERIT=edos2unix toolchain-funcs
IUSE=doc examples
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-3+
SLOT=0
SRC_URI=https://www.frontiernet.net/~eugene.ressler/sketch-0.3.7.tgz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=9e4a57df64a560b1ab586ffba30bf6d3
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=7a942f5a7b85ca9dbcf11503dc5838b7
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
index 2ef6fed57106..4f8beaff4534 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1-r1
@@ -4,12 +4,12 @@ DEPEND=acct-group/android
DESCRIPTION=Open Handset Alliance's Android SDK
EAPI=7
HOMEPAGE=https://developer.android.com
-INHERIT=desktop udev
+INHERIT=desktop user udev
KEYWORDS=~amd64 ~x86
LICENSE=android
RDEPEND=acct-group/android dev-java/ant-core dev-java/swt:3.7[cairo] >=virtual/jdk-1.8 sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)]
RESTRICT=mirror
SLOT=0
SRC_URI=https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=6541c86311f5c5276a2bd56acb1fa073
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
+_md5_=506f0a51b61b3aeb14cdabe128db7cb6
diff --git a/metadata/md5-cache/dev-util/babeltrace-1.2.4 b/metadata/md5-cache/dev-util/babeltrace-1.2.4
index a0232f9d5494..c381d3fd5256 100644
--- a/metadata/md5-cache/dev-util/babeltrace-1.2.4
+++ b/metadata/md5-cache/dev-util/babeltrace-1.2.4
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux sys-devel/bison sys-dev
DESCRIPTION=A command-line tool and library to read and convert trace files
EAPI=5
HOMEPAGE=https://lttng.org
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=test
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/popt sys-apps/util-linux
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://lttng.org/files/babeltrace/babeltrace-1.2.4.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=0b9b5105d91714a3690ff8e6071fb5fc
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=9b4f7f86b18e8e2998eaaae2461d925b
diff --git a/metadata/md5-cache/dev-util/ddd-3.3.12-r4 b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
index 231dee80c79d..a69f64c79f34 100644
--- a/metadata/md5-cache/dev-util/ddd-3.3.12-r4
+++ b/metadata/md5-cache/dev-util/ddd-3.3.12-r4
@@ -3,7 +3,7 @@ DEPEND=sys-devel/gdb sys-libs/ncurses:* x11-libs/libX11 x11-libs/libXaw x11-libs
DESCRIPTION=Graphical front-end for command-line debuggers
EAPI=6
HOMEPAGE=https://www.gnu.org/software/ddd
-INHERIT=autotools eutils optfeature
+INHERIT=autotools desktop optfeature
IUSE=readline
KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3 LGPL-3 FDL-1.1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gnu/ddd/ddd-3.3.12.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 optfeature e142388219c7fee6ff016fe1c78a10a5
-_md5_=d22f83ace01e55b208790f54fa709ac0
+_md5_=cefdf2f79a0d733b8a798afc0caf7c70
diff --git a/metadata/md5-cache/dev-util/debhelper-13.2.1 b/metadata/md5-cache/dev-util/debhelper-13.2.1
index 79c02625d61a..61edd6cd2ab1 100644
--- a/metadata/md5-cache/dev-util/debhelper-13.2.1
+++ b/metadata/md5-cache/dev-util/debhelper-13.2.1
@@ -3,6 +3,7 @@ DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/per
DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
EAPI=7
HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+INHERIT=toolchain-funcs
IUSE=test l10n_de l10n_es l10n_fr
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux
LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/pe
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_13.2.1.tar.xz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d42e9d2b892f852ebbc6008cef1b7f81
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=13a7ad313b034f306c440b3b2697c1d9
diff --git a/metadata/md5-cache/dev-util/emilpro-3-r4 b/metadata/md5-cache/dev-util/emilpro-3-r4
index 73ba93c95a50..40b57a73afa2 100644
--- a/metadata/md5-cache/dev-util/emilpro-3-r4
+++ b/metadata/md5-cache/dev-util/emilpro-3-r4
@@ -3,7 +3,7 @@ DEPEND=dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourcevie
DESCRIPTION=a graphical disassembler for a large number of instruction sets
EAPI=5
HOMEPAGE=http://www.emilpro.com/
-INHERIT=cmake-utils eutils
+INHERIT=cmake-utils epatch
IUSE=+system-binutils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourcevi
SLOT=0
SRC_URI=http://www.emilpro.com/emilpro-3.tar.gz !system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8
-_md5_=ac1229300fde0f0fdb84f31e2b2ce545
+_md5_=7a02f1ea5b6033425722f06e599a2e49
diff --git a/metadata/md5-cache/dev-util/emilpro-9999 b/metadata/md5-cache/dev-util/emilpro-9999
index bfa57c2826c8..cf2b3a6e52ec 100644
--- a/metadata/md5-cache/dev-util/emilpro-9999
+++ b/metadata/md5-cache/dev-util/emilpro-9999
@@ -3,7 +3,7 @@ DEPEND=dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourcevie
DESCRIPTION=a graphical disassembler for a large number of instruction sets
EAPI=5
HOMEPAGE=http://www.emilpro.com/
-INHERIT=cmake-utils eutils git-r3
+INHERIT=cmake-utils epatch git-r3
IUSE=+system-binutils
LICENSE=GPL-2
PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/cairomm:0 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourcevi
SLOT=0
SRC_URI=!system-binutils? ( mirror://gnu/binutils/binutils-2.23.2.tar.bz2 )
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4c26056bbe9c6c33656976a32ba02f71
+_md5_=6bcfe400f6dcb01df7210c967ee271c2
diff --git a/metadata/md5-cache/dev-util/findbugs-3.0.1 b/metadata/md5-cache/dev-util/findbugs-3.0.1
index 4a7c42eb239a..430222c125d3 100644
--- a/metadata/md5-cache/dev-util/findbugs-3.0.1
+++ b/metadata/md5-cache/dev-util/findbugs-3.0.1
@@ -3,7 +3,7 @@ DEPEND=>=virtual/jdk-1.7 app-arch/unzip doc? ( app-text/docbook-xsl-stylesheets
DESCRIPTION=Find Bugs in Java Programs
EAPI=5
HOMEPAGE=http://findbugs.sourceforge.net/
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 dev-java/ant-core:0 dev-java/apple-java-extensions-bin
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://sourceforge/findbugs/findbugs-3.0.1-source.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=2c82e09ef1e55234bbd9e6991900f1dc
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=c5c119cda08200e9355fd89102326e8b
diff --git a/metadata/md5-cache/dev-util/its4-1.1.1-r1 b/metadata/md5-cache/dev-util/its4-1.1.1-r1
index fe8af0a5489d..e120ae112d81 100644
--- a/metadata/md5-cache/dev-util/its4-1.1.1-r1
+++ b/metadata/md5-cache/dev-util/its4-1.1.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=ITS4: Software Security Tool
EAPI=5
HOMEPAGE=http://www.cigital.com/its4/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=ITS4
SLOT=0
SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/its4-1.1.1.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d5107c3d7b13f67c7296e71818a7dda9
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=89a483897b661816da695be3eb507316
diff --git a/metadata/md5-cache/dev-util/mutrace-0.2-r1 b/metadata/md5-cache/dev-util/mutrace-0.2-r1
index efd1566080d1..55b7e0fb769f 100644
--- a/metadata/md5-cache/dev-util/mutrace-0.2-r1
+++ b/metadata/md5-cache/dev-util/mutrace-0.2-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/binutils-libs:=
DESCRIPTION=A mutex tracer/profiler
EAPI=5
HOMEPAGE=http://0pointer.de/blog/projects/mutrace.html
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2 LGPL-3
RDEPEND=sys-libs/binutils-libs:=
SLOT=0
SRC_URI=http://0pointer.de/public/mutrace-0.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=9c1d66bd5779511cf50faaa809141c95
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=d4cf89599fa20f21ae1a991a9146bef4
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
index db9647ad4df6..ebe50c562d69 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.61-r1
@@ -3,7 +3,7 @@ DEPEND=~dev-util/nvidia-cuda-toolkit-8.0.61 media-libs/freeglut examples? ( medi
DESCRIPTION=NVIDIA CUDA Software Development Kit
EAPI=6
HOMEPAGE=https://developer.nvidia.com/cuda-zone
-INHERIT=cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
+INHERIT=cuda epatch flag-o-matic portability toolchain-funcs unpacker versionator
IUSE=+cuda debug +doc +examples opencl mpi
KEYWORDS=~amd64 ~amd64-linux
LICENSE=CUDPP
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run -> cuda_8.0.61_375.26_linux.run
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 cuda c2f1b334711bbbf2130f339636dc7515 portability c10bdc40668533b1faf15b1d89df0303 unpacker 517f16af48ee3ab88180dd58b5143213 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=855e9d2cbaa697f805b7c15e8f9100e1
+_md5_=d09f387d2e1a3b0d986224672c75cf60
diff --git a/metadata/md5-cache/dev-util/omake-0.10.2 b/metadata/md5-cache/dev-util/omake-0.10.2
index 88de6d3c6670..1f97826f68ae 100644
--- a/metadata/md5-cache/dev-util/omake-0.10.2
+++ b/metadata/md5-cache/dev-util/omake-0.10.2
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0=
DESCRIPTION=Make replacement
EAPI=5
HOMEPAGE=http://projects.camlcity.org/projects/omake.html
-INHERIT=toolchain-funcs multilib eutils
+INHERIT=epatch
IUSE=doc fam ncurses +ocamlopt readline
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0
RESTRICT=installsources !ocamlopt? ( strip )
SLOT=0
SRC_URI=http://download.camlcity.org/download/omake-0.10.2.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f1149adbea675543e6050804e3a2d021
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=09732c7cdf72d156ec915d0b96101e9b
diff --git a/metadata/md5-cache/dev-util/omake-0.10.3 b/metadata/md5-cache/dev-util/omake-0.10.3
index f72f0c15c68d..87cb85a893b4 100644
--- a/metadata/md5-cache/dev-util/omake-0.10.3
+++ b/metadata/md5-cache/dev-util/omake-0.10.3
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0=
DESCRIPTION=Make replacement
EAPI=5
HOMEPAGE=http://projects.camlcity.org/projects/omake.html
-INHERIT=toolchain-funcs multilib eutils
+INHERIT=epatch
IUSE=doc fam ncurses +ocamlopt readline
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0
RESTRICT=installsources !ocamlopt? ( strip )
SLOT=0
SRC_URI=http://download.camlcity.org/download/omake-0.10.3.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=61ac190dd85f6621edca9ded3b9dec6f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=edc47aff1b27ddc9c48d8ea75112a7e9
diff --git a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1 b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
index 38d341e4b961..0dc023db8f46 100644
--- a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
+++ b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0=
DESCRIPTION=Make replacement
EAPI=5
HOMEPAGE=http://omake.metaprl.org/
-INHERIT=toolchain-funcs multilib versionator eutils
+INHERIT=epatch toolchain-funcs multilib versionator
IUSE=doc fam ncurses +ocamlopt readline
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0
RESTRICT=installsources !ocamlopt? ( strip )
SLOT=0
SRC_URI=http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=73afa43ce923784ab6ea4ddba4cfade2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=da54f37bebccf9e4bfdf910d2db8d2c7
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
index 0c12520458b9..d01d57e003f8 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
@@ -3,12 +3,12 @@ DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,ab
DESCRIPTION=Package config system that manages compile/link flags
EAPI=5
HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
-INHERIT=eutils flag-o-matic libtool multilib multilib-minimal
+INHERIT=epatch flag-o-matic libtool multilib multilib-minimal
IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
SLOT=0
SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=85333f000a8502234084faafca890366
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=e1faf3496d5d3cbc0c5bc317c22428c9
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
index 6e9df514e7ec..0d670bd8b1ae 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
@@ -3,12 +3,12 @@ DEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,ab
DESCRIPTION=Package config system that manages compile/link flags
EAPI=5
HOMEPAGE=https://pkgconfig.freedesktop.org/wiki/
-INHERIT=eutils flag-o-matic libtool multilib multilib-minimal
+INHERIT=epatch flag-o-matic libtool multilib multilib-minimal
IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
SLOT=0
SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=b51f6ca4f1114c34ae6bad2123bf2e84
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=ce4739b2f0aa2e4bb623fe64c93a1841
diff --git a/metadata/md5-cache/dev-util/premake-4.3-r1 b/metadata/md5-cache/dev-util/premake-4.3-r1
index 1b0bed71932f..c99ecd5f0351 100644
--- a/metadata/md5-cache/dev-util/premake-4.3-r1
+++ b/metadata/md5-cache/dev-util/premake-4.3-r1
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=A makefile generation tool
EAPI=5
HOMEPAGE=http://industriousone.com/premake
-INHERIT=versionator eutils
+INHERIT=versionator epatch
KEYWORDS=amd64 ppc x86
LICENSE=BSD
SLOT=4
SRC_URI=mirror://sourceforge/premake/premake-4.3-src.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=90fc4455e20fd09c2bcf38b852fe1a5e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e0404ccd9fb6c8f8c5ceb1eb947e7c61
diff --git a/metadata/md5-cache/dev-util/rats-2.4 b/metadata/md5-cache/dev-util/rats-2.4
index c799f8047053..4024747c2b18 100644
--- a/metadata/md5-cache/dev-util/rats-2.4
+++ b/metadata/md5-cache/dev-util/rats-2.4
@@ -3,11 +3,11 @@ DEPEND=dev-libs/expat:=
DESCRIPTION=RATS - Rough Auditing Tool for Security
EAPI=6
HOMEPAGE=https://code.google.com/p/rough-auditing-tool-for-security/
-INHERIT=eutils
+INHERIT=edos2unix
KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=dev-libs/expat:=
SLOT=0
SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/rough-auditing-tool-for-security/rats-2.4.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=9ce9815bc1688729cf2c3414e5ad24d6
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=cfb4b020e008b6be377c54a181e21093
diff --git a/metadata/md5-cache/dev-util/regexxer-0.10-r1 b/metadata/md5-cache/dev-util/regexxer-0.10-r1
index 9cf3a88e5c87..80e6f068348d 100644
--- a/metadata/md5-cache/dev-util/regexxer-0.10-r1
+++ b/metadata/md5-cache/dev-util/regexxer-0.10-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-cpp/glibmm-2.28:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev
DESCRIPTION=An interactive tool for performing search and replace operations
EAPI=5
HOMEPAGE=http://regexxer.sourceforge.net/
-INHERIT=autotools eutils flag-o-matic gnome2
+INHERIT=autotools epatch flag-o-matic gnome2
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=dev-cpp/glibmm-2.28:2 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
SLOT=0
SRC_URI=mirror://sourceforge/regexxer/regexxer-0.10.tar.xz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=f68f5892c364b9879438d6c7aaa4a3b8
+_md5_=f2c9df757c7e28e1fa11702c9c8d7191
diff --git a/metadata/md5-cache/dev-util/splint-3.1.2-r2 b/metadata/md5-cache/dev-util/splint-3.1.2-r2
index 0653cb7f79b9..8159986e2e77 100644
--- a/metadata/md5-cache/dev-util/splint-3.1.2-r2
+++ b/metadata/md5-cache/dev-util/splint-3.1.2-r2
@@ -3,10 +3,10 @@ DEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 ||
DESCRIPTION=Check C programs for vulnerabilities and programming mistakes
EAPI=5
HOMEPAGE=http://lclint.cs.virginia.edu/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.splint.org/downloads/splint-3.1.2.src.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=21ef2180348910853271c68d24087e47
+_md5_=425dbf53a4260e552cf27ac176c3fe45
diff --git a/metadata/md5-cache/dev-util/txt2regex-0.8-r3 b/metadata/md5-cache/dev-util/txt2regex-0.8-r3
index fb4c76c18702..5f61bcec89c7 100644
--- a/metadata/md5-cache/dev-util/txt2regex-0.8-r3
+++ b/metadata/md5-cache/dev-util/txt2regex-0.8-r3
@@ -3,12 +3,12 @@ DEPEND=nls? ( sys-devel/gettext )
DESCRIPTION=A Regular Expression wizard that converts human sentences to regexs
EAPI=5
HOMEPAGE=http://txt2regex.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
IUSE=nls cjk
KEYWORDS=~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=>=app-shells/bash-2.04
SLOT=0
SRC_URI=http://txt2regex.sourceforge.net/txt2regex-0.8.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=b1bef60060e3e4b39ddc6ca92ecbd891
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=a9b2660cc2a986ecf4ac64f5979eb659
diff --git a/metadata/md5-cache/dev-util/visual-regexp-3.0-r1 b/metadata/md5-cache/dev-util/visual-regexp-3.0-r1
index c1f4f7cdd875..d6b8b40c4432 100644
--- a/metadata/md5-cache/dev-util/visual-regexp-3.0-r1
+++ b/metadata/md5-cache/dev-util/visual-regexp-3.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Type the regexp and visualize it on a sample of your choice
EAPI=5
HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
-INHERIT=eutils
+INHERIT=desktop epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/tk-8.3
SLOT=0
SRC_URI=https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar http://laurent.riesterer.free.fr/regexp/visual_regexp-3.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=862e63ce38148f73cb8b72cebffa99cc
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=97b23ee325c512ea04b18c121cfc43a3
diff --git a/metadata/md5-cache/dev-util/visual-regexp-3.1 b/metadata/md5-cache/dev-util/visual-regexp-3.1
index c7fff4ac4d4d..f416b3485dcb 100644
--- a/metadata/md5-cache/dev-util/visual-regexp-3.1
+++ b/metadata/md5-cache/dev-util/visual-regexp-3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install prepare unpack
DESCRIPTION=Type the regexp and visualize it on a sample of your choice
EAPI=5
HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
-INHERIT=eutils
+INHERIT=desktop edos2unix epatch
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=dev-lang/tk-8.5
SLOT=0
SRC_URI=https://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar http://laurent.riesterer.free.fr/regexp/visual_regexp-3.1.tcl
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=1225e3ec8caeba9d031b29500aabff5b
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=63576c3cbcfe493ea980647cf820e312
diff --git a/metadata/md5-cache/dev-vcs/cvsspam-0.2.12 b/metadata/md5-cache/dev-vcs/cvsspam-0.2.12
index 5aaa32aac867..149e24bf04ab 100644
--- a/metadata/md5-cache/dev-vcs/cvsspam-0.2.12
+++ b/metadata/md5-cache/dev-vcs/cvsspam-0.2.12
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Utility to send colored HTML CVS-mails
EAPI=5
HOMEPAGE=http://www.badgers-in-foil.co.uk/projects/cvsspam/
-INHERIT=eutils
+INHERIT=epatch
IUSE=subversion
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/ruby subversion? ( dev-vcs/subversion )
SLOT=0
SRC_URI=http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/cvsspam-0.2.12.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a70a6632ab91e4eac6a86a0853a376a5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=5650adb0582e86ec2ab8cff53e775069
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
index 0b05a076ba0d..95af39e21733 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
@@ -3,7 +3,7 @@ DEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git
DESCRIPTION=Highly flexible server for git directory version tracker, Gentoo fork
EAPI=5
HOMEPAGE=https://cgit.gentoo.org/proj/gitolite-gentoo.git
-INHERIT=eutils perl-module user
+INHERIT=perl-module user
IUSE=contrib vim-syntax
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/gi
SLOT=0
SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=2fca5436d7f89f421f35edbebbeb5adf
+_md5_=53e7acf70aa3f7becffde20763617b2c
diff --git a/metadata/md5-cache/dev-vcs/rcs-5.9.3 b/metadata/md5-cache/dev-vcs/rcs-5.9.3
index 5ba067610783..bb7a94e4c1c5 100644
--- a/metadata/md5-cache/dev-vcs/rcs-5.9.3
+++ b/metadata/md5-cache/dev-vcs/rcs-5.9.3
@@ -3,12 +3,12 @@ DEPEND=sys-apps/diffutils sys-apps/ed
DESCRIPTION=Revision Control System
EAPI=5
HOMEPAGE=https://www.gnu.org/software/rcs/
-INHERIT=eutils flag-o-matic
+INHERIT=flag-o-matic
IUSE=doc
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
LICENSE=GPL-3
RDEPEND=sys-apps/diffutils sys-apps/ed
SLOT=0
SRC_URI=mirror://gnu/rcs/rcs-5.9.3.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=e1e7f2240c10831a4105b71823b11ec7
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=5560251428cee9bfa7df7a028a7ddb43
diff --git a/metadata/md5-cache/dev-vcs/rcs-5.9.4 b/metadata/md5-cache/dev-vcs/rcs-5.9.4
index 5c51a8ec2962..5c5ce8522ed6 100644
--- a/metadata/md5-cache/dev-vcs/rcs-5.9.4
+++ b/metadata/md5-cache/dev-vcs/rcs-5.9.4
@@ -3,12 +3,12 @@ DEPEND=sys-apps/diffutils sys-apps/ed
DESCRIPTION=Revision Control System
EAPI=5
HOMEPAGE=https://www.gnu.org/software/rcs/
-INHERIT=eutils flag-o-matic
+INHERIT=flag-o-matic
IUSE=doc
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
LICENSE=GPL-3
RDEPEND=sys-apps/diffutils sys-apps/ed
SLOT=0
SRC_URI=mirror://gnu/rcs/rcs-5.9.4.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=5c102a6a538f815edf150e49d89c1494
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=9dc78de833db23121150cf2b04fb1f8e
diff --git a/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r3 b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r3
index a9ea4dabbdc3..06577c105533 100644
--- a/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r3
+++ b/metadata/md5-cache/games-action/trine-enchanted-edition-2.12.508-r3
@@ -1,8 +1,10 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install nofetch postinst postrm preinst prepare
-DEPEND=app-arch/unzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=The original sidescrolling action platformer under the Trine 2 engine
EAPI=7
HOMEPAGE=https://www.frozenbyte.com/games/trine-enchanted-edition
+INHERIT=desktop wrapper xdg
IUSE=+launcher
KEYWORDS=-* ~amd64 ~x86
LICENSE=all-rights-reserved
@@ -10,5 +12,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32]
RESTRICT=bindist fetch splitdebug
SLOT=0
SRC_URI=trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=769b5498dcc9f326d205e9baf3b077e1
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=96d58501ddd271dcb5f2c5e990e89725
diff --git a/metadata/md5-cache/games-action/trine2-2.01.425-r2 b/metadata/md5-cache/games-action/trine2-2.01.425-r2
index 6cb071b477de..36bbace0ca60 100644
--- a/metadata/md5-cache/games-action/trine2-2.01.425-r2
+++ b/metadata/md5-cache/games-action/trine2-2.01.425-r2
@@ -1,8 +1,10 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install nofetch postinst postrm preinst prepare
-DEPEND=app-arch/unzip dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Sidescrolling game of action, puzzles and platforming, Complete Story edition
EAPI=7
HOMEPAGE=http://www.trine2.com/
+INHERIT=desktop wrapper xdg
IUSE=+launcher
KEYWORDS=-* ~amd64 ~x86
LICENSE=all-rights-reserved
@@ -10,5 +12,5 @@ RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32]
RESTRICT=bindist fetch splitdebug
SLOT=0
SRC_URI=trine2_complete_story_v2_01_build_425_humble_linux_full.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=e95b8e6f5b90c029dc70396efb42118a
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=a2ca44835a8915d33dc6fd54ca5ab8e9
diff --git a/metadata/md5-cache/games-board/scid-4.6.2-r1 b/metadata/md5-cache/games-board/scid-4.6.2-r1
index 86f3f32618cb..d95b45289cc8 100644
--- a/metadata/md5-cache/games-board/scid-4.6.2-r1
+++ b/metadata/md5-cache/games-board/scid-4.6.2-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 || ( dev-lang/python:
DESCRIPTION=a free chess database application
EAPI=6
HOMEPAGE=http://scid.sourceforge.net/
-INHERIT=eutils toolchain-funcs gnome2-utils python-any-r1
+INHERIT=desktop edos2unix toolchain-funcs gnome2-utils python-any-r1
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 !games-board/chessdb
SLOT=0
SRC_URI=mirror://sourceforge/scid/scid-4.6.2.zip mirror://sourceforge/scid/spelling.zip mirror://sourceforge/scid/ratings.zip mirror://sourceforge/scid/photos.zip mirror://sourceforge/scid/scidlet40k.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9
-_md5_=58982c09bb70c3b592049cc11eccca1f
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9
+_md5_=f0de43fb80a43cc57f87fe34f9876833
diff --git a/metadata/md5-cache/games-emulation/caps-20071115 b/metadata/md5-cache/games-emulation/caps-20071115
index 62b5734cef3e..9a805faef3d4 100644
--- a/metadata/md5-cache/games-emulation/caps-20071115
+++ b/metadata/md5-cache/games-emulation/caps-20071115
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
DESCRIPTION=Support library for accessing and using C.A.P.S. images
EAPI=5
HOMEPAGE=http://www.softpres.org/
-INHERIT=eutils multilib
+INHERIT=multilib
IUSE=doc
KEYWORDS=amd64 x86
LICENSE=CAPS
RESTRICT=strip
SLOT=0
SRC_URI=mirror://gentoo/ipfdevlib_linux-20060612.tgz amd64? ( mirror://gentoo/ipflib_linux-amd64-20071115.tgz ) doc? ( mirror://gentoo/ipfdoc102a.zip ) mirror://gentoo/config_uae_ocs13_512c-512s.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=46c0a1a69c0c5b177ef47f7bcb55b43a
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=8431349037cc484d59d5e266ac3e2755
diff --git a/metadata/md5-cache/games-emulation/emutos-0.9.12 b/metadata/md5-cache/games-emulation/emutos-0.9.12
index cae6d9a448b8..1e8dee247442 100644
--- a/metadata/md5-cache/games-emulation/emutos-0.9.12
+++ b/metadata/md5-cache/games-emulation/emutos-0.9.12
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install
-DEPEND=app-arch/unzip
DESCRIPTION=Single-user single-tasking operating system for 32-bit Atari computer emulators
EAPI=7
HOMEPAGE=http://emutos.sourceforge.net
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/emutos/emutos-192k-0.9.12.zip mirror://sourceforge/emutos/emutos-256k-0.9.12.zip mirror://sourceforge/emutos/emutos-512k-0.9.12.zip mirror://sourceforge/emutos/emutos-aranym-0.9.12.zip
-_md5_=9e18aa7bee4ec3d3db5cf8da93a50634
+_md5_=e051e685fe031265ba692295fffe1311
diff --git a/metadata/md5-cache/games-engines/residualvm-0.2.1-r1 b/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
index de49b04efeec..481f3cd8a9b8 100644
--- a/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
+++ b/metadata/md5-cache/games-engines/residualvm-0.2.1-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,
DESCRIPTION=A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures
EAPI=6
HOMEPAGE=https://www.residualvm.org/
-INHERIT=eutils toolchain-funcs gnome2-utils
+INHERIT=desktop toolchain-funcs gnome2-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/residualvm/residualvm-0.2.1-sources.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
-_md5_=67021fa77b960d43c19c8c62de506381
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
+_md5_=8163aeeb31902333ea39ba6dc778a350
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r5 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r5
index 2c59885f1701..27e7f66a7940 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r5
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r5
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Demo for the sequel to the 1999 multi-player first-person shooter
EAPI=7
HOMEPAGE=http://www.ut2003.com/
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213
-_md5_=708a7f9d48c651423a537a3255033d11
+_md5_=e1f567130b8047dab93fa5eac5a24591
diff --git a/metadata/md5-cache/games-fps/ut2004-data-3186-r5 b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
index 98cca9a6b0c2..0547895f57e2 100644
--- a/metadata/md5-cache/games-fps/ut2004-data-3186-r5
+++ b/metadata/md5-cache/games-fps/ut2004-data-3186-r5
@@ -3,12 +3,13 @@ DEFINED_PHASES=install postinst postrm setup unpack
DESCRIPTION=Unreal Tournament 2004 - This is the data portion of UT2004
EAPI=7
HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
-INHERIT=cdrom desktop eutils portability unpacker xdg-utils
+INHERIT=cdrom desktop portability unpacker xdg-utils
KEYWORDS=~amd64 ~x86
LICENSE=ut2003
PDEPEND=>=games-fps/ut2004-3369.3-r2
PROPERTIES=interactive
RDEPEND=!games-fps/ut2004-ded
+RESTRICT=bindist
SLOT=0
-_eclasses_=portability c10bdc40668533b1faf15b1d89df0303 cdrom dd6ba7b03316338a4fdd3ebbade8a719 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc48eee771dd34ddfb985e00ac12cfdb
+_eclasses_=portability c10bdc40668533b1faf15b1d89df0303 cdrom dd6ba7b03316338a4fdd3ebbade8a719 desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=3ca39e2eeb3a2641c945cf52b6b23d2e
diff --git a/metadata/md5-cache/games-misc/exult-sound-0-r2 b/metadata/md5-cache/games-misc/exult-sound-0-r2
index 1e23a480b505..eacbeaf00838 100644
--- a/metadata/md5-cache/games-misc/exult-sound-0-r2
+++ b/metadata/md5-cache/games-misc/exult-sound-0-r2
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install
-DEPEND=app-arch/unzip
DESCRIPTION=Sound data for games-engines/exult
EAPI=7
HOMEPAGE=http://exult.sourceforge.net/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://downloads.sourceforge.net/exult/exult-data/exult_audio.zip
-_md5_=f76949e065a68ea5b51e120ddd295ef2
+_md5_=e08af2e18a35cd8ff65a75f9e79ab011
diff --git a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1 b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
index fb04f1eb8611..82f7d96b96ed 100644
--- a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
@@ -3,12 +3,12 @@ DEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2 >=dev-util/
DESCRIPTION=A simple (but not so easy to solve!) puzzle game
EAPI=5
HOMEPAGE=http://glightoff.sourceforge.net/
-INHERIT=eutils gnome2
+INHERIT=epatch gnome2
IUSE=debug
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2
SLOT=0
SRC_URI=mirror://sourceforge/glightoff/glightoff-1.0.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=4d0af3a754820db0c014254722d75d19
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
+_md5_=a733a0a665b2b111084a7f9b88f4fa8a
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101 b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
index e34616bec4b7..0f914c1bc862 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.25.1-r101
@@ -3,7 +3,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
EAPI=7
HOMEPAGE=https://crawl.develz.org
-INHERIT=desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+INHERIT=desktop python-any-r1 lua-single xdg-utils toolchain-funcs
IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=amd64 x86
LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
RESTRICT=test
SLOT=0.25
SRC_URI=https://github.com/crawl/crawl/releases/download/0.25.1/stone_soup-0.25.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.25.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.25.svg
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c59ac33622d29709e4a7aa4c32a8c1c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=af23c70f417721cf2b952ad2c5d7cfb2
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
index 2f8dbf81c0b6..66160e4d070e 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.0
@@ -3,7 +3,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
EAPI=7
HOMEPAGE=https://crawl.develz.org
-INHERIT=desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+INHERIT=desktop python-any-r1 lua-single xdg-utils toolchain-funcs
IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=amd64 x86
LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
RESTRICT=test
SLOT=0.26
SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.0/stone_soup-0.26.0.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=549ab0a82812e0af6f078706f4c43404
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a31515cd43418550d7c25f16cb516ef
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
index 2b546130db93..d4ed574ad303 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.26.1
@@ -3,7 +3,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
EAPI=7
HOMEPAGE=https://crawl.develz.org
-INHERIT=desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
+INHERIT=desktop python-any-r1 lua-single xdg-utils toolchain-funcs
IUSE=debug ncurses sound test +tiles lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
@@ -11,5 +11,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2?
RESTRICT=test
SLOT=0.26
SRC_URI=https://github.com/crawl/crawl/releases/download/0.26.1/stone_soup-0.26.1.zip https://dev.gentoo.org/~stasibear/distfiles/stone-soup.png -> stone-soup-0.26.png https://dev.gentoo.org/~stasibear/distfiles/stone-soup.svg -> stone-soup-0.26.svg
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=161b9e98ac0bc9696b15b890c88a80de
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-any-r1 17241a11501065ff3651350040875aa9 lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=c82d516911a30f64ccee228dbaa8f9fb
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
index 2b2a952fac69..6855d99a56cc 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
DESCRIPTION=Baldur's Gate: Enhanced Edition
EAPI=6
HOMEPAGE=https://www.baldursgate.com/
-INHERIT=eutils unpacker
+INHERIT=desktop unpacker wrapper
KEYWORDS=-* ~amd64 ~x86
LICENSE=GOG-EULA
RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/openssl:0[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
RESTRICT=bindist fetch
SLOT=0
SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e unpacker 517f16af48ee3ab88180dd58b5143213
-_md5_=65500b856f2345f63f8f4cd12ae4ec10
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=30de1f1a1163a70135b0cb4f6bc58204
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
index 3a6810a38978..dd42d7d8b5eb 100644
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.5.23121
@@ -1,14 +1,14 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Baldur's Gate: Enhanced Edition
EAPI=7
HOMEPAGE=https://www.baldursgate.com/
-INHERIT=desktop eutils unpacker
+INHERIT=desktop unpacker wrapper
KEYWORDS=-* ~amd64 ~x86
LICENSE=GOG-EULA
RDEPEND=dev-libs/expat dev-libs/openssl:0 media-libs/openal virtual/opengl x11-libs/libX11
RESTRICT=bindist fetch
SLOT=0
SRC_URI=baldur_s_gate_enhanced_edition_en_2_5_23121.sh
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213
-_md5_=598afa2d1f029fe5e055724027221692
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=fffbc887a190e250b493a91d56873c21
diff --git a/metadata/md5-cache/games-rpg/egoboo-2.8.1-r1 b/metadata/md5-cache/games-rpg/egoboo-2.8.1-r1
index b257dcc6c281..f05c6ff6cc26 100644
--- a/metadata/md5-cache/games-rpg/egoboo-2.8.1-r1
+++ b/metadata/md5-cache/games-rpg/egoboo-2.8.1-r1
@@ -3,11 +3,11 @@ DEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image m
DESCRIPTION=A 3d dungeon crawling adventure in the spirit of NetHack
EAPI=6
HOMEPAGE=http://egoboo.sourceforge.net/
-INHERIT=eutils
+INHERIT=desktop edos2unix
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 virtual/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/egoboo/egoboo-2.8.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=bb5b3956e7cc3bc3f3ebcd8870c05127
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=b198c54bc4346032339cdc2efbc4731c
diff --git a/metadata/md5-cache/games-server/etqw-ded-1.5-r1 b/metadata/md5-cache/games-server/etqw-ded-1.5-r1
index bb995af52248..ec06fc10171d 100644
--- a/metadata/md5-cache/games-server/etqw-ded-1.5-r1
+++ b/metadata/md5-cache/games-server/etqw-ded-1.5-r1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
DESCRIPTION=Enemy Territory: Quake Wars dedicated server
EAPI=6
HOMEPAGE=https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux
-INHERIT=eutils
+INHERIT=wrapper
KEYWORDS=-* ~amd64 ~x86
LICENSE=ETQW
RDEPEND=sys-libs/glibc
RESTRICT=bindist fetch strip
SLOT=0
SRC_URI=ETQW-server-1.5-full.x86.run
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=eb3a70e98e0ab5bb273690f29e5d9513
+_eclasses_=wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5fcbb18adb8b4e64e5aa6720e4bb242a
diff --git a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1 b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
index b09e72e06e85..d07d9f3371cb 100644
--- a/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
+++ b/metadata/md5-cache/games-simulation/bcs-demo-1.3-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install unpack
DESCRIPTION=design and build bridges and then stress test them with trains
EAPI=6
HOMEPAGE=http://www.chroniclogic.com/pontifex2.htm
-INHERIT=eutils unpacker
+INHERIT=wrapper unpacker
KEYWORDS=-* ~amd64 ~x86
LICENSE=BCS
RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=strip
+RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=ftp://ggdev-1.homelan.com/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e unpacker 517f16af48ee3ab88180dd58b5143213
-_md5_=54f632376d84748ea2f2658d1fe3fa73
+_eclasses_=wrapper 4251d4c84c25f59094fd557e0063a974 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e unpacker 517f16af48ee3ab88180dd58b5143213
+_md5_=bea1a9386ec7f69120306e23cb8308f3
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.9 b/metadata/md5-cache/gnome-extra/libgda-5.2.9
index ff99adc07157..ed719933c73c 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.9
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.9
@@ -3,7 +3,7 @@ DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/l
DESCRIPTION=GNOME database access library
EAPI=6
HOMEPAGE=https://www.gnome-db.org/
-INHERIT=db-use eutils flag-o-matic gnome2 java-pkg-opt-2 vala
+INHERIT=db-use epatch flag-o-matic gnome2 java-pkg-opt-2 vala
IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala elibc_FreeBSD java
KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2+ LGPL-2+
@@ -12,5 +12,5 @@ REQUIRED_USE=canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( intro
RESTRICT=test firebird? ( bindist )
SLOT=5/4
SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.9.tar.xz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 db-use 063d3e7add942762a8203b52ec3066c2 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f vala 12de027593aabf8f7d7df8d6c702db16
-_md5_=12a2d1a9e9a4b8922a17e91a02f00cf6
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 db-use 063d3e7add942762a8203b52ec3066c2 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f vala 12de027593aabf8f7d7df8d6c702db16
+_md5_=862a2115802034f75e91343e8d9f806b
diff --git a/metadata/md5-cache/gnustep-apps/gemas-0.4 b/metadata/md5-cache/gnustep-apps/gemas-0.4
index bcf5cd7e4530..fe1b8aeeacc6 100644
--- a/metadata/md5-cache/gnustep-apps/gemas-0.4
+++ b/metadata/md5-cache/gnustep-apps/gemas-0.4
@@ -3,12 +3,12 @@ DEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 project
DESCRIPTION=a simple code editor for GNUstep
EAPI=5
HOMEPAGE=http://wiki.gnustep.org/index.php/Gemas.app
-INHERIT=eutils gnustep-2
+INHERIT=epatch gnustep-2
IUSE=projectcenter debug doc
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-3
RDEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 projectcenter? ( gnustep-apps/projectcenter ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
SLOT=0
SRC_URI=mirror://nongnu/gnustep-nonfsf/Gemas-0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
-_md5_=5fac74bda06ff522b6930674d9be2468
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
+_md5_=0b0390454515f7e63cf140c50714e375
diff --git a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1 b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
index 382e375ac659..50a6d2306c29 100644
--- a/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
+++ b/metadata/md5-cache/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -3,12 +3,12 @@ DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
DESCRIPTION=A text editor with font, color, and style capabilities for GNUstep
EAPI=5
HOMEPAGE=http://www.nongnu.org/backbone/
-INHERIT=eutils gnustep-2
+INHERIT=epatch gnustep-2
IUSE=debug doc
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
SLOT=0
SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
-_md5_=f3bbe13ac0d97a889c096ed7f9e3bbeb
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
+_md5_=3a9e88c906d9fa680225edd67a4ac384
diff --git a/metadata/md5-cache/gnustep-libs/pantomime-1.2.2 b/metadata/md5-cache/gnustep-libs/pantomime-1.2.2
index e5a52a8ed756..bfd9fe557374 100644
--- a/metadata/md5-cache/gnustep-libs/pantomime-1.2.2
+++ b/metadata/md5-cache/gnustep-libs/pantomime-1.2.2
@@ -3,7 +3,7 @@ DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
DESCRIPTION=A set of Objective-C classes that model a mail system
EAPI=5
HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/
-INHERIT=eutils gnustep-2
+INHERIT=gnustep-2
IUSE=debug doc
KEYWORDS=amd64 ppc x86
LICENSE=LGPL-2.1 Elm
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
SLOT=0
SRC_URI=mirror://nongnu/gnustep-nonfsf/Pantomime-1.2.2.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
-_md5_=386fb58154eac20deca508d57d484aeb
+_md5_=75be9e03f096ff71fab7b4175ca4cf83
diff --git a/metadata/md5-cache/mail-client/mailx-support-20060102-r2 b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
index b1606ca67ff4..e846d34fdb31 100644
--- a/metadata/md5-cache/mail-client/mailx-support-20060102-r2
+++ b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Provides lockspool utility
EAPI=5
HOMEPAGE=http://www.openbsd.org/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=BSD
SLOT=0
SRC_URI=mirror://gentoo/mailx-support-20060102.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=fb0ea2565274037339584a27e081947c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=addba4f6eed753163e844ec78014ebe1
diff --git a/metadata/md5-cache/mail-client/mutt-2.0.4-r1 b/metadata/md5-cache/mail-client/mutt-2.0.4-r1
index a982f3ce08f0..9f4173cb4794 100644
--- a/metadata/md5-cache/mail-client/mutt-2.0.4-r1
+++ b/metadata/md5-cache/mail-client/mutt-2.0.4-r1
@@ -3,7 +3,7 @@ DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
DESCRIPTION=A small but very powerful text-based mail client
EAPI=6
HOMEPAGE=http://www.mutt.org/
-INHERIT=eutils flag-o-matic autotools
+INHERIT=epatch flag-o-matic autotools
IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
SLOT=0
SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.0.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.0.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.0.4-patches-r1.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=30ec62cbe12505bd03fd99a118070e4b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=bc15ddf0c89186ddbdb4905366335791
diff --git a/metadata/md5-cache/mail-client/mutt-2.0.5 b/metadata/md5-cache/mail-client/mutt-2.0.5
index 1b4fd94d81bb..84ceb340c5cb 100644
--- a/metadata/md5-cache/mail-client/mutt-2.0.5
+++ b/metadata/md5-cache/mail-client/mutt-2.0.5
@@ -3,7 +3,7 @@ DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
DESCRIPTION=A small but very powerful text-based mail client
EAPI=6
HOMEPAGE=http://www.mutt.org/
-INHERIT=eutils flag-o-matic autotools
+INHERIT=epatch flag-o-matic autotools
IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
SLOT=0
SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.0.5.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.0.5.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.0.5-patches-r0.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=474d1f7bce50c751b09bd432b40c75df
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=505d60b4f2e0843650266de85c25a42f
diff --git a/metadata/md5-cache/mail-client/mutt-2.0.6 b/metadata/md5-cache/mail-client/mutt-2.0.6
index 2b36707e43ce..9be0c4ec8479 100644
--- a/metadata/md5-cache/mail-client/mutt-2.0.6
+++ b/metadata/md5-cache/mail-client/mutt-2.0.6
@@ -3,7 +3,7 @@ DEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
DESCRIPTION=A small but very powerful text-based mail client
EAPI=6
HOMEPAGE=http://www.mutt.org/
-INHERIT=eutils flag-o-matic autotools
+INHERIT=epatch flag-o-matic autotools
IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm?
REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
SLOT=0
SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-2.0.6.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-2.0.6.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-2.0.6-patches-r0.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=474d1f7bce50c751b09bd432b40c75df
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=505d60b4f2e0843650266de85c25a42f
diff --git a/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1 b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
index a97519d7bae5..3f08291de4b2 100644
--- a/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
+++ b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-util/patchelf-0.9 >=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=Novell Groupwise Client for Linux
EAPI=5
HOMEPAGE=http://www.novell.com/products/groupwise/
-INHERIT=eutils rpm multilib versionator
+INHERIT=desktop rpm multilib versionator
KEYWORDS=~amd64 ~x86
LICENSE=all-rights-reserved
RDEPEND=sys-libs/libstdc++-v3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.8[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.3[abi_x86_32(-)] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXi-1.7.4[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXtst-1.2.2[abi_x86_32(-)] >=x11-libs/libxcb-1.11-r1[abi_x86_32(-)] >=x11-libs/motif-2.3.7:0[abi_x86_32(-),motif22-compatibility] >=media-libs/alsa-lib-1.0.28[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)]
RESTRICT=fetch mirror strip
SLOT=0
SRC_URI=gw802_hp3_client_linux_multi.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=270594b73e7c7c2b391cb3e420ad95fb
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=155f992d236d0bf361d6f1bcc5a60fa8
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1 b/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
index 171bed8d97fc..379c0ccea67b 100644
--- a/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
+++ b/metadata/md5-cache/mail-filter/amavisd-milter-1.5.0-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
DESCRIPTION=sendmail milter for amavisd-new
EAPI=5
HOMEPAGE=http://amavisd-milter.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
SLOT=0
SRC_URI=mirror://sourceforge/amavisd-milter/amavisd-milter-1.5.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=42f281f8f7d8287ef4ee9a7ad9b3300d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=eb082bf9a2e2a3b917a8651e33625f62
diff --git a/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r1 b/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r1
index a952ea9a2fad..67a945eccbd3 100644
--- a/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r1
+++ b/metadata/md5-cache/mail-filter/amavisd-milter-1.6.0-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
DESCRIPTION=sendmail milter for amavisd-new
EAPI=5
HOMEPAGE=http://amavisd-milter.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) mail-filter/amavisd-new
SLOT=0
SRC_URI=mirror://sourceforge/amavisd-milter/amavisd-milter-1.6.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f0ed3a8938aad331b987001f174eb9e3
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=c2fb73dad838e4472e18244d7115ed3b
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index 35ba4fcc763f..35ec21e5b57a 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -3,7 +3,7 @@ DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/a
DESCRIPTION=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
EAPI=5
HOMEPAGE=https://www.libspf2.org
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=static static-libs
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=|| ( LGPL-2.1 BSD-2 )
@@ -11,5 +11,5 @@ RDEPEND=!dev-perl/Mail-SPF-Query
REQUIRED_USE=static? ( static-libs )
SLOT=0
SRC_URI=https://www.libspf2.org/spf/libspf2-1.2.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8cc7a72c07d4cce717ecef984ccdb3e8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=945c77f041d9e46cd171ced6ac44b8df
diff --git a/metadata/md5-cache/mail-filter/popfile-1.1.3-r1 b/metadata/md5-cache/mail-filter/popfile-1.1.3-r1
index 3884af46e5d4..3434ab10816f 100644
--- a/metadata/md5-cache/mail-filter/popfile-1.1.3-r1
+++ b/metadata/md5-cache/mail-filter/popfile-1.1.3-r1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
DESCRIPTION=Anti-spam bayesian filter
EAPI=5
HOMEPAGE=http://getpopfile.org
-INHERIT=eutils
+INHERIT=edos2unix
IUSE=cjk ipv6 libressl mysql ssl xmlrpc
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/perl-Digest-MD5 virtual/perl-MIME-Base64 dev-perl/DBD-SQLite dev-perl/HTML-Tagset dev-perl/HTML-Template dev-perl/TimeDate dev-perl/DBI virtual/perl-Digest cjk? ( dev-perl/Encode-compat dev-perl/Text-Kakasi ) mysql? ( dev-perl/DBD-mysql ) ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-perl/IO-Socket-SSL dev-perl/Net-SSLeay ) xmlrpc? ( dev-perl/PlRPC )
SLOT=0
SRC_URI=http://getpopfile.org/downloads/popfile-1.1.3.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=0770d6ddf14f4731a90170149f042782
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=14e5e37a13a1ead81ea67df2bda06a27
diff --git a/metadata/md5-cache/mail-filter/rblcheck-1.5-r2 b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
index 80c9566e338e..980ff46a2f73 100644
--- a/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
+++ b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Perform lookups in RBL-styles services
EAPI=5
HOMEPAGE=https://github.com/logic/rblcheck
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~alpha amd64 ~hppa ~mips ppc sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/logic/rblcheck/releases/download/rblcheck-1.5/rblcheck-1.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=bd124efb8f44c26a4b44754656c0b621
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=0a0cf02ac156acc7a83345b65e5a1b7c
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
index 718c9f5913b7..913879fad9f4 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0
+++ b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
@@ -3,12 +3,12 @@ DEPEND=ssl? ( dev-libs/openssl:0= ) sys-devel/gnuconfig >=app-portage/elt-patche
DESCRIPTION=A drop-in connection-time spam filter for qmail
EAPI=5
HOMEPAGE=http://www.spamdyke.org/
-INHERIT=eutils autotools
+INHERIT=epatch autotools
IUSE=+ssl
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=ssl? ( dev-libs/openssl:0= ) virtual/qmail
SLOT=0
SRC_URI=http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=3a4b6c233ee9538de60391a443a30e5f
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=3cfe754a7ce8c708f4c9bb5b00bce7d1
diff --git a/metadata/md5-cache/mail-filter/spamdyke-5.0.1 b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
index 8d353858bc5d..ce89b4c5ff4d 100644
--- a/metadata/md5-cache/mail-filter/spamdyke-5.0.1
+++ b/metadata/md5-cache/mail-filter/spamdyke-5.0.1
@@ -3,12 +3,12 @@ DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:=
DESCRIPTION=A drop-in connection-time spam filter for qmail
EAPI=5
HOMEPAGE=http://www.spamdyke.org/
-INHERIT=eutils autotools
+INHERIT=autotools
IUSE=libressl +ssl
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) virtual/qmail
SLOT=0
SRC_URI=http://www.spamdyke.org/releases/spamdyke-5.0.1.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=56085853475b6ca6be0a0ca552ba6647
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=1cb9bf4722db5e3ebf5057987502d547
diff --git a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20 b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
index 27362da89d47..ad74b323ff70 100644
--- a/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
+++ b/metadata/md5-cache/media-fonts/fgdc-emergency-2.20
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip
DESCRIPTION=FGDC Emergency Response Symbology Prototype
EAPI=7
HOMEPAGE=http://www.fgdc.gov/HSWG/
@@ -11,4 +10,4 @@ LICENSE=public-domain
SLOT=0
SRC_URI=http://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=1fd2ab4906e05727a127a895880dbad2
+_md5_=31f86f98848ed335a75b5e7682e001e8
diff --git a/metadata/md5-cache/media-fonts/fira-code-4 b/metadata/md5-cache/media-fonts/fira-code-4
index 86fbd07e91c8..b8246be76806 100644
--- a/metadata/md5-cache/media-fonts/fira-code-4
+++ b/metadata/md5-cache/media-fonts/fira-code-4
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip
DESCRIPTION=Monospaced font with programming ligatures
EAPI=7
HOMEPAGE=https://github.com/tonsky/FiraCode
@@ -11,4 +10,4 @@ LICENSE=OFL-1.1
SLOT=0
SRC_URI=https://github.com/tonsky/FiraCode/archive/4.tar.gz -> fira-code-4.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=62f5aa6aec1ab5f34fd1f921578f1b25
+_md5_=e9ee7f60c8c3d0f55425e79349104b4e
diff --git a/metadata/md5-cache/media-fonts/fira-code-5.2 b/metadata/md5-cache/media-fonts/fira-code-5.2
index 5b0bf723b629..6c230a992d0a 100644
--- a/metadata/md5-cache/media-fonts/fira-code-5.2
+++ b/metadata/md5-cache/media-fonts/fira-code-5.2
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=app-arch/unzip
DESCRIPTION=Monospaced font with programming ligatures
EAPI=7
HOMEPAGE=https://github.com/tonsky/FiraCode
@@ -11,4 +10,4 @@ LICENSE=OFL-1.1
SLOT=0
SRC_URI=https://github.com/tonsky/FiraCode/archive/5.2.tar.gz -> fira-code-5.2.tar.gz https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=62f5aa6aec1ab5f34fd1f921578f1b25
+_md5_=78d022fb66966cbf3c1f9281e04778b4
diff --git a/metadata/md5-cache/media-fonts/oldstandard-2.2 b/metadata/md5-cache/media-fonts/oldstandard-2.2
index bce38d9c3a39..69e1fef8d316 100644
--- a/metadata/md5-cache/media-fonts/oldstandard-2.2
+++ b/metadata/md5-cache/media-fonts/oldstandard-2.2
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip
DESCRIPTION=Old Standard - font with wide range of Latin, Greek and Cyrillic characters
EAPI=7
HOMEPAGE=http://www.thessalonica.org.ru/en/fonts.html
@@ -11,4 +10,4 @@ LICENSE=OFL
SLOT=0
SRC_URI=http://www.thessalonica.org.ru/downloads/oldstandard-2.2.otf.zip http://www.thessalonica.org.ru/downloads/oldstandard-2.2.ttf.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=17cf806b85e42056959ac54a4ec67486
+_md5_=a60b39d5a1a8f4cd5e8005209239ceaf
diff --git a/metadata/md5-cache/media-fonts/pothana2k-2006-r1 b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
index 091a50d5f177..e9b197d6a7f0 100644
--- a/metadata/md5-cache/media-fonts/pothana2k-2006-r1
+++ b/metadata/md5-cache/media-fonts/pothana2k-2006-r1
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip
DESCRIPTION=Pothana 2000 and Vemana fonts for the Telugu script
EAPI=7
HOMEPAGE=http://www.kavya-nandanam.com/
@@ -11,4 +10,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/pothana2k-2006.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=f43789ceff5eae7052f45a164dc45335
+_md5_=f102f97a90203cde20fc31bddbe41b02
diff --git a/metadata/md5-cache/media-fonts/roboto-2.138 b/metadata/md5-cache/media-fonts/roboto-2.138
index bc1c645332db..4abb821ecc40 100644
--- a/metadata/md5-cache/media-fonts/roboto-2.138
+++ b/metadata/md5-cache/media-fonts/roboto-2.138
@@ -1,6 +1,5 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip
DESCRIPTION=Standard font for Android 4.0 (Ice Cream Sandwich) and later
EAPI=7
HOMEPAGE=https://github.com/google/roboto
@@ -11,4 +10,4 @@ LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://github.com/google/roboto/releases/download/v2.138/roboto-unhinted.zip -> roboto-2.138.zip
_eclasses_=font 0667878c2b594871023dd1833d05996f
-_md5_=30872f4a7a6d0fa00561233fecb08139
+_md5_=38321c9368d4800096e320a4f315eaa5
diff --git a/metadata/md5-cache/media-gfx/fondu-20060102-r1 b/metadata/md5-cache/media-gfx/fondu-20060102-r1
index 95dbc5cd572b..fc67c15272a2 100644
--- a/metadata/md5-cache/media-gfx/fondu-20060102-r1
+++ b/metadata/md5-cache/media-gfx/fondu-20060102-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Utilities for converting between and manipulating mac fonts and unix fonts
EAPI=5
HOMEPAGE=http://fondu.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://fondu.sourceforge.net/fondu_src-060102.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=25c31fe9d5254b952dff12c883378fa9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=4c54a8cea04a8901b7ffdaa1ae3b2a5c
diff --git a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1 b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
index 1f180f7bc5e0..feb4c3287c6a 100644
--- a/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
+++ b/metadata/md5-cache/media-gfx/freewrl-3.0.0-r1
@@ -3,12 +3,12 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
EAPI=5
HOMEPAGE=http://freewrl.sourceforge.net/
-INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib toolchain-funcs
+INHERIT=autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs
IUSE=curl debug java libeai motif +nsplugin opencl osc +sox static-libs elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=mirror://sourceforge/freewrl/freewrl-3.0.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d mozextension 02419f8d0c6b57fd23bb4e875a37996a nsplugins 2049586e425364a1c5bdb004205d1758 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=464c993a5dd609352a5f674c375c9558
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d mozextension 02419f8d0c6b57fd23bb4e875a37996a nsplugins 2049586e425364a1c5bdb004205d1758 eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=33ed75c2791e8b8f0edfb4318fb97713
diff --git a/metadata/md5-cache/media-gfx/freewrl-9999 b/metadata/md5-cache/media-gfx/freewrl-9999
index a1e28984bbd8..9c97098fe42a 100644
--- a/metadata/md5-cache/media-gfx/freewrl-9999
+++ b/metadata/md5-cache/media-gfx/freewrl-9999
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/
DESCRIPTION=VRML97 and X3D compliant browser, library, and web-browser plugin
EAPI=5
HOMEPAGE=http://freewrl.sourceforge.net/
-INHERIT=autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib toolchain-funcs git-r3
+INHERIT=autotools nsplugins epatch java-pkg-opt-2 multilib toolchain-funcs git-r3
IUSE=curl debug java libeai motif +nsplugin opencl osc rbp +sox static-libs elibc_FreeBSD java
LICENSE=GPL-3
PROPERTIES=live
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt x11-libs/libXxf86vm motif? ( x11-libs/motif:0= ) !motif? ( x11-libs/libXaw ) media-libs/mesa virtual/opengl media-libs/freealut media-libs/openal media-libs/libpng:0= virtual/jpeg:0= media-libs/imlib2 >=media-libs/freetype-2 media-libs/fontconfig curl? ( net-misc/curl ) osc? ( media-libs/liblo ) opencl? ( virtual/opencl ) rbp? ( dev-games/ode:0=[double-precision] ) dev-lang/spidermonkey:0= media-fonts/dejavu app-arch/unzip virtual/imagemagick-tools java? ( >=virtual/jre-1.4 ) sox? ( media-sound/sox ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d mozextension 02419f8d0c6b57fd23bb4e875a37996a nsplugins 2049586e425364a1c5bdb004205d1758 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=5971d154ca40f7379cbc0c1726699846
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d mozextension 02419f8d0c6b57fd23bb4e875a37996a nsplugins 2049586e425364a1c5bdb004205d1758 eapi7-ver f9ec87e93172b25ce65a85303dc06964 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=af644b8e74ae563068e5180f78d1d0c2
diff --git a/metadata/md5-cache/media-gfx/gimageview-0.2.27-r4 b/metadata/md5-cache/media-gfx/gimageview-0.2.27-r4
index e5640101da78..ff3807928109 100644
--- a/metadata/md5-cache/media-gfx/gimageview-0.2.27-r4
+++ b/metadata/md5-cache/media-gfx/gimageview-0.2.27-r4
@@ -3,12 +3,12 @@ DEPEND=app-arch/bzip2 x11-libs/gtk+:2 >=media-libs/libpng-1.2:0= x11-libs/libXin
DESCRIPTION=Powerful GTK+ based image & movie viewer
EAPI=6
HOMEPAGE=http://gtkmmviewer.sourceforge.net/
-INHERIT=eutils libtool ltprune
+INHERIT=epatch libtool ltprune
IUSE=mng nls mplayer svg wmf
KEYWORDS=amd64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=app-arch/bzip2 x11-libs/gtk+:2 >=media-libs/libpng-1.2:0= x11-libs/libXinerama wmf? ( >=media-libs/libwmf-0.2.8 ) mng? ( media-libs/libmng:= ) svg? ( gnome-base/librsvg ) mplayer? ( media-video/mplayer )
SLOT=0
SRC_URI=mirror://sourceforge/gtkmmviewer/gimageview-0.2.27.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96
-_md5_=682853ef77d0e3d5bc4abd592f39b01d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=9cb840394df3520de3126f8ea0b1af38
diff --git a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4 b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
index ac9fc3ad60d4..6f6a377742e7 100644
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r4
@@ -3,7 +3,7 @@ DEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib
DESCRIPTION=A set of cuda-enabled texture tools and compressors
EAPI=6
HOMEPAGE=http://developer.nvidia.com/object/texture_tools.html
-INHERIT=cmake-utils eutils
+INHERIT=cmake-utils edos2unix
IUSE=cg glew glut openexr
KEYWORDS=amd64 x86
LICENSE=MIT
@@ -11,4 +11,4 @@ RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zli
SLOT=0
SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~soap/distfiles/nvidia-texture-tools-2.0.8-patchset-1-r1.tar.xz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8
-_md5_=a4d1a214282c812545de34c80a8d48f9
+_md5_=ae59026a86f01c47d0b12fbf9c029da9
diff --git a/metadata/md5-cache/media-gfx/png2ico-2002.12.08 b/metadata/md5-cache/media-gfx/png2ico-2002.12.08
index 19f9a68156ae..9510fa33d243 100644
--- a/metadata/md5-cache/media-gfx/png2ico-2002.12.08
+++ b/metadata/md5-cache/media-gfx/png2ico-2002.12.08
@@ -3,11 +3,11 @@ DEPEND=media-libs/libpng:0= sys-libs/zlib:=
DESCRIPTION=PNG to icon converter
EAPI=5
HOMEPAGE=http://winterdrache.de/freeware/png2ico/index.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libpng:0= sys-libs/zlib:=
SLOT=0
SRC_URI=http://winterdrache.de/freeware/png2ico/data/png2ico-src-2002-12.08.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=1f67e5ac8e16998b8e76afb7153d93ac
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=0b76d035c722bcd8684f7a995e095769
diff --git a/metadata/md5-cache/media-gfx/pngnq-1.1 b/metadata/md5-cache/media-gfx/pngnq-1.1
index 3942ef1c6737..cf266d49ab38 100644
--- a/metadata/md5-cache/media-gfx/pngnq-1.1
+++ b/metadata/md5-cache/media-gfx/pngnq-1.1
@@ -3,11 +3,11 @@ DEPEND=media-libs/libpng:0= sys-devel/gnuconfig >=app-portage/elt-patches-201708
DESCRIPTION=Pngnq is a tool for quantizing PNG images in RGBA format
EAPI=5
HOMEPAGE=http://pngnq.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=amd64 x86
LICENSE=BSD pngnq rwpng
RDEPEND=media-libs/libpng:0=
SLOT=0
SRC_URI=mirror://sourceforge/pngnq/pngnq-1.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=2b2d7c4e5b01e75ef04dd8f0ca791f10
+_md5_=7e1d04ee7feeb51e9d76bb752e0be199
diff --git a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1 b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
index 6c07102dd5e7..24f660e7f8e5 100644
--- a/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
+++ b/metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0 app-arch/unzip sys
DESCRIPTION=sff to bmp converter
EAPI=5
HOMEPAGE=http://sfftools.sourceforge.net/
-INHERIT=autotools eutils flag-o-matic
+INHERIT=autotools epatch flag-o-matic
KEYWORDS=amd64 ~hppa ppc x86
LICENSE=HPND MIT
RDEPEND=>=dev-libs/boost-1.49 media-libs/tiff:0 virtual/jpeg:0
SLOT=0
SRC_URI=mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=91c79346247f1d33240ed059c046f331
+_md5_=c96ae74ddd2eac322361f33dd2a1489c
diff --git a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r1 b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r1
index da7c247141ff..ad865acdad46 100644
--- a/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r1
+++ b/metadata/md5-cache/media-gfx/tachyon-0.99_beta6-r1
@@ -3,7 +3,7 @@ DEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu virt
DESCRIPTION=A portable, high performance parallel ray tracing system
EAPI=6
HOMEPAGE=http://jedi.ks.uiuc.edu/~johns/raytracer/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=doc examples jpeg mpi +opengl png threads
KEYWORDS=~amd64 ~ppc ~x86 ~x64-macos
LICENSE=BSD
@@ -11,5 +11,5 @@ RDEPEND=jpeg? ( virtual/jpeg:0= ) mpi? ( virtual/mpi ) opengl? ( virtual/glu vir
REQUIRED_USE=^^ ( opengl mpi )
SLOT=0
SRC_URI=http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/tachyon-0.99b6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=2dd6ee12cfed696e29272783867333a7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=49bb79189b039946becdd4a757999e78
diff --git a/metadata/md5-cache/media-gfx/xsane-0.999-r3 b/metadata/md5-cache/media-gfx/xsane-0.999-r3
index 88123c251964..53dabdc94e88 100644
--- a/metadata/md5-cache/media-gfx/xsane-0.999-r3
+++ b/metadata/md5-cache/media-gfx/xsane-0.999-r3
@@ -1,9 +1,9 @@
DEFINED_PHASES=configure install prepare
DEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) gimp? ( media-gfx/gimp:0/2 ) lcms? ( media-libs/lcms:2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=graphical scanning frontend
+DESCRIPTION=Graphical scanning frontend
EAPI=6
HOMEPAGE=http://www.xsane.org/
-INHERIT=autotools eutils toolchain-funcs
+INHERIT=autotools desktop epatch l10n toolchain-funcs
IUSE=nls jpeg png tiff gimp lcms ocr
KEYWORDS=~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=media-gfx/sane-backends x11-libs/gtk+:2 x11-misc/xdg-utils jpeg? ( virtu
SLOT=0
SRC_URI=http://www.xsane.org/download/xsane-0.999.tar.gz https://dev.gentoo.org/~dilfridge/distfiles/xsane-0.998-patches-2.tar.xz https://dev.gentoo.org/~pacho/xsane/xsane-256x256.png
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=40a21042e7bc518842f3d0c18311a501
+_md5_=ccd3438b107e816e75d8c20e646c20d4
diff --git a/metadata/md5-cache/media-gfx/xzgv-0.9.1 b/metadata/md5-cache/media-gfx/xzgv-0.9.1
index f37a25f8458a..2473ff215730 100644
--- a/metadata/md5-cache/media-gfx/xzgv-0.9.1
+++ b/metadata/md5-cache/media-gfx/xzgv-0.9.1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 sys-apps/texinfo virtual/pkgconfig
DESCRIPTION=Fast and simple GTK+ image viewer
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/xzgv
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ~ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://sourceforge/xzgv/xzgv-0.9.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=63931ad3fe4a0715f07aa4ba800de34d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=efc37a25c2f833438849941753b394ed
diff --git a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1 b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
index ad9503237921..91980a77fe70 100644
--- a/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/md5-cache/media-libs/cal3d-0.11.0-r1
@@ -3,11 +3,11 @@ DEPEND=doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) sys-devel/gnuconfig
DESCRIPTION=Cal3D is a skeletal based character animation library
EAPI=5
HOMEPAGE=http://home.gna.org/cal3d
-INHERIT=eutils autotools
+INHERIT=epatch autotools
IUSE=16bit-indices debug doc
KEYWORDS=amd64 ~ia64 ppc x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=d334f72b0aa6a8c1d37eb43ae7b635d1
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=3bfb5a2022983e5c0526a9cd0a88294c
diff --git a/metadata/md5-cache/media-libs/flickcurl-1.26 b/metadata/md5-cache/media-libs/flickcurl-1.26
index fd6472631720..ec85670e2207 100644
--- a/metadata/md5-cache/media-libs/flickcurl-1.26
+++ b/metadata/md5-cache/media-libs/flickcurl-1.26
@@ -3,7 +3,7 @@ DEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/ra
DESCRIPTION=C library for the Flickr API
EAPI=5
HOMEPAGE=http://librdf.org/flickcurl/
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
IUSE=doc raptor static-libs
KEYWORDS=amd64 arm64 x86
LICENSE=|| ( LGPL-2.1 GPL-2 Apache-2.0 )
@@ -11,4 +11,4 @@ RDEPEND=>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/r
SLOT=0
SRC_URI=http://download.dajobe.org/flickcurl/flickcurl-1.26.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=a623fc64bf43c03da6846c5fe17a226c
+_md5_=09e3f0656298f8851d66853fe987ace1
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
index a334b46de95c..1a9aa699e1c4 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= )
DESCRIPTION=Image library supporting many formats
EAPI=7
HOMEPAGE=https://freeimage.sourceforge.io/
+INHERIT=edos2unix toolchain-funcs
IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 FIPL-1.0 )
RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
SLOT=0
SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=7fd80feedf054a48839de097b3835ac5
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=844b46fd69dfb744c228abae6647cefb
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r2 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
index 2dd31891ea19..065f20740fd9 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r2
@@ -4,11 +4,12 @@ DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= )
DESCRIPTION=Image library supporting many formats
EAPI=7
HOMEPAGE=https://freeimage.sourceforge.io/
+INHERIT=edos2unix toolchain-funcs
IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 FIPL-1.0 )
RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
SLOT=0
SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0293c641fd6e6593556f2d6a47123c54
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ea001834bd2bab407501ce4031651f48
diff --git a/metadata/md5-cache/media-libs/gmtk-1.0.9 b/metadata/md5-cache/media-libs/gmtk-1.0.9
index 22c6d5dc3533..04c4dd5923b3 100644
--- a/metadata/md5-cache/media-libs/gmtk-1.0.9
+++ b/metadata/md5-cache/media-libs/gmtk-1.0.9
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 alsa? ( media-
DESCRIPTION=GTK+ widget and function libraries for gnome-mplayer
EAPI=5
HOMEPAGE=https://code.google.com/p/gmtk/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=alsa +dconf pulseaudio
KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.30 >=x11-libs/gtk+-3.2:3 x11-libs/libX11 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dconf? ( gnome-base/dconf )
SLOT=0
SRC_URI=https://gmtk.googlecode.com/svn/packages/gmtk-1.0.9.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=3c19ed5f645c89fc989ad6a5add9677e
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=2fee65349dbf9e8b663b926403266675
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
index 0821cde558bb..38c8fdaae26d 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
@@ -3,7 +3,7 @@ DEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
DESCRIPTION=A library that creates colored ASCII-art graphics
EAPI=5
HOMEPAGE=http://libcaca.zoy.org/
-INHERIT=autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
+INHERIT=autotools ruby-ng epatch eutils flag-o-matic ltprune mono-env multilib java-pkg-opt-2 multilib-minimal
IUSE=cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-ng 40ad5ce3f20bff3a06352fd3fb633cfd flag-o-matic c0964e43ba712cb933da5f65b958fa88 mono-env 1f24c032c78290b0d9a07d5b343051a7 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=51621e0baf6b695d9420cd7e334b5025
+_md5_=e9f8d77bad7e7093324f3a66f944a931
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1 b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
index 77a990d54fe4..4c70498b7686 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
@@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/a52dec cpu_flags_x86_mmx? ( dev-l
DESCRIPTION=An mpeg library for linux
EAPI=5
HOMEPAGE=http://heroinewarrior.com/libmpeg3.php
-INHERIT=eutils autotools toolchain-funcs multilib-minimal
+INHERIT=autotools epatch multilib-minimal
IUSE=cpu_flags_x86_mmx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/a52dec
SLOT=0
SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.8-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=318e485db820da377c1b4fbee92835ca
+_md5_=46600650339c168ef68f3dad39a2a22c
diff --git a/metadata/md5-cache/media-libs/libpano13-2.9.19 b/metadata/md5-cache/media-libs/libpano13-2.9.19
index c05e91373225..b6ba9c3ce3d6 100644
--- a/metadata/md5-cache/media-libs/libpano13-2.9.19
+++ b/metadata/md5-cache/media-libs/libpano13-2.9.19
@@ -3,7 +3,7 @@ DEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java?
DESCRIPTION=Helmut Dersch's panorama toolbox library
EAPI=5
HOMEPAGE=http://panotools.sourceforge.net/
-INHERIT=versionator java-pkg-opt-2 eutils ltprune
+INHERIT=versionator java-pkg-opt-2 ltprune
IUSE=java static-libs elibc_FreeBSD java
KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 java
SLOT=0/3
SRC_URI=mirror://sourceforge/panotools/libpano13-2.9.19.tar.gz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=a9953e5a54d6dbcc409e23aa0063e262
+_md5_=59eb5ff640abc5910444688524aa473d
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r9 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
index cbf934ab69e0..9f31a479d7c7 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
@@ -3,7 +3,7 @@ DEPEND=sound? ( >=media-libs/audiofile-0.3.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
DESCRIPTION=Simple Direct Media Layer
EAPI=5
HOMEPAGE=https://libsdl.org/
-INHERIT=autotools flag-o-matic ltprune multilib toolchain-funcs eutils multilib-minimal
+INHERIT=autotools flag-o-matic ltprune multilib toolchain-funcs epatch multilib-minimal
IUSE=oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=sound? ( >=media-libs/audiofile-0.3.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_
SLOT=0
SRC_URI=https://libsdl.org/release/SDL-1.2.15.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=785ed34b198734c5ae65965916b48800
+_md5_=c881e45ab9c3cd2c2cd8d8e9c813a682
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.68 b/metadata/md5-cache/media-libs/opencollada-1.6.68
index 170dda0cb073..fb5619979f5b 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.68
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.68
@@ -4,7 +4,7 @@ DEPEND=dev-libs/libpcre:= dev-libs/libxml2:= dev-libs/zziplib media-libs/lib3ds
DESCRIPTION=Stream based read/write library for COLLADA files
EAPI=7
HOMEPAGE=http://www.opencollada.org/
-INHERIT=cmake eutils flag-o-matic
+INHERIT=cmake edos2unix flag-o-matic
IUSE=static-libs
KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
LICENSE=MIT
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libpcre:= dev-libs/libxml2:= dev-libs/zziplib media-libs/lib3ds
SLOT=0
SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.68.tar.gz -> opencollada-1.6.68.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake 518e4c9a6a38dfd7afc54b6a7c5de3da
-_md5_=0fdafc1d2a77064f1e874702acc0bb0d
+_md5_=1a1db54ae5847a10c5d3aa76e2dc02ec
diff --git a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2 b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
index 6c6f874fe23d..cb57ffbb749b 100644
--- a/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
+++ b/metadata/md5-cache/media-libs/openexr_ctl-1.0.1-r2
@@ -3,7 +3,7 @@ DEPEND=>=media-libs/ilmbase-2.0.1:= >=media-libs/openexr-2.0.1:= media-libs/ctl:
DESCRIPTION=OpenEXR CTL libraries
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/ampasctl
-INHERIT=autotools eutils ltprune
+INHERIT=autotools epatch ltprune
IUSE=static-libs
KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=AMPAS
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/ilmbase-2.0.1:= >=media-libs/openexr-2.0.1:= media-libs/ctl
SLOT=0
SRC_URI=mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=887fb2e43737311d1974ea5f50e71ff0
+_md5_=84b022ee1775a696966064c80a797b41
diff --git a/metadata/md5-cache/media-libs/pnglite-0.1.17 b/metadata/md5-cache/media-libs/pnglite-0.1.17
index dd544c84bca3..4dcd2d99cce1 100644
--- a/metadata/md5-cache/media-libs/pnglite-0.1.17
+++ b/metadata/md5-cache/media-libs/pnglite-0.1.17
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib app-arch/unzip
DESCRIPTION=Small and simple library for loading and writing PNG images
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/pnglite/
-INHERIT=eutils flag-o-matic multilib toolchain-funcs
+INHERIT=epatch flag-o-matic multilib toolchain-funcs
IUSE=static-libs
KEYWORDS=amd64 x86
LICENSE=ZLIB
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=mirror://sourceforge/pnglite/pnglite-0.1.17.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=122670ccb83c89b082edf2b7429a8242
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=17d3d26f462d9e9efd7ae992ccb6c865
diff --git a/metadata/md5-cache/media-libs/quesoglc-0.7.2 b/metadata/md5-cache/media-libs/quesoglc-0.7.2
index 8a360c586c9f..2dd9520f0297 100644
--- a/metadata/md5-cache/media-libs/quesoglc-0.7.2
+++ b/metadata/md5-cache/media-libs/quesoglc-0.7.2
@@ -3,12 +3,12 @@ DEPEND=virtual/opengl virtual/glu media-libs/fontconfig media-libs/freetype:2 de
DESCRIPTION=A free implementation of the OpenGL Character Renderer (GLC)
EAPI=5
HOMEPAGE=http://quesoglc.sourceforge.net/
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=doc examples static-libs
KEYWORDS=amd64 ppc sparc x86
LICENSE=LGPL-2.1
RDEPEND=virtual/opengl virtual/glu media-libs/fontconfig media-libs/freetype:2 dev-libs/fribidi
SLOT=0
SRC_URI=mirror://sourceforge/quesoglc/quesoglc-0.7.2-free.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=e3e6da32565e4da63418ba046304219e
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=37d9505c4a5f139eb16f297319c52e26
diff --git a/metadata/md5-cache/media-libs/sbc-1.5 b/metadata/md5-cache/media-libs/sbc-1.5
index 4966d84e113b..3f29c4d2a96d 100644
--- a/metadata/md5-cache/media-libs/sbc-1.5
+++ b/metadata/md5-cache/media-libs/sbc-1.5
@@ -1,5 +1,5 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile configure install test
-DEPEND=virtual/pkgconfig
DESCRIPTION=Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers
EAPI=7
HOMEPAGE=https://git.kernel.org/?p=bluetooth/sbc.git
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.kernel.org/pub/linux/bluetooth/sbc-1.5.tar.xz
_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=d3044d5f51a757836b6e5af6b7693ee5
+_md5_=8b41aa26693b572d92c9ccca2e462649
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2 b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
index d3908b20de7a..9358f55a8f81 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r2
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
DESCRIPTION=image file loading library
EAPI=5
HOMEPAGE=http://www.libsdl.org/projects/SDL_image/
-INHERIT=eutils ltprune multilib-minimal
+INHERIT=ltprune multilib-minimal
IUSE=gif jpeg png static-libs tiff webp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=ZLIB
RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] png? ( >=media-libs/libpng-1.6.10:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=271f4b23381540059b5a15e9a2ea0b06
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=8ffb7d872b07f3af64259b9f1ea14261
diff --git a/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1 b/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
index 5c1a67354e96..ce69e665c6c4 100644
--- a/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
+++ b/metadata/md5-cache/media-libs/sdl-terminal-1.1.3-r1
@@ -3,12 +3,12 @@ DEPEND=virtual/opengl virtual/glu >=media-libs/libsdl-1.2.4[opengl] media-libs/s
DESCRIPTION=library that provides a pseudo-ansi color terminal that can be used with any SDL application
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/sdl-terminal/
-INHERIT=eutils autotools ltprune
+INHERIT=epatch autotools ltprune
IUSE=static-libs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/opengl virtual/glu >=media-libs/libsdl-1.2.4[opengl] media-libs/sdl-ttf
SLOT=0
SRC_URI=mirror://gentoo/SDL_terminal-1.1.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=626dfe21c5b846a48e2ffe49940abcd8
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=f4dad9dfcae49f7d947cdaed18c96a7e
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
index 8d57aa178d43..6c425327aa42 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
@@ -3,7 +3,7 @@ DEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
DESCRIPTION=SDL MPEG Player Library
EAPI=5
HOMEPAGE=https://icculus.org/smpeg/
-INHERIT=eutils toolchain-funcs autotools flag-o-matic ltprune multilib-minimal
+INHERIT=autotools epatch flag-o-matic ltprune multilib-minimal
IUSE=X debug cpu_flags_x86_mmx opengl static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
SLOT=0
SRC_URI=ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=59b8cdc2b1c4f8dc441e6d1233aa7d7b
+_md5_=4fe61823e0abcd03672519c77f73c833
diff --git a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3 b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
index 7b2259664957..8efbfaba713e 100644
--- a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
+++ b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
@@ -3,7 +3,7 @@ DEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
DESCRIPTION=SDL MPEG Player Library
EAPI=5
HOMEPAGE=https://icculus.org/smpeg/
-INHERIT=eutils toolchain-funcs autotools ltprune multilib-minimal
+INHERIT=autotools epatch ltprune multilib-minimal
IUSE=debug cpu_flags_x86_mmx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86
LICENSE=LGPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
SLOT=0
SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/smpeg-2.0.0.tar.bz2
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=bcbd6d47ee51a3194a74e5cf71e5a8a7
+_md5_=62b5bb4daf81b1ebe684e4d854b45737
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1 b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
index f3734b98a559..5e0b9ac62630 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
@@ -3,12 +3,12 @@ DEPEND=>=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
DESCRIPTION=VBI Decoding Library for Zapping
EAPI=5
HOMEPAGE=http://zapping.sourceforge.net
-INHERIT=eutils libtool multilib-minimal
+INHERIT=epatch libtool multilib-minimal
IUSE=doc dvb nls static-libs v4l X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=media-libs/libpng-1.5.18:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=167fbf040dedbee2b205d53749f1f731
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=d7ccd2b9666a860eaad96032bb2ad50b
diff --git a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1 b/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
index 73c4d5883654..dcd72bd5f2a4 100644
--- a/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
+++ b/metadata/md5-cache/media-plugins/amb-plugins-0.8.1-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=AMB-plugins ladspa plugin package. Filters by Fons Adriaensen
EAPI=5
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
-INHERIT=multilib toolchain-funcs eutils
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
SLOT=0
SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/AMB-plugins-0.8.1.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=7dd874b7ec87fd70c245057d8312dff6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=6e52e055315bdbcc572aee3bb8eb478a
diff --git a/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1 b/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
index 05c1cb270589..f05c5d220b47 100644
--- a/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
+++ b/metadata/md5-cache/media-plugins/fil-plugins-0.3.0-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/ladspa-sdk
DESCRIPTION=FIL-plugins ladspa plugin package. Filters by Fons Adriaensen
EAPI=5
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/ladspa-sdk
SLOT=0
SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/FIL-plugins-0.3.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f370a279e76ac70b9c628abc4feca01c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=5e9879a080d4a716dfc1c4f625ebf840
diff --git a/metadata/md5-cache/media-radio/direwolf-1.4 b/metadata/md5-cache/media-radio/direwolf-1.4
index fb762b62dfef..e899c3939144 100644
--- a/metadata/md5-cache/media-radio/direwolf-1.4
+++ b/metadata/md5-cache/media-radio/direwolf-1.4
@@ -3,11 +3,11 @@ DEPEND=media-libs/alsa-lib:= virtual/pkgconfig
DESCRIPTION=Decoded Information from Radio Emissions for Windows Or Linux Fans
EAPI=6
HOMEPAGE=https://github.com/wb2osz/direwolf/blob/master/README.md
-INHERIT=eutils systemd
+INHERIT=epatch systemd
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 BSD
RDEPEND=media-libs/alsa-lib:=
SLOT=0
SRC_URI=https://github.com/wb2osz/direwolf/archive/1.4.tar.gz -> direwolf-1.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=059850d00749f2ce855900a2b2eef4c0
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=c37e05e8424ef4a2850e957ab3b0c372
diff --git a/metadata/md5-cache/media-sound/abcmidi-2020.06.07 b/metadata/md5-cache/media-sound/abcmidi-2020.06.07
index f92fc1c21270..4ed8b4d70c2c 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2020.06.07
+++ b/metadata/md5-cache/media-sound/abcmidi-2020.06.07
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=Programs for processing ABC music notation files
EAPI=7
HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
@@ -11,4 +10,4 @@ LICENSE=GPL-2
SLOT=0
SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2020.06.07.zip
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6f07e14a62d28df9e25e9e9a489442fa
+_md5_=f01d4794ae108c683e4a9cf066da292c
diff --git a/metadata/md5-cache/media-sound/cdcd-0.6.6-r2 b/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
index 1aba3c50ef7c..38839c52b401 100644
--- a/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
+++ b/metadata/md5-cache/media-sound/cdcd-0.6.6-r2
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4 sys-devel/gnuconfi
DESCRIPTION=a simple yet powerful command line cd player
EAPI=5
HOMEPAGE=http://libcdaudio.sourceforge.net
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=amd64 ~hppa ~ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4
SLOT=0
SRC_URI=mirror://sourceforge/libcdaudio/cdcd-0.6.6.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=268d45877abef3dfde13d54d532a9c78
+_md5_=2c3b794c1300ecdeef17b5d825216fb7
diff --git a/metadata/md5-cache/media-sound/din-50 b/metadata/md5-cache/media-sound/din-50
index 750ca25e8148..2d08d685da6c 100644
--- a/metadata/md5-cache/media-sound/din-50
+++ b/metadata/md5-cache/media-sound/din-50
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( me
DESCRIPTION=a software musical instrument and audio synthesizer
EAPI=7
HOMEPAGE=https://dinisnoise.org/
-INHERIT=autotools eutils xdg
+INHERIT=autotools edos2unix xdg
IUSE=+alsa jack
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( m
REQUIRED_USE=|| ( alsa jack )
SLOT=0
SRC_URI=https://archive.org/download/dinisnoise_source_code/din-50.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=3784d346d74f7278a6f363c11b738ba6
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=339cbb02126bdffe6fe1397efe54e94c
diff --git a/metadata/md5-cache/media-sound/din-50.1 b/metadata/md5-cache/media-sound/din-50.1
index adbc3b889515..ce5c57ab35bd 100644
--- a/metadata/md5-cache/media-sound/din-50.1
+++ b/metadata/md5-cache/media-sound/din-50.1
@@ -4,7 +4,7 @@ DEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( me
DESCRIPTION=a software musical instrument and audio synthesizer
EAPI=7
HOMEPAGE=https://dinisnoise.org/
-INHERIT=autotools eutils xdg
+INHERIT=autotools edos2unix xdg
IUSE=+alsa jack
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/glu virtual/opengl alsa? ( m
REQUIRED_USE=|| ( alsa jack )
SLOT=0
SRC_URI=https://archive.org/download/dinisnoise_source_code/din-50.1.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=08db31ff3d0423a2fb4af9e2afef8710
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=f210f54da57148c632572fdf23a6abfc
diff --git a/metadata/md5-cache/media-sound/gigedit-1.1.1-r1 b/metadata/md5-cache/media-sound/gigedit-1.1.1-r1
index 13d3938884da..f186dc2fa0b7 100644
--- a/metadata/md5-cache/media-sound/gigedit-1.1.1-r1
+++ b/metadata/md5-cache/media-sound/gigedit-1.1.1-r1
@@ -4,11 +4,11 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=An instrument editor for gig files
EAPI=7
HOMEPAGE=http://www.linuxsampler.org/
-INHERIT=autotools eutils desktop xdg
+INHERIT=autotools desktop xdg
KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-cpp/gtkmm:2.4 >=media-libs/libgig-3.3.0 >=media-libs/libsndfile-1.0.2 >=media-sound/linuxsampler-0.5.1
SLOT=0
SRC_URI=http://download.linuxsampler.org/packages/gigedit-1.1.1.tar.bz2
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=0bb4b584e4824e5a99598ad7b3a35615
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=176219a0d9c02227d723b2beb156cd1d
diff --git a/metadata/md5-cache/media-sound/gigedit-9999 b/metadata/md5-cache/media-sound/gigedit-9999
index 1943ae03881d..d8801304b690 100644
--- a/metadata/md5-cache/media-sound/gigedit-9999
+++ b/metadata/md5-cache/media-sound/gigedit-9999
@@ -4,10 +4,10 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=An instrument editor for gig files
EAPI=7
HOMEPAGE=http://www.linuxsampler.org/
-INHERIT=autotools eutils desktop xdg subversion
+INHERIT=autotools desktop xdg subversion
LICENSE=GPL-2
PROPERTIES=live
RDEPEND=dev-cpp/gtkmm:2.4 >=media-libs/libgig-3.3.0 >=media-libs/libsndfile-1.0.2 >=media-sound/linuxsampler-0.5.1
SLOT=0
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07 estack 055c42df72f76a4f45ec92b35e83cd56 subversion c500a1b7795f44153bd96fc2597e3c05
-_md5_=52dfc316d19d01b9bc9c2eaf2a376b17
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 desktop c0d27bf73aa08ca05b663dbd31fbef28 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07 estack 055c42df72f76a4f45ec92b35e83cd56 subversion c500a1b7795f44153bd96fc2597e3c05
+_md5_=5c583c5cbfd85b77437441fb92d8ecf2
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
index 00b9372001fe..d5eed922ed96 100644
--- a/metadata/md5-cache/media-sound/gnump3d-3.0-r2
+++ b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
@@ -1,9 +1,9 @@
DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=sys-apps/sed dev-lang/perl:=[-build(-)]
+DEPEND=dev-lang/perl:=[-build(-)]
DESCRIPTION=A streaming server for MP3, OGG vorbis and other streamable files
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gnump3d/
-INHERIT=eutils multilib user perl-module
+INHERIT=multilib user perl-module
IUSE=sox
KEYWORDS=~alpha amd64 ~ppc ppc64 sparc x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=sox? ( media-sound/sox ) dev-lang/perl:=[-build(-)]
RESTRICT=test
SLOT=0
SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=5c543af272709e53096867e41f042a78
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=c84eb7ffda240d8b8c30177c682dbd60
diff --git a/metadata/md5-cache/media-sound/mp3val-0.1.8 b/metadata/md5-cache/media-sound/mp3val-0.1.8
index ad467c04df0e..47f0917a19d5 100644
--- a/metadata/md5-cache/media-sound/mp3val-0.1.8
+++ b/metadata/md5-cache/media-sound/mp3val-0.1.8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Validate and fix MPEG audio files
EAPI=6
HOMEPAGE=http://mp3val.sourceforge.net/
-INHERIT=eutils
+INHERIT=edos2unix
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/mp3val/mp3val-0.1.8-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=20ab56511b93841db76a785b726844b1
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=0e4ee5678ec586c41faca71d6dee2bd5
diff --git a/metadata/md5-cache/media-sound/music-file-organizer-1.0.3 b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
index 04e26e2f3dba..db1e4b63e73e 100644
--- a/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
+++ b/metadata/md5-cache/media-sound/music-file-organizer-1.0.3
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=postinst
-DEPEND=media-libs/taglib dev-libs/icu:= virtual/pkgconfig
+DEPEND=dev-libs/icu:= media-libs/taglib
DESCRIPTION=Organizes audio files into directories based on metadata tags
EAPI=7
HOMEPAGE=https://git.zx2c4.com/music-file-organizer/about/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=media-libs/taglib dev-libs/icu:=
+RDEPEND=dev-libs/icu:= media-libs/taglib
SLOT=0
SRC_URI=https://git.zx2c4.com/music-file-organizer/snapshot/music-file-organizer-1.0.3.tar.xz
-_md5_=ffc78e51b9e52edce89705cb1ba2ccd5
+_md5_=3bab32e7f9ce08913beb47304972a9e6
diff --git a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2 b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
index ab5e11227426..0d4bb5a7f8cf 100644
--- a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
+++ b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
DESCRIPTION=Subsonic is a complete, personal media streaming solution
EAPI=5
HOMEPAGE=http://www.subsonic.org/
-INHERIT=eutils user
+INHERIT=wrapper user
IUSE=ffmpeg lame selinux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=virtual/jre lame? ( media-sound/lame ) ffmpeg? ( media-video/ffmpeg ) selinux? ( sec-policy/selinux-subsonic )
SLOT=0
SRC_URI=mirror://sourceforge/subsonic/5.2.1/subsonic-5.2.1-standalone.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=5d764eae99abc347ab8af08b246ceda6
+_eclasses_=wrapper 4251d4c84c25f59094fd557e0063a974 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=970ec6c6578ac9df120ef597caf3554e
diff --git a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1 b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
index e2c8eb98a201..38503c8a7aae 100644
--- a/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
+++ b/metadata/md5-cache/media-sound/tapestrea-0.1.0.5-r1
@@ -3,12 +3,12 @@ DEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/al
DESCRIPTION=Expressive Synthesis, Transformation, Rendering of Environmental Audio
EAPI=5
HOMEPAGE=http://taps.cs.princeton.edu/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=+alsa doc jack oss
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=jack? ( media-sound/jack-audio-connection-kit:0 ) alsa? ( >=media-libs/alsa-lib-0.9:0 ) media-libs/libsndfile:0 media-libs/freeglut:0 virtual/opengl:0 virtual/glu:0 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://taps.cs.princeton.edu/release/files/tapestrea-0.1.0.5.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=baeb212026ebbea46474862c88b68f06
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=5a9a9779c61756b262eb6651a740d1f5
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8 b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
index 93a446f21f2b..dfcec3334999 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r8
@@ -3,7 +3,7 @@ DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay?
DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
EAPI=7
HOMEPAGE=https://xmms2.org/wiki/Main_Page
-INHERIT=eutils multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
+INHERIT=multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
KEYWORDS=~alpha amd64 ~arm ppc x86
LICENSE=GPL-2 LGPL-2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xmms2-0.8DrO_o-949-gca15e830.tar.bz2 https://waf.io/waf-2.0.19.tar.bz2
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-single dd06178c43afcd54225a7d0fca6342a8
-_md5_=e64bcef186233a8213443cb0129996a5
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a ruby-utils 03dfa7f54d59d740c2964dc7256d2820 ruby-single dd06178c43afcd54225a7d0fca6342a8
+_md5_=dc1f46ec2a4faa82da14ea8d1d37d814
diff --git a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r2 b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r2
index 3796cc140016..b0d33e6eefbc 100644
--- a/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r2
+++ b/metadata/md5-cache/media-tv/channeleditor-1.9.2.1-r2
@@ -3,12 +3,12 @@ DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
DESCRIPTION=Editor for VDR channels.conf
EAPI=7
HOMEPAGE=https://sites.google.com/site/reniershomepage/
-INHERIT=desktop eutils java-pkg-2 java-ant-2 xdg
+INHERIT=desktop edos2unix java-pkg-2 java-ant-2 xdg
IUSE=elibc_FreeBSD source elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://sourceforge/channeleditor/channeleditor_1.9.2.1_src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=37599a1e76609e4d602508924bd8d707
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=288ffec3cfd3454a41fd51af088aea51
diff --git a/metadata/md5-cache/media-tv/dvbtune-0.5-r1 b/metadata/md5-cache/media-tv/dvbtune-0.5-r1
index 81f21647c405..190e737bf0d3 100644
--- a/metadata/md5-cache/media-tv/dvbtune-0.5-r1
+++ b/metadata/md5-cache/media-tv/dvbtune-0.5-r1
@@ -3,12 +3,12 @@ DEPEND=xml? ( dev-libs/libxml2 ) virtual/linuxtv-dvb-headers
DESCRIPTION=simple tuning app for DVB cards
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/dvbtools
-INHERIT=eutils
+INHERIT=epatch
IUSE=xml
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=xml? ( dev-libs/libxml2 )
SLOT=0
SRC_URI=mirror://sourceforge/dvbtools/dvbtune-0.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=2766e0e287a715e237ad7971ddd6ed2e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=b253d9143cab4cd7771c08cb601ba1a7
diff --git a/metadata/md5-cache/media-tv/gtk-v4l-0.4 b/metadata/md5-cache/media-tv/gtk-v4l-0.4
index 8dd083122fd4..187bb5ef58f2 100644
--- a/metadata/md5-cache/media-tv/gtk-v4l-0.4
+++ b/metadata/md5-cache/media-tv/gtk-v4l-0.4
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2 dev-libs/libgudev:= >=media-libs/libv4l-0.6 x11-libs/gt
DESCRIPTION=A control application for Video 4 Linux (based on C and GTK+)
EAPI=5
HOMEPAGE=http://fedorahosted.org/gtk-v4l/
-INHERIT=eutils ltprune
+INHERIT=epatch ltprune
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2 dev-libs/libgudev:= >=media-libs/libv4l-0.6 x11-libs/gtk+:3
SLOT=0
SRC_URI=http://fedorahosted.org/releases/g/t/gtk-v4l/gtk-v4l-0.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=b9ee184c6e1495d2779ccba7c7198e25
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=14474428b442c286b21b7bc4b50a54a3
diff --git a/metadata/md5-cache/media-video/bbtools-1.9 b/metadata/md5-cache/media-video/bbtools-1.9
index 64e71ec92f50..530a4e12147d 100644
--- a/metadata/md5-cache/media-video/bbtools-1.9
+++ b/metadata/md5-cache/media-video/bbtools-1.9
@@ -3,10 +3,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=bbdmux, bbinfo, bbvinfo and bbainfo from Brent Beyeler
EAPI=7
HOMEPAGE=http://members.cox.net/beyeler/bbmpeg.html
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=edos2unix flag-o-matic toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://files.digital-digest.com/downloads/files/encode/bbtool19_src.zip
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=b394411820c0548303f6b8170b923a6a
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=8f36396aa9f9fb6422389aaf42b5bf96
diff --git a/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1 b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1
index edaba7bb9fbe..db8bf6fcb932 100644
--- a/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1
+++ b/metadata/md5-cache/media-video/dvbsnoop-1.4.50-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/linuxtv-dvb-headers
DESCRIPTION=DVB/MPEG stream analyzer program
EAPI=5
HOMEPAGE=http://dvbsnoop.sourceforge.net/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/dvbsnoop/dvbsnoop-1.4.50.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f97585dfc7dfbd322d0eaf69666dab64
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=39f67d4f39dba432230acdf61072cbb0
diff --git a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4 b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
index 1a72a91592dc..fb69a4c045f7 100644
--- a/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
+++ b/metadata/md5-cache/media-video/dvdrip-0.98.11-r4
@@ -3,12 +3,12 @@ DEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=
DESCRIPTION=dvd::rip is a graphical frontend for transcode
EAPI=5
HOMEPAGE=https://www.exit1.org/dvdrip/
-INHERIT=eutils flag-o-matic perl-module
+INHERIT=epatch flag-o-matic perl-module
IUSE=ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 dev-perl/Gtk2 >=dev-perl/gtk2-ex-formfactory-0.65 >=dev-perl/libintl-perl-1.16 >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] virtual/imagemagick-tools >=virtual/perl-podlators-2.5.3 x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 ffmpeg? ( media-video/ffmpeg:0 ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) subtitles? ( media-video/subtitleripper ) vcd? ( media-video/transcode[mjpeg] >=media-video/mjpegtools-1.6.0 ) vorbis? ( media-sound/vorbis-tools ) xine? ( media-video/xine-ui ) xvid? ( media-video/xvid4conf ) >=media-video/lsdvd-0.15 dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=https://www.exit1.org/dvdrip/dist/dvdrip-0.98.11.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=07698aa07c5f754948afa62bea918e56
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=82b1b95540affecce8773e36a780a8e2
diff --git a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1 b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
index 89a8afc74e82..ad10f4120560 100644
--- a/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
+++ b/metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 virtual/libusb:0 virtual/udev
DESCRIPTION=Extract, load or export firmware for the iSight webcams
EAPI=5
HOMEPAGE=https://launchpad.net/isight-firmware-tools
-INHERIT=eutils versionator udev
+INHERIT=epatch versionator udev
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 virtual/libusb:0 virtual/udev
SLOT=0
SRC_URI=https://launchpad.net/isight-firmware-tools/main/1.6/+download/isight-firmware-tools-1.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=b9b1703ef672c832a735c0e100c9456a
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
+_md5_=7c39840e11c964648e6c8fa2968cb3b5
diff --git a/metadata/md5-cache/media-video/lsdvd-0.17 b/metadata/md5-cache/media-video/lsdvd-0.17
index da00d596bc23..0f6a508877e2 100644
--- a/metadata/md5-cache/media-video/lsdvd-0.17
+++ b/metadata/md5-cache/media-video/lsdvd-0.17
@@ -3,11 +3,11 @@ DEPEND=media-libs/libdvdread:0= sys-devel/gnuconfig >=app-portage/elt-patches-20
DESCRIPTION=Utility for getting info out of DVDs
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/lsdvd/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=media-libs/libdvdread:0=
SLOT=0
SRC_URI=mirror://sourceforge/lsdvd/lsdvd-0.17.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=85f5750d237e6a787ce5937d2cd875ca
+_md5_=697840026323db5759fa685e909a0ab8
diff --git a/metadata/md5-cache/media-video/lxdvdrip-1.77 b/metadata/md5-cache/media-video/lxdvdrip-1.77
index e9ffa554763b..91de2173dbc9 100644
--- a/metadata/md5-cache/media-video/lxdvdrip-1.77
+++ b/metadata/md5-cache/media-video/lxdvdrip-1.77
@@ -3,11 +3,11 @@ DEPEND=media-libs/libdvdread
DESCRIPTION=Command line tool to automate the process of ripping and burning DVDs
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/lxdvdrip/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libdvdread >=media-video/dvdauthor-0.6.9 media-video/streamdvd media-video/mpgtx
SLOT=0
SRC_URI=mirror://sourceforge/lxdvdrip/lxdvdrip-1.77.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=8fba7bb3c9861b2a5ea792be743125a6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=e7b92dc3eb3ccdb8a1d112dd95d518ac
diff --git a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5 b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
index 096ca21e2e29..9757128dbec2 100644
--- a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
+++ b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 virtual/jpeg:0
DESCRIPTION=Tools for MPEG video
EAPI=5
HOMEPAGE=http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=BSD
RDEPEND=x11-libs/libX11 virtual/jpeg:0
SLOT=0
SRC_URI=ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/mpeg_encode-1.5b-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=cbdc414f7da85fe59aa90179ce2e330d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=b31fb3e762b0343c069492a66db74a09
diff --git a/metadata/md5-cache/media-video/mpgtx-1.3.1-r2 b/metadata/md5-cache/media-video/mpgtx-1.3.1-r2
index 2ef93e0b1cbb..698eb45024f6 100644
--- a/metadata/md5-cache/media-video/mpgtx-1.3.1-r2
+++ b/metadata/md5-cache/media-video/mpgtx-1.3.1-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=Command line MPEG audio/video/system file toolbox
EAPI=5
HOMEPAGE=http://mpgtx.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/mpgtx/mpgtx-1.3.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ee591a861b22efa6d3c9c5ae464bfce1
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=c56d4fa73f4fa4ba00689218e608f88f
diff --git a/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2 b/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
index eeae4aba9f7d..469107a3de32 100644
--- a/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
+++ b/metadata/md5-cache/media-video/mplayer-sh-0.8.6-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Video Disk Recorder Mplayer API Script
EAPI=5
HOMEPAGE=http://batleth.sapienti-sat.org/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 x86
LICENSE=all-rights-reserved
RDEPEND=>=media-video/mplayer-0.90_rc4
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://batleth.sapienti-sat.org/projects/VDR/mplayer.sh-0.8.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=99a1b7fc98fec517850c7df1d832b9b2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=563adebd7aa818d7b61bb890540f1b1f
diff --git a/metadata/md5-cache/media-video/mplayer-sh-0.8.7 b/metadata/md5-cache/media-video/mplayer-sh-0.8.7
index 5d16e524b6f2..53b483c3e12d 100644
--- a/metadata/md5-cache/media-video/mplayer-sh-0.8.7
+++ b/metadata/md5-cache/media-video/mplayer-sh-0.8.7
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Video Disk Recorder Mplayer API Script
EAPI=5
HOMEPAGE=http://batleth.sapienti-sat.org/projects/VDR/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 x86
LICENSE=all-rights-reserved
RDEPEND=>=media-video/mplayer-0.1.20070321
RESTRICT=mirror bindist
SLOT=0
SRC_URI=http://batleth.sapienti-sat.org/projects/VDR/versions/mplayer.sh-0.8.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=2eb58a35cecf39f7112c11befcb8134a
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=45fa6b908b3a9d3b52e3bd851dd23cd0
diff --git a/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160217-r1 b/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160217-r1
index 905f7e9d3f17..6b23ab7542d8 100644
--- a/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160217-r1
+++ b/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160217-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userlan
DESCRIPTION=Command line media player for the Raspberry Pi
EAPI=5
HOMEPAGE=https://github.com/popcornmix/omxplayer
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=epatch toolchain-funcs flag-o-matic
KEYWORDS=~arm
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin ) sys-apps/dbus sys-apps/fbset media-video/ffmpeg x11-apps/xrefresh x11-apps/xset
SLOT=0
SRC_URI=https://github.com/popcornmix/omxplayer/tarball/15a490b -> raspberrypi-omxplayer-0_p20160217.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=15eae72f29b8a797b7905ff143cf3bab
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=15ecd757647a588d057ae19d1593bc07
diff --git a/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r2 b/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r2
index 3d36572e9bc5..d7cfe24ff176 100644
--- a/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r2
+++ b/metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r2
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userlan
DESCRIPTION=Command line media player for the Raspberry Pi
EAPI=5
HOMEPAGE=https://github.com/popcornmix/omxplayer
-INHERIT=eutils toolchain-funcs flag-o-matic
+INHERIT=epatch toolchain-funcs flag-o-matic
IUSE=X
KEYWORDS=~arm
LICENSE=GPL-2
RDEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin ) sys-apps/dbus sys-apps/fbset media-video/ffmpeg dev-libs/boost media-libs/freetype:2 X? ( x11-apps/xrefresh x11-apps/xset )
SLOT=0
SRC_URI=https://github.com/popcornmix/omxplayer/tarball/791d7df -> raspberrypi-omxplayer-0_p20160528.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=ddd84168f7aea6ba6802e974adc8885c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=106c964903b7c8c40abd4651bc75cede
diff --git a/metadata/md5-cache/media-video/raspberrypi-omxplayer-9999 b/metadata/md5-cache/media-video/raspberrypi-omxplayer-9999
index 453c9aab24ce..754473fe4ec0 100644
--- a/metadata/md5-cache/media-video/raspberrypi-omxplayer-9999
+++ b/metadata/md5-cache/media-video/raspberrypi-omxplayer-9999
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userlan
DESCRIPTION=Command line media player for the Raspberry Pi
EAPI=5
HOMEPAGE=https://github.com/popcornmix/omxplayer
-INHERIT=eutils git-r3 toolchain-funcs flag-o-matic
+INHERIT=epatch git-r3 toolchain-funcs flag-o-matic
IUSE=X
LICENSE=GPL-2
PROPERTIES=live
RDEPEND=dev-libs/libpcre media-fonts/freefont || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin ) sys-apps/dbus sys-apps/fbset media-video/ffmpeg dev-libs/boost media-libs/freetype:2 X? ( x11-apps/xrefresh x11-apps/xset )
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e git-r3 b8e8c92aa5fe8df7187e466138eb4e52 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=8949b89cd2757e8a7c92972e8a185e64
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e git-r3 b8e8c92aa5fe8df7187e466138eb4e52 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=7d31e8a3551f55d8e393b3fd1f178c61
diff --git a/metadata/md5-cache/media-video/snappy-1.0-r1 b/metadata/md5-cache/media-video/snappy-1.0-r1
index 16c9009e87fe..4ab677eaf674 100644
--- a/metadata/md5-cache/media-video/snappy-1.0-r1
+++ b/metadata/md5-cache/media-video/snappy-1.0-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.32:2 >=media-libs/clutter-1.20.0:1.0 media-libs/clutter
DESCRIPTION=A simple media player written using GStreamer and Clutter
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Apps/Snappy
-INHERIT=autotools eutils gnome2
+INHERIT=autotools epatch gnome2
KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=dev-libs/glib-2.32:2 >=media-libs/clutter-1.20.0:1.0 media-libs/clutter-gst:3.0 >=media-libs/clutter-gtk-1.6.0:1.0 >=x11-libs/gtk+-3.5.0:3 x11-libs/libXtst >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-base-1.4.0:1.0 media-plugins/gst-plugins-meta:1.0 !!<net-misc/spice-gtk-0.19
SLOT=0
SRC_URI=mirror://gnome/sources/snappy/1.0/snappy-1.0.tar.xz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=34c016c7d8300caf5c6ca0b2e15eef51
+_md5_=5824bae4e0b4d44bd1ab52632ff2e3e6
diff --git a/metadata/md5-cache/media-video/vstrip-0.8f b/metadata/md5-cache/media-video/vstrip-0.8f
index 36a7d23e22c0..8531c399559b 100644
--- a/metadata/md5-cache/media-video/vstrip-0.8f
+++ b/metadata/md5-cache/media-video/vstrip-0.8f
@@ -1,11 +1,12 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=A program to split non-css dvd vobs into individual chapters
EAPI=7
HOMEPAGE=http://www.maven.de/code
+INHERIT=edos2unix toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://files.digital-digest.com/downloads/files/encode/vStrip_08f.zip
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d8746837aa0de72a6c348cb3f908a565
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=38da79bbace737c87be93411bb48f867
diff --git a/metadata/md5-cache/media-video/xvattr-1.3-r3 b/metadata/md5-cache/media-video/xvattr-1.3-r3
index a6e9c8aca378..c146055630e8 100644
--- a/metadata/md5-cache/media-video/xvattr-1.3-r3
+++ b/metadata/md5-cache/media-video/xvattr-1.3-r3
@@ -3,12 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 )
DESCRIPTION=X11 XVideo Querying/Setting Tool from Ogle project
EAPI=5
HOMEPAGE=http://www.dtek.chalmers.se/groups/dvd
-INHERIT=eutils autotools
+INHERIT=epatch autotools
IUSE=gtk
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-1.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=5d439c5de6402d3e2ca44ce405bbe8d9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=c87922d42150a1af14bae49ae1b9bc4f
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
index 0aefa516822d..69a7398d1f7d 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/pkgconfig
DESCRIPTION=The OpenBSD network swiss army knife
EAPI=7
HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
+INHERIT=toolchain-funcs
IUSE=elibc_Darwin
KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
LICENSE=BSD
RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
SLOT=0
SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.190.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.190-2.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=ca28a64edfa2be41f59f01b8f16c9a36
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ab826065afe7452dc60248fc67d688e0
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
index a19741e8dbf1..96de5d8c9f2d 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install postinst prepare
-DEPEND=virtual/pkgconfig
DESCRIPTION=The OpenBSD network swiss army knife
EAPI=7
HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
+INHERIT=toolchain-funcs
IUSE=elibc_Darwin
KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
LICENSE=BSD
RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
SLOT=0
SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=eba5f863dba3d93dc9cf2ad03c8c3207
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=4e8828e8dfcf83a19e599560f5126b10
diff --git a/metadata/md5-cache/net-irc/cgiirc-0.5.10 b/metadata/md5-cache/net-irc/cgiirc-0.5.10
index 439b977f1474..02968051507a 100644
--- a/metadata/md5-cache/net-irc/cgiirc-0.5.10
+++ b/metadata/md5-cache/net-irc/cgiirc-0.5.10
@@ -3,12 +3,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-
DESCRIPTION=A perl/CGI program to use IRC from a web browser
EAPI=5
HOMEPAGE=http://cgiirc.org/
-INHERIT=webapp eutils vcs-clean
+INHERIT=webapp vcs-clean
IUSE=vhosts
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=app-admin/webapp-config-1.50.15
SLOT=0.5.10
SRC_URI=http://cgiirc.org/releases/cgiirc-0.5.10.tar.gz
-_eclasses_=webapp 990ad6a000cf18d1ef87117e8c7b0a54 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=847182c03c7aeead14c840a0dad6f8c0
+_eclasses_=webapp 990ad6a000cf18d1ef87117e8c7b0a54 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1d98516c264c76504961ee1fc603bd7a
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5-r100 b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
index a188eb030453..af61d3cbbb28 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5-r100
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5-r100
@@ -1,5 +1,5 @@
+BDEPEND=doc? ( app-doc/doxygen )
DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Embedded client/server TLSv1 SSL library and small HTTP(S) server
EAPI=7
HOMEPAGE=http://axtls.sourceforge.net/
@@ -12,4 +12,4 @@ REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ^^ ( lua_single_target_luajit lu
SLOT=0/1
SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 portability c10bdc40668533b1faf15b1d89df0303 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=d686979e7009e47670e8af8c8e80190b
+_md5_=28b2063d729fbcdcf37df6393da70f0b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
index a20a27fb695b..81aaf4c338df 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
@@ -3,12 +3,12 @@ DEPEND=net-libs/libmnl virtual/pkgconfig
DESCRIPTION=library providing interface to extended accounting infrastructure
EAPI=5
HOMEPAGE=https://netfilter.org/projects/libnetfilter_acct/
-INHERIT=eutils linux-info ltprune multilib
+INHERIT=linux-info ltprune multilib
IUSE=examples kernel_linux
KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux
LICENSE=LGPL-2.1
RDEPEND=net-libs/libmnl
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=5f13a051e9b9da0d3e1c091782f3c4d1
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=f215cee7a7601ebbacf94eb6ab31eb3c
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31-r2 b/metadata/md5-cache/net-mail/notmuch-0.31-r2
index a3d64f37ae8b..21d324f76602 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31-r2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31-r2
@@ -4,7 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
EAPI=7
HOMEPAGE=https://notmuchmail.org/
-INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=GPL-3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 multiprocessing cac3169468f893670dac3e7cb940e045 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 d8655e1387589a2e1930339b1627d5c1 elisp-common 36f97076abd90f943a34f8bcd58b5bcc edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 pax-utils d3fc79d3d50544347e324864f95206e2 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=62e361c9e59af752071366c5a87e19b7
+_md5_=6b6330c8a759d2d019b54f6596a0e697
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.2 b/metadata/md5-cache/net-mail/notmuch-0.31.2
index 5d5153eeea86..3fb95c2022b2 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.2
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.2
@@ -4,7 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
EAPI=7
HOMEPAGE=https://notmuchmail.org/
-INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
LICENSE=GPL-3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.2.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 multiprocessing cac3169468f893670dac3e7cb940e045 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 d8655e1387589a2e1930339b1627d5c1 elisp-common 36f97076abd90f943a34f8bcd58b5bcc edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 pax-utils d3fc79d3d50544347e324864f95206e2 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c6bc595150b00d828e485730753ba58
+_md5_=b7b45f3fd42a95e27da42a2be064e8f2
diff --git a/metadata/md5-cache/net-mail/notmuch-0.31.3 b/metadata/md5-cache/net-mail/notmuch-0.31.3
index a0fcaba80a6f..320474587b51 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.31.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.31.3
@@ -4,7 +4,7 @@ DEPEND=dev-libs/glib dev-libs/gmime:3.0[crypt] >=dev-libs/xapian-1.4.0:= sys-lib
DESCRIPTION=Thread-based e-mail indexer, supporting quick search and tagging
EAPI=7
HOMEPAGE=https://notmuchmail.org/
-INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+INHERIT=bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
IUSE=apidoc crypt doc emacs mutt nmbug python test valgrind python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
LICENSE=GPL-3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0/5
SRC_URI=https://notmuchmail.org/releases/notmuch-0.31.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 multiprocessing cac3169468f893670dac3e7cb940e045 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 distutils-r1 d8655e1387589a2e1930339b1627d5c1 elisp-common 36f97076abd90f943a34f8bcd58b5bcc edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 pax-utils d3fc79d3d50544347e324864f95206e2 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfa88feacc529bb93613f417cf2190e6
+_md5_=addadb178925588c8994d6bf2c31dcbb
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
index 68ccb08ba8d2..56cc020eec1d 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.0.3-r1
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-arch/unzip kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
DESCRIPTION=Amazon EC2 Elastic Network Adapter (ENA) kernel driver
EAPI=7
HOMEPAGE=https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html
@@ -11,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
SLOT=0
SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.0.3.zip -> ena-driver-2.0.3-linux.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e linux-mod 2356a95549dd8cb503f063d05e88c0c8
-_md5_=8acf00b51bc2c66501a6b959d29aa6cf
+_md5_=383b1881c2307159ca0b350a22a09a07
diff --git a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1 b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
index 02b3aada8f2e..65764656d613 100644
--- a/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
+++ b/metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
@@ -1,5 +1,6 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=app-arch/unzip kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
DESCRIPTION=Amazon EC2 Elastic Network Adapter (ENA) kernel driver
EAPI=7
HOMEPAGE=https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html
@@ -11,4 +12,4 @@ RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:
SLOT=0
SRC_URI=https://github.com/amzn/amzn-drivers/archive/ena_linux_2.2.3.tar.gz -> ena-driver-2.2.3-linux.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e linux-mod 2356a95549dd8cb503f063d05e88c0c8
-_md5_=c90154a8e2c7fffadb674a2ab00588b0
+_md5_=a5ed861bfe8533ae6ad66d6a0cbb02f8
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-0.27.2 b/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
index a22faceb300c..d2978d0306c8 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
+++ b/metadata/md5-cache/net-misc/npapi-sdk-0.27.2
@@ -1,5 +1,5 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=-
-DEPEND=virtual/pkgconfig
DESCRIPTION=NPAPI headers bundle
EAPI=7
HOMEPAGE=https://github.com/mgorny/npapi-sdk/
@@ -7,4 +7,4 @@ KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/mgorny/npapi-sdk/releases/download/npapi-sdk-0.27.2/npapi-sdk-0.27.2.tar.bz2
-_md5_=4233d203df772f3d2c62fd2b0d2e7b97
+_md5_=e2b8344cf70c2ff794da45a38f123322
diff --git a/metadata/md5-cache/net-misc/npapi-sdk-9999 b/metadata/md5-cache/net-misc/npapi-sdk-9999
index 7123158c5b56..4bea874e8ffe 100644
--- a/metadata/md5-cache/net-misc/npapi-sdk-9999
+++ b/metadata/md5-cache/net-misc/npapi-sdk-9999
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=prepare unpack
-DEPEND=virtual/pkgconfig
DESCRIPTION=NPAPI headers bundle
EAPI=7
HOMEPAGE=https://github.com/mgorny/npapi-sdk/
@@ -9,4 +8,4 @@ LICENSE=BSD
PROPERTIES=live
SLOT=0
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=88ae1b02d2645970817fc9d53ee3adda
+_md5_=23d71e5123e83184720874e6fdd040be
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.15.5 b/metadata/md5-cache/net-misc/teamviewer-15.15.5
index dd1550063b27..37f44d332e2b 100644
--- a/metadata/md5-cache/net-misc/teamviewer-15.15.5
+++ b/metadata/md5-cache/net-misc/teamviewer-15.15.5
@@ -1,6 +1,6 @@
BDEPEND=virtual/pkgconfig
DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=sys-apps/sed dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
EAPI=7
HOMEPAGE=https://www.teamviewer.com
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
SLOT=0
SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.15.5_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.15.5_i386.tar.xz )
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=336a59f60bc2e0d78d23d13948f93359
+_md5_=58a4acbeaeceab3419feb7baa273f561
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
index 864fffb5a9e7..d4db494445de 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.7 dev-java/bcprov:1.54 dev-java/commons-co
DESCRIPTION=An encrypted network without censorship
EAPI=6
HOMEPAGE=https://freenetproject.org/
-INHERIT=eutils java-pkg-2 java-ant-2 multilib systemd user
+INHERIT=epatch java-pkg-2 java-ant-2 systemd user
IUSE=+nss test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/freenet/fred/archive/build01484.zip -> freenet-0.7.5_p1484.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=8bec7f6c38de73e04c75250ea1054aa2
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=0cb430aa85485950460481f87c4bcbbe
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1486 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1486
index 5b3523564d06..b72d4e16bba7 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1486
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1486
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:1.54 dev-java/commons-co
DESCRIPTION=An encrypted network without censorship
EAPI=6
HOMEPAGE=https://freenetproject.org/
-INHERIT=eutils java-pkg-2 java-ant-2 multilib systemd user
+INHERIT=epatch java-pkg-2 java-ant-2 systemd user
IUSE=+nss test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/freenet/fred/archive/build01486.zip -> freenet-0.7.5_p1486.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=d86b7aec48b85ccf19340f4b60bf68e9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=bf148e73d1b643df56739418520e9ced
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
index dde03b35f82a..487e6731d226 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1488
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip >=virtual/jdk-1.8 dev-java/bcprov:1.54 dev-java/commons-co
DESCRIPTION=An encrypted network without censorship
EAPI=6
HOMEPAGE=https://freenetproject.org/
-INHERIT=eutils java-pkg-2 java-ant-2 multilib systemd
+INHERIT=epatch java-pkg-2 java-ant-2 systemd
IUSE=+nss test elibc_FreeBSD doc source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ GPL-2 MIT BSD-2 Apache-2.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/freenet/fred/archive/build01488.zip -> freenet-0.7.5_p1488.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=9eef50693539152571f18c8f42c72eb5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=aca7212e6f81bccbca36727da79b1ae3
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2 b/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
index ef7febc656b2..87f5bf4ee82a 100644
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
+++ b/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
@@ -4,6 +4,7 @@ DEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/mi
DESCRIPTION=P2P private sharing application
EAPI=7
HOMEPAGE=https://retroshare.cc
+INHERIT=desktop edos2unix qmake-utils xdg-utils
IUSE=cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian
KEYWORDS=amd64 x86
LICENSE=AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3
@@ -11,5 +12,5 @@ RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/m
REQUIRED_USE=|| ( cli gui service ) service? ( jsonapi )
SLOT=0
SRC_URI=https://github.com/RetroShare/RetroShare/releases/download/v0.6.5/RetroShare-v0.6.5-source-with-submodules.tar.gz -> retroshare-0.6.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bf6d5f6c93c6ca4c52c8f444b2eb8a4
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=c42f307d7409e7f975784e411639ce7a
diff --git a/metadata/md5-cache/net-print/libinklevel-0.9.2 b/metadata/md5-cache/net-print/libinklevel-0.9.2
index bf6ddd1ded09..0b1397243738 100644
--- a/metadata/md5-cache/net-print/libinklevel-0.9.2
+++ b/metadata/md5-cache/net-print/libinklevel-0.9.2
@@ -3,7 +3,7 @@ DEPEND=>=sys-libs/libieee1284-0.2.11 virtual/libusb:1 sys-devel/gnuconfig >=app-
DESCRIPTION=A library to get the ink level of your printer
EAPI=5
HOMEPAGE=http://libinklevel.sourceforge.net/
-INHERIT=autotools eutils multilib
+INHERIT=autotools multilib
IUSE=debug static-libs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/libieee1284-0.2.11 virtual/libusb:1
SLOT=0
SRC_URI=mirror://sourceforge/libinklevel/libinklevel-0.9.2.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=c1cd3ce1fbf32931eaa1d14bb6155d76
+_md5_=e4ebf0efaf0cc929b083f6dc8e73e7cc
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.127 b/metadata/md5-cache/net-vpn/badvpn-1.999.127
index 003babbe7d41..e2a716b8c8d3 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.127
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.127
@@ -3,7 +3,7 @@ DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-lib
DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
EAPI=5
HOMEPAGE=https://code.google.com/p/badvpn/
-INHERIT=eutils cmake-utils user toolchain-funcs systemd
+INHERIT=cmake-utils user toolchain-funcs systemd
IUSE=+client +ncd +server +tun2socks +udpgw debug
KEYWORDS=amd64 arm x86
LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
RESTRICT=!ncd? ( test )
SLOT=0
SRC_URI=https://badvpn.googlecode.com/files/badvpn-1.999.127.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=50923104f2701e40ef5b0dfed0543ab0
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=d5ee6b18f8359b351b8f005c92eacca3
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.129 b/metadata/md5-cache/net-vpn/badvpn-1.999.129
index aedd18c7f0b3..b564e4f0bda0 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.129
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.129
@@ -3,7 +3,7 @@ DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl ) server? ( dev-lib
DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
EAPI=5
HOMEPAGE=https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/
-INHERIT=eutils cmake-utils user toolchain-funcs systemd
+INHERIT=cmake-utils user toolchain-funcs systemd
IUSE=+client +ncd +server +tun2socks +udpgw debug
KEYWORDS=amd64 arm x86
LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
RESTRICT=!ncd? ( test )
SLOT=0
SRC_URI=https://github.com/ambrop72/badvpn/archive/1.999.129.tar.gz -> badvpn-1.999.129.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=c843405d858a8265fbe15b35fa810265
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=ee3955dec7641ce47c3c6fa54c02eff6
diff --git a/metadata/md5-cache/net-vpn/badvpn-1.999.130 b/metadata/md5-cache/net-vpn/badvpn-1.999.130
index e614b2678360..521ac79f5469 100644
--- a/metadata/md5-cache/net-vpn/badvpn-1.999.130
+++ b/metadata/md5-cache/net-vpn/badvpn-1.999.130
@@ -3,7 +3,7 @@ DEPEND=client? ( dev-libs/nspr dev-libs/nss dev-libs/openssl:0 ) server? ( dev-l
DESCRIPTION=Peer-to-peer VPN, NCD scripting language, tun2socks proxifier
EAPI=5
HOMEPAGE=https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/
-INHERIT=eutils cmake-utils user toolchain-funcs systemd
+INHERIT=cmake-utils user toolchain-funcs systemd
IUSE=+client +ncd +server +tun2socks +udpgw debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( client ncd server tun2socks udpgw )
RESTRICT=!ncd? ( test )
SLOT=0
SRC_URI=https://github.com/ambrop72/badvpn/archive/1.999.130.tar.gz -> badvpn-1.999.130.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=ffaf5900bc1a60af4463782c4c7630e3
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=b50b3198c9c7477f046dd1cd3c7710d9
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.45 b/metadata/md5-cache/net-wireless/unifi-6.0.45
index cfbb5198f2fc..d52805819aef 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.0.45
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.45
@@ -1,6 +1,5 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
EAPI=7
HOMEPAGE=https://www.ubnt.com
@@ -13,4 +12,4 @@ RESTRICT=bindist mirror
SLOT=0/6.0
SRC_URI=https://dl.ui.com/unifi/6.0.45-564eef1dda/UniFi.unix.zip -> unifi-6.0.45.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=3c8fbdd0578f113a24a5900825a6c606
+_md5_=496f61c1d863b51334eadaccc00a07d9
diff --git a/metadata/md5-cache/net-wireless/unifi-6.1.71 b/metadata/md5-cache/net-wireless/unifi-6.1.71
index e2582c71cd69..39f9b09bfd1c 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.1.71
+++ b/metadata/md5-cache/net-wireless/unifi-6.1.71
@@ -1,6 +1,5 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
EAPI=7
HOMEPAGE=https://www.ubnt.com
@@ -13,4 +12,4 @@ RESTRICT=bindist mirror
SLOT=0/6.1
SRC_URI=https://dl.ui.com/unifi/6.1.71-de70ef60fe/UniFi.unix.zip -> unifi-6.1.71.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=25249fb5ead04d8db2a90fc1c5252667
+_md5_=caf0229cb2a857d3b531536d044e9fed
diff --git a/metadata/md5-cache/net-wireless/unifi-6.2.17 b/metadata/md5-cache/net-wireless/unifi-6.2.17
index 1db9cbf111e3..492f413af421 100644
--- a/metadata/md5-cache/net-wireless/unifi-6.2.17
+++ b/metadata/md5-cache/net-wireless/unifi-6.2.17
@@ -1,6 +1,5 @@
-BDEPEND=virtual/pkgconfig
+BDEPEND=app-arch/unzip virtual/pkgconfig
DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
EAPI=7
HOMEPAGE=https://www.ubnt.com
@@ -13,4 +12,4 @@ RESTRICT=bindist mirror
SLOT=0/6.2
SRC_URI=https://dl.ui.com/unifi/6.2.17-ceb3ba714d/UniFi.unix.zip -> unifi-6.2.17.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=4b8597bd135350c6232129a61078d46f
+_md5_=a52c6479892e991693937140d6f22ce8
diff --git a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0 b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
index 9682a5cc4087..3501ea3fc693 100644
--- a/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
+++ b/metadata/md5-cache/perl-core/ExtUtils-MakeMaker-7.240.0
@@ -3,7 +3,7 @@ DEPEND=>=virtual/perl-ExtUtils-Install-1.520.0 >=virtual/perl-ExtUtils-Manifest-
DESCRIPTION=Create a module Makefile
EAPI=6
HOMEPAGE=https://metacpan.org/release/ExtUtils-MakeMaker
-INHERIT=eutils perl-module
+INHERIT=edos2unix perl-module
IUSE=test
LICENSE=|| ( Artistic GPL-1+ )
PDEPEND=>=virtual/perl-CPAN-Meta-2.143.240 >=virtual/perl-Parse-CPAN-Meta-1.441.400 virtual/perl-Test-Harness
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/perl-ExtUtils-Install-1.520.0 >=virtual/perl-ExtUtils-Manifest
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.24.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 alternatives a580929f7549ac1059e6cc32551a942e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=f65a664508f7de3cc1b3f1c02654f374
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 multiprocessing cac3169468f893670dac3e7cb940e045 alternatives a580929f7549ac1059e6cc32551a942e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=b6cfcffd3b313a1061a62e7b3375c2e4
diff --git a/metadata/md5-cache/perl-core/libnet-1.270.0 b/metadata/md5-cache/perl-core/libnet-1.270.0
index f417f161b335..bac5541319c9 100644
--- a/metadata/md5-cache/perl-core/libnet-1.270.0
+++ b/metadata/md5-cache/perl-core/libnet-1.270.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl:=[-build(-)]
DESCRIPTION=A URI Perl Module
EAPI=5
HOMEPAGE=https://metacpan.org/release/libnet
-INHERIT=eutils perl-module
+INHERIT=perl-module
IUSE=sasl
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=sasl? ( dev-perl/Authen-SASL ) dev-lang/perl:=[-build(-)]
SLOT=0
SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/libnet-1.27.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 alternatives a580929f7549ac1059e6cc32551a942e perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=4e843ad61d232318b8df76dabb92c6e1
+_md5_=de15f4aec7e2d1136744d5ad883a230c
diff --git a/metadata/md5-cache/sci-astronomy/xephem-3.7.7 b/metadata/md5-cache/sci-astronomy/xephem-3.7.7
index 2ca2f0a08b1d..a204fc8fc136 100644
--- a/metadata/md5-cache/sci-astronomy/xephem-3.7.7
+++ b/metadata/md5-cache/sci-astronomy/xephem-3.7.7
@@ -3,11 +3,11 @@ DEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0= media-libs/libpng:0= sys-apps/grof
DESCRIPTION=Interactive tool for astronomical ephemeris and sky simulation
EAPI=6
HOMEPAGE=https://www.clearskyinstitute.com/xephem
-INHERIT=desktop eutils toolchain-funcs
+INHERIT=desktop toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=XEphem
RDEPEND=>=x11-libs/motif-2.3:0 virtual/jpeg:0= media-libs/libpng:0=
SLOT=0
SRC_URI=http://97.74.56.125/free/xephem-3.7.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=06e7898867dc3ccc933b9e830f7651ae
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d15425e3f3314320b2824bdf73f47648
diff --git a/metadata/md5-cache/sci-biology/fasta-36.3.5e b/metadata/md5-cache/sci-biology/fasta-36.3.5e
index a06625db976a..641a5e4aa9a5 100644
--- a/metadata/md5-cache/sci-biology/fasta-36.3.5e
+++ b/metadata/md5-cache/sci-biology/fasta-36.3.5e
@@ -3,12 +3,12 @@ DEPEND=test? ( app-shells/tcsh )
DESCRIPTION=FASTA is a DNA and Protein sequence alignment software package
EAPI=5
HOMEPAGE=https://fasta.bioch.virginia.edu/fasta_www2/fasta_down.shtml
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=debug cpu_flags_x86_sse2 test
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=fasta
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://faculty.virginia.edu/wrpearson/fasta/fasta36/fasta-36.3.5e.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=7beae559e9562f9b68a7eb31e1429651
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=43c2cf221a4fd397bebdbe11749a1707
diff --git a/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2 b/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
index f9c54424a2d8..68c8b103181f 100644
--- a/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
+++ b/metadata/md5-cache/sci-biology/mrbayes-3.1.2-r2
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:0=
DESCRIPTION=Bayesian Inference of Phylogeny
EAPI=5
HOMEPAGE=http://mrbayes.csit.fsu.edu/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=debug mpi readline
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0= mpi? ( virtual/mpi ) readline? ( sys-libs/readline:0= )
SLOT=0
SRC_URI=mirror://sourceforge/mrbayes/mrbayes-3.1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a944448f568e57bb9f221cd1f437ab09
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=c97a54ea522e76af98a9b4e7e29e79cc
diff --git a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2 b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
index e69c2e70c4de..80d38351fb11 100644
--- a/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
+++ b/metadata/md5-cache/sci-biology/ncbi-tools-2.2.26-r2
@@ -3,12 +3,12 @@ DEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontco
DESCRIPTION=Development toolkit and applications for computational biology, including BLAST
EAPI=5
HOMEPAGE=https://www.ncbi.nlm.nih.gov/
-INHERIT=eutils flag-o-matic prefix toolchain-funcs
+INHERIT=epatch flag-o-matic prefix toolchain-funcs
IUSE=doc static-libs X
KEYWORDS=~alpha amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
RDEPEND=app-shells/tcsh dev-lang/perl media-libs/libpng:0= X? ( media-libs/fontconfig x11-libs/motif:0= x11-libs/libICE x11-libs/libX11 x11-libs/libXft x11-libs/libXmu x11-libs/libXt )
SLOT=0
SRC_URI=ftp://ftp.ncbi.nlm.nih.gov/blast/executables/release/2.2.26/ncbi.tar.gz -> ncbi-tools-2.2.26.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=11d9d9931cdc16e4b30aa72b3d5d3c79
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=f4fd3d16b0f57ddd5ddff7eb3342f37e
diff --git a/metadata/md5-cache/sci-biology/plink-1.90_pre140514 b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
index 0eba6b1aa4f9..8cf7ec02cb35 100644
--- a/metadata/md5-cache/sci-biology/plink-1.90_pre140514
+++ b/metadata/md5-cache/sci-biology/plink-1.90_pre140514
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip virtual/pkgconfig
DESCRIPTION=Whole genome association analysis toolset
EAPI=5
HOMEPAGE=http://pngu.mgh.harvard.edu/~purcell/plink/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib virtual/cblas virtual/lapack
SLOT=0
SRC_URI=http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.zip -> plink-1.90_pre140514.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=570249dc23feeff7b47b3e81df358196
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=84c4fdcaa7feed7785c42d566070ab94
diff --git a/metadata/md5-cache/sci-biology/psipred-3.5 b/metadata/md5-cache/sci-biology/psipred-3.5
index 13060e61783a..649a418f4326 100644
--- a/metadata/md5-cache/sci-biology/psipred-3.5
+++ b/metadata/md5-cache/sci-biology/psipred-3.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Protein Secondary Structure Prediction
EAPI=5
HOMEPAGE=http://bioinf.cs.ucl.ac.uk/psipred/
-INHERIT=eutils prefix toolchain-funcs versionator
+INHERIT=epatch prefix toolchain-funcs versionator
IUSE=test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=psipred
@@ -10,5 +10,5 @@ RDEPEND=app-shells/tcsh sci-biology/ncbi-tools sci-biology/update-blastdb
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://bioinf.cs.ucl.ac.uk/downloads/psipred/psipred3.5.tar.gz test? ( http://bioinfadmin.cs.ucl.ac.uk/downloads/psipred/old/data/tdbdata.tar.gz )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e prefix de7d8e2b10085ed5ff09ad70e4753e5c versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=44623bcd0b50824824056739420b4873
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=2d88f4808280c081fe9c75555b6d5c9e
diff --git a/metadata/md5-cache/sci-biology/rmblast-1.2-r1 b/metadata/md5-cache/sci-biology/rmblast-1.2-r1
index a1b4a245a2d1..5dcd604daa4b 100644
--- a/metadata/md5-cache/sci-biology/rmblast-1.2-r1
+++ b/metadata/md5-cache/sci-biology/rmblast-1.2-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/boost app-arch/cpio
DESCRIPTION=RepeatMasker compatible version of NCBI BLAST+
EAPI=5
HOMEPAGE=http://www.repeatmasker.org/RMBlast.html
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=OSL-2.1
RDEPEND=dev-libs/boost
SLOT=0
SRC_URI=http://www.repeatmasker.org/rmblast-1.2-ncbi-blast-2.2.23+-src.tar.gz https://dev.gentoo.org/~mgorny/dist/rmblast-1.2-gcc47.patch.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=1283e94bf3a231a794a498d2769aaa7d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=2f7831c50cdca352d9a7b340a8bee159
diff --git a/metadata/md5-cache/sci-biology/velvet-1.2.10 b/metadata/md5-cache/sci-biology/velvet-1.2.10
index ea632bde7f65..12ed4a9f541c 100644
--- a/metadata/md5-cache/sci-biology/velvet-1.2.10
+++ b/metadata/md5-cache/sci-biology/velvet-1.2.10
@@ -3,11 +3,11 @@ DEPEND=doc? ( virtual/latex-base )
DESCRIPTION=A sequence assembler for very short reads
EAPI=5
HOMEPAGE=https://www.ebi.ac.uk/~zerbino/velvet/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=flag-o-matic toolchain-funcs
IUSE=doc openmp
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.ebi.ac.uk/~zerbino/velvet/velvet_1.2.10.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=420632435bf1efe77241192fff993a20
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=b07b48444158719f00b415b6f8b8e6a1
diff --git a/metadata/md5-cache/sci-biology/wise-2.4.0_alpha b/metadata/md5-cache/sci-biology/wise-2.4.0_alpha
index 1ca92a887e0d..58df5b7e9f40 100644
--- a/metadata/md5-cache/sci-biology/wise-2.4.0_alpha
+++ b/metadata/md5-cache/sci-biology/wise-2.4.0_alpha
@@ -3,12 +3,12 @@ DEPEND=~sci-biology/hmmer-2.3.2 app-shells/tcsh dev-lang/perl virtual/latex-base
DESCRIPTION=Intelligent algorithms for DNA searches
EAPI=5
HOMEPAGE=http://www.ebi.ac.uk/Wise2/
-INHERIT=eutils toolchain-funcs versionator
+INHERIT=epatch toolchain-funcs versionator
IUSE=doc static-libs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=~sci-biology/hmmer-2.3.2
SLOT=0
SRC_URI=ftp://ftp.ebi.ac.uk/pub/software/wise2/wise2.4.0alpha.tar.gz https://dev.gentoo.org/~mgorny/dist/wise-2.4.0_alpha-patchset.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=5089373e8fa38f080134e22ddf59264c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=d5566134a062c60e1c2223a1b1283862
diff --git a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1 b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
index 8da3058791ff..58f223cef200 100644
--- a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
+++ b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Build lists of collections of interacting items
EAPI=5
HOMEPAGE=http://kinemage.biochem.duke.edu/software/index.php
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=richardson
SLOT=0
SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/cluster/cluster.1.3.081231.src.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=08b47969621aa7aec0ce1305311b8854
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=fb17631f6e2f355df6013da7e9cd21df
diff --git a/metadata/md5-cache/sci-chemistry/easychem-0.6-r1 b/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
index 1fe399c3fae1..4d9a055ef0c5 100644
--- a/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
+++ b/metadata/md5-cache/sci-chemistry/easychem-0.6-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 app-text/ghostscript-gpl media-gfx/pstoedit dev-lang/perl
DESCRIPTION=Chemical structure drawing program - focused on presentation
EAPI=5
HOMEPAGE=http://easychem.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 app-text/ghostscript-gpl media-gfx/pstoedit
SLOT=0
SRC_URI=mirror://sourceforge/easychem/easychem-0.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=fe3345ac49c5d923dd30b75864c6a8ff
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=4013149b00d5cdbde9b41f11b0ba33bb
diff --git a/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1 b/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
index 58787222eeb0..b5d91f3ca1f2 100644
--- a/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
+++ b/metadata/md5-cache/sci-chemistry/gelemental-2.0.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 virtual/pkgconfig sys-devel/gettext dev-util/intltool doc? ( app-doc/doxygen )
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Periodic table viewer with detailed information on the chemical elements
EAPI=7
HOMEPAGE=https://github.com/ginggs/gelemental/
-INHERIT=autotools eutils flag-o-matic xdg-utils
+INHERIT=autotools flag-o-matic xdg
IUSE=doc
KEYWORDS=amd64 x86
LICENSE=GPL-3 MIT
RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2
SLOT=0
SRC_URI=https://github.com/ginggs/gelemental/archive/v2.0.0.tar.gz -> gelemental-2.0.0.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=b50ee307aad70b9722f1cd9a1efaf38f
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=a6e1fa85fad3cdd95c8d1a0f2d41bf39
diff --git a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2 b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
index 4261a9b6dd3e..fb6713320490 100644
--- a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
+++ b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
@@ -3,12 +3,12 @@ DEPEND=media-libs/freeglut media-libs/gd:2= media-libs/libpng:0= virtual/jpeg:0=
DESCRIPTION=Display 3D molecules (e.g., proteins) in schematic and detailed representations
EAPI=5
HOMEPAGE=http://www.avatar.se/molscript/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=glut molscript
RDEPEND=media-libs/freeglut media-libs/gd:2= media-libs/libpng:0= virtual/jpeg:0= || ( x11-libs/libXmu x11-libs/libXext x11-libs/libX11 )
RESTRICT=fetch
SLOT=0
SRC_URI=molscript-2.1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=41c75eec15a7e1c640e586f38e987b4d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=46da3f0d3100abb26a1c6e77e0628fb3
diff --git a/metadata/md5-cache/sci-chemistry/mustang-3.2.2 b/metadata/md5-cache/sci-chemistry/mustang-3.2.2
index 883e0568c131..43d4ccc01311 100644
--- a/metadata/md5-cache/sci-chemistry/mustang-3.2.2
+++ b/metadata/md5-cache/sci-chemistry/mustang-3.2.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare test
DESCRIPTION=MUltiple STructural AligNment AlGorithm
EAPI=5
HOMEPAGE=http://www.csse.monash.edu.au/~karun/Site/mustang.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD
SLOT=0
SRC_URI=http://www.csse.monash.edu.au/~karun/mustang/mustang_v3.2.2.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=45e0fb87fd2c15d40cbbef5d5bd954d5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=30719739394528b167a7d451622640cf
diff --git a/metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20 b/metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
index a70d70bd48d0..c1894f5f6983 100644
--- a/metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
+++ b/metadata/md5-cache/sci-chemistry/povscript+-2.1.2.2.20
@@ -3,11 +3,11 @@ DEPEND=dev-libs/glib:2 media-libs/freeglut media-libs/giflib >=media-libs/libpng
DESCRIPTION=Modified molscript that uses POV-Ray, does thermal ellipsoids, and more
EAPI=5
HOMEPAGE=https://sites.google.com/site/timfenn/povscript
-INHERIT=eutils versionator
+INHERIT=epatch versionator
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=glut molscript
RDEPEND=dev-libs/glib:2 media-libs/freeglut media-libs/giflib >=media-libs/libpng-1.4:0= sci-libs/gts sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/libX11
SLOT=0
SRC_URI=https://sites.google.com/site/timfenn/povscript/molscript-2.1.2pov2.20.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=0a335f1e70d94904f0d4666c06852abf
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=1c7b0512e4c4d6becfa989224c02014a
diff --git a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2 b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
index 273e87c0df70..63ef28640e1f 100644
--- a/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
+++ b/metadata/md5-cache/sci-chemistry/rasmol-2.7.5.2-r2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=s
DESCRIPTION=Molecular Graphics Visualisation Tool
EAPI=5
HOMEPAGE=http://www.openrasmol.org/
-INHERIT=eutils fortran-2 multilib prefix toolchain-funcs
+INHERIT=epatch fortran-2 multilib prefix toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 RASLIC )
RDEPEND=dev-libs/cvector dev-util/gtk-builder-convert >=sci-libs/cbflib-0.9.2 >=sci-libs/cqrlib-1.1.2 >=sci-libs/neartree-3.1.1 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libXext x11-libs/libXi x11-libs/vte:0 virtual/fortran
SLOT=0
SRC_URI=mirror://sourceforge/openrasmol/RasMol/RasMol_2.7.5/rasmol-2.7.5.2-13May11.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=22c72d4b7786416bb745fc30bfd2dff9
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=d406f29d329bb6071162ebfd2ff4e486
diff --git a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2 b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
index cd11bc6e6a1b..9a7d7a033673 100644
--- a/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
+++ b/metadata/md5-cache/sci-electronics/drawtiming-0.7.1-r2
@@ -3,7 +3,7 @@ DEPEND=media-gfx/imagemagick[cxx] sys-devel/gnuconfig >=app-portage/elt-patches-
DESCRIPTION=Command line tool for drawing timing diagrams
EAPI=5
HOMEPAGE=http://drawtiming.sourceforge.net/index.html
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=examples
KEYWORDS=amd64 x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=media-gfx/imagemagick[cxx]
SLOT=0
SRC_URI=mirror://sourceforge/drawtiming/drawtiming-0.7.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ae1dd90c45174cab48bf875d65e9c2b1
+_md5_=d0d662c20fb477dd49ffcc1810618379
diff --git a/metadata/md5-cache/sci-electronics/gsmc-1.1-r2 b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
index 54c8a53b2963..0fbc385a90ba 100644
--- a/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
+++ b/metadata/md5-cache/sci-electronics/gsmc-1.1-r2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gnuconfig >=a
DESCRIPTION=A GTK program for doing Smith Chart calculations
EAPI=5
HOMEPAGE=https://www.qsl.net/ik5nax/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
SLOT=0
SRC_URI=https://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8e45d951acbfdd94bea5aa0b392a88e9
+_md5_=6ccd22517b8dd8febe7e94bf20d56157
diff --git a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2 b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
index 91cfa4b830e7..83293d9e28eb 100644
--- a/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
+++ b/metadata/md5-cache/sci-electronics/gspeakers-0.11-r2
@@ -3,11 +3,11 @@ DEPEND=dev-cpp/gtkmm:2.4 >=dev-libs/libsigc++-2.6:2 dev-libs/libxml2:2 || ( sci-
DESCRIPTION=GTK based loudspeaker enclosure and crossovernetwork designer
EAPI=5
HOMEPAGE=http://gspeakers.sourceforge.net/
-INHERIT=autotools eutils flag-o-matic gnome2
+INHERIT=autotools epatch flag-o-matic gnome2
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-cpp/gtkmm:2.4 >=dev-libs/libsigc++-2.6:2 dev-libs/libxml2:2 || ( sci-electronics/gnucap sci-electronics/ngspice sci-electronics/spice )
SLOT=0
SRC_URI=mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=8ed11e61f9c0c496f4346b27d61bae13
+_md5_=9014fc2272f44cf6797091256c7ed7dc
diff --git a/metadata/md5-cache/sci-electronics/irsim-9.7.93 b/metadata/md5-cache/sci-electronics/irsim-9.7.93
index d887fa256813..143fe413c796 100644
--- a/metadata/md5-cache/sci-electronics/irsim-9.7.93
+++ b/metadata/md5-cache/sci-electronics/irsim-9.7.93
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tcl:0 dev-lang/tk:0 app-shells/tcsh
DESCRIPTION=IRSIM is a "switch-level" simulator
EAPI=5
HOMEPAGE=http://opencircuitdesign.com/irsim/
-INHERIT=eutils multilib
+INHERIT=epatch multilib
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-lang/tcl:0 dev-lang/tk:0
SLOT=0
SRC_URI=http://opencircuitdesign.com/irsim/archive/irsim-9.7.93.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=c0e45d29e730d62dd8b6a0d64062d271
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=081be0fd84e88f58ef0293f13be6f4be
diff --git a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1 b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
index 84217c8d24e3..9f82c0fb0b16 100644
--- a/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
+++ b/metadata/md5-cache/sci-electronics/magic-7.5.202-r1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= d
DESCRIPTION=The VLSI design CAD tool
EAPI=5
HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-INHERIT=multilib eutils autotools
+INHERIT=multilib epatch autotools
KEYWORDS=amd64 ppc x86
LICENSE=HPND GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt
SLOT=0
SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=583ea0847f46d43982698cf9ab04767c
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=af7dc6435d65a5690a33917981eea531
diff --git a/metadata/md5-cache/sci-electronics/magic-8.0.207 b/metadata/md5-cache/sci-electronics/magic-8.0.207
index f174c8b382ec..986469f8b557 100644
--- a/metadata/md5-cache/sci-electronics/magic-8.0.207
+++ b/metadata/md5-cache/sci-electronics/magic-8.0.207
@@ -3,12 +3,12 @@ DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= d
DESCRIPTION=The VLSI design CAD tool
EAPI=5
HOMEPAGE=http://www.opencircuitdesign.com/magic/index.html
-INHERIT=multilib eutils autotools
+INHERIT=multilib epatch autotools
IUSE=debug opengl
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=HPND GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/blt opengl? ( virtual/glu virtual/opengl )
SLOT=0
SRC_URI=http://www.opencircuitdesign.com/magic/archive/magic-8.0.207.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=36a1661cfc6118546b52a69311343e97
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=79e800875e858ba562b23dd2ed38c109
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
index 3a74ade49203..cef5d74e7e2a 100644
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
+++ b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=install nofetch postinst pretend
DESCRIPTION=Full-featured EDA product for altera devices
EAPI=5
HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-INHERIT=eutils
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=Quartus-prime-megacore
RDEPEND=media-libs/libpng-compat:1.2
RESTRICT=fetch bindist
SLOT=0
SRC_URI=Quartus-lite-15.1.0.185-linux.tar
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=e1eca0471ac9f71f737023a41bbab80d
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=f2075fffc6735dafe0f4ee7a14487b58
diff --git a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3 b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
index ca37cd643aa3..0035cc49a9bb 100644
--- a/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
+++ b/metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install nofetch postinst pretend
DESCRIPTION=Full-featured EDA product for altera devices
EAPI=6
HOMEPAGE=https://www.altera.com/products/design-software/fpga-design/quartus-prime/overview.html
-INHERIT=eutils
+INHERIT=desktop epatch
LICENSE=Quartus-prime-megacore
RDEPEND=media-libs/libpng-compat:1.2[abi_x86_32] x11-libs/libXft[abi_x86_32] app-arch/bzip2[abi_x86_32] sys-libs/zlib[abi_x86_32] sys-libs/glibc[multilib]
RESTRICT=fetch bindist
SLOT=0
SRC_URI=Quartus-lite-15.1.0.185-linux.tar https://github.com/brendanhoran/gentoo-custom/raw/master/files/libfreetype.so.6
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=2aec48de402c28fe9166b3beb2ad7698
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=74217b19c6ebb20e90d6bff8fe1f028d
diff --git a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2 b/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
index cd8535412666..501443106133 100644
--- a/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
+++ b/metadata/md5-cache/sci-electronics/spice-3.5.5-r2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3 x11-base/x
DESCRIPTION=general-purpose circuit simulation program
EAPI=6
HOMEPAGE=http://bwrc.eecs.berkeley.edu/Classes/IcBook/SPICE/
-INHERIT=eutils flag-o-matic multilib
+INHERIT=flag-o-matic toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=BSD
RDEPEND=sys-libs/ncurses:0 x11-libs/libXaw >=app-misc/editor-wrapper-3
SLOT=0
SRC_URI=http://www.ibiblio.org/pub/Linux/apps/circuits/spice3f5sfix.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=414596fcb960ed07c1ca152e49a78c5c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=ba456b21b01a2cf9a767f0b26baf9c5d
diff --git a/metadata/md5-cache/sci-electronics/splat-1.4.2 b/metadata/md5-cache/sci-electronics/splat-1.4.2
index 550ba3231d92..57b9f4424799 100644
--- a/metadata/md5-cache/sci-electronics/splat-1.4.2
+++ b/metadata/md5-cache/sci-electronics/splat-1.4.2
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib app-arch/bzip2
DESCRIPTION=RF Signal Propagation, Loss, And Terrain analysis tool
EAPI=5
HOMEPAGE=https://www.qsl.net/kd2bd/splat.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=doc hires l10n_es
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib app-arch/bzip2
SLOT=0
SRC_URI=https://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=5c1528066aac99cb6d9552eb53e246ff
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=45997c7be7bd20450e806b6118bd0378
diff --git a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2 b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
index 71f8c7e052d8..526a8e83d301 100644
--- a/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
+++ b/metadata/md5-cache/sci-geosciences/bt747-2.1.7-r2
@@ -3,12 +3,12 @@ DEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev
DESCRIPTION=MTK GPS Datalogger Device Control
EAPI=6
HOMEPAGE=https://www.bt747.org
-INHERIT=eutils java-pkg-2 java-ant-2
+INHERIT=epatch java-pkg-2 java-ant-2
IUSE=elibc_FreeBSD elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-java/commons-imaging:0 dev-java/jcalendar:1.2 dev-java/jchart2d:0 dev-java/jopt-simple:0 >=dev-java/rxtx-2.2_pre2:2 dev-java/swing-layout:1 dev-java/swingx:1.6 dev-java/swingx-ws:bt747 dev-libs/glib:2[dbus] >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
SLOT=1
SRC_URI=mirror://sourceforge/bt747/Stable/BT747_2.1.7_full.zip https://www.bt747.org/icon/bt747_128x128.gif -> bt747.gif
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
-_md5_=1c58b92f0a98a76abc9e2e3c56ccd9ab
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0
+_md5_=2a36cbdc9a3047bda16fec276ff54931
diff --git a/metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9 b/metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9
index 5c6b0609e6a8..389a13a5c05c 100644
--- a/metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9
+++ b/metadata/md5-cache/sci-geosciences/mc2bsbh-0.0.9
@@ -1,11 +1,12 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=compile install
-DEPEND=app-arch/unzip
DESCRIPTION=MapCal to BSBchart Header Utility
EAPI=7
HOMEPAGE=http://www.dacust.com/inlandwaters/mapcal/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=http://www.dacust.com/inlandwaters/mapcal/mc2bsbh/mc2bsbh-beta09.zip
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=3c187445229d55917f171fba9f786c06
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=89fca473430349b61ca4553b81379777
diff --git a/metadata/md5-cache/sci-geosciences/swmm-5.0.022 b/metadata/md5-cache/sci-geosciences/swmm-5.0.022
index 9d38a97d71b6..2c0027e250d3 100644
--- a/metadata/md5-cache/sci-geosciences/swmm-5.0.022
+++ b/metadata/md5-cache/sci-geosciences/swmm-5.0.022
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=Storm Water Management Model-SWMM, hydrology, hydraulics, water quality model
EAPI=5
HOMEPAGE=http://www.epa.gov/ednnrmrl/models/swmm/index.htm
-INHERIT=eutils versionator toolchain-funcs
+INHERIT=epatch versionator toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/swmm50022_engine.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=cab1949a552178b54498eb50242036e4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=815b0eda4359e77daecfce66757eb35e
diff --git a/metadata/md5-cache/sci-libs/cbflib-0.9.3.3 b/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
index 5eda16479b49..6017cace416e 100644
--- a/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
+++ b/metadata/md5-cache/sci-libs/cbflib-0.9.3.3
@@ -3,7 +3,7 @@ DEPEND=sci-libs/hdf5:= sys-devel/make >=dev-util/cmake-3.9.6 virtual/fortran
DESCRIPTION=Library providing a simple mechanism for accessing CBF files and imgCIF files
EAPI=5
HOMEPAGE=http://www.bernstein-plus-sons.com/software/CBF/
-INHERIT=cmake-utils eutils flag-o-matic fortran-2 toolchain-funcs
+INHERIT=cmake-utils flag-o-matic fortran-2 toolchain-funcs
IUSE=doc test
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/cbflib/CBFlib-0.9.3.3.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 fortran-2 b4796813ccda91c9c0d3463fc90aa969
-_md5_=e6f5a2bec9838eb9528e6168b50bcc31
+_md5_=1b3e72b9f32c8a9f265805656fd1f2f9
diff --git a/metadata/md5-cache/sci-libs/cdd+-077a b/metadata/md5-cache/sci-libs/cdd+-077a
index 4b6675446f0c..4aa77992ff8d 100644
--- a/metadata/md5-cache/sci-libs/cdd+-077a
+++ b/metadata/md5-cache/sci-libs/cdd+-077a
@@ -3,11 +3,11 @@ DEPEND=dev-libs/gmp:0=
DESCRIPTION=Another implementation of the double description method
EAPI=5
HOMEPAGE=http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
RDEPEND=dev-libs/gmp:0=
SLOT=0
SRC_URI=ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cdd+-077a.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d7323c5f17e52782dd0cd67756b37a67
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=e9864b59cd9c71c35fd174caa3a6cb2e
diff --git a/metadata/md5-cache/sci-libs/cdf-3.5.0.2 b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
index 05e58aeeb39c..a621b364d9a3 100644
--- a/metadata/md5-cache/sci-libs/cdf-3.5.0.2
+++ b/metadata/md5-cache/sci-libs/cdf-3.5.0.2
@@ -3,12 +3,12 @@ DEPEND=java? ( >=virtual/jre-1.5:= ) ncurses? ( sys-libs/ncurses:0= ) ncurses? (
DESCRIPTION=Common Data Format I/O library for multi-dimensional data sets
EAPI=5
HOMEPAGE=https://cdf.gsfc.nasa.gov
-INHERIT=eutils java-pkg-opt-2 multilib toolchain-funcs versionator
+INHERIT=epatch java-pkg-opt-2 multilib toolchain-funcs versionator
IUSE=doc examples java ncurses static-libs elibc_FreeBSD java
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=CDF
RDEPEND=java? ( >=virtual/jre-1.5:= ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-cdf.tar.gz java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_0-dist-java.tar.gz ) doc? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350crm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350frm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf35ifd.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350prm.pdf http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350ug.pdf java? ( http://cdaweb.gsfc.nasa.gov/pub/software/cdf/dist/cdf35_0/unix//cdf35_documentation/cdf350jrm.pdf ) )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=4b80221519c375fc00302a41670bda4c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=7cf95aa747266804c6ddd9221e6a12c5
diff --git a/metadata/md5-cache/sci-libs/cgcode-1.0-r2 b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
index 0c0af2794fd6..cf9facac0fa6 100644
--- a/metadata/md5-cache/sci-libs/cgcode-1.0-r2
+++ b/metadata/md5-cache/sci-libs/cgcode-1.0-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/blas virtual/pkgconfig virtual/fortran
DESCRIPTION=Conjugate gradient Codes for large sparse linear systems
EAPI=5
HOMEPAGE=http://fetk.org/codes/cgcode/index.html
-INHERIT=eutils fortran-2 flag-o-matic toolchain-funcs
+INHERIT=epatch fortran-2 flag-o-matic toolchain-funcs
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=virtual/blas virtual/fortran
SLOT=0
SRC_URI=http://www.fetk.org/codes/download/cgcode-1.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=0b3dc084783ade28fac7db26b2beb967
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=a08942d709e164cb4c51986f278fc202
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76-r2 b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
index b56dd59c55b2..a13db4881525 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76-r2
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Extremely fast library for floating-point convolution
EAPI=5
HOMEPAGE=http://cr.yp.to/djbfft.html
-INHERIT=eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+INHERIT=epatch flag-o-matic toolchain-funcs multilib multilib-minimal
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=public-domain
SLOT=0
SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=bb4d3cd4b2c8e1d1a9f315fcc1d9849b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=c0fd54f1f82b2e774a5a047861bf5026
diff --git a/metadata/md5-cache/sci-libs/gsl-1.16 b/metadata/md5-cache/sci-libs/gsl-1.16
index 3f116a81a4a1..91e6bde09acd 100644
--- a/metadata/md5-cache/sci-libs/gsl-1.16
+++ b/metadata/md5-cache/sci-libs/gsl-1.16
@@ -3,12 +3,12 @@ DEPEND=cblas-external? ( virtual/cblas ) app-eselect/eselect-cblas virtual/pkgco
DESCRIPTION=The GNU Scientific Library
EAPI=5
HOMEPAGE=https://www.gnu.org/software/gsl/
-INHERIT=eutils flag-o-matic autotools toolchain-funcs
+INHERIT=epatch flag-o-matic autotools toolchain-funcs
IUSE=cblas-external static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=cblas-external? ( virtual/cblas )
SLOT=0
SRC_URI=mirror://gnu/gsl/gsl-1.16.tar.gz https://dev.gentoo.org/~mgorny/dist/gsl-1.16-cblas.patch.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=56b06054eab1702607aee7df5cbbc4db
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=296aaf2828d55f75304fbcd84dcd8695
diff --git a/metadata/md5-cache/sci-libs/inchi-1.04 b/metadata/md5-cache/sci-libs/inchi-1.04
index c8c3f52b47b2..632554606ef8 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.04
+++ b/metadata/md5-cache/sci-libs/inchi-1.04
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip
DESCRIPTION=Program and library for generating standard and non-standard InChI and InChIKeys
EAPI=5
HOMEPAGE=http://www.iupac.org/inchi/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=doc static-libs
KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=IUPAC-InChi
SLOT=0
SRC_URI=http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-API.ZIP -> inchi-1.04.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-DOC.ZIP -> inchi-1.04-doc.zip )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=fab5b17db74d0d978ea9604c7546b235
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=23b99f10b02f24d00a26b6bb14509d25
diff --git a/metadata/md5-cache/sci-libs/libbufr-000405 b/metadata/md5-cache/sci-libs/libbufr-000405
index 3981d8bd1216..3b71af64b946 100644
--- a/metadata/md5-cache/sci-libs/libbufr-000405
+++ b/metadata/md5-cache/sci-libs/libbufr-000405
@@ -3,12 +3,12 @@ DEPEND=sys-apps/findutils virtual/fortran
DESCRIPTION=ECMWF BUFR library - includes both C and Fortran example utilities
EAPI=5
HOMEPAGE=https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home
-INHERIT=eutils fortran-2 toolchain-funcs
+INHERIT=epatch fortran-2 toolchain-funcs
IUSE=debug doc examples
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=LGPL-3
RDEPEND=virtual/fortran virtual/fortran
SLOT=0
SRC_URI=https://software.ecmwf.int/wiki/download/attachments/35752466/bufrdc_000405.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969
-_md5_=f123530b554bd15dc57a9de1494fcb18
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969
+_md5_=7028282da655c36fc6c4a5d8fc0c81c6
diff --git a/metadata/md5-cache/sci-libs/libnova-0.16.0 b/metadata/md5-cache/sci-libs/libnova-0.16.0
index 40cd18ebbc06..ec58ad132370 100644
--- a/metadata/md5-cache/sci-libs/libnova-0.16.0
+++ b/metadata/md5-cache/sci-libs/libnova-0.16.0
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=Celestial Mechanics and Astronomical Calculation Library
EAPI=7
HOMEPAGE=http://libnova.sourceforge.net/
@@ -11,4 +10,4 @@ LICENSE=LGPL-2
SLOT=0/0.16
SRC_URI=https://dev.gentoo.org/~asturm/distfiles/libnova-0.16.0.tar.xz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=9e46e2a7bdc729af936d0ec86e30cd01
+_md5_=957dab0daa51f7d3bc542e571705e466
diff --git a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1 b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
index 849b7b637e53..c6eefffaa279 100644
--- a/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
+++ b/metadata/md5-cache/sci-libs/qrupdate-1.1.2-r1
@@ -3,12 +3,12 @@ DEPEND=virtual/lapack virtual/pkgconfig virtual/fortran
DESCRIPTION=Library for updating of QR and Cholesky decompositions
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/qrupdate
-INHERIT=eutils fortran-2 flag-o-matic multilib versionator toolchain-funcs
+INHERIT=epatch fortran-2 flag-o-matic multilib versionator toolchain-funcs
IUSE=static-libs
KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos
LICENSE=GPL-3
RDEPEND=virtual/lapack virtual/fortran
SLOT=0
SRC_URI=mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 flag-o-matic c0964e43ba712cb933da5f65b958fa88 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=ae8246dfb3baae4df90a375ad98aa2d7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 flag-o-matic c0964e43ba712cb933da5f65b958fa88 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=d2cce46cc42a0f73fd6993c1fbbc83d5
diff --git a/metadata/md5-cache/sci-libs/scotch-6.0.4-r2 b/metadata/md5-cache/sci-libs/scotch-6.0.4-r2
index a6cff6e31544..d715856d68ce 100644
--- a/metadata/md5-cache/sci-libs/scotch-6.0.4-r2
+++ b/metadata/md5-cache/sci-libs/scotch-6.0.4-r2
@@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib mpi? ( virtual/mpi )
DESCRIPTION=Software for graph, mesh and hypergraph partitioning
EAPI=5
HOMEPAGE=http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/
-INHERIT=eutils toolchain-funcs versionator flag-o-matic multilib
+INHERIT=epatch toolchain-funcs versionator flag-o-matic multilib
IUSE=doc int64 mpi static-libs test tools threads
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
LICENSE=CeCILL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( threads )
RESTRICT=!test? ( test )
SLOT=0/6
SRC_URI=http://gforge.inria.fr/frs/download.php/34618/scotch_6.0.4_esmumps.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=231a0a8546a37c4e6580805c0e884467
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=faba2ba31ec64a57e8bf777ae4502446
diff --git a/metadata/md5-cache/sci-libs/silo-4.10.2-r1 b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
index 98c06ee914aa..fd60e4b3ebf9 100644
--- a/metadata/md5-cache/sci-libs/silo-4.10.2-r1
+++ b/metadata/md5-cache/sci-libs/silo-4.10.2-r1
@@ -3,7 +3,7 @@ DEPEND=hdf5? ( sci-libs/hdf5 ) qt5? ( dev-qt/qtgui:5 ) virtual/fortran
DESCRIPTION=A mesh and field I/O library and scientific database
EAPI=5
HOMEPAGE=https://wci.llnl.gov/simulation/computer-codes/silo
-INHERIT=eutils fortran-2
+INHERIT=epatch fortran-2
IUSE=hdf5 +silex static-libs +qt5 test
KEYWORDS=~amd64 ~x86
LICENSE=BSD
@@ -12,5 +12,5 @@ REQUIRED_USE=silex? ( qt5 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.10.2/silo-4.10.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969
-_md5_=49ee2ae9475b196bc2231906704f5cc6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969
+_md5_=18a2dc1a81c296a6e657b73634e14d61
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r2 b/metadata/md5-cache/sci-libs/superlu-4.3-r2
index a4faa3c2009e..60b0be5ddcab 100644
--- a/metadata/md5-cache/sci-libs/superlu-4.3-r2
+++ b/metadata/md5-cache/sci-libs/superlu-4.3-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 fortran-2 b4796813ccda91c9c0d3463fc90aa969
-_md5_=17baefc15c7740ca8bbf6b4496572cb5
+_md5_=da13ced633615f7417db1c82f9ec5128
diff --git a/metadata/md5-cache/sci-mathematics/ent-101202 b/metadata/md5-cache/sci-mathematics/ent-101202
index 2da861d71c98..1e9cbaa360da 100644
--- a/metadata/md5-cache/sci-mathematics/ent-101202
+++ b/metadata/md5-cache/sci-mathematics/ent-101202
@@ -3,10 +3,10 @@ DEPEND=app-arch/unzip
DESCRIPTION=Pseudorandom number sequence test
EAPI=5
HOMEPAGE=http://www.fourmilab.ch/random/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://gentoo/random-101202.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=2c01e8ee09c61b29c8b111744cf6808d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=856e4830d78f0127b87da53f7da7135e
diff --git a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999 b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
index bcde637d5041..408dec34caba 100644
--- a/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
+++ b/metadata/md5-cache/sci-mathematics/gmp-ecm-9999
@@ -3,7 +3,7 @@ DEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp]
DESCRIPTION=Elliptic Curve Method for Integer Factorization
EAPI=5
HOMEPAGE=http://ecm.gforge.inria.fr/
-INHERIT=autotools eutils flag-o-matic subversion
+INHERIT=autotools flag-o-matic subversion
IUSE=blas -openmp test
LICENSE=GPL-3 LGPL-3
PROPERTIES=live
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/gmp:0= blas? ( sci-libs/gsl ) openmp? ( sys-devel/gcc:*[openmp]
RESTRICT=!test? ( test )
SLOT=0
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88 subversion c500a1b7795f44153bd96fc2597e3c05
-_md5_=4729644098f9b3c13eb98c48735360b4
+_md5_=db561896c56f4ff2071c3988549c3654
diff --git a/metadata/md5-cache/sci-mathematics/gretl-1.9.90 b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
index 596a73b32e39..b0f4e3bb8c20 100644
--- a/metadata/md5-cache/sci-mathematics/gretl-1.9.90
+++ b/metadata/md5-cache/sci-mathematics/gretl-1.9.90
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2= dev-libs/gmp:0= dev-libs/libxml2:2= dev-libs/mpfr:0= sci
DESCRIPTION=Regression, econometrics and time-series library
EAPI=5
HOMEPAGE=http://gretl.sourceforge.net/
-INHERIT=eutils elisp-common toolchain-funcs
+INHERIT=elisp-common toolchain-funcs
IUSE=accessibility cpu_flags_x86_avx +curl emacs gnome gtk mpi nls odbc openmp python readline cpu_flags_x86_sse2 R static-libs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2= dev-libs/gmp:0= dev-libs/libxml2:2= dev-libs/mpfr:0= sc
REQUIRED_USE=emacs? ( gtk ) !curl? ( !gtk )
SLOT=0/10
SRC_URI=mirror://sourceforge/gretl/gretl-1.9.90.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
-_md5_=fc7b59646d3b24bfc4a987c268a9a9f9
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=3110f362884429f03e0af5c56ed983e6
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.0.2 b/metadata/md5-cache/sci-mathematics/singular-4.0.2
index b6170bdbf571..060397f45416 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.0.2
+++ b/metadata/md5-cache/sci-mathematics/singular-4.0.2
@@ -3,12 +3,12 @@ DEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* )
DESCRIPTION=Computer algebra system for polynomial computations
EAPI=5
HOMEPAGE=https://www.singular.uni-kl.de/
-INHERIT=autotools eutils elisp-common flag-o-matic multilib prefix toolchain-funcs versionator
+INHERIT=autotools epatch elisp-common flag-o-matic toolchain-funcs versionator
IUSE=boost doc emacs examples python +readline
KEYWORDS=amd64 ppc x86 ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/gmp:0 >=dev-libs/ntl-5.5.1 emacs? ( >=app-editors/emacs-23.1:* ) sci-mathematics/flint sci-mathematics/4ti2 sci-libs/cddlib
SLOT=0
SRC_URI=https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2.tar.gz https://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-0-2/singular-4.0.2-share.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc flag-o-matic c0964e43ba712cb933da5f65b958fa88 prefix de7d8e2b10085ed5ff09ad70e4753e5c versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=80b7d05c2105623d0d34a481c5f66520
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc flag-o-matic c0964e43ba712cb933da5f65b958fa88 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=a86abc66b6c222206bcc640a00e18828
diff --git a/metadata/md5-cache/sci-mathematics/spin-6.4.5 b/metadata/md5-cache/sci-mathematics/spin-6.4.5
index a6b4367cad86..6b3cdf717b43 100644
--- a/metadata/md5-cache/sci-mathematics/spin-6.4.5
+++ b/metadata/md5-cache/sci-mathematics/spin-6.4.5
@@ -3,12 +3,12 @@ DEPEND=sys-devel/bison
DESCRIPTION=Tool for formal verification of distributed software systems
EAPI=5
HOMEPAGE=http://spinroot.com/
-INHERIT=eutils toolchain-funcs versionator
+INHERIT=desktop epatch toolchain-funcs versionator
IUSE=graphviz tk
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=sys-devel/gcc sys-process/time tk? ( dev-lang/tk graphviz? ( media-gfx/graphviz ) )
SLOT=0
SRC_URI=http://spinroot.com/spin/Src/spin645.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=262d6e1301573ff05482584cfce51401
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=386c32db763d9d1d41d191bade530502
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
index 077bfb563a53..dc197536e0b2 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
DESCRIPTION=Implementation of the logical framework LF
EAPI=6
HOMEPAGE=http://twelf.org/
-INHERIT=elisp-common eutils multilib
+INHERIT=elisp-common multilib
IUSE=doc emacs examples
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/mlton-20180207 doc? ( virtual/latex-base app-text/texi2html )
RESTRICT=test
SLOT=0/1.7.1
SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a1987f8d95dd1a3bb1f46796568add50
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=3f74bd2a1cb3329163c5601478e0df0a
diff --git a/metadata/md5-cache/sci-mathematics/yafu-9999 b/metadata/md5-cache/sci-mathematics/yafu-9999
index 91538f07bc34..c41be57abe41 100644
--- a/metadata/md5-cache/sci-mathematics/yafu-9999
+++ b/metadata/md5-cache/sci-mathematics/yafu-9999
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gmp:0= sci-mathematics/gmp-ecm dev-vcs/subversion[http(+)] net-m
DESCRIPTION=Yet another factoring utility
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/yafu/
-INHERIT=eutils subversion versionator
+INHERIT=subversion versionator
LICENSE=public-domain
PROPERTIES=live
RDEPEND=dev-libs/gmp:0= sci-mathematics/gmp-ecm
SLOT=0
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e subversion c500a1b7795f44153bd96fc2597e3c05 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=71ca3275080b509fce475f7419681e25
+_md5_=3acd3870ad55f0a7d223601d7578fb3b
diff --git a/metadata/md5-cache/sci-misc/ViSP-images-3.3.0 b/metadata/md5-cache/sci-misc/ViSP-images-3.3.0
index 86698607bf42..112357e7c4a3 100644
--- a/metadata/md5-cache/sci-misc/ViSP-images-3.3.0
+++ b/metadata/md5-cache/sci-misc/ViSP-images-3.3.0
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install
-DEPEND=app-arch/unzip
DESCRIPTION=ViSP images data set
EAPI=7
HOMEPAGE=http://www.irisa.fr/lagadic/visp/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~arm
LICENSE=GPL-2
SLOT=0
SRC_URI=http://visp-doc.inria.fr/download/dataset/visp-images-3.3.0.zip
-_md5_=ed1e1d0b3506251b41a72d142a704bae
+_md5_=2d897b73bfe83626becc0aa4bd6895be
diff --git a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3 b/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
index ad94c42e7b52..66823eafe44f 100644
--- a/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
+++ b/metadata/md5-cache/sci-visualization/epix-1.2.11-r3
@@ -3,7 +3,7 @@ DEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictu
DESCRIPTION=2- and 3-D plotter for creating images (to be used in LaTeX)
EAPI=5
HOMEPAGE=https://mathcs.holycross.edu/~ahwang/current/ePiX.html
-INHERIT=elisp-common bash-completion-r1 autotools eutils
+INHERIT=elisp-common bash-completion-r1 autotools epatch
IUSE=doc emacs examples
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pict
SLOT=0
SRC_URI=https://mathcs.holycross.edu/~ahwang/epix/epix-1.2.11_withpdf.tar.bz2
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f0edf3de4ac3eadc60e34e8bde7269bc
+_md5_=a665940ab76946366dbefb2fecfdf4f0
diff --git a/metadata/md5-cache/sci-visualization/ggobi-2.1.11 b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
index 1553a23a082e..400ea38cd72a 100644
--- a/metadata/md5-cache/sci-visualization/ggobi-2.1.11
+++ b/metadata/md5-cache/sci-visualization/ggobi-2.1.11
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2 virtual/pkgconfig s
DESCRIPTION=Visualization program for exploring high-dimensional data
EAPI=5
HOMEPAGE=http://www.ggobi.org/
-INHERIT=eutils autotools xdg
+INHERIT=epatch autotools xdg
IUSE=doc minimal nls
KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=CPL-1.0
RDEPEND=dev-libs/libxml2:2 media-gfx/graphviz x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://debian/pool/main/g/ggobi/ggobi_2.1.11.orig.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
-_md5_=bbf8e418a04344ce656d1cbd5cad7107
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=9ba59657c6961f2788205ce1ae05940b
diff --git a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1 b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
index c843dacdf1cd..0a3d3fdde6bf 100644
--- a/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
+++ b/metadata/md5-cache/sci-visualization/gri-2.12.23-r1
@@ -3,12 +3,12 @@ DEPEND=app-text/ghostscript-gpl >=sci-libs/netcdf-4 virtual/latex-base virtual/i
DESCRIPTION=Language for scientific graphics programming
EAPI=5
HOMEPAGE=http://gri.sourceforge.net/
-INHERIT=eutils elisp-common
+INHERIT=epatch elisp-common
IUSE=doc emacs examples hdf5
KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=app-text/ghostscript-gpl >=sci-libs/netcdf-4 virtual/latex-base virtual/imagemagick-tools[png] emacs? ( >=app-editors/emacs-23.1:* )
SLOT=0
SRC_URI=mirror://sourceforge/gri/gri-2.12.23.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
-_md5_=56811b1e97452f1a413db35b3a7669ea
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e eapi7-ver f9ec87e93172b25ce65a85303dc06964 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
+_md5_=84284f4f0d888389d343ca3dc57d2578
diff --git a/metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1 b/metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1
index fb36b4e2cfda..94ae0f533a57 100644
--- a/metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1
+++ b/metadata/md5-cache/sys-apps/apmd-3.2.2_p14-r1
@@ -3,12 +3,12 @@ DEPEND=>=sys-apps/debianutils-1.16 >=sys-power/powermgmt-base-1.31 X? ( x11-libs
DESCRIPTION=Advanced Power Management Daemon
EAPI=5
HOMEPAGE=https://packages.qa.debian.org/a/apmd.html
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
IUSE=nls X
KEYWORDS=amd64 arm ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/debianutils-1.16 >=sys-power/powermgmt-base-1.31 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXt x11-libs/libXext )
SLOT=0
SRC_URI=mirror://debian/pool/main/a/apmd/apmd_3.2.2.orig.tar.gz mirror://debian/pool/main/a/apmd/apmd_3.2.2-14.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=80567dc0a77d76dab413abe4ad9b119c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=e7c72e301131649537e653ded068cb31
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-10 b/metadata/md5-cache/sys-apps/darwin-miscutils-10
index b8a5f299a724..27013d774cf4 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-10
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-10
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Miscellaneous commands used on Darwin/Mac OS X systems, Mountain Lion 10.8
EAPI=6
HOMEPAGE=http://www.opensource.apple.com/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-31.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-170.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-55.tar.gz http://www.opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.c?txt -> adv_cmds-md-147.c http://www.opensource.apple.com/source/adv_cmds/adv_cmds-147/md/md.1?txt -> adv_cmds-md-147.1
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=4f2709ea4bdfa35fd7377012a492ea07
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=54615a928a7b0dcf0140eb6f0967cf99
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-6-r1 b/metadata/md5-cache/sys-apps/darwin-miscutils-6-r1
index 00712cba09f5..3cce9d2d5705 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-6-r1
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-6-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Miscellaneous commands used on Darwin/Mac OS X systems, Leopard
EAPI=6
HOMEPAGE=http://www.opensource.apple.com/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-23.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-118.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-49.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d98ff7ce9698950da1718092265b536d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=e2356c5125843ff4ab8cc5729c0257ef
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-8 b/metadata/md5-cache/sys-apps/darwin-miscutils-8
index 059d3e385cde..32ccc3c78ee5 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-8
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-8
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Miscellaneous commands used on Darwin/Mac OS X systems, Snow Leopard 10.6.3
EAPI=6
HOMEPAGE=http://www.opensource.apple.com/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-27.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-149.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-53.1.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d40ed2730e1962be0b5bc6413776b894
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f181094b7378564ba533b0c6d24adccd
diff --git a/metadata/md5-cache/sys-apps/darwin-miscutils-9 b/metadata/md5-cache/sys-apps/darwin-miscutils-9
index a2232ca254ce..85704995c428 100644
--- a/metadata/md5-cache/sys-apps/darwin-miscutils-9
+++ b/metadata/md5-cache/sys-apps/darwin-miscutils-9
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Miscellaneous commands used on Darwin/Mac OS X systems, Lion 10.7
EAPI=6
HOMEPAGE=http://www.opensource.apple.com/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=BSD
SLOT=0
SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/misc_cmds-31.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/shell_cmds-162.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/developer_cmds-55.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=1339537e789892f220e42feee324a3bc
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=b80dddd5827926be126ea36a200d784b
diff --git a/metadata/md5-cache/sys-apps/edac-utils-0.18 b/metadata/md5-cache/sys-apps/edac-utils-0.18
index 8ba83a8af3d5..58618313e4cb 100644
--- a/metadata/md5-cache/sys-apps/edac-utils-0.18
+++ b/metadata/md5-cache/sys-apps/edac-utils-0.18
@@ -3,12 +3,12 @@ DEPEND=sys-fs/sysfsutils
DESCRIPTION=Userspace helper for Linux kernel EDAC drivers
EAPI=5
HOMEPAGE=https://github.com/grondo/edac-utils
-INHERIT=eutils ltprune
+INHERIT=ltprune
IUSE=debug
KEYWORDS=amd64
LICENSE=GPL-2
RDEPEND=sys-fs/sysfsutils sys-apps/dmidecode
SLOT=0
SRC_URI=https://github.com/grondo/edac-utils/archive/0.18.tar.gz -> edac-utils-0.18.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=746d2fe4629440aa3ca1e0ce4ec4420c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa
+_md5_=cd4b483476644796467093c2e3a73c26
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.1 b/metadata/md5-cache/sys-apps/epoch-1.2.1
index 1b2c239f7c1c..bf24afc95629 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.1
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare pretend setup
DESCRIPTION=An init system, a /sbin/init replacement; designed for simplicity
EAPI=5
HOMEPAGE=http://universe2.us/epoch.html
-INHERIT=eutils linux-info
+INHERIT=epatch linux-info
IUSE=kernel_linux
KEYWORDS=amd64 arm x86
LICENSE=public-domain
SLOT=0
SRC_URI=https://github.com/Subsentient/epoch/archive/1.2.1.tar.gz -> epoch-1.2.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=5fea1830758f5febb11a326375cf9be1
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=fd66e1c2ac3919723646e3a1a645a401
diff --git a/metadata/md5-cache/sys-apps/epoch-1.2.2 b/metadata/md5-cache/sys-apps/epoch-1.2.2
index 290d88979de1..e6890ad40286 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.2.2
+++ b/metadata/md5-cache/sys-apps/epoch-1.2.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare pretend setup
DESCRIPTION=An init system, a /sbin/init replacement; designed for simplicity
EAPI=5
HOMEPAGE=http://universe2.us/epoch.html
-INHERIT=eutils linux-info
+INHERIT=epatch linux-info
IUSE=kernel_linux
KEYWORDS=~amd64 ~arm ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://universe2.us/epoch_1.2.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=31240e0ce49184593638d7b665d3e575
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=bcea35598373cb8c690a99d309f89646
diff --git a/metadata/md5-cache/sys-apps/epoch-1.3.0 b/metadata/md5-cache/sys-apps/epoch-1.3.0
index 49471d9dab9d..6eae5c654deb 100644
--- a/metadata/md5-cache/sys-apps/epoch-1.3.0
+++ b/metadata/md5-cache/sys-apps/epoch-1.3.0
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare pretend setup
DESCRIPTION=An init system, a /sbin/init replacement; designed for simplicity
EAPI=5
HOMEPAGE=http://universe2.us/epoch.html
-INHERIT=eutils linux-info
+INHERIT=epatch linux-info
IUSE=kernel_linux
KEYWORDS=~amd64 ~arm ~x86
LICENSE=public-domain
SLOT=0
SRC_URI=http://universe2.us/epoch_1.3.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=5d697b59558ef3e8d372d934bb32b199
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=769df7b7a39b12e477afe32dc624fadd
diff --git a/metadata/md5-cache/sys-apps/epoch-9999 b/metadata/md5-cache/sys-apps/epoch-9999
index 0de8716c6b70..d952dd7b9fbd 100644
--- a/metadata/md5-cache/sys-apps/epoch-9999
+++ b/metadata/md5-cache/sys-apps/epoch-9999
@@ -3,10 +3,10 @@ DEPEND=>=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=An init system, a /sbin/init replacement; designed for simplicity
EAPI=5
HOMEPAGE=http://universe2.us/epoch.html
-INHERIT=eutils linux-info git-r3
+INHERIT=epatch linux-info git-r3
IUSE=kernel_linux
LICENSE=public-domain
PROPERTIES=live
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=9777a19eccfc7cd26e5fb4d654c919b7
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=9de17d62ef7e7a3bdb9bc18036b3c1b4
diff --git a/metadata/md5-cache/sys-apps/fxload-20081013-r1 b/metadata/md5-cache/sys-apps/fxload-20081013-r1
index 1a6abd7c14a5..bc5dd49f0430 100644
--- a/metadata/md5-cache/sys-apps/fxload-20081013-r1
+++ b/metadata/md5-cache/sys-apps/fxload-20081013-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=USB firmware uploader
EAPI=5
HOMEPAGE=http://linux-hotplug.sourceforge.net/
-INHERIT=eutils toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/linux-hotplug/fxload-2008_10_13.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=16cc02451dcf3de2a2a64a9459cd063c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=e9e204bce7b643e45e7651e2425750ec
diff --git a/metadata/md5-cache/sys-apps/input-utils-1.2 b/metadata/md5-cache/sys-apps/input-utils-1.2
index bbc1209357e5..bbd677431852 100644
--- a/metadata/md5-cache/sys-apps/input-utils-1.2
+++ b/metadata/md5-cache/sys-apps/input-utils-1.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Small collection of linux input layer utils
EAPI=5
HOMEPAGE=https://www.kraxel.org/blog/linux/input/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ~arm ~arm64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.kraxel.org/releases/input/input-1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=e5868a23cc412d4f7bd83c2feca076ed
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=692292a090602583bf1230a7bfdad367
diff --git a/metadata/md5-cache/sys-apps/input-utils-1.3 b/metadata/md5-cache/sys-apps/input-utils-1.3
index bbede3e3f378..32d6d5290307 100644
--- a/metadata/md5-cache/sys-apps/input-utils-1.3
+++ b/metadata/md5-cache/sys-apps/input-utils-1.3
@@ -6,4 +6,4 @@ KEYWORDS=amd64 ~arm ~arm64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://www.kraxel.org/releases/input/input-1.3.tar.gz
-_md5_=f9794efc5f093d1c75bb1642a6e65da6
+_md5_=6236c233506eb3efbd087d042010b558
diff --git a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10 b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
index 6235800b85c4..dffd0dcfcbba 100644
--- a/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
+++ b/metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.10
@@ -3,11 +3,12 @@ DEPEND=>=sys-devel/gcc-4:* sys-apps/sed
DESCRIPTION=Intel Performance Counter Monitor - A better way to measure CPU utilization
EAPI=5
HOMEPAGE=https://software.intel.com/en-us/articles/intel-performance-counter-monitor-a-better-way-to-measure-cpu-utilization
+INHERIT=fcaps
IUSE=+filecaps
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=>=sys-devel/gcc-4:* filecaps? ( sys-libs/libcap )
SLOT=0
SRC_URI=https://dev.gentoo.org/~idella4/distfiles/IntelPerformanceCounterMonitor-PCM-V2.10.zip
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 fcaps da689a8e04bbbb3518888ff668fee45b versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=e4439d45183ea80c915cc16e03ef1640
+_eclasses_=fcaps da689a8e04bbbb3518888ff668fee45b
+_md5_=1e87870d315a5ce86e33b6c7832d733c
diff --git a/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1 b/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
index 6e9a1aee5e88..bb2be9f5a162 100644
--- a/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
+++ b/metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
@@ -3,7 +3,6 @@ DEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 sys-libs/libapparmo
DESCRIPTION=Linux application container management from Google
EAPI=5
HOMEPAGE=https://github.com/google/lmctfy
-INHERIT=eutils
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -11,5 +10,4 @@ RDEPEND=dev-libs/protobuf >=dev-cpp/gflags-2.1.1 dev-libs/re2 sys-libs/libapparm
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/google/lmctfy/archive/0.5.0.tar.gz -> lmctfy-0.5.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=e4b033547c26c619e0345b73072d43ec
+_md5_=2a78aa4fbbecb96abaec659355a40c69
diff --git a/metadata/md5-cache/sys-apps/lnxhc-1.2-r1 b/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
index 46daf1a0ad65..b99495b8335f 100644
--- a/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
+++ b/metadata/md5-cache/sys-apps/lnxhc-1.2-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/perl-5.8
DESCRIPTION=Linux Health Checker
EAPI=5
HOMEPAGE=http://lnxhc.sourceforge.net
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 x86
LICENSE=EPL-1.0
RDEPEND=>=dev-lang/perl-5.8
SLOT=0
SRC_URI=mirror://sourceforge/lnxhc/lnxhc-1.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=19712c97ca84c2be4333a82be2b5c428
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f3c831f65e007f6ffb130cf22c071696
diff --git a/metadata/md5-cache/sys-apps/lshw-02.18b b/metadata/md5-cache/sys-apps/lshw-02.18b
index a1e547fad1b4..82021ac1d2a2 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.18b
+++ b/metadata/md5-cache/sys-apps/lshw-02.18b
@@ -3,7 +3,7 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgco
DESCRIPTION=Hardware Lister
EAPI=5
HOMEPAGE=https://www.ezix.org/project/wiki/HardwareLiSter
-INHERIT=flag-o-matic eutils toolchain-funcs l10n
+INHERIT=desktop flag-o-matic toolchain-funcs l10n
IUSE=gtk sqlite static
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
REQUIRED_USE=static? ( !gtk )
SLOT=0
SRC_URI=https://www.ezix.org/software/files/lshw-B.02.18.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=6bdfa2ce19fcff9ce286fc5808c2456c
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=d374c08fc5204bd83953345d8da41e7d
diff --git a/metadata/md5-cache/sys-apps/lshw-02.18b-r1 b/metadata/md5-cache/sys-apps/lshw-02.18b-r1
index 5be49cc51efd..d90cf44cb6e2 100644
--- a/metadata/md5-cache/sys-apps/lshw-02.18b-r1
+++ b/metadata/md5-cache/sys-apps/lshw-02.18b-r1
@@ -3,7 +3,7 @@ DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgco
DESCRIPTION=Hardware Lister
EAPI=5
HOMEPAGE=https://www.ezix.org/project/wiki/HardwareLiSter
-INHERIT=flag-o-matic eutils toolchain-funcs l10n
+INHERIT=desktop flag-o-matic toolchain-funcs l10n
IUSE=gtk sqlite static
KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
REQUIRED_USE=static? ( !gtk !sqlite )
SLOT=0
SRC_URI=https://www.ezix.org/software/files/lshw-B.02.18.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=4947721053b781ea3460748b9d17d4bd
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=54ecc0301ba6df9a55c599e735cd72b3
diff --git a/metadata/md5-cache/sys-apps/most-5.0.0a-r1 b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
index fc1c135d3f2c..4d34bee3e83a 100644
--- a/metadata/md5-cache/sys-apps/most-5.0.0a-r1
+++ b/metadata/md5-cache/sys-apps/most-5.0.0a-r1
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/slang-2.1.3
DESCRIPTION=Paging program that displays, one windowful at a time, the contents of a file
EAPI=5
HOMEPAGE=ftp://space.mit.edu/pub/davis/most
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~alpha amd64 arm ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
RDEPEND=>=sys-libs/slang-2.1.3
SLOT=0
SRC_URI=ftp://space.mit.edu/pub/davis/most/most-5.0.0a.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=b97ef2081b139ec6360ad2cf41795bbf
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=45a4d0a7b5fb38dfae0d4b912699eeee
diff --git a/metadata/md5-cache/sys-apps/paxctl-0.9 b/metadata/md5-cache/sys-apps/paxctl-0.9
index b843cfefbe06..529fc2a62232 100644
--- a/metadata/md5-cache/sys-apps/paxctl-0.9
+++ b/metadata/md5-cache/sys-apps/paxctl-0.9
@@ -3,10 +3,10 @@ DEPEND=>=sys-devel/binutils-2.14.90.0.8-r1
DESCRIPTION=Manages various PaX related program header flags for Elf32, Elf64, binaries
EAPI=5
HOMEPAGE=https://pax.grsecurity.net
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=https://pax.grsecurity.net/paxctl-0.9.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=d19a08ea65298a1f1c9684dd7dcab7f0
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=9790282e3cfcc1f1baf2946b8afdbc08
diff --git a/metadata/md5-cache/sys-apps/pick-4.0.0 b/metadata/md5-cache/sys-apps/pick-4.0.0
index b6985bba7e7f..0cea9cb813b5 100644
--- a/metadata/md5-cache/sys-apps/pick-4.0.0
+++ b/metadata/md5-cache/sys-apps/pick-4.0.0
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=a fuzzy search tool for the command-line
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=A fuzzy search tool for the command-line
EAPI=7
HOMEPAGE=https://github.com/mptre/pick
-INHERIT=autotools toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=https://github.com/mptre/pick/releases/download/v4.0.0/pick-4.0.0.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=20bfbed3eab468cab3adb51b86cd936b
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=def794aa094041b9ba4f54d090ec7dcb
diff --git a/metadata/md5-cache/sys-apps/prctl-1.6-r1 b/metadata/md5-cache/sys-apps/prctl-1.6-r1
index 33398cad85f6..6035303d05f0 100644
--- a/metadata/md5-cache/sys-apps/prctl-1.6-r1
+++ b/metadata/md5-cache/sys-apps/prctl-1.6-r1
@@ -3,10 +3,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=Tool to query and modify process behavior
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/prctl/
-INHERIT=autotools toolchain-funcs
+INHERIT=autotools
KEYWORDS=~alpha ~amd64 ~ia64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/prctl/prctl-1.6.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=3741f5739ab5fc4f038b762c9b105597
+_md5_=52a0877fcdbea02f15e880909c218e3a
diff --git a/metadata/md5-cache/sys-apps/s6-2.1.3.0 b/metadata/md5-cache/sys-apps/s6-2.1.3.0
index 03b69c8a205c..26d1cd14746f 100644
--- a/metadata/md5-cache/sys-apps/s6-2.1.3.0
+++ b/metadata/md5-cache/sys-apps/s6-2.1.3.0
@@ -3,6 +3,7 @@ DEPEND=>=sys-devel/make-4.0 static? ( >=dev-lang/execline-2.1.1.0[static-libs] >
DESCRIPTION=skarnet.org's small and secure supervision software suite
EAPI=5
HOMEPAGE=http://www.skarnet.org/software/s6/
+INHERIT=multilib
IUSE=static
KEYWORDS=amd64 x86
LICENSE=ISC
@@ -10,4 +11,4 @@ RDEPEND=!static? ( >=dev-lang/execline-2.1.1.0 >=dev-libs/skalibs-2.3.2.0 )
SLOT=0
SRC_URI=http://www.skarnet.org/software/s6/s6-2.1.3.0.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=202f9dc838dd68a52ceb585771b127c4
+_md5_=62905094183a9de82e70f5383427d0ea
diff --git a/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136 b/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
index 1da4367c4cdf..1d5c35b2be57 100644
--- a/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
+++ b/metadata/md5-cache/sys-apps/spu-tools-2.3.0.136
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0= sys-apps/help2man virtual/pkgconfig
DESCRIPTION=CELL spu ps and top alike utilities
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/libspe
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
KEYWORDS=ppc ppc64
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=mirror://sourceforge/libspe/spu-tools-2.3.0.136.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=680142141573697f600f0ae516dd0139
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=bf09d76f9f41e891792df8caa39f1fcd
diff --git a/metadata/md5-cache/sys-apps/superdiag-1.4.0.20201120 b/metadata/md5-cache/sys-apps/superdiag-1.4.0.20201120
index f6d991db1696..76dfce3d8d20 100644
--- a/metadata/md5-cache/sys-apps/superdiag-1.4.0.20201120
+++ b/metadata/md5-cache/sys-apps/superdiag-1.4.0.20201120
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
DESCRIPTION=Provides the capability to determine the health of Supermicro servers components
EAPI=7
HOMEPAGE=https://www.supermicro.com
@@ -9,4 +9,4 @@ LICENSE=supermicro
RESTRICT=bindist fetch mirror
SLOT=0
SRC_URI=SuperDiag_1.4.0_20201120.zip
-_md5_=25bf9644bd55d956a2667e215a0602be
+_md5_=62b2c874ac7a07b2c2bb61ca2af42890
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.3 b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
index 53e7b5239b6d..f8cc46f5ea10 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.3
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=A timer-based entropy generator
EAPI=5
HOMEPAGE=http://www.vanheusden.com/te/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=debug selinux
KEYWORDS=amd64 ~arm ~mips x86
LICENSE=GPL-2
RDEPEND=selinux? ( sec-policy/selinux-entropyd )
SLOT=0
SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.3.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=cbd34b38e2b52f096ac1875330b0d6d6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=fd280b37bc1131b96913c4ae4fb10670
diff --git a/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214 b/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214
index a834e885a1ec..4381694a5cac 100644
--- a/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214
+++ b/metadata/md5-cache/sys-apps/tomoyo-tools-2.5.0_p20130214
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig
DESCRIPTION=TOMOYO Linux tools
EAPI=5
HOMEPAGE=http://tomoyo.sourceforge.jp/
-INHERIT=eutils multilib toolchain-funcs
+INHERIT=epatch multilib toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses !sys-apps/ccs-tools
SLOT=0
SRC_URI=mirror://sourceforge.jp/tomoyo/53357/tomoyo-tools-2.5.0-20130214.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=30b17f576c43d47bf6933916f019800e
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=e9e65074acdab9672d56b78abbd960cc
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
index 81edc647a3c4..c1411dbc4f5d 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.5.2
@@ -3,12 +3,12 @@ DEPEND=virtual/udev virtual/libusb:1 virtual/pkgconfig virtual/pkgconfig virtual
DESCRIPTION=A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks
EAPI=5
HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
-INHERIT=eutils linux-info toolchain-funcs udev systemd
+INHERIT=epatch linux-info toolchain-funcs udev systemd
IUSE=jimtcl kernel_linux
KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=virtual/udev virtual/libusb:1 jimtcl? ( dev-lang/jimtcl ) !jimtcl? ( dev-lang/tcl:0 )
SLOT=0
SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.5.2.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20170806.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 udev 452708c3f55cf6e918b045adb949a9e6 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=e7fb9d5b99ef0acce8ab69cb58ec59e6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 udev 452708c3f55cf6e918b045adb949a9e6 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=eac308d827792881056fdaead99f8efa
diff --git a/metadata/md5-cache/sys-apps/usbmon-6-r1 b/metadata/md5-cache/sys-apps/usbmon-6-r1
index 68c3e8f808b8..429e8966a912 100644
--- a/metadata/md5-cache/sys-apps/usbmon-6-r1
+++ b/metadata/md5-cache/sys-apps/usbmon-6-r1
@@ -3,10 +3,10 @@ DEPEND=!=sys-apps/usbutils-0.72-r2
DESCRIPTION=Userland for USB monitoring framework
EAPI=5
HOMEPAGE=https://people.redhat.com/zaitcev/linux/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://people.redhat.com/zaitcev/linux/usbmon-6.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=4c22d6af7987ebdf92e9b21a7e9880c8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f989357de47887cb86a46b601f0899bb
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r1 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r1
index 066ff665bd2d..ba265d11dcae 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r1
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
DEFINED_PHASES=configure
DEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= )
DESCRIPTION=Desktop integration portal
EAPI=7
HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
-INHERIT=autotools systemd
+INHERIT=systemd
IUSE=geolocation screencast
KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/glib:2 dev-libs/json-glib media-libs/fontconfig sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) sys-apps/dbus
SLOT=0
SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.0/xdg-desktop-portal-1.8.0.tar.xz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=61aa9acadfddabcaaaace8e8ef5d4fcc
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=b51cd91de75abf021eae2faefdbdf091
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
index 4b2d66e75b0b..a031aec1874d 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.8.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
DEFINED_PHASES=configure
DEPEND=dev-libs/glib:2 dev-libs/json-glib sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= )
DESCRIPTION=Desktop integration portal
EAPI=7
HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
-INHERIT=autotools systemd
+INHERIT=systemd
IUSE=geolocation screencast
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/glib:2 dev-libs/json-glib sys-fs/fuse:0 geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) sys-apps/dbus
SLOT=0
SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.8.1/xdg-desktop-portal-1.8.1.tar.xz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=dbf1134f21d164460738a9aa710ad047
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=f6fced94925762cefdd432c5bbc7693e
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
index 9ccd93447a12..13056586d957 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.8.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
DEFINED_PHASES=configure
DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
DESCRIPTION=portal backend implementation that is using GTK+ and various pieces of GNOME
EAPI=7
HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
-INHERIT=autotools systemd
+INHERIT=systemd
IUSE=wayland X
KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3= media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.7 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
SLOT=0
SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.8.0/xdg-desktop-portal-gtk-1.8.0.tar.xz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=b03569b953c9e615dc090a3877a1f1b5
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=b302575977c5b6f14a176b49e3d91cd2
diff --git a/metadata/md5-cache/sys-apps/zorroutils-0.05 b/metadata/md5-cache/sys-apps/zorroutils-0.05
index cacd3d028c52..980a8bd02913 100644
--- a/metadata/md5-cache/sys-apps/zorroutils-0.05
+++ b/metadata/md5-cache/sys-apps/zorroutils-0.05
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
DESCRIPTION=Zorro bus utility for Amigas running 2.1 and later kernels
EAPI=7
HOMEPAGE=http://users.telenet.be/geertu/Download/#zorro
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~m68k ~ppc
LICENSE=GPL-2
SLOT=0
SRC_URI=https://github.com/glaubitz/zorroutils/archive/0.05.tar.gz -> zorroutils-0.05.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=db12fa4da3da5bc2825eb1a716bec828
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=a8da61b4ae17f0f27b77d1d5372e602d
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r5 b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
index b0e3a40c27ba..40687e50e76e 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r5
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
@@ -3,12 +3,12 @@ DEPEND=>=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
DESCRIPTION=NSS LDAP Module
EAPI=5
HOMEPAGE=http://www.padl.com/OSS/nss_ldap.html
-INHERIT=fixheadtails eutils multilib multilib-minimal autotools prefix
+INHERIT=fixheadtails epatch multilib multilib-minimal autotools prefix
IUSE=debug ssl sasl kerberos abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux
LICENSE=LGPL-2
RDEPEND=>=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-fs/autofs-4.1.3
SLOT=0
SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=fixheadtails 1721997ed44d035654efe12da50797ef desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=eab6ad0fa490735beb83e6c68cb22321
+_eclasses_=fixheadtails 1721997ed44d035654efe12da50797ef estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=3152964fa196c357bf95df4b269a20d3
diff --git a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0 b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
index f1724f1365d8..9035926eec80 100644
--- a/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
+++ b/metadata/md5-cache/sys-auth/ykneo-ccid-tools-0.0.0
@@ -3,11 +3,11 @@ DEPEND=sys-apps/pcsc-lite sys-apps/help2man dev-util/gengetopt virtual/pkgconfig
DESCRIPTION=Tools for Yubico's YubiKey NEO in CCID mode
EAPI=5
HOMEPAGE=https://github.com/Yubico/ykneo-ccid-tools
-INHERIT=eutils udev
+INHERIT=epatch udev
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=sys-apps/pcsc-lite
SLOT=0
SRC_URI=http://yubico.github.io/ykneo-ccid-tools/releases/ykneo-ccid-tools-0.0.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=014ab1716523fce31c34d58461e8b866
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e udev 452708c3f55cf6e918b045adb949a9e6
+_md5_=0dd84bb60be8e256a9e29b26bddc55a0
diff --git a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1 b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
index 57dc183b16f6..5b52bc8821af 100644
--- a/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
+++ b/metadata/md5-cache/sys-block/arcconf-2.01.22270-r1
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install nofetch setup
-DEPEND=app-arch/unzip
DESCRIPTION=Microsemi Adaptec RAID Controller Command Line Utility
EAPI=7
HOMEPAGE=https://www.microsemi.com/
@@ -11,4 +11,4 @@ RESTRICT=fetch mirror bindist
SLOT=0
SRC_URI=http://download.adaptec.com/raid/storage_manager/arcconf_v2_01_22270.zip
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=2fc553089736953c5ab96cc9c8bb06ef
+_md5_=6549ce169cefcdbad01c4ab8b7e2b5a8
diff --git a/metadata/md5-cache/sys-block/blktrace-1.1.0 b/metadata/md5-cache/sys-block/blktrace-1.1.0
index 053a54614389..1fbaed84d75f 100644
--- a/metadata/md5-cache/sys-block/blktrace-1.1.0
+++ b/metadata/md5-cache/sys-block/blktrace-1.1.0
@@ -3,11 +3,11 @@ DEPEND=sys-kernel/linux-headers doc? ( virtual/latex-base >=app-text/texlive-cor
DESCRIPTION=btrace can show detailed info about what is happening on a block device io queue
EAPI=5
HOMEPAGE=https://git.kernel.dk/cgit/blktrace/
-INHERIT=eutils toolchain-funcs flag-o-matic linux-info
+INHERIT=epatch toolchain-funcs flag-o-matic linux-info
IUSE=doc kernel_linux
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://brick.kernel.dk/snaps/blktrace-1.1.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=b2a2f3be448a9ceb531c68e6fba191be
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=5d650f17e0f494c63dc69ddf2d5bc8c8
diff --git a/metadata/md5-cache/sys-block/raid-check-20140719-r1 b/metadata/md5-cache/sys-block/raid-check-20140719-r1
index 9677d9c382bc..9a748868c0c8 100644
--- a/metadata/md5-cache/sys-block/raid-check-20140719-r1
+++ b/metadata/md5-cache/sys-block/raid-check-20140719-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare test
DESCRIPTION=Script to do "scrubbing" on software RAID systems
EAPI=5
HOMEPAGE=https://github.com/fukawi2/raid-check
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/raid-check-20140719.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=0dd0875e13acd9f00a39badf6a5fd0b5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=5639850e7b648890d3cb9d88d866f08b
diff --git a/metadata/md5-cache/sys-block/scsirastools-1.5.7 b/metadata/md5-cache/sys-block/scsirastools-1.5.7
index 369d590c17b7..f81924728388 100644
--- a/metadata/md5-cache/sys-block/scsirastools-1.5.7
+++ b/metadata/md5-cache/sys-block/scsirastools-1.5.7
@@ -3,11 +3,11 @@ DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils sys-devel/gnuconfig >=app-por
DESCRIPTION=Serviceability for SCSI Disks and Arrays
EAPI=5
HOMEPAGE=http://scsirastools.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
RDEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils
SLOT=0
SRC_URI=mirror://sourceforge/scsirastools/scsirastools-1.5.7.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=80761567241a79f27f42ac48bf03180e
+_md5_=6a3900504cb4b6cdb3a758f1e6069492
diff --git a/metadata/md5-cache/sys-block/scsirastools-1.6.4 b/metadata/md5-cache/sys-block/scsirastools-1.6.4
index a73d2bb9ac8d..135630ae7146 100644
--- a/metadata/md5-cache/sys-block/scsirastools-1.6.4
+++ b/metadata/md5-cache/sys-block/scsirastools-1.6.4
@@ -3,11 +3,11 @@ DEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils sys-devel/gnuconfig >=app-por
DESCRIPTION=Serviceability for SCSI Disks and Arrays
EAPI=5
HOMEPAGE=http://scsirastools.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=BSD
RDEPEND=sys-apps/rescan-scsi-bus sys-apps/sg3_utils
SLOT=0
SRC_URI=mirror://sourceforge/scsirastools/scsirastools-1.6.4.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=0f1a0290d991896b7c770fb09e23591e
+_md5_=b61acb5a46b68b702627d52a84c8a4a8
diff --git a/metadata/md5-cache/sys-boot/colo-1.22 b/metadata/md5-cache/sys-boot/colo-1.22
index 1d1125006556..34ab4ba82ef8 100644
--- a/metadata/md5-cache/sys-boot/colo-1.22
+++ b/metadata/md5-cache/sys-boot/colo-1.22
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=CObalt LOader - Modern bootloader for Cobalt MIPS machines
EAPI=6
HOMEPAGE=https://www.colonel-panic.org/cobalt-mips/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=-* ~mips
LICENSE=GPL-2
RESTRICT=strip
SLOT=0
SRC_URI=https://www.colonel-panic.org/cobalt-mips/colo/colo-1.22.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=b23f6b34dfa3b91205b8ff396a51788b
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d1b2e8d2b66f68c9c335f77834440cec
diff --git a/metadata/md5-cache/sys-cluster/charm-6.8.2 b/metadata/md5-cache/sys-cluster/charm-6.8.2
index 2ee73a940008..ec1ef2ed74db 100644
--- a/metadata/md5-cache/sys-cluster/charm-6.8.2
+++ b/metadata/md5-cache/sys-cluster/charm-6.8.2
@@ -3,7 +3,7 @@ DEPEND=mpi? ( virtual/mpi ) net-libs/libtirpc virtual/pkgconfig virtual/fortran
DESCRIPTION=Message-passing parallel language and runtime system
EAPI=5
HOMEPAGE=http://charm.cs.uiuc.edu/
-INHERIT=eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
+INHERIT=epatch flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs
IUSE=charmdebug charmtracing charmproduction cmkopt examples mlogft mpi ampi numa smp static-libs syncft tcp
KEYWORDS=~amd64 ~x86
LICENSE=charm
@@ -11,5 +11,5 @@ RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
REQUIRED_USE=cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing )
SLOT=0
SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.8.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 fortran-2 b4796813ccda91c9c0d3463fc90aa969 multiprocessing cac3169468f893670dac3e7cb940e045
-_md5_=42add106f123b62c37ee2628393600b4
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 fortran-2 b4796813ccda91c9c0d3463fc90aa969 multiprocessing cac3169468f893670dac3e7cb940e045
+_md5_=a4fe77d28319a3fab9588722f19e588a
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
index 2433a57f3621..66c94e9c6a84 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.27-r1
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16 virtual/pk
DESCRIPTION=utility to administer the IP virtual server services
EAPI=6
HOMEPAGE=http://linuxvirtualserver.org/
-INHERIT=eutils linux-info toolchain-funcs
+INHERIT=epatch linux-info toolchain-funcs
IUSE=static-libs kernel_linux
KEYWORDS=amd64 ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
SLOT=0
SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.27.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=0a7b41af5f4f42fa5600d71eb0e8c806
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=a62f5e41c2d55321bc28d9a0df736553
diff --git a/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1 b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
index 95f8976f9429..f919dc7bdafd 100644
--- a/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
+++ b/metadata/md5-cache/sys-cluster/ipvsadm-1.28-r1
@@ -3,12 +3,12 @@ DEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16 virtual/pk
DESCRIPTION=utility to administer the IP virtual server services
EAPI=6
HOMEPAGE=http://linuxvirtualserver.org/
-INHERIT=eutils linux-info toolchain-funcs
+INHERIT=epatch linux-info toolchain-funcs
IUSE=static-libs kernel_linux
KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.2:* dev-libs/libnl:= >=dev-libs/popt-1.16
SLOT=0
SRC_URI=https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-1.28.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=5fe7992aa3008083b983345156deb04c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=537ba07be93b24c94e2b05c581f9ddc2
diff --git a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2 b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
index f82760b9e223..ccf2ab8b9586 100644
--- a/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
+++ b/metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
@@ -3,12 +3,12 @@ DEPEND=!minimal? ( >=virtual/jdk-1.6 ) !minimal? ( x11-libs/libXtst x11-libs/lib
DESCRIPTION=MPI development tools
EAPI=5
HOMEPAGE=http://www-unix.mcs.anl.gov/perfvis/download/index.htm
-INHERIT=eutils fortran-2 java-pkg-opt-2 toolchain-funcs
+INHERIT=epatch fortran-2 java-pkg-opt-2 toolchain-funcs
IUSE=debug minimal fortran threads elibc_FreeBSD java
KEYWORDS=amd64 x86
LICENSE=mpich2
RDEPEND=!minimal? ( >=virtual/jre-1.6 ) !minimal? ( x11-libs/libXtst x11-libs/libXi ) || ( sys-cluster/openmpi[fortran?,threads?] sys-cluster/mpich2[fortran?,threads?] ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=ftp://ftp.mcs.anl.gov/pub/mpi/mpe/mpe2-1.0.6p1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
-_md5_=204f1996863d06f17175380779b47e65
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e fortran-2 b4796813ccda91c9c0d3463fc90aa969 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f
+_md5_=6582a1ecf835e90ed3d7ce34971335a4
diff --git a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1 b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
index 7d4ba9cb7600..54b3f36e9b76 100644
--- a/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
+++ b/metadata/md5-cache/sys-cluster/torque-4.1.7-r1
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib sys-libs/readline:0= libressl? ( dev-libs/libressl:0= ) !li
DESCRIPTION=Resource manager and queuing system based on OpenPBS
EAPI=5
HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
-INHERIT=flag-o-matic eutils linux-info
+INHERIT=epatch linux-info
IUSE=cpusets +crypt doc drmaa kernel_linux libressl munge nvidia server +syslog tk kernel_linux
KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=torque-2.5
RDEPEND=sys-libs/zlib sys-libs/readline:0= libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
SLOT=0
SRC_URI=http://www.adaptivecomputing.com/index.php?wpfb_dl=1690 -> torque-4.1.7.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
-_md5_=d6c9079355459ac4e6bfde40ed48c4ed
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395
+_md5_=b869a10027aac6f876cb3e22f68c4cb8
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
index 8ef278ab6281..3bbc10d7c913 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.4.13-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup
DESCRIPTION=A high-performance coordination service for distributed applications.
EAPI=5
HOMEPAGE=http://zookeeper.apache.org/
-INHERIT=eutils java-utils-2 user
+INHERIT=java-utils-2 user
IUSE=elibc_FreeBSD
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7
RESTRICT=mirror binchecks
SLOT=0
SRC_URI=mirror://apache/zookeeper/zookeeper-3.4.13/zookeeper-3.4.13.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=a3bcc826d3f12f6064031685030d279e
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=4b41bca76ffbdf1c9f3fb74c9bc181b8
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
index 97e4d488d1b0..6693265d2859 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.5.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=install setup
DESCRIPTION=A high-performance coordination service for distributed applications.
EAPI=5
HOMEPAGE=http://zookeeper.apache.org/
-INHERIT=eutils java-utils-2 user
+INHERIT=java-utils-2 user
IUSE=elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7
RESTRICT=mirror binchecks
SLOT=0
SRC_URI=mirror://apache/zookeeper/zookeeper-3.5.9/apache-zookeeper-3.5.9-bin.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=5268079dc92264a1c68f981bbb6dbd7f
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=c9676dc192dff9943c096ba2d807c809
diff --git a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2 b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
index a111e9132680..081c6027aca9 100644
--- a/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
+++ b/metadata/md5-cache/sys-cluster/zookeeper-bin-3.6.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=install setup
DESCRIPTION=A high-performance coordination service for distributed applications.
EAPI=5
HOMEPAGE=http://zookeeper.apache.org/
-INHERIT=eutils java-utils-2 user
+INHERIT=java-utils-2 user
IUSE=elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jre-1.7
RESTRICT=mirror binchecks
SLOT=0
SRC_URI=mirror://apache/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=5268079dc92264a1c68f981bbb6dbd7f
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=c9676dc192dff9943c096ba2d807c809
diff --git a/metadata/md5-cache/sys-devel/bin86-0.16.20-r2 b/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
index 1f116dc01d8a..16fb12d19b3f 100644
--- a/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
+++ b/metadata/md5-cache/sys-devel/bin86-0.16.20-r2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Assembler and loader used to create kernel bootsector
EAPI=5
HOMEPAGE=http://v3.sk/~lkundrak/dev86/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://v3.sk/~lkundrak/dev86/bin86-0.16.20.tar.gz https://github.com/lkundrak/dev86/commit/2c95336f19eeff761ecb858c5a2a58484bb3ceeb.patch -> bin86-0.16.20-fix_lilo_build.patch
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f968307e751bdfe1c91fd44d4723235e
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=c7f1e8fc6730982a82ac5335676c52a2
diff --git a/metadata/md5-cache/sys-devel/bin86-0.16.21 b/metadata/md5-cache/sys-devel/bin86-0.16.21
index f9a99968e851..c67e3004c7e3 100644
--- a/metadata/md5-cache/sys-devel/bin86-0.16.21
+++ b/metadata/md5-cache/sys-devel/bin86-0.16.21
@@ -2,10 +2,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Assembler and loader used to create kernel bootsector
EAPI=6
HOMEPAGE=http://v3.sk/~lkundrak/dev86/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://v3.sk/~lkundrak/dev86/bin86-0.16.21.tar.gz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ad50fa27934b6b63845b30275c110f50
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=ddb42ae69fa16661e7e5604469bc18f2
diff --git a/metadata/md5-cache/sys-devel/crossdev-20201129 b/metadata/md5-cache/sys-devel/crossdev-20201129
index 09bd2d478233..12f911abaefe 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20201129
+++ b/metadata/md5-cache/sys-devel/crossdev-20201129
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/xz-utils
DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
DESCRIPTION=Gentoo Cross-toolchain generator
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
SLOT=0
SRC_URI=mirror://gentoo/crossdev-20201129.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20201129.tar.xz
-_md5_=8e5192d638cbdf409017df02a58ffc20
+_md5_=c482bb7ad50b913236f85bc28e1de0ab
diff --git a/metadata/md5-cache/sys-devel/crossdev-99999999 b/metadata/md5-cache/sys-devel/crossdev-99999999
index 9b7446207f59..0b4077747631 100644
--- a/metadata/md5-cache/sys-devel/crossdev-99999999
+++ b/metadata/md5-cache/sys-devel/crossdev-99999999
@@ -1,6 +1,5 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/xz-utils >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=install unpack
-DEPEND=app-arch/xz-utils
DESCRIPTION=Gentoo Cross-toolchain generator
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
@@ -10,4 +9,4 @@ PROPERTIES=live
RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
SLOT=0
_eclasses_=git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=83e9ebdc1e89d61083a44173d398b00a
+_md5_=f54eb4fe1bc41e18be7d8cbb3926e930
diff --git a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7 b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
index ca9f58657a46..8ada42105b1c 100644
--- a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
+++ b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
@@ -3,11 +3,11 @@ DEPEND=>=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=A library to use InfiniBand 'verbs' for direct access to IB hardware
EAPI=5
HOMEPAGE=https://www.openfabrics.org/
-INHERIT=eutils openib
+INHERIT=openib
KEYWORDS=amd64 x86 ~amd64-linux
LICENSE=|| ( GPL-2 BSD-2 )
RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libibverbs:0 !sys-fabric/libibverbs:3.5
SLOT=3.12
SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d openib 57c157cd757e688bd85aafc0965f2b53
-_md5_=3a06fc8c31b2bf4a6ada9ef7ff0d0bc7
+_md5_=35701036ade43cb9a069602008ef03a7
diff --git a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18 b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
index 716d676493bc..dc2a88cca346 100644
--- a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
+++ b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
@@ -3,11 +3,11 @@ DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
DESCRIPTION=OpenIB userspace RDMA CM library
EAPI=5
HOMEPAGE=https://www.openfabrics.org/
-INHERIT=eutils openib
+INHERIT=openib
KEYWORDS=amd64 x86 ~amd64-linux
LICENSE=|| ( GPL-2 BSD-2 )
RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/librdmacm:0 !sys-fabric/librdmacm:3.5
SLOT=3.12
SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d openib 57c157cd757e688bd85aafc0965f2b53
-_md5_=faa9911a93ac37ab84c77f0fe23123f2
+_md5_=dcbdac4870424e8cd613dfaa6671826b
diff --git a/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1 b/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
index 5798ffdf3c9c..2084f7556e53 100644
--- a/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
+++ b/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
@@ -3,7 +3,7 @@ DEPEND=sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 sys-devel/gnuconfig >=
DESCRIPTION=OpenSM - InfiniBand Subnet Manager and Administration for OpenIB
EAPI=5
HOMEPAGE=https://www.openfabrics.org/
-INHERIT=autotools eutils openib
+INHERIT=autotools epatch openib
IUSE=tools
KEYWORDS=amd64 ~x86 ~amd64-linux
LICENSE=|| ( GPL-2 BSD-2 )
@@ -11,4 +11,4 @@ RDEPEND=sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 tools? ( net-misc/ipu
SLOT=3.12
SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 rpm 760ff223c2c4299b68ea901e24c4cabd versionator d3fb3ba33acc3bbbdc4d7970227c100d openib 57c157cd757e688bd85aafc0965f2b53
-_md5_=5b7c0a98a48832fe3431e49f03a2e54e
+_md5_=ea6a3edaab3054c6809a628253293122
diff --git a/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4 b/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
index 93c9d7c8465a..e0fa42426a1e 100644
--- a/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
+++ b/metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=create and edit the partition table of a disk partitioned in Atari format
EAPI=5
HOMEPAGE=https://packages.qa.debian.org/a/atari-fdisk.html
-INHERIT=versionator toolchain-funcs eutils
+INHERIT=versionator toolchain-funcs epatch
KEYWORDS=-* ~m68k x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://debian/pool/main/a/atari-fdisk/atari-fdisk_0.7.1-5.4.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=81e81065958effeded2d1f487f11400c
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 versionator d3fb3ba33acc3bbbdc4d7970227c100d toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=d0f7103177ad024063892d20eba9a19f
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-105-r2 b/metadata/md5-cache/sys-fs/libeatmydata-105-r2
index 574bc8927849..b126d95f896e 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-105-r2
+++ b/metadata/md5-cache/sys-fs/libeatmydata-105-r2
@@ -1,5 +1,4 @@
DEFINED_PHASES=compile configure install test
-DEPEND=sys-apps/sed
DESCRIPTION=LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP
EAPI=7
HOMEPAGE=https://launchpad.net/libeatmydata/
@@ -11,4 +10,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://launchpad.net/libeatmydata/trunk/release-105/+download/libeatmydata-105.tar.gz
_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=7e82c5eee6fd42ad91d9944ac82cd0c6
+_md5_=1957b73d49f87634f75a2641a1dfdcff
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.227 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.227
index 6701bb2019ef..d67c7a723ee8 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.227
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.227
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sy
DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-INHERIT=kernel-2 eutils eapi7-ver
+INHERIT=kernel-2 epatch eapi7-ver
IUSE=experimental ip27 ip28 ip30 symlink build
KEYWORDS=-* ~mips
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
RESTRICT=binchecks strip
SLOT=4.14.227
SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.227.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~kumba/distfiles/mipsgit-4.14.0-20180128.diff.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.14.0-patches-v2.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=35b9fab1a965d2b43cc2a16c5214909c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=93aeb094ad7d99463ea341feeb3b436c
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.183 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.183
index f1eeb2c86e42..9759ed8fb924 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.183
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.183
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sy
DESCRIPTION=Kernel.org sources for MIPS-based machines
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-INHERIT=kernel-2 eutils eapi7-ver
+INHERIT=kernel-2 epatch eapi7-ver
IUSE=experimental ip27 ip28 ip30 symlink build
KEYWORDS=-* ~mips
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
RESTRICT=binchecks strip
SLOT=4.19.183
SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.183.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-4.19.0-patches-v2.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=4c9416ff613f8d82f57a81922a3ab619
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=eff75dacaba9e8aaa930600c53b87452
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-5.4.108 b/metadata/md5-cache/sys-kernel/mips-sources-5.4.108
index 297db9a9b441..5cf611b78c84 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-5.4.108
+++ b/metadata/md5-cache/sys-kernel/mips-sources-5.4.108
@@ -3,7 +3,7 @@ DEPEND=>=sys-devel/gcc-6.5.0 >=sys-devel/patch-2.7.6 !build? ( sys-apps/sed >=sy
DESCRIPTION=Kernel.org sources for MIPS-based machines
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:MIPS
-INHERIT=kernel-2 eutils eapi7-ver
+INHERIT=kernel-2 epatch eapi7-ver
IUSE=experimental ip27 ip28 ip30 symlink build
KEYWORDS=-* ~mips
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-
RESTRICT=binchecks strip
SLOT=5.4.108
SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.108.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~kumba/distfiles/mips-sources-5.4-patches-v3.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=c20c9a1ccc349c6167df4249a5940aa7
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 eapi7-ver f9ec87e93172b25ce65a85303dc06964 kernel-2 198f6aa4709a3392bdc99b64f962e342 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=7fae78765e2adc4569b65a63e9164572
diff --git a/metadata/md5-cache/sys-libs/csu-85-r1 b/metadata/md5-cache/sys-libs/csu-85-r1
index 07a68e16123c..ef1db0c83ac4 100644
--- a/metadata/md5-cache/sys-libs/csu-85-r1
+++ b/metadata/md5-cache/sys-libs/csu-85-r1
@@ -7,5 +7,4 @@ KEYWORDS=~ppc-macos ~x64-macos
LICENSE=APSL-2
SLOT=0
SRC_URI=http://www.opensource.apple.com/tarballs/Csu/Csu-85.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=db6b066f7da1ab480e753937988ff648
+_md5_=a6734a5045a86b0af5dbc4728967c0ef
diff --git a/metadata/md5-cache/sys-libs/efivar-37 b/metadata/md5-cache/sys-libs/efivar-37
index d83cb6d64e22..0afaf9519760 100644
--- a/metadata/md5-cache/sys-libs/efivar-37
+++ b/metadata/md5-cache/sys-libs/efivar-37
@@ -3,11 +3,11 @@ DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
DESCRIPTION=Tools and library to manipulate EFI variables
EAPI=6
HOMEPAGE=https://github.com/rhinstaller/efivar
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~arm arm64 ~ia64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/popt
SLOT=0/1
SRC_URI=https://github.com/rhinstaller/efivar/releases/download/37/efivar-37.tar.bz2
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=5579228506edcbe68989db461356d218
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=6db5765310b5fdba1117af96846cf88b
diff --git a/metadata/md5-cache/sys-libs/freeipmi-1.5.7 b/metadata/md5-cache/sys-libs/freeipmi-1.5.7
index e0db15c34fd6..53de5e3e97b4 100644
--- a/metadata/md5-cache/sys-libs/freeipmi-1.5.7
+++ b/metadata/md5-cache/sys-libs/freeipmi-1.5.7
@@ -3,12 +3,10 @@ DEPEND=dev-libs/libgcrypt:0 virtual/os-headers
DESCRIPTION=Provides Remote-Console and System Management Software as per IPMI v1.5/2.0
EAPI=6
HOMEPAGE=https://www.gnu.org/software/freeipmi/
-INHERIT=multilib
IUSE=debug nagios
KEYWORDS=amd64 hppa x86
LICENSE=GPL-3
RDEPEND=dev-libs/libgcrypt:0 nagios? ( || ( net-analyzer/icinga net-analyzer/nagios ) dev-lang/perl )
SLOT=0
SRC_URI=mirror://gnu/freeipmi/freeipmi-1.5.7.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5787fb9e20ad2783bdb97acf965c6a76
+_md5_=d6b2e4873d4d052b35ec0d091679cde3
diff --git a/metadata/md5-cache/sys-libs/libaal-1.0.7-r1 b/metadata/md5-cache/sys-libs/libaal-1.0.7-r1
index 10fa6c75b6c6..841208b991ed 100644
--- a/metadata/md5-cache/sys-libs/libaal-1.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libaal-1.0.7-r1
@@ -3,10 +3,11 @@ DEPEND=virtual/os-headers
DESCRIPTION=library required by reiser4progs
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/reiser4/
+INHERIT=usr-ldscript
IUSE=static-libs split-usr
KEYWORDS=amd64 arm ppc ppc64 -sparc x86
LICENSE=GPL-2
SLOT=0/7
SRC_URI=mirror://sourceforge/reiser4/libaal-1.0.7.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=812eb9dad8944d2cc7b72448a3393846
+_md5_=27b51c5faa172eb02a35a720ae01d62a
diff --git a/metadata/md5-cache/sys-libs/libaal-1.0.7-r2 b/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
index a213260d151f..37c03b5c373a 100644
--- a/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=configure install prepare
DESCRIPTION=library required by reiser4progs
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/reiser4/
+INHERIT=usr-ldscript
IUSE=static-libs split-usr
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86
LICENSE=GPL-2
SLOT=0/7
SRC_URI=mirror://sourceforge/reiser4/libaal-1.0.7.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=48a6fee8cdb951588bd22780f0498208
+_md5_=37fa7f5669a367e1f32ff4ee7ff47c91
diff --git a/metadata/md5-cache/sys-libs/libhx-3.24-r1 b/metadata/md5-cache/sys-libs/libhx-3.24-r1
index 6c762b649f23..7123b121b2ee 100644
--- a/metadata/md5-cache/sys-libs/libhx-3.24-r1
+++ b/metadata/md5-cache/sys-libs/libhx-3.24-r1
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/xz-utils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=install prepare
-DEPEND=app-arch/xz-utils
DESCRIPTION=Platform independent library providing basic system functions
EAPI=7
HOMEPAGE=http://libhx.sourceforge.net
@@ -11,4 +10,4 @@ LICENSE=GPL-3
SLOT=0/28
SRC_URI=mirror://sourceforge/libhx/libHX-3.24.tar.xz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=792ef2d5eb98b57abd1563278cc1eeef
+_md5_=b0e00ee6e0a11590f38f69a9425676cf
diff --git a/metadata/md5-cache/sys-libs/libhx-3.25 b/metadata/md5-cache/sys-libs/libhx-3.25
index e5caeebe0cad..58754b6b0780 100644
--- a/metadata/md5-cache/sys-libs/libhx-3.25
+++ b/metadata/md5-cache/sys-libs/libhx-3.25
@@ -1,6 +1,5 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/xz-utils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=install prepare
-DEPEND=app-arch/xz-utils
DESCRIPTION=Platform independent library providing basic system functions
EAPI=7
HOMEPAGE=https://inai.de/projects/libhx/
@@ -11,4 +10,4 @@ LICENSE=GPL-3
SLOT=0/32
SRC_URI=https://inai.de/files/libhx/libHX-3.25.tar.xz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=3dd3068a4c0b0a9881904f6fe5b00fda
+_md5_=275cd3608a1a45afbc1b5af5232a0b27
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.1-r1 b/metadata/md5-cache/sys-libs/libselinux-3.1-r1
index 103c7c9b075e..db5671328087 100644
--- a/metadata/md5-cache/sys-libs/libselinux-3.1-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-3.1-r1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libsepol-3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
DESCRIPTION=SELinux userland library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal
+INHERIT=python-r1 toolchain-funcs multilib-minimal
IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=public-domain
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libsepol-3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libselinux-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=6687d2bacfe56ff4b691f497e2259361
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=4c5865ed5e9f9033b8e7c29d95932177
diff --git a/metadata/md5-cache/sys-libs/libselinux-3.2 b/metadata/md5-cache/sys-libs/libselinux-3.2
index b2c6fe9a5f3a..4568d498530f 100644
--- a/metadata/md5-cache/sys-libs/libselinux-3.2
+++ b/metadata/md5-cache/sys-libs/libselinux-3.2
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
DESCRIPTION=SELinux userland library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal
+INHERIT=python-r1 toolchain-funcs multilib-minimal
IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
LICENSE=public-domain
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libselinux-3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=ad79674a08fb53b870d9b59e5e857a10
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=8ecabef4c162332bd1720e1df02798cb
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index ab29593cfdea..c298aaf577db 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -4,12 +4,12 @@ DEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
DESCRIPTION=SELinux userland library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal git-r3
+INHERIT=python-r1 toolchain-funcs multilib-minimal git-r3
IUSE=pcre2 python ruby static-libs ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
LICENSE=public-domain
PROPERTIES=live
RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ruby? ( ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ) elibc_musl? ( sys-libs/fts-standalone )
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
SLOT=0
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=ad79674a08fb53b870d9b59e5e857a10
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=8ecabef4c162332bd1720e1df02798cb
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.1-r1 b/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
index f9ce60a08b13..a362c4839e8d 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.1-r1
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libsepol-3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
DESCRIPTION=SELinux kernel and policy management library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal
+INHERIT=python-r1 toolchain-funcs multilib-minimal
IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libsemanage-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=e838ea421bd6c6581d77156b535a530f
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=12dc295bfe6784200775c0dd92fbbc84
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.2 b/metadata/md5-cache/sys-libs/libsemanage-3.2
index 20a3f65f340e..ad69133fce0b 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-3.2
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.2
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libsepol-3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
DESCRIPTION=SELinux kernel and policy management library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal
+INHERIT=python-r1 toolchain-funcs multilib-minimal
IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
LICENSE=GPL-2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
RESTRICT=test
SLOT=0/2
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libsemanage-3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=0cd1826e124e45da179f9918389c82f1
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=039a98dfb653c95ac1ac7861068143c5
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index b1e9322a454d..9aeab768761d 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -4,7 +4,7 @@ DEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
DESCRIPTION=SELinux kernel and policy management library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib python-r1 toolchain-funcs multilib-minimal git-r3
+INHERIT=python-r1 toolchain-funcs multilib-minimal git-r3
IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
LICENSE=GPL-2
PROPERTIES=live
@@ -12,5 +12,5 @@ RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
RESTRICT=test
SLOT=0/2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=0cd1826e124e45da179f9918389c82f1
+_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-r1 26e4ad0a4190b14f70973dc253e86535 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=039a98dfb653c95ac1ac7861068143c5
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.1 b/metadata/md5-cache/sys-libs/libsepol-3.1
index 0c1e6958762d..f7e44e461e79 100644
--- a/metadata/md5-cache/sys-libs/libsepol-3.1
+++ b/metadata/md5-cache/sys-libs/libsepol-3.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=SELinux binary policy representation library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib toolchain-funcs multilib-minimal
+INHERIT=toolchain-funcs multilib-minimal
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=amd64 ~arm ~arm64 ~mips x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/20200710/libsepol-3.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=1edf78c2ba17fe8dc5641430ece07cd6
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=29c62e58db62b70693019f0b57ca5882
diff --git a/metadata/md5-cache/sys-libs/libsepol-3.2 b/metadata/md5-cache/sys-libs/libsepol-3.2
index 9ddbf7783e99..687294a10de8 100644
--- a/metadata/md5-cache/sys-libs/libsepol-3.2
+++ b/metadata/md5-cache/sys-libs/libsepol-3.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=SELinux binary policy representation library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib toolchain-funcs multilib-minimal
+INHERIT=toolchain-funcs multilib-minimal
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0/2
SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.2/libsepol-3.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=4829b801a46de3765167b818970032ff
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
+_md5_=b8e6a3b2462b4bf46b6098de61dc5f92
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index b66de2fff3e7..20c4d1166e50 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -3,11 +3,11 @@ DEFINED_PHASES=compile configure install prepare test unpack
DESCRIPTION=SELinux binary policy representation library
EAPI=7
HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=multilib toolchain-funcs multilib-minimal git-r3
+INHERIT=toolchain-funcs multilib-minimal git-r3
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
LICENSE=GPL-2
PROPERTIES=live
RESTRICT=test
SLOT=0/2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=4829b801a46de3765167b818970032ff
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=b8e6a3b2462b4bf46b6098de61dc5f92
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.91 b/metadata/md5-cache/sys-libs/libstatgrab-0.91
index 2457bddb500a..5a212d8dfc67 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.91
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.91
@@ -1,15 +1,12 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure install
DEPEND=sys-libs/ncurses
DESCRIPTION=A tool to provide access to statistics about the system on which it's run
EAPI=7
HOMEPAGE=https://www.i-scream.org/libstatgrab/
-INHERIT=autotools
IUSE=doc examples
KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc x86
LICENSE=|| ( GPL-2 LGPL-2.1 )
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.91.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=6fabf50302307b2fa8eb11f95f1e7ac5
+_md5_=51365a8130f839e7f5f01506cf5f3a4f
diff --git a/metadata/md5-cache/sys-libs/libstatgrab-0.92 b/metadata/md5-cache/sys-libs/libstatgrab-0.92
index 323712054489..8a23b0c0eef3 100644
--- a/metadata/md5-cache/sys-libs/libstatgrab-0.92
+++ b/metadata/md5-cache/sys-libs/libstatgrab-0.92
@@ -1,15 +1,12 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure install
DEPEND=sys-libs/ncurses
DESCRIPTION=A tool to provide access to statistics about the system on which it's run
EAPI=7
HOMEPAGE=https://www.i-scream.org/libstatgrab/
-INHERIT=autotools
IUSE=examples
KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc x86
LICENSE=|| ( GPL-2 LGPL-2.1 )
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-0.92.tar.gz
-_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=0cdf80f46ee0c3ff6d8369c3c4597cd5
+_md5_=b1dc5e259f1b75d34cf2b2b07dd2b9f6
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.1 b/metadata/md5-cache/sys-libs/talloc-2.3.1
index 4aac997f9369..18927e0ec8ce 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.1
@@ -4,7 +4,7 @@ DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x8
DESCRIPTION=Samba talloc library
EAPI=7
HOMEPAGE=https://talloc.samba.org/
-INHERIT=waf-utils python-single-r1 multilib multilib-minimal
+INHERIT=waf-utils python-single-r1 multilib-minimal
IUSE=compat +python python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
LICENSE=GPL-3 LGPL-3+ LGPL-2
@@ -14,4 +14,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.1.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=727a7311c3e4b09c10b4553445cadd88
+_md5_=f65270dce466084833cd5588e60c9b7d
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.2 b/metadata/md5-cache/sys-libs/talloc-2.3.2
index b00f50da7b7e..ddbc35b1eea1 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.2
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.2
@@ -4,7 +4,7 @@ DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x8
DESCRIPTION=Samba talloc library
EAPI=7
HOMEPAGE=https://talloc.samba.org/
-INHERIT=waf-utils python-single-r1 multilib multilib-minimal
+INHERIT=waf-utils python-single-r1 multilib-minimal
IUSE=compat +python python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
LICENSE=GPL-3 LGPL-3+ LGPL-2
@@ -14,4 +14,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.2.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multiprocessing cac3169468f893670dac3e7cb940e045 waf-utils 941688efbf28e7ea7a106e516fc9bc91 python-utils-r1 3ea803de86891185c7b1db2c0b5bc8c8 python-single-r1 d25ac9d5d91fe9d44fda6ec192aca11a multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=d8028cb6558df8b506ba542b7106e875
+_md5_=d3e3e912784379619c4690ba93ab7c98
diff --git a/metadata/md5-cache/sys-power/acpitool-0.5.1-r1 b/metadata/md5-cache/sys-power/acpitool-0.5.1-r1
index 76d1bdd68ab5..e535bf38f80a 100644
--- a/metadata/md5-cache/sys-power/acpitool-0.5.1-r1
+++ b/metadata/md5-cache/sys-power/acpitool-0.5.1-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=prepare
DESCRIPTION=A small command line application, intended to be a replacement for the apm tool
EAPI=5
HOMEPAGE=http://packages.debian.org/sid/acpitool
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/acpitool-0.5.1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=a37b16ac680eb4cf14a8cdad77e73d13
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=bfa49a4520cc35749c315a145e98bf56
diff --git a/metadata/md5-cache/sys-power/pmtools-20110323-r1 b/metadata/md5-cache/sys-power/pmtools-20110323-r1
index 1fcfbd4ea2c5..0e66ac88457a 100644
--- a/metadata/md5-cache/sys-power/pmtools-20110323-r1
+++ b/metadata/md5-cache/sys-power/pmtools-20110323-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Collection of tools for ACPI and power management
EAPI=5
HOMEPAGE=https://github.com/anyc/pmtools/
-INHERIT=eutils flag-o-matic toolchain-funcs
+INHERIT=epatch flag-o-matic toolchain-funcs
IUSE=doc
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl >=sys-power/iasl-20090521
SLOT=0
SRC_URI=https://github.com/anyc/pmtools/tarball/20110323 -> pmtools-20110323.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=24ffa08c1d5692c92b9b7d1d42582bd6
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=299d1eda57b8f0b68d7cf3ad111599b4
diff --git a/metadata/md5-cache/sys-power/powernowd-1.00-r4 b/metadata/md5-cache/sys-power/powernowd-1.00-r4
index d15a62500eea..ed38da588e70 100644
--- a/metadata/md5-cache/sys-power/powernowd-1.00-r4
+++ b/metadata/md5-cache/sys-power/powernowd-1.00-r4
@@ -3,11 +3,11 @@ DEPEND=virtual/pkgconfig
DESCRIPTION=Daemon to control the speed and voltage of CPUs
EAPI=5
HOMEPAGE=http://www.deater.net/john/powernowd.html https://github.com/clemej/powernowd
-INHERIT=eutils linux-info systemd toolchain-funcs
+INHERIT=epatch linux-info systemd toolchain-funcs
IUSE=kernel_linux
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.deater.net/john/powernowd-1.00.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=0714325fd160450c95ce37adf2c182fe
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info 30ded7f9adbdd03d3e848cdd74f6c395 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
+_md5_=1c3c02dd663fee4d6cdf1fa0f37e051f
diff --git a/metadata/md5-cache/sys-process/top-apple-73 b/metadata/md5-cache/sys-process/top-apple-73
index 1cb05ba1678d..d8fc512f1ef4 100644
--- a/metadata/md5-cache/sys-process/top-apple-73
+++ b/metadata/md5-cache/sys-process/top-apple-73
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare
DESCRIPTION=Apple's top from Mac OS X Lion 10.7
EAPI=5
HOMEPAGE=http://www.opensource.apple.com/
-INHERIT=toolchain-funcs eutils
+INHERIT=toolchain-funcs epatch
KEYWORDS=~ppc-macos ~x64-macos
LICENSE=APSL-2 BSD
SLOT=0
SRC_URI=http://www.opensource.apple.com/tarballs/top/top-73.tar.gz http://www.opensource.apple.com/source/libutil/libutil-11/libutil.h?txt -> libutil-11-top-73.h
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=3e3e6dede60a5b45ecee3959bbb67c01
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=118bef1546cc9d9e7f1a6f2165179b06
diff --git a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2 b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
index 5555d52d57a3..46a8c9ed53d7 100644
--- a/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
+++ b/metadata/md5-cache/www-apache/mod_auth_kerb-5.4-r2
@@ -3,11 +3,11 @@ DEPEND=virtual/krb5 =www-servers/apache-2*
DESCRIPTION=An Apache authentication module using Kerberos
EAPI=5
HOMEPAGE=http://modauthkerb.sourceforge.net/
-INHERIT=apache-module eutils tmpfiles
+INHERIT=apache-module epatch tmpfiles
KEYWORDS=amd64 x86
LICENSE=BSD openafs-krb5-a HPND
RDEPEND=virtual/krb5 =www-servers/apache-2* virtual/tmpfiles
SLOT=0
SRC_URI=mirror://sourceforge/modauthkerb/mod_auth_kerb-5.4.tar.gz https://dev.gentoo.org/~mgorny/dist/mod_auth_kerb-5.4-gentoo-patchset.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e tmpfiles 5cd6e8cf3288d5b19ff8b5c78c7e3e31
-_md5_=4d73953c47a3bfc31612d4182719c06b
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e tmpfiles 5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_md5_=8e42cb54d0668071dfae231a1a91e224
diff --git a/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8 b/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
index 61ed1d2819ea..95fa4f52be8e 100644
--- a/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
+++ b/metadata/md5-cache/www-apache/mod_auth_radius-1.5.8
@@ -3,11 +3,11 @@ DEPEND==www-servers/apache-2*
DESCRIPTION=Radius authentication for Apache
EAPI=5
HOMEPAGE=http://freeradius.org/mod_auth_radius/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND==www-servers/apache-2*
SLOT=0
SRC_URI=ftp://ftp.freeradius.org/pub/radius/mod_auth_radius-1.5.8.tar
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=71692ea18eb6b11f69cdb62ca19d8a5e
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=5f9f57def25e67b5402d61139778b50f
diff --git a/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1 b/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
index 0fdf2296a56f..13ce63e7b6f2 100644
--- a/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
+++ b/metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-lang/perl =www-servers/apache-2*
DESCRIPTION=Apache module for cookie based authentication
EAPI=5
HOMEPAGE=http://www.openfusion.com.au/labs/mod_auth_tkt/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND==www-servers/apache-2*
RESTRICT=test
SLOT=0
SRC_URI=http://www.openfusion.com.au/labs/dist/mod_auth_tkt/mod_auth_tkt-2.1.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=f35dd85a4b7faea75fad4112d25575fe
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=a5051c842756e9b26749dccc99177afb
diff --git a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2 b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
index b0ad005e5963..02563d6c2217 100644
--- a/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
+++ b/metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
@@ -3,11 +3,11 @@ DEPEND==www-servers/apache-2.4*
DESCRIPTION=An Apache2 authentication DSO using external programs
EAPI=5
HOMEPAGE=https://github.com/phokz/mod-auth-external
-INHERIT=eutils apache-module
+INHERIT=apache-module
KEYWORDS=amd64 x86
LICENSE=Apache-1.1
RDEPEND==www-servers/apache-2.4*
SLOT=2
SRC_URI=https://mod-auth-external.googlecode.com/files/mod_authnz_external-3.3.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f
-_md5_=529d4d824c4224a00a1a8c9ced88aa84
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f
+_md5_=137c309a7833e01fd69896889477f713
diff --git a/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1 b/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
index fed945bc6ec0..139415b2fa00 100644
--- a/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
+++ b/metadata/md5-cache/www-apache/mod_bw-0.9.2-r1
@@ -3,11 +3,11 @@ DEPEND=sys-devel/libtool =www-servers/apache-2*
DESCRIPTION=Bandwidth Management Module for Apache2
EAPI=5
HOMEPAGE=http://www.ivn.cl/apache/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
KEYWORDS=amd64 ppc x86
LICENSE=Apache-2.0
RDEPEND==www-servers/apache-2*
SLOT=0
SRC_URI=http://ivn.cl/files/source/mod_bw-0.92.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=668d0df7928033f687b7e468120f42c8
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=0895432dbcde2ec26c1ff28d568fb765
diff --git a/metadata/md5-cache/www-apache/mod_caucho-4.0.47 b/metadata/md5-cache/www-apache/mod_caucho-4.0.47
index c18cc975d75c..cd748642e3ad 100644
--- a/metadata/md5-cache/www-apache/mod_caucho-4.0.47
+++ b/metadata/md5-cache/www-apache/mod_caucho-4.0.47
@@ -3,11 +3,11 @@ DEPEND==www-servers/apache-2.4*
DESCRIPTION=mod_caucho connects Resin and Apache2
EAPI=5
HOMEPAGE=http://www.caucho.com/
-INHERIT=eutils apache-module
+INHERIT=apache-module
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND==www-servers/apache-2.4*
SLOT=0
SRC_URI=http://www.caucho.com/download/resin-4.0.47-src.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f
-_md5_=0bbed836d8017b6ea1cf46bb215adf2f
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f
+_md5_=78fca312f0836be4b866051f44a27fc6
diff --git a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1 b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
index 7651c8f721b2..82c30959b6c9 100644
--- a/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
+++ b/metadata/md5-cache/www-apache/mod_dnssd-0.6-r1
@@ -3,11 +3,11 @@ DEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
DESCRIPTION=mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi
EAPI=5
HOMEPAGE=http://0pointer.de/lennart/projects/mod_dnssd/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=BSD
RDEPEND=net-dns/avahi[dbus] =www-servers/apache-2*
SLOT=0
SRC_URI=http://0pointer.de/lennart/projects/mod_dnssd/mod_dnssd-0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=34b5d2146d417cd099d28ae6862201eb
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=f7a82e5405be70af3ee67cc50d8c1ac4
diff --git a/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1 b/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
index dda7334cc67b..3b97db639ab7 100644
--- a/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
+++ b/metadata/md5-cache/www-apache/mod_fcgid-2.3.9-r1
@@ -3,11 +3,11 @@ DEPEND==www-servers/apache-2*
DESCRIPTION=Binary-compatible alternative to mod_fastcgi with better process management
EAPI=5
HOMEPAGE=https://httpd.apache.org/mod_fcgid/
-INHERIT=apache-module eutils multilib
+INHERIT=apache-module multilib
KEYWORDS=amd64 ~hppa ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND==www-servers/apache-2*
SLOT=0
SRC_URI=mirror://apache/httpd/mod_fcgid/mod_fcgid-2.3.9.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=8bf290e957a16a796fb6e1a485da8857
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f
+_md5_=16e4fc4cff748df1e5964b7690b71a4e
diff --git a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2 b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
index e577b82ca770..b285bf9da4ea 100644
--- a/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
+++ b/metadata/md5-cache/www-apache/mod_log_sql-1.101-r2
@@ -3,12 +3,12 @@ DEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0 ) =www-ser
DESCRIPTION=An Apache module for logging to an SQL (MySQL) database
EAPI=5
HOMEPAGE=http://www.outoforder.cc/projects/apache/mod_log_sql/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
IUSE=dbi ssl
KEYWORDS=amd64 ~ppc x86
LICENSE=Artistic
RDEPEND=virtual/mysql dbi? ( dev-db/libdbi ) ssl? ( dev-libs/openssl:0 ) =www-servers/apache-2.4*
SLOT=0
SRC_URI=http://www.outoforder.cc/downloads/mod_log_sql/mod_log_sql-1.101.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=7200b19b3c4f3cf6bd2c55bbde6ecbb7
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=7de59c433da413d1a4275567e8c9f50a
diff --git a/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1 b/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
index 952c80753699..68c67b795781 100644
--- a/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
+++ b/metadata/md5-cache/www-apache/mod_rpaf-0.6-r1
@@ -3,11 +3,11 @@ DEPEND==www-servers/apache-2.4*
DESCRIPTION=Reverse proxy add forward module
EAPI=5
HOMEPAGE=http://stderr.net/apache/rpaf/
-INHERIT=apache-module eutils
+INHERIT=apache-module epatch
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND==www-servers/apache-2.4*
SLOT=0
SRC_URI=http://stderr.net/apache/rpaf/download/mod_rpaf-0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=cde13531836cc63cc52a2cd4732818e6
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 depend.apache d54e0d0bd6b36c476594edc2cee2e332 apache-module 6d6745b832afba32cbcfba34e3ee328f estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=ed0df636dbb5c70b68cd6231d3fcc5bb
diff --git a/metadata/md5-cache/www-apps/cvsweb-3.0.6-r1 b/metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
index 1b24ddae2f86..ae01bccd23c5 100644
--- a/metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
+++ b/metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
@@ -3,12 +3,12 @@ DEPEND=>=app-admin/webapp-config-1.50.15
DESCRIPTION=WWW interface to a CVS tree
EAPI=5
HOMEPAGE=http://www.freebsd.org/projects/cvsweb.html
-INHERIT=eutils webapp
+INHERIT=epatch webapp
IUSE=vhosts
KEYWORDS=~amd64 ~ppc sparc x86
LICENSE=BSD
RDEPEND=>=dev-lang/perl-5.8 >=dev-vcs/cvs-1.11 >=dev-vcs/rcs-5.7 >=dev-perl/URI-1.28 dev-perl/IPC-Run dev-perl/MIME-Types dev-perl/String-Ediff >=dev-vcs/cvsgraph-1.4.0 >=app-text/enscript-1.6.3 >=app-admin/webapp-config-1.50.15
SLOT=3.0.6-r1
SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/cvsweb-3.0.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e webapp 990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=c8ec33509c6ce75eb78492116a7a48b1
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e webapp 990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=1af4dfc63c43db660146b7f6d794d5b9
diff --git a/metadata/md5-cache/www-apps/dotproject-2.1.7-r1 b/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
index 2c0990c3b339..191b3c64f45c 100644
--- a/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
+++ b/metadata/md5-cache/www-apps/dotproject-2.1.7-r1
@@ -3,12 +3,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-
DESCRIPTION=dotProject is a PHP web-based project management framework
EAPI=5
HOMEPAGE=http://www.dotproject.net/
-INHERIT=eutils webapp
+INHERIT=epatch webapp
IUSE=vhosts
KEYWORDS=~amd64 ~ppc ~sparc ~x86
LICENSE=GPL-2
RDEPEND=app-text/poppler[utils] dev-php/PEAR-Date virtual/httpd-php >=app-admin/webapp-config-1.50.15
SLOT=2.1.7-r1
SRC_URI=mirror://sourceforge/dotproject/dotproject-2.1.7.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e webapp 990ad6a000cf18d1ef87117e8c7b0a54
-_md5_=4656ec618d0e44099c7ebaf8a17ce672
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e webapp 990ad6a000cf18d1ef87117e8c7b0a54
+_md5_=d56d5a57fb3cec941a840648961ef73e
diff --git a/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7 b/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
index a1eeb8a127bf..8a19b4cec483 100644
--- a/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
+++ b/metadata/md5-cache/www-apps/liquid_feedback_frontend-2.2.7
@@ -3,11 +3,12 @@ DEPEND=www-apps/rocketwiki-lqfb www-servers/apache >=www-apps/liquid_feedback_co
DESCRIPTION=Internet platforms for proposition development and decision making
EAPI=7
HOMEPAGE=https://www.public-software-group.org/liquid_feedback
+INHERIT=estack toolchain-funcs
IUSE=l10n_de l10n_el l10n_en l10n_eo l10n_it
KEYWORDS=~amd64
LICENSE=HPND CC-BY-2.5
RDEPEND=>=www-apps/liquid_feedback_core-2.2.6
SLOT=0
SRC_URI=https://www.public-software-group.org/pub/projects/liquid_feedback/frontend/v2.2.7/liquid_feedback_frontend-v2.2.7.tar.gz l10n_it? ( mirror://gentoo/liquid_feedback_frontend-italian-2.2.7.tar.gz )
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=7bd625f862442c78a670d8fe2ee5ca80
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d17dc9bea70b403a6bc5db1750efd6cb
diff --git a/metadata/md5-cache/www-client/jd-2.8.5_p120826 b/metadata/md5-cache/www-client/jd-2.8.5_p120826
index 81b3641934af..161de8aed8ec 100644
--- a/metadata/md5-cache/www-client/jd-2.8.5_p120826
+++ b/metadata/md5-cache/www-client/jd-2.8.5_p120826
@@ -3,7 +3,7 @@ DEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/
DESCRIPTION=gtk2 based 2ch browser written in C++
EAPI=6
HOMEPAGE=http://jd4linux.sourceforge.jp/
-INHERIT=eutils autotools flag-o-matic
+INHERIT=desktop autotools flag-o-matic
IUSE=alsa gnutls migemo oniguruma
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs
SLOT=0
SRC_URI=mirror://sourceforge.jp/jd4linux/56721/jd-2.8.5-120826.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=b18e72d3701daedc9f825d71889ba3ab
+_md5_=686e7c0b35fe8970036b6e64344107bf
diff --git a/metadata/md5-cache/www-client/jd-2.8.9_p150226 b/metadata/md5-cache/www-client/jd-2.8.9_p150226
index 618a78c08017..570e4bd23be2 100644
--- a/metadata/md5-cache/www-client/jd-2.8.9_p150226
+++ b/metadata/md5-cache/www-client/jd-2.8.9_p150226
@@ -3,7 +3,7 @@ DEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs/
DESCRIPTION=gtk2 based 2ch browser written in C++
EAPI=6
HOMEPAGE=http://jd4linux.sourceforge.jp/
-INHERIT=eutils autotools flag-o-matic
+INHERIT=autotools desktop flag-o-matic
IUSE=alsa gnutls migemo oniguruma
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/glib:2 sys-libs/zlib x11-libs/libICE x11-libs
SLOT=0
SRC_URI=mirror://sourceforge.jp/jd4linux/62877/jd-2.8.9-150226.tgz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=9bf36964d321332711274cc39bd6b824
+_md5_=478fae79dcd00d7f0c9fce742e6cbd15
diff --git a/metadata/md5-cache/www-client/netrik-1.16.1-r1 b/metadata/md5-cache/www-client/netrik-1.16.1-r1
index 3d25d0426456..ab908bfde036 100644
--- a/metadata/md5-cache/www-client/netrik-1.16.1-r1
+++ b/metadata/md5-cache/www-client/netrik-1.16.1-r1
@@ -3,11 +3,11 @@ DEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline sys-devel/gnuconfig >=a
DESCRIPTION=A text based web browser with no ssl support
EAPI=5
HOMEPAGE=http://netrik.sourceforge.net/
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=amd64 ~sparc x86
LICENSE=GPL-3
RDEPEND=>=sys-libs/ncurses-5.1[unicode] sys-libs/readline
SLOT=0
SRC_URI=mirror://sourceforge/netrik/netrik-1.16.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=439f3459c18af444d8b4d5ca071a45b7
+_md5_=43f7f13a8bf5c550739c7c5a6c069c06
diff --git a/metadata/md5-cache/www-misc/litmus-0.13 b/metadata/md5-cache/www-misc/litmus-0.13
index d9ad58b035f0..c03f5b5bb830 100644
--- a/metadata/md5-cache/www-misc/litmus-0.13
+++ b/metadata/md5-cache/www-misc/litmus-0.13
@@ -3,7 +3,7 @@ DEPEND=net-libs/neon:0=[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] ex
DESCRIPTION=WebDAV server protocol compliance test suite
EAPI=5
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=autotools eutils
+INHERIT=autotools epatch
IUSE=debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/litmus-0.13.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=3655ab513fcd7430902ad8f9802d038f
+_md5_=30b22c5d26809492c932d0ecc0e712e2
diff --git a/metadata/md5-cache/www-plugins/pdfjs-2.4.456 b/metadata/md5-cache/www-plugins/pdfjs-2.4.456
index ab06f6c1ad0c..c101e81e7bc8 100644
--- a/metadata/md5-cache/www-plugins/pdfjs-2.4.456
+++ b/metadata/md5-cache/www-plugins/pdfjs-2.4.456
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install
-DEPEND=app-arch/unzip
DESCRIPTION=A PDF reader in JavaScript
EAPI=7
HOMEPAGE=https://mozilla.github.io/pdf.js/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://github.com/mozilla/pdf.js/releases/download/v2.4.456/pdfjs-2.4.456-dist.zip -> pdfjs-2.4.456.zip
-_md5_=094526fa9f2b32161723f3fd80d8018e
+_md5_=bd481478d9bd9f47adf5a431849e47e5
diff --git a/metadata/md5-cache/www-plugins/pdfjs-2.5.207 b/metadata/md5-cache/www-plugins/pdfjs-2.5.207
index ad86cb090bd7..6a28bed4b713 100644
--- a/metadata/md5-cache/www-plugins/pdfjs-2.5.207
+++ b/metadata/md5-cache/www-plugins/pdfjs-2.5.207
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/unzip
DEFINED_PHASES=install
-DEPEND=app-arch/unzip
DESCRIPTION=A PDF reader in JavaScript
EAPI=7
HOMEPAGE=https://mozilla.github.io/pdf.js/
@@ -7,4 +7,4 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://github.com/mozilla/pdf.js/releases/download/v2.5.207/pdfjs-2.5.207-dist.zip -> pdfjs-2.5.207.zip
-_md5_=094526fa9f2b32161723f3fd80d8018e
+_md5_=bd481478d9bd9f47adf5a431849e47e5
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1 b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
index b73c523f0c31..982387018155 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
+++ b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
@@ -3,7 +3,7 @@ DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= )
DESCRIPTION=A small, fast, and scalable web server
EAPI=5
HOMEPAGE=http://www.monkey-project.com/
-INHERIT=eutils flag-o-matic toolchain-funcs user multilib
+INHERIT=epatch flag-o-matic toolchain-funcs user multilib
IUSE=cgi -debug fastcgi php static-plugins monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls
KEYWORDS=amd64 arm ~mips ppc ppc64 x86
LICENSE=GPL-2
@@ -11,5 +11,5 @@ RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
SLOT=0
SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=05daf626217e52e9d521ee60d78f97cf
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
+_md5_=a94b8d67811d4af0c058d131631657f7
diff --git a/metadata/md5-cache/www-servers/monkeyd-9999 b/metadata/md5-cache/www-servers/monkeyd-9999
index 818ae79259d5..a81862267ffa 100644
--- a/metadata/md5-cache/www-servers/monkeyd-9999
+++ b/metadata/md5-cache/www-servers/monkeyd-9999
@@ -3,12 +3,12 @@ DEPEND=dev-util/cmake monkeyd_plugins_tls? ( net-libs/mbedtls:= ) >=dev-vcs/git-
DESCRIPTION=A small, fast, and scalable web server
EAPI=5
HOMEPAGE=http://www.monkey-project.com/
-INHERIT=eutils flag-o-matic toolchain-funcs user multilib git-r3
+INHERIT=epatch flag-o-matic toolchain-funcs user multilib git-r3
IUSE=cgi -debug fastcgi php static-plugins monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls
LICENSE=GPL-2
PROPERTIES=live
RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=a34719f3cc8a9370f931ab95c1075ab5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2 git-r3 b8e8c92aa5fe8df7187e466138eb4e52
+_md5_=f22d44daf8f030df02c96b3d6633f62a
diff --git a/metadata/md5-cache/www-servers/resin-4.0.48-r1 b/metadata/md5-cache/www-servers/resin-4.0.48-r1
index ff973f04db1b..2439f4cc93a0 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.48-r1
+++ b/metadata/md5-cache/www-servers/resin-4.0.48-r1
@@ -3,7 +3,7 @@ DEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-jav
DESCRIPTION=A fast Servlet and JSP engine
EAPI=5
HOMEPAGE=http://www.caucho.com
-INHERIT=java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+INHERIT=java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
IUSE=admin doc elibc_FreeBSD source elibc_FreeBSD
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-ja
SLOT=0
SRC_URI=http://www.caucho.com/download/resin-4.0.48-src.zip
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e versionator d3fb3ba33acc3bbbdc4d7970227c100d java-utils-2 2440f41421207d084e5e3f1fb001b34e java-pkg-2 45c44ec10db6affb3ebee1ac72039888 java-ant-2 51fb0a4707d58382310390ad47ab0ab0 flag-o-matic c0964e43ba712cb933da5f65b958fa88 user-info a2abd4e2f4c3b9b06d64bf1329359a02 user 26d8ce6329c43cbac965617f1c0627e2
-_md5_=ba7bd3256fbca927efc014a2d51d24f9
+_md5_=2077e71bcec22e7dcef02cae441c1bc9
diff --git a/metadata/md5-cache/x11-libs/goocanvas-1.0.0 b/metadata/md5-cache/x11-libs/goocanvas-1.0.0
index 17930b68b5b3..2787dc4512b3 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-1.0.0
+++ b/metadata/md5-cache/x11-libs/goocanvas-1.0.0
@@ -3,12 +3,12 @@ DEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.10:2 >=x11-libs/cairo-1.4 dev-ut
DESCRIPTION=Canvas widget for GTK+ using the cairo 2D library for drawing
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Projects/GooCanvas
-INHERIT=eutils gnome2 libtool
+INHERIT=epatch gnome2
IUSE=examples
KEYWORDS=~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2
RDEPEND=>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.10:2 >=x11-libs/cairo-1.4
SLOT=0
SRC_URI=mirror://gnome/sources/goocanvas/1.0/goocanvas-1.0.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=89832576bf383edbfc658461b1aad514
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
+_md5_=810950b669b741b0fcf635e82ff60458
diff --git a/metadata/md5-cache/x11-libs/mx-1.4.7-r2 b/metadata/md5-cache/x11-libs/mx-1.4.7-r2
index 7ee285f6105a..2d88bed04a39 100644
--- a/metadata/md5-cache/x11-libs/mx-1.4.7-r2
+++ b/metadata/md5-cache/x11-libs/mx-1.4.7-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.28.0:2 >=media-libs/clutter-1.7.91:1.0 media-libs/cogl:
DESCRIPTION=A widget toolkit using Clutter
EAPI=5
HOMEPAGE=http://clutter-project.org/
-INHERIT=gnome2 eutils
+INHERIT=gnome2 epatch
IUSE=dbus +gtk +introspection startup-notification debug
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.28.0:2 >=media-libs/clutter-1.7.91:1.0 media-libs/cogl
SLOT=1.0
SRC_URI=https://github.com/downloads/clutter-project/mx/mx-1.4.7.tar.xz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e libtool f143db5a74ccd9ca28c1234deffede96 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=d02e638b33e40f8950ff85dab498cd44
+_md5_=8af13893f0ef5149d43f6058a2c0c8a4
diff --git a/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1 b/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
index 9a7e896da913..83187fe07104 100644
--- a/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
+++ b/metadata/md5-cache/x11-libs/xosd-2.2.14_p2_p1
@@ -3,12 +3,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-mis
DESCRIPTION=Library for overlaying text in X-Windows X-On-Screen-Display
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/libxosd/
-INHERIT=eutils autotools versionator
+INHERIT=epatch autotools versionator
IUSE=static-libs xinerama
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXt media-fonts/font-misc-misc
SLOT=0
SRC_URI=mirror://debian/pool/main/x/xosd/xosd_2.2.14.orig.tar.gz mirror://debian/pool/main/x/xosd/xosd_2.2.14-2.1.debian.tar.xz http://digilander.libero.it/dgp85/gentoo/xosd-gentoo-m4-1.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=9ae8f832d0f5b940d2d683774a77beaa
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d
+_md5_=a3c17a8b57dcfbf3bcc50d3da053974e
diff --git a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1 b/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
index 19223a83d002..2d9458091c94 100644
--- a/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
+++ b/metadata/md5-cache/x11-misc/3dfb-0.6.1-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/glib:2 media-libs/freeglut virtual/opengl x11-libs/libXmu virtua
DESCRIPTION=3D File Browser
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/dz3d/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 media-libs/freeglut virtual/opengl x11-libs/libXmu
SLOT=0
SRC_URI=mirror://sourceforge/dz3d/3dfb-0.6.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=ecf9b29c482e6dbdc98dcee82c22d011
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=5fab99c3318383027609ce635c7e78c3
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.6 b/metadata/md5-cache/x11-misc/dmenu-4.6
index e1ac48365156..42e4f7d9ee3e 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.6
+++ b/metadata/md5-cache/x11-misc/dmenu-4.6
@@ -3,12 +3,12 @@ DEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-lib
DESCRIPTION=a generic, highly customizable, and efficient menu for the X Window System
EAPI=5
HOMEPAGE=https://tools.suckless.org/dmenu/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=xinerama
KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
LICENSE=MIT
RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=https://dl.suckless.org/tools/dmenu-4.6.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=8fbc6a563665d1e9630bd5b6928e2d43
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=7ca8d58b429943ec2cb5fe8edd0d7e5d
diff --git a/metadata/md5-cache/x11-misc/grun-0.9.3-r1 b/metadata/md5-cache/x11-misc/grun-0.9.3-r1
index 2d9db62aefeb..aa05d3626d41 100644
--- a/metadata/md5-cache/x11-misc/grun-0.9.3-r1
+++ b/metadata/md5-cache/x11-misc/grun-0.9.3-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig nls
DESCRIPTION=A GTK based Run dialog resembling the Windows Run dialog, just like xexec
EAPI=5
HOMEPAGE=https://github.com/lrgc/grun
-INHERIT=eutils
+INHERIT=epatch
IUSE=nls
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
SLOT=0
SRC_URI=https://grun.googlecode.com/files/grun-0.9.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=1bd83f9e220a9027a5813e572a8fd381
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=10414fc14cb616339e9b64b18a7abdb2
diff --git a/metadata/md5-cache/x11-misc/kbdd-0.7.1 b/metadata/md5-cache/x11-misc/kbdd-0.7.1
index c9fd578ce325..698dd20d964a 100644
--- a/metadata/md5-cache/x11-misc/kbdd-0.7.1
+++ b/metadata/md5-cache/x11-misc/kbdd-0.7.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/d
DESCRIPTION=Very simple layout switcher
EAPI=5
HOMEPAGE=https://github.com/qnikst/kbdd
-INHERIT=autotools eutils vcs-snapshot
+INHERIT=autotools vcs-snapshot
IUSE=dbus
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2= x11-libs/libX11:0= dbus? ( sys-apps/dbus:0= >=dev-libs/
SLOT=0
SRC_URI=https://github.com/qnikst/kbdd/tarball/v0.7.1 -> kbdd-0.7.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd
-_md5_=2e4f19ed6f86d410d847016e99106ac3
+_md5_=7a883bc7373ad1de42fca0018322ec63
diff --git a/metadata/md5-cache/x11-misc/openbox-menu-0.8.0 b/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
index f2eb2e2b2def..a0c51ef849cf 100644
--- a/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
+++ b/metadata/md5-cache/x11-misc/openbox-menu-0.8.0
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=Another dynamic menu generator for Openbox
EAPI=5
HOMEPAGE=http://fabrice.thiroux.free.fr/openbox-menu_en.html
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
IUSE=+icons svg
KEYWORDS=amd64 x86
LICENSE=GPL-3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 lxde-base/menu-cache x11-libs/gtk+:2 icons? ( x11-wm/ope
REQUIRED_USE=svg? ( icons )
SLOT=0
SRC_URI=https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-0.8.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=dae71d9210088fc5a041e99b70c17f3d
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=a5932e7523eeccff80edddfd36188878
diff --git a/metadata/md5-cache/x11-misc/slim-1.3.6-r5 b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
index 3dd5b2cd09d7..1c237e933e9d 100644
--- a/metadata/md5-cache/x11-misc/slim-1.3.6-r5
+++ b/metadata/md5-cache/x11-misc/slim-1.3.6-r5
@@ -3,7 +3,7 @@ DEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs/
DESCRIPTION=Simple Login Manager
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/slim.berlios/
-INHERIT=cmake-utils pam eutils systemd versionator
+INHERIT=cmake-utils pam systemd versionator
IUSE=branding pam
KEYWORDS=amd64 arm ~arm64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-libs/libXpm x11-libs/libXft x11-libs
SLOT=0
SRC_URI=mirror://sourceforge/project/slim.berlios/slim-1.3.6.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 xdg-utils ff2ff954e6b17929574eee4efc5152ba cmake-utils 12008d68ebfd61f49a377c49f83558a8 pam b097695df28f3974e3af860d6704d4f2 systemd fdf0d765c3f11f91fe54f8def9a8c0e6 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=7e75715e4adc1985bfc802dd5796e408
+_md5_=d637bb7126af5c62392306f755c5625b
diff --git a/metadata/md5-cache/x11-misc/whaw-0.2 b/metadata/md5-cache/x11-misc/whaw-0.2
index 2bd9bcd6919e..6aa5eef65e34 100644
--- a/metadata/md5-cache/x11-misc/whaw-0.2
+++ b/metadata/md5-cache/x11-misc/whaw-0.2
@@ -3,11 +3,11 @@ DEPEND=dev-libs/popt x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu
DESCRIPTION=Window manager independent Window Layout tool
EAPI=5
HOMEPAGE=http://repetae.net/computer/whaw/
-INHERIT=eutils
+INHERIT=epatch
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/popt x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu
SLOT=0
SRC_URI=http://repetae.net/computer/whaw/drop/whaw-0.2.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=84138c7c4542bb101955c5c9bfa7d00a
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
+_md5_=0a4769c784517ed940bbda218e9416eb
diff --git a/metadata/md5-cache/x11-misc/xcape-1.1 b/metadata/md5-cache/x11-misc/xcape-1.1
index 28e17ea14466..845db5a33f09 100644
--- a/metadata/md5-cache/x11-misc/xcape-1.1
+++ b/metadata/md5-cache/x11-misc/xcape-1.1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst virtual/pkgconfig
DESCRIPTION=Utility to make modifier keys send custom key events when pressed on their own
EAPI=5
HOMEPAGE=https://github.com/alols/xcape
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=x11-libs/libX11 x11-libs/libXtst
SLOT=0
SRC_URI=https://github.com/alols/xcape/archive/v1.1.tar.gz -> xcape-1.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=dcc541a3dc413340ead8a8c8d4911130
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=58f2f512048302ecf90ed8e83b5c0842
diff --git a/metadata/md5-cache/x11-misc/xdock-0.3.0 b/metadata/md5-cache/x11-misc/xdock-0.3.0
index a6adaab72895..940bb43e5b95 100644
--- a/metadata/md5-cache/x11-misc/xdock-0.3.0
+++ b/metadata/md5-cache/x11-misc/xdock-0.3.0
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 ||
DESCRIPTION=emulates Window Maker docks (runs in any window manager)
EAPI=5
HOMEPAGE=http://xdock.sourceforge.net
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=79263f6f1f8d3b5fd0e843177314feff
+_md5_=c9616d52647af77e76542242dd99c206
diff --git a/metadata/md5-cache/x11-misc/xrestop-0.4 b/metadata/md5-cache/x11-misc/xrestop-0.4
index da0769bf865c..4a9544d77654 100644
--- a/metadata/md5-cache/x11-misc/xrestop-0.4
+++ b/metadata/md5-cache/x11-misc/xrestop-0.4
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt virtual/pkgconfig x11-bas
DESCRIPTION='Top' like statistics of X11 client's server side resource usage
EAPI=5
HOMEPAGE=https://www.freedesktop.org/wiki/Software/xrestop
-INHERIT=autotools eutils
+INHERIT=autotools epatch
KEYWORDS=~alpha amd64 ~hppa ppc ~ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXres x11-libs/libXt
SLOT=0
SRC_URI=http://projects.o-hand.com/sources/xrestop/xrestop-0.4.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=155bf45fb85be71f3914d9c74ce816a0
+_md5_=a3720b31ea63dd9cd1b31c1c8fe054b8
diff --git a/metadata/md5-cache/x11-misc/xssstate-1.1 b/metadata/md5-cache/x11-misc/xssstate-1.1
index 4a2ba24ce1b5..78eea0001ce1 100644
--- a/metadata/md5-cache/x11-misc/xssstate-1.1
+++ b/metadata/md5-cache/x11-misc/xssstate-1.1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver x11-base/xorg-proto
DESCRIPTION=A simple tool to retrieve the X screensaver state
EAPI=5
HOMEPAGE=https://tools.suckless.org/x/xssstate
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
SLOT=0
SRC_URI=https://dl.suckless.org/tools/xssstate-1.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=62fe40f11268c4dd69fffdc981ce18aa
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d9c5ca2c30e14f31af9bc2a64a9b5565
diff --git a/metadata/md5-cache/x11-plugins/asapm-3.1-r1 b/metadata/md5-cache/x11-plugins/asapm-3.1-r1
index 06b2184487bd..995fc255af94 100644
--- a/metadata/md5-cache/x11-plugins/asapm-3.1-r1
+++ b/metadata/md5-cache/x11-plugins/asapm-3.1-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXpm x11-base/xorg-proto sys-devel/gnuconfig >
DESCRIPTION=APM monitor for AfterStep
EAPI=5
HOMEPAGE=http://tigr.net/afterstep/applets/
-INHERIT=autotools eutils toolchain-funcs
+INHERIT=autotools epatch toolchain-funcs
KEYWORDS=~amd64 ~ppc -sparc ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXpm
SLOT=0
SRC_URI=http://www.tigr.net/afterstep/download/asapm/asapm-3.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=8476ceaacce89cc8f842c0c34332253c
+_md5_=07b33b39c8f1fa00ecc4af7568f1d238
diff --git a/metadata/md5-cache/x11-plugins/docker-1.5-r1 b/metadata/md5-cache/x11-plugins/docker-1.5-r1
index 3707e694627c..4ac340ec0d8a 100644
--- a/metadata/md5-cache/x11-plugins/docker-1.5-r1
+++ b/metadata/md5-cache/x11-plugins/docker-1.5-r1
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 virtual/pkgconfig
DESCRIPTION=Openbox app which acts as a system tray for KDE and GNOME2
EAPI=5
HOMEPAGE=https://icculus.org/openbox/2/docker/
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=~alpha amd64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11
SLOT=0
SRC_URI=https://icculus.org/openbox/2/docker/docker-1.5.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=e084fcbea2f8781ff06a2908dfe1b0fa
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=f67a07c8bd0c1b17f771c31f2aed2ceb
diff --git a/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3 b/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3
index 895e7ff962cd..aaca95609a57 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3
+++ b/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3
@@ -3,11 +3,11 @@ DEPEND=app-crypt/gpgme net-im/pidgin virtual/pkgconfig sys-devel/gnuconfig >=app
DESCRIPTION=Pidgin GPG/OpenPGP (XEP-0027) plugin
EAPI=5
HOMEPAGE=https://github.com/Draghtnod/Pidgin-GPG
-INHERIT=autotools eutils ltprune
+INHERIT=autotools ltprune
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=app-crypt/gpgme net-im/pidgin
SLOT=0
SRC_URI=https://github.com/Draghtnod/Pidgin-GPG/archive/v0.9.3.tar.gz -> pidgin-gpg-0.9.3.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=83938bc79502237882d591c0be1e17ec
+_md5_=5a074fb3ebca7bafaf69b3944657cff9
diff --git a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1 b/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
index 92a71ac1a870..4921f2609c3d 100644
--- a/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
+++ b/metadata/md5-cache/x11-plugins/wmSpaceWeather-1.04_p19-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=dockapp showing weather at geosynchronous orbit
EAPI=6
HOMEPAGE=https://www.dockapps.net/wmspaceweather
-INHERIT=eutils toolchain-funcs
+INHERIT=epatch toolchain-funcs
KEYWORDS=amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm net-misc/curl dev-lang/perl
SLOT=0
SRC_URI=mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04.orig.tar.gz mirror://debian/pool/main/w/wmspaceweather/wmspaceweather_1.04-19.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=9940327c1574b625710e2e78dcf5e503
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=c994fbcb2762cdda217bbd74a31cde5c
diff --git a/metadata/md5-cache/x11-plugins/wmmand-1.3.2-r1 b/metadata/md5-cache/x11-plugins/wmmand-1.3.2-r1
index 7f23d7e1d94e..18118421d5a7 100644
--- a/metadata/md5-cache/x11-plugins/wmmand-1.3.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmmand-1.3.2-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
DESCRIPTION=a dockable mandelbrot browser
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/wmmand/
-INHERIT=eutils toolchain-funcs
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
SLOT=0
SRC_URI=mirror://sourceforge/wmmand/wmMand-1.3.2.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e
-_md5_=28e087869c0c6065e49968c0c1c7438b
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=06c892a920b09b301590e147be017960
diff --git a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1 b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
index 8aefbe52a4df..276c4c032992 100644
--- a/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
+++ b/metadata/md5-cache/x11-themes/gartoon-redux-1.10-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/perl dev-perl/Switch gnome-base/librsvg
DESCRIPTION=A massively improved variant of the well-known Gartoon theme
EAPI=5
HOMEPAGE=https://gnome-look.org/content/show.php/?content=74841
-INHERIT=eutils gnome2-utils
+INHERIT=epatch gnome2-utils
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RESTRICT=binchecks strip
SLOT=0
SRC_URI=http://tweenk.artfx.pl/gartoon/source/gartoon-redux-1.10.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
-_md5_=6bd90e730b487383946dc8ab73e565b5
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
+_md5_=9d98803e9906f884c92c2525a17dc7d8
diff --git a/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1 b/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
index 53f35f5816b7..ef0e4f23950c 100644
--- a/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
+++ b/metadata/md5-cache/x11-themes/gnustep-neos-theme-0.1
@@ -3,7 +3,7 @@ DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
DESCRIPTION=GNUstep theme closely following the original NeXT look and feel
EAPI=5
HOMEPAGE=http://gap.nongnu.org/themes/index.html
-INHERIT=eutils gnustep-2 vcs-clean
+INHERIT=gnustep-2 vcs-clean
IUSE=debug doc
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/gap/Neos-0.1.theme.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a gnustep-2 1051c5dfb0d9429bef576c60536dac89
-_md5_=6d18e342eea6c65f2a1e611526dde6ad
+_md5_=edf37eb464b9da685403462e295f696b
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2 b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
index 3647673f032a..79f3c64530b1 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
+++ b/metadata/md5-cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-p
DESCRIPTION=Theme engine based on GTK pixmap engine using the Plasma color scheme
EAPI=5
HOMEPAGE=http://www.kde-look.org/content/show.php?content=7043
-INHERIT=autotools eutils gnome2
+INHERIT=autotools epatch gnome2
KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=http://www.cpdrummond.freeuk.com/QtPixmap-0.28.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 eapi7-ver f9ec87e93172b25ce65a85303dc06964 versionator d3fb3ba33acc3bbbdc4d7970227c100d gnome.org df5c6c53843e1be0aad724138e78bbc3 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3 xdg c7ba313ea1eaf266f95cc6235f7d6a07 gnome2 c156bb2ac81c822dd861424ce19bc168
-_md5_=3e04bba2551c127724dd3bd5747d69ab
+_md5_=4ad3e5acbd5dc3397f6076e9ff668f45
diff --git a/metadata/md5-cache/x11-themes/light-themes-20.10-r2 b/metadata/md5-cache/x11-themes/light-themes-20.10-r2
index 648afbbc0b51..662dbc6cef62 100644
--- a/metadata/md5-cache/x11-themes/light-themes-20.10-r2
+++ b/metadata/md5-cache/x11-themes/light-themes-20.10-r2
@@ -1,5 +1,5 @@
+BDEPEND=app-arch/xz-utils
DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/xz-utils
DESCRIPTION=GTK2/GTK3 Ambiance and Radiance themes from Ubuntu
EAPI=7
HOMEPAGE=https://packages.ubuntu.com/zesty/light-themes
@@ -8,4 +8,4 @@ LICENSE=CC-BY-SA-3.0 CC-BY-SA-4.0
RDEPEND=x11-themes/gtk-engines-murrine
SLOT=0
SRC_URI=mirror://ubuntu/pool/main/u/ubuntu-themes/ubuntu-themes_20.10.orig.tar.gz https://dev.gentoo.org/~pacho/light-themes/Gentoo-Buttons-r1.tar.xz
-_md5_=ffd2e5e619db31e3ecceab015a06dab3
+_md5_=edd77e875ccecc5ab059d6effee46d6e
diff --git a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4 b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
index cadfa0b54fe0..b95a1aa78d9c 100644
--- a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
+++ b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
@@ -3,7 +3,7 @@ DEPEND=x11-libs/gtk+:2 dev-util/intltool media-gfx/icon-slicer virtual/pkgconfig
DESCRIPTION=RedHat's Bluecurve theme for GTK2, KDE, GDM, Metacity and Nautilus
EAPI=5
HOMEPAGE=https://www.redhat.com
-INHERIT=autotools eutils rpm
+INHERIT=autotools epatch rpm
IUSE=audacious cursors gdm icons nautilus
KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc sparc x86
LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/redhat-artwork-5.0.8-4.fc7.src.rpm
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e l10n 8cdd85e169b835d518bc2fd59f780d8e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa preserve-libs ef207dc62baddfddfd39a164d9797648 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 rpm 760ff223c2c4299b68ea901e24c4cabd
-_md5_=94fa23684f3b15c79a706baf7e031a5f
+_md5_=4ca2e2e1530d59d00d86f086b5650215
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index ea5f245f3a8e..0d499c506f37 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -10159,7 +10159,7 @@ dev-ruby/gnuplot 2.6.2-r2: Gnuplot drawing library - Ruby Bindings
dev-ruby/google-protobuf 3.12.4 3.13.0 3.14.0: Protocol Buffers are Google's data interchange format
dev-ruby/gpgme 2.0.20: Ruby language binding for GnuPG Made Easy
dev-ruby/gruff 0.7.0-r2 0.8.0 0.12.1: Beautiful graphs for one or multiple datasets
-dev-ruby/haml 5.1.2: A ruby web page templating engine
+dev-ruby/haml 5.1.2 5.1.2-r1: A ruby web page templating engine
dev-ruby/haml-rails 2.0.0 2.0.1: Provides Haml generators for Rails 4
dev-ruby/hamster 3.0.0-r1: Efficient, immutable, thread-safe collection classes for Ruby
dev-ruby/hashdiff 1.0.0 1.0.1: Simple Hash extension to make working with nested hashes easier
@@ -13157,7 +13157,7 @@ media-gfx/xfig 3.2.7b: A menu-driven tool to draw and manipulate objects interac
media-gfx/xli 1.17.0-r5: X Load Image: view images or load them to root window
media-gfx/xloadimage 4.1-r12: utility to view many different types of images under X11
media-gfx/xpaint 2.10.2-r1 3.1.3: Image editor with tiff, jpeg and png support
-media-gfx/xsane 0.999-r3: graphical scanning frontend
+media-gfx/xsane 0.999-r3: Graphical scanning frontend
media-gfx/xv 3.10a-r19: Interactive image manipulation program supporting a wide variety of formats
media-gfx/xzgv 0.9.1: Fast and simple GTK+ image viewer
media-gfx/yafaray 3.4.1 3.5.1: A free open-source montecarlo raytracing engine
@@ -17159,7 +17159,7 @@ sys-apps/pcmciautils 018_p8-r3: PCMCIA userspace utilities for Linux
sys-apps/pcsc-lite 1.9.0 1.9.1: PC/SC Architecture smartcard middleware library
sys-apps/pcsc-slb-rf72-drv 1.1.0-r2: Schlumberger Reflex 72 Serial Smartcard Reader
sys-apps/pcsc-tools 1.5.6 1.5.7: PC/SC Architecture smartcard tools
-sys-apps/pick 4.0.0: a fuzzy search tool for the command-line
+sys-apps/pick 4.0.0: A fuzzy search tool for the command-line
sys-apps/pkgcore 0.11.2-r2 0.11.5-r3 0.11.6-r1 0.11.8-r1 9999: a framework for package management
sys-apps/plocate 1.1.5 1.1.6: Posting locate is a much faster locate
sys-apps/pmount 0.9.99_alpha-r6: Policy based mounter that gives the ability to mount removable devices as a user
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 13be6cf898ad..672d68b91108 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Apr 2021 05:52:08 +0000
+Sun, 18 Apr 2021 06:22:22 +0000