diff --git a/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild
index 9d45dabd553b..61d008e9d258 100644
--- a/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild,v 1.1 2015/04/09 20:05:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mongo-tools/mongo-tools-3.0.2.ebuild,v 1.2 2015/04/10 07:40:15 ultrabug Exp $
EAPI=5
@@ -32,10 +32,6 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
-
- # bug #544346
- # remove when https://github.com/mongodb/mongo-tools/issues/13 is done
- sed -e 's/type Options int/type Options int64/g' -i vendor/src/github.com/spacemonkeygo/openssl/ctx.go || die
}
src_compile() {
diff --git a/app-crypt/libscrypt/libscrypt-1.20.ebuild b/app-crypt/libscrypt/libscrypt-1.20.ebuild
index f15c55081eed..bc844f4d931d 100644
--- a/app-crypt/libscrypt/libscrypt-1.20.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libscrypt/libscrypt-1.20.ebuild,v 1.3 2015/04/09 16:56:38 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libscrypt/libscrypt-1.20.ebuild,v 1.4 2015/04/10 09:51:25 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 48d37071c097..c1984053ef2e 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -25,6 +25,7 @@ DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264
DIST wine-1.7.38.tar.bz2 22027786 SHA256 981ee93e7db6b2b8d1ee16999cdff915a9411b1566539edc56137f9cd4d36bc0 SHA512 36793b8b2fd678b9542ff2c32582234a175e9795682b93c0df881dc1adac65dff8d33509511fe7400d8b099880df8d6f13ecc18e0c8b72827d9ac009770ddc81 WHIRLPOOL 646a36cd4f50c3c81fafc95e11e5c8df68e7c14e7b582b6cd7f5f99d3f37afebd9655e8b0c28bb7995c957d87f96913ac13c2fc425075406e32cbf9a23440add
DIST wine-1.7.39.tar.bz2 22122289 SHA256 6affb007fe772eb5588c584e3bdb62db96d8291c7fc8e75a5fd0bb098391335c SHA512 0eda88c4c092c2d596097548a341f62128dc39ffd6c88c514378639864dfbeedad3cb436065a85981cb2d9399a4cf439d1c301ec651a7e21eac886931218b6f5 WHIRLPOOL 9cb9d99d94e5abecbf5c6717165b58c7c23784aef0a4ffe2edaca2aef63e5706f17aa1102e00424fd849b30598f5d3b8206ea6b473c4337bb486211d7c3daf46
DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
+DIST wine-1.7.40.tar.bz2 22183479 SHA256 0d82e639a553765437f9a3f864f383e8e4e1eb0f1dd815263f9fda1c78d5cab6 SHA512 3d812b8eefa14f3fea908345b9a8950e9a409e5e45b38d73105c181bfc3fa5f9ef82a022cffcc2efd45f79220ab9ff139b3729410b7708ed6ff960647761dd61 WHIRLPOOL c9935e5daf077b3bb66209fe572b494ca8250c16f76a13122f61899112559a010344ff9e2046a9132d904b0396e519291eba641ebc8add364dda85becfd5d14b
DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
DIST wine-compholio-1.7.22.tar.gz 888414 SHA256 110da63d7037bfbff1a1b64659b01161976e3e686961d8ed30218ff0d4bafac2 SHA512 a19fd6c82a7395a09cdbe29d013fe4667c169aba95995eb64eb4946768a35308950c420fe704a75cf4d7a4c5c9920c34d4928b5715948068f2e4eeb8a6b06a92 WHIRLPOOL 58de03bf7a07f44a2843277fdafd2104d40fb5a7ccbbcb8ea0c2048596d6a76036c15c48bc4332b2ee48c5432692115f0ad85176da3029ba7730f5bd48f2a11b
@@ -42,6 +43,7 @@ DIST wine-staging-1.7.29.tar.gz 8423703 SHA256 27fab2e3a16f1af4580328ec399bd3839
DIST wine-staging-1.7.33.tar.gz 8759402 SHA256 30b7ecee549514ecd186689ae8eac15ed37507755025c8272d31e8fd4808b3f2 SHA512 b3b939c8d5af419a9305a16de93486f75197d28bc39be4ca0abdea3e194745bfb401ecf6e092f93c59f68255aa7f051ee847ad3c8521ce87ecbf91abccc900f6 WHIRLPOOL 657bc4d642e1c799c6e0b39ef627c8f6852ab8d511e86f96c54065d87fb144d25a97b1a2572e87a029084d568fda7bbdab7c2ba5255dc07f02691f46e9796960
DIST wine-staging-1.7.38.tar.gz 9047747 SHA256 b77fc0913c972c0cb2b3fcc3d7627a838ba05cb876396cab526f518564f2f936 SHA512 125937505308a974840d810beb9df10d57cf488b173836c5debf71a96cc11cd3dfee666960768db361edd3b280858f2e6db5eaa8d81f4b487b7c53a0f8fef13c WHIRLPOOL c5cb14dd7527752a0496e343d7b12a53c9df629c027d746e33ac3c25ad20bfebd22c40ceb31bd5e70d3ea2a9188efe076eceab30c3c3f2d519fb31164f189f5a
DIST wine-staging-1.7.39.tar.gz 9096658 SHA256 b7b3ba39e2a8829a6fd6aef4b3701dd0009eebc85539ac946e31de6d7fe36649 SHA512 d14780c30303a17f575f22adeab5cc026c2f41520d47dbb7ec70b939252eae656070eb8532cf1a42cca2b1c9c589a44081d12b2647b0d97c3c90b896a7433d23 WHIRLPOOL 8d71a49c3172261e83193ccfe85dfbd94421ee20063f4127ecb328450916cddbea742c59c09c34e10035d9f2fa0df0ebd0d68bbc6e90b92c1aa1a1071a26b055
+DIST wine-staging-1.7.40.tar.gz 9129843 SHA256 d2cafa5e847e1aecb82bb1dd42ea7729f749176c3ddc549c6b422c8ba74b89d5 SHA512 7688f9e2178335b8c1606673921368faa1532c766bf2a60c9be1d9640719acf024122270084afc892195878bfcadb6aea6cbf971a6bb2112260b3840d94ab994 WHIRLPOOL b58e5dcdbbb1632ed8d8bf98c34396c0a8e1d108d557d130ab9aceaa9efd9b9002eef38c7829196eae0736c1002a1e1c723bcdcf0a819e48a1394e615c997262
DIST wine_gecko-1.0.0-x86.cab 8119486 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c SHA512 0b8f778698f04ed2c01c25a866e54752ff67ad42099179c3c4d161b7f2cba92f262ee6ad909b382e57038428eacddf519b77934c079451eb0cbab6a030eee307 WHIRLPOOL d77903a7fecbc3ecc2d0ddb58fbc98fb401a796fc4d21b216de12702aef38a120c2e7d6f8279308a1d96b66b230973f076f267f246b3b1c02b40e40a518a57e7
DIST wine_gecko-1.3-x86.msi 13609984 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae SHA512 4d45ec762eba1fc2cc8ac1f6672e88ef392395ecd97a48038845c2dd7b40a49df7460cd88aff432b75bfe75231108710901a4759d2ab3998ed7052130d6bc46b WHIRLPOOL d9afae5ab439612e509fbe2b8a405a0252f872e826b0b6cb2c739c1cea0eb4c3a35e5152ac1ad583d17c21fec5c013a43f13779e92929b93e51ee819b70e73d7
DIST wine_gecko-1.3-x86_64.msi 13835776 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75 SHA512 26e596e498368f8307435a85e440205c1105e10538f8e6ddbb24fd022eed495e4f2d7f09b6b06d26b5a3cf1eb8d629f9baf342fcd239b3aeb16f08324e376e01 WHIRLPOOL 9f3502cf8514873ad3fb49aff0c63eda2b8fa3659d4dbecdb3366d4949cc0b256fcfa0e4269f011887e856113a3bf74dfc365348b9ab1a2c78eac98ab990d3ee
diff --git a/app-emulation/wine/wine-1.7.40.ebuild b/app-emulation/wine/wine-1.7.40.ebuild
new file mode 100644
index 000000000000..e5ed5e0e7810
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.40.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.40.ebuild,v 1.1 2015/04/10 06:24:37 idella4 Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.36"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+ abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+ pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ test? ( abi_x86_32 )
+ elibc_glibc? ( threads )
+ mono? ( abi_x86_32 )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ vaapi? ( staging )
+ osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+NATIVE_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0 )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ udisks? ( sys-apps/dbus )
+ fontconfig? ( media-libs/fontconfig:= )
+ gphoto2? ( media-libs/libgphoto2:= )
+ openal? ( media-libs/openal:= )
+ gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups:= )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm:= )
+ jpeg? ( virtual/jpeg:0= )
+ ldap? ( net-nds/openldap:= )
+ lcms? ( media-libs/lcms:2= )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ netapi? ( net-fs/samba[netapi(+)] )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC:= )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pcap? ( net-libs/libpcap )
+ staging? ( sys-apps/attr )
+ pulseaudio? ( media-sound/pulseaudio )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends:= )
+ ssl? ( net-libs/gnutls:= )
+ png? ( media-libs/libpng:0= )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( x11-libs/libva[X] )
+ xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+ !amd64? ( ${NATIVE_DEPEND} )
+ amd64? (
+ abi_x86_64? ( ${NATIVE_DEPEND} )
+ abi_x86_32? (
+ truetype? ( || (
+ >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+ ) )
+ ncurses? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+ ) )
+ udisks? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+ >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+ ) )
+ fontconfig? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ ) )
+ gphoto2? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+ ) )
+ openal? ( || (
+ app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+ >=media-libs/openal-1.15.1[abi_x86_32(-)]
+ ) )
+ gstreamer? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ (
+ >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+ >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+ )
+ ) )
+ X? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ (
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+ )
+ ) )
+ xinerama? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+ ) )
+ alsa? ( || (
+ app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+ >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+ ) )
+ cups? ( || (
+ app-emulation/emul-linux-x86-baselibs
+ >=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+ ) )
+ opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+ opengl? ( || (
+ app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+ (
+ >=virtual/glu-9.0-r1[abi_x86_32(-)]
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ )
+ ) )
+ gsm? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+ ) )
+ jpeg? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+ ) )
+ ldap? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+ ) )
+ lcms? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/lcms-2.5:2[abi_x86_32(-)]
+ ) )
+ mp3? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+ ) )
+ netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+ nls? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+ ) )
+ odbc? ( || (
+ app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+ >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+ ) )
+ osmesa? ( || (
+ >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+ >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+ ) )
+ pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+ pulseaudio? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+ ) )
+ staging? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+ ) )
+ xml? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+ )
+ ) )
+ scanner? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+ ) )
+ ssl? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+ ) )
+ png? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+ ) )
+ v4l? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+ ) )
+ vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
+ xcomposite? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+ ) )
+ )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ dos? ( games-emulation/dosbox )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )
+ pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+ staging? ( dev-lang/perl dev-perl/XML-Simple )
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ prelink? ( sys-devel/prelink )
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+ eerror "You need gcc-4.4+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ if use staging || use pulseaudio; then
+ EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+ unset ${PN}_LIVE_REPO;
+ EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+ fi
+ else
+ unpack ${MY_P}.tar.bz2
+ use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+ fi
+
+ unpack "${WINE_GENTOO}.tar.bz2"
+ use gstreamer && unpack "${GST_P}.patch.bz2"
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+ "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+ )
+ if use gstreamer; then
+ # See http://bugs.winehq.org/show_bug.cgi?id=30557
+ ewarn "Applying experimental patch to fix GStreamer support. Note that"
+ ewarn "this patch has been reported to cause crashes in certain games."
+
+ # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+ # during shutdown" patch and "Added patch to implement shared memory
+ # wineserver communication for various user32 functions" prevents the
+ # gstreamer patch from applying cleanly.
+ # So undo the staging patch, apply gstreamer, then re-apply rebased staging
+ # patch on top.
+ if use staging; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+ "${WORKDIR}/${GST_P}.patch"
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+ else
+ PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+ fi
+ fi
+ if use staging; then
+ ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+ ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+ ewarn "unless you can reproduce them with USE=-staging"
+
+ local STAGING_EXCLUDE=""
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $?
+ elif use pulseaudio; then
+ PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+ fi
+ autotools-utils_src_prepare
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+ fi
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ if use pulseaudio || use staging; then
+ myconf+=( $(use_with pulseaudio pulse) )
+ fi
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ local l
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+
+ # respect LINGUAS when installing man pages, #469418
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/dev-haskell/clock/metadata.xml b/dev-haskell/clock/metadata.xml
index de9386a89aed..f7accf134f2b 100644
--- a/dev-haskell/clock/metadata.xml
+++ b/dev-haskell/clock/metadata.xml
@@ -25,7 +25,4 @@
For more information, see:
<http://corsis.sourceforge.net/index.php/Haskell/Clock>
-
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild
deleted file mode 100644
index 3ff539df01c0..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r3.ebuild,v 1.16 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-# should be fixed in automake-1.13.2(?). Please test when released.
-# See automake bug #13514
-WANT_AUTOMAKE="1.12"
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- kerberos? ( virtual/krb5 )
- openldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
- epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.in || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- # Java support.
- use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf
-
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
- fi
-
- # Fix for bug #59634.
- if ! use ssl ; then
- myconf="${myconf} --without-des"
- fi
-
- if use mysql || use postgres || use sqlite ; then
- myconf="${myconf} --enable-sql"
- else
- myconf="${myconf} --disable-sql"
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=gdbm"
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
- else
- einfo "Building without SASLdb support"
- myconf="${myconf} --with-dblib=none"
- fi
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- if use urandom ; then
- myconf="${myconf} --with-devrandom=/dev/urandom"
- fi
-
- econf \
- --enable-login \
- --enable-ntlm \
- --enable-auth-sasldb \
- --disable-cmulocal \
- --disable-krb4 \
- --enable-otp \
- --without-sqlite \
- --with-saslauthd=/run/saslauthd \
- --with-pwcheck=/run/saslauthd \
- --with-configdir=/etc/sasl2 \
- --with-plugindir=/usr/$(get_libdir)/sasl2 \
- --with-dbpath=/etc/sasl2/sasldb2 \
- $(use_with ssl openssl) \
- $(use_with pam) \
- $(use_with openldap ldap) \
- $(use_enable ldapdb) \
- $(use_enable sample) \
- $(use_enable kerberos gssapi) \
- $(use_enable java) \
- $(use_with java javahome ${JAVA_HOME}) \
- $(use_with mysql mysql /usr) \
- $(use_with postgres pgsql) \
- $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
- $(use_enable srp) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- cd "${S}"
- if use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- keepdir /etc/sasl2
-
- if use sample ; then
- docinto sample
- dodoc sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through makefile
- rm -Rf "${D}/usr/$(get_libdir)/java"
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- dodir "/usr/share/doc/${PF}/java/Test"
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- docinto ""
- dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
- newdoc pwcheck/README README.pwcheck
- dohtml doc/*.html
-
- docinto "saslauthd"
- dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
- use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-
- preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
deleted file mode 100644
index ab7b696ccd17..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild,v 1.4 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- kerberos? ( virtual/krb5 )
- openldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
- epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.in || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- # #486740 #468556
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- configure.in || die
- sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- saslauthd/configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- # Java support.
- use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf
-
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
- fi
-
- # Fix for bug #59634.
- if ! use ssl ; then
- myconf="${myconf} --without-des"
- fi
-
- if use mysql || use postgres || use sqlite ; then
- myconf="${myconf} --enable-sql"
- else
- myconf="${myconf} --disable-sql"
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=gdbm"
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
- else
- einfo "Building without SASLdb support"
- myconf="${myconf} --with-dblib=none"
- fi
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- if use urandom ; then
- myconf="${myconf} --with-devrandom=/dev/urandom"
- fi
-
- econf \
- --enable-login \
- --enable-ntlm \
- --enable-auth-sasldb \
- --disable-cmulocal \
- --disable-krb4 \
- --enable-otp \
- --without-sqlite \
- --with-saslauthd=/run/saslauthd \
- --with-pwcheck=/run/saslauthd \
- --with-configdir=/etc/sasl2 \
- --with-plugindir=/usr/$(get_libdir)/sasl2 \
- --with-dbpath=/etc/sasl2/sasldb2 \
- $(use_with ssl openssl) \
- $(use_with pam) \
- $(use_with openldap ldap) \
- $(use_enable ldapdb) \
- $(use_enable sample) \
- $(use_enable kerberos gssapi) \
- $(use_enable java) \
- $(use_with java javahome ${JAVA_HOME}) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
- $(use_enable srp) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- cd "${S}"
- if use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- keepdir /etc/sasl2
-
- if use sample ; then
- docinto sample
- dodoc sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through makefile
- rm -Rf "${D}/usr/$(get_libdir)/java"
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- dodir "/usr/share/doc/${PF}/java/Test"
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- docinto ""
- dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
- newdoc pwcheck/README README.pwcheck
- dohtml doc/*.html
-
- docinto "saslauthd"
- dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
- use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
-}
-
-pkg_postinst () {
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-
- preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild
deleted file mode 100644
index 569aee61ea7b..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r5.ebuild,v 1.4 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-3.2 )
- gdbm? ( >=sys-libs/gdbm-1.8.0 )
- kerberos? ( virtual/krb5 )
- openldap? ( net-nds/openldap )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
- epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.in || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- # #486740 #468556
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- configure.in || die
- sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- saslauthd/configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- # Java support.
- use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf
-
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
- fi
-
- # Fix for bug #59634.
- if ! use ssl ; then
- myconf="${myconf} --without-des"
- fi
-
- if use mysql || use postgres || use sqlite ; then
- myconf="${myconf} --enable-sql"
- else
- myconf="${myconf} --disable-sql"
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=gdbm"
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
- else
- einfo "Building without SASLdb support"
- myconf="${myconf} --with-dblib=none"
- fi
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- if use urandom ; then
- myconf="${myconf} --with-devrandom=/dev/urandom"
- fi
-
- econf \
- --enable-login \
- --enable-ntlm \
- --enable-auth-sasldb \
- --disable-cmulocal \
- --disable-krb4 \
- --enable-otp \
- --without-sqlite \
- --with-saslauthd=/run/saslauthd \
- --with-pwcheck=/run/saslauthd \
- --with-configdir=/etc/sasl2 \
- --with-plugindir=/usr/$(get_libdir)/sasl2 \
- --with-dbpath=/etc/sasl2/sasldb2 \
- $(use_with ssl openssl) \
- $(use_with pam) \
- $(use_with openldap ldap) \
- $(use_enable ldapdb) \
- $(use_enable sample) \
- $(use_enable kerberos gssapi) \
- $(use_enable java) \
- $(use_with java javahome ${JAVA_HOME}) \
- $(use_with mysql) \
- $(use_with postgres pgsql) \
- $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
- $(use_enable srp) \
- $(use_enable static-libs static) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- cd "${S}"
- if use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- keepdir /etc/sasl2
-
- if use sample ; then
- docinto sample
- dodoc sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through makefile
- rm -Rf "${D}/usr/$(get_libdir)/java"
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- dodir "/usr/share/doc/${PF}/java/Test"
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- docinto ""
- dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
- newdoc pwcheck/README README.pwcheck
- dohtml doc/*.html
-
- docinto "saslauthd"
- dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
- use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_postinst () {
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild
deleted file mode 100644
index 72d262f71fde..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r7.ebuild,v 1.6 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- mysql? ( virtual/mysql )
- pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
- postgres? ( dev-db/postgresql )
- sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
- ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
- epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.in || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- # #486740 #468556
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- configure.in || die
- sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- saslauthd/configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Java support.
- multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf=()
-
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
- fi
-
- # Fix for bug #59634.
- if ! use ssl ; then
- myconf+=( --without-des )
- fi
-
- if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
- myconf+=( --enable-sql )
- else
- myconf+=( --disable-sql )
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf+=( --with-dblib=gdbm )
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf+=(
- --with-dblib=berkeley
- --with-bdb-incdir="$(db_includedir)"
- )
- else
- einfo "Building without SASLdb support"
- myconf+=( --with-dblib=none )
- fi
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- if use urandom ; then
- myconf+=( --with-devrandom=/dev/urandom )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-login \
- --enable-ntlm \
- --enable-auth-sasldb \
- --disable-cmulocal \
- --disable-krb4 \
- --enable-otp \
- --without-sqlite \
- --with-saslauthd=/run/saslauthd \
- --with-pwcheck=/run/saslauthd \
- --with-configdir=/etc/sasl2 \
- --with-plugindir=/usr/$(get_libdir)/sasl2 \
- --with-dbpath=/etc/sasl2/sasldb2 \
- $(use_with ssl openssl) \
- $(use_with pam) \
- $(use_with openldap ldap) \
- $(use_enable ldapdb) \
- $(multilib_native_use_enable sample) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_with java javahome ${JAVA_HOME}) \
- $(multilib_native_use_with mysql) \
- $(multilib_native_use_with postgres pgsql) \
- $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
- $(use_enable srp) \
- $(use_enable static-libs static) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- if multilib_is_native_abi && use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- if use sample ; then
- docinto sample
- dodoc "${S}"/sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through makefile
- rm -Rf "${D}/usr/$(get_libdir)/java"
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- dodir "/usr/share/doc/${PF}/java/Test"
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- dosbin saslauthd/testsaslauthd
- fi
-}
-
-multilib_src_install_all() {
- keepdir /etc/sasl2
-
- dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
- newdoc pwcheck/README README.pwcheck
- dohtml doc/*.html
-
- docinto "saslauthd"
- dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- prune_libtool_files --modules
-}
-
-pkg_postinst () {
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild
deleted file mode 100644
index c8a3de846420..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r8.ebuild,v 1.3 2014/12/28 15:30:29 titanofold Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
- authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
- berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
- gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- mysql? ( virtual/mysql )
- pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
- postgres? ( dev-db/postgresql )
- sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
- ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/sasl/md5global.h
-)
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
- epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
- epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
- epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
-
- # Get rid of the -R switch (runpath_switch for Sun)
- # >=gcc-4.6 errors out with unknown option
- sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
- configure.in || die
-
- # Use plugindir for sasldir
- sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
- "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
- # #486740 #468556
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
- -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- configure.in || die
- sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
- saslauthd/configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # Java support.
- multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
- local myconf=()
-
- # Add authdaemond support (bug #56523).
- if use authdaemond ; then
- myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
- fi
-
- # Fix for bug #59634.
- if ! use ssl ; then
- myconf+=( --without-des )
- fi
-
- if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
- myconf+=( --enable-sql )
- else
- myconf+=( --disable-sql )
- fi
-
- # Default to GDBM if both 'gdbm' and 'berkdb' are present.
- if use gdbm ; then
- einfo "Building with GNU DB as database backend for your SASLdb"
- myconf+=( --with-dblib=gdbm )
- elif use berkdb ; then
- einfo "Building with BerkeleyDB as database backend for your SASLdb"
- myconf+=(
- --with-dblib=berkeley
- --with-bdb-incdir="$(db_includedir)"
- )
- else
- einfo "Building without SASLdb support"
- myconf+=( --with-dblib=none )
- fi
-
- # Use /dev/urandom instead of /dev/random (bug #46038).
- if use urandom ; then
- myconf+=( --with-devrandom=/dev/urandom )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-login \
- --enable-ntlm \
- --enable-auth-sasldb \
- --disable-cmulocal \
- --disable-krb4 \
- --enable-otp \
- --without-sqlite \
- --with-saslauthd=/run/saslauthd \
- --with-pwcheck=/run/saslauthd \
- --with-configdir=/etc/sasl2 \
- --with-plugindir=/usr/$(get_libdir)/sasl2 \
- --with-dbpath=/etc/sasl2/sasldb2 \
- $(use_with ssl openssl) \
- $(use_with pam) \
- $(use_with openldap ldap) \
- $(use_enable ldapdb) \
- $(multilib_native_use_enable sample) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_with java javahome ${JAVA_HOME}) \
- $(multilib_native_use_with mysql mysql /usr) \
- $(multilib_native_use_with postgres pgsql) \
- $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
- $(use_enable srp) \
- $(use_enable static-libs static) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- # Thanks to axxo@gentoo.org for the solution.
- if multilib_is_native_abi && use java ; then
- jar -cvf ${PN}.jar -C java $(find java -name "*.class")
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- if use sample ; then
- docinto sample
- dodoc "${S}"/sample/*.c
- exeinto /usr/share/doc/${P}/sample
- doexe sample/client sample/server
- fi
-
- # Default location for java classes breaks OpenOffice (bug #60769).
- if use java ; then
- java-pkg_dojar ${PN}.jar
- java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
- # hackish, don't wanna dig through makefile
- rm -Rf "${D}/usr/$(get_libdir)/java"
- docinto "java"
- dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
- dodir "/usr/share/doc/${PF}/java/Test"
- insinto "/usr/share/doc/${PF}/java/Test"
- doins "${S}"/java/Test/*.java
- fi
-
- dosbin saslauthd/testsaslauthd
- fi
-}
-
-multilib_src_install_all() {
- keepdir /etc/sasl2
-
- dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
- newdoc pwcheck/README README.pwcheck
- dohtml doc/*.html
-
- docinto "saslauthd"
- dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
- newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
- newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
- systemd_dounit "${FILESDIR}/pwcheck.service"
-
- newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
- newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
- systemd_dounit "${FILESDIR}/saslauthd.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
- prune_libtool_files --modules
-}
-
-pkg_postinst () {
- # Generate an empty sasldb2 with correct permissions.
- if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
- einfo "Generating an empty sasldb2 with correct permissions ..."
- echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
- || die "Failed to generate sasldb2"
- "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
- || die "Failed to delete temp user"
- chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
- chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
- || die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
- fi
-
- if use authdaemond ; then
- elog "You need to add a user running a service using Courier's"
- elog "authdaemon to the 'mail' group. For example, do:"
- elog " gpasswd -a postfix mail"
- elog "to add the 'postfix' user to the 'mail' group."
- fi
-
- elog "pwcheck and saslauthd home directories have moved to:"
- elog " /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
deleted file mode 100644
index dbe3f096494c..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.22-db4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-support new db versions
-
-http://bugs.gentoo.org/192753
-
---- cyrus-sasl-2.1.22/cmulocal/berkdb.m4
-+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4
-@@ -213,7 +213,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+ for dbname in db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
- do
- LIBS="$saved_LIBS -l$dbname"
- AC_TRY_LINK([#include ],
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch
deleted file mode 100644
index 68fb75bc85b5..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://bugzilla.cyrusimap.org/show_bug.cgi?id=3589
-Gentoo bug #405097
---- cyrus-sasl-2.1.25/lib/saslutil.c.orig 2011-10-21 13:59:59.354462366 +0200
-+++ cyrus-sasl-2.1.25/lib/saslutil.c 2011-10-21 14:10:55.849675881 +0200
-@@ -555,32 +555,44 @@
- NULL, /* don't care abour service/port */
- &hints,
- &result) != 0) {
-- /* errno on Unix, WSASetLastError on Windows are already done by the function */
-- return (-1);
-+ if (abort_if_no_fqdn) {
-+ /* errno on Unix, WSASetLastError on Windows are already done by the function */
-+ return (-1);
-+ } else {
-+ goto LOWERCASE;
-+ }
- }
-
-- if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
-+ if (result == NULL || result->ai_canonname == NULL) {
- freeaddrinfo (result);
-+ if (abort_if_no_fqdn) {
- #ifdef WIN32
-- WSASetLastError (WSANO_DATA);
-+ WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
-- errno = ENODATA;
-+ errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
-- errno = EADDRNOTAVAIL;
-+ errno = EADDRNOTAVAIL;
- #endif
-- return (-1);
-+ return (-1);
-+ } else {
-+ goto LOWERCASE;
-+ }
- }
-
-- if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
-+ if (strchr (result->ai_canonname, '.') == NULL) {
- freeaddrinfo (result);
-+ if (abort_if_no_fqdn) {
- #ifdef WIN32
-- WSASetLastError (WSANO_DATA);
-+ WSASetLastError (WSANO_DATA);
- #elif defined(ENODATA)
-- errno = ENODATA;
-+ errno = ENODATA;
- #elif defined(EADDRNOTAVAIL)
-- errno = EADDRNOTAVAIL;
-+ errno = EADDRNOTAVAIL;
- #endif
-- return (-1);
-+ return (-1);
-+ } else {
-+ goto LOWERCASE;
-+ }
- }
-
-
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
deleted file mode 100644
index 3fe193c8144f..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-gssapi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix segfault in gssapi.
-
---- a/plugins/gssapi.c
-+++ b/plugins/gssapi.c
-@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
- }
-
- if (output_token->value && output) {
-- unsigned char * p = (unsigned char *) text->encode_buf;
-+ int len;
-
- ret = _plug_buf_alloc(text->utils,
- &(text->encode_buf),
-@@ -384,11 +384,8 @@ sasl_gss_encode(void *context, const str
- return ret;
- }
-
-- p[0] = (output_token->length>>24) & 0xFF;
-- p[1] = (output_token->length>>16) & 0xFF;
-- p[2] = (output_token->length>>8) & 0xFF;
-- p[3] = output_token->length & 0xFF;
--
-+ len = htonl(output_token->length);
-+ memcpy(text->encode_buf, &len, 4);
- memcpy(text->encode_buf + 4, output_token->value, output_token->length);
- }
-
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
deleted file mode 100644
index 6c79bb0fb406..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-lib_before_plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fixes parallel make
-http://git.cyrusimap.org/cyrus-sasl/commit/?id=5611d43e27098f659f84155271cf42f46aab1caf
-
-From 5611d43e27098f659f84155271cf42f46aab1caf Mon Sep 17 00:00:00 2001
-From: Alexey Melnikov
-Date: Thu, 22 Sep 2011 14:41:12 +0000
-Subject: lib should be built before plugins (Patch from marcandre.lureau@redhat.com)
-
----
-diff --git a/Makefile.am b/Makefile.am
-index d6005fb..b35164e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -69,7 +69,7 @@ else
- INSTALLOSX =
- endif
-
--SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
-+SUBDIRS=include sasldb lib plugins utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
- EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT
-
- dist-hook:
---
-cgit v0.9.0.2
diff --git a/dev-python/Kivy/Kivy-1.9.0.ebuild b/dev-python/Kivy/Kivy-1.9.0.ebuild
new file mode 100644
index 000000000000..3f5e6adb2775
--- /dev/null
+++ b/dev-python/Kivy/Kivy-1.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild,v 1.1 2015/04/10 08:29:03 slis Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications."
+HOMEPAGE="http://kivy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo camera doc examples garden gstreamer spell"
+
+DEPEND="
python
-
- idella4@gentoo.org
- Ian Delaney
-
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 19d8dbeaec98..fdd53912ba35 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,3 +1,4 @@
DIST pymongo-2.6.3.tar.gz 324241 SHA256 cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2 SHA512 6da3cbf035b52379c24df37b76e1eb743b12c1026116e28e4e7b6450e2674d730f9c8c2dd85f352c6ee4c9f604decaffc2dbc57fe64268bd7522d8ce155cca9e WHIRLPOOL ac36dd88c4311237ecda66a6008fa0d89d0670e331df6c49a08a1d3bc4ddcafe72e8e003009c206d3ac12afb1b14afe2d3615834a5a8df5ce30442f7b49fdbf2
DIST pymongo-2.7.2.tar.gz 381455 SHA256 8fb45e3edec006f4b11580fc579bec7781a8b3201ce0abf31593f086070e51f6 SHA512 0e78495462d670c168e716a7c34e05f6a11a203f0bf9b32c1488608343588a48cbbb76ce715411b310359de19d9cd57c75f80ac7d8195a122a760cec22e8d0c7 WHIRLPOOL 6cb7eedc530908c2fdb17b6e31561d9c860d6fd1edddb4d66288c3fe11bc199ebc58538a70508b2540b827077f62345a86729644fdf8d37c1b9934de03e77543
DIST pymongo-2.8.tar.gz 394529 SHA256 0543f65364fb54fb54b954136cf6b5e689ab12a7c1d15c59c52d3d0c5fa73935 SHA512 5ff223d1652cb32c236b3e3de30308c17aa3de2fa558f639cc3212ec2cf46b2fffc69341ee5998fc75fe4981d3dd340a544503ab3dad3aeda53a07382b19779a WHIRLPOOL 28ef0b6cd80d19b88bc435d7c66202f4fa3fd72f5b3012f36bd21b0311bd7e5c49339803b3d88356fc1640cf32aaf4cc0d5c62daf811472edcaf62a59a152832
+DIST pymongo-3.0.tar.gz 375457 SHA256 1919bed7ad5d73940a6628b7420d326128dc68f3f67d4158abacff8b72a4eaa7 SHA512 9dd79fc6fa26837de9f5a262185a87923b7218d3ea08d9dea248a6ac60d5c203d6407ac25532886ee19a5128a1c7edf2d344a5d6e52e695eaf0c77190e40d6e5 WHIRLPOOL 8a8cb050c1802920c95e505078cac64159c16f026ffc86537a9bba4cbce95bf17dc325bd2f2519f69b8f9e3c6756ea917a6e6330a201b57cc628464a6cb24df2
diff --git a/dev-python/pymongo/pymongo-3.0.ebuild b/dev-python/pymongo/pymongo-3.0.ebuild
new file mode 100644
index 000000000000..28bcb1b7ea3f
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-3.0.ebuild,v 1.1 2015/04/10 08:45:31 ultrabug Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RDEPEND="
+ kerberos? ( dev-python/pykerberos )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-db/mongodb-2.6.0
+ )
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+ if use test; then
+ # During the tests, database size reaches 1.5G.
+ local CHECKREQS_DISK_BUILD=1536M
+
+ check-reqs_${1}
+ fi
+}
+
+pkg_pretend() {
+ reqcheck pkg_pretend
+}
+
+pkg_setup() {
+ reqcheck pkg_setup
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir html || die
+ sphinx-build doc html || die
+ fi
+}
+
+src_test() {
+ # Yes, we need TCP/IP for that...
+ local DB_IP=127.0.0.1
+ local DB_PORT=27000
+
+ export DB_IP DB_PORT
+
+ # 1.5G of disk space per run.
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ local dbpath=${TMPDIR}/mongo.db
+ local logpath=${TMPDIR}/mongod.log
+
+ # Now, the hard part: we need to find a free port for mongod.
+ # We're just trying to run it random port numbers and check the log
+ # for bind errors. It shall be noted that 'mongod --fork' does not
+ # return failure when it fails to bind.
+
+ mkdir -p "${dbpath}" || die
+ while true; do
+ ebegin "Trying to start mongod on port ${DB_PORT}"
+
+ LC_ALL=C \
+ mongod --dbpath "${dbpath}" --smallfiles --nojournal \
+ --bind_ip ${DB_IP} --port ${DB_PORT} \
+ --unixSocketPrefix "${TMPDIR}" \
+ --logpath "${logpath}" --fork \
+ && sleep 2
+
+ # Now we need to check if the server actually started...
+ if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+ # yay!
+ eend 0
+ break
+ elif grep -q 'Address already in use' "${logpath}"; then
+ # ay, someone took our port!
+ eend 1
+ : $(( DB_PORT += 1 ))
+ continue
+ else
+ eend 1
+ eerror "Unable to start mongod for tests. See the server log:"
+ eerror " ${logpath}"
+ die "Unable to start mongod for tests."
+ fi
+ done
+
+ local failed
+ #https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+ pushd "${BUILD_DIR}"/../ > /dev/null
+ if [[ "${EPYTHON}" == python3* ]]; then
+ 2to3 --no-diffs -w test
+ fi
+ DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+ mongod --dbpath "${dbpath}" --shutdown
+
+ [[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+ rm -rf "${dbpath}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 741d27d9c8f1..7b6ed2fa8d61 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1 +1,2 @@
DIST mini_magick-3.8.1.tar.gz 219340 SHA256 2c44e5d8a8d4cd1dbef15a1f67517c03d16081f916eb8612e35ebd942b4d6e1e SHA512 be3465a2f5c38b21e26cddc551ff442f5ac009aaeb579f79547726077e270c5e3fae955c44707c5cfeb76399a947f0d917eac68c2dd982e231163527bc559908 WHIRLPOOL 06c897114f330be1d5edb948e2a6d2d6a35e3a2866b0ce3825f9e93bda1696d4ca5146a90721a0b16d01366d21f20662ce41e78a8026fa5d32e02805b1111e1d
+DIST mini_magick-4.2.1.tar.gz 1059651 SHA256 da09b071870371fd1aaa5bf24a462d363d3a451fa118e7e8630adf505b2a7580 SHA512 3ff9de560b9624e1ad77db8dd9feb27c21ca6b94e24ee5d2b0e6f39b47a7e6db49676842bcb5cdc7c24d4c32c91d6c6077d92f7f003c566187b90776fc7253e7 WHIRLPOOL 555f53bffa51ec765dbab614588a04af4ccb2315892052cdfc4a8dd5489d230f7651157a041b1f12da6188888138c218cb3e6a62b9093698a02c6b1d7478cba7
diff --git a/dev-ruby/mini_magick/mini_magick-4.2.1.ebuild b/dev-ruby/mini_magick/mini_magick-4.2.1.ebuild
new file mode 100644
index 000000000000..e79e2213b635
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mini_magick/mini_magick-4.2.1.ebuild,v 1.1 2015/04/10 05:57:15 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="http://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( media-gfx/imagemagick[tiff,jpeg,png] >=media-gfx/graphicsmagick-1.3.20[tiff,jpeg,png] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn )"
+
+all_ruby_prepare() {
+ # remove executable bit from all files
+ find "${S}" -type f -exec chmod -x {} +
+
+ sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+ # Don't force a specific formatter but use overall Gentoo defaults.
+ sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+ # Avoid test depending on graphicsmagick
+ sed -e '/identifies when gm exists/,/^ end/ s:^:#:' \
+ -i spec/lib/mini_magick_spec.rb || die
+}
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index f9647c1f9f09..3cf7a4fe4614 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,4 +1,2 @@
-DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569216da654f4ee6fd3b0278dabc103333 SHA512 cfa5724b413fab608ed15e5977301f9a6fe69d787ae2ad19c3d615ec443bf7250c33f582c252f9ab1c9632d8919d252937922407158d75f8b4295eb23032f374 WHIRLPOOL 44a7df0c38ccb7693938f10f63831828ca9f3e22a627b5d4e7f23a4756f8f6edf0f27e39c75f3678fec8c18c14cf944c126eba60c211c2b5e590b029593774c5
-DIST makemkv-bin-1.9.1.tar.gz 5051390 SHA256 d88a08ee6b188db94ef8d366ae8aa3c65eab8a2993f549b847989808198da810 SHA512 ab64351acd260fd3fa36eadf9a4335283a7fd08f7fb8a673570a7321065b3a37af6789486046fe616c3d1d8c656f97abb1fa88222887c6df1dbe077f6a6821ee WHIRLPOOL 218ccc33f693adad84687a525333855cf7ea8b4016e643f68858fe04e738c1796b3c1ab7da8ec64315ceab683d0befc3d533244491b4400a91c101399d6b7693
-DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
-DIST makemkv-oss-1.9.1.tar.gz 4217346 SHA256 22677e16a1fadda80f9b0961a114c396aa0d8a105fe62f66722f0d24469795f4 SHA512 19d0a766f53e564c9a6f11964baf7a250e08ea4957205e19c7d8d49b5c666134df6f4fa8392e994a010de69dc43c912a9d9ac34d41e69c62b0dac8c807e8a402 WHIRLPOOL 6e488753b7ec9e4121cd15128b3e5d5b0571e240cb3214fa32ac81e75c0918b11fabdfdd288c3c6301a175c70f424d5e337db13af13dcae6126ffdc909d66e4c
+DIST makemkv-bin-1.9.2.tar.gz 5148005 SHA256 72aea4a5254de9e07430ae6237fc60551cfa890d882a64a0783a2959e3f14b42 SHA512 f1ee3e027c6b9c38e2154003df43181a656c57cd9b5042c5f6fc4c56436c3348462bbe870cf13c4ffc2b55d8c77375bfba606f3c34d5ce78d9d8c1efd8cab45f WHIRLPOOL 50c5a794cf51938f66383d658ab62de3efb8bae32a5d473522ba25560d264a13d6a756a7265751d2b9d455950c2f2ca3d02d5ad8dfae2976977f1f4a9180b29d
+DIST makemkv-oss-1.9.2.tar.gz 4217396 SHA256 6687eba7ea772d017ccdf165369edb3d1a0609c12822b1eab75e9681be639a1c SHA512 eeb52e7be402f8e5b0a83845bfbae16314452bc992089e1f0955e0f342edbcb3163a26010673f9034821fd9f7c981d92252be393a630ee26fa83f02d215b34e4 WHIRLPOOL 7ca0c6a9b1c18ae4f795a04cbb7ac18a4f1fd48e08abf3826b8f1ce600add01cc212f72aa2b43bf34267a8805405aca903774658cc18d413484910bf9a00b0dc
diff --git a/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch
deleted file mode 100644
index 0c7e41e97c4c..000000000000
--- a/media-video/makemkv/files/makemkv-1.8.10-makefile.linux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makemkv-oss-1.8.10/Makefile.in.orig 2014-04-25 09:25:24.558767575 -0600
-+++ makemkv-oss-1.8.10/Makefile.in 2014-04-25 09:25:44.930534931 -0600
-@@ -50,7 +50,7 @@
- endif
-
- out/%: out/%.full
-- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
-+ $(OBJCOPY) --discard-all $< $@
-
- out/libdriveio.so.0.full:
- mkdir -p out
diff --git a/media-video/makemkv/files/makemkv-makefile.patch b/media-video/makemkv/files/makemkv-makefile.patch
new file mode 100644
index 000000000000..f3db0819c95d
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-makefile.patch
@@ -0,0 +1,19 @@
+--- makemkv-oss-1.9.2/Makefile.in.orig 2015-04-07 14:28:32.000000000 +0100
++++ makemkv-oss-1.9.2/Makefile.in 2015-04-09 22:00:26.821163836 +0100
+@@ -50,7 +50,7 @@
+ endif
+
+ out/%: out/%.full
+- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
++ $(OBJCOPY) --discard-all $< $@
+
+ out/libdriveio.so.0.full:
+ mkdir -p out
+@@ -94,6 +94,6 @@
+
+ tmp/image_data.o : makemkvgui/bin/image_data.bin
+ mkdir -p tmp
+- $(LD) -r -b binary -o $@.rw $<
++ $(LD) -r -b binary -z noexecstack -o $@.rw $<
+ $(OBJCOPY) --rename-section .data=.rodata2,readonly,alloc,load,data,contents $@.rw $@
+
diff --git a/media-video/makemkv/makemkv-1.8.10.ebuild b/media-video/makemkv/makemkv-1.8.10.ebuild
deleted file mode 100644
index 19694d3e51f0..000000000000
--- a/media-video/makemkv/makemkv-1.8.10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.10.ebuild,v 1.3 2014/10/15 20:44:34 pacho Exp $
-
-EAPI=5
-inherit eutils gnome2-utils multilib flag-o-matic
-
-MY_P=makemkv-oss-${PV}
-MY_PB=makemkv-bin-${PV}
-
-DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
-HOMEPAGE="http://www.makemkv.com/"
-SRC_URI="http://www.makemkv.com/download/old/${MY_P}.tar.gz
- http://www.makemkv.com/download/old/${MY_PB}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib"
-
-QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
-
-RDEPEND="
- sys-libs/glibc[multilib?]
- dev-libs/expat
- dev-libs/openssl:0
- sys-libs/zlib
- virtual/opengl
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- || ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/makemkv-oss-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.linux.patch
-}
-
-src_configure() {
- replace-flags -O* -Os
- if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
- econf
- fi
-}
-
-src_compile() {
- emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
-}
-
-src_install() {
- # install oss package
- dolib.so out/libdriveio.so.0
- dolib.so out/libmakemkv.so.1
- dolib.so out/libmmbd.so.0
- dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
- dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
- dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
- dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
- dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
- dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
- into /opt
- dobin out/makemkv
-
- local res
- for res in 16 22 32 64 128; do
- newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
- done
-
- make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
-
- # install bin package
- pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
- if use x86; then
- dobin i386/{makemkvcon,mmdtsdec}
- elif use amd64; then
- dobin amd64/makemkvcon
- use multilib && dobin i386/mmdtsdec
- fi
- popd >/dev/null
-
- # install license and default profile
- pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null
- insinto /usr/share/MakeMKV
- doins *.{gz,xml}
- popd >/dev/null
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- elog "While MakeMKV is in beta mode, upstream has provided a license"
- elog "to use if you do not want to purchase one."
- elog ""
- elog "See this forum thread for more information, including the key:"
- elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
- elog ""
- elog "Note that beta license may have an expiration date and you will"
- elog "need to check for newer licenses/releases. "
- elog ""
- elog "If this is a new install, remember to copy the default profile"
- elog "to the config directory:"
- elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
-}
-
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-video/makemkv/makemkv-1.9.1.ebuild b/media-video/makemkv/makemkv-1.9.2.ebuild
similarity index 96%
rename from media-video/makemkv/makemkv-1.9.1.ebuild
rename to media-video/makemkv/makemkv-1.9.2.ebuild
index fc971cc04b5f..bebb1408c82d 100644
--- a/media-video/makemkv/makemkv-1.9.1.ebuild
+++ b/media-video/makemkv/makemkv-1.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.9.1.ebuild,v 1.1 2015/03/08 10:55:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.9.2.ebuild,v 1.1 2015/04/10 09:27:52 chewi Exp $
EAPI=5
inherit eutils gnome2-utils multilib flag-o-matic
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-{1.8.10-makefile.linux,path}.patch
+ epatch "${FILESDIR}"/${PN}-{makefile,path}.patch
}
src_configure() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 110455d5993d..2507a7b34242 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Apr 2015 05:37:04 +0000
+Fri, 10 Apr 2015 13:36:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 110455d5993d..2507a7b34242 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Apr 2015 05:37:04 +0000
+Fri, 10 Apr 2015 13:36:52 +0000
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.0.2 b/metadata/md5-cache/app-admin/mongo-tools-3.0.2
index 2f0db61f6490..f3ea9e6527c3 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.0.2
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.0.2
@@ -10,4 +10,4 @@ RDEPEND=! mongo-tools-3.0.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=df42c75bef87bd0b1921a3fed8c3ee84
+_md5_=a1e40a9ad3a7224a62d5fb393328a152
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.20 b/metadata/md5-cache/app-crypt/libscrypt-1.20
index 67e6ff364276..3fc8a8ebf46a 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.20
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.20
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile
DESCRIPTION=Shared library to impliment the scrypt algorithm. See http://www.tarsnap.com/scrypt.html.
EAPI=5
HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
LICENSE=BSD-2
SLOT=0
SRC_URI=https://github.com/technion/libscrypt/archive/v1.20.tar.gz -> libscrypt-1.20.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=28307e5558d27daf72462589f617d570
+_md5_=5a22c955560847c163db9b142ccf1d79
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.40 b/metadata/md5-cache/app-emulation/wine-1.7.40
new file mode 100644
index 000000000000..0e181e63c991
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-1.7.40
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) amd64? ( abi_x86_32? ( !abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) ) ) staging? ( dev-lang/perl dev-perl/XML-Simple ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) prelink? ( sys-devel/prelink ) >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc sys-devel/flex !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix
+EAPI=5
+HOMEPAGE=http://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en linguas_en_US linguas_eo linguas_es linguas_fa linguas_fi linguas_fr linguas_he linguas_hi linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ml linguas_nb_NO linguas_nl linguas_or linguas_pa linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr_RS@cyrillic linguas_sr_RS@latin linguas_sv linguas_te linguas_th linguas_tr linguas_uk linguas_wa linguas_zh_CN linguas_zh_TW 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 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=!amd64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) amd64? ( abi_x86_64? ( truetype? ( >=media-libs/freetype-2.0.0 ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2:= ) udisks? ( sys-apps/dbus ) fontconfig? ( media-libs/fontconfig:= ) gphoto2? ( media-libs/libgphoto2:= ) openal? ( media-libs/openal:= ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXrandr x11-libs/libXi x11-libs/libXxf86vm ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) opencl? ( virtual/opencl ) opengl? ( virtual/glu virtual/opengl ) gsm? ( media-sound/gsm:= ) jpeg? ( virtual/jpeg:0= ) ldap? ( net-nds/openldap:= ) lcms? ( media-libs/lcms:2= ) mp3? ( >=media-sound/mpg123-1.5.0 ) netapi? ( net-fs/samba[netapi(+)] ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC:= ) osmesa? ( media-libs/mesa[osmesa] ) pcap? ( net-libs/libpcap ) staging? ( sys-apps/attr ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends:= ) ssl? ( net-libs/gnutls:= ) png? ( media-libs/libpng:0= ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X] ) xcomposite? ( x11-libs/libXcomposite ) ) abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] ) ) gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] ) ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=virtual/jpeg-0-r2:0[abi_x86_32(-)] ) ) ldap? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] ) ) odbc? ( || ( app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pcap? ( net-libs/libpcap[abi_x86_32(-)] ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) staging? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)] ) ) ) scanner? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] ) ) ssl? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)] ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) ) dos? ( games-emulation/dosbox ) perl? ( dev-lang/perl dev-perl/XML-Simple ) s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 ) pulseaudio? ( realtime? ( sys-auth/rtkit ) )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( threads ) mono? ( abi_x86_32 ) pipelight? ( staging ) s3tc? ( staging ) vaapi? ( staging ) osmesa? ( opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.40.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz )
+_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c autotools-utils 3727db64c7b960903d5033280f108080 eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 l10n 33bde4fb0cfd3a21a277b66bfd837e19 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pax-utils dfe060cb70d89757fde5c1ff8405e950 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
+_md5_=61d4aea6a50d78c78b57633749c4340a
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r3 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r3
deleted file mode 100644
index 948f1eb18cb1..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=18d67444db84ed1b25ade064881abd5f
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r4
deleted file mode 100644
index 8465c3afe4ac..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e0d3215acee5a81877f83f8f75c93a6d
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r5 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r5
deleted file mode 100644
index f8dbeee9bae9..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=43fc19011d64fa8c4172f517f2ae05af
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r7 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r7
deleted file mode 100644
index 5134d6ecfe02..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ebc5e64a44abbbe37a9fb0afeda87734
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r8 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r8
deleted file mode 100644
index 0c276ca546b5..000000000000
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4 ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig
-DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
-EAPI=5
-HOMEPAGE=http://cyrusimap.web.cmu.edu/
-IUSE=authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite srp ssl static-libs urandom 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 elibc_FreeBSD java
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=BSD-with-attribution
-RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=2
-SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c db-use 82d0e62839f20e1e0d5a2259abd5316f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pam aa1ebb3ab720ea04dbbdd6eaaf9554ed systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fcd760dec22712475ccdc6ce30c524a2
diff --git a/metadata/md5-cache/dev-python/Kivy-1.9.0 b/metadata/md5-cache/dev-python/Kivy-1.9.0
new file mode 100644
index 000000000000..ae3d998addbd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Kivy-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==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-2:=[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 software library for rapid development of hardware-accelerated multitouch applications.
+EAPI=5
+HOMEPAGE=http://kivy.org/
+IUSE=cairo camera doc examples garden gstreamer spell python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND==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-2:=[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/K/Kivy/Kivy-1.9.0.tar.gz
+_eclasses_=distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=bab710722a5512e885c9e657b1ccdf90
diff --git a/metadata/md5-cache/dev-python/pymongo-3.0 b/metadata/md5-cache/dev-python/pymongo-3.0
new file mode 100644
index 000000000000..830ad85f059f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymongo-3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=kerberos? ( dev-python/pykerberos ) 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(-)] doc? ( dev-python/sphinx[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/nose[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-db/mongodb-2.6.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Python driver for MongoDB
+EAPI=5
+HOMEPAGE=http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo
+IUSE=doc kerberos test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=Apache-2.0
+RDEPEND=kerberos? ( dev-python/pykerberos ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymongo/pymongo-3.0.tar.gz
+_eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 distutils-r1 c01d5c4af34f4a37a51fc9638299c222 eutils 9fb270e417e0e83d64ca52586c4a79de multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
+_md5_=09662dd69acb65a3e2df7d5a7144f2a4
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.2.1 b/metadata/md5-cache/dev-ruby/mini_magick-4.2.1
new file mode 100644
index 000000000000..f04c7824e379
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( media-gfx/imagemagick[tiff,jpeg,png] >=media-gfx/graphicsmagick-1.3.20[tiff,jpeg,png] ) ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] dev-ruby/posix-spawn[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha[ruby_targets_ruby20] dev-ruby/posix-spawn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha[ruby_targets_ruby21] dev-ruby/posix-spawn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] dev-ruby/posix-spawn[ruby_targets_ruby22] ) ) 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) 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] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Manipulate images with minimal use of memory
+EAPI=5
+HOMEPAGE=http://github.com/minimagick/minimagick
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick 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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=https://github.com/minimagick/minimagick/archive/v4.2.1.tar.gz -> mini_magick-4.2.1.tar.gz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de java-utils-2 85dc5414cfdfbdf5b56e6d8345d2c658 multilib 3bf24e6abb9b76d9f6c20600f0b716bf ruby-fakegem d4f8591e9b20b106327e9d143eb13da5 ruby-ng c79a9fd7644eefe8009be02a82648e1f toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7d56f29a56cf1c8f99b6bdabdc14a377
diff --git a/metadata/md5-cache/media-video/makemkv-1.8.10 b/metadata/md5-cache/media-video/makemkv-1.8.10
deleted file mode 100644
index 5d9e007a1e4a..000000000000
--- a/metadata/md5-cache/media-video/makemkv-1.8.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0 sys-libs/zlib virtual/opengl dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 ) >=sys-apps/sed-4
-DESCRIPTION=Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container
-EAPI=5
-HOMEPAGE=http://www.makemkv.com/
-IUSE=multilib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
-RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0 sys-libs/zlib virtual/opengl dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 || ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
-SLOT=0
-SRC_URI=http://www.makemkv.com/download/old/makemkv-oss-1.8.10.tar.gz http://www.makemkv.com/download/old/makemkv-bin-1.8.10.tar.gz
-_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=1a2a32e315be1fc4e1d691d936e31581
diff --git a/metadata/md5-cache/media-video/makemkv-1.9.1 b/metadata/md5-cache/media-video/makemkv-1.9.2
similarity index 86%
rename from metadata/md5-cache/media-video/makemkv-1.9.1
rename to metadata/md5-cache/media-video/makemkv-1.9.2
index a7e02ec27daa..fb98dded00b6 100644
--- a/metadata/md5-cache/media-video/makemkv-1.9.1
+++ b/metadata/md5-cache/media-video/makemkv-1.9.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
RDEPEND=sys-libs/glibc[multilib?] dev-libs/expat dev-libs/openssl:0 sys-libs/zlib qt4? ( virtual/opengl dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= )
SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.9.1.tar.gz http://www.makemkv.com/download/makemkv-bin-1.9.1.tar.gz
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.9.2.tar.gz http://www.makemkv.com/download/makemkv-bin-1.9.2.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=d28869e6f83199bc4463b37b0040927c
+_md5_=dbff781783b7ce3462ea7fd490726124
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.10-r2 b/metadata/md5-cache/net-libs/gnutls-3.3.10-r2
index 2323a3a09358..1d809a5cd375 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.10-r2
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.10-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
EAPI=5
HOMEPAGE=http://www.gnutls.org/
IUSE=+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.10.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c2e747412d374b7ef47a35651e2cddfe
+_md5_=9abc3b342547a39882755a144700fc9c
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.12 b/metadata/md5-cache/net-libs/gnutls-3.3.12
index d3e6cbf8ef6f..168df784f28c 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.12
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.12
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
EAPI=5
HOMEPAGE=http://www.gnutls.org/
IUSE=+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.12.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d19749a4d20d2f90e914053a7f32ff95
+_md5_=0e65c8c00b755f546f10afbea2c37c8c
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.14 b/metadata/md5-cache/net-libs/gnutls-3.3.14
index 2f58785be675..73f9780b98bc 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.14
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.14
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
EAPI=5
HOMEPAGE=http://www.gnutls.org/
-IUSE=+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN 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
+IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-2.7[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.14.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c1df0e186005f98f74e7961626065960
+_md5_=c39618c63ab6c0d0257b1b0226e50705
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.0 b/metadata/md5-cache/net-libs/gnutls-3.4.0
index 0894965e2125..e5d532ce6453 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.4.0
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.0
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/libtasn1-3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
EAPI=5
HOMEPAGE=http://www.gnutls.org/
-IUSE=+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test +tools zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN 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
+IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3 LGPL-3
RDEPEND=>=dev-libs/libtasn1-3.9[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/nettle-3.1[gmp,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/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
SLOT=0/30
SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.0.tar.xz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7b4199fe31094809ee430de4ee4f1573
+_md5_=61161b290331c39a2e2091df63767a16
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.2 b/metadata/md5-cache/net-misc/icecast-2.4.2
index a34d660ca503..e3c1a988e36f 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.2
+++ b/metadata/md5-cache/net-misc/icecast-2.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=An opensource alternative to shoutcast that supports mp3, ogg (vorbi
EAPI=5
HOMEPAGE=http://www.icecast.org/
IUSE=kate logrotate +speex +ssl +theora +yp
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=dev-libs/libxslt dev-libs/libxml2 media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl ) ssl? ( dev-libs/openssl:0= )
SLOT=0
SRC_URI=http://downloads.xiph.org/releases/icecast/icecast-2.4.2.tar.gz
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 user f54e098dd38ba1c0847a13e685b87747
-_md5_=fb62bee2b449c2bf50139ea326c39790
+_md5_=38016cb9d5bcaa7e0f773c76c04ee50a
diff --git a/metadata/md5-cache/net-misc/tor-0.2.5.12 b/metadata/md5-cache/net-misc/tor-0.2.5.12
index 4ae68a047bab..b8fb00462306 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.5.12
+++ b/metadata/md5-cache/net-misc/tor-0.2.5.12
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
EAPI=5
HOMEPAGE=http://www.torproject.org/
IUSE=-bufferevents +ecc nat-pmp seccomp selinux stats tor-hardening transparent-proxy threads test upnp web
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://www.torproject.org/dist/tor-0.2.5.12.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.5.12.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=728d4190c25fbcc595d93d7e0be086ab
+_md5_=d08cabd9d44580e8c5dcfbbc75c951a9
diff --git a/metadata/md5-cache/net-misc/tor-0.2.6.7 b/metadata/md5-cache/net-misc/tor-0.2.6.7
index 2e5f07c151fb..488153fef438 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.6.7
+++ b/metadata/md5-cache/net-misc/tor-0.2.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=Anonymizing overlay network for TCP
EAPI=5
HOMEPAGE=http://www.torproject.org/
IUSE=-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
LICENSE=BSD GPL-2
RDEPEND=dev-libs/openssl sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) nat-pmp? ( net-libs/libnatpmp ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) upnp? ( net-libs/miniupnpc ) selinux? ( sec-policy/selinux-tor )
SLOT=0
SRC_URI=https://www.torproject.org/dist/tor-0.2.6.7.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.6.7.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf readme.gentoo 106edea5533517715013de909a333abd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 user f54e098dd38ba1c0847a13e685b87747 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4f8936d5775cc862317c4042ecbb8069
+_md5_=6aaa267f8f503317b0d862e9a1aeb026
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.13.6 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.13.7
similarity index 85%
rename from metadata/md5-cache/sci-misc/mendeleydesktop-1.13.6
rename to metadata/md5-cache/sci-misc/mendeleydesktop-1.13.7
index b8fb5d7bd8b6..8ec5eb3d86d9 100644
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.13.6
+++ b/metadata/md5-cache/sci-misc/mendeleydesktop-1.13.7
@@ -9,6 +9,6 @@ RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) pytho
REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
RESTRICT=fetch
SLOT=0
-SRC_URI=amd64? ( mendeleydesktop-1.13.6-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.13.6-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.13.6-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.13.6-linux-i486.tar.bz2 )
+SRC_URI=amd64? ( mendeleydesktop-1.13.7-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.13.7-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.13.7-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.13.7-linux-i486.tar.bz2 )
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4
-_md5_=faa2d93aa908542d058be99be7dc8e61
+_md5_=864b28994ab8a3c7d6df73cfd75b9420
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.1
index a2e6a2a658e7..808d82dd27a8 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.1
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile install prepare unpack
DEPEND=virtual/pmake virtual/pmake
DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
-EAPI=3
+EAPI=5
HOMEPAGE=http://www.freebsd.org/
IUSE=userland_GNU profile
KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
@@ -10,4 +10,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=http://dev.gentoo.org/~mgorny/dist/freebsd/10.1/freebsd-share-10.1.tar.xz
_eclasses_=bsdmk a5323161d86b178920afb5e31a9e5d3f eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 freebsd b2473fe162b685fe81251ec1f7b2a218 multilib 3bf24e6abb9b76d9f6c20600f0b716bf portability a45c088f246ef5091e029f6285d7ce42 toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2ed9d1adfefc50d85cedef1f8110b39f
+_md5_=511e2e75aeb81dc99d8037aa1a386081
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4
new file mode 100644
index 000000000000..5bf2c73bedc8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Kernel sources with OpenVZ patchset
+EAPI=5
+HOMEPAGE=http://www.openvz.org
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=2.6.32.106.4
+SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab106.4/patches/patch-042stab106.4-combined.gz
+_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de kernel-2 b544eac9542c54048d7dd55302455f51 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-any-r1 da352ea9da8eb9bf158d56cca65d6c82 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 versionator cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e39afface6532ea3cf69b08f2e5d6877
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20140929b b/metadata/md5-cache/www-apps/dokuwiki-20140929b
deleted file mode 100644
index 110db5ce1508..000000000000
--- a/metadata/md5-cache/www-apps/dokuwiki-20140929b
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's documentation needs.
-EAPI=5
-HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
-IUSE=gd vhosts
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-SLOT=20140929b
-SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-09-29b.tgz
-_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 webapp 25b9b1696f5e698711f47d45c3d45e3e
-_md5_=76b9830d97d4f51619f36b863be56d00
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20140929d b/metadata/md5-cache/www-apps/dokuwiki-20140929d
index ecf5e186ab78..226c61a6bd55 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20140929d
+++ b/metadata/md5-cache/www-apps/dokuwiki-20140929d
@@ -4,10 +4,10 @@ DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's document
EAPI=5
HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
IUSE=gd vhosts
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/php-5.3[xml] gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
SLOT=20140929d
SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-09-29d.tgz
_eclasses_=depend.php df169a364e191b840b695604097e3c21 eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf phpconfutils e108303831029e5b8a9d24b991b1d62a toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 webapp 25b9b1696f5e698711f47d45c3d45e3e
-_md5_=ac7db25e025e51da5a651cbe28075c0d
+_md5_=c1ee56e6a1c62940533abe7b016e4562
diff --git a/metadata/md5-cache/x11-apps/intel-gpu-tools-1.10 b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.10
new file mode 100644
index 000000000000..c2481282a04d
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/intel-gpu-tools-1.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=Intel GPU userland tools
+EAPI=5
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=python test-programs video_cards_nouveau python_targets_python3_3 python_targets_python3_4 python_single_target_python3_3 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 >=x11-libs/cairo-1.12.0 >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.10.tar.bz2
+_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c autotools-utils 3727db64c7b960903d5033280f108080 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 79b635d29abf0572d6a1b0dc8e63c0e4 xorg-2 50dd640df6d0554c259daa81531ed3ee
+_md5_=593705bed159ed5dfa47490c9025da2d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8462c60c281a..4190829df99a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Apr 2015 05:37:07 +0000
+Fri, 10 Apr 2015 13:36:55 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5ca0f9d2cbb6..c6527e9d8504 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Apr 10 05:37:04 UTC 2015
+Fri Apr 10 13:36:52 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 11f374566b56..d9fdcb3f589f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 10 Apr 2015 06:00:01 +0000
+Fri, 10 Apr 2015 14:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 391961f4b2f7..44ea463a93e8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1428644101 Fri 10 Apr 2015 05:35:01 AM UTC
+1428672901 Fri 10 Apr 2015 01:35:01 PM UTC
diff --git a/net-libs/gnutls/gnutls-3.3.10-r2.ebuild b/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
index b8dd360ea1eb..1fee7c2944b9 100644
--- a/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.10-r2.ebuild,v 1.8 2015/03/10 21:24:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.10-r2.ebuild,v 1.9 2015/04/10 07:48:34 patrick Exp $
EAPI=5
@@ -23,6 +23,7 @@ IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${I
# use system libopts
RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+ =dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
sys-devel/autogen
crywrap? ( net-dns/libidn )
diff --git a/net-libs/gnutls/gnutls-3.3.12.ebuild b/net-libs/gnutls/gnutls-3.3.12.ebuild
index 0ec5a3b7c68b..9cee1b95cd0a 100644
--- a/net-libs/gnutls/gnutls-3.3.12.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.12.ebuild,v 1.1 2015/01/19 19:35:09 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.12.ebuild,v 1.2 2015/04/10 07:48:34 patrick Exp $
EAPI=5
@@ -23,6 +23,7 @@ IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${I
# use system libopts
RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+ =dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
sys-devel/autogen
crywrap? ( net-dns/libidn )
diff --git a/net-libs/gnutls/gnutls-3.3.14.ebuild b/net-libs/gnutls/gnutls-3.3.14.ebuild
index 5b2c30363849..2a2d027606a9 100644
--- a/net-libs/gnutls/gnutls-3.3.14.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.14.ebuild,v 1.1 2015/04/01 22:33:39 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.14.ebuild,v 1.3 2015/04/10 08:30:28 alonbl Exp $
EAPI=5
@@ -16,13 +16,14 @@ LICENSE="GPL-3 LGPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
# heartbeat support is not disabled until re-licensing happens fullyf
# NOTICE: sys-devel/autogen is required at runtime as we
# use system libopts
RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
+ =dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
sys-devel/autogen
crywrap? ( net-dns/libidn )
@@ -101,6 +102,7 @@ multilib_src_configure() {
$(multilib_native_use_enable guile) \
$(multilib_native_use_enable crywrap) \
$(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
$(use_enable static-libs static) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
diff --git a/net-libs/gnutls/gnutls-3.4.0.ebuild b/net-libs/gnutls/gnutls-3.4.0.ebuild
index 2dda3b38db7d..097c44981f2a 100644
--- a/net-libs/gnutls/gnutls-3.4.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.0.ebuild,v 1.1 2015/04/10 01:15:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.0.ebuild,v 1.2 2015/04/10 08:30:28 alonbl Exp $
EAPI=5
@@ -16,7 +16,7 @@ LICENSE="GPL-3 LGPL-3"
SLOT="0/30" # libgnutls.so number
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
# heartbeat support is not disabled until re-licensing happens fullyf
# NOTICE: sys-devel/autogen is required at runtime as we
@@ -105,6 +105,7 @@ multilib_src_configure() {
$(multilib_native_use_enable crywrap) \
$(multilib_native_use_enable test tests) \
$(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
$(use_enable static-libs static) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index f1f8e2e7732b..c17c260e778a 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -17,6 +17,9 @@
Use dev-libs/nettle as crypto backend
+
+ Build openssl compatibility libraries.
+
Add support for PKCS#11 through app-crypt/p11-kit
diff --git a/net-misc/icecast/icecast-2.4.2.ebuild b/net-misc/icecast/icecast-2.4.2.ebuild
index 540d3387fa90..0e9a87e5f94c 100644
--- a/net-misc/icecast/icecast-2.4.2.ebuild
+++ b/net-misc/icecast/icecast-2.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.4.2.ebuild,v 1.1 2015/04/09 19:26:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.4.2.ebuild,v 1.3 2015/04/10 09:46:00 ago Exp $
EAPI=5
inherit eutils autotools systemd user
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE="kate logrotate +speex +ssl +theora +yp"
#Although there is a --with-ogg and --with-orbis configure option, they're
diff --git a/net-misc/tor/tor-0.2.5.12.ebuild b/net-misc/tor/tor-0.2.5.12.ebuild
index e6c4fca7abe9..716cf8d9c172 100644
--- a/net-misc/tor/tor-0.2.5.12.ebuild
+++ b/net-misc/tor/tor-0.2.5.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.12.ebuild,v 1.4 2015/04/09 17:03:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.5.12.ebuild,v 1.5 2015/04/10 09:53:47 ago Exp $
EAPI="5"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="-bufferevents +ecc nat-pmp seccomp selinux stats tor-hardening transparent-proxy threads test upnp web"
DEPEND="dev-libs/openssl
diff --git a/net-misc/tor/tor-0.2.6.7.ebuild b/net-misc/tor/tor-0.2.6.7.ebuild
index 4c4926fa080d..ed2b9d8b822c 100644
--- a/net-misc/tor/tor-0.2.6.7.ebuild
+++ b/net-misc/tor/tor-0.2.6.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.7.ebuild,v 1.2 2015/04/09 17:03:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.6.7.ebuild,v 1.3 2015/04/10 09:53:47 ago Exp $
EAPI="5"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
IUSE="-bufferevents nat-pmp scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test upnp web"
DEPEND="dev-libs/openssl
diff --git a/profiles/package.mask b/profiles/package.mask
index 8869212b9a89..fd2c2d020be3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16471 2015/04/09 14:20:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16472 2015/04/10 07:38:28 patrick Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,11 @@
#--- END OF EXAMPLES ---
+# Patrick Lauer (10 Apr 2015)
+# Breaks pretty much all consumers, like samba
+# Mask until it's more usable
+>=net-libs/gnutls-3.4.0
+
# Michael Sterrett (08 Apr 2015)
# Upstream went away; GPL but no source.
# masked for removal on 20150508
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9a58821d3b1d..905135cb8d18 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1442,7 +1442,6 @@ dev-haskell/citeproc-hs:hexpat - use dev-haskell/hexpat instead of dev-haskell/x
dev-haskell/citeproc-hs:network - use dev-haskell/network and dev-haskell/http to retrieve CSL file from URIs
dev-haskell/citeproc-hs:small_base - Choose the new smaller, split-up base package.
dev-haskell/citeproc-hs:unicode_collation - Use Haskell bindings to the dev-libs/icu
-dev-haskell/clock:llvm - Compile via LLVM.
dev-haskell/cmdargs:quotation - Build quote module
dev-haskell/cmdargs:testprog - Build the test program
dev-haskell/comonad:containers - You can disable the use of the `containers` package using `-f-containers`. Disabing this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
@@ -5342,6 +5341,7 @@ net-libs/gnutls:bindist - Disallow building LZO support, because of a license in
net-libs/gnutls:crywrap - Build the crywrap TLS proxy service
net-libs/gnutls:dane - Build libgnutls-dane, implementing DNS-based Authentication of Named Entities. Requires net-dns/unbound.
net-libs/gnutls:nettle - Use dev-libs/nettle as crypto backend
+net-libs/gnutls:openssl - Build openssl compatibility libraries.
net-libs/gnutls:pkcs11 - Add support for PKCS#11 through app-crypt/p11-kit
net-libs/gnutls:tools - Build extra tools.
net-libs/gtk-vnc:gtk3 - Build the gtk3 gtk-vnc library and other gtk3 assets
@@ -7600,6 +7600,7 @@ www-servers/varnish:jemalloc - Use dev-libs/jemalloc for allocations
www-servers/varnish:tools - Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes
x11-apps/ardesia:cwiid - cwiid support: collection of Linux tools written in C for interfacing to the Nintendo Wiimote.
x11-apps/intel-gpu-tools:python - Install python based register dumper utilities
+x11-apps/intel-gpu-tools:test-programs - Install test programs for DRM driver development
x11-apps/mesa-progs:egl - Build EGL utilities
x11-apps/mesa-progs:gles1 - Build OpenGL ES 1 utilities
x11-apps/mesa-progs:gles2 - Build OpenGL ES 2 utilities
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index 0ad17298f668..13da8a68e670 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -1,2 +1,2 @@
-DIST mendeleydesktop-1.13.6-linux-i486.tar.bz2 33056389 SHA256 14570756a49b8e93a83fd8e046d3b23ec120eb779be5fd0a26f6670ceb84c65e SHA512 f83ba93b22b1773e3bf525f4dae3467bf6c98f54df739e35527e49ff279ba4fd802887c219c5d48e3567b03bd29688775a2035cf1e1a77ae3974f58a32042fa4 WHIRLPOOL 69749bfcd25c26915cb1a7a7e6e140f522053490e5edc088b82c9ae07a482302f2d628259ed23ba95d92ed7c763d95a8630cf19a86eb115bb6cd1fb8f12f6ce2
-DIST mendeleydesktop-1.13.6-linux-x86_64.tar.bz2 32835012 SHA256 1675f4bfada6926d8d67bbbd5d04453cd7de7a58732421a1c1b92fa9489c3a66 SHA512 93c0441ce34f5a8fe263eeef6e9b0fd7670da03c48cbf24f58601cd337374b667111372db8938c4df2048c561cfd6a6fde26f00961ad4bc948bf66e0e0f9ad7d WHIRLPOOL 67ccb1c62df43a4c63e20c7cf807dfb17bf2729cfdbb173f9871663af96bee02d6ba4e134de54f15271eff1b94ed17442f94c101524c3c0c49c2cc0ba67878a3
+DIST mendeleydesktop-1.13.7-linux-i486.tar.bz2 33059392 SHA256 444888a43d6ff9e3e7641e727e5fbda8b838de1b9b132bd181107976f97078ed SHA512 70f31f57c6730eb340105cde7e9453ebb4baac91b4adf44c59ff4a9134cc05a514a8d5ab972cdf4da8b1e03d2a738e9f0ff2afbe0c4c5c71c03c14f57f6d6cbb WHIRLPOOL c6e9dc7dfcda155962f59c0e231df67998eb65d9e9bb1fe71b3854a1b22054dbb70698fd9a5806127671dadfdd1c5b35bee7f625914c6918fe9e72ee19562ddb
+DIST mendeleydesktop-1.13.7-linux-x86_64.tar.bz2 32825531 SHA256 a18ae76fb360b6796deeab93fb0024c20d181f37a22fa84375869844999dc35b SHA512 425a8cdd3a54ad89be3ad6b81a37e33000bac5db3254ddefc405b8725ea289ed26803d73a7e217e2452cd57395e617d42e2cc22ddc5524fe2b87cf618825e42b WHIRLPOOL 5a321d58bab7ee3834ce2fc6249d256699b96217ca7fc2bb9136e52b8b3410616d36396d337c9241b66b79259bf432a470577cc4ab05e9fe377ac8fa7fe0031b
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.13.6.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.7.ebuild
similarity index 97%
rename from sci-misc/mendeleydesktop/mendeleydesktop-1.13.6.ebuild
rename to sci-misc/mendeleydesktop/mendeleydesktop-1.13.7.ebuild
index 8943eb9b4fc7..55ca5f841ed4 100644
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.13.6.ebuild
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.13.6.ebuild,v 1.2 2015/04/08 06:16:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.13.7.ebuild,v 1.1 2015/04/10 12:47:38 xmw Exp $
EAPI=5
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
similarity index 84%
rename from sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
rename to sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
index acce807fe618..e566e6235a3a 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
@@ -1,8 +1,8 @@
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 0a33fdb..cd7ca2f 100644
+index a5eacf9..01d1045 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
-@@ -165,11 +165,7 @@ _LIBS= lib${LIB}.a
+@@ -166,11 +166,7 @@ _LIBS= lib${LIB}.a
lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
@@ -12,10 +12,10 @@ index 0a33fdb..cd7ca2f 100644
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-.endif
+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
-@@ -182,11 +178,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
+@@ -183,11 +179,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
@@ -25,10 +25,10 @@ index 0a33fdb..cd7ca2f 100644
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-.endif
+ @${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
-@@ -213,15 +205,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
+@@ -214,15 +206,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
.if defined(SHLIB_LINK)
@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
@@ -45,7 +45,7 @@ index 0a33fdb..cd7ca2f 100644
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
.endif
-@@ -279,13 +265,6 @@ _EXTRADEPEND:
+@@ -280,13 +266,6 @@ _EXTRADEPEND:
.if !target(install)
@@ -60,10 +60,10 @@ index 0a33fdb..cd7ca2f 100644
.for ie in ${INSTALLFLAGS_EDIT}
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 02024e0..0f9010d 100644
+index a53ea14..af3f37c 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
-@@ -180,13 +180,6 @@ _EXTRADEPEND:
+@@ -179,13 +179,6 @@ _EXTRADEPEND:
.if !target(install)
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
index d146b69bb9bb..dc7c9a6f5e24 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.1 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.2 2015/04/10 13:30:26 mgorny Exp $
-EAPI=3
+EAPI=5
inherit bsdmk freebsd
@@ -26,7 +26,7 @@ S="${WORKDIR}/share/mk"
src_prepare() {
epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-10.0-gnu.patch"
+ use userland_GNU && epatch "${FILESDIR}/${PN}-10.1-gnu.patch"
}
src_compile() { :; }
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index dea438c1576f..31709bcc7c3b 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -7,3 +7,4 @@ DIST patch-042stab093.4-combined.gz 48387253 SHA256 9ae5c849ad917ac10668f2099f75
DIST patch-042stab093.5-combined.gz 48393969 SHA256 4fc28ac32c4bedb75e160531bda4fbd2b95c6af141db046a6e944b3f35ac4bda SHA512 b10b99a2d680641c90101ea54d211ae17deb4469bf4c3b233603d54d16674c93fc16c4ac91d838ddcbdde1950cfa68ba4684f57ba79faa4dae1efc3c1460eab8 WHIRLPOOL 3831da3cdcd475590abb9e8ed2dba1e99c08c651d642ab1da3ffda4c258902a315a41f20b8ce147e1f682a6eecf853116ef25cdc6f6989900af19078159845c5
DIST patch-042stab094.7-combined.gz 48397719 SHA256 aca2df4cefd1cc6ae41e978365f842275de4c56ad80c819534171d907498d94d SHA512 6ac0885dfc542c576bb6b13591f2b845deec5893ef50af39954f89dd9f9d4410e7256ca3e3640d3d3507292a1bceb2c29b3c7bfa576c65be88746f6b601fe9ff WHIRLPOOL f82cb6d80f0f83f7b07b4a967ff5dfe95a05092b7b142d967ef29a23c3721c9de8cc31ed3cb6475edfb6d82a1701a02b4a887fbea15d612420669f4edd968b30
DIST patch-042stab104.1-combined.gz 52689911 SHA256 e9dfb10e885d91fec452b75aafed2cb7b17006a37a84a90c6bf29cd9e395b09e SHA512 167b82ea247484d61fa78000960e3b023e833bafd68e8451748afa389c99b8851ab5e832ba775cf3ea2323f052e3f6ae5db82094208b24f9e38511d96faa3b37 WHIRLPOOL ba0b945af454737a0df5a8e4583c6a02374445055a34af7f77fa63182814a3fe3eff8dbf362a34eddec45c67e3562faddbfe3a8e6b25baaf3328310d23fe3c93
+DIST patch-042stab106.4-combined.gz 52715854 SHA256 dffa7a1b5d8308ff403af9ac1b650ec1d3ddb47f3c29cfa3ff99e0d21dd452d0 SHA512 ea405c742936a44c439a09aec18ae0b127ec58a7c63386fbf42af7e9c623ba7d4738548b5ac7e2bc481a3b0c09e02c3b788fb7e63597666a5136978481913264 WHIRLPOOL 3314106b31e025ff277f03a485cc7d435936d4564a4ad658e08b693b2611323cb5ef8047629f5d57dee96724bdc106fa4947c57738028aecf51766ae493a9de8
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.106.4.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.106.4.ebuild
new file mode 100644
index 000000000000..da1a3b8031af
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.106.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.106.4.ebuild,v 1.1 2015/04/10 07:37:59 civil Exp $
+
+EAPI="5"
+
+inherit versionator
+
+OVZ_KV="$(get_version_component_range 4).$(get_version_component_range 5)"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+ETYPE="sources"
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != "r0" ]]; then
+ KV_FULL+=-${PR}
+ EXTRAVERSION+=-${PR}
+fi
+S=${WORKDIR}/linux-${KV_FULL}
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.xz"
+
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE=0
+inherit kernel-2
+#detect_version
+
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+ http://download.openvz.org/kernel/branches/rhel6-${CKV}/042stab${OVZ_KV}/patches/patch-042stab${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-042stab${OVZ_KV}-combined.gz"
+
+K_EXTRAEINFO="This openvz kernel uses RHEL6 patchset instead of vanilla kernel.
+This patchset considered to be more stable and security supported by upstream,
+but for us RHEL6 patchset is very fragile and fails to build in many
+configurations so if you have problems use config files from openvz team
+http://wiki.openvz.org/Download/kernel/rhel6/042stab${OVZ_KV}"
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index dbb22488fd17..2a6111284e25 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,3 +1,2 @@
DIST dokuwiki-2014-05-05e.tgz 3218289 SHA256 015b5e76427b97e584f195bab6652beaa80796f12f4a547ba9b6bc4e50387282 SHA512 b306be2378aed7119c9005fc9d0c8af4d89317eac19d633a992c6e37d9fb23e22493f25854e1803c892951ec995adf2a7689e04001666318614dd78813d0ffa4 WHIRLPOOL cb4823e7110fe83eea7d61fbf2937455b44a27805b849bc475ae5c9f74a4de353be283ebd8f2cf95a94df8ea395a2a34b9f2442e763a64c730401aee67347aa9
-DIST dokuwiki-2014-09-29b.tgz 3241815 SHA256 7f7c705997278cb6769a91a1a7c38053a3edb0663e7ac8285f613c9d849a5487 SHA512 e37cf758d708c8c97668accfe98cbed247acff6c77892160a7f6e9fe8c4b06ea0ab5c542feea85394e35cb4703b348be47f9e25a90750d4b2b3bdc0ba75269f7 WHIRLPOOL 9e8d861b744c5f06612a9f29474007b835e46bd4b1b6139f5a7bffd07e1b9a7ee1f1263f2752757c5c504b3ae04326e938d7aad04914e8a4cf392f368a1564a4
DIST dokuwiki-2014-09-29d.tgz 3283317 SHA256 6fc6794e13c8e3fe07f5e02bd09cc3a167486a676e9822fa17aab0a45b094794 SHA512 426c41c5d7c6484cc6d5757dbe8e0ac50bf1088406c5c58d975f19fde5f6cb0a0dafb5a27c9901335b1d65a34578f46ffabbd44eed4f5bbd59d6c3fed1c769e3 WHIRLPOOL 59ea72ab973dfc5119056bfccbd5adae9a2ac45b13dbe5971325ca6e1bc4db2e8213aac1d5aab8d699b43b0602dd4b635841e7279e9535c63ed3d80cc85b1007
diff --git a/www-apps/dokuwiki/dokuwiki-20140929b.ebuild b/www-apps/dokuwiki/dokuwiki-20140929b.ebuild
deleted file mode 100644
index 6eea7fb3ac72..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20140929b.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929b.ebuild,v 1.3 2014/12/21 11:41:17 ago Exp $
-
-EAPI=5
-
-inherit webapp depend.php
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
- >=dev-lang/php-5.3[xml]
- gd? ( ||
- (
- dev-lang/php[gd]
- media-gfx/imagemagick
- )
- )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- # create initial changes file
- touch data/changes.log
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README
- rm -f README COPYING
-
- docinto scripts
- dodoc bin/*
- rm -rf bin
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- for x in $(find data/ -not -name '.htaccess'); do
- webapp_serverowned "${MY_HTDOCSDIR}"/${x}
- done
-
- webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
- webapp_configfile "${MY_HTDOCSDIR}"/conf
-
- for x in $(find conf/ -not -name 'msg'); do
- webapp_configfile "${MY_HTDOCSDIR}"/${x}
- done
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
index 6e8d7c1f9c69..7d169273074d 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d.ebuild,v 1.1 2015/04/09 17:42:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dokuwiki/dokuwiki-20140929d.ebuild,v 1.3 2015/04/10 09:45:56 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
IUSE="gd"
DEPEND=""
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index fc094aedce13..14710819e780 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,3 +1,4 @@
+DIST intel-gpu-tools-1.10.tar.bz2 1501523 SHA256 6df2bef12d7cd252d702e4412937fbdc48fa954dd5f7f6988f567912f63b9874 SHA512 b6d5e2b377534a2132a22e22af5786086360646ea6d788b863e7424dd68898c6e35c31c2620f4301b00659cea56aa5739609781d8324c04929bba367f61fc8da WHIRLPOOL 916d97f24972fc9f3dad52b80193921e2fff309345d7c977d9bee89d0f03db361ce167c52eaeda311ba87d4de11a4bdc1824ed27c79bf11a64581ecb085ef5bf
DIST intel-gpu-tools-1.2.tar.bz2 531491 SHA256 104eeed3087e7eff7aa3a843b3988cb767f013ce2f476d32be8d1dfbb13d7932 SHA512 d4206a0438e1280fd77700dce82a26720ef4ed954d587fb630bd2bf141055c931e0965a7fb4ce685069a8ce18c35866b7e899c53e0a6da262e24e40edf8191d7 WHIRLPOOL 81f10e6e5361cc77a1e7396050d81992ae1bf98fc31925ed172b02f40b634224d94317fffcd069fb498ccfd359c2f45c05ad7147ffc024411fc000621caf9980
DIST intel-gpu-tools-1.3.tar.bz2 589027 SHA256 51d22fdb3d415a1b3b7d0a172c1bb24dec6f16116e80a9ce49873f44527f20a0 SHA512 de0c8601dc1910b22c343e3709a0f2266b8bd509b582ff0e4d8a0c629a7678f4822e6c7c0e18d06fcd0cfec76e411d0e26b987dc021bb4b948ce64801382b94f WHIRLPOOL 2b513db673e1e337c2590d98850cb5b2f34be3d733738c85f18800539065c29aa65ccb7d9b53c50e9b109f15c9ba20f147e965e6f882a44a36161e2161e98ac0
DIST intel-gpu-tools-1.7.tar.bz2 11780573 SHA256 22612343bbd9b518b9f92a983555dbbcae8040ee577a38277dbf873c8900207a SHA512 13181db6d2424fa27c97c30ecb83b8554fc2e9ce98bec7b7735f919aa9d7e2563c3e1860dc6e5aedf3918c029acb205b8fcf6a32de1567f557f8cd98c09a5d98 WHIRLPOOL f66e0710377aa4f46067840efd1cf70814e10cd81ff24ebb5db21b901787846f63b1461502ec01ba7383ead76e985c25860801355a9582d5509a861fa70aacb0
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
new file mode 100644
index 000000000000..30d9a91bb370
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild,v 1.1 2015/04/10 12:26:47 chithanh Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test-programs video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable test-programs tests)
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+ if use test-programs; then
+ local testprogram
+ pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
+ for testprogram in $(x11