diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 6c026dbd5c83..3224db5dcb12 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -1,2 +1,3 @@
DIST cgmanager-0.36.tar.gz 428374 SHA256 f4707f0130efb50ccd8a1900e7ae626c0631947528ce921a63b15ef848fb2a0d SHA512 3325c03e25b7bd7b8dcfb68bb3dedccf9367ce80c23ac8df3f1af6cdb9ee706eafc0f95fcea055cc1fe9b31acb5bb66c61b16b21dfa057e661fdace3ff207f43 WHIRLPOOL dcaad06e6281f89e672b843f9903473cb1ee5d1b938c72d1b806f7bc7a1014144dd9e6e304e9ce6e2b941a1b224177747dacc7affa122f9a17a14598969a4779
DIST cgmanager-0.37.tar.gz 430522 SHA256 8309e7f2ae5f4a6b52cc2fca62c098b18ecfe90bca2c9c034ba80f68aa427b6e SHA512 fbe96af36d556c988351f1136f4382d907b8fb6d4098a90b17f4abfbdf182060d8ba059878455a8842597e7ad33ff12b91bddf68a6c42b02ad9549a2ad900a89 WHIRLPOOL 9a78226ec2a6a84c7fb84f3bb2622df159a4b857d990b2d4f22a1d8c7d02d071c0ed046e5d17ea9d2bd4b970a0a6ad9bf59ba68401248db318b89e16010c720a
+DIST cgmanager-0.39.tar.gz 437683 SHA256 9e65487fb4e4aa0a6acd87ba7f8f00b8007d8c52608aa6d411e72e6fe9445b7b SHA512 2adf2c639191fb681ffed083629d6ba93f6d5a3534d4dc00b2cff1917c3273febcb30ec7d524ee95ce4a1b8811d902a2ff1cdffe911a66850fb9f10750ef1801 WHIRLPOOL b57c0feb75543af7e7eadccd5287962034fa2c54883289822b54ed184873fb1b6e1eb6d9dcc952fcda2f3027d84fa517c2bfed22a855ede8e700c2298d5d210a
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
new file mode 100644
index 000000000000..a31daac011f1
--- /dev/null
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools pam
+
+DESCRIPTION="Control Group manager daemon"
+HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
+SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pam"
+
+RDEPEND="
+ sys-libs/libnih[dbus]
+ sys-apps/dbus"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch_user
+
+ # systemd expects files in /sbin but we will have them in /usr/sbin
+ pushd config/init/systemd > /dev/null || die
+ sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
+ die "Failed to fix paths in systemd service files"
+ popd > /dev/null || die
+
+ # there is an automagic dep on pam
+ epatch "${FILESDIR}/${PN}-0.39-make-pam-conditional.patch"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-distro=gentoo \
+ $(use_enable pam pam-module) \
+ --with-pamdir="$(getpam_mod_dir)" \
+ --with-init-script=systemd
+}
+
+src_install () {
+ default
+
+ # I see no reason to have the tests in the filesystem. Drop them
+ rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
+
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
new file mode 100644
index 000000000000..eed626f3e68c
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager-0.39-make-pam-conditional.patch
@@ -0,0 +1,31 @@
+--- Makefile.am.old 2015-09-06 00:16:38.997836415 +0800
++++ Makefile.am 2015-09-06 01:05:00.376009752 +0800
+@@ -133,6 +133,7 @@
+ $(CCLD) -o tests/cgm-concurrent tests/cgm-concurrent.o \
+ $(NIH_LIBS) $(NIH_DBUS_LIBS) $(DBUS_LIBS) -lpthread -lcgmanager
+
++if HAVE_PAMMODULE
+ pam_LTLIBRARIES = pam_cgm.la
+ pam_cgm_la_SOURCES = pam/pam_cgm.c pam/cgmanager.c pam/cgmanager.h
+ pam_cgm_la_CFLAGS = $(AM_CFLAGS)
+@@ -145,4 +146,6 @@
+ rm -f "$(DESTDIR)$(pamdir)/pam_cgm.a"
+ uninstall-local:
+ rm -f "$(DESTDIR)$(pamdir)/pam_cgm.so"
++endif
++
+ tests: TESTS_CGM_CONCURRENT TESTS_SCM TEST_NSTEST
+--- configure.ac.old 2015-09-06 00:55:48.262972928 +0800
++++ configure.ac 2015-09-06 01:04:19.683301852 +0800
+@@ -127,6 +127,11 @@
+
+ AS_AC_EXPAND(SBINDIR, "$sbindir")
+
++AC_ARG_ENABLE(pam-module,
++ [AS_HELP_STRING([--enable-pam-module],[build PAM module])],
++ , enable_pam_module=no)
++AM_CONDITIONAL([HAVE_PAMMODULE], [test "x$enable_pam_module" != "xno" ])
++
+ AC_ARG_WITH(
+ [pamdir],
+ [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored])],
diff --git a/app-admin/cgmanager/files/cgmanager.initd b/app-admin/cgmanager/files/cgmanager.initd
index 26c915f4dac8..46b1e01fd170 100644
--- a/app-admin/cgmanager/files/cgmanager.initd
+++ b/app-admin/cgmanager/files/cgmanager.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@ NESTED=yes
OPTIONS=
depend() {
- after cgproxy
+ before cgproxy
}
start() {
diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1
new file mode 100644
index 000000000000..48faf787c938
--- /dev/null
+++ b/app-admin/cgmanager/files/cgmanager.initd-r1
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Control Group manager daemon"
+pidfile="/run/cgmanager.pid"
+command="/usr/sbin/cgmanager"
+command_args="-m name=systemd"
+command_background="yes"
+retry="TERM/45"
+
+depend() {
+ before cgproxy
+}
diff --git a/app-admin/cgmanager/files/cgproxy.initd b/app-admin/cgmanager/files/cgproxy.initd
index 3624598adb31..458dcb6ec278 100644
--- a/app-admin/cgmanager/files/cgproxy.initd
+++ b/app-admin/cgmanager/files/cgproxy.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,7 +9,7 @@ NESTED=yes
OPTIONS=
depend() {
- before cgmanager
+ after cgmanager
}
start() {
diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1
new file mode 100644
index 000000000000..ff7b78e8bbbc
--- /dev/null
+++ b/app-admin/cgmanager/files/cgproxy.initd-r1
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+description="Control Group manager proxy"
+pidfile="/run/cgproxy.pid"
+command="/usr/sbin/cgproxy"
+command_args="--daemon"
+command_background="yes"
+retry="TERM/45"
+NESTED="${NESTED:-no}"
+
+depend() {
+ after cgmanager
+}
+
+start_pre() {
+ if ! /usr/sbin/cgproxy --check-master; then
+ ewarn "cgmanager is not running"
+ return 1
+ fi
+ # cgproxy should only run on container unless on older kernel
+ if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
+ eerror "Too old kernel to support cgroup, please update to >3.8"
+ return 1
+ fi
+}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
index 230776629fec..5d74e34036b5 100644
--- a/app-admin/cgmanager/metadata.xml
+++ b/app-admin/cgmanager/metadata.xml
@@ -1,8 +1,12 @@
-
-hwoarang@gentoo.org
-Markos Chandras
-
+
+ perfinion@gentoo.org
+ Jason Zaman
+
+
+ hwoarang@gentoo.org
+ Markos Chandras
+
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
index 013e6579a275..a5be798c5082 100644
--- a/app-admin/system-tools-backends/metadata.xml
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -1,7 +1,7 @@
-gnome
+lxqt
The System Tools Backends are a set of cross-platform modules for Linux,
FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
index c3aa1bd635df..ebf5c4697b3f 100644
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index 5b80f264acc0..d5fa59e682fe 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"
RDEPEND="
diff --git a/app-crypt/zuluCrypt/Manifest b/app-crypt/zuluCrypt/Manifest
index 40f1b8ea2866..41b8ffb88dc2 100644
--- a/app-crypt/zuluCrypt/Manifest
+++ b/app-crypt/zuluCrypt/Manifest
@@ -1 +1,2 @@
DIST zuluCrypt-4.7.6.tar.bz2 582120 SHA256 b39533de700608a0d1981eb6818f8e103c948c342ba3de36f2f4a0520664294b SHA512 bcf3dd31997ba7db47df4beae2c1e54d031b9c468517475fb7ea6a73e3cf787aaf87a4fdc3cfbb3e54cc0ed8ea218b92014315e940ecb722e0b748248367a2b7 WHIRLPOOL e4d1ca05ebce4c33a8b849e96917b842a1a0330a57700e94fc3f1d1af6a13bcfca9d2039e58f6b4b9353c14296d9feaf898b3de47c3ccd6cc11517be5f07088f
+DIST zuluCrypt-4.7.7.tar.bz2 550309 SHA256 d832668c646bb93a63e908bd1896def830db304138a17f34eae09dd41b3197d4 SHA512 bca390caacc7ff39b03dce370c2f85da2f52d9de3604713ec2dec6f53b75573163a5db60ca30746f4056def8617a9a93f80026c1833396356c849b10948468f1 WHIRLPOOL 6d54015b8458cd6b4460afc33f14dabe3672bc3aea849230090b0c2a64f37da9777f1e0745e7000be1e05874962f4cc97e284fa8877fa0a1d09b93b71bb5e215
diff --git a/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
new file mode 100644
index 000000000000..c0bf1f096d4c
--- /dev/null
+++ b/app-crypt/zuluCrypt/zuluCrypt-4.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="Front end to cryptsetup"
+HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
+SRC_URI="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome +gui kde udev"
+
+CDEPEND="
+ dev-libs/libgcrypt:0
+ sys-apps/util-linux
+ sys-fs/cryptsetup
+ gnome? ( app-crypt/libsecret )
+ gui? (
+ dev-libs/libpwquality
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde? (
+ kde-base/kdelibs:4
+ kde-apps/kwalletd:4
+ )
+ )
+"
+RDEPEND="${CDEPEND}
+ udev? ( virtual/udev )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use udev UDEVSUPPORT)
+ -DLIB_SUFFIX="$(get_libdir)"
+ $(cmake-utils_use !gnome NOGNOME)
+ $(cmake-utils_use !gui NOGUI)
+ # WITH_PWQUALITY has no effect without gui
+ $(cmake-utils_use gui WITH_PWQUALITY)
+ # KDE has no effect without gui
+ $(usex gui "$(cmake-utils_use !kde NOKDE)" "-DNOKDE=TRUE")
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 8ccee33616b0..9a213e499840 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1 +1,2 @@
DIST gnucash-docs-2.6.6.tar.gz 58940604 SHA256 64c5e5a9a5b0756f4fc7f631ace6d5bea910acf5b4d5249b9e010575f67004f7 SHA512 11ba613d0df2c8d1a4d107313001371b301db9595adeba6e0157ad258d3d2498e2b7a17f1bd6dc44ae3f6026ea0ed7d5597fde732a78bcf1cd03a835181f8f22 WHIRLPOOL 0a771aed2699b9b846c1b627e6b5018cf73bfb78b43ab6c7ff8d97dcf6fed457d69b56fe059971d0ce4eeeddb752ed2e23e895e9f28b92c0170294cb53215fe5
+DIST gnucash-docs-2.6.7.tar.gz 58975368 SHA256 80b8188675f3202aa0385f005a99d720a96aa380d2689c9c15f9aa7ecb08de7e SHA512 a73692e72f7613bf5f30869db8f8b42cc209af337ffb95327198a153a764ee0427fda12ee89a14ab932b15dfb8a3f8be318f50910e63b0419a13fb1b9773b262 WHIRLPOOL f6365eda03da9f005f4c6b19887dece44ce3893b57e37902ca2c55605755a9bd56ab00b405089631756fd65fba41a07361fd359e3edd8e76c08a7b7fa439e5c0
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild
new file mode 100644
index 000000000000..659b93645e9b
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+
+inherit gnome2
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="!<=app-office/gnucash-2.2.1"
+DEPEND="${RDEPEND}
+ >=dev-libs/libxml2-2.5.10
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/rarian
+ test? ( app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ has_version dev-java/fop || elog "You need dev-java/fop to generate pdf files."
+ has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 79b174919d7c..625471421b09 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,2 +1,3 @@
DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
+DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
diff --git a/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
new file mode 100644
index 000000000000..fbfcf1365016
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-dont-go-get.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2015-09-03 10:08:26.921410426 -0500
++++ Makefile 2015-09-03 10:08:52.193408698 -0500
+@@ -12,12 +12,10 @@
+
+ .PHONY: default
+ default:
+- go get -t -v -d ./... || true
+ go install -v ./...
+
+ .PHONY: client
+ client:
+- go get -t -v -d ./...
+ go install -v ./lxc
+
+ # This only needs to be done when migrate.proto is actually changed; since we
diff --git a/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
new file mode 100644
index 000000000000..c81a3edb7298
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/migration/rsync.go.orig 2015-08-21 12:05:15.098768663 -0500
++++ lxd/migration/rsync.go 2015-08-21 12:06:15.899764506 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.16.confd b/app-emulation/lxd/files/lxd-0.16.confd
new file mode 100644
index 000000000000..c3e6e681b885
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.confd
@@ -0,0 +1,23 @@
+LXD_OPTIONS=""
+
+# Group which owns the shared socket
+LXD_OPTIONS="${LXD_OPTIONS} --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --cpuprofile ''"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS="${LXD_OPTIONS} --memprofile ''"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS="${LXD_OPTIONS} --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS="${LXD_OPTIONS} --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS="${LXD_OPTIONS} -v"
diff --git a/app-emulation/lxd/files/lxd-0.16.initd b/app-emulation/lxd/files/lxd-0.16.initd
new file mode 100644
index 000000000000..2b75e51c8a64
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.16.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.16.ebuild b/app-emulation/lxd/lxd-0.16.ebuild
new file mode 100644
index 000000000000..cb20eba5a8ef
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.16.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+criu +daemon +image +lvm nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ virtual/acl
+ criu? (
+ sys-process/criu
+ )
+ image? (
+ app-crypt/gnupg
+ >=dev-lang/python-3.2
+ )
+ lvm? (
+ sys-fs/lvm2
+ )
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ if use daemon; then
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+ fi
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ use image && dobin scripts/lxd-images
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "including a Quick Start."
+
+ # The messaging below only applies to daemon installs
+ use daemon || return 0
+
+ # The control socket will be owned by (and writeable by) this group.
+ enewgroup lxd
+
+ # Ubuntu also defines an lxd user but it appears unused (the daemon
+ # must run as root)
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address profile option."
+ fi
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index 3ee6854f2f3a..c49dbec3e071 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -19,8 +19,18 @@
lxc/lxd
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
index 383a95ed75c3..80cc75921704 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 3112de3a938a..e488a91ae6cf 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1,2 @@
-DIST gnucash-2.6.5.tar.bz2 12997511 SHA256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65 SHA512 f45daa5a894f8cbe9ea552ccb354b08a4967f0a0f14595b871169a2a48495664a06e0f3dd81b6148b261418b67b76ae4e0ee3e72ec52ff3016c7f15523862538 WHIRLPOOL 38bdd5afec3337f929e4694dea072675baab86a68b730c0fc96c07c7287b0765140514ffd2c241784d857e7eba3d7bdbbf2b3c17f99d881d58095d68282b5d47
DIST gnucash-2.6.6.tar.bz2 13303707 SHA256 2337c791511ec35ca1ab207bac5f80dd5764df6029adf46a15154df370c97180 SHA512 bfb6f0e444463bd69f7e31f1dc8ff0ea9ba1c103c5d7d0a7a985c765ca17680c9d821bfe39474e2c9d71b655aeba78c1ec6f97f7a8ce8731cfdc335b683e830f WHIRLPOOL 2d917c0ab2f6756ed5205826b881467366b92d7cd1365b4d2531a8432e71fec46f5323fcb017647317cd7788e044fa4601f5179cfef4d65ed86e247eb126cd35
+DIST gnucash-2.6.7.tar.bz2 13529748 SHA256 6c15b12eeddc095d6926d9ea84d885c20b8f52781602c15aa3f672a1f7e2beef SHA512 a5711d5d6b89e9c44a28b9733dd185ed9afbe8d2c719675ced9d3e56ecdb03b62313faa5fee42cff70869baf4a3c29d4f69abc54967e46c3aa7ad766fc5a489d WHIRLPOOL b6aff7d48557a4619bfe27c2088ede6c3d2e6820947f457d2db42bc763d5dc24011afd28eb94e66f7a6f5405f2e44f03ae8a43e2fe7679502ea38ad2bee0e36a
diff --git a/app-office/gnucash/gnucash-2.6.5.ebuild b/app-office/gnucash/gnucash-2.6.7.ebuild
similarity index 92%
rename from app-office/gnucash/gnucash-2.6.5.ebuild
rename to app-office/gnucash/gnucash-2.6.7.ebuild
index 8a7d21015e7f..b951b2dec324 100644
--- a/app-office/gnucash/gnucash-2.6.5.ebuild
+++ b/app-office/gnucash/gnucash-2.6.7.ebuild
@@ -4,6 +4,7 @@
EAPI="5"
GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )
inherit autotools eutils gnome2 python-single-r1
@@ -14,13 +15,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
# libdbi version requirement for sqlite taken from bug #455134
RDEPEND="
- >=app-crypt/libsecret-0.18
>=dev-libs/glib-2.32.0:2
>=dev-libs/popt-1.5
>=dev-libs/libxml2-2.5.10:2
@@ -33,6 +33,7 @@ RDEPEND="
>=x11-libs/gtk+-2.24:2
>=x11-libs/goffice-0.7.0:0.8[gnome]
x11-libs/pango
+ gnome-keyring? ( >=app-crypt/libsecret-0.18 )
ofx? ( >=dev-libs/libofx-0.9.1 )
hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
sys-libs/gwenhywfar[gtk]
@@ -48,13 +49,11 @@ RDEPEND="
mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
"
DEPEND="${RDEPEND}
- >=app-text/scrollkeeper-0.3
virtual/pkgconfig
dev-util/intltool
gnome-base/gnome-common
sys-devel/libtool
"
-
PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
pkg_setup() {
@@ -93,6 +92,7 @@ src_configure() {
# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
gnome2_src_configure \
$(use_enable debug) \
+ $(use_enable gnome-keyring password-storage) \
$(use_enable ofx) \
$(use_enable hbci aqbanking) \
$(use_enable python) \
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
index de1531ffeb2d..98db667c2e91 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.4.5.2.ebuild
@@ -47,7 +47,7 @@ SRC_URI="
IUSE="gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
diff --git a/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
index 4861a30b2f64..e2c1e9bcd64c 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-4.4.5.2.ebuild
@@ -55,7 +55,7 @@ SRC_URI="
IUSE="gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
BIN_COMMON_DEPEND="
=app-text/libexttextcat-3.4*
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
index dd5266c1c33f..054b53fa7bcc 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-4.4.5.2.ebuild
@@ -14,7 +14,7 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="offlinehelp"
#
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
index 4df68ad0c431..beacbf0064c7 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.1.2.ebuild
@@ -14,8 +14,7 @@ BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="offlinehelp"
#
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 534142975b39..24f0563ac1e6 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -90,7 +90,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 5cb165c231bf..47bf9d130a94 100644
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -90,8 +90,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index 8a8d57ada897..bcd986fd67b5 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1 +1,2 @@
+DIST pinpoint-0.1.6.tar.xz 773492 SHA256 812a6e49ccd8bcd6cd0927fda98ceb0f2bafb1f18246bd2d75ea96c3c971f34b SHA512 5db48b64eb69fe677b5a4c226e989ce6eaea483396de82fdd644e4c4ed238ad5fd11f956ed6ffd1badbdfa8c9d24e9ec23375572360094721135c3b6a8347c27 WHIRLPOOL de1749d53b1512e0af761ef7457f01975b90a3301bed1b9e53a267349358b849be1f04d9a74aef98b02a6ddbf200c1ecd7dbe466ed9a207f5a1659a311cb0e57
DIST pinpoint-215ccad331a39c6e95d173938fcfffe6eb4d75d6.tar.xz 708020 SHA256 1303581f09ff6414269fe0642f7ce51094ebc5cee5101ef5b3113054da0bc8e9 SHA512 efbc711e034a968b104cca669fedaae8c1f088f598996843a65849f632ebdbff3df8d36225852b24327c26e2b972b1c5097775531b23ebc3eedf62415346f27e WHIRLPOOL 1c80ee81257c42b10ab860eabd4a95c61a9980b80cfb901ce167e70cf0046586b74e3670bffdb4342adfd378fb02c97ecfb1f4ae59d3e0ce09b205f9ef1e7ebd
diff --git a/app-office/pinpoint/pinpoint-0.1.6.ebuild b/app-office/pinpoint/pinpoint-0.1.6.ebuild
new file mode 100644
index 000000000000..60a066076ce7
--- /dev/null
+++ b/app-office/pinpoint/pinpoint-0.1.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="A tool for making hackers do excellent presentations"
+HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer +pdf"
+
+# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
+RDEPEND="
+ >=media-libs/clutter-1.12:1.0
+ >=dev-libs/glib-2.28:2
+ >=x11-libs/cairo-1.9.4
+ x11-libs/pango
+ x11-libs/gdk-pixbuf:2
+ gstreamer? ( media-libs/clutter-gst:3.0 )
+ pdf? ( gnome-base/librsvg:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # dax support is disabled because we don't have it in tree yet and it's
+ # experimental
+ gnome2_src_configure \
+ --disable-dax \
+ $(use_enable gstreamer cluttergst) \
+ $(use_enable pdf rsvg)
+}
+
+src_install() {
+ gnome2_src_install
+
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto "/usr/share/doc/${PF}/examples"
+ doins introduction.pin bg.jpg bowls.jpg linus.jpg
+}
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 0735bbf381e9..b34edb255365 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,2 +1,3 @@
DIST iso-codes-3.57.tar.xz 3773756 SHA256 dd6acd92843b69530fce535d3d6fd947ddb3802f0d5fc1bd214d1cb7d2bf5c47 SHA512 a58e48be152960d2391123e88b48f1c43e0bf0ac880a8d6a3ec7c8154e67fd40f264063cdf7106da9d261a5fb82f64d67545a17f69ec81141f10d1eb2d897424 WHIRLPOOL 9b6de080edc6c54071a8b7584de90af3554f91d77973dceb856570b2c1760ad89a807112903cd24697bab672024d319b72ce3141fdd0dc15405bf54bbd9b53ce
DIST iso-codes-3.59.tar.xz 3771916 SHA256 63d5ef035a96223f1fc8f36b711082f806e1666852dfc4149eeca8fd435d76ed SHA512 e1ac1c4717fd5a9daf76df109dadb24daa7dbf54b09736409e4cf4162de84038ab81ad03afecd3423d288bba306bf27f1301c03912c70a258a763a72fe8a77b4 WHIRLPOOL d56e8e81c1d6668c34d83035174aad2d393f2643ed8a4ef52f379119bb0d3a214ad9bd62d4087bfde8e3e60e427b1572eb41521dd02f081bd013278b3218bbd2
+DIST iso-codes-3.61.tar.xz 3772736 SHA256 a79bf119afdc20feef12965f26f9d97868819003a76355a6f027a14a6539167d SHA512 c18f4d9f92266bc590e9eb327edfc769abc384a0ffeb80bcff120cafe664019c747e733aa1b33de4179a6beddaa904bc70e2d35971d9edb6eba51592f5d5d07d WHIRLPOOL 74c620e00bfac3e007f58edd509c3204db162b99e3aba93fb02ab27b435925ac2b2886367f25c1749f3fbaf277a37b64e39a8684d8e6faff59ef9d7739108f3c
diff --git a/app-text/iso-codes/iso-codes-3.61.ebuild b/app-text/iso-codes/iso-codes-3.61.ebuild
new file mode 100644
index 000000000000..d5169d2e9133
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.61.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+ app-arch/xz-utils
+ sys-devel/gettext
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+ local norm loc all_locales mylinguas
+ local all_norms="iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3 iso_639_5"
+
+ # l10n_find_plocales_changes doesn't support multiple directories
+ einfo "Looking for new locales ..."
+ for norm in ${all_norms}; do
+ pushd "${norm}" > /dev/null || die
+ for loc in *.po; do
+ all_locales+="${loc%.po} "
+ done
+ popd > /dev/null
+ done
+
+ all_locales=$(echo "${all_locales}" | sed 's/ /\n/g' | sort | uniq)
+ all_locales=${all_locales//[[:space:]]/ }
+ all_locales=${all_locales#[[:space:]]}
+ all_locales=${all_locales%[[:space:]]}
+ if [[ ${PLOCALES} != ${all_locales} ]]; then
+ einfo "There are changes in locales! This ebuild should be updated to:"
+ einfo "PLOCALES=\"${all_locales}\""
+ else
+ einfo "Done"
+ fi
+
+ for norm in ${all_norms}; do
+ einfo "Preparing ${norm} ..."
+ pushd "${norm}" > /dev/null || die
+ mylinguas=
+ for loc in *.po; do
+ if use "linguas_"${loc%.po}; then
+ mylinguas+="${loc} "
+ fi
+ done
+
+ sed -e "s:pofiles =.*:pofiles = ${mylinguas} ${NULL}:" \
+ -e "s:mofiles =.*:mofiles = ${mylinguas//.po/.mo} ${NULL}:" \
+ -i Makefile.am Makefile.in || die "sed in ${norm} folder failed"
+ popd > /dev/null
+ done
+}
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 888ea969a115..f5b149468b1f 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,4 +1,3 @@
DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
-DIST libwps-0.4.0.tar.xz 463456 SHA256 53f66f67869ebee273d2e9a73b8edbac7d83346e72473035a02580d8ce6c995a SHA512 5c7f1a75d93b1028a55b438c55da4faad198c76b61c83498952d8e8e5faabc757dcece8cdcfa2ca11aa9842a151e9dcbe45b118947ace31670597425225bf493 WHIRLPOOL 8a2ecc699e3f7a2f53a5db3881695da61037dfd3f9a95221e15200c088511221581695212d29a2c89a4d121be04d19c0a50f279b137431c21e05027a3df09c4b
DIST libwps-0.4.1.tar.xz 476732 SHA256 bf915125d647aec18f63d593eb9385bce1e3cdb48649c1c90782d0e0ff5e976a SHA512 675b1d54436d568a990a305267daf33ebfb064e54b7b220f1ada850db85d1780590e161d27a68aa3b33807fab20a73e862f3dfffb62a8a5ff20192ed6f85063f WHIRLPOOL 56d849615588d2a6e33f1f20367b8ce5685bcc1cac6651fd1f48cda238c851fdaa81658d73557ae5f2e4d4f0ca690517543cbeb0a940bbdca2f3347b938d7d7b
diff --git a/app-text/libwps/libwps-0.4.0.ebuild b/app-text/libwps/libwps-0.4.0.ebuild
deleted file mode 100644
index 8ec30ec4cd01..000000000000
--- a/app-text/libwps/libwps-0.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base eutils
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="http://libwps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-# KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
- app-text/libwpd:0.10
- dev-libs/boost:=
- dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable static-libs static) \
- --docdir=/usr/share/doc/${PF} \
- $(use_with doc docs) \
- $(use_enable debug)
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/app-text/libwps/libwps-0.4.1.ebuild b/app-text/libwps/libwps-0.4.1.ebuild
index 8ec30ec4cd01..5ac9cb1b6c11 100644
--- a/app-text/libwps/libwps-0.4.1.ebuild
+++ b/app-text/libwps/libwps-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-# KEYWORDS="~alpha ~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
IUSE="doc debug static-libs"
RDEPEND="
diff --git a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
index 685d9f4dc310..5446f2679267 100644
--- a/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
+++ b/dev-haskell/aeson-qq/aeson-qq-0.7.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
diff --git a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
index c9bba0c8afc1..46345ab65a27 100644
--- a/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
+++ b/dev-haskell/enclosed-exceptions/enclosed-exceptions-1.0.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/async-2.0:=[profile?]
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 68f7f0681468..6bd7d85e76b2 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -6,3 +6,4 @@ DIST glib-0.12.5.4.tar.gz 46080 SHA256 e63346df27cb45aa7c76bfffe5ba81bb5332b48bd
DIST glib-0.13.0.6.tar.gz 47966 SHA256 3b434abc2d981f183fa022d57ec14cc2fd880cb74443b9ceaccf9c9f37a0c3c2 SHA512 9ee6aa2afcc2c98d3883d845e06ac9be576718c4f3920567c1150e885747b5884c13966574f2f0d7a7c5e1afd22d63deefbf3be9ed4263ee168927cf6a0e54d7 WHIRLPOOL b6d70d6b9f89196df383ba1b8c4be379e15d09ea0cb473e9a85f661dd63f9fff784cc96b643bcd0a87c58aeb4ccc11bfd993e880faa2b65d0986565787d98eda
DIST glib-0.13.0.7.tar.gz 47988 SHA256 fe5fb5339a7694c915a388bced3b8d934d78cf51c5369f348fa6f52815dea69b SHA512 357182e65e913323e6cee5709c117152e0fe7ffe3171adacbfa5f553904a9ac98406f1f246b37ea96fdc097235bbccc902b3b4fc459e4bf0c09d92c51bad6791 WHIRLPOOL ad710086350abb4a9f0257b7d52f23b9a5cbf1b560243e5a0384cf2d082bf464dc0ca7a7ba35e55ed86b967d805307c7b3d209de468f0b9b1faeb4dc545df79a
DIST glib-0.13.1.0.tar.gz 48157 SHA256 df1d250f1f2aeba208b7cb71f7201189b9939f6a5224739e35d94a5aa3d84c87 SHA512 5268c0ed455e5664bb0473a43eeb47dc3da6ee0c522fe72b17e5837f109a791f1323db0c843cc4e32d9804ed04e61e0a4a93f99b857d7badc79b233dd906ad5b WHIRLPOOL b2ac8e6f5798d94ef281d02fa356823a71a7007c61b92d0eb79a9f84ffadfa377b20ca59482f1841b8c0d8625efc9cee5d4db9440edc06f69bfa3ba9e91a25fc
+DIST glib-0.13.2.1.tar.gz 48651 SHA256 9763884736aa7ef2f0bb9e716aba5f87d50e6d068134e486f359490b8112acdf SHA512 c3d42c9ce4e0fbba24dd7d0ddd01040afe853fcfb3c06c9452f24953095f350ba21824aa32ab59f8bf7638cbd0056939b3a6e3d469fb83ce9100ab0017711139 WHIRLPOOL db98f95e618d926d67f09971bb28aa38a1455d20d299cc75c4658c93e4f7c86829e2fa5347b7b29bf68c1208a4f71f75111ee982393302c5d78f0a021e3feabd
diff --git a/dev-haskell/glib/glib-0.13.2.1.ebuild b/dev-haskell/glib/glib-0.13.2.1.ebuild
new file mode 100644
index 000000000000..6287f65782c0
--- /dev/null
+++ b/dev-haskell/glib/glib-0.13.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the GLIB library for Gtk2Hs"
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+closure_signals"
+
+RDEPEND=">=dev-haskell/text-1.0.0.0:=[profile?] =dev-haskell/utf8-string-0.2:=[profile?] =dev-lang/ghc-7.4.1:=
+ dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18
+ dev-haskell/gtk2hs-buildtools
+ virtual/pkgconfig
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag closure_signals closure_signals)
+}
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
index fd033cd79dab..1a3a974e87d8 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-1.16.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=dev-haskell/cpphs-1.3:=[profile?]
diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
index 205975e46e48..c9351506ede2 100644
--- a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
+++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] =virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,cglib-3"
-JAVA_SRC_DIR="src"
-
-src_unpack() {
- default
-
- cd "${S}" || die
- unzip ${P}-sources.jar -d src/ || die
-
- if use examples; then
- unzip ${P}-samples.jar -d examples/ || die
- fi
-}
-
-java_prepare() {
- epatch "${FILESDIR}"/${PV}-no-android.patch
- rm src/org/easymock/internal/AndroidClassProxyFactory.java || die
-}
-
-src_install() {
- java-pkg-simple_src_install
-
- use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
index 59d58ede8d05..ce2254034950 100644
--- a/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
+++ b/dev-java/glassfish-ejb-api/glassfish-ejb-api-3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~tomwij/files/dist/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="java-virtuals/xmlrpc-api:0
java-virtuals/transaction-api:0"
diff --git a/dev-java/glassfish-servlet-api/Manifest b/dev-java/glassfish-servlet-api/Manifest
index f94e1b37ca23..f1854ab6cc0a 100644
--- a/dev-java/glassfish-servlet-api/Manifest
+++ b/dev-java/glassfish-servlet-api/Manifest
@@ -1 +1,2 @@
DIST glassfish-v2-b44-src.zip 35200817 SHA256 331f6a65aa94b9d79f5b0a726d71afc4726032b3e9d62f2c7ab6fc679790e1b7 SHA512 2c236f37c08ec465959e80c90e3a2f8cdf9d143dc93c7a6bbdcc6e015125f167153f6abfaba4390a5d179b43130458b996498d3f1390588477462bd45ea367ee WHIRLPOOL 71c9b9cbcc194ffe03f4a604b570d618f88b7f08955b573f6b218683fba854267ee83915d26d909d8caf92779a2e15752d6fbce6c402d8ca69b108d18042845b
+DIST javax.servlet-3.1.1-sources.jar 211576 SHA256 c17212d132bf33dc9dcc44ed0e945e92a08cc8ec494ce7cd62de9f9514d63826 SHA512 7f152a389481e0381f041d97a6774a3e762a86b2a8a5413901c472fc2882b9cabd141dd85b46b8a7006cbe677c29c4caee09f3fc934afae857a6c1362efdc7bc WHIRLPOOL 9d794227cc6a119ef61122ec63515e18199bb4239382129b56f88ff74d5fb5b08a2b3259a1cfcde14a0761561beefd0152c853476d6d65039de76d791bd4090c
diff --git a/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
new file mode 100644
index 000000000000..bd1394778018
--- /dev/null
+++ b/dev-java/glassfish-servlet-api/glassfish-servlet-api-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="javax.servlet"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Glassfish reference implementation of Servlet API 2.5 and JSP API 2.1"
+HOMEPAGE="https://glassfish.dev.java.net/javaee5/webtier/webtierhome.html"
+SRC_URI="http://central.maven.org/maven2/org/glassfish/javax.servlet/${PV}/${MY_P}-sources.jar"
+LICENSE="CDDL"
+SLOT="3.1.1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsoup/Manifest b/dev-java/jsoup/Manifest
index f587ebb3ea9b..5f047a04695b 100644
--- a/dev-java/jsoup/Manifest
+++ b/dev-java/jsoup/Manifest
@@ -1,2 +1,3 @@
DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
DIST jsoup-1.8.1.a.tar.gz 303388 SHA256 788832a1a3fa639fecb71b52c5b1c062663f5b3a21c1451968910c4731393b60 SHA512 4afcc42187fd034e2c6f45d369c4fdd0cc7523f4aa2f2526a21aebdebb8608e1ced51f3d6c8de02ac519eccd5ef415e9b7619450fb2e958a0f7a4d5bf492ed8a WHIRLPOOL 7c1f8a0db34b8907bbc2ce849d85a845956059520202346a1d608e43cb264d2b478738868a2d183d97eff85b8df085ced10130400f2612a26faff7f688e4e698
+DIST jsoup-1.8.3a.zip 370626 SHA256 3a2dd962eb3f3bf0ef14f526d89795836d06bff411e68f0adfcc4a8dd5915876 SHA512 d044231fc70ff6d5428707d56853db77feedbb29a4ea1a501e6fcbaaecb2743bdeeaa8dcf4c76f7d278905b31e83707ad2644e7876a44c9d2325537d647aab85 WHIRLPOOL e1b5d4ed64b4460223b38aea43466465638236edf0ef6bd987430e16bb2bd12796a4900da797320c5bebcd8de0f823533f2a40bfb6cc50ad30183912eb34eee7
diff --git a/dev-java/jsoup/jsoup-1.8.1.ebuild b/dev-java/jsoup/jsoup-1.8.1.ebuild
index bac8d54ce0b7..15401030f79f 100644
--- a/dev-java/jsoup/jsoup-1.8.1.ebuild
+++ b/dev-java/jsoup/jsoup-1.8.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
JAVA_PKG_IUSE="doc source test"
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
+inherit java-pkg-2 java-pkg-simple
MY_PV="${PV}.a"
diff --git a/dev-java/jsoup/jsoup-1.8.3.ebuild b/dev-java/jsoup/jsoup-1.8.3.ebuild
new file mode 100644
index 000000000000..49c1eb536f39
--- /dev/null
+++ b/dev-java/jsoup/jsoup-1.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV="${PV}a"
+MY_P="${PN}-${PN}-${MY_PV}"
+
+DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
+HOMEPAGE="http://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${PN}-${MY_PV}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+ test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+ rm pom.xml || die
+ mkdir -p target/classes/org/jsoup/nodes/ || die
+ cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
+}
+
+src_test() {
+ testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+ mkdir target/tests || die
+ ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+ cp -r src/test/resources/* target/tests || die
+
+ tests=$(find target/tests -name "*Test.class" \
+ | sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+ | grep -vP '\$');
+ ejunit4 -cp "${testcp}" ${tests}
+}
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12.ebuild
index 8a94ed405b29..455992f659ca 100644
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/java
LICENSE="CDDL"
SLOT="2.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index eeb2263ddc94..52c5735bf687 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -23,9 +23,9 @@ CDEPEND="dev-java/commons-logging:0
dev-java/log4j:0
dev-java/slf4j-nop:0
dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.6
+RDEPEND=">=virtual/jre-1.7
${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND=">=virtual/jdk-1.7
${CDEPEND}"
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
index 6ac34002d82c..695b680775fb 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
index 64dcb531679e..62f34c4140c0 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index a901431ed92e..07b57d1f609d 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,3 +3,4 @@ DIST vala-0.22.1.tar.xz 2690324 SHA256 92c61b94a427f281ba2537b69135a3be23248b153
DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
+DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
diff --git a/dev-lang/vala/vala-0.28.1.ebuild b/dev-lang/vala/vala-0.28.1.ebuild
new file mode 100644
index 000000000000..55cc43395906
--- /dev/null
+++ b/dev-lang/vala/vala-0.28.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"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0.28"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ >=dev-libs/glib-2.24:2
+ >=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+ !${CATEGORY}/${PN}:0
+ dev-libs/libxslt
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+ test? (
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2 )
+"
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+ gnome2_src_configure --disable-unversioned
+}
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 58592bbf1180..71be1c6442a8 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,2 +1,3 @@
DIST angelscript_2.29.2.zip 1583192 SHA256 c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff WHIRLPOOL 1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb
DIST angelscript_2.30.1.zip 1859238 SHA256 a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52 WHIRLPOOL fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429
+DIST angelscript_2.30.2.zip 1640151 SHA256 8c08774bc1ca683124b4996ab4459f4b2b10bdacd860e76f28fb5b504332d7d7 SHA512 a95d1d0050cc18d71ecb20655e74c196654c69b34ae3d1ade6d3a90b952b20851a6255c7285f019046e22d4c3fd1a6100c917a66a7c0d4e00636e4a2c6003bd5 WHIRLPOOL 157f724736bfea7dc31549cb76e88107108eccf046016e848a282cfe70b3bb8968e60424df192c8235eae8b663b0bc6dfea572a68b0404d7e61ea3eaa56d30e2
diff --git a/dev-libs/angelscript/angelscript-2.30.2.ebuild b/dev-libs/angelscript/angelscript-2.30.2.ebuild
new file mode 100644
index 000000000000..09f40c9d8127
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.30.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+
+pkg_setup() {
+ tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+ multilib_copy_sources
+}
+
+multilib_src_compile() {
+ emake -C ${PN}/projects/gnuc
+}
+
+multilib_src_install() {
+ emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
+ use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
+}
+
+multilib_src_install_all() {
+ use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 1d4cb8f281eb..059eae4f666c 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,2 +1,3 @@
DIST appstream-glib-0.3.4.tar.xz 1814472 SHA256 97b948ad992cb985e5bed533446fb5d23632397cfe2833034e11d4c6b47199da SHA512 e128609980512a4975f1226dc41300480c43f311611ac935973e850a53562f7c770622239d4dd1a2ccd88430c2a305c64927a507125f6d7761c04d8ecf0ab502 WHIRLPOOL f80edc738ca5e07255625cc4322d483c2ae753e06d1f84eed1755239c2f87aff0fd13a60bd7bae2e4f4ffecc2760a6c301e98dd085a157448e89fcd91d6e614d
DIST appstream-glib-0.4.0.tar.xz 1837552 SHA256 f4dee0e86549009f248d38eb643061e82ff0d542f06e1f4af6b36af2f97c2e13 SHA512 54769b47f11f8792ee85ab0922d8a256800c00558ca9e2fcaab30845e3fbd9f4a08d311608f0b600f8ad070d79d5227cd9ac4b644ef6d94e1772e4695c4f1afe WHIRLPOOL da036564be55acc4c0b3d5320f165ac98d6f4754ed74dda8b06d31c7bfd91b10ff3f4ff0d85b141bfa804391befcadecd714a9b110d422cf9286c899714ad58d
+DIST appstream-glib-0.5.0.tar.xz 1818388 SHA256 35d63ca31664918905c3de634766766d98dadcd99d7271fb319f6279b846bf36 SHA512 1c1a1f41d6911c73a25a83396fb183d99ee139378766235b8885ee68c2b738137d55c108e7ea3ec2853e5ac5f17936b87df554bea45a1c19db3caea5bcee5d0d WHIRLPOOL 2a26ce1685ed3c78242c0ef29b4e5dea95ba070e531503f00f378f36974a8e1aa858b66640fe48ccc7c1ace9619671ff3c6d71aaf78e81a6ef5b55ab2be64090
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
new file mode 100644
index 000000000000..a1693fbcca6a
--- /dev/null
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2
+
+DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="+introspection nls"
+
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
+RDEPEND="
+ app-arch/gcab
+ app-arch/libarchive
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.16.1:2
+ >=media-libs/fontconfig-2.11
+ >=media-libs/freetype-2.4:2
+ >=net-libs/libsoup-2.24:2.4
+ >=x11-libs/gdk-pixbuf-2.14:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ dev-libs/libyaml
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.3
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+"
+# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
+# are migrated to appstream-glib
+RDEPEND="${RDEPEND}
+ !=dev-util/appdata-tools-0.1.8-r1"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-builder \
+ --disable-ostree \
+ --disable-rpm \
+ --disable-static \
+ --enable-dep11 \
+ --enable-man \
+ $(use_enable nls) \
+ $(use_enable introspection) \
+ --with-bashcompletiondir="$(get_bashcompdir)"
+}
diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
index 9a5b416f9f4f..0cc376a1df73 100644
--- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~patrick/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=" ~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/dev-libs/libassuan/libassuan-2.2.1.ebuild b/dev-libs/libassuan/libassuan-2.2.1.ebuild
index c21c40b170cb..d1e4138301e7 100644
--- a/dev-libs/libassuan/libassuan-2.2.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
deleted file mode 100644
index ba7b57329c1c..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
- "${FILESDIR}"/${P}-clang-arm.patch
-)
-
-src_configure() {
- local myeconfargs=(
- --disable-padlock-support # bug 201917
- --disable-dependency-tracking
- --enable-noexecstack
- --disable-O-flag-munging
- $(use_enable static-libs static)
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
- )
- autotools-utils_src_configure
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
index 25e59c881b9d..48153e8f99b7 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs +threads"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
similarity index 97%
rename from dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
rename to dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
index 9efac8bac5b7..0d6597490bd6 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.3-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.3-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
+IUSE="doc static-libs +threads"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
abi_x86_32? (
@@ -45,11 +45,11 @@ multilib_src_configure() {
append-cflags -Wa,--divide
fi
local myeconfargs=(
- --disable-padlock-support # bug 201917
--disable-dependency-tracking
--enable-noexecstack
--disable-O-flag-munging
$(use_enable static-libs static)
+ $(use_enable threads)
# disabled due to various applications requiring privileges
# after libgcrypt drops them (bug #468616)
diff --git a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
index 8299779d0140..9c3ac5a3496c 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index d932fd130425..18451f575cbf 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,2 +1,2 @@
-DIST libgusb-0.2.4.tar.xz 273832 SHA256 437966fb45e30b8e757b2c200daf5d4e7dd22bf5aa80e151e3b1807270d38083 SHA512 51b51a613718507d5bcc5789c9583f48e31269cee6a673d1ebdfcca974c78b9395dddc9de0f09f925283798fa349e99b4e4ee4f7d67726235015d19c57f305c4 WHIRLPOOL 5e515aa4ad2a363067fdfe15507bb589e5200cdb505497bbe99d6440c05f853eea52ca776ea64743768d669e73a328a660f9cda894fbfdc1d4246de46b5b7fed
DIST libgusb-0.2.5.tar.xz 275948 SHA256 a3ad56773548695292f49b62df1eb7fb1e87e1e0c9d3982e80f65f47095fa492 SHA512 6ac07c40faf6919991f5cbc3e5fd0523b7486b5437a6ac3d0bd1cfd05d645fe25e311366bb507d1b7af2fe913ae869523c052a7571cd8191914f8b1a81a4c22a WHIRLPOOL 3da2b781ef8df7912aababe174f83c020ac24fefc754303dd38beebd49fceaf40138cd601ffa11b02e2512e0e2ebe3727b1cdee89d0b504962d82a3898fd8c0f
+DIST libgusb-0.2.6.tar.xz 276608 SHA256 6f638bdbc4e77643c0a198a300e50b592ad326e56bddf359de15e04689209c06 SHA512 4b13166f4b02f1c10ee074564d1e25de0b4763a19b83f56d40b2f43b595cfeb1c7fe4ecdeceaf0b32f51f2156d1e26c42a976cab5db4ad269533b803dbc27bdb WHIRLPOOL d976567c41ef6ef11232ac999b9efd14667312112efec8bb4d4700a0e2d89f0310eabe7542ceda66df3d39bc95f92c88f1da90e6c5b563bd4fb20da2eeabadbb
diff --git a/dev-libs/libgusb/libgusb-0.2.4.ebuild b/dev-libs/libgusb/libgusb-0.2.6.ebuild
similarity index 82%
rename from dev-libs/libgusb/libgusb-0.2.4.ebuild
rename to dev-libs/libgusb/libgusb-0.2.6.ebuild
index 2ac801ebe32a..2e5cef78f761 100644
--- a/dev-libs/libgusb/libgusb-0.2.4.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.6.ebuild
@@ -9,12 +9,12 @@ VALA_USE_DEPEND="vapigen"
inherit eutils gnome2 multilib-minimal vala
DESCRIPTION="GObject wrapper for libusb"
-HOMEPAGE="https://gitorious.org/gusb/"
+HOMEPAGE="https://github.com/hughsie/libgusb"
SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="+introspection static-libs vala"
REQUIRED_USE="vala? ( introspection )"
@@ -22,11 +22,10 @@ REQUIRED_USE="vala? ( introspection )"
# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
RDEPEND="
>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
- >=dev-libs/libusb-1.0.19[udev,${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.29 )
+ virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.29:= )
"
DEPEND="${RDEPEND}
- app-arch/xz-utils
dev-libs/libxslt
dev-util/gtk-doc-am
virtual/pkgconfig[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 7bec1ba0c214..5a0489274398 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,8 +1,3 @@
-DIST libinput-0.13.0.tar.xz 540300 SHA256 6cecaf7fde525f1d81474cbd495ce526d5e34c845d3e9d6f3e2565b7048cc61a SHA512 d07b35cec8d8cd3f75d7f8916fda4723e6a7b94bf457e249ee2b93e9a7c60b9999508d071b8959c7fb3676d13a3b5430c71f2bf579572cab87bcc4e655ab69ab WHIRLPOOL 944a1336d764d6359f65a4d3ac8d3150caf1b0db649a6dea2eaf52fae2b2e14a2ffac8b3de93280115d296c773bb7fc0d6c771e98514f76061fb8814bf0d56ff
-DIST libinput-0.18.0.tar.xz 623740 SHA256 64a70f96bab17a22eaf2fd7af17cf83def3388374096c7623be9448f62808cda SHA512 352a941a03942ed486f4d0d1ce09c928b5230bb041f71d6d906307cd208d23071b85f885658e9118cf29a72686dcd76c2c66c1b3291f48745efd40e6e5dfe38b WHIRLPOOL 50a6e2f58ef35746fec615bb61f9859347853f3fbc6044903975668e50f92fa6713a4bf05e6e038ebe5184a7fd496778b6b64d582607b0f183d44404e327587b
-DIST libinput-0.19.0.tar.xz 627800 SHA256 69a97da47ef8fa9debadaa8ee11005b9b5183bd2b87c5aa7827b7c388a5acc5d SHA512 773e59ff0e797c206410f417fcc8cb775dd0e87277a598cf7bacd2f116df1e62de9e99b12b318de0d098ad43882728fa19334ed4e2ae1f8f39bc28c255307c5a WHIRLPOOL adac12649898714306ab59f7af08a7edfdc133bdd9703b7896cde2a771111b60b5a359182698ab9cb46cd8a66dfc3d422bd9a0bceb940a83f9ecfdc9dccbc21d
-DIST libinput-0.20.0.tar.xz 647668 SHA256 175bdfce97cfab13a2a0d02c3138fcf02f60c8fcd098835a97128ff114d7125d SHA512 5c38024d4f0f7c4a7f50b5bfe1ebcb60778643ab053798847b48c704dbf19de3443d98ea508f1dd72577567f949fe85bc80ff1706e6a0896d02449485b41b1a6 WHIRLPOOL c92b82b477cb09744815a6b07293f1a4b8347a630c75628ad0b0e510bfe8a47e8e916128520946a17cf8273ad0c5fa6c0d464f124c70eac6e89611aedd170bdc
-DIST libinput-0.21.0.tar.xz 658788 SHA256 7cce7a9e510dfe5c4a19ad00e9350808d4f59f8611fd2b5e87213c507283f550 SHA512 676d5353ca9fb6b6a3f76f4e2d2ab4c78b09240c0bba5d4e06049e2f6fc913ed99cdc60880d00d34c2f3367937e3fca03f0d3d8baaf3d3348d4f2edba1b600a5 WHIRLPOOL a6367e7edc797292937bc956d3ed6c2d73987f058d4eeddc43436115f8674ba1ff558ca9f7b5b6d56420fe64210565d47fae9dfe188b8ebedc91d2b991901721
-DIST libinput-0.7.0.tar.xz 440228 SHA256 129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e SHA512 0e03ab7ca98c4574997742b7d8912000fb176d7a3e2c381b7e63139f78455374f8f38284e226fe443d5a524f34be8995317b91fc0190795a97b10af060423b77 WHIRLPOOL 664510fc33cb718b56600553332bb3eb587b3f4a40f81d4a80dd218882aba204522bcbbfab98f3ae0c6447d3a39cc98b9d88aea5f8e3c21da0803b93d64ad321
DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
DIST libinput-1.0.0.tar.xz 785056 SHA256 afbd2751c000a4e5833624b6177a6919ad259f0bca44093947421c885fd42c0f SHA512 b6fc7973982cb2826fc5beb514e954d7673023628739a86d18b2522b1ad0ecf55f9d6c83e6307c10c633c57d6b61227898aded6a22a2de536c0f14f27d23b903 WHIRLPOOL 13304875b753127ada76bf18ba56ea9828d6532db5eefce56439ede83eeeb43b6da6aa59f763d2c912de838221ee53fd7d02bf865e80316a24c412ea001d3043
+DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
diff --git a/dev-libs/libinput/files/libinput-0.18.0-includes.patch b/dev-libs/libinput/files/libinput-0.18.0-includes.patch
deleted file mode 100644
index 22e292d6d2fb..000000000000
--- a/dev-libs/libinput/files/libinput-0.18.0-includes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 984dec0ed1c52087a4a32e181a1c09817881de39 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue
-Date: Tue, 23 Jun 2015 11:31:56 +0200
-Subject: [PATCH] Add missing includes for *stat
-
----
- src/evdev.c | 1 +
- src/path.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index 7e1e5c8..cfcdc34 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -29,6 +29,7 @@
- #include
- #include
- #include
-+#include
- #include "linux/input.h"
- #include
- #include
-diff --git a/src/path.c b/src/path.c
-index 92535cd..ab4d065 100644
---- a/src/path.c
-+++ b/src/path.c
-@@ -26,6 +26,7 @@
- #include
- #include
- #include
-+#include
- #include
-
- #include "path.h"
---
-2.4.3
-
diff --git a/dev-libs/libinput/libinput-0.13.0-r1.ebuild b/dev-libs/libinput/libinput-0.13.0-r1.ebuild
deleted file mode 100644
index a8ff917d5e73..000000000000
--- a/dev-libs/libinput/libinput-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- --disable-tests \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.18.0.ebuild b/dev-libs/libinput/libinput-0.18.0.ebuild
deleted file mode 100644
index b104b57dd10d..000000000000
--- a/dev-libs/libinput/libinput-0.18.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-# test? (
-# >=dev-libs/check-0.9.10
-# dev-util/valgrind
-# sys-libs/libunwind )
-
-src_prepare() {
- # Fix missing include for *stat, upstream #91069
- epatch "${FILESDIR}"/${PN}-0.18.0-includes.patch
-}
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- $(use_enable test tests) \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.20.0.ebuild b/dev-libs/libinput/libinput-0.20.0.ebuild
deleted file mode 100644
index b1aa4c8175e7..000000000000
--- a/dev-libs/libinput/libinput-0.20.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-# test? (
-# >=dev-libs/check-0.9.10
-# dev-util/valgrind
-# sys-libs/libunwind )
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- $(use_enable test tests) \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.21.0.ebuild b/dev-libs/libinput/libinput-0.21.0.ebuild
deleted file mode 100644
index b1aa4c8175e7..000000000000
--- a/dev-libs/libinput/libinput-0.21.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-# test? (
-# >=dev-libs/check-0.9.10
-# dev-util/valgrind
-# sys-libs/libunwind )
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- $(use_enable test tests) \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.7.0.ebuild b/dev-libs/libinput/libinput-0.7.0.ebuild
deleted file mode 100644
index 4ea4655c85e3..000000000000
--- a/dev-libs/libinput/libinput-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-# License appears to be a variant of libtiff
-LICENSE="libtiff"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- econf \
- --disable-event-gui \
- --disable-tests
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-0.19.0.ebuild b/dev-libs/libinput/libinput-1.0.1.ebuild
similarity index 98%
rename from dev-libs/libinput/libinput-0.19.0.ebuild
rename to dev-libs/libinput/libinput-1.0.1.ebuild
index b1aa4c8175e7..26877357fe85 100644
--- a/dev-libs/libinput/libinput-0.19.0.ebuild
+++ b/dev-libs/libinput/libinput-1.0.1.ebuild
@@ -3,7 +3,6 @@
# $Id$
EAPI=5
-
inherit eutils udev
DESCRIPTION="Library to handle input devices in Wayland"
@@ -24,8 +23,7 @@ RDEPEND="
virtual/libudev
"
DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
# test? (
# >=dev-libs/check-0.9.10
# dev-util/valgrind
diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
index 0dbc49da363a..211a06ad5e15 100644
--- a/dev-libs/liboobs/metadata.xml
+++ b/dev-libs/liboobs/metadata.xml
@@ -1,11 +1,7 @@
- gnome
-
- eva@gentoo.org
- Gilles Dartiguelongue
-
+ lxqt
Liboobs is a wrapping library to the System Tools Backends, it will
provide easy to access GObjects to system configuration details, like
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 901bc53f53ea..dd35c3bebba1 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,2 +1,2 @@
-DIST libpwquality-1.2.3.tar.bz2 367794 SHA256 b11c79ce7b03cdf878fccb653e67bd430155cc6fd224efbbb3e78842f752516a SHA512 1591f40feee4ad95d666887fbd04fc675ff2630a2cd080a7ef616f59af543751ef34910a085d880e8d75051ebeee747847b8015e66a7c315b955df62f926ccd2 WHIRLPOOL 9aff4c547758a2bc2d918f2411371f3b35231c6846d77b497275176842f8f48df3b66f419ddaee88e1fccc2e1a6b947e5b1e72215db74dbc978089d7c0afdf5b
DIST libpwquality-1.2.4.tar.bz2 394060 SHA256 9ad67be364a66dc8b334a473c77d9f531137ee0e9d85d81f567f410a375857c7 SHA512 63ead296320e8eadc1a3341c28b015f9dbbf30e610e9226a11018d81aeb412d0e211753ebdb45f959c35cedfc6ed580bba9e6b0f8822c3b5f38062428f637049 WHIRLPOOL 94166db5bba425fb19a9a27fe27eb082716e887b90fa2d2bd64e56f4d9202c6cc1f7f16779185a5c44ce3145f8a8df92ecca9b6628ae63daba99aca4d5a9c1a9
+DIST libpwquality-1.3.0.tar.bz2 423910 SHA256 74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a SHA512 c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea WHIRLPOOL b6451083551a13be259d1a81eb089889d9ee430c30afb2555aa2e5e7c4240febc71b152ce3c210b592a56db8988fc88a827d8e9f368c5aa478d5babf4e316b8c
diff --git a/dev-libs/libpwquality/libpwquality-1.2.3.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
similarity index 91%
rename from dev-libs/libpwquality/libpwquality-1.2.3.ebuild
rename to dev-libs/libpwquality/libpwquality-1.3.0.ebuild
index 8b619a0a0993..7827b61694c8 100644
--- a/dev-libs/libpwquality/libpwquality-1.2.3.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit eutils multilib pam python-r1 toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.bz2"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="pam python static-libs"
RDEPEND="
@@ -22,7 +22,7 @@ RDEPEND="
python? ( ${PYTHON_DEPS} )
"
DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.15
+ >=sys-devel/gettext-0.18.2
virtual/pkgconfig
"
diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild b/dev-libs/openssl/openssl-1.0.2d.ebuild
index 6b4277416a34..8947be663df1 100644
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 418160131fc1..18ad2ddd6ce7 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,4 @@
DIST vala-0.24.0.tar.xz 2666032 SHA256 22a37c977512c19cd29c373eaaef96cb2c994795d491106f32387f3f9d1e899c SHA512 a5897af7926affbdb018f0c31d4ec84d3322dc03e7cc64cb8b28c60fd4887a64b94760e061145aab5c36442a0d8665f3e3d584e09502e5f2587860d199317479 WHIRLPOOL d19cdf123abc3689c84c3746729a1452a8a9051271aaa64782db226ab4c276e963fa574900b4d145577d4fd0329cb29f73782b5f67ac1650ad1bdf663096e88f
DIST vala-0.26.2.tar.xz 2682856 SHA256 37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4 SHA512 9c8dcb59f01e7f77c79f5f9ed996930c23444bddf22898ee775602e54f817b4cbd7c477c9a46a140acca57db9d8047b8fcffdb87f51276ff1719857faed6e535 WHIRLPOOL 492790367f93b0e913ccb1c3c04c098473020f68236f6ec3c70eeb85023bbb913ecef366793996e4952b79dadd4d3687e167d8b9eed87daac950c6d66d9153bc
DIST vala-0.28.0.tar.xz 2720652 SHA256 0d9e3bd3f82145664875f7c29b2f544ba92d2814f75412948f774c0727fc977f SHA512 4f9adc4a3e672c25b508f5193bb1984e848dcaca059c2eb733e93ca7f58b5d58028a56f4234a62baa30ff50b63d87af24510334eba41630692c5f16e580bad88 WHIRLPOOL cfdd97f90f033b030d768ed66e78b5f86b6e1e50bac34806cd70dda168a5ff3192249d08ee9e020e0ea33d753b20aa69c6e269c65fa193a19e6ae4353912c7d2
+DIST vala-0.28.1.tar.xz 2721228 SHA256 1c0eaea6134b75af17221cb699f13d7236d607bb48192565c3d865c38f184f47 SHA512 41e58eebd7a333a928c52e6493f6677c63f9c6f57da7876b8e9edf138eaf5477a0d18266cdec6029d7c21cd711b709050a2ef99bc6b31ce618fbbef7e0b072af WHIRLPOOL 73b072552f0c8bd18db2255759b73a7711a6170a13c1c96503a3ffad48d3355cbda4064a2e9cefc42b3894d0a91c1979b943bc583f6bdb34ef8d52649ff726c4
diff --git a/dev-libs/vala-common/vala-common-0.28.1.ebuild b/dev-libs/vala-common/vala-common-0.28.1.ebuild
new file mode 100644
index 000000000000..5baa04e16af6
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.28.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+ ! /dev/null
+ eend $?
+ fi
+ if has_version ' /dev/null
+ eend $?
+ fi
+ if has_version ' /dev/null
+ eend $?
+ fi
+ if has_version ' /dev/null
+ eend $?
+ if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+ ebegin "Removing old vala-0.16 makefile template"
+ rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+ eend $?
+ fi
+ fi
+ if has_version ' /dev/null
+ eend $?
+ if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+ ebegin "Removing old vala-0.18 makefile template"
+ rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+ eend $?
+ fi
+ fi
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 60020bb51a70..8b990c9dadb8 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
IUSE="redis test"
RDEPEND="
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
index a5009b6e05fa..48f6ba4bab9e 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.4.0.ebuild
@@ -26,8 +26,9 @@ RDEPEND="$(python_gen_cond_dep 'dev-python/html5lib[${PYTHON_USEDEP}]' python2_7
$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' python2_7 'python3*')"
DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/nose[${PYTHON_USEDEP}]
- !dev-python/chardet[${PYTHON_USEDEP}] )"
+ !!dev-python/chardet )"
# See https://bugs.launchpad.net/beautifulsoup/+bug/1471359 to explain need for blocker
+[[ ${PV} == 4.4.0 ]] || die "Don't forget to remove the chardet blocker!"
S=${WORKDIR}/${MY_P}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index d6c5d9ada5bc..368525ec5966 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
-DIST botocore-1.1.7.tar.gz 1966396 SHA256 50d90705815aff4dd4e2be503ad42c0fb52874053046de9042bc16563a8ecd68 SHA512 4aba7712b7154362a52f46e2c0d28d0ff0d096d7741e99760848a23338420be290b3b91892cb764f4aca21122b208533a5b1e33bf23bce76b09e0bb5560b6764 WHIRLPOOL 9871171175dd88bf69171966c3fe8c410f07b0340381d64925d7c7ccf108664ba97f9785ffd61e3518ff9ce834eee7c405420d37c071acb1c655dd8c38f2ae95
DIST botocore-1.1.8.tar.gz 1969137 SHA256 338fed0119d819a60b2b7cf1a1a38f93603c5f012a2a483b713425816a43a57c SHA512 24c17057ce600873fb37ecd6712defe8339a36cc11cb77afd2417b68bef63e46ebb22dbe320e5c4bb7f948aee6fb3fc90336c021c6adf2d7902cab8ce6d214f2 WHIRLPOOL 54872902565ad7af5932517a554a4577445aa2539c1668f5d672f7e60b84efae6ad0af68e98d9cc3ed2fb4204936c6881bf17cda0ef821a2ee6e8f60b1cf6b20
+DIST botocore-1.2.0.tar.gz 1993122 SHA256 59f2b9109d2cef499679b1676622e653b6a74be8ce20f84104fe631eb5434972 SHA512 8a336c4895e61246f36fdacb7a90c192a6db8b543331b25a6abc153b4b7fd3dd1f06a7c2f64451a12d900ebebb0ae86d1fe0b8011e22a7b09fd6143a6b8a7072 WHIRLPOOL 3bc375a0949ff7a4cb5e97b766681c8a71f65183c36afd9900275ac54ea0bebea94bb655bf8020752ed1f9e85c9cca775fc3f531133ffb7ce535a5bfe1daf246
diff --git a/dev-python/botocore/botocore-1.1.7.ebuild b/dev-python/botocore/botocore-1.2.0.ebuild
similarity index 94%
rename from dev-python/botocore/botocore-1.1.7.ebuild
rename to dev-python/botocore/botocore-1.2.0.ebuild
index a9e058563f4a..5908e96eca5c 100644
--- a/dev-python/botocore/botocore-1.1.7.ebuild
+++ b/dev-python/botocore/botocore-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 vcs-snapshot
DESCRIPTION="Low-level, data-driven core of boto 3."
HOMEPAGE="https://github.com/boto/botocore"
-SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index f52552fa81bf..1213881d6a99 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_install_all() {
diff --git a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
index 818f70d7b87b..76e73e7db128 100644
--- a/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-0_p72-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 7b1a1e41147c..e82dfdd6c0c1 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
python_test() {
diff --git a/dev-python/django/django-1.8.4.ebuild b/dev-python/django/django-1.8.4.ebuild
index 142d3e3ab9c1..915004919505 100644
--- a/dev-python/django/django-1.8.4.ebuild
+++ b/dev-python/django/django-1.8.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc sqlite test"
RDEPEND=""
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index 2a3ffeb6579c..74a20afa79bf 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}-2.tar.gz"
SLOT="0"
LICENSE="PSF-2.4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/${P}-2
diff --git a/dev-python/jsonschema/jsonschema-2.5.1.ebuild b/dev-python/jsonschema/jsonschema-2.5.1.ebuild
index a5862d3c6dca..5dfd1b09d3a7 100644
--- a/dev-python/jsonschema/jsonschema-2.5.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-2.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
index 99b7908b272d..02e6bfead44a 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 02d18f667f66..9d2e1a78cf06 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,4 +1,3 @@
DIST mamba-0.6.tar.gz 12548 SHA256 94169b12141ba57bbcbc5a5fac810631102558450057e1b66b0631d521034b67 SHA512 1d29c90cb45d2a6881d3524517151b88c80acabeaecff42efa9c94a8257e726c4b53cc40aba0643e95ef4af7d2895cf49b6619df06e933aab88157105c98a8cb WHIRLPOOL 489769b4f4ae368d0fa9ce918b629ab661765e8e85f4de1fe609e6f85e19304ec2c3c41a278b47d205fbd42d44b625f8b16b09a223282031f0f317d622aa2481
-DIST mamba-0.8.2.tar.gz 13379 SHA256 4ece61321a90b904e8f2859f4966d3fd61b4161137e73d4a3f8015b6f1d944fd SHA512 3b8e824b5c84106462242404716a4b36c678878301a924c4118accedd1b6883e1102c3bc61ac200c78f64c3b6a6890ba0f5529c3cd4d6a2743189174aa2fd907 WHIRLPOOL 6a60c866c84140c82a57eec2341262fe9c8a3be900c4d8fecc3113c776b197ef9df378c73ef9c0e915ecf23f2ba31ec01c6e606cec30d7dcc0f9d7af6bc110a8
DIST mamba-0.8.4.tar.gz 14781 SHA256 2fc3eb17a1d051438ca844ad9086f6ad8d27d7a262153cb9e740416b01b7d46d SHA512 31a58a6ee43500b6e059598ff45ffb0e89e385a10fc47a41222cce2a2fee3987bd84dc4484151d46a7062244437973afaddc2c74aa7df21c0e175a33ce8a630c WHIRLPOOL dc26692c8e46ab1f2226099b051fd1236fc7006b0f3ce93f70cca4a685c209e71de256ae6ed21695df9ccb299bf2edc1f9975c2f98ee906e8067ab3a9ccb2383
-DIST mamba-0.8.tar.gz 13192 SHA256 7e6488e41acecc08c8d729c18ef881a94119f575b1c7d365cc4ea3c3442aca63 SHA512 ac1c9342829d949bfbe99caa42403734a9965c6070fd95a7e427f7e2592c122d86eacd19b4c1ae566e7c3035a27a6c7e43ce0fb98d1a9b5c126ed75f1de314bc WHIRLPOOL 2d3b2895bbe4a6dd7e51d327e4e22a58874c4654ad52e589467c4f0eeda332855c1968d12fcfc32cdf28c8a9718fe3892b01b079b0efccc7efadd8e4a57d2ab7
+DIST mamba-0.8.5.tar.gz 15265 SHA256 c90428c3cae331caf1887b62af89236bac14c7e8d078ea94e068a4b0d9f2cb85 SHA512 e8b5539f66c77bbec9001be6dd13914a17c1a23e6e1d9219d509b8e27664b65d16f5d5e992c284fb2e21e8e92f82a503bda5905baedb0e695b384f7280885a5a WHIRLPOOL a6a9e332b84b0c3a91d1376bf517eb67ced3f5ade8b294a949f5e951279c9c006b5d7718cadf27df5c073dd1fe7507485e10d1f69f81c62338a9fdbe8da24265
diff --git a/dev-python/mamba/mamba-0.8.2.ebuild b/dev-python/mamba/mamba-0.8.2.ebuild
deleted file mode 100644
index 0721779ad932..000000000000
--- a/dev-python/mamba/mamba-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
-HOMEPAGE="http://nestorsalceda.github.io/mamba"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- >=dev-python/expects-0.4.2[${PYTHON_USEDEP}]
- =dev-python/doublex-expects-0.4[${PYTHON_USEDEP}]
- =dev-python/coverage-3.7[${PYTHON_USEDEP}]
- ~dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- ebegin 'patching requirements.txt'
- sed \
- -e '2s/==/>=/' \
- -i requirements.txt
- STATUS=$?
- eend ${STATUS}
- [[ ${STATUS} -gt 0 ]] && die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
- rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
- distutils_install_for_testing
-
- "${TEST_DIR}"/scripts/mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/mamba/mamba-0.8.5.ebuild b/dev-python/mamba/mamba-0.8.5.ebuild
new file mode 100644
index 000000000000..fde264bf71f6
--- /dev/null
+++ b/dev-python/mamba/mamba-0.8.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
+HOMEPAGE="http://nestorsalceda.github.io/mamba"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ test? (
+ ~dev-python/doublex-expects-0.7.0_rc1[${PYTHON_USEDEP}]
+ ~dev-python/expects-0.8.0_rc2[${PYTHON_USEDEP}]
+ ~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ ~dev-python/clint-0.3.1[${PYTHON_USEDEP}]
+ ~dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+ ~dev-python/watchdog-0.8.1[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ "${PYTHON}" -m mamba.cli || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/mamba/mamba-0.8.ebuild b/dev-python/mamba/mamba-0.8.ebuild
deleted file mode 100644
index 67dee3e6867e..000000000000
--- a/dev-python/mamba/mamba-0.8.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The definitive testing tool for Python. Born under the banner of Behavior Driven Development"
-HOMEPAGE="http://nestorsalceda.github.io/mamba"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ~dev-python/expects-0.2.1[${PYTHON_USEDEP}]
- ~dev-python/doublex-1.8.1[${PYTHON_USEDEP}]
- >=dev-python/pyhamcrest-1.8.0[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- ~dev-python/clint-0.3.1[${PYTHON_USEDEP}]
- ~dev-python/coverage-3.7[${PYTHON_USEDEP}]
- >=dev-python/watchdog-0.6.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- ebegin 'patching requirements.txt'
- sed \
- -e '3s/==/>=/' \
- -i requirements.txt
- STATUS=$?
- eend ${STATUS}
- [[ ${STATUS} -gt 0 ]] && die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
- rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
- distutils_install_for_testing
-
- "${TEST_DIR}"/scripts/mamba || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild b/dev-python/packaging/packaging-15.3-r1.ebuild
index aaac708087bd..9fd313141262 100644
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ b/dev-python/packaging/packaging-15.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index 1a0c9d3b032f..47721018b501 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 7b4ef23953aa..79c0801c576b 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 7830c2ae2925..424b8637340c 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/rfc3986/rfc3986-0.2.2.ebuild b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
index 3099989634ed..64014eb139ae 100644
--- a/dev-python/rfc3986/rfc3986-0.2.2.ebuild
+++ b/dev-python/rfc3986/rfc3986-0.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
IUSE="test"
DEPEND="
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
index 3c85105c1905..25c04ea78742 100644
--- a/dev-python/stormpath/Manifest
+++ b/dev-python/stormpath/Manifest
@@ -1,2 +1,3 @@
DIST stormpath-2.0.8.tar.gz 4326469 SHA256 9f6ad7e7b210024915e2139b2ed395a7c0fff6ca49ad3cdf58dc8f214d080c70 SHA512 661714fac02528111bb01e30f8c16b1d8701fe894b21d803958331819ce145a9ec03864111b861286224b33aaf56ca68ddcef2b67cd0003c498cd007ce375a03 WHIRLPOOL 12e6f7ec559a654ab59d34106d85d98ada4c7e3dee6fcec6cad0a2500608e962289d73a50e6ce6d81122c43f0f53b30d861203c8a976ac7bdbdab1cd8f5db6be
DIST stormpath-2.0.9.tar.gz 4325976 SHA256 ba93f1f9f6b98db2eb2671d2b3285fdd15f8b2e6d3bce899f240576018f216ae SHA512 b50fa11e8fecf4909a8a1014963c80e7e2dde4db37e1f4681c2a116933d59f5b5ea32901cfde97b24398d8074db8b04121b2a7715d86b6b2eb78eb288465114c WHIRLPOOL 6290d5844d35158cc46f1810b6f83e41c443164cff4512caeeb38e562b04f448c1ac1b608b2cda4abd348f91319e4e8fbb3b195ba31a8fb415ba80f0ed7c5937
+DIST stormpath-2.1.1.tar.gz 4326557 SHA256 94600e8368f2fbe06adea5fddc8f4b7a479f7a89a0a35a46f58f7c796286e5f4 SHA512 7548aff63e5f04718d4d4887a1177f6f0cf3cc8cb9588e17f7563bae9c6dc5897a968ee2c4e189b6d9100ef16ec7e34e524c4cd3c5112845c0619876ca6d5505 WHIRLPOOL 33db1d8e52d24581a1fe7220b4329479142772939d1df76d52a46d47db6219890fde3204655dd65851d43b38e2427cd32df894392948482d85554772b9f12bbf
diff --git a/dev-python/stormpath/stormpath-2.1.1.ebuild b/dev-python/stormpath/stormpath-2.1.1.ebuild
new file mode 100644
index 000000000000..539c56ce761f
--- /dev/null
+++ b/dev-python/stormpath/stormpath-2.1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Official Stormpath SDK, used to interact with the Stormpath REST API."
+HOMEPAGE="https://github.com/stormpath/stormpath-sdk-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ >=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+ >=dev-python/oauthlib-0.6.3[${PYTHON_USEDEP}]
+ >=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+ >=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.4.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test || die "tests failed under ${EPYTYHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
index 918c3169b008..f082984032e7 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.6.ebuild
@@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
index c2c33998e41d..250a7d244434 100644
--- a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
IUSE="test"
DEPEND="
diff --git a/dev-python/webcolors/webcolors-1.5.ebuild b/dev-python/webcolors/webcolors-1.5.ebuild
index a871da0be8c4..6adc46fd9cc3 100644
--- a/dev-python/webcolors/webcolors-1.5.ebuild
+++ b/dev-python/webcolors/webcolors-1.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-util/android-ndk/metadata.xml b/dev-util/android-ndk/metadata.xml
index 905572c5b252..cdb306c98208 100644
--- a/dev-util/android-ndk/metadata.xml
+++ b/dev-util/android-ndk/metadata.xml
@@ -5,13 +5,6 @@
perfinion@gentoo.org
Jason Zaman
-
- cardoe@gentoo.org
- Doug Goldstein
- Feel free to update/modify this package, just don't break
- my limited use case that I use it for.
-
-