diff --git a/app-arch/libarchive/libarchive-3.2.2.ebuild b/app-arch/libarchive/libarchive-3.2.2.ebuild
index 687485a66e02..44e767bf53ef 100644
--- a/app-arch/libarchive/libarchive-3.2.2.ebuild
+++ b/app-arch/libarchive/libarchive-3.2.2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=6
-inherit eutils multilib-minimal toolchain-funcs autotools flag-o-matic
+inherit eutils multilib-minimal toolchain-funcs autotools
DESCRIPTION="BSD tar command"
HOMEPAGE="http://www.libarchive.org/"
@@ -78,9 +78,6 @@ multilib_src_configure() {
--without-lzmadec
)
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
diff --git a/app-benchmarks/bonnie++/Manifest b/app-benchmarks/bonnie++/Manifest
index 7b10851e00b1..51a578827542 100644
--- a/app-benchmarks/bonnie++/Manifest
+++ b/app-benchmarks/bonnie++/Manifest
@@ -1,3 +1,2 @@
-DIST bonnie++-1.96.tgz 105183 SHA256 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c SHA512 d389545be68eb236382ac1cc361d171e28b6204c9ea2427a6d4743086fb16a3a1ee78acc35fd0706237d8d90dd8403872ed743583496b1e2512fa57242ff0bb8 WHIRLPOOL 57b04f3cac809bd66e32c895c857bfce969ae16a207eecef743b5c522b6d7496bf518d352a673011fba3e9073f541a274cbc9a4ae5ddd88b37cb386ea2b2e5d4
DIST bonnie++-1.97.2.tgz 102533 SHA256 3f34a4c52ae9b2c3d493af8f794ba18cbf6732e9b76c3a4fa64549d95d914ce3 SHA512 e8303720be9a4ebcc454dbc8906a6843d63909c5101d66524a126ce0db3db7113d01edb7ed2f292bf9d08a6799579c4960f0ee4595019fbacda1601eba52a170 WHIRLPOOL 1f66eef8a583ce9cb851a6c301019ba76d104bf3a6322d504cd7c8d1eb073c48235efcff6fec2b2f49207aa696db1071c55c94a3943a01917b2a7aa7349b0b73
DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
diff --git a/app-benchmarks/bonnie++/bonnie++-1.96.ebuild b/app-benchmarks/bonnie++/bonnie++-1.96.ebuild
deleted file mode 100644
index b0e81de23099..000000000000
--- a/app-benchmarks/bonnie++/bonnie++-1.96.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
- econf \
- $(use_with debug) \
- --disable-stripping \
- || die
- emake || die "emake failed"
- emake zcav || die "emake zcav failed" # see #9073
-}
-
-src_install() {
- dosbin bonnie++ zcav || die
- dobin bon_csv2html bon_csv2txt || die
- doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
- dohtml readme.html
- dodoc changelog.txt credits.txt
-}
diff --git a/app-mobilephone/sobexsrv/sobexsrv-1.0.1.ebuild b/app-mobilephone/sobexsrv/sobexsrv-1.0.1.ebuild
deleted file mode 100644
index 85c22bbb0237..000000000000
--- a/app-mobilephone/sobexsrv/sobexsrv-1.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs user
-
-MY_P="${P/_pre/pre}"
-
-IUSE="gtk"
-
-DESCRIPTION="Scripting/Secure OBEX Server (for BlueZ Linux)"
-SRC_URI="http://www.mulliner.org/bluetooth/${MY_P}.tar.gz
- https://dev.gentoo.org/~joker/${P}-fix64.patch"
-HOMEPAGE="http://www.mulliner.org/bluetooth/sobexsrv.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-libs/openobex
- net-wireless/bluez"
-RDEPEND="${DEPEND}
- gtk? ( >=dev-python/pygtk-2.2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup sobexsrv
- enewuser sobexsrv -1 -1 /var/spool/sobexsrv sobexsrv
-}
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
-
- epatch "${DISTDIR}/${P}"-fix64.patch || die "fix64 patch failed"
-
- sed -e 's:/usr/man/man8:/usr/share/man/man8:' \
- -i Makefile
-
- sed -e 's/^CFLAGS =/CFLAGS +=/' \
- -e 's/^CC =/CC ?=/' \
- -e 's/$(CC) $(CFLAGS)/$(CC) $(LDFLAGS) $(CFLAGS)/' \
- -i src/Makefile
-}
-
-src_compile() {
- tc-export CC
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHOR CHANGELOG CONFIG README SECURITY TODO
-
- use gtk || rm "${D}/usr/bin/sobexsrv_handler"
-
- newinitd "${FILESDIR}/init.d_sobexsrv" sobexsrv
- newconfd "${FILESDIR}/conf.d_sobexsrv" sobexsrv
-
- keepdir /var/spool/sobexsrv
- fowners sobexsrv:sobexsrv /var/spool/sobexsrv
-}
-
-pkg_postinst() {
- elog
- elog "/usr/bin/sobexsrv is *NOT* installed set-uid root by"
- elog "default. suid is required for the chroot option (-R)."
- elog
- elog "Execute the following commands to enable suid:"
- elog
- elog "chown root:sobexsrv /usr/bin/sobexsrv"
- elog "chmod 4710 /usr/bin/sobexsrv"
- elog
-}
diff --git a/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild b/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
index 5f16ae564378..fdbb0dc9f043 100644
--- a/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
+++ b/app-shells/pdmenu/pdmenu-1.3.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="A simple console menu program"
HOMEPAGE="http://joeyh.name/code/pdmenu/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 mips x86"
IUSE="nls gpm examples"
DEPEND="
@@ -28,6 +28,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-impl-dec.patch
)
+DOCS=( doc/ANNOUNCE doc/BUGS doc/TODO )
+
src_prepare() {
default
sed \
@@ -47,12 +49,11 @@ src_compile() {
src_install() {
dobin "${PN}"
- dodoc doc/ANNOUNCE doc/BUGS doc/TODO
use examples && dodoc -r examples
mv "doc/${PN}.man" "doc/${PN}.1" || die
mv "doc/${PN}rc.man" "doc/${PN}rc.5" || die
doman "doc/${PN}.1" "doc/${PN}rc.5"
-
+ einstalldocs
}
pkg_postinst() {
diff --git a/app-shells/pdmenu/pdmenu-1.3.4.ebuild b/app-shells/pdmenu/pdmenu-1.3.4.ebuild
deleted file mode 100644
index bce67fcabf53..000000000000
--- a/app-shells/pdmenu/pdmenu-1.3.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A simple console menu program"
-HOMEPAGE="http://joeyh.name/code/pdmenu/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 mips x86"
-IUSE="nls gpm examples"
-
-DEPEND="
- sys-libs/slang
- gpm? ( sys-libs/gpm )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-impl-dec.patch
- sed \
- -e 's:\(-o pdmenu\):$(LDFLAGS) \1:g' \
- -i Makefile || die
-}
-
-src_configure() {
- CC=$(tc-getCC) econf \
- $(use_with gpm) \
- $(use_enable nls)
-}
-
-src_compile() {
- emake CC=$(tc-getCC) || die
-}
-
-src_install() {
- dobin "${PN}"
- dodoc doc/ANNOUNCE doc/BUGS doc/TODO
- use examples && dodoc -r examples
- mv "doc/${PN}.man" "doc/${PN}.1" || die
- mv "doc/${PN}rc.man" "doc/${PN}rc.5" || die
- doman "doc/${PN}.1" "doc/${PN}rc.5"
-
-}
-
-pkg_postinst() {
- ewarn "Note this part from man page: Security warning! Any exec command"
- ewarn "that uses the 'edit' flag will be a security hole. The user need"
- ewarn "only to enter text with a ';' in it, and they can run an"
- ewarn "arbitrary command after the semicolon!"
-}
diff --git a/app-shells/rrs/rrs-1.70-r2.ebuild b/app-shells/rrs/rrs-1.70-r2.ebuild
new file mode 100644
index 000000000000..99787758d34b
--- /dev/null
+++ b/app-shells/rrs/rrs-1.70-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Reverse Remote Shell"
+HOMEPAGE="http://freecode.com/projects/rrs"
+SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+PATCH=( "${FILESDIR}"/"${P}"-asneeded.patch)
+
+DOCS=( CHANGES README )
+
+src_prepare() {
+ default
+ sed -i -e "s#-s ##g" Makefile || die
+}
+
+src_compile() {
+ local target=""
+ use ssl || target="-nossl"
+
+ emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ einstalldocs
+}
diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild
index a90d9360a7fe..576160394913 100644
--- a/app-shells/scsh/scsh-0.6.7-r2.ebuild
+++ b/app-shells/scsh/scsh-0.6.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND="!dev-scheme/scheme48"
diff --git a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..9d3043d7fdb3
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# Restrict tests since they now require the specific rspec version to be
+# provided in an environment variable.
+#RESTRICT="test"
+
+ruby_add_rdepend "
+ >=dev-ruby/activesupport-3.0:*
+ >=dev-ruby/railties-3.0:*
+ >=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/rails-4.0
+ >=dev-ruby/uglifier-1.3
+ >=dev-ruby/rake-0.10
+ >=dev-ruby/coffee-rails-4.0
+ >=dev-ruby/sass-rails-4.0
+ >=dev-ruby/jquery-rails-3.0
+ dev-util/cucumber
+ dev-util/aruba
+ dev-ruby/sqlite3
+ dev-ruby/bundler
+ )"
+
+all_ruby_prepare() {
+ # fix the gemspec; we remove the version dependencies from there, as
+ # it requires _older_ versions of its dependencies.. it doesn't
+ # really seem to be the case though. Also remove the references to
+ # git ls-files to avoid calling it.
+ sed -i \
+ -e '/git ls-files/d' \
+ -e '/\(cucumber\|aruba\)/s:,.*$::' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # haml-rails is not packaged
+ sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+ rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild b/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
index 2d8a93fdb8dc..dd31782cbc91 100644
--- a/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..37b2c1f33a7f
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="http://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+ >=dev-ruby/actionpack-3.0:*
+ >=dev-ruby/railties-3.0:*
+ =dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+ >=dev-ruby/capybara-2.2.0
+ >=dev-ruby/ammeter-1.1.2
+ ~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+ # Remove .rspec options to avoid dependency on newer rspec when
+ # bootstrapping.
+ rm -f .rspec || die
+
+ # Avoid bundler-specific specs.
+ rm -f spec/sanity_check_spec.rb || die
+
+ # Avoid broken controller generator specs for now.
+ rm -fr spec/generators/rspec || die
+
+ # Avoid loading rspec/rails explicitly since ammeter/init will also
+ # do this and loading it twice causes an error
+ sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-util/cmake/cmake-3.7.1.ebuild b/dev-util/cmake/cmake-3.7.1.ebuild
index 7bda50dc1570..422a96f059b4 100644
--- a/dev-util/cmake/cmake-3.7.1.ebuild
+++ b/dev-util/cmake/cmake-3.7.1.ebuild
@@ -5,7 +5,7 @@
EAPI=6
CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx flag-o-matic
MY_P="${P/_/-}"
@@ -135,6 +135,9 @@ src_prepare() {
}
src_configure() {
+ # Fix linking on Solaris
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
local mycmakeargs=(
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
diff --git a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
deleted file mode 100644
index 65ccf5a5eaca..000000000000
--- a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit autotools eutils linux-info multilib user java-pkg-opt-2
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="java pch qt4"
-
-DEPEND=">=dev-libs/popt-1.7-r1
- >=sys-devel/binutils-2.14.90.0.6-r3:*
- >=sys-libs/glibc-2.3.2-r1
- qt4? ( dev-qt/qtgui:4[qt3support] )
- java? ( >=virtual/jdk-1.5:= )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- linux-info_pkg_setup
- if ! linux_config_exists || ! linux_chkconfig_present OPROFILE ; then
- echo
- elog "In order for ${PN} to work, you need to configure your kernel"
- elog "with CONFIG_OPROFILE set to 'm' or 'y'."
- echo
- fi
-
- if ! kernel_is -ge 2 6 ; then
- echo
- elog "Support for kernels before 2.6 has been dropped in ${PN}-0.9.8."
- echo
- fi
-
- # Required for JIT support, see README_PACKAGERS
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-
- use java && java-pkg_init
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
- epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
- epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
- epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_with qt4 x) \
- $(use_enable qt4 gui qt4) \
- $(use_enable pch) \
- $(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
- emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
- dodoc ChangeLog* README TODO
-
- dodir /etc/env.d
- echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${D}"/etc/env.d/10${PN} || die "env.d failed"
-}
-
-pkg_postinst() {
- echo
- elog "Now load the ${PN} module by running:"
- elog " # opcontrol --init"
- elog "Then read manpages and this html doc:"
- elog " /usr/share/doc/${PF}/${PN}.html"
- echo
-}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 41c9fabdc7d9..a9e87ceda54e 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,10 +1,6 @@
-
- mrueg@gentoo.org
- Manuel Rüger
-
dev-zero@gentoo.org
Tiziano Müller
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index a0b6d9327041..495eacbed6a9 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1 @@
-DIST qrencode-3.3.1.tar.bz2 365432 SHA256 7ad730379a9352051940c3be58cf4c6d548525f378551cb33e9c709c419adb9b SHA512 28eddb96264faefc3ae1e8c45961b685ee76e061f3e8d201661f572aa09661573afdb76596c3c41d6d94bd381898a8d22338c6cee3ffd3fc8fe4c78715922873 WHIRLPOOL b95c7c18b4e2e766ee43c1028c4f1255890a4d56304e3fd372733a1f908d34a5e9793f09b515e49c4f547aaf5f5aa358867f17d717d81bcd41f45cd4f28a2d3c
-DIST qrencode-3.4.3.tar.bz2 370709 SHA256 dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 SHA512 eba9d6220d0d5e08da614bd05904a08e11c45b7b293c45aa8417345c3267eae8790e83d9338b6cbadbd3fe15ac4579e0fb9e4e23b4f7e1d56e5fb3729afb9cf5 WHIRLPOOL 02b60e306fc2365de0be0f02619f1e5a3dcf783024845872d23940a4b720bf8a2b89255e95898c2a7323a93c8f4210b4362b30c0fc2ff1ae90d4850f344bd675
DIST qrencode-3.4.4.tar.bz2 369136 SHA256 efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5 SHA512 4835d462542e37e5460635e0dd84e291ff0976a6aec61c63f9950c1e60b446bc913220726e14f6379322bfd32ccd9bcd5fceed9ca10cb95343c952d8472b983d WHIRLPOOL fb5ce83ba422c361717514956e72157b5d611dc7eb33416bc621ec3fb57032ff57c3aa2eb1b1d5780608649d3424ed312c5cf7c15718baa5042542b3a42987fa
diff --git a/media-gfx/qrencode/qrencode-3.3.1.ebuild b/media-gfx/qrencode/qrencode-3.3.1.ebuild
deleted file mode 100644
index 9356dc22e7e6..000000000000
--- a/media-gfx/qrencode/qrencode-3.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="http://fukuchi.org/works/qrencode/"
-SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libpng"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-pngregenfix.patch" )
diff --git a/media-gfx/qrencode/qrencode-3.4.3.ebuild b/media-gfx/qrencode/qrencode-3.4.3.ebuild
deleted file mode 100644
index 033cae871a9b..000000000000
--- a/media-gfx/qrencode/qrencode-3.4.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="C library for encoding data in a QR Code symbol"
-HOMEPAGE="http://fukuchi.org/works/qrencode/"
-SRC_URI="http://fukuchi.org/works/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libpng"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-3.2.0-pngregenfix.patch" )
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index e337340792cf..4a90670cfaf1 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.3.tar.gz 8296526 SHA256 5c860fabd58e5d923c1e0f4c336751a9ba61a7874de320169a3988cda33d6cfb SHA512 93cca2516b51794af87dc997aee98e1fa99f75933e49b9ca4eb1bc3896464f3a2de251ddaa430a751f0233493ecc5948e39daaffe4b5b0d884ce47a38c27647f WHIRLPOOL 978cc0cd2eacdc495a39d5b070c7dfe48f2e88ac8644c39e5025c76b702af211c2420cf4204c3fcb5d0d656e704f3d1341c59f66a337c0701fa15adfaaf6e9dc
-DIST makemkv-oss-1.10.3.tar.gz 4419732 SHA256 b89069294c27b298d35be86353baf9c3da8d7e18b6bce53d4ad2ee3a46785760 SHA512 f380aaccd930659f80d937699f82bf39a51631fe67161f81adc7a3380d28ecc107c2921d82c42a7995a9eabdbbf78d289384dca09e84855044eef4cea9c2f0c9 WHIRLPOOL 272b25f17ad221dd408f921221390566ec97e6a7e7a1729731ba5d75ff2c097919d46235f1b271db1b2be037053b3c05629690a696fe8e9723f4abe8fe203cd9
+DIST makemkv-bin-1.10.4.tar.gz 8315649 SHA256 bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa SHA512 00482428a6374e37912e0537c1e876b478a5eb9e0a26476b01f74f93c0605ed7aa3547599287211f17dd2d511e5bebf60605e05d0064f501816fdfccd964b98c WHIRLPOOL 29dfa3dcc1f36511bd153ae1c43ca54b6fb2d8cfa8d62960e7605ca460a182d4d1feec05baa9d01dfba5f80734cae4c085b8b9f0ac5d0b0910c58fa766e351f8
+DIST makemkv-oss-1.10.4.tar.gz 4421220 SHA256 bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4 SHA512 6a792703ae4ab978ebe7a71e9d9f2c298e230168c2701fd2f7fab724f31a1c83388bae408c253a75504c73b9e25f9fb0ba48d5697cfa1f7ae39df133444983c4 WHIRLPOOL 099f0d5d76ec97e3bf3bfa0a0e1ffceb5c539584ca05f9d204b241960d579f9eaabb8dfc8df2a35feec253fa597d9c97ed28c7cef95928f699a6a74bed146bee
diff --git a/media-video/makemkv/makemkv-1.10.3.ebuild b/media-video/makemkv/makemkv-1.10.4.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.10.3.ebuild
rename to media-video/makemkv/makemkv-1.10.4.ebuild
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b4dbe23a6c43..645dcfa828e4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 20:13:13 +0000
+Mon, 26 Dec 2016 05:13:12 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3cc5197e0b21..645dcfa828e4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 20:13:14 +0000
+Mon, 26 Dec 2016 05:13:12 +0000
diff --git a/metadata/md5-cache/app-arch/libarchive-3.2.2 b/metadata/md5-cache/app-arch/libarchive-3.2.2
index 11da45859b9c..a982d0472234 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.2.2
+++ b/metadata/md5-cache/app-arch/libarchive-3.2.2
@@ -9,5 +9,5 @@ LICENSE=BSD BSD-2 BSD-4 public-domain
RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[threads=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/13
SRC_URI=http://www.libarchive.org/downloads/libarchive-3.2.2.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=2af5e52568cb49fa0391f1e2e5c6af9b
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=bde7e0ab999686a3c7b7cedc4367ce3c
diff --git a/metadata/md5-cache/app-benchmarks/bonnie++-1.96 b/metadata/md5-cache/app-benchmarks/bonnie++-1.96
deleted file mode 100644
index b470e99fd65b..000000000000
--- a/metadata/md5-cache/app-benchmarks/bonnie++-1.96
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Hard drive bottleneck testing benchmark suite
-EAPI=0
-HOMEPAGE=http://www.coker.com.au/bonnie++/
-IUSE=debug
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.coker.com.au/bonnie++/experimental/bonnie++-1.96.tgz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b8b41958a4d493abc4c13ddc4ee94458
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1
deleted file mode 100644
index e59eebef406b..000000000000
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=dev-libs/openobex net-wireless/bluez
-DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
-EAPI=0
-HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
-IUSE=gtk
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openobex net-wireless/bluez gtk? ( >=dev-python/pygtk-2.2 )
-SLOT=0
-SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87
-_md5_=336b8d48b7c0d569e3a51c3301716dd4
diff --git a/metadata/md5-cache/app-shells/pdmenu-1.3.4 b/metadata/md5-cache/app-shells/pdmenu-1.3.4
deleted file mode 100644
index 5ba9a721fe5c..000000000000
--- a/metadata/md5-cache/app-shells/pdmenu-1.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=sys-libs/slang gpm? ( sys-libs/gpm ) nls? ( sys-devel/gettext )
-DESCRIPTION=A simple console menu program
-EAPI=5
-HOMEPAGE=http://joeyh.name/code/pdmenu/
-IUSE=nls gpm examples
-KEYWORDS=amd64 mips x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/pdmenu/pdmenu_1.3.4.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=574d96658292300506fdeb94f9353afb
diff --git a/metadata/md5-cache/app-shells/pdmenu-1.3.4-r1 b/metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
index 3b2828880a43..128366c85bd4 100644
--- a/metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
+++ b/metadata/md5-cache/app-shells/pdmenu-1.3.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A simple console menu program
EAPI=6
HOMEPAGE=http://joeyh.name/code/pdmenu/
IUSE=nls gpm examples
-KEYWORDS=~amd64 ~mips ~x86
+KEYWORDS=amd64 mips x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
SRC_URI=mirror://debian/pool/main/p/pdmenu/pdmenu_1.3.4.tar.gz
-_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=3a7f53655b0e19a3efc0d2abcb277ca6
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=c99d2822e79a52f0a7881543774d5616
diff --git a/metadata/md5-cache/app-shells/rrs-1.70-r2 b/metadata/md5-cache/app-shells/rrs-1.70-r2
new file mode 100644
index 000000000000..85a2c10bec40
--- /dev/null
+++ b/metadata/md5-cache/app-shells/rrs-1.70-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Reverse Remote Shell
+EAPI=6
+HOMEPAGE=http://freecode.com/projects/rrs
+IUSE=ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://www.cycom.se/uploads/36/19/rrs-1.70.tar.gz
+_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
+_md5_=c26699d76c47b985ac097022dc1a60fb
diff --git a/metadata/md5-cache/app-shells/scsh-0.6.7-r2 b/metadata/md5-cache/app-shells/scsh-0.6.7-r2
index c33ab18bbc4d..290a70083649 100644
--- a/metadata/md5-cache/app-shells/scsh-0.6.7-r2
+++ b/metadata/md5-cache/app-shells/scsh-0.6.7-r2
@@ -3,11 +3,11 @@ DEPEND=!dev-scheme/scheme48
DESCRIPTION=Unix shell embedded in Scheme
EAPI=6
HOMEPAGE=http://www.scsh.net/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
LICENSE=BSD
RDEPEND=!dev-scheme/scheme48
RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.scsh.net/pub/scsh/0.6/scsh-0.6.7.tar.gz
_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=0fab4350fed51218e7376081407ea994
+_md5_=a8c86c89dc703f0ac5752af9d72373d8
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
new file mode 100644
index 000000000000..f3df8182a36f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ammeter-1.1.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.10[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby21] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3[ruby_targets_ruby23] >=dev-ruby/rake-0.10[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby23] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby23] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby23] dev-util/cucumber[ruby_targets_ruby23] dev-util/aruba[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] dev-ruby/bundler[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? ( 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=Write specs for your Rails 3+ generators
+EAPI=5
+HOMEPAGE=https://github.com/alexrothenberg/ammeter
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] >=dev-ruby/rspec-rails-2.2:*[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? ( 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 )
+SLOT=0
+SRC_URI=mirror://rubygems/ammeter-1.1.4.gem
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c60864810f9edfe4d5b80b85585ae91a
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
index fb942ba94d5d..daceda40a582 100644
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
+++ b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/webmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/webmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[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=Simple Simple HTTP and REST client for Ruby
EAPI=5
HOMEPAGE=https://github.com/archiloque/rest-client
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby20] >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby21] >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby22] >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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? ( 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 )
SLOT=0
SRC_URI=mirror://rubygems/rest-client-1.8.0.gem
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5a067d6d70684c130d3eeaa7037030e5
+_md5_=564b20ac5c9dfc7e8c78f3f3b18fb81a
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1 b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
new file mode 100644
index 000000000000..6d7d5be4046f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.5.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby22] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby22] ~dev-ruby/rspec-rails-3.5.2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/capybara-2.2.0[ruby_targets_ruby23] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby23] ~dev-ruby/rspec-rails-3.5.2[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? ( 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=RSpec's official Ruby on Rails plugin
+EAPI=5
+HOMEPAGE=http://rspec.info/
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.5*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] =dev-ruby/rspec-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby23] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby23] >=dev-ruby/railties-3.0:*[ruby_targets_ruby23] =dev-ruby/rspec-3.5*[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? ( 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 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.5.2.tar.gz -> rspec-rails-3.5.2.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng e7d26f9077ef49f07eaa5d0c7758fe7b ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=18c430db0d130df6bca77af07d866141
diff --git a/metadata/md5-cache/dev-util/cmake-3.7.1 b/metadata/md5-cache/dev-util/cmake-3.7.1
index cb2596c4c95c..4b9330783973 100644
--- a/metadata/md5-cache/dev-util/cmake-3.7.1
+++ b/metadata/md5-cache/dev-util/cmake-3.7.1
@@ -10,4 +10,4 @@ RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.
SLOT=0
SRC_URI=http://www.cmake.org/files/v3.7/cmake-3.7.1.tar.gz
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 cmake-utils 841d8d6fc58d18f89ca4920900fd8d2a elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=567c4f7311bfaab1f8b6d6da8af53ecb
+_md5_=218ce128ea3d17b91aa806b90922c481
diff --git a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1 b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
deleted file mode 100644
index a84af8d19d94..000000000000
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A transparent low-overhead system-wide profiler
-EAPI=5
-HOMEPAGE=http://oprofile.sourceforge.net
-IUSE=java pch qt4 elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/glibc-2.3.2-r1 qt4? ( dev-qt/qtgui:4[qt3support] ) java? ( >=virtual/jdk-1.5:= ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=afbe17f20014739acfee166630102a27
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.3.1 b/metadata/md5-cache/media-gfx/qrencode-3.3.1
deleted file mode 100644
index 15265c3f2d26..000000000000
--- a/metadata/md5-cache/media-gfx/qrencode-3.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=C library for encoding data in a QR Code symbol
-EAPI=4
-HOMEPAGE=http://fukuchi.org/works/qrencode/
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=media-libs/libpng
-SLOT=0
-SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.3.1.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=dbe094f6e265677866534c404243386d
diff --git a/metadata/md5-cache/media-gfx/qrencode-3.4.3 b/metadata/md5-cache/media-gfx/qrencode-3.4.3
deleted file mode 100644
index bf90377a8114..000000000000
--- a/metadata/md5-cache/media-gfx/qrencode-3.4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=C library for encoding data in a QR Code symbol
-EAPI=4
-HOMEPAGE=http://fukuchi.org/works/qrencode/
-KEYWORDS=alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=media-libs/libpng
-SLOT=0
-SRC_URI=http://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b140086867d5964074b2a0ce468fdf02
diff --git a/metadata/md5-cache/media-video/makemkv-1.10.3 b/metadata/md5-cache/media-video/makemkv-1.10.4
similarity index 90%
rename from metadata/md5-cache/media-video/makemkv-1.10.3
rename to metadata/md5-cache/media-video/makemkv-1.10.4
index 7bd824dc2faf..fec5b6fd9521 100644
--- a/metadata/md5-cache/media-video/makemkv-1.10.3
+++ b/metadata/md5-cache/media-video/makemkv-1.10.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0 sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) net-misc/wget
SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.3.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.3.tar.gz
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.10.4.tar.gz http://www.makemkv.com/download/makemkv-bin-1.10.4.tar.gz
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
_md5_=acebd9952b7395a1d51f796040754668
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.17 b/metadata/md5-cache/net-fs/openafs-1.6.17
deleted file mode 100644
index 0e6a47894b14..000000000000
--- a/metadata/md5-cache/net-fs/openafs-1.6.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=sys-libs/ncurses:0= pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The OpenAFS distributed file system
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=doc kerberos +modules pam
-KEYWORDS=amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=sys-libs/ncurses:0= pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) modules? ( ~net-fs/openafs-kernel-1.6.17 )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.17/openafs-1.6.17-src.tar.bz2 https://openafs.org/dl/openafs/1.6.17/openafs-1.6.17-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-1.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e6bb59cc2d3cf6a79361b0b17d6e9208
diff --git a/metadata/md5-cache/net-fs/openafs-1.6.18.2 b/metadata/md5-cache/net-fs/openafs-1.6.18.2
deleted file mode 100644
index 3df940a2ac69..000000000000
--- a/metadata/md5-cache/net-fs/openafs-1.6.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) virtual/yacc doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The OpenAFS distributed file system
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=virtual/libintl fuse? ( sys-fs/fuse ) kerberos? ( virtual/krb5 ) ncurses? ( sys-libs/ncurses:0= ) pam? ( virtual/pam ) modules? ( ~net-fs/openafs-kernel-1.6.18.2 )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.18.2/openafs-1.6.18.2-src.tar.bz2 https://openafs.org/dl/openafs/1.6.18.2/openafs-1.6.18.2-doc.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-2.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff461645dd280a56364b8bda24991a30
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.17 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.17
deleted file mode 100644
index 93af836d6acc..000000000000
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=The OpenAFS distributed file system kernel module
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=kernel_linux
-KEYWORDS=amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.17/openafs-1.6.17-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-1.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 linux-mod 0ccff2c1a7d70cf1678059b64bcf9183 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ebf83631d4441b7425b0aaaf04f5fd0a
diff --git a/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.2 b/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.2
deleted file mode 100644
index b881ba37c72d..000000000000
--- a/metadata/md5-cache/net-fs/openafs-kernel-1.6.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=The OpenAFS distributed file system kernel module
-EAPI=6
-HOMEPAGE=https://www.openafs.org/
-IUSE=debug kernel_linux
-KEYWORDS=~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=IBM BSD openafs-krb5-a APSL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=https://openafs.org/dl/openafs/1.6.18.2/openafs-1.6.18.2-src.tar.bz2 https://dev.gentoo.org/~bircoph/afs/openafs-patches-20160801-2.tar.xz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info af49d8ab3be91bb1d38b7201dc9e5123 linux-mod 0ccff2c1a7d70cf1678059b64bcf9183 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=489410e3715f306bc7dc051d84d52065
diff --git a/metadata/md5-cache/net-libs/xrootd-4.1.1 b/metadata/md5-cache/net-libs/xrootd-4.1.1
deleted file mode 100644
index 05452d50101f..000000000000
--- a/metadata/md5-cache/net-libs/xrootd-4.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!=dev-util/cmake-3.2.2
-DESCRIPTION=Extended ROOT remote file server
-EAPI=5
-HOMEPAGE=http://xrootd.org/
-IUSE=doc fuse http kerberos libevent perl readline ssl test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=!=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) doc? ( app-doc/doxygen[dot] python? ( dev-python/sphinx ) ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.2.2
+DESCRIPTION=Extended ROOT remote file server
+EAPI=6
+HOMEPAGE=http://xrootd.org/
+IUSE=doc examples fuse http kerberos python readline rbd ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=!=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
+REQUIRED_USE=http? ( kerberos ssl ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://xrootd.org/download/v4.5.0/xrootd-4.5.0.tar.gz
+_eclasses_=cmake-utils 841d8d6fc58d18f89ca4920900fd8d2a eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9b2638144a9d2ec27ff2739c222ec3e4
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.5.19 b/metadata/md5-cache/net-proxy/haproxy-1.5.19
new file mode 100644
index 000000000000..0c152fef47d1
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.5.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=5
+HOMEPAGE=http://haproxy.1wt.eu
+IUSE=+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.5/src/haproxy-1.5.19.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e1332d06f68d3a8f45e287ae9d141b06
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.6.11 b/metadata/md5-cache/net-proxy/haproxy-1.6.11
new file mode 100644
index 000000000000..a39a1fc14a41
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.6.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) virtual/pkgconfig
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=6
+HOMEPAGE=http://haproxy.1wt.eu
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+REQUIRED_USE=pcre-jit? ( pcre ) ?? ( slz zlib )
+SLOT=0
+SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.11.tar.gz
+_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c07b3f879996849368612a1d47de1434
diff --git a/metadata/md5-cache/sys-devel/gcc-6.2.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.3.0
similarity index 80%
rename from metadata/md5-cache/sys-devel/gcc-6.2.0-r1
rename to metadata/md5-cache/sys-devel/gcc-6.3.0
index c1fab632cbaf..4a8275b39cd6 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.2.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.3.0
@@ -8,7 +8,7 @@ LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exceptio
PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0 >=dev-libs/mpc-0.8.1:0 graphite? ( >=dev-libs/isl-0.14 )
RESTRICT=strip
-SLOT=6.2.0
-SRC_URI=mirror://gnu/gcc/gcc-6.2.0/gcc-6.2.0.tar.bz2 mirror://gentoo/gcc-6.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.2.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.2.0-patches-1.1.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
+SLOT=6.3.0
+SRC_URI=mirror://gnu/gcc/gcc-6.3.0/gcc-6.3.0.tar.bz2 mirror://gentoo/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.3.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 fixheadtails 2f44773656577fe2653bacc8bdcb2174 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnuconfig 3920de1188fc7bfee873515453ed1d10 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain e0c7ddcc7c221e1ee9eb15ccff442b0e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3610b50b20e179eba6204dd5a15a69b1
+_md5_=461a2a59d0e876265786a302e38aed86
diff --git a/metadata/md5-cache/www-apps/gitea-1.0.0 b/metadata/md5-cache/www-apps/gitea-1.0.0-r2
similarity index 79%
rename from metadata/md5-cache/www-apps/gitea-1.0.0
rename to metadata/md5-cache/www-apps/gitea-1.0.0-r2
index d7ac2f9510f1..e1394ea24416 100644
--- a/metadata/md5-cache/www-apps/gitea-1.0.0
+++ b/metadata/md5-cache/www-apps/gitea-1.0.0-r2
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install prepare setup test unpack
DEPEND=dev-go/go-bindata >=dev-lang/go-1.4.2:=
-DESCRIPTION=A painless self-hosted Git service, written in Go, forked from gogs
+DESCRIPTION=A painless self-hosted Git service, written in Go
EAPI=6
HOMEPAGE=https://github.com/go-gitea/gitea
KEYWORDS=~amd64
LICENSE=MIT
RDEPEND=dev-vcs/git
-SLOT=0/1.0.0
+SLOT=0
SRC_URI=https://github.com/go-gitea/gitea/archive/6aacf4d2f09631359b99df562b4bf31dcef44ea3.tar.gz -> gitea-1.0.0.tar.gz
_eclasses_=golang-base 08fe6e0e2b4750daff8887a7f0e1f873 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a user 80aaa71614ced86f02ee1a513821dc87
-_md5_=6f25a1d2f751ca2a9782195bab10cc3a
+_md5_=ae5480384d60e40de775d18cc5b3567b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3cc5197e0b21..645dcfa828e4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 20:13:14 +0000
+Mon, 26 Dec 2016 05:13:12 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 01dc72a235c3..2e32bde82072 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 25 20:09:24 UTC 2016
+Mon Dec 26 05:09:23 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5542f0c9e699..dfb30840861e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 20:30:01 +0000
+Mon, 26 Dec 2016 05:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 33ac32e526d2..ab94f60989a6 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1482696601 Sun 25 Dec 2016 08:10:01 PM UTC
+1482729001 Mon 26 Dec 2016 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b4dbe23a6c43..645dcfa828e4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 25 Dec 2016 20:13:13 +0000
+Mon, 26 Dec 2016 05:13:12 +0000
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index f8b201085a63..e0417e339eac 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,5 +1,2 @@
-DIST openafs-1.6.17-src.tar.bz2 14607107 SHA256 96413a2dbffdc9170cc5dde6aa5ad0ae2383c6106994285ed8f186928813a398 SHA512 3ca61a7731c9bd9bae7da2f7b3900438fcc9f75c95b354574389c2203af2ec0a7b4dcaaf13a437743477fcad8a46c3bbb8c68255a976b9a9917b8f0a0cdf028f WHIRLPOOL 92de51878836a721e6fadbe2f6c7a8069ecf622a08fd05e3a01d8fef376bd2e18e9f3b4715d42a26e8d5f1d665f91924520ed6928ed1f460bac49b1bc906e129
-DIST openafs-1.6.18.2-src.tar.bz2 14652869 SHA256 1e0749b33a20700651ec61436a25ad8d047ffc189a2d024614e7aeedaef57483 SHA512 a9690349c665baa29171d8256e41cac817599e742880bbb02382bdda67a1adc0b4910aa2a1e92dea4867cc25832b27b6561c4ff05f5103a0da952e60b6facfac WHIRLPOOL 830ee1e4285c3e8f5f6b5eac2dcecfb75d5007a9960525d53438ee71135aed269f558ef1fa6a07bd72dd911f496597db6bc085ef2cc342f543cd0e2edfde53b4
DIST openafs-1.6.18.3-src.tar.bz2 14668811 SHA256 b9cb45fdfd2aab543363e64da0b56167bfc1a302afdbcd5a076fb704a0c16a70 SHA512 679b463109c47fd252853e6f12c7e60148cf78f6d2699d468b1e1f85bbd5b392a909c3f2201460e3192ad7a60bad64c58489980c2efcd904ab4851df8724d47f WHIRLPOOL 8180188e3ecc87f002d5a4b4c4641949869a09b88474a75850e27dea1134dca1156ae4533f997494d64b8820aa4dc0f0ceb7b4dda01648c95f70408c190d353b
-DIST openafs-patches-20160801-1.tar.xz 10908 SHA256 d81c46d12e49fc917dc5171ddabd838d3c8c16dcb272edc533f6dbdda4dccadf SHA512 fc2ae985a69718ae4e12412059ed9431fccf854540e5b59112ea13be057b47695f8f14213d1c87d1eab2ff0d0c34407febfd37dbf8794cac6e3de223beb693fd WHIRLPOOL ea3e7e70f3f469561ef48d11bfa3f481c9d34265c78b45e1578b012432f7ff49463dacc938aee98060404baa79bed980a07b01422f076a2626308a842b99cbad
DIST openafs-patches-20160801-2.tar.xz 11004 SHA256 7037d9657bd3c90725fd8b2b063bef80cedcc9fbf0605c7a3bf3543b64eecb58 SHA512 42768bc54cbeafea2c8042b84368d9fcfc4e54681d1077eb1fd6a3d1633aa1a0ba2f6fd291a182a9f2f930f111d2ff587be9fe8a8b941b1e9535136ee344633b WHIRLPOOL 786c2155142916594f178cdc66631da5514f60ee0155e4420d702b4a934968e99ebb5d2de03beb8e22f00742972aeb3d9fb84d9051d9d67091264781deaa2108
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.17.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.17.ebuild
deleted file mode 100644
index 503154884343..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.17.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20160801-1"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
- if use kernel_linux && kernel_is ge 4 3 ; then
- ewarn "Gentoo supports kernels which are supported by OpenAFS"
- ewarn "which are limited to the kernel versions: <4.3"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Please do not file a bug report about this."
- fi
-}
-
-pkg_setup() {
- if use kernel_linux; then
- linux-mod_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- # packaging is f-ed up, so we can't run eautoreconf
- # run autotools commands based on what is listed in regen.sh
- eaclocal -I src/cf
- eautoconf
- eautoconf -o configure-libafs configure-libafs.ac
- eautoheader
- einfo "Deleting autom4te.cache directory"
- rm -rf autom4te.cache
-}
-
-src_configure() {
- local myconf=""
- # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
- if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
- myconf="--enable-linux-d_splice_alias-extra-iput"
- fi
-
- local ARCH="$(tc-arch-kernel)"
- local MY_ARCH="$(tc-arch)"
- local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
- if use kernel_linux; then
- myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
- --with-linux-kernel-build="${KV_OUT_DIR}"
- )
- elif use kernel_FreeBSD; then
- myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
- fi
- econf "${myconf[@]}"
-}
-
-src_compile() {
- ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
- if use kernel_linux; then
- local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
- [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
- MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
- linux-mod_src_install
- elif use kernel_FreeBSD; then
- insinto /boot/modules
- doins "${S}"/src/libafs/MODLOAD/libafs.ko
- fi
-}
-
-pkg_postinst() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.18.2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.18.2.ebuild
deleted file mode 100644
index 82f4bf28e523..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.18.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20160801-2"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~!AFS_FS KEYS"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
- if use kernel_linux && kernel_is ge 4 7 ; then
- ewarn "Gentoo supports kernels which are supported by OpenAFS"
- ewarn "which are limited to the kernel versions: < 4.7"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Please do not file a bug report about this."
- fi
-}
-
-pkg_setup() {
- if use kernel_linux; then
- linux-mod_pkg_setup
- fi
-}
-
-src_prepare() {
- default
-
- # packaging is f-ed up, so we can't run eautoreconf
- # run autotools commands based on what is listed in regen.sh
- eaclocal -I src/cf
- eautoconf
- eautoconf -o configure-libafs configure-libafs.ac
- eautoheader
- einfo "Deleting autom4te.cache directory"
- rm -rf autom4te.cache
-}
-
-src_configure() {
- local myconf=""
- # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
- if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
- myconf="--enable-linux-d_splice_alias-extra-iput"
- fi
-
- local ARCH="$(tc-arch-kernel)"
- local MY_ARCH="$(tc-arch)"
- local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
- if use kernel_linux; then
- myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
- --with-linux-kernel-build="${KV_OUT_DIR}"
- )
- elif use kernel_FreeBSD; then
- myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
- fi
- econf \
- $(use_enable debug debug-kernel) \
- "${myconf[@]}"
-}
-
-src_compile() {
- ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
- if use kernel_linux; then
- local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
- [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
- MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
- linux-mod_src_install
- elif use kernel_FreeBSD; then
- insinto /boot/modules
- doins "${S}"/src/libafs/MODLOAD/libafs.ko
- fi
-}
-
-pkg_postinst() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postinst
-
- if use kernel_linux; then
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 1.6.18.2 ${v}; then
- ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires"
- ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config."
- ewarn "If you only turned this option off for OpenAFS, please re-enable"
- ewarn "it, as keeping it turned off is a security risk."
- break
- fi
- done
- fi
-}
-
-pkg_postrm() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index f53476483322..a2d681233ba4 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,8 +1,3 @@
-DIST openafs-1.6.17-doc.tar.bz2 3529538 SHA256 803e895f9a5dc4c74866e8de20e07a8b7b972ee48b1603fab215b49116117921 SHA512 6056d5f410984a333fcd1581de623c4a4f218269138ab6ee4c9b9622a85ab89748b35d36517c092d8a7bace932fac0d6566645abbca087ae2b5d40e72cd52593 WHIRLPOOL 093b1c770748910af4c2144710350cef131b5621575d5d1648ff90ba54c4de13a1cc0bbcd9c8fcf81b126a81f20998806c90ab3d904446630eac214679c9b650
-DIST openafs-1.6.17-src.tar.bz2 14607107 SHA256 96413a2dbffdc9170cc5dde6aa5ad0ae2383c6106994285ed8f186928813a398 SHA512 3ca61a7731c9bd9bae7da2f7b3900438fcc9f75c95b354574389c2203af2ec0a7b4dcaaf13a437743477fcad8a46c3bbb8c68255a976b9a9917b8f0a0cdf028f WHIRLPOOL 92de51878836a721e6fadbe2f6c7a8069ecf622a08fd05e3a01d8fef376bd2e18e9f3b4715d42a26e8d5f1d665f91924520ed6928ed1f460bac49b1bc906e129
-DIST openafs-1.6.18.2-doc.tar.bz2 3532508 SHA256 44914a65bced200fa33032e8f0a96256865fa5bd9414683e646eb73d548d9593 SHA512 83883c3a2b8e9d0cb638e9a3aac8eb3bd48ddb89c7f55304a5256f9ceb8d03b0a013cf578d40ff68f0c1644eb5598617ad56b6548b4e786630d43a88008fee08 WHIRLPOOL 140234ed67ef52d9fd6b3e154640d645eb872b3180c2db12a0dce15152abc2d379c4898a2ff2b231e2bf6b7ed9437ef46feb3ff44e8c0e4706427563a373e7d8
-DIST openafs-1.6.18.2-src.tar.bz2 14652869 SHA256 1e0749b33a20700651ec61436a25ad8d047ffc189a2d024614e7aeedaef57483 SHA512 a9690349c665baa29171d8256e41cac817599e742880bbb02382bdda67a1adc0b4910aa2a1e92dea4867cc25832b27b6561c4ff05f5103a0da952e60b6facfac WHIRLPOOL 830ee1e4285c3e8f5f6b5eac2dcecfb75d5007a9960525d53438ee71135aed269f558ef1fa6a07bd72dd911f496597db6bc085ef2cc342f543cd0e2edfde53b4
DIST openafs-1.6.18.3-doc.tar.bz2 3531415 SHA256 96644f5c53827e4e37738899f9b0215c880c180c98501e0c59566d927694e506 SHA512 2373d3d13f991e4927dfd292dd8725d375f4b68419dd22d7e5dd8a7730eaff3d4c47663c4ba9a43b6e3103be58074b60130039bd2491166176a4bd666f4d2619 WHIRLPOOL f66f893ff155709e6f96fe7c2c9b37f4337278b14438f4a93347db250a4d334ae46c1ccf3d74dca49e476c9faa8b1b2695c70709fabc21023d6e50631973e0b3
DIST openafs-1.6.18.3-src.tar.bz2 14668811 SHA256 b9cb45fdfd2aab543363e64da0b56167bfc1a302afdbcd5a076fb704a0c16a70 SHA512 679b463109c47fd252853e6f12c7e60148cf78f6d2699d468b1e1f85bbd5b392a909c3f2201460e3192ad7a60bad64c58489980c2efcd904ab4851df8724d47f WHIRLPOOL 8180188e3ecc87f002d5a4b4c4641949869a09b88474a75850e27dea1134dca1156ae4533f997494d64b8820aa4dc0f0ceb7b4dda01648c95f70408c190d353b
-DIST openafs-patches-20160801-1.tar.xz 10908 SHA256 d81c46d12e49fc917dc5171ddabd838d3c8c16dcb272edc533f6dbdda4dccadf SHA512 fc2ae985a69718ae4e12412059ed9431fccf854540e5b59112ea13be057b47695f8f14213d1c87d1eab2ff0d0c34407febfd37dbf8794cac6e3de223beb693fd WHIRLPOOL ea3e7e70f3f469561ef48d11bfa3f481c9d34265c78b45e1578b012432f7ff49463dacc938aee98060404baa79bed980a07b01422f076a2626308a842b99cbad
DIST openafs-patches-20160801-2.tar.xz 11004 SHA256 7037d9657bd3c90725fd8b2b063bef80cedcc9fbf0605c7a3bf3543b64eecb58 SHA512 42768bc54cbeafea2c8042b84368d9fcfc4e54681d1077eb1fd6a3d1633aa1a0ba2f6fd291a182a9f2f930f111d2ff587be9fe8a8b941b1e9535136ee344633b WHIRLPOOL 786c2155142916594f178cdc66631da5514f60ee0155e4420d702b4a934968e99ebb5d2de03beb8e22f00742972aeb3d9fb84d9051d9d67091264781deaa2108
diff --git a/net-fs/openafs/openafs-1.6.17.ebuild b/net-fs/openafs/openafs-1.6.17.ebuild
deleted file mode 100644
index a34f1acf01d0..000000000000
--- a/net-fs/openafs/openafs-1.6.17.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20160801-1"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="doc kerberos +modules pam"
-
-CDEPEND="
- sys-libs/ncurses:0=
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )"
-
-DEPEND="${CDEPEND}
- doc? (
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )"
-
-RDEPEND="${CDEPEND}
- modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
- default
-
- # fixing 2-nd level makefiles to honor flags
- sed -i -r 's/\ "${ED}"/etc/openafs/cacheinfo
- echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
- # pam_afs and pam_afs.krb have been installed in irregular locations, fix
- if use pam ; then
- dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
- fi
- rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
- # remove kdump stuff provided by kexec-tools #222455
- rm -rf "${ED}"/usr/sbin/kdump*
-
- # avoid collision with mit_krb5's version of kpasswd
- mv "${ED}"/usr/bin/kpasswd{,_afs} || die
- mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
- # move lwp stuff around #200674 #330061
- mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
- mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
- # update paths to the relocated lwp headers
- sed -ri \
- -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>::' \
- "${ED}"/usr/include/*.h \
- "${ED}"/usr/include/*/*.h \
- || die
-
- # minimal documentation
- use pam && doman src/pam/pam_afs.5
- DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
- src/afsd/CellServDB NEWS README )
-
- # documentation package
- if use doc ; then
- DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
- dohtml -r doc/xml/
- fi
-
- einstalldocs
-
- # Gentoo related scripts
- newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
- newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
- newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
- newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
- systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
- systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
- # used directories: client
- keepdir /etc/openafs
-
- # used directories: server
- keepdir /etc/openafs/server
- diropts -m0700
- keepdir /var/lib/openafs
- keepdir /var/lib/openafs/db
- diropts -m0755
- keepdir /var/lib/openafs/logs
-
- # link logfiles to /var/log
- dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
- ## Somewhat intelligently install default configuration files
- ## (when they are not present)
- local x
- for x in cacheinfo CellServDB ThisCell ; do
- if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
- cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
- fi
- done
-}
-
-pkg_postinst() {
- elog "This installation should work out of the box (at least the"
- elog "client part doing global afs-cell browsing, unless you had"
- elog "a previous and different configuration). If you want to"
- elog "set up your own cell or modify the standard config,"
- elog "please have a look at the Gentoo OpenAFS documentation"
- elog "(warning: it is not yet up to date wrt the new file locations)"
- elog
- elog "The documentation can be found at:"
- elog " https://wiki.gentoo.org/wiki/OpenAFS"
- elog
- elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
- elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
- elog "Setting cache options for systemd."
-
- SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
- [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
- CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
- [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
- if [ ${CACHESIZE} -lt 131070 ]; then
- AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
- elif [ ${CACHESIZE} -lt 524288 ]; then
- AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
- elif [ ${CACHESIZE} -lt 1048576 ]; then
- AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
- elif [ ${CACHESIZE} -lt 2209715 ]; then
- AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
- else
- AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
- fi
-
- # Replace existing env var if exists, else append line
- grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
- sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
- sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
- die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/openafs/openafs-1.6.18.2.ebuild b/net-fs/openafs/openafs-1.6.18.2.ebuild
deleted file mode 100644
index a75b6bc02546..000000000000
--- a/net-fs/openafs/openafs-1.6.18.2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20160801-2"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
- https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
- https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
- virtual/libintl
- fuse? ( sys-fs/fuse )
- kerberos? ( virtual/krb5 )
- ncurses? ( sys-libs/ncurses:0= )
- pam? ( virtual/pam )"
-
-DEPEND="${CDEPEND}
- virtual/yacc
- doc? (
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )"
-
-RDEPEND="${CDEPEND}
- modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
- default
-
- # fixing 2-nd level makefiles to honor flags
- sed -i -r 's/\ "${ED}"/etc/openafs/cacheinfo
- echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
- # pam_afs and pam_afs.krb have been installed in irregular locations, fix
- if use pam ; then
- dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
- fi
- rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
- # remove kdump stuff provided by kexec-tools #222455
- rm -rf "${ED}"/usr/sbin/kdump*
-
- # avoid collision with mit_krb5's version of kpasswd
- mv "${ED}"/usr/bin/kpasswd{,_afs} || die
- mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
- # move lwp stuff around #200674 #330061
- mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
- mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
- # update paths to the relocated lwp headers
- sed -ri \
- -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>::' \
- "${ED}"/usr/include/*.h \
- "${ED}"/usr/include/*/*.h \
- || die
-
- # minimal documentation
- use pam && doman src/pam/pam_afs.5
- DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
- src/afsd/CellServDB NEWS README )
-
- # documentation package
- if use doc ; then
- DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
- dohtml -r doc/xml/
- fi
-
- einstalldocs
-
- # Gentoo related scripts
- newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
- newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
- newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
- newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
- systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
- systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
- systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
- # used directories: client
- keepdir /etc/openafs
-
- # used directories: server
- keepdir /etc/openafs/server
- diropts -m0700
- keepdir /var/lib/openafs
- keepdir /var/lib/openafs/db
- diropts -m0755
- keepdir /var/lib/openafs/logs
-
- # link logfiles to /var/log
- dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
- ## Somewhat intelligently install default configuration files
- ## (when they are not present)
- local x
- for x in cacheinfo CellServDB ThisCell ; do
- if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
- cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
- fi
- done
-}
-
-pkg_postinst() {
- elog "This installation should work out of the box (at least the"
- elog "client part doing global afs-cell browsing, unless you had"
- elog "a previous and different configuration). If you want to"
- elog "set up your own cell or modify the standard config,"
- elog "please have a look at the Gentoo OpenAFS documentation"
- elog "(warning: it is not yet up to date wrt the new file locations)"
- elog
- elog "The documentation can be found at:"
- elog " https://wiki.gentoo.org/wiki/OpenAFS"
- elog
- elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
- elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
- elog "Setting cache options for systemd."
-
- SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
- [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
- CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
- [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
- if [ ${CACHESIZE} -lt 131070 ]; then
- AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
- elif [ ${CACHESIZE} -lt 524288 ]; then
- AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
- elif [ ${CACHESIZE} -lt 1048576 ]; then
- AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
- elif [ ${CACHESIZE} -lt 2209715 ]; then
- AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
- else
- AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
- fi
-
- # Replace existing env var if exists, else append line
- grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
- sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
- sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
- die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index f33a836cb8c0..7597c28e167c 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,3 +1,3 @@
DIST xrootd-3.3.6.tar.gz 1836866 SHA256 06656d919f5296bcf49953e97b1f3d1cf601c9a1d676945529032fa0046d7217 SHA512 87682fbc49ac13e0c98ee72f506c7c23902f983cfdb672f52a041bcd8de3f723d0ce26638d366a74cffbb3e251e69335454da4b9f8dd8e00ae80bb3bfc432572 WHIRLPOOL 9da9140743b3679ac49f6ae42e9ae4fd430ababd1bf3a021331b804fbe6c56140c6b36fe7d10113a0efc14283ab934240e3d7dac6b4e94c794e8dc47c9896559
-DIST xrootd-4.1.1.tar.gz 1957303 SHA256 3e472ec8068adc76f10df8a1bb1c795bb37a0a9936d4a255cc62073eb86c70c4 SHA512 ad5793b622ef967f69bf4be16b23fd00c9db183c3d0664e1913b82697d663c885499db780acd0d968148af6c33e9dad18fe798093e3fec72b20eba0717f3cc7e WHIRLPOOL 4de2ac56599af17188fe608f95cc10434c22d87d72b534b80865a79f648e20b98908b8703c18259d96ea43fb34a683cb45c19656efcae6b32cb13f58bbc37d2e
DIST xrootd-4.4.0.tar.gz 2146909 SHA256 f066e7488390c0bc50938d23f6582fb154466204209ca92681f0aa06340e77c8 SHA512 3e81285b97b928830538f358daf358538609d1678d5beb23b8c0f8fdda7ad22895cc96ba0aaadf55892b7cba08a60182fee19e27af3225b638cb209a4146bbfa WHIRLPOOL febb09eb0a18660807e05bf1ae3645bb5969eba7dbe7a764d4efec4883b1c8558dcc6f5577881bc2b37feeb99b77f2dd9d087b22d933a1be186959e8b79f837e
+DIST xrootd-4.5.0.tar.gz 2172752 SHA256 27a8e4ef1e6bb6bfe076fef50afe474870edd198699d43359ef01de2f446c670 SHA512 0ffa982b872ac94eae1e26d1ebbb94db46f607fb4b0f1d4a2261a7d34dc7715b67cb7c7beecea300f82578bf4773d18e9b86c55b32dfd65ab2e48f3cbb03f173 WHIRLPOOL 0263647475007500b5df1590c6707f2c8025bb8e0970247a8a5674a96bc0fa1c88ed77c3478296df10ef178fe6b233abfebbb2539e0abfa9643f1d5b24c59c75
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 2367e12db122..ecd16e038b97 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -16,6 +16,6 @@
diff --git a/net-libs/xrootd/xrootd-4.1.1.ebuild b/net-libs/xrootd/xrootd-4.1.1.ebuild
deleted file mode 100644
index 920673938c8e..000000000000
--- a/net-libs/xrootd/xrootd-4.1.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils user multilib
-
-DURI="http://xrootd.slac.stanford.edu/doc/prod"
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="${HOMEPAGE}/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fuse http kerberos libevent perl readline ssl test"
-
-RDEPEND="
- ! contrib/systemd/haproxy.service || die
+
+ sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
+}
+
+src_compile() {
+ local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+ if use pcre ; then
+ args="${args} USE_PCRE=1"
+ if use pcre-jit; then
+ args="${args} USE_PCRE_JIT=1"
+ else
+ args="${args} USE_PCRE_JIT="
+ fi
+ else
+ args="${args} USE_PCRE= USE_PCRE_JIT="
+ fi
+
+# if use kernel_linux; then
+# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+# else
+# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+# fi
+
+ if use crypt ; then
+ args="${args} USE_LIBCRYPT=1"
+ else
+ args="${args} USE_LIBCRYPT="
+ fi
+
+ if use ssl ; then
+ args="${args} USE_OPENSSL=1"
+ else
+ args="${args} USE_OPENSSL="
+ fi
+
+ if use zlib ; then
+ args="${args} USE_ZLIB=1"
+ else
+ args="${args} USE_ZLIB="
+ fi
+
+ # For now, until the strict-aliasing breakage will be fixed
+ append-cflags -fno-strict-aliasing
+
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+
+ if use tools ; then
+ for contrib in halog iprange ; do
+ emake -C contrib/${contrib} \
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+ done
+ fi
+}
+
+src_install() {
+ dobin haproxy
+
+ newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
+
+ # Don't install useless files
+# rm examples/build.cfg doc/*gpl.txt
+
+ dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
+ doman doc/haproxy.1
+
+ dobin haproxy-systemd-wrapper
+ systemd_dounit contrib/systemd/haproxy.service
+
+ if use tools ; then
+ for contrib in halog iprange ; do
+ dobin contrib/${contrib}/${contrib}
+ done
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.cfg
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins examples/haproxy.vim
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+ ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+ ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+ if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+ einfo "Please consult the installed documentation for learning the configuration file's syntax."
+ einfo "The documentation and sample configuration files are installed here:"
+ einfo " ${ROOT}usr/share/doc/${PF}"
+ fi
+ fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.6.11.ebuild b/net-proxy/haproxy/haproxy-1.6.11.ebuild
new file mode 100644
index 000000000000..df81d1e500a9
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.6.11.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+ EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit ssl tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+ ?? ( slz zlib )"
+
+DEPEND="
+ pcre? (
+ dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[zlib?] )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ slz? ( dev-libs/libslz:= )
+ zlib? ( sys-libs/zlib )
+ lua? ( dev-lang/lua:5.3 )
+ device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+
+haproxy_use() {
+ (( $# != 2 )) && die "${FUNCNAME}