diff --git a/app-admin/sysstat/sysstat-11.2.0.ebuild b/app-admin/sysstat/sysstat-11.2.0.ebuild
index 40e717503bdf..2dc8b9716eb8 100644
--- a/app-admin/sysstat/sysstat-11.2.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.2.0.ebuild
@@ -77,8 +77,10 @@ src_install() {
keepdir /var/log/sa
emake \
+ CHOWN=true \
DESTDIR="${D}" \
DOC_DIR=/usr/share/doc/${PF} \
+ MANGRPARG='' \
install
dodoc contrib/sargraph/sargraph
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index bd48cce7625d..c4e048e85e65 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -1,5 +1,6 @@
DIST duply_1.10.1.tgz 36079 SHA256 78f3714b0dc39657e2b3030e206370d38205305ca484e212704dcf77f9e70d35 SHA512 be991742e343b16c08024e0f0185e0d23d2630f06bb53a73c2056ba90e7d5610d64885be3edcdb38e464d6ddcc9e4c854958f234471b718189e988af2599ba5f WHIRLPOOL 6fe0f5201d1ac9d9c738d16cda7bce500dc860a2c446be5a2382deeeb0faf26b43a7bfd423e2fe72d14c8319e3e5defa92d1ce51b28083462daf579821131f6b
DIST duply_1.10.tgz 36075 SHA256 62286bddd6efee67fb20c790e63bf25847ad65c06a4969b275e9abdb6253f6cc SHA512 10af8208d14bbb23bccc03cba5db7fbdccd8cacc0ada18cc07ad268966200884c280486ce5019385bfa8d1e61b1aecee5e38704332b45d97b47419eca995641c WHIRLPOOL dc96ba35644a88f9929ce93216b0b44901b9c7d1b5c2f58439888066ae64f7fd254e3496f12f08159ad905e4d7a06f07e09a7c9dab1318ce1e29fe101fc1c4b2
DIST duply_1.11.1.tgz 43677 SHA256 128792962bbd1509e875bd91e613be3aa1263e6edb57815957e07d54346bc02d SHA512 a5f3303d89f62633369e350b8232a571801dad395e66978fdf806cb9e072c22adfd5c0323308de2338580451096eb7f5cb304b6cb1964d0aecd205add213f424 WHIRLPOOL b62310c14f53400352de0936002bc915468db5325b3f91d82354b8bed6f108de750e2a4c557c5f3635b57dc9c27b8d382410de56cf1f969d9d479b1484988e3e
+DIST duply_1.11.2.tgz 44094 SHA256 06843960ae5753395cb5be72a9c9f2fe78e6ea81a17c6d8d28f2ae49ab50d5aa SHA512 20833c774705f83ec7efc88a7605c925ea5e56536a2338c6bd3a65ae789ffa7fabb03206b396fd92fb8ccf13cf0d72dbecdf705780e345a2cb1804783623e420 WHIRLPOOL c9776c29436573b695588119563703ce594df07039268931a49deaf1a98f8f5e2a62fdc8c5a6e32f822c948aabb28c57a2a526c24de11dcc59e746579baf9772
DIST duply_1.11.tgz 43476 SHA256 234fc6e2cb7ad53966e40aabb5ca6447217b7b6179d5f6f18240ac5b5071f75c SHA512 d42902839693af67b2bedf534430c2bb8f59d04fcfb609174743423e37dcff52ae04c8621a0c55d1f544e74e1834b5672cbb6bdb9e3cb124727a1d4f7e5dabda WHIRLPOOL c12b791240e7c24f3b3390d50b4878f9d44e1adb34d600c3f4596431bbda88c03ae835f413bb504d348584d9b07368a845d0866833e29a1aa15ac1b8b431a3c6
DIST duply_1.9.2.tgz 36222 SHA256 2bfc0964ebc0bae5752e0b4a12eb8fb6f78a27739f32c9acb4ac81947506c5ab SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e WHIRLPOOL 6a3e79c87e0b28386f0ed6fd8eb7973659477ad278e80e292a3e6cea944fd512baffc9a455e148faeadb687a46a8e274ce86668c29f30244b5b63f1f850a9c00
diff --git a/app-backup/duply/duply-1.11.2.ebuild b/app-backup/duply/duply-1.11.2.ebuild
new file mode 100644
index 000000000000..6eddd3102d67
--- /dev/null
+++ b/app-backup/duply/duply-1.11.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit readme.gentoo
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+ dobin ${PN}
+ ./${PN} txt2man > ${PN}.1 || die
+ doman ${PN}.1
+ dodoc CHANGELOG.txt
+ readme.gentoo_create_doc
+}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
index 4c02aba0ce3f..d045c3a64598 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
@@ -212,9 +212,6 @@ src_configure() {
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
index d65f76bf4817..c86711715db0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
@@ -225,9 +225,6 @@ src_configure() {
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index 9ae7f13c98ce..4a551eda5d7d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
@@ -225,9 +225,6 @@ src_configure() {
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
index f0c8c47ca34a..faaea0a6c8c7 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
@@ -212,9 +212,6 @@ src_configure() {
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
index c66d03f4343a..0569edeedcfa 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
@@ -225,9 +225,6 @@ src_configure() {
# Save version information in the Emacs binary. It will be available
# in variable "system-configuration-options".
myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
econf \
--program-suffix="-${EMACS_SUFFIX}" \
diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
index 0cc0e9d0d045..a108868c0a81 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 0a32ac0398d8..1955db8822d3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,11 +3,10 @@ DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d503
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
-DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
+DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
diff --git a/dev-db/mariadb/mariadb-10.0.22-r1.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
deleted file mode 100644
index fbba5c33531d..000000000000
--- a/dev-db/mariadb/mariadb-10.0.22-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20150717-1707Z"
-HAS_TOOLS_PATCH="1"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-IUSE="${IUSE}"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if use server ; then
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
- # fails due to bad cleanup of previous tests when run in parallel
- # The tool is deprecated anyway
- # Bug 532288
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.bootstrap \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-
- else
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mariadb/mariadb-5.5.46.ebuild b/dev-db/mariadb/mariadb-5.5.48.ebuild
similarity index 97%
rename from dev-db/mariadb/mariadb-5.5.46.ebuild
rename to dev-db/mariadb/mariadb-5.5.48.ebuild
index 5417effc9869..d3fb53961706 100644
--- a/dev-db/mariadb/mariadb-5.5.46.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -26,7 +26,7 @@ RDEPEND="${RDEPEND}"
# and create your own mysql-extras tarball, looking at 000_index.txt
# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs community' \
+# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 28c323a643ff..5432ee7043a6 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,6 +1,8 @@
-DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
DIST mysql-5.5.47.tar.gz 21187802 SHA256 77d0997e7ef47885a6682888e6d1282419687d333b2bd2365cb909a089b8db7b SHA512 807d140764ec18f4a7edb8de3ceff24b2003f1b30cf59cce315b6c1f2475a3f3f92bf369e9fe5704611dd45ee5fb676c0c187851230dcb419adde22436678ce3 WHIRLPOOL db188a23b470fc4d556dfeee6feb2a248dcbffe027018c99e28f3a47c2783cfe473378fb96aefbf5a263a6bd4676e62e77f9e6c1e3aac6325f732d9517a4a867
+DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84
DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2
+DIST mysql-5.6.29.tar.gz 32220131 SHA256 6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f SHA512 d0efb3a03274639e3e585d8af338f8907094643dfeeee457de99d5cd7feabb6d69a8b884ccf9625b10df7531a76bc36df25a3e8713dcb657b578fac991ade8c5 WHIRLPOOL 808c3beaf3873e5e8a4a50bf94f511e2327daee39dad675f87370174dda51604e46a2d4f09e16e0c651092600165bcb65fba650f835d93a5983bb2fcb19b9c94
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
DIST mysql-extras-20151105-2051Z.tar.bz2 1490187 SHA256 129d79c2064b08b0afad69e04e27991bf4103c20ccea39c133239b1dd822a49f SHA512 af34a44275b06c1626eb5952b3643b5663b8a1fb1d9ff18a67d51c02daaa51c4476df407d38ab607cc41842b47e5dd7b4cef8ae380a41eb80923df8052b9e521 WHIRLPOOL 01702ca4e2033fbc70db3ab2dd166b2e31072ea0f6bdd42d00c27ae0c0afab5c8451c4dcc90cce6d46f9ea056017e273f7c719e1cfabf969293bdcd15241f5b3
+DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 35b76a8d2b78..422ac80272ba 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -15,7 +15,6 @@ dev-db/mysql
dev-db/mariadb
-->
diff --git a/dev-db/mysql/mysql-5.5.46.ebuild b/dev-db/mysql/mysql-5.5.48.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.5.46.ebuild
rename to dev-db/mysql/mysql-5.5.48.ebuild
index 9a964d7e3633..dbc9696e8ebe 100644
--- a/dev-db/mysql/mysql-5.5.46.ebuild
+++ b/dev-db/mysql/mysql-5.5.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/dev-db/mysql/mysql-5.6.27-r1.ebuild b/dev-db/mysql/mysql-5.6.29.ebuild
similarity index 87%
rename from dev-db/mysql/mysql-5.6.27-r1.ebuild
rename to dev-db/mysql/mysql-5.6.29.ebuild
index 8a15534e23aa..7537cf9d546f 100644
--- a/dev-db/mysql/mysql-5.6.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.29.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
-MY_EXTRAS_VER="20151105-2051Z"
+MY_EXTRAS_VER="20160212-0233Z"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
HAS_TOOLS_PATCH="1"
SUBSLOT="18"
-inherit toolchain-funcs mysql-multilib
+inherit mysql-multilib-r1
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
@@ -29,10 +29,10 @@ RDEPEND="${RDEPEND}"
# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1"
+MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
src_prepare() {
- mysql-multilib_src_prepare
+ mysql-multilib-r1_src_prepare
if use libressl ; then
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
"${S}/cmake/ssl.cmake" || die
@@ -74,13 +74,6 @@ multilib_src_test() {
retstatus_unit=$?
[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
# Ensure that parallel runs don't die
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# Enable parallel testing, auto will try to detect number of cores
@@ -130,13 +123,13 @@ multilib_src_test() {
rpl.rpl_plugin_load \
main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
+ mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
done
if ! use extraengine ; then
# bug 401673, 530766
for t in federated.federated_plugin ; do
- mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
+ mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)"
done
fi
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index c83483de0842..7ca6a8bc40ad 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,6 +1,10 @@
DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
+DIST postgresql-9.1.20.tar.bz2 15844360 SHA256 6d1e6c4334c265a85f0f96407b7a9aafff0f26cb62db2d8d03a32ba0c2872937 SHA512 ebec6aae593058276dda2404812d89f3df637ceac24d96de1a774da03cf58ea9ce44819e18549040b6f6d811f2c8203462e13788df7158d45a0fe9dfb72d0fd9 WHIRLPOOL de990c029949c8ef372d3440c4cbb870739bf5b83c438ba2b012004cabcb077bab1258b2115ceb239eafefe73f282ea729384085e3f682240cb40ed662f350e5
DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
+DIST postgresql-9.2.15.tar.bz2 16480973 SHA256 7ced4807589899e83c64dd0803cf1f9782b6a20077ab545c66e868ef26543e60 SHA512 4a0e52beaffc9f0b004c761a5ca107a019d6265877d36cd7be46912807da6fa6824ce469c8d59fb24092440646d3f0872b8aa62941b4b3ba657edc2f5678b2b1 WHIRLPOOL 58607fcd1adc474f6a78741527b4192e30ac8e87d83a80fa71b6660ac1665a9ab5ee062ae19c919b288df607854ab55866e00e0228ffc6bd1b71dd59c18d83bd
DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
+DIST postgresql-9.3.11.tar.bz2 17047707 SHA256 3d222a90c941d3a6c02c7c749fc9eb54ff20a1166570459d09c5476743496a21 SHA512 8da91e11e0a6502c185931b6e47ba8e583d3360009f26ad703552be9a216b2c37a688894d4ea867c529c4135b6c36da26e9d7ef52a411b0c68ad50a53ff3cdb3 WHIRLPOOL cc1251553ec902dc1998c2bad11460206064c0d55140601b96293d98774f9622d38fa49f758e2f69ed6cb27ee14dd0a20f6ec41f655a4793b255168dfd430815
DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
-DIST postgresql-9.5.0.tar.bz2 18378311 SHA256 f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc SHA512 f8aa0364a7a73ec5ace2bd13417f680ad0d7d7a9a67f78d774af5359e8e67a4358f27600fc0a9cd808f4a409020277c1d04fe93b2535db619b5e8cfc29ce6d8d WHIRLPOOL a9f7e522451cc81ab21f1596ddd771f7dbf212b69f28e32382f0d231dbfce649b9fb53afcc95bdcdba86ce8a6a99cab33467fa178c6f6bde7b6c623c440c2793
+DIST postgresql-9.4.6.tar.bz2 17734946 SHA256 cbce1f4d01a6142c5d8bebe125623c5198ec04f363da7dd3d3b3a4100b4140a6 SHA512 03e2c68ec7fb40b4886885136692e96ed5d7e50ead8ebd094ede402eeb8ed94a791357e8eff2776a2e4a537ced3d900e032779a33c1fbd920588d89f8b6705ee WHIRLPOOL d25073985dc9974064175bf8b90f7a18368882c8d62fdb403183121452624bfb50c10c181bdc4b6a076d515dc29e081cf913793653f04ced98a48640dab9b3ff
+DIST postgresql-9.5.1.tar.bz2 18441638 SHA256 6b309d8506a39773a752ff074f47656e5424576ea090b04a24fe1725958c5bd2 SHA512 fcb2b3bde51c4152b3a72764de1f9b4e607cb591571ed5bc1187b2c6938c33e21bdd512694a969a03c046e4889a129bb0e75fa676d55a1a1e77142da1e984192 WHIRLPOOL 2fdbae2c58ce4255b514055ada220b25269a01719c202e1d1ae86d408fd56b523f1a4e16ef5abd675b0fbf0675c1eabca7d0f5f2e8fdb9cdc3a3d98e7b755aeb
diff --git a/dev-db/postgresql/postgresql-9.1.20.ebuild b/dev-db/postgresql/postgresql-9.1.20.ebuild
new file mode 100644
index 000000000000..5f16ba1c94e8
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.1.20.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Testing within Portage's environment is broken, and the patch no
+# longer applies cleanly.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!! \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.2.15.ebuild b/dev-db/postgresql/postgresql-9.2.15.ebuild
new file mode 100644
index 000000000000..ee15425f799f
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.2.15.ebuild
@@ -0,0 +1,396 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!! \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.3.11.ebuild b/dev-db/postgresql/postgresql-9.3.11.ebuild
new file mode 100644
index 000000000000..d08a3dd1953f
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.3.11.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+uuid? ( dev-libs/ossp-uuid )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${CDEPEND}
+!! \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9.5.0.ebuild b/dev-db/postgresql/postgresql-9.4.6.ebuild
similarity index 100%
rename from dev-db/postgresql/postgresql-9.5.0.ebuild
rename to dev-db/postgresql/postgresql-9.4.6.ebuild
diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild
new file mode 100644
index 000000000000..3a8c797b487e
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.5.1.ebuild
@@ -0,0 +1,433 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+SLOT="$(get_version_component_range 1-2)"
+
+SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+ local front back
+ while [[ ${#} -gt 1 ]]; do
+ front+="${1}? ( "
+ back+=" )"
+ shift
+ done
+ echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+ ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!! \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environemnt:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
index 47b0be2c72ef..a5ab0256578a 100644
--- a/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
+++ b/dev-go/go-crypto/go-crypto-0_pre20150808.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go supplementary cryptography libraries"
HOMEPAGE="https://godoc.org/golang.org/x/crypto"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-crypto/go-crypto-9999.ebuild b/dev-go/go-crypto/go-crypto-9999.ebuild
index 8601e78c875f..eae72ca5aede 100644
--- a/dev-go/go-crypto/go-crypto-9999.ebuild
+++ b/dev-go/go-crypto/go-crypto-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go supplementary cryptography libraries"
HOMEPAGE="https://godoc.org/golang.org/x/crypto"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-net/go-net-0_pre20150804.ebuild b/dev-go/go-net/go-net-0_pre20150804.ebuild
index 953c5bf7cebe..236778b38904 100644
--- a/dev-go/go-net/go-net-0_pre20150804.ebuild
+++ b/dev-go/go-net/go-net-0_pre20150804.ebuild
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go supplementary network libraries"
HOMEPAGE="https://godoc.org/golang.org/x/net"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-text:="
RDEPEND=""
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
index 9c9df76a54ca..1931db445ea9 100644
--- a/dev-go/go-net/go-net-9999.ebuild
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go supplementary network libraries"
HOMEPAGE="https://godoc.org/golang.org/x/net"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-text:="
RDEPEND=""
diff --git a/dev-go/go-sys/go-sys-0_pre20150729.ebuild b/dev-go/go-sys/go-sys-0_pre20150729.ebuild
index 13d3c5c96d7c..9582f6747dc1 100644
--- a/dev-go/go-sys/go-sys-0_pre20150729.ebuild
+++ b/dev-go/go-sys/go-sys-0_pre20150729.ebuild
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go packages for low-level interaction with the operating system"
HOMEPAGE="https://godoc.org/golang.org/x/sys"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-sys/go-sys-9999.ebuild b/dev-go/go-sys/go-sys-9999.ebuild
index c9d1ab6d9cd5..f7acca1ab035 100644
--- a/dev-go/go-sys/go-sys-9999.ebuild
+++ b/dev-go/go-sys/go-sys-9999.ebuild
@@ -19,7 +19,7 @@ inherit golang-build
DESCRIPTION="Go packages for low-level interaction with the operating system"
HOMEPAGE="https://godoc.org/golang.org/x/sys"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-text/go-text-0_pre20150806.ebuild b/dev-go/go-text/go-text-0_pre20150806.ebuild
index 532853bbbbf5..2ce00ab68ebe 100644
--- a/dev-go/go-text/go-text-0_pre20150806.ebuild
+++ b/dev-go/go-text/go-text-0_pre20150806.ebuild
@@ -20,7 +20,7 @@ inherit golang-build
DESCRIPTION="Go text processing support"
HOMEPAGE="https://godoc.org/golang.org/x/text"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
index 11e63f09d777..a6942d5dcffd 100644
--- a/dev-go/go-text/go-text-9999.ebuild
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -20,7 +20,7 @@ inherit golang-build
DESCRIPTION="Go text processing support"
HOMEPAGE="https://godoc.org/golang.org/x/text"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0/${PVR}"
IUSE=""
DEPEND=""
RDEPEND=""
diff --git a/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
index 030ff9e2a489..5acd21568074 100644
--- a/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20150823-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://godoc.org/golang.org/x/tools"
SRC_URI="${ARCHIVE_URI}
http://golang.org/favicon.ico -> go-favicon.ico"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-net:="
RDEPEND=""
diff --git a/dev-go/go-tools/go-tools-0_pre20150902.ebuild b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
index 440b6ed644fa..635d4d1f76d7 100644
--- a/dev-go/go-tools/go-tools-0_pre20150902.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20150902.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://godoc.org/golang.org/x/tools"
SRC_URI="${ARCHIVE_URI}
http://golang.org/favicon.ico -> go-favicon.ico"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-net:=
>=dev-lang/go-1.5"
diff --git a/dev-go/go-tools/go-tools-0_pre20160121.ebuild b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
index 7c5268425963..65bc8c2fe200 100644
--- a/dev-go/go-tools/go-tools-0_pre20160121.ebuild
+++ b/dev-go/go-tools/go-tools-0_pre20160121.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://godoc.org/golang.org/x/tools"
SRC_URI="${ARCHIVE_URI}
http://golang.org/favicon.ico -> go-favicon.ico"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-net:=
>=dev-lang/go-1.5"
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 030ff9e2a489..5acd21568074 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://godoc.org/golang.org/x/tools"
SRC_URI="${ARCHIVE_URI}
http://golang.org/favicon.ico -> go-favicon.ico"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PVR}"
IUSE=""
DEPEND="dev-go/go-net:="
RDEPEND=""
diff --git a/dev-go/go-tour/Manifest b/dev-go/go-tour/Manifest
new file mode 100644
index 000000000000..1b11d3fc9e7b
--- /dev/null
+++ b/dev-go/go-tour/Manifest
@@ -0,0 +1 @@
+DIST go-tour-0_p20160209.tar.gz 275272 SHA256 f50ce5a75f1dd9d625830c0907a5b611455b052ed1e287f5d2f9428759e14223 SHA512 bc9131e6173f72ea01c3062454a47a90301ad01bc1ea356ef09b81ad2d887759671ee9700f2c6b47821fc02c49297b8797d732ae0e9b414205e483d30579d2e9 WHIRLPOOL a2e117e2f50c83013604e85fb03919a25eacc1494dce9c53929d6bcbb22367d88f7b073d292261909767c91fda8f5a10380f452938ac3bba78c5939634206e9c
diff --git a/dev-go/go-tour/go-tour-0_p20160209.ebuild b/dev-go/go-tour/go-tour-0_p20160209.ebuild
new file mode 100644
index 000000000000..015451491917
--- /dev/null
+++ b/dev-go/go-tour/go-tour-0_p20160209.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN="golang.org/x/tour/..."
+
+EGIT_COMMIT="6b2e5b35ce8ed092eaedc3d2a2294373a639f122"
+ARCHIVE_URI="https://github.com/golang/tour/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+inherit golang-vcs-snapshot golang-build
+
+DESCRIPTION="A Tour of Go"
+HOMEPAGE="https://tour.golang.org"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/go-tools:="
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ cp -sR "$(go env GOROOT)" "${T}/goroot" || die
+ rm -rf "${T}/goroot/src/${EGO_PN%/*}" || die
+ GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ [[ -x $(find "${T}" -name a.out) ]] || die "a.out not found"
+}
+
+src_install() {
+ GOROOT="${T}/goroot" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+ exeinto "$(go env GOTOOLDIR)"
+ newexe bin/gotour tour
+ insinto "$(go env GOROOT)"
+ doins -r src
+}
diff --git a/dev-go/go-tour/metadata.xml b/dev-go/go-tour/metadata.xml
new file mode 100644
index 000000000000..46777271d39c
--- /dev/null
+++ b/dev-go/go-tour/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
+ golang/tour
+
+
diff --git a/dev-java/jazzy/Manifest b/dev-java/jazzy/Manifest
index 6c412eb5c1fc..4119c078f98d 100644
--- a/dev-java/jazzy/Manifest
+++ b/dev-java/jazzy/Manifest
@@ -1 +1 @@
-DIST jazzy-0.5.2.src.zip 235936 SHA256 df6925f924094a9ebab51f30c0e90299e93be7258c194b6f0ea06a1df04fe43d SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e WHIRLPOOL de286057fd174df70ce571699c2c38c4cee67f3c0d821be254e126e29e70802fcee420706a2814dab8fa45b6a929e1c78c535702e0e0dcb0e752619f5be3fb03
+DIST jazzy-0.5.2.zip 235936 SHA256 df6925f924094a9ebab51f30c0e90299e93be7258c194b6f0ea06a1df04fe43d SHA512 6d20f9bc133c03049c4c2a5c8612a52ef9fa09bc7510fb762c1ba9de479b1ce9319633ae2e78d3a1dd63900198d4e2468887113d034d95ba3e05bc631cc2de5e WHIRLPOOL de286057fd174df70ce571699c2c38c4cee67f3c0d821be254e126e29e70802fcee420706a2814dab8fa45b6a929e1c78c535702e0e0dcb0e752619f5be3fb03
diff --git a/dev-java/jazzy/jazzy-0.5.2-r1.ebuild b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..0b213239e7ae
--- /dev/null
+++ b/dev-java/jazzy/jazzy-0.5.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Spell Check API"
+HOMEPAGE="http://sourceforge.net/projects/jazzy"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip -> ${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ java-pkg_clean
+ rm -rf src/com/swabunga/test || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ use doc && dodoc README.txt
+ use examples && java-pkg_doexamples --subdir \
+ com/swabunga/spell/examples \
+ src/com/swabunga/spell/examples
+}
diff --git a/dev-java/jazzy/jazzy-0.5.2.ebuild b/dev-java/jazzy/jazzy-0.5.2.ebuild
deleted file mode 100644
index 10ab3ef38598..000000000000
--- a/dev-java/jazzy/jazzy-0.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Spell Check API"
-HOMEPAGE="http://sourceforge.net/projects/jazzy"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- mkdir dict
- rm -v www/*.jar || die
-}
-
-EANT_BUILD_TARGET="library-all"
-
-src_install() {
- java-pkg_dojar dist/lib/*.jar
- dodoc README.txt || die
- use doc && java-pkg_dojavadoc javadoc
- use source && java-pkg_dosrc src/com
- use examples && java-pkg_doexamples --subdir com/swabunga/spell/examples \
- ./src/com/swabunga/spell/examples
-}
diff --git a/dev-java/jcalendar/Manifest b/dev-java/jcalendar/Manifest
index 3e24b3469260..663676146d38 100644
--- a/dev-java/jcalendar/Manifest
+++ b/dev-java/jcalendar/Manifest
@@ -1,2 +1 @@
-DIST jcalendar-1.3.3.zip 669499 SHA256 1dbbf9037026b32adfd123d3946c3ca272075f8b4ddf205436cddeffae320ac9 SHA512 966cb1f063b15bb941e9e263bd0dcf8a6121a6fa37ed2def69be6031856a1459a198f1b10202d697aafff8c71ad6f4e191449014bb692385c066f2c93b9c73fd WHIRLPOOL 39ef9f370b9ddc7c04717c45b34614919e65e54d52b6c2c0b0898b38d917d470e2442bfde08f2b94d567c8806749651aa00362363d38b4a13ba6fae3171a1b58
DIST jcalendar-1.4.zip 982517 SHA256 21fb9332aad57d9542e9833376686a4bc7612e979c638e97334421bd15447c4f SHA512 aeab6f98451f4fa8718e127de6c0af345410bebbd1de4fa1ca4b9e7f5a22908f9e455ba96da34ef9e8691b4d462e8a01dbd7881b6565a0f3a65d18fe58b68d9c WHIRLPOOL 8c25a8918ef7d83cce59c347701a7af8e3a1bd307398f80d9e2d9d076afae05daaa56e1430eba167139aaae6193ed84a6c860d68ecd286992be71bec9e0dd388
diff --git a/dev-java/jcalendar/jcalendar-1.3.3.ebuild b/dev-java/jcalendar/jcalendar-1.3.3.ebuild
deleted file mode 100644
index 7f1bd6777556..000000000000
--- a/dev-java/jcalendar/jcalendar-1.3.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java date chooser bean for graphically picking a date"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
-HOMEPAGE="http://www.toedter.com/en/jcalendar/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-
-COMMON_DEPEND="dev-java/jgoodies-looks:2.0"
-
-RDEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
- >=app-arch/unzip-5.50-r1
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"
-
-# NOTE: build.xml contains no tests
-
-java_prepare() {
- cd lib || die
- rm -v *.jar || die
-
- java-pkg_jar-from jgoodies-looks-2.0
-}
-
-EANT_BUILD_XML="src/build.xml"
-EANT_DOC_TARGET="dist"
-
-src_install() {
- java-pkg_newjar lib/${P}.jar
-
- dodoc readme.txt
-
- use doc && java-pkg_dohtml -r doc/*
- use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
index fa558a8ee1a5..a5e1c65f3a66 100644
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,21 +9,23 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Java date chooser bean for graphically picking a date"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
HOMEPAGE="http://www.toedter.com/en/jcalendar/"
+SRC_URI="http://www.toedter.com/download/${P}.zip"
LICENSE="LGPL-2.1"
SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
-COMMON_DEPEND="dev-java/jgoodies-looks:2.6"
+CDEPEND="dev-java/jgoodies-looks:2.6"
-RDEPEND=">=virtual/jdk-1.4
- ${COMMON_DEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.4
- >=app-arch/unzip-5.50-r1
- ${COMMON_DEPEND}"
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.6"
S="${WORKDIR}"
@@ -36,7 +38,7 @@ EANT_BUILD_TARGET="jar"
EANT_DOC_TARGET=""
java_prepare() {
- rm lib/*.jar || die
+ java-pkg_clean
}
src_install() {
diff --git a/dev-java/jgoodies-common/Manifest b/dev-java/jgoodies-common/Manifest
index 92618081e07e..d7e280d671cb 100644
--- a/dev-java/jgoodies-common/Manifest
+++ b/dev-java/jgoodies-common/Manifest
@@ -1,2 +1 @@
-DIST jgoodies-common-1_2_1.zip 271803 SHA256 0fe2ede31e70a633c2a157b99594701e4206c4207f7a3f6e97b15121cac32dfb SHA512 c31c00e9a79eacec92a20cecd0b3e8c3a5739e14f46bdc1b348c801925777d5433077c5f0c81e5526f95aa2d993449115c517945a3381185663494c6e4577d92 WHIRLPOOL 3edbddb83405867437ca2ef97466b4e9a3509c2b117ca6666425679cbb6ef7d7e44bdbd615728efdbc687e81e6602e7057b57f26af1b55b3a94114d598ae2362
DIST jgoodies-common-1_8_0.zip 575972 SHA256 602873af50ca8251623cb7f2fcfb9d4289844834670dba10c143e70380cad685 SHA512 c00ffb6498b40b214bccad3ee8f0f3a9231bb8e67243be5ea15956694466485ac75aeed09f340aea323c6989190c10015b7a72b82d5a251bb5ea12ddaedb6b25 WHIRLPOOL 61dc47e3c00842999572b49c61d6fa6383f44dbe658647202f6599ea00b76e301903af2386bce4134a777fed00f5f307f6e16d1a31fd821700fed4d2216d18a8
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild
deleted file mode 100644
index 380240e588a6..000000000000
--- a/dev-java/jgoodies-common/jgoodies-common-1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="common"
-MY_PV=${PV//./_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="JGoodies Common Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-java_prepare() {
- # Remove the packaged jars
- find . -name "*.jar" -delete || die "rm failed"
-}
-
-src_compile() {
- # it does not like unset ${build.compiler.executable}
- # feel free to fix if you want jikes back
- java-pkg_filter-compiler jikes
- # not setting the bootcp breaks ecj, javac apparently ignores nonsense
- eant -Dbuild.boot.classpath="$(java-config -g BOOTCLASSPATH)" jar
-}
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
-
- dodoc RELEASE-NOTES.txt README.html || die
-
- use doc && java-pkg_dohtml -r docs/*
- use source && java-pkg_dosrc src/core/com
-}
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
index d1077902aae9..7d46a567b7c9 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,15 +18,17 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="1.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="test"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip"
RDEPEND=">=virtual/jre-1.6"
+DEPEND="
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
S="${WORKDIR}"/${P}
JAVA_SRC_DIR="src"
diff --git a/dev-java/jgoodies-looks/files/build.xml b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-build.xml
similarity index 100%
rename from dev-java/jgoodies-looks/files/build.xml
rename to dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-build.xml
diff --git a/dev-java/jgoodies-looks/files/plastic.txt b/dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-plastic.txt
similarity index 100%
rename from dev-java/jgoodies-looks/files/plastic.txt
rename to dev-java/jgoodies-looks/files/jgoodies-looks-1.2.2-plastic.txt
diff --git a/dev-java/jgoodies-looks/files/jgoodies-looks-2.0.4-build.xml.patch b/dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
similarity index 100%
rename from dev-java/jgoodies-looks/files/jgoodies-looks-2.0.4-build.xml.patch
rename to dev-java/jgoodies-looks/files/jgoodies-looks-2.3.1-build.xml.patch
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
deleted file mode 100644
index 03b477ab1493..000000000000
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="looks"
-MY_PV="${PV//./_}"
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
-
-LICENSE="BSD"
-SLOT="1.2"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.4.2
- dev-java/ant-core
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4.2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm *.jar
- unzip ${MY_PN}-${PV}-src.zip &> /dev/null || die "Unpack Failed"
- cp "${FILESDIR}/build.xml" "${FILESDIR}/plastic.txt" .
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar ${MY_PN}.jar
-
- dodoc RELEASE-NOTES.txt
- use doc && java-pkg_dohtml -r build/doc
-}
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
index 8e545b840972..5fa20a3ba568 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-1.2.2-r2.ebuild
@@ -17,11 +17,13 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}-${MY_PV}.zip"
LICENSE="BSD"
SLOT="1.2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="doc"
-DEPEND=">=virtual/jdk-1.5
+DEPEND="
+ >=virtual/jdk-1.5
app-arch/unzip"
+
RDEPEND=">=virtual/jre-1.5"
S="${WORKDIR}/${MY_PN}-${PV}"
@@ -29,14 +31,16 @@ S="${WORKDIR}/${MY_PN}-${PV}"
EANT_DOC_TARGET="javadoc"
java_prepare() {
- find -name "*.jar" -delete || die
- cp "${FILESDIR}/build.xml" "${FILESDIR}/plastic.txt" "${S}" || die
+ java-pkg_clean
+
+ cp "${FILESDIR}/${P}-build.xml" "${S}"/build.xml || die
+ cp "${FILESDIR}/${P}-plastic.txt" "${S}"/plastic.txt || die
unzip ${MY_PN}-${PV}-src.zip || die
}
src_install() {
- java-pkg_dojar ${MY_PN}.jar
+ java-pkg_dojar "${MY_PN}.jar"
dodoc RELEASE-NOTES.txt
use source && java-pkg_dosrc com
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index 705b727c9fd2..58d544b4d1df 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
JAVA_PKG_IUSE="doc source examples"
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
MY_PN="looks"
MY_PV="${PV//./_}"
@@ -18,11 +18,13 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="2.0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE=""
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
+ >=virtual/jdk-1.4
app-arch/unzip"
+
RDEPEND=">=virtual/jre-1.4"
S="${WORKDIR}/${MY_PN}-${PV}"
@@ -37,15 +39,15 @@ EANT_BUILD_TARGET="jar-all"
java_prepare() {
# remove the bootclasspath brokedness, make building demo optional
- epatch "${FILESDIR}/${PN}-2.0.4-build.xml.patch"
+ epatch "${FILESDIR}/${P}-build.xml.patch"
# unzip the look&feel settings from bundled jar before we delete it
unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
|| die "unzip of javax.swing.LookAndFeel failed"
# and rename it to what build.xml expects
- mv javax.swing.LookAndFeel all.txt
+ mv javax.swing.LookAndFeel all.txt || die
- find -name "*.jar" -delete || die
+ java-pkg_clean
}
src_install() {
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
deleted file mode 100644
index eb340750855d..000000000000
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="looks"
-MY_PV="${PV//./_}"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="JGoodies Looks Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="2.0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # remove the bootclasspath brokedness, make building demo optional
- epatch "${FILESDIR}/${PN}-2.0.4-build.xml.patch"
-
- # unzip the look&feel settings from bundled jar before we delete it
- unzip -j looks-${PV}.jar META-INF/services/javax.swing.LookAndFeel \
- || die "unzip of javax.swing.LookAndFeel failed"
- # and rename it to what build.xml expects
- mv javax.swing.LookAndFeel all.txt
-
- rm -v *.jar demo/*.jar lib/*.jar || die
- rm -rv docs/api || die
-}
-
-src_compile() {
- # bug #150970
- java-pkg_filter-compiler jikes
-
- # jar target fails unless we make descriptors.dir an existing directory
- # I checked the ustream binary distribution and they also don't actually
- # put anything there.
- # 31.7.2006 betelgeuse@gentoo.org
- # update: it's where it looks for all.txt file
- # 16.1.2007 caster@gentoo.org
- eant -Ddescriptors.dir="${S}" jar-all $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/looks.jar
-
- dodoc RELEASE-NOTES.txt || die
- dohtml README.html || die
- if use doc; then
- java-pkg_dohtml -r docs/*
- java-pkg_dojavadoc build/docs/api
- fi
- use source && java-pkg_dosrc src/core/com
-}
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
index 06e388c00a32..0c08204f6ec6 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,15 +18,19 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
LICENSE="BSD"
SLOT="2.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-COMMON_DEPEND="dev-java/jgoodies-common:1.8"
-DEPEND=">=virtual/jdk-1.6
+CDEPEND="dev-java/jgoodies-common:1.8"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
app-arch/unzip
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEPEND}"
+ >=virtual/jdk-1.6"
S="${WORKDIR}"/${P}
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
index 8b426900d14a..b90ca778b4f8 100644
--- a/dev-java/super-csv/Manifest
+++ b/dev-java/super-csv/Manifest
@@ -1 +1 @@
-DIST v2.3.1.zip 16624601 SHA256 71cc38d393d97eb332b85214d119002bde22954d8b7c9e7382f7ea140517173d SHA512 6b418e4875e5c553572fc8fbb8fac47f5bd9647aa6261bcb5115234b0d23ed606e88b862fe3203837ed389cb2216ab707909bb6ed1cd18297b8d481973170515 WHIRLPOOL 7972c7df2e939c4353397b15cf980db623be0abb987824cf19d2f5e6933143a79a4660522ef3cb95d96ba0dce2e42aa8e40b3bc3a547a5216bc34d14e0cc9c49
+DIST super-csv-2.3.1.zip 16624601 SHA256 71cc38d393d97eb332b85214d119002bde22954d8b7c9e7382f7ea140517173d SHA512 6b418e4875e5c553572fc8fbb8fac47f5bd9647aa6261bcb5115234b0d23ed606e88b862fe3203837ed389cb2216ab707909bb6ed1cd18297b8d481973170515 WHIRLPOOL 7972c7df2e939c4353397b15cf980db623be0abb987824cf19d2f5e6933143a79a4660522ef3cb95d96ba0dce2e42aa8e40b3bc3a547a5216bc34d14e0cc9c49
diff --git a/dev-java/super-csv/super-csv-2.3.1.ebuild b/dev-java/super-csv/super-csv-2.3.1.ebuild
index 381ee9450d12..b2733a168c2c 100644
--- a/dev-java/super-csv/super-csv-2.3.1.ebuild
+++ b/dev-java/super-csv/super-csv-2.3.1.ebuild
@@ -9,10 +9,10 @@ inherit java-pkg-2 java-ant-2
DESCRIPTION="A fast, programmer-friendly, free CSV library for Java"
HOMEPAGE="http://super-csv.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/xerial-core/xerial-core-2.0.1.ebuild b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
index d638b8d4d230..d9ba44b7e6fc 100644
--- a/dev-java/xerial-core/xerial-core-2.0.1.ebuild
+++ b/dev-java/xerial-core/xerial-core-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,12 +15,17 @@ SRC_URI="https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-DEPEND=">=virtual/jdk-1.6
- test? ( dev-java/junit:4 )"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND="
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:4
+ )"
+
+RDEPEND="
+ >=virtual/jre-1.6"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 5568f9fa3175..c2855e49ad4a 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,2 +1,3 @@
DIST Maude-2.6.tar.gz 1600026 SHA256 a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 SHA512 3931a540f72acdf2de532eff7b55ba4c9496b38a4b036f4e37d16b860f87728d6df5b9e377fd3489e55f7c369bca5eb9cded9b7a75032c410eff9a6e85da3fab WHIRLPOOL 9bc2011cb167ac5a451fc043fcaccbbfbfb5cb71bbb804021c7286a6f315d8c6778b6a385c5c6e5566db18051e8c817f93f099f39e3077bd414b83cc8e78be9b
+DIST Maude-2.7.tar.gz 1663708 SHA256 f5da81556c3180aee6a9cf4cef2f0b9bb2ff3b7fcc7bb103cb4ac3f5770b2b89 SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070 WHIRLPOOL 252b51f303e7d5d22226bbfa96e8a62bd94bccc92403f40fce990ce6d0e3e57305b9f823ef3cf5f43f4386a4ce326032c7c17e47a0a4ad8bf86538e2e1435fa3
DIST maude-2.6-extras.tar.xz 3157004 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd WHIRLPOOL 7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44
diff --git a/dev-lang/maude/files/maude-2.7-bison-parse-param.patch b/dev-lang/maude/files/maude-2.7-bison-parse-param.patch
new file mode 100644
index 000000000000..2aa77f01c4e8
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.7-bison-parse-param.patch
@@ -0,0 +1,39 @@
+Author: Jakub Wilk
+Last-Update: Tue, 20 May 2014 13:35:26 +0200
+Bug-Debian: http://bugs.debian.org/733407
+Description: this is quick and dirty patch to use %parse-param instead
+ of deprecated YYPARSE_PARAM (and eventually removed in Bison 3.0).
+ %parse-param was added in bison 1.875, over a decade ago, so no
+ Build-Depends adjustments are needed. :-)
+
+--- a/src/Mixfix/top.yy
++++ b/src/Mixfix/top.yy
+@@ -24,6 +24,8 @@
+ // Parser for Maude surface syntax.
+ //
+
++%parse-param {void* YYPARSE_PARAM}
++
+ %{
+ #include
+ #include
+@@ -91,7 +93,7 @@ SyntaxContainer* oldSyntaxContainer = 0;
+ Int64 number;
+ Int64 number2;
+
+-static void yyerror(char *s);
++static void yyerror(void *, char *s);
+
+ void cleanUpModuleExpression();
+ void cleanUpParser();
+--- a/src/Mixfix/bottom.yy
++++ b/src/Mixfix/bottom.yy
+@@ -23,7 +23,7 @@
+ %%
+
+ static void
+-yyerror(char *s)
++yyerror(void *, char *s)
+ {
+ if (!(UserLevelRewritingContext::interrupted()))
+ IssueWarning(LineNumber(lineNumber) << ": " << s);
diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
new file mode 100644
index 000000000000..b48d92e91264
--- /dev/null
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools versionator
+
+MYP="${PN/m/M}-$(get_version_component_range 1-2)"
+
+DESCRIPTION="High-level specification language for equational and logic programming"
+HOMEPAGE="http://maude.cs.uiuc.edu/"
+SRC_URI="
+ http://maude.cs.illinois.edu/w/images/2/2d/${MYP}.tar.gz
+ https://dev.gentoo.org/~jlec/distfiles/${PN}-2.6-extras.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+ dev-libs/gmp:0=
+ dev-libs/libsigsegv
+ dev-libs/libtecla
+ sci-libs/buddy"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.0-prll.patch"
+ "${FILESDIR}/${PN}-2.6-search-datadir.patch"
+ "${FILESDIR}/${PN}-2.7-bison-parse-param.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" src/Mixfix/global.hh || die
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ # install data and full maude
+ insinto /usr/share/${PN}
+ doins -r src/Main/*.maude
+ doins "${WORKDIR}"/${PN}-2.6-extras/full-maude.maude
+
+ # install docs and examples
+ use doc && dodoc "${WORKDIR}"/${PN}-2.6-extras/pdfs/*
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+ fi
+}
diff --git a/dev-lang/php/php-5.5.32.ebuild b/dev-lang/php/php-5.5.32.ebuild
index c9b074b8037b..083c7ad7fdec 100644
--- a/dev-lang/php/php-5.5.32.ebuild
+++ b/dev-lang/php/php-5.5.32.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.6.18.ebuild b/dev-lang/php/php-5.6.18.ebuild
index c64b183e9cde..9daa2abecf76 100644
--- a/dev-lang/php/php-5.6.18.ebuild
+++ b/dev-lang/php/php-5.6.18.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index c5a11adc47f6..56d89877ae9a 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -4,3 +4,4 @@ DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08d
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
DIST swipl-7.3.14.tar.gz 16190376 SHA256 2f201f79a01c65a9c2296b622d207749442c3ae1c62d3d9866a4a03f71d5e64f SHA512 3a88329d2c244b8614dfd55cbd0978bb1b59c975b6767ff18255d7c5dcfe713f04e252dc180b70d2daac4790c940d31ab060cec0371d0b36b13fd4e4b482e1c8 WHIRLPOOL 74e023c56f074c279249759f40e009c70698e282094201ae0f9ab0a88d42b29080b7db5c3337303b5b1f42615d7ff8afe1d96a2b2887e933440252778daa03b6
DIST swipl-7.3.15.tar.gz 16216228 SHA256 4ff611d8db31ff097edba66f8ee45cdffb229be75f66974d3d1beb114ab85d47 SHA512 2a2d61413e7c98366cb4dd472044b381b296b60b68867e61a2a38f52f3be538603c60710770f766e6f4fa53383bd40043f053352fd96d5054766225e91b4f8d9 WHIRLPOOL 76224d6db53090ffd4d44573acb463c8c79b2d08699625d98ee9e23da7a8211a84ba3aaea054d81d18228f1ce84be32811f5d4d61fadb12431e0ab29f47ffd05
+DIST swipl-7.3.16.tar.gz 16214414 SHA256 584dce14e7eea75189c9133bb4eda05d639d6a4562b8cfca738ece25f0c2479e SHA512 5df2bd845087bb3f26e65d06b7db341b14500c7fc69b5c62b3ddd20d146c4280ffc79d5490d18239c0e70dab85e4424d81423deead148d7d1af768ae6800b3b8 WHIRLPOOL d7f45266ac2d1c36d7cd27e0e98f3856697d397060802790b5984c221092a69553a7bbbb761aa482aaba4892542f12c7786965b3db5fa1860f9864a404f0810b
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.16.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.16.ebuild
new file mode 100644
index 000000000000..f9a7b8b391ad
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.16.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+ archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4:= )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline:= )
+ gmp? ( dev-libs/gmp:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ java? ( >=virtual/jdk-1.5:= )
+ uuid? ( dev-libs/ossp-uuid )
+ X? (
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ epatch "${WORKDIR}"/${PV}
+ fi
+
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+ cd "${S}"/src || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable readline) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages" || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ $(use_with berkdb bdb ) \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ $(use_with odbc) \
+ $(use_with ssl) \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src || die
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_test() {
+ cd "${S}/src" || die
+ emake check
+
+ if ! use minimal ; then
+ unset DISPLAY
+ cd "${S}/packages" || die
+ emake \
+ USE_PUBLIC_NETWORK_TESTS=false \
+ USE_ODBC_TESTS=false \
+ check
+ ./report-failed || die
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ ./packages/report-failed || die "Cannot report failed packages"
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-libs/botan/botan-1.10.12.ebuild b/dev-libs/botan/botan-1.10.12.ebuild
index b618b9b7e32a..29310d8c3cba 100644
--- a/dev-libs/botan/botan-1.10.12.ebuild
+++ b/dev-libs/botan/botan-1.10.12.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library"
HOMEPAGE="http://botan.randombit.net/"
SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
SLOT="0"
LICENSE="BSD"
IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib"
diff --git a/dev-libs/libbsd/libbsd-0.8.2.ebuild b/dev-libs/libbsd/libbsd-0.8.2.ebuild
index f8598ceff4ce..50299b0f5c8d 100644
--- a/dev-libs/libbsd/libbsd-0.8.2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
pkg_setup() {
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild
index afc1b200d611..e3f644ad6821 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild
index bbc898831ca9..a1e03466bb63 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs +threads"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
index 4c86be155509..32234df10699 100644
--- a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
+++ b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,7 +29,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
$(python_gen_any_dep 'gnome-extra/zeitgeist[${PYTHON_USEDEP}]')
- gnome-extra/zeitgeist
+ dev-util/automoc
"
python_check_deps() {
diff --git a/dev-perl/libwww-perl/Manifest b/dev-perl/libwww-perl/Manifest
index 421777de03ab..20991b4bd8d1 100644
--- a/dev-perl/libwww-perl/Manifest
+++ b/dev-perl/libwww-perl/Manifest
@@ -1 +1,2 @@
DIST libwww-perl-6.05.tar.gz 132505 SHA256 7b25799ff7eec18e8e4e97dc0cad7b2a5b433b50b13feb59d9179173bee78f23 SHA512 9e9272f72ab28bba1e8c0e85ed21f672e52605b3cc785c9e7d4f930439b75ce9fd43281f6e44c8fd5797404ba82f590de6cd2a6365fa2742fdc8df12a53b9014 WHIRLPOOL 584254383e91dc235b880950227757badb14049a402ac3cc3596ddaf1569a0b733a3f9317b2bd90c54c7e607f90786ed685f0dab28a24122aaad2369518cbcbc
+DIST libwww-perl-6.15.tar.gz 141936 SHA256 6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322 SHA512 b031f1b6766fe5433940abbda438013211e0f82713bfbe8f3512fd3dd64d2c7b1236d19bb9414094726a37ee91908ebca5269855a639d0fd921423163b227aed WHIRLPOOL 808921729702a443950f697ae7d691bafe07a2641aafb6ffc31342301f5881c375dcb35b0f8f11d57d84a13c0d0b79bbfa23d52395e6e689e0381c379d48af03
diff --git a/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild b/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
new file mode 100644
index 000000000000..6ea13ec30167
--- /dev/null
+++ b/dev-perl/libwww-perl/libwww-perl-6.150.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=ETHER
+MODULE_VERSION=6.15
+inherit perl-module
+
+DESCRIPTION="A collection of Perl Modules for the WWW"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl"
+
+RDEPEND="
+ >=dev-perl/File-Listing-6.0.0
+ >=dev-perl/HTTP-Cookies-6.0.0
+ >=dev-perl/HTTP-Daemon-6.0.0
+ >=dev-perl/HTTP-Date-6.0.0
+ >=dev-perl/HTTP-Negotiate-6.0.0
+ >=dev-perl/HTTP-Message-6.0.0
+ >=dev-perl/LWP-MediaTypes-6.0.0
+ >=dev-perl/Net-HTTP-6.40.0
+ >=dev-perl/WWW-RobotRules-6.0.0
+ >=virtual/perl-Digest-MD5-2.120.0
+ dev-perl/Encode-Locale
+ >=dev-perl/HTML-Parser-3.340.0
+ >=virtual/perl-MIME-Base64-2.120.0
+ virtual/perl-libnet
+ >=dev-perl/URI-1.100.0
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+ ssl? (
+ dev-perl/LWP-Protocol-https
+ )
+"
+
+src_install() {
+ perl-module_src_install
+
+ # Perform a check to see if the live filesystem is case-INsensitive
+ # or not. If it is, the symlinks GET, POST and in particular HEAD
+ # will collide with e.g. head from coreutils. While under Linux
+ # having a case-INsensitive filesystem is really unusual, most Mac
+ # OS X users are on it, and also Interix users deal with
+ # case-INsensitivity since Windows is underneath.
+
+ # bash should always be there, if we can find it in capitals, we're
+ # on a case-INsensitive filesystem.
+ if [[ ! -f ${EROOT}/BIN/BASH ]] ; then
+ dosym /usr/bin/lwp-request /usr/bin/GET
+ dosym /usr/bin/lwp-request /usr/bin/POST
+ dosym /usr/bin/lwp-request /usr/bin/HEAD
+ fi
+}
+#SRC_TEST=do
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index 04f1338a1ac0..c84a3dd5ac0e 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,3 +1,4 @@
DIST GitPython-0.3.6.tar.gz 353639 SHA256 f3f42ca085eedbd3a9956b5e639de58bbe77a119f6b3d5c3af27669a2322c4a9 SHA512 cfa70004c42580b858a030eb1b46c9827e33b4dbc5477934bf08809e001568a7314e21caacb36743e2b3575be005b4cf9d831fc26e9cbe1964c2808da222a161 WHIRLPOOL afee46f324d22de6ee1b5d1525a17e68e6fa84ef851cf4d44e4aa6f71ee55d26421716559ba446706b12afb45a692cd7b2c27659a58bcdd28f09063ff05961e0
DIST GitPython-1.0.0.tar.gz 354662 SHA256 c1b3e6fdd209040b6b1cb32ecbff989eeb2fb31b4e7078c3342d71ae8ef7352b SHA512 02d6ca44c930cabd9aa7344ae2f97d201e1840cf22b6083e949f9f374113558b1d7ca88f2d5a4691e63d71da5e54418ef7b8807adb2dfcf90d843fe2d588b3f9 WHIRLPOOL 1623ffabe1bd9de7a71890e3794b45b5871ef519d2b7581f881b4df4e54dc529e5e75bd7835161900a4307ffabfa014f7e64dbe1cee9502b70821691c9853476
DIST GitPython-1.0.1.tar.gz 355108 SHA256 9c88c17bbcae2a445ff64024ef13526224f70e35e38c33416be5ceb56ca7f760 SHA512 63fc061f0e045b11adf20ab291f9d614028d76fb44c6b0910193f6a9f4a5f9bae070527fa2ca06b234da12b7cd545194a7f5e912f4e09370bd41f81552c3160f WHIRLPOOL f166834a746d5e2a4888219aa86f897f2713dbcc94dd1f2444a3ffc1b292bb2ae0b83df51aebd65ef45b942ff6d48ebb08b26796818512af6fcafded90398d4e
+DIST GitPython-1.0.2.tar.gz 387615 SHA256 85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8 WHIRLPOOL c12e850114d101faa673d4d87e6885b1d7cd55544d335e08d4579c160e4d8ef488dd09359cfbd9a39e11f4555b8cb3cd2bfec214c95883b5a83565ad1e28b403
diff --git a/dev-python/git-python/git-python-1.0.2.ebuild b/dev-python/git-python/git-python-1.0.2.ebuild
new file mode 100644
index 000000000000..e7daa4265be0
--- /dev/null
+++ b/dev-python/git-python/git-python-1.0.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="GitPython"
+MY_PV="${PV/_rc/.RC}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="http://gitorious.org/git-python https://pypi.python.org/pypi/GitPython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# Tests dont make sense without a git repo
+RESTRICT="test"
+
+RDEPEND="
+ dev-vcs/git
+ >=dev-python/gitdb-0.6.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )"
+# $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+# is the correct entry for mock, however while RESTRICT="test"
+# there is little point in setting it since it is inactive
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/libiscsi-python/Manifest b/dev-python/libiscsi-python/Manifest
new file mode 100644
index 000000000000..153c5ea581e0
--- /dev/null
+++ b/dev-python/libiscsi-python/Manifest
@@ -0,0 +1 @@
+DIST libiscsi-python-0_pre160211.zip 110062 SHA256 5165edc59a696b200c5572a21a4fcf258d7cde32983ad56e0b92e2ca71ec4e37 SHA512 c3f3742d2471f038c93ccd61e3eccf0431242988bc1237e3a0047518fb1eef71c5092735bc323452fae2219ee5a89de1fe098cd1170174934b547b44319d465c WHIRLPOOL ea4034821f6540516132df8e005b4910281091b4b8b5d2d5bf7e4044b5437f74c9e137e530b0982f0803e81a6185a6a03120ba2b3cd7f266607f493a3fe106b8
diff --git a/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild b/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
new file mode 100644
index 000000000000..ca08dfc77950
--- /dev/null
+++ b/dev-python/libiscsi-python/libiscsi-python-0_pre160211.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+HASH="a8f548c2700dbe3dadfe048fa2491c7b77cf7846"
+
+DESCRIPTION="Python bindings for libiscsi"
+HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
+SRC_URI="https://github.com/sahlberg/libiscsi-python/archive/${HASH}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="net-libs/libiscsi"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${PN}-${HASH}
diff --git a/dev-python/libiscsi-python/libiscsi-python-9999.ebuild b/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
new file mode 100644
index 000000000000..d6d7c90b3f70
--- /dev/null
+++ b/dev-python/libiscsi-python/libiscsi-python-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Python bindings for libiscsi"
+HOMEPAGE="https://github.com/sahlberg/libiscsi-python"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/sahlberg/libiscsi-python.git"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="net-libs/libiscsi"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/libiscsi-python/metadata.xml b/dev-python/libiscsi-python/metadata.xml
new file mode 100644
index 000000000000..0f3589e95f63
--- /dev/null
+++ b/dev-python/libiscsi-python/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+ flameeyes@gentoo.org
+
+
diff --git a/dev-python/pillow/pillow-3.1.1.ebuild b/dev-python/pillow/pillow-3.1.1.ebuild
index 75293444473c..e3cd14393b45 100644
--- a/dev-python/pillow/pillow-3.1.1.ebuild
+++ b/dev-python/pillow/pillow-3.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/python-scsi/Manifest b/dev-python/python-scsi/Manifest
new file mode 100644
index 000000000000..bc47ea98fe7e
--- /dev/null
+++ b/dev-python/python-scsi/Manifest
@@ -0,0 +1 @@
+DIST python-scsi-0_pre160211.zip 126606 SHA256 a86f6cb42fbf45b186fdfbdb697b001dfabf773e698b30dae46815b1aa4f90ad SHA512 43218dfe91eba8f79c0cc7b48e5d7ba3026aac3d0c70dc2d8865905ef70bc479c6a32c46104b3284a00b5832d8893daf4285aac84fd43f1a1ba80affeaf5e258 WHIRLPOOL d44417d7461db3c779805f15311bd51ed0af154237516433ef17a5a23c72c502d6cb09ecf36de913f735a9bc0ce6c4608395167e1e5e850babd3e65dd4ca6c3a
diff --git a/dev-python/python-scsi/metadata.xml b/dev-python/python-scsi/metadata.xml
new file mode 100644
index 000000000000..0f3589e95f63
--- /dev/null
+++ b/dev-python/python-scsi/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
+ flameeyes@gentoo.org
+
+
diff --git a/dev-python/python-scsi/python-scsi-0_pre160211.ebuild b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
new file mode 100644
index 000000000000..8d434814355b
--- /dev/null
+++ b/dev-python/python-scsi/python-scsi-0_pre160211.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1 eutils
+
+HASH="957e5538d8d441fb792db6fbbdc0a5e8d57d9c7d"
+
+DESCRIPTION="Access to SG_IO scsi devices"
+HOMEPAGE="https://github.com/rosjat/python-scsi/"
+SRC_URI="https://github.com/rosjat/python-scsi/archive/${HASH}.zip -> ${P}.zip"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"/${PN}-${HASH}
+
+pkg_postinst() {
+ optfeature "iSCSI support" dev-python/libiscsi-python
+}
diff --git a/dev-python/python-scsi/python-scsi-9999.ebuild b/dev-python/python-scsi/python-scsi-9999.ebuild
new file mode 100644
index 000000000000..1098061caa2b
--- /dev/null
+++ b/dev-python/python-scsi/python-scsi-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="Access to SG_IO scsi devices"
+HOMEPAGE="https://github.com/rosjat/python-scsi/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/rosjat/python-scsi.git"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index 5710b2994fc1..b523c3a28fa9 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -6,3 +6,4 @@ DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cb
DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
DIST mavros-0.16.5.tar.gz 195946 SHA256 9b14de0d3144eb8064883cbee1d8db89887406584ca85f04e0b3d1f29d774d70 SHA512 69adfac236cb14d09a9f25f3dcd446cf91ed7c378339db8c9a6050835bf78c9aaf204b753b3147f0d99f716fb0ce003a58cd378909ef4fbf725737c58e74e962 WHIRLPOOL c8462c908dafc86a1489166c59295331513c277ae839032d31daae024901b45bbddef1b2cc779caab977c57b32cf949197e44cc291952abfc690d34747b9c539
DIST mavros-0.16.6.tar.gz 196455 SHA256 49085cb4175aa398cba69f1ccce3e6cd2d542d16a440ba71f6aacca97467ba8c SHA512 58d7b4f2d69cac40bd009d2b86e571ff25c23ca52e56a455989f0c6aa34d32725285a62df57e4065887841eaf93649c9c0d167f3c7c937c2e06e95d489b39e31 WHIRLPOOL 9be567311269caeab75e9ba4893f1ea5148bdd576176cd3ff248558c9821a41c4cb87afc91d8ee8f2b45df5d93bf1d1ff865affd83855c5fa3e2b3cf9b5eeabc
+DIST mavros-0.17.0.tar.gz 199754 SHA256 7bbafed3e7192875207499ad4c678356de29c1ab748c3f30ae02e71fdca7efff SHA512 e853596662f50b7ecea2bf7c503d56cb77d05e0ec37cb76f045511e271fb9a76adf0d642960164dd5aa94ffa70ff80661a663c74ecf228dca01f8bc63be3dc0c WHIRLPOOL 38a69ae71a00955b19a8f86101b886361fc321d6463119162203bda944ab96d56142d997cc5cd15ad8421b68b22ec9ba8f4bb481682d77ce7141f4198c555fd6
diff --git a/dev-ros/libmavconn/libmavconn-0.17.0.ebuild b/dev-ros/libmavconn/libmavconn-0.17.0.ebuild
new file mode 100644
index 000000000000..52d298555cc3
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.17.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink communication library"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=dev-ros/mavlink-gbp-release-2015.12.12
+ dev-libs/boost:=
+ dev-libs/console_bridge
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 510537eef127..889d31b4263a 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -2,3 +2,4 @@ DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cb
DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
DIST mavros-0.16.5.tar.gz 195946 SHA256 9b14de0d3144eb8064883cbee1d8db89887406584ca85f04e0b3d1f29d774d70 SHA512 69adfac236cb14d09a9f25f3dcd446cf91ed7c378339db8c9a6050835bf78c9aaf204b753b3147f0d99f716fb0ce003a58cd378909ef4fbf725737c58e74e962 WHIRLPOOL c8462c908dafc86a1489166c59295331513c277ae839032d31daae024901b45bbddef1b2cc779caab977c57b32cf949197e44cc291952abfc690d34747b9c539
DIST mavros-0.16.6.tar.gz 196455 SHA256 49085cb4175aa398cba69f1ccce3e6cd2d542d16a440ba71f6aacca97467ba8c SHA512 58d7b4f2d69cac40bd009d2b86e571ff25c23ca52e56a455989f0c6aa34d32725285a62df57e4065887841eaf93649c9c0d167f3c7c937c2e06e95d489b39e31 WHIRLPOOL 9be567311269caeab75e9ba4893f1ea5148bdd576176cd3ff248558c9821a41c4cb87afc91d8ee8f2b45df5d93bf1d1ff865affd83855c5fa3e2b3cf9b5eeabc
+DIST mavros-0.17.0.tar.gz 199754 SHA256 7bbafed3e7192875207499ad4c678356de29c1ab748c3f30ae02e71fdca7efff SHA512 e853596662f50b7ecea2bf7c503d56cb77d05e0ec37cb76f045511e271fb9a76adf0d642960164dd5aa94ffa70ff80661a663c74ecf228dca01f8bc63be3dc0c WHIRLPOOL 38a69ae71a00955b19a8f86101b886361fc321d6463119162203bda944ab96d56142d997cc5cd15ad8421b68b22ec9ba8f4bb481682d77ce7141f4198c555fd6
diff --git a/dev-ros/mavros/mavros-0.17.0.ebuild b/dev-ros/mavros/mavros-0.17.0.ebuild
new file mode 100644
index 000000000000..ad4e45d80ffd
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="MAVLink extendable communication node for ROS"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_updater
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/angles
+ dev-ros/libmavconn
+ dev-ros/rosconsole_bridge
+ dev-libs/boost:=
+ dev-ros/eigen_conversions
+ dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ >=dev-ros/mavros_msgs-0.16.4[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ >=dev-ros/mavlink-gbp-release-2015.12.12
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 5710b2994fc1..b523c3a28fa9 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -6,3 +6,4 @@ DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cb
DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
DIST mavros-0.16.5.tar.gz 195946 SHA256 9b14de0d3144eb8064883cbee1d8db89887406584ca85f04e0b3d1f29d774d70 SHA512 69adfac236cb14d09a9f25f3dcd446cf91ed7c378339db8c9a6050835bf78c9aaf204b753b3147f0d99f716fb0ce003a58cd378909ef4fbf725737c58e74e962 WHIRLPOOL c8462c908dafc86a1489166c59295331513c277ae839032d31daae024901b45bbddef1b2cc779caab977c57b32cf949197e44cc291952abfc690d34747b9c539
DIST mavros-0.16.6.tar.gz 196455 SHA256 49085cb4175aa398cba69f1ccce3e6cd2d542d16a440ba71f6aacca97467ba8c SHA512 58d7b4f2d69cac40bd009d2b86e571ff25c23ca52e56a455989f0c6aa34d32725285a62df57e4065887841eaf93649c9c0d167f3c7c937c2e06e95d489b39e31 WHIRLPOOL 9be567311269caeab75e9ba4893f1ea5148bdd576176cd3ff248558c9821a41c4cb87afc91d8ee8f2b45df5d93bf1d1ff865affd83855c5fa3e2b3cf9b5eeabc
+DIST mavros-0.17.0.tar.gz 199754 SHA256 7bbafed3e7192875207499ad4c678356de29c1ab748c3f30ae02e71fdca7efff SHA512 e853596662f50b7ecea2bf7c503d56cb77d05e0ec37cb76f045511e271fb9a76adf0d642960164dd5aa94ffa70ff80661a663c74ecf228dca01f8bc63be3dc0c WHIRLPOOL 38a69ae71a00955b19a8f86101b886361fc321d6463119162203bda944ab96d56142d997cc5cd15ad8421b68b22ec9ba8f4bb481682d77ce7141f4198c555fd6
diff --git a/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild
new file mode 100644
index 000000000000..562281398552
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/image_transport
+ dev-ros/cv_bridge
+ dev-ros/mavros
+ dev-ros/roscpp
+ dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/urdf
+ dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest
index 5710b2994fc1..b523c3a28fa9 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -6,3 +6,4 @@ DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cb
DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
DIST mavros-0.16.5.tar.gz 195946 SHA256 9b14de0d3144eb8064883cbee1d8db89887406584ca85f04e0b3d1f29d774d70 SHA512 69adfac236cb14d09a9f25f3dcd446cf91ed7c378339db8c9a6050835bf78c9aaf204b753b3147f0d99f716fb0ce003a58cd378909ef4fbf725737c58e74e962 WHIRLPOOL c8462c908dafc86a1489166c59295331513c277ae839032d31daae024901b45bbddef1b2cc779caab977c57b32cf949197e44cc291952abfc690d34747b9c539
DIST mavros-0.16.6.tar.gz 196455 SHA256 49085cb4175aa398cba69f1ccce3e6cd2d542d16a440ba71f6aacca97467ba8c SHA512 58d7b4f2d69cac40bd009d2b86e571ff25c23ca52e56a455989f0c6aa34d32725285a62df57e4065887841eaf93649c9c0d167f3c7c937c2e06e95d489b39e31 WHIRLPOOL 9be567311269caeab75e9ba4893f1ea5148bdd576176cd3ff248558c9821a41c4cb87afc91d8ee8f2b45df5d93bf1d1ff865affd83855c5fa3e2b3cf9b5eeabc
+DIST mavros-0.17.0.tar.gz 199754 SHA256 7bbafed3e7192875207499ad4c678356de29c1ab748c3f30ae02e71fdca7efff SHA512 e853596662f50b7ecea2bf7c503d56cb77d05e0ec37cb76f045511e271fb9a76adf0d642960164dd5aa94ffa70ff80661a663c74ecf228dca01f8bc63be3dc0c WHIRLPOOL 38a69ae71a00955b19a8f86101b886361fc321d6463119162203bda944ab96d56142d997cc5cd15ad8421b68b22ec9ba8f4bb481682d77ce7141f4198c555fd6
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.17.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.17.0.ebuild
new file mode 100644
index 000000000000..7c9f450664e1
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.17.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for MAVROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 30cee2542cb4..f0796b541298 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1 +1,2 @@
DIST backports-3.6.7.gem 88576 SHA256 2cbf3154f5392c3ae7278989094c2e9d68453bfb6079d36e74affa49a09c1255 SHA512 fd74fb8a139f8371ac9a7a9f067764b99fdb91e1c1d2eabcb187afb804cec7e0b2b0df931aefc8de114e5b51a4974e619afb5cca9403f2c04049f5c281415e56 WHIRLPOOL 3bb86087a9d274803cf1ddec936a0ec42f4d7fc50b7a270e40ff8e2af5f5f0b5c5190d39ec49273a6ddbf20276784846e73a49436de7373dc392bfc6d79eb62a
+DIST backports-3.6.8.gem 88064 SHA256 b3a81049fb3026b49302b6badedad33c710b302b8a7229d6b168c9530fc78ffd SHA512 5b4bebb56623043a4524715292f785b92f4993728deb30ef0268b099372a1835901e596ba33d374f501c45ffe960cc27a7ddd5c061c6fd02fe7bc6cc335b38c0 WHIRLPOOL 6f2fc79ec363fbff401882ddc5e143b6d906553caffcee1a022c9060a516a56d4c4abd6909841a2c7e64833f2b4757a0593afd16b6fe4bbb8851258e7ed800b5
diff --git a/dev-ruby/backports/backports-3.6.8.ebuild b/dev-ruby/backports/backports-3.6.8.ebuild
new file mode 100644
index 000000000000..9292ddbbea83
--- /dev/null
+++ b/dev-ruby/backports/backports-3.6.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails )"
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index 3c3293ab1236..59f9f13e12c2 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,2 +1,3 @@
DIST hashdiff-0.2.2.gem 14848 SHA256 109e5ebd20ac94de2fd8074959b9a1e0c6e69476206ab05e33852cc826eec959 SHA512 c26075c162baab018f2918d548042c15f8df70e03c184c1be07eab58b7accfd2a4c360001a5beadd686c2df6cfb3169216d55e9777f63635519a741132ea9ba0 WHIRLPOOL 21bce7e73d080dd2a497fef94b0755d8fe6fec9554468533e18a63c4668b884483cec862968b7887ef12c04507fd2dfcc559e4f7a5f9bd2c834656d5a42b5fd3
DIST hashdiff-0.2.3.gem 15360 SHA256 e3b61e7c19235619296300cd7e8aa4e6ac7d257446bc4e47742761a5f177a6c4 SHA512 3bcb3af69329a1103136cb4cfb2cea23459e32edae12a9cc3a14fa6e819982d218aee828dc6a919226a1d1c13160707e88a64a15b52376b7af65daa52cfe9729 WHIRLPOOL f0b6ba39a346950a48e05aecf861e7f14d60fcc279007563e9f28ad172443eef5b7874a8b58ab71a6843a2dc63c72bc116a1c0deace0f488c4e9b5b553f3b4fb
+DIST hashdiff-0.3.0.gem 15360 SHA256 04844d6f841e96ead0f1453597a92045cae5abb1c74fc0fcf790dc8fb27a06e4 SHA512 c40b400c5cfbc7a3cd5bd59936608ab4616e41937f355a3cea84b738d2fe51a88a80bc70a70a526a884326df93d2817be46c50065e20dda2a0de846b05f5f241 WHIRLPOOL d8e3a3fe4c7a36a8ec5965bc2a2401d4d57b785c402c7027f06558f3a02707df7e09beee197b9b6e9a032680d6adf6e68f521b79d0e8853fd7c6fdd79ff93eca
diff --git a/dev-ruby/hashdiff/hashdiff-0.3.0.ebuild b/dev-ruby/hashdiff/hashdiff-0.3.0.ebuild
new file mode 100644
index 000000000000..6cd505dd816f
--- /dev/null
+++ b/dev-ruby/hashdiff/hashdiff-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
+HOMEPAGE="https://github.com/liufengyun/hashdiff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index ed234aea69b7..80a0c690d059 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,3 +1,3 @@
DIST narray-0.6.0.8.tar.gz 68519 SHA256 0e7ec5d8554ad273ef74b3513d297e60769373fd8b258cfb2afcdd7b8320d642 SHA512 a2f194c0baea7c561d1ef70554e6d568876dd7192506c1e5432bcaccabae03a3e842e73d9cbccd110ac8924d86d18c559109244e302a4ad8aaa3acf304dd4618 WHIRLPOOL 8f722ac74f66759521bf467db3d5266538ab99b959ccbaa1c53d3ef26dab365996d34b37e65c49c739b1b0fecaeb72b0974bd7db897b3132caf3a29600ff8573
-DIST narray-0.6.0.9.tar.gz 68431 SHA256 54456689c3ed81a156a7d0a613369d271805761306653ca9fae6f68b9e1b442a SHA512 0da5a76582bc6226f6d8d087aaf6593fd6338d0d1f124f7707ebc7c2d296b098c553115ba0380af7b3b0b1afef9c1e7c4424cabe32604a22bc6616296deeb108 WHIRLPOOL b09c0b46616320909cdac4784cb5040e8086b5f6644755d529361754de63008d1dfeac7691d0ac0a8304603c7655886b131fd8eb7644d7c1305d777a46d7bd98
DIST narray-0.6.1.1.tar.gz 68536 SHA256 7c2f415666c834d982cba97de3bbda9160e76358c62f8f754cd0d11e90e95ed6 SHA512 1c9983d29c774cb61b7f8ec53290d427c123b648d88407ff4a2e2aef1a289267050d4846adfc00c075629cb228ed5b3d4f9f5ded4cded0b84ec1a5532cbb49ff WHIRLPOOL cdfdc8050daafb10629228bac4bc146a2d8b3461d3c365207ee1112e5f226da82183450f28b98fce98719ae10fbfd31c76ec6567d40e0cf63efe89f018c5db8a
+DIST narray-0.6.1.2.tar.gz 68621 SHA256 7ac717a8690ad5c85ae528102ef42ea50128c979a383abd35585db68cfd31f76 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a WHIRLPOOL 8c339a8377dbdc5ee61a4d09085de40cdcbe30ecaaae091dd62c6348e7579174ad0620d6b4c0175a9f90c224b9d9fa49d818f1455f3303d71f4d5d8bc50b92aa
diff --git a/dev-ruby/narray/narray-0.6.0.8-r2.ebuild b/dev-ruby/narray/narray-0.6.0.8-r2.ebuild
deleted file mode 100644
index 6d2e9060acf1..000000000000
--- a/dev-ruby/narray/narray-0.6.0.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# jruby → native extension
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.en README.ja SPEC.en SPEC.ja"
-
-RUBY_FAKEGEM_VERSION="${PV/_p/.}"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Numerical N-dimensional Array class"
-HOMEPAGE="http://www.ir.isas.ac.jp/~masa/ruby/index-e.html"
-SRC_URI="https://github.com/masa16/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
-
-all_ruby_prepare() {
- # the tests aren't really written to be a testsuite, so the
- # failure cases will literally fail; ignore all of those ad
- # instead expect that the rest won't fail.
- sed -i -e '/[fF]ollowing will fail/,$ s:^:#:' \
- -e '/next will fail/,$ s:^:#:' \
- test/*.rb || die "sed failed"
-}
-
-each_ruby_configure() {
- ${RUBY} extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
- cp -l ${PN}$(get_modname) ${PN}.h ${PN}_config.h lib/ || die "copy of ${PN}$(get_modname) failed"
-}
-
-each_ruby_test() {
- for unit in test/*; do
- # Skip over the FFTW test because it needs a package we don't
- # have in tree.
- [[ ${unit} == test/testfftw.rb ]] && continue
-
- ${RUBY} -Ilib ${unit} || die "test ${unit} failed"
- done
-}
diff --git a/dev-ruby/narray/narray-0.6.0.9.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
similarity index 84%
rename from dev-ruby/narray/narray-0.6.0.9.ebuild
rename to dev-ruby/narray/narray-0.6.1.2.ebuild
index d0267a82f5fb..d00619a7ce81 100644
--- a/dev-ruby/narray/narray-0.6.0.9.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-# jruby → native extension
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
@@ -46,10 +45,6 @@ each_ruby_compile() {
each_ruby_test() {
for unit in test/*; do
- # Skip over the FFTW test because it needs a package we don't
- # have in tree.
- [[ ${unit} == test/testfftw.rb ]] && continue
-
${RUBY} -Ilib ${unit} || die "test ${unit} failed"
done
}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index e720f382fd53..9f6a916e71aa 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1 +1,2 @@
DIST rack-attack-4.3.1.gem 16384 SHA256 9a2ea5df8c9b4a715ecd6497e7553c7e50fdb1452abe724bd8ae359115621146 SHA512 6f89b7f8afb8adab09b0df984df2ad4dbd043ad73dbb7adad11a87f9f4041194bb4f63399fd5c5d15bec1ee47a682247a9f01217ada8eeda1fb09235dd00ffaa WHIRLPOOL e9f45190635229975bb02abe2f6996d6de82f7486339c3bc26ac65dfa6a6f1da5e58a1f6f92b835388ddc218ff2971dec3a223e6c6be4e06c7eb034d06e1e1d2
+DIST rack-attack-4.4.0.gem 16896 SHA256 8e20760712a51a51f9919ffd24f8c638d2e1bbe13340b61fbc0c984a4cb40d6e SHA512 2c9d0a90c99481990d2cc777dfa4875b23fab16f542645a610619f870cccca8373ffe205ff0785732045216f3b97bfbc983dedd76941a12c0e36baf0050477a3 WHIRLPOOL 6e9d131ad525f83d2d2eb699d148dfd276199fa491f86c9bca9fa399c1f6cd53390558c24f137298651d29c71483d56567f24c9d3f529e0b60d37ca0bd18fa1b
diff --git a/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild
new file mode 100644
index 000000000000..232152e9171a
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-4.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? ( dev-ruby/activesupport
+ dev-ruby/rack-test
+ dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index f90c50994712..a3d441392ffd 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,3 +1,4 @@
DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916
DIST rack-cache-1.5.1.tar.gz 258817 SHA256 77afa21e3d2c97224795b740d4a67b23e2fbb15515b774b897993343265545f5 SHA512 e7d2804d2e4f48f8333ee9689251f760290eb15c692a55dd1bfdcfcbecc677afbf6db949c8ca9bc79e7248c58ca5f6f89bc13ab912c34f33e119befcdde902f8 WHIRLPOOL e3808050537411af5f210b7201da8f3b2b4d499a20e9a161ef29c88edba80348919629b23b929d9361982c4c328dcdae25eba3c616cbbab0ef626da6bfa0d590
DIST rack-cache-1.6.0.tar.gz 259383 SHA256 6c365f1a80a21701dd86b24bf5aa832fb3c70bd0ab1ede594ddc4a15e2376291 SHA512 d15e0eb55213e4ba7c528417c7f460606f4ac24222a0aa913859b8801e8b608600818c230a7677ccec99b1040a62a7067c1911ac109ae14d58c4ff140e502070 WHIRLPOOL 05f37a92b8affd318092218c871b1b3b7b7fe6f55088eb617af783fb178b6552dc5c19461ed2104053832fb9d84bddd0b0f34d250127167044961c7d10c810cb
+DIST rack-cache-1.6.1.tar.gz 259823 SHA256 59cc43d86f4147dd899c09bf6222f1509702b471aeed52525802bf6585237e27 SHA512 326643c9b438b94e556b38530401d2ef2cda8b86ccc5b2e8bdbd79bcba93cec6124ca425f12b993b9090a11210586f8772b552b4a526eb07c7d91ed71275f2ff WHIRLPOOL 938e3e2dfbee7d3fd2974a4337156ca2bcdefdbf9de588d1d1940348ec6440f93e63900bd56a04a184141aa078457581058de2f73658c66bf2d9439eaacd41c2
diff --git a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
new file mode 100644
index 000000000000..120d56e416d7
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+ dev-ruby/maxitest
+ >=dev-ruby/minitest-5.7.0:5
+ >=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' \
+ -e "2i require 'timeout'" \
+ test/test_helper.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/games-fps/doom3-ducttape/Manifest b/games-fps/doom3-ducttape/Manifest
index 077182768182..677f0bfa53c4 100644
--- a/games-fps/doom3-ducttape/Manifest
+++ b/games-fps/doom3-ducttape/Manifest
@@ -1,2 +1 @@
-DIST ducttape0006.zip 65641 SHA256 2bd694dddc49466defbf8ac2cf32b1778145900cec1e7c255d91c050ae6b7423 SHA512 57b7be6cbe38db8a93f3af68b9f08d09d28a3507f8408c0235d31edb8b670aeca034a161cfe88ba6b9174cbef86420cc6f7e5a5547d2bb1e1182958e5ec804df WHIRLPOOL 04dd51d5d48075e9dc33b6a38667c343837432f7a2ac5398d1773a74b67c146cdfdbb6c51e7369ead865f8da65a46540fa42d23b7d890b9a50b286049bcb0950
DIST ducttape0007.zip 66501 SHA256 5a23113075cbb7b9219b8506bf657ba4c887657fa877dc496454d47fd43ba3fd SHA512 90c2a271881b3cc7823be5f01b0809d99aabb6f8a88c9a3806d6b4adc0f86a9a0f63cd34498fcd99ff1eb25de4271aac5912495a469bbb72d4b9ae7b90f003a2 WHIRLPOOL 24db1d3b874dca8b8a2144e295b5c7d8f27955274877a461552aea9e9b0753c5afdb0e405c98b20cc32d28086d304f172558a2e45de7d33fbbe7caf51b5a8894
diff --git a/games-fps/doom3-ducttape/doom3-ducttape-0006-r1.ebuild b/games-fps/doom3-ducttape/doom3-ducttape-0006-r1.ebuild
deleted file mode 100644
index 7fb11e77a21d..000000000000
--- a/games-fps/doom3-ducttape/doom3-ducttape-0006-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MOD_DESC="sticks flashlights to your machinegun and shotgun"
-MOD_NAME="Duct Tape"
-MOD_DIR="ducttape"
-
-inherit games games-mods
-
-HOMEPAGE="http://ducttape.glenmurphy.com/"
-SRC_URI="http://ducttape.glenmurphy.com/ducttape${PV}.zip"
-
-LICENSE="freedist"
-KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
- mkdir ${MOD_DIR} || die
- cd ${MOD_DIR} || die
- unpack ${A}
-}
-
-src_prepare() {
- rm -f ${MOD_DIR}/pak002.pk4 || die # for doom3-roe
-}
-
-pkg_postinst() {
- games-mods_pkg_postinst
-
- elog "To use old saved games with this mod, run:"
- elog " mkdir -p ~/.doom3/ducttape"
- elog " cp -r ~/.doom3/base/savegames ~/.doom3/ducttape"
-}
diff --git a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
index 95896973c82e..89b6325db724 100644
--- a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
+++ b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ HOMEPAGE="http://ducttape.glenmurphy.com/"
SRC_URI="http://ducttape.glenmurphy.com/ducttape${PV}.zip"
LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="dedicated opengl"
src_unpack() {
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
index dd2cc718c7db..dfb1b5d94660 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
@@ -18,7 +18,10 @@ RDEPEND="
$(add_kdeapps_dep kabcclient '' ${PV})
$(add_kdeapps_dep kaddressbook '' ${PV})
$(add_kdeapps_dep kalarm '' ${PV})
- $(add_kdeapps_dep kdepim-icons '' ${PV})
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
$(add_kdeapps_dep kdepim-kresources '' ${PV})
$(add_kdeapps_dep kdepim-runtime '' ${PV})
$(add_kdeapps_dep kjots '' ${PV})
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
index 5b7355e3d0e4..ebfffdcc152c 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,10 @@ RDEPEND="
$(add_kdeapps_dep kabcclient)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
- $(add_kdeapps_dep kdepim-icons)
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
$(add_kdeapps_dep kdepim-kresources)
$(add_kdeapps_dep kdepim-runtime)
$(add_kdeapps_dep kjots)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
index 5ab989d61d0c..2a0d1c86a8b2 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.4.2015.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,10 @@ RDEPEND="
$(add_kdeapps_dep kabcclient)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
- $(add_kdeapps_dep kdepim-icons)
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
$(add_kdeapps_dep kdepim-kresources)
$(add_kdeapps_dep kdepim-wizards)
$(add_kdeapps_dep kjots)
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
index d3fb9586121b..938c15b6df1a 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
@@ -18,7 +18,10 @@ RDEPEND="
$(add_kdeapps_dep kabcclient)
$(add_kdeapps_dep kaddressbook)
$(add_kdeapps_dep kalarm)
- $(add_kdeapps_dep kdepim-icons)
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
$(add_kdeapps_dep kdepim-kresources)
$(add_kdeapps_dep kdepim-wizards)
$(add_kdeapps_dep kjots)
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
index 4edf1c7a2591..2a0dbb53fa01 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,10 @@ DEPEND="
kolab? ( >=net-libs/libkolab-0.5 )
"
RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdepim-icons)
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
!kde-misc/akonadi-google
"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.8.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
index 94d866e18852..f07e5fa3491d 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,10 @@ DEPEND="
kolab? ( >=net-libs/libkolab-0.5 )
"
RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdepim-icons)
+ || (
+ $(add_kdeapps_dep kdepim-icons)
+ >=kde-frameworks/oxygen-icons-5.19.0:5
+ )
!kde-misc/akonadi-google
"
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
index 517feb8e53ed..1da6f380075b 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ RESTRICT="test"
DEPEND="
!kde-misc/akonadi-social-utils
>=app-crypt/gpgme-1.1.6
- >=app-office/akonadi-server-1.12.90[qt4]
+ >=app-office/akonadi-server-1.12.90[qt4(+)]
>=dev-libs/boost-1.35.0-r5:=
dev-libs/libgpg-error
>=dev-libs/libical-0.48-r2:=
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild
index d1897786ff97..cb5624e2859f 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ RESTRICT="test"
DEPEND="
!kde-misc/akonadi-social-utils
>=app-crypt/gpgme-1.1.6
- >=app-office/akonadi-server-1.12.90[qt4]
+ >=app-office/akonadi-server-1.12.90[qt4(+)]
>=dev-libs/boost-1.35.0-r5:=
dev-libs/libgpg-error
>=dev-libs/libical-0.48-r2:=
diff --git a/kde-frameworks/kactivities/kactivities-5.17.0.ebuild b/kde-frameworks/kactivities/kactivities-5.17.0.ebuild
index 40e6028d8840..611357766422 100644
--- a/kde-frameworks/kactivities/kactivities-5.17.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.17.0.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
+ dev-qt/qtdeclarative:5[widgets]
dev-qt/qtgui:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5
diff --git a/kde-frameworks/kactivities/kactivities-5.18.0.ebuild b/kde-frameworks/kactivities/kactivities-5.18.0.ebuild
index a6a706580314..782b4595d241 100644
--- a/kde-frameworks/kactivities/kactivities-5.18.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.18.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
+ dev-qt/qtdeclarative:5[widgets]
dev-qt/qtgui:5
dev-qt/qtsql:5
dev-qt/qtwidgets:5
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.5.4-r1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.5.4-r1.ebuild
index d7a5ff5eb301..6a5dc1c60ccc 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.5.4-r1.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.5.4-r1.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${COMMON_DEPEND}
!
-Date: Sun, 4 Oct 2015 13:08:08 +0200
-Subject: [PATCH] [base] Replace left shifts with multiplication (#46118).
-
-* src/base/ftglyph.c (ft_bitmap_glyph_bbox, FT_Get_Glyph): Do it.
----
- ChangeLog | 6 ++++++
- src/base/ftglyph.c | 14 +++++++-------
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
-index cb7fc37..2778743 100644
---- a/src/base/ftglyph.c
-+++ b/src/base/ftglyph.c
-@@ -125,10 +125,10 @@
- FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph;
-
-
-- cbox->xMin = glyph->left << 6;
-- cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 );
-- cbox->yMax = glyph->top << 6;
-- cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 );
-+ cbox->xMin = glyph->left * 64;
-+ cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 );
-+ cbox->yMax = glyph->top * 64;
-+ cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 );
- }
-
-
-@@ -403,9 +403,9 @@
- if ( error )
- goto Exit;
-
-- /* copy advance while converting it to 16.16 format */
-- glyph->advance.x = slot->advance.x << 10;
-- glyph->advance.y = slot->advance.y << 10;
-+ /* copy advance while converting 26.6 to 16.16 format */
-+ glyph->advance.x = slot->advance.x * 1024;
-+ glyph->advance.y = slot->advance.y * 1024;
-
- /* now import the image from the glyph slot */
- error = clazz->glyph_init( glyph, slot );
---
-2.5.2
-
diff --git a/media-libs/freetype/freetype-2.6.1-r1.ebuild b/media-libs/freetype/freetype-2.6.3.ebuild
similarity index 89%
rename from media-libs/freetype/freetype-2.6.1-r1.ebuild
rename to media-libs/freetype/freetype-2.6.3.ebuild
index de89f3921c71..ffed637b5ade 100644
--- a/media-libs/freetype/freetype-2.6.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.6.3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit autotools-multilib flag-o-matic multilib toolchain-funcs
+EAPI=6
-INFINALITY_PATCH="03-infinality-2.6-2015.10.04.patch"
+inherit autotools flag-o-matic multilib multilib-build multilib-minimal toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6.3-2015.11.28.patch"
DESCRIPTION="A high-quality and portable font engine"
HOMEPAGE="http://www.freetype.org/"
@@ -41,6 +42,13 @@ RDEPEND="${CDEPEND}
abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+PATCHES=(
+ # This is the same as the 01 patch from infinality
+ "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+
+ "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
src_prepare() {
enable_option() {
sed -i -e "/#define $1/a #define $1" \
@@ -54,11 +62,10 @@ src_prepare() {
|| die "unable to disable option $1"
}
- # This is the same as the 01 patch from infinality
- epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
+ default
if use infinality; then
- epatch "${WORKDIR}/${INFINALITY_PATCH}"
+ eapply "${WORKDIR}/${INFINALITY_PATCH}"
# FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in freetype-2.4.11
enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
@@ -79,9 +86,6 @@ src_prepare() {
enable_option FT_DEBUG_MEMORY
fi
- epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
- epatch "${FILESDIR}"/${PN}-2.6.1-bad-shift.patch
-
if use utils; then
cd "${WORKDIR}/ft2demos-${PV}" || die
# Disable tests needing X11 when USE="-X". (bug #177597)
@@ -97,7 +101,7 @@ src_prepare() {
"${S}"/builds/unix/configure || die
fi
- autotools-utils_src_prepare
+ elibtoolize --patch-only
}
multilib_src_configure() {
@@ -106,16 +110,19 @@ multilib_src_configure() {
local myeconfargs=(
--enable-biarch-config
+ --enable-shared
$(use_with bzip2)
$(use_with harfbuzz)
$(use_with png)
+ $(use_enable static-libs static)
# avoid using libpng-config
LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
)
- autotools-utils_src_configure
+ ECONF_SOURCE="${S}" \
+ econf "${myeconfargs[@]}"
}
multilib_src_compile() {
@@ -157,7 +164,10 @@ multilib_src_install_all() {
fi
dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
- use doc && dohtml -r docs/*
+ if use doc ; then
+ docinto html
+ dodoc -r docs/*
+ fi
prune_libtool_files --all
}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.3.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
similarity index 94%
rename from media-sound/ncmpcpp/ncmpcpp-0.7.3.ebuild
rename to media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
index 14324db42998..114ea3cb847c 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.3.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
@@ -22,8 +22,11 @@ RDEPEND="
sys-libs/readline:*
curl? ( net-misc/curl )
taglib? ( media-libs/taglib )
- unicode? ( dev-libs/boost:=[icu] )
- visualizer? ( sci-libs/fftw:3.0 )
+ unicode? (
+ dev-libs/boost:=[icu]
+ dev-libs/icu:=
+ )
+ visualizer? ( sci-libs/fftw:3.0= )
"
DEPEND="
${RDEPEND}
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 5017057252d6..2e3ea641c4c0 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -4,3 +4,4 @@ DIST movit-1.1.2.tar.gz 858539 SHA256 417e1810d588e5b4b2e82f05c2b6a86f4d14a3d9d9
DIST movit-1.1.3.tar.gz 510811 SHA256 897fa5df7b261446dbed439c200f77b18a48e3693a0e6d666acf04eede806360 SHA512 ca8baa92907421d762a475fd06380fd3c9301df008ff60aaadf584f06185b0beed80633603073252492d4ad7f514ea6e09917862ba4d4630cf3bb0ecffa6f02f WHIRLPOOL 8f7efd99ee75b1e4990eac7a26fc0b0673fdfcecb49dfcc83211a0bd0e4af06a3b7b14b2b744b3823f0df6be49c020e2d9666f73257c53581fb24094330097b2
DIST movit-1.1.tar.gz 507154 SHA256 41dcd3ccefbe218b7ccc47a7ac2577cf261f1ea10298f26ff16ffc353adf0f25 SHA512 ecb84f918b28b507c06cde680da5114fdf19b224a71e202d6f932de0e080e941f7977e590476eda9ffc9fc5839126b1f2d1056dd80039ced894281a51eebcf30 WHIRLPOOL c349a9f12b5966e57fa0b09811bbf3cf4a36abbb06b3df5cc3b9fa1b42efa7e902be9625b09e161d0250034aa05c3901db5ec9e24b8af554fb046ad725cda04a
DIST movit-1.2.0.tar.gz 534145 SHA256 aeda1212288277ca136f2483765577a43ebd718be835dde73d81cf4b682fd473 SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154 WHIRLPOOL 3b937f8964e79066f2b9811f80d0bd8d97375d3a2154a8763f5caac0a416432c6229de7c711edd606f1d7b7970ba2da97b2b2647b61b435a677267c0d24187ac
+DIST movit-1.3.0.tar.gz 546075 SHA256 6a4b4fd6a49d6231d0ab84a2b98c822ed67bb32a803eea5a985557094b84abb3 SHA512 fea5419c4e5034f8e43d0a88845e6bdbd0b7b45bd2517368e8575432c564a62a3b14e290bc2751f046c5345c4dd64961f1829eb0b238237fbb1e09da58686658 WHIRLPOOL 3ad785ec72aca7aa8e24e448478ccf663c4f63dc638b24c574e688dd9d0aeb41d3ad357033d8e9e73749e1bab62cb5443ae74a6225250dbc24d6ff7f20310885
diff --git a/media-video/movit/movit-1.3.0.ebuild b/media-video/movit/movit-1.3.0.ebuild
new file mode 100644
index 000000000000..08927148bea1
--- /dev/null
+++ b/media-video/movit/movit-1.3.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+ https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+ >=dev-cpp/eigen-3.2.0:3
+ media-libs/libepoxy
+ sci-libs/fftw
+ media-libs/libsdl2
+ "
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+ GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/metadata/dtd/metadata.dtd b/metadata/dtd/metadata.dtd
index 394fb8a45433..5a5cb93e6ca5 100644
--- a/metadata/dtd/metadata.dtd
+++ b/metadata/dtd/metadata.dtd
@@ -5,12 +5,9 @@
-
+
-
-
-
-
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ce1f7241e14a..ea718624c23a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Feb 2016 06:08:22 +0000
+Fri, 12 Feb 2016 07:08:18 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ce1f7241e14a..ea718624c23a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Feb 2016 06:08:22 +0000
+Fri, 12 Feb 2016 07:08:18 +0000
diff --git a/metadata/md5-cache/app-admin/sysstat-11.2.0 b/metadata/md5-cache/app-admin/sysstat-11.2.0
index de9d1a18ebc5..ceee89141457 100644
--- a/metadata/md5-cache/app-admin/sysstat-11.2.0
+++ b/metadata/md5-cache/app-admin/sysstat-11.2.0
@@ -10,4 +10,4 @@ RDEPEND=isag? ( dev-lang/tk:0 dev-vcs/rcs sci-visualization/gnuplot ) nls? ( vir
SLOT=0
SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.2.0.tar.xz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=dcecd20e5d889dc994ada5e9c164973b
+_md5_=63adb3f1ca36eff9388921a6ee35d161
diff --git a/metadata/md5-cache/app-backup/duply-1.11.2 b/metadata/md5-cache/app-backup/duply-1.11.2
new file mode 100644
index 000000000000..7998cb44728c
--- /dev/null
+++ b/metadata/md5-cache/app-backup/duply-1.11.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-text/txt2man
+DESCRIPTION=A shell frontend for duplicity
+EAPI=5
+HOMEPAGE=http://duply.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-backup/duplicity
+SLOT=0
+SRC_URI=mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.11.x/duply_1.11.2.tgz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=f7c9d68b524557a06bb8894bf2b6065b
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113 b/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
index 4dbc9b621235..4bd713a28295 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=25
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-25.0.50_pre20151113.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-25.0.50_pre20151113.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=832bf2437fe6b50e5d713c3ae532d32e
+_md5_=81debbd9891065b03081c0e87234cb0c
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.0.90 b/metadata/md5-cache/app-editors/emacs-vcs-25.0.90
index 643c5a3bb399..39cd171a2c8e 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-25.0.90
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.0.90
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=25
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-25.0.90.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-25.0.90.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=de8eed6a4930422287147b63730b907d
+_md5_=dba61d6235de09e3166837e5d802b337
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r2 b/metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r2
index d5e1958bdfd8..5c9ec5735e59 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r2
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.0.9999-r2
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-co
REQUIRED_USE=?? ( aqua X )
SLOT=25
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e git-r3 ef66dfc3db09f327af21cf32f140fb2b libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=caa5b68c2ae453e258df7a3f4493df1f
+_md5_=b312fa25805970fbcce48f3498c2e4d7
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.1.50_pre20160130 b/metadata/md5-cache/app-editors/emacs-vcs-25.1.50_pre20160130
index c6fd56817946..a6fb644202e9 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-25.1.50_pre20160130
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.1.50_pre20160130
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( aqua X )
SLOT=25
SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-25.1.50_pre20160130.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-25.1.50_pre20160130.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=fdd3e7477749b5bdf458bb3404bbbcbd
+_md5_=1f9ccdc06f250110f0ea275400f81481
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-25.1.9999-r1 b/metadata/md5-cache/app-editors/emacs-vcs-25.1.9999-r1
index b85fc152fec9..3cfa358f561d 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-25.1.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-vcs-25.1.9999-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0 >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-co
REQUIRED_USE=?? ( aqua X )
SLOT=25
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e git-r3 ef66dfc3db09f327af21cf32f140fb2b libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=d66f2560760e0e403677ecab4b8d0b2a
+_md5_=42acfaef59f3af44d7265e48ba4cb9eb
diff --git a/metadata/md5-cache/app-eselect/eselect-php-0.9.1 b/metadata/md5-cache/app-eselect/eselect-php-0.9.1
index 589d75526cf6..442733a08cc5 100644
--- a/metadata/md5-cache/app-eselect/eselect-php-0.9.1
+++ b/metadata/md5-cache/app-eselect/eselect-php-0.9.1
@@ -4,10 +4,10 @@ DESCRIPTION=PHP eselect module
EAPI=6
HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-php.git/
IUSE=fpm apache2 apache2
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=app-admin/eselect apache2? ( www-servers/apache[apache2_modules_dir] ) apache2? ( =www-servers/apache-2* )
SLOT=0
SRC_URI=https://dev.gentoo.org/~mjo/distfiles/eselect-php-0.9.1.tar.xz https://dev.gentoo.org/~grknight/distfiles/eselect-php-0.9.1.tar.xz
_eclasses_=depend.apache e3c541cb90838388f81620d630c28f41 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=86e75cc62227d404e96e542c3e394d99
+_md5_=10d5d6bad6ec102b16ec9c57a74f75bc
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.22-r1 b/metadata/md5-cache/dev-db/mariadb-10.0.22-r1
deleted file mode 100644
index d1e6643dfc12..000000000000
--- a/metadata/md5-cache/dev-db/mariadb-10.0.22-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] ) !client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) >=sys-libs/zlib-1.2.3:0=[static-libs?] ) tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= ) !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) ) server? ( pam? ( virtual/pam:0= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= ) perl? ( !dev-db/mytop ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( dev-libs/judy:0= ) >=dev-libs/libpcre-8.35:3= !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.8.9
-DESCRIPTION=An enhanced, drop-in replacement for MySQL
-EAPI=5
-HOMEPAGE=http://mariadb.org/
-IUSE=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 bindist debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux systemtap static static-libs tcmalloc test yassl oqgraph pam sphinx tokudb odbc xml client-libs +server +tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
-RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] ) !client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) >=sys-libs/zlib-1.2.3:0=[static-libs?] ) tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= ) !bindist? ( tools? ( >=sys-libs/readline-4.1:0= ) embedded? ( >=sys-libs/readline-4.1:0= ) ) server? ( pam? ( virtual/pam:0= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= ) perl? ( !dev-db/mytop ) extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( dev-libs/judy:0= ) >=dev-libs/libpcre-8.35:3= !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !client-libs? ( virtual/libmysqlclient ) !=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps
REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
RESTRICT=!bindist? ( bindist )
SLOT=0
-SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.46/source/mariadb-5.5.46.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.46/kvm-tarbake-jaunty-x86/mariadb-5.5.46.tar.gz mirror://gentoo/mysql-extras-20150509-1847Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150509-1847Z.tar.bz2
+SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.48/source/mariadb-5.5.48.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.48/kvm-tarbake-jaunty-x86/mariadb-5.5.48.tar.gz mirror://gentoo/mysql-extras-20150509-1847Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150509-1847Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150509-1847Z.tar.bz2
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 mysql-cmake 3f6ffc12a798037a17c82fe978c44b60 mysql-v2 bbe2e200266e2f91a3e0ccb04b234805 mysql_fx 198902d1634b4462a8070f8c933df0e8 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be4a6fc4321cf069afd441068bfe9ae6
+_md5_=fd52a331aaae40351f343091ae30d48d
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.46 b/metadata/md5-cache/dev-db/mysql-5.5.48
similarity index 94%
rename from metadata/md5-cache/dev-db/mysql-5.5.46
rename to metadata/md5-cache/dev-db/mysql-5.5.48
index f49dddb01239..7286082c210f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.46
+++ b/metadata/md5-cache/dev-db/mysql-5.5.48
@@ -11,6 +11,6 @@ RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps
REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
RESTRICT=!bindist? ( bindist )
SLOT=0
-SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.46.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.46.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.46.tar.gz mirror://gentoo/mysql-extras-20150127-1351Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150127-1351Z.tar.bz2
+SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.48.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.48.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.48.tar.gz mirror://gentoo/mysql-extras-20150127-1351Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150127-1351Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150127-1351Z.tar.bz2
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 mysql-cmake 3f6ffc12a798037a17c82fe978c44b60 mysql-v2 bbe2e200266e2f91a3e0ccb04b234805 mysql_fx 198902d1634b4462a8070f8c933df0e8 prefix e7f2b9c6e57342e5d25eac22fce23062 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=118ab48454212ba9c2742fdc471e21e5
+_md5_=7401de6d3af3b027517376f69630b411
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.27-r1 b/metadata/md5-cache/dev-db/mysql-5.6.27-r1
deleted file mode 100644
index ab6b5d14dc04..000000000000
--- a/metadata/md5-cache/dev-db/mysql-5.6.27-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] ) !client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) >=sys-libs/zlib-1.2.3:0=[static-libs?] ) tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.8.9
-DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
-EAPI=5
-HOMEPAGE=http://www.mysql.com/
-IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux systemtap static static-libs tcmalloc test yassl client-libs +server +tools
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
-RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] ) !client-libs? ( openssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) >=sys-libs/zlib-1.2.3:0=[static-libs?] ) tools? ( sys-libs/ncurses:0= ) embedded? ( sys-libs/ncurses:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !client-libs? ( virtual/libmysqlclient ) !=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
+EAPI=5
+HOMEPAGE=http://www.mysql.com/
+IUSE=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 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
+RDEPEND=kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0: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(-)?,static-libs?] ) 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(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3: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(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.1 !dev-db/postgresql-base:9.1 !dev-db/postgresql-server:9.1 selinux? ( sec-policy/selinux-postgresql )
+RESTRICT=test
+SLOT=9.1
+SRC_URI=mirror://postgresql/source/v9.1.20/postgresql-9.1.20.tar.bz2
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1cbc1f542e5f1d5121280094c76157a4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.2.15 b/metadata/md5-cache/dev-db/postgresql-9.2.15
new file mode 100644
index 000000000000..2636b8faf1d7
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.2.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.2 !dev-db/postgresql-base:9.2 !dev-db/postgresql-server:9.2 selinux? ( sec-policy/selinux-postgresql )
+SLOT=9.2
+SRC_URI=mirror://postgresql/source/v9.2.15/postgresql-9.2.15.tar.bz2
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8dd601d2ab713d4a1336f6f0d68a3bfd
diff --git a/metadata/md5-cache/dev-db/postgresql-9.3.11 b/metadata/md5-cache/dev-db/postgresql-9.3.11
new file mode 100644
index 000000000000..e98865cfb7cb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !!=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) !dev-db/postgresql-docs:9.3 !dev-db/postgresql-base:9.3 !dev-db/postgresql-server:9.3 selinux? ( sec-policy/selinux-postgresql )
+SLOT=9.3
+SRC_URI=mirror://postgresql/source/v9.3.11/postgresql-9.3.11.tar.bz2
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b000646bf889bb4773bab54029bc8849
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.6 b/metadata/md5-cache/dev-db/postgresql-9.4.6
new file mode 100644
index 000000000000..62c30a459d5e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
+DEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+SLOT=9.4
+SRC_URI=mirror://postgresql/source/v9.4.6/postgresql-9.4.6.tar.bz2
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=54b94beb6db3dd25d7b80e3e402b78f4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.0 b/metadata/md5-cache/dev-db/postgresql-9.5.1
similarity index 98%
rename from metadata/md5-cache/dev-db/postgresql-9.5.0
rename to metadata/md5-cache/dev-db/postgresql-9.5.1
index 230f779dfa78..c4eca9251e0a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.0
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.1
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=POSTGRESQL GPL-2
RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
SLOT=9.5
-SRC_URI=mirror://postgresql/source/v9.5.0/postgresql-9.5.0.tar.bz2
+SRC_URI=mirror://postgresql/source/v9.5.1/postgresql-9.5.1.tar.bz2
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=54b94beb6db3dd25d7b80e3e402b78f4
diff --git a/metadata/md5-cache/dev-go/go-crypto-0_pre20150808 b/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
index 2104b80c71d6..a1f61e39b4fa 100644
--- a/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
+++ b/metadata/md5-cache/dev-go/go-crypto-0_pre20150808
@@ -8,4 +8,4 @@ LICENSE=BSD
SLOT=0/0_pre20150808
SRC_URI=https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=0b34f2e1ec2da84be543f81e299eb132
+_md5_=7ca902c60a26fda4a714cad2965702b6
diff --git a/metadata/md5-cache/dev-go/go-crypto-9999 b/metadata/md5-cache/dev-go/go-crypto-9999
index e150586966cd..3d918f09f59b 100644
--- a/metadata/md5-cache/dev-go/go-crypto-9999
+++ b/metadata/md5-cache/dev-go/go-crypto-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/crypto
LICENSE=BSD
SLOT=0/9999
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs c46e447dc94466eabb5ce867f21b85bf multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=b9b349b7e5cef6090d4c11733229dafb
+_md5_=74106340a5b092e7ad774105774df222
diff --git a/metadata/md5-cache/dev-go/go-net-0_pre20150804 b/metadata/md5-cache/dev-go/go-net-0_pre20150804
index 70a32cb27c79..03ed5f6346bb 100644
--- a/metadata/md5-cache/dev-go/go-net-0_pre20150804
+++ b/metadata/md5-cache/dev-go/go-net-0_pre20150804
@@ -8,4 +8,4 @@ LICENSE=BSD
SLOT=0/0_pre20150804
SRC_URI=https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=2b743c3f3d6ee09e3e9511047e5e65d4
+_md5_=55ef424aee6b0ea17ab0697829a94872
diff --git a/metadata/md5-cache/dev-go/go-net-9999 b/metadata/md5-cache/dev-go/go-net-9999
index 957dede5b62d..b63d6f9d7fdd 100644
--- a/metadata/md5-cache/dev-go/go-net-9999
+++ b/metadata/md5-cache/dev-go/go-net-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/net
LICENSE=BSD
SLOT=0/9999
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs c46e447dc94466eabb5ce867f21b85bf multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=996cbac4f5a56746ebf654420c0c8d2d
+_md5_=f94b8ba0c2fe1da00ca74cbf67a00a7f
diff --git a/metadata/md5-cache/dev-go/go-sys-0_pre20150729 b/metadata/md5-cache/dev-go/go-sys-0_pre20150729
index 2a46df3fa597..e3dd81751a02 100644
--- a/metadata/md5-cache/dev-go/go-sys-0_pre20150729
+++ b/metadata/md5-cache/dev-go/go-sys-0_pre20150729
@@ -8,4 +8,4 @@ LICENSE=BSD
SLOT=0/0_pre20150729
SRC_URI=https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=66a0d4f9980245f95a8d2743916ebeb3
+_md5_=e5d6e9fc09d84bc839ab32749bbd9c17
diff --git a/metadata/md5-cache/dev-go/go-sys-9999 b/metadata/md5-cache/dev-go/go-sys-9999
index 79957a11aede..131b10f0b3b8 100644
--- a/metadata/md5-cache/dev-go/go-sys-9999
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/sys
LICENSE=BSD
SLOT=0/9999
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs c46e447dc94466eabb5ce867f21b85bf multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=c0f35710342c2a1d3d8f6619058a6ec6
+_md5_=cfa41ade8e9be362f0e1b654e573ea0f
diff --git a/metadata/md5-cache/dev-go/go-text-0_pre20150806 b/metadata/md5-cache/dev-go/go-text-0_pre20150806
index ea28965e510d..435d2c56ef54 100644
--- a/metadata/md5-cache/dev-go/go-text-0_pre20150806
+++ b/metadata/md5-cache/dev-go/go-text-0_pre20150806
@@ -8,4 +8,4 @@ LICENSE=BSD
SLOT=0/0_pre20150806
SRC_URI=https://github.com/golang/text/archive/1309a1875a4368c12688b9383c6bcac738c17c29.tar.gz -> go-text-0_pre20150806.tar.gz
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=05faee0740e3d173045a688e28c3bcb6
+_md5_=03258bcdd4737fdb1e3646ef0e1ebf7a
diff --git a/metadata/md5-cache/dev-go/go-text-9999 b/metadata/md5-cache/dev-go/go-text-9999
index ff6f90a033a4..896731465b6a 100644
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@@ -6,4 +6,4 @@ HOMEPAGE=https://godoc.org/golang.org/x/text
LICENSE=BSD
SLOT=0/9999
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs c46e447dc94466eabb5ce867f21b85bf multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=b238945ee6f9aa7acc9fe74d1502db7b
+_md5_=2af2c92070123b5972afade5b49e1d96
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1 b/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
index a5e95a278a16..96d54c965f94 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20150823-r1
@@ -5,7 +5,7 @@ EAPI=5
HOMEPAGE=https://godoc.org/golang.org/x/tools
KEYWORDS=~amd64
LICENSE=BSD
-SLOT=0
+SLOT=0/0_pre20150823-r1
SRC_URI=https://github.com/golang/tools/archive/6c9aff3.tar.gz -> go-tools-0_pre20150823.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=a165331e268f3d9c3b575e013ca35366
+_md5_=8ce7ec7fba9dcfda36a826916f9c6e91
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20150902 b/metadata/md5-cache/dev-go/go-tools-0_pre20150902
index 2b69d886cfe2..34ccad1a7a85 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20150902
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20150902
@@ -6,7 +6,7 @@ HOMEPAGE=https://godoc.org/golang.org/x/tools
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=! go-tools-0_pre20150902.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=a8d805e75e0b32fee5fa7140327f408c
+_md5_=5ee9b36f3a0a8fb92ad814205d7c744a
diff --git a/metadata/md5-cache/dev-go/go-tools-0_pre20160121 b/metadata/md5-cache/dev-go/go-tools-0_pre20160121
index fba43db453e5..a0ef25f9fa33 100644
--- a/metadata/md5-cache/dev-go/go-tools-0_pre20160121
+++ b/metadata/md5-cache/dev-go/go-tools-0_pre20160121
@@ -6,7 +6,7 @@ HOMEPAGE=https://godoc.org/golang.org/x/tools
KEYWORDS=~amd64
LICENSE=BSD
RDEPEND=! go-tools-0_pre20160121.tar.gz http://golang.org/favicon.ico -> go-favicon.ico
_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
-_md5_=ba73629eddb7376a84bed6d4963cc01d
+_md5_=89a46c3bddd266807816414f4a0e87e6
diff --git a/metadata/md5-cache/dev-go/go-tools-9999 b/metadata/md5-cache/dev-go/go-tools-9999
index b18dc2328025..550e8c129e97 100644
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@@ -4,7 +4,7 @@ DESCRIPTION=Go Tools
EAPI=5
HOMEPAGE=https://godoc.org/golang.org/x/tools
LICENSE=BSD
-SLOT=0
+SLOT=0/9999
SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs c46e447dc94466eabb5ce867f21b85bf multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=a165331e268f3d9c3b575e013ca35366
+_md5_=8ce7ec7fba9dcfda36a826916f9c6e91
diff --git a/metadata/md5-cache/dev-go/go-tour-0_p20160209 b/metadata/md5-cache/dev-go/go-tour-0_p20160209
new file mode 100644
index 000000000000..1c4fcb6e61cc
--- /dev/null
+++ b/metadata/md5-cache/dev-go/go-tour-0_p20160209
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-go/go-tools:= >=dev-lang/go-1.4.2:=
+DESCRIPTION=A Tour of Go
+EAPI=5
+HOMEPAGE=https://tour.golang.org
+KEYWORDS=~amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/golang/tour/archive/6b2e5b35ce8ed092eaedc3d2a2294373a639f122.tar.gz -> go-tour-0_p20160209.tar.gz
+_eclasses_=golang-base 1f6a08c05da2d91150032ff45db6a2c5 golang-build a44f10e6bd86ecccf2a07cc0d4cf6bec golang-vcs-snapshot 1caa6d8238d2378ad688ae068ff22e5a
+_md5_=1dccba359980958e81fb03e646253df0
diff --git a/metadata/md5-cache/dev-java/jazzy-0.5.2 b/metadata/md5-cache/dev-java/jazzy-0.5.2
deleted file mode 100644
index 3942ca377607..000000000000
--- a/metadata/md5-cache/dev-java/jazzy-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java Spell Check API
-EAPI=0
-HOMEPAGE=http://sourceforge.net/projects/jazzy
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0ea6d2291fa9cfb2972fa0f1b0f2e0bb
diff --git a/metadata/md5-cache/dev-java/jazzy-0.5.2-r1 b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
new file mode 100644
index 000000000000..8b93bccd97c6
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jazzy-0.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DESCRIPTION=Java Spell Check API
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/jazzy
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/jazzy/jazzy-0.5.2.src.zip -> jazzy-0.5.2.zip
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=65268d2894ad5a3400b9fc4ef8447739
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.3.3 b/metadata/md5-cache/dev-java/jcalendar-1.3.3
deleted file mode 100644
index a9c19f15b265..000000000000
--- a/metadata/md5-cache/dev-java/jcalendar-1.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=app-arch/unzip-5.50-r1 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java date chooser bean for graphically picking a date
-EAPI=5
-HOMEPAGE=http://www.toedter.com/en/jcalendar/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jdk-1.4 dev-java/jgoodies-looks:2.0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.2
-SRC_URI=http://www.toedter.com/download/jcalendar-1.3.3.zip
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=78b26ac990d84f2d0feddeb724439a55
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4 b/metadata/md5-cache/dev-java/jcalendar-1.4
index 8d5aaccd8955..57f9c033f24f 100644
--- a/metadata/md5-cache/dev-java/jcalendar-1.4
+++ b/metadata/md5-cache/dev-java/jcalendar-1.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=app-arch/unzip-5.50-r1 dev-java/jgoodies-looks:2.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/jgoodies-looks:2.6 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=Java date chooser bean for graphically picking a date
EAPI=5
HOMEPAGE=http://www.toedter.com/en/jcalendar/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jdk-1.4 dev-java/jgoodies-looks:2.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=1.2
SRC_URI=http://www.toedter.com/download/jcalendar-1.4.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41cb88a152e49ab7dc85250a235dddd8
+_md5_=cdfbc310ac4895a3bd71a75204f2068d
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.2.1 b/metadata/md5-cache/dev-java/jgoodies-common-1.2.1
deleted file mode 100644
index 99fd1e25d7cb..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Common Library
-EAPI=2
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_2_1.zip
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=faffcfe9aba53f779278249c72964c6e
diff --git a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0 b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
index 3736079622fc..5d1a8957a7ac 100644
--- a/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
+++ b/metadata/md5-cache/dev-java/jgoodies-common-1.8.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
DESCRIPTION=JGoodies Common Library
EAPI=5
HOMEPAGE=http://www.jgoodies.com/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
RESTRICT=test
SLOT=1.8
SRC_URI=http://www.jgoodies.com/download/libraries/common/jgoodies-common-1_8_0.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=757f597a6fcf7566b409fd3d8bc2d571
+_md5_=bbc7b8c0b46739035e409109cc8cc24c
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
deleted file mode 100644
index 2e5523a93f60..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4.2 dev-java/ant-core app-arch/unzip >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Looks Library
-EAPI=0
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4.2 >=dev-java/java-config-2.2.0
-SLOT=1.2
-SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0a29591f977796dfd4c29ef9677913b6
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2 b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
index d97c6cee5993..9be7f7f0fb84 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-1.2.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=JGoodies Looks Library
EAPI=5
HOMEPAGE=http://www.jgoodies.com/
IUSE=doc elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=1.2
SRC_URI=http://www.jgoodies.com/download/libraries/looks-1_2_2.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=395e95ac701ae6f32c3ca8ecc9824a9e
+_md5_=85c468dca1f56fe14110d82659632b3a
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
deleted file mode 100644
index eec12f4ad062..000000000000
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=JGoodies Looks Library
-EAPI=0
-HOMEPAGE=http://www.jgoodies.com/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=2.0
-SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=79e3016e0687f145c6b55f5700f5e931
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1 b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
index 386a9976d30b..efc6fad64543 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.3.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=JGoodies Looks Library
EAPI=5
HOMEPAGE=http://www.jgoodies.com/
IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=2.0
SRC_URI=http://www.jgoodies.com/download/libraries/looks/looks-2_3_1.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6d6208fcc64c420fe780fd7325f8fc11
+_md5_=92dd9af00e39e7f5545ce685c666746c
diff --git a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0 b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
index ec191a3dc176..be2fe258c3a4 100644
--- a/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
+++ b/metadata/md5-cache/dev-java/jgoodies-looks-2.6.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=dev-java/jgoodies-common:1.8 app-arch/unzip >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
DESCRIPTION=JGoodies Looks Library
EAPI=5
HOMEPAGE=http://www.jgoodies.com/
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
-RDEPEND=>=virtual/jre-1.6 dev-java/jgoodies-common:1.8 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/jgoodies-common:1.8 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=2.6
SRC_URI=http://www.jgoodies.com/download/libraries/looks/jgoodies-looks-2_6_0.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=353b77d93eb53c59342efcfe39fe444f
+_md5_=3608ddfaed12185e2fc3368d8923ecb9
diff --git a/metadata/md5-cache/dev-java/super-csv-2.3.1 b/metadata/md5-cache/dev-java/super-csv-2.3.1
index e1fe5a6fc273..bbddda6a35c6 100644
--- a/metadata/md5-cache/dev-java/super-csv-2.3.1
+++ b/metadata/md5-cache/dev-java/super-csv-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=A fast, programmer-friendly, free CSV library for Java
EAPI=5
HOMEPAGE=http://super-csv.github.io/
IUSE=elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
-SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip
+SRC_URI=https://github.com/super-csv/super-csv/archive/v2.3.1.zip -> super-csv-2.3.1.zip
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d255ce007570cc1a322c9f1e00f2b05b
+_md5_=32b43285af7963c21b749c038d05a03c
diff --git a/metadata/md5-cache/dev-java/xerial-core-2.0.1 b/metadata/md5-cache/dev-java/xerial-core-2.0.1
index f033c6fee401..e88238dfcceb 100644
--- a/metadata/md5-cache/dev-java/xerial-core-2.0.1
+++ b/metadata/md5-cache/dev-java/xerial-core-2.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source DBMS for XML/JSON/Relational data
EAPI=5
HOMEPAGE=https://code.google.com/p/xerial/
IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=https://dev.gentoo.org/~ercpe/distfiles/dev-java/xerial-core/xerial-core-2.0.1.tar.bz2
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=db89d658c32eff6caad788f34986a215
+_md5_=1ce87607f16174e2519956bd903ba6fe
diff --git a/metadata/md5-cache/dev-lang/maude-2.7 b/metadata/md5-cache/dev-lang/maude-2.7
new file mode 100644
index 000000000000..0897301423c3
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/maude-2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/gmp:0= dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=High-level specification language for equational and logic programming
+EAPI=6
+HOMEPAGE=http://maude.cs.uiuc.edu/
+IUSE=doc examples
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0= dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
+SLOT=0
+SRC_URI=http://maude.cs.illinois.edu/w/images/2/2d/Maude-2.7.tar.gz https://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=558ff4540e9ebf5a57a471ce877d4ccd
diff --git a/metadata/md5-cache/dev-lang/php-5.5.32 b/metadata/md5-cache/dev-lang/php-5.5.32
index 039831af78cc..221ecf1e058a 100644
--- a/metadata/md5-cache/dev-lang/php-5.5.32
+++ b/metadata/md5-cache/dev-lang/php-5.5.32
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
EAPI=5
HOMEPAGE=http://php.net/
IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
SLOT=5.5
SRC_URI=http://www.php.net/distributions/php-5.5.32.tar.bz2
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d autotools 07e71b3b5690738ef7e8bc097077e00c db-use a4966c7f4f7df444ead1212848c13cc9 depend.apache e3c541cb90838388f81620d630c28f41 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=db1cf11f79a169efab304c05ccb8b0b4
+_md5_=b60a0fe5e5d07a48a8e9dda1a2087428
diff --git a/metadata/md5-cache/dev-lang/php-5.6.18 b/metadata/md5-cache/dev-lang/php-5.6.18
index b4a08af04cd8..832361751fbd 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.18
+++ b/metadata/md5-cache/dev-lang/php-5.6.18
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
EAPI=5
HOMEPAGE=http://php.net/
IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=PHP-3
RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0 ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( dev-libs/openssl:0 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=cli? ( readline ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
SLOT=5.6
SRC_URI=http://www.php.net/distributions/php-5.6.18.tar.bz2
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d autotools 07e71b3b5690738ef7e8bc097077e00c depend.apache e3c541cb90838388f81620d630c28f41 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=51792df982554b5f315ec3c4f481c6de
+_md5_=f4c6d98575875461e5e124e741cf9db8
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.16 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.16
new file mode 100644
index 000000000000..b51852bee679
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.3.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2 LGPL-2.1
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline:= ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.5:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.16.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bedeebb6c35cddbd88f92a2d7cfb4e4c
diff --git a/metadata/md5-cache/dev-libs/botan-1.10.12 b/metadata/md5-cache/dev-libs/botan-1.10.12
index 549e5da4beb6..a4c78f151a1a 100644
--- a/metadata/md5-cache/dev-libs/botan-1.10.12
+++ b/metadata/md5-cache/dev-libs/botan-1.10.12
@@ -4,10 +4,10 @@ DESCRIPTION=A C++ crypto library
EAPI=6
HOMEPAGE=http://botan.randombit.net/
IUSE=bindist doc python bzip2 gmp ssl static-libs threads zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
LICENSE=BSD
RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-libs/boost-1.48[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) gmp? ( >=dev-libs/gmp-4.2.2:* ) ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )
SLOT=0
SRC_URI=http://botan.randombit.net/releases/Botan-1.10.12.tgz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=0ad59939e029e4ae9d8633e9f16a98d9
+_md5_=95eb6a019fbca3369953ccb412ea1ed1
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.2 b/metadata/md5-cache/dev-libs/libbsd-0.8.2
index 233e372ac6b4..38eb76e4d41b 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.2
+++ b/metadata/md5-cache/dev-libs/libbsd-0.8.2
@@ -3,9 +3,9 @@ DESCRIPTION=An library to provide useful functions commonly found on BSD systems
EAPI=5
HOMEPAGE=http://libbsd.freedesktop.org/wiki/
IUSE=static-libs 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
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=BSD BSD-2 BSD-4 ISC
SLOT=0
SRC_URI=http://libbsd.freedesktop.org/releases/libbsd-0.8.2.tar.xz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=1e58ef87a6f095f76e6ee238a23468b7
+_md5_=6277627605a230b37009389a21366cf9
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r2
index 18b006f41d6c..b93e3cf1932a 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
EAPI=5
HOMEPAGE=http://www.gnupg.org/
IUSE=static-libs 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1 MIT
RDEPEND=>=dev-libs/libgpg-error-1.12[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(-)?] !dev-libs/libgcrypt:11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
SLOT=0/11
SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.4.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=d0974f644e620fc52b238375705b9b62
+_md5_=0f48935aefcc29e156128b39961169a5
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.5 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.5
index 7aa231ea9cca..53e60e96ef9a 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.5
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
EAPI=5
HOMEPAGE=http://www.gnupg.org/
IUSE=doc static-libs +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1 MIT
RDEPEND=>=dev-libs/libgpg-error-1.12[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
SLOT=0/20
SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.5.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=2e02453a7e9bf096440da62a234b50fb
+_md5_=01d08b8dadbc4e40fbeaf85594fbba65
diff --git a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0 b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
index 678fd69f5ad2..813227f4c35a 100644
--- a/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
+++ b/metadata/md5-cache/dev-libs/libqzeitgeist-0.8.0
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libzeitgeist dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 || ( ( >=dev-lang/python-2.7.5-r2:2.7 gnome-extra/zeitgeist[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) gnome-extra/zeitgeist >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=dev-libs/libzeitgeist dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarative:4 || ( ( >=dev-lang/python-2.7.5-r2:2.7 gnome-extra/zeitgeist[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-util/automoc >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
DESCRIPTION=Qt interface to the Zeitgeist event tracking system
EAPI=5
HOMEPAGE=https://projects.kde.org/projects/kdesupport/libqzeitgeist
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libzeitgeist dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtdeclarati
SLOT=4
SRC_URI=mirror://kde/stable/libqzeitgeist/0.8.0/src/libqzeitgeist-0.8.0.tar.bz2
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde4-base d530f4b52e4c1d51837c1f96f673a215 kde4-functions f6f7b3906630fb197969f914b1ad454a multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1a9ba5791b8d9a6a8c8b9dd50bfef389
+_md5_=f1ec94d2464e76cf0f4841be3298f27a
diff --git a/metadata/md5-cache/dev-perl/libwww-perl-6.150.0 b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
new file mode 100644
index 000000000000..72f803721b65
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/libwww-perl-6.150.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/File-Listing-6.0.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=dev-perl/Net-HTTP-6.40.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-Digest-MD5-2.120.0 dev-perl/Encode-Locale >=dev-perl/HTML-Parser-3.340.0 >=virtual/perl-MIME-Base64-2.120.0 virtual/perl-libnet >=dev-perl/URI-1.100.0 dev-lang/perl:=[-build(-)]
+DESCRIPTION=A collection of Perl Modules for the WWW
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/libwww-perl/
+IUSE=ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=ssl? ( dev-perl/LWP-Protocol-https )
+RDEPEND=>=dev-perl/File-Listing-6.0.0 >=dev-perl/HTTP-Cookies-6.0.0 >=dev-perl/HTTP-Daemon-6.0.0 >=dev-perl/HTTP-Date-6.0.0 >=dev-perl/HTTP-Negotiate-6.0.0 >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=dev-perl/Net-HTTP-6.40.0 >=dev-perl/WWW-RobotRules-6.0.0 >=virtual/perl-Digest-MD5-2.120.0 dev-perl/Encode-Locale >=dev-perl/HTML-Parser-3.340.0 >=virtual/perl-MIME-Base64-2.120.0 virtual/perl-libnet >=dev-perl/URI-1.100.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/libwww-perl-6.15.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions 15aff0b9cba2282790142295ceb6be0c perl-module b2108b3c85ac7a6a6a9b035b54f6813c toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813
+_md5_=f66f13892bc35c85d9e687c751059719
diff --git a/metadata/md5-cache/dev-python/git-python-1.0.2 b/metadata/md5-cache/dev-python/git-python-1.0.2
new file mode 100644
index 000000000000..2fd1ce25189d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/git-python-1.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-vcs/git >=dev-python/gitdb-0.6.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Library used to interact with Git repositories
+EAPI=5
+HOMEPAGE=http://gitorious.org/git-python https://pypi.python.org/pypi/GitPython
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-vcs/git >=dev-python/gitdb-0.6.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/G/GitPython/GitPython-1.0.2.tar.gz
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=4c30bdc0ac70112c1c8cbb79327149ee
diff --git a/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211 b/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211
new file mode 100644
index 000000000000..4569386e79ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libiscsi-python-0_pre160211
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libiscsi dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python bindings for libiscsi
+EAPI=6
+HOMEPAGE=https://github.com/sahlberg/libiscsi-python
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=net-libs/libiscsi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/sahlberg/libiscsi-python/archive/a8f548c2700dbe3dadfe048fa2491c7b77cf7846.zip -> libiscsi-python-0_pre160211.zip
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=6efa06903df18e23ee66b7a535abc0f5
diff --git a/metadata/md5-cache/dev-python/libiscsi-python-9999 b/metadata/md5-cache/dev-python/libiscsi-python-9999
new file mode 100644
index 000000000000..8a2a9617c7e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libiscsi-python-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=net-libs/libiscsi dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Python bindings for libiscsi
+EAPI=6
+HOMEPAGE=https://github.com/sahlberg/libiscsi-python
+IUSE=python_targets_python2_7
+LICENSE=LGPL-2.1
+RDEPEND=net-libs/libiscsi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 git-r3 ef66dfc3db09f327af21cf32f140fb2b multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=f5010c681e8704ba0bec72d7bd2c90d0
diff --git a/metadata/md5-cache/dev-python/pillow-3.1.1 b/metadata/md5-cache/dev-python/pillow-3.1.1
index 53b94cf5443e..47fe4a327d3f 100644
--- a/metadata/md5-cache/dev-python/pillow-3.1.1
+++ b/metadata/md5-cache/dev-python/pillow-3.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Imaging Library (fork)
EAPI=5
HOMEPAGE=https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow
IUSE=doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
LICENSE=HPND
RDEPEND=jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_pypy? ( virtual/pypy:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/P/Pillow/Pillow-3.1.1.zip
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 virtualx 86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=4bece929b89efac2fedba698431199d6
+_md5_=3ef6cc2287334e432a338eccd1a971fb
diff --git a/metadata/md5-cache/dev-python/python-scsi-0_pre160211 b/metadata/md5-cache/dev-python/python-scsi-0_pre160211
new file mode 100644
index 000000000000..a41796efaab0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-scsi-0_pre160211
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Access to SG_IO scsi devices
+EAPI=6
+HOMEPAGE=https://github.com/rosjat/python-scsi/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/rosjat/python-scsi/archive/957e5538d8d441fb792db6fbbdc0a5e8d57d9c7d.zip -> python-scsi-0_pre160211.zip
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=8774004f44305464deadcf0be6a2a33b
diff --git a/metadata/md5-cache/dev-python/python-scsi-9999 b/metadata/md5-cache/dev-python/python-scsi-9999
new file mode 100644
index 000000000000..069447107e47
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-scsi-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Access to SG_IO scsi devices
+EAPI=6
+HOMEPAGE=https://github.com/rosjat/python-scsi/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+LICENSE=LGPL-2.1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 git-r3 ef66dfc3db09f327af21cf32f140fb2b multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=541f7ff8bd525e3015bd5cb63f1643ab
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.17.0 b/metadata/md5-cache/dev-ros/libmavconn-0.17.0
new file mode 100644
index 000000000000..477e4c59a904
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DESCRIPTION=MAVLink communication library
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/libmavconn
+IUSE=test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge dev-util/catkin dev-python/empy
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/0.17.0.tar.gz -> mavros-0.17.0.tar.gz
+_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a93f42d7d303110603acbcc49e2366e0
diff --git a/metadata/md5-cache/dev-ros/mavros-0.17.0 b/metadata/md5-cache/dev-ros/mavros-0.17.0
new file mode 100644
index 000000000000..93c1365a8e17
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros-0.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=MAVLink extendable communication node for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.16.4[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2015.12.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/0.17.0.tar.gz -> mavros-0.17.0.tar.gz
+_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f34d60443253e78819c267efcdd0e8c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.17.0 b/metadata/md5-cache/dev-ros/mavros_extras-0.17.0
new file mode 100644
index 000000000000..54fc15d2bcb4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Extra nodes and plugins for mavros
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros_extras
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/0.17.0.tar.gz -> mavros-0.17.0.tar.gz
+_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3077e72f0b52008fe7e8947590767622
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.17.0 b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.0
new file mode 100644
index 000000000000..6356a41851f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+DESCRIPTION=Messages for MAVROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros_msgs
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/0.17.0.tar.gz -> mavros-0.17.0.tar.gz
+_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 ros-catkin 5bd0782bea06cf2dd93b07f40e0a5e09 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1521d47d71fd24451ca5c5e1c29b3af5
diff --git a/metadata/md5-cache/dev-ruby/backports-3.6.8 b/metadata/md5-cache/dev-ruby/backports-3.6.8
new file mode 100644
index 000000000000..036f8f9d7052
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/backports-3.6.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/rails[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rails[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rails[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/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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] ) )
+DESCRIPTION=Backports of Ruby features for older Ruby
+EAPI=5
+HOMEPAGE=https://github.com/marcandre/backports
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=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 )
+SLOT=0
+SRC_URI=mirror://rubygems/backports-3.6.8.gem
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=932dadd76060b69a94df02e51c732fde
diff --git a/metadata/md5-cache/dev-ruby/hashdiff-0.3.0 b/metadata/md5-cache/dev-ruby/hashdiff-0.3.0
new file mode 100644
index 000000000000..9a4c798bf00c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hashdiff-0.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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? ( 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] ) )
+DESCRIPTION=Simple Hash extension to make working with nested hashes easier
+EAPI=5
+HOMEPAGE=https://github.com/liufengyun/hashdiff
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=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 )
+SLOT=0
+SRC_URI=mirror://rubygems/hashdiff-0.3.0.gem
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=903ef9c3abdf2f973a79196a9c0bccb3
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2 b/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
deleted file mode 100644
index fbe5e09d32ee..000000000000
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Numerical N-dimensional Array class
-EAPI=5
-HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/masa16/narray/archive/0.6.0.8.tar.gz -> narray-0.6.0.8.tar.gz
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c3c0d23b818b713306ac51afa9b91b58
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.0.9 b/metadata/md5-cache/dev-ruby/narray-0.6.0.9
deleted file mode 100644
index 22d5605153f3..000000000000
--- a/metadata/md5-cache/dev-ruby/narray-0.6.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Numerical N-dimensional Array class
-EAPI=5
-HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/masa16/narray/archive/0.6.0.9.tar.gz -> narray-0.6.0.9.tar.gz
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f0a81f2f76e22e175f8116fc355415ee
diff --git a/metadata/md5-cache/dev-ruby/narray-0.6.1.2 b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
new file mode 100644
index 000000000000..e7f4ad2037db
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/narray-0.6.1.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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=Numerical N-dimensional Array class
+EAPI=5
+HOMEPAGE=http://www.ir.isas.ac.jp/~masa/ruby/index-e.html
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=Ruby
+RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) 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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/masa16/narray/archive/0.6.1.2.tar.gz -> narray-0.6.1.2.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c4b94db5adde34f72241da5f2f942ba7
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.4.0 b/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
new file mode 100644
index 000000000000..83885fc6bb7f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/activesupport[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/activesupport[ruby_targets_ruby22] dev-ruby/rack-test[ruby_targets_ruby22] dev-ruby/minitest[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? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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] ) )
+DESCRIPTION=A DSL for blocking & throttling abusive clients
+EAPI=5
+HOMEPAGE=https://github.com/kickstarter/rack-attack
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[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 )
+SLOT=0
+SRC_URI=mirror://rubygems/rack-attack-4.4.0.gem
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=1a0575036981a9447dd95a39ef286cda
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
new file mode 100644
index 000000000000..4d7be2531f99
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/maxitest[ruby_targets_ruby20] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby20] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.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? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[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] ) )
+DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
+EAPI=5
+HOMEPAGE=https://github.com/rtomayko/rack-cache
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[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 )
+SLOT=1.2
+SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 java-utils-2 51a42ff2f35cd75af735cd1626829b06 multilib 3972ca401cf7dbb430df9995f5d8d580 ruby-fakegem 836f858624840907bbb6ae6f2c881cb7 ruby-ng 3b6431b487e69b5070a45ea20d1c4c6c ruby-utils 2f896785ed65442d7e84ab5f5eef3bd3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=599958b29740b25d7d2728c3ee95fff7
diff --git a/metadata/md5-cache/games-fps/doom3-ducttape-0006-r1 b/metadata/md5-cache/games-fps/doom3-ducttape-0006-r1
deleted file mode 100644
index e8bcb901dd19..000000000000
--- a/metadata/md5-cache/games-fps/doom3-ducttape-0006-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Doom 3 Duct Tape - sticks flashlights to your machinegun and shotgun
-EAPI=5
-HOMEPAGE=http://ducttape.glenmurphy.com/
-IUSE=dedicated opengl dedicated opengl
-KEYWORDS=amd64 x86
-LICENSE=freedist
-RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=http://ducttape.glenmurphy.com/ducttape0006.zip
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 28fb3e5852485af1c348d446b0b98389 games 4dae170e58f773c484e07d18ef441804 games-mods 926c26c3723d1136680b3196a162ff9e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=9f8a6c91587818d79bc6342f0555fad9
diff --git a/metadata/md5-cache/games-fps/doom3-ducttape-0007 b/metadata/md5-cache/games-fps/doom3-ducttape-0007
index 5e5ecb4c106c..7e52d711ec72 100644
--- a/metadata/md5-cache/games-fps/doom3-ducttape-0007
+++ b/metadata/md5-cache/games-fps/doom3-ducttape-0007
@@ -4,11 +4,11 @@ DESCRIPTION=Doom 3 Duct Tape - sticks flashlights to your machinegun and shotgun
EAPI=5
HOMEPAGE=http://ducttape.glenmurphy.com/
IUSE=dedicated opengl dedicated opengl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=freedist
RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
RESTRICT=mirror strip
SLOT=0
SRC_URI=http://ducttape.glenmurphy.com/ducttape0007.zip
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 28fb3e5852485af1c348d446b0b98389 games 4dae170e58f773c484e07d18ef441804 games-mods 926c26c3723d1136680b3196a162ff9e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=bf23b86477ce9187ce0d0886ab6146df
+_md5_=f5901cc28cefc96424ddbe7612f6aaca
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-4.14.10-r1 b/metadata/md5-cache/kde-apps/kdepim-meta-4.14.10-r1
index 91c9039051ee..fb18d3f8c2cb 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-4.14.10-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-4.14.10-r1
@@ -5,7 +5,7 @@ HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDE_PIM
IUSE=nls aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadiconsole-4.14.10:4[aqua=] >=kde-apps/akregator-4.14.10:4[aqua=] >=kde-apps/blogilo-4.14.10:4[aqua=] >=kde-apps/calendarjanitor-4.14.10:4[aqua=] >=kde-apps/kabcclient-4.14.10:4[aqua=] >=kde-apps/kaddressbook-4.14.10:4[aqua=] >=kde-apps/kalarm-4.14.10:4[aqua=] >=kde-apps/kdepim-icons-4.14.10:4[aqua=] >=kde-apps/kdepim-kresources-4.14.10:4[aqua=] >=kde-apps/kdepim-runtime-4.14.10:4[aqua=] >=kde-apps/kjots-4.14.10:4[aqua=] >=kde-apps/kleopatra-4.14.10:4[aqua=] >=kde-apps/kmail-4.14.10:4[aqua=] >=kde-apps/knode-4.14.10:4[aqua=] >=kde-apps/knotes-4.14.10:4[aqua=] >=kde-apps/konsolekalendar-4.14.10:4[aqua=] >=kde-apps/kontact-4.14.10:4[aqua=] >=kde-apps/korganizer-4.14.10:4[aqua=] >=kde-apps/ktimetracker-4.14.10:4[aqua=] >=kde-apps/ktnef-4.14.10:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3-r1:4[aqua=] >=kde-apps/kdepim-l10n-4.14.3-r1:4[aqua=] )
+RDEPEND=>=kde-apps/akonadiconsole-4.14.10:4[aqua=] >=kde-apps/akregator-4.14.10:4[aqua=] >=kde-apps/blogilo-4.14.10:4[aqua=] >=kde-apps/calendarjanitor-4.14.10:4[aqua=] >=kde-apps/kabcclient-4.14.10:4[aqua=] >=kde-apps/kaddressbook-4.14.10:4[aqua=] >=kde-apps/kalarm-4.14.10:4[aqua=] || ( >=kde-apps/kdepim-icons-4.14.3:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) >=kde-apps/kdepim-kresources-4.14.10:4[aqua=] >=kde-apps/kdepim-runtime-4.14.10:4[aqua=] >=kde-apps/kjots-4.14.10:4[aqua=] >=kde-apps/kleopatra-4.14.10:4[aqua=] >=kde-apps/kmail-4.14.10:4[aqua=] >=kde-apps/knode-4.14.10:4[aqua=] >=kde-apps/knotes-4.14.10:4[aqua=] >=kde-apps/konsolekalendar-4.14.10:4[aqua=] >=kde-apps/kontact-4.14.10:4[aqua=] >=kde-apps/korganizer-4.14.10:4[aqua=] >=kde-apps/ktimetracker-4.14.10:4[aqua=] >=kde-apps/ktnef-4.14.10:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3-r1:4[aqua=] >=kde-apps/kdepim-l10n-4.14.3-r1:4[aqua=] )
SLOT=4
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 kde4-functions f6f7b3906630fb197969f914b1ad454a kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=704c6e95e4f70cc5b72364d00fe54dcd
+_md5_=af0baca1436ef4331d08980eaaebe1eb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-4.14.8 b/metadata/md5-cache/kde-apps/kdepim-meta-4.14.8
index e574686065fc..3430d1ff5390 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-4.14.8
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-4.14.8
@@ -5,7 +5,7 @@ HOMEPAGE=https://www.kde.org/ https://community.kde.org/KDE_PIM
IUSE=nls aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadiconsole-4.14.3:4[aqua=] >=kde-apps/akregator-4.14.3:4[aqua=] >=kde-apps/blogilo-4.14.3:4[aqua=] >=kde-apps/calendarjanitor-4.14.3:4[aqua=] >=kde-apps/kabcclient-4.14.3:4[aqua=] >=kde-apps/kaddressbook-4.14.3:4[aqua=] >=kde-apps/kalarm-4.14.3:4[aqua=] >=kde-apps/kdepim-icons-4.14.3:4[aqua=] >=kde-apps/kdepim-kresources-4.14.3:4[aqua=] >=kde-apps/kdepim-runtime-4.14.3:4[aqua=] >=kde-apps/kjots-4.14.3:4[aqua=] >=kde-apps/kleopatra-4.14.3:4[aqua=] >=kde-apps/kmail-4.14.3:4[aqua=] >=kde-apps/knode-4.14.3:4[aqua=] >=kde-apps/knotes-4.14.3:4[aqua=] >=kde-apps/konsolekalendar-4.14.3:4[aqua=] >=kde-apps/kontact-4.14.3:4[aqua=] >=kde-apps/korganizer-4.14.3:4[aqua=] >=kde-apps/ktimetracker-4.14.3:4[aqua=] >=kde-apps/ktnef-4.14.3:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.14.3:4[aqua=] )
+RDEPEND=>=kde-apps/akonadiconsole-4.14.3:4[aqua=] >=kde-apps/akregator-4.14.3:4[aqua=] >=kde-apps/blogilo-4.14.3:4[aqua=] >=kde-apps/calendarjanitor-4.14.3:4[aqua=] >=kde-apps/kabcclient-4.14.3:4[aqua=] >=kde-apps/kaddressbook-4.14.3:4[aqua=] >=kde-apps/kalarm-4.14.3:4[aqua=] || ( >=kde-apps/kdepim-icons-4.14.3:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) >=kde-apps/kdepim-kresources-4.14.3:4[aqua=] >=kde-apps/kdepim-runtime-4.14.3:4[aqua=] >=kde-apps/kjots-4.14.3:4[aqua=] >=kde-apps/kleopatra-4.14.3:4[aqua=] >=kde-apps/kmail-4.14.3:4[aqua=] >=kde-apps/knode-4.14.3:4[aqua=] >=kde-apps/knotes-4.14.3:4[aqua=] >=kde-apps/konsolekalendar-4.14.3:4[aqua=] >=kde-apps/kontact-4.14.3:4[aqua=] >=kde-apps/korganizer-4.14.3:4[aqua=] >=kde-apps/ktimetracker-4.14.3:4[aqua=] >=kde-apps/ktnef-4.14.3:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.14.3:4[aqua=] )
SLOT=4
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 kde4-functions f6f7b3906630fb197969f914b1ad454a kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e6c938e5e2c469b947842cc91d683461
+_md5_=f2382786a0d15a7867c3f329839322e4
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2015.06 b/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2015.06
index 3003eff4faf9..46e83bd946bc 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2015.06
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2015.06
@@ -5,7 +5,7 @@ HOMEPAGE=https://www.kde.org/
IUSE=nls aqua
KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/akregator-4.4.2015.06:4[aqua=] >=kde-apps/blogilo-4.4.2015.06:4[aqua=] >=kde-apps/kabcclient-4.4.2015.06:4[aqua=] >=kde-apps/kaddressbook-4.4.2015.06:4[aqua=] >=kde-apps/kalarm-4.4.2015.06:4[aqua=] >=kde-apps/kdepim-icons-4.4.2015.06:4[aqua=] >=kde-apps/kdepim-kresources-4.4.2015.06:4[aqua=] >=kde-apps/kdepim-wizards-4.4.2015.06:4[aqua=] >=kde-apps/kjots-4.4.2015.06:4[aqua=] >=kde-apps/kleopatra-4.4.2015.06:4[aqua=] >=kde-apps/kmail-4.4.2015.06:4[aqua=] >=kde-apps/knode-4.4.2015.06:4[aqua=] >=kde-apps/knotes-4.4.2015.06:4[aqua=] >=kde-apps/konsolekalendar-4.4.2015.06:4[aqua=] >=kde-apps/kontact-4.4.2015.06:4[aqua=] >=kde-apps/korganizer-4.4.2015.06:4[aqua=] >=kde-apps/ktimetracker-4.4.2015.06:4[aqua=] >=kde-apps/libkdepim-4.4.2015.06:4[aqua=] >=kde-apps/libkleo-4.4.2015.06:4[aqua=] >=kde-apps/libkpgp-4.4.2015.06:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.4.11.1-r1:4[aqua=] ) !kde-apps/kdepim-runtime
+RDEPEND=>=kde-apps/akregator-4.4.2015.06:4[aqua=] >=kde-apps/blogilo-4.4.2015.06:4[aqua=] >=kde-apps/kabcclient-4.4.2015.06:4[aqua=] >=kde-apps/kaddressbook-4.4.2015.06:4[aqua=] >=kde-apps/kalarm-4.4.2015.06:4[aqua=] || ( >=kde-apps/kdepim-icons-4.4.2015.06:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) >=kde-apps/kdepim-kresources-4.4.2015.06:4[aqua=] >=kde-apps/kdepim-wizards-4.4.2015.06:4[aqua=] >=kde-apps/kjots-4.4.2015.06:4[aqua=] >=kde-apps/kleopatra-4.4.2015.06:4[aqua=] >=kde-apps/kmail-4.4.2015.06:4[aqua=] >=kde-apps/knode-4.4.2015.06:4[aqua=] >=kde-apps/knotes-4.4.2015.06:4[aqua=] >=kde-apps/konsolekalendar-4.4.2015.06:4[aqua=] >=kde-apps/kontact-4.4.2015.06:4[aqua=] >=kde-apps/korganizer-4.4.2015.06:4[aqua=] >=kde-apps/ktimetracker-4.4.2015.06:4[aqua=] >=kde-apps/libkdepim-4.4.2015.06:4[aqua=] >=kde-apps/libkleo-4.4.2015.06:4[aqua=] >=kde-apps/libkpgp-4.4.2015.06:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.4.11.1-r1:4[aqua=] ) !kde-apps/kdepim-runtime
SLOT=4
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 kde4-functions f6f7b3906630fb197969f914b1ad454a kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5f00e3cdb663fcd5501dd99da8cf9731
+_md5_=0d407a5ff82cfcd1077e290a2fed4cdf
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2016.01 b/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2016.01
index a3387f8217da..0388b3d02788 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2016.01
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-4.4.2016.01
@@ -5,7 +5,7 @@ HOMEPAGE=https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi
IUSE=nls aqua
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/akregator-4.4.2016.01:4[aqua=] >=kde-apps/blogilo-4.4.2016.01:4[aqua=] >=kde-apps/kabcclient-4.4.2016.01:4[aqua=] >=kde-apps/kaddressbook-4.4.2016.01:4[aqua=] >=kde-apps/kalarm-4.4.2016.01:4[aqua=] >=kde-apps/kdepim-icons-4.4.2016.01:4[aqua=] >=kde-apps/kdepim-kresources-4.4.2016.01:4[aqua=] >=kde-apps/kdepim-wizards-4.4.2016.01:4[aqua=] >=kde-apps/kjots-4.4.2016.01:4[aqua=] >=kde-apps/kleopatra-4.4.2016.01:4[aqua=] >=kde-apps/kmail-4.4.2016.01:4[aqua=] >=kde-apps/knode-4.4.2016.01:4[aqua=] >=kde-apps/knotes-4.4.2016.01:4[aqua=] >=kde-apps/konsolekalendar-4.4.2016.01:4[aqua=] >=kde-apps/kontact-4.4.2016.01:4[aqua=] >=kde-apps/korganizer-4.4.2016.01:4[aqua=] >=kde-apps/ktimetracker-4.4.2016.01:4[aqua=] >=kde-apps/libkdepim-4.4.2016.01:4[aqua=] >=kde-apps/libkleo-4.4.2016.01:4[aqua=] >=kde-apps/libkpgp-4.4.2016.01:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.4.11.1-r1:4[aqua=] ) !kde-apps/kdepim-runtime
+RDEPEND=>=kde-apps/akregator-4.4.2016.01:4[aqua=] >=kde-apps/blogilo-4.4.2016.01:4[aqua=] >=kde-apps/kabcclient-4.4.2016.01:4[aqua=] >=kde-apps/kaddressbook-4.4.2016.01:4[aqua=] >=kde-apps/kalarm-4.4.2016.01:4[aqua=] || ( >=kde-apps/kdepim-icons-4.4.2016.01:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) >=kde-apps/kdepim-kresources-4.4.2016.01:4[aqua=] >=kde-apps/kdepim-wizards-4.4.2016.01:4[aqua=] >=kde-apps/kjots-4.4.2016.01:4[aqua=] >=kde-apps/kleopatra-4.4.2016.01:4[aqua=] >=kde-apps/kmail-4.4.2016.01:4[aqua=] >=kde-apps/knode-4.4.2016.01:4[aqua=] >=kde-apps/knotes-4.4.2016.01:4[aqua=] >=kde-apps/konsolekalendar-4.4.2016.01:4[aqua=] >=kde-apps/kontact-4.4.2016.01:4[aqua=] >=kde-apps/korganizer-4.4.2016.01:4[aqua=] >=kde-apps/ktimetracker-4.4.2016.01:4[aqua=] >=kde-apps/libkdepim-4.4.2016.01:4[aqua=] >=kde-apps/libkleo-4.4.2016.01:4[aqua=] >=kde-apps/libkpgp-4.4.2016.01:4[aqua=] nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] >=kde-apps/kdepim-l10n-4.4.11.1-r1:4[aqua=] ) !kde-apps/kdepim-runtime
SLOT=4
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 kde4-functions f6f7b3906630fb197969f914b1ad454a kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c344977a179ac6742c06b294abda488
+_md5_=595821f80f5723c557467486f9d7de1e
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.10 b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.10
index 6dde5f5965fc..035dffc63992 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.10
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.10
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
IUSE=debug facebook google kolab aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdepimlibs-4.14.3:4[aqua=,akonadi(+)] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi:4 ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-apps/kdepim-icons-4.14.3:4[aqua=] !kde-misc/akonadi-google !kde-base/kdepim-runtime:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdepimlibs-4.14.3:4[aqua=,akonadi(+)] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi:4 ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) || ( >=kde-apps/kdepim-icons-4.14.3:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) !kde-misc/akonadi-google !kde-base/kdepim-runtime:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/Attic/applications/15.04.3/src/kdepim-runtime-4.14.10.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde4-base d530f4b52e4c1d51837c1f96f673a215 kde4-functions f6f7b3906630fb197969f914b1ad454a multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=30c9c7787318981838c586dbaa1db430
+_md5_=273e474db0015e0925d26061ae9e7f72
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.8 b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.8
index 5ced4835b011..1b2b43552ac3 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.8
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-4.14.8
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
IUSE=debug facebook google kolab aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi:4 ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) >=kde-apps/kdepim-icons-4.14.3:4[aqua=] !kde-misc/akonadi-google !kde-base/kdepim-runtime:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=>=app-office/akonadi-server-1.12.90 dev-libs/boost:= dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdepimlibs-4.14.3:4[aqua=] x11-misc/shared-mime-info facebook? ( net-libs/libkfbapi:4 ) google? ( >=net-libs/libkgapi-2.0:4 ) kolab? ( >=net-libs/libkolab-0.5 ) || ( >=kde-apps/kdepim-icons-4.14.3:4[aqua=] >=kde-frameworks/oxygen-icons-5.19.0:5 ) !kde-misc/akonadi-google !kde-base/kdepim-runtime:4 kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/Attic/applications/15.04.1/src/kdepim-runtime-4.14.8.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde4-base d530f4b52e4c1d51837c1f96f673a215 kde4-functions f6f7b3906630fb197969f914b1ad454a multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b0da27c87f694d615cde53fb2a924e6c
+_md5_=8cbe3f00f2475329b5eb88dd898bac1d
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10
index 92d8d14094da..35486c65ba2b 100644
--- a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
DESCRIPTION=Common library for KDE PIM apps
EAPI=5
HOMEPAGE=https://www.kde.org/
IUSE=debug ldap prison test +handbook aqua
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
-RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-apps/kdepim-runtime-4.10* !=kde-apps/kdepim-runtime-4.11* !=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-apps/kdepim-runtime-4.10* !=kde-apps/kdepim-runtime-4.11* !=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/Attic/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde4-base d530f4b52e4c1d51837c1f96f673a215 kde4-functions f6f7b3906630fb197969f914b1ad454a multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9bc49a46ec680dcc03de1b4ca07ff9ce
+_md5_=d4c53592afe7326643ab013097d084a6
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.8 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.8
index d6848dbd21c8..571d44a01981 100644
--- a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.8
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.8
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
DESCRIPTION=Common library for KDE PIM apps
EAPI=5
HOMEPAGE=https://www.kde.org/
IUSE=debug ldap prison test +handbook aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
-RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-apps/kdepim-runtime-4.10* !=kde-apps/kdepim-runtime-4.11* !=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
+RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-apps/kdepim-runtime-4.10* !=kde-apps/kdepim-runtime-4.11* !=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
RESTRICT=test
SLOT=4/4.14
SRC_URI=mirror://kde/Attic/applications/15.04.1/src/kdepimlibs-4.14.8.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde4-base d530f4b52e4c1d51837c1f96f673a215 kde4-functions f6f7b3906630fb197969f914b1ad454a multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a3ed4c90ce1d11c549d3c31f5ebc6db3
+_md5_=c312bd12bfd7bfcb2ae6b0ac2b3342f5
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.17.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
index 754875aba979..757ea8981634 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.17.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=dev-libs/boost-1.54 =sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 >=kde-frameworks/extra-cmake-modules-5.17 doc? ( >=kde-frameworks/kapidox-5.17 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=dev-libs/boost-1.54 =sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 >=kde-frameworks/extra-cmake-modules-5.17 doc? ( >=kde-frameworks/kapidox-5.17 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Framework for working with KDE activities
EAPI=5
HOMEPAGE=https://www.kde.org/
IUSE=doc debug test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.17 >=kde-frameworks/kconfig-5.17 >=kde-frameworks/kconfigwidgets-5.17 >=kde-frameworks/kcoreaddons-5.17 >=kde-frameworks/kdbusaddons-5.17 >=kde-frameworks/kdeclarative-5.17 >=kde-frameworks/kglobalaccel-5.17 >=kde-frameworks/ki18n-5.17 >=kde-frameworks/kio-5.17 >=kde-frameworks/kservice-5.17 >=kde-frameworks/kwindowsystem-5.17 >=kde-frameworks/kxmlgui-5.17 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !=dev-qt/qtcore-5.4.2:5
SLOT=5/5.17
SRC_URI=mirror://kde/stable/frameworks/5.17/kactivities-5.17.0.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde5 3908a18c6f8a9afc8c1bc17ccfa86a50 kde5-functions 7b8e4ad4a10dc67f3ed2e2cca4d29e34 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=381908eb6a1c2e8c56c06d613d2f39c2
+_md5_=25611834918c084cb69ae65e61b2bbcd
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.18.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.18.0
index 702949a3fa63..0527f78504bf 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.18.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.18.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.18 >=kde-frameworks/kconfig-5.18 >=kde-frameworks/kconfigwidgets-5.18 >=kde-frameworks/kcoreaddons-5.18 >=kde-frameworks/kdbusaddons-5.18 >=kde-frameworks/kdeclarative-5.18 >=kde-frameworks/kglobalaccel-5.18 >=kde-frameworks/ki18n-5.18 >=kde-frameworks/kio-5.18 >=kde-frameworks/kservice-5.18 >=kde-frameworks/kwidgetsaddons-5.18 >=kde-frameworks/kwindowsystem-5.18 >=kde-frameworks/kxmlgui-5.18 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=dev-libs/boost-1.54 =sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 >=kde-frameworks/extra-cmake-modules-5.18 doc? ( >=kde-frameworks/kapidox-5.18 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.18 >=kde-frameworks/kconfig-5.18 >=kde-frameworks/kconfigwidgets-5.18 >=kde-frameworks/kcoreaddons-5.18 >=kde-frameworks/kdbusaddons-5.18 >=kde-frameworks/kdeclarative-5.18 >=kde-frameworks/kglobalaccel-5.18 >=kde-frameworks/ki18n-5.18 >=kde-frameworks/kio-5.18 >=kde-frameworks/kservice-5.18 >=kde-frameworks/kwidgetsaddons-5.18 >=kde-frameworks/kwindowsystem-5.18 >=kde-frameworks/kxmlgui-5.18 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=dev-libs/boost-1.54 =sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 >=kde-frameworks/extra-cmake-modules-5.18 doc? ( >=kde-frameworks/kapidox-5.18 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.2:5 ) >=dev-qt/qtcore-5.4.2:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Framework for working with KDE activities
EAPI=5
HOMEPAGE=https://www.kde.org/
IUSE=doc debug test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.18 >=kde-frameworks/kconfig-5.18 >=kde-frameworks/kconfigwidgets-5.18 >=kde-frameworks/kcoreaddons-5.18 >=kde-frameworks/kdbusaddons-5.18 >=kde-frameworks/kdeclarative-5.18 >=kde-frameworks/kglobalaccel-5.18 >=kde-frameworks/ki18n-5.18 >=kde-frameworks/kio-5.18 >=kde-frameworks/kservice-5.18 >=kde-frameworks/kwidgetsaddons-5.18 >=kde-frameworks/kwindowsystem-5.18 >=kde-frameworks/kxmlgui-5.18 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !=dev-qt/qtcore-5.4.2:5
+RDEPEND=>=kde-frameworks/kcmutils-5.18 >=kde-frameworks/kconfig-5.18 >=kde-frameworks/kconfigwidgets-5.18 >=kde-frameworks/kcoreaddons-5.18 >=kde-frameworks/kdbusaddons-5.18 >=kde-frameworks/kdeclarative-5.18 >=kde-frameworks/kglobalaccel-5.18 >=kde-frameworks/ki18n-5.18 >=kde-frameworks/kio-5.18 >=kde-frameworks/kservice-5.18 >=kde-frameworks/kwidgetsaddons-5.18 >=kde-frameworks/kwindowsystem-5.18 >=kde-frameworks/kxmlgui-5.18 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !=dev-qt/qtcore-5.4.2:5
SLOT=5/5.18
SRC_URI=mirror://kde/stable/frameworks/5.18/kactivities-5.18.0.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde5 3908a18c6f8a9afc8c1bc17ccfa86a50 kde5-functions 7b8e4ad4a10dc67f3ed2e2cca4d29e34 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f85987f11853fc439c3dd689daf055e7
+_md5_=b35db2e79d8bd82cb150f9aee383f0ab
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.4-r1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.4-r1
index a294b5ff767e..5c4c0a6cd907 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.4-r1
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.5.4-r1
@@ -7,7 +7,8 @@ IUSE=pam test debug test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcmutils-5.17.0:5 >=kde-frameworks/kconfig-5.17.0:5 >=kde-frameworks/kconfigwidgets-5.17.0:5 >=kde-frameworks/kcoreaddons-5.17.0:5 >=kde-frameworks/kcrash-5.17.0:5 >=kde-frameworks/kdeclarative-5.17.0:5 >=kde-frameworks/kdelibs4support-5.17.0:5 >=kde-frameworks/kglobalaccel-5.17.0:5 >=kde-frameworks/ki18n-5.17.0:5 >=kde-frameworks/kidletime-5.17.0:5 >=kde-frameworks/knotifications-5.17.0:5 >=kde-frameworks/kpackage-5.17.0:5 >=kde-frameworks/kwindowsystem-5.17.0:5 >=kde-frameworks/kxmlgui-5.17.0:5 >=kde-frameworks/plasma-5.17.0:5 >=kde-plasma/kwayland-5.5.4:5 dev-libs/wayland dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) >=kde-plasma/kde-cli-tools-5.5.4:5 !=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(-)] !=dev-qt/qtcore-5.5.0:5
+RESTRICT=test
SLOT=5
SRC_URI=mirror://kde/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d flag-o-matic d270fa247153df66074f795fa42dba3e gnome2-utils d19e7813f27c8f982134d657889b13cf kde5 3908a18c6f8a9afc8c1bc17ccfa86a50 kde5-functions 7b8e4ad4a10dc67f3ed2e2cca4d29e34 multilib 3972ca401cf7dbb430df9995f5d8d580 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=94618111a43ed5fdc66bf7b721264d79
+_md5_=f60499c661143e5261160c8e9cf51df8
diff --git a/metadata/md5-cache/media-libs/freetype-2.6.1-r1 b/metadata/md5-cache/media-libs/freetype-2.6.3
similarity index 77%
rename from metadata/md5-cache/media-libs/freetype-2.6.1-r1
rename to metadata/md5-cache/media-libs/freetype-2.6.3
index 1b3b891b46ce..8d0c42380502 100644
--- a/metadata/md5-cache/media-libs/freetype-2.6.1-r1
+++ b/metadata/md5-cache/media-libs/freetype-2.6.3
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,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(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[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(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[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(-)?] >=x11-libs/libXdmcp-1.1.1-r1[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(-)?] ) ) virtual/pkgconfig
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,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(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[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(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[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(-)?] >=x11-libs/libXdmcp-1.1.1-r1[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(-)?] ) ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A high-quality and portable font engine
-EAPI=5
+EAPI=6
HOMEPAGE=http://www.freetype.org/
IUSE=X +adobe-cff bindist bzip2 debug doc fontforge harfbuzz infinality png static-libs utils 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
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
@@ -10,6 +10,6 @@ PDEPEND=infinality? ( media-libs/fontconfig-infinality )
RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,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(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[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(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[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(-)?] >=x11-libs/libXdmcp-1.1.1-r1[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(-)?] ) ) abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )
RESTRICT=!bindist? ( bindist )
SLOT=2
-SRC_URI=mirror://sourceforge/freetype/freetype-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-2.6.1.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.1.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.1.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.1.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.1.tar.bz2 ) infinality? ( https://dev.gentoo.org/~polynomial-c/03-infinality-2.6-2015.10.04.patch.xz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=9ca6fe2a7e0e0ca595c52791e205db81
+SRC_URI=mirror://sourceforge/freetype/freetype-2.6.3.tar.bz2 mirror://nongnu/freetype/freetype-2.6.3.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.3.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.3.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.3.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.3.tar.bz2 ) infinality? ( https://dev.gentoo.org/~polynomial-c/03-infinality-2.6.3-2015.11.28.patch.xz )
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=8512f252ec8ce3dd145be8c5c1219a0e
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.3 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1
similarity index 78%
rename from metadata/md5-cache/media-sound/ncmpcpp-0.7.3
rename to metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1
index cbb7b2bd647d..81e57dc81e93 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.3
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare
-DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 ) virtual/pkgconfig
+DEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= ) virtual/pkgconfig
DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
EAPI=5
HOMEPAGE=http://ncmpcpp.rybczak.net/
IUSE=clock curl outputs taglib unicode visualizer
KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
-RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] ) visualizer? ( sci-libs/fftw:3.0 )
+RDEPEND=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= )
SLOT=0
SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.3.tar.bz2
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=634dde345e9c82f7a5187a4e8234cc8b
+_md5_=d534a473683a559e49433d78b12932db
diff --git a/metadata/md5-cache/media-video/movit-1.3.0 b/metadata/md5-cache/media-video/movit-1.3.0
new file mode 100644
index 000000000000..9e04495b34b5
--- /dev/null
+++ b/metadata/md5-cache/media-video/movit-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile test
+DEPEND=media-libs/mesa >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
+DESCRIPTION=Modern Video Toolkit
+EAPI=5
+HOMEPAGE=http://movit.sesse.net/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/mesa >=dev-cpp/eigen-3.2.0:3 media-libs/libepoxy sci-libs/fftw media-libs/libsdl2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://movit.sesse.net/movit-1.3.0.tar.gz https://googletest.googlecode.com/files/gtest-1.7.0.zip
+_md5_=22fa3897d57d355e5af34854391b9851
diff --git a/metadata/md5-cache/net-analyzer/2ping-3.2.0 b/metadata/md5-cache/net-analyzer/2ping-3.2.0
new file mode 100644
index 000000000000..f64a9d7d5bb8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/2ping-3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A bi-directional ping utility
+EAPI=5
+HOMEPAGE=http://www.finnie.org/software/2ping/
+IUSE=server python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.finnie.org/software/2ping/2ping-3.2.0.tar.gz
+_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=eaebd5094d8b4057b146afc4050607a0
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.14.0 b/metadata/md5-cache/net-ftp/filezilla-3.14.0
deleted file mode 100644
index f0295824e96c..000000000000
--- a/metadata/md5-cache/net-ftp/filezilla-3.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare pretend
-DEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 net-dns/libidn >=net-libs/gnutls-3.1.12 aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] ) !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils ) dbus? ( sys-apps/dbus ) virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=FTP client with lots of useful features and an intuitive interface
-EAPI=5
-HOMEPAGE=http://filezilla-project.org/
-IUSE=aqua dbus nls test
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 net-dns/libidn >=net-libs/gnutls-3.1.12 aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] ) !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils ) dbus? ( sys-apps/dbus )
-SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.14.0_src.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 wxwidgets cf6a488b00cd81e258206bc14b4167d9
-_md5_=6c4213b3719a053f8971b8e355edca9e
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.15.0 b/metadata/md5-cache/net-ftp/filezilla-3.15.0.2
similarity index 94%
rename from metadata/md5-cache/net-ftp/filezilla-3.15.0
rename to metadata/md5-cache/net-ftp/filezilla-3.15.0.2
index f6a0a35221b1..79700f50d6ae 100644
--- a/metadata/md5-cache/net-ftp/filezilla-3.15.0
+++ b/metadata/md5-cache/net-ftp/filezilla-3.15.0.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=app-eselect/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.3.0 >=dev-libs/pugixml-1.7 net-dns/libidn >=net-libs/gnutls-3.1.12 >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
SLOT=0
-SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.15.0_src.tar.bz2
+SRC_URI=mirror://sourceforge/filezilla/FileZilla_3.15.0.2_src.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 wxwidgets cf6a488b00cd81e258206bc14b4167d9
_md5_=563388fb85bda050a13b423edbd5043e
diff --git a/metadata/md5-cache/net-irc/quassel-0.12.2-r3 b/metadata/md5-cache/net-irc/quassel-0.12.2-r3
index b473bebd6fb7..2a6b1cbf642e 100644
--- a/metadata/md5-cache/net-irc/quassel-0.12.2-r3
+++ b/metadata/md5-cache/net-irc/quassel-0.12.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity
EAPI=5
HOMEPAGE=http://quassel-irc.org/
IUSE=ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris
+KEYWORDS=amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris
LICENSE=GPL-3
RDEPEND=sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl?] ) !qt5? ( dev-qt/qtcore:4[ssl?] ) monolithic? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[openssl,qt5] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[openssl,qt4(+)] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5] ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)] dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 kde-frameworks/oxygen-icons ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) ) !monolithic? ( server? ( qt5? ( dev-qt/qtscript:5 crypt? ( app-crypt/qca:2[openssl,qt5] ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) !qt5? ( dev-qt/qtscript:4 crypt? ( app-crypt/qca:2[openssl,qt4(+)] ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) ) syslog? ( virtual/logger ) ) X? ( qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5] dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/sonnet:5 ) phonon? ( media-libs/phonon[qt5] ) webkit? ( dev-qt/qtwebkit:5 ) ) !qt5? ( dev-qt/qtgui:4 ayatana? ( dev-libs/libindicate-qt ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4(+)] dev-qt/qtdbus:4 kde? ( kde-base/kdelibs:4 kde-frameworks/oxygen-icons ayatana? ( kde-misc/plasma-widget-message-indicator ) ) ) phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) webkit? ( dev-qt/qtwebkit:4 ) ) ) )
REQUIRED_USE=|| ( X server monolithic ) ayatana? ( || ( X monolithic ) ) crypt? ( || ( server monolithic ) ) dbus? ( || ( X monolithic ) ) kde? ( || ( X monolithic ) phonon ) phonon? ( || ( X monolithic ) ) postgres? ( || ( server monolithic ) ) qt5? ( !ayatana ) syslog? ( || ( server monolithic ) ) webkit? ( || ( X monolithic ) )
SLOT=0
SRC_URI=http://quassel-irc.org/pub/quassel-0.12.2.tar.bz2
_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0922473b35100185aa49672c7a611c56
+_md5_=1e0ea13a6ce707e394fba04a09882e81
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.15.0 b/metadata/md5-cache/net-libs/libiscsi-1.15.0
new file mode 100644
index 000000000000..c8db541d4eee
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libiscsi-1.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0= !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=iscsi client library and utilities
+EAPI=6
+HOMEPAGE=https://github.com/sahlberg/libiscsi
+IUSE=static-libs
+KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/libgcrypt:0=
+SLOT=0
+SRC_URI=https://github.com/sahlberg/libiscsi/archive/1.15.0.tar.gz -> libiscsi-1.15.0.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=a85b36278030dca3bfdd8c62a35aaf22
diff --git a/metadata/md5-cache/net-libs/libiscsi-1.9.0 b/metadata/md5-cache/net-libs/libiscsi-1.9.0
deleted file mode 100644
index 9f8880ad16d1..000000000000
--- a/metadata/md5-cache/net-libs/libiscsi-1.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=iscsi client library and utilities
-EAPI=5
-HOMEPAGE=https://github.com/sahlberg/libiscsi
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-SLOT=0
-SRC_URI=https://github.com/sahlberg/libiscsi/archive/1.9.0.tar.gz -> libiscsi-1.9.0.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=d5518d8d0f531ae6158986826ed3c998
diff --git a/metadata/md5-cache/net-libs/libiscsi-9999 b/metadata/md5-cache/net-libs/libiscsi-9999
index 39b0cdeda659..527582846c8d 100644
--- a/metadata/md5-cache/net-libs/libiscsi-9999
+++ b/metadata/md5-cache/net-libs/libiscsi-9999
@@ -1,9 +1,11 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-libs/libgcrypt:0= !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
DESCRIPTION=iscsi client library and utilities
-EAPI=5
+EAPI=6
HOMEPAGE=https://github.com/sahlberg/libiscsi
+IUSE=static-libs
LICENSE=GPL-2 LGPL-2
+RDEPEND=dev-libs/libgcrypt:0=
SLOT=0
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 28fb3e5852485af1c348d446b0b98389 git-2 df00117322129fb906bb0a53c3d6a020 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=9be663c0486f50958286af9d187fad10
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 git-r3 ef66dfc3db09f327af21cf32f140fb2b libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=54bbea3295eb043be3a128909153f239
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.42 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.42
deleted file mode 100644
index a614d7a939f5..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( >=net-misc/curl-7.25.0-r1[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.42.tar.gz
-_md5_=4d3b609325de82a85441e46977bc699b
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.45-r1 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.45-r1
deleted file mode 100644
index cefe3f0be746..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.45-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/11
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.45.tar.gz
-_md5_=a471433dabd8cdd816a4873ee69cb9bf
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.46 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.46
deleted file mode 100644
index 5ac8c7612531..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.46
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.46.tar.gz
-_md5_=d15ed82c420e91a426d7e40e80242847
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47
index 56c944e9e9f1..2172b31867ff 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.47
@@ -4,9 +4,9 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
EAPI=5
HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
LICENSE=LGPL-2.1
RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
SLOT=0/12
SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.47.tar.gz
-_md5_=066c2445a8493cf491711e21671f6224
+_md5_=b67db21591e3d5663e6c06f1cd878c58
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.7.1 b/metadata/md5-cache/net-libs/nghttp2-1.7.1
new file mode 100644
index 000000000000..1e227a8bb7e5
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nghttp2-1.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] ) libressl? ( dev-libs/libressl ) >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7:2 ) virtual/pkgconfig test? ( >=dev-util/cunit-2.1[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(-)?] )
+DESCRIPTION=HTTP/2 C Library
+EAPI=5
+HOMEPAGE=https://nghttp2.org/
+IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=cxx? ( dev-libs/boost:=[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] ) libressl? ( dev-libs/libressl ) >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7:2 )
+SLOT=0/1.14
+SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.7.1/nghttp2-1.7.1.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=fd5481bc5ab279156f2094235d553060
diff --git a/metadata/md5-cache/net-libs/nodejs-5.5.0 b/metadata/md5-cache/net-libs/nodejs-5.5.0
deleted file mode 100644
index 59af4441eee9..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-5.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) >=dev-lang/python-2.7.5-r2:2.7[threads] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.6:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2e:0=[-bindist] sys-libs/zlib !!net-libs/iojs test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=5
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) >=dev-lang/python-2.7.5-r2:2.7[threads] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-libs/http-parser-2.6:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2e:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v5.5.0/node-v5.5.0.tar.xz
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=7c26fb79b194ec1f837c31271c012a9b
diff --git a/metadata/md5-cache/net-libs/nodejs-5.6.0-r1 b/metadata/md5-cache/net-libs/nodejs-5.6.0-r1
new file mode 100644
index 000000000000..c2317fa17652
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-5.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.1:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] !!net-libs/iojs test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.1:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2f:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v5.6.0/node-v5.6.0.tar.xz
+_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=e1fc44caac7e5e32d91310a3e3c9e111
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.21-r2 b/metadata/md5-cache/net-mail/dovecot-2.2.21-r2
new file mode 100644
index 000000000000..80ef923e6476
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.21-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= ssl? ( dev-libs/openssl ) virtual/pkgconfig
+DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
+EAPI=5
+HOMEPAGE=http://www.dovecot.org/
+IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86
+LICENSE=LGPL-2.1 MIT
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
+SLOT=0
+SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.21.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.12.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.12.tar.gz )
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 ssl-cert e90a74de57c48ea6c058b1cb3a735907 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=08dcf968ac062e21a9b1a6407fc491e4
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.2.20141204 b/metadata/md5-cache/net-misc/minissdpd-1.2.20141204
deleted file mode 100644
index 5f6240d01818..000000000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.2.20141204
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=MiniSSDP Daemon
-EAPI=5
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/net-tools-1.60_p20120127084908[-old-output] || ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.2.20141204.tar.gz
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=7a446b470873cfd8b755f42f54b8bb0c
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.3 b/metadata/md5-cache/net-misc/minissdpd-1.3
deleted file mode 100644
index f8fdd5db3b15..000000000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=MiniSSDP Daemon
-EAPI=5
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=sys-apps/net-tools-1.60_p20120127084908[-old-output] || ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.3.tar.gz
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=7a446b470873cfd8b755f42f54b8bb0c
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.3-r1 b/metadata/md5-cache/net-misc/minissdpd-1.3-r1
deleted file mode 100644
index 0c7b3b668b7d..000000000000
--- a/metadata/md5-cache/net-misc/minissdpd-1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=MiniSSDP Daemon
-EAPI=5
-HOMEPAGE=http://miniupnp.free.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( net-misc/miniupnpd net-libs/miniupnpc )
-SLOT=0
-SRC_URI=http://miniupnp.free.fr/files/minissdpd-1.3.tar.gz
-_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=a9ce6b1a86b37ba32ad509b6584370b5
diff --git a/metadata/md5-cache/net-misc/owncloud-client-2.1.1 b/metadata/md5-cache/net-misc/owncloud-client-2.1.1
new file mode 100644
index 000000000000..df7c8605529c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 sys-fs/inotify-tools virtual/libiconv dolphin? ( >=kde-frameworks/kcoreaddons-5.16:5 >=kde-frameworks/kio-5.16:5 ) nautilus? ( dev-python/nautilus-python ) qt4? ( dev-libs/qtkeychain[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 net-libs/neon[ssl] ) qt5? ( dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 >=dev-qt/qtnetwork-5.4:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5[printsupport] ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-util/cmocka qt4? ( dev-qt/qttest:4 ) qt5? ( dev-qt/qttest:5 ) ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=6
+HOMEPAGE=http://owncloud.org/
+IUSE=doc dolphin nautilus samba +sftp test qt4 +qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 sys-fs/inotify-tools virtual/libiconv dolphin? ( >=kde-frameworks/kcoreaddons-5.16:5 >=kde-frameworks/kio-5.16:5 ) nautilus? ( dev-python/nautilus-python ) qt4? ( dev-libs/qtkeychain[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 net-libs/neon[ssl] ) qt5? ( dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 >=dev-qt/qtnetwork-5.4:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5[printsupport] ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync
+REQUIRED_USE=^^ ( qt4 qt5 )
+SLOT=0
+SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.1.1.tar.xz
+_eclasses_=cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7f83c70646db75b5a82073a0ee64156c
diff --git a/metadata/md5-cache/net-wireless/airtraf-1.1-r3 b/metadata/md5-cache/net-wireless/airtraf-1.1-r3
index 07ea3585aad0..927179c52dbc 100644
--- a/metadata/md5-cache/net-wireless/airtraf-1.1-r3
+++ b/metadata/md5-cache/net-wireless/airtraf-1.1-r3
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap sys-libs/ncurses virtual/pkgconfig
+DEPEND=net-libs/libpcap sys-libs/ncurses:= virtual/pkgconfig
DESCRIPTION=AirTraf 802.11b Wireless traffic sniffer
EAPI=5
HOMEPAGE=http://www.elixar.com/
KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
-RDEPEND=net-libs/libpcap sys-libs/ncurses
+RDEPEND=net-libs/libpcap sys-libs/ncurses:=
SLOT=0
SRC_URI=http://www.elixar.com/airtraf-1.1.tar.gz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=a39b727090fcb336ee8df7c03f0bb73a
+_md5_=3bdeb35c272c58740282e0f80f87c7f8
diff --git a/metadata/md5-cache/ros-meta/mavros-0.17.0 b/metadata/md5-cache/ros-meta/mavros-0.17.0
new file mode 100644
index 000000000000..fe26c658207a
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/mavros-0.17.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras dev-ros/mavros_msgs
+DESCRIPTION=Metapackage for mavros packages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros
+KEYWORDS=~amd64 ~arm
+LICENSE=metapackage
+RDEPEND=dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras dev-ros/mavros_msgs
+SLOT=0
+_md5_=44d23b157b834e0682da8b7a7c29df05
diff --git a/metadata/md5-cache/sci-chemistry/molden-4.8-r2 b/metadata/md5-cache/sci-chemistry/molden-4.8-r2
index 9f7320c34d3c..2f2fdda2f087 100644
--- a/metadata/md5-cache/sci-chemistry/molden-4.8-r2
+++ b/metadata/md5-cache/sci-chemistry/molden-4.8-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
DEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) x11-misc/gccmakedep app-editors/vim virtual/fortran
DESCRIPTION=Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac
EAPI=4
-HOMEPAGE=http://www.cmbi.kun.nl/~schaft/molden/molden.html
+HOMEPAGE=http://www.cmbi.ru.nl/molden/
IUSE=opengl
KEYWORDS=amd64 x86
LICENSE=MOLDEN
RDEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) virtual/fortran
SLOT=0
-SRC_URI=ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/molden4.8.tar.gz
+SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden4.8.tar.gz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e fortran-2 49cf4293404403fe100eafdd9b84c940 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=16668c3f3146d7c45c431034a150a914
+_md5_=a7a3a85e8ef77c1746f6e2146a0799de
diff --git a/metadata/md5-cache/sci-chemistry/molden-5.0 b/metadata/md5-cache/sci-chemistry/molden-5.0
index 7152fbdadf01..59351d08e3de 100644
--- a/metadata/md5-cache/sci-chemistry/molden-5.0
+++ b/metadata/md5-cache/sci-chemistry/molden-5.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
DEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) x11-misc/gccmakedep app-editors/vim virtual/fortran
DESCRIPTION=Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac
EAPI=4
-HOMEPAGE=http://www.cmbi.kun.nl/~schaft/molden/molden.html
+HOMEPAGE=http://www.cmbi.ru.nl/molden/
IUSE=opengl
KEYWORDS=~amd64 ~x86
LICENSE=MOLDEN
RDEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) virtual/fortran
SLOT=0
-SRC_URI=ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/molden5.0.tar.gz
+SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden5.0.tar.gz
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e fortran-2 49cf4293404403fe100eafdd9b84c940 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=8948e456115e0dc3c42fd9b41aa6d050
+_md5_=3ceacea7913d22a8bbf87711867303f9
diff --git a/metadata/md5-cache/sci-chemistry/molden-5.5 b/metadata/md5-cache/sci-chemistry/molden-5.5
new file mode 100644
index 000000000000..40a71300f160
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/molden-5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) x11-misc/gccmakedep app-editors/vim virtual/fortran
+DESCRIPTION=Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac
+EAPI=6
+HOMEPAGE=http://www.cmbi.ru.nl/molden/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=MOLDEN
+RDEPEND=x11-libs/libXmu virtual/glu opengl? ( media-libs/freeglut virtual/opengl ) virtual/fortran
+SLOT=0
+SRC_URI=ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden5.5.tar.gz
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e fortran-2 49cf4293404403fe100eafdd9b84c940 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=c804fde8cb26546f8ed63426d46fa7c2
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
index 2bfea054b023..eaa024e4c790 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mlton doc? ( virtual/latex-base ) emacs? ( virtual/emacs )
+DEPEND=dev-lang/mlton doc? ( virtual/latex-base app-text/texi2html ) emacs? ( virtual/emacs )
DESCRIPTION=Implementation of the logical framework LF
EAPI=5
HOMEPAGE=http://twelf.org/
IUSE=doc emacs examples
KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
-RDEPEND=dev-lang/mlton doc? ( virtual/latex-base ) emacs? ( virtual/emacs )
+RDEPEND=dev-lang/mlton doc? ( virtual/latex-base app-text/texi2html ) emacs? ( virtual/emacs )
RESTRICT=test
SLOT=0/1.7.1
SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
_eclasses_=elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 28fb3e5852485af1c348d446b0b98389 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=61a54c437c02e73e2e458425d889ffd8
+_md5_=b79f1f8441f5d4ee121d01ae96426f61
diff --git a/metadata/md5-cache/sci-visualization/yt-3.2 b/metadata/md5-cache/sci-visualization/yt-3.2
deleted file mode 100644
index 3ee57be27ce1..000000000000
--- a/metadata/md5-cache/sci-visualization/yt-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0= sci-libs/hdf5:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cython-0.22[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/setuptools-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( media-libs/libpng:0= sci-libs/hdf5:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ipython[notebook,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Astrophysical Simulation Analysis and Vizualization package
-EAPI=5
-HOMEPAGE=http://yt-project.org/
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=media-libs/libpng:0= sci-libs/hdf5:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ipython[notebook,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yt/yt-3.2.tar.gz
-_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=5205e1445464a6843f1e9e7ca63dc53e
diff --git a/metadata/md5-cache/sci-visualization/yt-3.2.1 b/metadata/md5-cache/sci-visualization/yt-3.2.3
similarity index 97%
rename from metadata/md5-cache/sci-visualization/yt-3.2.1
rename to metadata/md5-cache/sci-visualization/yt-3.2.3
index c70fc4b17236..33d27d120958 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.2.1
+++ b/metadata/md5-cache/sci-visualization/yt-3.2.3
@@ -9,6 +9,6 @@ LICENSE=BSD
RDEPEND=media-libs/libpng:0= sci-libs/hdf5:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/ipython[notebook,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
SLOT=0
-SRC_URI=mirror://pypi/y/yt/yt-3.2.1.tar.gz
+SRC_URI=mirror://pypi/y/yt/yt-3.2.3.tar.gz
_eclasses_=distutils-r1 4e8ac1ba76ddacd8f7c0289aa586a34c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=67ef7ac5502249219d0fd8d5fb00045c
+_md5_=b099cf3b6df578d011b412a1c6da077d
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.2 b/metadata/md5-cache/sys-devel/llvm-3.5.2
index c369d51b069c..c92a12d63a33 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.3 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.3 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( py
SLOT=0/3.5
SRC_URI=http://llvm.org/releases/3.5.2/llvm-3.5.2.src.tar.xz clang? ( http://llvm.org/releases/3.5.2/compiler-rt-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/cfe-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/clang-tools-extra-3.5.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb prefix e7f2b9c6e57342e5d25eac22fce23062 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=268cf65de7cdeac6af24252f13a96d5f
+_md5_=461e71080015ba4e44d3ed1a37418b21
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.2 b/metadata/md5-cache/sys-devel/llvm-3.6.2
index 0cbd5dc95d98..32c9133816dd 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.2
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= dev-ml/findlib dev-ml/ocaml-ctypes ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) !!=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
+DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( dev-lang/ocaml:0= dev-ml/findlib dev-ml/ocaml-ctypes ) app-arch/xz-utils dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 ) test? ( || ( py
SLOT=0/3.6
SRC_URI=http://llvm.org/releases/3.6.2/llvm-3.6.2.src.tar.xz clang? ( http://llvm.org/releases/3.6.2/compiler-rt-3.6.2.src.tar.xz http://llvm.org/releases/3.6.2/cfe-3.6.2.src.tar.xz http://llvm.org/releases/3.6.2/clang-tools-extra-3.6.2.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.1-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb prefix e7f2b9c6e57342e5d25eac22fce23062 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=3b6bd62d0019572dd134e70f9b41f0c8
+_md5_=6d818c18888276f0dac1c927b21d96fa
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1 b/metadata/md5-cache/sys-devel/llvm-3.7.1
index 76f272e1dbfa..0f2427838305 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
SLOT=0/3.7.1
SRC_URI=http://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( http://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz http://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee743028d784e557c4926d9939d45ef2
+_md5_=cf8fdfe47bf971f2fd87761a26a474fd
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.0_rc1 b/metadata/md5-cache/sys-devel/llvm-3.8.0_rc1
index 9e4e4098b551..4ff303a6ac54 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.0_rc1
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.0_rc1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( python? ( >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
+DEPEND=sys-libs/zlib:0= clang? ( python? ( >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2: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(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -12,4 +12,4 @@ REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
SLOT=0/3.8.0_rc1
SRC_URI=http://llvm.org/pre-releases/3.8.0/rc1/llvm-3.8.0rc1.src.tar.xz clang? ( http://llvm.org/pre-releases/3.8.0/rc1/compiler-rt-3.8.0rc1.src.tar.xz http://llvm.org/pre-releases/3.8.0/rc1/cfe-3.8.0rc1.src.tar.xz http://llvm.org/pre-releases/3.8.0/rc1/clang-tools-extra-3.8.0rc1.src.tar.xz ) lldb? ( http://llvm.org/pre-releases/3.8.0/rc1/lldb-3.8.0rc1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb prefix e7f2b9c6e57342e5d25eac22fce23062 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=32997603e7760c85aaf3ddf70e7eaaf3
+_md5_=86559222de13ce541161936047cad5ce
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 84704b178148..9ef5b5ce6fc6 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=sys-libs/zlib:0= clang? ( static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( sys-libs/libcxx ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) lldb? ( dev-lang/swig ) !!=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/zlib:0= clang? ( static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2: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(-)?] ) >=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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) kernel_Darwin? ( =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_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
DESCRIPTION=Low Level Virtual Machine
EAPI=5
HOMEPAGE=http://llvm.org/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:0= clang? ( static-analyzer? ( dev-lang/perl:* ) xml? ( de
REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
SLOT=0/9999
_eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils c67ce9708a9c02be2d296cf547740e9c eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e git-r3 ef66dfc3db09f327af21cf32f140fb2b multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5de850fe3c0effbafaeb098357cc98c6
+_md5_=3800de343e353fad6bc21a18a67fe867
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_pre-r20160209 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_pre-r20160209
new file mode 100644
index 000000000000..66eb4bca3ceb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_pre-r20160209
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Raspberry PI precompiled kernel and modules
+EAPI=5
+HOMEPAGE=https://github.com/raspberrypi/firmware
+KEYWORDS=~arm -*
+LICENSE=GPL-2
+RESTRICT=binchecks mirror strip
+SLOT=4.1.17_pre-r20160209
+SRC_URI=https://dev.gentoo.org/~xmw/raspberrypi-image/raspberrypi-image-4.1.17_pre-r20160209.tar.xz
+_md5_=2c86f2776c1c7148825998227fe51c33
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-image-4.4.1_pre-r20160209 b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.4.1_pre-r20160209
new file mode 100644
index 000000000000..841c3504fd82
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-image-4.4.1_pre-r20160209
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Raspberry PI precompiled kernel and modules
+EAPI=5
+HOMEPAGE=https://github.com/raspberrypi/firmware
+KEYWORDS=~arm -*
+LICENSE=GPL-2
+RESTRICT=binchecks mirror strip
+SLOT=4.4.1_pre-r20160209
+SRC_URI=https://dev.gentoo.org/~xmw/raspberrypi-image/raspberrypi-image-4.4.1_pre-r20160209.tar.xz
+_md5_=2c86f2776c1c7148825998227fe51c33
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
similarity index 98%
rename from metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
rename to metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
index 55d61e838a71..65e0b63ba421 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-4.4.9999
@@ -7,6 +7,6 @@ IUSE=symlink build
LICENSE=GPL-2 freedist
RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
RESTRICT=binchecks strip
-SLOT=3.19.9999
+SLOT=4.4.9999
_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 git-2 df00117322129fb906bb0a53c3d6a020 kernel-2 f745fe70cd0e35af07412905687b9a7f multilib 3972ca401cf7dbb430df9995f5d8d580 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 2e6826f6a93ad2acf904eecf5b5fb6d2 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=f025fdebb7d3ac0cc0a1bd1a865f6c9b
diff --git a/metadata/md5-cache/sys-process/htop-2.0.0 b/metadata/md5-cache/sys-process/htop-2.0.0
new file mode 100644
index 000000000000..a80227ce4c29
--- /dev/null
+++ b/metadata/md5-cache/sys-process/htop-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-libs/ncurses:0=[unicode?] virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=interactive process viewer
+EAPI=6
+HOMEPAGE=http://hisham.hm/htop/
+IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+RDEPEND=sys-libs/ncurses:0=[unicode?]
+SLOT=0
+SRC_URI=http://hisham.hm/htop/releases/2.0.0/htop-2.0.0.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b7744b7b42e27f416dbdd882d9cf0f4e
diff --git a/metadata/md5-cache/www-apache/mod_nss-1.0.11 b/metadata/md5-cache/www-apache/mod_nss-1.0.12
similarity index 89%
rename from metadata/md5-cache/www-apache/mod_nss-1.0.11
rename to metadata/md5-cache/www-apache/mod_nss-1.0.12
index 39e4df1ce296..a89ff005b704 100644
--- a/metadata/md5-cache/www-apache/mod_nss-1.0.11
+++ b/metadata/md5-cache/www-apache/mod_nss-1.0.12
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 net-dns/bind-tools =www-servers/apache-2*
SLOT=0
-SRC_URI=https://fedorahosted.org/released/mod_nss/mod_nss-1.0.11.tar.gz
+SRC_URI=https://fedorahosted.org/released/mod_nss/mod_nss-1.0.12.tar.gz
_eclasses_=apache-module 5e66430013d92dfe0bf8672b05319b6d autotools 07e71b3b5690738ef7e8bc097077e00c depend.apache e3c541cb90838388f81620d630c28f41 eutils 28fb3e5852485af1c348d446b0b98389 libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=fee556fd1c388a752c716947564491b8
+_md5_=5398901f475ef7c2ab115715ebd94e71
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.39_p1 b/metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.47_p1
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.39_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.47_p1
index d90c0288763b..1d2d59d9e52a 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.39_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-49.0.2623.47_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_49.0.2623.39-1_amd64.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_49.0.2623.47-1_amd64.deb )
_eclasses_=chromium e6257bd55bfdac1269e99d4d7ed21cda eutils 28fb3e5852485af1c348d446b0b98389 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils d19e7813f27c8f982134d657889b13cf linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils ecf634cba91bb9591a8fdb6f6145f1bb readme.gentoo df3fc8fdaf5a519e7d48c83e7592c95f toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
_md5_=1bd8c79692509c5c5618bfc80f321297
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.39_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.47_beta1
similarity index 90%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.39_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.47_beta1
index fa47523b01c3..5f98d203a11d 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.39_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-49.0.2623.47_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
RESTRICT=bindist mirror strip
SLOT=beta
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_49.0.2623.39-1_amd64.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_49.0.2623.47-1_amd64.deb )
_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813
_md5_=eb55e69184ed4426ca4e25ad51eeabad
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-361.28-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-361.28-r1
new file mode 100644
index 000000000000..7ac3cf08740a
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-361.28-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm +X kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror strip
+SLOT=0/361
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/361.28/NVIDIA-FreeBSD-x86_64-361.28.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/361.28/NVIDIA-Linux-x86_64-361.28.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/361.28/NVIDIA-FreeBSD-x86-361.28.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/361.28/NVIDIA-Linux-x86-361.28.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-361.28.tar.bz2 )
+_eclasses_=eutils 28fb3e5852485af1c348d446b0b98389 flag-o-matic d270fa247153df66074f795fa42dba3e linux-info fd1e29abbb02cbc49f1a14299846e9c4 linux-mod 4755518412586c2fd655ff6e55780bcb multilib 3972ca401cf7dbb430df9995f5d8d580 nvidia-driver fe3e559a49de32cd7df5ae282f98d107 portability 3a50b3ec310b86914f98babecc8f89c6 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 73058269b3e70e34e084fa3981282338 unpacker 1d149d9bda7723e740cfd28118f27813 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9302611106cd2517f909b6126289e4f3
diff --git a/metadata/md5-cache/x11-plugins/wmget-0.6.1 b/metadata/md5-cache/x11-plugins/wmget-0.6.1
new file mode 100644
index 000000000000..0275d8b1a3bb
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmget-0.6.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm >=net-misc/curl-7.9.7 x11-proto/xproto !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=a libcurl based dockapp for automated downloads
+EAPI=6
+HOMEPAGE=http://windowmaker.org/dockapps/?name=wmget
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm >=net-misc/curl-7.9.7
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmget-0.6.1.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=1977d6db93e5cefc7a52f2531e64767a
diff --git a/metadata/md5-cache/x11-plugins/wmtop-0.85 b/metadata/md5-cache/x11-plugins/wmtop-0.85
new file mode 100644
index 000000000000..aeec70c8a7ca
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmtop-0.85
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXpm x11-libs/libXext x11-proto/xproto !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=dockapp for monitoring the top three processes using cpu or memory
+EAPI=6
+HOMEPAGE=http://windowmaker.org/dockapps/?name=wmtop
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmtop-0.85.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c libtool b75230758539a7da029e24afdb693960 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=dddb0e3689a5c3fb287fabe3c74fb0d8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ce1f7241e14a..ea718624c23a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Feb 2016 06:08:22 +0000
+Fri, 12 Feb 2016 07:08:18 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 743ec1a7a44b..904e0a7910b9 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1320,17 +1320,6 @@
GLEP Editor
-
- gmn@gentoo.org
- Gentoo Monthly Newsletter
- https://wiki.gentoo.org/wiki/Project:GMN
- The Gentoo Monthly Newsletter (GMN) was intended to give anyone interested in Gentoo a single source of information about the latest happenings in the Gentoo world.
-
- maffblaster@gentoo.org
- Matthew Marchese
- Host
-
-
gnome@gentoo.org
Gentoo GNOME Desktop
@@ -2368,6 +2357,17 @@
Developer
+
+ gmn@gentoo.org
+ Gentoo Monthly Newsletter
+ https://wiki.gentoo.org/wiki/Project:News
+ Presenting news as it develops, the Gentoo News (GN) project is intended to give anyone interested in Gentoo a single-location for information on changes in the Gentoo universe.
+
+ maffblaster@gentoo.org
+ Matthew Marchese
+ Host
+
+
office@gentoo.org
Gentoo Office project
@@ -2955,11 +2955,6 @@
Jason Zaman
Member
-
- qnikst@gentoo.org
- Alexander Vershilov
- Member
-
tamiko@gentoo.org
Matthias Maier
@@ -3957,6 +3952,11 @@
Mike Gilbert
Lead
+
+ maffblaster@gentoo.org
+ Matthew Marchese
+ Member
+
mgorny@gentoo.org
Michał Górny
diff --git a/metadata/timestamp b/metadata/timestamp
index 3d919c574b76..b2c1b5395181 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Feb 11 06:07:32 UTC 2016
+Fri Feb 12 07:07:28 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 51f05f9b2833..e99fe0ece289 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 11 Feb 2016 06:30:01 +0000
+Fri, 12 Feb 2016 07:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4ad32cd98e7f..dff99bf9e167 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1455170701 Thu 11 Feb 2016 06:05:01 AM UTC
+1455260701 Fri 12 Feb 2016 07:05:01 AM UTC
diff --git a/net-analyzer/2ping/2ping-3.2.0.ebuild b/net-analyzer/2ping/2ping-3.2.0.ebuild
new file mode 100644
index 000000000000..b463b0200bbb
--- /dev/null
+++ b/net-analyzer/2ping/2ping-3.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A bi-directional ping utility"
+HOMEPAGE="http://www.finnie.org/software/2ping/"
+SRC_URI="http://www.finnie.org/software/2ping/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="server"
+
+src_install() {
+ distutils-r1_src_install
+ doman doc/2ping.1
+ dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md}
+ use server && {
+ doinitd "${FILESDIR}"/2pingd
+ newconfd "${FILESDIR}"/2pingd.conf 2pingd
+ }
+}
diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest
index 1ea41b16acf7..da289dd12d7d 100644
--- a/net-analyzer/2ping/Manifest
+++ b/net-analyzer/2ping/Manifest
@@ -1,2 +1,3 @@
DIST 2ping-3.0.1.tar.gz 39752 SHA256 d6997cd1680151e6f7d5e60137d45cd41bf385d26029878afdaaf5dc4f63dcc4 SHA512 c5e8b26591a51bc3410db2ab572b17d6fddbce8f25c8cbfb4eb23cb738b28b12dae1cc395d26987e84191039193853178dffb748b1f951661e319ac2d5c053db WHIRLPOOL 1f90e57a5e5e6788cc832335213fa3c93d029b2bb82837e322dc65b41c1b2dbfe7aa824e38e1595f3378b2ea2978604915404351866cac245276beedef6cbf39
DIST 2ping-3.1.0.tar.gz 42581 SHA256 0f5b4e10f89dd99ef04e2cc0564d6673ceae897ed0bf59b636553ec6aa1c7a92 SHA512 6b264001f32cd6d7178f66365a0999e5087516681ee266b9170fe4a8bf10be27e451302e40141534a3d115dfa73689954e566cb68b51ce181965f0d347b8f844 WHIRLPOOL 90ddfa773e0cedf292acb3671c3e1f9cd444a082379e2132553de505de81c16d77fbff0c2bd2f976cf92b1e82b11a4c3945b181e6805c01e48f8de11a10c9cb8
+DIST 2ping-3.2.0.tar.gz 48895 SHA256 6297f7775be50d208f3b7d4925ecddb3ed1c593198fd875448ae8f88f1a6b196 SHA512 115526b4416a63f1e79afdaef54b288fb03d103b78d3c79826fcea214800842ad8971145f31e4164c1d70e2bcdb61d7b94d63299d6ac1f5dc8018f7a8a6facf1 WHIRLPOOL e69cf97cdca760e79705b7f92ef7e315367f02ae103496d60413a4cf7000c3e78218b4e4ae5e4c7f1fefe6b406324c2449f6308b0f939ae2a1bcf7d47f72fa18
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 135a71a57120..948859f4acae 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,5 +1,4 @@
DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
-DIST FileZilla_3.14.0_src.tar.bz2 4415005 SHA256 92385ab4f30bc7e5e457d6a3310645cc6c4bd0e83a78e12c33f2778b73d579fd SHA512 00d81aeef1d30d16884d34a5c15584204f55f72d9a7ab88cca4ff953c6beda5ef2a7883d095c60826ccadc1c4529c0e6e93c50f5ececc598c2200c32cec5d4c5 WHIRLPOOL fd994ad7f150506111642015bf9ff87481231843512b6b5eac3b2e64ff4e63e2cd2933deb72b466785a09700fd88b9f45302b28dfed71f509001dbeb8a001d99
DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
DIST FileZilla_3.15.0.1_src.tar.bz2 4405885 SHA256 267d3e336a7ecc5277950f759a37016e9747e63d1fc315c6798f18d7fea38463 SHA512 f6e40452408dc9cdf4295d04ffc2e202dec6ba4b07eb12875cee6427cf5e930438af26c36e60d4b8e14b95750549ab822512ef39e89199064dd200561793ced9 WHIRLPOOL 62cfead9e69f9195412183b81faa63394b73423ff1396bc2eae09baee8e56ce13a0a00587e0d3f0a78aae339430fc292a8518201cd6bd4de74e661c01845d887
-DIST FileZilla_3.15.0_src.tar.bz2 4406433 SHA256 ff852187e11ffe49237ae15c8ca8c920e9dc9019cc88743eeaa62afaeecf9277 SHA512 aa0d3505b36ef3efe9d7912b6236e09d55a9020f2d4a68fb304ea6aff828a50809c0a9b96446ac49514396378cf252f1bf02596a0cb7fa1d9945494816ec6802 WHIRLPOOL 8970ea461f51fd59668df92b5db199700bc935b494d443cafa48b72c92f5bcee0bae81a3f3df5a80c3532fc19be9afb59e023b72388a48f2f0de6db1804f5da7
+DIST FileZilla_3.15.0.2_src.tar.bz2 4404751 SHA256 333c46709506b2777047556aa9ee791b404e5f8b94236b3c8a789c1dc09f7c4f SHA512 f71cff0c32771de92d3d7140e160ad9474ce8c84b82e3170dbd7d5814d94cf91fbf40d1b4bc581f77dac2082eef662f6ef8100032bdee5a90c1b4658da69bcab WHIRLPOOL 5eef822dd16e0ea9b37097432e22e4b805ab13cfabd5e49e3fa8c0789e191563321c009d46ecf1804f220beab739140b654b188619dcd52895d5442d04f73ab2
diff --git a/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch b/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch
deleted file mode 100644
index 843ea2d14a2c..000000000000
--- a/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in 2011-02-28 20:47:05.746530082 +0100
-+++ configure.in 2011-02-28 20:48:14.889939315 +0100
-@@ -44,8 +44,8 @@
- if ! test "$localesonly" = "yes"; then
-
- if test "X$GCC" = Xyes; then
-- CFLAGS="$CFLAGS -Wall -g -fexceptions"
-- CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
-+ CFLAGS="$CFLAGS -Wall -fexceptions"
-+ CXXFLAGS="$CXXFLAGS -Wall -fexceptions"
- fi
-
- # Add build information to config.h
diff --git a/net-ftp/filezilla/filezilla-3.14.0.ebuild b/net-ftp/filezilla/filezilla-3.14.0.ebuild
deleted file mode 100644
index 88d257b87edd..000000000000
--- a/net-ftp/filezilla/filezilla-3.14.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-db/sqlite-3.7
- net-dns/libidn
- >=net-libs/gnutls-3.1.12
- aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
- !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
- dbus? ( sys-apps/dbus )"
-# >=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
- eautoreconf
-}
-
-src_configure() {
- # system pugixml lacks long long ops support, use builtin for now
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=builtin \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-
- if use aqua ; then
- cat > "${T}/${PN}" <<-EOF || die
- #!${EPREFIX}/bin/bash
- open "${EPREFIX}"/Applications/FileZilla.app
- EOF
- rm "${ED}/usr/bin/${PN}" || die
- dobin "${T}/${PN}"
- insinto /Applications
- doins -r "${S}"/FileZilla.app
- fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.15.0.ebuild b/net-ftp/filezilla/filezilla-3.15.0.2.ebuild
similarity index 100%
rename from net-ftp/filezilla/filezilla-3.15.0.ebuild
rename to net-ftp/filezilla/filezilla-3.15.0.2.ebuild
diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml
index 93672b2e7a4e..13541a402eae 100644
--- a/net-ftp/filezilla/metadata.xml
+++ b/net-ftp/filezilla/metadata.xml
@@ -5,6 +5,10 @@
voyageur@gentoo.org
Bernard Cafarelli
+
+ polynomial-c@gentoo.org
+ Lars Wendler
+
The native linux ftp/sftp client GUI built on wxGTK
diff --git a/net-irc/quassel/quassel-0.12.2-r3.ebuild b/net-irc/quassel/quassel-0.12.2-r3.ebuild
index 967f8d0b3d2d..a11aa28e34b2 100644
--- a/net-irc/quassel/quassel-0.12.2-r3.ebuild
+++ b/net-irc/quassel/quassel-0.12.2-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://quassel-irc.org/"
[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
SLOT="0"
IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server +ssl syslog webkit X"
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index e9559f8d0017..e5394b1568bd 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -1 +1,2 @@
+DIST libiscsi-1.15.0.tar.gz 223380 SHA256 489e625e58c1e6da2fa3536f9c4b12290f2d3fb4ce14edc0583b8ba500605c34 SHA512 22c566d4cf10454b9c6208d64f5dab8e32806a5036cd328f8b2d8bf14f9e9c2d519db8df4fc8884f468bad27d645ccf719502d49f6937eace88f590946366e06 WHIRLPOOL f5618c985467df1b76689ae0601d8ec8a251a61ac1d7d7a5e44165b8710827530fbd2595ed87d0b83226fecc5ef8cb5e89dfa90cd6760db800856d5e2367ce69
DIST libiscsi-1.9.0.tar.gz 182123 SHA256 64d7d6fdb53f0cc4163a0f1dc6cc94618f34a52c4836cf25a42f3769dfd46bbf SHA512 cf88c0f32a21193499720d24f215fb02e7a46ef07999ef59cdad9cad14f92399b3d2e46e8e6f54574dc77225a5b437608216da242971e0d6f35c71830371415a WHIRLPOOL 63af85f03e032ff034b7ce3331f8cb74ffa79c4621efb9873e0b3c76f3f9620439c11216f33d1e97c784f98ecff516048e53f66d88d51dc81578e7e535135588
diff --git a/net-libs/libiscsi/libiscsi-1.15.0.ebuild b/net-libs/libiscsi/libiscsi-1.15.0.ebuild
new file mode 100644
index 000000000000..0c633a7453cf
--- /dev/null
+++ b/net-libs/libiscsi/libiscsi-1.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="iscsi client library and utilities"
+HOMEPAGE="https://github.com/sahlberg/libiscsi"
+SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-manpages \
+ --disable-werror \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/libiscsi/libiscsi-1.9.0.ebuild b/net-libs/libiscsi/libiscsi-1.9.0.ebuild
deleted file mode 100644
index 2be8c7b7e765..000000000000
--- a/net-libs/libiscsi/libiscsi-1.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit autotools-utils
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="iscsi client library and utilities"
-HOMEPAGE="https://github.com/sahlberg/libiscsi"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/net-libs/libiscsi/libiscsi-9999.ebuild b/net-libs/libiscsi/libiscsi-9999.ebuild
index bfb4ad5d3496..d3c3d7c5442b 100644
--- a/net-libs/libiscsi/libiscsi-9999.ebuild
+++ b/net-libs/libiscsi/libiscsi-9999.ebuild
@@ -1,28 +1,37 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-AUTOTOOLS_AUTORECONF="1"
-inherit autotools-utils
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-2
- SRC_URI=""
- EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/sahlberg/libiscsi/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+inherit autotools eutils git-r3
DESCRIPTION="iscsi client library and utilities"
HOMEPAGE="https://github.com/sahlberg/libiscsi"
+SRC_URI=""
+EGIT_REPO_URI="git://github.com/sahlberg/libiscsi.git"
-LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE=""
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS=""
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-manpages \
+ --disable-werror \
+ $(use_enable static-libs static)
+}
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 724293fec1e5..00165ce1c8f0 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,5 +1,2 @@
-DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
-DIST libmicrohttpd-0.9.45.tar.gz 1246332 SHA256 1075def48da9327be22441f4a3460d24159fae2bf4bcfb4ab6e7ca5e95e54a69 SHA512 670d1d1f47ea8657d389302c9bfa8b6d8d12658fb28ce6ed7549db0d4483b1023e7e7d419651f38cef5b024f853d83f336b365624a346b811c2d94ab0d84fb01 WHIRLPOOL 691c1577fd17f6db4bd1990dcfbe4f20cb8944dd51014b349d26bfc8844e367c337eb03c91342b2d9e9923979e36e7464530ed6808636085a2daa006c5295bf6
-DIST libmicrohttpd-0.9.46.tar.gz 1249529 SHA256 06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979 SHA512 d45cd6e8ca1fb0e4d42110fa6ae5b49823d1b2ce66dd82d8b68757b79bf441e4103301af9437886b2c5d3296102ed8da17933a573da9649e7359305f8e678e46 WHIRLPOOL 09413fd2f39d1da727dc8756b7487dcfd7d7d143af27ac3add70c302b6a8fe5454c328a8a341a5bd69a6a0d52c4153c1dbaad3157f731bf35e4e67a0a2b512a3
DIST libmicrohttpd-0.9.47.tar.gz 1075636 SHA256 96bdab4352a09fd3952a346bc01898536992f50127d0adea1c3096a8ec9f658c SHA512 c6a0d8602246c72bdec63140310fa72f1e73b569ffec5a46bddd92b8be434b334c74f9afb2fab828dd3e0387f02ac5f518580d13c5e7548dc0367e43233196c7 WHIRLPOOL 0087f9856ffd9fae983b7c82d82254f5dc3c416c0cdd9d2b8318793a0d727eb3f1dd038f4d222817cb665d17e912dbbc2f765ae3a06c010d35e53b0d332c108e
DIST libmicrohttpd-0.9.48.tar.gz 1077473 SHA256 87667e158f2bf8c691a002e256ffe30885d4121a9ee4143af0320c47cdf8a2a4 SHA512 67155356b01c2294f5b87db68ac275d8c739e06590fc0ae5bcc0c9b4cfc42027b227fd64862ec3197695727c937b5c5d8c815ffbfc770beba918c0e3ca6a37f0 WHIRLPOOL 6267832952d2f1c1b4222597da2c67a8eb298781e5f1d26fe760f19ca14b4364f35e11a458c580968b6142454cb5969ed067fb2fd55e73ea38583df604eac78e
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild
deleted file mode 100644
index 8c9e13ae72be..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.42.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls
- )"
-
-DEPEND="${RDEPEND}
- test? (
- ssl? ( >=net-misc/curl-7.25.0-r1[ssl] )
- )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
- econf \
- --enable-bauth \
- --enable-dauth \
- --disable-examples \
- --disable-spdy \
- --enable-postprocessor \
- $(use_enable epoll) \
- $(use_enable test curl) \
- $(use_enable messages) \
- $(use_enable ssl https) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.ebuild
deleted file mode 100644
index a4a6fb71fb3b..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.45-r1.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"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls
- )"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
- test? (
- ssl? ( net-misc/curl[ssl] )
- )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
- econf \
- --enable-bauth \
- --enable-dauth \
- --disable-examples \
- --disable-spdy \
- --enable-postprocessor \
- --runstatedir=/run \
- $(use_enable epoll) \
- $(use_enable test curl) \
- $(use_enable messages) \
- $(use_enable ssl https) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
- :
-}
-
-src_install() {
- default
-
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.46.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.46.ebuild
deleted file mode 100644
index ce4d3feb9437..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.46.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"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
- dev-libs/libgcrypt:0=
- net-libs/gnutls
- )"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
- test? (
- ssl? ( net-misc/curl[ssl] )
- )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
- econf \
- --enable-bauth \
- --enable-dauth \
- --disable-examples \
- --disable-spdy \
- --enable-postprocessor \
- --runstatedir=/run \
- $(use_enable epoll) \
- $(use_enable test curl) \
- $(use_enable messages) \
- $(use_enable ssl https) \
- $(use_with ssl gnutls) \
- $(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
- :
-}
-
-src_install() {
- default
-
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
index b18f80b02ff6..3dbd5e4be625 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="epoll messages ssl static-libs test"
RDEPEND="ssl? (
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index b806676457b6..b6bcc6553df1 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,2 +1,3 @@
DIST nghttp2-1.6.0.tar.gz 1983953 SHA256 c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26 SHA512 32d5227a5ff037d50d93d43b1fdb0be51d9cca1e09dcc85320b8e09f82fdc658397ca58ca400595f138ca7b77f389d945e3562ab4074afd05e1c74eca4de2744 WHIRLPOOL 31102e596a9e93ca993cd9b8b04da6f51acb247803de16958501bdb6fe06e5bbc951430d2c2be1bd7fd1d9216d087d711de83bad6bb93eb70f4e4b8b0f864efb
DIST nghttp2-1.7.0.tar.gz 2001726 SHA256 f0be9560baa30fc56bcce0151d88126d71b91815bb47076a8dd9ad2b9023ff49 SHA512 556a81ef9bad8a75a23b13532e6066af4412d79fa8dbde508ea893780bc9b19e0525674dc1cfb04b25cc48d62ae704737d6c4b1aa2b442a2be514b72490f6c1b WHIRLPOOL 138bb50c85ef7838be919989c032157ecedbfe1d5bf28633d5ee0c3d6f18dc7fa7525e185d476d146788466b58db0a2104054a1a28cb5152a8c4e9652fcb22ba
+DIST nghttp2-1.7.1.tar.gz 1993320 SHA256 d83858464c03555828bb603288b66a48680bf164b376d2459a5407c102098a14 SHA512 3a71153d2b30a69e79115402b7db9a04bc812025ccb67b918079f33690f18eb5b286095b8bc161df91abf6466b6bb822ecc13c49bee54265a06ba9ab7c289b54 WHIRLPOOL 41d0afd43878029069d2c339e22b8aec77fedbd1b0fb45da96b9592525c760731e2eec567999af704d63cf94c913b1d0c52063380e69170e1f2d2b928c1d70f3
diff --git a/net-libs/nghttp2/nghttp2-1.7.1.ebuild b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
new file mode 100644
index 000000000000..776f0f6311a0
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # . SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index cc342c068b39..60ecd06f7ed9 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,4 +5,4 @@ DIST node-v4.2.2.tar.xz 12791572 SHA256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223
DIST node-v5.0.0.tar.xz 12863764 SHA256 cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3 WHIRLPOOL 8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923
DIST node-v5.3.0.tar.xz 12776504 SHA256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e SHA512 f65773c35ce774bc6fe242f8627e5786f441f0286f7d272e854e2e2d6b927d5f368c366ff52dd780f7817fedf3935ec25e78ed3f81d4613495663eb81e2afbb1 WHIRLPOOL 5f270ed6fe35dba091bd75e6ad9de419c781fc6f919915a4117b8c0bbb2ea11a05369a9149e4f69614de508ff109eb94b24bdafc0832e91e055f01b0ef214c67
DIST node-v5.4.1.tar.xz 12812444 SHA256 4e7d3fdfeac85c46ddaef0224695620f218e7a178e97d6e210d6d643483f1d53 SHA512 9803478d502bf11bfc77e56109568b0f64186826be35a9b36b47b63ec744595db128955e6f7bec7eb4db39e85afdd364b1215427954ce33ab67689ff03a5bc57 WHIRLPOOL 87f791f4f0722a2d3bcb630d22548f395ac0e86dedc37849caab2d63bc43bad2621058f95eb2b31b1f3b01ec8585c0731c969a1f0167d95495008b44f3b69066
-DIST node-v5.5.0.tar.xz 13059924 SHA256 9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22 SHA512 8a2d268db2e04d905f879d3b1c1a9a17fb060754ccde86680df85311babf033249730e0ab3f7bd131b16ddaf79d740556e3ee4f37f34a0754be7d9c9080fa683 WHIRLPOOL baf2ec5dc3929a642487d83ebe2e442111379b841b7a2349ba17f372f420f40d4a069098909bffd85ed9e3f34d970ecf542cc80b0df3aac5470c656206cdc481
+DIST node-v5.6.0.tar.xz 13311288 SHA256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 SHA512 ef38d9ce708b8283b7f7441a0c2787e64c0602fb50542b4ccd29e705f879626adf2c1d89a9040af55b1f00b6e45d1d87ca829bf6816768933af9b5661f654aa7 WHIRLPOOL 6b5dcd85a74b47554400a6ff62e4001bb04b9063987571ac4434116d807d04ee58a0ca622973ff4b81c064e4ec1b0cd2f881680eb7f1ced5aeda745bf48538ab
diff --git a/net-libs/nodejs/files/gentoo-global-npm-config.patch b/net-libs/nodejs/files/gentoo-global-npm-config.patch
new file mode 100644
index 000000000000..e7346b826852
--- /dev/null
+++ b/net-libs/nodejs/files/gentoo-global-npm-config.patch
@@ -0,0 +1,40 @@
+commit 46ac7cd4229eac5e0182ab62b7ed844c24a8c52e
+Author: Johan Bergström
+Date: Wed Feb 10 22:45:59 2016 +1100
+
+ npm: set global config folder to /etc/npm
+
+ npm previously assumed that the global config path would be
+ based on $prefix/etc. Since gentoo installs nodejs into /usr,
+ this means we're also creating /usr/etc which is less desirable.
+
+ This patch will likely never go upstream.
+
+diff --git a/deps/npm/lib/config/core.js b/deps/npm/lib/config/core.js
+index d1306eb..bd2ef89 100644
+--- a/deps/npm/lib/config/core.js
++++ b/deps/npm/lib/config/core.js
+@@ -150,16 +150,14 @@ function load_ (builtin, rc, cli, cb) {
+ // Eg, `npm config get globalconfig --prefix ~/local` should
+ // return `~/local/etc/npmrc`
+ // annoying humans and their expectations!
+- if (conf.get('prefix')) {
+- var etc = path.resolve(conf.get('prefix'), 'etc')
+- mkdirp(etc, function () {
+- defaults.globalconfig = path.resolve(etc, 'npmrc')
+- defaults.globalignorefile = path.resolve(etc, 'npmignore')
+- afterUserContinuation()
+- })
+- } else {
++
++ // gentoo deviates wrt global config; store in /etc/npm
++ var globalconfig = path.resolve('/etc', 'npm')
++ mkdirp(globalconfig, function () {
++ defaults.globalconfig = path.resolve(globalconfig, 'npmrc')
++ defaults.globalignorefile = path.resolve(globalconfig, 'npmignore')
+ afterUserContinuation()
+- }
++ })
+ }
+
+ function afterUserContinuation () {
diff --git a/net-libs/nodejs/nodejs-5.5.0.ebuild b/net-libs/nodejs/nodejs-5.6.0-r1.ebuild
similarity index 76%
rename from net-libs/nodejs/nodejs-5.5.0.ebuild
rename to net-libs/nodejs/nodejs-5.6.0-r1.ebuild
index 796a5f2ea6ac..0c740de30cc4 100644
--- a/net-libs/nodejs/nodejs-5.5.0.ebuild
+++ b/net-libs/nodejs/nodejs-5.6.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
@@ -19,27 +19,29 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
RDEPEND="icu? ( >=dev-libs/icu-56:= )
- ${PYTHON_DEPS}
- >=net-libs/http-parser-2.6:=
+ npm? ( ${PYTHON_DEPS} )
+ >=net-libs/http-parser-2.6.1:=
>=dev-libs/libuv-1.8.0:=
- >=dev-libs/openssl-1.0.2e:0=[-bindist]
+ >=dev-libs/openssl-1.0.2f:0=[-bindist]
sys-libs/zlib"
DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
!!net-libs/iojs
test? ( net-misc/curl )"
S="${WORKDIR}/node-v${PV}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(
+ "${FILESDIR}"/gentoo-global-npm-config.patch
+)
+
pkg_pretend() {
(use x86 && ! use cpu_flags_x86_sse2) && \
die "Your CPU doesn't support the required SSE2 instruction."
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if ! test-flag-CXX -std=c++11 ; then
- die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
- fi
- fi
+ ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
}
src_prepare() {
@@ -80,7 +82,7 @@ src_prepare() {
BUILDTYPE=Debug
fi
- epatch_user
+ default
}
src_configure() {
@@ -121,10 +123,10 @@ src_compile() {
src_install() {
local LIBDIR="${ED}/usr/$(get_libdir)"
- make install DESTDIR="${ED}" PREFIX=/usr
+ emake install DESTDIR="${ED}"
pax-mark -m "${ED}"usr/bin/node
- # set up a symlink structure that npm expects..
+ # set up a symlink structure that node-gyp expects..
dodir /usr/include/node/deps/{v8,uv}
dosym . /usr/include/node/src
for var in deps/{uv,v8}/include; do
@@ -134,18 +136,24 @@ src_install() {
if use doc; then
# Patch docs to make them offline readable
for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
- sed -i '/fonts.googleapis.com/ d' $i;
+ sed -i '/fonts.googleapis.com/ d' $i;
done
# Install docs!
dohtml -r "${S}"/out/doc/api/*
fi
if use npm; then
+ dodir /etc/npm
+
# Install bash completion for `npm`
+ # We need to temporarily replace default config path since
+ # npm otherwise tries to write outside of the sandbox
+ local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+ sed -i -e "s|'/etc'|'${D}/etc'|g" "${ED}/${npm_config}" || die
local tmp_npm_completion_file="$(emktemp)"
"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
newbashcomp "${tmp_npm_completion_file}" npm
- rm "${LIBDIR}"/node_modules/npm/lib/utils/completion.sh
+ sed -i -e "s|'${D}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
# Move man pages
doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
@@ -154,22 +162,21 @@ src_install() {
rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
- local temp_name=("'AUTHORS*'" "'CHANGELOG*'" "'CONTRIBUT*'" \
- "'README*'" "'.travis.yml'" "'.eslint*'" "'.wercker.yml'" \
- "'.npmignore'" "'*.md'" "'*.markdown'" "'*.bat'" "'*.cmd'")
local find_exp="-or -name"
- local find_name=( "${temp_name[@]/%/ ${find_exp}}" )
- # drop last "-or -name"
- find_name[-1]="${find_name[-1]%${find_exp}}"
- local find_iname="-iname 'LICEN?E*' ${find_exp}"
+ local find_name=()
+ for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+ ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+ "*.md" "*.markdown" "*.bat" "*.cmd"; do
+ find_name+=( ${find_exp} "${match}" )
+ done
# Remove various development and/or inappropriate files and
# useless docs of dependend packages.
find "${LIBDIR}"/node_modules \
\( -type d -name examples \) -or \( -type f \( \
- ${find_iname} ${find_name[@]} \
- \) \)
- eend $?
+ -iname "LICEN?E*" \
+ "${find_name[@]}" \
+ \) \) -exec rm -rf "{}" \;
fi
}
@@ -179,8 +186,10 @@ src_test() {
}
pkg_postinst() {
- einfo "When using node-gyp to install native modules, you can avoid"
- einfo "having to download the full tarball by doing the following:"
+ einfo "The global npm config lives in /etc/npm. This deviates slightly"
+ einfo "from upstream which otherwise would have it live in /usr/etc/."
einfo ""
- einfo "node-gyp --nodedir /usr/include/node "
+ einfo "Protip: When using node-gyp to install native modules, you can"
+ einfo "avoid having to download extras by doing the following:"
+ einfo "$ node-gyp --nodedir /usr/include/node "
}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 17c83aebb667..fb4ea0669635 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,5 +1,6 @@
DIST dovecot-2.2-pigeonhole-0.4.10.tar.gz 1605634 SHA256 e9dfe7160fd3b465d6d5068f219122626ef790cce507e290cd09852c7d90726f SHA512 3e864727fc2bd346a7212135a3dd8759f9a5c27abd938c4d6b805c784c5c2c5aa401dd49cfa90951348a00202b85f91d86a2fa17ccab9a983a6faf2d0add48e8 WHIRLPOOL d97cb3111a8de17bcaf3c2cba63063bd45cee7578f826a14441d4568154bcd3520f4d43354411247c8a4ed168c01181718689cb94cb6ae9a15cfb705d7c9c2fd
DIST dovecot-2.2-pigeonhole-0.4.11.tar.gz 1660922 SHA256 5168b4ac4e173b563dd71f4024452da5a578aa8d5d047d98903489ab4d84ad72 SHA512 c01b23e90431da8c57f8e384d52bee0a608ce5de5a2e8cc304ab482b17473d637126704d549fbd3bc1ffffdeb41eff94e2587d1e6707a9249c15fff65631814d WHIRLPOOL d901c2b9e4fa2d7b59d77fae42beb42e51d12999a937979aed6b6b705238d2a3d8fad4243f3bee7bbe954e4c033861d9d5f731a9793899d211842627e71009a0
+DIST dovecot-2.2-pigeonhole-0.4.12.tar.gz 1681327 SHA256 98a2fd79b0d9effd08c0caf04d483b1caa5e4503dae811e6d436948557bfb702 SHA512 68b2bcc8bd2a8c039ff116a441ff8795917b280f89ad60819638d5903010611bbd5966567d0d33ae305f9ae4db9f6756b2a72ccd8305124cfe846d64bbdd08c5 WHIRLPOOL 7e5bca584219ed2c9dbfe7056c137ced7a1a56cfa7eb6940fa882d3683ef67ec103e9cf5788f0869175c5d4bf4804fb979951836f70755d4752af441d50afbbc
DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
DIST dovecot-2.2.21.tar.gz 4985686 SHA256 7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20 SHA512 0d246d44e0c908ea40d324982fb279b19424ddcb642e51796078f600fc5bf530898d2fa387fcfd971d43758cff22590e5ea6918c31e9f4a63f13a8c525a23d9b WHIRLPOOL 242026e876a12b9ecd50a76849cb16161f625791bc9d1a54270f38f24e66bc31b6ddf90acf119af2bd4c94e392c875a0c29be08b84a5f25d080a7e1b13d52175
diff --git a/net-mail/dovecot/dovecot-2.2.21-r2.ebuild b/net-mail/dovecot/dovecot-2.2.21-r2.ebuild
new file mode 100644
index 000000000000..873ae7de74c1
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.21-r2.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.12"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ textcat? ( app-text/libexttextcat )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-10-ssl.patch"
+ epatch_user
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ local storages=""
+ for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+ use ${storage} && storages="${storage} ${storages}"
+ done
+ [ "${storages}" ] || storages="maildir"
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --localstatedir="${EPREFIX}/var" \
+ --runstatedir="${EPREFIX}/run" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --with-storages="${storages}" \
+ --disable-rpath \
+ --with-icu \
+ $( systemd_with_unitdir ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with ssl ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with textcat ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="../${MY_P}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install () {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ if ! use maildir; then
+ if use mbox; then
+ mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+ keepdir /var/dovecot
+ sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+ "${confd}/10-mail.conf" || die "sed failed"
+ elif use mdbox ; then
+ mail_location="mdbox:~/.mdbox"
+ elif use sdbox ; then
+ mail_location="sdbox:~/.sdbox"
+ fi
+ fi
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ if use ssl; then
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = =sys-apps/net-tools-1.60_p20120127084908[-old-output]
- || ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2-respect-CC.patch"
- epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- einstall PREFIX="${D}"
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- dodoc Changelog.txt README
- doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.3-r1.ebuild b/net-misc/minissdpd/minissdpd-1.3-r1.ebuild
deleted file mode 100644
index 2aaba3988386..000000000000
--- a/net-misc/minissdpd/minissdpd-1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2-respect-CC.patch"
- epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- einstall PREFIX="${D}"
- newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- dodoc Changelog.txt README
- doman minissdpd.1
-}
diff --git a/net-misc/minissdpd/minissdpd-1.3.ebuild b/net-misc/minissdpd/minissdpd-1.3.ebuild
deleted file mode 100644
index 3055f5c45d9b..000000000000
--- a/net-misc/minissdpd/minissdpd-1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/net-tools-1.60_p20120127084908[-old-output]
- || ( net-misc/miniupnpd net-libs/miniupnpc )"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2-respect-CC.patch"
- epatch "${FILESDIR}/${PN}-1.2-remove-initd.patch"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install () {
- einstall PREFIX="${D}"
- newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- dodoc Changelog.txt README
- doman minissdpd.1
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index d8f40f2f538a..828ab3fc2a8c 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -2,3 +2,4 @@ DIST owncloudclient-2.0.0.tar.xz 11734540 SHA256 21cb79fe11bbacc02a98ad16ae60512
DIST owncloudclient-2.0.1.tar.xz 11737332 SHA256 97e8fe888b8f59b0703fd9fbd54feecbf14c078ac14e9856bf0327f2b41bc287 SHA512 a09044c5c74c15761d0a531908ac1882f77f02e7199af4f8370253ae5f8d0966609d706a771f074d3c686d33f1db260e61be94a1f8fca239aa6d79d30093ef41 WHIRLPOOL d05dd8a3587987b4c8a86d4958b09e2480ae5390de755dc925f085b3392669835c089530d0cc5180b9c6254fec747aff77f8ba3fe06859501309975f37237986
DIST owncloudclient-2.0.2.tar.xz 11518700 SHA256 2815dce34b568141d7c2ab90bcd733abb6862970917738e3b120d8073ab68228 SHA512 69b42ba45f95ed85f7afda586fb213069098ca5f7e779121a2a935066438403dba5e56292329997d955bbefbbafc3fadfed6bf1239ae9f0f90c91455d998c616 WHIRLPOOL 52224a5b79b9d28fb22d52ec9b30cc449b8e7b4dd6423c763c1f9bb429a7843d60381ad905921a20c33ab3bf864209f16aa9a55d7049b2175772b5c6ec92f768
DIST owncloudclient-2.1.0.tar.xz 11749608 SHA256 73553f182cc5e3d87a5382bf17f9adf6e1315cc9ea8f530bf39775e709a5d03f SHA512 1db9c27fa00b2896799c8ab2ca7b9bed40c5f514e495320234a06d453c703356ddf012eacde9abe9ffb3c29472fedc7e1eac78baae8a43ea743e2c1ab1176b1d WHIRLPOOL 53be85cfdf5191c3fbf088cd941ec7441f16e42bac6d59865f22114d97637224f52ff167955b845efaadfb7ab3a27862c2c9bb9e17308048b7348a36ee64deb4
+DIST owncloudclient-2.1.1.tar.xz 11920024 SHA256 4e7cfeb72ec565392e7968f352c4a7f0ef2988cc577ebdfd668a3887d320b1cb SHA512 62cd22c1c7119cc2269537ab562072bffa1a968b720263810f35b58722bac5b370b7b7ae6ec6fd3e9778bd996c8e4b0b91c34c1a3b533e1a60853963a8de5e19 WHIRLPOOL 00cf583a5c8c688d7fa08029cba5bb06412f4a3dbbfdd942dbc542af8ceb13603a9a757f8fa110b2dafcd0a8083ad40b7a2bf8a86155fb6f4515df72bad1cedf
diff --git a/net-misc/owncloud-client/owncloud-client-2.1.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.1.1.ebuild
new file mode 100644
index 000000000000..6fac78169bfa
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.1.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp test qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+ sys-fs/inotify-tools
+ virtual/libiconv
+ dolphin? (
+ >=kde-frameworks/kcoreaddons-5.16:5
+ >=kde-frameworks/kio-5.16:5 )
+ nautilus? ( dev-python/nautilus-python )
+ qt4? (
+ dev-libs/qtkeychain[qt4]
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ net-libs/neon[ssl]
+ )
+ qt5? (
+ dev-libs/qtkeychain[qt5]
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ >=dev-qt/qtnetwork-5.4:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtsql:5
+ dev-qt/qtwebkit:5[printsupport]
+ )
+ samba? ( >=net-fs/samba-3.5 )
+ sftp? ( >=net-libs/libssh-0.5 )
+ !net-misc/ocsync"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-python/sphinx
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+ qt5? ( dev-qt/linguist-tools:5 )
+ test? (
+ dev-util/cmocka
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+ # Keep tests in ${T}
+ sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
+
+ use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
+ shell_integration/CMakeLists.txt || die "sed failed"
+
+ default
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+ -DWITH_ICONV=ON
+ -DWITH_DOC=$(usex doc)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+ -DBUILD_WITH_QT4=$(usex qt4)
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+ -DUSE_UNIT_TESTING=$(usex test)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ # 1 test needs an existing ${HOME}/.config directory
+ mkdir "${T}"/.config
+ export HOME="${T}"
+ cmake-utils_src_test
+}
+
+pkg_postinst() {
+ if ! use doc ; then
+ elog "Documentation and man pages not installed"
+ elog "Enable doc USE-flag to generate them"
+ fi
+}
diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
index bd4dd8f70c11..bad74b01b4f2 100644
--- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
RDEPEND="
net-libs/libpcap
- sys-libs/ncurses
+ sys-libs/ncurses:=
"
DEPEND="
${RDEPEND}
@@ -24,7 +24,7 @@ DEPEND="
src_prepare() {
epatch \
- "${FILESDIR}"/${P}.patch \
+ "${FILESDIR}"/${P}-sniffd.patch \
"${FILESDIR}"/${P}-off-by-one.patch \
"${FILESDIR}"/${P}-fprintf-format.patch
@@ -32,7 +32,7 @@ src_prepare() {
-e '/^LIBS/s|=.*|= $(shell $(PKG_CONFIG) --libs panel)|' \
src/libncurses/Makefile || die
sed -i \
- -e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs panel)|' \
+ -e 's|-lpanel -lncurses|$(shell $(PKG_CONFIG) --libs ncurses panel)|' \
src/sniffd/Makefile || die
tc-export PKG_CONFIG
}
diff --git a/net-wireless/airtraf/files/airtraf-1.1.patch b/net-wireless/airtraf/files/airtraf-1.1-sniffd.patch
similarity index 100%
rename from net-wireless/airtraf/files/airtraf-1.1.patch
rename to net-wireless/airtraf/files/airtraf-1.1-sniffd.patch
diff --git a/profiles/package.mask b/profiles/package.mask
index b4621669612f..e6d44277c59f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,16 @@
#--- END OF EXAMPLES ---
+# Michael Palimaka (12 Feb 2016)
+# Fails to build. No revdeps. Masked for removal in 30 days.
+# Bug 574432
+media-libs/gluon
+
+# Aaron W. Swenson (11 Feb 2016)
+# Susceptible to security issues and other bugs. Removal pending
+# stabilization of 9.5.1, 9.4.6, 9.3.11, 9.2.15, and 9.1.20.
+=dev-db/postgresql-9.0.23-r1
+
# Aaron Bauman (10 Feb 2016)
# Old, no active or proxy maintainer, dead upstream
# and nothing depends on it.
@@ -69,6 +79,7 @@ net-libs/iojs
sci-biology/biojava
sci-biology/mauve
sci-biology/mauvealigner
+dev-java/bytecode
# James Le Cuirot (07 Feb 2016)
# Masked until 2.0 final arrives, which hopefully won't depend on
diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent
index 9c654750f678..085c1b8aefb9 100644
--- a/profiles/prefix/linux/parent
+++ b/profiles/prefix/linux/parent
@@ -1 +1,2 @@
../../features/prefix/rpath
+..
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a8987d587dbf..b0b2fee7eaad 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1352,7 +1352,6 @@ dev-db/maxscale:jemalloc - Use dev-libs/jemalloc for allocations
dev-db/maxscale:rabbitmq - Add support for RabbitMQ message queue
dev-db/mongodb:mms-agent - Install the MongoDB Monitoring Service agent
dev-db/mongodb:tools - Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools
-dev-db/mysql:client-libs - Build the libmysqlclient libraries
dev-db/mysql:cluster - Add support for NDB clustering (deprecated)
dev-db/mysql:community - Enables the community features from upstream.
dev-db/mysql:embedded - Build embedded server (libmysqld)
@@ -1367,7 +1366,6 @@ dev-db/mysql:profiling - Add support for statement profiling (requires USE=commu
dev-db/mysql:server - Build the server program
dev-db/mysql:systemtap - Build support for profiling and tracing using dev-util/systemtap
dev-db/mysql:test - Install upstream testsuites for end use.
-dev-db/mysql:tools - Build the command line tools (mysql, mysqldump, mysqladmin, etc)
dev-db/mysql:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
dev-db/mysql-cluster:cluster - Add support for NDB clustering
dev-db/mysql-cluster:community - Enables the community features from upstream.
@@ -8122,6 +8120,7 @@ x11-drivers/ati-drivers:modules - Build the kernel modules
x11-drivers/ati-drivers:pax_kernel - Enable pax kernel specific patches
x11-drivers/ati-drivers:qt4 - Install qt4 dependent optional tools (e.g Catalyst Control Panel)
x11-drivers/nvidia-drivers:X - Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries
+x11-drivers/nvidia-drivers:compat - Install non-GLVND libGL for backwards compatibility
x11-drivers/nvidia-drivers:driver - Install the kernel driver module
x11-drivers/nvidia-drivers:gtk2 - Install nvidia-settings with support for GTK+ 2
x11-drivers/nvidia-drivers:gtk3 - Install nvidia-settings with support for GTK+ 3
diff --git a/ros-meta/mavros/mavros-0.17.0.ebuild b/ros-meta/mavros/mavros-0.17.0.ebuild
new file mode 100644
index 000000000000..84de950bbc21
--- /dev/null
+++ b/ros-meta/mavros/mavros-0.17.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="http://wiki.ros.org/mavros"
+
+RDEPEND="
+ dev-ros/libmavconn
+ dev-ros/mavros
+ dev-ros/mavros_extras
+ dev-ros/mavros_msgs
+"
+DEPEND="${RDEPEND}"
+[ "${PV}" = "9999" ] || KEYWORDS="~amd64 ~arm"
diff --git a/sci-chemistry/molden/Manifest b/sci-chemistry/molden/Manifest
index e78207790325..a9128e66063f 100644
--- a/sci-chemistry/molden/Manifest
+++ b/sci-chemistry/molden/Manifest
@@ -1,2 +1,3 @@
DIST molden4.8.tar.gz 2969701 SHA256 314d9b9bdede2fd63d1e2f26e0212711576952244634fc28ea6c97ce2f7029b1 SHA512 11f2406e54a077d044369b5eee4a8a1c1b10f052188d33d4162af0151a1e76a1d5274d8788bbc3610905ff271b0bd2100990b77540a0290ad608bd5c29b839e3 WHIRLPOOL 838d66a4e17651dfd2bab893fa9b36ca8d722c879b9f10adb00c3c4e59974ae73e13060e6a559286c651ab35e1cea084049677277cc4b455e68a95c6c210dcf9
DIST molden5.0.tar.gz 3063244 SHA256 c9cf8f656adf2f2c7a8b8b64fa07b5feaa9c3ca36c4803e1f58ac33de1cffdc4 SHA512 bf45849bf4efb67bc552767c28a6df6e5106a7d8ac2d73db2c7218412fb6cd2f2785c2be83a8589a5664ba9c0ca052cef5eb155c665ee1f3d6c7fe208f806a6b WHIRLPOOL ab7f1118b000a8df36cbaf23fddabb21bd291a2388e3aa5599e609ffa792bec01bf7df52a98f7e70125b504f7866e48ec6d5ce029ecd0e40c7bab7b8627c5c86
+DIST molden5.5.tar.gz 4934764 SHA256 6514a317486fb4087d94afc929a646c4f30cab7ff79651deeecb30f03212c059 SHA512 45269d2c7a52b3b2bf4fdb5f4ca3912637b3414ff9dfcd0d4f23815b3dcf7a53ffee717420d4fbf286b71c972539e756a440f5e37b7b7325ab312c25fc6c47b0 WHIRLPOOL 952382f26e227236e98deec5350e2617c68003098a8954ee6eebb10c89039ae0abf60aa117f73e02662153838f26bc724f7b16e6facc0cf07d86ba38fa0c03aa
diff --git a/sci-chemistry/molden/molden-4.8-r2.ebuild b/sci-chemistry/molden/molden-4.8-r2.ebuild
index 943f7cc4fb05..11ac49c3f618 100644
--- a/sci-chemistry/molden/molden-4.8-r2.ebuild
+++ b/sci-chemistry/molden/molden-4.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,8 +9,8 @@ inherit eutils fortran-2 flag-o-matic toolchain-funcs
MY_P="${PN}${PV}"
DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac"
-HOMEPAGE="http://www.cmbi.kun.nl/~schaft/molden/molden.html"
-SRC_URI="ftp://ftp.cmbi.kun.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.cmbi.ru.nl/molden/"
+SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
LICENSE="MOLDEN"
SLOT="0"
diff --git a/sci-chemistry/molden/molden-5.0.ebuild b/sci-chemistry/molden/molden-5.0.ebuild
index e4ad3b6d802d..e46f9a0e790b 100644
--- a/sci-chemistry/molden/molden-5.0.ebuild
+++ b/sci-chemistry/molden/molden-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,8 +9,8 @@ inherit eutils fortran-2 flag-o-matic toolchain-funcs
MY_P="${PN}${PV}"
DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac"
-HOMEPAGE="http://www.cmbi.kun.nl/~schaft/molden/molden.html"
-SRC_URI="ftp://ftp.cmbi.kun.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.cmbi.ru.nl/molden/"
+SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
LICENSE="MOLDEN"
SLOT="0"
diff --git a/sci-chemistry/molden/molden-5.5.ebuild b/sci-chemistry/molden/molden-5.5.ebuild
new file mode 100644
index 000000000000..401aebb75106
--- /dev/null
+++ b/sci-chemistry/molden/molden-5.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fortran-2 flag-o-matic toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac"
+HOMEPAGE="http://www.cmbi.ru.nl/molden/"
+SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MOLDEN"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+RDEPEND="
+ x11-libs/libXmu
+ virtual/glu
+ opengl? (
+ media-libs/freeglut
+ virtual/opengl )"
+DEPEND="${RDEPEND}
+ x11-misc/gccmakedep
+ app-editors/vim"
+ # vim provides ex, which the build system uses (surf/Makefile, at least)
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.0-ambfor.patch
+ "${FILESDIR}"/${PN}-5.0-overflow.patch
+ "${FILESDIR}"/${PN}-4.8-ldflags.patch
+ "${FILESDIR}"/${PN}-4.7-implicit-dec.patch
+)
+
+src_prepare() {
+ default
+ sed \
+ -e 's:makedepend:gccmakedep:g' \
+ -i surf/Makefile || die
+ sed 's:shell g77:shell $(FC):g' -i makefile || die
+}
+
+src_compile() {
+ local args=()
+
+ # Use -mieee on alpha, according to the Makefile
+ use alpha && append-flags -mieee
+
+ args=(
+ CC="$(tc-getCC) ${CFLAGS}"
+ FC="$(tc-getFC)"
+ LDR="$(tc-getFC)"
+ FFLAGS="${FFLAGS}"
+ )
+
+ einfo "Building Molden..."
+ emake -j1 "${args[@]}"
+ if use opengl ; then
+ einfo "Building Molden OpenGL helper..."
+ emake -j1 "${args[@]}" moldenogl
+ fi
+}
+
+src_install() {
+ dobin ${PN} g${PN} $(usex opengl ${PN}ogl "")
+
+ dodoc HISTORY README REGISTER
+ cd doc || die
+ uncompress * && dodoc *
+}
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index e5e8a82361c3..7a097dd7aa21 100644
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,6 +25,7 @@ RDEPEND="
dev-lang/mlton
doc? (
virtual/latex-base
+ app-text/texi2html
)
emacs? (
virtual/emacs
@@ -45,7 +46,7 @@ PATCHES=(
)
src_prepare() {
- epatch ${PYTCHES[@]}
+ epatch ${PATCHES[@]}
sed \
-e "s@/usr/bin@${ROOT}usr/bin@g" \
-e "s@/usr/share@${ROOT}usr/share@" \
diff --git a/sci-visualization/yt/Manifest b/sci-visualization/yt/Manifest
index 5b632d605692..4ae1fc9d0d25 100644
--- a/sci-visualization/yt/Manifest
+++ b/sci-visualization/yt/Manifest
@@ -1,3 +1,2 @@
-DIST yt-3.2.1.tar.gz 7048102 SHA256 6c540a269ae3c84d6355da19ea9d8e5a7808e0cc069f803ea773502641ca7fcf SHA512 e2cc53d16f9ac5946e6830d3697baa132a519c95fa76f3ac5160e63ec928742e79aae02241bbf9953f79511d2b633d2d14744ff9e706288ff20141b0ce12033c WHIRLPOOL 1bb749136e30c62c2e40d5e0fa659d7549e0e6fdf75c5888e414f3077c555a34d157a3ac0225dfbbe0eebd02e1972a06a0a6c3683af14952bc88d959e4e8d107
DIST yt-3.2.2.tar.gz 7428532 SHA256 78866f51e4751534ad60987000f149a8295952b99b37ca249d45e4d11095a5df SHA512 5e8ad307103242cc75a4206b454653cb421bfaaa8e73fcf0a58197aa7adf39f5b1a5f577ee834cb64b68ab6734ec1bd32a96dc1dfe4ca6d85a08f09202c7b19e WHIRLPOOL 5345c6cdd0a57f81d74cb05d92ef64e3c251f08f75cdeccab8ad70bfded2d72262f6ab345ef111d0b023934bb96091c467f2996645ed6d45f6e422f2e6ff3d97
-DIST yt-3.2.tar.gz 23845436 SHA256 5c3b91b5886904c1a569b7d38c1ae574ca79b47adf7ba867a2044b4b55afacba SHA512 d3452a07c9d8e53d291816a73023d73bf97367f7f974dc0e52993af7a0e38675983295a52fd73b50a00bad925e3a7b780dfb75f588d7a59d8020539baa9847d4 WHIRLPOOL 742c3dca8ff4dd703dc93004bbb56d0957e8b5678c1fcb8c96d30586b8c65087b66e70e1440ae5e314f355a59edb46cab6c76d4224c96316bf0e5c064cc6bc7e
+DIST yt-3.2.3.tar.gz 8585635 SHA256 4d6ccf345d9fab965335c9faf8708c7eea79366b81d77f0f302808be3e82c0ed SHA512 4e77cea0370148678c816ecd7be9c7549a10e0ddd02c68bc2ea6c88f1751eec9616f5fa844781b317f2dda644dfee8ebaa2c5f6dfaef554902451295c3e6ef72 WHIRLPOOL 79df77314c8e5bc6b10d8f36d9e63174eac30b9387c7dfaa0def43555e6e2d09a4ba532276ff7971b4fe892f40a08b9c0e15f80c401d2696080fd6c185bf15f9
diff --git a/sci-visualization/yt/files/yt-3.0-missing_package.patch b/sci-visualization/yt/files/yt-3.0-missing_package.patch
deleted file mode 100644
index 164445bb08a4..000000000000
--- a/sci-visualization/yt/files/yt-3.0-missing_package.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/yt/analysis_modules/setup.py b/yt/analysis_modules/setup.py
-index 423fb52..f06d4e6 100644
---- a/yt/analysis_modules/setup.py
-+++ b/yt/analysis_modules/setup.py
-@@ -6,6 +6,7 @@ def configuration(parent_package='', top_path=None):
- config.make_config_py() # installs __config__.py
- config.add_subpackage("absorption_spectrum")
- config.add_subpackage("cosmological_observation")
-+ config.add_subpackage("halo_analysis")
- config.add_subpackage("halo_finding")
- config.add_subpackage("halo_mass_function")
- config.add_subpackage("level_sets")
diff --git a/sci-visualization/yt/yt-3.2.1.ebuild b/sci-visualization/yt/yt-3.2.3.ebuild
similarity index 96%
rename from sci-visualization/yt/yt-3.2.1.ebuild
rename to sci-visualization/yt/yt-3.2.3.ebuild
index 34cc28567419..cbf49d851f70 100644
--- a/sci-visualization/yt/yt-3.2.1.ebuild
+++ b/sci-visualization/yt/yt-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sci-visualization/yt/yt-3.2.ebuild b/sci-visualization/yt/yt-3.2.ebuild
deleted file mode 100644
index 9a3f6f55d48f..000000000000
--- a/sci-visualization/yt/yt-3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Astrophysical Simulation Analysis and Vizualization package"
-HOMEPAGE="http://yt-project.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="media-libs/libpng:0=
- sci-libs/hdf5:=
- dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- dev-python/ipython[notebook,${PYTHON_USEDEP}]
- dev-python/h5py[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sympy[${PYTHON_USEDEP}]"
-# dev-python/pyx[${PYTHON_USEDEP}]
-DEPEND="${CDEPEND}
- >=dev-python/cython-0.22[${PYTHON_USEDEP}]
- >=dev-python/setuptools-0.7[${PYTHON_USEDEP}]
- test? ( ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-python_prepare_all() {
- append-flags -fno-strict-aliasing
- sed -i yt/utilities/setup.py \
- -e "s:/usr:${EPREFIX}/usr:g" || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- pushd "${BUILD_DIR}"/lib > /dev/null
- nosetests -sv || die "Tests fail with ${EPYTHON} ${PWD}"
- popd > /dev/null
-}
diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index f6bb2c37914c..6d3a5ce61fc8 100644
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -50,7 +50,7 @@ DEPEND="${COMMON_DEPEND}
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
- kernel_Darwin? ( sys-libs/libcxx )
+ kernel_Darwin? ( =sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
- kernel_Darwin? ( sys-libs/libcxx )
+ kernel_Darwin? ( =sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
- kernel_Darwin? ( sys-libs/libcxx )
+ kernel_Darwin? (
- nikoli@gmx.us
- Nikoli
+ zx2c4@gentoo.org
+ Jason A. Donenfeld
web-apps@gentoo.org
Gentoo Webapps
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
cgit - cgi for git
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 03ab1863e0a5..51f12f3dcf12 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_49.0.2623.39-1_amd64.deb 48486470 SHA256 069e032948de5915b8a00408a81e923eacb283858bfcc31b57b9fa36952c305a SHA512 473bc2ca400755b4e870f90aa59450c619ee7e99073ec7092424af72757d0cec58882e742a708df7b9287027778d36da11842854f5f25d32f76fe63bde23b74b WHIRLPOOL b1f2636f7e9bc017bf1bc646d6e2657cd960f996d9ceb5a9d543239f1bc76dc72f4b4c242f88504d077571ff91689bdc09abb75b28721595fe0233cdf504966f
+DIST google-chrome-beta_49.0.2623.47-1_amd64.deb 48458988 SHA256 61d874cacab549e7113fbd1e011d7d7d993a36393223233a9b4b223b4299aa68 SHA512 8f3802a1d754520ec2f082809fd2937ea640e4bfabc80a7ed2a3692bb507e1ebe013d526be10dec52144828dd9619b2eed74b6aabb826280da280458c2c23c3b WHIRLPOOL 88b599128200eaf5d23e407779f98db5ac1e331d617571c9064f1ba5fb7d87dc1f28380f03d7fbe6744be5cc4366d54259fcdf66dd86f96b041eb1ea0f453bac
diff --git a/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.39_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-49.0.2623.47_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-49.0.2623.39_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-49.0.2623.47_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index de5bcf6cef71..1759c3bc9b72 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,4 +1,4 @@
-DIST google-chrome-beta_49.0.2623.39-1_amd64.deb 48486470 SHA256 069e032948de5915b8a00408a81e923eacb283858bfcc31b57b9fa36952c305a SHA512 473bc2ca400755b4e870f90aa59450c619ee7e99073ec7092424af72757d0cec58882e742a708df7b9287027778d36da11842854f5f25d32f76fe63bde23b74b WHIRLPOOL b1f2636f7e9bc017bf1bc646d6e2657cd960f996d9ceb5a9d543239f1bc76dc72f4b4c242f88504d077571ff91689bdc09abb75b28721595fe0233cdf504966f
+DIST google-chrome-beta_49.0.2623.47-1_amd64.deb 48458988 SHA256 61d874cacab549e7113fbd1e011d7d7d993a36393223233a9b4b223b4299aa68 SHA512 8f3802a1d754520ec2f082809fd2937ea640e4bfabc80a7ed2a3692bb507e1ebe013d526be10dec52144828dd9619b2eed74b6aabb826280da280458c2c23c3b WHIRLPOOL 88b599128200eaf5d23e407779f98db5ac1e331d617571c9064f1ba5fb7d87dc1f28380f03d7fbe6744be5cc4366d54259fcdf66dd86f96b041eb1ea0f453bac
DIST google-chrome-stable_48.0.2564.109-1_amd64.deb 48067952 SHA256 ba3fd26b9aafc5b747c979cf3abd5775e671b9088d5779d4a45c0a5b87f51aa6 SHA512 65af159affe7e3856d920ba0f1a2b1dbc2ec95cd310b1645ccfb5079cc83f1c639ddf02139a17247051e578262d6b2ca194e59807a5f5a8eb844d0d2c3714552 WHIRLPOOL c50ea6fdefd634f2ce6b26ae7f1ce52888fa364d16a5fab58960b8ba9c52f64d2365112d15c34726e9d9a980c6ebcb7692d0560b8bff4da8c998c7eaf1d147d9
DIST google-chrome-stable_48.0.2564.109-1_i386.deb 47625502 SHA256 e4d8652972d468c07f517617b13e15ad7d8e5d3f3d01bf0ac4862a6652ec3087 SHA512 ae8b870bb2bd2337aecbfc091bfb8f3f39bae31d088a45c2a599c552c838ce8aa9fb1631639f588033a8935a2fa6c31b2746492267f20f5c0b8c4d824fd411e6 WHIRLPOOL ba5dffb0822996179cc671e7261eee251d2979d0122fa9f468c5f12d94f6e69e62ed71b39cb0cfeaa7f2ad6c6190d43c3358a2c70e4bc90b742d6cdeb5d0a3eb
DIST google-chrome-unstable_50.0.2638.0-1_amd64.deb 48485834 SHA256 013a1fd1ab35db0b9e27965cf838e80a642ceb87f95fd1c75144071bc969b941 SHA512 688883ee5b4459b6c532c7dab630fbd6781a0604de23ae293ba9fbc1656c2bbcbf20a9dabafd6f66117ad2d516232a69a7e986e0d7eb0c24d52f08388f979bd4 WHIRLPOOL 943e52d51f6c6856f2d531b6fa6e0aa25a0ed67d5f95ffefa48d96417bcb2ed386a1d63e27ad3e6aa6fef2176a3456398dce8614113d2e077f3e86296f941db2
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.39_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.47_beta1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.39_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-49.0.2623.47_beta1.ebuild
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 34898ea528d0..a96a53b9dbaf 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -11,6 +11,7 @@ you will need to keep in mind that the major versions represent these different
branches.