summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-04-19 19:20:16 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-04-19 19:20:16 +0000
commit9251232b13b97a496d31abaa161c549ea046f04c (patch)
treeb3156335986d9e6005208bc6fffa40a1aab2c933
parentMerge updates from master (diff)
downloadgentoo-9251232b13b97a496d31abaa161c549ea046f04c.tar.gz
gentoo-9251232b13b97a496d31abaa161c549ea046f04c.tar.bz2
gentoo-9251232b13b97a496d31abaa161c549ea046f04c.zip
2021-04-19 19:20:12 UTC
-rw-r--r--metadata/md5-cache/app-doc/psmark-2.110
-rw-r--r--metadata/md5-cache/app-laptop/ibam-0.5.2-r47
-rw-r--r--metadata/md5-cache/app-misc/dvorak7min-1.6.1-r15
-rw-r--r--metadata/md5-cache/app-misc/gcal-3.6.39
-rw-r--r--metadata/md5-cache/app-misc/gcal-4.19
-rw-r--r--metadata/md5-cache/app-misc/hexcompare-1.0.415
-rw-r--r--metadata/md5-cache/app-misc/mmv-1.01b_p18-r111
-rw-r--r--metadata/md5-cache/app-misc/wcd-5.2.74
-rw-r--r--metadata/md5-cache/app-misc/wcd-5.3.44
-rw-r--r--metadata/md5-cache/app-misc/wcd-6.0.14
-rw-r--r--metadata/md5-cache/app-misc/wcd-6.0.26
-rw-r--r--metadata/md5-cache/app-misc/ytree-2.027
-rw-r--r--metadata/md5-cache/app-misc/ytree-2.037
-rw-r--r--metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r24
-rw-r--r--metadata/md5-cache/app-shells/hstr-2.04
-rw-r--r--metadata/md5-cache/app-shells/hstr-2.14
-rw-r--r--metadata/md5-cache/app-shells/hstr-2.28
-rw-r--r--metadata/md5-cache/app-text/bogosort-0.4.2-r19
-rw-r--r--metadata/md5-cache/app-text/code2html-0.9.1-r28
-rw-r--r--metadata/md5-cache/app-text/dos2unix-7.3.514
-rw-r--r--metadata/md5-cache/app-text/dos2unix-7.4.115
-rw-r--r--metadata/md5-cache/app-text/letterize-1.49
-rw-r--r--metadata/md5-cache/app-text/llpp-335
-rw-r--r--metadata/md5-cache/app-text/paps-0.6.8-r211
-rw-r--r--metadata/md5-cache/app-text/spellutils-0.712
-rw-r--r--metadata/md5-cache/app-text/talkfilters-2.3.8-r18
-rw-r--r--metadata/md5-cache/app-text/teseq-1.1.14
-rw-r--r--metadata/md5-cache/app-text/tokyodystopia-0.9.152
-rw-r--r--metadata/md5-cache/app-text/ttf2pt1-3.4.4-r19
-rw-r--r--metadata/md5-cache/app-text/txt2pdbdoc-1.4.49
-rw-r--r--metadata/md5-cache/app-text/xlhtml-0.5.1_p610
-rw-r--r--metadata/md5-cache/app-text/xmlto-0.0.28-r36
-rw-r--r--metadata/md5-cache/dev-cpp/metslib-0.5.34
-rw-r--r--metadata/md5-cache/dev-cpp/muParser-2.2.6.16
-rw-r--r--metadata/md5-cache/dev-cpp/picojson-1.3.07
-rw-r--r--metadata/md5-cache/dev-cpp/pstreams-1.0.19
-rw-r--r--metadata/md5-cache/dev-db/cdb-0.75-r48
-rw-r--r--metadata/md5-cache/dev-embedded/libjaylink-0.2.04
-rw-r--r--metadata/md5-cache/dev-games/clanlib-2.3.7-r16
-rw-r--r--metadata/md5-cache/dev-games/clanlib-4.0.04
-rw-r--r--metadata/md5-cache/dev-libs/ucl-1.03-r111
-rw-r--r--metadata/md5-cache/dev-lua/lanes-3.13.0-r1002
-rw-r--r--metadata/md5-cache/dev-ml/cinaps-0.15.04
-rw-r--r--metadata/md5-cache/dev-util/egypt-1.1015
-rw-r--r--metadata/md5-cache/dev-util/linklint-2.3.54
-rw-r--r--metadata/md5-cache/dev-util/mutrace-0.2-r18
-rw-r--r--metadata/md5-cache/dev-util/shflags-1.0.310
-rw-r--r--metadata/md5-cache/dev-util/splint-3.1.2-r211
-rw-r--r--metadata/md5-cache/dev-util/txt2regex-0.8-r36
-rw-r--r--metadata/md5-cache/dev-util/visual-regexp-3.0-r110
-rw-r--r--metadata/md5-cache/dev-util/visual-regexp-3.18
-rw-r--r--metadata/md5-cache/dev-util/xxdi-1.0.04
-rw-r--r--metadata/md5-cache/dev-vcs/git-mailz-0.1410
-rw-r--r--metadata/md5-cache/games-action/battalion-1.4b-r17
-rw-r--r--metadata/md5-cache/games-action/wordwarvi-1.00-r15
-rw-r--r--metadata/md5-cache/games-arcade/aop-0.6-r24
-rw-r--r--metadata/md5-cache/games-arcade/methane-1.5.1-r18
-rw-r--r--metadata/md5-cache/games-emulation/fbzx-3.0.0-r13
-rw-r--r--metadata/md5-cache/games-emulation/nestra-0.66-r38
-rw-r--r--metadata/md5-cache/games-puzzle/groundhog-1.4-r111
-rw-r--r--metadata/md5-cache/games-puzzle/picpuz-2.5-r14
-rw-r--r--metadata/md5-cache/games-util/higan-purify-032
-rw-r--r--metadata/md5-cache/gnustep-base/mknfonts-0.5-r37
-rw-r--r--metadata/md5-cache/mail-client/mailx-support-20060102-r28
-rw-r--r--metadata/md5-cache/mail-filter/libspf2-1.2.1012
-rw-r--r--metadata/md5-cache/mail-filter/rblcheck-1.5-r210
-rw-r--r--metadata/md5-cache/mail-filter/spamdyke-4.3.014
-rw-r--r--metadata/md5-cache/media-gfx/fondu-20060102-r16
-rw-r--r--metadata/md5-cache/media-gfx/png2ico-2002.12.088
-rw-r--r--metadata/md5-cache/media-gfx/pngnq-1.111
-rw-r--r--metadata/md5-cache/media-gfx/xzgv-0.9.113
-rw-r--r--metadata/md5-cache/media-libs/openctm-1.0.3-r15
-rw-r--r--metadata/md5-cache/media-libs/sge-0308095
-rw-r--r--metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r14
-rw-r--r--metadata/md5-cache/media-radio/direwolf-1.413
-rw-r--r--metadata/md5-cache/media-radio/qrq-0.3.36
-rw-r--r--metadata/md5-cache/media-sound/bristol-0.60.11-r22
-rw-r--r--metadata/md5-cache/media-sound/herrie-2.2-r12
-rw-r--r--metadata/md5-cache/media-sound/jaaa-0.9.26
-rw-r--r--metadata/md5-cache/media-sound/jack_capture-0.9.734
-rw-r--r--metadata/md5-cache/media-sound/jack_capture-99994
-rw-r--r--metadata/md5-cache/media-video/mpeg-tools-1.5b-r58
-rw-r--r--metadata/md5-cache/net-analyzer/nagircbot-0.0.335
-rw-r--r--metadata/md5-cache/net-ftp/tftp-hpa-5.2-r24
-rw-r--r--metadata/md5-cache/net-ftp/yafc-1.3.716
-rw-r--r--metadata/md5-cache/net-im/cpop-0.0.4-r18
-rw-r--r--metadata/md5-cache/net-libs/gsnmp-0.3.011
-rw-r--r--metadata/md5-cache/net-libs/openmq-cclient-4.4.14
-rw-r--r--metadata/md5-cache/net-misc/cbugzilla-0.2.18
-rw-r--r--metadata/md5-cache/net-misc/connect-1.10310
-rw-r--r--metadata/md5-cache/net-misc/httptype-1.3.9-r14
-rw-r--r--metadata/md5-cache/net-misc/pedro-1.66
-rw-r--r--metadata/md5-cache/net-misc/rsync-3.2.3-r34
-rw-r--r--metadata/md5-cache/net-proxy/adzapper-20110915-r26
-rw-r--r--metadata/md5-cache/net-proxy/nutcracker-0.4.1-r111
-rw-r--r--metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r14
-rw-r--r--metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r22
-rw-r--r--metadata/md5-cache/sci-libs/superlu-4.3-r22
-rw-r--r--metadata/md5-cache/sci-mathematics/pari-2.11.44
-rw-r--r--metadata/md5-cache/sci-mathematics/pari-2.13.04
-rw-r--r--metadata/md5-cache/sci-visualization/spectromatic-1.0-r35
-rw-r--r--metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r22
-rw-r--r--metadata/md5-cache/sys-apps/usb_modeswitch-2.6.04
-rw-r--r--metadata/md5-cache/sys-fs/davl-1.2.4-r25
-rw-r--r--metadata/md5-cache/sys-fs/mhddfs-0.1.39-r26
-rw-r--r--metadata/md5-cache/sys-libs/libaal-1.0.7-r24
-rw-r--r--metadata/md5-cache/x11-misc/apwal-0.4.5-r29
-rw-r--r--metadata/md5-cache/x11-misc/bbrun-1.6-r12
-rw-r--r--metadata/md5-cache/x11-misc/chgres-0.1-r27
-rw-r--r--metadata/md5-cache/x11-misc/devilspie2-0.43-r1005
-rw-r--r--metadata/md5-cache/x11-misc/gbase-0.5-r17
-rw-r--r--metadata/md5-cache/x11-misc/grabc-1.1-r27
-rw-r--r--metadata/md5-cache/x11-misc/gromit-20041213-r15
-rw-r--r--metadata/md5-cache/x11-misc/skippy-0.5.0-r18
-rw-r--r--metadata/md5-cache/x11-misc/xrootconsole-0.6-r17
-rw-r--r--metadata/md5-cache/x11-plugins/bubblemon-1.46-r38
-rw-r--r--metadata/md5-cache/x11-plugins/docker-1.5-r25
-rw-r--r--metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r14
-rw-r--r--metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r26
-rw-r--r--metadata/md5-cache/x11-plugins/gkwebmon-0.2-r24
-rw-r--r--metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r111
-rw-r--r--metadata/md5-cache/x11-plugins/wmfishtime-1.24-r35
-rw-r--r--metadata/md5-cache/x11-wm/echinus-0.4.95
-rw-r--r--metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r43
-rw-r--r--metadata/pkg_desc_index20
-rw-r--r--metadata/timestamp.chk2
126 files changed, 413 insertions, 456 deletions
diff --git a/metadata/md5-cache/app-doc/psmark-2.1 b/metadata/md5-cache/app-doc/psmark-2.1
index d549652d7da5..2e6e43f91b92 100644
--- a/metadata/md5-cache/app-doc/psmark-2.1
+++ b/metadata/md5-cache/app-doc/psmark-2.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
DESCRIPTION=Prints watermark-like text on any PostScript document
-EAPI=5
+EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.antitachyon.com/download/psmark-v2.1.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=3b01e954daa40b79bbbf8fb160ec195a
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=13e54b502f8fea0ee14843bf622e33fe
diff --git a/metadata/md5-cache/app-laptop/ibam-0.5.2-r4 b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
index b4af2166bd8e..3dd31f3e8091 100644
--- a/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
+++ b/metadata/md5-cache/app-laptop/ibam-0.5.2-r4
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install postinst prepare
+DEFINED_PHASES=compile install postinst
DEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) gkrellm? ( virtual/pkgconfig )
DESCRIPTION=Intelligent Battery Monitor
EAPI=6
HOMEPAGE=http://ibam.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=gkrellm
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=gkrellm? ( app-admin/gkrellm x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
SLOT=0
SRC_URI=mirror://sourceforge/ibam/ibam-0.5.2.tar.gz mirror://debian/pool/main/i/ibam/ibam_0.5.2-2.1.diff.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=38c1dfc0781a42694775b0af1948f360
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=f02bdfa8c1ce1ad166b783ddd1028d5a
diff --git a/metadata/md5-cache/app-misc/dvorak7min-1.6.1-r1 b/metadata/md5-cache/app-misc/dvorak7min-1.6.1-r1
index b65630a36e38..6e5229f97de9 100644
--- a/metadata/md5-cache/app-misc/dvorak7min-1.6.1-r1
+++ b/metadata/md5-cache/app-misc/dvorak7min-1.6.1-r1
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
DESCRIPTION=Simple ncurses-based typing tutor for learning the Dvorak keyboard layout
EAPI=7
HOMEPAGE=http://www.linalco.com/comunidad.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:=
SLOT=0
SRC_URI=http://www.linalco.com/ragnar/dvorak7min-1.6.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8c20203ed48289544cc695c02041444b
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=1475dbf8da302fcf9d7915f458d67552
diff --git a/metadata/md5-cache/app-misc/gcal-3.6.3 b/metadata/md5-cache/app-misc/gcal-3.6.3
index dfb94fc53005..311f70e826f2 100644
--- a/metadata/md5-cache/app-misc/gcal-3.6.3
+++ b/metadata/md5-cache/app-misc/gcal-3.6.3
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
+DEPEND=nls? ( virtual/libintl )
DESCRIPTION=The GNU Calendar - a replacement for cal
-EAPI=5
+EAPI=7
HOMEPAGE=https://www.gnu.org/software/gcal/
INHERIT=flag-o-matic toolchain-funcs
IUSE=ncurses nls unicode
@@ -10,5 +11,5 @@ LICENSE=GPL-3+
RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/gcal/gcal-3.6.3.tar.xz
-_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
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=a48d6cbcb244599879c5c8305bfa31b8
diff --git a/metadata/md5-cache/app-misc/gcal-4.1 b/metadata/md5-cache/app-misc/gcal-4.1
index 95df186bd824..7a93a9534108 100644
--- a/metadata/md5-cache/app-misc/gcal-4.1
+++ b/metadata/md5-cache/app-misc/gcal-4.1
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 )
DEFINED_PHASES=configure
-DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 ) unicode? ( dev-libs/libunistring:= )
+DEPEND=nls? ( virtual/libintl ) unicode? ( dev-libs/libunistring:= )
DESCRIPTION=The GNU Calendar - a replacement for cal
-EAPI=6
+EAPI=7
HOMEPAGE=https://www.gnu.org/software/gcal/
INHERIT=flag-o-matic toolchain-funcs
IUSE=ncurses nls unicode
@@ -10,5 +11,5 @@ LICENSE=GPL-3+
RDEPEND=nls? ( virtual/libintl ) unicode? ( dev-libs/libunistring:= )
SLOT=0
SRC_URI=mirror://gnu/gcal/gcal-4.1.tar.xz
-_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_=a0c1d16ceda0e5978cf2e2c6a8246f11
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=55e98f7ad668e2419e9cc06a7ba7a33d
diff --git a/metadata/md5-cache/app-misc/hexcompare-1.0.4 b/metadata/md5-cache/app-misc/hexcompare-1.0.4
index 2b1e135afd62..5104c6862c14 100644
--- a/metadata/md5-cache/app-misc/hexcompare-1.0.4
+++ b/metadata/md5-cache/app-misc/hexcompare-1.0.4
@@ -1,13 +1,14 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:0=
DESCRIPTION=ncurses-based visual comparison of binary files
-EAPI=5
+EAPI=7
HOMEPAGE=http://hexcompare.sourceforge.net/
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0
+RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=mirror://sourceforge/hexcompare/hexcompare-1.0.4.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=b0733dad407d300296e3ef296499e667
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=f26ad85fff4be714eb29cf98c0a59788
diff --git a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1 b/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
deleted file mode 100644
index 57a5a92416d6..000000000000
--- a/metadata/md5-cache/app-misc/mmv-1.01b_p18-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-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=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_=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/wcd-5.2.7 b/metadata/md5-cache/app-misc/wcd-5.2.7
index 7c8409d11050..7c0e04686913 100644
--- a/metadata/md5-cache/app-misc/wcd-5.2.7
+++ b/metadata/md5-cache/app-misc/wcd-5.2.7
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DEPEND=sys-libs/ncurses[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl virtual/pkgconfig
DESCRIPTION=Wherever Change Directory
EAPI=5
HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
@@ -11,4 +11,4 @@ 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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=213bc33787f7baca2ec882faad3eea64
+_md5_=0995ac80a568d9aadd658950ad5e14ea
diff --git a/metadata/md5-cache/app-misc/wcd-5.3.4 b/metadata/md5-cache/app-misc/wcd-5.3.4
index d2801191a10c..71727bc9a6b8 100644
--- a/metadata/md5-cache/app-misc/wcd-5.3.4
+++ b/metadata/md5-cache/app-misc/wcd-5.3.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl virtual/pkgconfig
DESCRIPTION=Wherever Change Directory
EAPI=6
HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
SLOT=0
SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.4.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=bd63af7b63a7037cc66af779ad21a3e7
+_md5_=1e16a16ff212f9b642cd9aa000af1b19
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.1 b/metadata/md5-cache/app-misc/wcd-6.0.1
index 78d84a5d6263..6019112e8d15 100644
--- a/metadata/md5-cache/app-misc/wcd-6.0.1
+++ b/metadata/md5-cache/app-misc/wcd-6.0.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl virtual/pkgconfig
DESCRIPTION=Wherever Change Directory
EAPI=6
HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
SLOT=0
SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.1.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=e2b32a245628bb8254443e761a3b4925
+_md5_=55a1658503c78bc27c52d9e598694784
diff --git a/metadata/md5-cache/app-misc/wcd-6.0.2 b/metadata/md5-cache/app-misc/wcd-6.0.2
index ba67148cf66c..cca371ca0731 100644
--- a/metadata/md5-cache/app-misc/wcd-6.0.2
+++ b/metadata/md5-cache/app-misc/wcd-6.0.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl
+DEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring ) app-text/ghostscript-gpl virtual/pkgconfig
DESCRIPTION=Wherever Change Directory
EAPI=6
HOMEPAGE=http://waterlan.home.xs4all.nl/#WCD_ANCHOR
INHERIT=toolchain-funcs
IUSE=nls unicode
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
SLOT=0
SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-6.0.2.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=5ac9aad136da31a7e63781a09dfa588f
+_md5_=970e5e2f2c566e5597d02f076b1e3ebf
diff --git a/metadata/md5-cache/app-misc/ytree-2.02 b/metadata/md5-cache/app-misc/ytree-2.02
index 4142e92d3c1c..9e1e40d2ff68 100644
--- a/metadata/md5-cache/app-misc/ytree-2.02
+++ b/metadata/md5-cache/app-misc/ytree-2.02
@@ -1,13 +1,14 @@
BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
+DEFINED_PHASES=configure install
DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
DESCRIPTION=A curses-based file manager
EAPI=7
HOMEPAGE=https://www.han.de/~werner/ytree.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
SLOT=0
SRC_URI=https://www.han.de/~werner/ytree-2.02.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=355841f37a8377ddfe28fbec93c2ec89
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=f306572d3c770ea9642138385403a76f
diff --git a/metadata/md5-cache/app-misc/ytree-2.03 b/metadata/md5-cache/app-misc/ytree-2.03
index f05d71983ca0..c3210c18d91e 100644
--- a/metadata/md5-cache/app-misc/ytree-2.03
+++ b/metadata/md5-cache/app-misc/ytree-2.03
@@ -1,13 +1,14 @@
BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
+DEFINED_PHASES=configure install
DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
DESCRIPTION=A curses-based file manager
EAPI=7
HOMEPAGE=https://www.han.de/~werner/ytree.html
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
SLOT=0
SRC_URI=https://www.han.de/~werner/ytree-2.03.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=872c87674747f1423852bd8b711133ea
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=7bbb284571bf79bcb8c5b7ffa74eba99
diff --git a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2 b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
index a56b66c91aa0..592c7554c599 100644
--- a/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
+++ b/metadata/md5-cache/app-office/magicpoint-1.13a_p20121015-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-text/rman x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 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-text/rman virtual/pkgconfig x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1 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 postinst postrm prepare
DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXrender emacs? ( >=app-editors/emacs-23.1:* ) imlib? ( media-libs/imlib2[X] ) !imlib? ( gif? ( media-libs/giflib:= ) png? ( >=media-libs/libpng-1.4:0= ) ) m17n-lib? ( dev-libs/m17n-lib[X] fontconfig? ( media-libs/fontconfig ) ) mng? ( media-libs/libmng:= ) truetype? ( x11-libs/libXft media-libs/fontconfig ) x11-libs/libxkbfile
DESCRIPTION=X11 based presentation tool
@@ -13,4 +13,4 @@ REQUIRED_USE=imlib? ( !gif !png )
SLOT=0
SRC_URI=ftp://sh.wide.ad.jp/WIDE/free-ware/mgp-snap/mgp-snap-20121015.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 elisp-common 36f97076abd90f943a34f8bcd58b5bcc
-_md5_=6bab6c6c05d240da0795522be22b648b
+_md5_=08fd46f322666d5eb8a697a133f26bba
diff --git a/metadata/md5-cache/app-shells/hstr-2.0 b/metadata/md5-cache/app-shells/hstr-2.0
index 74bf811b38b7..b0b8322eaab5 100644
--- a/metadata/md5-cache/app-shells/hstr-2.0
+++ b/metadata/md5-cache/app-shells/hstr-2.0
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig sys-devel/gnuconfig >=app-
DESCRIPTION=Shell history suggest box
EAPI=6
HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
-INHERIT=autotools
+INHERIT=autotools toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=sys-libs/ncurses:0=[unicode]
SLOT=0
SRC_URI=https://github.com/dvorka/hstr/archive/2.0.tar.gz -> hstr-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 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=f38a00439075bbf23d6c57dd59015f32
+_md5_=c89752f96fd63ea0a16a1f6e7917bcb5
diff --git a/metadata/md5-cache/app-shells/hstr-2.1 b/metadata/md5-cache/app-shells/hstr-2.1
index 089ffd8fc9a4..83fbbd18de67 100644
--- a/metadata/md5-cache/app-shells/hstr-2.1
+++ b/metadata/md5-cache/app-shells/hstr-2.1
@@ -3,11 +3,11 @@ DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig sys-devel/gnuconfig >=app-
DESCRIPTION=Shell history suggest box
EAPI=6
HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
-INHERIT=autotools
+INHERIT=autotools toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=sys-libs/ncurses:0=[unicode]
SLOT=0
SRC_URI=https://github.com/dvorka/hstr/archive/2.1.tar.gz -> hstr-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_=3654c6afebc3ad92f7dd8dbcf6d315bd
+_md5_=bc3abe767ae0a0e3dd223400f55864cc
diff --git a/metadata/md5-cache/app-shells/hstr-2.2 b/metadata/md5-cache/app-shells/hstr-2.2
index 82198fd2665c..86e30bef7a8b 100644
--- a/metadata/md5-cache/app-shells/hstr-2.2
+++ b/metadata/md5-cache/app-shells/hstr-2.2
@@ -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 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=prepare
-DEPEND=sys-libs/ncurses:0=[unicode] virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0=[unicode]
DESCRIPTION=Shell history suggest box
EAPI=7
HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
-INHERIT=autotools
+INHERIT=autotools toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=sys-libs/ncurses:0=[unicode]
SLOT=0
SRC_URI=https://github.com/dvorka/hstr/archive/2.2.tar.gz -> hstr-2.2.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ddcf38caa0ec8bfe70f38e5fdd7e7499
+_md5_=915ee385e4d86f085960672f62453249
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 413554fff57d..97fc96c2f7f4 100644
--- a/metadata/md5-cache/app-text/bogosort-0.4.2-r1
+++ b/metadata/md5-cache/app-text/bogosort-0.4.2-r1
@@ -1,11 +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 prepare
DESCRIPTION=A file sorting program which uses the bogosort algorithm
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.lysator.liu.se/~qha/bogosort/
-INHERIT=epatch toolchain-funcs
+INHERIT=autotools 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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=5c59e1925da676197a4a5dea3f6cc411
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=5329a1ea4673099f92b0691527d200f0
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 6b35a6c7f9af..5341250a8285 100644
--- a/metadata/md5-cache/app-text/code2html-0.9.1-r2
+++ b/metadata/md5-cache/app-text/code2html-0.9.1-r2
@@ -1,12 +1,12 @@
DEFINED_PHASES=install prepare
DESCRIPTION=Converts source files to colored HTML output
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.palfrader.org/code2html/
-INHERIT=epatch prefix
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e prefix de7d8e2b10085ed5ff09ad70e4753e5c
-_md5_=21d858d799ddd26d9c539e8685399f16
+_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c
+_md5_=f2b0d473312d38eacac59b7e4e974c7e
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.5 b/metadata/md5-cache/app-text/dos2unix-7.3.5
deleted file mode 100644
index 8e0c2fb6c514..000000000000
--- a/metadata/md5-cache/app-text/dos2unix-7.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-text/hd2u virtual/libintl nls? ( sys-devel/gettext ) test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
-EAPI=6
-HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
-IUSE=debug nls test
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-RDEPEND=!app-text/hd2u virtual/libintl
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e1b4c34744e2fee90522f164d0550476
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.1 b/metadata/md5-cache/app-text/dos2unix-7.4.1
deleted file mode 100644
index 688dd97ad8d5..000000000000
--- a/metadata/md5-cache/app-text/dos2unix-7.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-text/hd2u virtual/libintl test? ( virtual/perl-Test-Simple )
-DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
-EAPI=7
-HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
-IUSE=debug nls test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-RDEPEND=!app-text/hd2u virtual/libintl
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.1.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.1.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4a452ddf827953282305abd0a3493567
diff --git a/metadata/md5-cache/app-text/letterize-1.4 b/metadata/md5-cache/app-text/letterize-1.4
index 9ca570734d1c..cbdf9883cff8 100644
--- a/metadata/md5-cache/app-text/letterize-1.4
+++ b/metadata/md5-cache/app-text/letterize-1.4
@@ -1,10 +1,11 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
DESCRIPTION=Generate English-plausible alphabetic mnemonics for a phone number
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.catb.org/~esr/letterize/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=BSD
SLOT=0
SRC_URI=http://www.catb.org/~esr/letterize/letterize-1.4.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=891cd7ceef0f87363ce1e398aca164ea
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=a24c4a8824fe2f85c2936cfc2dd1b3d5
diff --git a/metadata/md5-cache/app-text/llpp-33 b/metadata/md5-cache/app-text/llpp-33
index 006347dd68eb..d6a047120bb4 100644
--- a/metadata/md5-cache/app-text/llpp-33
+++ b/metadata/md5-cache/app-text/llpp-33
@@ -4,6 +4,7 @@ DEPEND=>=app-text/mupdf-1.17.0:0= app-arch/bzip2 media-libs/fontconfig:1.0 media
DESCRIPTION=Graphical PDF viewer which aims to superficially resemble less(1)
EAPI=7
HOMEPAGE=https://github.com/moosotc/llpp
+INHERIT=toolchain-funcs xdg
IUSE=+ocamlopt
KEYWORDS=amd64 ~ppc x86
LICENSE=public-domain
@@ -11,5 +12,5 @@ RDEPEND=>=app-text/mupdf-1.17.0:0= app-arch/bzip2 media-libs/fontconfig:1.0 medi
RESTRICT=!ocamlopt? ( strip )
SLOT=0
SRC_URI=https://github.com/moosotc/llpp/archive/v33.tar.gz -> llpp-33.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4435f4f15273afb8d2f9bfb33815a9d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e xdg-utils ff2ff954e6b17929574eee4efc5152ba xdg c7ba313ea1eaf266f95cc6235f7d6a07
+_md5_=537fae251231dddca0857518de18bf78
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 864e587c3c11..dfef8ca4a8dc 100644
--- a/metadata/md5-cache/app-text/paps-0.6.8-r2
+++ b/metadata/md5-cache/app-text/paps-0.6.8-r2
@@ -1,13 +1,14 @@
+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
DEFINED_PHASES=install prepare
-DEPEND=x11-libs/pango 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
+DEPEND=x11-libs/pango
DESCRIPTION=Unicode-aware text to PostScript converter
-EAPI=5
+EAPI=7
HOMEPAGE=http://paps.sourceforge.net/
-INHERIT=autotools epatch
+INHERIT=autotools
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_=4de5fbb566278fdba82a0494195d92a3
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=fbd21cc1c8199466e93847a87d6fbb4d
diff --git a/metadata/md5-cache/app-text/spellutils-0.7 b/metadata/md5-cache/app-text/spellutils-0.7
index c0801a30a937..d35f81dec8ab 100644
--- a/metadata/md5-cache/app-text/spellutils-0.7
+++ b/metadata/md5-cache/app-text/spellutils-0.7
@@ -1,13 +1,15 @@
-DEFINED_PHASES=compile configure prepare
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure
DEPEND=nls? ( virtual/libintl )
DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)
-EAPI=5
+EAPI=7
HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
IUSE=nls
KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc x86
LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl )
SLOT=0
SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=88e8a9bb951bdce6a769d2da8db8e275
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=652893403336788365a2b280bcf44084
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 6869ac000b1a..93f58d4d42ad 100644
--- a/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
+++ b/metadata/md5-cache/app-text/talkfilters-2.3.8-r1
@@ -1,11 +1,9 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
DESCRIPTION=Convert ordinary English text into text that mimics a stereotyped dialect
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.hyperrealm.com/talkfilters/talkfilters.html
-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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=326668ac8bb886212faa128ebdf99e3d
+_md5_=54f5839fc2c3c4c63a9d15bb225ce133
diff --git a/metadata/md5-cache/app-text/teseq-1.1.1 b/metadata/md5-cache/app-text/teseq-1.1.1
index f9f64ee630c8..72e39fcf2088 100644
--- a/metadata/md5-cache/app-text/teseq-1.1.1
+++ b/metadata/md5-cache/app-text/teseq-1.1.1
@@ -1,9 +1,9 @@
DEFINED_PHASES=-
DESCRIPTION=A tool for analyzing files that contain control characters and sequences
-EAPI=5
+EAPI=7
HOMEPAGE=https://www.gnu.org/software/teseq/
KEYWORDS=~amd64
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://gnu/teseq/teseq-1.1.1.tar.xz
-_md5_=d47823c253f6b831abfd24a3443f8a8b
+_md5_=3ffc361ec3af10d9810c9a77d0fd0a4e
diff --git a/metadata/md5-cache/app-text/tokyodystopia-0.9.15 b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
index d6d6a2ea0946..aa3dbc2f3c2b 100644
--- a/metadata/md5-cache/app-text/tokyodystopia-0.9.15
+++ b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
RDEPEND=dev-db/tokyocabinet
SLOT=0
SRC_URI=https://fallabs.com/tokyodystopia/tokyodystopia-0.9.15.tar.gz
-_md5_=6d1ba6a0bb49a9b3f9391e0047b4b405
+_md5_=176db518b8d5ef05d3cfb52bb7cea75f
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 966a0f93d87b..cc7b4c75fd0d 100644
--- a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
+++ b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=install prepare
DEPEND=>=media-libs/freetype-2.5.1:2
DESCRIPTION=True Type Font to Postscript Type 1 Converter
-EAPI=5
+EAPI=7
HOMEPAGE=http://ttf2pt1.sourceforge.net/
-INHERIT=epatch multilib toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c3af08cf7009da346080bf94028d6fc7
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=712c6662c144ddc7a44fb7499bdc91ac
diff --git a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4 b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
index 9843a84ba226..25fc8d72e4c2 100644
--- a/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
+++ b/metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
@@ -1,7 +1,8 @@
+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=prepare
-DEPEND=dev-lang/perl 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
+DEPEND=dev-lang/perl
DESCRIPTION=Text/HTML to Doc file converter for the Palm Pilot
-EAPI=5
+EAPI=7
HOMEPAGE=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc/
INHERIT=autotools
KEYWORDS=amd64 ppc sparc x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc-1.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 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=4aa1f19dd6ee904894807db41c06d037
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=f442bedf9665f9fd932c8583ad3b0250
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 06d3e96f0363..979112c1bf09 100644
--- a/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/md5-cache/app-text/xlhtml-0.5.1_p6
@@ -1,12 +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=install prepare
-DEPEND=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=Convert MS Excel and Powerpoint files to HTML
-EAPI=5
+EAPI=7
HOMEPAGE=http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/
-INHERIT=autotools epatch vcs-clean
+INHERIT=autotools 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_=fbc4e0531dba347e977e3b0a8349de22
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a28578178d0c7ec12d87e22bb050a564
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r3 b/metadata/md5-cache/app-text/xmlto-0.0.28-r3
index fba7e3ab30ad..8faa665ef1b6 100644
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r3
+++ b/metadata/md5-cache/app-text/xmlto-0.0.28-r3
@@ -1,14 +1,12 @@
DEFINED_PHASES=configure prepare
DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed >=sys-apps/coreutils-6.10-r1 || ( sys-apps/util-linux app-misc/getopt ) sys-apps/which text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( dev-texlive/texlive-formatsextra )
DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
-EAPI=5
+EAPI=7
HOMEPAGE=https://pagure.io/xmlto
-INHERIT=epatch
IUSE=latex text
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=GPL-2
RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed >=sys-apps/coreutils-6.10-r1 || ( sys-apps/util-linux app-misc/getopt ) sys-apps/which text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( dev-texlive/texlive-formatsextra )
SLOT=0
SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=abbbebf74ae1b3269f76b524340e0f0b
+_md5_=07f28640ed767d1e1c0eb7369c174ded
diff --git a/metadata/md5-cache/dev-cpp/metslib-0.5.3 b/metadata/md5-cache/dev-cpp/metslib-0.5.3
index bb6688836886..7fb88f577000 100644
--- a/metadata/md5-cache/dev-cpp/metslib-0.5.3
+++ b/metadata/md5-cache/dev-cpp/metslib-0.5.3
@@ -1,9 +1,9 @@
DEFINED_PHASES=-
DESCRIPTION=Metaheuristic modeling framework and optimization toolkit
-EAPI=5
+EAPI=7
HOMEPAGE=https://projects.coin-or.org/metslib
KEYWORDS=~amd64 ~arm
LICENSE=|| ( GPL-3 CPL-1.0 )
SLOT=0
SRC_URI=http://www.coin-or.org/download/source/metslib/metslib-0.5.3.tgz
-_md5_=6c1603cc7dbd31b6dc02a84cab41bf4e
+_md5_=a8fa92515aecb2d3e460e345324b9bd7
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 258cfa44a146..ddc60fb94d34 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.2.6.1
@@ -1,13 +1,11 @@
DEFINED_PHASES=configure install prepare test
DESCRIPTION=Library for parsing mathematical expressions
-EAPI=5
+EAPI=7
HOMEPAGE=http://muparser.beltoforion.de/
-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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=754fe1a22e57c14f4ffafc17d074be4d
+_md5_=37af0f5fbe49029be260704834e57929
diff --git a/metadata/md5-cache/dev-cpp/picojson-1.3.0 b/metadata/md5-cache/dev-cpp/picojson-1.3.0
index 91c29d1abf50..367da78f0604 100644
--- a/metadata/md5-cache/dev-cpp/picojson-1.3.0
+++ b/metadata/md5-cache/dev-cpp/picojson-1.3.0
@@ -1,10 +1,11 @@
DEFINED_PHASES=compile install test
DESCRIPTION=Header-file-only, JSON parser serializer in C++
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/kazuho/picojson
+INHERIT=toolchain-funcs
KEYWORDS=~amd64
LICENSE=BSD-2
SLOT=0
SRC_URI=https://github.com/kazuho/picojson/archive/v1.3.0.tar.gz -> picojson-1.3.0.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=1610726bbff98536277bc3ceaf89336b
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=8dd973bacbf44710fcb8f55724aa4219
diff --git a/metadata/md5-cache/dev-cpp/pstreams-1.0.1 b/metadata/md5-cache/dev-cpp/pstreams-1.0.1
index 3244ca5076af..0f56cd015de2 100644
--- a/metadata/md5-cache/dev-cpp/pstreams-1.0.1
+++ b/metadata/md5-cache/dev-cpp/pstreams-1.0.1
@@ -1,12 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
DEFINED_PHASES=compile install test
-DEPEND=doc? ( app-doc/doxygen )
DESCRIPTION=C++ wrapper for the POSIX.2 functions popen(3) and pclose(3)
-EAPI=5
+EAPI=7
HOMEPAGE=http://pstreams.sourceforge.net/
+INHERIT=toolchain-funcs
IUSE=doc
KEYWORDS=~amd64 ~x86
LICENSE=LGPL-3
SLOT=0
SRC_URI=mirror://sourceforge/pstreams/pstreams-1.0.1.tar.gz doc? ( mirror://sourceforge/pstreams/pstreams-docs-1.0.1.tar.gz )
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=0938ecba83fcfd358b2482f2c1504c15
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=5be0ea9e6399e68ee287e6386998ce01
diff --git a/metadata/md5-cache/dev-db/cdb-0.75-r4 b/metadata/md5-cache/dev-db/cdb-0.75-r4
index 35a9257b1827..7b557df60a63 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=!dev-db/tinycdb
DESCRIPTION=Fast, reliable, simple package for creating and reading constant databases
-EAPI=5
+EAPI=7
HOMEPAGE=http://cr.yp.to/cdb.html
-INHERIT=epatch multilib toolchain-funcs
+INHERIT=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=!dev-db/tinycdb
SLOT=0
SRC_URI=http://cr.yp.to/cdb/cdb-0.75.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8d1c6daed035c1cae088266b747e7b68
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ffff803a6a51c57f1ba80110df1ab9ed
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
index 226fcdb47893..74766be837e1 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
INHERIT=autotools multilib-minimal
IUSE=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=amd64 ~arm x86
+KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=virtual/libusb:1[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=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.2.0/libjaylink-0.2.0.tar.bz2
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib-build ac696f0bea6c503f5980bfd5a0f312e5 multilib-minimal 8bddda43703ba94d8341f4e247f97566
-_md5_=f6042ef51c92472373b264defd71fd18
+_md5_=6cf466b2e429a2c1d3dac3f6289085f1
diff --git a/metadata/md5-cache/dev-games/clanlib-2.3.7-r1 b/metadata/md5-cache/dev-games/clanlib-2.3.7-r1
index 69863eb6c26f..fc0b437b2b6a 100644
--- a/metadata/md5-cache/dev-games/clanlib-2.3.7-r1
+++ b/metadata/md5-cache/dev-games/clanlib-2.3.7-r1
@@ -1,10 +1,10 @@
BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-lang/perl ) 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=sys-libs/zlib X? ( app-arch/bzip2 media-libs/libpng:0 media-libs/freetype media-libs/fontconfig virtual/jpeg:0 x11-libs/libX11 opengl? ( virtual/opengl ) ) mikmod? ( media-libs/alsa-lib media-libs/libmikmod ) sqlite? ( dev-db/sqlite:3 ) sound? ( media-libs/alsa-lib ) vorbis? ( media-libs/alsa-lib media-libs/libogg media-libs/libvorbis )
-DESCRIPTION=multi-platform game development library
+DESCRIPTION=Multi-platform game development library
EAPI=7
HOMEPAGE=http://www.clanlib.org/
-INHERIT=autotools
+INHERIT=autotools toolchain-funcs
IUSE=doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X
KEYWORDS=amd64 x86
LICENSE=ZLIB
@@ -13,4 +13,4 @@ REQUIRED_USE=opengl? ( X )
SLOT=2.3
SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.7.tgz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=ce5bc23bb0b361895b615c96290764a9
+_md5_=469c39214d0dddac5f88aabb1bbd9936
diff --git a/metadata/md5-cache/dev-games/clanlib-4.0.0 b/metadata/md5-cache/dev-games/clanlib-4.0.0
index 59de02b41e1b..e32da0e1b8ec 100644
--- a/metadata/md5-cache/dev-games/clanlib-4.0.0
+++ b/metadata/md5-cache/dev-games/clanlib-4.0.0
@@ -3,7 +3,7 @@ DEPEND=sys-libs/zlib X? ( media-libs/freetype:2 media-libs/fontconfig x11-libs/l
DESCRIPTION=Multi-platform game development library
EAPI=6
HOMEPAGE=https://github.com/sphair/ClanLib
-INHERIT=autotools
+INHERIT=autotools toolchain-funcs
IUSE=cpu_flags_x86_sse2 doc examples ipv6 opengl sound static-libs X
KEYWORDS=~amd64 ~x86
LICENSE=ZLIB
@@ -12,4 +12,4 @@ REQUIRED_USE=opengl? ( X )
SLOT=4.0
SRC_URI=https://github.com/sphair/ClanLib/archive/v4.0.0.tar.gz -> clanlib-4.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 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
-_md5_=c0c618ee0086c1644fd2d7ce66b14af3
+_md5_=7e0ff406b8aeb862dfb7b66958737eda
diff --git a/metadata/md5-cache/dev-libs/ucl-1.03-r1 b/metadata/md5-cache/dev-libs/ucl-1.03-r1
index f51617a2e00e..d6022bfb076f 100644
--- a/metadata/md5-cache/dev-libs/ucl-1.03-r1
+++ b/metadata/md5-cache/dev-libs/ucl-1.03-r1
@@ -1,13 +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
DEFINED_PHASES=configure install prepare
-DEPEND=!!dev-libs/libucl 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
+DEPEND=!!dev-libs/libucl
DESCRIPTION=the UCL Compression Library
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.oberhumer.com/opensource/ucl/
-INHERIT=autotools epatch flag-o-matic ltprune
+INHERIT=autotools flag-o-matic
IUSE=static-libs
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.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_=afbd64e5c5c3d7f466164f88189a5586
+_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_=827b1619b303836baf3239e951035553
diff --git a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100 b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
index 83e62c9bd883..53f8626973e0 100644
--- a/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
+++ b/metadata/md5-cache/dev-lua/lanes-3.13.0-r100
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/LuaLanes/lanes/archive/v3.13.0.tar.gz -> lanes-3.13.0.tar.gz
_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua 117840f7c4855d27ccde1c6cca990331
-_md5_=3af7b5d52c6edfc2721dc5dd95e310cc
+_md5_=cce49d367afb223b126a37666cd1898d
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.0 b/metadata/md5-cache/dev-ml/cinaps-0.15.0
index 4fbf11a647c3..18252d67c1d6 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.0
@@ -6,11 +6,11 @@ EAPI=7
HOMEPAGE=https://github.com/ocaml-ppx/cinaps
INHERIT=dune
IUSE=+ocamlopt test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86
LICENSE=MIT
RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?]
RESTRICT=!test? ( test )
SLOT=0/0.15.0
SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.0.tar.gz -> cinaps-0.15.0.tar.gz
_eclasses_=dune 2d138ae1c0f7d4624876ad486529731f
-_md5_=eca4f761b3f5c40610c0d149a6af1f32
+_md5_=0e02d6d91b7f697a95859dd21524b539
diff --git a/metadata/md5-cache/dev-util/egypt-1.10 b/metadata/md5-cache/dev-util/egypt-1.10
index c04a7e026d60..e983d657c3d5 100644
--- a/metadata/md5-cache/dev-util/egypt-1.10
+++ b/metadata/md5-cache/dev-util/egypt-1.10
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=devilishly simple tool for creating call graphs of C programs
-EAPI=5
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Devilishly simple tool for creating call graphs of C programs
+EAPI=7
HOMEPAGE=http://www.gson.org/egypt/
INHERIT=perl-module
KEYWORDS=~amd64 ~x86
LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=[-build(-)]
+RDEPEND=dev-lang/perl:=
SLOT=0
SRC_URI=http://www.gson.org/egypt/download/egypt-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 multiprocessing cac3169468f893670dac3e7cb940e045 unpacker 517f16af48ee3ab88180dd58b5143213 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
-_md5_=3af27e2197b3947c438cb8ff7ce0ea01
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 58b5d72d607014c48b5a1e106318d584
+_md5_=a0a1b2c3c632c04fceb3436fb20c9ef0
diff --git a/metadata/md5-cache/dev-util/linklint-2.3.5 b/metadata/md5-cache/dev-util/linklint-2.3.5
index fd5e1b328e2c..926cbbf83ffc 100644
--- a/metadata/md5-cache/dev-util/linklint-2.3.5
+++ b/metadata/md5-cache/dev-util/linklint-2.3.5
@@ -1,10 +1,10 @@
DEFINED_PHASES=install
DESCRIPTION=A Perl program that checks links on web sites
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.linklint.org/
KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=GPL-2
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://www.linklint.org/download/linklint-2.3.5.tar.gz
-_md5_=b6ea6d1983b509c932d2ac29189cb744
+_md5_=e84d9a2193d1b3f41139e54503e33fbd
diff --git a/metadata/md5-cache/dev-util/mutrace-0.2-r1 b/metadata/md5-cache/dev-util/mutrace-0.2-r1
index 55b7e0fb769f..ffd7d1a8d174 100644
--- a/metadata/md5-cache/dev-util/mutrace-0.2-r1
+++ b/metadata/md5-cache/dev-util/mutrace-0.2-r1
@@ -1,13 +1,11 @@
-DEFINED_PHASES=prepare
+DEFINED_PHASES=-
DEPEND=sys-libs/binutils-libs:=
DESCRIPTION=A mutex tracer/profiler
-EAPI=5
+EAPI=7
HOMEPAGE=http://0pointer.de/blog/projects/mutrace.html
-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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=d4cf89599fa20f21ae1a991a9146bef4
+_md5_=55f922c0cd62f4ae16ccade306d541f0
diff --git a/metadata/md5-cache/dev-util/shflags-1.0.3 b/metadata/md5-cache/dev-util/shflags-1.0.3
deleted file mode 100644
index 7333097f5f23..000000000000
--- a/metadata/md5-cache/dev-util/shflags-1.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install test
-DESCRIPTION=Command-line flags module for Unix shell scripts
-EAPI=5
-HOMEPAGE=https://github.com/kward/shflags
-IUSE=examples
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=https://github.com/kward/shflags/archive/1.0.3.tar.gz -> shflags-1.0.3.tgz
-_md5_=192c5b60599f4fb170bae26dde47be03
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 8159986e2e77..586edaaa350b 100644
--- a/metadata/md5-cache/dev-util/splint-3.1.2-r2
+++ b/metadata/md5-cache/dev-util/splint-3.1.2-r2
@@ -1,12 +1,13 @@
+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=compile configure prepare test
-DEPEND=sys-devel/flex 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
+DEPEND=sys-devel/flex
DESCRIPTION=Check C programs for vulnerabilities and programming mistakes
-EAPI=5
+EAPI=7
HOMEPAGE=http://lclint.cs.virginia.edu/
-INHERIT=autotools epatch
+INHERIT=autotools
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_=425dbf53a4260e552cf27ac176c3fe45
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=ed9a2a7a55b162a92d003b8135c54f38
diff --git a/metadata/md5-cache/dev-util/txt2regex-0.8-r3 b/metadata/md5-cache/dev-util/txt2regex-0.8-r3
index 5f61bcec89c7..e41ca5e12737 100644
--- a/metadata/md5-cache/dev-util/txt2regex-0.8-r3
+++ b/metadata/md5-cache/dev-util/txt2regex-0.8-r3
@@ -1,14 +1,12 @@
DEFINED_PHASES=install prepare
DEPEND=nls? ( sys-devel/gettext )
DESCRIPTION=A Regular Expression wizard that converts human sentences to regexs
-EAPI=5
+EAPI=7
HOMEPAGE=http://txt2regex.sourceforge.net/
-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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=a9b2660cc2a986ecf4ac64f5979eb659
+_md5_=da463782ce969c89d10432c6447bc616
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 d6b8b40c4432..e71ed303254f 100644
--- a/metadata/md5-cache/dev-util/visual-regexp-3.0-r1
+++ b/metadata/md5-cache/dev-util/visual-regexp-3.0-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
DESCRIPTION=Type the regexp and visualize it on a sample of your choice
-EAPI=5
+EAPI=7
HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
-INHERIT=desktop epatch
+INHERIT=desktop
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 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=97b23ee325c512ea04b18c121cfc43a3
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=181dd210b636ba882302e79395bfa8b6
diff --git a/metadata/md5-cache/dev-util/visual-regexp-3.1 b/metadata/md5-cache/dev-util/visual-regexp-3.1
index f416b3485dcb..8df0ace04f0d 100644
--- a/metadata/md5-cache/dev-util/visual-regexp-3.1
+++ b/metadata/md5-cache/dev-util/visual-regexp-3.1
@@ -1,12 +1,12 @@
DEFINED_PHASES=install prepare unpack
DESCRIPTION=Type the regexp and visualize it on a sample of your choice
-EAPI=5
+EAPI=7
HOMEPAGE=http://laurent.riesterer.free.fr/regexp/
-INHERIT=desktop edos2unix epatch
+INHERIT=desktop edos2unix
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
-_md5_=63576c3cbcfe493ea980647cf820e312
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773
+_md5_=c32902d0cd40704fe5873bc7df0ebe85
diff --git a/metadata/md5-cache/dev-util/xxdi-1.0.0 b/metadata/md5-cache/dev-util/xxdi-1.0.0
index 61632c96cf25..c08c849c4e4c 100644
--- a/metadata/md5-cache/dev-util/xxdi-1.0.0
+++ b/metadata/md5-cache/dev-util/xxdi-1.0.0
@@ -1,10 +1,10 @@
DEFINED_PHASES=install
DESCRIPTION=Simple alternative to vim's 'xxd -i' mode
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/gregkh/xxdi
KEYWORDS=amd64 arm64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-perl/File-Slurp
SLOT=0
SRC_URI=https://github.com/gregkh/xxdi/archive/v001.tar.gz -> xxdi-1.0.0.tar.gz
-_md5_=a58e0371d4f3e2eaa6a3c6a5a0ca6268
+_md5_=1890a5e834a8978719529bd3a0ccba84
diff --git a/metadata/md5-cache/dev-vcs/git-mailz-0.14 b/metadata/md5-cache/dev-vcs/git-mailz-0.14
index 01a1b60d4abe..f2f53807e6dc 100644
--- a/metadata/md5-cache/dev-vcs/git-mailz-0.14
+++ b/metadata/md5-cache/dev-vcs/git-mailz-0.14
@@ -1,12 +1,10 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=compile install
DESCRIPTION=Send a collection of patches as emails
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/roman-neuhauser/git-mailz/
-INHERIT=eutils
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=virtual/mta dev-vcs/git app-shells/zsh
+RDEPEND=app-shells/zsh dev-vcs/git virtual/mta
SLOT=0
SRC_URI=http://codex.sigpipe.cz/git-mailz/git-mailz-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
-_md5_=325d1bc6019911ebdb319a8d136bf240
+_md5_=bf118c8360d47e5e897908a520f4d1b3
diff --git a/metadata/md5-cache/games-action/battalion-1.4b-r1 b/metadata/md5-cache/games-action/battalion-1.4b-r1
index fde3678f8f8d..b864e765eff7 100644
--- a/metadata/md5-cache/games-action/battalion-1.4b-r1
+++ b/metadata/md5-cache/games-action/battalion-1.4b-r1
@@ -1,12 +1,13 @@
DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/glu virtual/opengl x11-libs/libX11
+DEPEND=virtual/glu virtual/opengl x11-libs/libX11 virtual/pkgconfig
DESCRIPTION=Be a rampaging monster and destroy the city
EAPI=6
HOMEPAGE=http://evlweb.eecs.uic.edu/aej/AndyBattalion.html
+INHERIT=toolchain-funcs
KEYWORDS=~x86
LICENSE=battalion HPND
RDEPEND=virtual/glu virtual/opengl x11-libs/libX11
SLOT=0
SRC_URI=http://evlweb.eecs.uic.edu/aej/BATTALION/battalion1.4b.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=7e5ede248528bfcbb754faadf25ec1c0
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=dc424e8a6298a6b69430def2f1d412d5
diff --git a/metadata/md5-cache/games-action/wordwarvi-1.00-r1 b/metadata/md5-cache/games-action/wordwarvi-1.00-r1
index 12cb4d2da193..53c4cb62a997 100644
--- a/metadata/md5-cache/games-action/wordwarvi-1.00-r1
+++ b/metadata/md5-cache/games-action/wordwarvi-1.00-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/gtk+:2 portaudio? ( media-libs/libvorbis >=media-libs/portaudio-
DESCRIPTION=A retro side-scrolling shoot'em up based on the editor war story
EAPI=6
HOMEPAGE=http://wordwarvi.sourceforge.net
+INHERIT=desktop toolchain-funcs
IUSE=portaudio
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 CC-BY-2.0 CC-BY-SA-3.0
RDEPEND=x11-libs/gtk+:2 portaudio? ( media-libs/libvorbis >=media-libs/portaudio-19_pre1 )
SLOT=0
SRC_URI=mirror://sourceforge/wordwarvi/wordwarvi-1.00.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=da0959988f4c3cf4028752b78bd9c342
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=2abc7ab15003051c8cb623ea16d82447
diff --git a/metadata/md5-cache/games-arcade/aop-0.6-r2 b/metadata/md5-cache/games-arcade/aop-0.6-r2
index 164a3284f260..f6c8d4e472f7 100644
--- a/metadata/md5-cache/games-arcade/aop-0.6-r2
+++ b/metadata/md5-cache/games-arcade/aop-0.6-r2
@@ -4,9 +4,11 @@ DEPEND=sys-libs/ncurses:0
DESCRIPTION=Ambassador of Pain is a curses based game with only 64 lines of code
EAPI=7
HOMEPAGE=http://raffi.at/view/code/aop
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:0
SLOT=0
SRC_URI=http://www.raffi.at/code/aop/aop-0.6.tar.gz
-_md5_=72d4ad2fd7cbc68c4a19d4958a8a0828
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d2bf8cf087d11a354f398675d1591f9d
diff --git a/metadata/md5-cache/games-arcade/methane-1.5.1-r1 b/metadata/md5-cache/games-arcade/methane-1.5.1-r1
index 4c7311f63f74..8f2999439215 100644
--- a/metadata/md5-cache/games-arcade/methane-1.5.1-r1
+++ b/metadata/md5-cache/games-arcade/methane-1.5.1-r1
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=install prepare
-DEPEND=dev-games/clanlib:2.3[opengl,mikmod] virtual/pkgconfig
+DEPEND=dev-games/clanlib:2.3[opengl,mikmod]
DESCRIPTION=Port from an old amiga game
EAPI=7
HOMEPAGE=http://methane.sourceforge.net/
+INHERIT=desktop toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=dev-games/clanlib:2.3[opengl,mikmod]
SLOT=0
SRC_URI=mirror://sourceforge/methane/methane-1.5.1.tgz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=c2a287d2448cbb4246722267d082a5e3
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ad248fe4ee060a20e8464f03fb4201c6
diff --git a/metadata/md5-cache/games-emulation/fbzx-3.0.0-r1 b/metadata/md5-cache/games-emulation/fbzx-3.0.0-r1
index 99f271c29a3f..de5a7c324332 100644
--- a/metadata/md5-cache/games-emulation/fbzx-3.0.0-r1
+++ b/metadata/md5-cache/games-emulation/fbzx-3.0.0-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtu
DESCRIPTION=Full Screen Sinclair Spectrum emulator
EAPI=6
HOMEPAGE=https://github.com/rastersoft/fbzx
+INHERIT=desktop
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3+
RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib
SLOT=0
SRC_URI=https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> fbzx-3.0.0.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
-_md5_=34b8ad3379d74e63b272024ae661fa9b
+_md5_=19274ded2e2a106aa51fa2e1cd82788f
diff --git a/metadata/md5-cache/games-emulation/nestra-0.66-r3 b/metadata/md5-cache/games-emulation/nestra-0.66-r3
index 9590c86ed5e6..f8f52293fca7 100644
--- a/metadata/md5-cache/games-emulation/nestra-0.66-r3
+++ b/metadata/md5-cache/games-emulation/nestra-0.66-r3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=x11-libs/libX11[abi_x86_32(-)]
DESCRIPTION=NES emulation for Linux/x86
-EAPI=6
+EAPI=7
HOMEPAGE=http://nestra.linuxgames.com/
-INHERIT=epatch toolchain-funcs flag-o-matic
+INHERIT=toolchain-funcs flag-o-matic
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11[abi_x86_32(-)]
SLOT=0
SRC_URI=http://nestra.linuxgames.com/nestra-0.66.tar.gz mirror://debian/pool/contrib/n/nestra/nestra_0.66-10.diff.gz
-_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_=d2d1980cd5f2f58d5900e775f5de4910
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
+_md5_=8b726cb3a6923ca11fca2c7580dbfcba
diff --git a/metadata/md5-cache/games-puzzle/groundhog-1.4-r1 b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
index c25016865d9b..81d70ae61840 100644
--- a/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
+++ b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
@@ -1,14 +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 install prepare
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) 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
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
DESCRIPTION=Put the balls in the pockets of the same color by manipulating a maze of tubes
-EAPI=6
+EAPI=7
HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
-INHERIT=desktop epatch autotools
+INHERIT=autotools desktop
IUSE=nls
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
SLOT=0
SRC_URI=http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e 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_=f02b04e82a09b036001de4a0fe143c4d
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 desktop c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=7cc64c76884a406623984957ddf271ef
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
index 66bf01e5ab8f..48d7ef825399 100644
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -3,11 +3,11 @@ DEPEND=x11-libs/gtk+:3 virtual/pkgconfig
DESCRIPTION=A jigsaw puzzle program
EAPI=6
HOMEPAGE=http://kornelix.squarespace.com/picpuz/
-INHERIT=desktop gnome2-utils
+INHERIT=desktop gnome2-utils toolchain-funcs
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:3
SLOT=0
SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.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 xdg-utils ff2ff954e6b17929574eee4efc5152ba gnome2-utils c8e3fff820d850c0e003e22208d2eea3
-_md5_=3c9e9a90f88b221e752a70f252ba1b0b
+_md5_=6eb78cb971dba8cb31dc3bb8c35b7b14
diff --git a/metadata/md5-cache/games-util/higan-purify-03 b/metadata/md5-cache/games-util/higan-purify-03
index e2ffa8d39544..5bba8a887d21 100644
--- a/metadata/md5-cache/games-util/higan-purify-03
+++ b/metadata/md5-cache/games-util/higan-purify-03
@@ -11,4 +11,4 @@ RDEPEND=dev-games/higan-ananke x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
SRC_URI=https://higan.googlecode.com/files/purify_v03-source.tar.xz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=9249bf0d801ffc24386938a646c61f83
+_md5_=d71f35a2d1ed7b4215c2f350990c3a42
diff --git a/metadata/md5-cache/gnustep-base/mknfonts-0.5-r3 b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r3
index cc21f2a3681e..221ef227c060 100644
--- a/metadata/md5-cache/gnustep-base/mknfonts-0.5-r3
+++ b/metadata/md5-cache/gnustep-base/mknfonts-0.5-r3
@@ -1,9 +1,10 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1 virtual/pkgconfig
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
EAPI=7
HOMEPAGE=https://packages.debian.org/mknfonts.tool
-INHERIT=gnustep-base
+INHERIT=gnustep-base toolchain-funcs
IUSE=debug doc
KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
@@ -11,4 +12,4 @@ RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
SLOT=0
SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e flag-o-matic c0964e43ba712cb933da5f65b958fa88 gnustep-base 49f1b9591be3a4bf8eeb1f3a07605a2a
-_md5_=8ec6611ca86e07e9066235020f2bd86b
+_md5_=8be0a628a1219a9194ed6cb61b4c3636
diff --git a/metadata/md5-cache/mail-client/mailx-support-20060102-r2 b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
index e846d34fdb31..f4ff8f5dce89 100644
--- a/metadata/md5-cache/mail-client/mailx-support-20060102-r2
+++ b/metadata/md5-cache/mail-client/mailx-support-20060102-r2
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile install prepare
DESCRIPTION=Provides lockspool utility
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.openbsd.org/
-INHERIT=epatch toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=addba4f6eed753163e844ec78014ebe1
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=e69829454731dc3d06a83a0bf6271760
diff --git a/metadata/md5-cache/mail-filter/libspf2-1.2.10 b/metadata/md5-cache/mail-filter/libspf2-1.2.10
index 35ec21e5b57a..d6ce194b7ae3 100644
--- a/metadata/md5-cache/mail-filter/libspf2-1.2.10
+++ b/metadata/md5-cache/mail-filter/libspf2-1.2.10
@@ -1,15 +1,13 @@
+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 prepare
-DEPEND=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=libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols
-EAPI=5
+EAPI=7
HOMEPAGE=https://www.libspf2.org
-INHERIT=autotools epatch
-IUSE=static static-libs
+INHERIT=autotools
KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
LICENSE=|| ( LGPL-2.1 BSD-2 )
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_=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
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=8a923f55b76f62602c56961d7465a270
diff --git a/metadata/md5-cache/mail-filter/rblcheck-1.5-r2 b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
index 980ff46a2f73..d3b0dd80f5fe 100644
--- a/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
+++ b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
DESCRIPTION=Perform lookups in RBL-styles services
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/logic/rblcheck
-INHERIT=epatch toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=0a0cf02ac156acc7a83345b65e5a1b7c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=7400e35a66f3dcce93b2640ca7e952b2
diff --git a/metadata/md5-cache/mail-filter/spamdyke-4.3.0 b/metadata/md5-cache/mail-filter/spamdyke-4.3.0
deleted file mode 100644
index 913879fad9f4..000000000000
--- a/metadata/md5-cache/mail-filter/spamdyke-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( dev-libs/openssl:0= ) 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=A drop-in connection-time spam filter for qmail
-EAPI=5
-HOMEPAGE=http://www.spamdyke.org/
-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_=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/media-gfx/fondu-20060102-r1 b/metadata/md5-cache/media-gfx/fondu-20060102-r1
index fc67c15272a2..ac7e6a8494cc 100644
--- a/metadata/md5-cache/media-gfx/fondu-20060102-r1
+++ b/metadata/md5-cache/media-gfx/fondu-20060102-r1
@@ -1,11 +1,9 @@
DEFINED_PHASES=install prepare
DESCRIPTION=Utilities for converting between and manipulating mac fonts and unix fonts
-EAPI=5
+EAPI=7
HOMEPAGE=http://fondu.sourceforge.net/
-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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=4c54a8cea04a8901b7ffdaa1ae3b2a5c
+_md5_=24bbf493157909c90f7297004b680092
diff --git a/metadata/md5-cache/media-gfx/png2ico-2002.12.08 b/metadata/md5-cache/media-gfx/png2ico-2002.12.08
index 9510fa33d243..15e082be2a65 100644
--- a/metadata/md5-cache/media-gfx/png2ico-2002.12.08
+++ b/metadata/md5-cache/media-gfx/png2ico-2002.12.08
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=media-libs/libpng:0= sys-libs/zlib:=
DESCRIPTION=PNG to icon converter
-EAPI=5
+EAPI=7
HOMEPAGE=http://winterdrache.de/freeware/png2ico/index.html
-INHERIT=epatch toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=0b76d035c722bcd8684f7a995e095769
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=b3cebd1bd6a2095cdfc24b09c6c0ad31
diff --git a/metadata/md5-cache/media-gfx/pngnq-1.1 b/metadata/md5-cache/media-gfx/pngnq-1.1
index cf266d49ab38..018e53b23b58 100644
--- a/metadata/md5-cache/media-gfx/pngnq-1.1
+++ b/metadata/md5-cache/media-gfx/pngnq-1.1
@@ -1,13 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=prepare
-DEPEND=media-libs/libpng:0= sys-devel/gnuconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:0=
DESCRIPTION=Pngnq is a tool for quantizing PNG images in RGBA format
-EAPI=5
+EAPI=7
HOMEPAGE=http://pngnq.sourceforge.net/
-INHERIT=autotools epatch
+INHERIT=autotools
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_=7e1d04ee7feeb51e9d76bb752e0be199
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=d0dbb5fdbf7e13a1b6258f2af2ac7fd7
diff --git a/metadata/md5-cache/media-gfx/xzgv-0.9.1 b/metadata/md5-cache/media-gfx/xzgv-0.9.1
index 2473ff215730..e29b516a81fd 100644
--- a/metadata/md5-cache/media-gfx/xzgv-0.9.1
+++ b/metadata/md5-cache/media-gfx/xzgv-0.9.1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 sys-apps/texinfo virtual/pkgconfig
+BDEPEND=sys-apps/texinfo virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/gtk+:2
DESCRIPTION=Fast and simple GTK+ image viewer
-EAPI=5
+EAPI=7
HOMEPAGE=https://sourceforge.net/projects/xzgv
-INHERIT=epatch toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=efc37a25c2f833438849941753b394ed
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ba0086f12630492bd0402c296212c716
diff --git a/metadata/md5-cache/media-libs/openctm-1.0.3-r1 b/metadata/md5-cache/media-libs/openctm-1.0.3-r1
index be946dc9371a..19e4063dff33 100644
--- a/metadata/md5-cache/media-libs/openctm-1.0.3-r1
+++ b/metadata/md5-cache/media-libs/openctm-1.0.3-r1
@@ -1,6 +1,7 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install prepare
DEPEND=dev-libs/tinyxml media-libs/freeglut media-libs/glew:0= media-libs/pnglite sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/gtk+:2
-DESCRIPTION=OpenCTM - the Open Compressed Triangle Mesh.
+DESCRIPTION=OpenCTM - the Open Compressed Triangle Mesh
EAPI=7
HOMEPAGE=http://openctm.sourceforge.net
INHERIT=edos2unix flag-o-matic toolchain-funcs
@@ -10,4 +11,4 @@ RDEPEND=dev-libs/tinyxml media-libs/freeglut media-libs/glew:0= media-libs/pngli
SLOT=0/1
SRC_URI=https://downloads.sourceforge.net/project/openctm/OpenCTM-1.0.3/OpenCTM-1.0.3-src.tar.bz2 -> openctm-1.0.3-src.tar.bz2
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=7b9549ec9c4b727ed41c72e6a6afbe38
+_md5_=f1640e8a301b0216e0fb1ea79e77485a
diff --git a/metadata/md5-cache/media-libs/sge-030809 b/metadata/md5-cache/media-libs/sge-030809
index 16ea98a0f868..c14d2c5b7d3f 100644
--- a/metadata/md5-cache/media-libs/sge-030809
+++ b/metadata/md5-cache/media-libs/sge-030809
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsdl image? ( media-libs/sdl-image ) truetype? ( >=media-lib
DESCRIPTION=Graphics extensions library for SDL
EAPI=6
HOMEPAGE=http://www.etek.chalmers.se/~e8cal1/sge/
+INHERIT=toolchain-funcs
IUSE=doc examples image truetype
KEYWORDS=amd64 ~ia64 ppc x86
LICENSE=LGPL-2.1
RDEPEND=media-libs/libsdl image? ( media-libs/sdl-image ) truetype? ( >=media-libs/freetype-2 )
SLOT=0
SRC_URI=http://www.etek.chalmers.se/~e8cal1/sge/files/sge030809.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=fb44ac07346cc3b629630cc7c40b6fd4
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=1b27dd6ba62f51531690432da2a82ecf
diff --git a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1 b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
index a0a63b4931de..e23b14181ec7 100644
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
+++ b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4-r1
@@ -4,7 +4,7 @@ DEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-lib
DESCRIPTION=LV2 convolver plugin especially for creating reverb effects
EAPI=7
HOMEPAGE=https://tomszilagyi.github.io/plugins/ir.lv2/
-INHERIT=toolchain-funcs flag-o-matic multilib
+INHERIT=toolchain-funcs flag-o-matic
IUSE=tools
KEYWORDS=amd64
LICENSE=GPL-2+
@@ -12,4 +12,4 @@ RDEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-li
SLOT=0
SRC_URI=https://github.com/tomszilagyi/ir.lv2/archive/1.3.4.tar.gz -> ir_lv2-1.3.4.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=15fdf9fb6326d4cf87ee4befae85803b
+_md5_=0a2921cced6df17e89ac35d8e785bf6b
diff --git a/metadata/md5-cache/media-radio/direwolf-1.4 b/metadata/md5-cache/media-radio/direwolf-1.4
deleted file mode 100644
index e899c3939144..000000000000
--- a/metadata/md5-cache/media-radio/direwolf-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-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=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=c37e05e8424ef4a2850e957ab3b0c372
diff --git a/metadata/md5-cache/media-radio/qrq-0.3.3 b/metadata/md5-cache/media-radio/qrq-0.3.3
index 70f7c3802864..64f6c35ec096 100644
--- a/metadata/md5-cache/media-radio/qrq-0.3.3
+++ b/metadata/md5-cache/media-radio/qrq-0.3.3
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install prepare
DEPEND=sys-libs/ncurses:= pulseaudio? ( media-sound/pulseaudio )
DESCRIPTION=Yet another CW trainer for Linux/Unix
EAPI=7
HOMEPAGE=http://fkurz.net/ham/qrq.html
+INHERIT=toolchain-funcs
IUSE=pulseaudio
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses:= pulseaudio? ( media-sound/pulseaudio )
SLOT=0
SRC_URI=http://fkurz.net/ham/qrq/qrq-0.3.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=284a01f5f3e457b9b0c144c902ad596f
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=4bd05a0103cf80070befb6d8665cb986
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11-r2 b/metadata/md5-cache/media-sound/bristol-0.60.11-r2
index 929d93fa0ee1..7ce819bf27aa 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.11-r2
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11-r2
@@ -12,4 +12,4 @@ RDEPEND=virtual/jack x11-libs/libX11 alsa? ( media-libs/alsa-lib )
SLOT=0
SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.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_=82439aa9cfd7ec2af242e5d64179e5d4
+_md5_=d8d9ec0ddbd4ccb3ca74caf31ded7cf9
diff --git a/metadata/md5-cache/media-sound/herrie-2.2-r1 b/metadata/md5-cache/media-sound/herrie-2.2-r1
index f4b3f3188256..df601aaded4b 100644
--- a/metadata/md5-cache/media-sound/herrie-2.2-r1
+++ b/metadata/md5-cache/media-sound/herrie-2.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ao alsa pulseaudio oss )
SLOT=0
SRC_URI=http://herrie.info/distfiles/herrie-2.2.tar.bz2
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=baed3c95f88d901e984c8beffeb4d7a9
+_md5_=f19be987afc3028ad27b0e3e87f46da3
diff --git a/metadata/md5-cache/media-sound/jaaa-0.9.2 b/metadata/md5-cache/media-sound/jaaa-0.9.2
index 20d28054d462..59490f03521b 100644
--- a/metadata/md5-cache/media-sound/jaaa-0.9.2
+++ b/metadata/md5-cache/media-sound/jaaa-0.9.2
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install
DEPEND=dev-libs/libclthreads >=media-libs/zita-alsa-pcmi-0.3 sci-libs/fftw:3.0= virtual/jack x11-libs/gtk+:2 x11-libs/libclxclient
DESCRIPTION=JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser
EAPI=7
HOMEPAGE=http://kokkinizita.linuxaudio.org/linuxaudio/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/libclthreads >=media-libs/zita-alsa-pcmi-0.3 sci-libs/fftw:3.0= virtual/jack x11-libs/gtk+:2 x11-libs/libclxclient
SLOT=0
SRC_URI=http://kokkinizita.linuxaudio.org/linuxaudio/downloads/jaaa-0.9.2.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=048c8887bcb52d74c27da47dce4d1e54
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=227ba2d63e3390d7a0f8acd892e0acd4
diff --git a/metadata/md5-cache/media-sound/jack_capture-0.9.73 b/metadata/md5-cache/media-sound/jack_capture-0.9.73
index bc9caa6c31ed..c41b819497c6 100644
--- a/metadata/md5-cache/media-sound/jack_capture-0.9.73
+++ b/metadata/md5-cache/media-sound/jack_capture-0.9.73
@@ -1,5 +1,5 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo )
DESCRIPTION=JACK Recording utility
EAPI=7
HOMEPAGE=https://github.com/kmatheussen/jack_capture
@@ -11,4 +11,4 @@ RDEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( medi
SLOT=0
SRC_URI=https://github.com/kmatheussen/jack_capture/archive/0.9.73.tar.gz -> jack_capture-0.9.73.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=e1342adf4efd77dec874cdfada79410d
+_md5_=c617dd53d527455e6171a2b40807f92c
diff --git a/metadata/md5-cache/media-sound/jack_capture-9999 b/metadata/md5-cache/media-sound/jack_capture-9999
index b0b30d202c59..704674fee199 100644
--- a/metadata/md5-cache/media-sound/jack_capture-9999
+++ b/metadata/md5-cache/media-sound/jack_capture-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile install prepare unpack
DEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo )
DESCRIPTION=JACK Recording utility
@@ -11,4 +11,4 @@ PROPERTIES=live
RDEPEND=media-libs/libsndfile virtual/jack mp3? ( media-sound/lame ) ogg? ( media-libs/libogg ) osc? ( media-libs/liblo )
SLOT=0
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e git-r3 b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=d61657647646af772315769d0b367410
+_md5_=4e4b8eefac2101d994d2879451ef70fa
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 9757128dbec2..bf9c91862492 100644
--- a/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
+++ b/metadata/md5-cache/media-video/mpeg-tools-1.5b-r5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install postinst prepare
DEPEND=x11-libs/libX11 virtual/jpeg:0
DESCRIPTION=Tools for MPEG video
-EAPI=5
+EAPI=7
HOMEPAGE=http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html
-INHERIT=epatch toolchain-funcs
+INHERIT=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_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=b31fb3e762b0343c069492a66db74a09
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=6ffb5543fe3de6bad5ed6d294012eea3
diff --git a/metadata/md5-cache/net-analyzer/nagircbot-0.0.33 b/metadata/md5-cache/net-analyzer/nagircbot-0.0.33
index 9c077ad4bb1f..6377a2b68c6e 100644
--- a/metadata/md5-cache/net-analyzer/nagircbot-0.0.33
+++ b/metadata/md5-cache/net-analyzer/nagircbot-0.0.33
@@ -3,11 +3,12 @@ DEPEND=virtual/pkgconfig !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs
DESCRIPTION=An irc bot that alerts you to nagios changes
EAPI=5
HOMEPAGE=http://www.vanheusden.com/nagircbot
+INHERIT=toolchain-funcs
IUSE=libressl
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=net-analyzer/nagios-core !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
SLOT=0
SRC_URI=http://www.vanheusden.com/nagircbot/nagircbot-0.0.33.tgz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=fd434abb966387c681e5315028add110
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=b26d77ae9013bcb33e022ef872808506
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2 b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
index 5d232522cdd8..9c94a9399e53 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r2
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://www.kernel.org/pub/software/network/tftp/
INHERIT=systemd toolchain-funcs
IUSE=ipv6 readline selinux tcpd +client +server
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos
LICENSE=BSD-4
RDEPEND=readline? ( sys-libs/readline:0= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-tftp ) !net-ftp/atftp server? ( !net-misc/iputils[tftpd(+)] !net-ftp/uftpd )
SLOT=0
SRC_URI=https://www.kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-5.2.tar.xz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=ea5c0bb68d6f20161f2f662234b00b64
+_md5_=530bcaea11d73df8864803a284839036
diff --git a/metadata/md5-cache/net-ftp/yafc-1.3.7 b/metadata/md5-cache/net-ftp/yafc-1.3.7
index 771d44a4d929..dc60f7b26b34 100644
--- a/metadata/md5-cache/net-ftp/yafc-1.3.7
+++ b/metadata/md5-cache/net-ftp/yafc-1.3.7
@@ -1,14 +1,14 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:* dev-libs/libbsd !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/ncurses:* dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
DESCRIPTION=Console ftp client with a lot of nifty features
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.yafc-ftp.com/
-INHERIT=bash-completion-r1 epatch
-IUSE=ipv6 libressl kerberos readline socks5 ssh
+INHERIT=bash-completion-r1
+IUSE=ipv6 kerberos readline socks5 ssh
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:* dev-libs/libbsd !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
+RDEPEND=sys-libs/ncurses:* dev-libs/libbsd dev-libs/openssl:0= kerberos? ( virtual/krb5 ) readline? ( >=sys-libs/readline-6:0= ) socks5? ( net-proxy/dante ) ssh? ( net-libs/libssh )
SLOT=0
SRC_URI=http://www.yafc-ftp.com/downloads/yafc-1.3.7.tar.xz
-_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908 estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=e4fb85d15c2a66c52cbbefe9afdebd79
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e bash-completion-r1 8e7c071081c68c2c398b77fe3a1d6908
+_md5_=95f5c485ab5873fac5b0454ec6c3caac
diff --git a/metadata/md5-cache/net-im/cpop-0.0.4-r1 b/metadata/md5-cache/net-im/cpop-0.0.4-r1
index 0d97553f4e4e..cab33095dd67 100644
--- a/metadata/md5-cache/net-im/cpop-0.0.4-r1
+++ b/metadata/md5-cache/net-im/cpop-0.0.4-r1
@@ -1,13 +1,11 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=install
DEPEND=dev-libs/glib:2 x11-libs/gtk+:2
DESCRIPTION=GTK+ network popup message client. Compatible with the jpop protocol
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.draxil.uklinux.net/hip/index.pl?page=cpop
-INHERIT=epatch
KEYWORDS=~amd64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://gentoo/cpop-0.0.4.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=d6c3eef002032bcae8dc24311a562622
+_md5_=323f105429ed665a3d2cdc75b959403a
diff --git a/metadata/md5-cache/net-libs/gsnmp-0.3.0 b/metadata/md5-cache/net-libs/gsnmp-0.3.0
index 7165c6eb82e1..50782a6b626a 100644
--- a/metadata/md5-cache/net-libs/gsnmp-0.3.0
+++ b/metadata/md5-cache/net-libs/gsnmp-0.3.0
@@ -1,14 +1,15 @@
+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
DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 net-libs/gnet 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
+DEPEND=dev-libs/glib:2 net-libs/gnet
DESCRIPTION=An SNMP library based on glib and gnet
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/schoenw/gsnmp
-INHERIT=autotools epatch ltprune
+INHERIT=autotools
IUSE=static-libs
KEYWORDS=amd64 ~ppc x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 net-libs/gnet
SLOT=0
SRC_URI=ftp://ftp.ibr.cs.tu-bs.de/pub/local/gsnmp/gsnmp-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_=28b74b2f73f650bf461e8656fd1228e0
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=5c310b5566fb2ce84b637a22d932156b
diff --git a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1 b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
index 46512982d0f9..a2dfbebba05e 100644
--- a/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
+++ b/metadata/md5-cache/net-libs/openmq-cclient-4.4.1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/nss dev-libs/nspr virtual/pkgconfig app-arch/unzip sys-devel/gnu
DESCRIPTION=C-Client Library for Open Source Java Message Service (JMS)
EAPI=5
HOMEPAGE=https://mq.java.net/
-INHERIT=autotools epatch versionator
+INHERIT=autotools epatch toolchain-funcs versionator
KEYWORDS=~amd64 ~x86
LICENSE=|| ( CDDL GPL-2-with-linking-exception )
RDEPEND=dev-libs/nss dev-libs/nspr
SLOT=0
SRC_URI=http://download.java.net/mq/open-mq/4.4u1/b7-final/openmq4_4-source.zip -> openmq4.4u1b7-final-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 gnuconfig 9f91b4b0c84e734a87492d4293f03de5 libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=92ad8eeb86620e6d4fcf7a611e4fa49c
+_md5_=0b5a8218bf4d4fe8de50f210719a2b8a
diff --git a/metadata/md5-cache/net-misc/cbugzilla-0.2.1 b/metadata/md5-cache/net-misc/cbugzilla-0.2.1
index 0e24fe6c241d..4b07598542c8 100644
--- a/metadata/md5-cache/net-misc/cbugzilla-0.2.1
+++ b/metadata/md5-cache/net-misc/cbugzilla-0.2.1
@@ -1,11 +1,11 @@
DEFINED_PHASES=configure
-DEPEND=net-misc/curl dev-libs/libxdg-basedir app-text/htmltidy
+DEPEND=app-text/htmltidy dev-libs/libxdg-basedir net-misc/curl
DESCRIPTION=CLI and C api to get data from Bugzilla
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/yaccz/cbugzilla
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=net-misc/curl dev-libs/libxdg-basedir app-text/htmltidy
+RDEPEND=app-text/htmltidy dev-libs/libxdg-basedir net-misc/curl
SLOT=0
SRC_URI=https://dev.gentoo.org/~yac/distfiles/cbugzilla-0.2.1.tar.xz
-_md5_=527daa91253b863193ed1d83f0b56019
+_md5_=ceba37bd8ffdbacee58ca844a9ace308
diff --git a/metadata/md5-cache/net-misc/connect-1.103 b/metadata/md5-cache/net-misc/connect-1.103
deleted file mode 100644
index 0ab9418b58c8..000000000000
--- a/metadata/md5-cache/net-misc/connect-1.103
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=network connection relaying command (proxy)
-EAPI=5
-HOMEPAGE=https://bitbucket.org/gotoh/connect
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://bitbucket.org/gotoh/connect/get/ee1fbc21da4b.tar.bz2 -> connect-1.103.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=b20c5ee79d3e440f5da01f29faf04b3c
diff --git a/metadata/md5-cache/net-misc/httptype-1.3.9-r1 b/metadata/md5-cache/net-misc/httptype-1.3.9-r1
index 3fbf1374e204..0aa46a18ebe0 100644
--- a/metadata/md5-cache/net-misc/httptype-1.3.9-r1
+++ b/metadata/md5-cache/net-misc/httptype-1.3.9-r1
@@ -1,10 +1,10 @@
DEFINED_PHASES=compile install
DESCRIPTION=Returns the http host software of a website
-EAPI=5
+EAPI=7
HOMEPAGE=http://httptype.sourceforge.net
KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux
LICENSE=GPL-1
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=mirror://sourceforge/httptype/httptype-1.3.9.tar.gz
-_md5_=1cd93fc1f6dd40038da26cd850e60fc1
+_md5_=e07548b9050b4bcc78c89e3682ecc7a1
diff --git a/metadata/md5-cache/net-misc/pedro-1.6 b/metadata/md5-cache/net-misc/pedro-1.6
index 25c007693581..a74710b22d7e 100644
--- a/metadata/md5-cache/net-misc/pedro-1.6
+++ b/metadata/md5-cache/net-misc/pedro-1.6
@@ -1,12 +1,14 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
DEPEND=dev-libs/glib:2
DESCRIPTION=Pedro is a subscription/notification communications system
EAPI=6
HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/PedroHome.html
+INHERIT=toolchain-funcs
IUSE=doc examples
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2
SLOT=0
SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/PedroFiles/pedro-1.6.tgz doc? ( mirror://gentoo/pedro-manual-1.6.tar.gz )
-_md5_=8d6cbc0ec02ade7e5c1053e35839f56f
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=070677a6145ba3dfff51f267eaa52d65
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.3-r3 b/metadata/md5-cache/net-misc/rsync-3.2.3-r3
index 0f941460a640..1fe73590ba0c 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.3-r3
+++ b/metadata/md5-cache/net-misc/rsync-3.2.3-r3
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://rsync.samba.org/
INHERIT=prefix systemd toolchain-funcs
IUSE=acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd
-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
+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=GPL-3
RDEPEND=acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( >=app-arch/zstd-1.4 ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )
SLOT=0
SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.3.tar.gz
_eclasses_=prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=923c38acb6c1d92868a9130eef890395
+_md5_=7be027eba1e02f59c339d9ee6da422a1
diff --git a/metadata/md5-cache/net-proxy/adzapper-20110915-r2 b/metadata/md5-cache/net-proxy/adzapper-20110915-r2
index 88da494051c9..7000e1312c0a 100644
--- a/metadata/md5-cache/net-proxy/adzapper-20110915-r2
+++ b/metadata/md5-cache/net-proxy/adzapper-20110915-r2
@@ -1,12 +1,10 @@
DEFINED_PHASES=install postinst prepare
DESCRIPTION=Redirector for squid to intercept advertising, page counters and web bugs
-EAPI=5
+EAPI=7
HOMEPAGE=http://adzapper.sourceforge.net/
-INHERIT=epatch
KEYWORDS=~alpha amd64 ~hppa ppc sparc x86
LICENSE=BSD
RDEPEND=dev-lang/perl
SLOT=0
SRC_URI=http://adzapper.sourceforge.net/adzap-20110915.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 epatch 9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=d9b3570f631b91a9173f0bf926db8e86
+_md5_=5ecc76b2693a9f100411af7258eb57ce
diff --git a/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1 b/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
index 02f0c848398f..cd1644ad0603 100644
--- a/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
+++ b/metadata/md5-cache/net-proxy/nutcracker-0.4.1-r1
@@ -1,14 +1,15 @@
+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
DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libyaml-0.1.4 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
+DEPEND=>=dev-libs/libyaml-0.1.4
DESCRIPTION=A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)
-EAPI=5
+EAPI=7
HOMEPAGE=https://github.com/twitter/twemproxy
-INHERIT=autotools epatch
+INHERIT=autotools
IUSE=debug doc
KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-libs/libyaml-0.1.4
SLOT=0
SRC_URI=https://github.com/twitter/twemproxy/archive/v0.4.1.tar.gz -> nutcracker-0.4.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_=f8561b0e3f9e4a49e0435c0e01a02948
+_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354
+_md5_=82cd30843784ad8348152aeed9bc96f1
diff --git a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1 b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
index 96d920863bd0..7a3e099c5474 100644
--- a/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
+++ b/metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
@@ -4,11 +4,11 @@ DEPEND=media-libs/glew:0= media-libs/mesa[X(+)] x11-libs/wxGTK:3.0[X,opengl]
DESCRIPTION=Chemical 3D graphics program with GAMESS input builder
EAPI=7
HOMEPAGE=http://www.scl.ameslab.gov/MacMolPlt/
-INHERIT=autotools desktop wxwidgets
+INHERIT=autotools desktop toolchain-funcs wxwidgets
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=media-libs/glew:0= media-libs/mesa[X(+)] x11-libs/wxGTK:3.0[X,opengl]
SLOT=0
SRC_URI=https://wxmacmolplt.googlecode.com/files/wxmacmolplt-7.5.tar.gz
_eclasses_=gnuconfig 9f91b4b0c84e734a87492d4293f03de5 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e libtool f143db5a74ccd9ca28c1234deffede96 autotools 9e63f92c2a5d867fea55ecb160c7d354 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88 wxwidgets 407be90c398e52298054aff2093912a3
-_md5_=aa06869a942c47c4b7ae5fd2f996579a
+_md5_=79066879c49f635ae7f6925ca500e74a
diff --git a/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r2 b/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r2
index e468d2c6d400..0447866618dc 100644
--- a/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r2
+++ b/metadata/md5-cache/sci-geosciences/gpscorrelate-1.6.1-r2
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libxml2:2 media-gfx/exiv2:= gtk? ( x11-libs/gtk+:2 )
SLOT=0
SRC_URI=http://freefoote.dview.net/linux/gpscorrelate-1.6.1.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=35a9494c1f952f97687e1c16e8b4e1dd
+_md5_=8df22dc5fb7f857420ec58202f0f34fc
diff --git a/metadata/md5-cache/sci-libs/superlu-4.3-r2 b/metadata/md5-cache/sci-libs/superlu-4.3-r2
index 60b0be5ddcab..8357ae7e9e14 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_=da13ced633615f7417db1c82f9ec5128
+_md5_=2bcb307df418eaae6c8bce2a3c06aafe
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.11.4 b/metadata/md5-cache/sci-mathematics/pari-2.11.4
index 6a8a252c0017..fd27d5bb4afe 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.11.4
+++ b/metadata/md5-cache/sci-mathematics/pari-2.11.4
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( virtual/latex-base )
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
DEFINED_PHASES=compile configure install prepare test
DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
DESCRIPTION=Computer-aided number theory C library and tools
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0/6
SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.11.4.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=c7f95a4eebe4a6b5e780d8f50e24097d
+_md5_=738ed5170714db30d801a0afe35161b6
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.13.0 b/metadata/md5-cache/sci-mathematics/pari-2.13.0
index c479fdc9aa4b..edb5690c0148 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.13.0
+++ b/metadata/md5-cache/sci-mathematics/pari-2.13.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( virtual/latex-base )
+BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
DEFINED_PHASES=compile configure install prepare test
DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
DESCRIPTION=Computer-aided number theory C library and tools
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0/7
SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.13.0.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e edos2unix 33e347e171066657f91f8b0c72ec8773 l10n 8cdd85e169b835d518bc2fd59f780d8e wrapper 4251d4c84c25f59094fd557e0063a974 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic c0964e43ba712cb933da5f65b958fa88
-_md5_=af075fadcd7704eb1460d966e276129b
+_md5_=84fd55483e7e826cb7aea993f931a7c3
diff --git a/metadata/md5-cache/sci-visualization/spectromatic-1.0-r3 b/metadata/md5-cache/sci-visualization/spectromatic-1.0-r3
index 861be52081d6..bd74fb659833 100644
--- a/metadata/md5-cache/sci-visualization/spectromatic-1.0-r3
+++ b/metadata/md5-cache/sci-visualization/spectromatic-1.0-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libpng:0= sci-libs/gsl:= virtual/pkgconfig
DESCRIPTION=Generates time-frequency analysis images from wav files
EAPI=6
HOMEPAGE=http://ieee.uow.edu.au/~daniel/software/spectromatic/
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=media-libs/libpng:0= sci-libs/gsl:=
SLOT=0
SRC_URI=http://ieee.uow.edu.au/~daniel/software/spectromatic/dist/spectromatic_1.0-1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=bb5bfd42f52ebcece100e3f1a106c4dc
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=593761192bcde1a65af38406ed7ef18f
diff --git a/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2 b/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
index df64ae3cc194..5f40d37afab1 100644
--- a/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
+++ b/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/pcsc-lite dev-libs/openct
SLOT=0
SRC_URI=mirror://gentoo/slb_rf72-drv-1.1.0.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=8f27e72dcf0fb076134240cb501bbd91
+_md5_=a4107aa060a5fb720871d57e418a5b5b
diff --git a/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.0 b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.0
index ba33250fca45..afe8a141936d 100644
--- a/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.0
+++ b/metadata/md5-cache/sys-apps/usb_modeswitch-2.6.0
@@ -6,10 +6,10 @@ EAPI=7
HOMEPAGE=https://www.draisberghof.de/usb_modeswitch/ https://www.draisberghof.de/usb_modeswitch/device_reference.txt
INHERIT=linux-info toolchain-funcs udev systemd
IUSE=kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=virtual/udev virtual/libusb:1
SLOT=0
SRC_URI=https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.6.0.tar.bz2 https://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-20191128.tar.bz2
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e linux-info 30ded7f9adbdd03d3e848cdd74f6c395 udev 452708c3f55cf6e918b045adb949a9e6 systemd fdf0d765c3f11f91fe54f8def9a8c0e6
-_md5_=24de63e412a35ef646554076b3f96f03
+_md5_=ea2e7727396622714438857d57b76aa1
diff --git a/metadata/md5-cache/sys-fs/davl-1.2.4-r2 b/metadata/md5-cache/sys-fs/davl-1.2.4-r2
index 26639601ef51..21575088e128 100644
--- a/metadata/md5-cache/sys-fs/davl-1.2.4-r2
+++ b/metadata/md5-cache/sys-fs/davl-1.2.4-r2
@@ -3,10 +3,11 @@ DEPEND=>=x11-libs/gtk+-2.6:2 >=sys-fs/e2fsprogs-1.41.7-r1 virtual/pkgconfig
DESCRIPTION=Visualizes the fragmentation status of ext2/3 filesystems
EAPI=6
HOMEPAGE=http://davl.sourceforge.net/
+INHERIT=toolchain-funcs
KEYWORDS=~x86
LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.6:2
SLOT=0
SRC_URI=mirror://sourceforge/davl/davl-1.2.4.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=f183745feb79adb051e2eb270cf5c174
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=eed3bc2f410b4981c2b747b726a738ec
diff --git a/metadata/md5-cache/sys-fs/mhddfs-0.1.39-r2 b/metadata/md5-cache/sys-fs/mhddfs-0.1.39-r2
index 7a8be3f01a9c..2f362d1e8040 100644
--- a/metadata/md5-cache/sys-fs/mhddfs-0.1.39-r2
+++ b/metadata/md5-cache/sys-fs/mhddfs-0.1.39-r2
@@ -1,13 +1,15 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install postinst
DEPEND=dev-libs/glib:2 sys-fs/fuse:0
DESCRIPTION=Fuse multi harddrive filesystem
EAPI=7
HOMEPAGE=http://mhddfs.uvw.ru/ http://svn.uvw.ru/mhddfs/trunk/README
+INHERIT=toolchain-funcs
IUSE=l10n_ru suid
KEYWORDS=amd64
LICENSE=GPL-3
RDEPEND=dev-libs/glib:2 sys-fs/fuse:0
SLOT=0
SRC_URI=http://mhddfs.uvw.ru/downloads/mhddfs_0.1.39.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=cb07323bb1c8593ed631e4b3e61696a2
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=e0dc34b031cc758e19a191815725be3f
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 7876eb138716..59da94ebde15 100644
--- a/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
+++ b/metadata/md5-cache/sys-libs/libaal-1.0.7-r2
@@ -5,9 +5,9 @@ EAPI=7
HOMEPAGE=https://sourceforge.net/projects/reiser4/
INHERIT=usr-ldscript
IUSE=static-libs split-usr
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 -sparc x86
+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_=66ba6ec555ce878bdcdc9bc1b857622a
+_md5_=dc243349f8abb0f31768ad7eabe66063
diff --git a/metadata/md5-cache/x11-misc/apwal-0.4.5-r2 b/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
index 84bd82681626..b8dda89b51ad 100644
--- a/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
+++ b/metadata/md5-cache/x11-misc/apwal-0.4.5-r2
@@ -1,12 +1,13 @@
DEFINED_PHASES=configure
-DEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig
+DEPEND=dev-libs/libxml2 dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=A simple application launcher and combined editor
EAPI=6
HOMEPAGE=http://apwal.free.fr/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/gdk-pixbuf dev-libs/libxml2 dev-libs/glib:2
+RDEPEND=dev-libs/libxml2 dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
SLOT=0
SRC_URI=http://apwal.free.fr/download/apwal-0.4.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=04a4a7228a7b6c9ebd712f4b7aa18fe7
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=e759bf37d93f00861c2fd5385bae5c10
diff --git a/metadata/md5-cache/x11-misc/bbrun-1.6-r1 b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
index 9c43f6ab8990..d67a7b3ea312 100644
--- a/metadata/md5-cache/x11-misc/bbrun-1.6-r1
+++ b/metadata/md5-cache/x11-misc/bbrun-1.6-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-lib
SLOT=0
SRC_URI=http://www.darkops.net/bbrun/bbrun-1.6.tar.gz
_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=12a90ed0832db68354a9c3bc5e4601de
+_md5_=bf708401655b58d1fcc15d6463dd0c8f
diff --git a/metadata/md5-cache/x11-misc/chgres-0.1-r2 b/metadata/md5-cache/x11-misc/chgres-0.1-r2
index 9cff35789d5a..48299b40f8fd 100644
--- a/metadata/md5-cache/x11-misc/chgres-0.1-r2
+++ b/metadata/md5-cache/x11-misc/chgres-0.1-r2
@@ -1,12 +1,13 @@
DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm x11-base/xorg-proto virtual/pkgconfig
DESCRIPTION=A very simple command line utility for changing X resolutions
EAPI=6
HOMEPAGE=http://hpwww.ec-lyon.fr/~vincent/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXxf86dga x11-libs/libXext x11-libs/libXxf86vm
SLOT=0
SRC_URI=http://hpwww.ec-lyon.fr/~vincent/chgres-0.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=90b831c5adcef332e1d3cb30fb921ab8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=ea59eaa07cd9f4d4b17462357e895399
diff --git a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100 b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
index 9cb7cb36d8aa..16f51b5c99df 100644
--- a/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
+++ b/metadata/md5-cache/x11-misc/devilspie2-0.43-r100
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1?
DESCRIPTION=Devilspie like window matching utility, using LUA for scripting
EAPI=7
HOMEPAGE=https://www.nongnu.org/devilspie2/
+INHERIT=lua-single toolchain-funcs l10n
IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3
KEYWORDS=amd64 x86
LICENSE=GPL-3
@@ -11,5 +12,5 @@ RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1
REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )
SLOT=0
SRC_URI=https://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.43-src.tar.gz
-_eclasses_=l10n 8cdd85e169b835d518bc2fd59f780d8e lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=49bfeb940a8a7ad57a4b12d1485c0e91
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e lua-utils 736947973cfbc9de01fdb8548f942f82 lua-single f91b5656f00869c220a6e35ae0521c54 l10n 8cdd85e169b835d518bc2fd59f780d8e
+_md5_=4f38972efbcc854a06b76a945f7d8b0c
diff --git a/metadata/md5-cache/x11-misc/gbase-0.5-r1 b/metadata/md5-cache/x11-misc/gbase-0.5-r1
index 368fecace6ab..1627d1bf5882 100644
--- a/metadata/md5-cache/x11-misc/gbase-0.5-r1
+++ b/metadata/md5-cache/x11-misc/gbase-0.5-r1
@@ -1,13 +1,14 @@
DEFINED_PHASES=compile install
DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=a convert program for decimal, hexadecimal, octal and binary values
+DESCRIPTION=A convert program for decimal, hexadecimal, octal and binary values
EAPI=6
HOMEPAGE=http://www.fluxcode.net
+INHERIT=toolchain-funcs
KEYWORDS=amd64 x86
LICENSE=Artistic
RDEPEND=x11-libs/gtk+:2
RESTRICT=test
SLOT=0
SRC_URI=http://www.fluxcode.net/files/gbase-0.5.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=9845afd9a2d1f8f82cec3d48a51d59a8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=da701bde1fb8519fe0a0db48b8e6350b
diff --git a/metadata/md5-cache/x11-misc/grabc-1.1-r2 b/metadata/md5-cache/x11-misc/grabc-1.1-r2
index db325a9039c0..ba4e7b2cfc86 100644
--- a/metadata/md5-cache/x11-misc/grabc-1.1-r2
+++ b/metadata/md5-cache/x11-misc/grabc-1.1-r2
@@ -1,12 +1,13 @@
DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-base/xorg-proto virtual/pkgconfig
DESCRIPTION=Identify color of a pixel on the screen by clicking on a pixel on the screen
EAPI=6
HOMEPAGE=https://www.muquit.com/muquit/software/grabc/grabc.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=https://www.muquit.com/muquit/software/grabc/grabc1.1.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=19a9a45b1d9673969ba448689f92c9f9
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=afb36fbcebca0dc9e2eed503e666fb34
diff --git a/metadata/md5-cache/x11-misc/gromit-20041213-r1 b/metadata/md5-cache/x11-misc/gromit-20041213-r1
index e296f9bb194f..e881d7d8a8cd 100644
--- a/metadata/md5-cache/x11-misc/gromit-20041213-r1
+++ b/metadata/md5-cache/x11-misc/gromit-20041213-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
DESCRIPTION=GRaphics Over MIscellaneous Things, a presentation helper
EAPI=6
HOMEPAGE=http://www.home.unix-ag.org/simon/gromit
+INHERIT=toolchain-funcs
KEYWORDS=~amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=http://www.home.unix-ag.org/simon/gromit/gromit-20041213.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d40bc448386926e853290f6c9e746b70
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=063d8bd30267ad547cdc4741ca229644
diff --git a/metadata/md5-cache/x11-misc/skippy-0.5.0-r1 b/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
index ceac9a8164de..748146e5b594 100644
--- a/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
+++ b/metadata/md5-cache/x11-misc/skippy-0.5.0-r1
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile postinst
-DEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu x11-libs/libXft x11-base/xorg-proto virtual/pkgconfig
+DEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu x11-libs/libXft x11-base/xorg-proto
DESCRIPTION=A full-screen task-switcher providing Apple Expose-like functionality
EAPI=7
HOMEPAGE=http://thegraveyard.org/skippy.php
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=media-libs/imlib2[X] x11-libs/libXext x11-libs/libX11 x11-libs/libXinerama x11-libs/libXmu x11-libs/libXft
SLOT=0
SRC_URI=http://thegraveyard.org/files/skippy-0.5.0.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8a3314a71a1daddb64bc2bd0fff2178d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=f11126b38d22c83a8a12577fe67596c8
diff --git a/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1 b/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
index 38fa06c2e83b..44a845b54c7b 100644
--- a/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
+++ b/metadata/md5-cache/x11-misc/xrootconsole-0.6-r1
@@ -1,12 +1,13 @@
DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DEPEND=x11-libs/libX11 x11-base/xorg-proto virtual/pkgconfig
DESCRIPTION=A utility that displays its input in a text box on your root window
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/xrootconsole/
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11
SLOT=0
SRC_URI=mirror://sourceforge/xrootconsole/xrootconsole-0.6.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=f95a10a923bfa233bf4ebeafef256edd
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=77decaa6b899380a61ab228d36277e42
diff --git a/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3 b/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
index 8207376faef6..b2f28eec52a4 100644
--- a/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
+++ b/metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
@@ -1,12 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DEPEND=x11-libs/gtk+:2
DESCRIPTION=A fun monitoring applet for your desktop, complete with swimming duck
EAPI=7
HOMEPAGE=http://www.ne.jp/asahi/linux/timecop
+INHERIT=toolchain-funcs
KEYWORDS=~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2
SLOT=0
SRC_URI=http://www.ne.jp/asahi/linux/timecop/software/bubblemon-dockapp-1.46.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=88b515b47a8c95c8546e53ce5f98bbd8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=39720179d36e99fa73967b506198400d
diff --git a/metadata/md5-cache/x11-plugins/docker-1.5-r2 b/metadata/md5-cache/x11-plugins/docker-1.5-r2
index 74bae7a7fa85..bd4d7f5ed98f 100644
--- a/metadata/md5-cache/x11-plugins/docker-1.5-r2
+++ b/metadata/md5-cache/x11-plugins/docker-1.5-r2
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile postinst
-DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11 virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.0.4 x11-libs/libX11
DESCRIPTION=Openbox app which acts as a system tray for KDE and GNOME2
EAPI=7
HOMEPAGE=https://icculus.org/openbox/2/docker/
@@ -10,4 +11,4 @@ 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_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=ff2124a5b935bde5d98a7f651a959db1
+_md5_=9f47036538b0aba48f949057c297cd0d
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
index 290d09d6a13e..97d545cf214a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=A GKrellM2 plugin to control a fli4l router
EAPI=6
HOMEPAGE=http://gkrellm-imonc.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=app-admin/gkrellm:2[X]
SLOT=0
SRC_URI=mirror://sourceforge/gkrellm-imonc/gkrellm-imonc-src-0.2.tar.bz2
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 gkrellm-plugin 30f870080cadcd60810a1fb1bbb33d9f
-_md5_=7b7850c10fb5846c8cf69a722faf5438
+_md5_=bd7ae86a8f9f85078cca1766cef9f9bf
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
index e13fa7b39c19..76943cf49f67 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=configure install
DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
EAPI=6
HOMEPAGE=http://nerv-un.net/~dragorn/
-INHERIT=gkrellm-plugin
+INHERIT=gkrellm-plugin toolchain-funcs
KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=app-admin/gkrellm:2[X]
SLOT=2
SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 gkrellm-plugin 30f870080cadcd60810a1fb1bbb33d9f
-_md5_=2bf3973b2dfd419e4f538430569ccdf3
+_md5_=e4a41f127406fc1370f55d73a38b0ab7
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
index e8ce750ec219..0bbc815caece 100644
--- a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0= virtual/pkgconfig
+DEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0= virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=A web monitor plugin for GKrellM2
EAPI=6
HOMEPAGE=http://gkwebmon.sourceforge.net/
@@ -10,4 +10,4 @@ RDEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0=
SLOT=0
SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.tgz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 gkrellm-plugin 30f870080cadcd60810a1fb1bbb33d9f
-_md5_=e4c90344dfd1a854ce5800d22ab357f3
+_md5_=9fe23519cbdd3148d3a5d69504c4c261
diff --git a/metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r1 b/metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r1
index b54d26dd099f..9d0012f7c494 100644
--- a/metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r1
+++ b/metadata/md5-cache/x11-plugins/wmclockmon-0.8.1-r1
@@ -1,11 +1,14 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/gtk+:2 x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt
-DESCRIPTION=a nice digital clock with 7 different styles either in LCD or LED style
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=x11-libs/gtk+:2 x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE x11-base/xorg-proto x11-libs/libXt
+DESCRIPTION=A nice digital clock with 7 different styles either in LCD or LED style
EAPI=7
HOMEPAGE=http://tnemeth.free.fr/projets/dockapps.html
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libXext x11-libs/libX11 x11-libs/libXpm x11-libs/libICE
SLOT=0
SRC_URI=mirror://debian/pool/main/w/wmclockmon/wmclockmon_0.8.1-1.tar.gz
-_md5_=e27f5e29c73b1c7592817d77e33d411d
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=d4b55a72b8757089d60f7015d29a3df4
diff --git a/metadata/md5-cache/x11-plugins/wmfishtime-1.24-r3 b/metadata/md5-cache/x11-plugins/wmfishtime-1.24-r3
index 1c36479624e1..a83a735cf06e 100644
--- a/metadata/md5-cache/x11-plugins/wmfishtime-1.24-r3
+++ b/metadata/md5-cache/x11-plugins/wmfishtime-1.24-r3
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libX11
DESCRIPTION=A fun clock applet for your desktop featuring swimming fish
EAPI=7
HOMEPAGE=http://www.ne.jp/asahi/linux/timecop
+INHERIT=toolchain-funcs
KEYWORDS=amd64 ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libX11
SLOT=0
SRC_URI=http://www.ne.jp/asahi/linux/timecop/software/wmfishtime-1.24.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=be57d346656c30eeabd29a027007ba1c
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=177afbdfa6025e913d192dce36e4c31a
diff --git a/metadata/md5-cache/x11-wm/echinus-0.4.9 b/metadata/md5-cache/x11-wm/echinus-0.4.9
index bd4650c1d39b..503e7e0b3ab9 100644
--- a/metadata/md5-cache/x11-wm/echinus-0.4.9
+++ b/metadata/md5-cache/x11-wm/echinus-0.4.9
@@ -4,11 +4,12 @@ DEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr )
DESCRIPTION=A window manager for X in the spirit of dwm
EAPI=7
HOMEPAGE=https://plhk.ru/
+INHERIT=toolchain-funcs
IUSE=xrandr
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr )
SLOT=0
SRC_URI=https://plhk.ru/static/echinus/echinus-0.4.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8bcde3756dfff36b5a2f7591e6a7f4a8
+_eclasses_=toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
+_md5_=bb8d32f2055e58e50cebc043e2441d65
diff --git a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4 b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
index 4511ddc80109..f157669df0d1 100644
--- a/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
+++ b/metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
@@ -1,3 +1,4 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=install postinst prepare
DEPEND=x11-libs/libX11
DESCRIPTION=A simple dynamic window manager, with features nicked from ratpoison and dwm
@@ -11,4 +12,4 @@ RDEPEND=x11-libs/libX11 >=x11-misc/dmenu-4.4 apis? ( x11-misc/xbindkeys )
SLOT=0
SRC_URI=mirror://gentoo/musca-0.9.24_p20100226.tgz
_eclasses_=portability c10bdc40668533b1faf15b1d89df0303 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 multilib d410501a125f99ffb560b0c523cd3d1e
-_md5_=1b26a2530bdb64cf6f52841d436df562
+_md5_=e4a702d9e6695aca9171440a411997cb
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index e6d4bf53c657..469beca78e9c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -2702,7 +2702,7 @@ app-misc/mencal 3.0: Calendar to track menstruation cycles
app-misc/mepl 0.45-r1: Self-employed-mode software for 3COM/USR message modems
app-misc/mime-types 9: Provides /etc/mime.types file
app-misc/mkcert 1.4.1: A zero-config tool to make locally trusted development certificates
-app-misc/mmv 1.01b_p18-r1 1.01b_p19: Move/copy/append/link multiple files according to a set of wildcard patterns
+app-misc/mmv 1.01b_p19: Move/copy/append/link multiple files according to a set of wildcard patterns
app-misc/mosquitto 1.6.8 1.6.9 1.6.10 1.6.12 2.0.10: An Open Source MQTT v3 Broker
app-misc/mouseremote 0.90-r2 0.90-r3: X10 MouseRemote
app-misc/muttprint 0.73-r5: Script for pretty printing of your mails
@@ -3068,7 +3068,7 @@ app-text/docbook-xsl-ns-stylesheets 1.79.1: XSL Stylesheets for Docbook
app-text/docbook-xsl-stylesheets 1.79.1-r2: XSL Stylesheets for Docbook
app-text/docbook2X 0.8.8-r4: Tools to convert docbook to man and info
app-text/docx2txt 1.4: Convert MS Office docx files to plain text
-app-text/dos2unix 7.3.5 7.4.1 7.4.2: Convert DOS or MAC text files to UNIX format or vice versa
+app-text/dos2unix 7.4.2: Convert DOS or MAC text files to UNIX format or vice versa
app-text/dvipng 1.17: Translate DVI files into PNG or GIF graphics
app-text/dvipsk 2020.1_p20200406 2021.1_p20210325: DVI-to-PostScript translator
app-text/dvisvgm 2.10.1-r1 2.11-r1: Converts DVI files to SVG
@@ -10918,7 +10918,7 @@ dev-util/dwdiff 2.1.3: diff-like program operating at word level instead of line
dev-util/edb-debugger 1.3.0 9999: edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg
dev-util/edi 0.8.0 0.8.0-r1: An EFL-based IDE
dev-util/editorconfig-geany 0.2: EditorConfig plugin for Geany
-dev-util/egypt 1.10: devilishly simple tool for creating call graphs of C programs
+dev-util/egypt 1.10: Devilishly simple tool for creating call graphs of C programs
dev-util/elfkickers 3.1a: collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc
dev-util/emilpro 3-r4 9999: a graphical disassembler for a large number of instruction sets
dev-util/envman 2.1.1: Environment variable manager for Bitrise CLI
@@ -11094,7 +11094,7 @@ dev-util/shc 3.9.6: A (shell-) script compiler/scrambler
dev-util/shellcheck 0.7.1: Shell script analysis tool
dev-util/shellcheck-bin 0.7.1: Shell script analysis tool (binary package)
dev-util/shelltestrunner 1.9: A tool for testing command-line programs
-dev-util/shflags 1.0.3 1.2.3: Command-line flags module for Unix shell scripts
+dev-util/shflags 1.2.3: Command-line flags module for Unix shell scripts
dev-util/shtool 2.0.8-r1: Set of stable and portable shell scripts
dev-util/shunit2 2.1.6-r1: Unit-test framework for Bourne-based shell scripts
dev-util/smem 1.5-r1: A tool that can give numerous reports on memory usage on Linux systems
@@ -12679,7 +12679,7 @@ mail-filter/sieve-connect 0.90: Sieve Command Line Interface
mail-filter/sigh 1607.1.6-r1: S/MIME signing milter
mail-filter/spamassassin 3.4.4-r4 3.4.4-r5 3.4.5 3.4.6: An extensible mail filter which can identify and tag spam
mail-filter/spamassassin-botnet 0.8-r1: SpamAssassin plugin that attempts to detect messages sent by a botnet
-mail-filter/spamdyke 4.3.0 5.0.1: A drop-in connection-time spam filter for qmail
+mail-filter/spamdyke 5.0.1: A drop-in connection-time spam filter for qmail
mail-filter/spampd 2.42: spampd is a program to scan messages for Unsolicited Commercial E-mail content
mail-filter/spamprobe 1.4d-r1: Fast, intelligent, automatic spam detector using Bayesian analysis
mail-filter/spf-engine 2.0.2-r1 2.9.2: Policy daemon and milter for Postfix SPF verification
@@ -13467,7 +13467,7 @@ media-libs/openal 1.21.0 1.21.1-r1: A software implementation of the OpenAL 3D a
media-libs/opencollada 1.6.68: Stream based read/write library for COLLADA files
media-libs/opencolorio 1.1.1: A color management framework for visual effects and animation
media-libs/opencore-amr 0.1.5-r1: Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec
-media-libs/openctm 1.0.3-r1: OpenCTM - the Open Compressed Triangle Mesh.
+media-libs/openctm 1.0.3-r1: OpenCTM - the Open Compressed Triangle Mesh
media-libs/opencv 4.1.2-r3 4.5.0 4.5.1: A collection of algorithms and sample code for various computer vision problems
media-libs/openexr 2.5.5: ILM's OpenEXR high dynamic-range image file format libraries
media-libs/openexr_ctl 1.0.1-r2: OpenEXR CTL libraries
@@ -13848,7 +13848,7 @@ media-radio/ax25-apps 0.0.8_rc5: Basic AX.25 (Amateur Radio) user tools, additio
media-radio/ax25-tools 0.0.10_rc5: Basic AX.25 (Amateur Radio) administrative tools and daemons
media-radio/cqrlog 2.4.0: CQRLOG is an advanced ham radio logger based on MySQL database
media-radio/cwdaemon 0.10.2: A morse daemon for the parallel or serial port
-media-radio/direwolf 1.4 1.5 1.5-r1: Decoded Information from Radio Emissions for Windows Or Linux Fans
+media-radio/direwolf 1.5 1.5-r1: Decoded Information from Radio Emissions for Windows Or Linux Fans
media-radio/dxcc 20190309 20191204: A ham radio callsign DXCC lookup utility
media-radio/flamp 2.2.03 2.2.05: Fldigi helper for transferring files
media-radio/fldigi 4.1.18: Sound card based multimode software modem for Amateur Radio use
@@ -15268,7 +15268,7 @@ net-misc/clockspeed 0.62-r7: Simple Network Time Protocol (NTP) client
net-misc/clusterssh 4.03.03 4.30.600 9999: Concurrent Multi-Server Terminal Access
net-misc/cmst 2020.11.01: Qt GUI for Connman with system tray icon
net-misc/cni-plugins 0.8.6 0.8.7 0.9.0 0.9.1: Standard networking plugins for container networking
-net-misc/connect 1.103 1.105: SSH Proxy Command
+net-misc/connect 1.105: SSH Proxy Command
net-misc/connman 1.39-r1 9999: Provides a daemon for managing internet connections
net-misc/connman-gtk 1.1.1-r1: GTK GUI for Connman
net-misc/connman-json-client 1.0_p20150721-r2: An ncurses UI for connman
@@ -18595,7 +18595,7 @@ x11-misc/fpm2 0.90: A GUI password manager utility with password generator
x11-misc/fracplanet 0.5.1: Fractal planet and terrain generator
x11-misc/fraqtive 0.4.8-r2: Open source, multi-platform generator of the Mandelbrot family fractals
x11-misc/ftmenu 0.4.0-r1: A tray menu for the Fluxbox toolbar
-x11-misc/gbase 0.5-r1: a convert program for decimal, hexadecimal, octal and binary values
+x11-misc/gbase 0.5-r1: A convert program for decimal, hexadecimal, octal and binary values
x11-misc/gbdfed 1.6: gbdfed Bitmap Font Editor
x11-misc/gccmakedep 1.0.3-r1 9999: create dependencies in makefiles using 'gcc -M'
x11-misc/gcolor2 0.4-r4: A GTK+ color selector
@@ -18929,7 +18929,7 @@ x11-plugins/wmcalendar 0.5.2-r2: a calendar dockapp
x11-plugins/wmcdplay 1.1-r1: CD player applet for WindowMaker
x11-plugins/wmcliphist 2.1-r2: Dockable clipboard history application for Window Maker
x11-plugins/wmclock 1.0.16-r1: a dockapp that displays time and date (same style as NEXTSTEP(tm) OS)
-x11-plugins/wmclockmon 0.8.1-r1: a nice digital clock with 7 different styles either in LCD or LED style
+x11-plugins/wmclockmon 0.8.1-r1: A nice digital clock with 7 different styles either in LCD or LED style
x11-plugins/wmcms 0.3.5-r4: WindowMaker CPU and Memory Usage Monitor Dock App
x11-plugins/wmcoincoin 2.6.3: a dockapp for browsing dacode news and board sites
x11-plugins/wmcp 1.2.8-r1: A pager dockapp
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3659f7d40bda..2190e871fd0c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 19 Apr 2021 19:05:17 +0000
+Mon, 19 Apr 2021 19:20:12 +0000