diff --git a/app-crypt/heimdal/files/heimdal_db5.patch b/app-crypt/heimdal/files/heimdal_db5.patch
deleted file mode 100644
index 957a3169b29d..000000000000
--- a/app-crypt/heimdal/files/heimdal_db5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/hdb/db3.c b/lib/hdb/db3.c
-index 3b22c2e..a7bae76 100644
---- a/lib/hdb/db3.c
-+++ b/lib/hdb/db3.c
-@@ -268,7 +268,7 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
- db_create(&d, NULL, 0);
- db->hdb_db = d;
-
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR == 5) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
- ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -276,7 +276,7 @@ DB_open(krb5_context context, HDB *db, int flags, mode_t mode)
-
- if (ret == ENOENT) {
- /* try to open without .db extension */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR == 5) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- myflags, mode);
- #else
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
deleted file mode 100644
index 00f6c35f8d75..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3-r1.ebuild,v 1.4 2014/05/18 19:51:35 swift Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python-any-r1 toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
- selinux? ( sec-policy/selinux-kerberos )
- berkdb? ( sys-libs/db )
- !berkdb? ( sys-libs/gdbm )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.5.7
- >=sys-libs/e2fsprogs-libs-1.41.11
- sys-libs/ncurses
- sys-libs/readline
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? ( x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-src_prepare() {
- epatch "${FILESDIR}/heimdal_missing-include.patch"
- epatch "${FILESDIR}/heimdal_db6.patch"
- epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
- epatch "${FILESDIR}/heimdal_link_order.patch"
- epatch "${FILESDIR}/heimdal_missing_symbols.patch"
- epatch "${FILESDIR}/heimdal_texinfo-5.patch"
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- local myconf=""
- if use berkdb; then
- myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
- else
- myconf="--without-berkeley-db"
- fi
- econf \
- --enable-kcm \
- --disable-osfc2 \
- --enable-shared \
- --with-libintl=/usr \
- --with-readline=/usr \
- --with-sqlite3=/usr \
- --libexecdir=/usr/sbin \
- $(use_enable afs afs-support) \
- $(use_enable otp) \
- $(use_enable pkinit kx509) \
- $(use_enable pkinit pk-init) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread-support) \
- $(use_with caps capng) \
- $(use_with hdb-ldap openldap /usr) \
- $(use_with ipv6) \
- $(use_with ssl openssl /usr) \
- $(use_with X x) \
- ${myconf}
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
- dodoc ChangeLog README NEWS TODO
-
- # Begin client rename and install
- for i in {telnetd,ftpd,rshd,popper}
- do
- mv "${D}"/usr/share/man/man8/{,k}${i}.8
- mv "${D}"/usr/sbin/{,k}${i}
- done
-
- for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
- do
- mv "${D}"/usr/share/man/man1/{,k}${i}.1
- mv "${D}"/usr/bin/{,k}${i}
- done
-
- mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
- mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
- # default database dir
- keepdir /var/heimdal
-
- # Ugly hack for broken symlink - bug #417081
- rm "${D}"/usr/share/man/man5/qop.5 || die
- dosym mech.5 /usr/share/man/man5/qop.5
-}
diff --git a/app-crypt/heimdal/heimdal-1.5.3.ebuild b/app-crypt/heimdal/heimdal-1.5.3.ebuild
deleted file mode 100644
index c9e46a2934c7..000000000000
--- a/app-crypt/heimdal/heimdal-1.5.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.16 2014/05/18 19:51:35 swift Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
- selinux? ( sec-policy/selinux-kerberos )
- berkdb? ( sys-libs/db )
- !berkdb? ( sys-libs/gdbm )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.5.7
- >=sys-libs/e2fsprogs-libs-1.41.11
- sys-libs/ncurses
- sys-libs/readline
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? ( x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
- =dev-lang/python-2*
- virtual/pkgconfig
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}/heimdal_missing-include.patch"
- epatch "${FILESDIR}/heimdal_db5.patch"
- epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
- epatch "${FILESDIR}/heimdal_link_order.patch"
- epatch "${FILESDIR}/heimdal_missing_symbols.patch"
- epatch "${FILESDIR}/heimdal_texinfo-5.patch"
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- local myconf=""
- if use berkdb; then
- myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
- else
- myconf="--without-berkeley-db"
- fi
- econf \
- --enable-kcm \
- --disable-osfc2 \
- --enable-shared \
- --with-libintl=/usr \
- --with-readline=/usr \
- --with-sqlite3=/usr \
- --libexecdir=/usr/sbin \
- $(use_enable afs afs-support) \
- $(use_enable otp) \
- $(use_enable pkinit kx509) \
- $(use_enable pkinit pk-init) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread-support) \
- $(use_with caps capng) \
- $(use_with hdb-ldap openldap /usr) \
- $(use_with ipv6) \
- $(use_with ssl openssl /usr) \
- $(use_with X x) \
- ${myconf}
-}
-
-src_compile() {
- emake -j1
-}
-
-src_install() {
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
- dodoc ChangeLog README NEWS TODO
-
- # Begin client rename and install
- for i in {telnetd,ftpd,rshd,popper}
- do
- mv "${D}"/usr/share/man/man8/{,k}${i}.8
- mv "${D}"/usr/sbin/{,k}${i}
- done
-
- for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
- do
- mv "${D}"/usr/share/man/man1/{,k}${i}.1
- mv "${D}"/usr/bin/{,k}${i}
- done
-
- mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
- mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
- # default database dir
- keepdir /var/heimdal
-
- # Ugly hack for broken symlink - bug #417081
- rm "${D}"/usr/share/man/man5/qop.5 || die
- dosym mech.5 /usr/share/man/man5/qop.5
-}
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
new file mode 100644
index 000000000000..0fd60a24c4a1
--- /dev/null
+++ b/app-crypt/libscrypt/Manifest
@@ -0,0 +1 @@
+DIST libscrypt-1.19.tar.gz 18208 SHA256 8f398677b2b43e21423b800156b3379f3cb0d314e70eec2eb2e83a012bce854f SHA512 decf4fe6eb83d6a9ddd71cd9b9f4f9232bbadc8a7dc4c62aa737b162fdb97a18e6a8b3ac314c0900830b151c1b77a8dc00ffd0e47e47c425490ee4c43a21a735 WHIRLPOOL 877bcc095fedabf023bdd1eb921625889afdaf20512ee93135b602d75b12686317efe2e63b5f115efb7d846f2a021cab84a0ce5791bcaa1abb931710895bbcfc
diff --git a/app-crypt/libscrypt/libscrypt-1.19.ebuild b/app-crypt/libscrypt/libscrypt-1.19.ebuild
new file mode 100644
index 000000000000..643b7494f84d
--- /dev/null
+++ b/app-crypt/libscrypt/libscrypt-1.19.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libscrypt/libscrypt-1.19.ebuild,v 1.1 2014/10/31 15:02:41 blueness Exp $
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Shared library to impliment the scrypt algorithm. See http://www.tarsnap.com/scrypt.html."
+HOMEPAGE="https://github.com/technion/libscrypt"
+SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ export PREFIX=/usr
+ export LIBDIR=${PREFIX}/$(get_libdir)
+ export CC=$(tc-getCC)
+ export CFLAGS="$CFLAGS -fPIC"
+ export LDFLAGS="$LDFLAGS -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version"
+ export CFLAGS_EXTRA=
+ emake
+}
diff --git a/app-crypt/libscrypt/metadata.xml b/app-crypt/libscrypt/metadata.xml
new file mode 100644
index 000000000000..1e7587374fdf
--- /dev/null
+++ b/app-crypt/libscrypt/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index 276a255b8450..c5ea9e15c0e6 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r2.ebuild,v 1.5 2014/10/30 10:00:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r2.ebuild,v 1.6 2014/10/31 15:56:10 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static"
DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-editors/ne/ne-2.5.ebuild b/app-editors/ne/ne-2.5.ebuild
index 7b4b4cdb48cd..0d206475ef8f 100644
--- a/app-editors/ne/ne-2.5.ebuild
+++ b/app-editors/ne/ne-2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.5.ebuild,v 1.5 2014/10/30 09:57:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.5.ebuild,v 1.6 2014/10/31 15:54:36 ago Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=tinfo
DEPEND="
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index c9bc53276e2f..4f737852e9c3 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,3 +2,4 @@ DIST docker-1.0.0.zip 8216390 SHA256 7552e1e02ed25c328c1c70820951fba144715bb3e26
DIST docker-1.0.1.zip 7048834 SHA256 5c60bafffd446cc2171d4126abe5a8092dcbdea4e844e9a0118a8fc211898646 SHA512 ab4161caaf6f92cd80d694bb8cde96efd9667752a084838744eda5194f242eb95f56d1e08a6b91f6eb54f539b0e625100f047d2092fb0cf0795c4e503115969c WHIRLPOOL 8718ad79827a1c514cd9fd9f2718389f0cd1ab2c5960847b478311e69ca9288cd07df8e92c139ab0a17911803ee2a9e6b1020542139425300dcad49f8bcfd343
DIST docker-1.1.0.zip 7083014 SHA256 5b3d4652946e8228ec6c0c7d7702b886f5c8f221a565e48eb2c08e88673c4627 SHA512 8c5360133f7632d04b8d773c492b2cc2ac49d55b6d4a7a878695049c458fec593c91b93b221485267fea299042398084134cb8db72301302c3bb376cd7ed3563 WHIRLPOOL 6a14f2557ffe9cccd986a2cf0abe176c29563db9e7e953ca5e05d7f57cf90ed33a572596c559db9e85aecc8a7a99b0ac885b4d0c1d476aee8207888b475c43bf
DIST docker-1.2.0.zip 7519710 SHA256 97485720bb43347eb5464d1650cf97cb8da9ace1022cf30c203f1bdbfaab0ce4 SHA512 7892cc9f887cec047969450f8576b9d11189cc920993dc39aea1fdcf4cd8611101ae06cc2d95eece5a71854183d2caf3ecd89feb1174c12d59c8a780506bf9ff WHIRLPOOL 0335bd98e2d2c9d8d919b49b78c8fd28195d878cbec0bf5626ff289d1eba8f9830b91ab378cd9f88bf9bb83ac2535b81754ba4c9fa744af47d9e213015d86a39
+DIST docker-1.3.1.tar.gz 5869113 SHA256 5eb5578945438dce485c2628a3df47a6f6ca8fff7366f1ec8335b37955f82f70 SHA512 358825e84b4b1ba98f603d831a6afd917068e1689761ee051681d38c8fa95e06a0b1ccea8c2b6e155d5efa4de063153e36675407dcd80bf818e53c2e3bee0a93 WHIRLPOOL ff9eaa3a378fe42bb1ffc71fac74ee13cb9f1ecb151f5da83f56db23b418f7af6e1e45c1a53c5edde7e312d956a23b7eae086e540ffb21c9a15d12ab68fc7ea9
diff --git a/app-emulation/docker/docker-1.3.1.ebuild b/app-emulation/docker/docker-1.3.1.ebuild
new file mode 100644
index 000000000000..cfd3970395f3
--- /dev/null
+++ b/app-emulation/docker/docker-1.3.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.3.1.ebuild,v 1.1 2014/10/31 16:22:48 xarthisius Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
+HOMEPAGE="https://www.docker.com"
+
+GITHUB_URI="github.com/docker/docker"
+
+if [[ ${PV} == *9999 ]]; then
+ SRC_URI=""
+ EGIT_REPO_URI="git://${GITHUB_URI}.git"
+ inherit git-2
+else
+ SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ DOCKER_GITCOMMIT="4e9bbfa"
+ KEYWORDS="~amd64"
+ [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+fi
+
+inherit bash-completion-r1 linux-info systemd udev user
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
+
+CDEPEND="
+ >=dev-db/sqlite-3.7.9:3
+ device-mapper? (
+ sys-fs/lvm2[thin]
+ )
+"
+DEPEND="
+ ${CDEPEND}
+ >=dev-lang/go-1.2
+ btrfs? (
+ >=sys-fs/btrfs-progs-0.20
+ )
+ dev-vcs/git
+ dev-vcs/mercurial
+"
+RDEPEND="
+ ${CDEPEND}
+ !app-emulation/docker-bin
+ >=net-firewall/iptables-1.4
+ lxc? (
+ >=app-emulation/lxc-1.0
+ )
+ >=dev-vcs/git-1.7
+ >=app-arch/xz-utils-4.9
+ aufs? (
+ || (
+ sys-fs/aufs3
+ sys-kernel/aufs-sources
+ )
+ )
+"
+
+RESTRICT="installsources strip"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+ NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
+ DEVPTS_MULTIPLE_INSTANCES
+ CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED
+ MACVLAN VETH BRIDGE
+ NF_NAT_IPV4 IP_NF_TARGET_MASQUERADE
+ NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
+ NF_NAT NF_NAT_NEEDED
+
+ ~MEMCG_SWAP
+ ~RESOURCE_COUNTERS
+ ~CGROUP_PERF
+"
+
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+
+pkg_setup() {
+ if kernel_is lt 3 8; then
+ eerror ""
+ eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
+ eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
+ die 'Kernel is too old - need 3.8 or above'
+ fi
+
+ # for where these kernel versions come from, see:
+ # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+ if ! {
+ kernel_is ge 3 16 \
+ || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+ || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+ || { kernel_is 3 12 && kernel_is ge 3 12 25; }
+ }; then
+ ewarn ""
+ ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+ ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+ ewarn ""
+ ewarn "See also https://github.com/docker/docker/issues/2960"
+ fi
+
+ if use aufs; then
+ CONFIG_CHECK+="
+ ~AUFS_FS
+ "
+ # TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
+ # an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
+ fi
+
+ if use btrfs; then
+ CONFIG_CHECK+="
+ ~BTRFS_FS
+ "
+ fi
+
+ if use device-mapper; then
+ CONFIG_CHECK+="
+ ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS
+ "
+ fi
+
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ # allow user patches (use sparingly - upstream won't support them)
+ epatch_user
+}
+
+src_compile() {
+ # if we treat them right, Docker's build scripts will set up a
+ # reasonable GOPATH for us
+ export AUTO_GOPATH=1
+
+ # setup CFLAGS and LDFLAGS for separate build target
+ # see https://github.com/tianon/docker-overlay/pull/10
+ export CGO_CFLAGS="-I${ROOT}/usr/include"
+ export CGO_LDFLAGS="-L${ROOT}/usr/lib"
+
+ # if we're building from a zip, we need the GITCOMMIT value
+ [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+ if gcc-specs-pie; then
+ sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+ grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+ sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
+ grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+ fi
+
+ # let's set up some optional features :)
+ export DOCKER_BUILDTAGS=''
+ for gd in aufs btrfs device-mapper; do
+ if ! use $gd; then
+ DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+ fi
+ done
+
+ # time to build!
+ ./hack/make.sh dynbinary || die 'dynbinary failed'
+
+ # TODO get go-md2man and then include the man pages using docs/man/md2man-all.sh
+}
+
+src_install() {
+ VERSION=$(cat VERSION)
+ newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
+ exeinto /usr/libexec/docker
+ newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
+
+ newinitd contrib/init/openrc/docker.initd docker
+ newconfd contrib/init/openrc/docker.confd docker
+
+ systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+ udev_dorules contrib/udev/*.rules
+
+ dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+ if use doc; then
+ # TODO doman contrib/man/man*/*
+
+ docompress -x /usr/share/doc/${PF}/md
+ docinto md
+ dodoc -r docs/sources/*
+ fi
+
+ dobashcomp contrib/completion/bash/*
+
+ if use zsh-completion; then
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+ fi
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles
+ doins -r contrib/syntax/vim/ftdetect
+ doins -r contrib/syntax/vim/syntax
+ fi
+
+ if use contrib; then
+ mkdir -p "${D}/usr/share/${PN}/contrib"
+ cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+ fi
+}
+
+pkg_postinst() {
+ udev_reload
+
+ elog ""
+ elog "To use Docker, the Docker daemon must be running as root. To automatically"
+ elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+ elog " rc-update add docker default"
+ elog "Similarly for systemd:"
+ elog " systemctl enable docker.service"
+ elog ""
+
+ # create docker group if the code checking for it in /etc/group exists
+ enewgroup docker
+
+ elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+ elog " usermod -aG docker youruser"
+ elog ""
+}
diff --git a/app-emulation/libvirt/libvirt-1.2.9.ebuild b/app-emulation/libvirt/libvirt-1.2.9.ebuild
index 173ade3cb7e2..03b3dc04e941 100644
--- a/app-emulation/libvirt/libvirt-1.2.9.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9.ebuild,v 1.4 2014/10/31 07:17:09 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.9.ebuild,v 1.5 2014/10/31 12:15:03 tamiko Exp $
EAPI=5
@@ -83,7 +83,7 @@ RDEPEND="sys-libs/readline
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
- >=app-emulation/qemu-0.13.0[usb,usbredir]
+ >=app-emulation/qemu-0.13.0
dev-libs/yajl
!systemd? ( sys-power/pm-utils )
)
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 5c94f8b5c042..ae4a1fd5d5a2 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.59 2014/10/31 07:17:09 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.60 2014/10/31 12:15:03 tamiko Exp $
EAPI=5
@@ -83,7 +83,7 @@ RDEPEND="sys-libs/readline
pcap? ( >=net-libs/libpcap-1.0.0 )
policykit? ( >=sys-auth/polkit-0.9 )
qemu? (
- >=app-emulation/qemu-0.13.0[usb,usbredir]
+ >=app-emulation/qemu-0.13.0
dev-libs/yajl
!systemd? ( sys-power/pm-utils )
)
diff --git a/app-i18n/man-pages-de/man-pages-de-1.7.ebuild b/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
index 28c2ac0e7f7c..7c47d558b8b8 100644
--- a/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-1.7.ebuild,v 1.4 2014/10/30 14:04:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-1.7.ebuild,v 1.5 2014/10/31 15:58:36 ago Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND="virtual/man"
diff --git a/app-misc/devtodo/devtodo-0.1.20-r2.ebuild b/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
index 9ecacf5e8e69..1e989cae4149 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r2.ebuild,v 1.4 2014/10/30 10:00:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/devtodo/devtodo-0.1.20-r2.ebuild,v 1.5 2014/10/31 15:55:52 ago Exp $
EAPI="5"
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="
diff --git a/app-text/kchmviewer/kchmviewer-7.1.ebuild b/app-text/kchmviewer/kchmviewer-7.1.ebuild
index f8b186b19121..9cfa2fcb2f10 100644
--- a/app-text/kchmviewer/kchmviewer-7.1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-7.1.ebuild,v 1.1 2014/10/17 16:48:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-7.1.ebuild,v 1.2 2014/10/31 12:57:02 kensington Exp $
EAPI=5
@@ -42,6 +42,9 @@ src_prepare() {
rm po/${PN}_${lang}.po
fi
done
+
+ # fix parallel build wrt bug #527192
+ echo "src.depends = lib" >> ${PN}.pro || die
}
src_configure() {
diff --git a/app-text/pytextile/pytextile-2.1.8.ebuild b/app-text/pytextile/pytextile-2.1.8.ebuild
index 852b16687842..6eff3a129b00 100644
--- a/app-text/pytextile/pytextile-2.1.8.ebuild
+++ b/app-text/pytextile/pytextile-2.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pytextile/pytextile-2.1.8.ebuild,v 1.5 2014/10/30 14:05:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pytextile/pytextile-2.1.8.ebuild,v 1.6 2014/10/31 16:00:40 ago Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-cpp/metslib/metslib-0.5.3.ebuild b/dev-cpp/metslib/metslib-0.5.3.ebuild
index 27681faa6e66..32947258765d 100644
--- a/dev-cpp/metslib/metslib-0.5.3.ebuild
+++ b/dev-cpp/metslib/metslib-0.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/metslib/metslib-0.5.3.ebuild,v 1.1 2014/10/31 10:36:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/metslib/metslib-0.5.3.ebuild,v 1.3 2014/10/31 14:09:06 aballier Exp $
EAPI=5
@@ -8,9 +8,9 @@ DESCRIPTION="Metaheuristic modeling framework and optimization toolkit"
HOMEPAGE="https://projects.coin-or.org/metslib"
SRC_URI="http://www.coin-or.org/download/source/metslib/${P}.tgz"
-LICENSE="GPL-3"
+LICENSE="|| ( GPL-3 CPL-1.0 )"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
IUSE=""
DEPEND=""
diff --git a/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch b/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
new file mode 100644
index 000000000000..28d7ef2b9e52
--- /dev/null
+++ b/dev-java/sblim-cim-client/files/2.2.1-no-network-tests.patch
@@ -0,0 +1,41 @@
+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
+index 5b0ce56..cf79a8b 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.discovery.txt
+@@ -1,3 +1,2 @@
+-discovery.DiscovererSLPTest
+ discovery.WBEMServiceAdvertisementSLPTest
+-discovery.AdvertisementCatalogTest
+\ No newline at end of file
++discovery.AdvertisementCatalogTest
+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
+index 68eab35..1437e75 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.slp.txt
+@@ -1,3 +1,2 @@
+-slp.SLPTest
+ slp.ServiceURLTest
+-! testcases.slp.internal.txt
+\ No newline at end of file
++! testcases.slp.internal.txt
+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
+index 43da29d..26bb35f 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.txt
+@@ -5,8 +5,6 @@ cim.CIMVersionTest
+ ! testcases.discovery.txt
+ ! testcases.util.txt
+ ! testcases.wbem.txt
+-http.SSLConfigurationTest
+ cimxml.CimXmlSerializerTest
+-http.HttpClientTest
+ http.HttpHeaderTest
+ logging.LogAndTraceBrokerTest
+diff --git a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
+index 4b34dd4..f0e7431 100644
+--- a/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
++++ b/sblim-cim-client2-2.2.1-src/utst/org/sblim/cimclient/unittest/testcases.util.txt
+@@ -1,3 +1,2 @@
+-util.WBEMConfigurationTest
+ util.XMLHostStrTest
+ util.BadDoubleStringsTest
diff --git a/dev-java/sblim-cim-client/files/sblim-cim-client-1.3.5-java-doc-without-clean.patch b/dev-java/sblim-cim-client/files/sblim-cim-client-1.3.5-java-doc-without-clean.patch
deleted file mode 100644
index 055482ba4a3d..000000000000
--- a/dev-java/sblim-cim-client/files/sblim-cim-client-1.3.5-java-doc-without-clean.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -Nr cim-client.orig/build.xml cim-client/build.xml
---- cim-client.orig/build.xml 2008-02-26 05:52:18.000000000 -0500
-+++ cim-client/build.xml 2008-04-11 10:30:42.000000000 -0400
-@@ -141,7 +141,7 @@
-
-
-
--
-+
- =virtual/jre-1.5"
+DEPEND="
+ >=virtual/jdk-1.5
+ test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}/${PN}2-${PV}-src"
+
+EANT_BUILD_TARGET="package"
+EANT_DOC_TARGET="java-doc"
+EANT_TEST_TARGET="unittest"
+
+java_prepare() {
+ epatch "${FILESDIR}"/${PV}-no-network-tests.patch
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "build/lib/${PN}2-${PV}.jar"
+
+ dodoc build/lib/*.properties
+ dodoc ChangeLog README NEWS
+
+ use doc && java-pkg_dojavadoc build/doc
+ use source && java-pkg_dosrc src/*
+}
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
index 9933dbe52dd9..65c128cdabe9 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild,v 1.5 2014/10/30 14:04:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild,v 1.6 2014/10/31 16:00:04 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc examples static-libs"
RDEPEND=""
diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
index e3cd530b1ebc..a6ff03be5c8c 100644
--- a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
+++ b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild,v 1.5 2013/03/02 20:01:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild,v 1.6 2014/10/31 13:37:03 kensington Exp $
EAPI=4
inherit eutils virtualx cmake-utils
@@ -23,6 +23,9 @@ DEPEND="${RDEPEND}
test? ( dev-qt/qttest:4 )
virtual/pkgconfig"
+# bug #440042
+RESTRICT="test"
+
src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
epatch "${FILESDIR}"/${P}-optionaltests.patch
diff --git a/dev-libs/seed/seed-3.8.1.ebuild b/dev-libs/seed/seed-3.8.1.ebuild
index 73b6e03d2c72..53b6258af640 100644
--- a/dev-libs/seed/seed-3.8.1.ebuild
+++ b/dev-libs/seed/seed-3.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/seed-3.8.1.ebuild,v 1.6 2014/10/05 12:08:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/seed-3.8.1.ebuild,v 1.7 2014/10/31 14:38:30 pacho Exp $
EAPI=5
GNOME2_LA_PUNT="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/Seed"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="debug profile test"
REQUIRED_USE="profile? ( debug )"
diff --git a/dev-python/PyQtMobility/metadata.xml b/dev-python/PyQtMobility/metadata.xml
index 5fecc85e4c00..d46620955c1d 100644
--- a/dev-python/PyQtMobility/metadata.xml
+++ b/dev-python/PyQtMobility/metadata.xml
@@ -2,7 +2,6 @@
qt
- python