diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index ab5a0ba2ea6d..2c70eeabf41d 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,2 +1 @@
DIST trousers-0.3.10.tar.gz 1658652 SHA256 eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530 SHA512 1835246f846d20bc1b2731d68440a9ca45865fcd52ad847d95485e4b126fae8bec09feaad559c27d83e243d92b8adc3a67934bff2034b318df075842fe9df4f0 WHIRLPOOL 7a27ef57b0038178cbf384c9fdec2d2e3e58dbeb5e5bc1503d2a7058a8312df54fa72b87968554631e4b5e483ae5e8c5e0a2367346bf3ae001b523a507ceff40
-DIST trousers-0.3.6.tar.gz 1335084 SHA256 91025f60248af44df192e8df16fa6b0c0f1e48c54f6dc51626567ed95758b0d6 SHA512 a9eba2f8e06b163c29e2e9079e62240d96dc630d12fbe61aa0c6b2bc93f88d7f528ae0cabae1de82aba9676e91c2c338da2ce1690bbf21b768af803f7cdff6c3 WHIRLPOOL b13e46f3e2f95bd28a4ad3f7686638709d2484b56ac96f98823f56aafd1be852275a1831ae82a1b11b4eb3e4e9ad051012e59368425374b918e41ecf41d70f01
diff --git a/app-crypt/trousers/trousers-0.3.6-r1.ebuild b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
deleted file mode 100644
index 61d09040576e..000000000000
--- a/app-crypt/trousers/trousers-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.5 2014/07/04 15:05:39 swift Exp $
-
-EAPI="3"
-
-inherit autotools eutils linux-info user udev toolchain-funcs
-
-#MY_P="${PN}-${PV%.*}-${PV##*.}"
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-# gtk? ( >=x11-libs/gtk+-2 )
-
-RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0
- selinux? ( sec-policy/selinux-tcsd )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-# S="${WORKDIR}/${P}git"
-
-pkg_setup() {
- # Check for driver (not sure it can be an rdep, because ot depends on the
- # version of virtual/linux-sources... Is that supported by portage?)
- linux-info_pkg_setup
- local tpm_kernel_version tpm_kernel_present tpm_module
- kernel_is ge 2 6 12 && tpm_kernel_version="yes"
- if linux_config_exists; then
- linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
- else
- ewarn "No kernel configuration could be found."
- fi
- has_version app-crypt/tpm-emulator && tpm_module="yes"
- if [[ -n "${tpm_kernel_present}" ]]; then
- einfo "Good, you seem to have in-kernel TPM support."
- elif [[ -n "${tpm_module}" ]]; then
- einfo "Good, you seem to have TPM support with the external module."
- if [[ -n "${tpm_kernel_version}" ]]; then
- elog
- elog "Note that since you have a >=2.6.12 kernel, you could use"
- elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
- fi
- elif [[ -n "${tpm_kernel_version}" ]]; then
- eerror
- eerror "To use this package, you will have to activate TPM support"
- eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
- eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
- eerror
- else
- eerror
- eerror "To use this package, you should install a TPM driver."
- eerror "You can have the following options:"
- eerror " - install app-crypt/tpm-emulator"
- eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
- eerror
- fi
-
- # New user/group for the daemon
- enewgroup tss
- enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch"
-
- sed -i -r \
- -e '/CFLAGS/s/ -(Werror|m64)//' \
- configure.in || die
- eautoreconf
-}
-
-src_configure() {
- #econf --with-gui=$(usev gtk || echo openssl) || die "econf failed"
- econf --with-gui=openssl || die "econf failed"
-}
-
-src_install() {
- keepdir /var/lib/tpm
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NICETOHAVES README TODO
- use doc && dodoc doc/*
- newinitd "${FILESDIR}/tcsd.initd" tcsd
- newconfd "${FILESDIR}/tcsd.confd" tcsd
- udev_dorules "${FILESDIR}"/61-trousers.rules
- fowners tss:tss /var/lib/tpm
-}
-
-pkg_postinst() {
- elog "If you have problems starting tcsd, please check permissions and"
- elog "ownership on /dev/tpm* and ~tss/system.data"
-}
diff --git a/app-crypt/trousers/trousers-0.3.6.ebuild b/app-crypt/trousers/trousers-0.3.6.ebuild
deleted file mode 100644
index 50fac1709ae5..000000000000
--- a/app-crypt/trousers/trousers-0.3.6.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.7 2014/07/04 15:05:39 swift Exp $
-
-EAPI="3"
-
-inherit autotools eutils linux-info user
-
-#MY_P="${PN}-${PV%.*}-${PV##*.}"
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-# gtk? ( >=x11-libs/gtk+-2 )
-
-RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7
- selinux? ( sec-policy/selinux-tcsd )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-# S="${WORKDIR}/${P}git"
-
-pkg_setup() {
- # Check for driver (not sure it can be an rdep, because ot depends on the
- # version of virtual/linux-sources... Is that supported by portage?)
- linux-info_pkg_setup
- local tpm_kernel_version tpm_kernel_present tpm_module
- kernel_is ge 2 6 12 && tpm_kernel_version="yes"
- if linux_config_exists; then
- linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
- else
- ewarn "No kernel configuration could be found."
- fi
- has_version app-crypt/tpm-emulator && tpm_module="yes"
- if [[ -n "${tpm_kernel_present}" ]]; then
- einfo "Good, you seem to have in-kernel TPM support."
- elif [[ -n "${tpm_module}" ]]; then
- einfo "Good, you seem to have TPM support with the external module."
- if [[ -n "${tpm_kernel_version}" ]]; then
- elog
- elog "Note that since you have a >=2.6.12 kernel, you could use"
- elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
- fi
- elif [[ -n "${tpm_kernel_version}" ]]; then
- eerror
- eerror "To use this package, you will have to activate TPM support"
- eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
- eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
- eerror
- else
- eerror
- eerror "To use this package, you should install a TPM driver."
- eerror "You can have the following options:"
- eerror " - install app-crypt/tpm-emulator"
- eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
- eerror
- fi
-
- # New user/group for the daemon
- enewgroup tss
- enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch"
-
- sed -e "s/ -Werror//" -i configure.in
- eautoreconf
-}
-
-src_configure() {
- #econf --with-gui=$(usev gtk || echo openssl) || die "econf failed"
- econf --with-gui=openssl || die "econf failed"
-}
-
-src_install() {
- keepdir /var/lib/tpm
- make DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NICETOHAVES README TODO
- use doc && dodoc doc/*
- newinitd "${FILESDIR}/tcsd.initd" tcsd
- newconfd "${FILESDIR}/tcsd.confd" tcsd
- insinto /etc/udev/rules.d
- doins "${FILESDIR}"/61-trousers.rules
- fowners tss:tss /var/lib/tpm
-}
-
-pkg_postinst() {
- elog "If you have problems starting tcsd, please check permissions and"
- elog "ownership on /dev/tpm* and ~tss/system.data"
-}
diff --git a/app-emacs/org-mode/org-mode-8.2.6.ebuild b/app-emacs/org-mode/org-mode-8.2.6.ebuild
index f45cc866d592..8ec7654caa32 100644
--- a/app-emacs/org-mode/org-mode-8.2.6.ebuild
+++ b/app-emacs/org-mode/org-mode-8.2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.2 2014/06/07 11:33:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-8.2.6.ebuild,v 1.3 2014/07/15 11:37:11 nimiux Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
IUSE="contrib doc odt-schema"
RESTRICT="test"
diff --git a/app-misc/vifm/vifm-0.7.1.ebuild b/app-misc/vifm/vifm-0.7.1.ebuild
index 304b9a8b5d78..33b7cc3fde87 100644
--- a/app-misc/vifm/vifm-0.7.1.ebuild
+++ b/app-misc/vifm/vifm-0.7.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.1.ebuild,v 1.1 2011/11/24 22:03:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.1.ebuild,v 1.2 2014/07/15 09:42:05 nimiux Exp $
EAPI=4
+
inherit base
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -24,7 +25,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
src_configure() {
econf \
diff --git a/app-misc/vifm/vifm-0.7.2.ebuild b/app-misc/vifm/vifm-0.7.2.ebuild
index d5fe3e560626..80d8f7dd807c 100644
--- a/app-misc/vifm/vifm-0.7.2.ebuild
+++ b/app-misc/vifm/vifm-0.7.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.2.ebuild,v 1.5 2012/09/16 14:26:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.2.ebuild,v 1.6 2014/07/15 09:42:05 nimiux Exp $
EAPI=4
+
inherit base
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -24,7 +25,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
S="${WORKDIR}"
diff --git a/app-misc/vifm/vifm-0.7.4b-r1.ebuild b/app-misc/vifm/vifm-0.7.4b-r1.ebuild
index 81c4176ebabb..7b322cdcf9f3 100644
--- a/app-misc/vifm/vifm-0.7.4b-r1.ebuild
+++ b/app-misc/vifm/vifm-0.7.4b-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.4b-r1.ebuild,v 1.1 2013/02/06 12:17:52 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.4b-r1.ebuild,v 1.2 2014/07/15 09:42:05 nimiux Exp $
EAPI=5
+
inherit base vim-doc
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -26,7 +27,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
src_configure() {
econf \
diff --git a/app-misc/vifm/vifm-0.7.5.ebuild b/app-misc/vifm/vifm-0.7.5.ebuild
index 79c51bcb7e83..94c15df8d9b2 100644
--- a/app-misc/vifm/vifm-0.7.5.ebuild
+++ b/app-misc/vifm/vifm-0.7.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.5.ebuild,v 1.2 2013/06/19 13:25:50 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.5.ebuild,v 1.3 2014/07/15 09:42:05 nimiux Exp $
EAPI=5
+
inherit base vim-doc
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -26,7 +27,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
src_configure() {
econf \
diff --git a/app-misc/vifm/vifm-0.7.6.ebuild b/app-misc/vifm/vifm-0.7.6.ebuild
index 70de11d9cd1c..b700a7bcbb0d 100644
--- a/app-misc/vifm/vifm-0.7.6.ebuild
+++ b/app-misc/vifm/vifm-0.7.6.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.6.ebuild,v 1.2 2014/07/13 10:07:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.6.ebuild,v 1.4 2014/07/15 11:25:44 zlogene Exp $
EAPI=5
+
inherit base vim-doc
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -11,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc ~s390 ~x86"
+KEYWORDS="amd64 ppc ~s390 ~x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
@@ -26,7 +27,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
src_configure() {
econf \
diff --git a/app-misc/vifm/vifm-0.7.7.ebuild b/app-misc/vifm/vifm-0.7.7.ebuild
index 0f041a741b8c..43fa9b7abbb0 100644
--- a/app-misc/vifm/vifm-0.7.7.ebuild
+++ b/app-misc/vifm/vifm-0.7.7.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.7.ebuild,v 1.2 2014/07/08 16:02:46 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.7.ebuild,v 1.4 2014/07/15 09:42:05 nimiux Exp $
EAPI=5
+
inherit base vim-doc
DESCRIPTION="Console file manager with vi(m)-like keybindings"
@@ -11,7 +12,7 @@ SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~s390 ~x86"
+KEYWORDS="~amd64 ~ppc ~s390 ~x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
@@ -26,7 +27,7 @@ RDEPEND="
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
"
-DOCS=( AUTHORS TODO README )
+DOCS=( AUTHORS FAQ NEWS README TODO )
src_configure() {
econf \
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 0dc37745e802..31e71b9255ff 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1 +1,2 @@
+DIST workrave-1.10.1.tar.gz 6800197 SHA256 6ef89aebd278e27d3b73896485e7d8aaef415e7d18318d3bb7ba0d0507bd48de SHA512 4f721ebaceb43f542c25b0eb3fcd2e2d205290c982ddb57628c56bfed0c63fdde85adf304b4fdaf07908e31e8e31942ffdf17a9f1f0a3e62fec71aa5722d946a WHIRLPOOL f365ba528ef56cc6475dc7898b98d08532724a5cebab81e0a7b25534eaa78871a7ac2e7d7d016fd6812099031355d4950b7eecd671befa2127295cbc68dca498
DIST workrave-1.10.tar.gz 6800389 SHA256 b6733907ed0f2d42f234a0ce4f000b03329c1c50b3028defcb892e6b3a4541ba SHA512 3a73d0fe8ba85dd6396666f6ea00e7a2992038d1eba06d97741ffc7ad43afef5528995fee24d9f306d8c207ef924d677c8a3223ac83f68126284d8a02c328506 WHIRLPOOL c53632b4ef7f014c4bb8783450b5f076f96a19eb0b26a96258574d3809a58e827424a140abba1a7a5ef300a9363dd43f64e256456746b577920a0542d8eafea4
diff --git a/app-misc/workrave/files/workrave-1.10.1-desktop.patch b/app-misc/workrave/files/workrave-1.10.1-desktop.patch
new file mode 100644
index 000000000000..5ab662e42564
--- /dev/null
+++ b/app-misc/workrave/files/workrave-1.10.1-desktop.patch
@@ -0,0 +1,10 @@
+--- frontend/gtkmm/src/workrave.desktop.in~ 2013-06-11 22:40:13.000000000 +0200
++++ frontend/gtkmm/src/workrave.desktop.in 2014-07-15 11:59:15.905346840 +0200
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+-Categories=Utility;GTK;Accessibility
++Categories=Utility;GTK;Accessibility;
+ Exec=workrave
+ Icon=workrave
+ _Comment=Assists in the prevention and recovery of Repetitive Strain Injury (RSI)
diff --git a/app-misc/workrave/workrave-1.10.1.ebuild b/app-misc/workrave/workrave-1.10.1.ebuild
new file mode 100644
index 000000000000..d0d26c7bb0ae
--- /dev/null
+++ b/app-misc/workrave/workrave-1.10.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/workrave/workrave-1.10.1.ebuild,v 1.1 2014/07/15 10:03:34 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
+HOMEPAGE="http://www.workrave.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus doc distribution gstreamer nls pulseaudio test"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=x11-libs/gtk+-3.0:3
+ >=dev-cpp/gtkmm-3.0.0:3.0
+ >=dev-cpp/glibmm-2.28.0:2
+ >=dev-libs/libsigc++-2.2.4.2:2
+ dbus? (
+ >=sys-apps/dbus-1.2
+ dev-libs/dbus-glib )
+ distribution? ( >=net-libs/gnet-2 )
+ gstreamer? (
+ >=media-libs/gstreamer-0.10:0.10
+ >=media-libs/gst-plugins-base-0.10:0.10 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
+ x11-libs/libXScrnSaver
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXtst
+ x11-libs/libXt
+ x11-libs/libXmu
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.0
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/recordproto
+ dev-python/cheetah
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-sgml-utils
+ app-text/xmlto )
+ nls? ( >=sys-devel/gettext-0.17 )
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.10.1-desktop.patch"
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-experimental \
+ --disable-static \
+ --disable-xml \
+ $(use_enable dbus) \
+ $(use_enable doc manual) \
+ $(use_enable distribution) \
+ $(use_enable gstreamer) \
+ $(use_enable nls) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable test tests)
+}
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
index 7d2f40277a56..813024973939 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.2 2014/05/31 16:24:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.3 2014/07/15 09:07:45 zlogene Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
LICENSE="|| ( GPL-2 LGPL-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="bluetooth debug java perl png python readline static-libs threads usb"
COMMON_DEPEND="dev-libs/popt
diff --git a/app-pda/pilot-link/pilot-link-0.12.5.ebuild b/app-pda/pilot-link/pilot-link-0.12.5.ebuild
deleted file mode 100644
index bc193cb587c0..000000000000
--- a/app-pda/pilot-link/pilot-link-0.12.5.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5.ebuild,v 1.11 2012/08/29 03:20:32 blueness Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools distutils eutils perl-module java-pkg-opt-2
-
-DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
-HOMEPAGE="http://www.pilot-link.org/"
-SRC_URI="http://pilot-link.org/source/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="bluetooth debug java perl png python readline static-libs threads usb"
-
-COMMON_DEPEND="dev-libs/popt
- >=sys-libs/ncurses-5.7-r7
- virtual/libiconv
- bluetooth? ( net-wireless/bluez )
- perl? ( >=dev-lang/perl-5.12 )
- png? ( media-libs/libpng:0 )
- readline? ( >=sys-libs/readline-6 )
- usb? ( virtual/libusb:0 )"
-DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.4 )"
-
-PYTHON_MODNAME="pisock.py pisockextras.py"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.12.3-java-install.patch \
- "${FILESDIR}"/${PN}-0.12.3-respect-javacflags.patch \
- "${FILESDIR}"/${PN}-0.12.2-werror_194921.patch \
- "${FILESDIR}"/${PN}-0.12.2-threads.patch \
- "${FILESDIR}"/${PN}-0.12.3-{libpng14,png}.patch \
- "${FILESDIR}"/${PN}-0.12.3-distutils.patch \
- "${FILESDIR}"/${PN}-0.12.3-libusb-compat-usb_open.patch \
- "${FILESDIR}"/${PN}-0.12.5-perl514.patch
-
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- # tcl/tk support is disabled as per upstream request.
- econf \
- --includedir="${EPREFIX}"/usr/include/libpisock \
- $(use_enable static-libs static) \
- --enable-conduits \
- $(use_enable threads) \
- $(use_enable usb libusb) \
- $(use_enable debug) \
- $(use_with png libpng) \
- $(use_with bluetooth bluez) \
- $(use_with readline) \
- $(use_with perl) \
- $(use_with java) \
- --without-tcl \
- $(use_with python)
-}
-
-src_compile() {
- emake || die
-
- if use perl; then
- cd "${S}"/bindings/Perl
- perl-module_src_prep
- local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
- perl-module_src_compile
- fi
-
- if use python; then
- cd "${S}"/bindings/Python
- distutils_src_compile
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README doc/{README*,TODO}
-
- if use java; then
- cd "${S}"/bindings/Java
- java-pkg_newjar ${PN}.jar
- java-pkg_doso libjpisock.so
- fi
-
- if use perl; then
- cd "${S}"/bindings/Perl
- perl-module_src_install
- fi
-
- if use python; then
- cd "${S}"/bindings/Python
- distutils_src_install
- fi
-
- find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_preinst() {
- perl-module_pkg_preinst
- java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
- use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use python && distutils_pkg_postrm
-}
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index dffa89f71e28..2665155da82f 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1 +1,2 @@
DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
new file mode 100644
index 000000000000..376c30458ecd
--- /dev/null
+++ b/dev-java/netty-buffer/files/netty-buffer-4.0.21-build.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
new file mode 100644
index 000000000000..60561216dba8
--- /dev/null
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild,v 1.1 2014/07/15 08:01:00 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/${MY_PN}-common:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}
+ test? (
+ dev-java/ant-core:0
+ dev-java/easymock:3.2
+ dev-java/hamcrest-library:1.3
+ dev-java/junit:4
+ )"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-common"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},ant-core,easymock-3.2,hamcrest-library-1.3,junit-4"
+EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+ ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index dffa89f71e28..2665155da82f 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -1 +1,2 @@
DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml
new file mode 100644
index 000000000000..cf611db90336
--- /dev/null
+++ b/dev-java/netty-codec/files/netty-codec-4.0.21-build.xml
@@ -0,0 +1,258 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/netty-codec/netty-codec-4.0.21.ebuild b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
new file mode 100644
index 000000000000..a6f8567d2302
--- /dev/null
+++ b/dev-java/netty-codec/netty-codec-4.0.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-codec/netty-codec-4.0.21.ebuild,v 1.1 2014/07/15 08:24:05 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+ dev-java/${MY_PN}-common:0
+ dev-java/${MY_PN}-transport:0
+ dev-java/jboss-marshalling:0
+ dev-java/jzlib:1.1.3
+ dev-libs/protobuf[java]"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common,jboss-marshalling,${MY_PN}-transport,jzlib-1.1.3,protobuf"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+# [junit] Testcase: testZLIB_OR_NONE2 took 0.008 sec
+# [junit] Caused an ERROR
+# [junit] null
+# [junit] java.lang.InstantiationException
+# [junit] at java.lang.reflect.Constructor.newInstance(Constructor.java:408)
+RESTRICT="test"
+
+src_install() {
+ java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java
+}
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index dffa89f71e28..2665155da82f 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1 +1,2 @@
DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-common/files/netty-common-4.0.19-build.xml b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
index 5b25fa9970a4..29e56ede46a2 100644
--- a/dev-java/netty-common/files/netty-common-4.0.19-build.xml
+++ b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
@@ -70,8 +70,7 @@
target="1.6"
verbose="false"
fork="true"
- memoryMaximumSize="256m"
- memoryInitialSize="1024m"
+ memoryInitialSize="1024m"
source="1.6">
@@ -97,8 +96,7 @@
target="1.6"
verbose="false"
fork="true"
- memoryMaximumSize="256m"
- memoryInitialSize="1024m"
+ memoryInitialSize="1024m"
source="1.6">
diff --git a/dev-java/netty-common/files/netty-common-4.0.21-build.xml b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
new file mode 100644
index 000000000000..b83a8bda55b8
--- /dev/null
+++ b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/netty-common/netty-common-4.0.19.ebuild b/dev-java/netty-common/netty-common-4.0.19.ebuild
index 29947d34bc4e..3ab4aacdd8de 100644
--- a/dev-java/netty-common/netty-common-4.0.19.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.19.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.19.ebuild,v 1.1 2014/05/19 12:35:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.19.ebuild,v 1.2 2014/07/15 07:50:55 ercpe Exp $
EAPI="5"
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-ant-2
@@ -16,26 +16,22 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
- dev-java/commons-logging:0
+CDEPEND="dev-java/commons-logging:0
dev-java/javassist:3
dev-java/log4j:0
- dev-java/slf4j-api:0
- test? (
- dev-java/ant-core:0
- dev-java/easymock:3.2
- dev-java/junit:4
- )"
+ dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
EANT_BUILD_TARGET="package"
JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
# Tests fail as they might need logging to be properly set up and/or compatible.
#
@@ -44,23 +40,12 @@ EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
RESTRICT="test"
java_prepare() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
-
cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
- # Remove the odd memory restriction in the generated build files.
- sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
- EANT_EXTRA_ARGS="${EANT_EXTRA_ARGS}:$(java-pkg_getjars --build-only ant-core,easymock-3.2,junit-4)"
-
- ANT_TASKS="ant-junit" java-pkg-2_src_test
}
src_install() {
java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java
+ use source && java-pkg_dosrc src/main/java/*
}
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
new file mode 100644
index 000000000000..ce6794c5b0a8
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.21.ebuild,v 1.1 2014/07/15 07:50:55 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-logging:0
+ dev-java/javassist:3
+ dev-java/log4j:0
+ dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
+
+# Tests fail as they might need logging to be properly set up and/or compatible.
+#
+# junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
+# at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
+RESTRICT="test"
+
+java_prepare() {
+ #EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+ java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index dffa89f71e28..2665155da82f 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1 +1,2 @@
DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
diff --git a/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml b/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml
new file mode 100644
index 000000000000..4f033f48124a
--- /dev/null
+++ b/dev-java/netty-transport/files/netty-transport-4.0.21-build.xml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================================== WARNING ===================================
+ JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
+ ===============================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-java/netty-transport/netty-transport-4.0.21.ebuild b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
new file mode 100644
index 000000000000..89e47616dcf5
--- /dev/null
+++ b/dev-java/netty-transport/netty-transport-4.0.21.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-transport/netty-transport-4.0.21.ebuild,v 1.2 2014/07/15 08:22:42 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/${MY_PN}-buffer:0
+ dev-java/${MY_PN}-common:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="${MY_PN}-buffer,${MY_PN}-common"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+# error: package ch.qos.logback.classic does not exist
+RESTRICT="test"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+ java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+ use doc && java-pkg_dojavadoc target/site/apidocs
+ use source && java-pkg_dosrc src/main/java/*
+}
diff --git a/dev-libs/btparser/Manifest b/dev-libs/btparser/Manifest
index 2ad70ccdaa7e..5f07106efaf6 100644
--- a/dev-libs/btparser/Manifest
+++ b/dev-libs/btparser/Manifest
@@ -1 +1,2 @@
DIST btparser-0.24.tar.xz 353700 SHA256 9cc1e172c864afb6dec45850ed7b2fa605d39013918027df81800899ea654e32 SHA512 3aee4a8cbc8cda7017cc7203b670ba30443b5f302d728ecb7ce06a9569367543669c9c02d10a71b2bbf0bbc65cb927c0e25a53a422fc3be5e4a2ee51e5495198 WHIRLPOOL a5feb168f9ab2d4442c37ba388c0ed4708781ab2e6becc89ea20ac2601a698600e47721c0818aad8e4df93888cfadfdec68aace0f659985d95cecb31cdb01b8f
+DIST btparser-0.25.tar.xz 355736 SHA256 afaad61a52d90c7dcc65f53485ced298e9cd9dab6a9ff611c4eb40bfcc2a786e SHA512 fc3f1f440fdf19eba8d698bdde9b1f197cbf663b7f8a53dea98c9fa6ffe4cd23a12b8d46d211fcff30dd4adbd3998723f7a2afb19c6c5d73da34156bc7877b56 WHIRLPOOL 5ed0fa3b7c97243d120c11d5870c4a682033501151df22bbf9a7b12832cecc888b3fad3ab6e0269c43835108af8bbd1b4ad3c81bb983b9bcd2ff55f2919257e1
diff --git a/dev-libs/btparser/btparser-0.25.ebuild b/dev-libs/btparser/btparser-0.25.ebuild
new file mode 100644
index 000000000000..4f02f88b534a
--- /dev/null
+++ b/dev-libs/btparser/btparser-0.25.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/btparser/btparser-0.25.ebuild,v 1.1 2014/07/15 10:17:26 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools gnome2 python-single-r1
+
+DESCRIPTION="Parser and analyzer for backtraces produced by gdb"
+HOMEPAGE="https://fedorahosted.org/btparser/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.21:2
+"
+DEPEND="${RDEPEND}"
+
+# Incomplete tarball for tests
+RESTRICT="test"
+
+src_prepare() {
+ eautoreconf # to prevent maintainer mode
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Configure checks for python.pc; our python-2.7 installs python-2.7.pc,
+ # while python-2.6 does not install any pkgconfig file.
+ export PYTHON_CFLAGS=$(python-config --includes)
+ export PYTHON_LIBS=$(python-config --libs)
+
+ gnome2_src_configure \
+ $(use_enable static-libs static)
+}
diff --git a/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
index 130e25267492..fcd5a00f0d6c 100644
--- a/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
+++ b/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild,v 1.7 2013/08/06 13:11:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r2.ebuild,v 1.8 2014/07/15 09:04:09 zlogene Exp $
-EAPI="3"
+EAPI="5"
PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 26c9a6712aa8..f4e700070e51 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,3 +1,4 @@
DIST Net-SSLeay-1.55.tar.gz 394657 SHA256 8cd5f09722e07b4e436102cb3a4b93623d753c171665ca9752c3b39a62ea3a79 SHA512 204928a95937b31216008986692ef96370ab6623c9238b69a10452db40ce0b1d50d97813c53eca6debb5f605afa946fd4a468fd32fa63572c275ce0ad33ab855 WHIRLPOOL bdbe27149c4e3f041c6a10da78f7513d8e5b602159f83a2e93047c0f6079d60f1d0d6d23d0211a7e20bdb8aa35b96b87dfbf733e5199b5b9ca2ab7b6308b51e8
DIST Net-SSLeay-1.58.tar.gz 399353 SHA256 0bdc50c19df545eb2f9e434458ee2b54e97b109315dafb476044b9039e783f56 SHA512 88d768ac5b8dc3dbbfe2715ed91fc4dd887febcc31316e06e40a875de98db95ca87452ad02df7ee74063c0ba9a171bbef02679577e4d219fcea1b21cf0399761 WHIRLPOOL 04a5c6423d35d4415ef03f2bcda945efff580d5081695e83b8be8349ab1c3c9f79651874ad75e81709eb2d94473815fbee0ede8812e0417767af5bfa2af59820
DIST Net-SSLeay-1.64.tar.gz 411886 SHA256 9354e6b153d571ad612a211ce9732980944adb581997801f4643cda6e12d80b2 SHA512 cf469b6d7fdea853682d1d2e34be71948f75d2d5ca7ce1222be15f707843f0683cf348bff50f010ea55522904ea22a84e0a688fdbba70a5e6f6d28ebd2bf0de4 WHIRLPOOL c487a44edb2793957fd39491028e0946265c40de627c31e24326e8fbb3aa7fd9a8b153dda4c006e9bfb19bda2233aae76f3a39c9ef3e552ab3cb49b2c012a62d
+DIST Net-SSLeay-1.65.tar.gz 384413 SHA256 2fb1371120b85f018944d95736c107163f04ba56b6029c0709a2c3d6247b9c06 SHA512 e347ac7cc5ee22b9785953a5318d35fa3a2d5a21a2e726f49c74621d2dad9ea68373e208068dcd60d8a8d5ab027ae6e32fc0b671995d1645a14c2934eb5a884f WHIRLPOOL 15f38b5a026734f7a074b290979f3e346dfea125d02d8f63e7f5c163de7a4514456d3948ade61b74a53173e27aa221b9142736a98b9d6631c61f0239e6f0833b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0.ebuild
new file mode 100644
index 000000000000..f04fe51c4203
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-SSLeay/Net-SSLeay-1.650.0.ebuild,v 1.1 2014/07/15 10:34:05 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MIKEM
+MODULE_VERSION=1.65
+inherit multilib perl-module
+
+DESCRIPTION="Net::SSLeay module for perl"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+# test? ( dev-perl/Test-Exception
+# dev-perl/Test-Warn
+# dev-perl/Test-NoWarnings )"
+
+#SRC_TEST=do
+
+export OPTIMIZE="$CFLAGS"
+export OPENSSL_PREFIX=${EPREFIX}/usr
+
+src_prepare() {
+ sed -i \
+ -e "/\$opts->{optimize} = '-O2 -g';/d" \
+ -e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
+ inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
+ perl-module_src_prepare
+}
diff --git a/dev-perl/Net-Subnet/files/1.03-pod-spelling.patch b/dev-perl/Net-Subnet/files/1.30.0-pod-spelling.patch
similarity index 100%
rename from dev-perl/Net-Subnet/files/1.03-pod-spelling.patch
rename to dev-perl/Net-Subnet/files/1.30.0-pod-spelling.patch
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 9ca4243ef0df..7fb1f7a20d9e 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1 +1 @@
-DIST cinnamon-control-center-2.2.9.tar.gz 4852457 SHA256 76b32187298f4d934ded2a2a898c371e7644fe9f3142b41bf9acf39d11436491 SHA512 9cda51d9b196e41ed4e4aaf6c86b13378c050cc00dea32d892978929f44945d1a244551e1ac0e94485394a8839e29d6398a6b0d6effe568235b557cd05c3a9a8 WHIRLPOOL 4cb6272fe390cb4da7bedfcc0912b5c2b5104d80dc5d9fc1d9463141f7e494793e450b46567e04a105280b1dbe2aad8eb537bfcf9307eb9f9f75777bb24fa34d
+DIST cinnamon-control-center-2.2.10.tar.gz 4855304 SHA256 5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef SHA512 9fc9bd3dbaa2cc53adb2b66e3a36a94f0095892deb067579492eeae31b1a9878356025f5a78d1a5e9d325b2a79550dbbe29a8162eeb880aabffd5d6c71ae5919 WHIRLPOOL 5045ea10602c64c0a4798aa9762eeaa2be6a360ddeb401999676ee4deb929a72f744d5198363ef3e27251ca6277f470d6114d6542dedc332603d7a89b9b8d05e
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild
similarity index 97%
rename from gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild
rename to gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild
index c50877a57458..729eda6894ba 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.9.ebuild,v 1.1 2014/06/01 08:13:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.10.ebuild,v 1.1 2014/07/15 10:29:48 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 84c0d0dafb7c..37d7a9127ae3 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,2 +1 @@
-DIST cinnamon-desktop-2.2.1.tar.gz 555757 SHA256 241b9649b6152a8437fe6f6d2174a1a1d2bb790b1087c557273f36a7aed357a1 SHA512 c7b837a860c06cdfa545cacba3f328c40b1d8b22b6dd691e3f12f3923f1b4dadebf54b0ab8f4c60ee3c699a04aae2028df14d077d2f4433aab867c4e604c0f1c WHIRLPOOL db1b6163da5ad7baf8588dd217fc4e69ac31a17964623dd44bd73202e644fed9c8d62828c647bf7c3f5f9149d43b228ba0373ca02539672fe4b0892be231cafc
-DIST cinnamon-desktop-2.2.2.tar.gz 555757 SHA256 2680cc35b89e4e89bc78cbd11310a0efb1e6b42be628238585ddf8b121480db3 SHA512 98f5ec937167fb0335c57ba715edfec2f60093cb4a6f649cc54800ef37a107eb9da915c5e8211a8900341be79b6662e20d231a11fa11b7021a69d12823a307b9 WHIRLPOOL fd1dd72ad9da5d09aecffa2249229964097a7729e30352aa9b229e773c7db5c5887b8c155592d5fc776e479dc74fde1d6d59ebf1fe59f961f9f61f8520696661
+DIST cinnamon-desktop-2.2.3.tar.gz 555916 SHA256 0950bdee8671e4693bfd375f01a25fb8ef5d38d246338600083cd181400619d8 SHA512 61d7e44cbb3f973613a88596eb937d8edd77e4ada210ba6c859b5381b4921b4dae67703a90cbba89f477b85d0ebf6da01093a93d29165797c67afc59c0f2c6a1 WHIRLPOOL 82734f617b6cc0a641371f6aa163a8215dfaec40e7ab2831b203a1ac67688a489f970667c32fad3909b7e4b5074adc2e8da210a84309730b3502df2bb3d1ef14
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.2.ebuild
deleted file mode 100644
index da5a8689b143..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.2.ebuild,v 1.1 2014/05/16 01:57:47 tetromino Exp $
-
-EAPI="5"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.32:2
- >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[introspection?]
- >=x11-libs/libXext-1.1
- >=x11-libs/libXrandr-1.3
- x11-libs/cairo:=[X]
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=gnome-base/gsettings-desktop-schemas-3.5.91
- introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.40.6
- x11-proto/randrproto
- x11-proto/xproto
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch_user
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
-
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.3.ebuild
similarity index 93%
rename from gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.1.ebuild
rename to gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.3.ebuild
index d34a4fabf3a3..9a3660f20516 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.3.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.1.ebuild,v 1.1 2014/05/06 03:07:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.2.3.ebuild,v 1.1 2014/07/15 10:33:19 pacho Exp $
EAPI="5"
+GCONF_DEBUG="no"
inherit autotools eutils gnome2
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 41fc70efe3fd..44517e157fb3 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1 +1 @@
-DIST cinnamon-screensaver-2.2.3.tar.gz 141638 SHA256 0893bb4a78dbe0647ffacd38c685da0cbe9d1274cbd40ec063a1615a6b1bf5c8 SHA512 4b008704f7e2487f38b1acae08c55b967ea12c334b6ea82b2e94a6e2c6fc9fb60f1afc1a433d2764ae09b0d09b0411367df7344d965763dfcd4eef2cde2c4aa0 WHIRLPOOL fc38c70aba9946bcbc1e77959842afc38f7c02eaa891037b559d75ab2d61fe76e29bb80c28ba8c005136eee353d9c735f37019e4355dc1642a4c555474da3b14
+DIST cinnamon-screensaver-2.2.4.tar.gz 141772 SHA256 5fed9a7504856dc362390e3f020b5faa5b4e9a2b4dd09b0e87c04ee18bd40bfa SHA512 b9ed0fa3f660cc6697682f510375bb68eb59517a0d91801f6e047380a9e452747633c1eed3a1b3f82b941e6a890c80206b1a7caf01bb84458c030cfb6441f921 WHIRLPOOL 8bdea21732b9bdbd12aa0ffe4723b54d359ed8a61b8a163532f7045d4effc99a341664be79764e7e15160cb27c87abedcaf7f9869d418c16bb8e6d7058f66990
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild
similarity index 96%
rename from gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild
rename to gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild
index 22cab03573e6..5c62c26c8cbc 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.3 2014/07/01 08:46:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.4.ebuild,v 1.1 2014/07/15 10:34:59 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 2c89eb2e34d2..8e9e74ca38fd 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1 +1 @@
-DIST cinnamon-session-2.2.1.tar.gz 902111 SHA256 357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e SHA512 4cb7e061462287995b94e238e760f420d0c25a2fd0dfe3b9a6a4489174ea7288122b69b8b7c0d4ea3244bc83240d3a57826f8ab30144d2ff36460f59fb32432a WHIRLPOOL cf9c0229d213798dedf6638640c24d5f7e3fa9bffce5d0beb892725f803be6547c22416a75f37e10a8673a509525e041831bcf191c7f5d7244fc8080bf2a1293
+DIST cinnamon-session-2.2.2.tar.gz 902668 SHA256 16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288 SHA512 6d3e506d1276ce4fe9b4ea8ff09130137c8c36a3328a90bbde84cde3f18d3e9e507b5dc4f81c67b3a170b87aa28a1386da5da6b12acc57796e01f4509735d98e WHIRLPOOL 042717131e0dd6a2dec8b6e5c1a6fe32f00d1e4208d537f6b75dd9ee1f1f1c8922636fa98d43ab7c32c5bb585dc2be646b573f0c65c5c70d3951a221bbc6bda6
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.2.2.ebuild
similarity index 91%
rename from gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild
rename to gnome-extra/cinnamon-session/cinnamon-session-2.2.2.ebuild
index e40f3fee76f7..7631063eaf0e 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.2.2.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/cinnamon-session-2.2.1.ebuild,v 1.3 2014/06/26 02:40:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-session/cinnamon-session-2.2.2.ebuild,v 1.1 2014/07/15 10:37:49 pacho Exp $
EAPI="5"
+GCONF_DEBUG="no"
inherit autotools eutils gnome2
@@ -63,8 +64,6 @@ src_configure() {
DOCS="AUTHORS README README.md"
gnome2_src_configure \
- --disable-deprecation-flags \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
--disable-static \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 9dd5d4446533..5a76cd7555ad 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1 +1 @@
-DIST cinnamon-settings-daemon-2.2.3.tar.gz 2994112 SHA256 c8776481e9b544662edb7c340805030d1331d70381c1a1b65db681f03e47be0e SHA512 25dc1b37274774b76d27858fed4ce2d641f2c240f67faad0c64609bfeae152e082c2223ad8e3f9c73914cfc42a61455423e3746c507ddf23b5a4d784eb43ccb8 WHIRLPOOL 734f75878de529160ff35681e80d7f5c4043171b0d4735acef686682300652432354943c81cc03d138328cb8ed1e979ad688101ddda816a0657961e3072c3fc6
+DIST cinnamon-settings-daemon-2.2.4.tar.gz 2995813 SHA256 5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414 SHA512 442314bc685397a13772e5768067083e1188ab2a85a33d5ef5c670b234445508cf5454e0ffbd43065d78e5d32b9c30eda067689b9d0a146507741accf74805ec WHIRLPOOL 54ded63f6c67bf7f44805c453202f11391f539da24bbf89418a84579ffe2d89581605fbefa22ae0ac9e3c8d2c2c27527b602e3b4cbbe2e4dc8918866796c70e3
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.4.ebuild
similarity index 95%
rename from gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
rename to gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.4.ebuild
index 461a3a4a8f92..c0766fca5f34 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.4.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.3.ebuild,v 1.2 2014/05/31 22:27:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.2.4.ebuild,v 1.1 2014/07/15 10:41:33 pacho Exp $
EAPI="5"
+GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
inherit autotools eutils gnome2
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 5271349719b1..8cc384219625 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1 +1 @@
-DIST cinnamon-translations-2.2.2.tar.gz 10030363 SHA256 f1889d9cdee8186897724cf6c36c54a3b4d300a1866fe08970896acade5e5ef7 SHA512 38a93dc5f9bb9349b69972d37eb3d17672f3d67a7e7224bb9fbe02e6902f80f0339b7694f3f94f8cd86889233721b47fb31f3e3bea61559ec31c9dd6c1541903 WHIRLPOOL c31a661db2e4ba8aac8c3ec32e511437169025310b859738eb5fd0ddb803c2edc35e733ea5e6c76ddd49d0da28832e099756be6ed50fee6084bfbe84f6dc4c97
+DIST cinnamon-translations-2.2.3.tar.gz 10140660 SHA256 6fe8d79d98ff57c1c9f9d253ec6a7907e5b0bec6f022fe5fc346e71753c26992 SHA512 d19e82d071dd6abe97719b1a741f9b69d0dfd0a8313656af52ce6b06ead49c4105d8e0aa4199b517dc19c0f16d7d75e9dfd6dab07af48ca9d21842634100574e WHIRLPOOL 776587f6c2cca121280614ee84682104d8c1a83820a07f0ea17aad8c75ab4a0c5d20c5f1b44e41fc7b25ad48202356647fb1eafd2e39093196f5b980030f82e3
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild
similarity index 94%
rename from gnome-extra/cinnamon-translations/cinnamon-translations-2.2.2.ebuild
rename to gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild
index b601a27bfd67..aea414415376 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.2.ebuild,v 1.1 2014/05/16 01:32:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild,v 1.1 2014/07/15 10:45:20 pacho Exp $
EAPI=5
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index b052801465b4..eef0100c7875 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,4 +1,3 @@
DIST cinnamon-1.8.8.1.tar.gz 4347516 SHA256 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb SHA512 a709781b4e6cecfe97f6fb4bad4b953f6c11ec49ebacabbfcc186e57a2e6a28abebc163d7081248d6cbac24996732a4aea7e5d54991e6c09b9701b7e64a91a0f WHIRLPOOL 49533ec7c6c40aae5e76377a67efa88f16a7ae2a6b2c3b3ab9316cb61d40fbca544f00f402e2a75b54bd90537f0813dfb5ba4d3a17a2ad3ce5d7e67e88a6c543
-DIST cinnamon-2.2.13.tar.gz 2656518 SHA256 123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a SHA512 c35e49476483dc4dd751252501cae80ae93e4a95b074363f3f67ed2d45c5e38e7916fe713767f4a38675c43e8fc432108ab262d89e0da1460ed4edfcdd5a6049 WHIRLPOOL bc344733914c03688ab0875a1fdc313967a7900f5a6952d57f3508dae77aeff02c77fad76b6a35ef24b11e8d1a7a386a9accfba2c9d9936a079c9b1c8ecffac8
-DIST cinnamon-2.2.9.tar.gz 2655818 SHA256 26b42a99a59d334b485565421a8eb52e8346ab908a0e235902f089d5f6efa8af SHA512 f0499232698bee548b83cd7482c7bfca3ea21328e68d84e19feef73bd8cf62627cff84ae1aa5fa76f0523d8a14b254b3029323415391eaf6d971cb0dc83b1beb WHIRLPOOL 5cca19150cb9a2fc9f7fcac521cbd81cc6b56cee01d74c7eaad2633494c512630463deb2e703ce55b5b01948ecafff8916a6da0443b5d761cc6047ce0d911402
+DIST cinnamon-2.2.14.tar.gz 2656809 SHA256 ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9 SHA512 fab14dd7ba7ec0ed0ae8e9eb57befdd9d85239dc0215900192475fb7b256bb7c54df068ccedaa01c97651ce97f6bb2837bf1b2f56189d34eaf5a1d5f2ffad227 WHIRLPOOL 4f19e3bd44fcb63d650d3a8c8748605f55e5e3c8a1796bb88968addcefd277d9572a8192aead9c5e3ceae7f1132ad6d060e56060e6780dc836312f7281c0f655
DIST gnome-3.8.patch 138356 SHA256 840cebcefc183076f9e9208421354e5e9cbccec62824c788b17cb564c2d2519a SHA512 1fd95720a6398607330ff445bd55f1f898dac03dda542d7a7246f81127e55793b02a4df4cc8c759a5f6c11dd7e5a6609bf0bfc05266a87e65034eab0f94077f2 WHIRLPOOL 84899979f7a4c1c6f7cb4f3d356e45e3b49f798605e48c768c3f43a90b828b3f1e9051e9e176bc099c9051d8fb4107e7d127cef27dc4797189b7c9479edf9bd5
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild
similarity index 99%
rename from gnome-extra/cinnamon/cinnamon-2.2.13.ebuild
rename to gnome-extra/cinnamon/cinnamon-2.2.14.ebuild
index 8592b2725da5..d4209e9206d9 100644
--- a/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.13.ebuild,v 1.2 2014/06/07 17:38:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.14.ebuild,v 1.1 2014/07/15 10:26:23 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
deleted file mode 100644
index 2638426dd682..000000000000
--- a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.4 2014/06/07 17:38:04 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
- http://dev.gentoo.org/~pacho/gnome/cinnamon-1.8/gnome-3.8.patch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+bluetooth +l10n +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
- app-misc/ca-certificates
- dev-libs/dbus-glib
- >=dev-libs/glib-2.29.10:2
- >=dev-libs/gobject-introspection-0.10.1
- >=dev-libs/json-glib-0.13.2
- >=dev-libs/libcroco-0.6.2:0.6
- dev-libs/libxml2:2
- gnome-base/gconf:2[introspection]
- gnome-base/librsvg
- >=gnome-extra/cinnamon-desktop-1.0:0=[introspection]
- gnome-extra/cinnamon-menus[introspection]
- >=gnome-extra/cjs-1.9.0
- >=media-libs/clutter-1.7.5:1.0[introspection]
- media-libs/cogl:1.0=[introspection]
- >=gnome-base/gsettings-desktop-schemas-2.91.91
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-libs/libcanberra
- media-sound/pulseaudio:0=[glib]
- net-libs/libsoup:2.4[introspection]
- >=sys-auth/polkit-0.100[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.0.0:3[introspection]
- x11-libs/pango[introspection]
- >=x11-libs/startup-notification-0.11
- x11-libs/libX11
- >=x11-libs/libXfixes-5.0
- >=x11-wm/muffin-1.9.1[introspection]
- ${PYTHON_DEPS}
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
- networkmanager? (
- gnome-base/libgnome-keyring
- >=net-misc/networkmanager-0.8.999[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-# user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-# note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/dconf-0.4.1
- >=gnome-base/libgnomekbd-2.91.4[introspection]
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
- gnome-extra/cinnamon-session
-
- gnome-extra/cinnamon-settings-daemon
-
- >=sys-apps/accountsservice-0.6.14[introspection]
-
- >=app-accessibility/caribou-0.3
-
- x11-libs/gksu
- x11-misc/xdg-utils
-
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/gconf-python:2
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pypam[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
-
- x11-themes/gnome-themes-standard[gtk]
- x11-themes/gnome-icon-theme-symbolic
-
- gnome-extra/nemo
- gnome-extra/cinnamon-control-center
- gnome-extra/cinnamon-screensaver
-
- bluetooth? ( net-wireless/cinnamon-bluetooth )
- l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
- networkmanager? (
- gnome-extra/nm-applet
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
-"
-
-DEPEND="${COMMON_DEPEND}
- dev-python/polib[${PYTHON_USEDEP}]
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- >=dev-util/intltool-0.40
- gnome-base/gnome-common
- !!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix GNOME 3.8 support
- epatch "${FILESDIR}/background.patch"
-
- # Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch"
-
- # Optional NetworkManager, bug #488684
- epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch"
-
- # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
- sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
- -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
- -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
- -i files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py \
- -i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
- -i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
- -i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \
- -i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \
- -i files/usr/lib/cinnamon-settings/bin/*.py \
- -i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \
- -i files/usr/lib/cinnamon-menu-editor/cme/*.py \
- -i files/usr/bin/* || die "sed failed"
- if [[ "$(get_libdir)" != lib ]]; then
- mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
- fi
-
- if ! use networkmanager; then
- rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
- fi
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # Don't error out on warnings
- gnome2_src_configure \
- --disable-jhbuild-wrapper-script \
- $(use_with bluetooth) \
- $(use_enable networkmanager) \
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
- gnome2_src_install
- python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users}
- # Fix broken shebangs
- sed -e "s%#!.*python%#!${PYTHON}%" \
- -i "${ED}usr/bin/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users} \
- -i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
-
- # Required for gnome-shell on hardened/PaX, bug #398941
- pax-mark mr "${ED}usr/bin/cinnamon"
-
- # Doesn't exist on Gentoo, causing this to be a dead symlink
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of Cinnamon's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "org.cinnamon.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version ">=x11-base/xorg-server-1.11"; then
- ewarn "If you use multiple screens, it is highly recommended that you"
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
- ewarn "pointer barriers which will make it easier to use hot corners."
- fi
-
- if has_version "=gnome-base/gnome-common-2.12
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
+
+ gnome2_src_configure \
+ $(use_enable libnotify) \
+ $(use_enable webkit webkitgtk) \
+ PERL=$(type -P false) \
+ ITSTOOL=$(type -P true)
+}
+
+src_install() {
+ gnome2_src_install
+ rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 5d1cb0f544a9..957a457752db 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,2 +1,3 @@
DIST simple-scan-3.10.2.tar.xz 462416 SHA256 a98a580ee9df3b9eacb936a661c7166f91177d2fd5659e45292e622ad75286f0 SHA512 0ffc32a4cf80c41ed7fb61525ed01e49091dfccfe22e65b267aa2db947d86af17ecebcc48dc152c186cb472e5e0ee51609bd1b11fb134b149c961b5e8175ae88 WHIRLPOOL 1ccd1b8ec0144aa916984d9f7f8a10057c1ec261bc8934dc3f431e7ac61177aa67c12ac7095d8a5d622356d446dc0933c27e54958657180cfa43225a163ffe86
DIST simple-scan-3.12.0.tar.xz 474044 SHA256 a88719f6142ddfa24d154d1093c67b27ac491c059ac5c87cba3b36ebc04b21a6 SHA512 2025a8b21c8e8d276d6c9ba98e4033669ccef55b483a3a0da6f98b8bcd51438b19c4f79f2bc4d1fac2092e5b3649185a80d9f921ae52ce62ac13299d0128867e WHIRLPOOL 48418474d550588807a3fab66461401c39066020247a3b834c4df8faf0589ba75cff4d28437ddf02e1b9126d75d9ad2843431be5dfb6f85587d2b3814f3233cb
+DIST simple-scan-3.12.1.tar.xz 474476 SHA256 fbef2cd91408e0ead7649fcf39eb2af125bbd904869ad7d3694c63a38b999fe8 SHA512 e1215829364b2eb6a8a9cfebcd75ad0ff7a10d7263c1c876c425f31666ffabbc6c3cc2d036fb88af5245a8f4059bd992438a5f565a3cd65f4f9c963fd8c0d2da WHIRLPOOL 9d7faf92b5467352d0eb369f61df8cf48470ad9c248e4004294b5c0ceabf75a88892d16ec516d2352c4686f2edd24bbbbe846d638e599f6a6672e94a62b35df3
diff --git a/media-gfx/simple-scan/simple-scan-3.12.1.ebuild b/media-gfx/simple-scan/simple-scan-3.12.1.ebuild
new file mode 100644
index 000000000000..0609bb18b051
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.12.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/simple-scan/simple-scan-3.12.1.ebuild,v 1.1 2014/07/15 11:03:28 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://launchpad.net/simple-scan"
+
+MY_PV=$(get_version_component_range 1-2)
+SRC_URI="http://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=media-gfx/sane-backends-1.0.20:=
+ >=sys-libs/zlib-1.2.3.1:=
+ virtual/jpeg:0=
+ virtual/udev:=[gudev]
+ x11-libs/cairo:=
+ >=x11-libs/gtk+-3:3
+ || (
+ >=x11-misc/colord-0.1.24:=[udev]
+ x11-misc/colord:=[scanner] )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/xdg-utils
+ x11-themes/gnome-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+"
+
+src_configure() {
+ DOCS="NEWS README.md"
+ gnome2_src_configure \
+ VALAC=$(type -P true) \
+ ITSTOOL=$(type -P true)
+}
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 833b95b78636..74833045dfcd 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild,v 1.5 2014/06/14 09:36:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild,v 1.6 2014/07/15 11:34:29 nimiux Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE="mmx"
RDEPEND="sys-libs/zlib
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index afbd74ece85b..e3d139be7bcb 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,2 +1,2 @@
-DIST libsamplerate-0.1.7.tar.gz 4340634 SHA256 e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c
+DIST libsamplerate-0.1.7.tar.gz 4340634 SHA256 e0a646224a0323ac63f56ef009b2d7fee11452a7b8af139b19ae71d2890dbc9c SHA512 462cf7339fe9907fa3bec49df4fb7edf722bd82dce70c96a61b4ed3837a9b0691ab13dc8c7b98696223d53791cba3642b7fc584923b3dc37e7be83f1159ac074 WHIRLPOOL 05972f82e84c77e16755f2f5b09b4deed240ad4ece4fb8afb0d15ac24e0c1f643c043e181fff7d2c2020689aaa683a5775bda264fa03e8bb604429efa3a9e956
DIST libsamplerate-0.1.8.tar.gz 4303330 SHA256 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 SHA512 85d93df24d9d62e7803a5d0ac5d268b2085214adcb160e32fac316b12ee8a0ce36ccfb433a3c0a08f6e3ec418a5962bdb84f8a11262286a9b347436983029a7d WHIRLPOOL 5aff2290372570178752fedb5cafe1cb8d30cd8aa0910f8f7a2333d41746ac7a88e5cc7f7228eb8ba60aa2908fad0242214ac3e29346db04cc1e9cc66386eddf
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild
index 2eb0078e762d..7dbd14cb8ae8 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild,v 1.2 2013/07/29 22:19:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.8-r1.ebuild,v 1.3 2014/07/15 11:17:48 zlogene Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="sndfile static-libs"
RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 33cc70a3b0b7..ae2f433ee8fe 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1 +1,2 @@
DIST subtitleeditor-0.41.0.tar.gz 1637527 SHA256 30e7fc29e8a6e714f6b0eedf80b2b387099957b9d70093fa0032fd5528b14e62 SHA512 fd2c0150754a4ba0ed5ad4b6f1460d78e9bf9c0593de5ec6c565ed5bec605ada6a5203aaa9b31a4dc5c99a97e863718c8c0458e8bfaea17dc0b045b410dcca22 WHIRLPOOL fd0160fe61eb1c46077ec651dece4376f2c502be53505190efa1375e579d741926e41c8baba2f3c7f5406a1af87b718a716faa6c5c3e31f025cada3498e53095
+DIST subtitleeditor-0.41.1.tar.gz 1637940 SHA256 3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0 SHA512 6e87df6bf1b97fc085387f331fa415be48086b9dabf445e6050ff3ab3c812c8fff72e613959308f07c2e849bf95064c5d288f44dbc266997e7143bbb46615c9d WHIRLPOOL 111163dde1cf17df34e0dfb0aeeb874a98095d6d338ca22138ff13747697d78a2d1be127f344c36286b79f828918ab1c615bccc7e04cc8586b12efe407c76f52
diff --git a/media-video/subtitleeditor/subtitleeditor-0.41.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.41.1.ebuild
similarity index 75%
rename from media-video/subtitleeditor/subtitleeditor-0.41.0.ebuild
rename to media-video/subtitleeditor/subtitleeditor-0.41.1.ebuild
index b35e5656a6f2..d8b26630aebf 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.41.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.0.ebuild,v 1.3 2013/12/08 19:17:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.41.1.ebuild,v 1.1 2014/07/15 11:10:48 pacho Exp $
EAPI=5
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug nls opengl"
RDEPEND="
@@ -37,6 +37,16 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+src_prepare() {
+ # Get textoverlay working with gstreamermm 0.10.11
+ epatch "${FILESDIR}/${PN}-0.41.0-textoverlay.patch"
+
+ # Prevent crash when generating keyframes with gstreamermm 0.10.11
+ epatch "${FILESDIR}/${PN}-0.41.0-keyframe-generation.patch"
+
+ gnome2_src_prepare
+}
+
src_configure() {
export GST_REGISTRY="${T}/home/registry.cache.xml"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dc8d41d64738..1d752e5b93d1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 06:38:53 +0000
+Tue, 15 Jul 2014 12:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dc8d41d64738..1d752e5b93d1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 06:38:53 +0000
+Tue, 15 Jul 2014 12:07:02 +0000
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.6 b/metadata/md5-cache/app-crypt/trousers-0.3.6
deleted file mode 100644
index 480023e7ab86..000000000000
--- a/metadata/md5-cache/app-crypt/trousers-0.3.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 selinux? ( sec-policy/selinux-tcsd ) virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
-EAPI=3
-HOMEPAGE=http://trousers.sf.net
-IUSE=doc selinux
-KEYWORDS=amd64 arm x86
-LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 selinux? ( sec-policy/selinux-tcsd )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/trousers-0.3.6.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cd2ced001884c999af0409c153b58c1a
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.6-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.6-r1
deleted file mode 100644
index 751e63375bda..000000000000
--- a/metadata/md5-cache/app-crypt/trousers-0.3.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 selinux? ( sec-policy/selinux-tcsd ) virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
-DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
-EAPI=3
-HOMEPAGE=http://trousers.sf.net
-IUSE=doc selinux
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7:0 selinux? ( sec-policy/selinux-tcsd )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/trousers-0.3.6.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 linux-info 2b8c53f6065bdee2d757472215a3088f multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 udev 8cd692457c1524c7be9af69831698a78 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a1d8c9edab0a6fe8a84bfeac6d844554
diff --git a/metadata/md5-cache/app-emacs/org-mode-8.2.6 b/metadata/md5-cache/app-emacs/org-mode-8.2.6
index 2bbc21eb45e7..d627288cdf13 100644
--- a/metadata/md5-cache/app-emacs/org-mode-8.2.6
+++ b/metadata/md5-cache/app-emacs/org-mode-8.2.6
@@ -4,11 +4,11 @@ DESCRIPTION=An Emacs mode for notes and project planning
EAPI=5
HOMEPAGE=http://www.orgmode.org/
IUSE=contrib doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
LICENSE=GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )
RDEPEND=>=virtual/emacs-23
RESTRICT=test
SLOT=0
SRC_URI=http://orgmode.org/org-8.2.6.tar.gz
_eclasses_=elisp b7ff113c97bf466ace6f3235f80af600 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=a22bae4fb4f574845211e61115374b79
+_md5_=8849af5ba2bdc278806e6fedea52d32f
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.1 b/metadata/md5-cache/app-misc/vifm-0.7.1
index 2e42414cadf5..d6502ce5d508 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.1
+++ b/metadata/md5-cache/app-misc/vifm-0.7.1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) vim-plugin? ( >=app-e
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.1.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=6dd91bba56e0c6b7adb59830d50eeb9d
+_md5_=405475d1e2c8a97d4483a27ac435befd
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.2 b/metadata/md5-cache/app-misc/vifm-0.7.2
index 11c9d7e96c50..76f4c8a406e0 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.2
+++ b/metadata/md5-cache/app-misc/vifm-0.7.2
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) vim-plugin? ( >=app-e
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.2.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=f49c5d38a9622f49280e92babf06debb
+_md5_=ab86e24b31b6c1d0307091c79d644167
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.4b-r1 b/metadata/md5-cache/app-misc/vifm-0.7.4b-r1
index ce934dee8ae0..88663a06e503 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.4b-r1
+++ b/metadata/md5-cache/app-misc/vifm-0.7.4b-r1
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.4b.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vim-doc 1c18baeec98cec3287524cbf2fee2bd2
-_md5_=d1b51fd5df5b016fa95f56afc2ca568d
+_md5_=4d8babeddf9f061daa8c236dadfb4010
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.5 b/metadata/md5-cache/app-misc/vifm-0.7.5
index 783a63f3a3bf..9d00c207cfab 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.5
+++ b/metadata/md5-cache/app-misc/vifm-0.7.5
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.5.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vim-doc 1c18baeec98cec3287524cbf2fee2bd2
-_md5_=12c5096cec49a0404c736957648b9eb1
+_md5_=3e416020b974025ff1775bb02df6e37f
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.6 b/metadata/md5-cache/app-misc/vifm-0.7.6
index 5547d2d5f9da..64c7adbe1812 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.6
+++ b/metadata/md5-cache/app-misc/vifm-0.7.6
@@ -4,10 +4,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
EAPI=5
HOMEPAGE=http://vifm.sourceforge.net/
IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=~amd64 ppc ~s390 ~x86
+KEYWORDS=amd64 ppc ~s390 ~x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.6.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vim-doc 1c18baeec98cec3287524cbf2fee2bd2
-_md5_=8c8c38d9158b51fd3c82fc8653bc9394
+_md5_=72d6f258f104c47a182368f1c8bc342c
diff --git a/metadata/md5-cache/app-misc/vifm-0.7.7 b/metadata/md5-cache/app-misc/vifm-0.7.7
index 4e4466ba25b4..16fbbee6d6be 100644
--- a/metadata/md5-cache/app-misc/vifm-0.7.7
+++ b/metadata/md5-cache/app-misc/vifm-0.7.7
@@ -4,10 +4,10 @@ DESCRIPTION=Console file manager with vi(m)-like keybindings
EAPI=5
HOMEPAGE=http://vifm.sourceforge.net/
IUSE=X developer +extended-keys gtk +magic vim vim-syntax
-KEYWORDS=amd64 ~ppc ~s390 ~x86
+KEYWORDS=~amd64 ~ppc ~s390 ~x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
SLOT=0
SRC_URI=mirror://sourceforge/vifm/vifm-0.7.7.tar.bz2
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 vim-doc 1c18baeec98cec3287524cbf2fee2bd2
-_md5_=9652deededc5a85d0d37e659fb1b77ba
+_md5_=f82395f4dd2517cf850174bbfebf4271
diff --git a/metadata/md5-cache/app-misc/workrave-1.10.1 b/metadata/md5-cache/app-misc/workrave-1.10.1
new file mode 100644
index 000000000000..61e13de0bd91
--- /dev/null
+++ b/metadata/md5-cache/app-misc/workrave-1.10.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3 >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 dbus? ( >=sys-apps/dbus-1.2 dev-libs/dbus-glib ) distribution? ( >=net-libs/gnet-2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu >=dev-util/intltool-0.40.0 x11-proto/xproto x11-proto/inputproto x11-proto/recordproto dev-python/cheetah virtual/pkgconfig doc? ( app-text/docbook-sgml-utils app-text/xmlto ) nls? ( >=sys-devel/gettext-0.17 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
+EAPI=5
+HOMEPAGE=http://www.workrave.org/
+IUSE=dbus doc distribution gstreamer nls pulseaudio test debug python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3 >=dev-cpp/gtkmm-3.0.0:3.0 >=dev-cpp/glibmm-2.28.0:2 >=dev-libs/libsigc++-2.2.4.2:2 dbus? ( >=sys-apps/dbus-1.2 dev-libs/dbus-glib ) distribution? ( >=net-libs/gnet-2 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) x11-libs/libXScrnSaver x11-libs/libSM x11-libs/libX11 x11-libs/libXtst x11-libs/libXt x11-libs/libXmu
+SLOT=0
+SRC_URI=mirror://sourceforge/workrave/workrave-1.10.1.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b4a03597c3d1dde35edd1154adf03e77
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5 b/metadata/md5-cache/app-pda/pilot-link-0.12.5
deleted file mode 100644
index 6ad6d99f7089..000000000000
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=dev-lang/perl-5.16 =dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=suite of tools for moving data between a Palm device and a desktop
-EAPI=3
-HOMEPAGE=http://www.pilot-link.org/
-IUSE=bluetooth debug java perl png python readline static-libs threads usb elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=dev-lang/perl-5.16 =dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 distutils 34e0f373c466bb0e97ba194735f1acf2 eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a2bcf77a0c014390ff0fbfff0669bd49
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
index 975be6a9a8d7..514c994865cb 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=suite of tools for moving data between a Palm device and a desktop
EAPI=5
HOMEPAGE=http://www.pilot-link.org/
IUSE=bluetooth debug java perl png python readline static-libs threads usb python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 LGPL-2 )
RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7 virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)] java? ( >=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 distutils-r1 d48d51c220f1678179fc4ab13b534ec1 eutils 06133990e861be0fe60c2b428fd025d9 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a python-r1 c820706d8b22c1d0fe215a9d4a47671d python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1b6f35e62c9fa33317dec7d0d8a93837
+_md5_=537db368efc2150baaf6d7e51a16a631
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.21 b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
new file mode 100644
index 000000000000..24484d2c4182
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 dev-java/netty-common:0 test? ( dev-java/ant-core:0 dev-java/easymock:3.2 dev-java/hamcrest-library:1.3 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
+EAPI=5
+HOMEPAGE=http://netty.io/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/netty-common:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=21f0e27f9496437c25ea7bdc0eaa1f85
diff --git a/metadata/md5-cache/dev-java/netty-codec-4.0.21 b/metadata/md5-cache/dev-java/netty-codec-4.0.21
new file mode 100644
index 000000000000..5e13b53e4eeb
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-codec-4.0.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-java/netty-transport:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-libs/protobuf[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
+EAPI=5
+HOMEPAGE=http://netty.io/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 dev-java/netty-transport:0 dev-java/jboss-marshalling:0 dev-java/jzlib:1.1.3 dev-libs/protobuf[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d14f05783a0e459e6052f60e8e0819de
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.19 b/metadata/md5-cache/dev-java/netty-common-4.0.19
index 50d1002205b2..0b3d64a29afa 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.19
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.19
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 test? ( dev-java/ant-core:0 dev-java/easymock:3.2 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
EAPI=5
HOMEPAGE=http://netty.io/
-IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/netty/netty/archive/netty-4.0.19.Final.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e7d418c2f11f2374576aa429812cb1a6
+_md5_=82c4eea75cefa2340f793403a39a20b8
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.21 b/metadata/md5-cache/dev-java/netty-common-4.0.21
new file mode 100644
index 000000000000..6dc4c229c7cc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
+EAPI=5
+HOMEPAGE=http://netty.io/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b35300b444f46f305f168aee6c62fe38
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.21 b/metadata/md5-cache/dev-java/netty-transport-4.0.21
new file mode 100644
index 000000000000..c8a18315c482
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Async event-driven framework for rapid development of high performance network applications
+EAPI=5
+HOMEPAGE=http://netty.io/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/netty-buffer:0 dev-java/netty-common:0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/netty/netty/archive/netty-4.0.21.Final.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=96ab9dc47f800eb8099e0234579999e9
diff --git a/metadata/md5-cache/dev-libs/btparser-0.25 b/metadata/md5-cache/dev-libs/btparser-0.25
new file mode 100644
index 000000000000..42e64d457410
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/btparser-0.25
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-libs/glib-2.21:2 !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Parser and analyzer for backtraces produced by gdb
+EAPI=5
+HOMEPAGE=https://fedorahosted.org/btparser/
+IUSE=static-libs python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=dev-libs/glib-2.21:2
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=https://fedorahosted.org/released/btparser/btparser-0.25.tar.xz
+_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3c75b8176ce7ddb75955673e9074cecf
diff --git a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2 b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
index 4aab37501782..ca766147985a 100644
--- a/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/md5-cache/dev-libs/dbxml-2.5.16-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) || ( >=dev-lang/perl-5.16 =dev-java/java-config-2.1.9-r1 )
+DEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build(-)] java? ( >=dev-java/java-config-2.1.9-r1 )
DESCRIPTION=BerkeleyDB XML, a native XML database from the BerkeleyDB team
-EAPI=3
+EAPI=5
HOMEPAGE=http://www.oracle.com/technetwork/database/berkeleydb/index-083851.html http://download.oracle.com/otndocs/products/berkeleydb/html/2.5.html
IUSE=doc examples java perl python tcl elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=Sleepycat Apache-1.1 BSD
-RDEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) || ( >=dev-lang/perl-5.16 =dev-java/java-config-2.1.9-r1 )
+RDEPEND=sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 =dev-libs/xqilla-2.2* sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build(-)] java? ( >=dev-java/java-config-2.1.9-r1 )
SLOT=0
SRC_URI=http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 distutils 34e0f373c466bb0e97ba194735f1acf2 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-app 4c2027b6530baeab97482b706149e640 perl-module a6a2d5c77bdaeba2794b167689cafb7a python be9965681d83c3980660a2660ac95e95 toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a6133ee3ca7811ed7d446d602ecac51b
+_md5_=889215df18f3e12cbae2c8532c9ab62f
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.650.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.650.0
new file mode 100644
index 000000000000..872ec2610b34
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.650.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/openssl dev-lang/perl:=[-build(-)]
+DESCRIPTION=Net::SSLeay module for perl
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=openssl
+RDEPEND=dev-libs/openssl dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.65.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
+_md5_=28699c08d74d66e0bacca6b3b002d8f9
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.2.13 b/metadata/md5-cache/gnome-extra/cinnamon-2.2.14
similarity index 97%
rename from metadata/md5-cache/gnome-extra/cinnamon-2.2.13
rename to metadata/md5-cache/gnome-extra/cinnamon-2.2.14
index c50f27fbc67a..5af3a9d6414f 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-2.2.13
+++ b/metadata/md5-cache/gnome-extra/cinnamon-2.2.14
@@ -9,6 +9,6 @@ LICENSE=GPL-2+
RDEPEND=app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2 >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-1.0:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-1.9.0 >=media-libs/clutter-1.7.5:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libcanberra media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-1.9.1[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) gnome-extra/cinnamon-session gnome-extra/cinnamon-settings-daemon >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-libs/gksu x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/gconf-python:2 dev-python/lxml[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pexpect[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic gnome-extra/nemo gnome-extra/cinnamon-control-center gnome-extra/cinnamon-screensaver l10n? ( >=gnome-extra/cinnamon-translations-2.2 ) networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
SLOT=0
-SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.2.13.tar.gz -> cinnamon-2.2.13.tar.gz
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.2.14.tar.gz -> cinnamon-2.2.14.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils 51ad5130f4a69b1a118ca5296de276ae python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3231fa61457623e1627fe16af976691e
+_md5_=f98483701cff392579155bb4edcbe78c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-2.2.9 b/metadata/md5-cache/gnome-extra/cinnamon-2.2.9
deleted file mode 100644
index 51d579b439f6..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-2.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2 >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-1.0:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-1.9.0 >=media-libs/clutter-1.7.5:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libcanberra media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-1.9.1[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) dev-python/polib[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=+bluetooth +l10n +networkmanager python_targets_python2_7 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.29.10:2 >=dev-libs/gobject-introspection-0.10.1 >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-1.0:0=[introspection] gnome-extra/cinnamon-menus[introspection] >=gnome-extra/cjs-1.9.0 >=media-libs/clutter-1.7.5:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libcanberra media-sound/pulseaudio:0=[glib] net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-1.9.1[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) gnome-extra/cinnamon-session gnome-extra/cinnamon-settings-daemon >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-libs/gksu x11-misc/xdg-utils dev-python/dbus-python[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/gconf-python:2 dev-python/lxml[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pexpect[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] virtual/python-imaging[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] x11-themes/gnome-themes-standard[gtk] x11-themes/gnome-icon-theme-symbolic gnome-extra/nemo gnome-extra/cinnamon-control-center gnome-extra/cinnamon-screensaver bluetooth? ( net-wireless/cinnamon-bluetooth ) l10n? ( >=gnome-extra/cinnamon-translations-2.2 ) networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
-REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/Cinnamon/archive/2.2.9.tar.gz -> cinnamon-2.2.9.tar.gz http://dev.gentoo.org/~pacho/gnome/cinnamon-1.8/gnome-3.8.patch
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils 51ad5130f4a69b1a118ca5296de276ae python-single-r1 a71a169a881e0a11d04a7fe12dc39f6e python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7d16411f7a3dfc3d5954e412c2fb0d1
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.9 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.10
similarity index 96%
rename from metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.9
rename to metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.10
index 8f3e2c9fcc12..c2bbcfe00d59 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.9
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-2.2.10
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-1.1[glib] net-misc/modemmanager >=net-misc/networkmanager-0.8.9[modemmanager] >=sys-auth/polkit-0.103 || ( >=sys-power/upower-0.9.1 sys-power/upower-pm-utils ) >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.8:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) socialweb? ( net-libs/libsocialweb ) || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) x11-themes/gnome-icon-theme-symbolic colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( >=app-admin/system-config-printer-gnome-1.3.5 net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.2.9.tar.gz -> cinnamon-control-center-2.2.9.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/2.2.10.tar.gz -> cinnamon-control-center-2.2.10.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f68b0f638fc7f2151978d3924dcae50a
+_md5_=718dd434ce1ef7117cc019f15371ec39
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.2
deleted file mode 100644
index b169855866d1..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 x11-proto/randrproto x11-proto/xproto virtual/pkgconfig !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A collection of libraries and utilites used by Cinnamon
-EAPI=5
-HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=+introspection debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
-SLOT=0/4
-SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/2.2.2.tar.gz -> cinnamon-desktop-2.2.2.tar.gz
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=48ac3614eefc4539e143047572e28a87
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.3
similarity index 94%
rename from metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.1
rename to metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.3
index e182a04de335..1d20ce72ebf7 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-2.2.3
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x
DESCRIPTION=A collection of libraries and utilites used by Cinnamon
EAPI=5
HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=+introspection debug
+IUSE=+introspection
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
SLOT=0/4
-SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/2.2.1.tar.gz -> cinnamon-desktop-2.2.1.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/2.2.3.tar.gz -> cinnamon-desktop-2.2.3.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e5898cc76366b6a3a875ab17ad20e7b5
+_md5_=9289394d6b7054124ba32fdfebf1c758
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.3 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.4
similarity index 95%
rename from metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.3
rename to metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.4
index 19db11c027f4..c03677510175 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-2.2.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=!~gnome-extra/cinnamon-1.8.8.1 !systemd? ( sys-auth/consolekit )
SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/2.2.3.tar.gz -> cinnamon-screensaver-2.2.3.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/2.2.4.tar.gz -> cinnamon-screensaver-2.2.4.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=55d57ed41a824accc925f81703b873a8
+_md5_=a9f5a5353642da8de3f866a7572bf933
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-2.2.1 b/metadata/md5-cache/gnome-extra/cinnamon-session-2.2.2
similarity index 94%
rename from metadata/md5-cache/gnome-extra/cinnamon-session-2.2.1
rename to metadata/md5-cache/gnome-extra/cinnamon-session-2.2.2
index 0e4cfedc7c08..8651ee08ebf0 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-2.2.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-2.2.2
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.1
DESCRIPTION=Cinnamon session manager
EAPI=5
HOMEPAGE=http://cinnamon.linuxmint.com/
-IUSE=doc gconf ipv6 systemd debug
+IUSE=doc gconf ipv6 systemd
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.32:2 >=dev-libs/json-glib-0.10 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.90.7:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl gconf? ( gnome-base/gconf:2 ) systemd? ( >=sys-apps/systemd-183 ) !systemd? ( || ( cinnamon-session-2.2.1.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/2.2.2.tar.gz -> cinnamon-session-2.2.2.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ab44ac3117eb48b32f9ca71efa5ec8d8
+_md5_=817734bb66c42386eb88b6f9ede682fe
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.3 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.4
similarity index 96%
rename from metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.3
rename to metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.4
index d3c828e83096..2c1bec4bf542 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-2.2.4
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-1.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] >=media-sound/pulseaudio-0.9.16:0= sys-apps/dbus >=sys-auth/polkit-0.97 || ( >=sys-power/upower-0.9.11 sys-power/upower-pm-utils ) x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.7.8:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/udev[gudev] colord? ( >=x11-misc/colord-0.1.9:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/consolekit:0= )
SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/2.2.3.tar.gz -> cinnamon-settings-daemon-2.2.3.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/2.2.4.tar.gz -> cinnamon-settings-daemon-2.2.4.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=102bbea1c8b28c1f0d9921bc65a07b87
+_md5_=6e18a0c552234f9220332db87186582a
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.2 b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.3
similarity index 95%
rename from metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.2
rename to metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.3
index 664b6e60db64..3e1884344ca2 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-2.2.3
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RESTRICT=test
SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/2.2.2.tar.gz -> cinnamon-translations-2.2.2.tar.gz
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/2.2.3.tar.gz -> cinnamon-translations-2.2.3.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 l10n 33bde4fb0cfd3a21a277b66bfd837e19 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=913ce108c6bbc2f5fce9273d8adad2ba
+_md5_=f9307fd4a2878ef472367ec075d09dfe
diff --git a/metadata/md5-cache/gnome-extra/cjs-2.2.0 b/metadata/md5-cache/gnome-extra/cjs-2.2.1
similarity index 93%
rename from metadata/md5-cache/gnome-extra/cjs-2.2.0
rename to metadata/md5-cache/gnome-extra/cjs-2.2.1
index 38fb998bf289..8dc0b62b44ee 100644
--- a/metadata/md5-cache/gnome-extra/cjs-2.2.0
+++ b/metadata/md5-cache/gnome-extra/cjs-2.2.1
@@ -9,6 +9,6 @@ LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
RDEPEND=>=dev-lang/spidermonkey-1.8.5:0 dev-libs/dbus-glib >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.32 sys-libs/ncurses sys-libs/readline:0 x11-libs/cairo[glib] virtual/libffi
RESTRICT=test
SLOT=0
-SRC_URI=https://github.com/linuxmint/cjs/archive/2.2.0.tar.gz -> cjs-2.2.0.tar.gz
+SRC_URI=https://github.com/linuxmint/cjs/archive/2.2.1.tar.gz -> cjs-2.2.1.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 pax-utils 51ad5130f4a69b1a118ca5296de276ae python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a9459143b9323acfa93b7f59b7ea07df
+_md5_=fc31ea1a87653796fc8aa767b91715d0
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.8.0 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.8.0
new file mode 100644
index 000000000000..e8fd1a5a2783
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-0.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
+EAPI=5
+HOMEPAGE=http://intgat.tigress.co.uk/rmy/extensions/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-admin/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.6 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=http://intgat.tigress.co.uk/rmy/extensions/gnome-shell-frippery-0.8.0.tgz
+_md5_=3d567e33d5aba0878fd1f7b19dd2594b
diff --git a/metadata/md5-cache/gnome-extra/nemo-2.2.1 b/metadata/md5-cache/gnome-extra/nemo-2.2.2
similarity index 95%
rename from metadata/md5-cache/gnome-extra/nemo-2.2.1
rename to metadata/md5-cache/gnome-extra/nemo-2.2.2
index 1d828d414c6b..478bb3075b8b 100644
--- a/metadata/md5-cache/gnome-extra/nemo-2.2.1
+++ b/metadata/md5-cache/gnome-extra/nemo-2.2.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2+ LGPL-2+ FDL-1.1
PDEPEND=>=gnome-base/gvfs-0.1.2
RDEPEND=>=dev-libs/glib-2.34:2 >=gnome-extra/cinnamon-desktop-1.0:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.3.17:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.1.0:= ) x11-themes/gnome-icon-theme-symbolic l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
SLOT=0
-SRC_URI=https://github.com/linuxmint/nemo/archive/2.2.1.tar.gz -> nemo-2.2.1.tar.gz
+SRC_URI=https://github.com/linuxmint/nemo/archive/2.2.2.tar.gz -> nemo-2.2.2.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=33bd148e7516728f8ca97a0e45fbdc58
+_md5_=75c8a6fe1759e24ea183de11eaeba538
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.12.1 b/metadata/md5-cache/gnome-extra/zenity-3.12.1
new file mode 100644
index 000000000000..d79e7d83afa0
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/zenity-3.12.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-1.4.0:3 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.14 virtual/pkgconfig test? ( app-text/yelp-tools ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+IUSE=libnotify test +webkit debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/zenity/3.12/zenity-3.12.1.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=dafedc0ebaa5d6b7a190addfb1bf9439
diff --git a/metadata/md5-cache/media-gfx/simple-scan-3.12.1 b/metadata/md5-cache/media-gfx/simple-scan-3.12.1
new file mode 100644
index 000000000000..07f7a7d549ea
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/simple-scan-3.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/udev:=[gudev] x11-libs/cairo:= >=x11-libs/gtk+-3:3 || ( >=x11-misc/colord-0.1.24:=[udev] x11-misc/colord:=[scanner] ) app-text/yelp-tools >=dev-util/intltool-0.35.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Simple document scanning utility
+EAPI=5
+HOMEPAGE=https://launchpad.net/simple-scan
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.32:2 >=media-gfx/sane-backends-1.0.20:= >=sys-libs/zlib-1.2.3.1:= virtual/jpeg:0= virtual/udev:=[gudev] x11-libs/cairo:= >=x11-libs/gtk+-3:3 || ( >=x11-misc/colord-0.1.24:=[udev] x11-misc/colord:=[scanner] ) x11-misc/xdg-utils x11-themes/gnome-icon-theme
+SLOT=0
+SRC_URI=http://launchpad.net/simple-scan/3.12/3.12.1/+download/simple-scan-3.12.1.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=9f832f838546572f30f9177597d9c7c9
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1 b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
index 30546883152d..035d40498ee2 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An mpeg library for linux
EAPI=5
HOMEPAGE=http://heroinewarrior.com/libmpeg3.php
IUSE=mmx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86
LICENSE=GPL-2
RDEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec
SLOT=0
SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.8-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=1e1d458dc5eda6621ebc47644cc067d5
+_md5_=e68058886c920e85cd6560af3928ed97
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1 b/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
index f61cbdecaede..0a7580964ef4 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter fo
EAPI=5
HOMEPAGE=http://www.mega-nerd.com/SRC/
IUSE=sndfile static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=80cf58fcca681439267d264c504bc2f5
+_md5_=4eb7a15b127a08655459ba6a74cdf89b
diff --git a/metadata/md5-cache/media-video/subtitleeditor-0.41.0 b/metadata/md5-cache/media-video/subtitleeditor-0.41.1
similarity index 95%
rename from metadata/md5-cache/media-video/subtitleeditor-0.41.0
rename to metadata/md5-cache/media-video/subtitleeditor-0.41.1
index 08b1d227739e..97e2700b1c00 100644
--- a/metadata/md5-cache/media-video/subtitleeditor-0.41.0
+++ b/metadata/md5-cache/media-video/subtitleeditor-0.41.1
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+2 subtitle editing tool
EAPI=5
HOMEPAGE=http://home.gna.org/subtitleeditor/
IUSE=debug nls opengl
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-text/iso-codes >=dev-cpp/gtkmm-2.14:2.4 >=dev-cpp/glibmm-2.16.3:2 >=dev-cpp/libxmlpp-2.20:2.6 >=app-text/enchant-1.4 >=dev-cpp/gstreamermm-0.10.6 >=media-libs/gst-plugins-good-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-xvideo-0.10:0.10 opengl? ( >=dev-cpp/gtkglextmm-1.2 )
SLOT=0
-SRC_URI=http://download.gna.org/subtitleeditor/0.41/subtitleeditor-0.41.0.tar.gz
+SRC_URI=http://download.gna.org/subtitleeditor/0.41/subtitleeditor-0.41.1.tar.gz
_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=66625611a2d4f9c60ce4388143de53f3
+_md5_=912abae58ae4346acf9795172dd0d248
diff --git a/metadata/md5-cache/net-libs/cyassl-2.4.6 b/metadata/md5-cache/net-libs/cyassl-2.4.6
deleted file mode 100644
index 87fa39de79f0..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=4
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512 ocsp crl crl-monitor +sessioncerts +testcert
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.4.6.zip
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=096100641db6052edef577e02d2a9c9e
diff --git a/metadata/md5-cache/net-libs/cyassl-2.5.0 b/metadata/md5-cache/net-libs/cyassl-2.5.0
deleted file mode 100644
index 44f0f7ba43dd..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening small big +huge aes-gcm aes-ccm aes-ni camellia +hc128 md2 +psk +ripemd sha512 ocsp crl crl-monitor +sessioncerts +testcert test
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 s390 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.5.0.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=db4262b7c89f8d22d6c1fd4024511290
diff --git a/metadata/md5-cache/net-libs/cyassl-2.7.0 b/metadata/md5-cache/net-libs/cyassl-2.7.0
deleted file mode 100644
index 2bf0c06ae8f1..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls examples extra fortress ipv6 +httpd mcapi pwdbased sni sniffer static-libs threads +zlib cyassl-hardening small big +huge +aes aes-gcm aes-ccm aes-ni +arc4 +asn blake2 camellia +coding +dh dsa +des3 ecc +hc128 md2 md4 +md5 nullcipher +psk leanpsk rabbit +ripemd +rsa +sha sha512 ocsp crl crl-monitor savesession savecert +sessioncerts +testcert debug +errorstrings +memory test
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) leanpsk? ( psk ) fortress? ( extra sha512 ) pwdbased? ( extra ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.7.0.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=7c891ac8e5f457696bc9be7ea3d03161
diff --git a/metadata/md5-cache/net-libs/cyassl-2.8.0 b/metadata/md5-cache/net-libs/cyassl-2.8.0
deleted file mode 100644
index 22e81e1e137e..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls examples extra fortress ipv6 +httpd mcapi pwdbased sni sniffer static-libs threads +zlib cyassl-hardening small big +huge +aes aes-gcm aes-ccm aes-ni +arc4 +asn blake2 camellia +coding +dh dsa +des3 ecc +hc128 md2 md4 +md5 nullcipher +psk leanpsk rabbit +ripemd +rsa +sha sha512 ocsp crl crl-monitor savesession savecert +sessioncerts +testcert atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx debug +errorstrings +memory test
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip sniffer? ( net-libs/libpcap ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=^^ ( small big huge ) leanpsk? ( psk ) fortress? ( extra sha512 ) pwdbased? ( extra ) test? ( !dtls )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.8.0.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=65dbb7ed020dceb0bc2eddbdc51effeb
diff --git a/metadata/md5-cache/net-libs/cyassl-2.9.4 b/metadata/md5-cache/net-libs/cyassl-2.9.4
deleted file mode 100644
index b708ec0b22df..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=app-arch/unzip zlib? ( sys-libs/zlib )
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib small big huge aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves ocsp crl crl-monitor savesession savecert sessioncerts testcert atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx debug errorstrings memory test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip zlib? ( sys-libs/zlib )
-REQUIRED_USE=leanpsk? ( psk ) fortress? ( extra sha512 ) pwdbased? ( extra ) test? ( !dtls )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.9.4.zip
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=c12f6f46ac464ccfbe1f37fad6901195
diff --git a/metadata/md5-cache/net-libs/cyassl-2.9.4-r1 b/metadata/md5-cache/net-libs/cyassl-2.9.4-r1
deleted file mode 100644
index 51ba96232083..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-2.9.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip zlib? ( sys-libs/zlib ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib small big huge aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves ocsp crl crl-monitor savesession savecert sessioncerts testcert atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx debug errorstrings memory test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip zlib? ( sys-libs/zlib )
-REQUIRED_USE=leanpsk? ( psk ) fortress? ( extra sha512 ) pwdbased? ( extra ) test? ( !dtls )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-2.9.4.zip
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=61b0c6def76b81f53ce6a4320cc55d76
diff --git a/metadata/md5-cache/net-libs/cyassl-3.0.0-r1 b/metadata/md5-cache/net-libs/cyassl-3.0.0-r1
deleted file mode 100644
index 149c684f5836..000000000000
--- a/metadata/md5-cache/net-libs/cyassl-3.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=app-arch/unzip zlib? ( sys-libs/zlib ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Lightweight SSL/TLS library targeted at embedded and RTOS environments
-EAPI=5
-HOMEPAGE=http://www.yassl.com/yaSSL/Home.html
-IUSE=-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib smallstack small big huge aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves ocsp crl crl-monitor savesession savecert sessioncerts testcert atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx debug errorstrings memory test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip zlib? ( sys-libs/zlib )
-REQUIRED_USE=leanpsk? ( psk ) fortress? ( extra sha512 ) pwdbased? ( extra ) test? ( !dtls )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~blueness/cyassl/cyassl-3.0.0.zip
-_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=4da44417f9a2391b925a078d3c974572
diff --git a/metadata/md5-cache/net-libs/farstream-0.2.4 b/metadata/md5-cache/net-libs/farstream-0.2.4
new file mode 100644
index 000000000000..f29d4ff9a201
--- /dev/null
+++ b/metadata/md5-cache/net-libs/farstream-0.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.3-r1 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gtk-doc-am virtual/pkgconfig test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Audio/video conferencing framework specifically designed for instant messengers
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/Farstream
+IUSE=+introspection msn test upnp
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/glib-2.32:2 >=net-libs/libnice-0.1.3-r1 introspection? ( >=dev-libs/gobject-introspection-0.10.11 ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-libnice:1.0 msn? ( media-plugins/gst-plugins-mimic:1.0 )
+RESTRICT=test
+SLOT=0.2
+SRC_URI=http://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.4.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 9637c29fc715b17a6328f24251129557 gnome2-utils f658eba3cc594a21cf6eef4af47daa90 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 4560effd96d3d2a82e50af7cf87166da python-utils-r1 8c66c6dabd0295878b68b40dbd0b087b toolchain-funcs 0f1760274637a138b99bb649202ea402 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bc2b8400660bbe0d8e7d7f276d3c5c90
diff --git a/metadata/md5-cache/net-misc/curl-7.36.0 b/metadata/md5-cache/net-misc/curl-7.36.0
index 00471ac5feb5..8e79e7bca781 100644
--- a/metadata/md5-cache/net-misc/curl-7.36.0
+++ b/metadata/md5-cache/net-misc/curl-7.36.0
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.36.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=0c2536504443d389ec4f00d6210a2063
+_md5_=12b03dd69af63cb57ab079148ca5c6b4
diff --git a/metadata/md5-cache/net-misc/curl-7.36.0-r1 b/metadata/md5-cache/net-misc/curl-7.36.0-r1
index f9e979522eeb..e7214cd363a1 100644
--- a/metadata/md5-cache/net-misc/curl-7.36.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.36.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.36.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=d8706cc8d82d43170da2aebb0909dc5a
+_md5_=0de90b267f41cbc7f93c1f38b8f85263
diff --git a/metadata/md5-cache/net-misc/curl-7.37.0 b/metadata/md5-cache/net-misc/curl-7.37.0
index 038d78a815f6..f176233237af 100644
--- a/metadata/md5-cache/net-misc/curl-7.37.0
+++ b/metadata/md5-cache/net-misc/curl-7.37.0
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.37.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=b999d91422c2b5f0f07d5444b402eeda
+_md5_=ee3960e171242989ddc101a8ce6dbb7a
diff --git a/metadata/md5-cache/net-misc/curl-7.37.0-r1 b/metadata/md5-cache/net-misc/curl-7.37.0-r1
index ac6ded3a462e..75a33198f55c 100644
--- a/metadata/md5-cache/net-misc/curl-7.37.0-r1
+++ b/metadata/md5-cache/net-misc/curl-7.37.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://curl.haxx.se/download/curl-7.37.0.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 eutils 06133990e861be0fe60c2b428fd025d9 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build fbb9baa0b4039304643e36e9820fdecf multilib-minimal 5bbdc77877c1aa3c6bd89ca3f9196d11 multiprocessing d7f2985a2c76c365ee20269db5261414 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=8e29700b6690c10340f819ef0de87c31
+_md5_=82035e7cd4421229f98ad7ed32210111
diff --git a/metadata/md5-cache/net-wireless/wavemon-0.7.6 b/metadata/md5-cache/net-wireless/wavemon-0.7.6
index 87b685c1721a..c1e6da2f72d8 100644
--- a/metadata/md5-cache/net-wireless/wavemon-0.7.6
+++ b/metadata/md5-cache/net-wireless/wavemon-0.7.6
@@ -4,10 +4,10 @@ DESCRIPTION=Ncurses based monitor for IEEE 802.11 wireless LAN cards
EAPI=5
HOMEPAGE=http://eden-feed.erg.abdn.ac.uk/wavemon/
IUSE=caps
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ppc ~sparc x86
LICENSE=GPL-3
RDEPEND=sys-libs/ncurses caps? ( sys-libs/libcap )
SLOT=0
SRC_URI=http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.6.tar.bz2
_eclasses_=autotools 82621aada74cb2a492bd8e73d49e9f54 autotools-utils fb74970befc9b65ceec689d2ccff3022 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 9836bc51856bcaffac53c9cd4b59a8be libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 0f1760274637a138b99bb649202ea402
-_md5_=a1eb846cc35cb849d5a5f6b9fbdb473a
+_md5_=e382bd0a784eb94c4e5ad3fa2c339f4a
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0
deleted file mode 100644
index 8e54965a6dda..000000000000
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm test unpack
-DEPEND=dev-lang/perl ~sci-chemistry/openbabel-2.3.0 >=dev-lang/swig-2 dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=dev-lang/perl-5.16 =dev-lang/perl-5.16 =dev-perl/Set-IntSpan-1.11 dev-perl/Graphics-ColorObject dev-perl/List-MoreUtils dev-perl/Class-Base dev-perl/config-general virtual/perl-Module-Build || ( >=dev-lang/perl-5.16 =dev-perl/Set-IntSpan-1.11 dev-perl/Graphics-ColorObject dev-perl/List-MoreUtils dev-perl/Class-Base dev-perl/config-general virtual/perl-Module-Build || ( >=dev-lang/perl-5.16 =sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) >=sys-apps/kmod-15:0= lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) xattr? ( sys-apps/attr:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.10 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection kdbus lzma pam policykit python qrcode +seccomp selinux ssl test vanilla xattr +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) >=sys-apps/kmod-15:0= lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) xattr? ( sys-apps/attr:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 ) python? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) filecaps? ( sys-libs/libcap ) virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=System and service manager for Linux
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux ssl test vanilla +filecaps abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/u
RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( virtual/pam:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 =sys-apps/hwids-20140304[udev] ) keymap? ( >=sys-apps/hwids-20140304[udev] ) openrc? ( >=sys-fs/udev-init-scripts-26 )
RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !=app-misc/pax-utils-0.2.1 !=dev-perl/URI-1.0.9 >=dev-perl/libwww-perl-5.64-r1 >=virtual/perl-MIME-Base64-2.12 dev-lang/perl[-build(-)]
+DESCRIPTION=w3mir is a all purpose HTTP copying and mirroring tool
+EAPI=5
+HOMEPAGE=http://langfeldt.net/w3mir/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~arm-linux ~x86-linux
+LICENSE=Artistic
+RDEPEND=dev-lang/perl[-build(-)]
+SLOT=0
+SRC_URI=http://langfeldt.net/w3mir/w3mir-1.0.10.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-app 4c2027b6530baeab97482b706149e640 perl-module a6a2d5c77bdaeba2794b167689cafb7a toolchain-funcs 0f1760274637a138b99bb649202ea402 unpacker f300a7ca9131b1024a79762e8edd3c52
+_md5_=1fb4b16a3840afc16b17f03fc9bc3402
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 79bba0fa2acb..ce39685dbe79 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 06:38:56 +0000
+Tue, 15 Jul 2014 12:07:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e5f1a617f1d8..64bd3175bf27 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 15 06:38:53 UTC 2014
+Tue Jul 15 12:07:01 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2211519e0324..2c02afd1e00a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Jul 2014 07:00:01 +0000
+Tue, 15 Jul 2014 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f328c42e4fc2..0198fb437e07 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1405406101 Tue 15 Jul 2014 06:35:01 AM UTC UTC
+1405425901 Tue 15 Jul 2014 12:05:01 PM UTC UTC
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
deleted file mode 100644
index a374843fa3ab..000000000000
--- a/net-libs/cyassl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST cyassl-2.4.6.zip 1041965 SHA256 051caa5013cecafbec3780d2597374870e7e5a7bbeaeb502bc029d5774d6e508 SHA512 85d4db5207e3f47db676415f4d51ccbedbf3e1d05db19e91fd33d9ef80851d79933d40b1fed17acef3be803b811514b08065588889f9d6dec7fc63dfb58e4aff WHIRLPOOL b1a6edfdfc0bed8c95c8987fc35ad4dec772a17c66c5478cbae30e384a5a6857cca87dcbb8ac5e647e8fdbe4ea54827ccf88b04b276877896645617a05ef85ad
-DIST cyassl-2.5.0.zip 1203748 SHA256 3b4ecc75cdb001d5171b127c03fd3f458bc585bfa1c19505dcf36bc239c04c2e SHA512 0bacefc6ddb1c37ad2091352b92c9a49c2e592c0d01d2d8868529ebebc61d70112827ca19ba44571b150eb5723b2a745c74158aa403dc77c00c8f4a0d2de58b7 WHIRLPOOL 2af4e9440aab89197e2290c4ec4f75098a9284f74871a3817748f59ddaef7605559ca2791b4a5446dfcf0040d6891223cb97a9b29593f2e75f80737a69603d87
-DIST cyassl-2.7.0.zip 1296831 SHA256 16c82f8ec18f73222f2337492d86db31b03b1c712b9a6a56f2472bdb65d72521 SHA512 26960ed5551c47e2f6572816827775754a7e9b373c317e4328e4402a4c84232e09d8709b81d72b79b63776d7d6445d4545642f42720c92f12cb6c993cee7f0b5 WHIRLPOOL 73038ec3c0c7e1c2fae3254c54aa38510427e675f1b718df2719267b9ec7201887f778b9dd13b502a89a89805fb0d9cabfa2497619b634d237d13f0f518d12a4
-DIST cyassl-2.8.0.zip 1394203 SHA256 94dcac2dfa87b8474815241eee50f7192e7f315c8173ec209d2a3f752bba9a8d SHA512 598b989890aa95b02d240901a5d9e9da93bc080e228380fbe0650f138f58dfd9299270adb818521c5f09c84620dc7ed11667d8eee2b935dcce620049c4f3328f WHIRLPOOL 92afbea16b700bd400785a18e053e00d92c5258361751077f1e823ad84204cf1575835dea689b083b90789687eaaa373ba9e3c7b1e8a97a8e29931e35b1f6154
-DIST cyassl-2.9.4.zip 1935752 SHA256 4c68a6157f3a197f6fbd07456506e0b4a65a38ec08441fb22265d188b69a49be SHA512 6415fed4d0380a608363fc97e98a7158d9074a14f54075c6425d56a73fb6eb838008b5ad48bdc8f4ad905202a69b697b2dc59a22755e341458f7f46e434e74df WHIRLPOOL 6ce5f62d80d8a76e3b4f34e2053141560d36b1cc3a12913b43435ba27c9da1792b0e06ce0e89bf41df4f2d03f63222b513210e1984668ac06c964b20d75bb808
-DIST cyassl-3.0.0.zip 1942979 SHA256 03825863aef91c5fccb68f1a23d1f2d404254f51fa5413b72fd4a022bece1eed SHA512 cf4a2f5ffa80f804bf659cc2f0821f5cd0857bebfa91b84ef2e435bef696ff2375dceb7ddaba35627590bdb428ea554c40b3124c152368bd608aadd99cab6fb0 WHIRLPOOL 190a4035335d040021c501fa6b73b39f2a8f232db666c07838a6b8307b934d9679ca0fe7e2f639a98343ecab82f74236b45faa61c67afaed9f77d9705d41c900
diff --git a/net-libs/cyassl/cyassl-2.4.6.ebuild b/net-libs/cyassl/cyassl-2.4.6.ebuild
deleted file mode 100644
index 4cbb5495468b..000000000000
--- a/net-libs/cyassl/cyassl-2.4.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.4.6.ebuild,v 1.8 2013/02/03 19:40:39 ago Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512"
-CERT_OPTS="ocsp crl crl-monitor +sessioncerts +testcert"
-IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-
- #Apply unconditionally, but only triggered if USE="aes-ni"
- epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.patch
-
- #Bug #454300
- epatch "${FILESDIR}"/${P}-fix-disable-debug.patch
- epatch "${FILESDIR}"/${P}-respect-CFLAGS.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singleThreaded )
- else
- myconf+=( --enable-singleThreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #There are lots of options, so we'll force a few reasonable
- #We may change this in the future, in particular ecc needs to be fixed
- econf \
- --enable-opensslExtra \
- --enable-fortress \
- --enable-keygen \
- --enable-certgen \
- --disable-debug \
- --disable-ecc \
- --disable-small \
- --disable-ntru \
- --disable-noFilesystem \
- --disable-noInline \
- $(use_enable debug) \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ni aesni) \
- $(use_enable hc128) \
- $(use_enable md2) \
- $(use_enable psk) \
- $(use_enable ripemd) \
- $(use_enable sha512) \
- $(use_enable dtls) \
- $(use_enable ipv6) \
- $(use_enable httpd webServer) \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable sessioncerts) \
- $(use_enable sniffer) \
- $(use_enable testcert) \
- $(use_enable static-libs static) \
- $(use_enable cyassl-hardening gcc-hardening) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.5.0.ebuild b/net-libs/cyassl/cyassl-2.5.0.ebuild
deleted file mode 100644
index b772481d943c..000000000000
--- a/net-libs/cyassl/cyassl-2.5.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.5.0.ebuild,v 1.10 2013/03/07 07:26:17 vapier Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="aes-gcm aes-ccm aes-ni camellia +hc128 md2 +psk +ripemd sha512"
-CERT_OPTS="ocsp crl crl-monitor +sessioncerts +testcert"
-IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} test"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singleThreaded )
- else
- myconf+=( --enable-singleThreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- #There are lots of options, so we'll force a few reasonable
- #We may change this in the future, in particular ecc needs to be fixed
- econf \
- --disable-silent-rules \
- --enable-opensslExtra \
- --enable-fortress \
- --enable-keygen \
- --enable-certgen \
- --disable-debug \
- --disable-ecc \
- --disable-ntru \
- --disable-noFilesystem \
- --disable-noInline \
- $(use_enable debug) \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable camellia) \
- $(use_enable hc128) \
- $(use_enable md2) \
- $(use_enable psk) \
- $(use_enable ripemd) \
- $(use_enable sha512) \
- $(use_enable dtls) \
- $(use_enable ipv6) \
- $(use_enable httpd webServer) \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable sessioncerts) \
- $(use_enable sniffer) \
- $(use_enable testcert) \
- $(use_enable static-libs static) \
- $(use_enable cyassl-hardening gcc-hardening) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.7.0.ebuild b/net-libs/cyassl/cyassl-2.7.0.ebuild
deleted file mode 100644
index fb468adbb944..000000000000
--- a/net-libs/cyassl/cyassl-2.7.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.7.0.ebuild,v 1.7 2013/12/24 12:53:24 ago Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 x86"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="+aes aes-gcm aes-ccm aes-ni +arc4 +asn blake2 camellia +coding +dh dsa +des3 ecc +hc128 md2 md4 +md5 nullcipher +psk leanpsk rabbit +ripemd +rsa +sha sha512"
-CERT_OPTS="ocsp crl crl-monitor savesession savecert +sessioncerts +testcert"
-DEBUG="debug +errorstrings +memory test"
-IUSE="-dtls examples extra fortress ipv6 +httpd mcapi pwdbased sni sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${DEBUG}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- leanpsk? ( psk )
- fortress? ( extra sha512 )
- pwdbased? ( extra )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singlethreaded )
- else
- myconf+=( --enable-singlethreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- econf \
- --disable-silent-rules \
- --enable-keygen \
- --enable-certgen \
- --disable-stacksize \
- --disable-ntru \
- --enable-filesystem \
- --enable-inline \
- --disable-oldtls \
- --disable-valgrind \
- \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- \
- $(use_enable aes) \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable arc4) \
- $(use_enable asn) \
- $(use_enable blake2) \
- $(use_enable camellia) \
- $(use_enable coding) \
- $(use_enable dh) \
- $(use_enable dsa) \
- $(use_enable des3) \
- $(use_enable ecc) \
- $(use_enable hc128) \
- $(use_enable md2) \
- $(use_enable md4) \
- $(use_enable md5) \
- $(use_enable nullcipher) \
- $(use_enable psk) \
- $(use_enable leanpsk) \
- $(use_enable rabbit) \
- $(use_enable ripemd) \
- $(use_enable rsa) \
- $(use_enable sha) \
- $(use_enable sha512) \
- \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable savesession) \
- $(use_enable savecert) \
- $(use_enable sessioncerts) \
- $(use_enable testcert) \
- \
- $(use_enable debug) \
- $(use_enable errorstrings) \
- $(use_enable memory) \
- \
- $(use_enable dtls) \
- $(use_enable examples) \
- $(use_enable extra opensslextra) \
- $(use_enable fortress) \
- $(use_enable ipv6) \
- $(use_enable httpd webserver) \
- $(use_enable mcapi) \
- $(use_enable pwdbased) \
- $(use_enable sni) \
- $(use_enable sniffer) \
- $(use_enable static-libs static) \
- $(use_with zlib libz) \
- $(use_enable cyassl-hardening gcc-hardening) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.8.0.ebuild b/net-libs/cyassl/cyassl-2.8.0.ebuild
deleted file mode 100644
index 75b25200116d..000000000000
--- a/net-libs/cyassl/cyassl-2.8.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.8.0.ebuild,v 1.3 2014/05/15 12:06:18 blueness Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-#Add CRYPTO_OPTS=ecc when fixed
-CACHE_SIZE="small big +huge"
-CRYPTO_OPTS="+aes aes-gcm aes-ccm aes-ni +arc4 +asn blake2 camellia +coding +dh dsa +des3 ecc +hc128 md2 md4 +md5 nullcipher +psk leanpsk rabbit +ripemd +rsa +sha sha512"
-CERT_OPTS="ocsp crl crl-monitor savesession savecert +sessioncerts +testcert"
-EXTRAS="atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx"
-DEBUG="debug +errorstrings +memory test"
-IUSE="-dtls examples extra fortress ipv6 +httpd mcapi pwdbased sni sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="^^ ( small big huge )
- leanpsk? ( psk )
- fortress? ( extra sha512 )
- pwdbased? ( extra )
- test? ( !dtls )"
-
-DEPEND="app-arch/unzip
- sniffer? ( net-libs/libpcap )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-}
-
-src_configure() {
- local myconf=()
-
- if use threads; then
- myconf+=( --disable-singlethreaded )
- else
- myconf+=( --enable-singlethreaded )
- fi
-
- if use amd64; then
- myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
- elif use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- econf \
- --disable-silent-rules \
- --enable-keygen \
- --enable-certgen \
- --disable-stacksize \
- --disable-ntru \
- --enable-filesystem \
- --enable-inline \
- --disable-oldtls \
- --disable-valgrind \
- \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- \
- $(use_enable aes) \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable arc4) \
- $(use_enable asn) \
- $(use_enable blake2) \
- $(use_enable camellia) \
- $(use_enable coding) \
- $(use_enable dh) \
- $(use_enable dsa) \
- $(use_enable des3) \
- $(use_enable ecc) \
- $(use_enable hc128) \
- $(use_enable md2) \
- $(use_enable md4) \
- $(use_enable md5) \
- $(use_enable nullcipher) \
- $(use_enable psk) \
- $(use_enable leanpsk) \
- $(use_enable rabbit) \
- $(use_enable ripemd) \
- $(use_enable rsa) \
- $(use_enable sha) \
- $(use_enable sha512) \
- \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable savesession) \
- $(use_enable savecert) \
- $(use_enable sessioncerts) \
- $(use_enable testcert) \
- \
- $(use_enable atomicuser) \
- $(use_enable pkcallbacks) \
- $(use_enable sep) \
- $(use_enable maxfragment) \
- $(use_enable truncatedhmac) \
- $(use_enable tlsx) \
- \
- $(use_enable debug) \
- $(use_enable errorstrings) \
- $(use_enable memory) \
- \
- $(use_enable dtls) \
- $(use_enable examples) \
- $(use_enable extra opensslextra) \
- $(use_enable fortress) \
- $(use_enable ipv6) \
- $(use_enable httpd webserver) \
- $(use_enable mcapi) \
- $(use_enable pwdbased) \
- $(use_enable sni) \
- $(use_enable sniffer) \
- $(use_enable static-libs static) \
- $(use_with zlib libz) \
- $(use_enable cyassl-hardening gcc-hardening) \
- "${myconf[@]}"
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.9.4-r1.ebuild b/net-libs/cyassl/cyassl-2.9.4-r1.ebuild
deleted file mode 100644
index 23c2bd4aa391..000000000000
--- a/net-libs/cyassl/cyassl-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.9.4-r1.ebuild,v 1.1 2014/06/09 20:45:54 blueness Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-CACHE_SIZE="small big huge"
-CRYPTO_OPTS="aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves"
-CERT_OPTS="ocsp crl crl-monitor savesession savecert sessioncerts testcert"
-EXTRAS="atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx"
-DEBUG="debug errorstrings memory test"
-
-#Note: sniffer is broken at the configure.ac level. Its not too important and we'll disable it for this release.
-#IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni sniffer static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="
- leanpsk? ( psk )
- fortress? ( extra sha512 )
- pwdbased? ( extra )
- test? ( !dtls )"
-
-# Re-add sniffer? ( net-libs/libpcap ) to DEPEND when its fixed
-DEPEND="app-arch/unzip
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-# More trouble ahead, bug #512312
-RESTRICT="test"
-
-src_prepare() {
- # More trouble ahead, bug #512312
- #epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
- epatch "${FILESDIR}"/${PN}-2.9.4-remove-hardened-flags.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use debug; then
- myconf+=( --enable-debug )
- fi
-
- if use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-keygen --disable-fastmath --disable-fasthugemath --disable-bump )
- else
- myconf+=( --enable-keygen --enable-fastmath --enable-fasthugemath --enable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- econf \
- $(usex threads --disable-singlethreaded --enable-singlethreaded) \
- \
- --disable-silent-rules \
- --enable-certgen \
- --disable-stacksize \
- --disable-ntru \
- --enable-filesystem \
- --enable-inline \
- --disable-oldtls \
- --disable-valgrind \
- --enable-asn \
- --enable-md5 \
- --enable-arc4 \
- --enable-des3 \
- --enable-aes \
- --enable-sha \
- --enable-rsa \
- --enable-dh \
- --enable-coding \
- \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable blake2) \
- $(use_enable camellia) \
- $(use_enable dsa) \
- $(use_enable ecc) \
- $(use_enable hc128) \
- $(use_enable hkdf) \
- $(use_enable md2) \
- $(use_enable md4) \
- $(use_enable nullcipher) \
- $(use_enable psk) \
- $(use_enable leanpsk) \
- $(use_enable pkcs7) \
- $(use_enable rabbit) \
- $(use_enable ripemd) \
- $(use_enable scep) \
- $(use_enable sha512) \
- $(use_enable supportedcurves) \
- \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable savesession) \
- $(use_enable savecert) \
- $(use_enable sessioncerts) \
- $(use_enable testcert) \
- \
- $(use_enable atomicuser) \
- $(use_enable pkcallbacks) \
- $(use_enable sep) \
- $(use_enable maxfragment) \
- $(use_enable truncatedhmac) \
- $(use_enable tlsx) \
- \
- $(use_enable errorstrings) \
- $(use_enable memory) \
- \
- $(use_enable dtls) \
- $(use_enable examples) \
- $(use_enable extra opensslextra) \
- $(use_enable fortress) \
- $(use_enable ipv6) \
- $(use_enable httpd webserver) \
- $(use_enable mcapi) \
- $(use_enable pwdbased) \
- $(use_enable sni) \
- $(use_enable static-libs static) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-
-# Re-add $(use_enable sniffer) when its fixed
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-2.9.4.ebuild b/net-libs/cyassl/cyassl-2.9.4.ebuild
deleted file mode 100644
index 20ef257ebdbf..000000000000
--- a/net-libs/cyassl/cyassl-2.9.4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.9.4.ebuild,v 1.4 2014/06/08 14:18:58 blueness Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-CACHE_SIZE="small big huge"
-CRYPTO_OPTS="aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves"
-CERT_OPTS="ocsp crl crl-monitor savesession savecert sessioncerts testcert"
-EXTRAS="atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx"
-DEBUG="debug errorstrings memory test"
-
-# More trouble ahead, bug #512312
-RESTRICT="test"
-
-#Note: sniffer is broken at the configure.ac level. Its not too important and we'll disable it for this release.
-#IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni sniffer static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="
- leanpsk? ( psk )
- fortress? ( extra sha512 )
- pwdbased? ( extra )
- test? ( !dtls )"
-
-# Re-add sniffer? ( net-libs/libpcap ) to DEPEND when its fixed
-DEPEND="app-arch/unzip
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-#src_prepare() {
-# epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
-#}
-
-src_configure() {
- local myconf=()
-
- if use debug; then
- myconf+=( --enable-debug )
- fi
-
- if use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-keygen --disable-fastmath --disable-fasthugemath --disable-bump )
- else
- myconf+=( --enable-keygen --enable-fastmath --enable-fasthugemath --enable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- econf \
- $(usex threads --disable-singlethreaded --enable-singlethreaded) \
- \
- --disable-silent-rules \
- --enable-certgen \
- --disable-stacksize \
- --disable-ntru \
- --enable-filesystem \
- --enable-inline \
- --disable-oldtls \
- --disable-valgrind \
- --enable-asn \
- --enable-md5 \
- --enable-arc4 \
- --enable-des3 \
- --enable-aes \
- --enable-sha \
- --enable-rsa \
- --enable-dh \
- --enable-coding \
- \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable blake2) \
- $(use_enable camellia) \
- $(use_enable dsa) \
- $(use_enable ecc) \
- $(use_enable hc128) \
- $(use_enable hkdf) \
- $(use_enable md2) \
- $(use_enable md4) \
- $(use_enable nullcipher) \
- $(use_enable psk) \
- $(use_enable leanpsk) \
- $(use_enable pkcs7) \
- $(use_enable rabbit) \
- $(use_enable ripemd) \
- $(use_enable scep) \
- $(use_enable sha512) \
- $(use_enable supportedcurves) \
- \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable savesession) \
- $(use_enable savecert) \
- $(use_enable sessioncerts) \
- $(use_enable testcert) \
- \
- $(use_enable atomicuser) \
- $(use_enable pkcallbacks) \
- $(use_enable sep) \
- $(use_enable maxfragment) \
- $(use_enable truncatedhmac) \
- $(use_enable tlsx) \
- \
- $(use_enable errorstrings) \
- $(use_enable memory) \
- \
- $(use_enable dtls) \
- $(use_enable examples) \
- $(use_enable extra opensslextra) \
- $(use_enable fortress) \
- $(use_enable ipv6) \
- $(use_enable httpd webserver) \
- $(use_enable mcapi) \
- $(use_enable pwdbased) \
- $(use_enable sni) \
- $(use_enable static-libs static) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-
-# Re-add $(use_enable sniffer) when its fixed
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/cyassl-3.0.0-r1.ebuild b/net-libs/cyassl/cyassl-3.0.0-r1.ebuild
deleted file mode 100644
index 2e964a6de611..000000000000
--- a/net-libs/cyassl/cyassl-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-3.0.0-r1.ebuild,v 1.1 2014/06/09 20:45:54 blueness Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
-HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
-SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-CACHE_SIZE="smallstack small big huge"
-CRYPTO_OPTS="aes-gcm aes-ccm aes-ni blake2 camellia dsa ecc hc128 hkdf md2 md4 nullcipher psk leanpsk pkcs7 rabbit ripemd scep sha512 supportedcurves"
-CERT_OPTS="ocsp crl crl-monitor savesession savecert sessioncerts testcert"
-EXTRAS="atomicuser pkcallbacks sep maxfragment truncatedhmac tlsx"
-DEBUG="debug errorstrings memory test"
-
-# More trouble ahead, bug #512312
-RESTRICT="test"
-
-#Note: sniffer is broken at the configure.ac level. Its not too important and we'll disable it for this release.
-#IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni sniffer static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-IUSE="-dtls examples extra fortress ipv6 httpd mcapi pwdbased sni static-libs threads zlib ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${EXTRAS} ${DEBUG}"
-
-#You can only pick one cach size
-#sha512 is broken on x86
-#Testing freezes with dtls
-REQUIRED_USE="
- leanpsk? ( psk )
- fortress? ( extra sha512 )
- pwdbased? ( extra )
- test? ( !dtls )"
-
-# Re-add sniffer? ( net-libs/libpcap ) to DEPEND when its fixed
-DEPEND="app-arch/unzip
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9.4-remove-hardened-flags.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use debug; then
- myconf+=( --enable-debug )
- fi
-
- if use x86; then
- #not pie friendly, sorry x86, no fast math for you :(
- myconf+=( --disable-keygen --disable-fastmath --disable-fasthugemath --disable-bump )
- else
- myconf+=( --enable-keygen --enable-fastmath --enable-fasthugemath --enable-bump )
- fi
-
- #Bug #454300
- export C_EXTRA_FLAGS=${CFLAGS}
-
- econf \
- $(usex threads --disable-singlethreaded --enable-singlethreaded) \
- \
- --disable-silent-rules \
- --enable-certgen \
- --disable-stacksize \
- --disable-ntru \
- --enable-filesystem \
- --enable-inline \
- --disable-oldtls \
- --disable-valgrind \
- --enable-asn \
- --enable-md5 \
- --enable-arc4 \
- --enable-des3 \
- --enable-aes \
- --enable-sha \
- --enable-rsa \
- --enable-dh \
- --enable-coding \
- \
- $(use_enable smallstack ) \
- $(use_enable small smallcache) \
- $(use_enable big bigcache) \
- $(use_enable huge hugecache) \
- \
- $(use_enable aes-gcm aesgcm) \
- $(use_enable aes-ccm aesccm) \
- $(use_enable aes-ni aesni) \
- $(use_enable blake2) \
- $(use_enable camellia) \
- $(use_enable dsa) \
- $(use_enable ecc) \
- $(use_enable hc128) \
- $(use_enable hkdf) \
- $(use_enable md2) \
- $(use_enable md4) \
- $(use_enable nullcipher) \
- $(use_enable psk) \
- $(use_enable leanpsk) \
- $(use_enable pkcs7) \
- $(use_enable rabbit) \
- $(use_enable ripemd) \
- $(use_enable scep) \
- $(use_enable sha512) \
- $(use_enable supportedcurves) \
- \
- $(use_enable ocsp) \
- $(use_enable crl) \
- $(use_enable crl-monitor) \
- $(use_enable savesession) \
- $(use_enable savecert) \
- $(use_enable sessioncerts) \
- $(use_enable testcert) \
- \
- $(use_enable atomicuser) \
- $(use_enable pkcallbacks) \
- $(use_enable sep) \
- $(use_enable maxfragment) \
- $(use_enable truncatedhmac) \
- $(use_enable tlsx) \
- \
- $(use_enable errorstrings) \
- $(use_enable memory) \
- \
- $(use_enable dtls) \
- $(use_enable examples) \
- $(use_enable extra opensslextra) \
- $(use_enable fortress) \
- $(use_enable ipv6) \
- $(use_enable httpd webserver) \
- $(use_enable mcapi) \
- $(use_enable pwdbased) \
- $(use_enable sni) \
- $(use_enable static-libs static) \
- $(use_with zlib libz) \
- "${myconf[@]}"
-
-# Re-add $(use_enable sniffer) when its fixed
-}
-
-src_test() {
- "${S}"/tests/unit
- "${S}"/ctaocrypt/benchmark/benchmark
-}
-
-src_install() {
- default
-
- mv "${D}"/usr/share/doc/"${PN}"/* \
- "${D}"/usr/share/doc/"${P}"/
- rmdir "${D}"/usr/share/doc/"${PN}"/
-}
diff --git a/net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit-ifnothreads.patch b/net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit-ifnothreads.patch
deleted file mode 100644
index b1c2cbe2494a..000000000000
--- a/net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit-ifnothreads.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur cyassl-2.0.8.orig//testsuite/testsuite.c cyassl-2.0.8/testsuite/testsuite.c
---- cyassl-2.0.8.orig//testsuite/testsuite.c 2012-02-13 14:51:39.000000000 -0500
-+++ cyassl-2.0.8/testsuite/testsuite.c 2012-04-10 10:26:40.000000000 -0400
-@@ -27,10 +27,11 @@
- #include
- #include
-
-+/* Create a stub rather than #error out */
-+/* We can run the tests manually */
- #ifdef SINGLE_THREADED
-- #error testsuite needs threads to run, please run ctaocrypt/test, \
-- and the examples/ individually
--#endif
-+int main() { return 0; }
-+#else
-
- void wait_tcp_ready(func_args*);
- void ctaocrypt_test(void*);
-@@ -230,4 +231,4 @@
- fclose(f);
- }
-
--
-+#endif /* SINGLE_THREADED */
diff --git a/net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch b/net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch
deleted file mode 100644
index 69067088d3b9..000000000000
--- a/net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur cyassl-2.0.8.orig//ctaocrypt/src/aes_asm.s cyassl-2.0.8/ctaocrypt/src/aes_asm.s
---- cyassl-2.0.8.orig//ctaocrypt/src/aes_asm.s 2011-09-26 18:22:08.000000000 -0400
-+++ cyassl-2.0.8/ctaocrypt/src/aes_asm.s 2012-04-10 12:20:21.000000000 -0400
-@@ -482,3 +482,6 @@
- pxor %xmm2, %xmm3
- ret
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch b/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch
deleted file mode 100644
index b6871da6bf18..000000000000
--- a/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cyassl-2.4.6.orig/m4/ax_debug.m4 cyassl-2.4.6/m4/ax_debug.m4
---- cyassl-2.4.6.orig/m4/ax_debug.m4 2012-10-19 16:01:02.000000000 -0400
-+++ cyassl-2.4.6/m4/ax_debug.m4 2013-01-28 22:03:46.000000000 -0500
-@@ -49,7 +49,7 @@
- AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
-- ax_enable_debug=yes
-+ ax_enable_debug=$enableval
- AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
- ],[
- ax_enable_debug=no
diff --git a/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch b/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch
deleted file mode 100644
index 89b3764e2a74..000000000000
--- a/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cyassl-2.4.6.orig/configure.ac cyassl-2.4.6/configure.ac
---- cyassl-2.4.6.orig/configure.ac 2012-12-20 16:25:33.000000000 -0500
-+++ cyassl-2.4.6/configure.ac 2013-01-31 09:49:36.000000000 -0500
-@@ -42,7 +42,7 @@
-
- # capture user C_EXTRA_FLAGS from ./configure line, CFLAGS may hold -g -O2 even
- # if user doesn't override, no way to tell
--USER_C_EXTRA_FLAGS="$C_EXTRA_FLAGS"
-+USER_C_EXTRA_FLAGS="$CFLAGS"
-
- LT_INIT([win32-dll])
- LT_LANG([C++])
diff --git a/net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch b/net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch
deleted file mode 100644
index 1144d7057c64..000000000000
--- a/net-libs/cyassl/files/cyassl-2.9.4-remove-hardened-flags.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Naur cyassl-2.9.4.orig/configure.ac cyassl-2.9.4/configure.ac
---- cyassl-2.9.4.orig/configure.ac 2014-04-09 13:23:26.000000000 -0400
-+++ cyassl-2.9.4/configure.ac 2014-06-09 13:38:59.988657720 -0400
-@@ -13,7 +13,7 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_BUILD
-
--AM_INIT_AUTOMAKE([1.11 -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])
-+AM_INIT_AUTOMAKE([1.11 foreign tar-ustar subdir-objects no-define color-tests])
- AC_PREREQ([2.63])
-
- AC_ARG_PROGRAM
-@@ -1586,7 +1586,6 @@
- # OPTIMIZE FLAGS
- if test "$GCC" = "yes"
- then
-- AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
- if test "$ax_enable_debug" = "no"
- then
- if test "$ENABLED_FASTMATH" = "yes"
-@@ -1603,7 +1602,7 @@
- fi
-
- LIB_SOCKET_NSL
--AX_HARDEN_CC_COMPILER_FLAGS
-+dnl AX_HARDEN_CC_COMPILER_FLAGS
-
- # link to ws2_32 if on mingw
- case $host_os in
-@@ -1612,8 +1611,8 @@
- esac
-
- # add user C_EXTRA_FLAGS back
--CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
--OPTION_FLAGS="$USER_C_EXTRA_FLAGS $AM_CFLAGS"
-+CFLAGS="-fwrapv $CFLAGS"
-+OPTION_FLAGS="$AM_CFLAGS"
-
- CREATE_HEX_VERSION
- AC_SUBST([AM_CPPFLAGS])
-diff -Naur cyassl-2.9.4.orig/m4/ax_debug.m4 cyassl-2.9.4/m4/ax_debug.m4
---- cyassl-2.9.4.orig/m4/ax_debug.m4 2014-03-27 13:44:24.000000000 -0400
-+++ cyassl-2.9.4/m4/ax_debug.m4 2014-06-09 13:34:14.291644716 -0400
-@@ -43,19 +43,21 @@
- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--#serial 6
-+#serial 6.1
-
- AC_DEFUN([AX_DEBUG],
- [AC_PREREQ([2.63])dnl
- AC_ARG_ENABLE([debug],
- [AS_HELP_STRING([--enable-debug],
- [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
-- [ax_enable_debug=yes
-- AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])],
-- [ax_enable_debug=no
-- AC_SUBST([MCHECK])
-- AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
-+ [ax_enable_debug=$enableval],
-+ [ax_enable_debug=no])
-+
-+ AS_IF([test "x$ax_enable_debug" = xyes],
-+ [AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])],
-+ [AC_SUBST([MCHECK])
-+ AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
-
- AC_MSG_CHECKING([for debug])
- AC_MSG_RESULT([$ax_enable_debug])
-- AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])
-+ AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = xyes])])
diff --git a/net-libs/cyassl/metadata.xml b/net-libs/cyassl/metadata.xml
deleted file mode 100644
index 70aa2633c941..000000000000
--- a/net-libs/cyassl/metadata.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
- blueness@gentoo.org
- Anthony G. Basile
-
-
-
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 8a49fc0bea8c..a6d39569298d 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,2 +1,3 @@
DIST farstream-0.1.2.tar.gz 1265972 SHA256 fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 SHA512 7d9ddde5d17205752a17298fb90cf855a828b2ae58746fbdc7e47749cee5e5eac4fd56f97f58251a5d253901cdd555e9cfade6016b6d92df99daefbe850e2910 WHIRLPOOL 273d20082152ff09adf8e64481b1b7c7ba7e6a24fc09addc219880fbee7f1e6b9845ce727c032fa3c364e8d2440736fd0324015426591b7e9766f11054828294
DIST farstream-0.2.3.tar.gz 1253317 SHA256 bff535949252cdfc0374cb91f08b08476e7af38183295269b579500cc6c60496 SHA512 2f584a034611c22bfaa622e043884329a6d32821fd194b55d5c92669285ee43ff1a60cde3a9f825c3a895c50fd733ff6cf85beeb7efffff053eca287e7bc9528 WHIRLPOOL b93006211c35f6275d8422472f2effe3f70e8ee9b78a7a463f1b9e6caea8736d2a14cdf151151bbd663e2b101735b4521b4e637a4dd072bb65d03f24b71a73c8
+DIST farstream-0.2.4.tar.gz 1274905 SHA256 120d5b5cd79fcbe19d9e046526fc4bc059e0a3733b3de2d7e5299dc5a3a7bb30 SHA512 f0327392cf644bf08fac81b3408d98eff8ba96742b88d1bd3006416d6fb1fc7c44a0dcc3e6e6ccc64be27633c67069a1219d6dc07815b80edf34515119cda089 WHIRLPOOL c529d16b8de0020bea77785826dd3d7d639c130ef91371d63fae6f8561353d35bce28ef7e249a6510498097962eed50dd1f4b2e01619f149086fc9e3ae32e0b7
diff --git a/net-libs/farstream/farstream-0.2.4.ebuild b/net-libs/farstream/farstream-0.2.4.ebuild
new file mode 100644
index 000000000000..ce7d7f2d4e97
--- /dev/null
+++ b/net-libs/farstream/farstream-0.2.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/farstream/farstream-0.2.4.ebuild,v 1.1 2014/07/15 11:16:53 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="Audio/video conferencing framework specifically designed for instant messengers"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/Farstream"
+SRC_URI="http://freedesktop.org/software/farstream/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection msn test upnp"
+
+SLOT="0.2"
+
+# Tests need shmsink from gst-plugins-bad, which isn't packaged
+RESTRICT="test"
+
+COMMONDEPEND="
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=dev-libs/glib-2.32:2
+ >=net-libs/libnice-0.1.3-r1
+ introspection? ( >=dev-libs/gobject-introspection-0.10.11 )
+ upnp? ( >=net-libs/gupnp-igd-0.2:= )
+"
+RDEPEND="${COMMONDEPEND}
+ media-libs/gst-plugins-good:1.0
+ media-libs/gst-plugins-bad:1.0
+ media-plugins/gst-plugins-libnice:1.0
+ msn? ( media-plugins/gst-plugins-mimic:1.0 )
+"
+DEPEND="${COMMONDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? (
+ media-libs/gst-plugins-base:1.0[vorbis]
+ media-libs/gst-plugins-good:1.0 )"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ plugins="fsrawconference,fsrtpconference,fsfunnel,fsrtcpfilter,fsvideoanyrate"
+ use msn && plugins="${plugins},fsmsnconference"
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable upnp gupnp) \
+ --with-plugins=${plugins}
+}
+
+src_test() {
+ # FIXME: do an out-of-tree build for tests if USE=-msn
+ if ! use msn; then
+ elog "Tests disabled without msn use flag"
+ return
+ fi
+
+ emake -j1 check
+}
diff --git a/net-misc/curl/curl-7.36.0-r1.ebuild b/net-misc/curl/curl-7.36.0-r1.ebuild
index 2a1253392d47..f1326d185cc1 100644
--- a/net-misc/curl/curl-7.36.0-r1.ebuild
+++ b/net-misc/curl/curl-7.36.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.1 2014/04/29 13:27:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0-r1.ebuild,v 1.3 2014/07/15 09:40:13 blueness Exp $
EAPI="5"
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
index 54c15ef4b869..e3eeb16db595 100644
--- a/net-misc/curl/curl-7.36.0.ebuild
+++ b/net-misc/curl/curl-7.36.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.15 2014/05/14 16:10:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.17 2014/07/15 09:40:13 blueness Exp $
EAPI="5"
diff --git a/net-misc/curl/curl-7.37.0-r1.ebuild b/net-misc/curl/curl-7.37.0-r1.ebuild
index de246f9b50b4..969c9a479aab 100644
--- a/net-misc/curl/curl-7.37.0-r1.ebuild
+++ b/net-misc/curl/curl-7.37.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0-r1.ebuild,v 1.5 2014/07/04 18:03:11 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0-r1.ebuild,v 1.7 2014/07/15 09:40:13 blueness Exp $
EAPI="5"
diff --git a/net-misc/curl/curl-7.37.0.ebuild b/net-misc/curl/curl-7.37.0.ebuild
index 4b240ecb81d9..50ec1ba4e739 100644
--- a/net-misc/curl/curl-7.37.0.ebuild
+++ b/net-misc/curl/curl-7.37.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0.ebuild,v 1.2 2014/06/15 15:51:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0.ebuild,v 1.4 2014/07/15 09:40:13 blueness Exp $
EAPI="5"
diff --git a/net-wireless/wavemon/wavemon-0.7.6.ebuild b/net-wireless/wavemon/wavemon-0.7.6.ebuild
index c86465969bff..e920ed77a10b 100644
--- a/net-wireless/wavemon/wavemon-0.7.6.ebuild
+++ b/net-wireless/wavemon/wavemon-0.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.6.ebuild,v 1.1 2014/05/16 13:42:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.7.6.ebuild,v 1.3 2014/07/15 10:38:19 zlogene Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ~sparc x86"
IUSE="caps"
RDEPEND="sys-libs/ncurses
diff --git a/profiles/arch/amd64-fbsd/todo/package.use.mask b/profiles/arch/amd64-fbsd/todo/package.use.mask
index 95c41a95e410..6f2b18e03527 100644
--- a/profiles/arch/amd64-fbsd/todo/package.use.mask
+++ b/profiles/arch/amd64-fbsd/todo/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.336 2013/11/17 14:13:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/todo/package.use.mask,v 1.337 2014/07/15 10:20:31 blueness Exp $
# Mask useflags that require deps with missing keywords.
# Anyone is allowed and _very welcome_ to add masks there.
@@ -39,9 +39,6 @@ net-misc/curl curl_ssl_axtls
# provided by glibc)
net-misc/curl metalink
-# net-libs/cyassl (fails to build)
-net-misc/curl curl_ssl_cyassl
-
# sys-process/numactl
sys-apps/hwloc numa
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 9e045df42880..7046b4705e7b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.182 2014/06/29 18:35:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.183 2014/07/15 10:20:31 blueness Exp $
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -67,10 +67,6 @@ sys-apps/hwloc -cuda -gl -opencl
# Meaningless on amd64 (it controls the 32-bit x86 JIT).
dev-python/pypy sse2
-# Anthony G. Basile (18 Jun 2013)
-# Works on amd64
-net-libs/cyassl -aes-ni
-
# Michael Weber (18 Jun 2013)
# unsatisfied multilib dep on curl[abi_x86_32]
www-client/netsurf abi_x86_32
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 93e0b41d76c1..2e35233e1e1a 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.135 2014/05/21 07:39:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.136 2014/07/15 10:20:31 blueness Exp $
# This file requires >=portage-2.1.1
@@ -52,10 +52,6 @@ sys-apps/hwloc -cuda -gl -opencl
# Keywords missing, bug #478104
>=app-editors/gedit-plugins-3.8.3 git
-# Anthony G. Basile (18 Jun 2013)
-# Works on x86
-net-libs/cyassl -aes-ni
-
# Justin Lecher (21 Feb 2013)
# cuda only works on x86 and amd64
sci-libs/cholmod -cuda
@@ -85,10 +81,6 @@ media-libs/phonon zeitgeist
# dependency keyworded here, masked in base
media-libs/freetype -infinality
-# Anthony G. Basile (12 Jul 2012)
-# sha512 support in cyassl is broken on x86
-net-libs/cyassl sha512
-
# Rick Farina (05 July 2012)
# masked in base, unmask x86/amd64 only
app-crypt/johntheripper -cuda
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ee4eb1f79799..78784ff037dd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.584 2014/07/11 19:36:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.585 2014/07/15 10:20:32 blueness Exp $
# This file requires >=portage-2.1.1
# New entries go on top.
@@ -22,10 +22,6 @@ net-misc/stargazer module_store_firebird
# net-libs/adns is going away (bug #513982)
net-analyzer/wireshark libadns
-# Anthony G. Basile (14 Jun 2014)
-# net-libs/cyassl is being tree cleaned, bug #495848
-net-misc/curl curl_ssl_cyassl
-
# Zac Medico (06 Jun 2014)
# Needs hardmasked lua-5.2
www-servers/mongoose lua
@@ -281,10 +277,6 @@ sys-libs/libcxxrt libunwind
# Not fit for production
=www-client/netsurf-3.0* fbcon pdf-writer gstreamer
-# Anthony G. Basile (18 Jun 2013)
-# Only work on amd64/x86
-net-libs/cyassl aes-ni
-
# Sergey Popov (08 Jun 2013)
# mask because requires unstable depends not ready for the stabilization
app-leechcraft/leechcraft-meta unstable
diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
index 171daabda2da..2cdb077b199b 100644
--- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
+++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.4 2013/06/19 13:00:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.5 2014/07/15 10:20:32 blueness Exp $
# Build libcxxrt over libgcc_s since that is what clang defaults to.
sys-libs/libcxxrt libunwind
@@ -13,4 +13,4 @@ sys-devel/binutils cxx
# Force openssl on curl since cmakes needs it and is in @system because of
# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
+net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
index b8d04ba8ad6f..f7204c7ac93d 100644
--- a/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
+++ b/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.1 2013/08/09 14:11:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.2/clang/package.use.mask,v 1.2 2014/07/15 10:20:32 blueness Exp $
# Build libcxxrt over libgcc_s since that is what clang defaults to.
sys-libs/libcxxrt libunwind
@@ -13,4 +13,4 @@ sys-devel/binutils cxx
# Force openssl on curl since cmakes needs it and is in @system because of
# libcxx on this profile. Mask the other ssl providers.
-net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
+net-misc/curl curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl
diff --git a/profiles/default/linux/alpha/13.0/use.mask b/profiles/default/linux/alpha/13.0/use.mask
index 795d4aaf0b31..de1b80c26103 100644
--- a/profiles/default/linux/alpha/13.0/use.mask
+++ b/profiles/default/linux/alpha/13.0/use.mask
@@ -2,5 +2,4 @@
# Pulls in net-libs/axtls or net-libs/polarssl which are
# not keyworded for arch
curl_ssl_axtls
-curl_ssl_cyassl
curl_ssl_polarssl
diff --git a/profiles/default/linux/ia64/13.0/use.mask b/profiles/default/linux/ia64/13.0/use.mask
index 795d4aaf0b31..de1b80c26103 100644
--- a/profiles/default/linux/ia64/13.0/use.mask
+++ b/profiles/default/linux/ia64/13.0/use.mask
@@ -2,5 +2,4 @@
# Pulls in net-libs/axtls or net-libs/polarssl which are
# not keyworded for arch
curl_ssl_axtls
-curl_ssl_cyassl
curl_ssl_polarssl
diff --git a/profiles/default/linux/sparc/13.0/use.mask b/profiles/default/linux/sparc/13.0/use.mask
index bf9d5e60a1ab..eab5da4ff4e0 100644
--- a/profiles/default/linux/sparc/13.0/use.mask
+++ b/profiles/default/linux/sparc/13.0/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/use.mask,v 1.1 2013/01/18 19:48:22 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/13.0/use.mask,v 1.2 2014/07/15 10:20:33 blueness Exp $
# this is not a multilib profile
multilib
@@ -8,4 +8,3 @@ multilib
# Anthony G. Basile (15 Apr 2012)
# Pulls in net-libs/axtls which is not keyworded for arch
curl_ssl_axtls
-curl_ssl_cyassl
diff --git a/profiles/desc/curl_ssl.desc b/profiles/desc/curl_ssl.desc
index e77018322c20..8bd7dde62cff 100644
--- a/profiles/desc/curl_ssl.desc
+++ b/profiles/desc/curl_ssl.desc
@@ -1,12 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/curl_ssl.desc,v 1.3 2014/04/29 13:25:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/curl_ssl.desc,v 1.4 2014/07/15 10:20:33 blueness Exp $
# This file contains descriptions of CURL_SSL USE_EXPAND flags for net-misc/curl
#spnego - Use SPNEGO fbopenssl - to be added
axtls - Use axTLS
-cyassl - Use CyaSSL
gnutls - Use GnuTLS
nss - Use Mozilla's Network Security Services
openssl - Use OpenSSL
diff --git a/profiles/package.mask b/profiles/package.mask
index 9e2319422f10..ea51c9652fcd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15895 2014/07/14 19:56:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15896 2014/07/15 10:20:30 blueness Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -144,10 +144,6 @@ x11-misc/keytouch-editor
app-emulation/openstack-guest-agents-unix
app-emulation/xe-guest-utilities
-# Anthony G. Basile (14 Jun 2014)
-# Masked for removal in 30 days, bug #495848
-net-libs/cyassl
-
# Mike Gilbert (13 Jun 2014)
# Masked due to security bug 499870.
# Please migrate to net-misc/libreswan.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 6e34e380f939..66d1700da7ee 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -184,6 +184,7 @@ mips hardened/linux/musl/mips exp
mips hardened/linux/musl/mips/mipsel exp
ppc hardened/linux/powerpc/ppc32 dev
ppc hardened/linux/powerpc/ppc64/32bit-userland dev
+ppc hardened/linux/uclibc/ppc dev
ppc64 hardened/linux/powerpc/ppc64/64bit-userland dev
x86 hardened/linux/x86 stable
x86 hardened/linux/x86/selinux stable
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a8466d529630..dee0a456fe07 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5089,63 +5089,6 @@ net-libs/c-client:doc - Install RFCs related to IMAP
net-libs/c-client:topal - Enable support for net-mail/topal for use with mail-client/alpine
net-libs/courier-authlib:vpopmail - Enable vpopmail support
net-libs/cvm:vpopmail - Enable vpopmail support
-net-libs/cyassl:aes - Enable AES cipher support
-net-libs/cyassl:aes-ccm - Eanble AES Counter with CBC-MAC mode
-net-libs/cyassl:aes-gcm - Enable AES Galois/Counter mode
-net-libs/cyassl:aes-ni - Enable Intel AES instruction support
-net-libs/cyassl:arc4 - Enable ARC4 cipher support
-net-libs/cyassl:asn - Enable ASN cipher support
-net-libs/cyassl:atomicuser - Enable Atomic User Record Layer
-net-libs/cyassl:big - Choose big cache size (excludes small or huge)
-net-libs/cyassl:blake2 - Enable CyaSSL BLAKE2 support
-net-libs/cyassl:camellia - Enable Camellia-CBC cipher support
-net-libs/cyassl:coding - Enable Coding base 16/64
-net-libs/cyassl:crl - Enable Certificate Revocation List
-net-libs/cyassl:crl-monitor - Enable Certificate Revocation List Directory Monitoring
-net-libs/cyassl:cyassl-hardening - Add hardening flags to CFLAGS/LDFLAGS
-net-libs/cyassl:des3 - Enable triple DES support
-net-libs/cyassl:dh - Enable DH cipher support
-net-libs/cyassl:dsa - Enable DSA cipher support
-net-libs/cyassl:dtls - Enable datagram TLS (must be disabled for tests)
-net-libs/cyassl:ecc - Enable Elliptic Curve support
-net-libs/cyassl:errorstrings - Enable error strings table
-net-libs/cyassl:extra - Enable extra OpenSSL API
-net-libs/cyassl:fortress - Enable fortress SSL build (requires extra and SHA512)
-net-libs/cyassl:hc128 - Enable HC-128 support
-net-libs/cyassl:hkdf - Enable HKDF (HMAC-KDF) support
-net-libs/cyassl:httpd - Enable features for yaSSL web server
-net-libs/cyassl:huge - Choose big cache size (excludes small or big)
-net-libs/cyassl:leanpsk - Enable lean PSK support (requires psk)
-net-libs/cyassl:maxfragment - Enable Maximum Fragment Length
-net-libs/cyassl:mcapi - Enable Microchip API
-net-libs/cyassl:md2 - Enable MD2 support
-net-libs/cyassl:md4 - Enable MD4 support
-net-libs/cyassl:md5 - Enable MD5 support
-net-libs/cyassl:memory - Enable memory callbacks
-net-libs/cyassl:nullcipher - Enable nullcipher support
-net-libs/cyassl:ocsp - Enable Online Certificate Status Protocol
-net-libs/cyassl:pkcallbacks - Enable Public Key Callbacks
-net-libs/cyassl:pkcs7 - Enable PKCS7 standard
-net-libs/cyassl:psk - Enable Pre-Shared Key support
-net-libs/cyassl:pwdbased - Enable PWDBASED (requires extra)
-net-libs/cyassl:rabbit - Enable RABBIT cipher support
-net-libs/cyassl:ripemd - Enable RIPEMD-160 support
-net-libs/cyassl:rsa - Enable RSA cihper support
-net-libs/cyassl:savecert - Support certificate saving
-net-libs/cyassl:savesession - Support session saving
-net-libs/cyassl:scep - Enable wolfSCEP
-net-libs/cyassl:sep - Enable sep extensions
-net-libs/cyassl:sessioncerts - Store session certificates
-net-libs/cyassl:sha - Enable SHA cipher support
-net-libs/cyassl:sha512 - Enable SHA-160 support
-net-libs/cyassl:small - Choose small cache size (excludes big or huge)
-net-libs/cyassl:smallstack - Enable Small Stack Usage (excludes big or huge)
-net-libs/cyassl:sni - Enable server name indication
-net-libs/cyassl:sniffer - Allow collection/decryption of SSL traffic
-net-libs/cyassl:supportedcurves - Enable Supported Elliptic Curves
-net-libs/cyassl:testcert - Enable certificate testing
-net-libs/cyassl:tlsx - Enable all TLS Extensions
-net-libs/cyassl:truncatedhmac - Enable Truncated HMAC
net-libs/daq:afpacket - Build the AFPacket data acquisition module. Functions similar to the PCAP module but with better performance. Snort can run unprivileged when using this module. AFpacket supports both inline and passive modes.
net-libs/daq:dump - Build the Dump data acquisition module. The dump DAQ allows you to test the various inline mode features available in 2.9 Snort like injection and normalization.
net-libs/daq:ipq - Build the IPQ data acquisition module. IPQ is the old way to process iptables packets for inline deployments. Snort can not run unprivileged when using this module.
diff --git a/sci-chemistry/openbabel-perl/Manifest b/sci-chemistry/openbabel-perl/Manifest
index 52c92f6a806c..917604de42f8 100644
--- a/sci-chemistry/openbabel-perl/Manifest
+++ b/sci-chemistry/openbabel-perl/Manifest
@@ -1,3 +1,2 @@
-DIST openbabel-2.3.0.tar.gz 14321281 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb SHA512 1f57bf32d174d171e7a2386851b3758c39981536b8c930af9df94eeb81387f64d1fc5a632346021916d5e8f4301b0a4475a9156dbeedc0defd65c51f77a4830a WHIRLPOOL 1534ab834045402a7ecab1f00b809cd9eec30b5c7d46f254158ea9e8588f4eb3aff4e0cdb4f45123b486c50812a6717b83de9d6b232da9a4417d23cc12ef7360
DIST openbabel-2.3.1.tar.gz 20142960 SHA256 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3 SHA512 3cd20d0d8487ab4d8a9c9f1017fb36026cc07e9443b0b245eee23c5b39292cda5a752970a07ba18fb9da42599ba8677d7aa7662984e2552b827b2f88ecd4acd7 WHIRLPOOL 01ba08ba176edd6bd483c9e1d7a2563306b4ab281c00052a533c76da2a4389efe13770cab65b7ca61da50d3eee3c092567f7d12401ec027253e69f213c1c94b4
DIST openbabel-2.3.2.tar.gz 20509105 SHA256 4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188 SHA512 d0e1f8b758ffdd65ec6c31d988bffe3279355e286ce69fad12c5905b3b832e2b73ee95b1061b1576aba1ee9fe4da5e31ec30350c473be17493c657dc80caf919 WHIRLPOOL 74eff18b73d24c8f702e5573a58ba6afba8402e9ce8782de95dc0568575a7d2d632dbc8e8a98b3cd25efdfa7379494f7dcd449342c81ddf73f42a387bce77aaa
diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild
deleted file mode 100644
index 87b63642c99b..000000000000
--- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-perl/openbabel-perl-2.3.0.ebuild,v 1.3 2011/03/29 06:00:42 jlec Exp $
-
-EAPI="3"
-
-inherit cmake-utils eutils perl-module
-
-DESCRIPTION="Perl bindings for OpenBabel"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="
- dev-lang/perl
- ~sci-chemistry/openbabel-${PV}"
-DEPEND="${RDEPEND}
- >=dev-lang/swig-2
- dev-util/cmake"
-
-S="${WORKDIR}/openbabel-${PV}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}/${P}-makefile.patch" \
- "${FILESDIR}"/${P}-swig.patch
-}
-
-src_configure() {
- local mycmakeargs="-DPERL_BINDINGS=ON"
- mycmakeargs="${mycmakeargs}
- -DRUN_SWIG=ON"
- cmake-utils_src_configure
-}
-
-src_compile() {
- cd "${WORKDIR}/${P}_build/scripts"
- perl-module_src_prep
- perl-module_src_compile
-}
-
-src_test() {
- cd "${WORKDIR}/${P}_build/scripts"
- emake test || die "make test failed"
-}
-
-src_install() {
- cd "${WORKDIR}/${P}_build/scripts"
- perl-module_src_install
-}
-
-pkg_preinst() {
- perl-module_pkg_preinst
-}
-
-pkg_postinst() {
- perl-module_pkg_postinst
-}
-
-pkg_prerm() {
- perl-module_pkg_prerm
-}
-
-pkg_postrm() {
- perl-module_pkg_postrm
-}
diff --git a/sci-visualization/circos/Manifest b/sci-visualization/circos/Manifest
index fae51d77b4a4..a749ed41ec85 100644
--- a/sci-visualization/circos/Manifest
+++ b/sci-visualization/circos/Manifest
@@ -1,2 +1 @@
-DIST circos-0.52.tgz 43523958 SHA256 ec38a6f7ea7d25eca887f9d696e101801498ad78db2dd012dfc0605f3d7d0f96
DIST circos-0.55.tgz 10163948 SHA256 3c9f3302b7becb8300d31153d9f8db5552491cb21f5b4cb2f3dc4ca9fd2a362d SHA512 3ebad082acd96b27281e6fcd996fb79022d982a93db59e1f3589a341df7f9855d7554fb92c88c41dc4679e7273d11c0372285a4059ec14a77f11d1d4014db9c1 WHIRLPOOL 4c242fbea59095f24d08eb18c9c9e145e6c7b783581297698a8b21d702019d621709a233bf4ba06928f00ced4eb9e50674f338d12265eaf948533a7ef0a2e251
diff --git a/sci-visualization/circos/circos-0.52.ebuild b/sci-visualization/circos/circos-0.52.ebuild
deleted file mode 100644
index 1fc7079923cf..000000000000
--- a/sci-visualization/circos/circos-0.52.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/circos/circos-0.52.ebuild,v 1.1 2010/05/01 20:33:15 weaver Exp $
-
-EAPI="2"
-
-inherit perl-module
-
-DESCRIPTION="Circular layout visualization of genomic and other data"
-HOMEPAGE="http://mkweb.bcgsc.ca/circos/"
-SRC_URI="http://mkweb.bcgsc.ca/circos/distribution/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-perl/Clone
- dev-perl/GD
- dev-perl/Math-Bezier
- dev-perl/Math-Round
- dev-perl/Math-VecStat
- dev-perl/Params-Validate
- dev-perl/Readonly
- >=dev-perl/Set-IntSpan-1.11
- dev-perl/Graphics-ColorObject
- dev-perl/List-MoreUtils
- dev-perl/Class-Base
- dev-perl/config-general
- virtual/perl-Module-Build"
-RDEPEND="${DEPEND}"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 27df39814381..78cfefd2f521 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,5 @@
DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03
DIST systemd-212.tar.xz 2722692 SHA256 652906b43704fe705cb47757ea9bbbf3c1ab4a1d55ea38b0013a6f2d0863f2c2 SHA512 3e6dac77785cb2f928886886f92cdd11ed00a4db1453699e0102d3ecffa03d1795f44df10239105e4b2b039f0e3e4b5d44c9f876f25c10a6dc4f7e1fbf87c333 WHIRLPOOL 31d1a967435963155c60ca5016f207aa105e9ddcb7d73e9fcde20f7e1fb66701384b81ee01134bf4d75dfa1ea0d412bb352ff11ac6f8c05e836135baf94bbe37
-DIST systemd-213.tar.xz 2782712 SHA256 8a8f73c4a9c0602f3125d6a59e45c9d3fc6db86eb1de6ade4e7fa342cf7f44b2 SHA512 28baaa07ab63e3c4b328dc714b0411c9d895cf48419dbc11b08aa6d3a82557fb0fe0d6d48060a67773d312a9dcb5f7d31be973602cc8b5bcff03a28b4022f6a4 WHIRLPOOL 7ffcc80e6adf25732f03b20e94619895fcdcd1c04dcfd910c3cd58086abb94417971c87d06811936fcbd0d778fcde6f39a487d7e49ea9fa964977dd58af3b97f
DIST systemd-214.tar.xz 2790264 SHA256 0e902796e1dc4e9cd3ee89793936166adb4a538605edd9692e271824c1579b15 SHA512 7e0a7541b7d423c9e8f9d97b8862bb68566bde24e0f6fbc4519c0b32da321d4339bad13dba55af6a45d61c713fbf49ad3e2018fcba1195b772392cbf3a87f83e WHIRLPOOL 443c42a53c0e2b5dd578fcae6155a757dfe98af4a29ac2d89d3030ed0d9b896342ccb048860bc4bc48abdb4d15755f474e3881a5fea2d69aa11c81d201f710f5
DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a
DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417
diff --git a/sys-apps/systemd/systemd-213.ebuild b/sys-apps/systemd/systemd-213.ebuild
deleted file mode 100644
index e7023f6f7ce2..000000000000
--- a/sys-apps/systemd/systemd-213.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-213.ebuild,v 1.5 2014/06/24 22:17:59 mgorny Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
- multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
- user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection
- kdbus lzma pam policykit python qrcode +seccomp selinux ssl
- test vanilla xattr"
-
-MINKV="3.10"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
- sys-libs/libcap:0=
- acl? ( sys-apps/acl:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
- gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=
- ssl? ( >=net-libs/gnutls-3.1.4:0= )
- )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
- >=sys-apps/kmod-15:0=
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam:= )
- python? ( ${PYTHON_DEPS} )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( sys-libs/libseccomp:0= )
- selinux? ( sys-libs/libselinux:0= )
- xattr? ( sys-apps/attr:0= )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/baselayout-2.2
- || (
- >=sys-apps/util-linux-2.22
- "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-migrate_net_name_slot() {
- # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
- # do the same for 80-net-setup-link.rules to keep the old behavior
- local net_move=no
- local net_name_slot_sym=no
- local net_rules_path="${EROOT%/}"/etc/udev/rules.d
- local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
- local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
- if [[ -e ${net_setup_link} ]]; then
- net_move=no
- elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
- net_move=yes
- elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
- net_move=yes
- net_name_slot_sym=yes
- fi
- if [[ ${net_move} == yes ]]; then
- ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
- if [[ ${net_name_slot_sym} == yes ]]; then
- ln -nfs /dev/null "${net_setup_link}"
- else
- cp "${net_name_slot}" "${net_setup_link}"
- fi
- eend $? || FAIL=1
- fi
-}
-
-pkg_postinst() {
- enewgroup systemd-journal
- enewgroup systemd-timesync
- enewuser systemd-timesync -1 -1 -1 systemd-timesync
- if use http; then
- enewgroup systemd-journal-gateway
- enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway
- fi
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required. Despite that this file is owned by sys-apps/hwids.
- if has_version "sys-apps/hwids[udev]"; then
- udevadm hwdb --update --root="${ROOT%/}"
- fi
-
- udev_reload || FAIL=1
-
- # Bug 468876
- fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
- # Bug 465468, make sure locales are respect, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
- migrate_net_name_slot
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if [[ ! -L "${ROOT}"/etc/mtab ]]; then
- ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
- ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
- ewarn "and 'mount' to not work properly. Please run:"
- ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
- ewarn
- fi
-
- if ! has_version sys-apps/systemd-ui; then
- elog "To get additional features, a number of optional runtime dependencies may"
- elog "be installed:"
- elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-215-r1.ebuild b/sys-apps/systemd/systemd-215-r1.ebuild
index d7c75d0e68e5..1eccc1c3a344 100644
--- a/sys-apps/systemd/systemd-215-r1.ebuild
+++ b/sys-apps/systemd/systemd-215-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r1.ebuild,v 1.3 2014/07/15 01:57:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r1.ebuild,v 1.4 2014/07/15 10:01:25 pacho Exp $
EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http
introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux
ssl test vanilla"
diff --git a/sys-apps/systemd/systemd-215.ebuild b/sys-apps/systemd/systemd-215.ebuild
deleted file mode 100644
index f85cc4700f01..000000000000
--- a/sys-apps/systemd/systemd-215.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215.ebuild,v 1.4 2014/07/04 19:04:15 floppym Exp $
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \
- multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
- user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http
- introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux
- ssl test vanilla"
-
-MINKV="3.8"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20:0=
- sys-libs/libcap:0=
- acl? ( sys-apps/acl:0= )
- audit? ( >=sys-process/audit-2:0= )
- cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
- elfutils? ( >=dev-libs/elfutils-0.158:0= )
- gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0= )
- gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] )
- http? (
- >=net-libs/libmicrohttpd-0.9.33:0=
- ssl? ( >=net-libs/gnutls-3.1.4:0= )
- )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= )
- kmod? ( >=sys-apps/kmod-15:0= )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam:= )
- python? ( ${PYTHON_DEPS} )
- qrcode? ( media-gfx/qrencode:0= )
- seccomp? ( sys-libs/libseccomp:0= )
- selinux? ( sys-libs/libselinux:0= )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/baselayout-2.2
- || (
- >=sys-apps/util-linux-2.22
- "${locale_conf}" <<-EOF
- # This file has been created by the sys-apps/systemd ebuild.
- # See locale.conf(5) and localectl(1).
-
- # LANG=${LANG}
- EOF
- eend ${?} || FAIL=1
- fi
- fi
-
- if [[ ! -L ${envd_locale} ]]; then
- # now, if env.d/??locale is not a symlink (to locale.conf)...
- if [[ -e ${envd_locale} ]]; then
- # ...warn the user that he has duplicate locale settings
- ewarn
- ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
- ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
- ewarn "and create the symlink with the following command:"
- ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
- ewarn
- else
- # ...or just create the symlink if there's nothing here
- ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
- ln -n -s ../locale.conf "${envd_locale_def}"
- eend ${?} || FAIL=1
- fi
- fi
-}
-
-migrate_net_name_slot() {
- # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
- # do the same for 80-net-setup-link.rules to keep the old behavior
- local net_move=no
- local net_name_slot_sym=no
- local net_rules_path="${EROOT%/}"/etc/udev/rules.d
- local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
- local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
- if [[ -e ${net_setup_link} ]]; then
- net_move=no
- elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
- net_move=yes
- elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
- net_move=yes
- net_name_slot_sym=yes
- fi
- if [[ ${net_move} == yes ]]; then
- ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
- if [[ ${net_name_slot_sym} == yes ]]; then
- ln -nfs /dev/null "${net_setup_link}"
- else
- cp "${net_name_slot}" "${net_setup_link}"
- fi
- eend $? || FAIL=1
- fi
-}
-
-pkg_postinst() {
- newusergroup() {
- enewgroup "$1"
- enewuser "$1" -1 -1 -1 "$1"
- }
-
- enewgroup input
- enewgroup systemd-journal
- newusergroup systemd-bus-proxy
- newusergroup systemd-network
- newusergroup systemd-resolve
- newusergroup systemd-timesync
- use http && newusergroup systemd-journal-gateway
-
- systemd_update_catalog
-
- # Keep this here in case the database format changes so it gets updated
- # when required. Despite that this file is owned by sys-apps/hwids.
- if has_version "sys-apps/hwids[udev]"; then
- udevadm hwdb --update --root="${ROOT%/}"
- fi
-
- udev_reload || FAIL=1
-
- # Bug 468876
- fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
-
- # Bug 465468, make sure locales are respect, and ensure consistency
- # between OpenRC & systemd
- migrate_locale
-
- # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
- migrate_net_name_slot
-
- if [[ ${FAIL} ]]; then
- eerror "One of the postinst commands failed. Please check the postinst output"
- eerror "for errors. You may need to clean up your system and/or try installing"
- eerror "systemd again."
- eerror
- fi
-
- if [[ ! -L "${ROOT}"/etc/mtab ]]; then
- ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
- ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
- ewarn "and 'mount' to not work properly. Please run:"
- ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
- ewarn
- fi
-
- if ! has_version sys-apps/systemd-ui; then
- elog "To get additional features, a number of optional runtime dependencies may"
- elog "be installed:"
- elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
- fi
-}
-
-pkg_prerm() {
- # If removing systemd completely, remove the catalog database.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
- fi
-}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1043b37c9c0d..58cf4400be90 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.126 2014/07/15 01:57:12 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.127 2014/07/15 10:01:25 pacho Exp $
EAPI=5
@@ -24,7 +24,7 @@ SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http
introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux
ssl test vanilla"
diff --git a/sys-fs/eudev/eudev-1.9-r1.ebuild b/sys-fs/eudev/eudev-1.9-r1.ebuild
index 9ea7cd8682e3..147432496a19 100644
--- a/sys-fs/eudev/eudev-1.9-r1.ebuild
+++ b/sys-fs/eudev/eudev-1.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.9-r1.ebuild,v 1.2 2014/07/14 18:02:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-1.9-r1.ebuild,v 1.3 2014/07/15 08:47:53 zlogene Exp $
EAPI="5"
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-215.ebuild b/sys-fs/udev/udev-215.ebuild
index db8d3e32746a..fd5dd5f3d5fb 100644
--- a/sys-fs/udev/udev-215.ebuild
+++ b/sys-fs/udev/udev-215.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-215.ebuild,v 1.3 2014/07/14 19:25:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-215.ebuild,v 1.4 2014/07/15 11:52:44 ssuominen Exp $
EAPI=5
@@ -362,6 +362,12 @@ multilib_src_install_all() {
# maintainer note: by not letting the upstream build-sys create the .so
# link, you also avoid a parallel make problem
mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+
+ insinto /usr/share/doc/${PF}/html/gudev
+ doins "${S}"/docs/gudev/html/*
+
+ insinto /usr/share/doc/${PF}/html/libudev
+ doins "${S}"/docs/libudev/html/*
}
pkg_preinst() {
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index dab6ba9a17e3..c6297e340787 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -8,6 +8,7 @@ DIST genkernel-3.4.49.1.tar.bz2 266425 SHA256 84f23a7d01aafa3de0ec651c266db1a6d2
DIST genkernel-3.4.49.2.tar.bz2 266427 SHA256 62ade4f83cefc2278e1dc7cf1456974b037a2aedc6dafcaf05c02b53e29a6e34 SHA512 f66b0107438d420a16de546ee28e2a2f09281fcf21c2ffc26c94438ba4c7467e607bf296081954e90d01a92e7db7642091267bade458b837758041a64b0b97ea WHIRLPOOL 626adac32a9b4c9f1ab9acc62a2354d894db806171a4fe28bd4697e28b7315d2ac1da1fcc438fbdb8ce5d9ce9bb88269c4e4f549122bae425b8d98e7f32315fa
DIST genkernel-3.4.49.tar.bz2 289872 SHA256 7212b1c80e63db9949f2a72f160b06ece6d886980aee5c165050e92b400bcd49 SHA512 4116656544d8bb30f79a86366dae58f8c52942ce831b4e3d263b103dfb76afb92d22bc44038212c53285b0ab5803d7931a4a5e9595b275f0f254c22249eddff4 WHIRLPOOL 27c7db14abe33fc5546c95681d7e14ed9d364457e2df0bf3f6d98bf9afcc3e0fdfc743ac0b645b2421aefe950ff4b6b30d4a6eab3b15a787e3b0faca100a5bd5
DIST genkernel-3.4.50.tar.bz2 273874 SHA256 d1450b9a38837147f3ec2600bcd05a56df5537a1d9de0c41db123833a5f2f450 SHA512 8b56c0736abaffa1c04dd1315d38ed35be46b72a2e20b5602e946dbabde9c05a66691d3059306f58a17f436124912dd0b39ccc012fff8562b1531cfcb90e7d28 WHIRLPOOL 09d88f2013267021e792b784850057472b40d216b45c8cd8f67c9340c30ee4cdf8161beaa7fd628fb71755a35fed6e64adddd9b957f5c5b7698207fb70d4a7e4
+DIST genkernel-3.4.51.tar.bz2 273918 SHA256 6256510fa8966e8d6929f66679a1af249aacc564c91c9869decbab0a2f789bd7 SHA512 0a845e9ff0aeb15c75faaf0c1aac80e79ce30c0a907e3e028e0f3feb66e34005991a7b5e82b2281c60bf857f77b15c3d405cf698375caf398fc8e9d7504326d1 WHIRLPOOL 1e28036c2eabd3eb7ed4017347c1f6a44cba0ce2202898f19d3332e3217a65e9e6500b5ddb30774007d222422fe6218de93a1efc12eb6f33171a42b07722b33d
DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
diff --git a/sys-kernel/genkernel/genkernel-3.4.51.ebuild b/sys-kernel/genkernel/genkernel-3.4.51.ebuild
new file mode 100644
index 000000000000..a591a4734dd3
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.51.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.51.ebuild,v 1.1 2014/07/15 07:36:57 robbat2 Exp $
+
+# genkernel-9999 -> latest Git branch "master"
+# genkernel-VERSION -> normal genkernel release
+
+EAPI="3"
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+ ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+ mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+ ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+ ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+ ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+ http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+ mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+ http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+ mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+ http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+ inherit git-2 bash-completion-r1 eutils
+ S="${WORKDIR}/${PN}"
+ SRC_URI="${COMMON_URI}"
+ KEYWORDS=""
+else
+ inherit bash-completion-r1 eutils
+ SRC_URI="mirror://gentoo/${P}.tar.bz2
+ ${COMMON_URI}"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+ selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+ cryptsetup? ( sys-fs/cryptsetup )
+ app-arch/cpio
+ >=app-misc/pax-utils-0.2.1
+ !/dev/null || die
+ git log > "${S}"/ChangeLog || die
+ popd >/dev/null || die
+ fi
+ use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+
+ # Update software.sh
+ sed -i \
+ -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+ -e "s:VERSION_MDADM:$VERSION_MDADM:" \
+ -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+ -e "s:VERSION_FUSE:$VERSION_FUSE:" \
+ -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+ -e "s:VERSION_LVM:$VERSION_LVM:" \
+ -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+ -e "s:VERSION_GPG:$VERSION_GPG:" \
+ "${S}"/defaults/software.sh \
+ || die "Could not adjust versions"
+
+ epatch_user
+}
+
+src_compile() {
+ if [[ ${PV} == 9999* ]]; then
+ emake || die
+ fi
+}
+
+src_install() {
+ insinto /etc
+ doins "${S}"/genkernel.conf || die "doins genkernel.conf"
+
+ doman genkernel.8 || die "doman"
+ dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+ dobin genkernel || die "dobin genkernel"
+
+ rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+ insinto /usr/share/genkernel
+ doins -r "${S}"/* || die "doins"
+ use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+ cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+ # Copy files to /var/cache/genkernel/src
+ GKDISTDIR=/usr/share/genkernel/distfiles/
+ elog "Copying files to ${GKDISTDIR}..."
+ insinto $GKDISTDIR
+ doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
+ doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
+ doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
+ doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
+ doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
+ doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+ doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
+ doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
+
+ newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+ insinto /etc
+ doins "${FILESDIR}"/initramfs.mounts
+}
+
+pkg_postinst() {
+ echo
+ elog 'Documentation is available in the genkernel manual page'
+ elog 'as well as the following URL:'
+ echo
+ elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+ echo
+ ewarn "This package is known to not work with reiser4. If you are running"
+ ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
+ ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+ ewarn "broken in this regard. Try using a sane filesystem like ext3 or"
+ ewarn "even reiser3."
+ echo
+ ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
+ ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+ echo
+ if use crypt && ! use cryptsetup ; then
+ ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+ ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+ ewarn "to have genkernel create an initramfs with LUKS support."
+ ewarn "Sorry for the inconvenience."
+ echo
+ fi
+}
diff --git a/www-client/w3mir/w3mir-1.0.10-r2.ebuild b/www-client/w3mir/w3mir-1.0.10-r2.ebuild
new file mode 100644
index 000000000000..43b1d5f5606e
--- /dev/null
+++ b/www-client/w3mir/w3mir-1.0.10-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mir/w3mir-1.0.10-r2.ebuild,v 1.1 2014/07/15 09:14:10 zlogene Exp $
+
+EAPI=5
+
+inherit eutils perl-app
+
+DESCRIPTION="w3mir is a all purpose HTTP copying and mirroring tool"
+SRC_URI="http://langfeldt.net/w3mir/${P}.tar.gz"
+HOMEPAGE="http://langfeldt.net/w3mir/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~arm-linux ~x86-linux"
+
+DEPEND="${DEPEND}
+ >=dev-perl/URI-1.0.9
+ >=dev-perl/libwww-perl-5.64-r1
+ >=virtual/perl-MIME-Base64-2.12"
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${P}-cwd.diff"
+}