diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index b3df3aa4ab16..426b419d2bc5 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -33,7 +33,6 @@
Build the apache input plugin (collects statistics from Apache's mod_status module)
Build the apcups input plugin (reads various statistics about a connected uninterruptible power supply (UPS))
Build the ascent input plugin (reads and parses the statistics page of Ascent)
- Build the barometer input plugin (reads sensor data from various Freescale and Bosch digital barometers)
Build the battery input plugin (collects the battery's charge, the drawn current and the battery's voltage)
Build the bind input plugin (collects statistics from bind instances)
Build the Ceph input plugin (collects statistics from the Ceph distributed storage system)
@@ -146,7 +145,6 @@
Build the write_http output plugin (sends metrics to a web-server using HTTP POST requests)
Build the Kafka output plugin (sends metrics to Apache Kafka)
Build the write_log output plugin (writes metrics to a file)
- Build the MongoDB output plugin (writes metrics to a MongoDB)
Build the Redis output plugin (stores values in Redis)
Build the Riemann output plugin (stores values in Riemann, a stream processing and monitoring system)
Build the Sensu output plugin (sends metrics to Sensu Core, an open-source monitoring project)
diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild
index 60a85a10f477..136055671806 100644
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index b6d422822e04..9039684df54a 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,6 +1,4 @@
DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
-DIST magit-2.2.2.tar.gz 244326 SHA256 08e61898e23dbeb3a152d82e58fc9f6c769fe36d35d87617dcd1e69b2f91b3c6 SHA512 fcb8a27597988fd29b824be58b145f483a492a0d199e505478cf7cab09068a608e5e9d314abda7e8954712c2db3012ee578c8a5bbdfd79e909a8b9d1ef45e0d4 WHIRLPOOL f45d4bfe3942d4203918b8c5309b640efcb9204d7a05f74df746349d9a49ae40df34d744d91388db23e718fc7579e303ea0a704d7f30235efbf63b9da360082a
-DIST magit-2.3.1.tar.gz 262976 SHA256 ee9574dc20cd078d62d669dc19caf8ffc29480a01184d6bc5e90cfa6c800ddf2 SHA512 3c640887263dd5284a446b396975495878b33f1f1b2a2d76f657beb921099acb27dd8a036cb38f2b00e21c0d30b3b412bec26921d3d960e8be79b28cd327c713 WHIRLPOOL a8d017f89cfb327e7ca5ef02ca6c0e90b67b6e80e5b403858a3c65d8c25d348f6a21f34a69ad4bdf06b0eaa5b850b0d107029a7915aef51f42a4f5a9c72ced23
-DIST magit-2.4.0.tar.gz 277515 SHA256 57b7198970d6f10f822964db67661313fed5c9ceff519c8eacc1003328a96af1 SHA512 5e06064c5baa38e279f4fcba7d133bf2e00d3eaed55af101f792f5ef894353aef1d71d0d62e4d5f10f6853f81f4d89daff026518476c465830ac51c221d94ec0 WHIRLPOOL 82f98830a93a3d36288aedfc4f7d30d7b8b26521f2b4c241c5f63acd8ed20fc1996ce4a505ba83cd36426d937dabf779fdc7351353eb4c5710cefdf906b28aa6
DIST magit-2.4.1.tar.gz 275628 SHA256 f53fc3cb94692d3f3c157f1156be373c763cabefb9e524b4a3b5ccb56a74e8e3 SHA512 a2ae4749766f7353e4042fa4200a8575933516554ba64e5ea3a76d587cc002d2a89da089eb85776c9940171a2b8c09f60f10303ae5208610445357aa8c488224 WHIRLPOOL 4b9dd74c99a915ef0c92bcfc608c8bdb23acd1fa7f454ac994bf748b08fe67c873559ea4a5f0c9d494ca80c178c2bbe447dcbdf2e3e747352c1cbe31e3c4d1ed
DIST magit-2.5.0.tar.gz 269518 SHA256 aaebcea4317c5f3a92f4d106e5196e5803171f6251c1c69c9f84fdaf4bbfd844 SHA512 02cc70bff28263351a781bf695bc3013e20bcdf027ce3495230928705ffdef9afd588d7de689cb40427ecc5fe4a6df1ccb2fb53321521db99dea2a2ddac2435f WHIRLPOOL a8d0cce7bcb9348f3ed7c53b7fe65a50b54c75507588235a1c5bd029c490ed4f61582cfb686fdb93e1d3c1a6c7ca42f5ef6afbb3b097a429deb4e89d62e73e4e
+DIST magit-2.6.0.tar.gz 274545 SHA256 39d2e883836c05c88b908aca6bceba839b266524cdf936e0f9d8a3108c2c7512 SHA512 5d66a4ca4f3499bbddca027e75c3e28e27120f4950328a59888105457745d0ca47f3e7c1d6a69534fee92abcd5f00ea2c378440c996f4f2799fca37de76b8478 WHIRLPOOL b4291cd29a58bf489709f92927002cb1761a80ca6eb697991392e91942e7f5968092482a507e6579c09ac5371cf6c0d877aa5ca6c84aa86020b26b86fa644692
diff --git a/app-emacs/magit/magit-2.2.2-r2.ebuild b/app-emacs/magit/magit-2.2.2-r2.ebuild
deleted file mode 100644
index acb718137f8b..000000000000
--- a/app-emacs/magit/magit-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="http://magit.vc/"
-SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.12.1"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-emacs/magit/magit-2.4.0.ebuild b/app-emacs/magit/magit-2.4.0.ebuild
deleted file mode 100644
index 5df1d3952619..000000000000
--- a/app-emacs/magit/magit-2.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="http://magit.vc/"
-SRC_URI="https://github.com/magit/magit/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.12.1"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-emacs/magit/magit-2.3.1.ebuild b/app-emacs/magit/magit-2.6.0.ebuild
similarity index 83%
rename from app-emacs/magit/magit-2.3.1.ebuild
rename to app-emacs/magit/magit-2.6.0.ebuild
index 5df1d3952619..cf776f7a1f49 100644
--- a/app-emacs/magit/magit-2.3.1.ebuild
+++ b/app-emacs/magit/magit-2.6.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$
@@ -20,5 +20,5 @@ SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="../Documentation/*.texi"
DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/${PV}.txt"
-DEPEND=">=app-emacs/dash-2.12.1"
+DEPEND=">=app-emacs/dash-2.12.1 >=app-emacs/with-editor-2.5.0"
RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 9b6abe5e8247..250b28ec1d98 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE=""
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index daeea60263c0..71aa79b6e1ce 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,2 +1,3 @@
+DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
DIST sigil-0.9.4.tar.gz 18084460 SHA256 97872d88e1b55de638f77add19d95f867b39fa919ed98bfe7a7e11b0bc44c168 SHA512 dad5d44061375da99748d767c0cc288e11d02cc475c239b7709b4ace36cfd0deec8b2a5bcd74431e0465e1cd4d927bafd094ba238aec06bf40ec62d43d568cc1 WHIRLPOOL 5ecbb09f373e976f716dfc2c95d504bb92f40bf5cc42f0b09c90430ca67141e1e0feb89cdabcc1fac225b1785a3bf443299dd8eeb8dd39824f044c9a32a81f52
diff --git a/app-text/sigil/sigil-0.9.4.ebuild b/app-text/sigil/sigil-0.9.4.ebuild
index 22683ba89645..acd68646010a 100644
--- a/app-text/sigil/sigil-0.9.4.ebuild
+++ b/app-text/sigil/sigil-0.9.4.ebuild
@@ -46,8 +46,6 @@ RDEPEND="
sys-libs/zlib[minizip]
"
DEPEND="${RDEPEND}
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
>=sys-devel/gcc-4.8
virtual/pkgconfig
>=dev-qt/linguist-tools-5.4:5
diff --git a/app-text/sigil/sigil-0.9.5.ebuild b/app-text/sigil/sigil-0.9.5.ebuild
new file mode 100644
index 000000000000..ad8e7cb8fed9
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+CMAKE_MIN_VERSION="3.0"
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit eutils cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-text/hunspell
+ dev-libs/boost[threads]
+ dev-libs/libpcre[pcre16]
+ dev-libs/xerces-c[icu]
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/cssselect[${PYTHON_USEDEP}]
+ dev-python/cssutils[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-qt/qtconcurrent-5.4:5
+ >=dev-qt/qtcore-5.4:5
+ >=dev-qt/qtgui-5.4:5
+ >=dev-qt/qtnetwork-5.4:5
+ >=dev-qt/qtprintsupport-5.4:5
+ >=dev-qt/qtsvg-5.4:5
+ >=dev-qt/qtwebkit-5.4:5
+ >=dev-qt/qtwidgets-5.4:5
+ >=dev-qt/qtxml-5.4:5
+ >=dev-qt/qtxmlpatterns-5.4:5
+ sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/gcc-4.8
+ virtual/pkgconfig
+ >=dev-qt/linguist-tools-5.4:5
+"
+
+S="${WORKDIR}"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_prepare() {
+ # sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+ sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
+ eapply "${FILESDIR}/sigil-0.9.4-proper-gumbo-install.patch"
+
+ eapply_user
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_SYSTEM_LIBS=1
+ -DSYSTEM_LIBS_REQUIRED=1
+ -DLIBDIR="$(get_libdir)"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ elog "From Sigil's release notes:"
+ elog "When you fire up Sigil for the very first time:"
+ elog "navigate to the new General Preferences and select the default"
+ elog "epub version you plan to work with (epub 2 or epub3) so that new"
+ elog "empty ebooks start with the correct code."
+ elog "if you plan to work with epub3 epubs, you should change your"
+ elog "PreserveEntities setting to use ONLY NUMERIC entities."
+ elog ""
+ elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
+ elog ""
+ elog "We strongly recommend enabling Mend On Open in your settings"
+ elog "for best performance with Sigil."
+}
diff --git a/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild
index 929f63093ded..32f1af1487b1 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/libintl"
diff --git a/dev-python/flower/files/flower.initd b/dev-python/flower/files/flower.initd
index bd2008fc2f9e..8464cd2e511e 100644
--- a/dev-python/flower/files/flower.initd
+++ b/dev-python/flower/files/flower.initd
@@ -8,7 +8,7 @@ pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
user=${SVCNAME}
group=${SVCNAME}
-command="/usr/bin/${SVCNAME}"
+command="/usr/libexec/${SVCNAME}/${SVCNAME}"
command_background="true"
start_stop_daemon_args="--user ${user} --group ${group} \
--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
diff --git a/dev-python/flower/files/flower.logrotated b/dev-python/flower/files/flower.logrotated
new file mode 100644
index 000000000000..7a0ce640a908
--- /dev/null
+++ b/dev-python/flower/files/flower.logrotated
@@ -0,0 +1,7 @@
+/var/log/flower/flower.log {
+ su flower flower
+ missingok
+ size 5M
+ rotate 3
+ compress
+}
diff --git a/dev-python/flower/files/flower.service b/dev-python/flower/files/flower.service
index 5220d89fcff8..dd2f1d9da105 100644
--- a/dev-python/flower/files/flower.service
+++ b/dev-python/flower/files/flower.service
@@ -7,7 +7,7 @@ After=network-online.target
User=flower
PrivateDevices=Yes
Environment=_FLOWER_OPTS="--conf=/etc/flower/config.py"
-ExecStart=/usr/bin/flower $_FLOWER_OPTS
+ExecStart=/usr/libexec/flower/flower $_FLOWER_OPTS
[Install]
WantedBy=multi-user.target
diff --git a/dev-python/flower/flower-0.8.4.ebuild b/dev-python/flower/flower-0.8.4.ebuild
index bbbeb2ac7a57..4a2a0e77cd3c 100644
--- a/dev-python/flower/flower-0.8.4.ebuild
+++ b/dev-python/flower/flower-0.8.4.ebuild
@@ -44,6 +44,12 @@ src_install() {
systemd_dounit "${FILESDIR}/${PN}.service"
keepdir /var/log/${PN}
fowners ${PN}:${PN} /var/log/${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
+
+python_install() {
+ distutils-r1_python_install --install-scripts "${EPREFIX}/usr/libexec/flower"
}
python_test() {
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 41e622ab6098..473cd000586d 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1 +1 @@
-DIST keystoneauth1-2.3.0.tar.gz 149266 SHA256 27262621a8e74fe296f3c23a4b43dc9c1422670e89568626eb511163cb1c567c SHA512 e41a84e46247abf54073d8aa978d5e0db8341bff6507d9cb7079230381e10ccd7f72f5478849c37d8e914b520392762270bf0495d0945e7a7b3e5cd72fdced34 WHIRLPOOL 41fe83b35055975ad4ff99a387e30aa512ea071856034ace7804b3ea6f7c9378f4b2268b9df023e92ccea92807b47bdfafffef9e964336acca36599c288654d2
+DIST keystoneauth1-2.4.0.tar.gz 151550 SHA256 4d7fda675f47cab4456f0a4bae91899b37f38d540a6f0972a93935c75df8cb53 SHA512 69614a96cddfa6652ba5ca0abcd44305be605c1b1359a62aadc8e5315a9ddb3442eef677688e8646feaab0d184d4a9c96071effb1b2b9044b7362c1727868ab6 WHIRLPOOL 91994ee1639e5f8da3a85560a53b61fa71ed8653d11ff897b05d06c7c3fb06b38803e0488fdbc9d8b953284f2b2a2fd7c6136a38f1aa3b4e669fb5daf044c69d
diff --git a/dev-python/keystoneauth/keystoneauth-2.3.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
similarity index 100%
rename from dev-python/keystoneauth/keystoneauth-2.3.0.ebuild
rename to dev-python/keystoneauth/keystoneauth-2.4.0.ebuild
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 93b08ee1e508..b9ecde8c75ce 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -4,4 +4,4 @@ DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 e3fca3fdc093d7fd3817bbd767fac
DIST keystonemiddleware-2.3.1.tar.gz 181764 SHA256 9970f8187cb0a91cb2d78ef9a088147b2c9457653e95caa7b8bcd11bd450bec1 SHA512 976aece1d308607eec6f406bb94f1e6dddc27edebc8d99bd7bc00dfbc1f21479da2c76404a99eb677e6647afd42f68b82d6f519659d7483db6fa9d68f839cf5f WHIRLPOOL e6a568e7c96886907eaeba9bc843833ffece8f441bfbe760b77c597c38a5a2720b702a527830d61f07bf0e3adbe4a90d6198b97b487ca08c3e4829058f7e0ef4
DIST keystonemiddleware-2.3.2.tar.gz 180429 SHA256 ba4a3bc6224d8ba85319741034d3c6f0c569096e38c6f75a5f044b1c742feeb3 SHA512 ef3a36cd8daa2456b960b9677f06d3753ed3eb7bad83b5d32a1fb2e69239237a495649b5c8138b92b1ab2b6b8e7a8db9e1d02dd7c595962f82681c478e5dfb78 WHIRLPOOL 846b4efdb61a0680d6a71cfe7605c88c3e908c0391b974ba6517c0122a2720bbc5b8990c41907a306ace5d0d25f9362260acc44dfd8e7c9e8dcf6b19213fcda8
DIST keystonemiddleware-2.3.3.tar.gz 185140 SHA256 3a71fdd81d835dbf95086df29bed4f72a05f6588a193ee207877cdb954b9d155 SHA512 cc5a9d5d7411e59471993deff33e71198fe0124252f668e01dc32f84dd2cec56a3256c3a1f05c5f9ed15c25598472fce79a26809ed34123ad10fb90aa8bfde7a WHIRLPOOL 88cf95922b4f32e673b0c77ee95a4effc2f0a65aa3118d5e49c0f25ba83e356bd1af4aa05efe71dc69c1bc3453fea132eab3c53d24815edf1aebcebe01beeaa2
-DIST keystonemiddleware-4.3.0.tar.gz 195199 SHA256 c78def2359359a35d349cf38c53f2d2fdd109fc6debe14ee4c31837e64210b02 SHA512 1adf923ebf8896de21c86d9ddbbec26567f873f3819b4cd5d145cb89b3db963457b1529083f96423967c9b504f12e532ec125cf2009634746cfb1b94772ecb47 WHIRLPOOL f006000815af7329fa1288cae47a1a450fdaf361ff5cecf6ccb6388c040f027011048ccea608b7dca8d5f8450f3c5a4f29194ecd1c9310997a1a830e864e0935
+DIST keystonemiddleware-4.4.0.tar.gz 196504 SHA256 65d574c0bfcd0152391ce5d32261702f9e44736c3c80f22447961d682ebc8367 SHA512 0f42d5d28b81538d4ee8ecaa563d671dd62b19162661edc3959b564bc6143750f31f6946aae494c42934f78954b9861c45212f4f19c1460b73351f1ab9dafc4b WHIRLPOOL 81c94eb7e9b72e46ca1312af800ab131a12aa3ee32318e1181fbfdfdf540e8a3a5c1348217b3967b50efcfc05c67412f208bec15e19de5e46f42d40112ac0908
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
similarity index 96%
rename from dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild
rename to dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
index bdd0f16dd138..52b896ae2ec7 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.3.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.4.0.ebuild
@@ -45,11 +45,11 @@ DEPEND="
RDEPEND="
${CDEPEND}
>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/metadata.xml b/dev-python/metadata.xml
index cbb601aa95eb..6b3408aea694 100644
--- a/dev-python/metadata.xml
+++ b/dev-python/metadata.xml
@@ -22,15 +22,16 @@
z językiem programowania Python.
- De dev-python categorie bevat bibliotheken en hulpmiddelen voor het gebruik
- van de programmeertaal Python.
+ De dev-python categorie bevat bibliotheken en hulpmiddelen voor het
+ gebruik van de programmeertaal Python.
Nhóm dev-python chứa các thư viện và tiện ích liên quan
đến ngôn ngữ lập trình Python.
- La categoria dev-python contiene librerie ed utilità per il linguaggio di programmazione Python.
+ La categoria dev-python contiene librerie ed utilità per il linguaggio
+ di programmazione Python.
A categoria dev-python contém bibliotecas, utilitários e
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 9719cf457e35..1b2fe487ef31 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,2 +1,2 @@
DIST os-brick-0.5.0.tar.gz 63340 SHA256 a63e761c74ecd0214ea5dad67cefb1e9b67bac74706ccd3338443505cbf405e0 SHA512 07fbcba60c53a8f5b123770bb7df5336ed92c7e668898e1c893989928492d76e1aada434fa7c9d8ac8e21f2cc22a4e2fa1e7792067f092ef1183724077183a05 WHIRLPOOL 4241dba5bf45608d1aaa321bce39ff5b960b81c8678bdefeac6692a4d6cf344cbd54fdfdd4b55d4ff6bfa8afba6e0d882497fb6f2a50241dc79352d551357433
-DIST os-brick-1.1.0.tar.gz 89877 SHA256 a4ef50e7977f778994ab0914fbb68c5e04f730d3d429495337e980bfc962f512 SHA512 8c7d264f60114a4330d9fd8bf84f7075f9b9811861645310fa85e98bafd44f216912ca73938458716deb5f9d21cb5a3c29a5d3f1d9e48d48f01d2efda11d8c2b WHIRLPOOL 19fa3380523af182b1b0dc17fea8035dae3d42ad59d90248b1e0bd6c217a362e3a081868a4c4e44405211d27d8d9ebd9a2f9b78d0f3e7217182a4eb9238d1130
+DIST os-brick-1.2.0.tar.gz 90245 SHA256 e8c5931d2a5115a7c484276add6be6b5e3ba13402c8a71e32b2313448010be30 SHA512 9e35d4244f53d495824d7da5dc7cde117b78d0bdbf1bed6234848ce6b965ddb0fb88296a54f76915bbdf1cc337ca308c46f48814c5fa6877979debae3ab58628 WHIRLPOOL 7b7e1bf264313db1d8cc9c2e1966bce7872e755bfa043c38d81a54436ddf3cf0b1362618d4131f1cf947823c775286e32b9adca2b14887e679ff8def35c1fe72
diff --git a/dev-python/os-brick/os-brick-1.1.0.ebuild b/dev-python/os-brick/os-brick-1.2.0.ebuild
similarity index 95%
rename from dev-python/os-brick/os-brick-1.1.0.ebuild
rename to dev-python/os-brick/os-brick-1.2.0.ebuild
index 2cff5ccee6a1..47b4fa06950c 100644
--- a/dev-python/os-brick/os-brick-1.1.0.ebuild
+++ b/dev-python/os-brick/os-brick-1.2.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
${CDEPEND}
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index 0ba39d6962a7..1ee48c98e91b 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1 +1 @@
-DIST os-win-0.2.3.tar.gz 126677 SHA256 2e04357eb99705c9be91a240c84e6dffca5b12c058b8baf9344b508db0e96da0 SHA512 7e4b8f2b851c796cc1afe7db3b1512fc33da2d9365d3dc869badf49a20ea39ca65ba184af892f8b091f757efffec51db0921e49c5eee65cb7dc09039a6870e92 WHIRLPOOL 20efe53e47ea9b976e414518a9c9de0abb3d5c379d46ca933d8b29137c21684e2c18088b5ae35f1a3817943902b00cf96fb98bfc5faee9f3c80e2c6d57a58211
+DIST os-win-0.4.0.tar.gz 134421 SHA256 369d9483340ab48a5c145e4863082d2c611a02a467b7609227e3432a26880283 SHA512 6ffc33c8dbeb834ee588a8b84fb3fc6d7f6bf886d22307cac46c6f769c0d645bc76fd432be0cd8d3b76d0119ef6f5fe3276482cfda7880462f7af6969748a53e WHIRLPOOL 6c3c643b3992f98eb8551d19d067e8a56809a10005abf0940c270a77c4f1066469b367045c6e1be9f453b87db67f4f7fe9d3f614589887bc0e5d1d46c62b2099
diff --git a/dev-python/os-win/os-win-0.2.3.ebuild b/dev-python/os-win/os-win-0.4.0.ebuild
similarity index 100%
rename from dev-python/os-win/os-win-0.2.3.ebuild
rename to dev-python/os-win/os-win-0.4.0.ebuild
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 647f374e55c2..4372a6ed7964 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1 +1 @@
-DIST oslo-cache-1.5.0.tar.gz 36204 SHA256 a8810cac4b53535e26d9c12c75c49e08387c54577f2973379a8ff4bba45f418d SHA512 aeb9ec97c9b964b1a897b929426082a6a3900dca9b6e86a203338603fc94b57d3327e79a1b6ee2bb9364041b014e8a5b9e3ea330937d79f32ff111115fb3af0b WHIRLPOOL c0c1fa549f656b7eddafc08b1611690adb46b2ac0f4be1f44efc265dced9c06ec9744e0e923f2c857d00b4526fbcbc7fb13711734ac4a33a17116a376ce4830b
+DIST oslo-cache-1.6.0.tar.gz 36037 SHA256 c357671fb642822924d063b8151e132a6e7a65189c6c35c3f22c64ae0b0bdda8 SHA512 48ea43142d8221a61556ccccbb3c64e8708a1af04514b28dc22049a84d00e14253c9577d05321ef6de62ddc9120789942a82f231f1d7eeca2e5adf2d92ae04d5 WHIRLPOOL 8d06791e971fd6d9e3f49ade330b3c2ad780b162f953a5f9f04d40568efac7b38ae997f53ba315c38af59715d8be95cbab3dd3df051fa1b685b763476bbaf5a6
diff --git a/dev-python/oslo-cache/oslo-cache-1.5.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.6.0.ebuild
similarity index 100%
rename from dev-python/oslo-cache/oslo-cache-1.5.0.ebuild
rename to dev-python/oslo-cache/oslo-cache-1.6.0.ebuild
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index dc75d256d2ea..c5674beef1d6 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -2,4 +2,4 @@ DIST oslo.concurrency-1.8.0.tar.gz 52531 SHA256 2070e04106d9d3bdffdd9729a1f0b62a
DIST oslo.concurrency-1.8.1.tar.gz 53044 SHA256 12c5339c9263c994feb5c59290f7fb0eab12d6b729284efd01dd324c95bdecbb SHA512 227c16dd6916bd48ec937520650196b80bbbdf3988e7d6095eecd1ded601e207f24f63598881276591403e3b7c6e85f9adcce5a8ca210f82cffc75eff2351422 WHIRLPOOL 48bf1ffd9b04d0c5f199a8a6ff2deec6e25557a5af680450d30441b715edf0fea986c6620fb9a0ab722b13ca5f4664d39450db5e23cc96a331ed65532abf7a5a
DIST oslo.concurrency-1.8.2.tar.gz 53278 SHA256 149f4c972916f14c14c97d7be7b92ba59497c1bbd09c114ee3681bef0773daca SHA512 b73b52cef9dca932b8d0b737bd544f0a6d138de701aa9d2309d6e7698af337e4aea5cbb47c78c2ebda14abc164b8cc2b40fee6c8e92a30ee674318f436cf3b94 WHIRLPOOL 1ad6cc6dc0d339b2bec4959539fdadfb0914b1677005e250b4e74da3be97310474d20514003b0c0f50a4c6dff021ac8efa25e1f9b4502f419ab9763117caa16e
DIST oslo.concurrency-2.5.0.tar.gz 35903 SHA256 279c7cca885f69cfb7b3b50d686cd3d7c8d50dfb8eb13aada01bf733ef5ccc45 SHA512 866c3b7ea938c2b1fed7a004a34398b99fd6b084ca3c709a8448464f4845445a16fc1a016ea30b391190625ac53bf6756509dfbee28c89000f689743622246e0 WHIRLPOOL 0067b6d3089d94c41491e5e208392bad7cd7eebb9d7ba9c5300b985cfbad924273c30ec575674ba2177fe4ba3b17fe2dcd709c778753b013989bfb285070aa2b
-DIST oslo.concurrency-3.6.0.tar.gz 39546 SHA256 21726ea22125ec3e6076cc13b64ef25b60b31b6eca646c57f0d152f295695353 SHA512 561f3e99f8e2a013b381b95f035a3bd7da5cc3989ba93019fd2abffcdec71cc4cef17b71c1eaf34922a90f0241d9551e5214f71f6fb1c17b83b3033d0e63dfe1 WHIRLPOOL 2cfc1adffb83e8fcd910bcab075a1c5c8a4f0ed4ecebb9cf74428b86ca688b031bac0cf3fabf2951deeda68228f4b4c46e6c9ff0a45cafa52669b5c98985b879
+DIST oslo.concurrency-3.7.0.tar.gz 39703 SHA256 30021612be662827b92cddbd522e922b038a88b2e071d3a7c489c89523f6ac32 SHA512 6be8b6e07278d53d076d382fed92ac5c79e957279791193aeee5023ce0beb466e76819ba0659178554994ae6af9968ce8a3d6159c5c03bb9f50222eeb6430c9f WHIRLPOOL cc196fd07c99c15fcc8747099273c4b8d38e4d785b0f58fa647035a748e3a71f9ff545249ca6e7dc66ca41d1e433d2ee40f1329f2a53fadb97db023be6c9cdb7
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
similarity index 97%
rename from dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild
rename to dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
index a9c8b22193e6..71c155b2f89b 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.6.0.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.7.0.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
virtual/python-enum34[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 615fbbb6f301..5bb9d2ef7ef4 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -5,4 +5,4 @@ DIST oslo.db-1.7.2.tar.gz 134542 SHA256 e10b1bc9b128aaeae652809e1659ec2d2f64e2d1
DIST oslo.db-1.8.0.tar.gz 143208 SHA256 0688ced3c34c975e2a68139e0f91601ef43c79fb73308d75674fdc40d30a2d4c SHA512 c97fd671572dc1fdc2bff642e5680f1b8910c737d295ff8d79bed6e4886de46216361de47c1e7f0ac88315988b7d1cd448d6cffff58d906524d8f9ec86d2e582 WHIRLPOOL 70d72ac5f0baf1c01eea040908a2b35336f793b3c7968f218e83a2c1699fd7381ca84cabef9a612069020a1292c3e195047a5795ca6fd9c62b961c68393b3f38
DIST oslo.db-1.9.0.tar.gz 143040 SHA256 028ed6a38c1ed6d39d04f3dc2d7b7e2e0aca3cf53e72e145c3c07a5a0fb80eb8 SHA512 2131b2641502007b9b42aecbcb7e83a0cc90527edda2df91d52507dc58f0418b0111c9fb22e9d8bcf40ed53588adc9f02bec1b3df5788d99c775c328c1b3118b WHIRLPOOL f6205bb8e06efaf549d433c236069a5f0432cf49d1c64aadab0617f7badf4b6ea1a7277e42da1f62428c81d33f802adbb8895daf3cbbf9bd0e3e95f475a6bc80
DIST oslo.db-2.6.0.tar.gz 133772 SHA256 07fbfc19ce8f84de47819a66dcd86c2ce95c7203a4de68924165ffc367ef22ee SHA512 1371e56ed65923e3e624d6551e18c9623b8b3f6adbfcfa08591a6e3771432d4d9e88bd0bcd57ea76ffeb7bb49a476ed1a4b8a01969a2c0d3d317865f26a5ab45 WHIRLPOOL 50975dc63c339dcc0344fd897f4e5e2f655f9bfc7db642fd4a4871be760abecddc6bcb5ff4bf4c06500697069ed5a090e52e90107e90cbcd8ffbb07a7cfcf08a
-DIST oslo.db-4.6.0.tar.gz 140297 SHA256 77cb1940b319820da5b3aec76f7d142c80f74c898152cbac1ba17661b044d8f3 SHA512 8ea7b92923d2b1de549f7b7e7b915335a8f935e2535eac61909c62df1c8f6ac228d021f52a06141339371a044badbe8af3157dc527258724911b47fac3626afd WHIRLPOOL 685e4d1206bedded4b9c3e43dd8af8cb0f39a10bfffbfbfd4eccb87e28333e1fea7f970d73fd568014042070a490a1f644fd7a46889f657425a64584d1916ff1
+DIST oslo.db-4.7.0.tar.gz 141288 SHA256 d8110193efaed5fa13b22171dfc7c1bf4aae4fcd7f1bc95186279d4598a56f49 SHA512 efe699fa32feb65f84b08d97980e9ea87262782ca818546eabd683aef5b75e6c4770bb49d1c433b2ccfc6a31da76e565494dc56949e81d1e815a69dc9d148ccf WHIRLPOOL 462dfa6baa68c741d9c9b1d753d4037b9dc23b66a40e3630af1eb581624234401dc1456774b4c9ff84d2e5567398e50240241404e3a86eecbefde47abea86031
diff --git a/dev-python/oslo-db/oslo-db-4.6.0.ebuild b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
similarity index 96%
rename from dev-python/oslo-db/oslo-db-4.6.0.ebuild
rename to dev-python/oslo-db/oslo-db-4.7.0.ebuild
index 5f749d478cba..6cf10653e254 100644
--- a/dev-python/oslo-db/oslo-db-4.6.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
sqlite? (
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index afbbb8ece79c..50f875e3e80a 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,5 +1,5 @@
DIST oslo-i18n-2.7.0.tar.gz 36899 SHA256 9f510fd251510ca670ef876783a1727f67fe7a27595d772057273d33e4664f86 SHA512 c0733c63aa64046cf693676d43bece82a75f962e260d1e46f76120ada0139459184016c81a9a760d71493e414c0eb06311c9b89cc713d11c022a7faca4d46ab6 WHIRLPOOL dfb922bbf520d2a1e1691d865a0c133d0633572ede58c0ba28e51df08e5f9ad70ff40e31722b1612778ad0f96ec231978579f493b2db7b433ebbcee1d234f68c
-DIST oslo-i18n-3.4.0.tar.gz 36201 SHA256 8de65e4cc94c220f67895e4230df243e7555d92088b7d44724c8407d37fd277b SHA512 53913d0a955143e7236cfc7be537e666b0704f92718e88b393332636fdad7ebe78f9e193bd40338cbeb305b6417e10abe17b0343f12363a11392bc341a6b6e12 WHIRLPOOL 08ec0910c8b3808131a6217435459ebf4a4c5df545fdf59a7a73102b27a172a9e6cce674fc5d17832a1354d0d20030a4f60ec2f07a6d60b3ae61182c409e8f29
+DIST oslo-i18n-3.5.0.tar.gz 36093 SHA256 5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10 SHA512 156b28fa1db65a57a8db2744d72cb5db2706ec773746e676895121c0d6459f4806d826b76428841ee7124c27eba281095fa50d64cbb68f82133c41560ea15950 WHIRLPOOL 8d599b0e989c650d305c0f2ad85596971e6b0e3c5a8f8daa00ba76b9fdc8cdf5486a346343123247efc8dbaf4d7825a62b5340a957c7e7881c2483ea051e90e1
DIST oslo.i18n-1.3.1.tar.gz 35050 SHA256 8e1b9b3f87cea9e43a2414bb02d8c79b0a688c916afa1f1453f6a0a65ffd85f6 SHA512 987beef5e59b213988001fb53f1b2e41b122b830bd476c64a4481f7650db45d31d66c94d79da26e1fc346035393c00a63febb1254d3ab881ce3d2b00398c5ac8 WHIRLPOOL 7b590d93c478d855edfdfba8a31dac491913426100c8e216cfd4b82ff47b60f98b34a56ff69e2af49d0c16d3e2ac1813731527ab21bb4f9fe2f33dc5847d0835
DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
DIST oslo.i18n-1.5.0.tar.gz 36068 SHA256 cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70 SHA512 20a640950b7e0eef69371eece396fc6b284c87e195b98a98ec689f207f9ab4f8a41c70cac1c64b0f68621742b6e9da8001d422f67242a3e03e6b4cf09d8add96 WHIRLPOOL ce22737d5285abe18a7e62d01894da59f7d1068a0d16dd055ba62d40888bba7d1408f3d739bfa6a5da7f7149fc84f3794067db4562538f7cee99fca3871924ac
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.4.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
similarity index 96%
rename from dev-python/oslo-i18n/oslo-i18n-3.4.0.ebuild
rename to dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
index 9c04118cb95d..e1125b335b1f 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.4.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="
${CDEPEND}
>=dev-python/mock-1.2[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
)
doc? (
${CDEPEND}
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index c0869e09750e..9154cf02f029 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -2,4 +2,4 @@ DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404f
DIST oslo.log-1.0.0.tar.gz 34366 SHA256 3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a SHA512 420a019592778e69cf339617d21b2eabde8220709f9067bbfe61ce11b8defc54f6635b8f120557b032bea15eac936ad4957e23f9f041556390c9e0b641ca0c0f WHIRLPOOL b579fe52acba0ca5957a55b6720862ef7343d0f41157e667f7bd63e57c6779af683cbaf083440c98a1cf0184cc162eb91b64a52a1a19c1e9732a7eb4ce8530c7
DIST oslo.log-1.1.0.tar.gz 40991 SHA256 a568d567a99443b617338e4a9f120d3c866896b99e5aad2eff1bcfa448ea7e28 SHA512 761324c6a48e6c43411c44a741c7c8e38bdc0ad08e1eeadaf4efd3b264e00c428042b873bc294a0176bc0831d7a612d08e49da838611ad66e2954a7547cc42a0 WHIRLPOOL f680ce7722818bb3d1f2e682bce447ae37fd16a1ba066ac264c5c7ae1b29803c3c12e33138d6b66afcc5e222a401526f1b1eb07f294974551eef0184e83e575d
DIST oslo.log-1.10.0.tar.gz 42768 SHA256 9f2addc788f8b316a76cd2655e5524ad962b125cd62187896f0b8c2563d75aee SHA512 4a3ec2b439c469d61934250a1a9c74a6afaf62a4ed8e7cf119a9ab1a49f120a03aa1df06e351b8e2445ef487f2a9e2f29f5c8bb2892d408ff61d26352b8e0274 WHIRLPOOL 4a9dd6f52526cee3a5cd486a4bb7a60bd70ebc382e86ffec204d5574e3c7620713ff745a20f84ba8d33c5a438589bd11038e5ff602fc79ddd9c5c44bf24d2fad
-DIST oslo.log-3.2.0.tar.gz 56001 SHA256 6b2802eb1381c960dd10ed6dab5941ecb1e1e2eff39d621844f6ec771c76a4a9 SHA512 3214043ed4904c80cd1cbdc61ae32a22afd96ca255e3a0a8767b46072900a1420850a28650776211b08eeb40f1178a933a0e3f2925ba023c877c8417fd9e08ce WHIRLPOOL 8abecefad537cbf52d67ed11ab40cd5273ce475a3d81a19340ff7eddabbf0d3c9ec01eafdd0d8eff61abf0010829300859555636d950762f6db526fb076d042c
+DIST oslo.log-3.3.0.tar.gz 56039 SHA256 b3414b6f3b05f50571d8973543227f0d6445c297ba762262adfc28b704f8efd9 SHA512 77258a5861db25f46d1148a55990f9b708563837e5dbb2123db1074a837ffbe88b4fe3e788b23fbf2af3aa9ef1a0204d1ce3ef37215bd8265e0559f3d780f882 WHIRLPOOL 2ad46f549514b3cc098b65d3ecc7e73ccad078b3652398cc98ac32302b0ef62cf8c26b057c827cea12ac38bb38ee15c419f5e19f33d17dc18754d0e0c3100a8b
diff --git a/dev-python/oslo-log/oslo-log-3.2.0.ebuild b/dev-python/oslo-log/oslo-log-3.3.0.ebuild
similarity index 97%
rename from dev-python/oslo-log/oslo-log-3.2.0.ebuild
rename to dev-python/oslo-log/oslo-log-3.3.0.ebuild
index 1b889de12894..bcefaa8b4fdf 100644
--- a/dev-python/oslo-log/oslo-log-3.2.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.3.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
${CDEPEND}
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 497de78a513f..db630ff6a9a6 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -7,4 +7,4 @@ DIST oslo.messaging-1.8.2.tar.gz 208688 SHA256 31222c9afe3b5655401424a6229f633be
DIST oslo.messaging-1.8.3.tar.gz 208757 SHA256 149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea SHA512 98fd93a4ae366ac413ec0ad0310b669d9e0dddf61a03b2da40bfdfb3aec63de95a187556bcdecc19a209c38398f2ed0359aa05c9024bbad429e4c79c35b91b01 WHIRLPOOL 22f2a4237f874f3a681d3ea6e87bea7ed9759f967dfe8abfa8c6dc0f68d362b248f54b98fb7e64ff388de7c406f0cde29861fd17fe2fef5a8a688855b67c436c
DIST oslo.messaging-1.9.0.tar.gz 214963 SHA256 ac5f58378515597e6d5759653cac3828eb2ee6bb11e2bbf94ee0d65a692990ed SHA512 2e7de860fed55b0548f3cfa4a911cba0750889fd807ed7addb83192dd37f84997ceecd92faf480be97873e58286748865c8c57a09014ae0de97c60be826cd27f WHIRLPOOL 8e331116313757c93b2add853a35929e0a0603b691f9ffb322f4e39c422e13d83ee757277e42ce9b0360cf9e5823bb066a48fadc8eb706f7ebca018b014e1e06
DIST oslo.messaging-2.4.0.tar.gz 181234 SHA256 6e505e86ebd2115992d41db2ab4e2e2b946d2a2699ef205f84d74f1a62c710bf SHA512 2d3b8dd220307d97fcf5e06269771d2c8b1412ed69e08258f4e77791a9b43077e787b8f21248c8282e53630d57c461034d93aa91d8d129ffe5e6d9abe871a72f WHIRLPOOL 99c023e230505b06a75ae51f63d67de60fadf4f44851a6a50466dd865b6a3f9b39c949ce31c36fdd35917281700b316edac6301d2d6d64b2440fc22ad61e1681
-DIST oslo.messaging-4.5.1.tar.gz 219031 SHA256 ad82f575a031579ba1758ac08f84f95addc70563b135c5bd29cfae83268e5035 SHA512 3679b6f4155c114bc6afe3b6f5390b1c36c6df3cbeb40db4a529fc3f7076424edde5110a347190137ac76d2612053ca9426cefbe29a13b1abf86a19c9d198d02 WHIRLPOOL d832623ae35e15adcc398f2c15e28d7a23f17862a95db104674e45a7cc9b83d7a207a1add2c80a49e28ec8560acc7ff34b34f043b915e4537758d275411ae434
+DIST oslo.messaging-4.6.1.tar.gz 220648 SHA256 be0499c3c2bf22f7ab3934bd2c331af6eea47f8c6508774d209a8028e9582421 SHA512 b63a3e6d68261852a09a238a404459e6f0e23b60bab863702aa044bf2256244d86bdaf86a7eda8f13a73d87d7599ffcee4a8e7ea2df230ff7a7e3f84b8279d6e WHIRLPOOL c7d9b341eb243f382db2e39b90f4b430dd75b0445322fe228e26201ae75b06fec42c27f80a1f003dbb7c03382be94b1ccca3ed96b3bfd4f14c723c496db77a5f
diff --git a/dev-python/oslo-messaging/oslo-messaging-4.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
similarity index 97%
rename from dev-python/oslo-messaging/oslo-messaging-4.5.1.ebuild
rename to dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
index db8ea0f86c4f..fdbfd22bcd24 100644
--- a/dev-python/oslo-messaging/oslo-messaging-4.5.1.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-4.6.1.ebuild
@@ -24,7 +24,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
RDEPEND="
${CDEPEND}
>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index cf3c9e9409c6..cfe6aea1004d 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -5,4 +5,4 @@ DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 0647456ebf1611e2a0efc445673af3583
DIST oslo.middleware-1.2.0.tar.gz 29850 SHA256 0597ae9df233ba58e3f58e03878ba1f1d34a30918895bb109ebe50d8760495b7 SHA512 021836c40d096d96effc904a1ddd4889dde7f40e598aa435be3e8b5a0ff5dce013515bae878bf4eb05680fe01737c9fa20701de46bad151e7b795b229309e9db WHIRLPOOL 627b3c968e806cb1256768286ea580aa2ff4edd37107e3873db52030224cddda19ae2a4b341616f6a103dc4c456260d5c02f6645be4bf805758587eb54fece68
DIST oslo.middleware-1.3.0.tar.gz 29172 SHA256 9e0fcf28f5d635c10e684bce26524e79a9da78a5c3d380c6759d2f419a0ff1c5 SHA512 39f3ba43aac0839aa47112eb6406286ae5e9ff92c53b46540e456d885617ad583a5a1ec3d86bdd1f95be9bb31354b3dba061da1fe28e6174ce01adc75901e6c7 WHIRLPOOL 05d57f094c22cddae6982cd3cc45cbf2fb881b181eceb39fc7295e9f930425180d4c2e72ce0ee700c979dffd0f40bc65d4d83eaada424553cc047cb7a8123db3
DIST oslo.middleware-2.8.0.tar.gz 35432 SHA256 ec4c4da59abaa441814d85610f911df4be405a98f9c4af0482dc2fa03f3d2bac SHA512 73c3d18a2d97a3a06436e31124a73c6196f874a3b99ca3e698bc73426461ab4402545e53eb12fa048030508f32d523c47978723b51d30490529686b7e119087f WHIRLPOOL 419a21db7c26b31ec40fc7b28ba9b1fff600c3169e069184968af05a3631779f1e79e0159ce30752aee91f049b68b96add647d6d0988a70d0cd59776722f2538
-DIST oslo.middleware-3.7.0.tar.gz 38877 SHA256 9510db04d2b13d47c202e76be7f025d8c62e32c86f493f8c36b3f31ca5ef1fc0 SHA512 d89f3751fe964a3db782d42bf8206a112bdc71ee50683e62efafff6ac874d46af1ebe8dad26651c6e2742b5c137b3c015266628136bda2474fbbf7dccfabd896 WHIRLPOOL d96010134e0b05cc1d928e1df4171339cbe17d46fccaac76f10551c902e1de29c0e46f61fe1eebb246f67854009368d59031746610940912eed383810b196abf
+DIST oslo.middleware-3.8.0.tar.gz 39756 SHA256 2d985b238182cf70c1adbe1a041eb96eacde3106751fe2c7f1cd81d57a4dbda2 SHA512 575708b9f19938787d4d42accfbafcd63a9cee0aeb871dc0b3dd504dc4d5f97db27abfcfd7ae56dfc7d68eb670c11f93c1f79d3fd02d30247497614b3f51d80a WHIRLPOOL 2498c2a67ca83214c8512a2a86d78155638a107971d7a98a3534c625138c89f56273ab6dda437399799a6960129f4c7dfa758d2af46ede15813d7614d5db3a6d
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.7.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.8.0.ebuild
similarity index 94%
rename from dev-python/oslo-middleware/oslo-middleware-3.7.0.ebuild
rename to dev-python/oslo-middleware/oslo-middleware-3.8.0.ebuild
index c4ee03c34693..cc30720cffd3 100644
--- a/dev-python/oslo-middleware/oslo-middleware-3.7.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-3.8.0.ebuild
@@ -37,10 +37,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
RDEPEND="
${CDEPEND}
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 8e28c82e7c48..4093311fc0e5 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,4 +1,4 @@
DIST oslo.policy-0.11.0.tar.gz 34280 SHA256 7aa50cea4db9e26e2cb94f4fa5b42889ad3af70af74fa08bbc15b2c82190c220 SHA512 68593d5d05640d9b505532d03ba8dbf16b121b3d31cdc601ff86abdbfa7e8e2dcbd8a398692ae09496735a7a833a5913e5543cc0a99734b4f40f8b8f0de53f00 WHIRLPOOL ed2ccda20c63173cbb80f009f835348db99819e3371ed7ef3617479e084cc3b8cc1affa39f98dc83aac7237d9d8a506d81a778726a4be2cdfc60cf2e428514cc
DIST oslo.policy-0.12.0.tar.gz 35104 SHA256 5a2319e99a5e6bff310c74222f26a1425e9554c9bf577dcb13ee3cee8c545719 SHA512 b1228d60feb91f8a787915dee46f8944a1c831009b1433ecffc7256f3e1c17efd842d17b69e723b2ff303a05e7a8099f3c9ab1f2fce73a7fd1a5ea552a454c9a WHIRLPOOL 32dcc70a6a4ccd2f9d7ef8742376e40b0bfdb58c15414ca70c46a96d464d62e92a0822f424de0cb615c81ecd07e7e6473203deca7c5c1ddef1151fbec87b5f07
DIST oslo.policy-0.3.2.tar.gz 31745 SHA256 e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6 SHA512 55043f7cbb93799dc53735844d8a315bbdfdba6c83121612737e6125f78e9396f071b2ff6d67133b582228e7e3a36912a4ab02aaa6641ce62f8820a1500bdd99 WHIRLPOOL a93e99f46db150e14327f5a6109dec56993a78c28ef93daa630418685da4d60d1017d8d805ae856eccf8e7553983dec7cc4b87005f12b965a9b4d75348e288e7
-DIST oslo.policy-1.5.0.tar.gz 37685 SHA256 9933b7a7f1647ed81cf5d1f74acd0f622f126dc852ce149f6887035bd13881ab SHA512 778698876f646998a6924ccfc081020dd17419cceb4bbc51c850822211eb0a8dbba5df7cbd3aca8888d48a9f8b1baaa25cb30464083cd28a5c176da63f774a57 WHIRLPOOL 5d4767bc197477749ab9c11f2d6867d8de638e9eedc1cccf359fbaf04329777c03f8922545c571835f94c38f41613fb1a7f0011e09f9edb9bacea3d249ddb173
+DIST oslo.policy-1.6.0.tar.gz 38076 SHA256 24d5ecdf4e10f33a9fb2e8784876f73276637d8663c33f594e8efc99e179016a SHA512 468fcad020c90ce55b8f12199952f946cef6f352f3abc72b64e4538a6bd98dbf1d7ebe191600cff0e2654f97e4af3ccfc480a88c36133f33045ce37c2692a31c WHIRLPOOL b84ebb32db93710c5019dda8833129f3ccc855486655daf7b937eb3ad786b501cd51a9fdb4b55819dd414cdb3151a72b2d7ffd118c015bc1ca7b68a60c5a435d
diff --git a/dev-python/oslo-policy/oslo-policy-1.5.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.6.0.ebuild
similarity index 100%
rename from dev-python/oslo-policy/oslo-policy-1.5.0.ebuild
rename to dev-python/oslo-policy/oslo-policy-1.6.0.ebuild
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index fbf761ceecc4..4a21540804b2 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,3 +1,3 @@
DIST oslo.reports-0.5.0.tar.gz 33848 SHA256 acc8a11422536fccbd1eda4af6b70c219e994ebcf357719480d82981f518672f SHA512 afc4af1255701798e6f5786194fbdb9d523aa657987a2c7e02751482570426634c353583931f83b295fdde0c8e7919f465867344236595733788f8d38831f161 WHIRLPOOL 7ec7130987b784ef72a2382108d5dcdee809fe9b8c8b12c967af18b738dc98e5c72d52c90b93bc4aaa19bba279df98c9b9b9638dc7067ae07b3a950ed12989a7
DIST oslo.reports-0.6.0.tar.gz 42210 SHA256 c5ac22c2a611a8fad6d3a5667dc88becc69deed11d25db69b22ef8a2f4aa4748 SHA512 43223d432a62c506d1071ec5f8bce5ecd62a49de4e69b4f63b5cfa1a4ce2794735307e9bf8dddd06e3716497c39e963fe5612463ab9eaa3f3900d72c9c4f5156 WHIRLPOOL 269f5d00b833db12dfc6b07f5bb8fba35f385edb25ece7a4d7eca587ad9a91157fe80efc6dedaa893b902640d9cea4295c9eab5a2fcdba42f31cd9ec4e2dfa03
-DIST oslo.reports-1.6.0.tar.gz 40333 SHA256 add85b98ec126dd013a623e97054de2569bdd12c2a59bafb1afdc28ecde8632c SHA512 c9da12b811a810260b1711742c87aad0a2dc9f7ca5b57188fc2b7bbaac886949d62b25a93351237b2172c36ce334bc1e8a211d60d15d24d36782c5d19dbf6d53 WHIRLPOOL 266d91a54a046445fb818a39e4ac2636ba839e1fde879e88c8807681ec53217121160c6953d3944ac865e0f180a04186e03c7e4542bfa630f368a91416bcf8e8
+DIST oslo.reports-1.7.0.tar.gz 41592 SHA256 288e9a3b699fcefcb9ae8d848a965e5c6918729b4200ae0e799b077a8e8ecafa SHA512 be40ade6d4d67eb7766bf7f1609809c92817363c8788ff6a8c069d6de650eef57e4ea243a03eab2e855866966c1e95999235363066f9a84faad25f9bc4c9b138 WHIRLPOOL 2422a76258f73a33efa92bcc016a4cefd9dee40459cd1185a9f6140fb13bc91618025a0da928b629d05cd734e239558847c41e64676543a0ef92f7d0e8c808de
diff --git a/dev-python/oslo-reports/oslo-reports-1.6.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.7.0.ebuild
similarity index 100%
rename from dev-python/oslo-reports/oslo-reports-1.6.0.ebuild
rename to dev-python/oslo-reports/oslo-reports-1.7.0.ebuild
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 70ecf583f498..d883a5d739d7 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,2 +1,2 @@
DIST oslo.service-0.9.0.tar.gz 57558 SHA256 f77753910391a1b2bd7fd9b5b863d7230b1ff727443dd2efcb725ce937ffb566 SHA512 6e17d1e28682732c8866e43f509a7fd7f69d2718493de3dab939600207e56fd0622036ff62928b9855b6219729e1173e62e1a1c949959a5d2d58eeeded97a1e2 WHIRLPOOL be645ac0d461056d5df4d17bbfe6f3819d6eba4fd2764459d287badf056d5c962e2c690b64fceba72160094ca1d29ff5f6c7708fef90bd192faa8ba532a4d4bb
-DIST oslo.service-1.7.0.tar.gz 66128 SHA256 a3f67202ceaaf9b0a58c375bbaa7297d3fa80377bce98e4f6b1c650b578a1d85 SHA512 07493573c6405a134eede66cb6a7e55557ef59bb656f9c0e9eb66fb706ee9dacd25d8518b0a5467e67eeb0e013507a6c3964c651e648d599973863ded70b3597 WHIRLPOOL cfbaa65f8a7c47c0aa939f29bdca5a2d4d2918041d5b4aca3545c7a48b317adc01c16115d30346336386aa14f12b2929493ff0309114d7cf2be9fd9bdf700b48
+DIST oslo.service-1.8.0.tar.gz 66072 SHA256 cfd519945adb986f3e9e9bb01bebe1a0875ba38b1463a7deb6a7cba5a4e02d4d SHA512 f84aae9eddd4a702b289a2265bc4d53f4d0f01ebeba3c48b2614942eff6beeb3da7a978dcfccc58c9ddcc28031f358da3875926e8baece9d96bf5829a1c3b9e5 WHIRLPOOL 3da0853cb7568fbfde61e9a08cf2bbeaf741011e4768774c5e1423093adca8028861bcedf0b1451fce4c5154af17932a2944c07412d6fac3262653c8a11f4392
diff --git a/dev-python/oslo-service/oslo-service-1.7.0.ebuild b/dev-python/oslo-service/oslo-service-1.8.0.ebuild
similarity index 97%
rename from dev-python/oslo-service/oslo-service-1.7.0.ebuild
rename to dev-python/oslo-service/oslo-service-1.8.0.ebuild
index 14f031e89377..0fc13a5796ef 100644
--- a/dev-python/oslo-service/oslo-service-1.7.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.8.0.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 2dc13d94a4bb..a3c248d23a6a 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
DIST oslo-utils-2.4.0.tar.gz 56342 SHA256 fe210740eca9ef168afbb98038b94e48e3beb17f48b8a771f044a5fbfc7d0397 SHA512 6fa0b065f905c09c02748b76ef1818789fb96773beb1ac5d2bebb8edf76794e411961fd259e4ecda754ec0b8ebd3d8e323ac6ac3f971c4bf2d6755e2ca2ab64e WHIRLPOOL 888057b8720fc91b3b6ac85d8c6db88b2998d0cec1b495da7aaf10d2cd2cba0e482dd667479d5bf21d2414fc26e9373afd9d4fa8d433d9734d6a33fd789ae4c3
-DIST oslo-utils-3.7.0.tar.gz 70033 SHA256 04f79a8d68c263e7e13babecd4f06f5799b682578571c17e383f6acc5d846fa3 SHA512 c36e02c19a4ea5d692e685082446205e25845916fe3d2f960e8f05ccbae76634ed590236c245db3209ccfeacdfbd9e95f6c5ba4619ac3b360210e40c7ce4421f WHIRLPOOL 3bfef1c629570317bcf41bd14429c9ddaf423a790c36d495d4c644ecbdb3d88c79584c4cb25b6fae6669c4dd8b869ab2daf6d87068f1ff36ec95b2b9f4f27f52
+DIST oslo-utils-3.8.0.tar.gz 70830 SHA256 c0e935b86e72facc02264271ed09dd9c5879d52452d7a1b4a116a6c7d05077aa SHA512 bd2e140f8f2c06c3b1ad8ee34071746e3987352d0ab79d91ea70716c34b4a8baa066e9731376618554b57b1b88ea570ab2f51c563c43f78a46ff7a132ed03fc5 WHIRLPOOL 865a2d438f0085c7cf50f2c29d12dcbb9f94dc1a5d7679d69a56f821029ef8f92d4f19dfa4375b302dd3848f77e35f7a168cefbd9e85bac26a680cfe3cfce9f1
DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c
DIST oslo.utils-1.1.0.tar.gz 40359 SHA256 f12dfba246ff52e94ec005d5c5862c0300e6cd295ceb953b37b876571a544dc1 SHA512 6b6ffc086e88c0222e9931c78680f15f021b9e9bb211bcb9b4114cc62f47b5bf85846b58e7b792355c7bfe1c01dddcb78871f981fde719360c3889daa85a5ddc WHIRLPOOL f44c34acdecd1d4bd495c60e65d41cebdaa7ef1a39fc4a749a339161ec428e3d274462e34fa8729aa2e7bcdc1f0de66e8d3f87c022c6c91425f1778ca7bef145
DIST oslo.utils-1.2.1.tar.gz 54946 SHA256 9cd8bcde345554582fd12c6daab81a7327a90c72861aa644e8b7b3fbfed5deba SHA512 f928afe21ef908cb6f20beb42502c4709827fdcc7e44f81fd5adeb4ac8faf07649c813824702e0a1972e8100ec894f441017dfc3a887f1b56afd4bfa24846803 WHIRLPOOL c91b4e2eb283b46df6341d7f52ca61ee20b286c84afd8ca8a287627a7d3be914b343c9fd1ea141e02f2c7179c96921ab38c6d094666ba3979dc639fa5fb2e4f7
diff --git a/dev-python/oslo-utils/oslo-utils-3.7.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
similarity index 98%
rename from dev-python/oslo-utils/oslo-utils-3.7.0.ebuild
rename to dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
index a578013a4321..d6b8e56b5363 100644
--- a/dev-python/oslo-utils/oslo-utils-3.7.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.8.0.ebuild
@@ -35,7 +35,7 @@ DEPEND="
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
)
doc? (
>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 9ffdabca36ba..c6ec62eedccf 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1,3 @@
DIST oslo.versionedobjects-0.10.0.tar.gz 124396 SHA256 4207562d99965ec703d753e38878cc536e27930f09a6accfcc36ea2715db273d SHA512 82fd38c02facb55ab2d0cb028ca6fd9bbd8413f5a3dd671bf7086d6522c148b01c500bf3d01fed90ed8e61df33074327d9b5ef1a923187fa7020d7906c11c8fe WHIRLPOOL fbad489e2d7e8f4a3a7cbd35a8bbdf8b94e8664cd2bbb7e31f21798a8700794f2eb5d8393b0ea19e7d659b04e2cb56a799969ccfa851e2137ed6e6f2755b2dde
DIST oslo.versionedobjects-0.11.0.tar.gz 126752 SHA256 c703c4a8c4cdadb80734021d172cb8e757a20010bc6be2152165a8e3be58acb5 SHA512 957610eae70ee35a40a5dc98ddf6f83740e0cabf142be2ac69c457ad98f9a8f28f8e41dfae08b7b1ec0e2777dccfba664b5e4c5d795feae94654a35f3d5c9ab3 WHIRLPOOL a0d0e7cad5ae3c585b55fcbe2aa497b7461ef37a83481913161265424132dddccf7beacb4255a8bd46095a795488a8db4b76b74358021b2c6238a66d674bc300
-DIST oslo.versionedobjects-1.7.0.tar.gz 132728 SHA256 943dd6224cc8d1bb37944439ae8298b2801702b61cbab03eeafb8b84d486ad61 SHA512 e8608243f6231e930fd838fd987a2ef408859e00b6d7ad5188b1a3cf057ce4fda2fcfc3727f1137b93f724b371a5ef41fdbdfd99de21356b81ddcb33621b0bb9 WHIRLPOOL 33eaa1f29a28775987ecfa3eb6164a45ce818158b43f5e8b5b8765ed3f20482e6acf6d5c07e442f60552953e3cea3c2a14673b26320f8bf5ab62334e925c265e
+DIST oslo.versionedobjects-1.8.0.tar.gz 132949 SHA256 e727d969a5a89190783bcfa10d2c0d0bfd68d2344be3eb2f1a61ff6f63d6fd59 SHA512 913cf8bfda0dcd24941e4aefff3ec76ace0e4699fc538eee38417f547374484d4916f64fee1c77425ea60d479c732da919077c243d51b51320b2bbfcd3e40422 WHIRLPOOL 9dfaec3590ee729a8be65e6cec98b9d6af5db16de1d615a4932636dab7969b57407b1f68a372c38835ff76c30e4ec0e01214b18edda7c1accc40b5c5cb82b53a
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.7.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
similarity index 96%
rename from dev-python/oslo-versionedobjects/oslo-versionedobjects-1.7.0.ebuild
rename to dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
index e2c6241e3f52..f88f25a265a9 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.7.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 3cd750e1b1ab..0de7a8e3e463 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -4,4 +4,4 @@ DIST oslotest-1.3.0.tar.gz 18084 SHA256 7c29dcf2289b4de8b3a64764ae617626e86bda94
DIST oslotest-1.5.0.tar.gz 20622 SHA256 df732f8bd4b6b5d6869e4b570624c4a0ee3f906bee9b4cd70e8933b0dcef5586 SHA512 9e4f335d8eaa9b4c22f127b43ae5a96cf036ea0238b557a549a2b3b465e5f06e7b4c58a72e752e6d1be40a9dc6cee6c331bca4635679eb80c0a36d858c195ae4 WHIRLPOOL 552cd5c5e96634d39fd334619807645eb8258879c1048771b64c618bca3497a1c9449b5b51111a86c7b231e9721a4982b6679fbbb22bf08d546fdbe219814498
DIST oslotest-1.5.1.tar.gz 20723 SHA256 8123fb3471d82b141614728e66beecedecdd33c2844d1ef0c14c89b833339981 SHA512 b69770d260060bfec4185a3d1484d304be0e48c4dfa6ab2613eb3a73fd046eb3b0ad90ed061d8c6cca65bd3e76d7fdbe8832a73ea6674e5c9aa92d7a3978322f WHIRLPOOL 777c6c8a93502e795b3c61ddab62d8b3dffdaed62b65f73b6c63180721a00b4a64fef48a631919ef75c3c2b7e42237d71be78548ef62198113e27ffead4c1ef9
DIST oslotest-1.6.0.tar.gz 21226 SHA256 cb65b53b753375b669dcdb4717c362a205d19e3d16ca26310c0916cfd359354c SHA512 e7eb97dfde919b523c302d7dc495d835791c646b98ce579a6056e2412b93c1791d6d7e2c8333d142b89f1e7a414f1d5c61a321b41d8ad0ba4592227f9e3073a7 WHIRLPOOL 3b8f984f9adccf9abfdd70f5b593a16a0061bac0705c3331d0065a1ad6bc4a97b402e7f4e757a22f01e203980865510bf7741baffc9ede77ad1f652e15b6dfb1
-DIST oslotest-2.3.0.tar.gz 26475 SHA256 e28e0cade31ebe85bd777aa0f3fd3c03c6a77969ad2c4e6066e394521f8addf4 SHA512 a18ae0e0248fc4b0fb1b6d1de0c589d5668ae8991f5d51b05a38707daf388bcc915b89f50b2851223c3c95a04d74318ca783ac15f7ddeb1134fdc85cd8866827 WHIRLPOOL 7e3861044a5cae666b8c38b46b9492f1ebe14d6be6bad1446444cadff5c76ed1c51dfb4f8637fb0ab70899cb564b3a6e49d6719079da7f2ce49a1d8bbd70a05a
+DIST oslotest-2.4.0.tar.gz 26392 SHA256 cad9a20b4c26a691e947b826c37ea393c35384ff3d9091ac83c8ad4201795b0d SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886 WHIRLPOOL e8a5b8dc30bf2aa68e58c07d3a9e2067aa8d037022d22bdc9351950d70f922b61ec7e907652ae04886cd918bccf84ec4f409dc0604cb2a34af87780f1912fba2
diff --git a/dev-python/oslotest/oslotest-2.3.0.ebuild b/dev-python/oslotest/oslotest-2.4.0.ebuild
similarity index 96%
rename from dev-python/oslotest/oslotest-2.3.0.ebuild
rename to dev-python/oslotest/oslotest-2.4.0.ebuild
index 69ec31fb257a..1dd8f76a13c4 100644
--- a/dev-python/oslotest/oslotest-2.3.0.ebuild
+++ b/dev-python/oslotest/oslotest-2.4.0.ebuild
@@ -21,7 +21,7 @@ CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
- test? ( >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}] )
+ test? ( >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}] )
>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index 4c6cecf54fc7..a3d43a4983c4 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -2,3 +2,4 @@ DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4
DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
DIST pycadf-1.0.0.tar.gz 247178 SHA256 8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0 WHIRLPOOL 68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
DIST pycadf-1.1.0.tar.gz 248161 SHA256 af114ba08d535ad9600e961c1048e1c7214c669a7ee3611f46ea06b917b46953 SHA512 f3215fda9c76422ffdaa65d11c65c3835562539f61f02c91e167433c8e65a55b81290792ae827a8b4e7c497878322b802e42c666658a3cf11682e2a72002c8cf WHIRLPOOL d75adc656d344a667ff1b5d3063f300be8fe57d9e5fd32b86bfa242d132e3ee587f72aa4d1eb104c468c71005e3b9825581c145dc7c8b64b7c701274016004da
+DIST pycadf-2.2.0.tar.gz 246623 SHA256 bdb3427a28d318c6ce073b54993c2f4cc9148be498b30ad1b362ade45eb4f7fb SHA512 366e30b387ec1164aa52f1f79141263ea411313ff06f72de753f316ba1c0cd1b751633cd899383ba375747903c531976938d8c0733a25340a85d2b5d61d0425d WHIRLPOOL 6e9be54670196a35fe6f0c4a95429bb24947332e7fd8aaa9d99af9a57e9174cd60befe1d2a8a1a8e2d69debae67b1d23d6369ada543dda42e906913b9efa00a2
diff --git a/dev-python/pycadf/pycadf-2.2.0.ebuild b/dev-python/pycadf/pycadf-2.2.0.ebuild
new file mode 100644
index 000000000000..b17cdbbc62af
--- /dev/null
+++ b/dev-python/pycadf/pycadf-2.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ =dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ =dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild
index e02c7dbdde22..cfe9dda0ed93 100644
--- a/dev-python/pygments/pygments-2.1.1.ebuild
+++ b/dev-python/pygments/pygments-2.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 088c191410d9..cbe98864e1a5 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -2,4 +2,4 @@ DIST python-openstackclient-1.0.4.tar.gz 203012 SHA256 4ae6d7b35fd1da2a07959fea9
DIST python-openstackclient-1.6.0.tar.gz 256666 SHA256 7400b86fc57032bfd7d4fed317ad2311bfb35ee192200c437b23c2ab85d49b24 SHA512 e62f9265566def5c43dc4fe6d4aeb7c61be802cd7f53db78bb3db681a97b140364afedff07a9e0bcc0622d39d9341150dab3ca7fa230b2c64a6c820d713acc89 WHIRLPOOL 6b7cd39f26fcd106f4e5819af8a54b4fb79e3a1dbb5aff79e7601392e25f6b7a80f94b1ff299e6d80d3afb7a064f03acfa202779f36677098f4b612dfc174d9c
DIST python-openstackclient-1.7.1.tar.gz 265368 SHA256 c9a379d5688cf63e5ff9634929bac06204b562d2afe00fca14831ad0799e3240 SHA512 137d6bf2b6a2bd09073ca1ee63f3f6b38568baa3bc93796938e18dc694a6401353598369d8c7028d054cf31eed84bc38869375fa38649d4657b46907ba379b2c WHIRLPOOL afc99ef30eaba71059a3141eb4fe9c5f094e41cf35af12a44cf2209c3244747573651c7cbd722b750c48cc8c6897db574f3af8f1993892e953238e96d1f2f1e0
DIST python-openstackclient-1.7.2.tar.gz 265828 SHA256 f5b25c175dc9a4fc4a6170a229b178ed5d033ff28e1f34b15af6553c4e6ba95e SHA512 8bc13d3618079aef9beeb3c7d5ca15bab3242d39f04a97844486cc2bf139e3189da21db912a5edc5e03c985374f921e46501dd211c10b2e13a2eee80a560207f WHIRLPOOL 1ceca9e37e01a0eee4d246608f2cacce9ce94b45ca4baad340ecd6b4e5132f530e61bf38723c3474615dd5973ef4b88a2492b9dee46e75a5722f40d22e2db815
-DIST python-openstackclient-2.2.0.tar.gz 331120 SHA256 35b2c371f1389d2e37db569176baf8267e4a8a8f03d8611c674aced95daa1ad2 SHA512 dd9d4a3c248064000fa534727226e0121e651ec0c0b2f326043182cef160f7aaf5c9aa738aecfc5f3d032937251cc99f8bb4b1f8ff428a65d4fccd006179efa2 WHIRLPOOL 0d986bb6a421dd011e57392748246425ed8beb7d87fe2f581d50eda204fa6117f540b0c1fe7aa4814f1d5eac7a566426d06beb60eecbe1c7f7f17c41f3f74383
+DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
diff --git a/dev-python/python-openstackclient/python-openstackclient-2.2.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
similarity index 88%
rename from dev-python/python-openstackclient/python-openstackclient-2.2.0.ebuild
rename to dev-python/python-openstackclient/python-openstackclient-2.3.0.ebuild
index a78b8275b362..ba9928b262a6 100644
--- a/dev-python/python-openstackclient/python-openstackclient-2.2.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-2.3.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$
@@ -14,8 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
+IUSE="test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -42,11 +41,12 @@ RDEPEND="
>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/openstacksdk-0.7.4[${PYTHON_USEDEP}]
+ >=dev-python/openstacksdk-0.8.1[${PYTHON_USEDEP}]
>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
- >=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-2.0.0[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
@@ -65,16 +65,11 @@ python_prepare_all() {
distutils-r1_python_prepare_all
}
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
python_test() {
testr init
testr run || die "testsuite failed under python2.7"
}
python_install_all() {
- use doc && local HTML_DOCS=( doc/build/html/. )
distutils-r1_python_install_all
}
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index 4c0c7365f5b9..fbac976407d4 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1 +1,2 @@
DIST laser_filters-1.8.0.tar.gz 24671 SHA256 ecdbc3c188bf8be25e66ea456a6a6cd59d174cdd102abd74baf2c1775c11d163 SHA512 0f83cf13a88b75cedc90f048f7d2b13fb351020ad900685e227012c07ca1dddd46a47124257ad8ad73f1eef497e11eb9b0b11492e2d03fab07b42acac137d56e WHIRLPOOL d3918750bdb168327110622de74d3f3feb0cd913c039ca6e1d3bd1d5d2f7d2a977fcc8a617f8b4599a3175faad19354d196fbf15643a412ada041958e91ebe98
+DIST laser_filters-1.8.1.tar.gz 27781 SHA256 a34122563c388918fd9313d3d9235cb12dc57938598baa36d17d8cb8d4eef4b0 SHA512 7af0a177581196294ebf2e4f74a64ccddd87734f6fe70dde48d449d2d7071d1c57927c2463ea74ab80634d165789b753bf61b5ba6506f34cdbcddf83a2871fc7 WHIRLPOOL 24596ccb0e32578cd9efc19fe9691da6224031c40f6a76904142aed6ea6ea05a4df99dd7bbe995f842eead51a983ff4818bbd16b5a6c1f39bf380ac43401102c
diff --git a/dev-ros/laser_filters/laser_filters-1.8.1.ebuild b/dev-ros/laser_filters/laser_filters-1.8.1.ebuild
new file mode 100644
index 000000000000..1fb96eb1893a
--- /dev/null
+++ b/dev-ros/laser_filters/laser_filters-1.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-libs/boost:=
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf
+ dev-cpp/eigen:3
+ dev-ros/angles
+ dev-ros/filters
+ dev-ros/laser_geometry
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index a29b471a3e00..1fb96eb1893a 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-9999.ebuild
@@ -5,6 +5,7 @@
EAPI=5
ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -24,4 +25,4 @@ RDEPEND="
dev-ros/laser_geometry
"
DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index b523c3a28fa9..b487831cc95b 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -7,3 +7,4 @@ DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626
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
+DIST mavros-0.17.1.tar.gz 201092 SHA256 7f97961f2b19609293ba5c8d17336e93b3372f743884fd7a33539b3151a214fa SHA512 4c4557d6361f032a2a17699a3693f63ef0e43edd217f40f808d5f041f8b2c4eed24ff2fc292021a1271721393f3c3cbca03961ac85235fd5b5a421180331333a WHIRLPOOL 7c88a88f1dd24441e359e0b00decd7ac6113ac620326fc128501865198702c5e3e3d058c2381e35a439010ba3668149d09c98134a4a773283ae2d30b042399a8
diff --git a/dev-ros/libmavconn/libmavconn-0.17.1.ebuild b/dev-ros/libmavconn/libmavconn-0.17.1.ebuild
new file mode 100644
index 000000000000..52d298555cc3
--- /dev/null
+++ b/dev-ros/libmavconn/libmavconn-0.17.1.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/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index 28d166858793..f6bcc83ef481 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,2 +1,3 @@
DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab
DIST mavlink-gbp-release-2015.12.12.tar.gz 479433 SHA256 f5bab2ca92ef9c82aebffa69448eabfe26a9beedd4daa03301bc284ed65b63d8 SHA512 afadec6ed2b1a479c8c264f6805d0237843a4d501a1a7ed376749e7312dc2f5562d1af3bcac07670823abda9ba4f3104a16b5bfc18e0083b00ed4cbf44a780fc WHIRLPOOL 41a92dfd53fad94b56a5c0153b7e920ce7778ad606c5bda7f78bfff4b998bd89365119070a15143f8929dfd5e56c36181abd350fd7e824dc1e688cc17bb56420
+DIST mavlink-gbp-release-2016.3.3.tar.gz 482997 SHA256 33cc9373b092e73f48aa83457f8af67ce19c09431a41e1daaeda759935b39dc3 SHA512 e99575ebfd80233220ffd53b1c7120a6f77d74a7fd20ac600999b2c237d32d7f8ba534d0fd07f16dc4744bf3f1e6d747401dafb9876e530525c136d83e6f373c WHIRLPOOL f9bedb61d770a3288bdc214d111c119513707550f37e411b7a4e71391a0496f893a331fa4d5f2832934e6a3a591ad6ae18aa1503f8717718814ba5693e1e3085
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2016.3.3.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2016.3.3.ebuild
new file mode 100644
index 000000000000..97f60dd91739
--- /dev/null
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2016.3.3.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/mavlink-gbp-release"
+VER_PREFIX=release/jade/mavlink/
+VER_SUFFIX=-${PV#*_p}
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+EGIT_BRANCH="release/jade/mavlink"
+DESCRIPTION="MAVLink message marshaling library"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 889d31b4263a..966b21cae84b 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -3,3 +3,4 @@ DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626
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
+DIST mavros-0.17.1.tar.gz 201092 SHA256 7f97961f2b19609293ba5c8d17336e93b3372f743884fd7a33539b3151a214fa SHA512 4c4557d6361f032a2a17699a3693f63ef0e43edd217f40f808d5f041f8b2c4eed24ff2fc292021a1271721393f3c3cbca03961ac85235fd5b5a421180331333a WHIRLPOOL 7c88a88f1dd24441e359e0b00decd7ac6113ac620326fc128501865198702c5e3e3d058c2381e35a439010ba3668149d09c98134a4a773283ae2d30b042399a8
diff --git a/dev-ros/mavros/mavros-0.17.1.ebuild b/dev-ros/mavros/mavros-0.17.1.ebuild
new file mode 100644
index 000000000000..ad4e45d80ffd
--- /dev/null
+++ b/dev-ros/mavros/mavros-0.17.1.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 b523c3a28fa9..b487831cc95b 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -7,3 +7,4 @@ DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626
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
+DIST mavros-0.17.1.tar.gz 201092 SHA256 7f97961f2b19609293ba5c8d17336e93b3372f743884fd7a33539b3151a214fa SHA512 4c4557d6361f032a2a17699a3693f63ef0e43edd217f40f808d5f041f8b2c4eed24ff2fc292021a1271721393f3c3cbca03961ac85235fd5b5a421180331333a WHIRLPOOL 7c88a88f1dd24441e359e0b00decd7ac6113ac620326fc128501865198702c5e3e3d058c2381e35a439010ba3668149d09c98134a4a773283ae2d30b042399a8
diff --git a/dev-ros/mavros_extras/mavros_extras-0.17.1.ebuild b/dev-ros/mavros_extras/mavros_extras-0.17.1.ebuild
new file mode 100644
index 000000000000..562281398552
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.17.1.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 b523c3a28fa9..b487831cc95b 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -7,3 +7,4 @@ DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626
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
+DIST mavros-0.17.1.tar.gz 201092 SHA256 7f97961f2b19609293ba5c8d17336e93b3372f743884fd7a33539b3151a214fa SHA512 4c4557d6361f032a2a17699a3693f63ef0e43edd217f40f808d5f041f8b2c4eed24ff2fc292021a1271721393f3c3cbca03961ac85235fd5b5a421180331333a WHIRLPOOL 7c88a88f1dd24441e359e0b00decd7ac6113ac620326fc128501865198702c5e3e3d058c2381e35a439010ba3668149d09c98134a4a773283ae2d30b042399a8
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.17.1.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.17.1.ebuild
new file mode 100644
index 000000000000..7c9f450664e1
--- /dev/null
+++ b/dev-ros/mavros_msgs/mavros_msgs-0.17.1.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-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 2082b63a268a..e8583f879f59 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1 +1,2 @@
DIST xacro-1.10.6.tar.gz 78054 SHA256 6f3b7246465e61569dcae2e79575eb1cbce8ad73b41704c931fbf00466b3a106 SHA512 a41b56f501018c19cfcda988858635296d01210fc34d249906a938eb6daa041d8cf46679cd54da830d76e61a9693688f86adc5093ee2f202c843b7fdf017cb13 WHIRLPOOL f31a935134ca123a5e9a06a03756078756a579e41cfd78e88bb2b0fcf1bd92a9fa10a19da46d21e0fa9ae85d890d84f244dff7e954c7ba2bc657767d7e0ce434
+DIST xacro-1.11.0.tar.gz 78613 SHA256 a0e6eff1cc91ea4a57120c53d45718f248522799d536547732c13ed85df982d8 SHA512 77e5a1d8d09504eb5fc04665bcbf3c5cf212693e0fa056df063db01bf0a6ddf4ef32ff286f64434a0632b642486fce5f8e5a72ca77912b31ad4c2facc2077ee0 WHIRLPOOL 4d7e3e270a965b32a72137b9f0c721a0467e828183b7d6157946f7262bedff97c522d715203870df7def0c3ff901b3985f61771e0c01c0ed6409f5b7e1cd3e28
diff --git a/dev-ros/xacro/xacro-1.11.0.ebuild b/dev-ros/xacro/xacro-1.11.0.ebuild
new file mode 100644
index 000000000000..5065af861ccc
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.11.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/xacro"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="XML macro language"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="${RDEPEND}
+ dev-ros/roslaunch[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/ast/ast-2.2.0.ebuild b/dev-ruby/ast/ast-2.2.0.ebuild
index 3a9bdbc70df4..006ff76bc497 100644
--- a/dev-ruby/ast/ast-2.2.0.ebuild
+++ b/dev-ruby/ast/ast-2.2.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="yard"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index 39e0a47aba04..3f8a452058cd 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index 6827f9049dd0..c794be5297b6 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1 +1,2 @@
DIST fattr-2.2.2.gem 12800 SHA256 628a998d404d0417bb4ce72a126ff2d8dced608a11b57ade8fcf64509d6def8c SHA512 ddd81f35ad703d33c52ab8dae537fe4834c174c1b595904f23da6ad33886aaf3140eb554c396461c2897fe2b483e29116650df22be4ab128bcfa0e0b0d971b1d WHIRLPOOL 08370db4d525f5197f5b758a151daa5c70da61b0771e14396940c95eb321851cbf19483b17ed4d7166f744a5381ce30a8fca297e43ca8a50ca1888cbbf4cdfac
+DIST fattr-2.3.0.gem 12800 SHA256 0430a798270a7097c8c14b56387331808b8d9bb83904ba643b196c895bdf5993 SHA512 620825a4659e30402e44d077fd60b4b2260fe3eb7f28c87ca26f61a6be3a2d4e96920ca1d89070dbd90e1d5d760632f6e103766dddb38a8eb1fb104c6b261baf WHIRLPOOL 6bb48686ba8d0e4dacb66f802c00a1a3f30820a91e17f61f9fe8ed97f1d74066664c375cfd4f16797c2e2cf96571cc5858e3ee919d5a3ea6cedbb34815547019
diff --git a/dev-ruby/fattr/fattr-2.3.0.ebuild b/dev-ruby/fattr/fattr-2.3.0.ebuild
new file mode 100644
index 000000000000..6f8b5c7afeff
--- /dev/null
+++ b/dev-ruby/fattr/fattr-2.3.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 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
+HOMEPAGE="https://github.com/ahoward/fattr"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+each_ruby_test() {
+ ${RUBY} test/fattr_test.rb || die "Tests failed."
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ insinto /usr/share/doc/${PF}
+ doins -r samples
+}
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
index a8e0c70eb9b3..c8a90690f744 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/mustache/mustache-1.0.2.ebuild b/dev-ruby/mustache/mustache-1.0.2.ebuild
index f61ac498421f..513d036e38da 100644
--- a/dev-ruby/mustache/mustache-1.0.2.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 7d8369d66eb8..05e82849b1d2 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,2 +1,3 @@
DIST parser-2.3.0.4.gem 508928 SHA256 1c480682d9fc2b19f67520fb250f6f9713ac419e1dd0d71b235122a4991828c6 SHA512 e9f273a78c40e1ea5861308653d3e284ddb564527eb0d2cc6ca1a495e2ab6453eefabfc0c24784ddd383cd156e47b9824e902b2834955d9d4e3dd9361281a7d0 WHIRLPOOL e48aa6ee3d5467012ada0bed8ab260d77248a0aacf09ea449ec450ec97e7942460e3499131653b1488161e115d5219cde12b39905edee4755ecd63c898e6940d
DIST parser-2.3.0.6.gem 509440 SHA256 7fc1c0b72d237c8842ff15d8709acda05cacd38492ce5065dfb1304d659924e4 SHA512 4c03d201c05ec8a655d8062a90ed4b28b37e1251b9e6797964482c197bdb44b275b40778e787ffbf1360394dac47f7beb5b45877b0145c22e66d61502a199674 WHIRLPOOL ca62cb861cfd6a94e6388696b6e45865bc6b5fdcf21ac3fbab1e450b162c295be5f4c14e2a34c4df1342d08bb559afb27c2e52f708b2a8b6d71b180baf453289
+DIST parser-2.3.0.7.gem 511488 SHA256 822407352812ff3e30c9476ed5de9773c0ddff22d8341f864baf9089ec121a72 SHA512 a627b5069f8cb9d4d4708449bea8a7f7fac99ded94dba6016650b1e75cc17ea13f7dd6d1abef22355e010fce6ad93dbc36bb208d96e1ab2df28c242c38ae2fa5 WHIRLPOOL b5ac8dd840addf6613da20a1a77ecdff4e89e2f3507142f828e1fed3b88234f73ec35b9f2f90b78a2929b38e5bf3e69cb58131bf9d0c2f5bfdb24f999ebdd435
diff --git a/dev-ruby/parser/parser-2.3.0.7.ebuild b/dev-ruby/parser/parser-2.3.0.7.ebuild
new file mode 100644
index 000000000000..5ac9378e1ae1
--- /dev/null
+++ b/dev-ruby/parser/parser-2.3.0.7.ebuild
@@ -0,0 +1,33 @@
+# 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="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/minitest:5
+ dev-ruby/racc
+ dev-ruby/cliver )"
+ruby_add_rdepend ">=dev-ruby/ast-2.2:0"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+ sed -i -e "/simplecov/,+35d" test/helper.rb || die
+}
diff --git a/dev-util/emilpro/emilpro-3-r3.ebuild b/dev-util/emilpro/emilpro-3-r3.ebuild
index 7447e4dd5e68..b6c73d1378bf 100644
--- a/dev-util/emilpro/emilpro-3-r3.ebuild
+++ b/dev-util/emilpro/emilpro-3-r3.ebuild
@@ -33,14 +33,14 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/cairomm
dev-libs/libsigc++:2
dev-libs/glib:2
- system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+ system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
net-misc/curl"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/respect-cflags.patch
if use system-binutils; then
- epatch "${FILESDIR}"/use-gentoo-binutils.patch
+ epatch "${FILESDIR}"/${P}-system-binutils.patch
else
sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
fi
diff --git a/dev-util/emilpro/emilpro-9999.ebuild b/dev-util/emilpro/emilpro-9999.ebuild
index dd7ff405c34c..ccf564bcaf95 100644
--- a/dev-util/emilpro/emilpro-9999.ebuild
+++ b/dev-util/emilpro/emilpro-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="|| ( dev-libs/elfutils dev-libs/libelf )
dev-cpp/cairomm
dev-libs/libsigc++:2
dev-libs/glib:2
- system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r1:=[multitarget] )
+ system-binutils? ( >=sys-libs/binutils-libs-2.25.1-r2:=[multitarget] )
net-misc/curl"
# automagic dep
# dev-util/capstone
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}"
src_prepare() {
if use system-binutils; then
- epatch "${FILESDIR}"/${P}-use-gentoo-binutils.patch
+ epatch "${FILESDIR}"/${P}-system-binutils.patch
else
sed -i "s#wget -O binutils.tar.bz2 https://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2#cp \"${DISTDIR}/binutils-2.23.2.tar.bz2\" ./binutils.tar.bz2#" cmake/BuildBinutils.cmake
fi
diff --git a/dev-util/emilpro/files/use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
similarity index 65%
rename from dev-util/emilpro/files/use-gentoo-binutils.patch
rename to dev-util/emilpro/files/emilpro-3-system-binutils.patch
index 576055810710..d73f402a3005 100644
--- a/dev-util/emilpro/files/use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-3-system-binutils.patch
@@ -1,6 +1,6 @@
-diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
---- emilpro-3/CMakeLists.txt 2013-12-28 04:22:34.000000000 -0500
-+++ emilpro-3-nobinutils/CMakeLists.txt 2014-03-18 14:59:17.983479920 -0400
+diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt
+--- emilpro-3-orig/CMakeLists.txt 2016-03-29 13:19:47.035441401 -0400
++++ emilpro-3/CMakeLists.txt 2016-03-29 13:18:36.650443067 -0400
@@ -11,7 +11,6 @@
set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -34,3 +34,15 @@ diff -Naur emilpro-3/CMakeLists.txt emilpro-3-nobinutils/CMakeLists.txt
set (BASE_LIBS
${LIBELF_LIBRARIES}
+diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc
+--- emilpro-3-orig/src/namemangler.cc 2016-03-29 13:17:23.957444786 -0400
++++ emilpro-3/src/namemangler.cc 2016-03-29 13:18:57.306442578 -0400
+@@ -1,7 +1,7 @@
+ #include
+
+ #include
+-#include
++#include
+
+ using namespace emilpro;
+
diff --git a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
similarity index 61%
rename from dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
rename to dev-util/emilpro/files/emilpro-9999-system-binutils.patch
index 8cfa9f52b079..194e8d10b6e4 100644
--- a/dev-util/emilpro/files/emilpro-9999-use-gentoo-binutils.patch
+++ b/dev-util/emilpro/files/emilpro-9999-system-binutils.patch
@@ -1,5 +1,6 @@
---- CMakeLists.txt.orig 2015-06-25 22:02:55.041406946 +0200
-+++ CMakeLists.txt 2015-06-25 22:03:51.841696845 +0200
+diff -Naur emilpro-9999-orig/CMakeLists.txt emilpro-9999/CMakeLists.txt
+--- emilpro-9999-orig/CMakeLists.txt 2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/CMakeLists.txt 2016-03-29 14:31:21.335339797 -0400
@@ -11,7 +11,6 @@
set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -7,8 +8,8 @@
-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
find_package (LibElf REQUIRED)
- find_package (PkgConfig REQUIRED)
-@@ -30,10 +29,6 @@
+ find_package (LibCapstone)
+@@ -40,10 +39,6 @@
pkg_check_modules(LIBCURL REQUIRED libcurl)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1 -pthread")
@@ -19,7 +20,7 @@
if (HAVE_BFD_MULTIARCH)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
-@@ -109,7 +104,6 @@
+@@ -120,7 +115,6 @@
set_property(SOURCE src/emilpro.cc APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/built_in_instruction_models.hh)
include_directories(
@@ -27,7 +28,7 @@
src/gtk/include/
src/include/
${CMAKE_BINARY_DIR}
-@@ -131,9 +125,6 @@
+@@ -143,9 +137,6 @@
tools/squash-instruction-models.cc
)
@@ -37,3 +38,15 @@
set (BASE_LIBS
${LIBELF_LIBRARIES}
opcodes
+diff -Naur emilpro-9999-orig/src/namemangler.cc emilpro-9999/src/namemangler.cc
+--- emilpro-9999-orig/src/namemangler.cc 2016-03-29 14:30:48.017340585 -0400
++++ emilpro-9999/src/namemangler.cc 2016-03-29 14:31:06.397340150 -0400
+@@ -1,7 +1,7 @@
+ #include
+
+ #include
+-#include
++#include
+
+ using namespace emilpro;
+
diff --git a/dev-vcs/git/git-2.8.0.ebuild b/dev-vcs/git/git-2.8.0.ebuild
index d8bf7cd33bc8..2497aa5543f9 100644
--- a/dev-vcs/git/git-2.8.0.ebuild
+++ b/dev-vcs/git/git-2.8.0.ebuild
@@ -8,9 +8,16 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+# See https://git-scm.com/docs/gitworkflows#_graduation
+# In order of stability:
+# 9999-r0: maint
+# 9999-r1: master
+# 9999-r2: next
+# 9999-r3: pu
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
+EGIT_BRANCH=pu
PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
@@ -205,6 +212,8 @@ exportmakeopts() {
fi
if [[ ${CHOST} == *-solaris* ]]; then
myopts+=" NEEDS_LIBICONV=YesPlease"
+ myopts+=" HAVE_CLOCK_MONOTONIC=1"
+ myopts+=" HAVE_GETDELIM=1"
fi
has_version '>=app-text/asciidoc-8.0' \
@@ -230,7 +239,7 @@ src_unpack() {
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -382,7 +391,7 @@ src_install() {
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
- dodoc README.md Documentation/{SubmittingPatches,CodingGuidelines}
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2720fa39ef63..906428738da6 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -2,17 +2,25 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+# See https://git-scm.com/docs/gitworkflows#_graduation
+# In order of stability:
+# 9999-r0: maint
+# 9999-r1: master
+# 9999-r2: next
+# 9999-r3: pu
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=maint
+EGIT_BRANCH=master
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
@@ -38,15 +46,16 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0 )
+ tk? ( dev-lang/tk:0= )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND}
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
- app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
@@ -110,6 +118,20 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+PATCHES=(
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
pkg_setup() {
if use subversion && has_version "dev-vcs/subversion[dso]"; then
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -127,24 +149,24 @@ exportmakeopts() {
local myopts
if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
+ myopts+=" BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
+ myopts+=" PPC_SHA1=YesPlease"
fi
if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
else
- myopts="${myopts} NO_CURL=YesPlease"
+ myopts+=" NO_CURL=YesPlease"
fi
# broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
# For svn-fe
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
@@ -153,53 +175,55 @@ exportmakeopts() {
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || myopts+=" NO_ICONV=YesPlease"
use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
+ || myopts+=" NO_GETTEXT=YesPlease"
use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
+ || myopts+=" NO_TCLTK=YesPlease"
use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
+ || myopts+=" NO_PYTHON=YesPlease"
use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ || myopts+=" NO_SVN_TESTS=YesPlease"
use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
+ || myopts+=" NO_CVS=YesPlease"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
fi
if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ myopts+=" HAVE_CLOCK_MONOTONIC=1"
+ myopts+=" HAVE_GETDELIM=1"
fi
has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
# Bug 290465:
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
[[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
export EXTLIBS="${extlibs}"
@@ -215,7 +239,7 @@ src_unpack() {
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -223,24 +247,17 @@ src_unpack() {
}
src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
# add experimental patches to improve mediawiki support
# see patches for origin
if use mediawiki-experimental ; then
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ PATCHES+=(
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ )
fi
- epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
- epatch_user
+ default
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -308,8 +325,8 @@ src_compile() {
if use perl && use cgi ; then
git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
+ gitweb \
+ || die "emake gitweb (cgi) failed"
fi
if [[ ${CHOST} == *-darwin* ]]; then
@@ -374,13 +391,15 @@ src_install() {
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
done
docinto /
# Upstream does not ship this pre-built :-(
@@ -453,7 +472,11 @@ src_install() {
cd "${S}"/contrib/svn-fe
dobin svn-fe
dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
+ if use doc ; then
+ doman svn-fe.1
+ docinto html
+ dodoc svn-fe.html
+ fi
cd "${S}"
fi
@@ -521,6 +544,16 @@ src_install() {
fi
perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ l10n_for_each_disabled_locale_do rm_loc
}
src_test() {
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 3303ae886916..56b5b6bb100e 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -2,17 +2,25 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+# See https://git-scm.com/docs/gitworkflows#_graduation
+# In order of stability:
+# 9999-r0: maint
+# 9999-r1: master
+# 9999-r2: next
+# 9999-r3: pu
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=next
+EGIT_BRANCH=next
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
@@ -38,15 +46,16 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0 )
+ tk? ( dev-lang/tk:0= )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND}
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
- app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
@@ -110,6 +118,20 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+PATCHES=(
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
pkg_setup() {
if use subversion && has_version "dev-vcs/subversion[dso]"; then
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -127,24 +149,24 @@ exportmakeopts() {
local myopts
if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
+ myopts+=" BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
+ myopts+=" PPC_SHA1=YesPlease"
fi
if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
else
- myopts="${myopts} NO_CURL=YesPlease"
+ myopts+=" NO_CURL=YesPlease"
fi
# broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
# For svn-fe
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
@@ -153,53 +175,55 @@ exportmakeopts() {
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || myopts+=" NO_ICONV=YesPlease"
use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
+ || myopts+=" NO_GETTEXT=YesPlease"
use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
+ || myopts+=" NO_TCLTK=YesPlease"
use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
+ || myopts+=" NO_PYTHON=YesPlease"
use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ || myopts+=" NO_SVN_TESTS=YesPlease"
use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
+ || myopts+=" NO_CVS=YesPlease"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
fi
if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ myopts+=" HAVE_CLOCK_MONOTONIC=1"
+ myopts+=" HAVE_GETDELIM=1"
fi
has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
# Bug 290465:
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
[[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
export EXTLIBS="${extlibs}"
@@ -215,7 +239,7 @@ src_unpack() {
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -223,24 +247,17 @@ src_unpack() {
}
src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
# add experimental patches to improve mediawiki support
# see patches for origin
if use mediawiki-experimental ; then
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ PATCHES+=(
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ )
fi
- epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch
-
- epatch_user
+ default
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -308,8 +325,8 @@ src_compile() {
if use perl && use cgi ; then
git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
+ gitweb \
+ || die "emake gitweb (cgi) failed"
fi
if [[ ${CHOST} == *-darwin* ]]; then
@@ -374,13 +391,15 @@ src_install() {
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
done
docinto /
# Upstream does not ship this pre-built :-(
@@ -453,7 +472,11 @@ src_install() {
cd "${S}"/contrib/svn-fe
dobin svn-fe
dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
+ if use doc ; then
+ doman svn-fe.1
+ docinto html
+ dodoc svn-fe.html
+ fi
cd "${S}"
fi
@@ -521,6 +544,16 @@ src_install() {
fi
perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ l10n_for_each_disabled_locale_do rm_loc
}
src_test() {
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 876bc8d4e613..2497aa5543f9 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -2,17 +2,25 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+# See https://git-scm.com/docs/gitworkflows#_graduation
+# In order of stability:
+# 9999-r0: maint
+# 9999-r1: master
+# 9999-r2: next
+# 9999-r3: pu
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
+EGIT_BRANCH=pu
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
@@ -42,12 +50,12 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libre
# Common to both DEPEND and RDEPEND
CDEPEND="
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0 )
+ tk? ( dev-lang/tk:0= )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@@ -81,7 +89,6 @@ RDEPEND="${CDEPEND}
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
- app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
@@ -111,6 +118,20 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+PATCHES=(
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
pkg_setup() {
if use subversion && has_version "dev-vcs/subversion[dso]"; then
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -128,24 +149,24 @@ exportmakeopts() {
local myopts
if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
+ myopts+=" BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
+ myopts+=" PPC_SHA1=YesPlease"
fi
if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
else
- myopts="${myopts} NO_CURL=YesPlease"
+ myopts+=" NO_CURL=YesPlease"
fi
# broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
# For svn-fe
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
@@ -154,55 +175,55 @@ exportmakeopts() {
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || myopts+=" NO_ICONV=YesPlease"
use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
+ || myopts+=" NO_GETTEXT=YesPlease"
use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
+ || myopts+=" NO_TCLTK=YesPlease"
use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
+ || myopts+=" NO_PYTHON=YesPlease"
use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ || myopts+=" NO_SVN_TESTS=YesPlease"
use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
+ || myopts+=" NO_CVS=YesPlease"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
fi
if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- myopts="${myopts} HAVE_CLOCK_MONOTONIC=1"
- myopts="${myopts} HAVE_GETDELIM=1"
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ myopts+=" HAVE_CLOCK_MONOTONIC=1"
+ myopts+=" HAVE_GETDELIM=1"
fi
has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
# Bug 290465:
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
[[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
export EXTLIBS="${extlibs}"
@@ -218,7 +239,7 @@ src_unpack() {
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -226,24 +247,17 @@ src_unpack() {
}
src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
# add experimental patches to improve mediawiki support
# see patches for origin
if use mediawiki-experimental ; then
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ PATCHES+=(
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ )
fi
- epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
- epatch_user
+ default
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -311,8 +325,8 @@ src_compile() {
if use perl && use cgi ; then
git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
+ gitweb \
+ || die "emake gitweb (cgi) failed"
fi
if [[ ${CHOST} == *-darwin* ]]; then
@@ -377,13 +391,15 @@ src_install() {
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
done
docinto /
# Upstream does not ship this pre-built :-(
@@ -456,7 +472,11 @@ src_install() {
cd "${S}"/contrib/svn-fe
dobin svn-fe
dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
+ if use doc ; then
+ doman svn-fe.1
+ docinto html
+ dodoc svn-fe.html
+ fi
cd "${S}"
fi
@@ -524,6 +544,16 @@ src_install() {
fi
perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ l10n_for_each_disabled_locale_do rm_loc
}
src_test() {
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 0ed6ae995f7c..5fbd63182f53 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -2,17 +2,25 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+# See https://git-scm.com/docs/gitworkflows#_graduation
+# In order of stability:
+# 9999-r0: maint
+# 9999-r1: master
+# 9999-r2: next
+# 9999-r3: pu
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=master
+EGIT_BRANCH=maint
+PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
MY_PV="${PV/_rc/.rc}"
MY_P="${PN}-${MY_PV}"
@@ -38,15 +46,16 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
sys-libs/zlib
pcre? ( dev-libs/libpcre )
perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0 )
+ tk? ( dev-lang/tk:0= )
curl? (
net-misc/curl
webdav? ( dev-libs/expat )
@@ -80,7 +89,6 @@ RDEPEND="${CDEPEND}
# .xml/docbook --(docbook2texi.pl)--> .texi
# .texi --(makeinfo)---------> .info
DEPEND="${CDEPEND}
- app-arch/cpio
doc? (
app-text/asciidoc
app-text/docbook2X
@@ -110,6 +118,20 @@ REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
"
+PATCHES=(
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ "${FILESDIR}"/git-2.2.2-optional-cvs.patch
+
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+ "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+ # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+ "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
pkg_setup() {
if use subversion && has_version "dev-vcs/subversion[dso]"; then
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
@@ -127,24 +149,24 @@ exportmakeopts() {
local myopts
if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
+ myopts+=" BLK_SHA1=YesPlease"
elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
+ myopts+=" PPC_SHA1=YesPlease"
fi
if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ use webdav || myopts+=" NO_EXPAT=YesPlease"
else
- myopts="${myopts} NO_CURL=YesPlease"
+ myopts+=" NO_CURL=YesPlease"
fi
# broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
+ myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts+=" INSTALL=install TAR=tar"
+ myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts+=" SANE_TOOL_PATH="
+ myopts+=" OLD_ICONV="
+ myopts+=" NO_EXTERNAL_GREP="
# For svn-fe
extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
@@ -153,53 +175,55 @@ exportmakeopts() {
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || myopts+=" NO_ICONV=YesPlease"
use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
+ || myopts+=" NO_GETTEXT=YesPlease"
use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
+ || myopts+=" NO_TCLTK=YesPlease"
use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
+ && myopts+=" USE_LIBPCRE=yes" \
+ && extlibs+=" -lpcre"
use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
+ && myopts+=" INSTALLDIRS=vendor" \
+ || myopts+=" NO_PERL=YesPlease"
use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
+ || myopts+=" NO_PYTHON=YesPlease"
use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ || myopts+=" NO_SVN_TESTS=YesPlease"
use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
+ && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts+=" NO_PTHREADS=YesPlease"
use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
+ || myopts+=" NO_CVS=YesPlease"
# Disabled until ~m68k-mint can be keyworded again
# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# myopts+=" NO_MMAP=YesPlease"
+# myopts+=" NO_IPV6=YesPlease"
+# myopts+=" NO_STRLCPY=YesPlease"
+# myopts+=" NO_MEMMEM=YesPlease"
+# myopts+=" NO_MKDTEMP=YesPlease"
+# myopts+=" NO_MKSTEMPS=YesPlease"
# fi
if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
fi
if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
fi
if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ myopts+=" NEEDS_LIBICONV=YesPlease"
+ myopts+=" HAVE_CLOCK_MONOTONIC=1"
+ myopts+=" HAVE_GETDELIM=1"
fi
has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+ && myopts+=" ASCIIDOC8=YesPlease"
+ myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
# Bug 290465:
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
[[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
+ myopts+=" NO_NSEC=YesPlease"
export MY_MAKEOPTS="${myopts}"
export EXTLIBS="${extlibs}"
@@ -215,7 +239,7 @@ src_unpack() {
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
#cp "${FILESDIR}"/GIT-VERSION-GEN .
fi
@@ -223,24 +247,17 @@ src_unpack() {
}
src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
# add experimental patches to improve mediawiki support
# see patches for origin
if use mediawiki-experimental ; then
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
- epatch "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ PATCHES+=(
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ )
fi
- epatch "${FILESDIR}"/${PN}-2.2.0-svn-fe-linking.patch
-
- epatch_user
+ default
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -308,8 +325,8 @@ src_compile() {
if use perl && use cgi ; then
git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
+ gitweb \
+ || die "emake gitweb (cgi) failed"
fi
if [[ ${CHOST} == *-darwin* ]]; then
@@ -374,13 +391,15 @@ src_install() {
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
use doc && dodir /usr/share/doc/${PF}/html
for d in / /howto/ /technical/ ; do
docinto ${d}
dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
done
docinto /
# Upstream does not ship this pre-built :-(
@@ -453,7 +472,11 @@ src_install() {
cd "${S}"/contrib/svn-fe
dobin svn-fe
dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
+ if use doc ; then
+ doman svn-fe.1
+ docinto html
+ dodoc svn-fe.html
+ fi
cd "${S}"
fi
@@ -521,6 +544,16 @@ src_install() {
fi
perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ l10n_for_each_disabled_locale_do rm_loc
}
src_test() {
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 8a3d3062285e..b200f866eba4 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,3 +5,4 @@ DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d41
DIST mercurial-3.6.3.tar.gz 4521749 SHA256 402731f27256beb9a575a6991ca3d7059976197c905337f4f5729fd940329fa8 SHA512 e5b39e5456a35e19f2ac02838946305023de957590c5aa2828f7c37e9b5f6f2e6376526d0845ebd1ca198860425d11e208b3c36e12e189e0b02871e9c91aad9a WHIRLPOOL 36f0f6caa43ce2c65c7c2bdfb3fa3935cec1e47c25fae6a6a3c7b00165d1aff9b71c73dd10faad2e2ba096d55cc633366170135d95452c162936fef93571dbf1
DIST mercurial-3.7.1.tar.gz 4630846 SHA256 96d37d1f444a032295e190318b3166e9d05abb55916d2b3adb618a8f16c5cfed SHA512 32df161756d7c76abd792bfe5dc3d3f2ea39facdc9c9bd8d93193ecd6cc171f050a4e6dae18255614087ba6fa8f9d787aac41b137c233fa9c3f32217a9cad112 WHIRLPOOL 894a9bd7c61f6a6262ec46f8c80b1894348f765216159458795210fed504a4700e8b4b263e305f3c746d180ef27ab1de11fd4926a2969883d529a613dc93e17a
DIST mercurial-3.7.2.tar.gz 4634748 SHA256 5ba9438d6ab0db93f7b0786ba632138eb64a9dc0d93e30dde2b17b328fdc6d7a SHA512 573b35052ec50f4672cdd5afd93080edc864deb854b890c8cedba53c40d6d3a37a560e364b94b819cfc6d9fc5c07c0411a13167f0888007e5c9366bc94154306 WHIRLPOOL 782a80d5ee09b6868f9da62ff5e7733e8431323ab7adc8fae52ec0d3e43e88c6ef9cdc90bcb61481e971acf60e43965216f414ed9e88dd9f09546d86561baabc
+DIST mercurial-3.7.3.tar.gz 4636732 SHA256 c099c42d74e2d520b61dd372cd996b0fa7605c06617834fd7b13c79b9a9a5b30 SHA512 7f9f97229e40c7092c16ccf227b19a08a9839d8ce19a9d057341fff75876bff32241ee9aa10eab293f779ea3e8a1d97577597187bd96251fb499cbb1075a82cf WHIRLPOOL 51d7f152a0af27924fec8b39933796f5584867efff7f271147139e740302d05f8976f3c2aa95cb724b774ba4951040483bb51b02eed1495d8b15012301ba060e
diff --git a/dev-vcs/mercurial/mercurial-3.7.3.ebuild b/dev-vcs/mercurial/mercurial-3.7.3.ebuild
new file mode 100644
index 000000000000..18f93f985ef2
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.7.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+ gpg? ( app-crypt/gnupg )
+ tk? ( dev-lang/tk )
+ app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+ test? ( app-arch/unzip
+ dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+ # fix up logic that won't work in Gentoo Prefix (also won't outside in
+ # certain cases), bug #362891
+ sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ strip-flags -ftracer -ftree-vectorize
+ # Note: make it impl-conditional if py3 is supported
+ append-flags -fno-strict-aliasing
+
+ "${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+ rm -r contrib/{win32,macosx} || die
+ if use emacs; then
+ cd contrib || die
+ elisp-compile mercurial.el || die "elisp-compile failed!"
+ fi
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newbashcomp contrib/bash_completion hg
+
+ insinto /usr/share/zsh/site-functions
+ newins contrib/zsh_completion _hg
+
+ rm -f doc/*.?.txt
+ dodoc CONTRIBUTORS
+ cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+ dobin hgeditor
+ dobin contrib/hgk
+ python_foreach_impl python_doscript contrib/hg-ssh
+
+ if use emacs; then
+ elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+ *.el mercurial.spec)
+ for f in ${RM_CONTRIB[@]}; do
+ rm -r contrib/$f || die
+ done
+
+ dodoc -r contrib
+ docompress -x /usr/share/doc/${PF}/contrib
+ doman doc/*.?
+
+ cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+ doenvd "${T}/80mercurial"
+
+ insinto /etc/mercurial/hgrc.d
+ doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+ pushd tests &>/dev/null || die
+ rm -rf *svn* # Subversion tests fail with 1.5
+ rm -f test-archive* # Fails due to verbose tar output changes
+ rm -f test-convert-baz* # GNU Arch baz
+ rm -f test-convert-cvs* # CVS
+ rm -f test-convert-darcs* # Darcs
+ rm -f test-convert-git* # git
+ rm -f test-convert-mtn* # monotone
+ rm -f test-convert-tla* # GNU Arch tla
+ #rm -f test-doctest* # doctest always fails with python 2.5.x
+ rm -f test-largefiles* # tends to time out
+
+ popd &>/dev/null || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ local TEST_DIR
+
+ rm -rf "${TMPDIR}"/test
+ distutils_install_for_testing
+ cd tests || die
+ "${PYTHON}" run-tests.py --verbose \
+ --tmpdir="${TMPDIR}"/test \
+ --with-hg="${TEST_DIR}"/scripts/hg \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+
+ elog "If you want to convert repositories from other tools using convert"
+ elog "extension please install correct tool:"
+ elog " dev-vcs/cvs"
+ elog " dev-vcs/darcs"
+ elog " dev-vcs/git"
+ elog " dev-vcs/monotone"
+ elog " dev-vcs/subversion"
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 6c137cd02787..11bfcd4adc32 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -26,7 +26,7 @@ esac
# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
# @DESCRIPTION:
# Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.17.0}
+: ${FRAMEWORKS_MINIMAL:=5.18.0}
# @ECLASS-VARIABLE: PLASMA_MINIMAL
# @DESCRIPTION:
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 406129e877f5..47ced0915868 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -32,7 +32,7 @@ EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_
# @ECLASS-VARIABLE: QT_MINIMAL
# @DESCRIPTION:
# Minimal Qt version to require for the package.
-: ${QT_MINIMAL:=5.4.2}
+: ${QT_MINIMAL:=5.5.1}
# @ECLASS-VARIABLE: KDE_AUTODEPS
# @DESCRIPTION:
diff --git a/games-board/xfreecell/xfreecell-1.0.5b.ebuild b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
index ed49c806ef66..02af2cc4e379 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b.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$
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE=""
-RDEPEND="x11-libs/libXext"
+RDEPEND="x11-libs/libXext
+ media-fonts/font-misc-misc"
DEPEND="${RDEPEND}
x11-proto/xextproto"
@@ -33,5 +34,11 @@ src_install() {
doins "${WORKDIR}"/MSNumbers
dodoc CHANGES README mshuffle.txt
doman xfreecell.6
+ make_desktop_entry xfreecell XFreecell
prepgamesdirs
}
+
+pkg_postinst() {
+ games_pkg_postinst
+ einfo "Remember to restart X if this is the first time you've installed media-fonts/font-misc-misc"
+}
diff --git a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
index 8103e786c13b..003540116811 100644
--- a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
@@ -12,7 +12,7 @@ IUSE="accessibility kdepim minimal nls sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta)
+ kde-apps/kdeartwork-meta:*
$(add_kdeapps_dep kdebase-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
diff --git a/kde-apps/kde-meta/kde-meta-4.14.3.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
index 784e575555a0..d5efb7c88695 100644
--- a/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
@@ -12,7 +12,7 @@ IUSE="accessibility kdepim minimal nls sdk"
RDEPEND="
$(add_kdeapps_dep kate)
$(add_kdeapps_dep kdeadmin-meta)
- $(add_kdeapps_dep kdeartwork-meta)
+ kde-apps/kdeartwork-meta:*
$(add_kdeapps_dep kdebase-meta)
$(add_kdeapps_dep kdeedu-meta)
$(add_kdeapps_dep kdegames-meta)
diff --git a/kde-apps/kdeartwork-meta/kdeartwork-meta-15.08.3-r1.ebuild b/kde-apps/kdeartwork-meta/kdeartwork-meta-15.08.3-r1.ebuild
index 8d2868938c63..35e6e616bee7 100644
--- a/kde-apps/kdeartwork-meta/kdeartwork-meta-15.08.3-r1.ebuild
+++ b/kde-apps/kdeartwork-meta/kdeartwork-meta-15.08.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde5-meta-pkg
DESCRIPTION="kdeartwork - merge this to pull in all kdeartwork-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 17547c5b9f0f..0e523425d336 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1 +1,2 @@
DIST bluedevil-5.5.5.tar.xz 135112 SHA256 34f95e384aff73a8a4284d6de0baf900582305f21c7d248ce7903024dc1bd581 SHA512 67446a8f759e345255f4ad7bc693d29119d94e9a2ebd948904e9b5a6c5edd894d51ad50e15ab33a282598dcba46f5e646c012921cc8748401c33c3aeb8dfaee1 WHIRLPOOL 49ff37890aa24352e560e07f64e9d3c051e3dbe20f4140b8acf43caf02846829b2810975d0ac1fde5262f0d1d6f7e0119d6903b340e1460dfa4585e9bf52c15f
+DIST bluedevil-5.6.1.tar.xz 173196 SHA256 2116b11389290d909c9c5a8f13cf12ab5dd52ee37e282c8ec5fd9b45446f33ef SHA512 daa91e0a546abeccdf3e3117fd45cd0e42bec9d46ebd0084c724a89167b134c5ef7405990e4217e85eccf0305fffa05ab311dd7d2ac7ed3fadb479b926c8f08f WHIRLPOOL 87a3f903755389d19584e8fb604402e7b0b7cc28ac5b69e8372ea5cfa3e7adce23ce6cfe6e8a2338cd7666128ba2c7c4ae446899d41826cf7ee140da62641c8f
diff --git a/kde-plasma/bluedevil/bluedevil-5.6.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.6.1.ebuild
new file mode 100644
index 000000000000..6bec802f5a73
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Bluetooth stack for KDE"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/bluedevil"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ $(add_frameworks_dep bluez-qt)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !app-mobilephone/obexd
+ !app-mobilephone/obex-data-server
+ !net-wireless/bluedevil
+ !net-wireless/kbluetooth
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
new file mode 100644
index 000000000000..a226f769832f
--- /dev/null
+++ b/kde-plasma/breeze-grub/Manifest
@@ -0,0 +1 @@
+DIST breeze-grub-5.6.1.tar.xz 153952 SHA256 f15759894f565dbd51b0cddb1057d873e7a69e2f18aa26a327621125d8a4cdd4 SHA512 ca698f2bdcfc9e16a2fd5e4b4adbfcf5260bd25a03fbb8204d081768f01bb9a44d0d71cfb68fce754e9b0bc2bddf14120eef0e4fd7a12375215c4bab117eb918 WHIRLPOOL f0366cf08fb4496b0c801279822cd3e53c5a4468cff611100771f2e74aa14c453fd82756a29632055ea1346863d77ad605a44ba0d5c8a3445ca155bfadffdbf1
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.6.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.6.1.ebuild
new file mode 100644
index 000000000000..fde18315b549
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for GRUB"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ insinto /usr/share/grub/themes
+ doins -r breeze
+}
diff --git a/kde-plasma/breeze-grub/metadata.xml b/kde-plasma/breeze-grub/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/breeze-grub/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index d68e8f13dce0..f890da934c81 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1 +1,2 @@
DIST breeze-gtk-5.5.5.tar.xz 257580 SHA256 c54879a55194dd9e63a3aa07f8b6fb7282ab8b14fdf6ac430f4dccbb722feb10 SHA512 b3584aa9bd9dd5b13d7c7e7c00614c9794debba26836f0638010c36f3db7152c231a8686570e2762af14fff2c6e63426570240c1f122e20e666f6eb4f9af8756 WHIRLPOOL 432181eae75676a7096a59bfcd55f118d3063d58ec955b069e6dad5024190fa1a6a227104ac62b2a6d1d961790a273b137508b089c5540318b0a0b6361f76960
+DIST breeze-gtk-5.6.1.tar.xz 257724 SHA256 b774c00c4f2a829bdec4c60ea80328b4b2eb33bdd24155798acfd55a82c184ac SHA512 2c227a0065597e92c20f03bafb2b74ac7d4a90c78407aa29a17f033b5247315dd1f24b06ec239f9e9e6c15db496cce1c60b7d6b71872f309e8e34894d4981459 WHIRLPOOL d5629d4dc14170aaa8bbc3fb61228ad8a435abd68cc1be8ac639c1e97e2d38ca92f2c2e8305e3f69f236304ddf52ace2efe322dece1b89037f326f292ca89d2b
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.6.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.6.1.ebuild
new file mode 100644
index 000000000000..03be4ed237a1
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.6.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Official GTK+ port of KDE's Breeze widget style"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze-gtk"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
new file mode 100644
index 000000000000..4197b68fc364
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -0,0 +1 @@
+DIST breeze-plymouth-5.6.1.tar.xz 49184 SHA256 f59b52b4b12fa80f11e9054dfe96ac24c8e53e2c92c19f586f312fb208df1513 SHA512 fbfbe623ae5f276370314277f36c742592416b7c4ef4a18d0705a5e5f32f5995fdaa8f16f25d5cdef13c46fcf7c695020fcb4301abd489840c8bdc5e8080268e WHIRLPOOL d6f302b7817cfebade203fd4ab0a2efc9da883ff283a850c6b4e06140e5caf5d84742b19d51f3cdaf44ec7158a1839b958ef16f3de8f3bcd904a4b0d0aeff44a
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.1.ebuild
new file mode 100644
index 000000000000..b5c41788c8d5
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Breeze theme for Plymouth"
+LICENSE="GPL-2+ GPL-3+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-boot/plymouth"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep extra-cmake-modules)
+"
diff --git a/kde-plasma/breeze-plymouth/metadata.xml b/kde-plasma/breeze-plymouth/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 57513f01b983..87ae551ded56 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1 +1,2 @@
DIST breeze-5.5.5.tar.xz 29670168 SHA256 b490398e75779ab0261222adbba26b9b85943236735689962c26eb17def4ae77 SHA512 0d3b3c107e41df1e78c7baa2998b6fd1c4ff872179b33e00cd0eb294982593f8253d70666f59864ca85277fc5128fb556f9cc5b11fbdb8c75562764a087ca09b WHIRLPOOL 66e4bc008d5e36a9af0caa18cdf65e69e7a362343543c15901f312428bca8a98ab6a6fe3cbf2f7817dbc0d4069f2341c339c087be5ed69a9871de4b0d615e779
+DIST breeze-5.6.1.tar.xz 19675832 SHA256 4188d39ef8a020c5ae891630e8852be591636ec0f26e8ffe354050f4ffea30c1 SHA512 a866e6adc19108b248803cf216cfa484c001aff248a07d7405d8e2783aecdf1a3d52c1a6d0c59bf42a6364bfc0b850dae453d0de68b9de9d8a9bacc82c421f4d WHIRLPOOL fa10bffdfdfa311b32c40b0fc13bebd1d042310231dca4b1f8963bba5d7fab74964955cf237a3206a9493b1acd942023fdb31aeac0f9cbc023f6543ab30baacd
diff --git a/kde-plasma/breeze/breeze-5.6.1.ebuild b/kde-plasma/breeze/breeze-5.6.1.ebuild
new file mode 100644
index 000000000000..4eaa5af49ed7
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.6.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5 multibuild
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt4"
+
+DEPEND="
+ $(add_frameworks_dep frameworkintegration)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep plasma)
+ $(add_plasma_dep kdecoration)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libxcb
+ qt4? (
+ kde-base/kdelibs:4
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_frameworks_dep breeze-icons)
+ $(add_plasma_dep kde-cli-tools)
+"
+
+pkg_setup() {
+ kde5_pkg_setup
+ MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=()
+
+ if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
+ mycmakeargs+=( -DUSE_KDE4=true )
+ fi
+
+ kde5_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant kde5_src_compile
+}
+
+src_install() {
+ multibuild_foreach_variant kde5_src_install
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 9f41ae53b1a7..61998786795a 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1 +1,2 @@
DIST kactivitymanagerd-5.5.0.tar.xz 111028 SHA256 4d8ed5a621ac3df49f57249b4651c8e4c5b3d8bef31cd86864c3586cff332acf SHA512 f4dab46a3ca3d5440d14502eeb2e24b329ee5da4eaeb19ab6d8f6c0d5108d048547a4c6c4e0d75229cd736e83f255e5522038f620e6793d2f01767c7acd166de WHIRLPOOL 8d19482514d65e815017455fc5d4abeca5b7cb28c20a257c4451251070d21123e03016a97bced8c85fb1053e780aaedebb07b59bba0fd8e3211a803163b79117
+DIST kactivitymanagerd-5.6.1.tar.xz 84324 SHA256 7313693279aefd833ab0d5852d9084d4692a3d9612bb01da521e5556cfcf95f7 SHA512 5bce2b6d3cdb1c1ba1fb4ede192af31bdf603ef453d33fa990553b3140c63dccb0d11abab421da4976343a862e193a6fa2f13683a52c7b82eee2dabcc939f283 WHIRLPOOL 94c977c2184fb39d1aabb963685bdb54e70054926e9175f12c831d03665b66eaa50031632d7606938fd2215a59db58a0cbcef3e84dfa3e39b36393529eb28dd8
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
new file mode 100644
index 000000000000..cd12f123509a
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.20.0"
+inherit kde5
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ !=dev-libs/boost-1.54
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 3cddbbc536f4..ec8240369595 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1 +1,2 @@
DIST kde-cli-tools-5.5.5.tar.xz 485772 SHA256 50d7c9e2f8423a0e26844e7a9758f4e190e0383f57d0d4bb90e1776a957d2fa6 SHA512 6ebd2041a07d12c14893261a5a12936fa1fad6416626a3ce8dfa9b3c048987fd663e69fe81eb3b8746cdf838ad55139316757505642ea93ff380bed317ab716e WHIRLPOOL 70180b9aca273f661bbce3fc76193995f6f0fa80430e7a3167f3376080b0cb35e930bb571e4f099b2a58375345b4d5502373cef38fa00a0ed90f0e735a9ba64f
+DIST kde-cli-tools-5.6.1.tar.xz 505076 SHA256 918d75e9d7db608b7e432ebf14dcb1e778626a752dcd0e5b5e9030307a8df75f SHA512 6681cad73aece9b985cfd4dfc6cd1c36cccb1e68e5fcc3b5ee7b3989b3d5ddf7e9b86afccd1ef944562a4cc2a5dfd880ee6608fb10a302dc3438a9a05c8b3de8 WHIRLPOOL fcb78825c33847a75f9d0be01c33f93828c68c9ff77b8dce6d958378dc09e094275d3679a4d10c7e92e8f90c007c3b0cf2658c12366af64b1eb9825ddf70c418
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.1.ebuild
new file mode 100644
index 000000000000..14cdf5affcc1
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ kdesu? ( $(add_frameworks_dep kdesu) )
+ X? (
+ $(add_frameworks_dep kdelibs4support)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package kdesu KF5Su)
+ $(cmake-utils_use_find_package X KF5KDELibs4Support)
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+ use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index b7b75dfeefa4..5c42399df280 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1 +1,2 @@
DIST kde-gtk-config-5.5.5.tar.xz 146876 SHA256 183e4faec4cc175f9fabf7eaa8d3343498079f41e10b645fdc4335e2dd9ddd2c SHA512 3449f8c3eab4fd3ef181e84214eec2b55e0c617c2e4460a0519e17cfdbcc14687f48b096c2aee7878bbea1c3f51e95d7a62d7748b6fa1e4b0c4bef682a9cff27 WHIRLPOOL 6bfecc088a6c153ec672f91c5ec3e93bcc299b69d22c224c368534a262e0929354e4d9ec619a086db0b21fc3c270d478193a97af3d1dd064869c735920c2d6f0
+DIST kde-gtk-config-5.6.1.tar.xz 164772 SHA256 ff058dbe1003303d16b5dc500ba4a414d0655da19a0f9dfce0fb063afbaac028 SHA512 6a4acc52c86a6c1ee6480a10f30480d97790a4cc2855f79b110d95d545ba5f7d0e57a43b0c7ae679c5e3a5c11eb6e22e452d2d87674a8ec4d1accd4205288290 WHIRLPOOL a97f4a9fd692e967a9e6b1d09e65e4a9d2a0ef33fb90a833ea7b26b27b943ce664664878318fa5ee604964911e275eef1f4c0a286d3f64808ff983f173c3cfcd
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.1.ebuild
new file mode 100644
index 000000000000..34381a9e39fb
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
+HOMEPAGE="https://projects.kde.org/kde-gtk-config"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+gtk3"
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-libs/glib:2
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ x11-libs/gtk+:2
+ gtk3? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/kde-gtk-config:4
+ !kde-misc/kde-gtk-config
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+ -DBUILD_gtk3proxies=$(usex gtk3)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ einfo
+ elog "If you notice missing icons in your GTK applications, you may have to install"
+ elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
+ elog "for example."
+ einfo
+}
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 5b5146573a21..f699059e0a77 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1 +1,2 @@
DIST kdecoration-5.5.5.tar.xz 34700 SHA256 6c63fd16a4b3c887a0694cc161a2109a45ad780d1265931f6ceeca52b195a447 SHA512 48d99f64304562cb8579ec816a3311531747f9c42ce95ef76aa64a31321d10217942777ab6569716aca5958b7ac2372f7d7dbaa8c0da67e70a4d0dbb03175a6a WHIRLPOOL a03dc6364e0b8e1492daaf7c4a0a8880a1da930062fb02db6b03777c63326b2538a6c3bdbafd9a0ae859ca625adff823fddd73abfcc4b7378497e9ee5dad822f
+DIST kdecoration-5.6.1.tar.xz 34808 SHA256 eb268f10c87de713327430a398e56d6db871d992a667e443b9f3c935c98bb8b7 SHA512 a20b122b7176f1c8b5f3ad4d03a19b33fcec16b6bb078c6aa5e3de1a7b3ef14346b824ffe2032e35b4eba23fd7a8c07aeaa43a1bd39b18e762d7a4a01fc4fd5a WHIRLPOOL ff9575f3ad2850aa1a14554243696222f9eef295356139cb08355c2143b271225c0c218bd27f70c57ed76a1ea07ff6738a4d2210c44a15064aa8edddcc16a744
diff --git a/kde-plasma/kdecoration/kdecoration-5.6.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.6.1.ebuild
new file mode 100644
index 000000000000..0cbf34a8fbe2
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugin based library to create window decorations"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="$(add_qt_dep qtgui)"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index f69c6e9a7be6..da3f72cab3bf 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1 +1,2 @@
DIST kdeplasma-addons-5.5.5.tar.xz 2116160 SHA256 5d47e27632c11dd69bbe1b58884d983a77eb7d1e210c77e494748f0ea23b62d0 SHA512 f7ff2fd4c019154350161101d48391253ec0801ec30390abff587da4eccd38718e9665df1fee1651a1073bf3571b2d926e711b506e1e55601857ac5046a61ab9 WHIRLPOOL ca81627ec835b80a0278cfa9d227e3e7137143f794fa47592c570c042cada9153e38eaf3b87d2f2a30e11fca43b72b128dbb2d508cd5bfc1f5234695b6072e8c
+DIST kdeplasma-addons-5.6.1.tar.xz 2071956 SHA256 1a8963dc87a8c27ba15948fabe629f0b64eaec551a9edc0b1d8baf0fcf51a33b SHA512 87d656a3cf226ad4aa5e9869d8560e110a4b47162bad5c8a80fa6b0aff242bbdb3a9b24d7532aa661f130970e1e26fa6c8512654aad5b51ca4406898f324e3d9 WHIRLPOOL f7c6a28cf510d6c4460d0ee7f1409c7e7415e9cf3d02ed3ff942f41303ea388a8a18a5df728d902d3b01c1c9c5e8b7c3f541cc6f897b0f4a6a23e2a4fd89ef58
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.1.ebuild
new file mode 100644
index 000000000000..705a14c81d89
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="share"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kross)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep sonnet)
+ $(add_plasma_dep plasma-workspace)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep plasma-workspace)
+ !kde-base/kdeplasma-addons:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package share KDEExperimentalPurpose)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index 52f99fa25fe2..661a6715ac9c 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -8,5 +8,6 @@
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index b9df0cf074de..971818613eda 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1 +1,2 @@
DIST kgamma5-5.5.5.tar.xz 60308 SHA256 b2f9e3bb5c224d2fea930d5d58f5cbae0f2919ed451440ea9fb5111e51c22795 SHA512 7295f12afcaf875a0f98fcb4ed7e806b3226e0db0ff20274ad8c507c7ee3ecfd7af0cc3be20c322a1ad0b20f70eeb9d0501cac502d7881637726b80cd0b81a48 WHIRLPOOL 58b8a3718629eabdae1b6017d3ea5dbca59869783bf5ee030336a1ea5475859700f8861582e54318c0cc855a7282195d57765c7c7213248194529673327c5813
+DIST kgamma5-5.6.1.tar.xz 72180 SHA256 aa34dbea8d2cc22bc95da0cebaf0684aac823a00309500cd282fdaec743ac170 SHA512 acbbf78185b937a05ba94351e724fa0fa9c5ac01b6d28f0eb28297009c554a365a9efd214d0f87c9beb8ab229841ba5289b467491427e87da92572f1792c08c7 WHIRLPOOL 329afbb67e3042160072783967829753ecd863fb230dc27041aba0b3529df61beb3825cbd3dc05eedfa592b28a5101f3228cca8d12c212f01a13fef113056a01
diff --git a/kde-plasma/kgamma/kgamma-5.6.1.ebuild b/kde-plasma/kgamma/kgamma-5.6.1.ebuild
new file mode 100644
index 000000000000..44c95c0ef04c
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="${PN}5"
+inherit kde5
+
+DESCRIPTION="Screen gamma values kcontrol module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto
+ ! glogo-small.png"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X"
+
+REQUIRED_USE="egl? ( || ( gles opengl ) )"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui 'opengl(+)')
+ $(add_qt_dep qtwidgets)
+ gles? (
+ $(add_qt_dep qtgui 'gles2')
+ || (
+ media-libs/mesa[egl,gles1]
+ media-libs/mesa[egl,gles2]
+ )
+ )
+ ieee1394? ( sys-libs/libraw1394 )
+ nfs? ( net-fs/nfs-utils )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pci? ( sys-apps/pciutils )
+ samba? ( net-fs/samba[server(+)] )
+ wayland? ( $(add_plasma_dep kwayland) )
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep plasma)
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !kde-base/kcontrol:4
+ !kde-base/kinfocenter:4
+ !kde-misc/about-distro
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package gles OpenGLES)
+ $(cmake-utils_use_find_package ieee1394 RAW1394)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package pci PCIUTILS)
+ $(cmake-utils_use_find_package wayland KF5Wayland)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
+
+src_install() {
+ kde5_src_install
+
+ insinto /etc/xdg
+ doins "${FILESDIR}"/kcm-about-distrorc
+
+ insinto /usr/share/${PN}
+ doins "${DISTDIR}"/glogo-small.png
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 8388d2908c5e..f0ff5fff34ee 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1 +1,2 @@
DIST kmenuedit-5.5.5.tar.xz 441448 SHA256 b255e2c32f3f2eaf5c746cfcfe049bfd10a033c1ff7a73de869cab79ae6b0e04 SHA512 91b50597ff74ceae5e76255d9f2c317314c322849ec7c5208cbfe0e92932b6eeae8ea4830445bd36e73ed6580dad244e7e28c7ad12341f58310e557a038ecfa2 WHIRLPOOL b8da6d3c761e1b9b68a855e28f0b74eeb3a13f398658caaf7ac505b8b47ebbfdcd58728f2065e1d666d0cf51dd1b6ba88db514dd25c0e1182b6af81c75a7baaa
+DIST kmenuedit-5.6.1.tar.xz 480044 SHA256 53f10c17158db4db913f0109f55dfc04a9c039beb9214d5f97d822cb63f38159 SHA512 c430668f5966078df94e3f7683de84f8137ea720b783caa624e05456a1981d738b80bccca2b16a9eb2906166806c34d01b3a805f2cd108448edbca22fa53c153 WHIRLPOOL 5d230cc2f0f2b8a96f85c7b9ed762a9f9a14f52d7b3963691ebf59ced9008067308fbcd7f440773743ba3319355c3d0b30b89e19ffe12cd4e721eb95f0ba4806
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild
new file mode 100644
index 000000000000..1f17739f3606
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE menu editor"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kmenuedit"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+hotkeys"
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ hotkeys? ( $(add_plasma_dep khotkeys) )
+"
+RDEPEND="${DEPEND}
+ !kde-base/kmenuedit:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 585a2a67768a..63b71cc4bd6d 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1 +1,2 @@
DIST kscreen-5.5.5.tar.xz 104344 SHA256 9f61e87f9128481aaa4718d900ffaab2ad15e377f5514db2c0d95a30bac00ea8 SHA512 85f0e8c7480fa493a24869a4ce99cfce04707f270521e18914e019924645f89237b96fecae2245fae03543e1e7e331c8771a1ba56daa4a81af99b106d82b75c3 WHIRLPOOL a8dfb6add72f094ffb295bc3af69f31fd9bd06fe6e1dcc2b0b3ed5e34b70df2c5ca85d854f7c89a6995bbfd6dcc4383219d732e2ef1551ea18be8e7fb55bf9a8
+DIST kscreen-5.6.1.tar.xz 116892 SHA256 a1b64dbfcbd611d32155276b73de42162aa389d0f253de611504ac2e7ce0c378 SHA512 51129b0489254ab9f03a72a9780da5caa67ac767667826fea0a1d5703770779fe5421183230595ddce10fcb7aec7cbc8c9fd85a4618bf791a2d78858c6cc9532 WHIRLPOOL 5be6f229fa82255531abd8c0fa86787c47f8966567264b39cbecf89fd8f99daf10b49cf061d59c8cf8c2cc6184b08303ccbefd432759a8b26e573defc8986a19
diff --git a/kde-plasma/kscreen/kscreen-5.6.1.ebuild b/kde-plasma/kscreen/kscreen-5.6.1.ebuild
new file mode 100644
index 000000000000..5d5fa248c031
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/extragear/base/kscreen"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_plasma_dep libkscreen)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ $(add_qt_dep qtgraphicaleffects)
+ !kde-misc/kscreen
+"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 06f446de6586..744f51bacb3e 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1 +1,2 @@
DIST kscreenlocker-5.5.5.tar.xz 98400 SHA256 7cad8630831094dc1cde7d828df750191eb032c908a6bccc6d5d83b15a235803 SHA512 290341230f96db32d9c0b767f46994c91c3a5809799830c2b377a79e3163c53c484114f63a85aa0eede1763e06611e07c677cfa0678350921f14b764da798135 WHIRLPOOL accdc244e23e6f0f749ef87bee122b5f03506b875731c8a59027f2a90eb64331e272f92e89d375baa1d677611b244eb882da944088b5269eacbc854205125794
+DIST kscreenlocker-5.6.1.tar.xz 103896 SHA256 8071a4bdef749cd392d0080b09827e5613e92d36283880ea6c1224211a0a01ef SHA512 27d657d4ecc7c009146a9a462f74163922a4b30222a52d3f2e7fae28ce44de7ff9a1c1b762c38c4a75550ac765eec579f8a9d6bd63c3504c5e2ed2eebd32c656 WHIRLPOOL c7812b85e9094993fd02e9553b942461f90ab27f11c7cc3c4e0ca6bacd8d3804730faf655602b85b44bbd4c5de6437bea0eeb11964e4338cd41ec07797ae4789
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.6.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.6.1.ebuild
new file mode 100644
index 000000000000..0bc30781612c
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 pam
+
+DESCRIPTION="Library and components for secure lock screen architecture"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pam"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_plasma_dep kwayland)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ dev-libs/wayland
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ pam? ( virtual/pam )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ !=dev-libs/wayland-1.7.0
+ $(add_qt_dep qtgui)
+ media-libs/mesa[egl]
+"
+RDEPEND="${DEPEND}"
+
+# All failing, i guess we need a virtual wayland server
+RESTRICT="test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 4ac5c3338d22..486cf51cd9e3 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1 +1,2 @@
DIST kwin-5.5.5.tar.xz 3817132 SHA256 759772e263c14e853803e2beb9ef9c02da3cb59ca1a62ee533df657013c6e9c4 SHA512 1291cd627c8a72bee02083d0c4b2220330ce2acf2aea871a7cc03a6eebad68a75c05bee10f169248fe17df2fcd45cb8dcaada1151455c52e64e5ad70dfb6e2ce WHIRLPOOL 4916a5fc579e6d67d0e352e4b32c7d8f7f390d38fdb05eac54b45971262b4a4632f107de2c5b56c7eb386ed0b26b719bd6903e3dc5af1801a9a36b78e3d65aec
+DIST kwin-5.6.1.tar.xz 3915572 SHA256 f71a97c159c4d56a5769d9f9a878e906da4b16c58199b1a9a0f6db17efaa4568 SHA512 aab22e2b2c8d8749234d283e03f0ce0802bb8fdcd0423276aac5cd80947371e2eb1fc1b256b3953559a7c7c2f33706dd2030b5d00676e88abca7a41fa7351d3a WHIRLPOOL 3a0b703b4df96763a6d02d6fd10ccb7aa34c19793c3b480e32f8ea9d5ca6ab1b2d535dcaa259e56b3ad653fe5e149db6a096d48fabf1fb61ee2f6d5c2f45871a
diff --git a/kde-plasma/kwin/kwin-5.6.1.ebuild b/kde-plasma/kwin/kwin-5.6.1.ebuild
new file mode 100644
index 000000000000..566e23a1890b
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE window manager"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gles2 multimedia"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem X)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_plasma_dep kdecoration)
+ $(add_plasma_dep kscreenlocker)
+ $(add_plasma_dep kwayland)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui 'gles2=,opengl(+)')
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ >=dev-libs/libinput-0.10
+ >=dev-libs/wayland-1.2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libepoxy
+ media-libs/mesa[egl,gbm,gles2?,wayland]
+ virtual/libudev:=
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libdrm
+ >=x11-libs/libxcb-1.10
+ >=x11-libs/libxkbcommon-0.4.1
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep kde-cli-tools)
+ multimedia? (
+ || (
+ $(add_qt_dep qtmultimedia 'gstreamer,qml')
+ $(add_qt_dep qtmultimedia 'gstreamer010,qml')
+ )
+ )
+ !Enable configuration module for desktop input devices.
Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator.
Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator.
+ Use ibus input method via app-i18n/ibus
Add support for applications using legacy xembed systray icons.
+ Enable applets that use app-i18n/scim
Enable configuration module for synaptics-based touchpads.
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.6.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.6.1.ebuild
new file mode 100644
index 000000000000..94cb718f50a2
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.6.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.20.0"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE Plasma desktop"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus legacy-systray pulseaudio +qt4 scim"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep attica)
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kded)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kpeople)
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep sonnet)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep plasma-workspace)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxcb
+ x11-libs/libxkbfile
+ fontconfig? (
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libXft
+ x11-libs/xcb-util-image
+ )
+ ibus? (
+ $(add_qt_dep qtx11extras)
+ app-i18n/ibus
+ dev-libs/glib:2
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
+ pulseaudio? (
+ dev-libs/glib:2
+ media-libs/libcanberra
+ media-sound/pulseaudio
+ )
+ scim? ( app-i18n/scim )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_plasma_dep breeze)
+ $(add_plasma_dep kde-cli-tools)
+ $(add_plasma_dep oxygen)
+ $(add_qt_dep qtgraphicaleffects)
+ sys-apps/accountsservice
+ x11-apps/setxkbmap
+ legacy-systray? (
+ gtk2? ( dev-libs/libappindicator:2 )
+ gtk3? ( dev-libs/libappindicator:3 )
+ qt4? ( dev-libs/sni-qt )
+ )
+ pulseaudio? ( $(add_plasma_dep plasma-pa ) )
+ qt4? ( kde-base/qguiplatformplugin_kde )
+ !kde-apps/kcontrol
+ !kde-apps/kdepasswd
+ !kde-apps/knetattach[handbook]
+ !kde-base/plasma-desktop:4
+ !kde-base/plasma-workspace:4
+ !kde-base/solid-actions-kcm:4
+ !kde-base/systemsettings:4
+ !kde-misc/kcm_touchpad
+ !kde-misc/kcm-touchpad
+ !kde-plasma/kcm-touchpad
+ !
+
+
+
+ kde@gentoo.org
+ Gentoo KDE Project
+
+
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.6.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.6.1.ebuild
new file mode 100644
index 000000000000..e124da2aaa23
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_plasma_dep kwayland)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui '' '' '5=')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libXcursor
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep oxygen-fonts '' 5.4.3)
+ media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-plasma/plasma-mediacenter/Manifest b/kde-plasma/plasma-mediacenter/Manifest
index 8b25df7993cd..413cd8270ea0 100644
--- a/kde-plasma/plasma-mediacenter/Manifest
+++ b/kde-plasma/plasma-mediacenter/Manifest
@@ -1 +1,2 @@
DIST plasma-mediacenter-5.5.5.tar.xz 161388 SHA256 1231f770032a445b3285765112024bb75e1f47791f58136cb932b92e95c63dfa SHA512 cf02cedb251e891ed479241a3ac3f25934454b9296e1fd795271d0e6e25da02c39e311b229faba19a458cfefb0191bb3edef3f90a6c3437daf1e597123601f96 WHIRLPOOL 90910e67f068b465fbb388009d614f24f3922708ccf86cb18d238dcf90755fbffdb3fea57ccaf9314dc48a21c77ace932fbb15552712de8e7f026f1c7020cf34
+DIST plasma-mediacenter-5.6.1.tar.xz 174344 SHA256 f6c8804bd814bbdac0cee45c7dfc9df0fff5dbd4ed49741d9987ba31c7569033 SHA512 90f8ec0e459052663e3b0d87d337dca7b4fe24bc9866d675c29e6c6c2e0f3c676820cf90624ec08d279c50b98bc5672d55a75729b488dca0b3da740d8e58d0d4 WHIRLPOOL 9587141e015a5eb69f4a51778d57676595e4626fd1163d6b40f8253cb76cd7319317632754f33053ad7e9fe18049eedf52fb8443e8000ffc95a75e2a6c7487f7
diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.1.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.1.ebuild
new file mode 100644
index 000000000000..b1b0d084431d
--- /dev/null
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Unified media experience for any device capable of running KDE"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="semantic-desktop"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep plasma)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtxml)
+ media-libs/taglib
+ semantic-desktop? (
+ $(add_frameworks_dep baloo)
+ $(add_frameworks_dep kfilemetadata)
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep plasma-workspace)
+ $(add_qt_dep qtmultimedia 'qml')
+ !media-video/plasma-mediacenter
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+ $(cmake-utils_use_find_package semantic-desktop KF5FileMetadata)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index fd4996638513..5e7b5a484220 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -7,7 +7,9 @@