diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 466a738b4d1c..8959ce1a582c 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,2 +1 @@
-DIST catdoc-0.94.2.tar.gz 146012 SHA256 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362 SHA512 d1772ba8977b7d99febd0a34e0660a169eea7c91c873baeab0e290c448a66cfacc3ad7d8927c4cae0106af4b41bac1e66492fec743a6406d70a7e0df6f418a56 WHIRLPOOL a076abfa9a4695188faa736643e8d843be55e6391d97edcc8e11fda81eb6f5d631c9048ad47c080b9be42c4c6df47ae1d0227857f4626c4c31fead4fbca5bd5b
DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5
diff --git a/app-text/catdoc/catdoc-0.94.2.ebuild b/app-text/catdoc/catdoc-0.94.2.ebuild
deleted file mode 100644
index 827c4588effa..000000000000
--- a/app-text/catdoc/catdoc-0.94.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2.ebuild,v 1.3 2008/08/17 17:21:31 maekke Exp $
-
-DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
-HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE="tk"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="tk? ( >=dev-lang/tk-8.1 )"
-
-DOCS="CODING.STD CREDITS NEWS README TODO"
-
-src_compile() {
-
- local myconf="--with-install-root=${D}"
-
- use tk \
- && myconf="${myconf} --with-wish=/usr/bin/wish" \
- || myconf="${myconf} --disable-wordview"
-
- econf ${myconf} || die
- emake LIB_DIR=/usr/share/catdoc || die
-
-}
-
-src_install() {
-
- emake -j1 mandir=/usr/share/man/man1 install || die
- dodoc ${DOCS}
-
-}
diff --git a/app-text/catdoc/catdoc-0.94.2-r2.ebuild b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
similarity index 59%
rename from app-text/catdoc/catdoc-0.94.2-r2.ebuild
rename to app-text/catdoc/catdoc-0.94.4-r1.ebuild
index a9b45a72cf3c..a31e488ec1e5 100644
--- a/app-text/catdoc/catdoc-0.94.2-r2.ebuild
+++ b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
@@ -1,28 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.3 2010/09/15 11:22:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.4-r1.ebuild,v 1.1 2014/10/27 05:27:08 radhermit Exp $
-EAPI=3
+EAPI=5
WANT_AUTOMAKE=none
inherit autotools eutils
DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
-IUSE="tk"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
DEPEND="tk? ( >=dev-lang/tk-8.1 )"
DOCS="CODING.STD CREDITS NEWS README TODO"
src_prepare() {
- epatch "${FILESDIR}/${P}-flags.patch"
- epatch "${FILESDIR}/${P}+autoconf-2.63.patch"
+ epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
+ epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
+ epatch "${FILESDIR}"/${P}-destdir.patch
+ epatch "${FILESDIR}"/${P}-desktop.patch
+
+ # only install wordview.desktop when tk is enabled (bug #522766)
+ if ! use tk ; then
+ sed -i 's/ desktop//' Makefile.in || die
+ fi
# Fix for case-insensitive filesystems
echo ".PHONY: all install clean distclean dist" >> Makefile.in
@@ -37,11 +44,11 @@ src_configure() {
}
src_compile() {
- emake LIB_DIR="${EPREFIX}"/usr/share/catdoc || die
+ emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
}
src_install() {
- emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
+ emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
if [[ -e ${ED}/usr/bin/xls2csv ]]; then
einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index ba6a8a8800d5..f3fcf97ba32f 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@@ -1,5 +1,9 @@
-tex
+
+ radhermit@gentoo.org
+ Tim Harder
+
+ tex
diff --git a/app-text/krop/krop-0.4.6.ebuild b/app-text/krop/krop-0.4.6.ebuild
index e9ea8a873322..da81c92351e8 100644
--- a/app-text/krop/krop-0.4.6.ebuild
+++ b/app-text/krop/krop-0.4.6.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/krop/krop-0.4.6.ebuild,v 1.1 2014/10/10 15:45:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/krop/krop-0.4.6.ebuild,v 1.2 2014/10/27 05:46:07 ssuominen Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
inherit eutils distutils-r1
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
new file mode 100644
index 000000000000..3dbde60b3b3d
--- /dev/null
+++ b/app-text/restview/Manifest
@@ -0,0 +1 @@
+DIST restview-2.1.1.tar.gz 24948 SHA256 1bf9e845078d05e7cda31bba6fed24a74ffe46f4f466b7b28c39650801724c1f SHA512 c74158d415940c3240b248ec83b1d9c79fa7e279b05a118f04fd5caf6273ef6ba4944a62cf8832e6e214b256962fc559abf42f28a636f4e3140dad9d88fe0cf0 WHIRLPOOL 5986fe67814806eff6c566cb8ba5cd426de984a74740ec50a16790f67029e0d28a33087ec0de1f016461bce725cfbe9921bf8bedef7ffc4603fb9dfcf567c765
diff --git a/app-text/restview/metadata.xml b/app-text/restview/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /dev/null
+++ b/app-text/restview/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ radhermit@gentoo.org
+ Tim Harder
+
+
diff --git a/app-text/restview/restview-2.1.1.ebuild b/app-text/restview/restview-2.1.1.ebuild
new file mode 100644
index 000000000000..f225f46cad02
--- /dev/null
+++ b/app-text/restview/restview-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/restview/restview-2.1.1.ebuild,v 1.1 2014/10/27 05:16:06 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-db/lmdb/lmdb-0.9.14.ebuild b/dev-db/lmdb/lmdb-0.9.14.ebuild
index fb3a03f7d426..c3416ef8cb12 100644
--- a/dev-db/lmdb/lmdb-0.9.14.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.1 2014/10/23 11:57:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.2 2014/10/27 05:29:53 robbat2 Exp $
EAPI=5
inherit toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/2f587ae081d076e3707360c5db086520c
LICENSE="OPENLDAP"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
new file mode 100644
index 000000000000..6f97f318bc60
--- /dev/null
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild,v 1.1 2014/10/27 06:00:40 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
+
+HOMEPAGE="http://nekohtml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMON_DEP=">=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+ test? (
+ dev-java/junit:0
+ dev-java/ant-junit:0
+ )
+ ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit,xerces-2"
+
+# Do not generate docs, use bundled.
+EANT_DOC_TARGET=""
+
+java_prepare() {
+ find . -iname '*.jar' -delete || die
+ epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar build/lib/${PN}.jar
+
+ if use doc; then
+ java-pkg_dojavadoc doc/javadoc
+ java-pkg_dohtml -r doc/*
+ fi
+
+ use source && java-pkg_dosrc src/org
+ use examples && java-pkg_doexamples src/sample
+}
diff --git a/dev-python/python-poppler-qt4/Manifest b/dev-python/python-poppler-qt4/Manifest
index 9f22e609d3bd..4fe829a9c363 100644
--- a/dev-python/python-poppler-qt4/Manifest
+++ b/dev-python/python-poppler-qt4/Manifest
@@ -1 +1 @@
-DIST python-poppler-qt4-0.16.3.tar.gz 15345 SHA256 52232383b273038027a881db7e46879b73cccf690d393f677e7496e19cfb59aa SHA512 b0324a029e2245fdaf913fc9073c88b3d1c0043421fcc55ce0d4523497f26362c7a734a2d88b1fed86221f5abced15a4e1374c0db8b02c418d33c272ba91bb7c WHIRLPOOL 071f12db5e90f5877a12505659a99c89e1f59ee3142dc06883e4de08598fae729cbe0b011668665968e05c902ef25d3549608a4216da0f59e9030c880b059605
+DIST python-poppler-qt4-0.18.1.tar.gz 15555 SHA256 c6903c4b6ab71730ae2a1da9fb95830a83da82185b5ef6b8184b16c0cae908ba SHA512 f1451e3b60cb51eb3c07d906144ecff2a2737b68018645390441b2eb4942450e2e836a3e20d926c82a7536ae7b3963f7a869a5d7a3274befde7d01144b116a44 WHIRLPOOL 2ef090817a78baa1b55997baf4e6eb61aa21e6d064826bfc14db27e145a477d3b3ff28b6f10076cade979e9f1634cfbe43e3bee51d841d4ea4fbd72cddcd6ce4
diff --git a/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch b/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch
new file mode 100644
index 000000000000..ce56a780967b
--- /dev/null
+++ b/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch
@@ -0,0 +1,185 @@
+From 099924f9b359b82696e3aa9f159616ff09d2da97 Mon Sep 17 00:00:00 2001
+From: Philip Lorenz
+Date: Tue, 8 Jul 2014 18:23:49 +0200
+Subject: [PATCH 3/3] Support PyQt's "new" build system
+
+PyQt4 ships with a configure.py and configure-ng.py script for
+configuration. The former produced the "pyqtconfig" module which was
+used to determine various flags required for compilation of
+python-poppler-qt4. The configure.py script has been causing some issues
+([1]) and upstream suggests to use configure-ng.py instead as the old
+configuration script is deprecated ([2]).
+
+This patch adapts setup.py to work without the "pyqtconfig" module by
+looking up the required config values via the new mechanisms endorsed by
+upstream. Additionally, it adds the --qt-include-dir, --pyqt-sip-dir,
+--pyqt-sip-flags command line arguments to the "build_ext" command which
+can be used to set those values manually.
+
+[1] http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034344.html
+[2] http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034354.html
+---
+ setup.py | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 94 insertions(+), 20 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 56f3e3f..c43c5e4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -56,14 +56,6 @@ except ImportError:
+ pass
+ ### end
+
+-import PyQt4.pyqtconfig
+-config = PyQt4.pyqtconfig.Configuration()
+-
+-pyqt_sip_dir = config.pyqt_sip_dir
+-pyqt_sip_flags = config.pyqt_sip_flags
+-qt_inc_dir = config.qt_inc_dir
+-
+-
+ def pkg_config(package, attrs=None, include_only=False):
+ """parse the output of pkg-config for a package.
+
+@@ -107,17 +99,8 @@ def pkg_config_version(package):
+ return tuple(map(int, re.findall(r'\d+', output)))
+ except OSError:
+ sys.stderr.write("Can't determine version of %s\n" % package)
+-
+-
+-ext_args = {
+- 'include_dirs': [
+- qt_inc_dir,
+- os.path.join(qt_inc_dir, 'QtCore'),
+- os.path.join(qt_inc_dir, 'QtGui'),
+- os.path.join(qt_inc_dir, 'QtXml'),
+- ],
+-}
+
++ext_args = {}
+ pkg_config('poppler-qt4', ext_args)
+
+ if 'libraries' not in ext_args:
+@@ -131,17 +114,108 @@ class build_ext(build_ext_base):
+
+ user_options = build_ext_base.user_options + [
+ ('poppler-version=', None, "version of the poppler library"),
++ ('qmake-bin=', None, "Path to qmake binary"),
++ ('qt-include-dir=', None, "Path to Qt headers"),
++ ('pyqt-sip-dir=', None, "Path to PyQt's SIP files"),
++ ('pyqt-sip-flags=', None, "SIP flags used to generate PyQt bindings")
+ ]
+
+ def initialize_options (self):
+ build_ext_base.initialize_options(self)
+ self.poppler_version = None
+
++ self.qmake_bin = 'qmake'
++
++ self.qt_include_dir = None
++ self.pyqt_sip_dir = None
++ self.pyqt_sip_flags = None
++
+ def finalize_options (self):
+ build_ext_base.finalize_options(self)
++
++ if not self.qt_include_dir:
++ self.qt_include_dir = self.__find_qt_include_dir()
++
++ if not self.pyqt_sip_dir:
++ self.pyqt_sip_dir = self.__find_pyqt_sip_dir()
++
++ if not self.pyqt_sip_flags:
++ self.pyqt_sip_flags = self.__find_pyqt_sip_flags()
++
++ if not self.qt_include_dir:
++ raise SystemExit('Could not find Qt4 headers. '
++ 'Please specify via --qt-include-dir=')
++
++ if not self.pyqt_sip_dir:
++ raise SystemExit('Could not find PyQt SIP files. '
++ 'Please specify containing directory via '
++ '--pyqt-sip-dir=')
++
++ if not self.pyqt_sip_flags:
++ raise SystemExit('Could not find PyQt SIP flags. '
++ 'Please specify via --pyqt-sip-flags=')
++
++ self.include_dirs += (self.qt_include_dir,
++ os.path.join(self.qt_include_dir, 'QtCore'),
++ os.path.join(self.qt_include_dir, 'QtGui'),
++ os.path.join(self.qt_include_dir, 'QtXml'))
++
+ if self.poppler_version is not None:
+ self.poppler_version = tuple(map(int, re.findall(r'\d+', self.poppler_version)))
+
++ def __find_qt_include_dir(self):
++ if self.pyqtconfig:
++ return self.pyqtconfig.qt_inc_dir
++
++ try:
++ qt_version = subprocess.check_output([self.qmake_bin,
++ '-query',
++ 'QT_VERSION'])
++ qt_version = qt_version.strip().decode("ascii")
++ except (OSError, subprocess.CalledProcessError) as e:
++ raise SystemExit('Failed to determine Qt version (%s).' % e)
++
++ if not qt_version.startswith("4."):
++ raise SystemExit('Unsupported Qt version (%s). '
++ 'Try specifying the path to qmake manually via '
++ '--qmake-bin=' % qt_version)
++
++ try:
++ result = subprocess.check_output([self.qmake_bin,
++ '-query',
++ 'QT_INSTALL_HEADERS'])
++ return result.strip().decode(sys.getfilesystemencoding())
++ except (OSError, subprocess.CalledProcessError) as e:
++ raise SystemExit('Failed to determine location of Qt headers (%s).' % e)
++
++ def __find_pyqt_sip_dir(self):
++ if self.pyqtconfig:
++ return self.pyqtconfig.pyqt_sip_dir
++
++ import sipconfig
++
++ return os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
++
++ def __find_pyqt_sip_flags(self):
++ if self.pyqtconfig:
++ return self.pyqtconfig.pyqt_sip_flags
++
++ from PyQt4 import QtCore
++
++ return QtCore.PYQT_CONFIGURATION.get('sip_flags', '')
++
++ @property
++ def pyqtconfig(self):
++ if not hasattr(self, '_pyqtconfig'):
++ try:
++ from PyQt4 import pyqtconfig
++
++ self._pyqtconfig = pyqtconfig.Configuration()
++ except ImportError:
++ self._pyqtconfig = None
++
++ return self._pyqtconfig
++
+ def _sip_compile(self, sip_bin, source, sbf):
+
+ # Disable features if older poppler-qt4 version is found.
+@@ -176,8 +250,8 @@ class build_ext(build_ext_base):
+ cmd += [
+ "-c", self.build_temp,
+ "-b", sbf,
+- "-I", pyqt_sip_dir] # find the PyQt4 stuff
+- cmd += shlex.split(pyqt_sip_flags) # use same SIP flags as for PyQt4
++ "-I", self.pyqt_sip_dir] # find the PyQt4 stuff
++ cmd += shlex.split(self.pyqt_sip_flags) # use same SIP flags as for PyQt4
+ cmd.append(source)
+ self.spawn(cmd)
+
+--
+2.0.2
+
diff --git a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild b/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild
deleted file mode 100644
index bfbbbf5bb094..000000000000
--- a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild,v 1.1 2012/11/19 14:49:40 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="A python binding for libpoppler-qt4"
-HOMEPAGE="http://code.google.com/p/python-poppler-qt4/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[qt4]
- dev-python/PyQt4
- >=dev-python/sip-4.9.1"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild b/dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild
similarity index 54%
rename from dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild
rename to dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild
index 6a38d2e894f9..9dca4e462134 100644
--- a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild
+++ b/dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild,v 1.1 2013/03/17 17:14:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild,v 1.1 2014/10/27 05:59:08 ssuominen Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
+inherit distutils-r1 eutils
DESCRIPTION="A python binding for libpoppler-qt4"
HOMEPAGE="http://code.google.com/p/python-poppler-qt4/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -20,3 +20,8 @@ RDEPEND="app-text/poppler:=[qt4]
dev-python/PyQt4[${PYTHON_USEDEP}]
>=dev-python/sip-4.9.1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-update_for_new_PyQt4_build.patch
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 5df18401db64..043dff7dcc48 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1 +1,2 @@
DIST qrcode-5.0.1.tar.gz 20546 SHA256 5ce16060c2c4f9fc9455bc82766c227e55ee9b43bfb9f17bfe3f1f5ba5eecf3c SHA512 a57ca9d4b382637a8b3cc3a20a03d291f22675e9d851a739f01c610465f1977efd748661330557e9017db2d7b9b501c278668da5eeef93fb8e503e71921bb4c5 WHIRLPOOL d4e55f2536a917bd5f040f2cb66cabe2a529e5a9266fd09d0f413ba0a3137dffc89afd4d32ac4db2f8bbf6db17a1ecccf6bf8ba08d7a188b924daa778491c727
+DIST qrcode-5.1.tar.gz 22259 SHA256 33bdee5e834fc99eb538e1dad198a3a5b70d0a88845629cacf4c592be1ce7f6a SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3 WHIRLPOOL df72f727af2a1342adf61fcde25645cd25f5cfafd454ae2d13567a3c144949738f924082fe78dbb529c9b3757bbf1474e5f4f48fc95538d5d1cdcfdc6452637d
diff --git a/dev-python/qrcode/qrcode-5.1.ebuild b/dev-python/qrcode/qrcode-5.1.ebuild
new file mode 100644
index 000000000000..0102da64f8c1
--- /dev/null
+++ b/dev-python/qrcode/qrcode-5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qrcode/qrcode-5.1.ebuild,v 1.1 2014/10/27 07:24:52 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.python.org/pypi/qrcode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests pass run from source, but a few fail run from the ebuild. For now,
+# RESTRICT=test
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7) )"
+
+python_test() {
+ "${PYTHON}" -m unittest dicover || die "Testing failed with ${EPYTHON}"
+}
+
+src_install() {
+ distutils-r1_src_install
+ doman doc/qr.1
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index d9f53b54db9a..932e4e306e26 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,3 +1,4 @@
DIST rack-attack-2.3.0.gem 13312 SHA256 f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c SHA512 4add5fdf4fbc92a88a7448248df72e755fde7e3a5222ee2df788eb5f2e86689ed2ba925b420ee1873997c11c13ce4f6d5bf1e405a9c42f025ecc731b26490d38 WHIRLPOOL 3ded4c62c5f0058e1f8443c2dd574734e28dfe1021efdcca76afa1dcfdd219b50f975261d4987dafc996771990944c5ad63e59303ffaa3b290c967f1fa5eff7b
DIST rack-attack-4.1.0.gem 14848 SHA256 6c28ec2cb3e234e75ffe9306e7b75a86c22b9861c03c3ecbb12d38b6f630f5ae SHA512 3e23e48b1c39a9e84c9ba4d10ab71d570690bf37901a3cdf6f46a6df54de5005490523df7f33818f723ab25dcfb1e935e7209d061d66f0f5c48cbdfdbd7dc220 WHIRLPOOL ea25c308a42be5c39983d9507d63301e76a7ff77653d61f1bf97ed813ab5fbc74b644e47660db999898ee072ba2f781b07da3748650018faebec9ca9d9635030
DIST rack-attack-4.1.1.gem 14848 SHA256 b713eaa3d3377c227c2637398a84978c0ab4021b4b5b2c4dbdbc2b68d448814c SHA512 06bf682b5fbbe3996197d14337963abcf6cfb7f8f1edbcf40f65650508655c92f43ba97189d22394b821acc4fe7cd6b27f70859020632ec6c9c5da04ac8cc807 WHIRLPOOL 8d37a9619f21a29459a7bd745ea0a783a01780da4df766e9657007c1459fcf02a05123296d26ed9da0ffdd3371f1245840b6dd9347794b76bf0ae00d9180e416
+DIST rack-attack-4.2.0.gem 15360 SHA256 f915f0811e32455729b58a1f4359a31a169f6a465ac46e163e573eb4cbca918e SHA512 27a46987d864886ba5f2a2724fb36293f3d7bc6721d1663defaa924bc6e3e17dd3f74b260eb74e0f6ca84a331dfeaea6431d0589b2cb410a51385d96c27cfca9 WHIRLPOOL 136fed76ce46865294f1f0952c564a5799728855166b1f1ef5d96fbea6dc1fa0f76bd3e33e6c3a9c3aa1b3197f00deca09ca153aeb4b1c03764c174eb1905677
diff --git a/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild b/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild
new file mode 100644
index 000000000000..95b7ac713e97
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild,v 1.1 2014/10/27 07:06:31 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack"
+ruby_add_bdepend "test? ( dev-ruby/activesupport
+ dev-ruby/rack-test
+ dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/d' spec/spec_helper.rb || die
+}
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
new file mode 100644
index 000000000000..cf2cc4446cb9
--- /dev/null
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.8-r2.ebuild,v 1.1 2014/10/27 07:59:46 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=DevIL-${PV}
+
+DESCRIPTION="DevIL image library"
+HOMEPAGE="http://openil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl sse sse2 sse3 static-libs tiff xpm X"
+
+RDEPEND="allegro? ( media-libs/allegro:0 )
+ gif? ( media-libs/giflib )
+ glut? ( media-libs/freeglut )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ mng? ( media-libs/libmng )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ openexr? ( media-libs/openexr )
+ opengl? ( virtual/opengl
+ virtual/glu )
+ png? ( media-libs/libpng:0 )
+ sdl? ( media-libs/libsdl )
+ tiff? ( media-libs/tiff:0 )
+ xpm? ( x11-libs/libXpm )
+ X? ( x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXrender )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ X? ( x11-proto/xextproto )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT}.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ --disable-lcms \
+ --enable-ILU \
+ --enable-ILUT \
+ $(use_enable sse) \
+ $(use_enable sse2) \
+ $(use_enable sse3) \
+ $(use_enable openexr exr) \
+ $(use_enable gif) \
+ $(use_enable jpeg) \
+ $(use_enable jpeg2k jp2) \
+ $(use_enable mng) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_enable xpm) \
+ $(use_enable allegro) \
+ --disable-directx8 \
+ --disable-directx9 \
+ $(use_enable opengl) \
+ $(use_enable sdl) \
+ $(use_enable X x11) \
+ $(use_enable X shm) \
+ $(use_enable X render) \
+ $(use_enable glut) \
+ $(use_with X x) \
+ $(use_with nvtt)
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files
+}
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index be0dfa3296b5..124c7d01cfc8 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,4 +1 @@
-DIST frescobaldi-2.0.13.tar.gz 3739244 SHA256 501d2388fa7c49fc8d644caa7550463a4455a0064e2ffe469261a26dab32bee4 SHA512 2ddfc62011a43ecc14e3268716b2722610682b26a65a040a0fb29f31f6f8bc318d25479c4381c983f56a38ccc0788573dd553c496f88d2b798d55de88bbdb987 WHIRLPOOL 3847b2ccb74e6f745ef0bb4175466b206830253411ba6d3b6495e1ae35f1a5565babed6ee7dffb1cc7659441f73c7473cbb13a8bc45535248914ad233181a08c
-DIST frescobaldi-2.0.14.tar.gz 3736640 SHA256 6771bddc6a1a982931fbabd56003d1302e78a50f7cf7f9c08c31f0472d7463ac SHA512 981cbbc07343778bac71ef4d5cd50ccfea0175e35b9d95d92323bb43bb0d3835449e1f2c930daebb7d2c7be607c8a999aa68172cf6441c56b850143f53fff374 WHIRLPOOL 59e724d02442b56958acd3eb9a41540c0ac53098a2a4c1acd43934350817897a22fbbeadbf94febe556697124a254b882349019f0f9514ce45dd2b9862e88b66
-DIST frescobaldi-2.0.15.tar.gz 3747346 SHA256 1f9d56fc1e4de90c93b327d78b6c086ed2fc575b67503bdbb852545ff75daa17 SHA512 d4684c51bad42ea6aea82dba6844839d3c1dae1d6aaf0a8d04857b8babc3e3199114342527445a8076ff6733193304d38a13e7728caa902e36e48d05f1e4b745 WHIRLPOOL e718c7a6b75befc8a83f1d2d1731d84a1578434684c845ec24dfeba0c1bcae812116139f3d28477df0c3f9a4dd484231c2cb38f2a96fcea6469ba5dd2330c409
DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild
deleted file mode 100644
index 893faebc7a0a..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild,v 1.1 2014/01/01 05:08:20 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
- dev-python/PyQt4[X,${PYTHON_USEDEP}]
- >=media-sound/lilypond-2.14.2
- portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild
deleted file mode 100644
index 2ce879dd6018..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild,v 1.1 2014/03/06 20:34:55 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
- dev-python/PyQt4[X,${PYTHON_USEDEP}]
- >=media-sound/lilypond-2.14.2
- portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild
deleted file mode 100644
index 862e545c7eda..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild,v 1.1 2014/03/12 00:41:55 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
- dev-python/PyQt4[X,${PYTHON_USEDEP}]
- >=media-sound/lilypond-2.14.2
- portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e22544d6a990..e93872441ae0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Oct 2014 05:07:27 +0000
+Mon, 27 Oct 2014 08:07:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c85a5eb2ef39..e93872441ae0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 27 Oct 2014 05:07:28 +0000
+Mon, 27 Oct 2014 08:07:01 +0000
diff --git a/metadata/md5-cache/app-text/catdoc-0.94.2 b/metadata/md5-cache/app-text/catdoc-0.94.2
deleted file mode 100644
index 39d515570d5f..000000000000
--- a/metadata/md5-cache/app-text/catdoc-0.94.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=tk? ( >=dev-lang/tk-8.1 )
-DESCRIPTION=A convertor for Microsoft Word, Excel and RTF Files to text
-HOMEPAGE=http://www.wagner.pp.ru/~vitus/software/catdoc/
-IUSE=tk
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=tk? ( >=dev-lang/tk-8.1 )
-SLOT=0
-SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz
-_md5_=1999defcf7da7f3e7b76c48bb8f18df7
diff --git a/metadata/md5-cache/app-text/catdoc-0.94.2-r2 b/metadata/md5-cache/app-text/catdoc-0.94.4-r1
similarity index 83%
rename from metadata/md5-cache/app-text/catdoc-0.94.2-r2
rename to metadata/md5-cache/app-text/catdoc-0.94.4-r1
index fff2028201c4..4acf7fd00f46 100644
--- a/metadata/md5-cache/app-text/catdoc-0.94.2-r2
+++ b/metadata/md5-cache/app-text/catdoc-0.94.4-r1
@@ -1,13 +1,12 @@
DEFINED_PHASES=compile configure install prepare
DEPEND=tk? ( >=dev-lang/tk-8.1 ) !=sys-devel/autoconf-2.69 sys-devel/libtool
DESCRIPTION=Converter for Microsoft Word, Excel, PowerPoint and RTF files to text
-EAPI=3
+EAPI=5
HOMEPAGE=http://www.wagner.pp.ru/~vitus/software/catdoc/
IUSE=tk
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
-RDEPEND=tk? ( >=dev-lang/tk-8.1 )
SLOT=0
-SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz
+SRC_URI=mirror://debian/pool/main/c/catdoc/catdoc_0.94.4.orig.tar.gz
_eclasses_=autotools ebea507d219855923e3438c953cf4ab8 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=a7a5beed7f88d6f527926103f254f41f
+_md5_=aaf6511f5e5f55af03ed885f388c5bb0
diff --git a/metadata/md5-cache/app-text/krop-0.4.6 b/metadata/md5-cache/app-text/krop-0.4.6
index 821b84930750..ff97ef2aa32c 100644
--- a/metadata/md5-cache/app-text/krop-0.4.6
+++ b/metadata/md5-cache/app-text/krop-0.4.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=http://arminstraub.com/downloads/krop/krop-0.4.6.tar.gz
_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=cd686b960ed02d58d637f108234b9905
+_md5_=6836fe9bf280e5b8af98e079d892cc0d
diff --git a/metadata/md5-cache/app-text/restview-2.1.1 b/metadata/md5-cache/app-text/restview-2.1.1
new file mode 100644
index 000000000000..898a6c4df07e
--- /dev/null
+++ b/metadata/md5-cache/app-text/restview-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=reStructuredText viewer
+EAPI=5
+HOMEPAGE=https://mg.pov.lt/restview/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/r/restview/restview-2.1.1.tar.gz
+_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
+_md5_=5616c8c1c22695db0120d9a7ee71d735
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.14 b/metadata/md5-cache/dev-db/lmdb-0.9.14
index d935d692aca1..291a9aa49696 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.14
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.14
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
EAPI=5
HOMEPAGE=http://symas.com/mdb/
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=OPENLDAP
SLOT=0
SRC_URI=https://gitorious.org/mdb/mdb/archive/2f587ae081d076e3707360c5db086520c219d3ea.tar.gz -> lmdb-0.9.14.tar.gz
_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=b828c9998d5d41b0a1775044e5d068f5
+_md5_=8de52bedf06aa602af4fc8e4c515c414
diff --git a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1 b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
new file mode 100644
index 000000000000..81f022afa868
--- /dev/null
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A simple HTML scanner and tag balancer using standard XML interfaces
+EAPI=5
+HOMEPAGE=http://nekohtml.sourceforge.net/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
+_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c java-ant-2 5f5bada6517ed26bc25083134e42b146 java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 6ce35cb0d56d962486c858d41604c820 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=20e6df09d65d0ddff6b395d6c4c07f15
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3 b/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3
deleted file mode 100644
index b2d528fb49d8..000000000000
--- a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=app-text/poppler[qt4] dev-python/PyQt4 >=dev-python/sip-4.9.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A python binding for libpoppler-qt4
-EAPI=4
-HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler[qt4] dev-python/PyQt4 >=dev-python/sip-4.9.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://python-poppler-qt4.googlecode.com/files/python-poppler-qt4-0.16.3.tar.gz
-_eclasses_=distutils 34e0f373c466bb0e97ba194735f1acf2 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python be9965681d83c3980660a2660ac95e95 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=cb30ac32d7533df5a52b148c79417abf
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1 b/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1
deleted file mode 100644
index 0c214ca3be6a..000000000000
--- a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A python binding for libpoppler-qt4
-EAPI=5
-HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://python-poppler-qt4.googlecode.com/files/python-poppler-qt4-0.16.3.tar.gz
-_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=7138172def76b44e622fa51d9444d84b
diff --git a/metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1 b/metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
new file mode 100644
index 000000000000..39530cfcca3a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A python binding for libpoppler-qt4
+EAPI=5
+HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://github.com/wbsoft/python-poppler-qt4/archive/v0.18.1.tar.gz -> python-poppler-qt4-0.18.1.tar.gz
+_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
+_md5_=5287aa0475d298ded1cb07f2fbf5b583
diff --git a/metadata/md5-cache/dev-python/qrcode-5.1 b/metadata/md5-cache/dev-python/qrcode-5.1
new file mode 100644
index 000000000000..29b03b74036c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qrcode-5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=QR Code generator on top of PIL
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/qrcode
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/q/qrcode/qrcode-5.1.tar.gz
+_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
+_md5_=46dfa03b8ad0ab3322e4deac350f38a4
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-4.2.0 b/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
new file mode 100644
index 000000000000..29a80fa7f196
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/activesupport[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/activesupport[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A DSL for blocking & throttling abusive clients
+EAPI=5
+HOMEPAGE=https://github.com/kickstarter/rack-attack
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/rack-attack-4.2.0.gem
+_eclasses_=eutils 32548a82e42dc26e3312581476d2f20c java-utils-2 f02d3e4777b404c719a5a6479c37c6e3 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem 738ee4b7f8b16d4a734b4d37717db89b ruby-ng 14f0490e24cbad7c17cece628b3d111e toolchain-funcs 6ce35cb0d56d962486c858d41604c820 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6c8e49b00b50beed9dfba2a5c5fb3391
diff --git a/metadata/md5-cache/media-libs/devil-1.7.8-r2 b/metadata/md5-cache/media-libs/devil-1.7.8-r2
new file mode 100644
index 000000000000..91396e7d32e9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) virtual/pkgconfig X? ( x11-proto/xextproto ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=DevIL image library
+EAPI=5
+HOMEPAGE=http://openil.sourceforge.net/
+IUSE=allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl sse sse2 sse3 static-libs tiff xpm X
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender )
+SLOT=0
+SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
+_eclasses_=autotools ebea507d219855923e3438c953cf4ab8 eutils 32548a82e42dc26e3312581476d2f20c libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
+_md5_=6aa43fb930c6694cebdf7dafe19b87a6
diff --git a/metadata/md5-cache/media-sound/frescobaldi-2.0.13 b/metadata/md5-cache/media-sound/frescobaldi-2.0.13
deleted file mode 100644
index c895b599d176..000000000000
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.13/frescobaldi-2.0.13.tar.gz
-_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c gnome2-utils f658eba3cc594a21cf6eef4af47daa90 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=fc3a4b9add9be914acc0bd828d651572
diff --git a/metadata/md5-cache/media-sound/frescobaldi-2.0.14 b/metadata/md5-cache/media-sound/frescobaldi-2.0.14
deleted file mode 100644
index f3fa58e07ab2..000000000000
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.14/frescobaldi-2.0.14.tar.gz
-_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c gnome2-utils f658eba3cc594a21cf6eef4af47daa90 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=aed1cc37e2386477aec35c34636cb3cd
diff --git a/metadata/md5-cache/media-sound/frescobaldi-2.0.15 b/metadata/md5-cache/media-sound/frescobaldi-2.0.15
deleted file mode 100644
index 4029484b35d4..000000000000
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.15/frescobaldi-2.0.15.tar.gz
-_eclasses_=distutils-r1 90e7008a7d21e3b1597bea444bb85827 eutils 32548a82e42dc26e3312581476d2f20c gnome2-utils f658eba3cc594a21cf6eef4af47daa90 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 75e5c82b55dcb208a0a8f4ab8847e731 python-utils-r1 14f70a8c0d896d1b016d17f108a6de74 toolchain-funcs 6ce35cb0d56d962486c858d41604c820
-_md5_=a39804fd59e46010460c08207ffb1221
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.7.0 b/metadata/md5-cache/net-analyzer/snort-2.9.7.0
new file mode 100644
index 000000000000..50383780e0d8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet sys-libs/zlib !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=The de facto standard for intrusion detection/prevention
+EAPI=5
+HOMEPAGE=http://www.snort.org/
+IUSE=static +gre +mpls +targetbased +ppm +perfprofiling +non-ether-decoders control-socket file-inspect high-availability shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 large-pcap-64bit selinux
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet sys-libs/zlib selinux? ( sec-policy/selinux-snort )
+REQUIRED_USE=!kernel_linux? ( !shared-rep )
+SLOT=0
+SRC_URI=https://www.snort.org/downloads/snort/snort-2.9.7.0.tar.gz
+_eclasses_=autotools ebea507d219855923e3438c953cf4ab8 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 toolchain-funcs 6ce35cb0d56d962486c858d41604c820 user f54e098dd38ba1c0847a13e685b87747
+_md5_=cdb4a934b952e465bd62f92a9d0417ac
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40-r1 b/metadata/md5-cache/net-nds/openldap-2.4.40-r1
new file mode 100644
index 000000000000..124f2ec2aa28
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( >=sys-libs/db-4.4 bindist? ( =sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=5
+HOMEPAGE=http://www.OpenLDAP.org/
+IUSE=crypt icu samba slp tcpd experimental minimal +berkdb +bindist overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs smbkrb5passwd kerberos -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP GPL-2
+RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( >=sys-libs/db-4.4 bindist? ( |config daq: afpacket|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+
+ # Set the location of the DAQ modules
+ sed -i -e 's|^# config daq_dir: |config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+
+ # Set the DAQ mode to passive
+ sed -i -e 's|^# config daq_mode: |config daq_mode: passive|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+
+ # Set snort to run as snort:snort
+ sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+ sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+
+ # Set the default log dir
+ sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+
+ # Set the correct so_rule location in the config
+ sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+ "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+ einfo "There have been a number of improvements and new features"
+ einfo "added to ${P}. Please review the RELEASE.NOTES and"
+ einfo "ChangLog located in /usr/share/doc/${PF}."
+ einfo
+ elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+ elog "users migrate their snort.conf customizations to the latest config"
+ elog "file released by the VRT. You can find the latest version of the"
+ elog "Snort config file in /etc/snort/snort.conf.distrib."
+ elog
+ elog "!! It is important that you migrate to this new snort.conf file !!"
+ elog
+ elog "This version of the ebuild includes an updated init.d file and"
+ elog "conf.d file that rely on options found in the latest Snort"
+ elog "config file provided by the VRT."
+
+ if use debug; then
+ elog "You have the 'debug' USE flag enabled. If this has been done to"
+ elog "troubleshoot an issue by producing a core dump or a back trace,"
+ elog "then you need to also ensure the FEATURES variable in make.conf"
+ elog "contains the 'nostrip' option."
+ fi
+}
diff --git a/net-nds/openldap/files/openldap-2.4.40-db-6.patch b/net-nds/openldap/files/openldap-2.4.40-db-6.patch
new file mode 100644
index 000000000000..77c3759224f2
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.40-db-6.patch
@@ -0,0 +1,28 @@
+Re-allow building with >= BerkeleyDB-6.0.20.
+
+If you do build/link against this version, please note that the licenses
+PROHIBIT distribution of the binaries. We will enforce RESTRICT=bindist for
+this.
+
+X-Gentoo-Bug: 525110
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=525110
+
+diff -ur openldap-2.4.40/build/openldap.m4 openldap-2.4.40.fix/build/openldap.m4
+--- openldap-2.4.40/build/openldap.m4 2014-09-19 05:48:49.000000000 +0400
++++ openldap-2.4.40.fix/build/openldap.m4 2014-10-16 15:51:38.223985217 +0400
+@@ -553,13 +553,10 @@
+
+ #define DB_VERSION_FULL ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
+
+-/* require 4.4 or later, but less than 6.0.20 */
+-#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
++/* require 4.4 or later */
++#if DB_VERSION_FULL >= 0x040400
+ __db_version_compat
+ #endif
+-#if DB_VERSION_FULL >= 0x060014
+-#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
+-#endif
+ ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+
diff --git a/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch b/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
new file mode 100644
index 000000000000..9265a01701ab
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
@@ -0,0 +1,136 @@
+--- ./build/top.mk.orig 2014-10-24 14:34:59.260827298 +0200
++++ ./build/top.mk 2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+
+ BDB_LIBS = @BDB_LIBS@
++MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig 2014-10-24 10:52:02.837221734 +0200
++++ ./build/openldap.m4 2014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+ ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+
++dnl --------------------------------------------------------------------
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[
++ AC_EGREP_CPP(__mdb_version_compat,[
++#include
++
++/* require 0.9.14 or later */
++#if MDB_VERSION_FULL >= 0x00000009000E
++ __mdb_version_compat
++#endif
++ ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
++])
++
++dnl
++dnl --------------------------------------------------------------------
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++ OL_MDB_COMPAT
++
++ if test $ol_cv_mdb_compat != yes ; then
++ AC_MSG_ERROR([LMDB version incompatible with MDB backends])
++ fi
++
++ ol_cv_lib_mdb=-llmdb
++ ol_cv_mdb=yes
++fi
++])
++
+ dnl
+ dnl ====================================================================
+ dnl Check POSIX Thread version
+--- ./servers/slapd/back-mdb/Makefile.in.orig 2014-10-24 10:31:30.860931076 +0200
++++ ./servers/slapd/back-mdb/Makefile.in 2014-10-24 14:33:33.803705424 +0200
+@@ -25,11 +25,10 @@
+ extended.lo operational.lo \
+ attr.lo index.lo key.lo filterindex.lo \
+ dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+- nextid.lo monitor.lo mdb.lo midl.lo
++ nextid.lo monitor.lo
+
+ LDAP_INCDIR= ../../../include
+ LDAP_LIBDIR= ../../../libraries
+-MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb
+
+ BUILD_OPT = "--enable-mdb"
+ BUILD_MOD = @BUILD_MDB@
+@@ -44,7 +43,7 @@
+
+ LIBBASE = back_mdb
+
+-XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR)
++XINCPATH = -I.. -I$(srcdir)/..
+ XDEFS = $(MODULES_CPPFLAGS)
+
+ all-local-lib: ../.backend
+@@ -52,11 +51,5 @@
+ ../.backend: lib$(LIBBASE).a
+ @touch $@
+
+-mdb.lo: $(MDB_SUBDIR)/mdb.c
+- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c
+-
+-midl.lo: $(MDB_SUBDIR)/midl.c
+- $(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c
+-
+ veryclean-local-lib: FORCE
+ $(RM) $(XXHEADERS) $(XXSRCS) .links
+--- ./configure.in.orig 2014-10-24 10:46:53.289139847 +0200
++++ ./configure.in 2014-10-24 10:51:34.372846374 +0200
+@@ -519,6 +519,7 @@
+ dnl Initialize vars
+ LDAP_LIBS=
+ BDB_LIBS=
++MDB_LIBS=
+ SLAPD_NDB_LIBS=
+ SLAPD_NDB_INCS=
+ LTHREAD_LIBS=
+@@ -1905,6 +1906,30 @@
+ fi
+
+ dnl ----------------------------------------------------------------
++ol_link_mdb=no
++
++if test $ol_enable_mdb != no; then
++ OL_MDB
++
++ if test $ol_cv_mdb = no ; then
++ AC_MSG_ERROR(MDB: LMDB not available)
++ fi
++
++ AC_DEFINE(HAVE_MDB,1,
++ [define this if LMDB is available])
++
++ dnl $ol_cv_lib_mdb should be yes or -llmdb
++ dnl (it could be no, but that would be an error
++ if test $ol_cv_lib_mdb != yes ; then
++ MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb"
++ fi
++
++ SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)"
++
++ ol_link_mdb=yes
++fi
++
++dnl ----------------------------------------------------------------
+
+ if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then
+ BUILD_LIBS_DYNAMIC=shared
+@@ -3133,6 +3158,7 @@
+ AC_SUBST(LDAP_LIBS)
+ AC_SUBST(SLAPD_LIBS)
+ AC_SUBST(BDB_LIBS)
++AC_SUBST(MDB_LIBS)
+ AC_SUBST(SLAPD_NDB_LIBS)
+ AC_SUBST(SLAPD_NDB_INCS)
+ AC_SUBST(LTHREAD_LIBS)
diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r1 b/net-nds/openldap/files/slapd-initd-2.4.40-r1
new file mode 100644
index 000000000000..4229ca1053ab
--- /dev/null
+++ b/net-nds/openldap/files/slapd-initd-2.4.40-r1
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.40-r1,v 1.1 2014/10/27 05:33:59 robbat2 Exp $
+
+extra_commands="checkconfig"
+
+[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}"
+PIDDIR=/run/openldap
+PIDFILE=$PIDDIR/$SVCNAME.pid
+
+depend() {
+ need net
+ before dbus hald avahi-daemon
+ provide ldap
+}
+
+start() {
+ checkpath -q -d ${PIDDIR} -o ldap:ldap
+ if ! checkconfig -Q ; then
+ eerror "There is a problem with your slapd.conf!"
+ return 1
+ fi
+ ebegin "Starting ldap-server"
+ [ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME
+ eval start-stop-daemon --start --pidfile ${PIDFILE} --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ldap-server"
+ start-stop-daemon --stop --signal 2 --quiet --pidfile ${PIDFILE}
+ eend $?
+}
+
+checkconfig() {
+ # checks requested by bug #502948
+ # Step 1: extract the last valid config file or config dir
+ set -- $OPTS
+ while [ -n "$*" ]; do
+ opt=$1 ; shift
+ if [ "$opt" = "-f" -o "$opt" = "-F" ] ; then
+ CONF=$1
+ shift
+ fi
+ done
+ set --
+ # Fallback
+ CONF=${CONF-/etc/openldap/slapd.conf}
+ [ -d $CONF ] && CONF=${CONF}/*
+ DBDIRS=`eval awk '/^(directory|olcDbDirectory:)/{print $2}' $CONF`
+ for d in $DBDIRS; do
+ if [ ! -d $d ]; then
+ eerror "Directory $d in config does not exist!"
+ return 1
+ fi
+ /usr/bin/find $d ! -name DB_CONFIG ! -user ldap -o ! -group ldap |grep -sq .
+ if [ $? -ne 0 ]; then
+ ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!"
+ fi
+ [ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal"
+ done
+ # now test the config fully
+ /usr/sbin/slaptest -u "$@" ${OPTS_CONF}
+}
diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index cf1698e95ba0..18b77d178bad 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -12,5 +12,6 @@
Enable overlay for syncing ldap, unix and
lanman passwords
Build libraries & userspace tools only. Does not install any server code.
+ Make the built binaries safe for redistribution: Disables use of Berkeley DB 6
diff --git a/net-nds/openldap/openldap-2.4.40-r1.ebuild b/net-nds/openldap/openldap-2.4.40-r1.ebuild
new file mode 100644
index 000000000000..0158726ba4ae
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.40-r1.ebuild
@@ -0,0 +1,817 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r1.ebuild,v 1.1 2014/10/27 05:33:58 robbat2 Exp $
+
+EAPI="5"
+
+inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+# mirrors are mostly not working, using canonical URI
+SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
+ mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
+IUSE_BACKEND="+berkdb +bindist"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs"
+IUSE_CONTRIB="smbkrb5passwd kerberos"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+REQUIRED_USE="cxx? ( sasl )"
+# This is only actually applicable if linking against db-6
+RESTRICT="!minimal? ( !bindist? ( berkdb? ( bindist ) ) )"
+
+# always list newer first
+BDB_SLOTS='6.1 6.0 5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+
+# openssl is needed to generate lanman-passwords required by samba
+RDEPEND="icu? ( dev-libs/icu:= )
+ ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+ sasl? ( dev-libs/cyrus-sasl:= )
+ !minimal? (
+ sys-devel/libtool
+ sys-libs/e2fsprogs-libs
+ >=dev-db/lmdb-0.9.14
+ tcpd? ( sys-apps/tcp-wrappers )
+ odbc? ( !iodbc? ( dev-db/unixODBC )
+ iodbc? ( dev-db/libiodbc ) )
+ slp? ( net-libs/openslp )
+ perl? ( dev-lang/perl[-build(-)] )
+ samba? ( dev-libs/openssl )
+ berkdb? (
+ >=sys-libs/db-4.4
+ bindist? ( =DB-6 is not permitted
+ use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
+ # find which one would be used
+ for bdb_slot in $BDB_SLOTS ; do
+ NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+ [[ -n "$NEWVER" ]] && break
+ done
+ fi
+ local fail=0
+ if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
+ :
+ # Nothing wrong here.
+ elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
+ eerror " Your existing version of OpenLDAP was not built against"
+ eerror " any version of sys-libs/db, but the new one will build"
+ eerror " against ${NEWVER} and your database may be inaccessible."
+ echo
+ fail=1
+ elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
+ eerror " Your existing version of OpenLDAP was built against"
+ eerror " sys-libs/db:${OLDVER}, but the new one will not be"
+ eerror " built against any version and your database may be"
+ eerror " inaccessible."
+ echo
+ fail=1
+ elif [ "${OLDVER}" != "${NEWVER}" ]; then
+ eerror " Your existing version of OpenLDAP was built against"
+ eerror " sys-libs/db:${OLDVER}, but the new one will build against"
+ eerror " ${NEWVER} and your database would be inaccessible."
+ echo
+ fail=1
+ fi
+ [ "${fail}" == "1" ] && openldap_upgrade_howto
+ fi
+
+ echo
+ einfo
+ einfo "All datadirs are fine, proceeding with merge now..."
+ einfo
+}
+
+openldap_upgrade_howto() {
+ eerror
+ eerror "A (possible old) installation of OpenLDAP was detected,"
+ eerror "installation will not proceed for now."
+ eerror
+ eerror "As major version upgrades can corrupt your database,"
+ eerror "you need to dump your database and re-create it afterwards."
+ eerror
+ eerror "Additionally, rebuilding against different major versions of the"
+ eerror "sys-libs/db libraries will cause your database to be inaccessible."
+ eerror ""
+ d="$(date -u +%s)"
+ l="/root/ldapdump.${d}"
+ i="${l}.raw"
+ eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+ eerror " 2. slapcat -l ${i}"
+ eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+ eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+ eerror " 5. emerge --update \=net-nds/${PF}"
+ eerror " 6. etc-update, and ensure that you apply the changes"
+ eerror " 7. slapadd -l ${l}"
+ eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+ eerror " 9. /etc/init.d/slapd start"
+ eerror "10. check that your data is intact."
+ eerror "11. set up the new replication system."
+ eerror
+ if [ "${FORCE_UPGRADE}" != "1" ]; then
+ die "You need to upgrade your database first"
+ else
+ eerror "You have the magical FORCE_UPGRADE=1 in place."
+ eerror "Don't say you weren't warned about data loss."
+ fi
+}
+
+pkg_setup() {
+ if ! use sasl && use cxx ; then
+ die "To build the ldapc++ library you must emerge openldap with sasl support"
+ fi
+ # Bug #322787
+ if use minimal && ! has_version "net-nds/openldap" ; then
+ einfo "No datadir scan needed, openldap not installed"
+ elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+ einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+ else
+ openldap_find_versiontags
+ fi
+
+ enewgroup ldap 439
+ enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_prepare() {
+ # ensure correct SLAPI path by default
+ sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+ "${S}"/include/ldap_defaults.h
+
+ epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+ epatch \
+ "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
+ "${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+ # bug #116045 - still present in 2.4.28
+ epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+ # bug #408077 - samba4
+ epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+ # bug #189817
+ epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+ # bug #233633
+ epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+
+ # bug #281495
+ epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+ # bug #294350
+ epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+ # unbreak /bin/sh -> dash
+ epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+ # bug #420959
+ epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+ # bug #421463
+ #epatch "${FILESDIR}"/${PN}-2.4.33-gnutls.patch # merged upstream
+
+ # bug #525110: allow compiling with db-6 against
+ # but RESTRICT=bindist now applies
+ use bindist || epatch "${FILESDIR}"/${PN}-2.4.40-db-6.patch
+
+ # unbundle lmdb
+ epatch "${FILESDIR}"/${P}-mdb-unbundle.patch
+ rm -rf "${S}"/libraries/liblmdb
+
+ cd "${S}"/build || die
+ einfo "Making sure upstream build strip does not do stripping too early"
+ sed -i.orig \
+ -e '/^STRIP/s,-s,,g' \
+ top.mk || die "Failed to block stripping"
+
+ # wrong assumption that /bin/sh is /bin/bash
+ sed -i \
+ -e 's|/bin/sh|/bin/bash|g' \
+ "${S}"/tests/scripts/* || die "sed failed"
+
+ cd "${S}" || die
+
+ AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+ #
+ cd "${S}/contrib/slapd-modules/$1" || die
+ einfo "Compiling contrib-module: $3"
+ # Make sure it's uppercase
+ local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+ "${lt}" --mode=compile --tag=CC \
+ "${CC}" \
+ -D${define_name}=SLAPD_MOD_DYNAMIC \
+ -I"${BUILD_DIR}"/include \
+ -I../../../include -I../../../servers/slapd ${CFLAGS} \
+ -o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+ einfo "Linking contrib-module: $3"
+ "${lt}" --mode=link --tag=CC \
+ "${CC}" -module \
+ ${CFLAGS} \
+ ${LDFLAGS} \
+ -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+ -o $3.la ${2%.c}.lo || die "linking $3 failed"
+}
+
+src_configure() {
+ #Fix for glibc-2.8 and ucred. Bug 228457.
+ append-cppflags -D_GNU_SOURCE
+
+ # Bug 408001
+ use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+ # connectionless ldap per bug #342439
+ append-cppflags -DLDAP_CONNECTIONLESS
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ use debug && myconf+=( $(use_enable debug) )
+
+ # ICU usage is not configurable
+ export ac_cv_header_unicode_utypes_h="$(multilib_is_native_abi && use icu && echo yes || echo no)"
+
+ if ! use minimal && multilib_is_native_abi; then
+ local CPPFLAGS=${CPPFLAGS}
+
+ # re-enable serverside overlay chains per bug #296567
+ # see ldap docs chaper 12.3.1 for details
+ myconf+=( --enable-ldap )
+
+ # backends
+ myconf+=( --enable-slapd )
+ if use berkdb ; then
+ einfo "Using Berkeley DB for local backend"
+ myconf+=( --enable-bdb --enable-hdb )
+ # >=db-6 is probibited for bindist
+ use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
+ DBINCLUDE=$(db_includedir $BDB_SLOTS)
+ einfo "Using $DBINCLUDE for sys-libs/db version"
+ # We need to include the slotted db.h dir for FreeBSD
+ append-cppflags -I${DBINCLUDE}
+ else
+ myconf+=( --disable-bdb --disable-hdb )
+ fi
+ for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+ myconf+=( --enable-${backend}=mod )
+ done
+
+ myconf+=( $(use_enable perl perl mod) )
+
+ myconf+=( $(use_enable odbc sql mod) )
+ if use odbc ; then
+ local odbc_lib="unixodbc"
+ if use iodbc ; then
+ odbc_lib="iodbc"
+ append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+ fi
+ myconf+=( --with-odbc=${odbc_lib} )
+ fi
+
+ # slapd options
+ myconf+=(
+ $(use_enable crypt)
+ $(use_enable slp)
+ $(use_enable samba lmpasswd)
+ $(use_enable syslog)
+ )
+ if use experimental ; then
+ myconf+=(
+ --enable-dynacl
+ --enable-aci=mod
+ )
+ fi
+ for option in aci cleartext modules rewrite rlookups slapi; do
+ myconf+=( --enable-${option} )
+ done
+
+ # slapd overlay options
+ # Compile-in the syncprov, the others as module
+ myconf+=( --enable-syncprov=yes )
+ use overlays && myconf+=( --enable-overlays=mod )
+
+ else
+ myconf+=(
+ --disable-backends
+ --disable-slapd
+ --disable-bdb
+ --disable-hdb
+ --disable-mdb
+ --disable-overlays
+ --disable-syslog
+ )
+ fi
+
+ # basic functionality stuff
+ myconf+=(
+ $(use_enable ipv6)
+ $(multilib_native_use_with sasl cyrus-sasl)
+ $(multilib_native_use_enable sasl spasswd)
+ $(use_enable tcpd wrappers)
+ )
+
+ local ssl_lib="no"
+ if use ssl || ( ! use minimal && use samba ) ; then
+ ssl_lib="openssl"
+ use gnutls && ssl_lib="gnutls"
+ fi
+
+ myconf+=( --with-tls=${ssl_lib} )
+
+ for basicflag in dynamic local proctitle shared; do
+ myconf+=( --enable-${basicflag} )
+ done
+
+ tc-export AR CC CXX
+ ECONF_SOURCE=${S} \
+ STRIP=/bin/true \
+ econf \
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+ $(use_enable static-libs static) \
+ "${myconf[@]}"
+ emake depend
+}
+
+src_configure_cxx() {
+ # This needs the libraries built by the first build run.
+ # So we have to run it AFTER the main build, not just after the main
+ # configure.
+ local myconf_ldapcpp=(
+ --with-ldap-includes="${S}"/include
+ )
+
+ mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+ cd "${BUILD_DIR}/contrib/ldapc++" || die
+
+ local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+ append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+ -L"${BUILD_DIR}"/libraries/libldap/.libs
+ append-cppflags -I"${BUILD_DIR}"/include
+ ECONF_SOURCE=${S}/contrib/ldapc++ \
+ econf "${myconf_ldapcpp[@]}" \
+ CC="${CC}" \
+ CXX="${CXX}"
+}
+
+multilib_src_compile() {
+ tc-export AR CC CXX
+ emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
+ local lt="${BUILD_DIR}/libtool"
+ export echo="echo"
+
+ if ! use minimal && multilib_is_native_abi ; then
+ if use cxx ; then
+ einfo "Building contrib library: ldapc++"
+ src_configure_cxx
+ cd "${BUILD_DIR}/contrib/ldapc++" || die
+ emake \
+ CC="${CC}" CXX="${CXX}"
+ fi
+
+ if use smbkrb5passwd ; then
+ einfo "Building contrib-module: smbk5pwd"
+ cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+
+ MY_DEFS="-DDO_SHADOW"
+ if use samba ; then
+ MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+ MY_KRB5_INC=""
+ fi
+ if use kerberos ; then
+ MY_DEFS="${MY_DEFS} -DDO_KRB5"
+ MY_KRB5_INC="$(krb5-config --cflags)"
+ fi
+
+ emake \
+ DEFS="${MY_DEFS}" \
+ KRB5_INC="${MY_KRB5_INC}" \
+ LDAP_BUILD="${BUILD_DIR}" \
+ CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+ fi
+
+ if use overlays ; then
+ einfo "Building contrib-module: samba4"
+ cd "${S}/contrib/slapd-modules/samba4" || die
+
+ emake \
+ LDAP_BUILD="${BUILD_DIR}" \
+ CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+ fi
+
+ if use kerberos ; then
+ build_contrib_module "kinit" "kinit.c" "kinit"
+ cd "${S}/contrib/slapd-modules/passwd" || die
+ einfo "Compiling contrib-module: pw-kerberos"
+ "${lt}" --mode=compile --tag=CC \
+ "${CC}" \
+ -I"${BUILD_DIR}"/include \
+ -I../../../include \
+ ${CFLAGS} \
+ $(krb5-config --cflags) \
+ -DHAVE_KRB5 \
+ -o kerberos.lo \
+ -c kerberos.c || die "compiling pw-kerberos failed"
+ einfo "Linking contrib-module: pw-kerberos"
+ "${lt}" --mode=link --tag=CC \
+ "${CC}" -module \
+ ${CFLAGS} \
+ ${LDFLAGS} \
+ -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+ -o pw-kerberos.la \
+ kerberos.lo || die "linking pw-kerberos failed"
+ fi
+ # We could build pw-radius if GNURadius would install radlib.h
+ cd "${S}/contrib/slapd-modules/passwd" || die
+ einfo "Compiling contrib-module: pw-netscape"
+ "${lt}" --mode=compile --tag=CC \
+ "${CC}" \
+ -I"${BUILD_DIR}"/include \
+ -I../../../include \
+ ${CFLAGS} \
+ -o netscape.lo \
+ -c netscape.c || die "compiling pw-netscape failed"
+ einfo "Linking contrib-module: pw-netscape"
+ "${lt}" --mode=link --tag=CC \
+ "${CC}" -module \
+ ${CFLAGS} \
+ ${LDFLAGS} \
+ -rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+ -o pw-netscape.la \
+ netscape.lo || die "linking pw-netscape failed"
+
+ #build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+ #build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+ build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+ build_contrib_module "allop" "allop.c" "overlay-allop"
+ build_contrib_module "allowed" "allowed.c" "allowed"
+ build_contrib_module "autogroup" "autogroup.c" "autogroup"
+ build_contrib_module "cloak" "cloak.c" "cloak"
+ # build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+ build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+ build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+ build_contrib_module "dupent" "dupent.c" "dupent"
+ build_contrib_module "lastbind" "lastbind.c" "lastbind"
+ # lastmod may not play well with other overlays
+ build_contrib_module "lastmod" "lastmod.c" "lastmod"
+ build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+ build_contrib_module "nops" "nops.c" "nops-overlay"
+ #build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+ build_contrib_module "trace" "trace.c" "trace"
+ # build slapi-plugins
+ cd "${S}/contrib/slapi-plugins/addrdnvalues" || die
+ einfo "Building contrib-module: addrdnvalues plugin"
+ "${CC}" -shared \
+ -I"${BUILD_DIR}"/include \
+ -I../../../include \
+ ${CFLAGS} \
+ -fPIC \
+ ${LDFLAGS} \
+ -o libaddrdnvalues-plugin.so \
+ addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ cd tests || die
+ emake tests || die "make tests failed"
+ fi
+}
+
+multilib_src_install() {
+ local lt="${BUILD_DIR}/libtool"
+ emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
+ use static-libs || prune_libtool_files --all
+
+ if ! use minimal && multilib_is_native_abi; then
+ # openldap modules go here
+ # TODO: write some code to populate slapd.conf with moduleload statements
+ keepdir /usr/$(get_libdir)/openldap/openldap/
+
+ # initial data storage dir
+ keepdir /var/lib/openldap-data
+ use prefix || fowners ldap:ldap /var/lib/openldap-data
+ fperms 0700 /var/lib/openldap-data
+
+ echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+ echo "# do NOT delete this. it is used" >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+ echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+ # use our config
+ rm "${ED}"etc/openldap/slapd.conf
+ insinto /etc/openldap
+ newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+ configfile="${ED}"etc/openldap/slapd.conf
+
+ # populate with built backends
+ ebegin "populate config with built backends"
+ for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
+ einfo "Adding $(basename ${x})"
+ sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
+ done
+ sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+ use prefix || fowners root:ldap /etc/openldap/slapd.conf
+ fperms 0640 /etc/openldap/slapd.conf
+ cp "${configfile}" "${configfile}".default
+ eend
+
+ # install our own init scripts and systemd unit files
+ einfo "Install init scripts"
+ newinitd "${FILESDIR}"/slapd-initd-2.4.40-r1 slapd
+ newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+ einfo "Install systemd service"
+ systemd_dounit "${FILESDIR}"/slapd.service
+ systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+ systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+ if [[ $(get_libdir) != lib ]]; then
+ sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
+ "${ED}"/etc/init.d/slapd \
+ "${ED}"/usr/lib/systemd/system/slapd.service || die
+ fi
+ # If built without SLP, we don't need to be before avahi
+ use slp \
+ || sed -i \
+ -e '/before/{s/avahi-daemon//g}' \
+ "${ED}"etc/init.d/slapd
+
+ if use cxx ; then
+ einfo "Install the ldapc++ library"
+ cd "${BUILD_DIR}/contrib/ldapc++" || die
+ emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+ cd "${S}"/contrib/ldapc++ || die
+ newdoc README ldapc++-README
+ fi
+
+ if use smbkrb5passwd ; then
+ einfo "Install the smbk5pwd module"
+ cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+ emake DESTDIR="${D}" \
+ LDAP_BUILD="${BUILD_DIR}" \
+ libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+ newdoc README smbk5pwd-README
+ fi
+
+ if use overlays ; then
+ einfo "Install the samba4 module"
+ cd "${S}/contrib/slapd-modules/samba4" || die
+ emake DESTDIR="${D}" \
+ LDAP_BUILD="${BUILD_DIR}" \
+ libexecdir="/usr/$(get_libdir)/openldap" install
+ newdoc README samba4-README
+ fi
+
+ einfo "Installing contrib modules"
+ cd "${S}/contrib/slapd-modules" || die
+ for l in */*.la; do
+ "${lt}" --mode=install cp ${l} \
+ "${ED}"usr/$(get_libdir)/openldap/openldap || \
+ die "installing ${l} failed"
+ done
+
+ dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+ docinto contrib
+ doman */*.5
+ #newdoc acl/README*
+ newdoc addpartial/README addpartial-README
+ newdoc allop/README allop-README
+ newdoc allowed/README allowed-README
+ newdoc autogroup/README autogroup-README
+ newdoc dsaschema/README dsaschema-README
+ newdoc passwd/README passwd-README
+ cd "${S}/contrib/slapi-plugins" || die
+ insinto /usr/$(get_libdir)/openldap/openldap
+ doins */*.so
+ docinto contrib
+ newdoc addrdnvalues/README addrdnvalues-README
+
+ insinto /etc/openldap/schema
+ newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+ docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+ docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+ docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+ dosbin "${S}"/contrib/slapd-tools/statslog
+ newdoc "${S}"/contrib/slapd-tools/README README.statslog
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+ docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+ # keep old libs if any
+ preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+ # bug 440470, only display the getting started help there was no openldap before,
+ # or we are going to a non-minimal build
+ ! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+ OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+ if ! use minimal ; then
+ # You cannot build SSL certificates during src_install that will make
+ # binary packages containing your SSL key, which is both a security risk
+ # and a misconfiguration if multiple machines use the same key and cert.
+ if use ssl; then
+ install_cert /etc/openldap/ssl/ldap
+ use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.*
+ ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+ ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+ ewarn "add 'TLS_REQCERT allow' if you want to use them."
+ fi
+
+ if use prefix; then
+ # Warn about prefix issues with slapd
+ eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+ eerror "to start up, and requires that certain files directories be owned by"
+ eerror "ldap:ldap. As Prefix does not support changing ownership of files and"
+ eerror "directories, you will have to manually fix this yourself."
+ fi
+
+ # These lines force the permissions of various content to be correct
+ use prefix || chown ldap:ldap "${EROOT}"var/run/openldap
+ chmod 0755 "${EROOT}"var/run/openldap
+ use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default}
+ chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default}
+ use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
+ fi
+
+ if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+ elog "Getting started using OpenLDAP? There is some documentation available:"
+ elog "Gentoo Guide to OpenLDAP Authentication"
+ elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+ elog "---"
+ elog "An example file for tuning BDB backends with openldap is"
+ elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+ fi
+
+ preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ef30682a77ca..e2d21c32994d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5850,6 +5850,7 @@ net-nds/gosa-core:samba - Manage samba accounts with gosa.
net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
net-nds/nsscache:nssdb - Depend on sys-libs/libnss_db to handle dbm files.
+net-nds/openldap:bindist - Make the built binaries safe for redistribution: Disables use of Berkeley DB 6
net-nds/openldap:experimental - Enable experimental backend options
net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code.
net-nds/openldap:odbc - Enable ODBC and SQL backend options