Sync with portage [Mon Oct 27 11:55:59 MSK 2014].

2014-10-27 11:56:00 +03:00 · 2014-10-27 11:56:00 +03:00 · aef6da4168
commit aef6da4168
parent 902c1f17c0
72 changed files with 2106 additions and 426 deletions
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@ -1,6 +1,17 @@
 # ChangeLog for app-text/catdoc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.31 2014/09/13 17:07:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.33 2014/10/27 05:27:08 radhermit Exp $
+
+*catdoc-0.94.4-r1 (27 Oct 2014)
+
+  27 Oct 2014; Tim Harder <radhermit@gentoo.org> +catdoc-0.94.4-r1.ebuild,
+  metadata.xml:
+  Only install wordview.desktop when tk support is enabled (bug #522766), add
+  myself as maintainer.
+
+  27 Oct 2014; Tim Harder <radhermit@gentoo.org> -catdoc-0.94.2.ebuild,
+  -catdoc-0.94.2-r2.ebuild:
+  Remove old.

  13 Sep 2014; Agostino Sarubbo <ago@gentoo.org> catdoc-0.94.4.ebuild:
  Stable for x86, wrt bug #440942
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@ -5,27 +5,19 @@ AUX catdoc-0.94.2+autoconf-2.63.patch 479 SHA256 1b15644b2cf8ba2c09bdd5c463736c8
 AUX catdoc-0.94.2-flags.patch 1371 SHA256 bebe4055f8f26ccd33a1f26d5dced8ccbf6eed2a2be72e8649cec6372790b5d0 SHA512 a59d3387c599e483bbbf146ad19ed8374ceb2dfeb48381e4c0ef13242aeefec818ee59132ba615817c96305002ff98280973d9b0a3bab05aace4f8eddf916de8 WHIRLPOOL 273fdaab29649c88ce0b04f40d23d8d5b9fcfdc810af0a00b71ea282fb6db7f51988affc13912a9bf0cb230c40ccf9bda674f2358fe7a3d7378eac867f547f13
 AUX catdoc-0.94.4-desktop.patch 291 SHA256 ed1a2a776649544040c96a7e5376c607e47690c11d1c63a17c0c4c7c6ca9c37c SHA512 3bff7a4ffb52d3b2f8a986eec5d46ad499951bda697a1dd623bb07c3d0a13da71340f13cae5cf97c2bc39bdf80bf447f3691123fcb9d3139b45462de234491cc WHIRLPOOL 3a7452e6e5d1249cbaf49ccf3b1f3e26568b98dd2d0f96c6e1969910803f7fc2e88ec47cfad2f4b206b7ec50a8d1437d8abf05f7d900d0d923139182f2e9e7d4
 AUX catdoc-0.94.4-destdir.patch 662 SHA256 0f8e87468c7b3369654f14f11cee6d02394b275e59aa29ff2521881b3cf176e3 SHA512 748d48358261b3f5d52ce0b31dfab810696cbc04c08817f067d4b7a41076c7135bcf94ad16fc40ace6bde3e9eb9481f390335f17cfa90e3ab47ec136d19895e0 WHIRLPOOL 98664c8a30dd6d8a0885759a171c9a1df6f2f8d2ab7b9924b320f9fa79e3416eef53f92c6319516e8067079ff02b68dcb74121ce7382e6fd53e32a13117d0a5d
-DIST catdoc-0.94.2.tar.gz 146012 SHA256 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362 SHA512 d1772ba8977b7d99febd0a34e0660a169eea7c91c873baeab0e290c448a66cfacc3ad7d8927c4cae0106af4b41bac1e66492fec743a6406d70a7e0df6f418a56 WHIRLPOOL a076abfa9a4695188faa736643e8d843be55e6391d97edcc8e11fda81eb6f5d631c9048ad47c080b9be42c4c6df47ae1d0227857f4626c4c31fead4fbca5bd5b
 DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5
-EBUILD catdoc-0.94.2-r2.ebuild 1391 SHA256 8940b899fa8b2fca67c0aaff75da8eedd544ce33d08f681f75022ddfee340334 SHA512 e22643707e4d2327391fc005ddc40d61b8622ee8a7cafa12abf076fe98d528996ff5cca80817dfd99779b9fb2ad8a93b09f0aff941912848ec867b86f8ccfb3a WHIRLPOOL 6dce458ee89edff58c4932f63b4d61edee13cd76c587bcfa8d228763d3a4aa5910bbe3866c559737fd7084888db3a3d73ff56959213991ae23a2dd10afe979f8
-EBUILD catdoc-0.94.2.ebuild 872 SHA256 d26ea0a27ab63b11f9b1b08de2000a03ff822892a0934f905d922fd74c36ecbf SHA512 e6b5dfdc10517c1b843faedc8994bd09e2b8ac2e853c0511125f185e8bcc225f148031e964df00534891de7fe6131e67133ef2cf434ea285b74f61e09ac8176f WHIRLPOOL d1655176e0e51c1e64abfb88e2684bfb214a5f076799f4bff5a21f57ada889c9118e18d3a1295e5c71257ee52f0db2d359e5212e40284341d9032bbc193ccb42
+EBUILD catdoc-0.94.4-r1.ebuild 1628 SHA256 d60e387246a43a1266b1b97c0dcf2453809c430322456c97e93883a74b1027c0 SHA512 af30a5e180cc53f6da46bc495471e059dcdf54a10df36172dd7210ee04ca75c062f8bbfb00bc2a86f4f386c018ae681de534baad0fecee4092dfd49a68cf8294 WHIRLPOOL 1a12f91b04beccab624faba64dca4c454f2e2e328d91ef45ed9fbf20725226c62e945044bf1c22b800196da9f1cc8ef685925224b293466e840d637f70301393
 EBUILD catdoc-0.94.4.ebuild 1483 SHA256 197a3d9079f6c4445f6241af6f152d2abd3faff2a0c28273ade96eebbd96d96d SHA512 078afac500b237efa67326361dc1f34d1674149b7a4803b0d85420ad26cde79c06dfb7fb965596d30f2b7d13816a7679dd56c041474722f3c027816b4df63bf8 WHIRLPOOL b1e23a5502b7605e9602bc52b3e7559acdc648079ad1a05be338e6ad5bc14d57554f864fe97c706d9e80718d4b73eedac3558bb521977001a7b1ab6f31be5e11
-MISC ChangeLog 4038 SHA256 5bea82e07135764e3874fe0e32c5a728413c2ca97ff4de26fdf6deb8cd98ab18 SHA512 d3d621391f59cd257e5455a73db37d1e9964a3cefffd0a4ff1a6db036c8670c31dca41c36b54c94d94f2d37a7b1ff5f953c29923e3afcd52b6a2e1fd92ad2bd0 WHIRLPOOL f7ccbc8b3aff5e578edbf76508c16fdf0972f72dfdcd517d14e6264d325a4efeddf7b215f29c6848038024e9f4f595dc5998520b67aa04e0a45e679b868eba51
-MISC metadata.xml 156 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 SHA512 cecee760dd314c182191a282255f2415e479a8cc6cab9cb664e5b82d52b700a3444aa0d33b30a721a756e432819decc8c92588c769ea6fd33dabe9adc16d75c0 WHIRLPOOL 88a15092b616df72dd0ae91d89c80d852ad49ab9fee8a9688f3a1be59c365cc3dc77e90be68b5c4ec9cc1dc9885e06e723abc96830df4d0628df8c97f8b2a332
+MISC ChangeLog 4386 SHA256 17ee74637ac69a0a8000665c65b9418610e7f11a6a2576f87888fb50df81b4f1 SHA512 849119cf090d6eeacfa224547418f9615cec4abf4c3844c9f2b132c9b4851336dba05a7a17823d951305214c35c8030f3881890fb2c7fa670564739c9f7a1ebd WHIRLPOOL 439766fa53d0537e9dd30e7040eabb922cf279927ea0fb0e93871e02a30d2179c8e02a13583ad9444873aad230615b5f02b70ffa2163cf42aa884eef5b1fcddb
+MISC metadata.xml 250 SHA256 3f0b6796e85c204bfc04438608076e4a8c5d39100266c4af1fe6a03c2618b01c SHA512 16250c8dca25e4cc4436aaf2852b2da7e56aaa679ed7b97062d5251d63cb0abe7128bb755f3ffdfae0cf0618a3c1ff90fd83142f2e6184ad6dd2b4797a232a3f WHIRLPOOL dab7aa3e1a79209a852f1bae122f47d9718fffc3e2af4d4441df83a821f76adef72fac9ed1eb33132f5925909cb22967ecd6692df6628328b951448dda22aad2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUFHnAAAoJELp701BxlEWfX4AP/A9x8ikruAGsCjNapl2oPY/G
-fNMPGOjncom+EM9ONxtR27XwJfI5i5K/hb7Bh0FW7s3ZGQOpvk9Dm+CrxBmXh1SM
-djhnkMtV72XEUWlY8/DDnWg02oKo8AJrqK1adyeisXICQY40XPd1vPMyaf+XEZZI
-A5msyV2fvgR4+FXGIapwgXYotbzL1zGez/WWkPTi9tMXRyBDUjoUatIHhPvYzKnz
-44gVJpbkkuVqtw7giY0i5OCYU/nz4XJeLDj8yIFPzlBFTNf5RRNiZhZo+HhoGGUo
-HoOQHeC4uApI7cCgxh6ISCXSuEebiT/yPoZHvDvV8c9aPWWdw4zbA8H6qBWyEl9J
-PQqhKzn7hpxW75y8REsyYWycZSWmijPSQgXU2rqpwsiFDXkihrXeHn2Yi6Gc63MJ
-9herGN9iJFoNSFhNdSAhBA5jj+wKG34N1iEGj5aYoky09Yett8TN4BYje85MbNJs
-W8a9IGpM7vj2cqWFvJKZE1oft/xW75xqOYmy9n2VGUXTZUqgbHy2Y30hctt7Ie4x
-D8v6gTSPF4p2n8TMh9SLU7BxDmmvnj56fWjex8WUZMsu/HgOfbnrpZ1ek1pwe3gV
-26+R+ZsL+vTqXyPT9E+QnPAXDsFAIqgPCg2yYjd2torUeRlCl2FkOnmg5kAkZeDd
-S6ESQ/MjOmxERZdWC9Kl
-=kJdD
+iQEcBAEBCAAGBQJUTdevAAoJEEqz6FtPBkyjhqMIALfSsWnGhzHbH7JSUk0iPRwl
+pDZPLKG0vv0cG6g/7xOXTtG82mZnYgkLoXM7jx/05n6kh3mi+ZReMPaVmPpVbVnu
+15r+MvLjsVomG3qk2h5LEzv639xxGZIDZOafV9RyBgsNGbk9Ipwe7Fk86xgHDzTH
+feslkjshbCZBFz3nn4QiPLCgdfABTul7AfRWKXWybdkZdDVCg2bOQWUOLSmx9ZB9
+K1XzfBq33yh8i7517hkOrHRKwTwhdYWU9Y9snnDsuHbcAN7ugF7kAR7+pFgL7+Q2
+6ztB98RQunM81FNadd80gG/l40mGAsy00pw6T+raoV/9cmag+fKuS85q0y7A7vE=
+=JgDF
 -----END PGP SIGNATURE-----
--- a/app-text/catdoc/catdoc-0.94.2.ebuild
+++ b/app-text/catdoc/catdoc-0.94.2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2.ebuild,v 1.3 2008/08/17 17:21:31 maekke Exp $
-
-DESCRIPTION="A convertor for Microsoft Word, Excel and RTF Files to text"
-HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE="tk"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="tk? ( >=dev-lang/tk-8.1 )"
-
-DOCS="CODING.STD CREDITS NEWS README TODO"
-
-src_compile() {
-
-	local myconf="--with-install-root=${D}"
-
-	use tk \
-		&& myconf="${myconf} --with-wish=/usr/bin/wish" \
-		|| myconf="${myconf} --disable-wordview"
-
-	econf ${myconf} || die
-	emake LIB_DIR=/usr/share/catdoc || die
-
-}
-
-src_install() {
-
-	emake -j1 mandir=/usr/share/man/man1 install || die
-	dodoc ${DOCS}
-
-}
--- a/app-text/catdoc/catdoc-0.94.4-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
@ -1,28 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r2.ebuild,v 1.3 2010/09/15 11:22:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.4-r1.ebuild,v 1.1 2014/10/27 05:27:08 radhermit Exp $

-EAPI=3
+EAPI=5
 WANT_AUTOMAKE=none

 inherit autotools eutils

 DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
 HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"

-IUSE="tk"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"

 DEPEND="tk? ( >=dev-lang/tk-8.1 )"

 DOCS="CODING.STD CREDITS NEWS README TODO"

 src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch"
-	epatch "${FILESDIR}/${P}+autoconf-2.63.patch"
+	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# only install wordview.desktop when tk is enabled (bug #522766)
+	if ! use tk ; then
+		sed -i 's/ desktop//' Makefile.in || die
+	fi

 	# Fix for case-insensitive filesystems
 	echo ".PHONY: all install clean distclean dist" >> Makefile.in
@ -37,11 +44,11 @@ src_configure() {
 }

 src_compile() {
-	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc || die
+	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
 }

 src_install() {
-	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install || die
+	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install

 	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
 		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/metadata.xml
@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<herd>tex</herd>
 </pkgmetadata>
--- a/app-text/krop/ChangeLog
+++ b/app-text/krop/ChangeLog
@ -1,10 +1,13 @@
 # ChangeLog for app-text/krop
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/krop/ChangeLog,v 1.1 2014/10/10 15:45:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/krop/ChangeLog,v 1.2 2014/10/27 05:46:07 ssuominen Exp $
+
+  27 Oct 2014; Samuli Suominen <ssuominen@gentoo.org> krop-0.4.6.ebuild:
+  Remove obsolete python2_6 support in favour of python2_7, mimicing what's
+  being done in dev-python/python-poppler-qt4.

 *krop-0.4.6 (10 Oct 2014)

  10 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> +krop-0.4.6.ebuild,
  +metadata.xml:
  New package. Based on the ebuild by Armin Straub (upstream author).
-
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@ -2,25 +2,17 @@
 Hash: SHA256

 DIST krop-0.4.6.tar.gz 30046 SHA256 31931fa06fbe6ee393f7a5441ca987e2daf5029c5ca5fccfa35877e906932b84 SHA512 537a20fbda0fdd9cf4f013285082c465226cc95dc013f1b6b3d3edd625bc06a35528538bc96dc7d521c5477135fa0a42376f2e687a505e04edd16b24581034aa WHIRLPOOL 94f80ede3be58b34e4cd81d28d1cc9c970c162638ee2a615d2e804a1641c1e372865e850979d99ab72591817ad9115c9faaa537e5a3180c7727427800c32f45e
-EBUILD krop-0.4.6.ebuild 693 SHA256 ea01d52fd0cb40480217ab89ce7a7e080704e3b4f38632bfe2de36b3c6a300c1 SHA512 f35e937d263ff56f558818141b6787dd993d8c955247533c7aa632dae2c2ad9874bb41a0a0d57592df8fb89d96d65e3b7e8f5b9e28c8231888d294d6531631d0 WHIRLPOOL 2422785123775f884bcf57804f1d964d0a1b36943ce8a4bd644cb332ddcce1b72c822c8262829fdc84c1b05a8dc0e955d8ab28ee7aadb9ea882ff723d6c689ae
-MISC ChangeLog 394 SHA256 f4497557f16da9b52d634154bdb57bba335619c1b74cc63665d637e5c64f6407 SHA512 09c2dffc327ee2c2c76b6447ee0a6ec3a89fd0094064bffa5f7c606ae995b38480da9ba0dcce78c1dd6a606690dd148abc7584c0ba08ff0953f5bb4842824d14 WHIRLPOOL 60980ff23a25580d4c88664cbd6e3a3dbc5441ec1c85fb2b09b2d5f965de099d314b830dd091d97ab4c3437cc667f82996dc11e1a2f3aadfbaa15b65df13ac0e
+EBUILD krop-0.4.6.ebuild 687 SHA256 71e3fe90b3d9ed09328e0113fdf58599bdd7e439f1494ce350787bb50ce3cb50 SHA512 ec8b9fe4594185e1ef4ce1e80fa351e07975798e44b38c163cf76b3558075430e19bbdb210fcf9e490f3609ac3af0a7d684d81eb60da9c2349d9c490ee295b84 WHIRLPOOL dcc07e2ae9b0f5a92fcdf28ce2de3f08d6c8dd75339e38ef6bbdc3e9efd313152fd22e0f4477f575cb701e0a534ad93305d30a63422c50d41b19976637c73863
+MISC ChangeLog 590 SHA256 99f5505e3ad13eadf69ef8b1ab5957167175fef2f25ba620a77bfa0905aec3bc SHA512 19608dbbada2fe023e394fb64582c59fbfebf1f39a76f44ee1b275e82eca07b3b01a776eabe989c2d42280f86c07455fc907eea4f5d2c99be876c9bf24bd565b WHIRLPOOL d760cb3968bd9d44be7ea3276d678d2ce8bd66ba9f56b6d6623e102f310b10309ce4db49a4dad624febfc544499fd3b100195551fc3e71f1c9d9ca6daf38941a
 MISC metadata.xml 225 SHA256 3b5f838ba3b15ee19ba102b56b0642bc116b6d3410de498f3e711fdffca93dcc SHA512 3c2687f9d7866d9191a9bab3d33a26caf638ceb4202477e0e90bfa6ba0b4f90dd524db6c73c4e6d1f5136e278d0747156636d46ef8b8ae9a1ae0d2cbb0aaed16 WHIRLPOOL 8aacff78611686ed2f9465fb1d173675b5df8d56bf7cd1a74f4e1d3842ba760e91bee79c2417909647e11a9bd638428474da4760f95f2250271d5a80f8872bfb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2

-iQJ8BAEBCABmBQJUN/8FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
-NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvrqcQAJLC0S2phDLese5zpybMWs3g
-7Vng3lgW2/+rBCfmlBxBct5tZ9dOeYN1RNGLY4F5ti4uqbW/XNI65IDTTtLMbcS0
-r8YECf7Ac3YScZszB9L3OfuX1ODMIlHKb0NFxWxtD3Nwz/JADqlHbGnr+5cm2iWa
-nBdMKatcadanV/06siHQ/oBdh8ry6rFmxAAL9uZeuG+PXVlnNBiTbgN7ow5xQfTD
-BObCGl3At/cMTlNBamxomEAB/nwB4moMo3AD/morcQPHSHXLZcN2s4NZA4qLD7nw
-XNEdIjJMD+nDDXFcFEOai7sQD8gctvYTOrFFhjEhBc0l2rzEadq3DQl90+iCKwgA
-PT5ZqWcZAUksDVbmcQMEhw2k23zq1A7Wab2bgp4Uz2RhVaWUJJQDsKl8SlZ38vMh
-LhnhqWr/s7ndE9MM0ZZ4MnCm/EOh29ansEdgcl4ugJPgVudsdqudeZXDO4xbqgUZ
-i18aNxFrCFdo7klYrDYeqmZqjaDfsopiXBEuyRwUXNCz/nG/Tzr3kMTO0pAnUNJZ
-MJIYljxTN6XDE8ldeGyuC/vofakb0e3J/9Y2i0+FS4NaUZy3MqlStUG1m8wcXlDK
-vdFKiWjn2opfPmZ2qvPFocAJtkLl/bs2t4xvGTmzVGt41n9BDHvFzyaVYLKpzEeH
-+H4MpNrXWxXUeUaid1xp
-=NNlW
+iQEcBAEBCAAGBQJUTdwHAAoJEEdUh39IaPFNYUcH/1xThFmqgzAykV9ueBEJglk1
+AYU7saiw2WKRSamIQACB9xQvBrfAxXqPiv3WJtKoyNJCkF2wx7B6S7pXiRWBevi9
+YD84cnRBT3rwVBW/wgBG82D8ugZF1YB6eE7doS4eW3ImrAxXcL6/OiINxIwghcnn
+crSTndA4FG2FTlNiga8sdeXAKIiZTxE66PvXBntyWfd7dbpcewpxbNDQrGoXDOLS
+emH0VjtNjGw7AGS4cNN7SGHqDLnoeD+pNhTX4cJWeFm5UClXJM9pUU3CR+YhMRbP
+PlPXkeHIiToKyck//61C2YdFtUzj1VpjDzsxDDJm0FChDnBq/3/xGns3rsCPAio=
+=DqKL
 -----END PGP SIGNATURE-----
--- a/app-text/krop/krop-0.4.6.ebuild
+++ b/app-text/krop/krop-0.4.6.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/krop/krop-0.4.6.ebuild,v 1.1 2014/10/10 15:45:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/krop/krop-0.4.6.ebuild,v 1.2 2014/10/27 05:46:07 ssuominen Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )

 inherit eutils distutils-r1

--- a/app-text/restview/ChangeLog
+++ b/app-text/restview/ChangeLog
@ -0,0 +1,10 @@
+# ChangeLog for app-text/restview
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/restview/ChangeLog,v 1.1 2014/10/27 05:16:06 radhermit Exp $
+
+*restview-2.1.1 (27 Oct 2014)
+
+  27 Oct 2014; Tim Harder <radhermit@gentoo.org> +restview-2.1.1.ebuild,
+  +metadata.xml:
+  Initial import.
+
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST restview-2.1.1.tar.gz 24948 SHA256 1bf9e845078d05e7cda31bba6fed24a74ffe46f4f466b7b28c39650801724c1f SHA512 c74158d415940c3240b248ec83b1d9c79fa7e279b05a118f04fd5caf6273ef6ba4944a62cf8832e6e214b256962fc559abf42f28a636f4e3140dad9d88fe0cf0 WHIRLPOOL 5986fe67814806eff6c566cb8ba5cd426de984a74740ec50a16790f67029e0d28a33087ec0de1f016461bce725cfbe9921bf8bedef7ffc4603fb9dfcf567c765
+EBUILD restview-2.1.1.ebuild 754 SHA256 24268933433aa83fb5fbb1bdeaa8e2acd1481f222a0f6d1a66de5e41adf3d46e SHA512 fc40c64db40d0a7d35b3f6e64e1da656eb78e9856cb180cc9fab5073f0f7d218a79468c69e7121710f08c8720ff20d65bb047dad94254713232c4b14d9b2adbb WHIRLPOOL 4ec37ff0a9aef943ad2c6a7e452487b71eb865b6941142dfe3f561811980bf776f9f2bfb6b13b193f1e56284a4a7be31acae18db1c244deef0aa87619fcfc839
+MISC ChangeLog 350 SHA256 d72ff203eee947eba05b826b4b8129ba17d112d2c85327ad6c10e96f011572e0 SHA512 5315d00b5c6bd887ff77bfe86302f030015b71cf4613e3ea8c59c455a130c7ae844b175ad475febdce82536e772bac7e5dcac59fcc5fb83f41b49f48d460fb62 WHIRLPOOL 4b68ab537cbb539a9f0385fc2e99f0d52a32234222c2ee0bb2ece83a4ac6853989831e945534afafdae0459168c8c26563f6ff64c153b4a10b818e11b2e89aa8
+MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJUTdUcAAoJEEqz6FtPBkyj6K4IAIwnf1n+e1aLZQZrqYSVnsdC
+OVE+T9vdf2P2g2tFCH1P/tObMynAXupBSuwxURyker3hzniqqX9QjkiwwXym16eX
+6ZHAOceQ7U6J6Bm4heg0GLF9J1DQmYfUyTzgNF8ERUjlW+9Y1NspRQbAnaS/ATPG
+XbzrSGOs0LejB8SGo+lCmv8SuIAL81giRysh3eonOE6MkhznGm/mxwDcSEG5QzAj
+TnHXZlrFqN3JKIn2NdclUFE+z77iTrjhB5Ev7PYd4eFOVpVhNd+0CMp+sRBfBXAg
+NjMjoPlx5QWCn01i0srJt06CxpLcnqTGhb7oaDdJwN8qIGfMqVgfyuYhwRqmhEQ=
+=gI1p
+-----END PGP SIGNATURE-----
--- a/app-text/restview/metadata.xml
+++ b/app-text/restview/metadata.xml
@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
--- a/app-text/restview/restview-2.1.1.ebuild
+++ b/app-text/restview/restview-2.1.1.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/restview/restview-2.1.1.ebuild,v 1.1 2014/10/27 05:16:06 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
--- a/dev-db/lmdb/ChangeLog
+++ b/dev-db/lmdb/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-db/lmdb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/ChangeLog,v 1.11 2014/10/23 11:57:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/ChangeLog,v 1.12 2014/10/27 05:29:53 robbat2 Exp $
+
+  27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> lmdb-0.9.14.ebuild:
+  Copy keywords from openldap, because this code came from there.

 *lmdb-0.9.14 (23 Oct 2014)

--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@ -1,6 +1,3 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST lmdb-0.9.13.tar.gz 116425 SHA256 8b41a7f0f1263e607d91c16530c85567cd8bc383680dad6577847611e5266214 SHA512 9f81ab8319123c9662112210bddcf136d732af5c930fad9c88472ad6a0b8a7dbd066c8adbf64ee03a26a006fad57913ffee1cb17e6fe8d9f9ae1472760014d18 WHIRLPOOL dd7bb50f5b218bd3b97d45c90e2df3fa8a967731a75432cbaa38a8e2f6fa6e8b55edeed1999f6c385d848ff94e4ba2e53e7c2a30f4094c214606047fdb4d9294
 DIST lmdb-0.9.14.tar.gz 128170 SHA256 3b14dfe2134521cfebd98168b925f7327b9bd07c715640b79f3526e54f0ccb1f SHA512 d5bde616fb22631fe1689e2c77babfbf5098833cf313bce59a5daab1e450d2998a65f087929879e73e0a897b934ff40b8e340c79ec7b2b1c1fe7e1eea7da6267 WHIRLPOOL 0ebda52fd50d9d73bc079e6a613b2e2cdaa1032665d91e499dea9dcf1698095bfe84b03a931118baae8048c616e9bae7153972446502d368e7dc9ee33105e777
 DIST lmtp-0.9.11.tar.gz 114646 SHA256 c1235660f081c5bd6e14b9e4a84ef36c490de34ff09c015519c3f384fd47a0da SHA512 b34362a6c46e7cbb3e8fa7d2c9dc224609f5d661af03eaa0a84ce0ff500611f863bc41e3fdb139e20dfbffcc2a14a2c769eaf060994dffb60470a0bc5a73507a WHIRLPOOL 604c905efc643d977511bd465fbc0d75fbd053163d52d6c167acebc896baaaa9468bd1fdd1a397579ffcb38332eca383611b233cdf5a77e7c2f59cd6773a17cb
@ -8,23 +5,6 @@ DIST openldap-2.4.38.tgz 5506085 SHA256 88209a3599ec5d9354fc09bbe29b99db1ffa1b61
 EBUILD lmdb-0.9.10.ebuild 1275 SHA256 b143fe4dfa12ec4856cdb9915f4510e26ecee73b45d5c55f6761a5491f244918 SHA512 5e2388b69ae216a5fc2731b9e02001a76ff8ebcf01757eb6e81d33f3d3e92096c77649c5119c61d96d5821460b732422327617221b4e6467ae2564103a4f5d83 WHIRLPOOL 94153484d1a811099b293629693b9340ba6a7e2e73b9ea193a6a8682e9072cda2a81bf256c58451079413b43b7f15657870af4bfe93fdf4465f4491b191a6444
 EBUILD lmdb-0.9.11.ebuild 1311 SHA256 0f340a218e7a5c5dc755ce9fffdecda02ae6715f0d6d76910e7795f46da2e8f6 SHA512 551733cde57fa2afea47310c8cc40df2c81654ae9e696fdc3f9ca042d3b02bf4b8289b11c36eba74a8d06b9d514a1a3d67e10c2fe0fc7acd4073c6b08cb2ac9c WHIRLPOOL 7035409c99b73cf72d54a237001a276669ff89253243471fdba2250cb2c058dbb18ed54fc84a05c49a519e77e14b00152c671d047e457abe201805e07d6cffbb
 EBUILD lmdb-0.9.13.ebuild 1286 SHA256 4c177d2e056844dae7a32ae376113835115a33b447070619851e40898ba9c6b8 SHA512 c28bc67bb5f09c1bfafdb51afd9cfed8c70ed4d48b6664b769792565410bcb9e141a971906771c45f241f542327afcb8ed04a831b9086c058e82a835bd29c74f WHIRLPOOL cd940ab86fa931528e28dfd1b0f2492f6fcc8aeaaf6315d2fb16bb202269a4f5e3fdbdddb3125cc1e736a9bfd8ef78131f902f1894e3f87f705e38164fd8f0ed
-EBUILD lmdb-0.9.14.ebuild 1282 SHA256 7d27eb39aff289815d937336ea6c3e4e3ed908ff7703c63cd3d08078fb98d48f SHA512 ba363bc639f3434c103aa8cbc91eb0af86824cbb8a06e97674348b134f6da971f3e103aaecc735bae889261b47ce817256061ff0cea06f1edcebeb83d38f4127 WHIRLPOOL b1e5feb71c760090d473271ca2e741b7e9f88f1ac6670578a272ea611b216ae6cd633d0bca0cbffebd138ec0fb10f3b1c6e7c33db1e180372421b095295b4227
-MISC ChangeLog 1390 SHA256 3459a375311b289a157488876f0361f77008fc70257dc6a51bf0e4ee3b61ba4f SHA512 c3d108e14bd9cc085d35ac843a34ede26e4f03bb5daaaacc938f9e2b683a22856b8d2a5932c1074c1aa41772a40f4b306bb543d43d38db04ee7e575e2d396873 WHIRLPOOL 848b9bd852ccbc00d97d429a68e89f3e4fe1a43b3c9f667b3bfc3ddb46837d7c09ec6eb3a90a7d6d5756fceddd2fba692b4e841e5e1288a4960ebf6938dc51d1
+EBUILD lmdb-0.9.14.ebuild 1395 SHA256 8daca96f2b1c5e649c51b8adc8791953bebb54fdef8ad191fbe4bb2b553eed2d SHA512 f6ffdb1823f5b0082e0ea8c4d2bb4ffd8bacde5a7bc8bf6068fe3fb9a4cdbc3fbc04d70c0c41f48b4472a72d5c167c050adf0d809823d16f70b932c86224c72a WHIRLPOOL 41e7b6af0fc7665208712ae3a2da8ed6304efb0c6e8c2b0a22291e047544f96e32f029046886c0de1febe6a748e3936ca5a5b73d08b94fcb04c40083fbfe119e
+MISC ChangeLog 1533 SHA256 74e53016ca3915ffa20d7f39f04e449680dda9a40b33bb86da06c59e1e14870e SHA512 7159f331fc863d139e9ccc7128744af8d1dfdb470396185c1105af649b841e3c508d7bd3a8b912ae5e26421ab2336602d2b20ff4f80b5f9e219322041fc91910 WHIRLPOOL e3947188bcab72511a53c1734d61dc70964d6b6a312b48d4aec6252412670c1e9ca23c846e27cfb9eafe4c7df51128c3bd6b8b493625f47a6a1e135cfdacc818
 MISC metadata.xml 330 SHA256 4a710ecb699038a95fcdbd49933b058bae7c3e3300d91032dace41814f30b2a2 SHA512 ea31699c80edd682f3c1c1d5b818dce5b0c52a3542a22e00875059a258f226ef9508eaba5e5b0285d5efa861ca99981f74e905335c1ddc1498ff70cb0617f1d3 WHIRLPOOL 4588edcd0dc5269c165f156299cadf05a6ef92bf6bfdd2ec8e8d9bf7b27f7cabb10d32149df8da861ce17b6a75dfa0842fa3f48a349179a66ca6fdd18d224e3d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUSO0/AAoJEHfx8XVYajsfpBgP/0GVXAe6capUHNlRiQNLdXgu
-JkToMK4WCEKaUts2lq7mqyonfMykP2RsXbEU2ZRT6soDf353HlZYLj8GmXu6v+ec
-D7Q4Vwy2B3tl2v9qFJ2p1+ModZNr7JkShluTQkbLkwy4tBxnISKbSRmb4nDOtxww
-aywYMqHRL78VpP4z2SVWyb+WvrFtZDe+913Q4UwrZ417NzukSELGP1MPbkkdAOlA
-scDyTl4iQbC+CXCVCsaDavpRkhIHCGTlWeUMoWAH63EG8TyD7wAQN9T3wDQTZhWn
-GtKttAle+A4FMvjOD5Y4TqqMwuXbhTHAROwJw6aRaKPxDu8qbhLQJyCPKBZwEODi
-EcmqSFHJyvUktfxCIiUNL1mAtVzjxWuHMaLCRyfVSi87Dj/nukr0n6oARSsRz768
-yIv0UUupIhLyakOVRvdMer1RRrRr74UG/H+NfkF70XP7ypUT56cF8saPGCZ+wBVw
-G5YhQcY+sDfKlv7f/Ufivy3dL6+0QXl2DQMzkq5sSjMX37oX8G1yvu9kuqdBOKRk
-OvXSyLZpSRX6uBIfWAXgHVDr0ZtnnvpWtIYd7+VJAMmxVGAe7bf03ux2vaKcMvNc
-MZzoh6xxu3DVqY2gveDgfIFOx7E5JAzmy2YShzJ3TSisaEdeWAvidhcNZbISwIsC
-Ge2EuVxZQCM9SGTeL084
-=oxlA
-----END PGP SIGNATURE-----
--- a/dev-db/lmdb/lmdb-0.9.14.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.1 2014/10/23 11:57:40 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.14.ebuild,v 1.2 2014/10/27 05:29:53 robbat2 Exp $

 EAPI=5
 inherit toolchain-funcs
@ -12,7 +12,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/2f587ae081d076e3707360c5db086520c

 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"

 DEPEND=""
--- a/dev-java/nekohtml/ChangeLog
+++ b/dev-java/nekohtml/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-java/nekohtml
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.17 2014/10/18 14:31:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.18 2014/10/27 06:00:40 ercpe Exp $
+
+*nekohtml-1.9.18-r1 (27 Oct 2014)
+
+  27 Oct 2014; Johann Schmitz <ercpe@gentoo.org> +nekohtml-1.9.18-r1.ebuild:
+  Fixed broken doc installation (bug #526898)

  18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nekohtml-1.9.18.ebuild:
  Stable for ppc, wrt bug #518952
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@ -5,24 +5,19 @@ AUX nekohtml-0.9.5-xerces.patch 705 SHA256 32a7b1e79c9258905aab082237d10583fdf3e
 AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 SHA256 9d72da5a1b4281fb83514db33c471e70dbf91c1e0c9bcdbb9e41a5049ffa2bed SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937 WHIRLPOOL c15097c889a72e511d8c2e6306f35b54821a7c983a0d995aa4d11d739002f4a2bd5c1512eb1002014dd21fe80650181e3f8bfa4b1ce1370eacff39b1d22673bc
 DIST nekohtml-1.9.18.tar.gz 10471968 SHA256 fbb0dc6bdc07a1b4c4cc7ab32197f1aa431a506e33caf6cfb8130766c22475c0 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb WHIRLPOOL 8b7208ba84bdce1da6fdca17548f5c8b98a85a6d39f2695ddf776508c5b0dc3a724fbe994f64c37b62a718a36e41b8dfe28c73bbb7da7c0347485ebf8b811336
 DIST nekohtml-1.9.6.tar.gz 395521 SHA256 b0b40e4facee1ce2afae6402172835b8d86984117e8e9fe1e201afa6c29940a5 SHA512 dfc4e647d5e92a915f67d9095ba17b69a04e42e15eb10cdfd63f270ba157044e99ff9cca4f99105303d30cd6d9d484b0dcdd1ae5411c92f0523bed0c557fce3b WHIRLPOOL df151e335894c3fd8ada2fa2f9b4cd0f133453d9ac9403bf5abf29b0e950d3d934db9f383712f39b346b73d9b5f1c691cd5a578b3d85ee22655442ee07ec5bec
+EBUILD nekohtml-1.9.18-r1.ebuild 1350 SHA256 8bce549270211dba8f1eefa71e27a02adc8ec3a6ddc7deeab3d0c57a84196c66 SHA512 0e6a062a2e56b6922981b0ab69bd3d170a60c46e46960d83dde687ba13d34748f72b3cc33e107f9bf6a1fb49c7eb4518163e7ec24f23d69d313c8a7ca2b84b1d WHIRLPOOL b71f08ae35bad37f566174effc48dbe970bb1bf2c52c36d2738dc579db1c84d88fa58d616fa46140d0e116b885942d6bfed79ed65496277fcead16bd917efbda
 EBUILD nekohtml-1.9.18.ebuild 1344 SHA256 fccec41da89afbca8b66736e2e9539de9156ea600993dd18907835a08976571a SHA512 bfe34ce27f8670b92c1ed29472f3a26fa6e0170e4f6fdd60fcef152db5d5ab179ce87296c3605c5e360f2669c7a81c5842434e4951aadbe7b5b1cd652c0eb4f6 WHIRLPOOL c5276fad4e7cfacbfed2317981a6168edd4ce93f91a820447ae6c32ae9ff8ca6fc4e5512f4b9e1c2c46a9b484ee4dbb2a2b1ba28f663f4627bcff81bd1662330
 EBUILD nekohtml-1.9.6.ebuild 1182 SHA256 b4ac5e9c27931812fcf32e9c7f81842ec38cf7d39b8e69ebf5a5a4e73058c1e1 SHA512 18de18f1947fe1db8a65a8e0f15de294d6129385f55454b789ac3323f40f514b5588880acc5ad80819c52a739672c1a462352cb3676a914ee54096c8d2fe57e5 WHIRLPOOL 6e72808b8b640365a522ceded5eaab1e990b306dafec02c46ef1f4f9dc5671e8f052c26d92160998abb9cd1bafe40bb4b6fccbe6790da01a1317f970d46677e3
-MISC ChangeLog 2420 SHA256 88f52ac43f594c97ffedc216ffaed1f7109f0c3475f84e78cfca525d75db9722 SHA512 1f485bfc0e76db59074c3e65a6fca64c83667b978b83c2e3f802d34e7c414c19d6fafd79fd2e85e94c66986341b88e07bafa2edf098b86b159a5d7f1ee0c6cea WHIRLPOOL 6e84833de8368ef1448f9ef191b987551aff0d75caa6f1097b06925c5f34cf0d018a4299416087df28afe1a028e3d0f5b4888e607fef0303a36ad2b0b167b14c
+MISC ChangeLog 2581 SHA256 dc37b506df6dd4234ee6b8b02e418efd4c4a95c73e5ea2af0374db821ef245e2 SHA512 f8027761f1c095b0050e1fc8af73b98342c145db875d5e88d413896424ff2bbe2453fde77d7dd83f57c2f0b0979548f05066fd75d45c4ca46f6d7de608811b7b WHIRLPOOL 494babea10b7815c4f5e369acccde177e1221c7b35870783a09918beb1c48e2ef08138aad91479aaef35d52098d409c2de5170cf2a0dd2fa2efb0298283c02dd
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQIcBAEBCAAGBQJUQnnQAAoJELp701BxlEWfLiQP/jWUQPA02UekMJzl1JM3nfZj
-Gc+LYUqopPuVPaoh8PIqJGVBnwNeJSY1YVMZ+our8DbcEErQMwHJ63kipGkgs4/q
-2XJzhr0kC8U6/Wc2sGWSPDXmYGnKgP81PrYzy8pPQGTIxb297FsINcNQSQ9gzZb4
-jQy18Pkvw6ukRaXqMSGNsFdtgixGfv4nX+WLSRzlyN7JlJp7Jvh1WZ85x+lpKk4s
-GUW32XBXz033ow6t2+YIyUARF+jEwqqpQz8ZGJhvPTt7vIXVxvq0HASe7PwEpncB
-HqmYVHrxIj1ktelGOOPB3C2oBw0IgGehSiQTHhpntmNsOFjsNsO4xr3SoHcg1zde
-5zyrLTMm+1tX6GyzSvg5Z5ygHaKDfUu772AkU/b2sR2jMOc8wjxM6XgI/tQ56iq4
-mQ8asUZYfguLn2+4iYr87FxozXIm8CR54WL34CrZVr8fLPopHrBA9dJgYw5JaJt5
-wcRAkMGMUjA4hmti/T7aMb+JDIw2uNh5dfYzRfmRf24npg/UeacBG+0MeMHb3AGz
-YrC+lIPh2ExY0JeQeDmnESgvURcjvpuOTUN94ZOO6lVmoXV+3V3ZpJLjUHIbqun5
-Ymwpyul0RUNk0mJqwX15xZ9fwO/ITXeqs7Hg+/B9j6cIVCyz6TT08vRK+ZOMdX/Q
-6b/vU/y93zY6mU5Vxfhn
-=b802
+iQEcBAEBCAAGBQJUTd+NAAoJEKCEBkJ3xQHtYU8H/36vk3lqk6j9Dqu0QlxKv/z7
+iuLPoeFkmvcnsfcwrN4C9+7JPNX7SYhNGdn72w67RQBNHiVX/dXaloYXrj1qqiA3
+UWHS9w0/rgmeM9KSJBcWDfp7WFjdAg9dlGg/bBd+dfeLfDhz9PppD0hew9cwoa01
+sz8Omug0AbgyGAvUIgBM6kpxvhdNGSWcFyv0vR/hq+elxF34mAsbX7UkwFgYafdw
+CxHnwMjI+iJzz0yxc8PySSudSsfv6cUa9+0TNpCM0foF/X+GX0+FnkAL5GHSPmGD
+uKQaHpUdRnZGdzJicnQ9zrv2eiIHIDX0I6pkXiy1y9E0p+/JWGD7Sv7dQWzaUc8=
+=G9dW
 -----END PGP SIGNATURE-----
--- a/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
+++ b/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild,v 1.1 2014/10/27 06:00:40 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces"
+
+HOMEPAGE="http://nekohtml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMON_DEP=">=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit,xerces-2"
+
+# Do not generate docs, use bundled.
+EANT_DOC_TARGET=""
+
+java_prepare() {
+	find . -iname '*.jar' -delete || die
+	epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	if use doc; then
+		java-pkg_dojavadoc doc/javadoc
+		java-pkg_dohtml -r doc/*
+	fi
+
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples src/sample
+}
--- a/dev-python/python-poppler-qt4/ChangeLog
+++ b/dev-python/python-poppler-qt4/ChangeLog
@ -1,6 +1,18 @@
 # ChangeLog for dev-python/python-poppler-qt4
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/ChangeLog,v 1.6 2013/03/17 17:14:40 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/ChangeLog,v 1.8 2014/10/27 06:01:37 ssuominen Exp $
+
+  27 Oct 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -python-poppler-qt4-0.16.3-r1.ebuild, -python-poppler-qt4-0.16.3.ebuild:
+  old
+
+*python-poppler-qt4-0.18.1 (27 Oct 2014)
+
+  27 Oct 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch,
+  +python-poppler-qt4-0.18.1.ebuild:
+  Version bump; with a patch for new PyQt4 build system; with Python 3.x
+  support.

 *python-poppler-qt4-0.16.3-r1 (17 Mar 2013)

--- a/dev-python/python-poppler-qt4/Manifest
+++ b/dev-python/python-poppler-qt4/Manifest
@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-DIST python-poppler-qt4-0.16.3.tar.gz 15345 SHA256 52232383b273038027a881db7e46879b73cccf690d393f677e7496e19cfb59aa SHA512 b0324a029e2245fdaf913fc9073c88b3d1c0043421fcc55ce0d4523497f26362c7a734a2d88b1fed86221f5abced15a4e1374c0db8b02c418d33c272ba91bb7c WHIRLPOOL 071f12db5e90f5877a12505659a99c89e1f59ee3142dc06883e4de08598fae729cbe0b011668665968e05c902ef25d3549608a4216da0f59e9030c880b059605
-EBUILD python-poppler-qt4-0.16.3-r1.ebuild 668 SHA256 3dfc65d0f20954799af12fed5420002ed7ad873b0a61a1c7d72875e23669f23b SHA512 2ac5cb14a69f06bfb9f720a8dba10f7b3e18d7b82806550e454d58c3f4f09d204f1f9f7900567054f3dfcd7b650eae8c4c3c2726a2965b2ffd5acc7b9d9e20ae WHIRLPOOL 05c9a356e72eaaaf232e78a5d925df9a5bc18fb7c8b319fc7cf4ca82ea27dccd3dea8f97db4582ea3bcb7af7634887ab7c7eb70248318627b45bfeded87b41ab
-EBUILD python-poppler-qt4-0.16.3.ebuild 679 SHA256 0658dd9babfdf0780396d9a2fbac12008aa73602741945eabe40feb9fc945ba8 SHA512 91a618e2a1ad9d704e465b5165baa0cedd415ae2c7858168538977f834f2957ee7e7f9caa066d9e06c74cf46c2c13652f9a94d0053a8ef9f3d47221981b2887c WHIRLPOOL f3d38d118ab30d0a14b58e6f4211b31bf779a64aac0d275e1b94573d5fa9477feb29447b82f0791dcdc07e8cff93ba471a98e5a8dbb0d68fbd6c4607ba8d9ea6
-MISC ChangeLog 1272 SHA256 ec373b59e27f05a126587ca363987bbbf659b430edea83aa969ef9e9279d1dd6 SHA512 a1cf438e49a66f09e119b77f0b8ffb01ad8f1c3587f54f81bc26006279a60478804f199972506061181c36bda97a61b0741c8c898931ad04ec3abbb21a50aa88 WHIRLPOOL 5a79f52b48b84712ebb5cb56517d49ffc101e3e4036906ae9e8dea707e9cf235feebd3241e56db24c4064e49a8366c205b10b17b7e842c13cbbd90c28e8a9704
+AUX python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch 6856 SHA256 4014e124bf08f6b3a74a6dcd03d69639cc28318dc778687d1f98852f522f87ac SHA512 b9644b8763f250ca058681a0277741bc2089e939831b389df28fbb5435291d93d79bef1fce8a743c43b81a58cafdd6f72673d112658d76740f4943a69c16f1cd WHIRLPOOL c36e7d1c4c54d2340a61e8d4506dd449b9f7bcc6dc7219815f08ceaef69b17c9a807f8b2002a2f4a45599310f6becddf21f244b7db885d91f47c2e5814e3bac6
+DIST python-poppler-qt4-0.18.1.tar.gz 15555 SHA256 c6903c4b6ab71730ae2a1da9fb95830a83da82185b5ef6b8184b16c0cae908ba SHA512 f1451e3b60cb51eb3c07d906144ecff2a2737b68018645390441b2eb4942450e2e836a3e20d926c82a7536ae7b3963f7a869a5d7a3274befde7d01144b116a44 WHIRLPOOL 2ef090817a78baa1b55997baf4e6eb61aa21e6d064826bfc14db27e145a477d3b3ff28b6f10076cade979e9f1634cfbe43e3bee51d841d4ea4fbd72cddcd6ce4
+EBUILD python-poppler-qt4-0.18.1.ebuild 805 SHA256 480c94b3f4bed85149cbadf1cd94d1541d84f23cc19287859350e2dc1ae4c8ef SHA512 6bd0fd3cb501049731b9022358d5dceb7b2aba8c42bce0a64c54cea5be97a5c9251e7846d740792652cddf31f373f10346c7c6d1b0e8a4a65fff937862f78b9e WHIRLPOOL 27dd7fe5886d718f03174460b62b47e87a2612cb3e34c6226ba7f238de40969f7d9af48dcd71bf958d3e259be2a4a8c5b6793050aab026ad73cbcb58869802e3
+MISC ChangeLog 1697 SHA256 15e652aff55a2424340c7e39fc4ca22c51ea7fe6d856b6710236a71021991c11 SHA512 fc97370ab7fd1ce0d92c17ffeb1474f36e23c758a447a7684f4aeec6847f7113dac6edcb9cdceb41791c0ef24240612744fcc051e8adae2f8700529b37707ab4 WHIRLPOOL 3cb9e6bc0480744881f95addabc0efe9f9561018ca66091dec40eaf6c63294059e10214d492461cab11dd6995608bf84ab21a007b9d7e4c4e9100374f07e5918
 MISC metadata.xml 346 SHA256 6c845e856bbe0fd3941412cb1c2458ff42306d2314a27f761893021de9dfa372 SHA512 c6476887f46d65311582c7786cc7a879aad8f389e86ac68a742c0defb3c689af9d6a7a69d5664ad442475e259ec7972caa2322dc337660d561bad86c79250cfe WHIRLPOOL 8bdfa5c9d5f74610cce38bd97612a5adc38b995a6c965cc50009d3ebe0d9b8661fd5ffd5f5b8d2b7916dc7a17fb55a7266f74001d633191273e109fb3f1ef69e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2

-iF4EAREIAAYFAlFF+gEACgkQC77qH+pIQ6QgZwEArCqSpRsuzF7KG75ZLgpf6Bl4
-k3T1GBveY/kmxLuEvoAA/1lHF/m1zvIr4rIz3GGtF9s/NFWwyIQlgHy/chZyx0bZ
-=uDDP
+iQEcBAEBCAAGBQJUTd+pAAoJEEdUh39IaPFNkS4H/0BYnL0VpmTzpyLklsyajHqK
+ccmnf49jmsr6+E0JBpyVLDKWEBILJ2qS2hakxSOnehdcIOyunCNIKwDy7v/yNH8r
+M+z1ShRkHHC5nZiqtMY6ZRHnUNxkIt1wVbigGSTW+BzNANiACskfdVWjJlwlehZM
+iZInIDn90hzuPcFzVJdme7FCglDDD95aJAR6sY0qqCCsvBHNYPVRskbISCUzHOxh
+MO+nQZ8VfXKgTQIBAHzYvpvBEKRlCnsv/fi4A/WCHTXTycLquC5ot+Et+HP2qW8B
+RVb3f4q6hSBJthpL3TyGMxdHRC+2u4agj8LkCKVR53hNiKzgOlKWn6SHI7n59QA=
+=bLdw
 -----END PGP SIGNATURE-----
--- a/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch
+++ b/dev-python/python-poppler-qt4/files/python-poppler-qt4-0.18.1-update_for_new_PyQt4_build.patch
@ -0,0 +1,185 @@
+From 099924f9b359b82696e3aa9f159616ff09d2da97 Mon Sep 17 00:00:00 2001
+From: Philip Lorenz <philip@bithub.de>
+Date: Tue, 8 Jul 2014 18:23:49 +0200
+Subject: [PATCH 3/3] Support PyQt's "new" build system
+
+PyQt4 ships with a configure.py and configure-ng.py script for
+configuration. The former produced the "pyqtconfig" module which was
+used to determine various flags required for compilation of
+python-poppler-qt4. The configure.py script has been causing some issues
+([1]) and upstream suggests to use configure-ng.py instead as the old
+configuration script is deprecated ([2]).
+
+This patch adapts setup.py to work without the "pyqtconfig" module by
+looking up the required config values via the new mechanisms endorsed by
+upstream. Additionally, it adds the --qt-include-dir, --pyqt-sip-dir,
+--pyqt-sip-flags command line arguments to the "build_ext" command which
+can be used to set those values manually.
+
+[1] http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034344.html
+[2] http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034354.html
+---
+ setup.py | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 94 insertions(+), 20 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 56f3e3f..c43c5e4 100644
+--- a/setup.py
+++ b/setup.py
+@@ -56,14 +56,6 @@ except ImportError:
+     pass
+ ### end
+ 
+-import PyQt4.pyqtconfig
+-config = PyQt4.pyqtconfig.Configuration()
+-
+-pyqt_sip_dir = config.pyqt_sip_dir
+-pyqt_sip_flags = config.pyqt_sip_flags
+-qt_inc_dir = config.qt_inc_dir
+-
+-
+ def pkg_config(package, attrs=None, include_only=False):
+     """parse the output of pkg-config for a package.
+     
+@@ -107,17 +99,8 @@ def pkg_config_version(package):
+         return tuple(map(int, re.findall(r'\d+', output)))
+     except OSError:
+         sys.stderr.write("Can't determine version of %s\n" % package)
+-        
+-
+-ext_args = {
+-    'include_dirs': [
+-        qt_inc_dir,
+-        os.path.join(qt_inc_dir, 'QtCore'),
+-        os.path.join(qt_inc_dir, 'QtGui'),
+-        os.path.join(qt_inc_dir, 'QtXml'),
+-    ],
+-}
+ 
+ext_args = {}
+ pkg_config('poppler-qt4', ext_args)
+ 
+ if 'libraries' not in ext_args:
+@@ -131,17 +114,108 @@ class build_ext(build_ext_base):
+     
+     user_options = build_ext_base.user_options + [
+         ('poppler-version=', None, "version of the poppler library"),
+        ('qmake-bin=', None, "Path to qmake binary"),
+        ('qt-include-dir=', None, "Path to Qt headers"),
+        ('pyqt-sip-dir=', None, "Path to PyQt's SIP files"),
+        ('pyqt-sip-flags=', None, "SIP flags used to generate PyQt bindings")
+     ]
+     
+     def initialize_options (self):
+         build_ext_base.initialize_options(self)
+         self.poppler_version = None
+ 
+        self.qmake_bin = 'qmake'
+
+        self.qt_include_dir = None
+        self.pyqt_sip_dir = None
+        self.pyqt_sip_flags = None
+
+     def finalize_options (self):
+         build_ext_base.finalize_options(self)
+
+        if not self.qt_include_dir:
+            self.qt_include_dir = self.__find_qt_include_dir()
+
+        if not self.pyqt_sip_dir:
+            self.pyqt_sip_dir = self.__find_pyqt_sip_dir()
+
+        if not self.pyqt_sip_flags:
+            self.pyqt_sip_flags = self.__find_pyqt_sip_flags()
+
+        if not self.qt_include_dir:
+            raise SystemExit('Could not find Qt4 headers. '
+                             'Please specify via --qt-include-dir=')
+
+        if not self.pyqt_sip_dir:
+            raise SystemExit('Could not find PyQt SIP files. '
+                             'Please specify containing directory via '
+                             '--pyqt-sip-dir=')
+
+        if not self.pyqt_sip_flags:
+            raise SystemExit('Could not find PyQt SIP flags. '
+                             'Please specify via --pyqt-sip-flags=')
+
+        self.include_dirs += (self.qt_include_dir,
+                              os.path.join(self.qt_include_dir, 'QtCore'),
+                              os.path.join(self.qt_include_dir, 'QtGui'),
+                              os.path.join(self.qt_include_dir, 'QtXml'))
+
+         if self.poppler_version is not None:
+             self.poppler_version = tuple(map(int, re.findall(r'\d+', self.poppler_version)))
+ 
+    def __find_qt_include_dir(self):
+        if self.pyqtconfig:
+            return self.pyqtconfig.qt_inc_dir
+
+        try:
+            qt_version = subprocess.check_output([self.qmake_bin,
+                                                  '-query',
+                                                  'QT_VERSION'])
+            qt_version = qt_version.strip().decode("ascii")
+        except (OSError, subprocess.CalledProcessError) as e:
+            raise SystemExit('Failed to determine Qt version (%s).' % e)
+
+        if not qt_version.startswith("4."):
+            raise SystemExit('Unsupported Qt version (%s). '
+                             'Try specifying the path to qmake manually via '
+                             '--qmake-bin=' % qt_version)
+
+        try:
+            result =  subprocess.check_output([self.qmake_bin,
+                                               '-query',
+                                               'QT_INSTALL_HEADERS'])
+            return result.strip().decode(sys.getfilesystemencoding())
+        except (OSError, subprocess.CalledProcessError) as e:
+            raise SystemExit('Failed to determine location of Qt headers (%s).' % e)
+
+    def __find_pyqt_sip_dir(self):
+        if self.pyqtconfig:
+            return self.pyqtconfig.pyqt_sip_dir
+
+        import sipconfig
+
+        return os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4')
+
+    def __find_pyqt_sip_flags(self):
+        if self.pyqtconfig:
+            return self.pyqtconfig.pyqt_sip_flags
+
+        from PyQt4 import QtCore
+
+        return QtCore.PYQT_CONFIGURATION.get('sip_flags', '')
+
+    @property
+    def pyqtconfig(self):
+        if not hasattr(self, '_pyqtconfig'):
+            try:
+                from PyQt4 import pyqtconfig
+
+                self._pyqtconfig = pyqtconfig.Configuration()
+            except ImportError:
+                self._pyqtconfig = None
+
+        return self._pyqtconfig
+
+     def _sip_compile(self, sip_bin, source, sbf):
+         
+         # Disable features if older poppler-qt4 version is found.
+@@ -176,8 +250,8 @@ class build_ext(build_ext_base):
+         cmd += [
+             "-c", self.build_temp,
+             "-b", sbf,
+-            "-I", pyqt_sip_dir]             # find the PyQt4 stuff
+-        cmd += shlex.split(pyqt_sip_flags)  # use same SIP flags as for PyQt4
+            "-I", self.pyqt_sip_dir]             # find the PyQt4 stuff
+        cmd += shlex.split(self.pyqt_sip_flags)  # use same SIP flags as for PyQt4
+         cmd.append(source)
+         self.spawn(cmd)
+ 
+-- 
+2.0.2
+
--- a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild
+++ b/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild,v 1.1 2012/11/19 14:49:40 ssuominen Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.* *-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="A python binding for libpoppler-qt4"
-HOMEPAGE="http://code.google.com/p/python-poppler-qt4/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[qt4]
-	dev-python/PyQt4
-	>=dev-python/sip-4.9.1"
-DEPEND="${RDEPEND}"
--- a/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild
+++ b/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild,v 1.1 2013/03/17 17:14:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild,v 1.1 2014/10/27 05:59:08 ssuominen Exp $

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

-inherit distutils-r1
+inherit distutils-r1 eutils

 DESCRIPTION="A python binding for libpoppler-qt4"
 HOMEPAGE="http://code.google.com/p/python-poppler-qt4/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+SRC_URI="http://github.com/wbsoft/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
@ -20,3 +20,8 @@ RDEPEND="app-text/poppler:=[qt4]
 	dev-python/PyQt4[${PYTHON_USEDEP}]
 	>=dev-python/sip-4.9.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-update_for_new_PyQt4_build.patch
+	distutils-r1_src_prepare
+}
--- a/dev-python/qrcode/ChangeLog
+++ b/dev-python/qrcode/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-python/qrcode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qrcode/ChangeLog,v 1.5 2014/06/21 22:55:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qrcode/ChangeLog,v 1.6 2014/10/27 07:24:52 idella4 Exp $
+
+*qrcode-5.1 (27 Oct 2014)
+
+  27 Oct 2014; Ian Delaney <idella4@gentoo.org> +qrcode-5.1.ebuild:
+  bump; updrade deps & install phase, retrict test phase for now due to failures

 *qrcode-5.0.1 (21 Jun 2014)

--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@ -2,13 +2,15 @@
 Hash: SHA256

 DIST qrcode-5.0.1.tar.gz 20546 SHA256 5ce16060c2c4f9fc9455bc82766c227e55ee9b43bfb9f17bfe3f1f5ba5eecf3c SHA512 a57ca9d4b382637a8b3cc3a20a03d291f22675e9d851a739f01c610465f1977efd748661330557e9017db2d7b9b501c278668da5eeef93fb8e503e71921bb4c5 WHIRLPOOL d4e55f2536a917bd5f040f2cb66cabe2a529e5a9266fd09d0f413ba0a3137dffc89afd4d32ac4db2f8bbf6db17a1ecccf6bf8ba08d7a188b924daa778491c727
+DIST qrcode-5.1.tar.gz 22259 SHA256 33bdee5e834fc99eb538e1dad198a3a5b70d0a88845629cacf4c592be1ce7f6a SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3 WHIRLPOOL df72f727af2a1342adf61fcde25645cd25f5cfafd454ae2d13567a3c144949738f924082fe78dbb529c9b3757bbf1474e5f4f48fc95538d5d1cdcfdc6452637d
 EBUILD qrcode-5.0.1.ebuild 826 SHA256 361a7b3e0fccb7b346386bfbd6edf038f894ec79ffe061f6828ab34056e6428b SHA512 e8c3b9431ce1e52f038ee45976d2e3ea5e07ec6085e0a32d552542bcbecbaaa9108b6011149b2f1c8fed0f743ede2ee8b273bd3bf6e59ce3f295fd8af44821da WHIRLPOOL f0a506890b5d263d9f6f6fa782088ed087a77cd752cadfc15802a3bc39d57def29aa97472c1e25c43b29c171b1efb503582a3497383bbe54f13d9b534d325182
-MISC ChangeLog 941 SHA256 e1d38835a5da5b59983f896cc2353d319bdb9bd470acf2282dbb6a0e2e2f2592 SHA512 48e40479738cc88f4746da9616da4238c8c53690208fc6c1ae1bc6fc5b2d1674cbab9dd9407297238b27653bcc186a4e3299e7787843bfeda4f79bd13182305b WHIRLPOOL 515037e836542e763a2462986fd30e89b5dcf6bdd6e69d64416075dc76b51218dc97571b375369a91efa00cb0bc72f3ab002b677f57643410a6d1e3caf41571d
+EBUILD qrcode-5.1.ebuild 1071 SHA256 1a00962ae05922bd43026be9e69f106b61ebb4a3ca734f16d8fd73b14d7e061f SHA512 05df5c3fe666eb21070fd0332ee8233a4e254878ca66b6c0837abcf5128b09f82c37c15a087830beaf2891545756836b384b467d75b707a6ca519ddbb57c3f62 WHIRLPOOL a2b3e146414ba078c62f671b4347f20830270a330ec210207a671b636162203e5099fc8ae06cfb565cdd897ab0c5f10940e69c20e386b612156dc0dcfb94b17c
+MISC ChangeLog 1118 SHA256 57a3c1a6dbb2b73b8e38f343c5fa67385fb9e95f20b7af0b66248f8bcc9e0fff SHA512 d6b0ecd68fdc7f710950e0e64210224158a2367d25b502b203340cf4cbbd7121542da272698e5bfd3eff94710187af11bfc172a82bf51f9a009434da6abe0124 WHIRLPOOL 8534d6fa99bc9b6a476b39918470c942444b13ecea9400e968dba2132c6b091d1da906856e8b9bffa9a01c26f5d4a6e25ee40070fd736f678e45830219515fba
 MISC metadata.xml 229 SHA256 3d8e2c4caf17e39218a2435ccfa5dd5be83ca1bc5cc4d6f8e577c4033f554df8 SHA512 8632af65aeab375ecdf483c4714e2f48b0d31e9ab7fc567da87aa3d98d455f2f7fcd85c2b110ab36184b18203e1459463e32407f6c6e298148ce2d75ea891b28 WHIRLPOOL 86f554b8a25c434b041d7b1389817f47c55fb0af3b269dd7c22eaa2b146d4999c8ce378f2ca8e5c8fef3cad6ece55054d123b76e5074f4e49a66f9e543993135
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iF4EAREIAAYFAlOmDX0ACgkQC77qH+pIQ6QiNwD/UkTtF12zdBNJ9ilC/EmrcK5B
-29NMyvBDXqi+iHuSId8A/iDBusA2TwlLwiQhxLfnIEtScnx3/1TesbqnrZFqlIs3
-=YVGE
+iEYEAREIAAYFAlRN81UACgkQso7CE7gHKw1XMACgs/GgimIo3X4f8+BeHc+lakys
+p+AAoIpwJ3zf1fECFl91bi8NzPkGbHyd
+=uLr9
 -----END PGP SIGNATURE-----
--- a/dev-python/qrcode/qrcode-5.1.ebuild
+++ b/dev-python/qrcode/qrcode-5.1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qrcode/qrcode-5.1.ebuild,v 1.1 2014/10/27 07:24:52 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.python.org/pypi/qrcode"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests pass run from source, but a few fail run from the ebuild. For now,
+# RESTRICT=test
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python{2_7) )"
+
+python_test() {
+	"${PYTHON}" -m unittest dicover || die "Testing failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
--- a/dev-ruby/rack-attack/ChangeLog
+++ b/dev-ruby/rack-attack/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rack-attack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/ChangeLog,v 1.3 2014/09/14 01:48:18 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/ChangeLog,v 1.4 2014/10/27 07:06:31 graaff Exp $
+
+*rack-attack-4.2.0 (27 Oct 2014)
+
+  27 Oct 2014; Hans de Graaff <graaff@gentoo.org> +rack-attack-4.2.0.ebuild:
+  Version bump.

 *rack-attack-4.1.1 (14 Sep 2014)

--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rack-attack-2.3.0.gem 13312 SHA256 f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c SHA512 4add5fdf4fbc92a88a7448248df72e755fde7e3a5222ee2df788eb5f2e86689ed2ba925b420ee1873997c11c13ce4f6d5bf1e405a9c42f025ecc731b26490d38 WHIRLPOOL 3ded4c62c5f0058e1f8443c2dd574734e28dfe1021efdcca76afa1dcfdd219b50f975261d4987dafc996771990944c5ad63e59303ffaa3b290c967f1fa5eff7b
 DIST rack-attack-4.1.0.gem 14848 SHA256 6c28ec2cb3e234e75ffe9306e7b75a86c22b9861c03c3ecbb12d38b6f630f5ae SHA512 3e23e48b1c39a9e84c9ba4d10ab71d570690bf37901a3cdf6f46a6df54de5005490523df7f33818f723ab25dcfb1e935e7209d061d66f0f5c48cbdfdbd7dc220 WHIRLPOOL ea25c308a42be5c39983d9507d63301e76a7ff77653d61f1bf97ed813ab5fbc74b644e47660db999898ee072ba2f781b07da3748650018faebec9ca9d9635030
 DIST rack-attack-4.1.1.gem 14848 SHA256 b713eaa3d3377c227c2637398a84978c0ab4021b4b5b2c4dbdbc2b68d448814c SHA512 06bf682b5fbbe3996197d14337963abcf6cfb7f8f1edbcf40f65650508655c92f43ba97189d22394b821acc4fe7cd6b27f70859020632ec6c9c5da04ac8cc807 WHIRLPOOL 8d37a9619f21a29459a7bd745ea0a783a01780da4df766e9657007c1459fcf02a05123296d26ed9da0ffdd3371f1245840b6dd9347794b76bf0ae00d9180e416
+DIST rack-attack-4.2.0.gem 15360 SHA256 f915f0811e32455729b58a1f4359a31a169f6a465ac46e163e573eb4cbca918e SHA512 27a46987d864886ba5f2a2724fb36293f3d7bc6721d1663defaa924bc6e3e17dd3f74b260eb74e0f6ca84a331dfeaea6431d0589b2cb410a51385d96c27cfca9 WHIRLPOOL 136fed76ce46865294f1f0952c564a5799728855166b1f1ef5d96fbea6dc1fa0f76bd3e33e6c3a9c3aa1b3197f00deca09ca153aeb4b1c03764c174eb1905677
 EBUILD rack-attack-2.3.0.ebuild 705 SHA256 088a3c0b8c84e2fec569c039260ef32f9c9ff6b344e576cdf78f0d209a9f94f1 SHA512 bf81d578a73c9ca12d43dfd4835b1bfbe2eadfdc5025f9c1207271c885f8656356a1fab5869255c2be741b4cefd23c2ff0418316032eff7950aae8b56812771b WHIRLPOOL 4ae54227a4fad6002efb1e09dbbb8bab0d391684740212513116fcc4c7439e517cc2473013240050c48c50a19127cefdcee82d260558db25cfe72dc6be04e9cf
 EBUILD rack-attack-4.1.0.ebuild 870 SHA256 b42c4aac94582d8e97e392545191f48b2451f6dcdb09deb61187b60c9a81f82a SHA512 84c6153efc16770e41c7630f672e2b39fba34a7e5e61215ea1627f415436d60974476a755782f6ebed3628a036d8c17da2a6e73ea9a1345fe2d13ea91cb8ca96 WHIRLPOOL a358f85b7fb013049b110b9bbb8635bbdabd5a0aa7cba6046e7373879a280430fb8b6baf48f242ca9a2ca1a8b30e895fc7e435a16e494fb88534f288b33edde9
 EBUILD rack-attack-4.1.1.ebuild 869 SHA256 d7fc67c8dbc499ce8b620232a6302e4fa5f62dbe219f512f0a626d0918f8501c SHA512 7703cda6ed0037f0758c8c4a5904ff58e54ed52fb512ac2273d0623f5cc7368d81a5412a144d87786c7afa3841b2f33776b0c5439d2979348af69c79eb6569d6 WHIRLPOOL a2bf76d7d358ab956eda7a46e38346321d9c680064208bba44b076435139d2e6160032588124372526c25e8a1607f07b01736c205312d8eb130d30bef9fec0d8
-MISC ChangeLog 610 SHA256 2e869af65d2f723bca881000e7c89d1b40c1b061a0456ad6d936c9e016efbdd6 SHA512 56e769be76e99e9d082f0da12679bc93a33cc8173797c877435b82579d5ab0c37c4288b4d7e66a513af147494251d32476b7626bf1f50d0260389312112a32a9 WHIRLPOOL 07d88f2fdff2865b801c3a12fe16a2b86467175b5379ac5af74d01f6445e9c4e35adcb14ba18ecf8ab6b4cbaf9ebdd9acdad7f408e2ae3283c99c3e71455aa97
+EBUILD rack-attack-4.2.0.ebuild 859 SHA256 7bfc1aa57016fec7140f5d4e1544b1c8169f48bb6d64fb3626797e2427b3e689 SHA512 b71b45d5cf281e7c800fe15b3b3bc3d5f7a55be843ea74cd88f78fe11fe4d737d14644fefaec8d8563ce68580e8e14614c2598961e7577520288ba3520eb0fc8 WHIRLPOOL 3dac66e0ce7fd6500f78163b9d171e4cb7e9e42df2628f08891da49484052cccbaf6aa5ee13cdbc4a14dcd680226af21bfa4e9e598c6bc4eafef8749a8b61e68
+MISC ChangeLog 739 SHA256 a675d64293ed825b8371242fff39fc489632e9e3d82bbae4b23f3c199fc9b4d3 SHA512 d872e1961667321bdb62627227020dec4e678e1bb8d26987683af56f46136cba854628f495d15f43323c20ccfeac09b334c0e31bc9533b672ba9dc471efe8661 WHIRLPOOL dbd027c9b0797ebfd2bef70a4ba8236e89553d85bc5fd52ddd2619a49894ccb1b55aa2290bae2ec67e568b7d057dfabff641fb5d108ef0378694e04b39a4a86d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlRN7v0ACgkQiIP6VqMIqNfxMwD/f8dTVapQWqMuztYj7xLkD8o4
+ES1pdMgr/rMPnHtfeYsA/jY2aJ54IwRU5akWiPA18I4WPW+Wr7npkXEIHq466eVg
+=0gzz
+-----END PGP SIGNATURE-----
--- a/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-attack/rack-attack-4.2.0.ebuild,v 1.1 2014/10/27 07:06:31 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack"
+ruby_add_bdepend "test? ( dev-ruby/activesupport
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die
+}
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for media-libs/devil
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.61 2014/02/02 11:51:15 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.62 2014/10/27 07:59:46 mr_bones_ Exp $
+
+*devil-1.7.8-r2 (27 Oct 2014)
+
+  27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org> +devil-1.7.8-r2.ebuild:
+  drop lcms:0 support (bug #526836)

  02 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> devil-1.7.8-r1.ebuild:
  Add ~mips, wrt bug #499866
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@ -1,22 +1,9 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX devil-1.7.8-CVE-2009-3994.patch 443 SHA256 856c0f3f5b24b4474acaf84277441a390d13fcdd86e9ed19623de07a6261ef90 SHA512 b5e720e24f2e97e19c694224281a41466296de9e3bc3a4dddf7a5a0881c8f49af864625f1b46e37cd9d113d0b7e7f95b1720e5b49be679e2c7ad6169cd52729f WHIRLPOOL 179af1739cfa54cc4206c454a5632adff123be2c98c12cfb6ce668f6f17fe4238b747a77f9972cd9533c4de425b3acced180a9a1559f85163e406fc51623412e
 AUX devil-1.7.8-ILUT.patch 667 SHA256 a100cda1db97f7e90cc864589b89294f18aee05f2ef4907dde0c8cf03845160d SHA512 e36d441a2f7e56a7affc858de7447a558a9b73037bec3d0544126c5fdc2d3d580acb314f666db2a9cdaa8f78586ecafd8bb211ed0a921b32d23e49f3780145a2 WHIRLPOOL 5d241a7f1a3bc95652217903fce8abc578c02200b40ffd665d2f0207a65ee32318064f9416da17d0141e106ec9c1d526ad4acaf5cc5aa617eda972a3779b70d5
 AUX devil-1.7.8-libpng14.patch 1221 SHA256 bd1da681157678fcffcaba5ec2f7f2d33ad9971816ea33dedcf2721ad0ab4536 SHA512 cca76f7f6702ee8341ef68f36f36ade358662a38294e6e2badf7944e2c5b194d1098eb24e9c57e4101b3b110548d106cf8e3ed7ac55281d96428c07cbf6396d0 WHIRLPOOL 06178a97bfa6a67ef50bc26887f6ec4067c0db21c97a518032d75005b18658500262ad22c74e7df0cbe6a66e09eedbb3e57fac25eb06590a2be2e3828af748e9
 AUX devil-1.7.8-nvtt-glut.patch 2477 SHA256 7660558de9615d617027f501f93e7472647696fb5cd7c02dee31cb2a42969383 SHA512 08fc08f2ef37a19eb0d5f0d904814d659ff6133f479a323420d8cc1922b2c836e5f7d23cc52bddd723fe51a747cc40646df75c16fdb3c2a1a08a1967f0d842e0 WHIRLPOOL 96a17dff33a6c0daa7833b223078bb3df7a95b965bee0ec1b05aa2caa2a15e46a2a8b4e5bedd4c504f070102cf8e2cc99a41042291b55803c76b4ee61b050070
 DIST DevIL-1.7.8.tar.gz 2051993 SHA256 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e WHIRLPOOL 749bf0ce73786709414d6f2c3bf29b20c56397cb6f9f92b4158902a98a4f4d0ef66d78096ce8daea3d65b1718c5255421055cd223e9269f6c773ca310c2df146
 EBUILD devil-1.7.8-r1.ebuild 2178 SHA256 f5f0bf9c8e83b2d8a9e37f5ec7defdcd029a0096472cae5a615c5d1331a0dff3 SHA512 51a732772427447f7c72e003e35dca23df6fc69bd82ba66cb837fc5053abdcfba83b758733e1f32344f4c2a4a0269b49b2e809b111b4c5d77093b3765577f9ea WHIRLPOOL f14ba44ff8f9ca46ab092d89784b31b0b71485bf52f8e5f4f6a88f765e54988b67ea06e67334db21a1cc04c1172c6b3836d1f7c6dae479413b33d360708ecefb
-MISC ChangeLog 7681 SHA256 df489dbc90e16bd9c1a145a438ac9b14bf4d0ae95e9dc544ef99f4ae661146f1 SHA512 6ff4928b19d6b058b45ca419ffd497bb70ef000776112315a08c71cbb06d2318cd773b04f3404254f21cf86b18794fbc8ae6684c0c21f8606495a7d929f0e99f WHIRLPOOL 782baf85b351211ac28789620aede49750dbe74d4d2801687a08b85d2dd5c8f13885d455e4a577e1efd1f463c5f70895a6253fe7d74c94a74e489d975ff03357
+EBUILD devil-1.7.8-r2.ebuild 1946 SHA256 e1b35c76d5affb76c369f5d832a6ce5cfaa6c868702bc11c312084f9414041fb SHA512 f26724184858d4fe690febb3886bb9c83aad2726a6a42ddbb21683933e624ae6646eb3b2e47cdc66d883b7619ebc766e5ef8ae7e97b4f27b09cb99cb0ce12b2d WHIRLPOOL 552c1f80a4aaa5d548bfd8af35ee7d37b78010d7c6fb29e3d4ea0f1c7dca190e7493ebed3c3fb897188e5c396ef18377acb856265b4f7125ce6d2fecb8c36ca9
+MISC ChangeLog 7829 SHA256 f897842b045545930890b11d76b7556485fa28c04841d263d2d396ea1d9eb3a4 SHA512 93e740bc303a04af8f228b729e5e18f7655fefb7552d2640c05701eaadf81b524386151338d6e948b9003eeab4a6e284be42b12ca1c223b8abcaba7fdda1e5f4 WHIRLPOOL 9ec7ae50fd37805c41778afde651e16b6043b16cb286fa1d9c2170899165cfc8bbd3fc83574386cd2009fc3fe7b88a135a13e3cd6bd98f9c2f85e915c5f82a65
 MISC metadata.xml 316 SHA256 388c820e32109098344e929245c2cc8e5d208aeafb5bac00c684851f9f44099b SHA512 bb18bf810ad2d70eab915a10e3bc1f1029639649d9f1fc8ee330d7f1ec0ef7ae8e6699dcdf64ab14635bde4088c8ac5afd9b9280b24a269e8efd1643ae1fa5af WHIRLPOOL 7ac9e392a5ce6a832d7493ffdb6818989eccad99ffdc7871f32d7b11c7c7b19dc28763d162b65f16424d997bd1c857d299a30c6edaca3da709c8314ad4e07b1e
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJS7jE0AAoJECo/aRed9267Ba4H/A7YZpjuYilvjCEvLkLhzC5A
-7yndvHIsFqAv2efj/tMQKvSWG2JDJFW2M8Nti7s0ZtcYZiu/RI87aYM4HRaU4xMD
-pR2ZQkuzQMOVMAZaKwM36S8+BYvS0eIR1CJ3/etgZwzR24OZY32fgYnPFLf4iXwT
-kLpOP7zchXg6mOjS9f5KnwYVJJTckv18ZnH2jke9JJZisSI87pXOyLQhF6vXoeBn
-iGAY4Zzvp1gbbgWVWRr/xZzSy8O5tH/Y39HY72mi1zKsiMVlk/WvpMsI0WU8W2Fu
-Yolq73h7w23Oyobdykbo8G6ZdkUEtSMUHtGcaMCHXjMce0zjCVyxMUpRURQfSRQ=
-=bDpp
-----END PGP SIGNATURE-----
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.7.8-r2.ebuild,v 1.1 2014/10/27 07:59:46 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=DevIL-${PV}
+
+DESCRIPTION="DevIL image library"
+HOMEPAGE="http://openil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl sse sse2 sse3 static-libs tiff xpm X"
+
+RDEPEND="allegro? ( media-libs/allegro:0 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	mng? ( media-libs/libmng )
+	nvtt? ( media-gfx/nvidia-texture-tools )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl
+		virtual/glu )
+	png? ( media-libs/libpng:0 )
+	sdl? ( media-libs/libsdl )
+	tiff? ( media-libs/tiff:0 )
+	xpm? ( x11-libs/libXpm )
+	X? ( x11-libs/libXext
+		 x11-libs/libX11
+		 x11-libs/libXrender )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-lcms \
+		--enable-ILU \
+		--enable-ILUT \
+		$(use_enable sse) \
+		$(use_enable sse2) \
+		$(use_enable sse3) \
+		$(use_enable openexr exr) \
+		$(use_enable gif) \
+		$(use_enable jpeg) \
+		$(use_enable jpeg2k jp2) \
+		$(use_enable mng) \
+		$(use_enable png) \
+		$(use_enable tiff) \
+		$(use_enable xpm) \
+		$(use_enable allegro) \
+		--disable-directx8 \
+		--disable-directx9 \
+		$(use_enable opengl) \
+		$(use_enable sdl) \
+		$(use_enable X x11) \
+		$(use_enable X shm) \
+		$(use_enable X render) \
+		$(use_enable glut) \
+		$(use_with X x) \
+		$(use_with nvtt)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
--- a/media-sound/frescobaldi/ChangeLog
+++ b/media-sound/frescobaldi/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for media-sound/frescobaldi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/ChangeLog,v 1.27 2014/06/20 07:12:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/ChangeLog,v 1.28 2014/10/27 05:44:48 ssuominen Exp $
+
+  27 Oct 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -frescobaldi-2.0.13.ebuild, -frescobaldi-2.0.14.ebuild,
+  -frescobaldi-2.0.15.ebuild:
+  old

 *frescobaldi-2.0.16 (20 Jun 2014)

--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

-DIST frescobaldi-2.0.13.tar.gz 3739244 SHA256 501d2388fa7c49fc8d644caa7550463a4455a0064e2ffe469261a26dab32bee4 SHA512 2ddfc62011a43ecc14e3268716b2722610682b26a65a040a0fb29f31f6f8bc318d25479c4381c983f56a38ccc0788573dd553c496f88d2b798d55de88bbdb987 WHIRLPOOL 3847b2ccb74e6f745ef0bb4175466b206830253411ba6d3b6495e1ae35f1a5565babed6ee7dffb1cc7659441f73c7473cbb13a8bc45535248914ad233181a08c
-DIST frescobaldi-2.0.14.tar.gz 3736640 SHA256 6771bddc6a1a982931fbabd56003d1302e78a50f7cf7f9c08c31f0472d7463ac SHA512 981cbbc07343778bac71ef4d5cd50ccfea0175e35b9d95d92323bb43bb0d3835449e1f2c930daebb7d2c7be607c8a999aa68172cf6441c56b850143f53fff374 WHIRLPOOL 59e724d02442b56958acd3eb9a41540c0ac53098a2a4c1acd43934350817897a22fbbeadbf94febe556697124a254b882349019f0f9514ce45dd2b9862e88b66
-DIST frescobaldi-2.0.15.tar.gz 3747346 SHA256 1f9d56fc1e4de90c93b327d78b6c086ed2fc575b67503bdbb852545ff75daa17 SHA512 d4684c51bad42ea6aea82dba6844839d3c1dae1d6aaf0a8d04857b8babc3e3199114342527445a8076ff6733193304d38a13e7728caa902e36e48d05f1e4b745 WHIRLPOOL e718c7a6b75befc8a83f1d2d1731d84a1578434684c845ec24dfeba0c1bcae812116139f3d28477df0c3f9a4dd484231c2cb38f2a96fcea6469ba5dd2330c409
 DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
-EBUILD frescobaldi-2.0.13.ebuild 915 SHA256 79d5c60fae8735fd9302c861750ed28c763c22aff54ec8b598e186c405e0ce58 SHA512 b21085c4b41783e77c080b895ff97ba47ace7827bdedc182fa9421df57a9bb54db45d41a8ea1069e709c0c2e775ba2b5e6dae5206ab9049af19ab5b26e53d03a WHIRLPOOL 960434f8e21a2259da5b0702e9cc46c9a46f9c53ab384fbd2f90357c17860a81a7f58289b39a4b7f8da8deacdd62889238992e5e1f5636afe324c021b2e8a52e
-EBUILD frescobaldi-2.0.14.ebuild 915 SHA256 acd7a4f7153406919250142d8e886bf41a07f08aa0a56d307821424723686105 SHA512 c90bb144650993716424dd5d72d81b7e8954060272c58ed4b9404a228578ebd1a56e7050225ea2403587bc0a6392a41444f3fe6f969bfe50f1c9b311a56e64b4 WHIRLPOOL 9b0e299b83289dcebd0f509800590e209388e9d0018779ead2438d7ef167e69914815c079d487c7ef4fefdf03ccc9918c51fdbb2ee4b32917e7b5d0b7101484b
-EBUILD frescobaldi-2.0.15.ebuild 915 SHA256 2f751f4ccbd22dd8feeca41cb94070de296aff99d37d952fc366444d42653f4f SHA512 84d9482afbb054b26cec49592cda96101d628b517062ea36801a284dd074ab6065b0b6fd63e0cb81da2b15fb4a95c9d01abf0bf91731c2691f8ad2f4793dc333 WHIRLPOOL f92895569236245a1a78ba404f7c4a37121501302690f615971b2e0eb5c935877c24e8f37f2f8cca6331c6c428404d07760d36335c2c4fc19c0e468e125727c4
 EBUILD frescobaldi-2.0.16.ebuild 909 SHA256 9be837e73bbc7e862079e679196f43bd74e023e6f4a3bdf5d4e63dc4eeb15777 SHA512 ce1005fe0373a9ef853edba5504f0fea6c0bd6a1ed6abd28a5593f1df51836bb5397d1459ebdf9858da7d84acc331df65f231dc0f48f7736c5875f895ea248a2 WHIRLPOOL f0725aabfcf2aad372343f6200c6b733189ab5808ebcb01802a70d51b7fbf1247ff6828aab5e27aa7041497d9fbc318629cd517e16314e47bfc17e891ccf5d74
-MISC ChangeLog 3964 SHA256 f89234dc20daea54f53b85b0aac417e0c44caf351a2bbab30786e3750ef63426 SHA512 bb84d578653198126bf07554d567bd65aa8185ee825b22e2aa85c1427911012713b2e9297496b34b71357434fc96011dbbbb971e0c7146f98073ba6e95396024 WHIRLPOOL c07b08a7e96a055b86ee3740a388273af710d1884bd0136729afac61a7323ecc216f7e9b9cec8864d72a3117fca76178720748b75a381db885ce0ccf13b42faf
+MISC ChangeLog 4113 SHA256 63a8b3d62472a4c2c8258415a4a1bfa477b3fd3c209cb7edc8b417dc1bc2e918 SHA512 074e89c50b7d937222e63fe02ffeb83f1a1b94e7789b6376792231eed893df0721cf59f5fab1b4ccb823058b975552ef84577f67e57c4d09db865d554b84bf51 WHIRLPOOL 06c7ecda229b554da698a6f1da5b426ec241f2667c393401795c40193d9c792fdae792c0178e80f6a6ed951f72dc29417a3d886ba68a1bda2c822ebca52fe8f6
 MISC metadata.xml 278 SHA256 5f5939f0ff55f6e8c9220b7de246d84d110b7690fc9b40f715364823abd531fa SHA512 8945ace7d7b61a38ae07527f8e1c927dc5fd02d342e879123660a67178000d8793778a37baebb8b381549c11783577d479eaba642890aeb1313a3119e7a55b2f WHIRLPOOL 0ae75fa5bf43a78c990760ce599edcd2e9a484bd2c05ef63b0143cdbf52d3ed9ed750cb685f5b3136a3b6fc13a960767eb14d572436b6d97d2bc26792aef2f81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2

-iQEcBAEBCAAGBQJTo97QAAoJEEqz6FtPBkyj1r0IALXavku9axJJBjynK7OYGCTr
-oceNq0leRSC8yD8ZRuiokmcv3VDnMoctphV88CIorXV3QXmTeomTD7o5AaZTzhwr
-B72q/QGSW7wPBiORdgQNqou/2c2UpXyqy02DIJ8URMmtDOEjrFgKNYIGO5LmdZL4
-2UShi4OQ+IIBniV+pn8zFcC6kO098P63gN2DQXdGmXXGHrVPkNuuRUbDAzIg0kM8
-yTYPZ6CNVorE++4EolderWPbT4mOFMEFin7Nr2hnRaer5QArJUM1NUz8R0uI3jvu
-gEd8YT6Qz7ScQb7JAuWd2WR60XrLdS3BSZG417Tbm81xZ7+/nW6WPNwGGdadHLw=
-=Iolu
+iQEcBAEBCAAGBQJUTdu5AAoJEEdUh39IaPFNwbQH/3N5g12LFv1goQLv5snryR2E
+pPlgHOk9LRfo0UoH4cilA2nyxO75NJEG4hf7hIn371dyvqfWQzCknafR4NMjHDzV
+XT6pei/rC74G6GfTzz9dqz5xIiPSZJCF2lGHktz7q8H4VG537HeOYxviwUQivzt4
+xgRBYqe9Ge6toHxVzBs9jSV7LjxKeuzqW10W0C3jrQqf6qmg52RH26TBixEBvOzl
+njXPBdl0IT1AlBzlbZHgOWjk7S/7Bc0ukVDKtuCKV3jqKlLdrfb7QHPCsLGreEoE
+6AaWRRHzcYVTFxtD1kIERY3BGbjNnmpe42gjQ4VX2l6y0fTljOA+4MlEBf6H7YE=
+=zuVp
 -----END PGP SIGNATURE-----
--- a/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.13.ebuild,v 1.1 2014/01/01 05:08:20 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.14.ebuild,v 1.1 2014/03/06 20:34:55 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.15.ebuild,v 1.1 2014/03/12 00:41:55 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 27 Oct 2014 05:07:27 +0000
+Mon, 27 Oct 2014 08:07:01 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 27 Oct 2014 05:07:28 +0000
+Mon, 27 Oct 2014 08:07:01 +0000
--- a/metadata/md5-cache/app-text/catdoc-0.94.2
+++ b/metadata/md5-cache/app-text/catdoc-0.94.2
@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=tk? ( >=dev-lang/tk-8.1 )
-DESCRIPTION=A convertor for Microsoft Word, Excel and RTF Files to text
-HOMEPAGE=http://www.wagner.pp.ru/~vitus/software/catdoc/
-IUSE=tk
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=tk? ( >=dev-lang/tk-8.1 )
-SLOT=0
-SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz
-_md5_=1999defcf7da7f3e7b76c48bb8f18df7
--- a/metadata/md5-cache/app-text/catdoc-0.94.4-r1
+++ b/metadata/md5-cache/app-text/catdoc-0.94.4-r1
@ -1,13 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=tk? ( >=dev-lang/tk-8.1 ) !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Converter for Microsoft Word, Excel, PowerPoint and RTF files to text
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.wagner.pp.ru/~vitus/software/catdoc/
 IUSE=tk
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=tk? ( >=dev-lang/tk-8.1 )
 SLOT=0
-SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz
+SRC_URI=mirror://debian/pool/main/c/catdoc/catdoc_0.94.4.orig.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=a7a5beed7f88d6f527926103f254f41f
+_md5_=aaf6511f5e5f55af03ed885f388c5bb0
--- a/metadata/md5-cache/app-text/krop-0.4.6
+++ b/metadata/md5-cache/app-text/krop-0.4.6
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://arminstraub.com/downloads/krop/krop-0.4.6.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cd686b960ed02d58d637f108234b9905
+_md5_=6836fe9bf280e5b8af98e079d892cc0d
--- a/metadata/md5-cache/app-text/restview-2.1.1
+++ b/metadata/md5-cache/app-text/restview-2.1.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=reStructuredText viewer
+EAPI=5
+HOMEPAGE=https://mg.pov.lt/restview/
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/r/restview/restview-2.1.1.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=5616c8c1c22695db0120d9a7ee71d735
--- a/metadata/md5-cache/dev-db/lmdb-0.9.14
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.14
@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=5
 HOMEPAGE=http://symas.com/mdb/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP
 SLOT=0
 SRC_URI=https://gitorious.org/mdb/mdb/archive/2f587ae081d076e3707360c5db086520c219d3ea.tar.gz -> lmdb-0.9.14.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=b828c9998d5d41b0a1775044e5d068f5
+_md5_=8de52bedf06aa602af4fc8e4c515c414
--- a/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
+++ b/metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A simple HTML scanner and tag balancer using standard XML interfaces
+EAPI=5
+HOMEPAGE=http://nekohtml.sourceforge.net/
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.4 >=dev-java/xerces-2.7 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/nekohtml/nekohtml-1.9.18.tar.gz
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	java-ant-2	5f5bada6517ed26bc25083134e42b146	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=20e6df09d65d0ddff6b395d6c4c07f15
--- a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3
+++ b/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=app-text/poppler[qt4] dev-python/PyQt4 >=dev-python/sip-4.9.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A python binding for libpoppler-qt4
-EAPI=4
-HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler[qt4] dev-python/PyQt4 >=dev-python/sip-4.9.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://python-poppler-qt4.googlecode.com/files/python-poppler-qt4-0.16.3.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cb30ac32d7533df5a52b148c79417abf
--- a/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1
+++ b/metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A python binding for libpoppler-qt4
-EAPI=5
-HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://python-poppler-qt4.googlecode.com/files/python-poppler-qt4-0.16.3.tar.gz
-_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=7138172def76b44e622fa51d9444d84b
--- a/metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
+++ b/metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A python binding for libpoppler-qt4
+EAPI=5
+HOMEPAGE=http://code.google.com/p/python-poppler-qt4/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/poppler:=[qt4] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://github.com/wbsoft/python-poppler-qt4/archive/v0.18.1.tar.gz -> python-poppler-qt4-0.18.1.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=5287aa0475d298ded1cb07f2fbf5b583
--- a/metadata/md5-cache/dev-python/qrcode-5.1
+++ b/metadata/md5-cache/dev-python/qrcode-5.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=QR Code generator on top of PIL
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/qrcode
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/q/qrcode/qrcode-5.1.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=46dfa03b8ad0ab3322e4deac350f38a4
--- a/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-4.2.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/activesupport[ruby_targets_ruby19] dev-ruby/rack-test[ruby_targets_ruby19] dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/activesupport[ruby_targets_ruby20] dev-ruby/rack-test[ruby_targets_ruby20] dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/activesupport[ruby_targets_ruby21] dev-ruby/rack-test[ruby_targets_ruby21] dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A DSL for blocking & throttling abusive clients
+EAPI=5
+HOMEPAGE=https://github.com/kickstarter/rack-attack
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/rack[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rack[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/rack-attack-4.2.0.gem
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6c8e49b00b50beed9dfba2a5c5fb3391
--- a/metadata/md5-cache/media-libs/devil-1.7.8-r2
+++ b/metadata/md5-cache/media-libs/devil-1.7.8-r2
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender ) virtual/pkgconfig X? ( x11-proto/xextproto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=DevIL image library
+EAPI=5
+HOMEPAGE=http://openil.sourceforge.net/
+IUSE=allegro gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl sse sse2 sse3 static-libs tiff xpm X
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=allegro? ( media-libs/allegro:0 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mng? ( media-libs/libmng ) nvtt? ( media-gfx/nvidia-texture-tools ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) X? ( x11-libs/libXext x11-libs/libX11 x11-libs/libXrender )
+SLOT=0
+SRC_URI=mirror://sourceforge/openil/DevIL-1.7.8.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=6aa43fb930c6694cebdf7dafe19b87a6
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.13
+++ b/metadata/md5-cache/media-sound/frescobaldi-2.0.13
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.13/frescobaldi-2.0.13.tar.gz
-_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=fc3a4b9add9be914acc0bd828d651572
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.14
+++ b/metadata/md5-cache/media-sound/frescobaldi-2.0.14
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.14/frescobaldi-2.0.14.tar.gz
-_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=aed1cc37e2386477aec35c34636cb3cd
--- a/metadata/md5-cache/media-sound/frescobaldi-2.0.15
+++ b/metadata/md5-cache/media-sound/frescobaldi-2.0.15
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=A LilyPond sheet music text editor
-EAPI=5
-HOMEPAGE=http://www.frescobaldi.org/
-IUSE=portmidi python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 public-domain
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[X,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=media-sound/lilypond-2.14.2 portmidi? ( media-libs/portmidi ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/wbsoft/frescobaldi/releases/download/v2.0.15/frescobaldi-2.0.15.tar.gz
-_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	14f70a8c0d896d1b016d17f108a6de74	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=a39804fd59e46010460c08207ffb1221
--- a/metadata/md5-cache/net-analyzer/snort-2.9.7.0
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.7.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet sys-libs/zlib !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=The de facto standard for intrusion detection/prevention
+EAPI=5
+HOMEPAGE=http://www.snort.org/
+IUSE=static +gre +mpls +targetbased +ppm +perfprofiling +non-ether-decoders control-socket file-inspect high-availability shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen +threads debug +active-response +normalizer reload-error-restart +react +flexresp3 large-pcap-64bit selinux
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 dev-libs/libdnet sys-libs/zlib selinux? ( sec-policy/selinux-snort )
+REQUIRED_USE=!kernel_linux? ( !shared-rep )
+SLOT=0
+SRC_URI=https://www.snort.org/downloads/snort/snort-2.9.7.0.tar.gz
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=cdb4a934b952e465bd62f92a9d0417ac
--- a/metadata/md5-cache/net-nds/openldap-2.4.40-r1
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( >=sys-libs/db-4.4 bindist? ( <sys-libs/db-6 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) sys-apps/groff ssl? ( dev-libs/openssl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool virtual/pkgconfig
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=5
+HOMEPAGE=http://www.OpenLDAP.org/
+IUSE=crypt icu samba slp tcpd experimental minimal +berkdb +bindist overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs smbkrb5passwd kerberos -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP GPL-2
+RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( sys-devel/libtool sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.14 tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( >=sys-libs/db-4.4 bindist? ( <sys-libs/db-6 ) ) smbkrb5passwd? ( dev-libs/openssl kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=cxx? ( sasl )
+RESTRICT=!minimal? ( !bindist? ( berkdb? ( bindist ) ) )
+SLOT=0
+SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=699ffdcad9dcf5704d7c003cc2371155
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 27 Oct 2014 05:07:31 +0000
+Mon, 27 Oct 2014 08:07:04 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Oct 27 05:07:27 UTC 2014
+Mon Oct 27 08:07:01 UTC 2014
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@ -1742,7 +1742,7 @@
 1408200031 ./dev-db/lmdb/lmdb-0.9.13.ebuild
 1408200031 ./dev-db/lmdb/lmdb-0.9.10.ebuild
 1408200031 ./dev-db/lmdb/lmdb-0.9.11.ebuild
-1410231557 ./dev-db/lmdb/lmdb-0.9.14.ebuild
+1410270831 ./dev-db/lmdb/lmdb-0.9.14.ebuild
 1410112335 ./dev-db/postgresql/postgresql-9.2.9.ebuild
 1410112335 ./dev-db/postgresql/postgresql-9.0.18.ebuild
 1410260522 ./dev-db/postgresql/postgresql-9.4_beta3.ebuild
@ -2319,6 +2319,7 @@
 1209092138 ./media-libs/libmp4v2/libmp4v2-2.0.0.ebuild
 1207021158 ./media-libs/libmp4v2/libmp4v2-1.9.1-r1.ebuild
 1402021551 ./media-libs/devil/devil-1.7.8-r1.ebuild
+1410271059 ./media-libs/devil/devil-1.7.8-r2.ebuild
 1306100254 ./media-libs/libbmp/libbmp-0.1.3.ebuild
 1401052318 ./media-libs/libsvgtiny/libsvgtiny-0.1.0.ebuild
 1302281150 ./media-libs/libsvgtiny/libsvgtiny-0.0.2.ebuild
@ -4169,6 +4170,7 @@
 0702171136 ./net-nds/led/led-1.79.4.ebuild
 1207111708 ./net-nds/adtool/adtool-1.3.3.ebuild
 1410121031 ./net-nds/openldap/openldap-2.4.23.ebuild
+1410270833 ./net-nds/openldap/openldap-2.4.40-r1.ebuild
 1410121031 ./net-nds/openldap/openldap-2.4.28-r1.ebuild
 1410121031 ./net-nds/openldap/openldap-2.4.19-r1.ebuild
 1410121031 ./net-nds/openldap/openldap-2.4.24.ebuild
@ -4809,9 +4811,6 @@
 1205051226 ./media-sound/gtkguitune/gtkguitune-0.8.ebuild
 1308311812 ./media-sound/pianobooster/pianobooster-0.6.4b.ebuild
 1406201112 ./media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
-1401010908 ./media-sound/frescobaldi/frescobaldi-2.0.13.ebuild
-1403070034 ./media-sound/frescobaldi/frescobaldi-2.0.14.ebuild
-1403120441 ./media-sound/frescobaldi/frescobaldi-2.0.15.ebuild
 0712121842 ./media-sound/cdplay/cdplay-1.0.ebuild
 1205051252 ./media-sound/specimen/specimen-0.5.2_rc3.ebuild
 1207141616 ./media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
@ -8027,6 +8026,7 @@
 0803282052 ./dev-java/stax-ex/stax-ex-1.0.ebuild
 1408110031 ./dev-java/commons-codec/commons-codec-1.7.ebuild
 0704280216 ./dev-java/commons-graph/commons-graph-0.8.1_p20040118-r2.ebuild
+1410270900 ./dev-java/nekohtml/nekohtml-1.9.18-r1.ebuild
 1410181901 ./dev-java/nekohtml/nekohtml-1.9.18.ebuild
 1408110031 ./dev-java/nekohtml/nekohtml-1.9.6.ebuild
 1405171931 ./dev-java/icedtea/icedtea-6.1.12.7.ebuild
@ -16350,8 +16350,7 @@
 1202211301 ./dev-python/py-notify/py-notify-0.3.1.ebuild
 1408110131 ./dev-python/python-daemon/python-daemon-1.6.ebuild
 1408110131 ./dev-python/python-daemon/python-daemon-1.6-r1.ebuild
-1211191849 ./dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3.ebuild
-1303172114 ./dev-python/python-poppler-qt4/python-poppler-qt4-0.16.3-r1.ebuild
+1410270859 ./dev-python/python-poppler-qt4/python-poppler-qt4-0.18.1.ebuild
 1409271601 ./dev-python/characteristic/characteristic-14.1.0.ebuild
 1401052201 ./dev-python/pympler/pympler-0.3.1.ebuild
 1402110702 ./dev-python/dynd-python/dynd-python-0.6.0.ebuild
@ -16447,6 +16446,7 @@
 1410160331 ./dev-python/twill/twill-0.9-r1.ebuild
 1408110131 ./dev-python/bjoern/bjoern-1.3.2.ebuild
 1404061501 ./dev-python/audioread/audioread-1.0.1.ebuild
+1410271024 ./dev-python/qrcode/qrcode-5.1.ebuild
 1406220255 ./dev-python/qrcode/qrcode-5.0.1.ebuild
 1407171101 ./dev-python/turbolift/turbolift-2.0.5.ebuild
 1409260000 ./dev-python/treq/treq-0.2.1.ebuild
@ -23022,6 +23022,7 @@
 1204011931 ./app-text/gocr/gocr-0.49.ebuild
 1108221347 ./app-text/letterize/letterize-1.3.ebuild
 0805241606 ./app-text/letterize/letterize-1.2.ebuild
+1410270816 ./app-text/restview/restview-2.1.1.ebuild
 1406051401 ./app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
 1404050101 ./app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
 1402120031 ./app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
@ -23095,8 +23096,7 @@
 1010021712 ./app-text/7plus/7plus-2.25.ebuild
 1407011431 ./app-text/libabw/libabw-0.0.2.ebuild
 1410110031 ./app-text/libabw/libabw-0.1.0.ebuild
-1009151522 ./app-text/catdoc/catdoc-0.94.2-r2.ebuild
-0808172121 ./app-text/catdoc/catdoc-0.94.2.ebuild
+1410270827 ./app-text/catdoc/catdoc-0.94.4-r1.ebuild
 1409132131 ./app-text/catdoc/catdoc-0.94.4.ebuild
 1408061131 ./app-text/getxbook/getxbook-1.0.ebuild
 1409071801 ./app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@ -23136,7 +23136,7 @@
 1305161731 ./app-text/linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild
 1308241731 ./app-text/convertlit/convertlit-1.8-r1.ebuild
 1003271917 ./app-text/ddir/ddir-0_p20100323.ebuild
-1410101945 ./app-text/krop/krop-0.4.6.ebuild
+1410270901 ./app-text/krop/krop-0.4.6.ebuild
 1205040801 ./app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
 1405142036 ./app-text/notecase/notecase-1.9.8-r1.ebuild
 1305131616 ./app-text/writerperfect/writerperfect-0.8.1.ebuild
@ -28245,6 +28245,7 @@
 1401160045 ./dev-ruby/ruby-goocanvas/ruby-goocanvas-2.1.0.ebuild
 1408052031 ./dev-ruby/evented-spec/evented-spec-0.9.0.ebuild
 1409091101 ./dev-ruby/spring/spring-1.1.3.ebuild
+1410271006 ./dev-ruby/rack-attack/rack-attack-4.2.0.ebuild
 1311220622 ./dev-ruby/rack-attack/rack-attack-2.3.0.ebuild
 1405290945 ./dev-ruby/rack-attack/rack-attack-4.1.0.ebuild
 1409140548 ./dev-ruby/rack-attack/rack-attack-4.1.1.ebuild
@ -30326,6 +30327,7 @@
 1402031227 ./net-analyzer/snort/snort-2.9.6.0.ebuild
 1408250649 ./net-analyzer/snort/snort-2.9.6.2.ebuild
 1402031227 ./net-analyzer/snort/snort-2.9.4.6-r1.ebuild
+1410270847 ./net-analyzer/snort/snort-2.9.7.0.ebuild
 1402031227 ./net-analyzer/snort/snort-2.9.5.6.ebuild
 1401260641 ./net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
 1302210625 ./net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r1.ebuild
@ -39639,7 +39641,7 @@
 1410160309 metadata/md5-cache/dev-db/myodbc-5.2.7
 1410201706 metadata/md5-cache/dev-db/maatkit-7540-r1
 1410160309 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r1
-1410231606 metadata/md5-cache/dev-db/lmdb-0.9.14
+1410270906 metadata/md5-cache/dev-db/lmdb-0.9.14
 1410190306 metadata/md5-cache/dev-db/tokumx-1.5.0-r1
 1410190306 metadata/md5-cache/dev-db/barman-1.3.1
 1410160309 metadata/md5-cache/dev-db/postgis-2.0.3
@ -40852,6 +40854,7 @@
 1408110137 metadata/md5-cache/media-libs/gnonlin-0.10.9
 1410160323 metadata/md5-cache/media-libs/soxr-0.1.0
 1410231506 metadata/md5-cache/media-libs/alsa-oss-1.0.28
+1410271106 metadata/md5-cache/media-libs/devil-1.7.8-r2
 1410160323 metadata/md5-cache/media-libs/sratom-0.4.0
 1410160322 metadata/md5-cache/media-libs/exempi-2.2.0
 1410160323 metadata/md5-cache/media-libs/libmatroska-1.4.1
@ -42156,6 +42159,7 @@
 1410160326 metadata/md5-cache/net-nds/nsscache-0.23
 1410160326 metadata/md5-cache/net-nds/gosa-plugin-systems-2.6.11
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-samba-2.6.11
+1410270906 metadata/md5-cache/net-nds/openldap-2.4.40-r1
 1410160326 metadata/md5-cache/net-nds/phpldapadmin-1.2.3-r1
 1410160326 metadata/md5-cache/net-nds/openldap-2.4.35
 1211091748 metadata/md5-cache/net-nds/gosa-plugin-samba-2.6.10
@ -42178,7 +42182,6 @@
 1410160324 metadata/md5-cache/media-sound/dir2ogg-0.11.6
 1406031106 metadata/md5-cache/media-sound/abcm2ps-7.8.3
 1410160324 metadata/md5-cache/media-sound/xmms2-0.8-r1
-1410190309 metadata/md5-cache/media-sound/frescobaldi-2.0.14
 1410160324 metadata/md5-cache/media-sound/sox-14.4.1
 1410160324 metadata/md5-cache/media-sound/muse-0.9.2
 1410160324 metadata/md5-cache/media-sound/qtractor-0.5.9
@ -42374,7 +42377,6 @@
 1410160324 metadata/md5-cache/media-sound/xnoise-0.2.20
 1410160324 metadata/md5-cache/media-sound/daudio-0.3
 1410160324 metadata/md5-cache/media-sound/ardour-2.8.14-r1
-1410190309 metadata/md5-cache/media-sound/frescobaldi-2.0.15
 1410160324 metadata/md5-cache/media-sound/pragha-1.1.2.1
 1211091746 metadata/md5-cache/media-sound/sndfile-tools-1.03
 1410160324 metadata/md5-cache/media-sound/pulseaudio-5.0-r3
@ -42657,7 +42659,6 @@
 1410160324 metadata/md5-cache/media-sound/qmpdclient-1.2.2-r1
 1410160324 metadata/md5-cache/media-sound/dbmeasure-0.0.20100217
 1410160324 metadata/md5-cache/media-sound/lame-3.99.5
-1410190309 metadata/md5-cache/media-sound/frescobaldi-2.0.13
 1410190309 metadata/md5-cache/media-sound/listen-0.6.5-r1
 1410160324 metadata/md5-cache/media-sound/gsm-1.0.13-r1
 1410160324 metadata/md5-cache/media-sound/justeport-0.2
@ -46032,6 +46033,7 @@
 1410160311 metadata/md5-cache/dev-java/texhyphj-1.1
 1410160311 metadata/md5-cache/dev-java/netbeans-enterprise-7.2
 1410160310 metadata/md5-cache/dev-java/groovy-1.8.5
+1410270906 metadata/md5-cache/dev-java/nekohtml-1.9.18-r1
 1410160311 metadata/md5-cache/dev-java/rhino-1.7.2-r2
 1410160311 metadata/md5-cache/dev-java/txw2-runtime-20070407-r2
 1410190306 metadata/md5-cache/dev-java/jython-2.7_beta1
@ -52523,7 +52525,6 @@
 1410190308 metadata/md5-cache/dev-python/pyfeyn-0.3.4-r1
 1410190308 metadata/md5-cache/dev-python/pyftpdlib-1.3.0
 1410160316 metadata/md5-cache/dev-python/rope-0.9.3
-1410160315 metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3
 1410190307 metadata/md5-cache/dev-python/mwlib-rl-0.14.5
 1410160315 metadata/md5-cache/dev-python/pyodbc-2.1.8
 1410190308 metadata/md5-cache/dev-python/rackspace-monitoring-cli-0.5.2
@ -53909,6 +53910,7 @@
 1410190308 metadata/md5-cache/dev-python/pylast-0.5.11-r1
 1410190307 metadata/md5-cache/dev-python/argcomplete-0.6.5
 1410190308 metadata/md5-cache/dev-python/pyroma-1.5
+1410270906 metadata/md5-cache/dev-python/python-poppler-qt4-0.18.1
 1410190307 metadata/md5-cache/dev-python/patsy-0.3.0
 1410160315 metadata/md5-cache/dev-python/odfpy-0.9.4
 1410190308 metadata/md5-cache/dev-python/soappy-0.12.22
@ -53960,6 +53962,7 @@
 1410190308 metadata/md5-cache/dev-python/pyfits-3.3
 1410190308 metadata/md5-cache/dev-python/pkginfo-1.0
 1410232036 metadata/md5-cache/dev-python/pycurl-7.19.0
+1410271036 metadata/md5-cache/dev-python/qrcode-5.1
 1410190308 metadata/md5-cache/dev-python/speaklater-1.3-r1
 1410190308 metadata/md5-cache/dev-python/pysnmp-4.2.2-r1
 1410160314 metadata/md5-cache/dev-python/celementtree-1.0.5-r1
@ -54102,7 +54105,6 @@
 1410160315 metadata/md5-cache/dev-python/pygsl-0.9.5
 1410160314 metadata/md5-cache/dev-python/beaker-1.6.2
 1410190307 metadata/md5-cache/dev-python/lesscpy-0.9j
-1410190308 metadata/md5-cache/dev-python/python-poppler-qt4-0.16.3-r1
 1410190308 metadata/md5-cache/dev-python/w3lib-1.5
 1410190307 metadata/md5-cache/dev-python/django-endless-pagination-2.0
 1410160315 metadata/md5-cache/dev-python/py-xmlrpc-0.8.8.3-r1
@ -60811,7 +60813,6 @@
 1410160308 metadata/md5-cache/app-text/agrep-2.04-r1
 1410160309 metadata/md5-cache/app-text/zathura-ps-0.2.2
 1410160308 metadata/md5-cache/app-text/highlight-3.12
-1211091735 metadata/md5-cache/app-text/catdoc-0.94.2
 1410152106 metadata/md5-cache/app-text/html-xml-utils-6.8
 1410160309 metadata/md5-cache/app-text/queequeg-0.91
 1410190306 metadata/md5-cache/app-text/fbless-9999
@ -60868,7 +60869,7 @@
 1410190306 metadata/md5-cache/app-text/pelican-3.2.2
 1410201706 metadata/md5-cache/app-text/htag-0.0.24-r1
 1410160308 metadata/md5-cache/app-text/htmlrecode-1.3.1
-1410190306 metadata/md5-cache/app-text/krop-0.4.6
+1410270906 metadata/md5-cache/app-text/krop-0.4.6
 1305131636 metadata/md5-cache/app-text/writerperfect-0.8.1
 1410170106 metadata/md5-cache/app-text/calibre-1.47
 1410160308 metadata/md5-cache/app-text/dos2unix-6.0.3
@ -61018,6 +61019,7 @@
 1410160308 metadata/md5-cache/app-text/dvipsk-5.991_p20110705-r1
 1410160308 metadata/md5-cache/app-text/html401-19991224-r2
 1410160308 metadata/md5-cache/app-text/llpp-19
+1410270836 metadata/md5-cache/app-text/catdoc-0.94.4-r1
 1410160308 metadata/md5-cache/app-text/libmwaw-0.2.0
 1410190306 metadata/md5-cache/app-text/xlsx2csv-0.7
 1410160309 metadata/md5-cache/app-text/qpdfview-0.4.7
@ -61096,7 +61098,6 @@
 1410160308 metadata/md5-cache/app-text/mupdf-1.5-r1
 1410160308 metadata/md5-cache/app-text/enscript-1.6.6
 1410160308 metadata/md5-cache/app-text/jabref-2.6
-1410160308 metadata/md5-cache/app-text/catdoc-0.94.2-r2
 1410160308 metadata/md5-cache/app-text/ebook-tools-0.2.2
 1410160309 metadata/md5-cache/app-text/yagf-0.9.3.2
 1410160308 metadata/md5-cache/app-text/libabw-0.1.0
@ -61215,6 +61216,7 @@
 1410160308 metadata/md5-cache/app-text/chm2pdf-0.9.1
 1410160308 metadata/md5-cache/app-text/mecab-0.98
 1305141906 metadata/md5-cache/app-text/writerperfect-0.8.2
+1410270836 metadata/md5-cache/app-text/restview-2.1.1
 1410160308 metadata/md5-cache/app-text/jmupdf-0.4.1
 1410160309 metadata/md5-cache/app-text/wklej-0.2.1
 1410160309 metadata/md5-cache/app-text/wgetpaste-2.25-r2
@ -65599,6 +65601,7 @@
 1410160317 metadata/md5-cache/dev-ruby/mocha-1.1.0
 1410251036 metadata/md5-cache/dev-ruby/bunny-1.5.1
 1410160317 metadata/md5-cache/dev-ruby/slim-2.0.2-r1
+1410271036 metadata/md5-cache/dev-ruby/rack-attack-4.2.0
 1410160317 metadata/md5-cache/dev-ruby/ruby-vte3-2.2.0
 1410160317 metadata/md5-cache/dev-ruby/oauth2-1.0.0
 1410160317 metadata/md5-cache/dev-ruby/ruby-gdk3-2.1.0
@ -68104,6 +68107,7 @@
 1410160325 metadata/md5-cache/net-analyzer/oinkmaster-2.0
 1410160324 metadata/md5-cache/net-analyzer/etherape-0.9.13
 1410221236 metadata/md5-cache/net-analyzer/openvas-manager-5.0.4-r2
+1410270906 metadata/md5-cache/net-analyzer/snort-2.9.7.0
 1410160324 metadata/md5-cache/net-analyzer/nagios-3.3.1
 1410160324 metadata/md5-cache/net-analyzer/netsniff-ng-0.5.8
 1410160324 metadata/md5-cache/net-analyzer/nagios-check_fail2ban-3
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 27 Oct 2014 05:30:01 +0000
+Mon, 27 Oct 2014 08:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1414386301 Mon 27 Oct 2014 05:05:01 AM UTC UTC
+1414397101 Mon 27 Oct 2014 08:05:01 AM UTC UTC
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.206 2014/08/25 02:49:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.207 2014/10/27 05:47:33 patrick Exp $
+
+*snort-2.9.7.0 (27 Oct 2014)
+
+  27 Oct 2014; Patrick Lauer <patrick@gentoo.org> +snort-2.9.7.0.ebuild:
+  Bump for #526774

 *snort-2.9.6.2 (25 Aug 2014)

--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@ -5,10 +5,12 @@ DIST snort-2.9.5.6.tar.gz 5049188 SHA256 69ed09077c1fa2268f814c8eff6e613b7fe8876
 DIST snort-2.9.6.0.tar.gz 5189146 SHA256 3cc6c8a9b52f4c863a5736a73b4012aff340b50b5e002771b04d4877f47cd19e SHA512 8af7ce53019c3a13745d2a92b4e8fd93d32431349cd3265034ad8e4a7312c73c034d6773e63eaa96e909c4b9d2a8c2c275533b9cc661cbc02375fb9cf815f995 WHIRLPOOL 3c1b77f5436b8513037e575465d77b6522ac57407a0704a051753aac0d7b2c5698c205efe3d7a50ccba07a936251798e943f8665707376b6e89c0a99a8e43773
 DIST snort-2.9.6.1.tar.gz 5226869 SHA256 119e4c5df83fe36a8d465e72a0347fe31e7771704da286f04115b0c5baa5f7b8 SHA512 455b92900efa098ca85f81290f2b4bfff756d6db1b7f85352f3d17e24e4139c69bde27b4d250aa1291146773f54b891dc8ed877d1bb82fa354bd3e5b8db572a7 WHIRLPOOL 0803e9c3d19fd731820d8d95c81aabdf409db9300c72c5d94384c0e1066bbdd1a4c05cac8b8fa66455358f76e4de24a30b86d4df3992c0c9336def3f6e67d738
 DIST snort-2.9.6.2.tar.gz 5229232 SHA256 8e1d7fc5e1523a786d845ca0102cc474abfcebfcc7e964a1653680034b5b5d77 SHA512 f7ed5dc7777fb330c048d3b14c6fa4b13988ecb3bea7990e04e496dcca7ba28eae976e60838504198a98b9fd3992e021aece5c3142385efebb05a33014afb1c4 WHIRLPOOL fed94a69c69bf5b0e456c272512f77452247168f0a29d5a4bcec43f9b596fe631df3669cea0b90165e573ac875f3d0e1408449d7c99803ef07b1238f4c5ba5a0
+DIST snort-2.9.7.0.tar.gz 6340553 SHA256 9738afea45d20b7f77997cc00055e7dd70f6aea0101209d87efec4bc4eace49b SHA512 f2cbdd2cf2ad15bd4cf3f8658c2a4880ee2069589db89c11aaea637984dde270ef6242c6dd43d5e12f829ed2464388950ee791dbbfa8df796843942c415fbc2f WHIRLPOOL d018f7f4cc9820057642bc691c0812866083a54f9399421f1b6eedfdb55e8cdfd42b0088c12e15facbfbeccd76a6df6351b0103eac35b5d5ca43900521ee274a
 EBUILD snort-2.9.4.6-r1.ebuild 8684 SHA256 7a6bc0033e52d5a4d1c3b0a5c2eeca1e3751232af46bf2773f54e94a61cb73e4 SHA512 098a90677def25487a9a2b786fc2e3fb1c12cd988fc77306a4ddc194851e844c54b2bcf8df906e3e6231df53234a3bb300283896e53a9d3cb21a5619cbb36ee5 WHIRLPOOL 37f7857fbfe6602e8b313739b459af802af858fd2d1a3c6340799b3ae7e9f622a150bbac093d1baab0bf2a486eddad6126676d72555f1d2caa09fab4e0a25d2c
 EBUILD snort-2.9.5.6.ebuild 8678 SHA256 9f87362e0a6985cee737d78b00e5b70e03831afa1e6b2fb33792f145f80c3b05 SHA512 8ebac2a153f6d342a286c44d77037bd4c438bbb592521f6add0d536fae77a76cce1ff3276f9b3f6347ecb2f6bfce9f5f0d065bbd047bbd15006202f0e4d0e44c WHIRLPOOL fb9ff629611151cc3a3a85fecb31f2a373584fbf78db72866ebcfb1e0d99072de23d8d6e84b7e1e8ea4d9a2a5efe19dff0f48495f52074cc6dc16a5162b7669d
 EBUILD snort-2.9.6.0.ebuild 8727 SHA256 96d77ecb89534df0cc87381375c8a438b979aa749c7c2d6e0e26d58bee466ba3 SHA512 b0b7a645392625314a46a5ae672570fcd06e84849b879b5325ac6fe67ae6d79ac0b208575d3ac6bc4f2d50318382fe694c21400fbf0ef67290b37d8f26f427e0 WHIRLPOOL 340dfbafcfa5fe175ba46c897f09be18237bb0ead4ef2802ea34ed9d08bdea02483df26dffe44dba675553a5106e0781facfb316c0c427805f654cd1e9d24ab2
 EBUILD snort-2.9.6.1.ebuild 8729 SHA256 c7c8ba3951779562574f9d100b0c5845a75d4347ce3a2b92bf262ca32c65a61e SHA512 efffcd4dc8b990057f0ca7df6dc973b231dcc18ab4095c7ce7f9e794936899f5046ee44a28f45b7880953bfc18596e84af1d56dd8ac0fb48a8bc18e6a6793955 WHIRLPOOL afcfa3bfb9d0ed904247ff33448947959cf6bee80bfc20105d9311e681ff98bc2472da19095cc4b8ee4cfc2936cc0e25b63d2e339d432c6612839f0ac4c8315e
 EBUILD snort-2.9.6.2.ebuild 8732 SHA256 51597405d909df309c75cb0d79a2a7d6e7d9280585027399686e7731f05ce0a4 SHA512 171397b0db7f86490e972a14fc0a9fde8f028519d1108cf571fca7d9d3395c2b4148c10ee7ac865b07f0750a97ca5faaccec9078344f3de7babf458c970fbe5a WHIRLPOOL 71078fc3874d96cafecad4f7f6900a1269ec965de574f53412206306827d6ec29c7f5152b7a26f241ae5095182920c6d521cfcfb44de235f0b802b0e66755dce
-MISC ChangeLog 36098 SHA256 12c6c05823e1d66434d64163e16a915c5c382693ae96d4b8ca7aa85336f182dc SHA512 3cfc2570495e33aa198263d1b72bdd62435691371decf99768fd742b466a1b919ca501eca68801a506f1b2802181f944c0aee89c98e987f5a4dd134cbd778013 WHIRLPOOL ca93570731a314d566b6965a1b6949c16dea2d863a4d7506596ce6903800fafedb741375e6f5b203210d4c2a748950786682667995e03df3c0df408ea1d22ae2
+EBUILD snort-2.9.7.0.ebuild 8661 SHA256 a8efb6438e153ab637eb60af200f294f4d354b5754a033853072bdf151070902 SHA512 ab1bb5cad0312d5a77adb360c75c85452e4ee32f3a17779d8ec50afc4c8116bab74639ba82d0a9da75a70f4d94b2ba8a7acc343e44c2d5e605061bfe07193783 WHIRLPOOL bad75ff24a1851dc755cef1a346be49b1d4a0a3d43e0de0bcc70cb7b8e67acefad4920e62d355ee67b8f416a4d05ba9fedc707ad8ec3cfd1fb0b39edbc704bec
+MISC ChangeLog 36221 SHA256 299b001ad9e44ce425322a2c147c0cf3721d3bd8754ef9ef0ea3a21262deb946 SHA512 75e5c4f0e24b9ea96b99a67e11bd2f5006c8c65c729041d4e22da815b7c3beb2f34cce2d5c85aa8fbfee1252d45c8478b0ee802ab337e760c31cb90d0538ca94 WHIRLPOOL ad1711e81eb92aa7967bb8ad3c0147d8da8ac92070ca35a7e9514d5123ecf24d4f205b5ece8d4e38d0239b368903c18460d2a005e34e3c56ec7073eb8a0e97d5
 MISC metadata.xml 5163 SHA256 1cba429bc6c631439913bdb2cd5ac6d1c8ea73330d6e034f3f43143e6f37dd4a SHA512 0a741ee8ac244ab387e1a8e783cc62da07c595e9e78dfc0fd14a099327b4de2234b0d30d05853db8acc0386275f60314eb682104b6bef900d3183d6d1004f3ec WHIRLPOOL 0dddc308a4e42c0b1cb724aa366e6d83987fdee3db06271ce2f95de5ef9f04df5ee3ffb35b4a5114dc68c781fc7caea8fc3a3415ac94687dccdf2be458245946
--- a/net-analyzer/snort/snort-2.9.7.0.ebuild
+++ b/net-analyzer/snort/snort-2.9.7.0.ebuild
@ -0,0 +1,250 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.9.7.0.ebuild,v 1.1 2014/10/27 05:47:33 patrick Exp $
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
+non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
+threads debug +active-response +normalizer reload-error-restart
+react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@ -1,6 +1,18 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.480 2014/10/13 21:03:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.482 2014/10/27 06:03:53 robbat2 Exp $
+
+  27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.4.40-mdb-unbundle.patch:
+  failed to commit this the first time due to CVS blip.
+
+*openldap-2.4.40-r1 (27 Oct 2014)
+
+  27 Oct 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +files/openldap-2.4.40-db-6.patch, +files/slapd-initd-2.4.40-r1,
+  +openldap-2.4.40-r1.ebuild, metadata.xml:
+  Bug #525110: Improve handling for DB-6; Bug #525408: fix init script; Bug
+  #525126: use external lmdb

  13 Oct 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.40.ebuild:
  Bug #440470: Clean up elog stuff with Arfrever's suggestion.
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@ -21,6 +21,8 @@ AUX openldap-2.4.31-gcc47.patch 480 SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab
 AUX openldap-2.4.33-gnutls.patch 1863 SHA256 e8d493246c2e652135f130c1dedbeb9760bed5f61d73c6662ba7f816ead59e52 SHA512 1b3830cf96b2c470e723dd966330e1b0a69c11aa7b10b5af04f2ab907e7e9ffd038589af7a472a374f47b5d08638b06ad04e0ff9a9180a9b5fc89884d3437df4 WHIRLPOOL 331798cf7ef9270ad57ca81ad1c32c223f8cd3932cec7fb235e3328acabedf68f952ace2903c45277617ebc0f498c919e62eadf638fb5d817717b324635531cd
 AUX openldap-2.4.35-contrib-samba4.patch 1400 SHA256 64ca91d3edae25d392f39a7f538e269b26de4e09923f872014e84ec388bda911 SHA512 332c4b2daa3eba165cfdcd479b1012e139d60095aaa628f8f5750fffb722d39395935bd7d7e56272e98fd234ab0be1c6568a71feeda5d88ba24b91b385defdad WHIRLPOOL c472dc75bbc1261b84ce0bfe8dd0a749200d7540647733ca13c0b1ccd8330739278f83eea3c91b3b29e5982eb6c9f9fb920ffdd9a6faaf4c0e66a97a1d16db55
 AUX openldap-2.4.35-contrib-smbk5pwd.patch 1626 SHA256 377b9204f51bb751d7311de3ee789386496372db2964ed2a929733099c23688a SHA512 c045c7605d25bab9eef8c12752f4952e3e6358124764ded91f5f98210686bc371f32ac20c56a63de80410f882f20e0889eec95474f1ee9d4c5bb4ed303ec8da0 WHIRLPOOL 64feead042fe22ec8bd36a23a11ea1af513702de2ab063324f0e49802635ca53b9f2f662159c8784877f6342d0a15cb231710be2ea69031c3df7459cd150cc47
+AUX openldap-2.4.40-db-6.patch 1012 SHA256 9ed45a48a0853956bb41ba65e6c8728ae1925f661e96897c8f5abc250f99d56a SHA512 b50d44c0a8d4ece3149cb0a2bee15c1335a119d5ba69199ce3e94782e5a3bfae0cf568bdfa87c4c82911405584341fe4ffd1b7a7eb91c90070f82c2be152d247 WHIRLPOOL 7a7334623690e23d82b590867608ee7b47933034df859380805805116e0bb2853a092ca7136c1faa4ed39c2f115507646e394b7b4020a34c3b0b09b6bcbdb64a
+AUX openldap-2.4.40-mdb-unbundle.patch 3589 SHA256 43be88ef0810608232b2490e7f06f66272d17059c581f76d4de79c415365dd97 SHA512 ec123ff8cef6c32b1f29c2d0643433dd88dfa8ab62b4d7536de829475ff8b45b5c7376f3e17f3424aab326a573aa36a593630feecbd40c3e574c6c24f5dd83ec WHIRLPOOL 0eadd603e016506d3365f81c802561a0201122b989033935a5a6b4737db75ff6c1517bcca1c7c127b54bfd7c1ea2db0c11f65228ea6c4cbacf2f783af98dfddb
 AUX openldap-2.4.40-slapd-conf 2059 SHA256 306602d38cbbdc2203e9f838348cbe9b264738cf86bbebc60272658b92a1eff9 SHA512 7ce8a8262db74d86449a3d31b96b2efa9e8dae2f9992a1c3a6d6899fb65531eaf917f410d8728852cb74338d7ba3c8c3b52d2f6cdcbba4cb3b97f6c733099fa2 WHIRLPOOL 979a2802501ec22dd93032eb3bc1a3df322558013cd8038736bac436b33fdb666df5d93fbfcc4d99762c10aa9e1a1edef496fa364d2b4f0019b5dd702174b6f4
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b WHIRLPOOL 624f11c996825bb248dd7c33f64afd3a4e8b9edbbe79c6fdffc7f2d8e57c5d8ac4c651eae7763dbc0a06144b916131b70e599771034bcb6bd8c586a9bf6a8209
 AUX slapd-confd 614 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89 SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 WHIRLPOOL d45df7487a952f899e9098779edda82afd9fb5ca66e42bbaf4a94f9ebdda9be58a026c0358a521a2feb4cc04c1f8477fb034896054ca4575d717bec367e1e2e8
@ -28,6 +30,7 @@ AUX slapd-confd-2.4.28-r1 1072 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfe
 AUX slapd-initd 1277 SHA256 b0769a9790a6da8adfedcffc53b6d0d21756c299d94894ea635c3d9dea506844 SHA512 8bc6384ccf83900cac17ecc001251dedbbae945d48d7d51a65c3aaa4d2714a4a2f9de558a16a39d679aa2b0bd45c66a1fe1704e14021756bc0dd8512ecbb1345 WHIRLPOOL 799de21cdd8c836dee1751830431d7823e1741327062795891e14aac3421f67fe01ee1fcef27f6b3b79817003708527049114503d0f539c5380c34d14bf7e930
 AUX slapd-initd-2.4.28-r1 981 SHA256 1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f SHA512 e57f1e26d3635cb9328aa021c7033abca5a02959eeb2ff9534c4cae6f89b1e4e4992590dd3ae9fcc5529fa6ab109973624d06bcfe3aac126214cfca08e8aed0e WHIRLPOOL bddd056cbf759ef5e9f510165eb786ed3153b1ed7f53191325ffff999adfc4360139da79873e2190d7988345559e62692dd5327f24fad1c28c7a8b6f38e8eb9f
 AUX slapd-initd-2.4.40 1510 SHA256 05ab6f1d7ffe731249ead7bdcaa3e1980bc0e89b9070890794bcda9512bf63b7 SHA512 6705aa3540af915025f1c192c24529a60fe95afb875dc91b712748d70e78c6bdb2e94ea8063bbf9dd1aa7dd98f402f07f9894c92fc3638c887e61e8a3e2bf23c WHIRLPOOL e9b559d8d50e5db5fb5f599c60db983db5ccbca444a5d8c7b47d6aa46291d6b431e41ad40fa4d8f72a878b452d365f6ef1fa13809e7f09044f000769ffa4e6f9
+AUX slapd-initd-2.4.40-r1 1841 SHA256 82ac6d0fcda9a50ab6b2bdc1b44fb70ffbf463962b2de424f2ebcd467c6f45a2 SHA512 83a79cbd93e423a1965e8f74a0f24825eb6a72ec7715d55dba949818f319524d94b2166750672609eb77a57247989a59336c9542e4cdcf7a3084fa469eb0c954 WHIRLPOOL a6d25b54c27e43e70207ec52d27b145eb11ca582a319b9fe5971d6588c2ca1cd28984b5f746c4ba522bcf69c143ef809fb3011cefa857dbc1ab0ba853201ab9c
 AUX slapd-initd2 622 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa SHA512 36faef3b274fbb8f958893a6375e8ba99949705f73ed06d0022b09e7e4531ff3fdc1f87b026a787fafab05a9d227b3381d769c79d54662542c5bc15f1fec3afa WHIRLPOOL dba6e25b5e7ceb0f72c5a46f39d6271e0e76410296584dee96e46c5c18793a995183154fa98dd76f4f926c76a8dc988c87dbe1912e9d8048bd7cf1bbffc1103c
 AUX slapd.service 284 SHA256 106563991611b44717cf93c10473edef39b4f0b4b391e29b9d5bdd3059c7a64a SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82 WHIRLPOOL d1ff7b8c672d9b38116cc8984567179a743b140211ae99bebd00729d8dc3cfcd4ed7c0833a18b071c9fa20eeb2cce4e053e7b6805474fc3ca8442167254c1e35
 AUX slapd.service.conf 443 SHA256 462adb8f6fc1a9f742c792b4392346d30949eed523453dd19b64afc9dc448145 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b WHIRLPOOL 8697c1c1c82c5c3fbb5d3fffc43e56f1a05a8bf23443270f2a051fde7d6ca0d1c5102611ac62d244b2c190c6bd1fb675cc46a5978a715d2df4e72f13c58db3c8
@ -58,6 +61,7 @@ EBUILD openldap-2.4.35.ebuild 22183 SHA256 c85606e0e461306d3da36f2ebacffea27edfd
 EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db5ffcd514628adaa106b11a801aa174 SHA512 0847b7fd3d9c473501e08fe3af0562476eb2325c4749c2f7f7ae63f55d0c8aa940d2ca1e3667ff45bafcabe32a23175bf9e99a37b5fad1f2c612c42e20d54b1d WHIRLPOOL 735b128508f135849fea5c9c4310c2faed5e612b8b662f3f44ff89d05d87edf68a86d4c00c22470e6d634876b910e629b741ee9c8d8f3607bc77a565f7f77deb
 EBUILD openldap-2.4.38-r2.ebuild 23988 SHA256 4d35a67fd87f7b25ab939b17d2a7efe314f19cc937ab148d36dd1cfe12a82fe4 SHA512 46e72b3e2a02281d6dd96e80e9519a62fc3951f8c68cc24a5eb4c291f89ac52155c158e7f0dd9d714d7f64f6e46cb9e5ecd61ad367c09be23339c5f8323f028f WHIRLPOOL 22f6fd3d6cc418ab16caf96109f4aee3cd872aec377f57656ad5c97df6b69199ac8ab9c587e45c7f928c164ed8e869bd96094c39c9702177920d63b774e6abaa
 EBUILD openldap-2.4.39.ebuild 23993 SHA256 60c0d2a86303f67cb7d4e8bac0398a48f309439e7628ddc1e99b71e27cb613be SHA512 291722e8516f9db02b35b721e57f5b2a299a9cab032d3a99ca776dbba025873cb8dde7bf711a39283ffd65952952dbd7996a930857baac3c1ad7c7ccb5dfa0dd WHIRLPOOL 219d7a3500d2fccc23496f1b9fe2adf34e46c179a691fc60e2ef37af11778981e5e89369fd5ffcff23aed7a99df56d7c4d7b62ac42a740e3a3a3daf405628fc2
+EBUILD openldap-2.4.40-r1.ebuild 26584 SHA256 8ba2015e9cb4ecbcb6a938bb467092c840923b6f347c5c74c12e969c37351ec5 SHA512 d417713ced880d526d47fee15d0cec8064b108103b48034b0db2aa1bb4002f2785b77bffe399b944bf8ce5a8435774fd8a4d1cf3933fbde22e4a99148f3e7da7 WHIRLPOOL 07d82ba9228193ba4cb7c60800fcc51e4de950369ed67bff699d6493837a450a6ce62d6b79f39407ac6e99617131b06761a6eb263bf17d2d7b3aa0262fb632ce
 EBUILD openldap-2.4.40.ebuild 26649 SHA256 00fda023cac73b0415bddc4bbdc1b310fbbc94d91fd8a01d11ba38921b87f0b0 SHA512 744649e5b44c0259386a78c2cd0c3bd236f6cdbdb4bc2e32c8dbcab91bcdab4c48df20f0722d409b89e9ea207e8951ba0bc25a1fc7ac8cff93641e4aacaf48d1 WHIRLPOOL 7e119156ffcaeca06b1920e970d2acaf4aec2cd28bfd741ce7bf0a4ec7f8905a0963b5c94b46195c2f049068e7ec91e8b92acd2c90b4c4aab06a101c621f6096
-MISC ChangeLog 84349 SHA256 aa8c2ad99b935cfe9c70183d06aa2e47d1992ee9b741e2cdf0369416a3a319d6 SHA512 a4aaf3a958d91ca9072308ee3b7ececfc8c87d621a93d0f70e1346d705c42cc5f423a10310fa67167bae235c9d86464f2d39b6822ce98d67aeb811648bc435f6 WHIRLPOOL 6f33b82f2eba784b21c844e35cf596beca8d05d1080e303875fb7b0e770849cff1f432fba8364e0bda3a80e7d640636c4006ead0bc9d619f7704df2c5833f447
-MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
+MISC ChangeLog 84809 SHA256 30e7e20fe037384c3fcbdbb3d551aaa39bec0f02d470cbb93c1a4be9a973dea6 SHA512 30f309954d15f649af4e2cf2ff7a65a660972a2f80184f03b85dc3c3b0c4af6d8c29a19dfb1ee89d9f61da20e007e80ff02f7f80e98a3ecf7f59b572e1f30391 WHIRLPOOL b7aa4e3aea90ea29e54f089989d8bfca39454928be9c7f007246734219e1b6715b4fa6cb2d885f34542cac3500b2c7c79c3fe4805974a06decc28e75818b630d
+MISC metadata.xml 773 SHA256 cbf6a17e91453ce562af82e2bdb3cc37c422f5b15574c2c9c401e8ef4de45476 SHA512 551553fc55a55e9b1c38670dcebe01eb746df423cd205e65c92b940b40b5035594fce7f22b7860935a552ef7515210826a973da2c429156615c0394776d53070 WHIRLPOOL 99e74da58ceb71a13cf5720c81ef83be48ef9d4b19f4a286b38c5621ed471dd4253328ec23ed276d35ec5e46e5b685c3b7508f91448e60d72db0c46984c9d3bd
--- a/net-nds/openldap/files/openldap-2.4.40-db-6.patch
+++ b/net-nds/openldap/files/openldap-2.4.40-db-6.patch
@ -0,0 +1,28 @@
+Re-allow building with >= BerkeleyDB-6.0.20.
+
+If you do build/link against this version, please note that the licenses
+PROHIBIT distribution of the binaries. We will enforce RESTRICT=bindist for
+this.
+
+X-Gentoo-Bug: 525110
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=525110
+
+diff -ur openldap-2.4.40/build/openldap.m4 openldap-2.4.40.fix/build/openldap.m4
+--- openldap-2.4.40/build/openldap.m4	2014-09-19 05:48:49.000000000 +0400
+++ openldap-2.4.40.fix/build/openldap.m4	2014-10-16 15:51:38.223985217 +0400
+@@ -553,13 +553,10 @@
+ 
+ #define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
+ 
+-/* require 4.4 or later, but less than 6.0.20 */
+-#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
+/* require 4.4 or later */
+#if DB_VERSION_FULL >= 0x040400
+ 	__db_version_compat
+ #endif
+-#if DB_VERSION_FULL >= 0x060014
+-#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
+-#endif
+ 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
--- a/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
+++ b/net-nds/openldap/files/openldap-2.4.40-mdb-unbundle.patch
@ -0,0 +1,136 @@
+--- ./build/top.mk.orig	2014-10-24 14:34:59.260827298 +0200
+++ ./build/top.mk	2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+ 
+ BDB_LIBS = @BDB_LIBS@
+MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+ 
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig	2014-10-24 10:52:02.837221734 +0200
+++ ./build/openldap.m4	2014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+ 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
+dnl --------------------------------------------------------------------
+dnl Check for version compatility with back-mdb
+AC_DEFUN([OL_MDB_COMPAT],
+[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[
+	AC_EGREP_CPP(__mdb_version_compat,[
+#include <lmdb.h>
+
+/* require 0.9.14 or later */
+#if MDB_VERSION_FULL >= 0x00000009000E
+	__mdb_version_compat
+#endif
+	], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
+])
+
+dnl
+dnl --------------------------------------------------------------------
+dnl Find any MDB
+AC_DEFUN([OL_MDB],
+[ol_cv_mdb=no
+AC_CHECK_HEADERS(lmdb.h)
+if test $ac_cv_header_lmdb_h = yes; then
+	OL_MDB_COMPAT
+
+	if test $ol_cv_mdb_compat != yes ; then
+		AC_MSG_ERROR([LMDB version incompatible with MDB backends])
+	fi
+
+	ol_cv_lib_mdb=-llmdb
+	ol_cv_mdb=yes
+fi
+])
+
+ dnl
+ dnl ====================================================================
+ dnl Check POSIX Thread version 
+--- ./servers/slapd/back-mdb/Makefile.in.orig	2014-10-24 10:31:30.860931076 +0200
+++ ./servers/slapd/back-mdb/Makefile.in	2014-10-24 14:33:33.803705424 +0200
+@@ -25,11 +25,10 @@
+ 	extended.lo operational.lo \
+ 	attr.lo index.lo key.lo filterindex.lo \
+ 	dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+-	nextid.lo monitor.lo mdb.lo midl.lo
+	nextid.lo monitor.lo
+ 
+ LDAP_INCDIR= ../../../include       
+ LDAP_LIBDIR= ../../../libraries
+-MDB_SUBDIR = $(srcdir)/$(LDAP_LIBDIR)/liblmdb
+ 
+ BUILD_OPT = "--enable-mdb"
+ BUILD_MOD = @BUILD_MDB@
+@@ -44,7 +43,7 @@
+ 
+ LIBBASE = back_mdb
+ 
+-XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR)
+XINCPATH = -I.. -I$(srcdir)/..
+ XDEFS = $(MODULES_CPPFLAGS)
+ 
+ all-local-lib:	../.backend
+@@ -52,11 +51,5 @@
+ ../.backend: lib$(LIBBASE).a
+ 	@touch $@
+ 
+-mdb.lo:	$(MDB_SUBDIR)/mdb.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c
+-
+-midl.lo:	$(MDB_SUBDIR)/midl.c
+-	$(LTCOMPILE_MOD) $(MDB_SUBDIR)/midl.c
+-
+ veryclean-local-lib: FORCE
+ 	$(RM) $(XXHEADERS) $(XXSRCS) .links
+--- ./configure.in.orig	2014-10-24 10:46:53.289139847 +0200
+++ ./configure.in	2014-10-24 10:51:34.372846374 +0200
+@@ -519,6 +519,7 @@
+ dnl Initialize vars
+ LDAP_LIBS=
+ BDB_LIBS=
+MDB_LIBS=
+ SLAPD_NDB_LIBS=
+ SLAPD_NDB_INCS=
+ LTHREAD_LIBS=
+@@ -1905,6 +1906,30 @@
+ fi
+ 
+ dnl ----------------------------------------------------------------
+ol_link_mdb=no 
+
+if test $ol_enable_mdb != no; then
+	OL_MDB
+
+	if test $ol_cv_mdb = no ; then
+		AC_MSG_ERROR(MDB: LMDB not available)
+	fi
+
+	AC_DEFINE(HAVE_MDB,1,
+		[define this if LMDB is available])
+
+	dnl $ol_cv_lib_mdb should be yes or -llmdb
+	dnl (it could be no, but that would be an error
+	if test $ol_cv_lib_mdb != yes ; then
+		MDB_LIBS="$MDB_LIBS $ol_cv_lib_mdb"
+	fi
+
+	SLAPD_LIBS="$SLAPD_LIBS \$(MDB_LIBS)"
+
+	ol_link_mdb=yes 
+fi
+
+dnl ----------------------------------------------------------------
+ 
+ if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then
+ 	BUILD_LIBS_DYNAMIC=shared
+@@ -3133,6 +3158,7 @@
+ AC_SUBST(LDAP_LIBS)
+ AC_SUBST(SLAPD_LIBS)
+ AC_SUBST(BDB_LIBS)
+AC_SUBST(MDB_LIBS)
+ AC_SUBST(SLAPD_NDB_LIBS)
+ AC_SUBST(SLAPD_NDB_INCS)
+ AC_SUBST(LTHREAD_LIBS)
--- a/net-nds/openldap/files/slapd-initd-2.4.40-r1
+++ b/net-nds/openldap/files/slapd-initd-2.4.40-r1
@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.40-r1,v 1.1 2014/10/27 05:33:59 robbat2 Exp $
+
+extra_commands="checkconfig"
+
+[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}"
+PIDDIR=/run/openldap
+PIDFILE=$PIDDIR/$SVCNAME.pid
+
+depend() {
+	need net
+	before dbus hald avahi-daemon
+	provide ldap
+}
+
+start() {
+	checkpath -q -d ${PIDDIR} -o ldap:ldap 
+	if ! checkconfig -Q ; then
+		eerror "There is a problem with your slapd.conf!"
+		return 1
+	fi
+	ebegin "Starting ldap-server"
+	[ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME
+	eval start-stop-daemon --start --pidfile ${PIDFILE} --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ldap-server"
+	start-stop-daemon --stop --signal 2 --quiet --pidfile ${PIDFILE}
+	eend $?
+}
+
+checkconfig() {
+	# checks requested by bug #502948
+	# Step 1: extract the last valid config file or config dir
+	set -- $OPTS
+	while [ -n "$*" ]; do
+		opt=$1 ; shift
+		if [ "$opt" = "-f" -o "$opt" = "-F" ] ; then
+			CONF=$1
+			shift
+		fi
+	done
+	set --
+	# Fallback
+	CONF=${CONF-/etc/openldap/slapd.conf}
+	[ -d $CONF ] && CONF=${CONF}/*
+	DBDIRS=`eval awk '/^(directory|olcDbDirectory:)/{print $2}' $CONF`
+	for d in $DBDIRS; do
+		if [ ! -d $d ]; then
+			eerror "Directory $d in config does not exist!"
+			return 1
+		fi
+		/usr/bin/find $d ! -name DB_CONFIG ! -user ldap -o ! -group ldap |grep -sq .
+		if [ $? -ne 0 ]; then
+			ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!"
+		fi
+		[ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" 
+	done
+	# now test the config fully
+	/usr/sbin/slaptest -u "$@" ${OPTS_CONF}
+}
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@ -12,5 +12,6 @@
 		<flag name='smbkrb5passwd'>Enable overlay for syncing ldap, unix and
 			lanman passwords</flag>
 		<flag name='minimal'>Build libraries &amp; userspace tools only. Does not install any server code.</flag>
+		<flag name='bindist'>Make the built binaries safe for redistribution: Disables use of Berkeley DB 6</flag>
 	</use>
 </pkgmetadata>
--- a/net-nds/openldap/openldap-2.4.40-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r1.ebuild
@ -0,0 +1,817 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r1.ebuild,v 1.1 2014/10/27 05:33:58 robbat2 Exp $
+
+EAPI="5"
+
+inherit db-use eutils flag-o-matic multilib multilib-minimal ssl-cert versionator toolchain-funcs autotools user systemd
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+# mirrors are mostly not working, using canonical URI
+SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
+		 mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
+IUSE_BACKEND="+berkdb +bindist"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs"
+IUSE_CONTRIB="smbkrb5passwd kerberos"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+REQUIRED_USE="cxx? ( sasl )"
+# This is only actually applicable if linking against db-6
+RESTRICT="!minimal? ( !bindist? ( berkdb? ( bindist ) ) )"
+
+# always list newer first
+BDB_SLOTS='6.1 6.0 5.3 5.1 4.8 4.7 4.6 4.5 4.4'
+
+# openssl is needed to generate lanman-passwords required by samba
+RDEPEND="icu? ( dev-libs/icu:= )
+	ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] ) )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		sys-devel/libtool
+		sys-libs/e2fsprogs-libs
+		>=dev-db/lmdb-0.9.14
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl[-build(-)] )
+		samba? ( dev-libs/openssl )
+		berkdb? ( 
+			>=sys-libs/db-4.4
+			bindist? ( <sys-libs/db-6 ) 
+			)
+		smbkrb5passwd? (
+			dev-libs/openssl
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? ( virtual/krb5 )
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+	selinux? ( sec-policy/selinux-ldap )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r3
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	openldap_datadirs=""
+	if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/etc/openldap/slapd.conf)"
+	fi
+	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs}; do
+		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
+		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
+		if [ -d ${CURRENT_TAGDIR} ] &&	[ ${openldap_found_tag} == 0 ] ; then
+			einfo "- Checking ${each}..."
+			if [ -r ${CURRENT_TAG} ] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source ${CURRENT_TAG}
+				if [ "${OLDPF}" == "" ] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
+
+				[ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1
+
+				# are we on the same branch?
+				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[ $(openldap_filecount ${each}) -gt 0 ] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd
+	if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# If USE=bindist, then >=DB-6 is not permitted
+			use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
+			# find which one would be used
+			for bdb_slot in $BDB_SLOTS ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "$NEWVER" ]] && break
+			done
+		fi
+		local fail=0
+		if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
+			:
+			# Nothing wrong here.
+		elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [ "${OLDVER}" != "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[ "${fail}" == "1" ] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [ "${FORCE_UPGRADE}" != "1" ]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		"${S}"/include/ldap_defaults.h
+
+	epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
+		"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	epatch "${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	epatch "${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	epatch "${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# bug #421463
+	#epatch "${FILESDIR}"/${PN}-2.4.33-gnutls.patch # merged upstream
+
+	# bug #525110: allow compiling with db-6 against
+	# but RESTRICT=bindist now applies
+	use bindist || epatch "${FILESDIR}"/${PN}-2.4.40-db-6.patch
+
+	# unbundle lmdb
+	epatch "${FILESDIR}"/${P}-mdb-unbundle.patch
+	rm -rf "${S}"/libraries/liblmdb
+
+	cd "${S}"/build || die
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed -i \
+		-e 's|/bin/sh|/bin/bash|g' \
+		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}" || die
+
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	cd "${S}/contrib/slapd-modules/$1" || die
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+}
+
+src_configure() {
+	#Fix for glibc-2.8 and ucred. Bug 228457.
+	append-cppflags -D_GNU_SOURCE
+
+	# Bug 408001
+	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU usage is not configurable
+	export ac_cv_header_unicode_utypes_h="$(multilib_is_native_abi && use icu && echo yes || echo no)"
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			# >=db-6 is probibited for bindist
+			use bindist && BDB_SLOTS=${BDB_SLOTS/6.0} && BDB_SLOTS=${BDB_SLOTS/6.1}
+			DBINCLUDE=$(db_includedir $BDB_SLOTS)
+			einfo "Using $DBINCLUDE for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			$(use_enable slp)
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	ECONF_SOURCE=${S} \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	cd "${BUILD_DIR}/contrib/ldapc++" || die
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake \
+				CC="${CC}" CXX="${CXX}"
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+		fi
+
+		if use kerberos ; then
+			build_contrib_module "kinit" "kinit.c" "kinit"
+			cd "${S}/contrib/slapd-modules/passwd" || die
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+		fi
+		# We could build pw-radius if GNURadius would install radlib.h
+		cd "${S}/contrib/slapd-modules/passwd" || die
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		build_contrib_module "nops" "nops.c" "nops-overlay"
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		# build slapi-plugins
+		cd "${S}/contrib/slapi-plugins/addrdnvalues" || die
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests || die "make tests failed"
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install
+	use static-libs || prune_libtool_files --all
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default
+		eend
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		newinitd "${FILESDIR}"/slapd-initd-2.4.40-r1 slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+		einfo "Install systemd service"
+		systemd_dounit "${FILESDIR}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		systemd_newtmpfilesd "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		if [[ $(get_libdir) != lib ]]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i \
+				"${ED}"/etc/init.d/slapd \
+				"${ED}"/usr/lib/systemd/system/slapd.service || die
+		fi
+		# If built without SLP, we don't need to be before avahi
+		use slp \
+			|| sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"etc/init.d/slapd
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la; do
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README  allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		use prefix || chown ldap:ldap "${EROOT}"var/run/openldap
+		chmod 0755 "${EROOT}"var/run/openldap
+		use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default}
+		use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -5850,6 +5850,7 @@ net-nds/gosa-core:samba - Manage samba accounts with gosa.
 net-nds/ldapvi:gnutls - Use net-libs/gnutls instead of dev-libs/openssl
 net-nds/nsscache:nsscache - Depend on sys-auth/libnss-cache to handle flat files
 net-nds/nsscache:nssdb - Depend on sys-libs/libnss_db to handle dbm files.
+net-nds/openldap:bindist - Make the built binaries safe for redistribution: Disables use of Berkeley DB 6
 net-nds/openldap:experimental - Enable experimental backend options
 net-nds/openldap:minimal - Build libraries & userspace tools only. Does not install any server code.
 net-nds/openldap:odbc - Enable ODBC and SQL backend options