Sync with portage [Mon Mar 23 23:00:05 MSK 2015].

9 years ago · 596720f28d
parent 5f5b41aaae
commit 596720f28d
109 changed files with 593 additions and 4418 deletions
--- a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.4 2015/03/19 18:40:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild,v 1.6 2015/03/23 18:47:08 mr_bones_ Exp $

 EAPI=5
 inherit eutils multilib systemd versionator
@ -53,12 +53,13 @@ src_prepare() {
 				$f > ${f/.in/} || die
 		fi
 	done
+	epatch_user
 }

 src_configure() {
-	#adddeny $(echo /usr/$(get_libdir)/libsyslog* | sed 's/ /:/g')
 	econf \
 		--disable-docs \
+		--with-embedded-crypto \
 		--with-ivykis=internal \
 		--with-libmongo-client=internal \
 		--sysconfdir=/etc/syslog-ng \
--- a/app-doc/csound-manual/metadata.xml
+++ b/app-doc/csound-manual/metadata.xml
@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proaudio</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 	</use>
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<herd>tex</herd>
+<herd>tex</herd>
 </pkgmetadata>
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<herd>printing</herd>
 </pkgmetadata>
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@ -1,4 +1,5 @@
 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
 DIST nss-3.17.3.tar.gz 6932021 SHA256 f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5 SHA512 828d3d495492bed020d819790b439a912e5a997a2e38dd2b3b27f5d92989960984b758fffe410fc82165dea2c138125571a992f6b90596f599bfb5636d0ccaaf WHIRLPOOL f450eefbd2a64fe0cde12188ff6b1e21d649528e06f3d9303f28147cfee77aa085bd83746a7b5ccb1a1c57599688e05a214ef6e0eac79c9c8d1e3958aa7a1542
 DIST nss-3.17.4.tar.gz 6924699 SHA256 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79 SHA512 dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89 WHIRLPOOL bb6e1027c5237d12fe58b4c520536022d8d4e83183a78c3421fd46bf9c3503b1f0ca4644240e383f216ec1e5174c0ae4148372db68fb9f1c10275954559d5bbf
+DIST nss-3.18.tar.gz 6944836 SHA256 618db0fb2af9f6fc165934d509036b65efc78ab0ae118c06c9488bb667f21d40 SHA512 b9ba1feed47ea6e650a3b746691134907cd7682748aed0d65ab5d15cbf07ab00010caabc0375f5d2d88d47277d002cddc299a57053e954e191205070b3a8297b WHIRLPOOL 7dab7c55658814bb1e46c99d4214b0d6329031829c940784d90c9e42211d35fc2ec1c9464ddcd4ba217b576521700060f64a4b7c2b7fe061b342c73e3a040cc9
 DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
--- a/dev-libs/nss/nss-3.18.ebuild
+++ b/dev-libs/nss/nss-3.18.ebuild
@ -0,0 +1,321 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.18.ebuild,v 1.1 2015/03/23 18:08:12 polynomial-c Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.10.6-r1"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
+PEM_P="${PN}-pem-${PEM_GIT_REV}"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
+	nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cacert +nss-pem utils"
+
+DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+	use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L -t "${ED}"/usr/$(get_libdir) */lib/{libcrmf,libfreebl}.a || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+			cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+			nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+			pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+			symkeyutil tstclnt vfychain vfyserv"
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	local l libs=() liblist
+	for l in ${NSS_CHK_SIGN_LIBS} ; do
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+	done
+	liblist=$(printf '%s:' "${libs[@]}")
+	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
+	doenvd "${T}/90nss-${ABI}"
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
--- a/dev-libs/pugixml/metadata.xml
+++ b/dev-libs/pugixml/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<herd>video</herd>
 </pkgmetadata>
--- a/dev-libs/tinyxml2/metadata.xml
+++ b/dev-libs/tinyxml2/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<herd>video</herd>
 </pkgmetadata>
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/dev-lua/luacrypto/metadata.xml
+++ b/dev-lua/luacrypto/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/dev-python/bcrypt/bcrypt-1.1.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-1.1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bcrypt/bcrypt-1.1.0.ebuild,v 1.1 2015/02/17 11:14:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bcrypt/bcrypt-1.1.0.ebuild,v 1.2 2015/03/23 15:45:11 jlec Exp $

 EAPI=5

@ -27,7 +27,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		)"
 RDEPEND="
-	>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
 	!dev-python/py-bcrypt"

--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<herd>python</herd>
 </pkgmetadata>
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@ -1 +1,2 @@
 DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404ff787d97df98ccc508b311e59 SHA512 d50ead9274e29a9fa3d03f7cfa4de51601b4e2d3c28ccf1ded3a389d7485e5d858c418a5eafbedaec164f4d47ff40e066b0a3f6e11530f270a9d0a4a93d20556 WHIRLPOOL 6d1177899b4771660685a34ce7f91835803c27533bb8d60a047db889e243fac9e49f91ab691244beb0dbdc226bb6b0186e5d3e845e68e96005d4b574aeed01ba
+DIST oslo.log-1.0.0.tar.gz 34366 SHA256 3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a SHA512 420a019592778e69cf339617d21b2eabde8220709f9067bbfe61ce11b8defc54f6635b8f120557b032bea15eac936ad4957e23f9f041556390c9e0b641ca0c0f WHIRLPOOL b579fe52acba0ca5957a55b6720862ef7343d0f41157e667f7bd63e57c6779af683cbaf083440c98a1cf0184cc162eb91b64a52a1a19c1e9732a7eb4ce8530c7
--- a/dev-python/oslo-log/oslo-log-1.0.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-1.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-log/oslo-log-1.0.0.ebuild,v 1.1 2015/03/23 15:17:58 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library provides standardized configuration for all openstack projects."
+HOMEPAGE="http://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/pyramid/Manifest
+++ b/dev-python/pyramid/Manifest
@ -1,5 +1,3 @@
-DIST pyramid-1.4.3.tar.gz 2426125 SHA256 8484ceb740ae5e21bda40fa9f9a8fd3be2cdd323eb64ff7e21c0bf3b6388c5b7 SHA512 c892b261e6f866e369cf1327a084436554dd13989fbf96828c1db166cf3abe1a49c3be0c242cd59a6b97bc11291a6ec6864290c031cfa43f694b7f9577461aa5 WHIRLPOOL d6fd2e7af36ce7cb241f349590b9a8df82e7be4da72575397b2b5f33e38171a23a9741de87dad7bc2dd9acfb2510a67dae397b67534e8285909b989bf0c5d6cf
 DIST pyramid-1.5.1.tar.gz 2401767 SHA256 2fe0b4012f10444682acc0df3b9cb85c7cfff2508ba5cbe6db83f5f14b510d86 SHA512 70b04111020d0f02ef21c52c44d7b6a5e78d198daee0068921df048bcae8b07567aee05d57f1a9e7329ef418116a0f7682aee30c6f785a4d1ec847e2519e7cc5 WHIRLPOOL 16e17ccba24f6a76c4ef0f2e361580e832c6450f453f88229bf1204cd123719e08e8565bb46d8b0bef5b395af2dfa87cb7ac7a9dc0dc9a0cc2d019490716e151
 DIST pyramid-1.5.2.tar.gz 2422156 SHA256 12057e63c9c99f88bc71af12f00a5e2c934221122baf582c7365361cba45bdcc SHA512 531d68fb480cf1420e069025537968abebc17bed98bf25e9993b8c744a12c5031df4b9b09e6f775bb1176f305f2e2c8ddb176ff43d1b34a10f2181df74fac8b8 WHIRLPOOL 785706946338dee67c7472c8d0b97fea86b8695d2efe7da93c483acf6476e5501269732a24b1cec50e1b9bf723edab44e437785cfd833bd3263c0207bc4f3ad9
 DIST pyramid-1.5.4.tar.gz 2678373 SHA256 39c48570595cfdb38227552a9e2858e62cc45ced4db94cf9b136cd823acda19f SHA512 2c2f9f42c64a4c184bb743005f7ba2f7fce2409e35c7db3e683852f6c93e44dea26d082c88727a44bdde253e6648cfb95169f6f5615d2d17bccd4b4113e0361f WHIRLPOOL bebd849ce1a116f7b04d2b5f3fb71ab5fe964e50a16a576d91c5509f7dd3f5312b4d9d174d0369d2d7db2f2c363e8caa594bb23249f59b11bfd80eed9e2d6245
-DIST pyramid-1.5.tar.gz 2413504 SHA256 db3216f61d9dbb5358fcb3f9eb2d772948c5b2bc608eb2f643159b4abd993621 SHA512 158617587cacd1c660e97d65a92739a4b04c795f1bc08db6afea574a603fcbca7aa69f0389000ed1e69a067a9007a63996c273843a4e5b7e6135d9d46a283cd9 WHIRLPOOL 46c284cbbf3e94af1ff8c26651ea773558a1791436387a6f515ae4b82013f7764159ffa2d9f24d3502536993bd4caa54b79328f85afd90bfb5c507f15f086de7
--- a/dev-python/pyramid/pyramid-1.4.3.ebuild
+++ b/dev-python/pyramid/pyramid-1.4.3.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.4.3.ebuild,v 1.3 2014/12/12 23:23:19 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-RESTRICT="test" # Can't package dependencies
-
-DESCRIPTION="A small open source Python web framework"
-HOMEPAGE="http://www.pylonsproject.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="test"
-# tests would pull in dev-python/zope-deprecation with its deps - not a good idea
-
-RDEPEND="
-	dev-python/chameleon[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/repoze-lru[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/translationstring[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/venusian[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
-	#	dev-python/nose[${PYTHON_USEDEP}]
-	#	dev-python/coverage[${PYTHON_USEDEP}]
-	#	dev-python/virtualenv[${PYTHON_USEDEP}]
-	#	)
-	#"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/pyramid/pyramid-1.5.4.ebuild
+++ b/dev-python/pyramid/pyramid-1.5.4.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.4.ebuild,v 1.1 2015/03/19 05:41:47 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.4.ebuild,v 1.2 2015/03/23 15:13:01 idella4 Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )

 inherit distutils-r1

--- a/dev-python/pyramid/pyramid-1.5.ebuild
+++ b/dev-python/pyramid/pyramid-1.5.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyramid/pyramid-1.5.ebuild,v 1.3 2014/12/12 23:23:19 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-RESTRICT="test" # Can't package dependencies
-
-DESCRIPTION="A small open source Python web framework"
-HOMEPAGE="http://www.pylonsproject.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-#IUSE="test"
-# tests would pull in dev-python/zope-deprecation with its deps - not a good idea
-
-RDEPEND="
-	dev-python/chameleon[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-	dev-python/repoze-lru[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/translationstring[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/venusian[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-	#test? ( dev-python/webtest[${PYTHON_USEDEP}]
-	#	dev-python/nose[${PYTHON_USEDEP}]
-	#	dev-python/coverage[${PYTHON_USEDEP}]
-	#	dev-python/virtualenv[${PYTHON_USEDEP}]
-	#	)
-	#"
-
-python_test() {
-	nosetests || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/tempest-lib/Manifest
+++ b/dev-python/tempest-lib/Manifest
@ -1 +1,2 @@
 DIST tempest-lib-0.3.0.tar.gz 53341 SHA256 0b2fdfe904b6bea12f5572f03307623ad43256694c17a5bd92ee837d8698d3c5 SHA512 e03617bd5e19b5872e4ae1e60c0eef2dfe325646f0b9d1c518f668bd7d054866b79aed494820f6ca99ee3d0735cc807aae7942f5f343e4d6c663368197be0f2c WHIRLPOOL 5f06bbaeeeb95b4724878481ddb500e1f7eaca98110cbcd2fe768917ed986656e64fae2e78e97cb099b776dbe069ad50f5c7717927ee78a5bf54f4638e8c9eec
+DIST tempest-lib-0.4.0.tar.gz 68776 SHA256 b1d00f9da6d14b5ffac87710efd9d533361b8af11003728ee3b47591358f17b0 SHA512 f0f959de4f003971929c015a5a020921f9338805d9f1109e8d42ec9b5eb43702858182c5eaf43bc1b1c4006a01f96243ec6aad9fa9b93823f04b499ad09f5c81 WHIRLPOOL 01b147dd7f5929407c1d01dc8ad10ae2cbd6c0f2f08e628689025cb649dec9446d881245ab81d1370a7ff93c4ab0d5b9fb4c7ac0837b5ba3ad0c8b7b90bf46a8
--- a/dev-python/tempest-lib/tempest-lib-0.4.0.ebuild
+++ b/dev-python/tempest-lib/tempest-lib-0.4.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tempest-lib/tempest-lib-0.4.0.ebuild,v 1.1 2015/03/23 15:19:12 prometheanfire Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to assist in creating functional or integrated test suites for OpenStack projects."
+HOMEPAGE="http://pypi.python.org/pypi/tempest-lib https://github.com/openstack/tempest-lib"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-0.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests tempest_lib/tests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-tex/minted/Manifest
+++ b/dev-tex/minted/Manifest
@ -1 +1,2 @@
+DIST minted-2.0.tar.gz 1039735 SHA256 a54daeb9d5e5d1150bb75f252d5f81ff5b3d13b1d6528261ac80dd9245813fe7 SHA512 1e874a865da24d9d890d68f9a7d7fed710746993534903cd04a518e3d65003f65efca47c4cd563bda70b3eb1356e609f5e662a0d762248c7b722b8c5aebda6de WHIRLPOOL dd01416ea13e7f862de3ee8ee84b28b5f5d1f9020b5c01afb40c382016053bd79beed86b1500328bc29e95161dfed0e179df9e311e3d338f12d8f62b18549e80
 DIST minted-v1.7.zip 363605 SHA256 71113736bbc44fdf619dce95fdd3b0f5d870117574212bd9dbe08ef95547790e SHA512 6f1b3af3d5bd3fb8d3c2a9c6ae595a28a69cc733106d241cb258d61a89da70866eeeed7f3b6023c64246161c2c10689cac5ae56fcde73cea891133d08e521d63 WHIRLPOOL d74cb7eea25b19c96770a4d6e50c44bf7b11bb68d3ab5575b2cf30036187baaac51ba8026342308bbbac20783d2659c0347d16d0ef5ae2ee0fac4c0aa248ce0f
--- a/dev-tex/minted/minted-2.0.ebuild
+++ b/dev-tex/minted/minted-2.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/minted/minted-2.0.ebuild,v 1.1 2015/03/23 15:10:46 jlec Exp $
+
+EAPI=5
+
+inherit latex-package
+
+DESCRIPTION="LaTeX package that facilitates expressive syntax highlighting in using the powerful Pygments library"
+HOMEPAGE="https://github.com/gpoore/minted"
+SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	dev-texlive/texlive-latexextra
+	dev-python/pygments"
+
+S="${WORKDIR}"/${P}/source
+
+src_install() {
+	latex-package_src_install
+	dodoc "${S}"/../*md
+}
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<use>
 		<flag name="link">Enable GBA linking functionality</flag>
 	</use>
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@ -1,5 +1,2 @@
 DIST libmediainfo_0.7.65.tar.bz2 1030927 SHA256 afda2ab23ff25278c502f6ab2a4adcad96240157953d77555eb425d0aa46cea6 SHA512 63c697f28048d1f545ac721fc8530ddf61a9cc83ad44d9b6020c36f087b1b75af381d33f19dc8e6555a3a599206df51ea44df812ba9383a1057889b68dd8c834 WHIRLPOOL d281f59afb1916799f3f8f296581b00e99c0b7865dc118031fb198974c6981f7a261abe78a14352d1221cadacb8da1b07a9fff00f28dd33d55164946d9375870
-DIST libmediainfo_0.7.67.tar.bz2 1051454 SHA256 d5204f5bcb1fb07954ecc59eb639e85975bc3fcc83b77fb47689a558a1e24a74 SHA512 f2842298ac8c64c7e23f4f127d04a4543b16cc0f07c9ac376152f9d3440373cde0ede3ac5c537aa4fe0d34d38ed283d10a726454a8fb0847f80944b1b2cfb426 WHIRLPOOL 9c5fc8f968d4a3492f8baa51071e952e2c7f620cab31ed5d15acf2f7c8b246cb1a559b1f6503730e394af282c9b0dcdd59cc43d61ca53a09df31eef32870cc2c
-DIST libmediainfo_0.7.70.tar.bz2 1612851 SHA256 fcc694aea336392ce0c4a11da700c641357561f25d83f17b8d8224e2474405c5 SHA512 e5d9cb9a4b25eadd68b407b6f2809d1b335341d9281e75eab3fa80a7887d3c0240ef631971ef42e6d59c9248b62285ee46b921345ea409b5f42600061fb7ce47 WHIRLPOOL 7e444f3a5c59e48df5f98a1eb7a5ba13690b1e7d5211fc0bbcf804abd2843b59ec3651940a7259d3d339e15cbd79b2525bdf11b2fbbf4420d881364c126d07cc
-DIST libmediainfo_0.7.71.tar.bz2 1627639 SHA256 e2d23c3c40b24e0df9fb79fa72d769e685b1f857a43b84b28cb7b463353e1b21 SHA512 5fa7460e08f83222061a1334de01014d840d5027d4aeee47bb546c438846e03ffa84838086bb89cb55e4373254c3bab8cd4dc83a6a1fdcec1ca4cc4af50f312c WHIRLPOOL c8c721a2b01bb18511a1da8e157303ac168cdefd5fa042dcbccff47465d2ef4a18986c0af895dad960b338f05445a20739be76225693b8ece902cbd80f0d7657
 DIST libmediainfo_0.7.72.tar.bz2 1640978 SHA256 a61e3d58521a6b771e45eea7f7ab8b807d4e356aa2bdce639088faa3d253aed9 SHA512 67679fada3c78426abdb394ee68b6ec5b3d59bec56fd6803c5700a6c6ee02e0cb3d2a61fc15375b44d81400337ec2944fb9d2fe5321643743f4299c0af9463a6 WHIRLPOOL 08876bbe1bb3bfa2fcfe405e7b16069bc04a844f198654309eca712d393eaf4c71fc3129323144738cd5268d897d0f28f12c1af4369c8210ba6c9dff3a7dbf32
--- a/media-libs/libmediainfo/libmediainfo-0.7.67.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.67.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.67.ebuild,v 1.2 2014/03/29 00:22:58 radhermit Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/mediainfo/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.28[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	epatch "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
--- a/media-libs/libmediainfo/libmediainfo-0.7.70.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.70.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.70.ebuild,v 1.3 2014/12/12 03:11:31 radhermit Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/mediainfo/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.28[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	epatch "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
--- a/media-libs/libmediainfo/libmediainfo-0.7.71.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-0.7.71.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediainfo/libmediainfo-0.7.71.ebuild,v 1.1 2014/11/25 23:11:30 radhermit Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/mediainfo/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.28[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	epatch "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-	if use doc; then
-		dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
-	fi
-
-	prune_libtool_files
-}
--- a/media-libs/libmediainfo/metadata.xml
+++ b/media-libs/libmediainfo/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<herd>video</herd>
 	<upstream>
 		<remote-id type="sourceforge">mediainfo</remote-id>
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/metadata.xml
@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proaudio</herd>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<use>
 		<flag name="beats">Build the beats score frontend</flag>
 		<flag name="chua">Build the chua opcodes</flag>
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@ -1,5 +1,2 @@
 DIST mediainfo_0.7.65.tar.bz2 2246510 SHA256 f035ae99eb160b1dd3129443574671631302810d71310dc72ceaa8f7a4c7e80d SHA512 6dc37cbecbe347dbe3fd2d1206b347c70a8fd2e8cd061537f015bd7510db94c1c8e84dfe74bafad3e00e2d13545a43509acf262d5db57e041ff3d7577a5d82e8 WHIRLPOOL 40a17113bc70277d9c6886430147d9e0025851b2d0bb9fd8310cc046165ce4b722d436b14e932976bc05456ba1fdf7194bf4d4b4ddba038ee0edd531635c4825
-DIST mediainfo_0.7.67.tar.bz2 1138374 SHA256 fad1256d7607e233948df7709702cf550c791a7f01373f5d3a01028900b039c7 SHA512 d4b937808b778851866f7230cd81c4f85866c8d6b44b4534e90d9e4345e89b7be57de588de89d94ffc82ae11d5d0b6bc7203368ffc46e67a051e78933b6ed743 WHIRLPOOL d17b035e0d50581c5d77c72319a70ff546d938f332d6d092f49ea5a08f7131e285df72de6f1273679319ffaf5b1de23f3bbe214245fd249fd9d5077526a0e940
-DIST mediainfo_0.7.70.tar.bz2 1145770 SHA256 a079c55b19089361957f8c486a4af905cee719296504cded827b23ab2a63989f SHA512 bb2b476394b0f3454c01fe08e48a88183e5ea9e28e5a2185a739c30c385e8bbd4b3b7258e701e15bbc8168de7ba7634eb0f8dbc284ac3128d05fd0fb391eecc6 WHIRLPOOL e06ded6d7cc2c7f6db01a5989b85eb96286d28cfc0780e433b83a9a23f3b49a64d6a70a0be3ea8450a56d5ff2b7eb5c13871783b2ddb75c82b92f3f86e14835f
-DIST mediainfo_0.7.71.tar.bz2 1289870 SHA256 d849018c5ef1944a59727973dc7bbe212fdf9408c798d917e145b7b241f5c069 SHA512 da3e061247ee56518dfaeb2e7ff2b3177741e3ccddb75cbbef09c1fa9ecc3cd8003071f689f4b17c486d4bac05560e1315e51086a830d1f74489fdf942b76f58 WHIRLPOOL 6cd728b52a7ac74094a966d4cb671a5b87b3b888be0572f1ea8dfe41b3d4118c8a42fdfe7b6a1cefb193cc1fb59fba39811a9ff8eeb79da3b7ba51a1e666b770
 DIST mediainfo_0.7.72.tar.bz2 1293016 SHA256 2173f7e5224233374925ee60ba99d37519e2f7402e2145177c76e3f899a85813 SHA512 e40c16a4dd5c9bd35d6424d6ab962d39f863633726d0deec1a7c37a122778a5b4dcc390a821aeda7bba2b84ff3f6e19d6cae744839dc31b15f08d1c2245bf12b WHIRLPOOL 144f669c69fd29aa9fe3b306ed897362c6adf013f920cb8ca852a6dccdbf626879b07432f422d80679a4ac0325c16a42f95017fba4ff40dd634fe7177961f45e
--- a/media-video/mediainfo/mediainfo-0.7.67.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.67.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.67.ebuild,v 1.1 2014/03/03 20:04:37 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="2.8"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
--- a/media-video/mediainfo/mediainfo-0.7.70.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.70.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.70.ebuild,v 1.1 2014/09/04 14:43:31 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
--- a/media-video/mediainfo/mediainfo-0.7.71.ebuild
+++ b/media-video/mediainfo/mediainfo-0.7.71.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mediainfo/mediainfo-0.7.71.ebuild,v 1.1 2014/11/25 23:13:04 radhermit Exp $
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit eutils autotools wxwidgets multilib
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="http://mediaarea.net/mediainfo/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	media-libs/libzen
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	use wxwidgets && TARGETS+=" GUI"
-}
-
-src_prepare() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		sed -i -e "s:-O2::" configure.ac
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target}
-		default
-		dodoc "${S}"/History_${target}.txt
-		if [[ ${target} == "GUI" ]]; then
-			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
-			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
-		fi
-	done
-}
--- a/media-video/mediainfo/metadata.xml
+++ b/media-video/mediainfo/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
 	<herd>video</herd>
 	<upstream>
 		<remote-id type="sourceforge">mediainfo</remote-id>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 23 Mar 2015 14:07:02 +0000
+Mon, 23 Mar 2015 19:06:49 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 23 Mar 2015 14:07:02 +0000
+Mon, 23 Mar 2015 19:06:49 +0000
--- a/metadata/md5-cache/app-admin/syslog-ng-3.6.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.6.2
@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.balabit.com/downloads/files/syslog-ng/sources/3.6.2/source/syslog-ng_3.6.2.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f7372ab59145d688e26fbc5901101a1
+_md5_=ed2949c9bfa039075567f088f708a009
--- a/metadata/md5-cache/dev-libs/nss-3.18
+++ b/metadata/md5-cache/dev-libs/nss-3.18
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=virtual/pkgconfig-0-r1[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/nspr-4.10.6-r1[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(-)?]
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=5
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=+cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.10.6-r1[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/nss-3.18.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
+_md5_=40c4817edad81e7aeeb57c24a0ee42fd
--- a/metadata/md5-cache/dev-python/bcrypt-1.1.0
+++ b/metadata/md5-cache/dev-python/bcrypt-1.1.0
@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/pyca/bcrypt/ https://pypi.python.org/pypi/bcrypt/
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cffi-0.8:=[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/six-1.4.1[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/py-bcrypt 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-2:=[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(-)]
+RDEPEND=virtual/python-cffi[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/six-1.4.1[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/py-bcrypt 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-2:=[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=https://github.com/pyca/bcrypt/archive/v1.1.0.tar.gz -> bcrypt-1.1.0.tar.gz mirror://pypi/b/bcrypt/bcrypt-1.1.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=63de27800231953e95a285785ba71ac2
+_md5_=563680bb3da9727a618c9c24b4a9eb38
--- a/metadata/md5-cache/dev-python/oslo-log-1.0.0
+++ b/metadata/md5-cache/dev-python/oslo-log-1.0.0
--- a/metadata/md5-cache/dev-python/pyramid-1.4.3
+++ b/metadata/md5-cache/dev-python/pyramid-1.4.3
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/chameleon[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/repoze-lru[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/translationstring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/venusian[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=A small open source Python web framework
-EAPI=5
-HOMEPAGE=http://www.pylonsproject.org/
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-python/chameleon[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/repoze-lru[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/translationstring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/venusian[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyramid/pyramid-1.4.3.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=da89f52d48f310f738cfbf7e8bfeb9ee
--- a/metadata/md5-cache/dev-python/pyramid-1.5
+++ b/metadata/md5-cache/dev-python/pyramid-1.5
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/chameleon[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/repoze-lru[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/translationstring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/venusian[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=A small open source Python web framework
-EAPI=5
-HOMEPAGE=http://www.pylonsproject.org/
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-python/chameleon[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/webob[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/repoze-lru[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/translationstring[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pastedeploy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/venusian[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyramid/pyramid-1.5.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=2285e7013ed50dc269f959e589c15e10
--- a/metadata/md5-cache/dev-python/pyramid-1.5.4
+++ b/metadata/md5-cache/dev-python/pyramid-1.5.4
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyramid/pyramid-1.5.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=3d065f7076e3704908f565d14ed4d3c1
+_md5_=f5c8606c424929754cf001a54d8aa933
--- a/metadata/md5-cache/dev-python/tempest-lib-0.4.0
+++ b/metadata/md5-cache/dev-python/tempest-lib-0.4.0
--- a/metadata/md5-cache/dev-tex/minted-2.0
+++ b/metadata/md5-cache/dev-tex/minted-2.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=LaTeX package that facilitates expressive syntax highlighting in using the powerful Pygments library
+EAPI=5
+HOMEPAGE=https://github.com/gpoore/minted
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-texlive/texlive-latexextra dev-python/pygments virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/gpoore/minted/archive/v2.0.tar.gz -> minted-2.0.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
+_md5_=f768a6edb64f0088037929bef0352658
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.67
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.67
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo libraries
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/libmediainfo_0.7.67.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=802ff85430f1bf3635932294d32b87f6
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.70
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.70
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo libraries
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/libmediainfo_0.7.70.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=75be34a9fe4d5be5fddf38cd93282d90
--- a/metadata/md5-cache/media-libs/libmediainfo-0.7.71
+++ b/metadata/md5-cache/media-libs/libmediainfo-0.7.71
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo libraries
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl doc mms static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.28[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/libmediainfo_0.7.71.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=a3f788a9e15b8611dd396c3072f1c385
--- a/metadata/md5-cache/media-video/mediainfo-0.7.67
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.67
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.67[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.67[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:2.8[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/mediainfo_0.7.67.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=765313dbdae136b95a6d3862b5192ae5
--- a/metadata/md5-cache/media-video/mediainfo-0.7.70
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.70
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.70[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.70[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/mediainfo_0.7.70.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=9d912ba1c8aae35086a6ab5d8b88d1d5
--- a/metadata/md5-cache/media-video/mediainfo-0.7.71
+++ b/metadata/md5-cache/media-video/mediainfo-0.7.71
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.71[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=MediaInfo supplies technical and tag information about media files
-EAPI=5
-HOMEPAGE=http://mediaarea.net/mediainfo/
-IUSE=curl mms wxwidgets
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=sys-libs/zlib media-libs/libzen ~media-libs/libmediainfo-0.7.71[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
-SLOT=0
-SRC_URI=mirror://sourceforge/mediainfo/mediainfo_0.7.71.tar.bz2
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=03b90c02a0df01377e20fa8c3ed7b0f2
--- a/metadata/md5-cache/net-mail/dovecot-2.2.13
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.13
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.13.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=30d77290bc99ddf7f4c031acd0897084
--- a/metadata/md5-cache/net-mail/dovecot-2.2.14
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.14
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.14.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.3.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.3.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=eaeeaeb38f308aca2938f64d279619fb
--- a/metadata/md5-cache/net-mail/dovecot-2.2.15
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.15
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.15.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.4.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.4.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=517eae5aa59472a66929b22c866782d0
--- a/metadata/md5-cache/net-mail/dovecot-2.2.15-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.15-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.15.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.5.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.5.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7cd09a7ddace3e61b1cfd2f365bf5fe
--- a/metadata/md5-cache/net-mail/dovecot-2.2.15-r2
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.15-r2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl ) virtual/pkgconfig
-DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
-EAPI=5
-HOMEPAGE=http://www.dovecot.org/
-IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
-SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.15.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.6.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.6.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a228eb7b5da0443d3500bae148076613
--- a/metadata/md5-cache/net-mail/dovecot-2.2.14-r1
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.14-r1
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( dev-libs/openssl:* ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv ssl? ( dev-libs/openssl ) virtual/pkgconfig
 DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 lzma lz4 zlib caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd ssl
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1 MIT
-RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
+RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite:* ) ssl? ( dev-libs/openssl:* ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv net-mail/mailbase
 SLOT=0
-SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.14.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.4.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.4.tar.gz )
+SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.16.tar.gz sieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.7.tar.gz ) managesieve? ( http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.7.tar.gz )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3415c8f40fc999aafb3ba784eb0590a0
+_md5_=dee7af9494255b24ce8afa445e35a0b6
--- a/metadata/md5-cache/net-misc/openssh-6.8_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-6.8_p1-r2
@ -9,6 +9,6 @@ LICENSE=BSD GPL-2
 RDEPEND=!static? ( sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) ssl? ( >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl ) >=sys-libs/zlib-1.2.3 ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl )
 SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.8p1.tar.gz mirror://gentoo/openssh-6.8_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-6.8p1-r2-hpnssh14v5.tar.xz http://dev.gentoo.org/~vapier/dist/openssh-6.8p1-r2-hpnssh14v5.tar.xz mirror://sourceforge/hpnssh/openssh-6.8p1-r2-hpnssh14v5.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-6.8p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.3/openssh-6.8p1+x509-8.3.diff.gz mirror://gentoo/openssh-6.8_p1-x509-glue.patch.xz )
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.8p1.tar.gz mirror://gentoo/openssh-6.8_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-6.8p1-r3-hpnssh14v5.tar.xz http://dev.gentoo.org/~vapier/dist/openssh-6.8p1-r3-hpnssh14v5.tar.xz mirror://sourceforge/hpnssh/openssh-6.8p1-r3-hpnssh14v5.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-6.8p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.3/openssh-6.8p1+x509-8.3.diff.gz mirror://gentoo/openssh-6.8_p1-x509-glue.patch.xz )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=504828e329f1b96d2c5e5ec0e1ab3b75
+_md5_=335fc43612667d69fa1bcd5e748e35e7
--- a/metadata/md5-cache/sci-physics/lammps-20140201
+++ b/metadata/md5-cache/sci-physics/lammps-20140201
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=mpi? ( virtual/mpi ) package-meam? ( virtual/fortran )
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/mpi ) package-meam? ( virtual/fortran )
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-1Feb14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=7af4ceb7604cd42aff95a87cb039746b
--- a/metadata/md5-cache/sci-physics/lammps-20141021-r1
+++ b/metadata/md5-cache/sci-physics/lammps-20141021-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-21Oct14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=129350a800a427635ebfe1ee372523cc
--- a/metadata/md5-cache/sci-physics/lammps-20150105
+++ b/metadata/md5-cache/sci-physics/lammps-20150105
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-5Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=e140ea23f638dfc76274f6e821324815
--- a/metadata/md5-cache/sci-physics/lammps-20150106
+++ b/metadata/md5-cache/sci-physics/lammps-20150106
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-6Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=4ad47167b0727db32ed904d095c39ac3
--- a/metadata/md5-cache/sci-physics/lammps-20150110
+++ b/metadata/md5-cache/sci-physics/lammps-20150110
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-10Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=82ebde80ff944844cd587046e63832a8
--- a/metadata/md5-cache/sci-physics/lammps-20150119
+++ b/metadata/md5-cache/sci-physics/lammps-20150119
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-19Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=dd88161b27b0ce454b0573fbcfdb78e7
--- a/metadata/md5-cache/sci-physics/lammps-20150120
+++ b/metadata/md5-cache/sci-physics/lammps-20150120
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-20Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=9ea6431ce77efffc384091035848043f
--- a/metadata/md5-cache/sci-physics/lammps-20150121
+++ b/metadata/md5-cache/sci-physics/lammps-20150121
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-21Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=5745ace10f08e59897ba996e70f50127
--- a/metadata/md5-cache/sci-physics/lammps-20150130
+++ b/metadata/md5-cache/sci-physics/lammps-20150130
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
-EAPI=5
-HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
-SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-30Jan15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=2596a4ddc920a2a80c4ede61ee1a45b7
--- a/metadata/md5-cache/sci-physics/lammps-20150314
+++ b/metadata/md5-cache/sci-physics/lammps-20150314
@ -3,11 +3,11 @@ DEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/
 DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
 EAPI=5
 HOMEPAGE=http://lammps.sandia.gov/
-IUSE=doc examples gzip lammps-memalign mpi static-libs
+IUSE=doc examples gzip lammps-memalign mpi static static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) sci-libs/voro++ virtual/fortran
 SLOT=0
-SRC_URI=http://lammps.sandia.gov/tars/lammps-21Oct14.tar.gz
+SRC_URI=http://lammps.sandia.gov/tars/lammps-14Mar15.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=486451d26a8d6de4f1755ad3007d69ec
+_md5_=7bcf6ecd77f4436d3e2fbb5d6fc0e20f
--- a/metadata/md5-cache/sys-boot/vboot-utils-42_p20150219
+++ b/metadata/md5-cache/sys-boot/vboot-utils-42_p20150219
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= sys-apps/util-linux:= !minimal? ( app-arch/xz-utils:= dev-libs/libyaml:= )
 SLOT=0
-SRC_URI=https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/f44ebbe36b2c1603437edc57b534244e89bfcd9c.tar.gz -> vboot-utils-42_p20150219.tar.gz
+SRC_URI=mirror://gentoo/vboot-utils-42_p20150219.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=22a81f316282ec369c61a51344b4d915
+_md5_=33e2af23e316210ab03bb0885d534090
--- a/metadata/md5-cache/virtual/python-cffi-0
+++ b/metadata/md5-cache/virtual/python-cffi-0
@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DESCRIPTION=https://bpaste.net/raw/006f2714152b
+DESCRIPTION=Virtual for Python's C Foreign Function Interface
 EAPI=5
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 RDEPEND=python_targets_python2_7? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-python/cffi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_pypy? ( virtual/pypy )
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=e7dbafdc4ef15091f0b84cfbb247d413
+_md5_=e3f2a8011a1019890ffd9c26570ea547
--- a/metadata/md5-cache/www-client/vimb-2.5
+++ b/metadata/md5-cache/www-client/vimb-2.5
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 ) virtual/pkgconfig
-DESCRIPTION=a fast, lightweight, vim-like browser based on webkit
-EAPI=5
-HOMEPAGE=http://fanglingsu.github.io/vimb/
-IUSE=gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 )
-SLOT=0
-SRC_URI=https://github.com/fanglingsu/vimb/archive/2.5.tar.gz -> vimb-2.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=beb26d5da9f4e5b66b5b420ec804b814
--- a/metadata/md5-cache/www-client/vimb-2.7
+++ b/metadata/md5-cache/www-client/vimb-2.7
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 ) virtual/pkgconfig
-DESCRIPTION=a fast, lightweight, vim-like browser based on webkit
-EAPI=5
-HOMEPAGE=http://fanglingsu.github.io/vimb/
-IUSE=gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 )
-SLOT=0
-SRC_URI=https://github.com/fanglingsu/vimb/archive/2.7.tar.gz -> vimb-2.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=2541511d70a76f800829a4ab68ce38f5
--- a/metadata/md5-cache/www-client/vimb-2.8
+++ b/metadata/md5-cache/www-client/vimb-2.8
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 ) virtual/pkgconfig
-DESCRIPTION=a fast, lightweight, vim-like browser based on webkit
-EAPI=5
-HOMEPAGE=http://fanglingsu.github.io/vimb/
-IUSE=gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/libsoup-2.38:2.4 !gtk3? ( >=net-libs/webkit-gtk-1.5.0:2 x11-libs/gtk+:2 ) gtk3? ( >=net-libs/webkit-gtk-1.5.0:3 x11-libs/gtk+:3 )
-SLOT=0
-SRC_URI=https://github.com/fanglingsu/vimb/archive/2.8.tar.gz -> vimb-2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	b99aa37f734b5d426efd83b2f271cece
-_md5_=f76b9f717fb25df668e4de636dbc4b06
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 23 Mar 2015 14:07:05 +0000
+Mon, 23 Mar 2015 19:06:52 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Mar 23 14:07:02 UTC 2015
+Mon Mar 23 19:06:49 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 23 Mar 2015 14:30:01 +0000
+Mon, 23 Mar 2015 19:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1427119501 Mon 23 Mar 2015 02:05:01 PM UTC
+1427137501 Mon 23 Mar 2015 07:05:01 PM UTC
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>net-dialup</herd>
-  <maintainer>
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
  <longdescription lang="en">
    Minicom is a menu driven communications program. It emulates ANSI and VT102
    terminals. It has a dialing directory and auto zmodem download.
--- a/net-firewall/sanewall/metadata.xml
+++ b/net-firewall/sanewall/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@ -1,9 +1,8 @@
 DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
 DIST dovecot-2.2-pigeonhole-0.4.3.tar.gz 1184029 SHA256 d692f4ab077bdf2c43c98829ed24b2e6f148db488ef8ba429b430394d8b4d757 SHA512 f2bb83578bb05c7ca2213ecc110f5e7059935746f720ee43897508394f3ab8a7072d193c78caf1fa77df81a20fbbeab1ac14069989250b3032ef459e798c54ff WHIRLPOOL 854d58cdb6b0d51d6e6337a2716858020a1ec22b7da24db903965fc01a00a75af5efcde7c4ddf572c0ee2a36a51bf467da011276f8a4e092463dc76e2622bfbb
-DIST dovecot-2.2-pigeonhole-0.4.4.tar.gz 1235456 SHA256 e08c5a45f359afa34b27571e14d79de753d73d47b8e72c5142064c6fd047f93e SHA512 76b635f5213ac61161734040fed0a3d32643190f9fb8fbcbf166c797953bb09f1414e2c994c86dd965e215a79f7f1898cfcd586d02782df9ac3c6d6781bd079e WHIRLPOOL a30032e96cee2f9e4b427f7beb6986b943c829d0c6d55352d9cf7b9372c8b86b95747f637691b481fbc41aefda0b30bf9283369bc3ccd1c5114d446ff7f924da
-DIST dovecot-2.2-pigeonhole-0.4.5.tar.gz 1239438 SHA256 020a4795ca9cd528394cd55e87714776aeb396b943411dce86cb9945a68ff419 SHA512 faf369662ed3498589804e09391ef17128c834a88f2ef0a5aa6150f53c8ef512f8862a7550e47d45ef09e7ea1a0784b43025d45e83c4dd7475d04bdfba30c58d WHIRLPOOL b07c33c9830e6b127d472dca9dbed8dfffa3344d85ef5a4d4bcc51324431cb95a48c890706c16e059c5c8bc8e35ae9ab628d51aaab63f01db08769b02cb5710f
 DIST dovecot-2.2-pigeonhole-0.4.6.tar.gz 1240368 SHA256 91034669f9ce07661bbadcfb00fe50b6929bf7f616d9aa79d3f5a351d1a47d3d SHA512 50b0df4438f6fc751a7dd058919628a2f3bc631c119e86356495d7de94d24b9f9cc8c11fa5e3646bc2429170bf3c9473d42542ee8b15b7c94a1502bb76042b9e WHIRLPOOL 00f32f01bc5298a5ee428b920e4489b2234ce48db2d0603008b11f2ab0f9e45a280ec2d3b2bedeb28ce3baf3401c8231a49a973792da76ac81643ffc4b551898
+DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6
 DIST dovecot-2.2.13.tar.gz 4613824 SHA256 133cf3d2aa81733f6688ec986c91dbe07602fad81e856ba3d8046ffca85d9dce SHA512 1f3c0e600048ac2c1b2e497286620976c0fc821a6cac8e4e1492180af8eb9620cd143c89ee6d12872cecacbcadca573435cce1050c46325de3072c98ab5a9331 WHIRLPOOL 7bb81575faf69820b07d654c469fdd3fcf12c47517bb1dd6ea5566771bb60ce8f9c3a1a7b5c6df6d5f4b903d10472ffa1cca1a01c7fd158b6055794a44aacf39
-DIST dovecot-2.2.14.tar.gz 4720087 SHA256 68ac0fa105c6041129a1fe83ccf4915982d03d41d99054567892cc0fbd68ebf0 SHA512 640edfc0f6d2261485f366a6b4139bdb09f25a26439ee22573e09aeffa5f47106b0acb036c673839de12f76e6490c383ab6c7320ca85747c51c4f4757e120d24 WHIRLPOOL e32e9450db8bc4cd8aa84e81bf8aa9121b9a44a981b7cdbe5a52f986b866bbcc4078fc536fa88ae2c96d1f3666bf174ce22bef34cae05a279debab1855c9e9e6
 DIST dovecot-2.2.15.tar.gz 4747444 SHA256 d10e7769e2367d635c93fd6589efdd05f2e3acf13c7911a40167faedf23c399f SHA512 4d84744a23f21dd0923e86fdb1604a0a431e7c1a579f8323fb6643f92ac84754389e5a91fc8e8b53eac4202dba7f8541aa13ada12265e397ecdc15ff9b5c7ada WHIRLPOOL 3cccf5d6014baf8f7b66ab9fa7e90cf27001ab8842db3f1d2814b94b05fba5827103eccf7e07253632a58f8ed2a492d693bff070fd2a1a40c8016ec63b4abc2a
+DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4
 DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
--- a/net-mail/dovecot/dovecot-2.2.13.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.13.ebuild
@ -1,292 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.13.ebuild,v 1.7 2014/12/28 16:33:27 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.2"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://www.rename-it.nl/dovecot/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
--- a/net-mail/dovecot/dovecot-2.2.14-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.14-r1.ebuild
@ -1,292 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.14-r1.ebuild,v 1.4 2014/12/28 16:33:27 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.4"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
--- a/net-mail/dovecot/dovecot-2.2.14.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.14.ebuild
@ -1,292 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.14.ebuild,v 1.4 2014/12/28 16:33:27 titanofold Exp $
-
-EAPI=5
-inherit eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.3"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
--- a/net-mail/dovecot/dovecot-2.2.15-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.15-r1.ebuild
@ -1,300 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.15-r1.ebuild,v 1.4 2014/12/28 16:33:27 titanofold Exp $
-
-EAPI=5
-inherit autotools eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.5"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-
-	epatch_user
-
-	if use sieve || use managesieve; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		epatch "${FILESDIR}/${PN}-pigeonhole-0.4.5.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
--- a/net-mail/dovecot/dovecot-2.2.15-r2.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.15-r2.ebuild
@ -1,294 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.15-r2.ebuild,v 1.2 2014/12/28 16:33:27 titanofold Exp $
-
-EAPI=5
-inherit autotools eutils multilib ssl-cert systemd user versionator
-
-MY_P="${P/_/.}"
-major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.6"
-if [[ ${PV} == *_rc* ]] ; then
-	rc_dir="rc/"
-else
-	rc_dir=""
-fi
-SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-	sieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	)
-	managesieve? (
-	http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="http://www.dovecot.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
-IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
-IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
-IUSE_DOVECOT_OTHER="caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
-	selinux? ( sec-policy/selinux-dovecot )
-	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	vpopmail? ( net-mail/vpopmail )
-	zlib? ( sys-libs/zlib )
-	virtual/libiconv"
-
-RDEPEND="${DEPEND}
-	net-mail/mailbase"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use managesieve && ! use sieve; then
-		ewarn "managesieve USE flag selected but sieve USE flag unselected"
-		ewarn "sieve USE flag will be turned on"
-	fi
-	# default internal user
-	enewgroup dovecot 97
-	enewuser dovecot 97 -1 /dev/null dovecot
-	# default login user
-	enewuser dovenull -1 -1 /dev/null
-	# add "mail" group for suid'ing. Better security isolation.
-	if use suid; then
-		enewgroup mail
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10-ssl.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	local conf=""
-
-	if use postgres || use mysql || use sqlite; then
-		conf="${conf} --with-sql"
-	fi
-
-	local storages=""
-	for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
-		use ${storage} && storages="${storage} ${storages}"
-	done
-	[ "${storages}" ] || storages="maildir"
-
-	# turn valgrind tests off. Bug #340791
-	VALGRIND=no econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--without-stemmer \
-		--with-storages="${storages}" \
-		--disable-rpath \
-		$( systemd_with_unitdir ) \
-		$( use_with bzip2 bzlib ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with ssl ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with vpopmail ) \
-		$( use_with zlib ) \
-		$( use_enable static-libs static ) \
-		${conf}
-
-	if use sieve || use managesieve ; then
-		# The sieve plugin needs this file to be build to determine the plugin
-		# directory and the list of libraries to link to.
-		emake dovecot-config
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		econf \
-			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX}/var" \
-			--enable-shared \
-			--with-dovecot="../${MY_P}" \
-			$( use_with managesieve )
-	fi
-}
-
-src_compile() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-	fi
-}
-
-src_test() {
-	default
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		default
-	fi
-}
-
-src_install () {
-	default
-
-	# insecure:
-	# use suid && fperms u+s /usr/libexec/dovecot/deliver
-	# better:
-	if use suid;then
-		einfo "Changing perms to allow deliver to be suided"
-		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
-	fi
-
-	newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
-
-	rm -rf "${ED}"/usr/share/doc/dovecot
-
-	dodoc AUTHORS NEWS README TODO
-	dodoc doc/*.{txt,cnf,xml,sh}
-	docinto example-config
-	dodoc doc/example-config/*.{conf,ext}
-	docinto example-config/conf.d
-	dodoc doc/example-config/conf.d/*.{conf,ext}
-	docinto wiki
-	dodoc doc/wiki/*
-	doman doc/man/*.{1,7}
-
-	# Create the dovecot.conf file from the dovecot-example.conf file that
-	# the dovecot folks nicely left for us....
-	local conf="${ED}/etc/dovecot/dovecot.conf"
-	local confd="${ED}/etc/dovecot/conf.d"
-
-	insinto /etc/dovecot
-	doins doc/example-config/*.{conf,ext}
-	insinto /etc/dovecot/conf.d
-	doins doc/example-config/conf.d/*.{conf,ext}
-	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
-	rm -f "${confd}/../README"
-
-	# .maildir is the Gentoo default
-	local mail_location="maildir:~/.maildir"
-	if ! use maildir; then
-		if use mbox; then
-			mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
-			keepdir /var/dovecot
-			sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
-			"${confd}/10-mail.conf" || die "sed failed"
-		elif use mdbox ; then
-			mail_location="mdbox:~/.mdbox"
-		elif use sdbox ; then
-			mail_location="sdbox:~/.sdbox"
-		fi
-	fi
-	sed -i -e \
-		"s|#mail_location =|mail_location = ${mail_location}|" \
-		"${confd}/10-mail.conf" \
-		|| die "failed to update mail location settings in 10-mail.conf"
-
-	# We're using pam files (imap and pop3) provided by mailbase
-	if use pam; then
-		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
-			"${confd}/auth-system.conf.ext" \
-			|| die "failed to update PAM settings in auth-system.conf.ext"
-		# mailbase does not provide a sieve pam file
-		use managesieve && dosym imap /etc/pam.d/sieve
-		sed -i -e \
-			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update PAM settings in 10-auth.conf"
-	fi
-
-	# Disable ipv6 if necessary
-	if ! use ipv6; then
-		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
-			|| die "failed to update listen settings in dovecot.conf"
-	fi
-
-	# Update ssl cert locations
-	if use ssl; then
-		sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-		|| die "ssl conf failed"
-		sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-			-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-			"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
-	fi
-
-	# Install SQL configuration
-	if use mysql || use postgres; then
-		sed -i -e \
-			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
-			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
-			10-auth.conf"
-	fi
-
-	# Install LDAP configuration
-	if use ldap; then
-		sed -i -e \
-			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update ldap settings in 10-auth.conf"
-	fi
-
-	if use vpopmail; then
-		sed -i -e \
-			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
-			"${confd}/10-auth.conf" \
-			|| die "failed to update vpopmail settings in 10-auth.conf"
-	fi
-
-	if use sieve || use managesieve ; then
-		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
-		emake DESTDIR="${ED}" install
-		sed -i -e \
-			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-			|| die "failed to update sieve settings in 15-lda.conf"
-		rm -rf "${ED}"/usr/share/doc/dovecot
-		dodoc doc/*.txt
-		docinto example-config/conf.d
-		dodoc doc/example-config/conf.d/*.conf
-		insinto /etc/dovecot/conf.d
-		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
-		docinto sieve/rfc
-		dodoc doc/rfc/*.txt
-		docinto sieve/devel
-		dodoc doc/devel/DESIGN
-		doman doc/man/*.{1,7}
-	fi
-
-	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-	if use ssl; then
-	# Let's not make a new certificate if we already have one
-		if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
-			einfo "Creating SSL	certificate"
-			SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-			install_cert /etc/ssl/dovecot/server
-		fi
-	fi
-
-	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
-}
--- a/net-mail/dovecot/dovecot-2.2.16.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.16.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.15.ebuild,v 1.4 2014/12/28 16:33:27 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.16.ebuild,v 1.1 2015/03/23 15:54:38 eras Exp $

 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator

 MY_P="${P/_/.}"
 major_minor="$(get_version_component_range 1-2)"
-sieve_version="0.4.4"
+sieve_version="0.4.7"
 if [[ ${PV} == *_rc* ]] ; then
 	rc_dir="rc/"
 else
@ -43,11 +43,11 @@ DEPEND="bzip2? ( app-arch/bzip2 )
 	lz4? ( app-arch/lz4 )
 	mysql? ( virtual/mysql )
 	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql !dev-db/postgresql[ldap,threads] )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
 	selinux? ( sec-policy/selinux-dovecot )
 	solr? ( net-misc/curl dev-libs/expat )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
+	sqlite? ( dev-db/sqlite:* )
+	ssl? ( dev-libs/openssl:* )
 	tcpd? ( sys-apps/tcp-wrappers )
 	vpopmail? ( net-mail/vpopmail )
 	zlib? ( sys-libs/zlib )
@ -106,6 +106,8 @@ src_configure() {
 		$( use_with kerberos gssapi ) \
 		$( use_with ldap ) \
 		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
 		$( use_with mysql ) \
 		$( use_with pam ) \
 		$( use_with postgres pgsql ) \
--- a/net-mail/dovecot/files/dovecot-pigeonhole-0.4.5.patch
+++ b/net-mail/dovecot/files/dovecot-pigeonhole-0.4.5.patch
@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Stephan Bosch <stephan@rename-it.nl>
-# Date 1414713028 -3600
-# Node ID 3e924b1b6c5c0199f1b97cb5782f52e6348a9840
-# Parent  80b47902cf40053cf13d8edbf034d0e4f8a4da07
-After make distclean the distributed tarball would fail to recompile.
-
-diff -r 80b47902cf40 -r 3e924b1b6c5c Makefile.am
--- a/Makefile.am	Thu Oct 30 23:27:42 2014 +0100
-+++ b/Makefile.am	Fri Oct 31 00:50:28 2014 +0100
-@@ -2,7 +2,10 @@
- DOCS = doc
- endif
- 
-SUBDIRS = src $(DOCS)
-+SUBDIRS = \
-+	. \
-+	src \
-+	$(DOCS)
- 
- ACLOCAL_AMFLAGS = -I m4
- 
-@@ -11,6 +14,7 @@
- 	examples \
- 	COPYING.LGPL \
- 	ChangeLog \
-+	is-tagged.py \
- 	update-version.sh
- 
- dist-hook:
-
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@ -7,7 +7,7 @@ DIST openssh-6.8_p1-x509-glue.patch.xz 141312 SHA256 2060c896e1f8c241052bb272466
 DIST openssh-6.8p1+x509-8.3.diff.gz 347942 SHA256 34dbefcce8509d3c876be3e7d8966455c7c3589a6872bdfb1f8ce3d133f4d304 SHA512 74a83e9716731a6b4b0d957c49ba86a4124e208e31f61efb332ebc19b02e8b384afbd3f52409b34ae721183a7863be135c5d4fe4d21c9473ef828bc30688fdac WHIRLPOOL 19570e07381dc9fd31dbe4bf3e6fefd0bc0f9cfbb1777b3900a943dac8cb41560a6216475659defa7d9d05882902fe7f575038cdb23e7587a8515465b24fc9f9
 DIST openssh-6.8p1-hpnssh14v5.tar.xz 24660 SHA256 dea2c5cdfd08d09f832a88aaf9d8285e57a67bbc68e6652ca3e0bf8b0213d99e SHA512 0b77e5d7d13ac7e2392d52e18240e5a0233d0a452d6cb7d1a0bf7ea7b640df5edc64cfcbe8c4fcb7c011b0eaa6a7aa3d6585292be753387af369d726345b7f5c WHIRLPOOL 2385c4f8ce5b9a2359991b9ca38362ec19482d3c904b10ceeb77c5044c88edabc2470db2ed156931d1c3ab6f93872809bef66a6848e9b39969f7c59d144c31ba
 DIST openssh-6.8p1-r1-hpnssh14v5.tar.xz 24648 SHA256 87ab38507c7e4f1855c127f276c7c20e58bcd539dd303a37843d3d24ff72df7e SHA512 5883787b09330ae154f385bbc6bda8c6dbc727df7e9a96ddf4cb4a5162c932937bce8e3aa2b555ff4854df80b738c2ea1cdc4c170a10f9ed6252520edb070edb WHIRLPOOL e508fbfbb148fbd311927c4a88d388d1d15a1ee99e5445df0c774fd23acf7c87962682eab03a0bef6bd12c9d7149b047cbb145e60e6e947bd577e88110b47d52
-DIST openssh-6.8p1-r2-hpnssh14v5.tar.xz 25264 SHA256 1106514e4a77bcb2fc625cd4ddde550269f24491f2a552b59ddcc0b071a172f4 SHA512 07294e39ef465f34df920dfa92e0e1319d3cc28f428d73d5ce9bbeb39b06aa8828c88d183c2dcff9d1db6855d656185b708bf44019792836b28e9b391bb4833c WHIRLPOOL 1f2aaf944d147106c540fa3d902324dee828b1e0e6c13af10f76eb4e249999a72c969ae7233b1c8a5b530fea417159585940fea91a0af02887d6c96207a086f8
+DIST openssh-6.8p1-r3-hpnssh14v5.tar.xz 25396 SHA256 fc8d075679b659a15df919e1a946fae396b272e7da5de84d993ca0c90a212b43 SHA512 d710aab0f788a56615f951dc1e030d443dd6e14ef2944e41ef82e621b9406542142e095f2ebd4090f16471b08e300665c159edd7567cec17a178586b47aea92d WHIRLPOOL faee05730e96d00c09fb3ca39af39a516b602d841f894cd3b3e8051735eb8bcfb13674aba9b9b139d3407720791232af172a4c935453a525c92726b45fce4df7
 DIST openssh-6.8p1.tar.gz 1475953 SHA256 3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e SHA512 7c4457e4525a56cdabb1164ffaf6bed1c094294ae7d06dd3484dcffcd87738fcffe7019b6cae0032c254b0389832644522d5a9f2603b50637ffeb9999b5fcede WHIRLPOOL 3ac9cc4fe0b11ca66c0220618d0ef0c5925e5605d4d3d55c9579b708c478cf8613b7575fe213aba57054d97d3290baac4eba26b7a630d22477ec947f22327a5a
 DIST openssh-lpk-6.7p1-0.3.14.patch.xz 16920 SHA256 0203e6e44e41d58ec46d1611d7efc985134e662bbee51632c29f43ae809003f0 SHA512 344ccde4a04aeb1500400f779e64b2d8a5ad2970de3c4c343ca9605758e22d3812ef5453cd3221b18ad74a9762583c62417879107e4e1dda1398a6a65bcd04b2 WHIRLPOOL 5b6beeb743d04deea70c8b471a328b5f056fd4651e1370c7882e5d12f54fa2170486dcd6f97aa8c58e80af9a2d4012e2dfbcf53185317976d309783ca8d6cf73
 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081 WHIRLPOOL b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b
--- a/net-misc/openssh/openssh-6.8_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-6.8_p1-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r2.ebuild,v 1.1 2015/03/22 19:48:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.8_p1-r2.ebuild,v 1.2 2015/03/23 16:47:39 vapier Exp $

 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@ -9,7 +9,7 @@ inherit eutils user flag-o-matic multilib autotools pam systemd versionator
 # and _p? releases.
 PARCH=${P/_}

-HPN_PATCH="${PN}-6.8p1-r2-hpnssh14v5.tar.xz"
+HPN_PATCH="${PN}-6.8p1-r3-hpnssh14v5.tar.xz"
 LDAP_PATCH="${PN}-lpk-6.8p1-0.3.14.patch.xz"
 X509_VER="8.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"

--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -6649,9 +6649,6 @@ sci-physics/hepmc:cm - Build with cm instead of default mm for length units
 sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units
 sci-physics/hoomd-blue:cuda - Enable cuda non-bonded kernels
 sci-physics/lammps:lammps-memalign - Enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS
-sci-physics/lammps:package-dipole - point dipole particles
-sci-physics/lammps:package-meam - modified EAM potential
-sci-physics/lammps:package-rigid - rigid bodies
 sci-physics/lhapdf:octave - Add bindings for sci-mathematics/octave
 sci-physics/meep:mpb - Enable build against sci-physics/mpb
 sci-physics/pythia:hepmc - Adds support for High Energy Physics Monte Carlo Generators sci-physics/hepmc
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@ -1,25 +1,17 @@
 DIST lammps-10Feb15.tar.gz 62912048 SHA256 59373e9b5592f7b697a144bbce1fb742726e03536b7bb355dac7a9e013ddf9b8 SHA512 a7804377a23f03f338bdaf443439dffcdc52293b4c45e6369b340a1107510fed0b8a198e3b5afcff2e04e109985b52ee62e7b28276697bae37ac6f783d1ab9f2 WHIRLPOOL 09f29cadf8b072d388abe45ec219341d2a14a6c9cc9e4010a0f7945e930e9984738f7837748d117ab95ca76ce0c8d9160fe88dcec17e8d21b81f385dec8f7005
-DIST lammps-10Jan15.tar.gz 62757375 SHA256 b3cbc1e2efb64b5431744940a8d78a0737824c46bfa18c2f0cc6565d67394421 SHA512 40d273049c9c22cb9828d4f51c29dd1044efad24a78e989f4c0da443ebd8f84d15dc18197ecc41cfc3a3f70ce5b59aeb82bb84dafa014a62b991b6d9b674f4fe WHIRLPOOL 946ab5f4d0701abbaadee94ad5493d6c39bad6ed866ae29176ffa8f16b3508a7cb0a8deefddd987aaf95ae2f74b768cadeddc54b4c053eb12dfde2b9fa597fb8
 DIST lammps-12Mar15.tar.gz 63521532 SHA256 048dc4d5f9f4d26d6f9bfeb4e20bb48cd01d3b064fb0b091309218c0895dbb3e SHA512 2581d795adcde9ef7bd10ebea5cfa1897835849c8aea112b8d45614e2eabb610316c6f7cba94b5324203b08382d31bdb17a3031d4d7f1ef4e951c35a08eda6f3 WHIRLPOOL 7fd33fed676b5b833dd053d79e64d090aa8384b462026147ee9e62313e937abaaef1d95d04c152254b2a1593f8b0baa077e5b68f85cb9f461f7128363a50214e
 DIST lammps-13Feb15.tar.gz 62974524 SHA256 6be39873ff30eaaf467ac201d7f9b06b7fb175c5fcc4687dc38b7e8ab8ac0544 SHA512 20a0e7ba4905cf3e1f57df9bb9ddba298c8ee03e823d920ffa526a6ee318e4c9a5d3319bd79a46441a895c5b03ba0d296a2921f38f5795014f544ec58b3be629 WHIRLPOOL 22e9534dc84a9ce5cc2f5ca0ff693a05cc8afa1f307cac71d739c7504e56a11121acda62cc1d141f2e8f556a4c35bddeeac09cd429cddde531dec115925f4b00
+DIST lammps-14Mar15.tar.gz 63563980 SHA256 10dba8d347a7ab7a5ba3e4a87f555177cb0ad5cbf4bcee4125cca5e67cb31dfa SHA512 99dd8fece0ec220f324a0c9dc14b80260119c1038afd4312ad85d6672a65164a6cee6625677f8ef337962677b82d4a0c7b2ca361d004dfd9fb0083c5b7eb1737 WHIRLPOOL 1fc20a1d388d575c3313a65d601b2f099464767c1585f601a961269317fcb320bb9b8dda7a7e4122808d8234d120300a379ba4d119c32d2dcc9ad0e5616893b2
 DIST lammps-16Feb15.tar.gz 62981941 SHA256 deaac4218a1f016fcd49bf3cf01e26c32ffcecb89d6b61636192baf6f5980392 SHA512 ed4e3270d94d1f4d2ae75728913eaf9fc501cb5512c7ee2f9a2a3ec6369c5d86aa5ca9dba625c961908bdca954b85aa37b6a0b8e5cee67e5cdf1a74b635ff394 WHIRLPOOL 4f8197361be45fa6928d89e8e3d623ed048102aaa1bee3af4c9b53d3baad86e07a78344806955a86094bbd35ec01103c8303f835bf062b36e97cb0f883ae836e
 DIST lammps-19Feb15.tar.gz 63160551 SHA256 970ea081e424f631c56a93e0bbd8cf37b67f8b3d707b0c6a84e5d942100a3848 SHA512 f8947dce3143ba3bfaa20e71cde35e519f0074c2654c71037cff5e1b1fc68214431e92529235d8ca61d65c4f1c70945df76b6a97f4e291bd9fe15bbb477112f5 WHIRLPOOL 7bc761796bdad741a5f82416262ace5c45a71b2c765f975586d970e7584c43ac0488051381cf6860491af4b0d702ba1223872825af10365635b2c40785a55591
-DIST lammps-19Jan15.tar.gz 62756608 SHA256 7f51f735010ce71193d0e4b105fb6bd203f21cc92a830eba1c0392d49d510257 SHA512 9340f6ae01507115f31b8b791ffacd5fc9a174fc4a26178db0023bbb16d233c64498348bacb07597d7088cd17319de17bb440f1e6fde483f8866930f4750c43e WHIRLPOOL 79efcf5902c1c31a82c5e3d0b21f32c5212926f1a69c1ed2d9d37681b719f23d39f4ab972f1263aa0a02a8e2155b1c38be243886cbe39b4e5acc28541682c4af
-DIST lammps-1Feb14.tar.gz 57811478 SHA256 2d01ca4f2c52c18a9a95866f558b3f3857b22662415cb44fa16a5be4dd5bfe44 SHA512 aa84766d19d7f9f753792d6c3a9ba9b37faa671b4ae06ae89be6d3485a064326c79dc351cb784e6a03f5e4e046885a791274a64899ef117dd395e583eac13f3c WHIRLPOOL 4921525762c5842fe7bb96420db26553bf2ea3d91bfda52d2a9fad57f205487fe772c878d83e5b4ae146507e3a90509a4ff0b5628ebfda9a5dde82b8b3a95b3b
 DIST lammps-1Feb15.tar.gz 62801871 SHA256 4bae0a1bb8e56db0e657e5df068fd7caf62117624227d82400e39a5e171280d6 SHA512 85b59dfe5f24d30625171711555cc95587f2944ff6bba1914c223dfd422975319e8725a45b9bd2743fbf2e770d3af7ef26dc4b283c1514c429c67e9cab9d6eeb WHIRLPOOL ed1e5626314540e0ee6df0c537af93e5b81a00ee9994a6ccaa9a9ff852d9eefb34d5d5918faf4f605d95beb5758ec46c27a8aea3345392e85c9eb1198380b2ec
-DIST lammps-20Jan15.tar.gz 62761594 SHA256 3b52023a0fec9fcff7a9cb507c3b7d0ab78f786bccd105d21f53274bfc2ff136 SHA512 2dfbc5f6a96b86c42583562495758db90a279b9dd1fdb214242744e318897f9859692d683f1271cf6bab46584aa1b7e1567b7d88869fb6d3ae703f0d2c9c5675 WHIRLPOOL a8d3cf7867f1e2f92f9c38d9afe99191a1c8c6600e2671ecdfb6e8e7bfa931a246299714b7f72df9c2d006fed4a2bd1a3a8e55670b381ce03d04db141ecd4fa8
-DIST lammps-21Jan15.tar.gz 62794305 SHA256 29b45158acc1103e569e1ff343e2413775c1b4d4b90506fd647051a11c9eb915 SHA512 ed11e5a4470e80c709ae461337f9c15a8a6d5d5a5d4d35b8a51d197f0493826ec6c31bd1da38206c377186fe2693d32e6dcf12ccf1cae9eba3590bab738c2a4c WHIRLPOOL 8a0122f692db767127cbd53af55d8d45d3e7679f6718684f15b632da6806945675a5e86623ac7178f787c38eedcaca4411b10afafa2adae5a991658aefbfe047
-DIST lammps-21Oct14.tar.gz 58596371 SHA256 58ed8d560246a5bf48a681c156113d7746c654cac85e9aa9e10fff6bf38fa99e SHA512 0a10267089292530cc1c9895b0b9e1a2cba403a1b1f7e8ff20dea7a2921739c7d5042bae28bca5f1312b9dc1ab03170b1d5dd9141a3ff7d98507aa0e22d42b3c WHIRLPOOL 711376ca17e4cf6ae6a9a98d386a5970777b9b03dfac60087cd7c10d92a0c6e05996709a253f72936c5e14b465ccec2dedaa1aa6bcb07930be75213700e531f0
 DIST lammps-24Feb15.tar.gz 63487709 SHA256 f8a42d4fcd3c3b6591898cddee2fae6f29ecfd11bf688b2ae81896360181bdef SHA512 42777481fd6551fc14010c256bcd5665a42b52e79026860eca89724edb50df9e4af6566553e51954cf0c9099e4cc9c982e07cb4a99ec31e07fdb225ee5e7e219 WHIRLPOOL 140566ede55929e528c91da1903bda7667028183bf1d4294c441f98877675af206d66fa476167469f5e1f83aee969635a53c6a56d7eac3eb6d646cf5400d6472
 DIST lammps-28Jun14.tar.gz 64598325 SHA256 3dc8f415f076c5b1563e25c06ddf360a7234c0b3428c561764a13618f80fb233 SHA512 568a00249dd88d0ad94714d2b388855376d020a34b546f9f54142b761e95515c1fce44bbbc9db2538a5a9b8335b8ac9e2905b875e954da18831087a3021df0e2 WHIRLPOOL 9d283de197c6e7216c60ed3f34bcd0a55baab925ab4d025717f1bee8a7e8b668c67bf008a9a9a807361c8f5ade36e362afdf7ac9ef6c3ed6d856389591483354
 DIST lammps-2Feb15.tar.gz 62843740 SHA256 34a385dde4e6c4436feaad9d188401a1616ba4fc41b4ff802a2af7cdc66a33ec SHA512 b8fc645ced67571857f89793113fe98eab5c9d44990de4ca9bd46ad3c88e1041986f1f71bc0cd9d5a917a27ba44ebee2e8f3eb0c68df7f9d4f11a2bb73b3d748 WHIRLPOOL ecfaa4f26b55597553b20e38824c1628a071508edb123813c57cc8c0660505a3aaa9012aab6adabdb7be0a7a180284430f773086669b020c226125848cd8aadf
-DIST lammps-30Jan15.tar.gz 62799073 SHA256 f4fd77d4cbb6b952bfd714824097a7b5a015c9273786393b62f8f1a30f1a0f2c SHA512 aee8db0e6632986258c0bb90e4968cc66671d0decf145a50e9f30dbb4dd4517805d85c45d80fbd22f52876a6036ed243dcc49f5143d64e675c391c7c50e9ee28 WHIRLPOOL 7a920dcfc2260e367f521847d9fbe0fb6b700de26f9f857533b4253995feb49d49ebea65e55f85d287e2db28796c23a3bfafcf60b58f37e5582eb801db27b389
 DIST lammps-30Oct14.tar.gz 59386701 SHA256 b99522370cb2ea3e55c63f401b2bafb0c98f6b28b9af76fb8339e9bd4a3ae205 SHA512 9b9952ec098c17abd9af085d546869a60ba421a380abcd0be3c425e3c1495394417bfee8d8097c99f54131e286a325d736e766e1ae7239bf45ca44c737611c2c WHIRLPOOL b8ad0078b883455cd7e8f06c0ad8f43eefe7d1c158af58baa42ad179154f09f68077d8fb31c22abccedf06daa344e4abb7f3edcc16d9e69e9d2c458f4fda1085
 DIST lammps-3Feb15.tar.gz 62848209 SHA256 1520038071774fbe984d74e00d2e86ba778c65c28a99098dc5513230ef6c553f SHA512 4cdac7624e2fadf12a2db23f8f52eb4c31cf61b19e0ec53d9885ce24cb8fbfb9030dc66a468b99434aac569fa16b26010707956326ae7eaf91181cbcf7291134 WHIRLPOOL ff2843ac51359ecd3beb57fc60e98a3735901e489af32b8a6835e463878b26fd1c956ae9e90926d73730d60f103967b1d6517156e04dcfdc2d8b01775a0745a4
 DIST lammps-4Mar15.tar.gz 63497305 SHA256 80a5a18419c5e07c3c89f131edb1f5af59e3e7223b4f46346e48da3f42e3d40c SHA512 7932f1601aa22f43243c91d255e8c6a4ce6f401768ce2c78f22d82dd7d1f33025a1895e9a4436b2b5442f99dffbf1f746f284afe695cbf91f2529f42ec2e81fa WHIRLPOOL 55984c405853d3d8cd1bf73f33ffb0c4a5b6d342b682eb89975657b1e225addfc2d4a041891ce965135557ad771114967ae8756d7f18f93def1b6b2a4013225c
-DIST lammps-5Jan15.tar.gz 61852386 SHA256 0283c06904cec23c1577fd28686be8c61ac7e72ea76bfb8aa7135aba98e13b51 SHA512 4c6dd1b18b25b22f943f6dc439e5cf1d7583cd044b23c423a525457ead47d0b33ab9f9f07ef7a2c1930e7677d78b8b542d47599fa2b19082dbe600188056fef1 WHIRLPOOL b55e802377e08dab8e0cd7b501be0479570b73ddb7c01206b043fd1bb3b27b9c651cfc955885ecfd66cad1881fd03ce4bae40606c09416c7f73a2ab23b05a567
 DIST lammps-5Mar15.tar.gz 63506216 SHA256 19d7fdfa4fba34fb8fec8317e45d2daec0cd55290a4a576640c866acee4288ba SHA512 3d325cc3b451596fe87f15dbe640944752ab05687c86fa39e27a6eb3e990f6de772ea4d4d9abbd6cd6e9bd67965ad96c85e2469eeeac3258f5a29e1cdd48318a WHIRLPOOL 0e8de71e6544c12b83de7dae15a832481665e474c4f9231f23d49c71bb5c242b6411099bd05a0a16604384c6ca27533d56d442704bf4f45d4a1a99b9da40918c
 DIST lammps-6Feb15.tar.gz 62909412 SHA256 3bc26f6d7eaf31c7846b83dd3020f95b2bad13d8acb0b4ea5ebc058849e98e86 SHA512 27e9d7dbacc90372a6ae85cc7a238883759417d09711fe223dfc9872e00e80e641e34bbcc5c924e3963a719e6c17e9cd890fa236c86265c7b734a1c26c66355a WHIRLPOOL 0391c69da9ca3f03281b109c20f981f8a85e63ce20a7afcb762cb2b3b2297016d3dab78a71ea5c4e6c0b98c6a5ce7cbec92c59daaf670686204a688299f7dd09
-DIST lammps-6Jan15.tar.gz 61856773 SHA256 8a46420d189e071c0019b2f14594d32026816bd9da269c1733932b75a98a52ff SHA512 a6a54cc5f78414e92977b6cb77076ef23b31e1ca6ed4129ba286d403b41aee6217a0136ba5f35a0f20baa15976c61f75abec840179173411bf6f4f314e06d389 WHIRLPOOL 133ea1ad548a3803074248281c3dcff874f59b712fa59bf7fb92d21559608123caaef3811ce8191519ffe08dc89f5eb5dbcdd1a8341cfad1b1558e8700c6606e
 DIST lammps-6Mar15.tar.gz 63537482 SHA256 b019cd6dda169874414f501e1b2bf3eaff4a21dd9dd0c18d55fadf50501810a9 SHA512 fdcbce8bf5abfda7d6f0dc26bb9fd0efd1ecabdd28197cb1a061505777c7b0acc936e71e1dc49683bc04b8cfa4f04124b28706bd3f082c17db2abae09b951be2 WHIRLPOOL 085e286be41616183b5dd569119254f8491a323844f5a94bac2f9e5d018f5ce2d1090fe23d51bec6d1777ae59cb1daeb363422f79e18917fa12f984f314428f8
 DIST lammps-9Dec14.tar.gz 61465046 SHA256 01724976608413e049d197a12b8608321220a9a15a7c3d7706babd1ab9e21de1 SHA512 30ae88f930bea43adbbe217cf6b4d9f257d16f707f95d60e6a07358b0633578dae767fd348f656061e10d9783fff2a59118bbf902569bd70bb77f682fd7fd666 WHIRLPOOL 5cccbe3da9e00316c660d721ece7fa0d208edbf3c94845c06d15d08f5e5852cc11919aae78fcb02f7f9109e5e478f2d52c299dc20be3877cb378e636701c0579
--- a/sci-physics/lammps/lammps-20140201.ebuild
+++ b/sci-physics/lammps/lammps-20140201.ebuild
@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20140201.ebuild,v 1.2 2014/03/03 23:57:03 pacho Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED="package-meam"
-
-inherit eutils fortran-2
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid"
-
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# Note: The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		"$@"
-}
-
-src_compile() {
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build optional packages.
-	if use package-meam; then
-		lmp_emake -C src yes-meam
-		lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	fi
-	use package-dipole && emake -C src yes-dipole
-	use package-rigid && emake -C src yes-rigid
-
-	# Compile.
-	lmp_emake -C src serial
-}
-
-src_install() {
-	newbin "src/lmp_serial" "lmp"
-
-	local LAMMPS_POTENTIALS="/usr/share/${PF}/potentials"
-	insinto "${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PF}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20141021-r1.ebuild
+++ b/sci-physics/lammps/lammps-20141021-r1.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20141021-r1.ebuild,v 1.1 2014/10/28 16:28:46 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		src/VORONOI/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20141021.ebuild
+++ b/sci-physics/lammps/lammps-20141021.ebuild
@ -1,199 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20141021.ebuild,v 1.1 2014/10/24 21:04:00 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		src/VORONOI/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150105.ebuild
+++ b/sci-physics/lammps/lammps-20150105.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150105.ebuild,v 1.1 2015/01/07 17:34:34 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		src/VORONOI/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150106.ebuild
+++ b/sci-physics/lammps/lammps-20150106.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150106.ebuild,v 1.1 2015/01/07 17:34:34 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		src/VORONOI/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150110.ebuild
+++ b/sci-physics/lammps/lammps-20150110.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150110.ebuild,v 1.1 2015/01/13 14:24:21 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150119.ebuild
+++ b/sci-physics/lammps/lammps-20150119.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150119.ebuild,v 1.1 2015/01/20 13:06:52 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150121.ebuild
+++ b/sci-physics/lammps/lammps-20150121.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150121.ebuild,v 1.1 2015/01/22 16:46:18 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/sci-physics/lammps/lammps-20150130.ebuild
+++ b/sci-physics/lammps/lammps-20150130.ebuild
@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150130.ebuild,v 1.1 2015/02/03 17:21:39 nicolasbock Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic fortran-2 multilib
-
-convert_month() {
-	case $1 in
-		01) echo Jan
-			;;
-		02) echo Feb
-			;;
-		03) echo Mar
-			;;
-		04) echo Apr
-			;;
-		05) echo May
-			;;
-		06) echo Jun
-			;;
-		07) echo Jul
-			;;
-		08) echo Aug
-			;;
-		09) echo Sep
-			;;
-		10) echo Oct
-			;;
-		11) echo Nov
-			;;
-		12) echo Dec
-			;;
-		*)  echo unknown
-			;;
-	esac
-}
-
-MY_P=${PN}-$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2}
-
-DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
-HOMEPAGE="http://lammps.sandia.gov/"
-SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gzip lammps-memalign mpi static-libs"
-
-DEPEND="
-	mpi? (
-		virtual/blas
-		virtual/lapack
-		virtual/mpi
-	)
-	sci-libs/voro++
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-lmp_emake() {
-	local LAMMPS_INCLUDEFLAGS
-	LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')"
-	LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')"
-
-	# The lammps makefile uses CC to indicate the C++ compiler.
-	emake \
-		ARCHIVE=$(tc-getAR) \
-		CC=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		F90=$(usex mpi "mpif90" "$(tc-getFC)") \
-		LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \
-		CCFLAGS="${CXXFLAGS}" \
-		F90FLAGS="${FCFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		LMP_INC="${LAMMPS_INCLUDEFLAGS}" \
-		MPI_INC=$(usex mpi '' "-I../STUBS") \
-		MPI_PATH=$(usex mpi '' '-L../STUBS') \
-		MPI_LIB=$(usex mpi '' '-lmpi_stubs') \
-		user-atc_SYSLIB="$(usex mpi "$($(tc-getPKG_CONFIG) --libs blas) $($(tc-getPKG_CONFIG) --libs lapack)" '')"\
-		"$@"
-}
-
-src_prepare() {
-	# Fix inconsistent use of SHFLAGS.
-	sed -i \
-		-e 's:voronoi_SYSINC\s\+=.*$:voronoi_SYSINC = -I/usr/include/voro++:' \
-		-e 's:voronoi_SYSPATH\s\+=.*$:voronoi_SYSPATH =:' \
-		lib/voronoi/Makefile.lammps || die
-
-	# Fix missing .so name.
-	sed -i \
-		-e 's:SHLIBFLAGS\s\+=\s\+:SHLIBFLAGS = -Wl,-soname,liblammps.so.0 :' \
-		src/MAKE/Makefile.serial || die
-
-	# Fix makefile in tools.
-	sed -i \
-		-e 's:g++:$(CXX) $(CXXFLAGS):' \
-		-e 's:gcc:$(CC) $(CCFLAGS):' \
-		-e 's:ifort:$(FC) $(FCFLAGS):' \
-		tools/Makefile || die
-}
-
-src_compile() {
-	# Prepare compiler flags.
-	append-cxxflags -fPIC -I../../src
-	append-fflags -fPIC
-
-	# Compile stubs for serial version.
-	use mpi || lmp_emake -C src stubs
-
-	# Build packages
-	emake -C src yes-asphere
-	emake -C src yes-body
-	emake -C src yes-class2
-	emake -C src yes-colloid
-	emake -C src yes-dipole
-	emake -C src yes-fld
-	#emake -C src yes-gpu
-	emake -C src yes-granular
-	# Need OpenKIM external dependency.
-	#emake -C src yes-kim
-	# Need Kokkos external dependency.
-	#emake -C src yes-kokkos
-	emake -C src yes-kspace
-	emake -C src yes-manybody
-	emake -C src yes-mc
-	lmp_emake -C src yes-meam
-	lmp_emake -j1 -C lib/meam -f Makefile.gfortran
-	emake -C src yes-misc
-	emake -C src yes-molecule
-	#emake -C src yes-mpiio
-	emake -C src yes-opt
-	emake -C src yes-peri
-	emake -C src yes-poems
-	lmp_emake -C lib/poems -f Makefile.g++
-	emake -C src yes-reax
-	lmp_emake -j1 -C lib/reax -f Makefile.gfortran
-	emake -C src yes-replica
-	emake -C src yes-rigid
-	emake -C src yes-shock
-	emake -C src yes-snap
-	emake -C src yes-srd
-	emake -C src yes-voronoi
-	emake -C src yes-xtc
-
-	emake -C src yes-user-eff
-	emake -C src yes-user-fep
-	use mpi && emake -C src yes-user-lb
-	emake -C src yes-user-phonon
-	emake -C src yes-user-sph
-
-	if use mpi; then
-		emake -C src yes-user-atc
-		lmp_emake -C lib/atc -f Makefile.g++
-	fi
-
-	if use static-libs; then
-		# Build static library.
-		lmp_emake -C src makelib
-		lmp_emake -C src -f Makefile.lib serial
-	fi
-
-	# Build shared library.
-	lmp_emake -C src makeshlib
-	lmp_emake -C src -f Makefile.shlib serial
-
-	# Compile main executable.
-	lmp_emake -C src serial
-
-	# Compile tools.
-	emake -C tools binary2txt chain micelle2d data2xmovie
-}
-
-src_install() {
-	use static-libs && newlib.a src/liblammps_serial.a liblammps.a
-	newlib.so src/liblammps_serial.so liblammps.so.0.0.0
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so
-	dosym liblammps.so.0.0.0 /usr/$(get_libdir)/liblammps.so.0
-	newbin src/lmp_serial lmp
-	dobin tools/binary2txt
-	# Don't forget to add header files of optional packages as they are added
-	# to this ebuild. There may also be .mod files from Fortran based
-	# packages.
-	insinto "/usr/include/${PN}"
-	doins -r src/*.h lib/meam/*.mod
-
-	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
-	insinto "/${LAMMPS_POTENTIALS}"
-	doins potentials/*
-	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
-	doenvd 99lammps
-
-	if use examples; then
-		local LAMMPS_EXAMPLES="/usr/share/${PN}/examples"
-		insinto "${LAMMPS_EXAMPLES}"
-		doins -r examples/*
-	fi
-
-	dodoc README
-	if use doc; then
-		dodoc doc/Manual.pdf
-		dohtml -r doc/*
-	fi
-}
--- a/Show More
+++ b/Show More