Merge remote-tracking branch 'remotes/Coacher/fwknop-2.6.8-bump'

Pull request: https://github.com/gentoo/gentoo/pull/520

8 files changed, 195 insertions, 252 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index f65ec868cf79..58b35c9c7615 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,5 +1,6 @@
 DIST Botan-1.10.10.tgz 2706592 SHA256 6b67b14746410461fe4a8ce6a625e7eef789243454fe30eab7329d5984be4163 SHA512 8f1aab5dde0191e8347ae98e265ffe799699f9ab6377a81acdb13ddabb8e025ab129b55dbc484796ddcd21c9997dde6e39ec080ad815472cb1e2857007744c9b WHIRLPOOL 3fe729adef417e5cf6af0748985324315d18ec1681ace8c00734c68043682888e29faed1bbd40e68f8f7a923f638f343368c97a89262e649d03360b361a79411
 DIST Botan-1.10.5.tbz 2214817 SHA256 2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3 SHA512 7456eaf2bbdabac9438cdd28dbc0735924480034d848c40039b5b58d52924b4cb065316989d6902201bc62fb5c19cba109b550b6865ca4d11748e3a3a1ececa6 WHIRLPOOL 7fd3de981d55a03925e78a4afcee55c0f3cf7e2dc88bd503f9c5705e5cc73293cf3bdcf3c3fdf54b6d1b77ba7dc32cf6fa46720635b922e368aaf12a39339fcd
 DIST Botan-1.11.20.tgz 2916027 SHA256 60a02717983535215822bbb1d6ae3c97cf517874d4e48808c6fbfd5c3b112d9c SHA512 0d8f0b66d1fc753381d141da96f859d30301f5e4ea74e21dbd8a787020c186a814fc485bd5055589a06f6556c860dcd39a9ba3af662b63ccf71b6cf41d805137 WHIRLPOOL 31a7df028405df2b364f47b9f7c28a8408f06d9c3600cbb7fe058bd0f8015929ca2191053a43cd16c4fa8487ff175cc7e1f17dc16f4d8c70655fbaa56b44513c
+DIST Botan-1.11.25.tgz 2841455 SHA256 cc18259cef073c4c0514cd41c94c6cd245f2e178334423945ef6fba4becff2ea SHA512 c275c0c0e8a95c1ed38ae2a0ec6daa42730a4b1cd06fc0bb9624c5b1baa43ec10af191cd3dde16a5c106250e39960840a8e2514e2123017c86152812ed27c89e WHIRLPOOL ff6c26fbbc76b78d147d073b021234b54e70acf5b99ba6128c3a407fd0bd5953d981020d67917354a1c59c684cca42a6415bddda310c871901a62378df44807d
 DIST Botan-1.11.4.tbz 2346343 SHA256 ebbcc493ef2f13f536597b72e317462e1503c83f7e18e1fe10887f16b5f4da0f SHA512 c5c521a78b50de6c6e2bba912f0697e507a8432bd7f348e3e41856cc2ed60fea5877df4957d74887419208f8df63224a4c6726c94eef58fc1b255133b1f0ee22 WHIRLPOOL 41a024e3698fa2ede2a5124b6c5d2400e969f2cddfec6e7e9e43e549097dd606d105d6e02d6268e322d98e83300c76eb4f7783ee54699a7fa85addcf9adc3aa2
 DIST Botan-1.11.8.tbz 2193897 SHA256 5c3a5485dd8f2b5e690bdc73d5848b1f436a090e7fc521c66920f34d6af68efd SHA512 2d3f5d77687ed56be39c88fe7ffdb27ebda573650f164b8681864cff0ca8b0a0bd56f9749f3695e4240a68bfa1483565c854ff4f9d8a7460de0883255a917e26 WHIRLPOOL c9eaeb2d2da10bc61eb704beb9025fada4f16ec4e82a7845cdc465295d05ad070e73d289abdc30fc96f5b43778c87f31ea4cb66c6706cb822ceb2adba0354d41
diff --git a/dev-libs/botan/botan-1.11.25.ebuild b/dev-libs/botan/botan-1.11.25.ebuild
new file mode 100644
index 000000000000..d1b7d662e008
--- /dev/null
+++ b/dev-libs/botan/botan-1.11.25.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="http://botan.randombit.net/"
+SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="0"
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="python? ( boost )"
+
+RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+	zlib? ( >=sys-libs/zlib-1.2.3 )
+	boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] )
+	lzma? ( app-arch/xz-utils )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.8g:0[bindist=] )
+		libressl? ( dev-libs/libressl )
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )"
+
+pkg_pretend() {
+	# Botan 1.11 requires -std=c++11
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+		&& die "Sorry, but gcc 4.7 or higher is required."
+	fi
+}
+
+src_prepare() {
+	sed \
+		-e "/^install:/s/ docs//" \
+		-i src/build-data/makefile/gmake.in || die "sed failed"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local disable_modules=( proc_walk unix_procs )
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	use python || disable_modules+=( "ffi" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)   myos=darwin ;;
+		*)           myos=linux  ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	./configure.py \
+		--prefix="${EPREFIX}/usr" \
+		--destdir="${D}/${EPREFIX}/usr" \
+		--libdir=$(get_libdir) \
+		--docdir=share/doc \
+		--cc=gcc \
+		--os=${myos} \
+		--cpu=${CHOSTARCH} \
+		--with-endian="$(tc-endian)" \
+		--without-sphinx \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(use_with boost) \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		|| die "configure.py failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}"
+	if use doc; then
+		einfo "Generation of documentation"
+		sphinx-build doc doc_output
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	emake install
+
+	if ! use static-libs; then
+		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
+	fi
+
+	# Add compatibility symlinks.
+	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
+	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
+	dosym botan-config-1.11 /usr/bin/botan-config
+	dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+
+	use python && python_foreach_impl python_optimize
+
+	if use doc; then
+		pushd doc_output > /dev/null
+		insinto /usr/share/doc/${PF}/html
+		doins -r [a-z]* _static
+		popd > /dev/null
+	fi
+}
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
new file mode 100644
index 000000000000..55d75c027b77
--- /dev/null
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Loki C++ library from Modern C++ Design"
+HOMEPAGE="http://www.libferris.com/"
+SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs stlport"
+
+RDEPEND="stlport? ( >=dev-libs/STLport-5 )
+	>=dev-libs/libsigc++-2.6:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# derice this damn configure script
+	sed -i \
+		-e '/^CFLAGS/{s: -O3 : :g;s:-Wl,-O1 -Wl,--hash-style=both::;}' \
+		-e 's:-lstlport_gcc:-lstlport:' \
+		configure || die
+
+	# Fix building with libsigc++-2.6
+	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
+	find -name '*.hh' -exec sed -i '/sigc++\/object.h/d' {} + || die
+
+	epatch_user
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-stlport="${EPREFIX}/usr/include/stlport" \
+		$(use_enable stlport) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 9f7f457a7f92..48052ae282aa 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,5 +1,2 @@
-DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 SHA256 fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74 SHA512 bff2b1cd907d814a61296a99eaa5cdcb983355def8022ec09620048415e66b5feea425cba2d19b9f023073165969e981358dc6e406b1bc62f1e00f49e91ef943 WHIRLPOOL c77b1aa0268043d31b3d9d9d53d6416d9d8af5fbb29b07f498aaed61807c1848961b046192ca7eab227f055ba829c13bfa2696d016795b4df71e467c2a0185cc
-DIST opencryptoki-2.3.3.tar.bz2 694854 SHA256 7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2 SHA512 2c7ea2f689daba92ec178198dc1a3ffbc4812f4547a574b86cc8b69ada4e3aefb2613d4d291829d81b97d91d5d3fbe1735bd9b3f99db415ddcb4ca03863ddc4a WHIRLPOOL 3a955b464ea44c1dc50ce9869bbc48ced2a3962ef533491aa53956cccbca1fcf9411ffcccd1839384e7f3ba87368dba4c8c415f283139169391224a1f4cf5092
-DIST opencryptoki-2.4.2.tar.gz 1083876 SHA256 0bfbcf956fec078af12c34cd447c6274a5e7e886335c3b8b81106d20ccefa0d9 SHA512 2f760968cec7f15f7de38f0c74e0444d75d1a247d1efd9fc17a17ac5f2bcc4fd283def49d46baeea0c5adb6e19236993b4e8937f0e32162bcc7dbac8066144b9 WHIRLPOOL d7df0db3450d33c3e28be0031b48f22d89387f12f35ca868f593f82a87abb9eea89f28be43fb4ce3b17dee6e1d226fc08586320fbce4e0bf7d57db871d3cd76c
-DIST opencryptoki-2.4.3.tar.gz 1111897 SHA256 3ddc0a0e96957e64e61a960c8a7bfcff0030564ebf4f6848abe0740491fd52bc SHA512 e33d8df344161909c1fc0626880d89e47ac902c5f780cc04af07691fff20c50bdea5bfa0368df39fff84b365342f704638e90b329a3ae12ab5fb5f668c50a164 WHIRLPOOL ab5836f30749e7bb56b1ba882c15098096d7c36e1f9dd65a83a93d9b497231258a54c5a60cf4847fce8267c086a3aea380c33380fcb9d7a20c770f5f922846d7
 DIST opencryptoki-v3.3.tgz 937619 SHA256 e1deac5edd571621dc1624e9b7af8d1632d6db6f18815f5ed8824fc78f354609 SHA512 53efbc6009da178473abf17d092249781b1eb465f68c83653bd5e88703b9ad74ce9e0128486dffec65beaf8b8974ea6852d206ec5bf035c7296a40c8f84791ab WHIRLPOOL d939eb97bb7f2b54d510326ac4dba4dc49f9f725fa8900687fd8ebe199ce1c2a797a6e514378995f24ef5b9e904b29434edf962537dc545c2fc2206d180b1d43
+DIST opencryptoki-v3.4.1.tgz 1014416 SHA256 018ea402f3a1b38b203282fb047dfac209d94bf2988f2c29793eca65455452c4 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6 WHIRLPOOL c05b61c220e87af361cf67c5223f5745e305c5039a610bb740d2e729299517363d5d7d03175869ab517519857a526ac0272f1556bd9e1cd9dea84bd500595f7e
diff --git a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch b/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
deleted file mode 100644
index e1375c7130bc..000000000000
--- a/dev-libs/opencryptoki/files/opencryptoki-2.4.2-destdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fcc24176398ab2f40c33ebc686c2f803782af8d6 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 15 Dec 2012 22:13:56 +0200
-Subject: [PATCH] Always use DESTDIR when installing
-
----
- usr/Makefile.am |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/usr/Makefile.am b/usr/Makefile.am
-index bced120..20352d5 100644
---- a/usr/Makefile.am
-+++ b/usr/Makefile.am
-@@ -5,6 +5,6 @@ endif
- SUBDIRS = lib $(DAEMONDIRS)
- 
- install-data-hook:
--	$(MKDIR_P) $(lockdir)
--	$(CHGRP) pkcs11 $(lockdir)
--	$(CHMOD) 0770 $(lockdir)
-+	$(MKDIR_P) $(DESTDIR)$(lockdir)
-+	$(CHGRP) pkcs11 $(DESTDIR)$(lockdir)
-+	$(CHMOD) 0770 $(DESTDIR)$(lockdir)
--- 
-1.7.8.6
-
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
deleted file mode 100644
index 877a90eafbd3..000000000000
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-# backports are maintained as tags on Diego's repository on gitorious:
-# http://gitorious.org/~flameeyes/opencryptoki/flameeyess-opencryptoki
-BACKPORTS=3
-
-inherit autotools eutils multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
-SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
-	${BACKPORTS:+
-		https://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-		 dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-IUSE="+tpm debug"
-
-# tests right now basically don't exist; the only available thing would
-# test against an installed copy and would kill a running pcscd, all
-# things that we're not interested to.
-RESTRICT=test
-
-pkg_setup() {
-	enewgroup pkcs11
-}
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_MULTI_MSG="Applying backports patches #${BACKPORTS} ..." \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	eautoreconf
-}
-
-src_configure() {
-	# package uses ${localstatedir}/lib as the default path, so if we
-	# leave it to econf, it'll create /var/lib/lib.
-
-	# Since upstream by default seem to enable any possible token, even
-	# when they don't seem to be used, we limit ourselves to the
-	# software emulation token (swtok) and if the user enabled the tpm
-	# USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-	# software-dependent even when they build fine without their
-	# requirements, but until somebody asks for those, I'd rather not
-	# enable them.
-
-	# We don't use --enable-debug because that tinkers with the CFLAGS
-	# and we don't want that. Instead we append -DDEBUG which enables
-	# debug information.
-	use debug && append-flags -DDEBUG
-
-	econf \
-		--localstatedir=/var \
-		--enable-fast-install \
-		--disable-dependency-tracking \
-		--disable-debug \
-		--enable-daemon \
-		--enable-library \
-		--disable-icatok \
-		--enable-swtok \
-		$(use_enable tpm tpmtok) \
-		--disable-aeptok \
-		--disable-bcomtok \
-		--disable-ccatok \
-		--disable-crtok \
-		--disable-icctok \
-		--disable-pkcscca_migrate
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	# Install libopencryptoki in the standard directory for libraries.
-	mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
-	rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
-	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
-
-	# Remove compatibility symlinks as we _never_ required those and
-	# they seem unused even upstream.
-	find "${D}" -name 'PKCS11_*' -delete
-
-	# doesn't use libltdl; only dlopen()-based interfaces
-	find "${D}" -name '*.la' -delete
-
-	# We replace their ld.so and init files (mostly designed for RedHat
-	# as far as I can tell) with our own replacements.
-	rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
-
-	# make sure that we don't modify the init script if the USE flags
-	# are enabled for the needed services.
-	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
-	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
-	newinitd "${T}/pkcsslotd.init" pkcsslotd
-
-	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
-}
diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
deleted file mode 100644
index fb736c031f18..000000000000
--- a/dev-libs/opencryptoki/opencryptoki-2.4.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils multilib flag-o-matic user
-
-DESCRIPTION="PKCS#11 provider cryptographic hardware"
-HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
-SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.gz"
-
-# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
-# token sources are under CPL-1.0 already.
-LICENSE="CPL-0.5"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="tpm? ( app-crypt/trousers )
-		 dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-IUSE="+tpm debug"
-
-# tests right now basically don't exist; the only available thing would
-# test against an installed copy and would kill a running pcscd, all
-# things that we're not interested to.
-RESTRICT=test
-
-pkg_setup() {
-	enewgroup pkcs11
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-destdir.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# package uses ${localstatedir}/lib as the default path, so if we
-	# leave it to econf, it'll create /var/lib/lib.
-
-	# Since upstream by default seem to enable any possible token, even
-	# when they don't seem to be used, we limit ourselves to the
-	# software emulation token (swtok) and if the user enabled the tpm
-	# USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
-	# software-dependent even when they build fine without their
-	# requirements, but until somebody asks for those, I'd rather not
-	# enable them.
-
-	# We don't use --enable-debug because that tinkers with the CFLAGS
-	# and we don't want that. Instead we append -DDEBUG which enables
-	# debug information.
-	use debug && append-flags -DDEBUG
-
-	econf \
-		--localstatedir=/var \
-		--enable-fast-install \
-		--disable-dependency-tracking \
-		--disable-debug \
-		--enable-daemon \
-		--enable-library \
-		--disable-icatok \
-		--enable-swtok \
-		$(use_enable tpm tpmtok) \
-		--disable-aeptok \
-		--disable-bcomtok \
-		--disable-ccatok \
-		--disable-crtok \
-		--disable-icctok \
-		--disable-pkcscca_migrate
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	# Install libopencryptoki in the standard directory for libraries.
-	mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
-	rm "${D}"/usr/$(get_libdir)/pkcs11/libopencryptoki.so
-	dosym ../libopencryptoki.so /usr/$(get_libdir)/pkcs11/libopencryptoki.so
-
-	# Remove compatibility symlinks as we _never_ required those and
-	# they seem unused even upstream.
-	find "${D}" -name 'PKCS11_*' -delete
-
-	# doesn't use libltdl; only dlopen()-based interfaces
-	find "${D}" -name '*.la' -delete
-
-	# We replace their ld.so and init files (mostly designed for RedHat
-	# as far as I can tell) with our own replacements.
-	rm -rf "${D}"/etc/ld.so.conf.d "${D}"/etc/rc.d
-
-	# make sure that we don't modify the init script if the USE flags
-	# are enabled for the needed services.
-	cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
-	use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
-	newinitd "${T}/pkcsslotd.init" pkcsslotd
-
-	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
-}
diff --git a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index 60a26ba9b41e..ff61dcb9a7b0 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.4.3.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI="5"
 
 inherit autotools multilib flag-o-matic user
 
 DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
-SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/opencryptoki/${PV}/${PN}-v${PV}.tgz"
 
 # Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
 # token sources are under CPL-1.0 already.
@@ -17,11 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="tpm? ( app-crypt/trousers )
-		 dev-libs/openssl"
+		 dev-libs/openssl:*"
 DEPEND="${RDEPEND}"
 
 IUSE="+tpm debug"
 
+S="${WORKDIR}/${PN}"
+
 # tests right now basically don't exist; the only available thing would
 # test against an installed copy and would kill a running pcscd, all
 # things that we're not interested to.
@@ -32,6 +34,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -62,16 +65,11 @@ src_configure() {
 		--disable-icatok \
 		--enable-swtok \
 		$(use_enable tpm tpmtok) \
-		--disable-aeptok \
-		--disable-bcomtok \
-		--disable-ccatok \
-		--disable-crtok \
-		--disable-icctok \
-		--disable-pkcscca_migrate
+		--disable-ccatok
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	emake install DESTDIR="${ED}"
 
 	# Install libopencryptoki in the standard directory for libraries.
 	mv "${D}"/usr/$(get_libdir)/opencryptoki/libopencryptoki.so* "${D}"/usr/$(get_libdir) || die
@@ -99,5 +97,5 @@ src_install() {
 	# our own.
 	rm -r "${D}"/var/{lib,lock} || die
 
-	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die
+	dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf
 }