2017-06-30 13:35:53 UTC

15 files changed, 85 insertions, 45 deletions

diff --git a/metadata/md5-cache/app-admin/puppet-5.0.0 b/metadata/md5-cache/app-admin/puppet-5.0.0
index 3420e5e0419e..69ebb8ca3ca9 100644
--- a/metadata/md5-cache/app-admin/puppet-5.0.0
+++ b/metadata/md5-cache/app-admin/puppet-5.0.0
@@ -1,16 +1,17 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) emacs? ( virtual/emacs ) xemacs? ( app-editors/xemacs ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/rack[ruby_targets_ruby21] dev-ruby/rspec-its[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/rack[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=A system automation and configuration management software.
 EAPI=5
 HOMEPAGE=http://puppetlabs.com/
-IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+IUSE=augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=Apache-2.0 GPL-2
+PDEPEND=emacs? ( app-emacs/puppet-mode )
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-ruby/hiera[ruby_targets_ruby21] dev-ruby/json:=[ruby_targets_ruby21] >=dev-ruby/facter-3.0.0[ruby_targets_ruby21] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby21] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby21] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby21] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby21] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby21] ) virtual/ruby-ssl[ruby_targets_ruby21] dev-ruby/hocon[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/hiera[ruby_targets_ruby22] dev-ruby/json:=[ruby_targets_ruby22] >=dev-ruby/facter-3.0.0[ruby_targets_ruby22] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby22] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby22] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby22] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby22] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) virtual/ruby-ssl[ruby_targets_ruby22] dev-ruby/hocon[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/hiera[ruby_targets_ruby23] dev-ruby/json:=[ruby_targets_ruby23] >=dev-ruby/facter-3.0.0[ruby_targets_ruby23] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby23] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby23] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby23] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby23] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby23] ) virtual/ruby-ssl[ruby_targets_ruby23] dev-ruby/hocon[ruby_targets_ruby23] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.0.0.tar.gz
-_eclass_exported_funcs=pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=elisp-common	19ff54b35acd0bf2a14831a308a57753	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=c6b0eeb7b091a771612e6b5a1a405984
+_eclass_exported_funcs=pkg_postinst:- pkg_setup:- src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	9652a5d6e78586973d23226d8fd77713	ruby-ng	e52d9a73c7757cdc3b195bcd5cf9d389	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=1e294d944bae181c03d6e0cd960cbb0a
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1
deleted file mode 100644
index a6229da5645d..000000000000
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converts bin/cue CD-images to iso+wav/cdr
-EAPI=0
-HOMEPAGE=http://he.fi/bchunk/
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7
-_md5_=5f56ba5290cb938141849dedb5b539fd
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r2 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r2
new file mode 100644
index 000000000000..ef2040f3af7e
--- /dev/null
+++ b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Convert CD images from bin/cue to iso+wav/cdr
+EAPI=6
+HOMEPAGE=http://he.fi/bchunk/
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
+_eclass_exported_funcs=src_install:-
+_md5_=d378a76ea3ccd7cb31d78b6f06bde5fc
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.3 b/metadata/md5-cache/app-emacs/puppet-mode-0.3
new file mode 100644
index 000000000000..53dd01b15d99
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing Puppet manifests
+EAPI=6
+HOMEPAGE=https://github.com/voxpupuli/puppet-mode
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=!!<app-admin/puppet-5[emacs] >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.3.tar.gz -> puppet-mode-0.3.tar.gz
+_eclass_exported_funcs=pkg_postrm:elisp pkg_postinst:elisp pkg_setup:elisp src_unpack:elisp src_prepare:- src_configure:elisp src_compile:elisp src_install:elisp
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	19ff54b35acd0bf2a14831a308a57753
+_md5_=c06ebeb59216d6e42089794a6c01f3fc
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.7 b/metadata/md5-cache/app-misc/geoclue-2.4.7
new file mode 100644
index 000000000000..7b709b843731
--- /dev/null
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1 ) zeroconf? ( >=net-dns/avahi-0.6.10 ) !<sci-geosciences/geocode-glib-3.10.0 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170317 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=A geoinformation D-Bus service
+EAPI=6
+HOMEPAGE=https://freedesktop.org/wiki/Software/GeoClue
+IUSE=+introspection +modemmanager zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34:2 >=dev-libs/json-glib-0.14 >=net-libs/libsoup-2.42:2.4 sys-apps/dbus introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) modemmanager? ( >=net-misc/modemmanager-1 ) zeroconf? ( >=net-dns/avahi-0.6.10 ) !<sci-geosciences/geocode-glib-3.10.0
+SLOT=2.0
+SRC_URI=https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.7.tar.xz
+_eclass_exported_funcs=pkg_preinst:- pkg_postrm:gnome2 pkg_postinst:gnome2 src_prepare:- src_configure:- src_compile:gnome2 src_install:gnome2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	64c50579ea42fbcc77a7e220a8ae8e94	gnome2-utils	8a5e0bf2b8031478ecfeaec753ef4560	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	e12dd5e3cf1f359292cea2a70abeba5f	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
+_md5_=1efc69b5485677f603973fd5ad685644
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.1-r1 b/metadata/md5-cache/dev-libs/beignet-1.3.1-r1
index bbddd27f9b33..5033519de354 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.1-r1
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.1-r1
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.1-source.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_setup:- src_prepare:- src_configure:cmake-multilib src_compile:cmake-multilib src_test:cmake-multilib src_install:cmake-multilib
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6bc963602c516384bfd9592c90d24a7b
+_md5_=43599b8eed24654d2ca2635675cd05e0
diff --git a/metadata/md5-cache/dev-libs/beignet-9999 b/metadata/md5-cache/dev-libs/beignet-9999
index 3e30c1bc09b0..24fae7101ca7 100644
--- a/metadata/md5-cache/dev-libs/beignet-9999
+++ b/metadata/md5-cache/dev-libs/beignet-9999
@@ -9,4 +9,4 @@ RDEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4
 SLOT=0
 _eclass_exported_funcs=pkg_pretend:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:cmake-multilib src_compile:cmake-multilib src_test:cmake-multilib src_install:cmake-multilib
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c2aa16bc770da31e259028da0d53c794
+_md5_=a38358eaf854b336e83547d49e8b49c0
diff --git a/metadata/md5-cache/games-simulation/simutrans-0.120.2.2 b/metadata/md5-cache/games-simulation/simutrans-0.120.2.2
new file mode 100644
index 000000000000..fb4c9fc4c64a
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/simutrans-0.120.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=sys-libs/zlib app-arch/bzip2 media-libs/sdl-mixer media-libs/libpng:0 media-libs/libsdl[sound,video] app-arch/unzip
+DESCRIPTION=A free Transport Tycoon clone
+EAPI=6
+HOMEPAGE=http://www.simutrans.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=sys-libs/zlib app-arch/bzip2 media-libs/sdl-mixer media-libs/libpng:0 media-libs/libsdl[sound,video]
+SLOT=0
+SRC_URI=mirror://sourceforge/simutrans/simutrans-src-120-2-2.zip http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip mirror://sourceforge/simutrans/simupak64-120-2.zip
+_eclass_exported_funcs=src_unpack:- src_prepare:- src_install:-
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7
+_md5_=ee8e49c530738cd0405f4e5c78626d96
diff --git a/metadata/md5-cache/net-nntp/nzbget-19.0_pre2021 b/metadata/md5-cache/net-nntp/nzbget-19.0
index 77db72324e91..94275b866d1f 100644
--- a/metadata/md5-cache/net-nntp/nzbget-19.0_pre2021
+++ b/metadata/md5-cache/net-nntp/nzbget-19.0
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libxml2 ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0= ) ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=https://github.com/nzbget/nzbget/releases/download/v19.0-r2021/nzbget-19.0-testing-r2021-src.tar.gz -> nzbget-19.0_pre2021.tar.gz
+SRC_URI=https://github.com/nzbget/nzbget/releases/download/v19.0/nzbget-19.0-src.tar.gz -> nzbget-19.0.tar.gz
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=a891e15543e240393643748447ec01cb
+_md5_=cfcea0ce803918cd126f8120d84f971d
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20170629 b/metadata/md5-cache/net-vpn/wireguard-0.0.20170629
index 45acbbc23b8c..2dd185b2aa7d 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20170629
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20170629
@@ -11,4 +11,4 @@ SLOT=0
 SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20170629.tar.xz
 _eclass_exported_funcs=pkg_preinst:linux-mod pkg_postrm:linux-mod pkg_postinst:- pkg_setup:- src_compile:- src_install:-
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4f47f4705db396e7089722b8be048bed
+_md5_=122e79fd6cace5d5abe97b142cc0315b
diff --git a/metadata/md5-cache/net-vpn/wireguard-9999 b/metadata/md5-cache/net-vpn/wireguard-9999
index 5aa5d8e428f6..b7cab4c134d5 100644
--- a/metadata/md5-cache/net-vpn/wireguard-9999
+++ b/metadata/md5-cache/net-vpn/wireguard-9999
@@ -9,4 +9,4 @@ RDEPEND=tools? ( net-libs/libmnl ) kernel_linux? ( virtual/modutils )
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:linux-mod pkg_postrm:linux-mod pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_compile:- src_install:-
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	git-r3	cbafa3261c37c7e3af44bb16a34ea390	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	772b26a6baefb4c8c5e0c1fc724508b7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4f47f4705db396e7089722b8be048bed
+_md5_=122e79fd6cace5d5abe97b142cc0315b
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807 b/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807
deleted file mode 100644
index 39b604873267..000000000000
--- a/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Commandline script to print hardware information for irc and administration.
-EAPI=6
-HOMEPAGE=https://github.com/smxi/inxi
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils
-SLOT=0
-SRC_URI=https://github.com/smxi/inxi/tarball/c2a22b3e2590d896d4b0a8fd298f505cc1d787f5 -> inxi-2.3.0_p20160807.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=7db695f388d7ee6670e7ee5a0f0ec47a
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807-r1 b/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807-r1
new file mode 100644
index 000000000000..a668b6539169
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-2.3.0_p20160807-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=The CLI inxi collects and prints hardware and system information
+EAPI=6
+HOMEPAGE=https://github.com/smxi/inxi
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils sys-apps/usbutils
+SLOT=0
+SRC_URI=https://github.com/smxi/inxi/tarball/c2a22b3e2590d896d4b0a8fd298f505cc1d787f5 -> inxi-2.3.0_p20160807.tar.gz
+_eclass_exported_funcs=src_install:-
+_md5_=5ca3feba5675cf5b13844e19377acfd8
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104 b/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104
deleted file mode 100644
index f56f53590a73..000000000000
--- a/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Commandline script to print hardware information for irc and administration
-EAPI=6
-HOMEPAGE=https://github.com/smxi/inxi
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils
-SLOT=0
-SRC_URI=https://github.com/smxi/inxi/tarball/89e18d245bc34fc5be5f5baddac2ccd8106be050 -> inxi-2.3.4_p20161104.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_install:-
-_md5_=7f18447b64a65701293c90374aef6728
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104-r1 b/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104-r1
new file mode 100644
index 000000000000..c5a3eaccd88e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-2.3.4_p20161104-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=The CLI inxi collects and prints hardware and system information
+EAPI=6
+HOMEPAGE=https://github.com/smxi/inxi
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=app-shells/bash-3.0 sys-apps/pciutils sys-apps/usbutils
+SLOT=0
+SRC_URI=https://github.com/smxi/inxi/tarball/89e18d245bc34fc5be5f5baddac2ccd8106be050 -> inxi-2.3.4_p20161104.tar.gz
+_eclass_exported_funcs=src_install:-
+_md5_=3eb8d9c03f5ececaa2f87343d2ca5a56