Added the full elimination of sabayon-version

author: BlackNoxis <steven.darklight@gmail.com> 2014-11-07 12:54:17 +0200
committer: BlackNoxis <steven.darklight@gmail.com> 2014-11-07 12:54:17 +0200
commit: 5a01792340999d37435f5000a3f6b8e0f2d11815 (patch)
tree: 4bcca1f73cc4ab721b3c31ea81585917f909ebc7 /dev-libs
parent: 86c8d1f28bd2b785ccbb28f41c4e0763d062ba2f (diff)
51 files changed, 4149 insertions, 0 deletions
diff --git a/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild b/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
new file mode 100644
index 00000000..4dac682b
--- /dev/null
+++ b/dev-libs/d0_blind_id/d0_blind_id-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+EGIT_REPO_URI="git://git.xonotic.org/xonotic/${PN}.git"
+
+[[ ${PV} == *9999 ]] && SCM="autotools git-2"
+inherit base ${SCM}
+unset SCM
+
+DESCRIPTION="Blind-ID library for user identification using RSA blind signatures"
+HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt openssl  static-libs"
+
+RDEPEND="
+	!openssl? ( dev-libs/gmp )
+	openssl? ( dev-libs/openssl )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
+
+pkg_setup() {
+	use crypt || ewarn "You will have no encryption, only authentication."
+	use openssl && ewarn "OpenSSL is for Mac OS X users only, GMP is faster."
+}
+
+src_prepare() {
+	base_src_prepare
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable crypt rijndael) \
+		$(use_with openssl) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	dodoc d0_blind_id.txt
+}
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
new file mode 100644
index 00000000..84a25628
--- /dev/null
+++ b/dev-libs/gobject-introspection/Manifest
@@ -0,0 +1,2 @@
+DIST gobject-introspection-1.38.0.tar.xz 1226324 SHA256 3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73 SHA512 2eeafbb09484988c8489757232233aa9bf5cefecf7f80ed940867cf721e271644f7e94d8ae3b18717340ba3af1c208701c4766b1113af03972311517fda10e8f WHIRLPOOL 7dbab4e983095a12d6711236cd198473a326b100c67958693edf4a236cab6a922234b0e809d171fac1a2c860e29f7775f74a70589c1e1a124c137769ddd540e0
+DIST gobject-introspection-1.40.0.tar.xz 1286424 SHA256 96ea75e9679083e7fe39a105e810e2ead2d708abf189a5ba420bfccfffa24e98 SHA512 d6cc91be018d812f1b04281bc322b8809c2cc12e5e16adf8b826a82505315ec140ce2b823c107ed98c6dced8f62afb6071eed2702a9e76b0e8e73ad193824c04 WHIRLPOOL b5ab2bb221816802cd3d1d3aedcb6b9b5ea9f516b51b4a3a892de1098d834c78cf94aa3e552dc58f0d2530c032e9ba08b41c24b31992afc4493ac3f0bfdc2f78
diff --git a/dev-libs/gobject-introspection/files/disable_python.patch b/dev-libs/gobject-introspection/files/disable_python.patch
new file mode 100644
index 00000000..aec1394c
--- /dev/null
+++ b/dev-libs/gobject-introspection/files/disable_python.patch
@@ -0,0 +1,33 @@
+--- configure.ac_orig	2013-03-23 12:21:11.907228112 +0100
++++ configure.ac	2013-03-23 12:21:53.982820539 +0100
+@@ -259,18 +259,18 @@
+ AC_CHECK_FUNCS([backtrace backtrace_symbols])
+ 
+ # Python
+-AM_PATH_PYTHON([2.6])
+-case "$host" in
+-*-*-mingw*)
+-	# Change backslashes to forward slashes in pyexecdir to avoid
+-	# quoting issues
+-	pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
+-	;;
+-esac
+-AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
+-if test "x$os_win32" = "xyes"; then
+-  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
+-fi
++#AM_PATH_PYTHON([2.6])
++#case "$host" in
++#*-*-mingw*)
++#	# Change backslashes to forward slashes in pyexecdir to avoid
++#	# quoting issues
++#	pyexecdir=`echo $pyexecdir | tr '\\\\' '/'`
++#	;;
++#esac
++#AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
++#if test "x$os_win32" = "xyes"; then
++#  AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
++#fi
+ 
+ dnl Not enabled by default until 3.6 cycle when we can propose mako as
+ dnl an external dependency
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
new file mode 100644
index 00000000..5823899e
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.5 2013/07/27 17:12:33 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="cairo doctool test"
+REQUIRED_USE="test? ( cairo )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	doctool? ( dev-python/mako )
+	virtual/libffi:=[${MULTILIB_USEDEP}]
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib,${MULTILIB_USEDEP}] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+disable_python_for_x86() {
+	# x86 build on AMD64 fails due to missing 32bit python. We just remove the
+	# Python parts and those that depend on it as they are not required.
+	if use amd64 && [ "$ABI" == "x86" ]; then
+		cd ${BUILD_DIR}
+
+		# disable configure checks
+		epatch ${FILESDIR}/disable_python.patch
+
+		# disable python bindings
+		sed -i "s/include Makefile-giscanner.am//" Makefile.am || die "sed failed"
+
+		# disable stuff that doesn't get installed anyways
+		sed -i "s/include Makefile-tools.am//" Makefile.am || die "sed failed"
+		sed -i "s/include Makefile-gir.am//" Makefile.am || die "sed failed"
+
+		# disable tests
+		sed -i "s/SUBDIRS = . docs tests/SUBDIRS = . docs/" Makefile.am || die "sed failed"
+		eautoreconf
+	fi
+}
+
+src_prepare() {
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_prepare
+
+	# avoid GNU-isms
+	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
+
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	multilib_copy_sources
+	multilib_foreach_abi disable_python_for_x86
+}
+
+multilib_src_configure(){
+	gnome2_src_configure \
+		--disable-static \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
new file mode 100644
index 00000000..84a6ee52
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.5 2013/07/27 17:12:33 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
+HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="cairo doctool test"
+REQUIRED_USE="test? ( cairo )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	doctool? ( dev-python/mako )
+	virtual/libffi:=[${MULTILIB_USEDEP}]
+	!<dev-lang/vala-0.20.0
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	x11-proto/xproto[${MULTILIB_USEDEP}]
+"
+# PDEPEND to avoid circular dependencies, bug #391213
+PDEPEND="cairo? ( x11-libs/cairo[glib,${MULTILIB_USEDEP}] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+disable_python_for_x86() {
+	# x86 build on AMD64 fails due to missing 32bit python. We just remove the
+	# Python parts and those that depend on it as they are not required.
+	if use amd64 && [ "$ABI" == "x86" ]; then
+		cd ${BUILD_DIR}
+
+		# disable configure checks
+		epatch ${FILESDIR}/disable_python.patch
+
+		# disable python bindings
+		sed -i "s/include Makefile-giscanner.am//" Makefile.am || die "sed failed"
+
+		# disable stuff that doesn't get installed anyways
+		sed -i "s/include Makefile-tools.am//" Makefile.am || die "sed failed"
+		sed -i "s/include Makefile-gir.am//" Makefile.am || die "sed failed"
+
+		# disable tests
+		sed -i "s/SUBDIRS = . docs tests/SUBDIRS = . docs/" Makefile.am || die "sed failed"
+		eautoreconf
+	fi
+}
+
+src_prepare() {
+	# To prevent crosscompiling problems, bug #414105
+	CC=$(tc-getCC)
+
+	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
+	gnome2_src_prepare
+
+	# avoid GNU-isms
+	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
+
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	multilib_copy_sources
+	multilib_foreach_abi disable_python_for_x86
+}
+
+multilib_src_configure(){
+	gnome2_src_configure \
+		--disable-static \
+		YACC=$(type -p yacc) \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/guiloader-c++/Manifest b/dev-libs/guiloader-c++/Manifest
new file mode 100644
index 00000000..805cf7cc
--- /dev/null
+++ b/dev-libs/guiloader-c++/Manifest
@@ -0,0 +1 @@
+DIST guiloader-c++-2.21.0.tar.bz2 301239 SHA256 e8e9bfcf35ebca28b9cf725bbd54bbdc2bf427a16b80d907b91d9c2f91a7ece4
diff --git a/dev-libs/guiloader-c++/files/guiloader-c++-2.21.0-gcc46.patch b/dev-libs/guiloader-c++/files/guiloader-c++-2.21.0-gcc46.patch
new file mode 100644
index 00000000..f5bcc52f
--- /dev/null
+++ b/dev-libs/guiloader-c++/files/guiloader-c++-2.21.0-gcc46.patch
@@ -0,0 +1,10 @@
+--- guiloader-c++-2.21.0.orig/guiloader-c++/guiloader-c++.h
++++ guiloader-c++-2.21.0/guiloader-c++/guiloader-c++.h
+@@ -26,6 +26,7 @@
+ #ifndef GUILOADER_CPP_GUILOADER_CPP_H
+ #define GUILOADER_CPP_GUILOADER_CPP_H
+ 
++#include <cstddef>
+ #include <string>
+ #include <sigc++/sigc++.h>
+ #include <gtkmm.h>
diff --git a/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild b/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
new file mode 100644
index 00000000..cb71fbea
--- /dev/null
+++ b/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild,v 1.3 2011/07/26 21:16:02 maekke Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="C++ binding to GuiLoader library"
+HOMEPAGE="http://www.crowdesigner.org"
+SRC_URI="http://nothing-personal.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+LANGS="ru"
+
+RDEPEND=">=dev-libs/guiloader-2.21
+	>=dev-cpp/gtkmm-2.22:2.4
+	>=dev-cpp/glibmm-2.24:2"
+DEPEND="${RDEPEND}
+		dev-libs/boost
+		dev-util/pkgconfig
+		nls? ( >=sys-devel/gettext-0.18 )"
+
+for x in ${LANGS}; do
+	IUSE="${IUSE} linguas_${x}"
+done
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc doc/{authors.txt,news.en.txt,readme.en.txt} || die
+}
diff --git a/dev-libs/guiloader-c++/metadata.xml b/dev-libs/guiloader-c++/metadata.xml
new file mode 100644
index 00000000..d1cfa95c
--- /dev/null
+++ b/dev-libs/guiloader-c++/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>pva@gentoo.org</email>
+	<name>Peter Volkov</name>
+</maintainer>
+	<longdescription lang="en">
+		GuiLoader/C++ is a C++ binding to GuiLoader library. It is a convenience
+		layer that simplifies development of GuiLoader based applications
+		written in C++ language by introducing exception safety, binding GTK+
+		objects d efined in GuiXml to C++ variables and type-safe dynamic
+		connection to signals.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-libs/libcitadel/ChangeLog b/dev-libs/libcitadel/ChangeLog
new file mode 100644
index 00000000..89308e90
--- /dev/null
+++ b/dev-libs/libcitadel/ChangeLog
@@ -0,0 +1,62 @@
+# ChangeLog for dev-libs/libcitadel
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*libcitadel-8.04 (19 Feb 2012)
+
+  19 Feb 2012; the_mgt themgt@uncensored.citadel.org -libcitadel-7.86.ebuild,
+  +libcitadel-8.04.ebuild:
+  Version bump to 8.04, EAPI=4 and minor improvements. Thanks to floppym and
+  hasufell.
+
+  21 Apr 2011; the_mgt themgt@mail.ru libcitadel-7.86.ebuild:
+  Fixed a typo in replace-flags: Used zero instead of O for -O3 filtering
+
+  21 Apr 2011; the_mgt themgt@mail.ru -libcitadel-7.85.ebuild,
+  +libcitadel-7.86.ebuild:
+  Version bump due to fresh release of whole Citadel suite
+
+  17 Mar 2011; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
+  libcitadel-7.85.ebuild:
+  Remove newline which confuses repoman.
+
+  29 Jan 2011; the_mgt the_mgt themgt@mail.ru -libcitadel-7.84.ebuild,
+  +libcitadel-7.85.ebuild:
+  Version Bump, added flag filtering for -O3, since it also contains -finline-functions. Waiting for upstream fix.
+
+  20 Dec 2010; the_mgt themgt@mail.ru -libcitadel-7.83.ebuild,
+  +libcitadel-7.84.ebuild:
+  Late version bump to most recent version of Citadel suite packages
+
+  13 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  libcitadel-7.83.ebuild:
+  Replace spaces with tab
+
+  10 Aug 2010; the_mgt (the_mgt) <themgt@mail.ru> libcitadel-7.83.ebuild:
+  Re-added the install phase so the files compiled by this ebuild do really
+  get installed...
+
+  03 Aug 2010; the_mgt (the_mgt) <themgt@mail.ru> -libcitadel-7.81.ebuild,
+  +libcitadel-7.83.ebuild:
+  Version bump by renaming the libcitadel ebuild
+
+  22 Jul 2010; the_mgt (the_mgt) <themgt@mail.ru> -libcitadel-7.72.ebuild,
+  +libcitadel-7.81.ebuild:
+  Version bump to 7.81, added flag-o-matic filter for -finline-functions
+
+  21 Feb 2010; the_mgt themgt@mail.ru -libcitadel-7.71.ebuild,
+  +libcitadel-7.72.ebuild:
+  Version bump for libcitadel, bugfix/maintenance update
+
+  08 Feb 2010; the_mgt themgt@mail.ru -libcitadel-7.66.ebuild,
+  +libcitadel-7.71.ebuild:
+  Version bump for libcitadel to current 7.71 version
+
+  04 Oct 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -libcitadel-7.63.ebuild, metadata.xml:
+  Nuke old version, fix metadata.xml and Changelog
+
+  04 Oct 2009; the_mgt themgt@mail.ru +libcitadel-7.63.ebuild,
+  +libcitadel-7.66.ebuild, +metadata.xml:
+  New Ebuild for bug 286323, blocking bug 62119 and 123139. Thanks for the
+  reviews and help to the people of #gentoo-sunrise
diff --git a/dev-libs/libcitadel/Manifest b/dev-libs/libcitadel/Manifest
new file mode 100644
index 00000000..05c22c16
--- /dev/null
+++ b/dev-libs/libcitadel/Manifest
@@ -0,0 +1 @@
+DIST libcitadel-8.04.tar.gz 578398 SHA256 a8ceff160ed6b7ea5a22e245a98966be305230ddd83d3552d30c4334a410c14b
diff --git a/dev-libs/libcitadel/libcitadel-8.04.ebuild b/dev-libs/libcitadel/libcitadel-8.04.ebuild
new file mode 100644
index 00000000..09d55dbf
--- /dev/null
+++ b/dev-libs/libcitadel/libcitadel-8.04.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit flag-o-matic
+
+DESCRIPTION="Code shared across all the components of a Citadel system"
+HOMEPAGE="http://citadel.org/"
+SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/expat
+	dev-libs/libical
+	net-misc/curl
+	mail-filter/libsieve
+	sys-libs/db
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	filter-flags -finline-functions
+	replace-flags -O3 -O2
+	default
+}
diff --git a/dev-libs/libcitadel/metadata.xml b/dev-libs/libcitadel/metadata.xml
new file mode 100644
index 00000000..29db3a8d
--- /dev/null
+++ b/dev-libs/libcitadel/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<longdescription>libcitadel contains code which is shared across all
+		the components which make up the Citadel system. It is needed
+		by mail-mta/citadel and www-servers/webcit
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>IGnatiusTFoobar@uncensored.citadel.org</email>
+			<name>IGnatius T Foobar</name>
+		</maintainer>
+		<doc>http://www.citadel.org/doku.php/doku.php?id=documentation:start</doc>
+		<bugs-to>http://bugzilla.citadel.org/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
new file mode 100644
index 00000000..05a3df1f
--- /dev/null
+++ b/dev-libs/libnl/Manifest
@@ -0,0 +1 @@
+DIST libnl-1.1.tar.gz 288932 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3
diff --git a/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch b/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch
new file mode 100644
index 00000000..ffa61a18
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch
@@ -0,0 +1,15 @@
+--- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64	2005-11-02 12:29:06.000000000 -0500
++++ libnl-1.0-pre5/include/netlink-local.h	2006-05-26 20:09:28.000000000 -0400
+@@ -30,11 +30,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-typedef uint8_t		__u8;
+-typedef uint16_t	__u16;
+-typedef uint32_t	__u32;
+-typedef int32_t		__s32;
+-typedef uint64_t	__u64;
++#include <asm/types.h>
+ 
+ /* local header copies */
+ #include <linux/if.h>
diff --git a/dev-libs/libnl/files/libnl-1.0_pre5-include.diff b/dev-libs/libnl/files/libnl-1.0_pre5-include.diff
new file mode 100644
index 00000000..f858953c
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.0_pre5-include.diff
@@ -0,0 +1,10 @@
+--- libnl-0.5.0.orig/include/netlink/route/tc.h	2005-09-08 19:13:15.000000000 -0300
++++ libnl-0.5.0/include/netlink/route/tc.h	2005-09-08 19:32:33.000000000 -0300
+@@ -24,6 +24,7 @@
+ #include <netlink/netlink.h>
+ #include <netlink/cache.h>
+ #include <netlink/data.h>
++#include <linux/pkt_sched.h>
+ 
+ #define TCA_HAS_HANDLE    0x001
+ #define TCA_HAS_PARENT    0x002
diff --git a/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch b/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch
new file mode 100644
index 00000000..fb89baa7
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.0_pre6-__u64_x86_64.patch
@@ -0,0 +1,15 @@
+--- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64	2005-11-02 12:29:06.000000000 -0500
++++ libnl-1.0-pre5/include/netlink-local.h	2006-05-26 20:09:28.000000000 -0400
+@@ -30,11 +30,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ 
+-typedef uint8_t		__u8;
+-typedef uint16_t	__u16;
+-typedef uint32_t	__u32;
+-typedef int32_t		__s32;
+-typedef uint64_t	__u64;
++#include <linux/types.h>
+ 
+ /* local header copies */
+ #include <linux/if.h>
diff --git a/dev-libs/libnl/files/libnl-1.1-types.patch b/dev-libs/libnl/files/libnl-1.1-types.patch
new file mode 100644
index 00000000..8c639a47
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.1-types.patch
@@ -0,0 +1,11 @@
+diff -Nurp libnl-1.1.orig/include/linux/if_link.h libnl-1.1/include/linux/if_link.h
+--- libnl-1.1.orig/include/linux/if_link.h	2008-01-30 17:47:40.000000000 +0000
++++ libnl-1.1/include/linux/if_link.h	2008-01-30 17:47:51.000000000 +0000
+@@ -1,6 +1,7 @@
+ #ifndef _LINUX_IF_LINK_H
+ #define _LINUX_IF_LINK_H
+ 
++typedef unsigned long long __u64;
+ #include <linux/netlink.h>
+ 
+ /* The struct should be in sync with struct net_device_stats */
diff --git a/dev-libs/libnl/files/libnl-1.pc b/dev-libs/libnl/files/libnl-1.pc
new file mode 100644
index 00000000..6dd5a895
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-1.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: libnl
+Description: Convenience library for netlink sockets
+Version: 1.0-pre3
+Libs: -L${libdir} -lnl
+Cflags:
diff --git a/dev-libs/libnl/libnl-1.1.ebuild b/dev-libs/libnl/libnl-1.1.ebuild
new file mode 100644
index 00000000..8db8c944
--- /dev/null
+++ b/dev-libs/libnl/libnl-1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild,v 1.1 2007/12/01 19:47:49 rbu Exp $
+
+inherit eutils multilib linux-info versionator
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
+SRC_URI="http://people.suug.ch/~tgr/libnl/files/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+	sed -i Makefile -e 's:install -o root -g root:install:'
+
+	cd "${S}/include"
+	sed -i Makefile -e 's:install -o root -g root:install:g'
+	epatch "${FILESDIR}/${PN}-1.0_pre5-include.diff"
+	epatch "${FILESDIR}/${P}-types.patch"
+	
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
new file mode 100644
index 00000000..acce5f79
--- /dev/null
+++ b/dev-libs/libreport/Manifest
@@ -0,0 +1,2 @@
+DIST libreport-2.0.20.tar.gz 1323225 SHA256 a2a66b97e1e345f18837f39657210931bd6cb9bebc33f56736e56380ddbf743e SHA512 f57e0819351fecbd37e8511b3ef88eeb3885fdfc51bb1c7835ef70929fb7c59177db4f967b069674f3521c805d90a795436f509a63211638bd0c82cf4d58782b WHIRLPOOL 605f9e3f39f98fbd6903238e5b861f1bf61caff68a14dec6265eca72df94de8d299bae07a27d1588abcb19d88c138f7ab18074b3359992e0288b43b1948be51b
+DIST libreport-2.1.9.tar.gz 1567949 SHA256 ebc4db230e915c6d8d2f97b9ee148524ed017d8fb09c5b4607bdbeb9f435052a SHA512 442ecbb2029e550fb0737555c6d7c5e29bf34fcd89e52da767b42816ee2bb7f5fc8e8d58833e40ded72ffa016d3b1cb1782d0c1ede94f0210341c09752113fd4 WHIRLPOOL 3bd4e7776f768e772716d1fc5ed3f07b2913b60343379baba3071d8f70c591946af50d412830ee551505b2ba80b7367a6d96d4f8e10d618527dc779cb9727500
diff --git a/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch b/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch
new file mode 100644
index 00000000..8fa847b5
--- /dev/null
+++ b/dev-libs/libreport/files/0001-Add-Kogaion-customizations.patch
@@ -0,0 +1,108 @@
+From 1b071a4f6529e4753519b0a9c5a68ac258f4a03a Mon Sep 17 00:00:00 2001
+From: Stefan Cristian B. <stefan.cristian@rogentos.ro>
+Date: Sat, 10 May 2014 15:45:58 +0100
+Subject: [PATCH] Add Sabayon customizations
+
+---
+ src/include/internal_libreport.h | 4 ++--
+ src/lib/dump_dir.c               | 2 +-
+ src/plugins/bugzilla.conf        | 2 +-
+ src/plugins/report_Bugzilla.conf | 2 +-
+ src/plugins/reporter-bugzilla.c  | 2 +-
+ src/report-python/__init__.py    | 6 +++---
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
+index db2ffd8..e61a80f 100644
+--- a/src/include/internal_libreport.h
++++ b/src/include/internal_libreport.h
+@@ -840,13 +840,13 @@ struct dump_dir *open_directory_for_writing(
+ #define FILENAME_KERNEL       "kernel"
+ /*
+  * From /etc/os-release
+- * os_release filename name is alredy occupied by /etc/redhat-release (see
++ * os_release filename name is alredy occupied by /etc/kogaion-release (see
+  * below) in sake of backward compatibility /etc/os-release is stored in
+  * os_info file
+  */
+ #define FILENAME_OS_INFO      "os_info"
+ #define FILENAME_OS_INFO_IN_ROOTDIR "os_info_in_rootdir"
+-// From /etc/system-release or /etc/redhat-release
++// From /etc/system-release or /etc/kogaion-release
+ #define FILENAME_OS_RELEASE   "os_release"
+ #define FILENAME_OS_RELEASE_IN_ROOTDIR "os_release_in_rootdir"
+ // Filled by <what?>
+diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
+index 83f898b..63b6492 100644
+--- a/src/lib/dump_dir.c
++++ b/src/lib/dump_dir.c
+@@ -672,7 +672,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid, const char *chroot_di
+         release = load_text_file("/etc/system-release",
+                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE | DD_OPEN_FOLLOW);
+         if (!release)
+-            release = load_text_file("/etc/redhat-release",
++            release = load_text_file("/etc/kogaion-release",
+                     DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE | DD_OPEN_FOLLOW);
+         if (!release)
+             release = load_text_file("/etc/SuSE-release", DD_OPEN_FOLLOW);
+diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
+index 29c44b3..c495f13 100644
+--- a/src/plugins/bugzilla.conf
++++ b/src/plugins/bugzilla.conf
+@@ -1,5 +1,5 @@
+ # Bugzilla URL
+-BugzillaURL = https://bugzilla.redhat.com/
++BugzillaURL = https://bugs.rogentos.ro/
+ # yes means that ssl certificates will be checked
+ SSLVerify = yes
+ # your login has to exist, if you don have any, please create one
+diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf
+index f1a77f5..9e6f875 100644
+--- a/src/plugins/report_Bugzilla.conf
++++ b/src/plugins/report_Bugzilla.conf
+@@ -1,4 +1,4 @@
+-Bugzilla_BugzillaURL = https://bugzilla.redhat.com
++Bugzilla_BugzillaURL = https://bugs.rogentos.ro
+ Bugzilla_Login =
+ Bugzilla_Password =
+ Bugzilla_SSLVerify = yes
+diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
+index a45419c..01e2b6d 100644
+--- a/src/plugins/reporter-bugzilla.c
++++ b/src/plugins/reporter-bugzilla.c
+@@ -696,7 +696,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_t *settings)
+     environ = getenv("Bugzilla_BugzillaURL");
+     b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL");
+     if (!b->b_bugzilla_url[0])
+-        b->b_bugzilla_url = "https://bugzilla.redhat.com";
++        b->b_bugzilla_url = "https://bugs.rogentos.ro";
+     else
+     {
+         /* We don't want trailing '/': "https://host/dir/" -> "https://host/dir" */
+diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py
+index 2c58736..26368bd 100644
+--- a/src/report-python/__init__.py
++++ b/src/report-python/__init__.py
+@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, NewtIO
+ 
+ import os
+ 
+-SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"]
+-SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"]
++SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/rogentos-release"]
++SYSTEM_RELEASE_DEPS = ["kogaion-version"]
+ 
+ _hardcoded_default_product = ""
+ _hardcoded_default_version = ""
+@@ -178,7 +178,7 @@ def createPythonUnhandledExceptionSignature(**kwargs):
+     version = getVersion()
+     if version:
+         pd.add("version", version)
+-    #libreport expect the os_release as in /etc/redhat-release
++    #libreport expect the os_release as in /etc/rogentos-release
+     if (version and product):
+         # need to add "release", parse_release() expects format "<product> release <version>"
+         pd.add("os_release", product +" release "+ version)
+-- 
+1.9.2
+
diff --git a/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch b/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch
new file mode 100644
index 00000000..4758e866
--- /dev/null
+++ b/dev-libs/libreport/files/0002-Drop-Fedora-workflows-add-Sabayon-one.patch
@@ -0,0 +1,376 @@
+From bc95f13701e018f4dc07e6c206c8b638acc6113a Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sat, 10 May 2014 18:05:10 +0100
+Subject: [PATCH 2/2] Drop Fedora workflows, add Sabayon one
+
+---
+ src/workflows/Makefile.am                      | 33 ++++----------------------
+ src/workflows/anaconda_event.conf              |  3 +--
+ src/workflows/report_fedora.conf               | 19 ---------------
+ src/workflows/report_rhel.conf                 | 19 ---------------
+ src/workflows/workflow_AnacondaFedora.xml.in   |  9 -------
+ src/workflows/workflow_AnacondaRHEL.xml.in     |  9 -------
+ src/workflows/workflow_AnacondaSabayon.xml.in  |  9 +++++++
+ src/workflows/workflow_FedoraCCpp.xml.in       | 13 ----------
+ src/workflows/workflow_FedoraKerneloops.xml.in | 12 ----------
+ src/workflows/workflow_FedoraPython.xml.in     | 12 ----------
+ src/workflows/workflow_FedoraVmcore.xml.in     | 13 ----------
+ src/workflows/workflow_FedoraXorg.xml.in       |  9 -------
+ src/workflows/workflow_RHELCCpp.xml.in         | 10 --------
+ src/workflows/workflow_RHELKerneloops.xml.in   | 10 --------
+ src/workflows/workflow_RHELPython.xml.in       | 10 --------
+ src/workflows/workflow_RHELvmcore.xml.in       | 10 --------
+ src/workflows/workflow_RHELxorg.xml.in         |  9 -------
+ 17 files changed, 14 insertions(+), 195 deletions(-)
+ delete mode 100644 src/workflows/report_fedora.conf
+ delete mode 100644 src/workflows/report_rhel.conf
+ delete mode 100644 src/workflows/workflow_AnacondaFedora.xml.in
+ delete mode 100644 src/workflows/workflow_AnacondaRHEL.xml.in
+ create mode 100644 src/workflows/workflow_AnacondaSabayon.xml.in
+ delete mode 100644 src/workflows/workflow_FedoraCCpp.xml.in
+ delete mode 100644 src/workflows/workflow_FedoraKerneloops.xml.in
+ delete mode 100644 src/workflows/workflow_FedoraPython.xml.in
+ delete mode 100644 src/workflows/workflow_FedoraVmcore.xml.in
+ delete mode 100644 src/workflows/workflow_FedoraXorg.xml.in
+ delete mode 100644 src/workflows/workflow_RHELCCpp.xml.in
+ delete mode 100644 src/workflows/workflow_RHELKerneloops.xml.in
+ delete mode 100644 src/workflows/workflow_RHELPython.xml.in
+ delete mode 100644 src/workflows/workflow_RHELvmcore.xml.in
+ delete mode 100644 src/workflows/workflow_RHELxorg.xml.in
+
+diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
+index 7f1e676..33fb8e6 100644
+--- a/src/workflows/Makefile.am
++++ b/src/workflows/Makefile.am
+@@ -1,30 +1,17 @@
+ workflowsdir = $(WORKFLOWS_DIR)
+ 
+ dist_workflows_DATA = \
+-    workflow_FedoraCCpp.xml \
+-    workflow_FedoraKerneloops.xml \
+-    workflow_FedoraPython.xml \
+-    workflow_FedoraVmcore.xml \
+-    workflow_FedoraXorg.xml \
+-    workflow_Upload.xml \
+-    workflow_RHELCCpp.xml \
+-    workflow_RHELKerneloops.xml \
+-    workflow_RHELPython.xml \
+-    workflow_RHELvmcore.xml \
+-    workflow_RHELxorg.xml
++    workflow_Upload.xml
+ 
+ if BUILD_BUGZILLA
+ dist_workflows_DATA += \
+-    workflow_AnacondaFedora.xml \
+-    workflow_AnacondaRHEL.xml \
++    workflow_AnacondaSabayon.xml \
+     workflow_AnacondaUpload.xml
+ endif
+ 
+ workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
+ 
+-dist_workflowsdef_DATA =\
+-    report_fedora.conf \
+-    report_rhel.conf
++dist_workflowsdef_DATA =
+ 
+ if BUILD_BUGZILLA
+ dist_workflowsdef_DATA += \
+@@ -34,21 +21,9 @@ endif
+ @INTLTOOL_XML_RULE@
+ 
+ EXTRA_DIST = \
+-    workflow_FedoraCCpp.xml.in \
+-    workflow_FedoraKerneloops.xml.in \
+-    workflow_FedoraPython.xml.in \
+-    workflow_FedoraVmcore.xml.in \
+-    workflow_FedoraXorg.xml.in \
+-    workflow_Upload.xml.in \
+-    workflow_RHELCCpp.xml.in \
+-    workflow_RHELKerneloops.xml.in \
+-    workflow_RHELPython.xml.in \
+-    workflow_RHELvmcore.xml.in \
+-    workflow_RHELxorg.xml.in
++    workflow_Upload.xml.in
+ 
+ if BUILD_BUGZILLA
+ EXTRA_DIST += \
+-    workflow_AnacondaFedora.xml.in \
+-    workflow_AnacondaRHEL.xml.in \
+     workflow_AnacondaUpload.xml.in
+ endif
+diff --git a/src/workflows/anaconda_event.conf b/src/workflows/anaconda_event.conf
+index 5828b5a..91a2e14 100644
+--- a/src/workflows/anaconda_event.conf
++++ b/src/workflows/anaconda_event.conf
+@@ -1,3 +1,2 @@
+-EVENT=workflow_AnacondaFedora component=anaconda
+-EVENT=workflow_AnacondaRHEL component=anaconda
++EVENT=workflow_AnacondaSabayon component=anaconda
+ EVENT=workflow_AnacondaUpload component=anaconda
+diff --git a/src/workflows/report_fedora.conf b/src/workflows/report_fedora.conf
+deleted file mode 100644
+index 84009bf..0000000
+--- a/src/workflows/report_fedora.conf
++++ /dev/null
+@@ -1,19 +0,0 @@
+-EVENT=workflow_FedoraCCpp analyzer=CCpp
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_FedoraPython analyzer=Python component!=anaconda
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_FedoraKerneloops analyzer=Kerneloops
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_FedoraVmcore analyzer=vmcore
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_FedoraXorg analyzer=xorg
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+diff --git a/src/workflows/report_rhel.conf b/src/workflows/report_rhel.conf
+deleted file mode 100644
+index 104bcc3..0000000
+--- a/src/workflows/report_rhel.conf
++++ /dev/null
+@@ -1,19 +0,0 @@
+-EVENT=workflow_RHELCCpp analyzer=CCpp
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_RHELPython analyzer=Python component!=anaconda
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_RHELKerneloops analyzer=Kerneloops
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_RHELvmcore analyzer=vmcore
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+-
+-EVENT=workflow_RHELxorg analyzer=xorg
+-# this is just a meta event which consists of other events
+-# the list is defined in the xml file
+diff --git a/src/workflows/workflow_AnacondaFedora.xml.in b/src/workflows/workflow_AnacondaFedora.xml.in
+deleted file mode 100644
+index 6322d9a..0000000
+--- a/src/workflows/workflow_AnacondaFedora.xml.in
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report a bug to Fedora maintainers</_name>
+-    <_description>Process the report using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>report_Bugzilla</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_AnacondaRHEL.xml.in b/src/workflows/workflow_AnacondaRHEL.xml.in
+deleted file mode 100644
+index 6d401ff..0000000
+--- a/src/workflows/workflow_AnacondaRHEL.xml.in
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report a bug to Red Hat Support Tool</_name>
+-    <_description>Process the report using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_AnacondaSabayon.xml.in b/src/workflows/workflow_AnacondaSabayon.xml.in
+new file mode 100644
+index 0000000..bf27e52
+--- /dev/null
++++ b/src/workflows/workflow_AnacondaSabayon.xml.in
+@@ -0,0 +1,9 @@
++<?xml version="1.0" encoding="UTF-8" ?>
++<workflow>
++    <_name>Report a bug to Sabayon maintainers</_name>
++    <_description>Process the report using the Sabayon infrastructure</_description>
++
++    <events>
++        <event>report_Bugzilla</event>
++    </events>
++</workflow>
+diff --git a/src/workflows/workflow_FedoraCCpp.xml.in b/src/workflows/workflow_FedoraCCpp.xml.in
+deleted file mode 100644
+index b48d25a..0000000
+--- a/src/workflows/workflow_FedoraCCpp.xml.in
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Fedora</_name>
+-    <_description>Process the C/C++ crash using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>report_uReport</event>
+-        <event>collect_*</event>
+-        <event>analyze_CCpp</event>
+-        <event>report_Bugzilla</event>
+-        <event>post_report</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_FedoraKerneloops.xml.in b/src/workflows/workflow_FedoraKerneloops.xml.in
+deleted file mode 100644
+index a3aa867..0000000
+--- a/src/workflows/workflow_FedoraKerneloops.xml.in
++++ /dev/null
+@@ -1,12 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Fedora</_name>
+-    <_description>Process the kerneloops using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>report_uReport</event>
+-        <event>collect_*</event>
+-        <event>report_Bugzilla</event>
+-        <event>post_report</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_FedoraPython.xml.in b/src/workflows/workflow_FedoraPython.xml.in
+deleted file mode 100644
+index 520f406..0000000
+--- a/src/workflows/workflow_FedoraPython.xml.in
++++ /dev/null
+@@ -1,12 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Fedora</_name>
+-    <_description>Process the python exception using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>report_uReport</event>
+-        <event>collect_*</event>
+-        <event>report_Bugzilla</event>
+-        <event>post_report</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_FedoraVmcore.xml.in b/src/workflows/workflow_FedoraVmcore.xml.in
+deleted file mode 100644
+index b6b9cd9..0000000
+--- a/src/workflows/workflow_FedoraVmcore.xml.in
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Fedora</_name>
+-    <_description>Process the kernel crash using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>analyze_VMcore</event>
+-        <event>report_uReport</event>
+-        <event>collect_*</event>
+-        <event>report_Bugzilla</event>
+-        <event>post_report</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_FedoraXorg.xml.in b/src/workflows/workflow_FedoraXorg.xml.in
+deleted file mode 100644
+index d796bae..0000000
+--- a/src/workflows/workflow_FedoraXorg.xml.in
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Fedora</_name>
+-    <_description>Process the X Server problem using the Fedora infrastructure</_description>
+-
+-    <events>
+-        <event>report_Bugzilla</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_RHELCCpp.xml.in b/src/workflows/workflow_RHELCCpp.xml.in
+deleted file mode 100644
+index 026062a..0000000
+--- a/src/workflows/workflow_RHELCCpp.xml.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Red Hat</_name>
+-    <_description>Process the C/C++ crash using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>collect_*</event>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_RHELKerneloops.xml.in b/src/workflows/workflow_RHELKerneloops.xml.in
+deleted file mode 100644
+index 7f84822..0000000
+--- a/src/workflows/workflow_RHELKerneloops.xml.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Red Hat</_name>
+-    <_description>Process the kerneloops using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>collect_*</event>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_RHELPython.xml.in b/src/workflows/workflow_RHELPython.xml.in
+deleted file mode 100644
+index a0a4aeb..0000000
+--- a/src/workflows/workflow_RHELPython.xml.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Red Hat</_name>
+-    <_description>Process the python exception using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>collect_*</event>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_RHELvmcore.xml.in b/src/workflows/workflow_RHELvmcore.xml.in
+deleted file mode 100644
+index 31712e0..0000000
+--- a/src/workflows/workflow_RHELvmcore.xml.in
++++ /dev/null
+@@ -1,10 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Red Hat</_name>
+-    <_description>Process the kernel crash using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>collect_*</event>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+diff --git a/src/workflows/workflow_RHELxorg.xml.in b/src/workflows/workflow_RHELxorg.xml.in
+deleted file mode 100644
+index 7dfda52..0000000
+--- a/src/workflows/workflow_RHELxorg.xml.in
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" ?>
+-<workflow>
+-    <_name>Report to Red Hat</_name>
+-    <_description>Process the X Server problem using the Red Hat infrastructure</_description>
+-
+-    <events>
+-        <event>report_RHTSupport</event>
+-    </events>
+-</workflow>
+-- 
+1.9.2
+
diff --git a/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch b/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch
new file mode 100644
index 00000000..561323ef
--- /dev/null
+++ b/dev-libs/libreport/files/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch
@@ -0,0 +1,27 @@
+From af93a79ebe914934552c4343e928c4cfc7a70184 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sat, 10 May 2014 18:09:05 +0100
+Subject: [PATCH 3/3] Make report_Bugzilla use Sabayon's bugzilla URL
+
+---
+ src/plugins/report_Bugzilla.xml.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
+index 9ffe90f..368573a 100644
+--- a/src/plugins/report_Bugzilla.xml.in
++++ b/src/plugins/report_Bugzilla.xml.in
+@@ -16,8 +16,8 @@
+             <_label>Bugzilla URL</_label>
+             <allow-empty>no</allow-empty>
+             <_description>Address of Bugzilla server</_description>
+-            <default-value>https://bugzilla.redhat.com</default-value>
+-            <_note-html>You can create bugzilla.redhat.com account &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
++            <default-value>https://bugs.sabayon.org</default-value>
++            <_note-html>You can create bugs.sabayon.org account &lt;a href="https://bugs.sabayon.org/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
+         </option>
+         <option type="text" name="Bugzilla_Login">
+             <_label>User name</_label>
+-- 
+1.9.2
+
diff --git a/dev-libs/libreport/files/libreport-2.0.20-json-c.patch b/dev-libs/libreport/files/libreport-2.0.20-json-c.patch
new file mode 100644
index 00000000..4e0f3d49
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.20-json-c.patch
@@ -0,0 +1,51 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -158,7 +158,14 @@ AS_HELP_STRING([--with-ureport],[use uRe
+ LIBREPORT_PARSE_WITH([ureport]))
+ if test -z "$NO_UREPORT"; then
+ AM_CONDITIONAL(BUILD_UREPORT, true)
+-PKG_CHECK_MODULES([JSON_C], [json])
++PKG_CHECK_MODULES([JSON_C], [json], [
++    JSON_C_PACKAGE=json
++], [
++    PKG_CHECK_MODULES([JSON_C], [json-c], [
++        JSON_C_PACKAGE=json-c
++    ])
++])
++AC_SUBST([JSON_C_PACKAGE])
+ else
+ AM_CONDITIONAL(BUILD_UREPORT, false)
+ fi dnl end NO_UREPORT
+--- a/libreport-web.pc.in
++++ b/libreport-web.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: libreport
+ Description: Library providing network API for libreport
+ Version: @VERSION@
+-Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json btparser libreport
++Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client @JSON_C_PACKAGE@ btparser libreport
+ Libs: -L${libdir} -lreport-web
+ Cflags:
+ 
+--- a/src/lib/json.c
++++ b/src/lib/json.c
+@@ -17,7 +17,7 @@
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ 
+-#include <json/json.h>
++#include <json-c/json.h>
+ #include <btparser/thread.h>
+ #include <btparser/core-backtrace.h>
+ 
+--- a/src/plugins/ureport.c
++++ b/src/plugins/ureport.c
+@@ -17,7 +17,7 @@
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ 
+-#include <json/json.h>
++#include <json-c/json.h>
+ #include "internal_libreport.h"
+ #include "ureport.h"
+ #include "libreport_curl.h"
diff --git a/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch b/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch
new file mode 100644
index 00000000..5ad4cdb7
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.20-sabayon.patch
@@ -0,0 +1,157 @@
+diff -Nurp libreport-2.0.20.orig/doc/reporter-bugzilla.txt libreport-2.0.20/doc/reporter-bugzilla.txt
+--- libreport-2.0.20.orig/doc/reporter-bugzilla.txt	2012-11-23 14:36:38.000000000 +0000
++++ libreport-2.0.20/doc/reporter-bugzilla.txt	2014-04-29 08:57:43.665256679 +0100
+@@ -52,7 +52,7 @@ Configuration file lines should have 'PA
+ 	Password to Bugzilla account.
+ 
+ 'BugzillaURL'::
+-	Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com)
++	Bugzilla HTTP(S) address. (default: https://bugs.rogentos.ro)
+ 
+ 'SSLVerify'::
+ 	Use yes/true/on/1 to verify server's SSL certificate. (default: yes)
+diff -Nurp libreport-2.0.20.orig/src/include/internal_libreport.h libreport-2.0.20/src/include/internal_libreport.h
+--- libreport-2.0.20.orig/src/include/internal_libreport.h	2012-12-18 12:53:59.000000000 +0000
++++ libreport-2.0.20/src/include/internal_libreport.h	2014-04-29 09:02:37.934552423 +0100
+@@ -722,7 +722,7 @@ struct dump_dir *open_directory_for_writ
+ #define FILENAME_CRASH_FUNCTION "crash_function"
+ #define FILENAME_ARCHITECTURE "architecture"
+ #define FILENAME_KERNEL       "kernel"
+-// From /etc/system-release or /etc/redhat-release
++// From /etc/system-release or /etc/kogaion-release
+ #define FILENAME_OS_RELEASE   "os_release"
+ #define FILENAME_OS_RELEASE_IN_ROOTDIR "os_release_in_rootdir"
+ // Filled by <what?>
+diff -Nurp libreport-2.0.20.orig/src/lib/dump_dir.c libreport-2.0.20/src/lib/dump_dir.c
+--- libreport-2.0.20.orig/src/lib/dump_dir.c	2012-11-29 10:42:38.000000000 +0000
++++ libreport-2.0.20/src/lib/dump_dir.c	2014-04-29 09:02:29.942680183 +0100
+@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_d
+         release = load_text_file("/etc/system-release",
+                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
+         if (!release)
+-            release = load_text_file("/etc/redhat-release", /*flags:*/ 0);
++            release = load_text_file("/etc/kogaion-release", /*flags:*/ 0);
+         dd_save_text(dd, FILENAME_OS_RELEASE, release);
+         if (chroot_dir)
+         {
+diff -Nurp libreport-2.0.20.orig/src/plugins/bugzilla.conf libreport-2.0.20/src/plugins/bugzilla.conf
+--- libreport-2.0.20.orig/src/plugins/bugzilla.conf	2012-11-10 09:39:39.000000000 +0000
++++ libreport-2.0.20/src/plugins/bugzilla.conf	2014-04-29 09:01:23.660739782 +0100
+@@ -1,5 +1,5 @@
+ # Bugzilla URL
+-BugzillaURL = https://bugzilla.redhat.com/
++BugzillaURL = https://bugs.rogentos.ro/
+ # yes means that ssl certificates will be checked
+ SSLVerify = yes
+ # your login has to exist, if you don have any, please create one
+diff -Nurp libreport-2.0.20.orig/src/plugins/Makefile.am libreport-2.0.20/src/plugins/Makefile.am
+--- libreport-2.0.20.orig/src/plugins/Makefile.am	2012-12-18 18:15:11.000000000 +0000
++++ libreport-2.0.20/src/plugins/Makefile.am	2014-04-29 08:57:12.568753794 +0100
+@@ -10,7 +10,6 @@ reporters_bin +=  reporter-ureport
+ endif
+ 
+ bin_PROGRAMS = $(reporters_bin) \
+-    reporter-rhtsupport \
+     reporter-kerneloops \
+     reporter-upload \
+     reporter-mailx \
+@@ -31,7 +30,6 @@ reporters_plugin_conf += bugzilla.conf \
+ endif
+ 
+ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \
+-    rhtsupport.conf \
+     mailx.conf
+ 
+ eventsdir = $(EVENTS_DIR)
+@@ -49,7 +47,6 @@ dist_events_DATA = $(reporters_events) \
+     report_Logger.conf \
+     report_Logger.xml \
+     report_Mailx.xml \
+-    report_RHTSupport.xml \
+     report_Kerneloops.xml \
+     report_Uploader.xml
+ 
+@@ -61,7 +58,6 @@ dist_eventsconf_DATA = \
+     mailx_event.conf \
+     print_event.conf \
+     bugzilla_event.conf \
+-    rhtsupport_event.conf \
+     uploader_event.conf
+ 
+ reporters_extra_dist =
+@@ -80,7 +76,6 @@ EXTRA_DIST = $(reporters_extra_dist) \
+     report_Logger.conf \
+     report_Logger.xml.in \
+     report_Mailx.xml.in \
+-    report_RHTSupport.xml.in \
+     report_Kerneloops.xml.in \
+     report_Uploader.xml.in
+ 
+@@ -113,32 +108,6 @@ reporter_bugzilla_LDADD = \
+     ../lib/libreport.la
+ endif
+ 
+-reporter_rhtsupport_SOURCES = \
+-    abrt_rh_support.h abrt_rh_support.c \
+-    reporter-rhtsupport.h \
+-    reporter-rhtsupport-parse.c \
+-    reporter-rhtsupport.c
+-reporter_rhtsupport_CPPFLAGS = \
+-    -I$(srcdir)/../include \
+-    -I$(srcdir)/../lib \
+-    -DBIN_DIR=\"$(bindir)\" \
+-    -DCONF_DIR=\"$(CONF_DIR)\" \
+-    -DLOCALSTATEDIR='"$(localstatedir)"' \
+-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+-    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+-    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
+-    $(GLIB_CFLAGS) \
+-    $(LIBREPORT_CFLAGS) \
+-    $(LIBXML_CFLAGS) \
+-    -D_GNU_SOURCE
+-reporter_rhtsupport_LDFLAGS = -ltar
+-reporter_rhtsupport_LDADD = \
+-    $(GLIB_LIBS) \
+-    $(LIBXML_LIBS) \
+-    ../lib/libreport-web.la \
+-    ../lib/libreport.la
+-
+ reporter_upload_SOURCES = \
+     reporter-upload.c
+ reporter_upload_CPPFLAGS = \
+diff -Nurp libreport-2.0.20.orig/src/plugins/report_Bugzilla.conf libreport-2.0.20/src/plugins/report_Bugzilla.conf
+--- libreport-2.0.20.orig/src/plugins/report_Bugzilla.conf	2012-11-10 09:39:39.000000000 +0000
++++ libreport-2.0.20/src/plugins/report_Bugzilla.conf	2014-04-29 09:01:36.588533115 +0100
+@@ -1,4 +1,4 @@
+-Bugzilla_BugzillaURL = https://bugzilla.redhat.com
++Bugzilla_BugzillaURL = https://bugs.rogentos.ro
+ Bugzilla_Login =
+ Bugzilla_Password =
+ Bugzilla_SSLVerify = yes
+diff -Nurp libreport-2.0.20.orig/src/plugins/reporter-bugzilla.c libreport-2.0.20/src/plugins/reporter-bugzilla.c
+--- libreport-2.0.20.orig/src/plugins/reporter-bugzilla.c	2012-12-06 15:44:02.000000000 +0000
++++ libreport-2.0.20/src/plugins/reporter-bugzilla.c	2014-04-29 08:59:22.419677969 +0100
+@@ -691,7 +691,7 @@ static void set_settings(struct bugzilla
+     environ = getenv("Bugzilla_BugzillaURL");
+     b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL");
+     if (!b->b_bugzilla_url[0])
+-        b->b_bugzilla_url = "https://bugzilla.redhat.com";
++        b->b_bugzilla_url = "https://bugs.rogentos.ro";
+     else
+     {
+         /* We don't want trailing '/': "https://host/dir/" -> "https://host/dir" */
+diff -Nurp libreport-2.0.20.orig/src/report-python/__init__.py libreport-2.0.20/src/report-python/__init__.py
+--- libreport-2.0.20.orig/src/report-python/__init__.py	2012-11-10 09:39:39.000000000 +0000
++++ libreport-2.0.20/src/report-python/__init__.py	2014-04-29 09:02:55.591270159 +0100
+@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, New
+ 
+ import os
+ 
+-SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"]
+-SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"]
++SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/kogaion-release"]
++SYSTEM_RELEASE_DEPS = ["system-release", "kogaion-version"]
+ 
+ _hardcoded_default_product = ""
+ _hardcoded_default_version = ""
diff --git a/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch b/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch
new file mode 100644
index 00000000..4f43ec90
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch
@@ -0,0 +1,19 @@
+From 88e39835f1f94eff58e6d0cc0bee20ceae10bdd2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 16 Nov 2011 02:07:24 -0500
+Subject: [PATCH] fix uploader_event syntax
+
+---
+ src/plugins/uploader_event.conf |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/plugins/uploader_event.conf b/src/plugins/uploader_event.conf
+index 2406008..bd13c5e 100644
+--- a/src/plugins/uploader_event.conf
++++ b/src/plugins/uploader_event.conf
+@@ -1 +1 @@
+-EVENT=report_Uploader analyzer=libreport reporter-upload
++EVENT=report_Uploader reporter-upload
+-- 
+1.7.8.rc1
+
diff --git a/dev-libs/libreport/files/libreport-2.1.9-json-c.patch b/dev-libs/libreport/files/libreport-2.1.9-json-c.patch
new file mode 100644
index 00000000..d7257192
--- /dev/null
+++ b/dev-libs/libreport/files/libreport-2.1.9-json-c.patch
@@ -0,0 +1,24 @@
+diff -Nurp libreport-2.1.9.orig/src/lib/json.c libreport-2.1.9/src/lib/json.c
+--- libreport-2.1.9.orig/src/lib/json.c	2013-10-22 15:32:23.000000000 +0100
++++ libreport-2.1.9/src/lib/json.c	2014-05-10 16:12:52.436219734 +0100
+@@ -17,7 +17,7 @@
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ 
+-#include <json/json.h>
++#include <json-c/json.h>
+ 
+ #include <satyr/abrt.h>
+ #include <satyr/report.h>
+diff -Nurp libreport-2.1.9.orig/src/plugins/ureport.c libreport-2.1.9/src/plugins/ureport.c
+--- libreport-2.1.9.orig/src/plugins/ureport.c	2013-10-23 16:07:05.000000000 +0100
++++ libreport-2.1.9/src/plugins/ureport.c	2014-05-10 16:12:45.532339236 +0100
+@@ -17,7 +17,7 @@
+     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ 
+-#include <json/json.h>
++#include <json-c/json.h>
+ #include "internal_libreport.h"
+ #include "ureport.h"
+ #include "libreport_curl.h"
diff --git a/dev-libs/libreport/libreport-2.0.20-r1.ebuild b/dev-libs/libreport/libreport-2.0.20-r1.ebuild
new file mode 100644
index 00000000..6efccdcb
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.0.20-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils python-r1 user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+COMMON_DEPEND="!dev-python/python-report
+	>=dev-libs/btparser-0.18:=
+	>=dev-libs/glib-2.21:2
+	dev-libs/json-c:=
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt:=
+	dev-libs/nss:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	>=x11-libs/gtk+-3.3.12:3
+	x11-misc/xdg-utils
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Replace redhat- and fedora-specific defaults with gentoo ones, and disable
+	# code that requires gentoo infra support.
+	epatch "${FILESDIR}/${PN}-2.0.20-kogaion.patch"
+
+	# json-c-0.11, https://github.com/abrt/libreport/pull/{159,174}
+	epatch "${FILESDIR}/${PN}-2.0.20-json-c.patch"
+
+	# Modify uploader_event so that the gui recognizes it
+	epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
+
+	mkdir -p m4
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(usex debug --enable-debug "")
+	# --disable-debug enables debug!
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	prune_libtool_files --modules
+
+	# Drop Fedora specific files
+	rm "${D}/etc/libreport/workflows/workflow_Fedora.xml"
+	rm "${D}/etc/libreport/workflows/workflow_AnacondaFedora.xml"
+	rm "${D}/etc/libreport/workflows/workflow_Upload.xml"
+}
diff --git a/dev-libs/libreport/libreport-2.1.9.ebuild b/dev-libs/libreport/libreport-2.1.9.ebuild
new file mode 100644
index 00000000..6cc7313b
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.1.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils python-r1 user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +gtk"
+
+COMMON_DEPEND="!dev-python/python-report
+	>=dev-libs/glib-2.21:2
+	dev-libs/satyr
+	dev-libs/json-c:=
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt:=
+	dev-libs/nss:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+	x11-misc/xdg-utils
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Replace redhat- and fedora-specific defaults with gentoo ones, and disable
+	# code that requires gentoo infra support.
+	epatch "${FILESDIR}/0001-Add-Kogaion-customizations.patch"
+	epatch "${FILESDIR}/0002-Drop-Fedora-workflows-add-Sabayon-one.patch"
+	epatch "${FILESDIR}/0003-Make-report_Bugzilla-use-Sabayon-s-bugzilla-URL.patch"
+
+	# json-c support
+	epatch "${FILESDIR}/libreport-2.1.9-json-c.patch"
+
+	mkdir -p m4
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(usex debug --enable-debug "")
+	# --disable-debug enables debug!
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	prune_libtool_files --modules
+}
diff --git a/dev-libs/libreport/metadata.xml b/dev-libs/libreport/metadata.xml
new file mode 100644
index 00000000..da6fd63d
--- /dev/null
+++ b/dev-libs/libreport/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
new file mode 100644
index 00000000..ccf2ca86
--- /dev/null
+++ b/dev-libs/openssl/Manifest
@@ -0,0 +1,2 @@
+DIST openssl-1.0.1g.tar.gz 4509047 SHA256 53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 SHA512 66ebbad3c8ad98a07b486d39d0c3ae62b00133f8f2877cf8b97c461e7c7f40b29cf9c3cae82cf73a92dcf1daa63d33aa76c910fbcbe60158589fc7cb48f41e6d WHIRLPOOL 6bfb30d1f41b051f794e2eb80ad9116b064f6d464c22698538c4e16b85739b80744387ca160fd1a86b92814b5b1b3fc7d0658a709942b7b31b198da8cce37056
+DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.1 b/dev-libs/openssl/files/gentoo.config-1.0.1
new file mode 100755
index 00000000..bbc1aa95
--- /dev/null
+++ b/dev-libs/openssl/files/gentoo.config-1.0.1
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.1,v 1.1 2013/05/21 17:53:19 vapier Exp $
+#
+# Openssl doesn't play along nicely with cross-compiling
+# like autotools based projects, so let's teach it new tricks.
+#
+# Review the bundled 'config' script to see why kind of targets
+# we can pass to the 'Configure' script.
+
+
+# Testing routines
+if [[ $1 == "test" ]] ; then
+	for c in \
+		"arm-gentoo-linux-uclibc      |linux-generic32 -DL_ENDIAN" \
+		"armv5b-linux-gnu             |linux-armv4 -DB_ENDIAN" \
+		"x86_64-pc-linux-gnu          |linux-x86_64" \
+		"alpha-linux-gnu              |linux-alpha-gcc" \
+		"alphaev56-unknown-linux-gnu  |linux-alpha+bwx-gcc" \
+		"i686-pc-linux-gnu            |linux-elf" \
+		"whatever-gentoo-freebsdX.Y   |BSD-generic32" \
+		"i686-gentoo-freebsdX.Y       |BSD-x86-elf" \
+		"sparc64-alpha-freebsdX.Y     |BSD-sparc64" \
+		"ia64-gentoo-freebsd5.99234   |BSD-ia64" \
+		"x86_64-gentoo-freebsdX.Y     |BSD-x86_64" \
+		"hppa64-aldsF-linux-gnu5.3    |linux-generic32 -DB_ENDIAN" \
+		"powerpc-gentOO-linux-uclibc  |linux-ppc" \
+		"powerpc64-unk-linux-gnu      |linux-ppc64" \
+		"x86_64-apple-darwinX         |darwin64-x86_64-cc" \
+		"powerpc64-apple-darwinX      |darwin64-ppc-cc" \
+		"i686-apple-darwinX           |darwin-i386-cc" \
+		"i386-apple-darwinX           |darwin-i386-cc" \
+		"powerpc-apple-darwinX        |darwin-ppc-cc" \
+		"i586-pc-winnt                |winnt-parity" \
+		"s390-ibm-linux-gnu           |linux-generic32 -DB_ENDIAN" \
+		"s390x-linux-gnu              |linux64-s390x" \
+	;do
+		CHOST=${c/|*}
+		ret_want=${c/*|}
+		ret_got=$(CHOST=${CHOST} "$0")
+
+		if [[ ${ret_want} == "${ret_got}" ]] ; then
+			echo "PASS: ${CHOST}"
+		else
+			echo "FAIL: ${CHOST}"
+			echo -e "\twanted: ${ret_want}"
+			echo -e "\twe got: ${ret_got}"
+		fi
+	done
+	exit 0
+fi
+[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
+
+
+# Detect the operating system
+case ${CHOST} in
+	*-aix*)          system="aix";;
+	*-darwin*)       system="darwin";;
+	*-freebsd*)      system="BSD";;
+	*-hpux*)         system="hpux";;
+	*-linux*)        system="linux";;
+	*-solaris*)      system="solaris";;
+	*-winnt*)        system="winnt";;
+	x86_64-*-mingw*) system="mingw64";;
+	*mingw*)         system="mingw";;
+	*)               exit 0;;
+esac
+
+
+# Compiler munging
+compiler="gcc"
+if [[ ${CC} == "ccc" ]] ; then
+	compiler=${CC}
+fi
+
+
+# Detect target arch
+machine=""
+chost_machine=${CHOST%%-*}
+case ${system} in
+linux)
+	case ${chost_machine}:${ABI} in
+		alphaev56*|\
+		alphaev[678]*)machine=alpha+bwx-${compiler};;
+		alpha*)       machine=alpha-${compiler};;
+		armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
+		armv[4-9]*)   machine="armv4 -DL_ENDIAN";;
+		arm*b*)       machine="generic32 -DB_ENDIAN";;
+		arm*)         machine="generic32 -DL_ENDIAN";;
+		avr*)         machine="generic32 -DL_ENDIAN";;
+		bfin*)        machine="generic32 -DL_ENDIAN";;
+	#	hppa64*)      machine=parisc64;;
+		hppa*)        machine="generic32 -DB_ENDIAN";;
+		i[0-9]86*|\
+		x86_64*:x86)  machine=elf;;
+		ia64*)        machine=ia64;;
+		m68*)         machine="generic32 -DB_ENDIAN";;
+		mips*el*)     machine="generic32 -DL_ENDIAN";;
+		mips*)        machine="generic32 -DB_ENDIAN";;
+		powerpc64*)   machine=ppc64;;
+		powerpc*)     machine=ppc;;
+	#	sh64*)        machine=elf;;
+		sh*b*)        machine="generic32 -DB_ENDIAN";;
+		sh*)          machine="generic32 -DL_ENDIAN";;
+		sparc*v7*)    machine="generic32 -DB_ENDIAN";;
+		sparc64*)     machine=sparcv9;;
+		sparc*)       machine=sparcv8;;
+		s390x*)       machine=s390x system=linux64;;
+		s390*)        machine="generic32 -DB_ENDIAN";;
+		x86_64*:x32)  machine=x32;;
+		x86_64*)      machine=x86_64;;
+	esac
+	;;
+BSD)
+	case ${chost_machine} in
+		alpha*)       machine=generic64;;
+		i[6-9]86*)    machine=x86-elf;;
+		ia64*)        machine=ia64;;
+		sparc64*)     machine=sparc64;;
+		x86_64*)      machine=x86_64;;
+		*)            machine=generic32;;
+	esac
+	;;
+aix)
+	machine=${compiler}
+	;;
+darwin)
+	case ${chost_machine} in
+		powerpc64)    machine=ppc-cc; system=${system}64;;
+		powerpc)      machine=ppc-cc;;
+		i?86*)        machine=i386-cc;;
+		x86_64)       machine=x86_64-cc; system=${system}64;;
+	esac
+	;;
+hpux)
+	case ${chost_machine} in
+		ia64)	machine=ia64-${compiler} ;;
+	esac
+	;;
+solaris)
+	case ${chost_machine} in
+		i386)         machine=x86-${compiler} ;;
+		x86_64*)      machine=x86_64-${compiler}; system=${system}64;;
+		sparcv9*)     machine=sparcv9-${compiler}; system=${system}64;;
+		sparc*)       machine=sparcv8-${compiler};;
+	esac
+	;;
+winnt)
+	machine=parity
+	;;
+mingw*)
+	# special case ... no xxx-yyy style name
+	echo ${system}
+	;;
+esac
+
+
+# If we have something, show it
+[[ -n ${machine} ]] && echo ${system}-${machine}
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
new file mode 100644
index 00000000..c0b3bc3f
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/327421
+
+--- Makefile.org
++++ Makefile.org
+@@ -189,6 +189,7 @@
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
+ 		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\
+ 		MAKEDEPPROG='$(MAKEDEPPROG)'			\
++		LDFLAGS='${LDFLAGS}'				\
+ 		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\
+ 		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\
+ 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
+--- Makefile.shared
++++ Makefile.shared
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/files/openssl-1.0.0d-windres.patch b/dev-libs/openssl/files/openssl-1.0.0d-windres.patch
new file mode 100644
index 00000000..3f889807
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0d-windres.patch
@@ -0,0 +1,76 @@
+URL: http://rt.openssl.org/Ticket/Display.html?id=2558
+Subject: make windres controllable via build env var settings
+
+atm, the windres code in openssl is only usable via the cross-compile prefix 
+option unlike all the other build tools. so add support for the standard $RC 
+/ $WINDRES env vars as well.
+
+Index: Configure
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
+retrieving revision 1.621.2.40
+diff -u -p -r1.621.2.40 Configure
+--- Configure	30 Nov 2010 22:19:26 -0000	1.621.2.40
++++ Configure	4 Jul 2011 23:12:32 -0000
+@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar
+ my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+ my $ar = $ENV{'AR'} || "ar";
+ my $arflags = $fields[$idx_arflags];
++my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres";
+ my $multilib = $fields[$idx_multilib];
+ 
+ # if $prefix/lib$multilib is not an existing directory, then
+@@ -1511,12 +1512,14 @@ while (<IN>)
+ 		s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
+ 		s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
+ 		s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
++		s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/;
+ 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
+ 		}
+ 	else	{
+ 		s/^CC=.*$/CC= $cc/;
+ 		s/^AR=\s*ar/AR= $ar/;
+ 		s/^RANLIB=.*/RANLIB= $ranlib/;
++		s/^WINDRES=.*/WINDRES= $windres/;
+ 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
+ 		}
+ 	s/^CFLAG=.*$/CFLAG= $cflags/;
+Index: Makefile.org
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v
+retrieving revision 1.295.2.10
+diff -u -p -r1.295.2.10 Makefile.org
+--- Makefile.org	27 Jan 2010 16:06:58 -0000	1.295.2.10
++++ Makefile.org	4 Jul 2011 23:13:08 -0000
+@@ -66,6 +66,7 @@ EXE_EXT= 
+ ARFLAGS=
+ AR=ar $(ARFLAGS) r
+ RANLIB= ranlib
++WINDRES= windres
+ NM= nm
+ PERL= perl
+ TAR= tar
+@@ -180,6 +181,7 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESS
+ 		CC='$(CC)' CFLAG='$(CFLAG)' 			\
+ 		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\
+ 		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\
++		WINDRES='$(WINDRES)'				\
+ 		CROSS_COMPILE='$(CROSS_COMPILE)'	\
+ 		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\
+ 		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\
+Index: Makefile.shared
+===================================================================
+RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v
+retrieving revision 1.72.2.4
+diff -u -p -r1.72.2.4 Makefile.shared
+--- Makefile.shared	21 Aug 2010 11:36:49 -0000	1.72.2.4
++++ Makefile.shared	4 Jul 2011 23:13:52 -0000
+@@ -293,7 +293,7 @@ link_a.cygwin:
+ 	fi; \
+ 	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+ 	$(PERL) util/mkrc.pl $$dll_name | \
+-		$(CROSS_COMPILE)windres -o rc.o; \
++		$(WINDRES) -o rc.o; \
+ 	extras="$$extras rc.o"; \
+ 	ALLSYMSFLAGS='-Wl,--whole-archive'; \
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
diff --git a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch b/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch
new file mode 100644
index 00000000..6c021825
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch
@@ -0,0 +1,32 @@
+depend on other pc files rather than encoding library info directly in
+every pkg-config file
+
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -335,11 +335,11 @@ libssl.pc: Makefile
+ 	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+-	    echo 'Name: OpenSSL'; \
++	    echo 'Name: OpenSSL-libssl'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
++	    echo 'Requires.private: libcrypto'; \
++	    echo 'Libs: -L$${libdir} -lssl'; \
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+ 
+@@ -352,10 +353,7 @@ openssl.pc: Makefile
+ 	    echo 'Name: OpenSSL'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires: '; \
+-	    echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+-	    echo 'Libs.private: $(EX_LIBS)'; \
+-	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
++	    echo 'Requires: libssl libcrypto' ) > openssl.pc
+ 
+ Makefile: Makefile.org Configure config
+ 	@echo "Makefile is older than Makefile.org, Configure or config."
diff --git a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch
new file mode 100644
index 00000000..19f859ab
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch
@@ -0,0 +1,354 @@
+http://rt.openssl.org/Ticket/Display.html?id=2084
+
+--- a/Makefile.org
++++ b/Makefile.org
+@@ -247,17 +247,17 @@
+ build_libs: build_crypto build_ssl build_engines
+ 
+ build_crypto:
+-	@dir=crypto; target=all; $(BUILD_ONE_CMD)
++	+@dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
++build_ssl: build_crypto
+-	@dir=ssl; target=all; $(BUILD_ONE_CMD)
++	+@dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
++build_engines: build_crypto
+-	@dir=engines; target=all; $(BUILD_ONE_CMD)
++	+@dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
++build_apps: build_libs
+-	@dir=apps; target=all; $(BUILD_ONE_CMD)
++	+@dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
++build_tests: build_libs
+-	@dir=test; target=all; $(BUILD_ONE_CMD)
++	+@dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
++build_tools: build_libs
+-	@dir=tools; target=all; $(BUILD_ONE_CMD)
++	+@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -497,9 +497,9 @@
+ dist_pem_h:
+ 	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: install_docs install_sw
+ 
+-install_sw:
++install_dirs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -508,6 +508,13 @@
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++	@$(PERL) $(TOP)/util/mkdir-p.pl \
++		$(INSTALL_PREFIX)$(MANDIR)/man1 \
++		$(INSTALL_PREFIX)$(MANDIR)/man3 \
++		$(INSTALL_PREFIX)$(MANDIR)/man5 \
++		$(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -511,7 +511,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
++	+@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ 	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+ 	do \
+ 		if [ -f "$$i" ]; then \
+@@ -593,12 +600,7 @@
+ 		done; \
+ 	done
+ 
+-install_docs:
+-	@$(PERL) $(TOP)/util/mkdir-p.pl \
+-		$(INSTALL_PREFIX)$(MANDIR)/man1 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man3 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man5 \
+-		$(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+ 	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+ 	here="`pwd`"; \
+ 	filecase=; \
+--- a/Makefile.shared
++++ b/Makefile.shared
+@@ -105,6 +105,7 @@ LINK_SO=	\
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+ 	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +124,7 @@ SYMLINK_SO=	\
+ 			done; \
+ 		fi; \
+ 		if [ -n "$$SHLIB_SOVER" ]; then \
++			[ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+ 			( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+ 			  ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+ 		fi; \
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -85,11 +85,11 @@
+ 	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+-	@target=files; $(RECURSIVE_MAKE)
++	+@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+ 	@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:	$(LIB)
+ 	@touch lib
+-$(LIB):	$(LIBOBJ)
++$(LIB):	$(LIBOBJ) | subdirs
+ 	$(AR) $(LIB) $(LIBOBJ)
+ 	$(RANLIB) $(LIB) || echo Never mind.
+ 
+@@ -110,7 +110,7 @@
+ 	fi
+ 
+ libs:
+-	@target=lib; $(RECURSIVE_MAKE)
++	+@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -119,7 +119,7 @@
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+ 	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+ 	done;
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+ 	@target=lint; $(RECURSIVE_MAKE)
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -72,7 +72,7 @@
+ 
+ all:	lib subdirs
+ 
+-lib:	$(LIBOBJ)
++lib:	$(LIBOBJ) | subdirs
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+ 		for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ 
+ subdirs:
+ 	echo $(EDIRS)
+-	@target=all; $(RECURSIVE_MAKE)
++	+@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+ 			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+-	@target=install; $(RECURSIVE_MAKE)
++	+@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+ 	ctags $(SRC)
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -123,7 +123,7 @@
+ tags:
+ 	ctags $(SRC)
+ 
+-tests:	exe apps $(TESTS)
++tests:	exe $(TESTS)
+ 
+ apps:
+ 	@(cd ..; $(MAKE) DIRS=apps all)
+@@ -365,109 +365,109 @@
+ 		link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-	@target=$(RSATEST); $(BUILD_CMD)
++	+@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-	@target=$(BNTEST); $(BUILD_CMD)
++	+@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-	@target=$(ECTEST); $(BUILD_CMD)
++	+@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-	@target=$(EXPTEST); $(BUILD_CMD)
++	+@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-	@target=$(IDEATEST); $(BUILD_CMD)
++	+@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-	@target=$(MD2TEST); $(BUILD_CMD)
++	+@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-	@target=$(SHATEST); $(BUILD_CMD)
++	+@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA1TEST); $(BUILD_CMD)
++	+@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA256TEST); $(BUILD_CMD)
++	+@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-	@target=$(SHA512TEST); $(BUILD_CMD)
++	+@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-	@target=$(RMDTEST); $(BUILD_CMD)
++	+@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-	@target=$(MDC2TEST); $(BUILD_CMD)
++	+@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-	@target=$(MD4TEST); $(BUILD_CMD)
++	+@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-	@target=$(MD5TEST); $(BUILD_CMD)
++	+@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-	@target=$(HMACTEST); $(BUILD_CMD)
++	+@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-	@target=$(WPTEST); $(BUILD_CMD)
++	+@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-	@target=$(RC2TEST); $(BUILD_CMD)
++	+@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-	@target=$(BFTEST); $(BUILD_CMD)
++	+@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-	@target=$(CASTTEST); $(BUILD_CMD)
++	+@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-	@target=$(RC4TEST); $(BUILD_CMD)
++	+@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-	@target=$(RC5TEST); $(BUILD_CMD)
++	+@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-	@target=$(DESTEST); $(BUILD_CMD)
++	+@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-	@target=$(RANDTEST); $(BUILD_CMD)
++	+@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-	@target=$(DHTEST); $(BUILD_CMD)
++	+@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-	@target=$(DSATEST); $(BUILD_CMD)
++	+@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-	@target=$(METHTEST); $(BUILD_CMD)
++	+@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-	@target=$(SSLTEST); $(FIPS_BUILD_CMD)
++	+@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-	@target=$(ENGINETEST); $(BUILD_CMD)
++	+@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-	@target=$(EVPTEST); $(BUILD_CMD)
++	+@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-	@target=$(ECDSATEST); $(BUILD_CMD)
++	+@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-	@target=$(ECDHTEST); $(BUILD_CMD)
++	+@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-	@target=$(IGETEST); $(BUILD_CMD)
++	+@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-	@target=$(JPAKETEST); $(BUILD_CMD)
++	+@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-	@target=$(ASN1TEST); $(BUILD_CMD)
++	+@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-	@target=$(SRPTEST); $(BUILD_CMD)
++	+@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ #$(AESTEST).o: $(AESTEST).c
+ #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
+@@ -480,7 +480,7 @@
+ #	fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-	@target=dummytest; $(BUILD_CMD)
++	+@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+ 
+--- a/crypto/objects/Makefile
++++ b/crypto/objects/Makefile
+@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h
+ # objects.pl both reads and writes obj_mac.num
+ obj_mac.h: objects.pl objects.txt obj_mac.num
+ 	$(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
+-	@sleep 1; touch obj_mac.h; sleep 1
+ 
+-obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
++# This doesn't really need obj_mac.h, but since that rule reads & writes
++# obj_mac.num, we can't run in parallel with it.
++obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
+ 	$(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
+-	@sleep 1; touch obj_xref.h; sleep 1
+ 
+ files:
+ 	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/dev-libs/openssl/files/openssl-1.0.1-x32.patch b/dev-libs/openssl/files/openssl-1.0.1-x32.patch
new file mode 100644
index 00000000..5106cb6e
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1-x32.patch
@@ -0,0 +1,79 @@
+http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
+
+UpstreamStatus: Pending
+
+Received from H J Liu @ Intel
+Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
+
+ported the patch to the 1.0.0e version
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
+Index: openssl-1.0.0e/Configure
+===================================================================
+--- openssl-1.0.0e.orig/Configure
++++ openssl-1.0.0e/Configure
+@@ -393,6 +393,7 @@ my %table=(
+ "debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
++"linux-x32",	"gcc:-DL_ENDIAN 	-DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "dist",		"cc:-O::(unknown)::::::",
+ 
+ # Basic configs that should work on any (32 and less bit) box
+Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
++++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
+@@ -55,7 +55,7 @@
+  *    machine.
+  */
+ 
+-#ifdef _WIN64
++#if defined _WIN64 || !defined __LP64__
+ #define BN_ULONG unsigned long long
+ #else
+ #define BN_ULONG unsigned long
+@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	adcq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	adcq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
+ 	asm (
+ 	"	subq	%2,%2		\n"
+ 	".p2align 4			\n"
+-	"1:	movq	(%4,%2,8),%0	\n"
+-	"	sbbq	(%5,%2,8),%0	\n"
+-	"	movq	%0,(%3,%2,8)	\n"
++	"1:	movq	(%q4,%2,8),%0	\n"
++	"	sbbq	(%q5,%2,8),%0	\n"
++	"	movq	%0,(%q3,%2,8)	\n"
+ 	"	leaq	1(%2),%2	\n"
+ 	"	loop	1b		\n"
+ 	"	sbbq	%0,%0		\n"
+Index: openssl-1.0.0e/crypto/bn/bn.h
+===================================================================
+--- openssl-1.0.0e.orig/crypto/bn/bn.h
++++ openssl-1.0.0e/crypto/bn/bn.h
+@@ -172,6 +172,13 @@ extern "C" {
+ # endif
+ #endif
+ 
++/* Address type.  */
++#ifdef _WIN64
++#define BN_ADDR unsigned long long
++#else
++#define BN_ADDR unsigned long
++#endif
++
+ /* assuming long is 64bit - this is the DEC Alpha
+  * unsigned long long is only 64 bits :-(, don't define
+  * BN_LLONG for the DEC Alpha */
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-bad-mac-aes-ni.patch b/dev-libs/openssl/files/openssl-1.0.1e-bad-mac-aes-ni.patch
new file mode 100644
index 00000000..4422a62c
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-bad-mac-aes-ni.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/463444
+
+From 9ab3ce124616cb12bd39c6aa1e1bde0f46969b29 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Mon, 18 Mar 2013 19:29:41 +0100
+Subject: [PATCH] e_aes_cbc_hmac_sha1.c: fix rare bad record mac on AES-NI
+ plaforms.
+
+PR: 3002
+(cherry picked from commit 5c60046553716fcf160718f59160493194f212dc)
+---
+ crypto/evp/e_aes_cbc_hmac_sha1.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
+index 483e04b..fb2c884 100644
+--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
++++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
+@@ -328,10 +328,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ 
+ 				if (res!=SHA_CBLOCK) continue;
+ 
+-				mask = 0-((inp_len+8-j)>>(sizeof(j)*8-1));
++				/* j is not incremented yet */
++				mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
+ 				data->u[SHA_LBLOCK-1] |= bitlen&mask;
+ 				sha1_block_data_order(&key->md,data,1);
+-				mask &= 0-((j-inp_len-73)>>(sizeof(j)*8-1));
++				mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
+ 				pmac->u[0] |= key->md.h0 & mask;
+ 				pmac->u[1] |= key->md.h1 & mask;
+ 				pmac->u[2] |= key->md.h2 & mask;
+-- 
+1.8.2.1
+
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.1e-ipv6.patch
new file mode 100644
index 00000000..521cfb5e
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-ipv6.patch
@@ -0,0 +1,656 @@
+http://rt.openssl.org/Ticket/Display.html?id=2051
+user/pass: guest/guest
+
+Index: apps/s_apps.h
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_apps.h,v
+retrieving revision 1.21.2.1
+diff -u -r1.21.2.1 s_apps.h
+--- apps/s_apps.h	4 Sep 2009 17:42:04 -0000	1.21.2.1
++++ apps/s_apps.h	28 Dec 2011 00:28:14 -0000
+@@ -148,7 +148,7 @@
+ #define PORT_STR        "4433"
+ #define PROTOCOL        "tcp"
+ 
+-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
++int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
+ #ifdef HEADER_X509_H
+ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+ #endif
+@@ -156,7 +156,7 @@
+ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
+ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
+ #endif
+-int init_client(int *sock, char *server, int port, int type);
++int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
+ int should_retry(int i);
+ int extract_port(char *str, short *port_ptr);
+ int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
+Index: apps/s_client.c
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_client.c,v
+retrieving revision 1.123.2.6.2.10
+diff -u -r1.123.2.6.2.10 s_client.c
+--- apps/s_client.c	14 Dec 2011 22:18:02 -0000	1.123.2.6.2.10
++++ apps/s_client.c	28 Dec 2011 00:28:14 -0000
+@@ -285,6 +285,10 @@
+ 	{
+ 	BIO_printf(bio_err,"usage: s_client args\n");
+ 	BIO_printf(bio_err,"\n");
++	BIO_printf(bio_err," -4             - use IPv4 only\n");
++#if OPENSSL_USE_IPV6
++	BIO_printf(bio_err," -6             - use IPv6 only\n");
++#endif
+ 	BIO_printf(bio_err," -host host     - use -connect instead\n");
+ 	BIO_printf(bio_err," -port port     - use -connect instead\n");
+ 	BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
+@@ -564,6 +567,7 @@
+ 	int sbuf_len,sbuf_off;
+ 	fd_set readfds,writefds;
+ 	short port=PORT;
++	int use_ipv4, use_ipv6;
+ 	int full_log=1;
+ 	char *host=SSL_HOST_NAME;
+ 	char *cert_file=NULL,*key_file=NULL;
+@@ -609,7 +613,11 @@
+ #endif
+ 	char *sess_in = NULL;
+ 	char *sess_out = NULL;
+-	struct sockaddr peer;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage peer;
++#else
++	struct sockaddr_in peer;
++#endif
+ 	int peerlen = sizeof(peer);
+ 	int enable_timeouts = 0 ;
+ 	long socket_mtu = 0;
+@@ -630,6 +638,12 @@
+ 	meth=SSLv2_client_method();
+ #endif
+ 
++	use_ipv4 = 1;
++#if OPENSSL_USE_IPV6
++	use_ipv6 = 1;
++#else
++	use_ipv6 = 0;
++#endif
+ 	apps_startup();
+ 	c_Pause=0;
+ 	c_quiet=0;
+@@ -951,6 +961,18 @@
+ 			jpake_secret = *++argv;
+ 			}
+ #endif
++		else if (strcmp(*argv,"-4") == 0)
++			{
++			use_ipv4 = 1;
++			use_ipv6 = 0;
++			}
++#if OPENSSL_USE_IPV6
++		else if (strcmp(*argv,"-6") == 0)
++			{
++			use_ipv4 = 0;
++			use_ipv6 = 1;
++			}
++#endif
+ #ifndef OPENSSL_NO_SRTP
+ 		else if (strcmp(*argv,"-use_srtp") == 0)
+ 			{
+@@ -1259,7 +1276,7 @@
+ 
+ re_start:
+ 
+-	if (init_client(&s,host,port,socket_type) == 0)
++	if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
+ 		{
+ 		BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
+ 		SHUTDOWN(s);
+@@ -1285,7 +1302,7 @@
+ 		{
+ 
+ 		sbio=BIO_new_dgram(s,BIO_NOCLOSE);
+-		if (getsockname(s, &peer, (void *)&peerlen) < 0)
++		if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
+ 			{
+ 			BIO_printf(bio_err, "getsockname:errno=%d\n",
+ 				get_last_socket_error());
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_server.c,v
+retrieving revision 1.136.2.15.2.13
+diff -u -r1.136.2.15.2.13 s_server.c
+--- apps/s_server.c	27 Dec 2011 14:23:22 -0000	1.136.2.15.2.13
++++ apps/s_server.c	28 Dec 2011 00:28:14 -0000
+@@ -558,6 +558,10 @@
+ # endif
+         BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list");
+ #endif
++	BIO_printf(bio_err," -4            - use IPv4 only\n");
++#if OPENSSL_USE_IPV6
++	BIO_printf(bio_err," -6            - use IPv6 only\n");
++#endif
+ 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
+ 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
+ 	}
+@@ -943,6 +947,7 @@
+ 	int state=0;
+ 	const SSL_METHOD *meth=NULL;
+ 	int socket_type=SOCK_STREAM;
++	int use_ipv4, use_ipv6;
+ 	ENGINE *e=NULL;
+ 	char *inrand=NULL;
+ 	int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
+@@ -981,6 +986,12 @@
+   /*  #error no SSL version enabled */
+ #endif
+ 
++	use_ipv4 = 1;
++#if OPENSSL_USE_IPV6
++	use_ipv6 = 1;
++#else
++	use_ipv6 = 0;
++#endif
+ 	local_argc=argc;
+ 	local_argv=argv;
+ 
+@@ -1329,6 +1340,18 @@
+ 			jpake_secret = *(++argv);
+ 			}
+ #endif
++		else if (strcmp(*argv,"-4") == 0)
++			{
++			use_ipv4 = 1;
++			use_ipv6 = 0;
++			}
++#if OPENSSL_USE_IPV6
++		else if (strcmp(*argv,"-6") == 0)
++			{
++			use_ipv4 = 0;
++			use_ipv6 = 1;
++			}
++#endif
+ #ifndef OPENSSL_NO_SRTP
+ 		else if (strcmp(*argv,"-use_srtp") == 0)
+ 			{
+@@ -1884,9 +1907,9 @@
+ 	BIO_printf(bio_s_out,"ACCEPT\n");
+ 	(void)BIO_flush(bio_s_out);
+ 	if (www)
+-		do_server(port,socket_type,&accept_socket,www_body, context);
++		do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
+ 	else
+-		do_server(port,socket_type,&accept_socket,sv_body, context);
++		do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
+ 	print_stats(bio_s_out,ctx);
+ 	ret=0;
+ end:
+Index: apps/s_socket.c
+===================================================================
+RCS file: /v/openssl/cvs/openssl/apps/s_socket.c,v
+retrieving revision 1.43.2.3.2.2
+diff -u -r1.43.2.3.2.2 s_socket.c
+--- apps/s_socket.c	2 Dec 2011 14:39:40 -0000	1.43.2.3.2.2
++++ apps/s_socket.c	28 Dec 2011 00:28:14 -0000
+@@ -97,16 +97,16 @@
+ #include "netdb.h"
+ #endif
+ 
+-static struct hostent *GetHostByName(char *name);
++static struct hostent *GetHostByName(char *name, int domain);
+ #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+ static void ssl_sock_cleanup(void);
+ #endif
+ static int ssl_sock_init(void);
+-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
+-static int init_server(int *sock, int port, int type);
+-static int init_server_long(int *sock, int port,char *ip, int type);
++static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
++static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
+ static int do_accept(int acc_sock, int *sock, char **host);
+-static int host_ip(char *str, unsigned char ip[4]);
++static int host_ip(char *str, unsigned char *ip, int domain);
+ 
+ #ifdef OPENSSL_SYS_WIN16
+ #define SOCKET_PROTOCOL	0 /* more microsoft stupidity */
+@@ -234,38 +234,68 @@
+ 	return(1);
+ 	}
+ 
+-int init_client(int *sock, char *host, int port, int type)
++int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
+ 	{
++#if OPENSSL_USE_IPV6
++	unsigned char ip[16];
++#else
+ 	unsigned char ip[4];
++#endif
+ 
+-	memset(ip, '\0', sizeof ip);
+-	if (!host_ip(host,&(ip[0])))
+-		return 0;
+-	return init_client_ip(sock,ip,port,type);
+-	}
+-
+-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+-	{
+-	unsigned long addr;
++	if (use_ipv4)
++		if (host_ip(host,ip,AF_INET))
++			return(init_client_ip(sock,ip,port,type,AF_INET));
++#if OPENSSL_USE_IPV6
++	if (use_ipv6)
++		if (host_ip(host,ip,AF_INET6))
++			return(init_client_ip(sock,ip,port,type,AF_INET6));
++#endif
++	return 0;
++	}
++
++static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
++	{
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage them;
++	struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
++	struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
++#else
+ 	struct sockaddr_in them;
++	struct sockaddr_in *them_in = &them;
++#endif
++	socklen_t addr_len;
+ 	int s,i;
+ 
+ 	if (!ssl_sock_init()) return(0);
+ 
+ 	memset((char *)&them,0,sizeof(them));
+-	them.sin_family=AF_INET;
+-	them.sin_port=htons((unsigned short)port);
+-	addr=(unsigned long)
+-		((unsigned long)ip[0]<<24L)|
+-		((unsigned long)ip[1]<<16L)|
+-		((unsigned long)ip[2]<< 8L)|
+-		((unsigned long)ip[3]);
+-	them.sin_addr.s_addr=htonl(addr);
++	if (domain == AF_INET)
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in);
++		them_in->sin_family=AF_INET;
++		them_in->sin_port=htons((unsigned short)port);
++#ifndef BIT_FIELD_LIMITS
++		memcpy(&them_in->sin_addr.s_addr, ip, 4);
++#else
++		memcpy(&them_in->sin_addr, ip, 4);
++#endif
++		}
++	else
++#if OPENSSL_USE_IPV6
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in6);
++		them_in6->sin6_family=AF_INET6;
++		them_in6->sin6_port=htons((unsigned short)port);
++		memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
++		}
++#else
++		return(0);
++#endif
+ 
+ 	if (type == SOCK_STREAM)
+-		s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
++		s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
+ 	else /* ( type == SOCK_DGRAM) */
+-		s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
++		s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
+ 			
+ 	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
+ 
+@@ -277,29 +315,27 @@
+ 		if (i < 0) { perror("keepalive"); return(0); }
+ 		}
+ #endif
+-
+-	if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
++	if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
+ 		{ closesocket(s); perror("connect"); return(0); }
+ 	*sock=s;
+ 	return(1);
+ 	}
+ 
+-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
++int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
+ 	{
+ 	int sock;
+ 	char *name = NULL;
+ 	int accept_socket = 0;
+ 	int i;
+ 
+-	if (!init_server(&accept_socket,port,type)) return(0);
+-
++	if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
+ 	if (ret != NULL)
+ 		{
+ 		*ret=accept_socket;
+ 		/* return(1);*/
+ 		}
+-  	for (;;)
+-  		{
++	for (;;)
++		{
+ 		if (type==SOCK_STREAM)
+ 			{
+ 			if (do_accept(accept_socket,&sock,&name) == 0)
+@@ -322,41 +358,88 @@
+ 		}
+ 	}
+ 
+-static int init_server_long(int *sock, int port, char *ip, int type)
++static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
+ 	{
+ 	int ret=0;
++	int domain;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage server;
++	struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
++	struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
++#else
+ 	struct sockaddr_in server;
++	struct sockaddr_in *server_in = &server;
++#endif
++	socklen_t addr_len;
+ 	int s= -1;
+ 
++	if (!use_ipv4 && !use_ipv6)
++		goto err;
++#if OPENSSL_USE_IPV6
++	/* we are fine here */
++#else
++	if (use_ipv6)
++		goto err;
++#endif
+ 	if (!ssl_sock_init()) return(0);
+ 
+-	memset((char *)&server,0,sizeof(server));
+-	server.sin_family=AF_INET;
+-	server.sin_port=htons((unsigned short)port);
+-	if (ip == NULL)
+-		server.sin_addr.s_addr=INADDR_ANY;
+-	else
+-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
+-#ifndef BIT_FIELD_LIMITS
+-		memcpy(&server.sin_addr.s_addr,ip,4);
++#if OPENSSL_USE_IPV6
++	domain = use_ipv6 ? AF_INET6 : AF_INET;
+ #else
+-		memcpy(&server.sin_addr,ip,4);
++	domain = AF_INET;
+ #endif
+-	
+-		if (type == SOCK_STREAM)
+-			s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
+-		else /* type == SOCK_DGRAM */
+-			s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
++	if (type == SOCK_STREAM)
++		s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
++	else /* type == SOCK_DGRAM */
++		s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
+ 
+ 	if (s == INVALID_SOCKET) goto err;
+ #if defined SOL_SOCKET && defined SO_REUSEADDR
++	{
++	int j = 1;
++	setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
++		   (void *) &j, sizeof j);
++	}
++#endif
++#if OPENSSL_USE_IPV6
++	if ((use_ipv4 == 0) && (use_ipv6 == 1))
+ 		{
+-		int j = 1;
+-		setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+-			   (void *) &j, sizeof j);
++		const int on = 1;
++
++		setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
++		           (const void *) &on, sizeof(int));
+ 		}
+ #endif
+-	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
++	if (domain == AF_INET)
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in);
++		memset(server_in, 0, sizeof(struct sockaddr_in));
++		server_in->sin_family=AF_INET;
++		server_in->sin_port = htons((unsigned short)port);
++		if (ip == NULL)
++			server_in->sin_addr.s_addr = htonl(INADDR_ANY);
++		else
++/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
++#ifndef BIT_FIELD_LIMITS
++			memcpy(&server_in->sin_addr.s_addr, ip, 4);
++#else
++			memcpy(&server_in->sin_addr, ip, 4);
++#endif
++		}
++#if OPENSSL_USE_IPV6
++	else
++		{
++		addr_len = (socklen_t)sizeof(struct sockaddr_in6);
++		memset(server_in6, 0, sizeof(struct sockaddr_in6));
++		server_in6->sin6_family = AF_INET6;
++		server_in6->sin6_port = htons((unsigned short)port);
++		if (ip == NULL)
++			server_in6->sin6_addr = in6addr_any;
++		else
++			memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
++		}
++#endif
++	if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
+ 		{
+ #ifndef OPENSSL_SYS_WINDOWS
+ 		perror("bind");
+@@ -375,16 +458,23 @@
+ 	return(ret);
+ 	}
+ 
+-static int init_server(int *sock, int port, int type)
++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
+ 	{
+-	return(init_server_long(sock, port, NULL, type));
++	return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
+ 	}
+ 
+ static int do_accept(int acc_sock, int *sock, char **host)
+ 	{
+ 	int ret;
+ 	struct hostent *h1,*h2;
+-	static struct sockaddr_in from;
++#if OPENSSL_USE_IPV6
++	struct sockaddr_storage from;
++	struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
++	struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
++#else
++	struct sockaddr_in from;
++	struct sockaddr_in *from_in = &from;
++#endif
+ 	int len;
+ /*	struct linger ling; */
+ 
+@@ -431,13 +521,23 @@
+ */
+ 
+ 	if (host == NULL) goto end;
++#if OPENSSL_USE_IPV6
++	if (from.ss_family == AF_INET)
++#else
++	if (from.sin_family == AF_INET)
++#endif
+ #ifndef BIT_FIELD_LIMITS
+-	/* I should use WSAAsyncGetHostByName() under windows */
+-	h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
+-		sizeof(from.sin_addr.s_addr),AF_INET);
++		/* I should use WSAAsyncGetHostByName() under windows */
++		h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
++		                 sizeof(from_in->sin_addr.s_addr), AF_INET);
+ #else
+-	h1=gethostbyaddr((char *)&from.sin_addr,
+-		sizeof(struct in_addr),AF_INET);
++		h1=gethostbyaddr((char *)&from_in->sin_addr,
++		                 sizeof(struct in_addr), AF_INET);
++#endif
++#if OPENSSL_USE_IPV6
++	else
++		h1=gethostbyaddr((char *)&from_in6->sin6_addr,
++		                 sizeof(struct in6_addr), AF_INET6);
+ #endif
+ 	if (h1 == NULL)
+ 		{
+@@ -454,15 +554,23 @@
+ 			}
+ 		BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
+ 
+-		h2=GetHostByName(*host);
++#if OPENSSL_USE_IPV6
++		h2=GetHostByName(*host, from.ss_family);
++#else
++		h2=GetHostByName(*host, from.sin_family);
++#endif
+ 		if (h2 == NULL)
+ 			{
+ 			BIO_printf(bio_err,"gethostbyname failure\n");
+ 			return(0);
+ 			}
+-		if (h2->h_addrtype != AF_INET)
++#if OPENSSL_USE_IPV6
++		if (h2->h_addrtype != from.ss_family)
++#else
++		if (h2->h_addrtype != from.sin_family)
++#endif
+ 			{
+-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
++			BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
+ 			return(0);
+ 			}
+ 		}
+@@ -477,7 +585,7 @@
+ 	char *h,*p;
+ 
+ 	h=str;
+-	p=strchr(str,':');
++	p=strrchr(str,':');
+ 	if (p == NULL)
+ 		{
+ 		BIO_printf(bio_err,"no port defined\n");
+@@ -485,7 +593,7 @@
+ 		}
+ 	*(p++)='\0';
+ 
+-	if ((ip != NULL) && !host_ip(str,ip))
++	if ((ip != NULL) && !host_ip(str,ip,AF_INET))
+ 		goto err;
+ 	if (host_ptr != NULL) *host_ptr=h;
+ 
+@@ -496,48 +604,58 @@
+ 	return(0);
+ 	}
+ 
+-static int host_ip(char *str, unsigned char ip[4])
++static int host_ip(char *str, unsigned char *ip, int domain)
+ 	{
+-	unsigned int in[4]; 
++	unsigned int in[4];
++	unsigned long l;
+ 	int i;
+ 
+-	if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
++	if ((domain == AF_INET) &&
++	    (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
+ 		{
++		
+ 		for (i=0; i<4; i++)
+ 			if (in[i] > 255)
+ 				{
+ 				BIO_printf(bio_err,"invalid IP address\n");
+ 				goto err;
+ 				}
+-		ip[0]=in[0];
+-		ip[1]=in[1];
+-		ip[2]=in[2];
+-		ip[3]=in[3];
+-		}
++		l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
++		memcpy(ip, &l, 4);
++		return 1;
++		}
++#if OPENSSL_USE_IPV6
++	else if ((domain == AF_INET6) &&
++	         (inet_pton(AF_INET6, str, ip) == 1))
++	         return 1;
++#endif
+ 	else
+ 		{ /* do a gethostbyname */
+ 		struct hostent *he;
+ 
+ 		if (!ssl_sock_init()) return(0);
+ 
+-		he=GetHostByName(str);
++		he=GetHostByName(str,domain);
+ 		if (he == NULL)
+ 			{
+ 			BIO_printf(bio_err,"gethostbyname failure\n");
+ 			goto err;
+ 			}
+ 		/* cast to short because of win16 winsock definition */
+-		if ((short)he->h_addrtype != AF_INET)
++		if ((short)he->h_addrtype != domain)
+ 			{
+-			BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
++			BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
+ 			return(0);
+ 			}
+-		ip[0]=he->h_addr_list[0][0];
+-		ip[1]=he->h_addr_list[0][1];
+-		ip[2]=he->h_addr_list[0][2];
+-		ip[3]=he->h_addr_list[0][3];
++		if (domain == AF_INET)
++			memset(ip, 0, 4);
++#if OPENSSL_USE_IPV6
++		else
++			memset(ip, 0, 16);
++#endif
++		memcpy(ip, he->h_addr_list[0], he->h_length);
++		return 1;
+ 		}
+-	return(1);
+ err:
+ 	return(0);
+ 	}
+@@ -574,7 +692,7 @@
+ static unsigned long ghbn_hits=0L;
+ static unsigned long ghbn_miss=0L;
+ 
+-static struct hostent *GetHostByName(char *name)
++static struct hostent *GetHostByName(char *name, int domain)
+ 	{
+ 	struct hostent *ret;
+ 	int i,lowi=0;
+@@ -589,14 +707,20 @@
+ 			}
+ 		if (ghbn_cache[i].order > 0)
+ 			{
+-			if (strncmp(name,ghbn_cache[i].name,128) == 0)
++			if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
++			    (ghbn_cache[i].ent.h_addrtype == domain))
+ 				break;
+ 			}
+ 		}
+ 	if (i == GHBN_NUM) /* no hit*/
+ 		{
+ 		ghbn_miss++;
+-		ret=gethostbyname(name);
++		if (domain == AF_INET)
++			ret=gethostbyname(name);
++#if OPENSSL_USE_IPV6
++		else
++			ret=gethostbyname2(name, AF_INET6);
++#endif
+ 		if (ret == NULL) return(NULL);
+ 		/* else add to cache */
+ 		if(strlen(name) < sizeof ghbn_cache[0].name)
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-perl-5.18.patch b/dev-libs/openssl/files/openssl-1.0.1e-perl-5.18.patch
new file mode 100644
index 00000000..6427c535
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-perl-5.18.patch
@@ -0,0 +1,375 @@
+https://bugs.gentoo.org/483820
+
+Submitted By: Martin Ward <macros_the_black at ntlworld dot com>
+Date: 2013-06-18
+Initial Package Version: 1.0.1e
+Upstream Status: Unknown
+Origin: self, based on fedora
+Description: Fixes install with perl-5.18.
+
+--- openssl-1.0.1e.orig/doc/apps/cms.pod
++++ openssl-1.0.1e/doc/apps/cms.pod
+@@ -450,28 +450,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1e.orig/doc/apps/smime.pod
++++ openssl-1.0.1e/doc/apps/smime.pod
+@@ -308,28 +308,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod
++++ openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod
+@@ -278,6 +278,8 @@
+ an application specific error. This will never be returned unless explicitly
+ set by an application.
+ 
++=back
++
+ =head1 NOTES
+ 
+ The above functions should be used instead of directly referencing the fields
+--- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod
++++ openssl-1.0.1e/doc/ssl/SSL_accept.pod
+@@ -44,12 +44,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+--- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod
++++ openssl-1.0.1e/doc/ssl/SSL_clear.pod
+@@ -56,12 +56,12 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The SSL_clear() operation was successful.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod
++++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
+@@ -53,11 +53,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation succeeded.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation failed. Check the error queue to find out the reason.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod
++++ openssl-1.0.1e/doc/ssl/SSL_connect.pod
+@@ -41,12 +41,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod
+@@ -52,13 +52,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+  The operation failed. In case of the add operation, it was tried to add
+  the same (identical) session twice. In case of the remove operation, the
+  session was not found in the cache.
+ 
+-=item 1
++=item C<1>
+  
+  The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod
+@@ -100,13 +100,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,11 +66,11 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+-=item 0
++=item C<0>
+ 
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod
+@@ -64,13 +64,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod
+@@ -42,11 +42,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The new choice failed, check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -81,6 +81,8 @@
+ 
+ Return values from the server callback are interpreted as follows:
+ 
++=over
++
+ =item > 0
+ 
+ PSK identity was found and the server callback has provided the PSK
+@@ -94,9 +96,11 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+ 
+-=item 0
++=item C<0>
+ 
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+ 
++=back
++
+ =cut
+--- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod
++++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod
+@@ -45,12 +45,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+--- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod
++++ openssl-1.0.1e/doc/ssl/SSL_read.pod
+@@ -86,7 +86,7 @@
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+--- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod
++++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod
+@@ -27,11 +27,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A new session was negotiated.
+ 
+-=item 1
++=item C<1>
+ 
+ A session was reused.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod
++++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod
+@@ -35,11 +35,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed. Check the error stack to find out why.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod
++++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod
+@@ -37,11 +37,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed; check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod
++++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod
+@@ -92,12 +92,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+ 
+-=item 0
++=item C<0>
+ 
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+--- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod
++++ openssl-1.0.1e/doc/ssl/SSL_write.pod
+@@ -79,7 +79,7 @@
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-rdrand-explicit.patch b/dev-libs/openssl/files/openssl-1.0.1e-rdrand-explicit.patch
new file mode 100644
index 00000000..8c414a42
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-rdrand-explicit.patch
@@ -0,0 +1,28 @@
+https://chromium-review.googlesource.com/181001
+
+From 8a1956f3eac8b164f8c741ff1a259008bab3bac1 Mon Sep 17 00:00:00 2001
+From: "Dr. Stephen Henson" <steve@openssl.org>
+Date: Wed, 11 Dec 2013 14:45:12 +0000
+Subject: [PATCH] Don't use rdrand engine as default unless explicitly
+ requested. (cherry picked from commit
+ 16898401bd47a153fbf799127ff57fdcfcbd324f)
+
+---
+ crypto/engine/eng_rdrand.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
+index a9ba5ae..4e9e91d 100644
+--- a/crypto/engine/eng_rdrand.c
++++ b/crypto/engine/eng_rdrand.c
+@@ -104,6 +104,7 @@ static int bind_helper(ENGINE *e)
+ 	{
+ 	if (!ENGINE_set_id(e, engine_e_rdrand_id) ||
+ 	    !ENGINE_set_name(e, engine_e_rdrand_name) ||
++            !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL) ||
+ 	    !ENGINE_set_init_function(e, rdrand_init) ||
+ 	    !ENGINE_set_RAND(e, &rdrand_meth) )
+ 		return 0;
+-- 
+1.8.4.3
+
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch b/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch
new file mode 100644
index 00000000..03e4f599
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/472584
+http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest
+
+fix verification handling in s_client.  when loading paths, make sure
+we properly fallback to setting the default paths.
+
+--- a/apps/s_client.c
++++ b/apps/s_client.c
+@@ -899,7 +899,7 @@
+ 	if (!set_cert_key_stuff(ctx,cert,key))
+ 		goto end;
+ 
+-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
++	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
+ 		(!SSL_CTX_set_default_verify_paths(ctx)))
+ 		{
+ 		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
+
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-tls-ver-crash.patch b/dev-libs/openssl/files/openssl-1.0.1e-tls-ver-crash.patch
new file mode 100644
index 00000000..034da7d4
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1e-tls-ver-crash.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/494816
+https://bugzilla.redhat.com/show_bug.cgi?id=1045363
+http://rt.openssl.org/Ticket/Display.html?id=3200&user=guest&pass=guest
+
+From ca989269a2876bae79393bd54c3e72d49975fc75 Mon Sep 17 00:00:00 2001
+From: "Dr. Stephen Henson" <steve@openssl.org>
+Date: Thu, 19 Dec 2013 14:37:39 +0000
+Subject: [PATCH] Use version in SSL_METHOD not SSL structure.
+
+When deciding whether to use TLS 1.2 PRF and record hash algorithms
+use the version number in the corresponding SSL_METHOD structure
+instead of the SSL structure. The SSL structure version is sometimes
+inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already.
+(CVE-2013-6449)
+---
+ ssl/s3_lib.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
+index bf832bb..c4ef273 100644
+--- a/ssl/s3_lib.c
++++ b/ssl/s3_lib.c
+@@ -4286,7 +4286,7 @@ need to go to SSL_ST_ACCEPT.
+ long ssl_get_algorithm2(SSL *s)
+ 	{
+ 	long alg2 = s->s3->tmp.new_cipher->algorithm2;
+-	if (TLS1_get_version(s) >= TLS1_2_VERSION &&
++	if (s->method->version == TLS1_2_VERSION &&
+ 	    alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))
+ 		return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
+ 	return alg2;
+-- 
+1.8.4.3
+
diff --git a/dev-libs/openssl/files/openssl-1.0.1f-perl-5.18.patch b/dev-libs/openssl/files/openssl-1.0.1f-perl-5.18.patch
new file mode 100644
index 00000000..c6620963
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1f-perl-5.18.patch
@@ -0,0 +1,356 @@
+Forward-ported from openssl-1.0.1e-perl-5.18.patch
+Fixes install with perl-5.18.
+
+https://bugs.gentoo.org/show_bug.cgi?id=497286
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- openssl-1.0.1f/doc/apps/cms.pod
++++ openssl-1.0.1f/doc/apps/cms.pod
+@@ -450,28 +450,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1f/doc/apps/smime.pod
++++ openssl-1.0.1f/doc/apps/smime.pod
+@@ -308,28 +308,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+--- openssl-1.0.1f/doc/ssl/SSL_accept.pod
++++ openssl-1.0.1f/doc/ssl/SSL_accept.pod
+@@ -44,13 +44,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_clear.pod
++++ openssl-1.0.1f/doc/ssl/SSL_clear.pod
+@@ -56,12 +56,12 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The SSL_clear() operation was successful.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
++++ openssl-1.0.1f/doc/ssl/SSL_COMP_add_compression_method.pod
+@@ -53,11 +53,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation succeeded.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation failed. Check the error queue to find out the reason.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_connect.pod
++++ openssl-1.0.1f/doc/ssl/SSL_connect.pod
+@@ -41,13 +41,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_add_session.pod
+@@ -52,13 +52,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+  The operation failed. In case of the add operation, it was tried to add
+  the same (identical) session twice. In case of the remove operation, the
+  session was not found in the cache.
+ 
+-=item 1
++=item C<1>
+  
+  The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_load_verify_locations.pod
+@@ -100,13 +100,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_client_CA_list.pod
+@@ -66,13 +66,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+ to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_session_id_context.pod
+@@ -64,13 +64,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_set_ssl_version.pod
+@@ -42,11 +42,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The new choice failed, check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
++++ openssl-1.0.1f/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+@@ -96,7 +96,7 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+ 
+-=item 0
++=item C<0>
+ 
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+--- openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
++++ openssl-1.0.1f/doc/ssl/SSL_do_handshake.pod
+@@ -45,13 +45,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+ return value B<ret> to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+--- openssl-1.0.1f/doc/ssl/SSL_read.pod
++++ openssl-1.0.1f/doc/ssl/SSL_read.pod
+@@ -86,7 +86,7 @@
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+--- openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
++++ openssl-1.0.1f/doc/ssl/SSL_session_reused.pod
+@@ -27,11 +27,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A new session was negotiated.
+ 
+-=item 1
++=item C<1>
+ 
+ A session was reused.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_fd.pod
+@@ -35,11 +35,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed. Check the error stack to find out why.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_set_session.pod
++++ openssl-1.0.1f/doc/ssl/SSL_set_session.pod
+@@ -37,11 +37,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed; check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+--- openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
++++ openssl-1.0.1f/doc/ssl/SSL_shutdown.pod
+@@ -92,14 +92,14 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+ The output of L<SSL_get_error(3)|SSL_get_error(3)> may be misleading, as an
+ erroneous SSL_ERROR_SYSCALL may be flagged even though no error occurred.
+ 
+-=item 1
++=item C<1>
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+--- openssl-1.0.1f/doc/ssl/SSL_write.pod
++++ openssl-1.0.1f/doc/ssl/SSL_write.pod
+@@ -79,7 +79,7 @@
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
diff --git a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch b/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch
new file mode 100644
index 00000000..42a6fbd5
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch
@@ -0,0 +1,83 @@
+when gcc is given a .s file and told to preprocess it, it outputs nothing
+
+https://bugs.gentoo.org/499086
+
+From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 25 Jan 2014 05:44:47 -0500
+Subject: [PATCH] Revert "Make Makefiles OSF-make-friendly."
+
+This reverts commit d1cf23ac86c05b22b8780e2c03b67230564d2d34.
+---
+ crypto/Makefile       | 4 +---
+ crypto/bn/Makefile    | 4 +---
+ crypto/evp/Makefile   | 2 +-
+ crypto/modes/Makefile | 5 +----
+ crypto/sha/Makefile   | 4 +---
+ util/shlib_wrap.sh    | 6 +-----
+ 6 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/crypto/Makefile b/crypto/Makefile
+index b253f50..1de9d5f 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -86,9 +86,7 @@ ia64cpuid.s:	ia64cpuid.S;	$(CC) $(CFLAGS) -E ia64cpuid.S > $@
+ ppccpuid.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
+ pariscid.s:	pariscid.pl;	$(PERL) pariscid.pl $(PERLASM_SCHEME) $@
+ alphacpuid.s:	alphacpuid.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+-	$(PERL) alphacpuid.pl > $$preproc && \
+-	$(CC) -E $$preproc > $@ && rm $$preproc)
++	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+ 
+ subdirs:
+ 	@target=all; $(RECURSIVE_MAKE)
+diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
+index b62b676..6c03363 100644
+--- a/crypto/bn/Makefile
++++ b/crypto/bn/Makefile
+@@ -136,9 +136,7 @@ ppc-mont.s:	asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
+ ppc64-mont.s:	asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
+ 
+ alpha-mont.s:	asm/alpha-mont.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+-	$(PERL) asm/alpha-mont.pl > $$preproc && \
+-	$(CC) -E $$preproc > $@ && rm $$preproc)
++	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+ 
+ # GNU make "catch all"
+ %-mont.S:	asm/%-mont.pl;	$(PERL) $< $(PERLASM_SCHEME) $@
+diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
+index ce0dcd6..88ac65e 100644
+--- a/crypto/modes/Makefile
++++ b/crypto/modes/Makefile
+@@ -55,10 +55,7 @@ aesni-gcm-x86_64.s:	asm/aesni-gcm-x86_64.pl
+ ghash-sparcv9.s:	asm/ghash-sparcv9.pl
+ 	$(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
+ ghash-alpha.s:	asm/ghash-alpha.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+-	$(PERL) asm/ghash-alpha.pl > $$preproc && \
+-	$(CC) -E $$preproc > $@ && rm $$preproc)
+-
++	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+ ghash-parisc.s:	asm/ghash-parisc.pl
+ 	$(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
+ 
+diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
+index 64eab6c..63fba69 100644
+--- a/crypto/sha/Makefile
++++ b/crypto/sha/Makefile
+@@ -60,9 +60,7 @@ sha256-armv4.S: asm/sha256-armv4.pl
+ 	$(PERL) $< $(PERLASM_SCHEME) $@
+ 
+ sha1-alpha.s:	asm/sha1-alpha.pl
+-	(preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
+-	$(PERL) asm/sha1-alpha.pl > $$preproc && \
+-	$(CC) -E $$preproc > $@ && rm $$preproc)
++	$(PERL) $< | $(CC) -E - | tee $@ > /dev/null
+ 
+ # Solaris make has to be explicitly told
+ sha1-x86_64.s:	asm/sha1-x86_64.pl;	$(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
+-- 
+1.8.5.3
+
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
new file mode 100644
index 00000000..84ddb514
--- /dev/null
+++ b/dev-libs/openssl/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<use>
+ <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented)</flag>
+ <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
+ <flag name='tls-heartbeat'>Enable the Heartbeat Extension in TLS and DTLS</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-libs/openssl/openssl-1.0.1g-r1.ebuild b/dev-libs/openssl/openssl-1.0.1g-r1.ebuild
new file mode 100644
index 00000000..d5a38708
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.0.1g-r1.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
+
+REV="1.7"
+DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc -ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+	kerberos? ( app-crypt/mit-krb5 )"
+# The blocks are temporary just to make sure people upgrade to a
+# version that lack runtime version checking.  We'll drop them in
+# the future.
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!<net-misc/openssh-5.9_p1-r4
+	!<net-libs/neon-0.29.6-r1"
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	test? ( sys-devel/bc )"
+PDEPEND="app-misc/ca-certificates"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/rand.h
+	usr/include/openssl/modes.h
+	usr/include/openssl/seed.h
+	usr/include/openssl/opensslconf.h
+	usr/include/openssl/kssl.h
+	usr/include/openssl/opensslconf.h
+	usr/include/openssl/srtp.h
+	usr/include/openssl/ossl_typ.h
+	usr/include/openssl/sha.h
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	SSL_CNF_DIR="/etc/ssl"
+	sed \
+		-e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+		-e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
+		"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
+		> "${WORKDIR}"/c_rehash || die #416717
+}
+
+src_prepare() {
+	# Make sure we only ever touch Makefile.org and avoid patching a file
+	# that gets blown away anyways by the Configure script in src_configure
+	rm -f Makefile
+
+	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
+		epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
+		epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1e-ipv6.patch
+		epatch "${FILESDIR}"/${PN}-1.0.1f-perl-5.18.patch #497286
+		epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584
+		epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086
+
+		epatch_user #332661
+	fi
+
+	# disable fips in the build
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	sed -i \
+		-e '/DIRS/s: fips : :g' \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		Makefile.org \
+		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
+	chmod a+rx gentoo.config
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+
+	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	# The config script does stupid stuff to prompt the user.  Kill it.
+	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
+	./config --test-sanity || die "I AM NOT SANE"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	unset APPS #197996
+	unset SCRIPTS #312551
+	unset CROSS_COMPILE #311473
+
+	tc-export CC AR RANLIB RC
+
+	# Clean out patent-or-otherwise-encumbered code
+	# Camellia: Royalty Free            http://en.wikipedia.org/wiki/Camellia_(cipher)
+	# IDEA:     Expired                 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
+	# EC:       ????????? ??/??/2015    http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
+	# MDC2:     Expired                 http://en.wikipedia.org/wiki/MDC-2
+	# RC5:      5,724,428 03/03/2015    http://en.wikipedia.org/wiki/RC5
+
+	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
+	echoit() { echo "$@" ; "$@" ; }
+
+	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
+
+	# See if our toolchain supports __uint128_t.  If so, it's 64bit
+	# friendly and can use the nicely optimized code paths. #460790
+	local ec_nistp_64_gcc_128
+	# Disable it for now though #469976
+	#if ! use bindist ; then
+	#	echo "__uint128_t i;" > "${T}"/128.c
+	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
+	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
+	#	fi
+	#fi
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+	ECONF_SOURCE=${S} \
+	echoit \
+	./${config} \
+		${sslout} \
+		$(use sse2 || echo "no-sse2") \
+		enable-camellia \
+		$(use_ssl !bindist ec) \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		$(use_ssl !bindist rc5) \
+		enable-tlsext \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
+		$(use_ssl rfc3779) \
+		$(use_ssl tls-heartbeat heartbeats) \
+		$(use_ssl zlib) \
+		--prefix="${EPREFIX}"/usr \
+		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--libdir=$(get_libdir) \
+		shared threads \
+		|| die
+
+	# Clean out hardcoded flags that openssl uses
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
+		-e 's:-fomit-frame-pointer ::g' \
+		-e 's:-O[0-9] ::g' \
+		-e 's:-march=[-a-z0-9]* ::g' \
+		-e 's:-mcpu=[-a-z0-9]* ::g' \
+		-e 's:-m[a-z0-9]* ::g' \
+	)
+	sed -i \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# depend is needed to use $confopts; it also doesn't matter
+	# that it's -j1 as the code itself serializes subdirs
+	emake -j1 depend
+	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	emake INSTALL_PREFIX="${D}" install
+}
+
+multilib_src_install_all() {
+	dobin "${WORKDIR}"/c_rehash #333117
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
+	dohtml -r doc/*
+	use rfc3779 && dodoc engines/ccgost/README.gost
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+
+	has_version ${CATEGORY}/${PN}:0.9.8 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+}
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
new file mode 100644
index 00000000..2ac476e6
--- /dev/null
+++ b/dev-libs/satyr/Manifest
@@ -0,0 +1 @@
+DIST satyr-0.13.tar.xz 483584 SHA256 8c2e0ad4512b8a22a2b005fcffe51c80930b9b09462f04d66298b417733e8451 SHA512 64a120942daca824827a8790897b27328b7162531dc860b298d044b54ae652a512f1e6cca12179ce7307626f3dac9a0e09894b265f1ded42eb7b2735843737ac WHIRLPOOL 03851582941b2a089e092182dabd62c119743e1b4d653db32b2542d1307d76984da8d7f175d438a7d0c6cb0e7c9f04dfe12e6fd5e18f3e6f615d67c371fc713c
diff --git a/dev-libs/satyr/files/satyr-0.13-elfutils-0.158.patch b/dev-libs/satyr/files/satyr-0.13-elfutils-0.158.patch
new file mode 100644
index 00000000..715b3299
--- /dev/null
+++ b/dev-libs/satyr/files/satyr-0.13-elfutils-0.158.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/core_unwind.c b/lib/core_unwind.c
+index d0c7aec..7910254 100644
+--- a/lib/core_unwind.c
++++ b/lib/core_unwind.c
+@@ -206,7 +206,7 @@ open_coredump(const char *elf_file, const char *exe_file, char **error_msg)
+     ch->cb.section_address = dwfl_offline_section_address;
+     ch->dwfl = dwfl_begin(&ch->cb);
+ 
+-    if (dwfl_core_file_report(ch->dwfl, ch->eh) == -1)
++    if (dwfl_core_file_report(ch->dwfl, ch->eh, exe_file) == -1)
+     {
+         set_error_dwfl("dwfl_core_file_report");
+         goto fail_dwfl;
diff --git a/dev-libs/satyr/satyr-0.13.ebuild b/dev-libs/satyr/satyr-0.13.ebuild
new file mode 100644
index 00000000..031b9a6f
--- /dev/null
+++ b/dev-libs/satyr/satyr-0.13.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils autotools python-single-r1 toolchain-funcs
+
+DESCRIPTION="Satyr is a collection of low-level algorithms for program failure processing"
+HOMEPAGE="https://github.com/abrt/satyr"
+SRC_URI="https://fedorahosted.org/released/abrt/satyr-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	app-arch/rpm
+	>=dev-libs/elfutils-0.158"
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/satyr-0.13-elfutils-0.158.patch"
+
+	default
+}
+
+src_configure() {
+	econf --disable-python-manpage --disable-static
+}
author	BlackNoxis <steven.darklight@gmail.com>	2014-11-07 12:54:17 +0200
committer	BlackNoxis <steven.darklight@gmail.com>	2014-11-07 12:54:17 +0200
commit	5a01792340999d37435f5000a3f6b8e0f2d11815 (patch)
tree	4bcca1f73cc4ab721b3c31ea81585917f909ebc7 /dev-libs
parent	86c8d1f28bd2b785ccbb28f41c4e0763d062ba2f (diff)