diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 468a9b68b1db..9191ff693a0a 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,2 +1,2 @@
-DIST puppetserver-2.1.1.tar.gz 42547364 SHA256 206db88de533ebf0071a3d957aa21145500abb7748897b01f0de8e5d57dbff0c SHA512 850276fdd67f77f4c8e67be920ca4685fb267d6c90ed1eea41792c5f500ad4b199c198a4367a0faeb55d7aaf85ad531f50bd6704562c1c26bce499265d03a3d5 WHIRLPOOL aabce9259f99926788b9ff16e1b547e4f3c543a54c50a0bd3b0ef0e27eb5b1042981b5bbc73339b28b063798da3cd2453f45a40fcc77f9019f8db40fb5216f28
DIST puppetserver-2.1.2.tar.gz 42613471 SHA256 5b5ba875bad9d7ac6b060dab8ab02afb624878fa420d49c81954442c2d8b4048 SHA512 5b814f0268e232cef3e1b613cd0f608e14afacde2788700269687727c4a1f7dec2e353628e1714c71e086b9726972ef6d0aea2f997277e9c55eb481510430b5d WHIRLPOOL 357cf5e5c347d7942748cae3240a2aedaaab48293c4c7c7eb71b4723582a427760fe97cb954dc196a5fd87e1323ca3b2cd9e256429e5aee61f9a148a23de3537
+DIST puppetserver-2.2.0.tar.gz 42664943 SHA256 960603e0af9b7bf622db562d00516dfbbf1549ce82ad4eacf97c9a45c2c02e0d SHA512 a7413921ed2aaadfa0d9250482379e54ef7538f237a287bf3bc7226b3df45bdfd86b51768d4c36bfee7c26520c5c4189b56a2622009a8253140e5423a253198a WHIRLPOOL 6b77f4b47105600ec8f23871835852657b86a6692d4a89d104522cfcde2ad16136ef3f693857f56af4381af1320cd50d3b90ea255f59eadabc3f0edfaf92185f
diff --git a/app-admin/puppetserver/puppetserver-2.1.1.ebuild b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
similarity index 95%
rename from app-admin/puppetserver/puppetserver-2.1.1.ebuild
rename to app-admin/puppetserver/puppetserver-2.2.0.ebuild
index d40553ccb5d2..cfc7fb3e2ebe 100644
--- a/app-admin/puppetserver/puppetserver-2.1.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.2.0.ebuild
@@ -101,7 +101,4 @@ pkg_postinst() {
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
elog "puppet config set --section master codedir /etc/puppetlabs/code"
-# elog
-# elog "the jruby needs it's own puppet gem installed..."
-# elog "/opt/puppetlabs/server/apps/puppetserver/bin/puppetserver gem install puppet"
}
diff --git a/app-misc/xmind/files/xmind-wrapper-3.5.3 b/app-misc/xmind/files/xmind-wrapper-3.5.3
new file mode 100644
index 000000000000..b38ef1476246
--- /dev/null
+++ b/app-misc/xmind/files/xmind-wrapper-3.5.3
@@ -0,0 +1,8 @@
+#!/bin/bash
+#XMind wrapper script, copies configuration stuff into the user's local config dir if either
+#the files aren't there or are older than the set in /opt (indicating that XMind has been upgraded)
+if [ ! -f ~/.xmind/configuration-cathy/config.ini -o ~/.xmind/configuration-cathy/config.ini -ot /opt/xmind/XMind/configuration/config.ini ]; then
+ mkdir -p ~/.xmind/configuration-cathy
+ cp -r /opt/xmind/XMind/configuration/* ~/.xmind/configuration-cathy/
+fi
+/opt/xmind/XMind/XMind "$@"
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
similarity index 93%
rename from app-misc/xmind/xmind-3.5.3.201506180105.ebuild
rename to app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
index 0dcc285605d4..32e785ad02a6 100644
--- a/app-misc/xmind/xmind-3.5.3.201506180105.ebuild
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -64,7 +64,7 @@ src_install() {
fperms a+rx "/opt/xmind/XMind/XMind"
exeinto /opt/bin
- newexe "${FILESDIR}/xmind-wrapper" xmind
+ newexe "${FILESDIR}/xmind-wrapper-3.5.3" xmind
# install icons
local res
@@ -72,8 +72,7 @@ src_install() {
newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
done
- # make desktop entry
- make_desktop_entry "xmind %F" XMind xmind Office "MimeType=application/x-xmind;"
+ make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
}
pkg_preinst() {
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index cd980310ad5d..3d96708e00b3 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,2 +1,3 @@
DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 SHA256 7e037aa42b7a3212140674d39a8dc0d722670d744f99e019bde308db91eb4d85 SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821 WHIRLPOOL 7e36266b5bade8bd1bb288f3936b059f57b24ea3662610999d5b9667688076b1de21d99ea21b774af43793fbef4feeb605eb4051bd95a5d0e0d36c49507307f7
DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 SHA256 bb1dc59939464f833e94de64e33b2a643f5bee03cad28d92af70af9820519e70 SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97 WHIRLPOOL 1ef11b150934d532a97be1ac8b43280989763e76d9bbadf1faeb0a99b6a68f0066ebac8bb66f8fdfe6fcfc94f9a127d5159119746c69307305b8a3ae160d88d9
+DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 SHA256 525daffdb999b647ce87328ec2e94c004ab59803b00a71ce1afd0b5dfd167116 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416 WHIRLPOOL c3546878e4bd7c1a5a2b911bdf325f9846574adf45929af073d00923e7d6851c8408cd27cea861c84ab96b140cae09130977773ae6cce5fca4c56c4ca08948b3
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
new file mode 100644
index 000000000000..554a7c22a685
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ # ruby is only uses for tests
+ econf \
+ --without-ruby \
+ --docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+ rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index d2f9b0763790..8d67ca410715 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,2 +1,3 @@
DIST groonga-4.0.7.tar.gz 10990151 SHA256 ec1d19b05c7a592a316e845ff4c5549c6236cc7ea83423c0fc7831c16161bbbf SHA512 942c28205ffb2c7d3ba767ff68b342ef5b7b9fef72131782635e86682c82a4ea3dad9d5263a42563ded22db573015c9859e49dc20c812f7a6534478b22d8b9a8 WHIRLPOOL 2473c14bcc50c87bfb925e73cc3c4cd2c02915ac498a5e40aeee312ac9873857406e38e8146fabe722250f2d258b6444813d4c47726c16ce4cfceea35f207d3a
DIST groonga-5.0.3.tar.gz 12421501 SHA256 d4f3e9d00cb16c0028cb32422fa666cbbfb32f47597988fd308931274d94cf52 SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158 WHIRLPOOL bbcf91770eb626dfaf5d01e04b6f4b2f4ee6fff8fad73cdca36c500560ce8d0b9dc606391b1ae0a23d2fd763ba4eddbc69f2eb8b692a5c3c59c1b21745d01de0
+DIST groonga-5.0.9.tar.gz 12851324 SHA256 4fb59009dca154ffb53f9b408dc296e6e215f8eda613a8ef184fa634e702d35d SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6 WHIRLPOOL 7f7ac215d4eb0eca0eb18e496a79c6023fe2040f2423c3b4b968d4923b800676c1ad2982880925880ffee5b92ff508b21132ecc2f9b7675612e147adfd13dd6c
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
new file mode 100644
index 000000000000..494462be877a
--- /dev/null
+++ b/app-text/groonga/groonga-5.0.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
+
+RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
+ libedit? ( >=dev-libs/libedit-3 )
+ libevent? ( dev-libs/libevent )
+ lzo? ( dev-libs/lzo )
+ mecab? ( >=app-text/mecab-0.80 )
+ msgpack? ( dev-libs/msgpack )
+ sphinx? ( >=dev-python/sphinx-1.0.1 )
+ zeromq? ( net-libs/zeromq )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+ enewgroup groonga
+ enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ # httpd is a bundled copy of nginx; disabled for security reasons
+ # prce only is used with httpd
+ # kytea and libstemmer are not available in portage
+ # ruby is only used for an http test
+ econf \
+ --disable-groonga-httpd \
+ --without-pcre \
+ --without-kytea \
+ --without-libstemmer \
+ --with-log-path="${EROOT}var/log/${PN}.log" \
+ --docdir="${EROOT}usr/share/doc/${P}" \
+ --without-ruby \
+ $(use_enable abort) \
+ $(use_enable benchmark) \
+ $(use_enable debug memory-debug) \
+ $(use_enable doc document) \
+ $(use_enable dynamic-malloc-change) \
+ $(use_enable exact-alloc-count) \
+ $(use_enable fmalloc) \
+ $(use_enable futex) \
+ $(use_enable libedit) \
+ $(use_with libevent) \
+ $(use_with lzo) \
+ $(use_with mecab) \
+ $(use_with msgpack message-pack "${EROOT}usr") \
+ $(use_enable nfkc) \
+ $(use_with sphinx sphinx-build) \
+ $(use_enable static-libs static) \
+ $(use_enable uyield) \
+ $(use_enable zeromq) \
+ $(use_with zlib)
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ keepdir /var/{log,lib}/${PN}
+ fowners groonga:groonga /var/{log,lib}/${PN}
+
+ dodoc README.md
+
+ use examples || rm -r "${D}usr/share/${PN}" || die
+ # Extra init script
+ rm -r "${D}usr/sbin/groonga-httpd-restart" || die
+}
diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest
index 780ede82b9f7..2bc825020bed 100644
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@@ -1,2 +1 @@
-DIST hamcrest-1.1.tgz 1670123 SHA256 a76cca2dbb38ac185f51f8551c964a356009c7adf1a19b5407f87352e2e438c8 SHA512 07b55c539ffcd3b1d33e94bec518164b95cefa39d96e0c3d02fc97c0a20f71bd8d1dea90a59ffd163e748ed1007b087c3d0d355876a68a429e8e564d0cfd3595 WHIRLPOOL 937d4fcde43a36eb19efb1b45e255389dcd18a853f90cc96e6421cec4db176708047e4c6de53ad7f3c11b29e4bc77725c3b70992239d9da420fa95c682615011
DIST hamcrest-1.3.tgz 3686096 SHA256 c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 WHIRLPOOL 9edc85f8d988ba9e7d080e3240d02956775bb73857903a2ec2a72e80d5a1b8570111c97d7b9906951273a1a1db6213a77de9cc2c55a6c73246d45157fed11ed9
diff --git a/dev-java/hamcrest-library/files/1.1-remove-targets.patch b/dev-java/hamcrest-library/files/1.1-remove-targets.patch
deleted file mode 100644
index 08affbce634d..000000000000
--- a/dev-java/hamcrest-library/files/1.1-remove-targets.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..b24dea0 100644
---- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -23,48 +23,11 @@
-
-
--
--
--
--
--
--
--
--
-
-
-
--
--
--
--
--
--
--
--
--
--
--
-
-
-
-
-
--
--
--
--
-+
-+
-+
-+
-
-@@ -121,7 +84,7 @@
- destjar="build/hamcrest-unit-test-${version}.jar"
- classpath="
- build/hamcrest-core-${version}.jar;
-- build/hamcrest-library-${version}.jar;
-+ build/hamcrest-library-${version}.jar;
- build/hamcrest-text-${version}.jar;
- build/hamcrest-integration-${version}.jar;
- build/hamcrest-generator-${version}.jar"/>
-@@ -164,7 +127,7 @@
-
-
-
--
-+
-
-
-
-@@ -221,7 +184,7 @@
-
-
-
--
-+
-
-
-
-@@ -261,4 +224,4 @@
-
-
-
--
-+
diff --git a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
deleted file mode 100644
index bb2dc08c0a63..000000000000
--- a/dev-java/hamcrest-library/hamcrest-library-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=${PN/-library}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Core library of matchers for building test expressions"
-HOMEPAGE="https://github.com/hamcrest"
-SRC_URI="https://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
- dev-java/hamcrest-core:${SLOT}
- dev-java/hamcrest-generator:${SLOT}
- dev-java/qdox:1.6
-"
-DEPEND=">=virtual/jdk-1.5
- userland_GNU? ( sys-apps/findutils )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
-EANT_GENTOO_CLASSPATH="hamcrest-generator,hamcrest-core,qdox-1.6"
-EANT_BUILD_TARGET="library"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_GENTOO_CLASSPATH_EXTRA="build/${P}.jar"
-
-java_prepare() {
- # remove core+generator target as they are already built.
- epatch "${FILESDIR}/${PV}-remove-targets.patch"
-
- find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
-}
-
-src_install() {
- java-pkg_newjar build/${PN/core/library}-${PV}.jar ${PN/core/library}.jar
-
- use source && java-pkg_dosrc ${PN}/src/main/java/org
-}
diff --git a/dev-java/jmdns/Manifest b/dev-java/jmdns/Manifest
index e486518335c0..2674779379d3 100644
--- a/dev-java/jmdns/Manifest
+++ b/dev-java/jmdns/Manifest
@@ -1,3 +1 @@
-DIST jmdns-1.0-Final.tar.gz 157799 SHA256 eed717e220f13e0063f09cd9b0bb9fe43dbe9d8ac68b7fa184bae5ce2864295b SHA512 62fc4e0a8ce42acb8f414299d6d59a313a3a201fb634777a77be78bff679eae4c2068959e035d82d6b6159cb1a42abfdce02509d9b511f36d8aea6eb3a19c6b4 WHIRLPOOL 060b316324596157a056abda9cdf5114b5801702ea948e8c5c44755cb32d15e919647fadfba2826766337e7525a0dbaf56c85335ce443455c047e1361190533d
-DIST jmdns-3.1.4.tgz 275127 SHA256 3824642f040d358745952e8e5e8686d45a4f18a9ed4605e5b72eae8e082386ab SHA512 4c644b02f814fb8c6ea81d74ee18697eecfa2e57de73bebe2b3b1ac89c7f5b45143c55c343426bce2ac38bd0ac82aa316b5af6a704bd9732ebac6224c3ed8e44 WHIRLPOOL ba4e27f9d3f42656df816a02b41d5a81bfa866727c3a6c513607bc3d35152e66a082f809ccaada69d82dc9cf5a9d2e1af55333070161762fa14a6ea6f35bf856
DIST jmdns-3.4.1.tgz 665503 SHA256 aefc28fcb0a8d8d563abfe0b764fa91a2737aa8b19f8a8f859a96a50fe663ebe SHA512 06e01dc7ef9eabd1ba75be016d688294043a6eec53de40d20026587f2c3d82bd0b025efd9b662bbe28450940d277da0fbc30ef69293ca3e81426212d8e85d7fb WHIRLPOOL 1df820435d9d1ad72daaff2d2467eb0d5080b8e74bbb9b18da7333feabdf48b25b39cdd29d453535b00ea3f2a20231282e49a9bf845075815bef6eb498bdd9f8
diff --git a/dev-java/jmdns/jmdns-1.0.ebuild b/dev-java/jmdns/jmdns-1.0.ebuild
deleted file mode 100644
index 48803902de0c..000000000000
--- a/dev-java/jmdns/jmdns-1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}-Final.tar.gz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3.1"
-RDEPEND=">=virtual/jre-1.3.1"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- rm lib/*.jar
-}
-
-src_compile() {
- echo "Compiling JmDNS..."
- ejavac "${S}"/src/javax/jmdns/* || die
- echo "Compiling tools..."
- ejavac -classpath "${S}/src" "${S}"/src/com/strangeberry/jmdns/tools/* || die
- echo "Making jars..."
- echo "Main-class: com.strangeberry.jmdns.tools.Main" > jmdns-tools-manifest
- jar cmf jmdns-tools-manifest jmdns.jar -C "${S}/src" com -C "${S}/src" javax || die
-}
-
-src_install() {
- java-pkg_dojar jmdns*.jar
- java-pkg_dolauncher
- dodoc README.txt CHANGELOG.txt
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc src/{com,javax}
-
- if use examples; then
- insinto /usr/share/doc/${P}/
- doins -r src/samples
- fi
-}
diff --git a/dev-java/jmdns/jmdns-3.1.4.ebuild b/dev-java/jmdns/jmdns-3.1.4.ebuild
deleted file mode 100644
index 20ddd5ec7ee4..000000000000
--- a/dev-java/jmdns/jmdns-3.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz"
-HOMEPAGE="http://jmdns.sourceforge.net"
-
-LICENSE="Apache-2.0"
-SLOT="3.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
- rm "${S}"/build.xml
- rm "${S}"/lib/*.jar || die
-}
diff --git a/dev-java/jmdns/jmdns-3.4.1.ebuild b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
similarity index 70%
rename from dev-java/jmdns/jmdns-3.4.1.ebuild
rename to dev-java/jmdns/jmdns-3.4.1-r1.ebuild
index 5b50bcc61b28..8fd63276a234 100644
--- a/dev-java/jmdns/jmdns-3.4.1.ebuild
+++ b/dev-java/jmdns/jmdns-3.4.1-r1.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
-
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="JmDNS is an implementation of multi-cast DNS in Java"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.tgz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
HOMEPAGE="http://jmdns.sourceforge.net"
LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
-S="${WORKDIR}"
JAVA_SRC_DIR="src"
src_prepare() {
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
similarity index 82%
rename from dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
rename to dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
index 445c3a5159de..f16a15f79d80 100644
--- a/dev-java/svgsalamander/svgsalamander-0.0-r1.ebuild
+++ b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
@@ -3,11 +3,10 @@
# $Id$
EAPI="5"
-
JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-nodeps ant-trax"
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
DESCRIPTION="a SVG engine for Java"
HOMEPAGE="https://svgsalamander.dev.java.net/"
@@ -18,20 +17,26 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+ dev-java/ant-core:0
+ dev-java/javacc:0
+"
RDEPEND="
- >=virtual/jre-1.5
- dev-java/ant-core:0"
+ ${CDEPEND}
+ >=virtual/jre-1.6"
DEPEND="
- >=virtual/jdk-1.5
- dev-java/javacc:0"
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
java_prepare() {
# Delete these so that we don't need junit
# They run a dialog any way so not useful for us
- ecvs_clean
rm -vr test/* || die
cd lib || die
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index cb671e0df77b..dfb2680c200c 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -2,3 +2,4 @@ DIST llvmlite-0.2.1.tar.gz 67340 SHA256 48c9217db60d496ffef9d15bcb493b84757fc08b
DIST llvmlite-0.2.2.tar.gz 75171 SHA256 5771189d07da7774446e1ac6c586d31ea4293ef1c2bfb9dbe0c570bcf971b4a1 SHA512 7eeea5c0bd5287415d6cc39fb2e546366de42d3b2b99cf57655036c9fd2bf526398cc51ea79d062504cdfdd927ce5be22997a54c5d79cc2e4de3168317f35fcf WHIRLPOOL aac97a187e341a67a5ee1771480deb6598d921cfce098aec6ca20927d6173c1f984de0b8e1985e2c7db55e393e65f4bd471c5d57bb8fd0da21cb2ad4faf0a3dc
DIST llvmlite-0.5.0.tar.gz 74434 SHA256 616b0f16366dd1eec197b7067f4618c6c5183db852e7f4203862c0343ebdd31c SHA512 aec69c841a8166896a6632a4204a53df1f19a42514c335a3dc21a9c7e7610c110a5d00b293d7013dfe497cc7c1e3ffbaedf0a80ee16970f5f33f0043bacd6aec WHIRLPOOL 737a53017e160a04f371e87abf24eb923f17b101d3b2394c276ae0d47787c617aa496428b268ee86301a2ed33a0a93b0b5d3fbc0fb293e295d38742d8a5b98e8
DIST llvmlite-0.6.0.tar.gz 74834 SHA256 0ed6bbf850578dc99c06be3060a1067ea4993474392137760d1c020f7188a236 SHA512 7db3f774d7cff903e4a5a476eee3efd1c6f107443433ab47543eae4e28918a385534225a23e0cd000cfab65b5ebeb0a5c38d6b963090ee0943c65fb61879fc7b WHIRLPOOL 3bed14fef8defac3f217b9ecdb5a2b4d1c68cd9e19078292cc792f375345a87b4daf63ee9c6429954d5156e7c73b5ea85b3bff54c60f78fbc982067411f2eb40
+DIST llvmlite-0.8.0.tar.gz 80497 SHA256 a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c SHA512 d960dd2635d670b3ed2a79f81e5c3ada4fe0a03ac39e8f94a16a83fb62013ecbbce1a430ac48c8e6abd8fa34c37938d4ec7a0b949bd8c490f391c8dc29ce221c WHIRLPOOL 569cf60ae6b6efe63aa1af322d53cb983a4d29550557ba465ff26dbcc49bab598365cc592931cabca5f2e99b979ebb4f101d698a1c457a1ef1fa11eb89184c31
diff --git a/dev-python/llvmlite/llvmlite-0.8.0.ebuild b/dev-python/llvmlite/llvmlite-0.8.0.ebuild
new file mode 100644
index 000000000000..6e422ed343f8
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://pypi.python.org/pypi/llvmlite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+ =sys-devel/llvm-3.6*:=[multitarget]
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3)
+ "
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+ # disable test using installed instance to read version info
+ sed -e 's:test_version:_&:' -i llvmlite/tests/test_binding.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" -m "llvmlite.tests" || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 068ecdd00ef4..e8ac3a4d3258 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,3 +1,4 @@
DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb63bb8ae49487fe013235a7f SHA512 03d0511df1a5e98f4166a1febc51b6bc4dbf4ca8b432c315a93c8a5c762f6d0ac830fd264c4b42cdb52f262a24c6777885abcccc6e61e08605f30c4bb830850d WHIRLPOOL d62e5e14191146d301fd5475023d0e711e1a014f52c8d2d4661529adb6190006c37259e9a45a8336e5e4cbf8d60fa8a69babce6e0cf01a297ef43d1e7f563cf7
DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67
DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce
+DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16
diff --git a/dev-python/numba/numba-0.22.1.ebuild b/dev-python/numba/numba-0.22.1.ebuild
new file mode 100644
index 000000000000..cbd0b4239074
--- /dev/null
+++ b/dev-python/numba/numba-0.22.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+ dev-python/llvmlite[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+ virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+ # Re-set them of doc build to one provided by sphinx
+ if has_version ">=dev-python/sphinx-1.3.1"; then
+ sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+ else
+ sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+ fi
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && emake -C docs/ html
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib* || die
+ ${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+ # doc needs obsolete sphinxjp package
+# use doc && dodoc docs/Numba.pdf
+ use examples && local EXAMPLES=( examples/. )
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index f02465c442bc..77247c8030c9 100644
--- a/dev-vcs/notify-webhook/Manifest
+++ b/dev-vcs/notify-webhook/Manifest
@@ -1,3 +1 @@
-DIST notify-webhook-20140805.tar.gz 15078 SHA256 479d71c7ab9ba772a0b621638e80a14cbe6f34e8fbe851d8db93b118d4567e3f SHA512 8e10994ad26d6de86e7930a2299a8701bed0f04299f2ca14b070f00543368015628b89fd4cbf351f3e42e85cf98e7465dd94517243d1beb71b645d91a637e6d2 WHIRLPOOL 533e2118941edc2f9db4412477a76332fe27475ebc882eb8f567d39a846bf04c95cc693230ae32bc1c10bf24301117b7d6e04c08e45e0fe7cf181fe454504a4b
-DIST notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch 8581 SHA256 c6167fd81e88fcb8de6c37bb2c5259f1c09e6e3a7f0b61d6b58f5f5e478e585c SHA512 c72b03cbea34884c089968e67b61e654a9d365e6b2a338363b6405ab1950aaa5a1c4f8ece73181003571a88f1983458c2e9194d6b26aa103c95c1ceed8e0dd4c WHIRLPOOL 3f4be9d58f5d1a4dff2a7978d067afb0e8fb739b6836709964dec17cc386890eb1d97b0652323acaefc7ca5bc5ae25c46f1f222323d471529e92a5640541bcae
-DIST notify-webhook-20150308.tar.gz 16347 SHA256 cb9d2687eea5ab4f32f6fbc9bdb05a24c8b7755193b312a574172f6aaaca857e SHA512 7a82418d16e6cfd58b9bccaf1700c5a9258601a45a823f1b8307ee3b3c6e90ad52424421836468e34b400b07100a291fd514450a2e1b3c2d1c8dff99ee409557 WHIRLPOOL 523578237483d74d2bd4fa9f4f87277b9103c67c415fbb383629211ea91403fc11debfed70fa94069e9bd8e87a1c9e799929aa1c376244e1a2dde656609a10d8
+DIST notify-webhook-0.1.0.tar.gz 17525 SHA256 3782f588e75872e7dd25656279bab154102c476dd3b1fa24fb3af66475960d55 SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4 WHIRLPOOL 908e3b7e61ac8893c064d95566ee504bea1689f227ca900c27e3189e4e5be0fbe1409b24c3002feb1ee05aa85364cd2fcb620f0c4a7cdcbb1ce3c53d81bf412f
diff --git a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
similarity index 66%
rename from dev-vcs/notify-webhook/notify-webhook-20140805.ebuild
rename to dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
index a909d4780d58..8441e7fad76e 100644
--- a/dev-vcs/notify-webhook/notify-webhook-20140805.ebuild
+++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
@@ -4,10 +4,12 @@
EAPI=5
+PYTHON_COMPAT=( python3_{3,4,5} pypy3 )
+
DESCRIPTION="Git post-receive web hook notifier in Python."
HOMEPAGE="https://github.com/metajack/notify-webhook"
-COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
-SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+#COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
+SRC_URI="https://github.com/metajack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -17,8 +19,8 @@ IUSE=""
DEPEND="dev-python/simplejson"
RDEPEND="${DEPEND}"
-MY_P="${PN}-${COMMIT}"
-S="${WORKDIR}/${MY_P}"
+#MY_P="${PN}-${COMMIT}"
+#S="${WORKDIR}/${MY_P}"
src_install() {
dodoc *markdown
diff --git a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild b/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
deleted file mode 100644
index 9262564d7192..000000000000
--- a/dev-vcs/notify-webhook/notify-webhook-20150308.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Git post-receive web hook notifier in Python."
-HOMEPAGE="https://github.com/metajack/notify-webhook"
-COMMIT='1ff39853e59bb0ee37c4783da8dcf3ea14cef53f'
-PATCH_COMMIT='BCLibCoop:ee038b53a48e70d9e69c86386c39b7f24736d07e'
-PATCH_DELTA="${COMMIT:0:7}...${PATCH_COMMIT:0:17}"
-PATCH_NAME="${P}-${PATCH_DELTA}.patch"
-SRC_URI="https://github.com/metajack/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
- https://github.com/metajack/notify-webhook/compare/${PATCH_DELTA}.patch -> ${PATCH_NAME}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/simplejson"
-DEPEND="${RDEPEND}
- dev-util/patchutils"
-
-MY_P="${PN}-${COMMIT}"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${P}.tar.gz
-}
-
-# Yes, this is some creative patch mangling, to avoid a manually created
-# distfile. epatch's dryrun fails on a sequence of changes that depend on each
-# other, so we can clean up the patch to actually pass that check.
-src_prepare() {
- cd "${T}"
- cp "${DISTDIR}/${PATCH_NAME}" diff
- p="newdiff"
- >$p # Make an empty file to work in
- splitdiff -a -p 1 diff # split out the patches
- # combine them to a single patch
- for f in diff.part*.patch ; do
- combinediff -p 1 $p $f >$p.new && mv $p.new $p
- done
-
- # Now apply it, and dry-run will pass too!
- cd "${S}"
- EPATCH_OPTS="-p1" epatch "${T}"/newdiff
-}
-
-src_install() {
- dodoc *markdown
- exeinto /usr/libexec/githook/$PN/
- doexe notify-webhook.py
-}
diff --git a/gnome-base/gvfs/gvfs-1.26.2.ebuild b/gnome-base/gvfs/gvfs-1.26.2.ebuild
index edab684f779e..b0dcce115568 100644
--- a/gnome-base/gvfs/gvfs-1.26.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gvfs"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
+IUSE="afp archive bluray cdda fuse +google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf"
REQUIRED_USE="
cdda? ( udev )
mtp? ( udev )
@@ -29,7 +29,6 @@ RDEPEND="
>=dev-libs/glib-2.45.7:2
sys-apps/dbus
dev-libs/libxml2:2
- >=dev-libs/libgdata-0.17.3:=[gnome]
net-misc/openssh
afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
archive? ( app-arch/libarchive:= )
@@ -37,6 +36,7 @@ RDEPEND="
fuse? ( >=sys-fs/fuse-2.8.0 )
gnome-keyring? ( app-crypt/libsecret )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+ google? ( >=dev-libs/libgdata-0.17.3:=[gnome] )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
http? ( >=net-libs/libsoup-2.42:2.4 )
@@ -109,6 +109,7 @@ src_configure() {
$(use_enable fuse) \
$(use_enable gnome-keyring keyring) \
$(use_enable gnome-online-accounts goa) \
+ $(use_enable google) \
$(use_enable gphoto2) \
$(use_enable gtk) \
$(use_enable ios afc) \
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 93e236daeec9..89339791ff3e 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -15,6 +15,7 @@ applications not using gio to access the gvfs filesystems.
Enable playback of Blu-ray filesystems using media-libs/libbluray
Enables fuse mount points in $HOME/.gvfs for legacy application access
Enable configuration panel for net-libs/gnome-online-accounts accounts
+ Enables support for accessing Google accounts via dev-libs/libgdata
Enable the HTTP/DAV backend using net-libs/libsoup-gnome
Enable app-crypt/libsecret support to store login credentials.
Enable NFS client support via net-fs/libnfs.
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index fff1d968bacf..e39639531532 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,4 +1,2 @@
-DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
-DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab WHIRLPOOL 30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e
-DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
+DIST libmikmod-3.3.8.tar.gz 1254702 SHA256 4acf6634a477d8b95f18b55a3e2e76052c149e690d202484e8b0ac7589cf37a2 SHA512 033e3977d5723c42af697bf1b9ba6b1912fff1bfbef1894e2b1919d55415efa8024046579ff6a1e9ec752a3c793acc60b616c223b3cb5d79a814746c0cf55e15 WHIRLPOOL 569dda4099e7b7b0c8f198425c9ae68f0fd6a1468e301e133482e24aef04ff85385aafe0ead3b847fb138d3c3fca06a9b588f3a896cf789143a2622d826f4cb1
diff --git a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch b/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
deleted file mode 100644
index 5aa45566c30c..000000000000
--- a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-64bit.patch
-
---- include/mikmod.h.in
-+++ include/mikmod.h.in
-@@ -85,7 +85,8 @@ typedef char CHAR;
-
- @DOES_NOT_HAVE_SIGNED@
-
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
-+#include
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
-
- typedef signed char SBYTE; /* 1 byte, signed */
---- include/mikmod_internals.h
-+++ include/mikmod_internals.h
-@@ -43,7 +43,8 @@ extern "C" {
- /*========== More type definitions */
-
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__)
-+#include
-+#if __WORDSIZE == 64
- typedef long SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch b/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
deleted file mode 100644
index beef6129f7af..000000000000
--- a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-strip-lib.patch
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -51,7 +51,7 @@
-
- install: $(LIB)
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-- $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
-
- uninstall: $(LIB)
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
diff --git a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch b/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
deleted file mode 100644
index be2483857fd4..000000000000
--- a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-multilib.patch
-
---- libmikmod-config.in
-+++ libmikmod-config.in
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
-
- usage="\
--Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
-+Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]"
-
- if test $# -eq 0 ; then
- echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
- echo @LIB_LDADD@
- ;;
- --libs)
-+ if [ -d /usr/lib64 ]; then
-+ libdir=-L${exec_prefix}/lib64
-+ else
-+ libdir=-L${exec_prefix}/lib
-+ fi
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
-+ --libs32)
- libdir=-L${exec_prefix}/lib
- echo $libdir -lmikmod @LIBRARY_LIB@
- ;;
-+ --libs64)
-+ libdir=-L${exec_prefix}/lib64
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
- *)
- echo "${usage}" 1>&2
- exit 1
diff --git a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch b/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
deleted file mode 100644
index 9214df87d72e..000000000000
--- a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-malloc-fail.patch
-
-Some partially corrupt mod files cause mikmod to try and allocate lots
-of memory, this is ok, because failure to do so is being handled.
-
-But the new libmikmod malloc code align_pointer function did not handle
-asking to align the NULL pointer, resulting from the too big alloc,
-causing a segfault, this patch fixes this.
-
---- mmio/mmalloc.c
-+++ mmio/mmalloc.c
-@@ -38,6 +38,10 @@ static void * align_pointer(char *ptr, s
- {
- char *pptr = ptr + sizeof(void*);
- char *fptr;
-+
-+ if (ptr == NULL)
-+ return NULL;
-+
- size_t err = ((size_t)pptr)&(stride-1);
- if (err)
- fptr = pptr + (stride - err);
diff --git a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch b/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
deleted file mode 100644
index a49c50a56da6..000000000000
--- a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- playercode/mplayer.c
-+++ playercode/mplayer.c
-@@ -50,6 +50,8 @@ extern long int random(void);
- /* The currently playing module */
- MODULE *pf = NULL;
-
-+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define HIGH_OCTAVE 2 /* number of above-range octaves */
-
- static UWORD oldperiods[OCTAVE*2]={
-@@ -246,14 +248,14 @@ static int MP_FindEmptyChannel(MODULE *m
- MP_VOICE *a;
- ULONG t,k,tvol,pp;
-
-- for (t=0;tvoice[t].main.kick==KICK_ABSENT)||
- (mod->voice[t].main.kick==KICK_ENV))&&
- Voice_Stopped_internal(t))
- return t;
-
- tvol=0xffffffUL;t=-1;a=mod->voice;
-- for (k=0;kmain.s)
- return k;
-@@ -2247,12 +2249,12 @@ static void DoNNAEffects(MODULE *mod, MP
-
- switch (dat) {
- case 0x0: /* past note cut */
-- for (t=0;tvoice[t].master==a)
- mod->voice[t].main.fadevol=0;
- break;
- case 0x1: /* past note off */
-- for (t=0;tvoice[t].master==a) {
- mod->voice[t].main.keyoff|=KEY_OFF;
- if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2261,7 +2263,7 @@ static void DoNNAEffects(MODULE *mod, MP
- }
- break;
- case 0x2: /* past note fade */
-- for (t=0;tvoice[t].master==a)
- mod->voice[t].main.keyoff|=KEY_FADE;
- break;
-@@ -2316,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
- SAMPLE *s;
-
- mod->totalchn=mod->realchn=0;
-- for (channel=0;channelnumchn;channel++) {
-+ for (channel=0;channelvoice[channel];
- i=aout->main.i;
- s=aout->main.s;
-@@ -2737,7 +2739,7 @@ void pt_NNA(MODULE *mod)
- if (a->dct!=DCT_OFF) {
- int t;
-
-- for (t=0;tvoice[t].masterchn==channel)&&
- (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2979,6 +2981,11 @@ BOOL Player_Init(MODULE* mod)
- if (!(mod->voice=(MP_VOICE*)MikMod_calloc(md_sngchn,sizeof(MP_VOICE))))
- return 1;
-
-+ /* mod->numvoices was used during loading to clamp md_sngchn.
-+ After loading it's used to remember how big mod->voice is.
-+ */
-+ mod->numvoices = md_sngchn;
-+
- Player_Init_internal(mod);
- return 0;
- }
-@@ -3087,7 +3094,7 @@ MIKMODAPI void Player_NextPosition(void)
- pf->patbrk=0;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;tnumchn;t++) {
-+ for (t=0;tvoice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
-@@ -3112,7 +3119,7 @@ MIKMODAPI void Player_PrevPosition(void)
- pf->patbrk=0;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;tnumchn;t++) {
-+ for (t=0;tvoice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
-@@ -3139,7 +3146,7 @@ MIKMODAPI void Player_SetPosition(UWORD
- pf->sngpos=pos;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;tnumchn;t++) {
-+ for (t=0;tvoice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
diff --git a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch b/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
deleted file mode 100644
index f70c35e0bfe8..000000000000
--- a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- loaders/load_xm.c
-+++ loaders/load_xm.c
-@@ -611,7 +611,8 @@ static BOOL LoadInstruments(void)
- nextwav[of.numsmp+u]=next;
- next+=s->length;
-
-- if(_mm_eof(modreader)) {
-+ /* last instrument is at the end of file in version 0x0104 */
-+ if(_mm_eof(modreader) && (mh->version<0x0104 || tvolume=(volume<0)?0:(volume>128)?128:volume;
-+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
- MUTEX_UNLOCK(vars);
- }
-
diff --git a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch b/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
deleted file mode 100644
index e85ca13ea6ec..000000000000
--- a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* Samuli Suominen (17 Nov 2012)
- Reviewed libmikmod-3.2.0_beta2-autotools.patch from gentoo-x86 and only this
- chunk didn't make it upstream
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -73,7 +73,7 @@
- rm -f Makefile
-
- $(LIB): $(OBJ)
-- $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-
- dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
- $(top_srcdir)/dlapi/dlfcn.h
diff --git a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch b/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
deleted file mode 100644
index af4a2f6e0261..000000000000
--- a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream didn't ship Makefile.am so we have to patch bits by hands.
-$(SHELL) is needed to run libtool properly (contains bashisms).
-LIBTOOL variable uses $(SHELL) in it's definition.
-
-Gentoo-bug: http://bugs.gentoo.org/401329
-Reported by: Anthony Parsons
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -27,6 +27,7 @@ CC=@CC@
- INSTALL=@INSTALL@
- LIBTOOL=@LIBTOOL@
- MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
-+SHELL=@SHELL@
-
- DEFS=@DEFS@
- CFLAGS=@CFLAGS@ -Dunix
diff --git a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch b/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
deleted file mode 100644
index 5159634c0fc7..000000000000
--- a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=445556#c2
-
---- configure.in
-+++ configure.in
-@@ -724,7 +724,7 @@
- ;;
- Linux)
- dnl force_cpusubtype_ALL not allowed for Linux as
-- CFLAGS="$CFLAGS -faltivec"
-+ CFLAGS="$CFLAGS -maltivec"
- ;;
- esac
- fi
diff --git a/media-libs/libmikmod/libmikmod-3.2.0.ebuild b/media-libs/libmikmod/libmikmod-3.2.0.ebuild
deleted file mode 100644
index 7b78d6c1eae1..000000000000
--- a/media-libs/libmikmod/libmikmod-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.shlomifish.org/"
-SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa coreaudio oss static-libs"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
- !${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
- EPATCH_SOURCE="${FILESDIR}"/${PVR} EPATCH_SUFFIX=patch epatch
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #468212
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable alsa) \
- --disable-nas \
- $(use_enable coreaudio osx) \
- $(use_enable oss) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dohtml docs/*.html
-
- prune_libtool_files
- dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-
- cat <<-EOF > "${T}"/${PN}.pc
- prefix=/usr
- exec_prefix=\${prefix}
- libdir=/usr/$(get_libdir)
- includedir=\${prefix}/include
- Name: ${PN}
- Description: ${DESCRIPTION}
- Version: ${PV}
- Libs: -L\${libdir} -lmikmod
- Libs.private: -ldl -lm
- Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
- EOF
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${T}"/${PN}.pc
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.5.ebuild b/media-libs/libmikmod/libmikmod-3.3.5.ebuild
deleted file mode 100644
index 00ab6d4eb135..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
- nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
- !${CATEGORY}/${PN}:2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-multilib_src_configure() {
- local mysimd="--disable-simd"
- if use ppc || use ppc64 || use ppc-macos; then
- mysimd="$(use_enable altivec simd)"
- fi
- if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
- mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
- fi
-
- # sdl, sdl2: missing multilib supported ebuilds, temporarily disabled
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable alsa) \
- $(use_enable nas) \
- $(use_enable pulseaudio) \
- --disable-sdl \
- --disable-sdl2 \
- $(use_enable openal) \
- $(use_enable oss) \
- $(use_enable coreaudio osx) \
- $(use_enable debug) \
- $(use_enable threads) \
- $(use_enable static-libs static) \
- --disable-dl \
- ${mysimd}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README TODO
- dohtml docs/*.html
- prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
similarity index 92%
rename from media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
rename to media-libs/libmikmod/libmikmod-3.3.8.ebuild
index 44bdc9e9c483..22193848d4de 100644
--- a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
LICENSE="LGPL-2+ LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
@@ -24,6 +24,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
+ sys-apps/texinfo
oss? ( virtual/os-headers )"
MULTILIB_CHOST_TOOLS=(
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 99bc8d56d7a8..3fc2a4dab897 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,2 +1,2 @@
-DIST mikmod-3.2.5.tar.gz 285801 SHA256 da2b4b13f769a7c54119869851c8e6b9a6ca812b96fe5e2c5394441722e4e383 SHA512 e441d5dc4a3f6f2101e4db8cd3cb55f90a418d92767c143c1754c8ef33445aa4ace48a48ab8c209336c0eb3fd66590380cfbbe71c086908dfb0ae9fdd88adca5 WHIRLPOOL 9f46690799f4f1a899eaff15367512969f461ae6264024e1b1350b59fed979bac42ffcce9569558675a8f257c7de22ded1d0df9f30e4ebbe03fd109c81e8f334
DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8
+DIST mikmod-3.2.7.tar.gz 279228 SHA256 5f398d5a5ccee2ce331036514857ac7e13a5644267a13fb11f5a7209cf709264 SHA512 cd68f46418af4fedd6fef35c48c120cc8ddb66c0160107528ee8816228cac1732fb3f474a850317022d2161cd619e5694645c78690792fee743130d380684c4d WHIRLPOOL 9c884b333b960f40951b4a208ec1ddbf78a02b27c96c26ef165103dc1c9c9061fbe1907ba1788f3fea17d2e13f408c88f8a1109621b30db9b39f86cf0268aa3f
diff --git a/media-sound/mikmod/mikmod-3.2.5.ebuild b/media-sound/mikmod/mikmod-3.2.7.ebuild
similarity index 65%
rename from media-sound/mikmod/mikmod-3.2.5.ebuild
rename to media-sound/mikmod/mikmod-3.2.7.ebuild
index 3530e48c929c..6e34d8037f1c 100644
--- a/media-sound/mikmod/mikmod-3.2.5.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE=""
-RDEPEND=">=media-libs/libmikmod-3.2.0
- >=sys-libs/ncurses-5.7-r7"
+RDEPEND=">=media-libs/libmikmod-3.3
+ >=sys-libs/ncurses-5.7-r7:0="
DEPEND="${RDEPEND}"
DOCS="AUTHORS NEWS README"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ee616bd57d21..467598ab4387 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Nov 2015 12:54:29 +0000
+Sat, 21 Nov 2015 04:54:59 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ee616bd57d21..033ce3af6368 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Nov 2015 12:54:29 +0000
+Sat, 21 Nov 2015 04:55:00 +0000
diff --git a/metadata/md5-cache/app-admin/puppetserver-2.1.1 b/metadata/md5-cache/app-admin/puppetserver-2.2.0
similarity index 83%
rename from metadata/md5-cache/app-admin/puppetserver-2.1.1
rename to metadata/md5-cache/app-admin/puppetserver-2.2.0
index fe7fc4b5c2e5..23a1f8005a2d 100644
--- a/metadata/md5-cache/app-admin/puppetserver-2.1.1
+++ b/metadata/md5-cache/app-admin/puppetserver-2.2.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=virtual/jdk-1.7.0 app-admin/puppet-agent[puppetdb?]
SLOT=0
-SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.1.1.tar.gz
+SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-2.2.0.tar.gz
_eclasses_=eutils f813d23e417656bf3917483643165d5a multilib 3972ca401cf7dbb430df9995f5d8d580 systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=19b221d256ed841e2202a7971eb14351
+_md5_=92ebbba4d9c9eabe6b385be0f3059ebe
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105 b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
similarity index 94%
rename from metadata/md5-cache/app-misc/xmind-3.5.3.201506180105
rename to metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
index 430c0cb52b0b..f1b3e346c6e4 100644
--- a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105
+++ b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
@@ -9,4 +9,4 @@ RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
_eclasses_=eutils f813d23e417656bf3917483643165d5a gnome2-utils 588052cacdf74572e68bdfeaece20534 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=5437765d721deef437b7bbf77e0a99a5
+_md5_=9d3584fb79342b97726c92d76dbc777f
diff --git a/metadata/md5-cache/app-text/groonga-5.0.9 b/metadata/md5-cache/app-text/groonga-5.0.9
new file mode 100644
index 000000000000..20b5223e0bcd
--- /dev/null
+++ b/metadata/md5-cache/app-text/groonga-5.0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx )
+DESCRIPTION=An Embeddable Fulltext Search Engine
+EAPI=5
+HOMEPAGE=http://groonga.org/
+IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
+SLOT=0
+SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
+_eclasses_=eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=346ba4100c82e7fd267f49c6344c87ab
diff --git a/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0 b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
new file mode 100644
index 000000000000..ed0911b3df63
--- /dev/null
+++ b/metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/groonga virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
+EAPI=5
+HOMEPAGE=http://groonga.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-text/groonga
+SLOT=0
+SRC_URI=http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.tar.gz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=f2f8bd8f55389cf974645bd7d4a98b82
diff --git a/metadata/md5-cache/dev-java/hamcrest-library-1.1 b/metadata/md5-cache/dev-java/hamcrest-library-1.1
deleted file mode 100644
index 98ef60142415..000000000000
--- a/metadata/md5-cache/dev-java/hamcrest-library-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 userland_GNU? ( sys-apps/findutils ) dev-java/hamcrest-core:0 dev-java/hamcrest-generator:0 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Core library of matchers for building test expressions
-EAPI=5
-HOMEPAGE=https://github.com/hamcrest
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=virtual/jre-1.5 dev-java/hamcrest-core:0 dev-java/hamcrest-generator:0 dev-java/qdox:1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://hamcrest.googlecode.com/files/hamcrest-1.1.tgz
-_eclasses_=eutils f813d23e417656bf3917483643165d5a java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 a96633177f44ee992b3fce360d1c4f16 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8f14e6ebc096e8437b26846fecc129d2
diff --git a/metadata/md5-cache/dev-java/jmdns-1.0 b/metadata/md5-cache/dev-java/jmdns-1.0
deleted file mode 100644
index c88e61489bab..000000000000
--- a/metadata/md5-cache/dev-java/jmdns-1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=JmDNS is an implementation of multi-cast DNS in Java
-EAPI=0
-HOMEPAGE=http://jmdns.sourceforge.net
-IUSE=elibc_FreeBSD doc examples source
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.3.1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/jmdns/jmdns-1.0-Final.tar.gz
-_eclasses_=eutils f813d23e417656bf3917483643165d5a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 a96633177f44ee992b3fce360d1c4f16 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5215d9d3e01bfbddf5e8db0282428a22
diff --git a/metadata/md5-cache/dev-java/jmdns-3.1.4 b/metadata/md5-cache/dev-java/jmdns-3.1.4
deleted file mode 100644
index 4256901f3032..000000000000
--- a/metadata/md5-cache/dev-java/jmdns-3.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=JmDNS is an implementation of multi-cast DNS in Java
-EAPI=5
-HOMEPAGE=http://jmdns.sourceforge.net
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://sourceforge/jmdns/jmdns-3.1.4.tgz
-_eclasses_=eutils f813d23e417656bf3917483643165d5a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 a96633177f44ee992b3fce360d1c4f16 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff026d1d28697e1a77381977735f7da9
diff --git a/metadata/md5-cache/dev-java/jmdns-3.4.1 b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
similarity index 75%
rename from metadata/md5-cache/dev-java/jmdns-3.4.1
rename to metadata/md5-cache/dev-java/jmdns-3.4.1-r1
index b0edc557aa70..7164c8c302ee 100644
--- a/metadata/md5-cache/dev-java/jmdns-3.4.1
+++ b/metadata/md5-cache/dev-java/jmdns-3.4.1-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
DESCRIPTION=JmDNS is an implementation of multi-cast DNS in Java
EAPI=5
HOMEPAGE=http://jmdns.sourceforge.net
IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=3.4
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
SRC_URI=mirror://sourceforge/jmdns/jmdns-3.4.1.tgz
_eclasses_=eutils f813d23e417656bf3917483643165d5a java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-pkg-simple bdf24e52707f01512ffea6d3aa05425b java-utils-2 a96633177f44ee992b3fce360d1c4f16 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9451a92a963e4c4f1fda79e87829f662
+_md5_=52c69c97e6801b03edfbe0aa3edea6dd
diff --git a/metadata/md5-cache/dev-java/svgsalamander-0.0-r1 b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
similarity index 60%
rename from metadata/md5-cache/dev-java/svgsalamander-0.0-r1
rename to metadata/md5-cache/dev-java/svgsalamander-0.0-r2
index 74a110689ac6..31a07a9f1203 100644
--- a/metadata/md5-cache/dev-java/svgsalamander-0.0-r1
+++ b/metadata/md5-cache/dev-java/svgsalamander-0.0-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 dev-java/javacc:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/ant-nodeps dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=a SVG engine for Java
EAPI=5
HOMEPAGE=https://svgsalamander.dev.java.net/
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.5 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/ant-core:0 dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
SLOT=0
SRC_URI=mirror://gentoo/svgsalamander-0.0.tar.bz2
_eclasses_=eutils f813d23e417656bf3917483643165d5a java-ant-2 7c5d0c274d390745f5033754a319f515 java-pkg-2 b02dc1e46b3648e467b5fbdf7857cf28 java-utils-2 a96633177f44ee992b3fce360d1c4f16 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=05b30e2bb3a4e1f77d55a6c039c7c275
+_md5_=6a9003313e7875ba4592d6bfccd31956
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.8.0 b/metadata/md5-cache/dev-python/llvmlite-0.8.0
new file mode 100644
index 000000000000..0c23e951e666
--- /dev/null
+++ b/metadata/md5-cache/dev-python/llvmlite-0.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==sys-devel/llvm-3.6*:=[multitarget] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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=Python wrapper around the llvm C++ library
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/llvmlite
+IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND==sys-devel/llvm-3.6*:=[multitarget] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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/l/llvmlite/llvmlite-0.8.0.tar.gz
+_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils f813d23e417656bf3917483643165d5a multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 fb656e31d5596be6ac85cde42dccfcb6 python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=7eeb3017f4b421dd60d213e0dee48470
diff --git a/metadata/md5-cache/dev-python/numba-0.22.1 b/metadata/md5-cache/dev-python/numba-0.22.1
new file mode 100644
index 000000000000..ad7247ed92c2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numba-0.22.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/llvmlite[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) virtual/python-funcsigs[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(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-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=NumPy aware dynamic Python compiler using LLVM
+EAPI=5
+HOMEPAGE=http://numba.pydata.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/llvmlite[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/numba/numba/archive/0.22.1.tar.gz -> numba-0.22.1.tar.gz
+_eclasses_=distutils-r1 46506dd0dd992b3c89b0d00daabfd86c eutils f813d23e417656bf3917483643165d5a multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing d769539d9bace6eaca30af23bc2b4dde python-r1 fb656e31d5596be6ac85cde42dccfcb6 python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
+_md5_=ac0c44193b8efe89f969a2693edf86d9
diff --git a/metadata/md5-cache/dev-vcs/notify-webhook-20140805 b/metadata/md5-cache/dev-vcs/notify-webhook-0.1.0
similarity index 57%
rename from metadata/md5-cache/dev-vcs/notify-webhook-20140805
rename to metadata/md5-cache/dev-vcs/notify-webhook-0.1.0
index 31bed4b6a742..eaee6a0879f6 100644
--- a/metadata/md5-cache/dev-vcs/notify-webhook-20140805
+++ b/metadata/md5-cache/dev-vcs/notify-webhook-0.1.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-python/simplejson
SLOT=0
-SRC_URI=https://github.com/metajack/notify-webhook/archive/c571160f155122446e97bb01c1150b4d14ea69d6.tar.gz -> notify-webhook-20140805.tar.gz
-_md5_=dfb4d72ff857fd9d9c27367861553f6d
+SRC_URI=https://github.com/metajack/notify-webhook/archive/v0.1.0.tar.gz -> notify-webhook-0.1.0.tar.gz
+_md5_=ba22e083a53aa8f03f4af34eacb579ef
diff --git a/metadata/md5-cache/dev-vcs/notify-webhook-20150308 b/metadata/md5-cache/dev-vcs/notify-webhook-20150308
deleted file mode 100644
index 34f5b612d4b7..000000000000
--- a/metadata/md5-cache/dev-vcs/notify-webhook-20150308
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-python/simplejson dev-util/patchutils
-DESCRIPTION=Git post-receive web hook notifier in Python.
-EAPI=5
-HOMEPAGE=https://github.com/metajack/notify-webhook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/simplejson
-SLOT=0
-SRC_URI=https://github.com/metajack/notify-webhook/archive/1ff39853e59bb0ee37c4783da8dcf3ea14cef53f.tar.gz -> notify-webhook-20150308.tar.gz https://github.com/metajack/notify-webhook/compare/1ff3985...BCLibCoop:ee038b5.patch -> notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch
-_eclasses_=eutils f813d23e417656bf3917483643165d5a multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=3d2c02fc597ce24f38a76b01bba5723e
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.26.2 b/metadata/md5-cache/gnome-base/gvfs-1.26.2
index a224d6a18fe2..19cb7c803ae8 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.26.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.26.2
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:=[gnome] net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) google? ( >=dev-libs/libgdata-0.17.3:=[gnome] ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
DESCRIPTION=Virtual filesystem implementation for gio
EAPI=5
HOMEPAGE=https://git.gnome.org/browse/gvfs
-IUSE=afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf
+IUSE=afp archive bluray cdda fuse +google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf
KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
LICENSE=LGPL-2+
-RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:=[gnome] net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
+RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) google? ( >=dev-libs/libgdata-0.17.3:=[gnome] ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
REQUIRED_USE=cdda? ( udev ) mtp? ( udev ) udisks? ( udev ) systemd? ( udisks )
RESTRICT=test
SLOT=0
SRC_URI=mirror://gnome/sources/gvfs/1.26/gvfs-1.26.2.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c bash-completion-r1 b1fc4d30333bb528c8abb4332bb70ea6 eutils f813d23e417656bf3917483643165d5a fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 56d268cae832738430a9de86a5765fa1 gnome2-utils 588052cacdf74572e68bdfeaece20534 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=994ded6023c7d6ccca8bf63327c14e96
+_md5_=328a784df38eee0241c14e6a07d8a263
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.2.0 b/metadata/md5-cache/media-libs/libmikmod-3.2.0
deleted file mode 100644
index 4d2f2546a57b..000000000000
--- a/metadata/md5-cache/media-libs/libmikmod-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) !media-libs/libmikmod:2 oss? ( virtual/os-headers ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library to play a wide range of module formats
-EAPI=5
-HOMEPAGE=http://mikmod.shlomifish.org/
-IUSE=+alsa coreaudio oss static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2+ LGPL-2.1
-RDEPEND=alsa? ( media-libs/alsa-lib ) !media-libs/libmikmod:2
-REQUIRED_USE=|| ( alsa oss coreaudio )
-SLOT=0
-SRC_URI=http://mikmod.shlomifish.org/files/libmikmod-3.2.0.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=e71d6f523923a34b5e6bbb51c8db101a
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.5 b/metadata/md5-cache/media-libs/libmikmod-3.3.5
deleted file mode 100644
index 452456823c14..000000000000
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) oss? ( virtual/os-headers )
-DESCRIPTION=A library to play a wide range of module formats
-EAPI=5
-HOMEPAGE=http://mikmod.sourceforge.net/
-IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads 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 hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2+ LGPL-2.1
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
-REQUIRED_USE=|| ( alsa oss coreaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.5.tar.gz
-_eclasses_=eutils f813d23e417656bf3917483643165d5a multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=0b1c0cf4c55a281ea3ef4f12b6f9816c
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1 b/metadata/md5-cache/media-libs/libmikmod-3.3.8
similarity index 90%
rename from metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
rename to metadata/md5-cache/media-libs/libmikmod-3.3.8
index 82ac41b06545..6c9a8206e562 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.8
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) oss? ( virtual/os-headers )
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) sys-apps/texinfo oss? ( virtual/os-headers )
DESCRIPTION=A library to play a wide range of module formats
EAPI=5
HOMEPAGE=http://mikmod.sourceforge.net/
IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=LGPL-2+ LGPL-2.1
RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[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(-)?] ) openal? ( >=media-libs/openal-1.15.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.6.tar.gz
+SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.8.tar.gz
_eclasses_=eutils f813d23e417656bf3917483643165d5a multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 multilib-build c47eec09e82c8a750127ff2abf0745b1 multilib-minimal a93a9b4153a5f1c746bdd3b20ef9d834 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85
-_md5_=96ed63d1942614bd90e565a81a8159b7
+_md5_=4b98db9c299ff753d3f188293546ae40
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.5 b/metadata/md5-cache/media-sound/mikmod-3.2.5
deleted file mode 100644
index e7f42b608e39..000000000000
--- a/metadata/md5-cache/media-sound/mikmod-3.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libmikmod-3.2.0 >=sys-libs/ncurses-5.7-r7
-DESCRIPTION=A console MOD-Player based on libmikmod
-EAPI=5
-HOMEPAGE=http://mikmod.sourceforge.net/
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libmikmod-3.2.0 >=sys-libs/ncurses-5.7-r7
-SLOT=0
-SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.5.tar.gz
-_md5_=8ac673a6290437610b93d45c9b59f7eb
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.7 b/metadata/md5-cache/media-sound/mikmod-3.2.7
new file mode 100644
index 000000000000..080aab63b81f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mikmod-3.2.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
+DESCRIPTION=A console MOD-Player based on libmikmod
+EAPI=5
+HOMEPAGE=http://mikmod.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.7.tar.gz
+_md5_=e708140a3fae00b21959641a045b2957
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.30 b/metadata/md5-cache/net-misc/spice-gtk-0.30
deleted file mode 100644
index 56c9dee69b4e..000000000000
--- a/metadata/md5-cache/net-misc/spice-gtk-0.30
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl:0= gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.10 dev-lang/python dev-python/pyparsing dev-perl/Text-CSV >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
-EAPI=5
-HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
-IUSE=dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl:0= gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
-REQUIRED_USE=python? ( python_targets_python2_7 ) ?? ( pulseaudio gstreamer )
-SLOT=0
-SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.30.tar.bz2
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 python-single-r1 f0877a50e1277a64cd4fe5855250102b python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 vala 15f7a43101d2ff0c6dcdab272c02f469
-_md5_=c2047ef36385004adc15979020af74b6
diff --git a/metadata/md5-cache/net-misc/spice-gtk-0.30-r1 b/metadata/md5-cache/net-misc/spice-gtk-0.30-r1
new file mode 100644
index 000000000000..b8172268da08
--- /dev/null
+++ b/metadata/md5-cache/net-misc/spice-gtk-0.30-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl:0= gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 ) >=app-emulation/spice-protocol-0.12.10 dev-perl/Text-CSV dev-python/pyparsing[python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Set of GObject and Gtk objects for connecting to Spice servers and a client GUI
+EAPI=5
+HOMEPAGE=http://spice-space.org http://gitorious.org/spice-gtk
+IUSE=dbus gstreamer gtk3 +introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir vala webdav python_targets_python3_4 python_targets_python2_7 python_single_target_python3_4 python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] pulseaudio? ( media-sound/pulseaudio[glib] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=x11-libs/pixman-0.17.7 >=media-libs/celt-0.5.1.1:0.5.1 media-libs/opus dev-libs/openssl:0= gtk3? ( x11-libs/gtk+:3[introspection?] ) x11-libs/gtk+:2[introspection?] >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.2 virtual/jpeg:0= sys-libs/zlib introspection? ( dev-libs/gobject-introspection ) lz4? ( app-arch/lz4 ) python? ( dev-python/pygtk:2 ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( app-emulation/qemu[smartcard] ) usbredir? ( sys-apps/hwids >=sys-apps/usbredir-0.4.2 virtual/libusb:1 virtual/libgudev:= policykit? ( sys-apps/acl >=sys-auth/polkit-0.110-r1 !~sys-auth/polkit-0.111 ) ) webdav? ( net-libs/phodav:2.0 >=dev-libs/glib-2.43.90:2 >=net-libs/libsoup-2.49.91 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ?? ( pulseaudio gstreamer )
+SLOT=0
+SRC_URI=http://spice-space.org/download/gtk/spice-gtk-0.30.tar.bz2
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 multibuild ce2c2ede0c914b77f5dfc4e2ff2d0249 multilib 3972ca401cf7dbb430df9995f5d8d580 python-single-r1 f0877a50e1277a64cd4fe5855250102b python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 vala 15f7a43101d2ff0c6dcdab272c02f469
+_md5_=a1a7f52797ed0d2602dc4598115943bc
diff --git a/metadata/md5-cache/net-misc/tor-0.2.7.4_rc b/metadata/md5-cache/net-misc/tor-0.2.7.5
similarity index 90%
rename from metadata/md5-cache/net-misc/tor-0.2.7.4_rc
rename to metadata/md5-cache/net-misc/tor-0.2.7.5
index bfffc3070f8d..3e3be347099b 100644
--- a/metadata/md5-cache/net-misc/tor-0.2.7.4_rc
+++ b/metadata/md5-cache/net-misc/tor-0.2.7.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos
LICENSE=BSD GPL-2
RDEPEND=!libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib dev-libs/libevent bufferevents? ( dev-libs/libevent[ssl] ) scrypt? ( app-crypt/libscrypt ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd ) selinux? ( sec-policy/selinux-tor )
SLOT=0
-SRC_URI=https://www.torproject.org/dist/tor-0.2.7.4-rc.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.7.4-rc.tar.gz
+SRC_URI=https://www.torproject.org/dist/tor-0.2.7.5.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.2.7.5.tar.gz
_eclasses_=eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib 3972ca401cf7dbb430df9995f5d8d580 readme.gentoo e37aea783a61ae55fab947df247eebea systemd 6b4f0cefa642270eded7e6ca816fd181 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=080f384f91d4cd4014f349afb27e3117
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.14.0 b/metadata/md5-cache/sci-astronomy/stellarium-0.14.0
new file mode 100644
index 000000000000..fe19c9b50fcb
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.14.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtquick1:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 virtual/opengl sound? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qttest:5 dev-qt/qtconcurrent:5 nls? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=5
+HOMEPAGE=http://www.stellarium.org/
+IUSE=debug nls sound stars linguas_af linguas_ak linguas_am linguas_ar linguas_as linguas_ast linguas_az linguas_be linguas_bg linguas_bn linguas_bo linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en linguas_en_CA linguas_en_GB linguas_en_US linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fil linguas_fr linguas_ga linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_kn linguas_ko linguas_ky linguas_la linguas_lb linguas_lo linguas_lt linguas_lv linguas_mk linguas_ml linguas_mn linguas_mr linguas_ms linguas_mt linguas_nan linguas_nb linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_se linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_tg linguas_th linguas_tl linguas_tr linguas_tt linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_HK linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=media-fonts/dejavu dev-qt/qtcore:5 dev-qt/qtquick1:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 virtual/opengl sound? ( dev-qt/qtmultimedia:5[widgets] )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/stellarium/stellarium-0.14.0.tar.gz stars? ( mirror://sourceforge/stellarium/stars_4_1v0_1.cat mirror://sourceforge/stellarium/stars_5_2v0_1.cat mirror://sourceforge/stellarium/stars_6_2v0_1.cat mirror://sourceforge/stellarium/stars_7_2v0_1.cat mirror://sourceforge/stellarium/stars_8_2v0_1.cat )
+_eclasses_=cmake-utils f16fa5681153277df51f001deaf17ff8 eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 gnome2-utils 588052cacdf74572e68bdfeaece20534 multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=316afdf24ae29c9b545d4cd6cbc6d377
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-3.2.20-r1 b/metadata/md5-cache/sci-libs/linux-gpib-3.2.20-r1
deleted file mode 100644
index 9b1d83e6e949..000000000000
--- a/metadata/md5-cache/sci-libs/linux-gpib-3.2.20-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) firmware? ( sys-apps/fxload ) virtual/pkgconfig doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
-EAPI=5
-HOMEPAGE=http://linux-gpib.sourceforge.net/
-IUSE=isa pcmcia static debug guile perl php python tcl doc firmware kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-3.2.20.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a linux-mod 9e27971daa324852d78bc7d4d811afae multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing d769539d9bace6eaca30af23bc2b4dde perl-module 1cfb38bf68a24c8394e41d2f53003146 python-single-r1 f0877a50e1277a64cd4fe5855250102b python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 37ef89be271b9ae8aa64be024ddb39b5 unpacker 1d149d9bda7723e740cfd28118f27813 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f9d0f46a9f749928f5efc5a77d9492c7
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-3.2.21 b/metadata/md5-cache/sci-libs/linux-gpib-4.0.2
similarity index 91%
rename from metadata/md5-cache/sci-libs/linux-gpib-3.2.21
rename to metadata/md5-cache/sci-libs/linux-gpib-4.0.2
index 0d07e0e2e9ff..a5207960af9b 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-3.2.21
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
EAPI=5
HOMEPAGE=http://linux-gpib.sourceforge.net/
IUSE=isa pcmcia static debug guile perl php python tcl doc firmware kernel_linux python_targets_python2_7
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
-SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-3.2.21.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
+SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.0.2.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils f813d23e417656bf3917483643165d5a libtool 7f78cd7d403808a350c9ae23f5821fb4 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a linux-mod 9e27971daa324852d78bc7d4d811afae multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing d769539d9bace6eaca30af23bc2b4dde perl-module 1cfb38bf68a24c8394e41d2f53003146 python-single-r1 f0877a50e1277a64cd4fe5855250102b python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 udev 37ef89be271b9ae8aa64be024ddb39b5 unpacker 1d149d9bda7723e740cfd28118f27813 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb88cfd1d9023cce36e120cd8c68fbf7
+_md5_=8e3d7037371c2305fae8b5e88cf3dc08
diff --git a/metadata/md5-cache/sci-physics/root-6.04.06 b/metadata/md5-cache/sci-physics/root-6.04.06
index 43316bc99ed0..7d45c5d786fc 100644
--- a/metadata/md5-cache/sci-physics/root-6.04.06
+++ b/metadata/md5-cache/sci-physics/root-6.04.06
@@ -12,4 +12,4 @@ REQUIRED_USE=!X? ( !opengl !qt4 !tiff ) mpi? ( math !openmp ) openmp? ( math !mp
SLOT=0/6.04.06
SRC_URI=ftp://root.cern.ch/root/root_v6.04.06.source.tar.gz
_eclasses_=elisp-common 73c48c11ad6a6494eda0d0cca848c8fa eutils f813d23e417656bf3917483643165d5a fdo-mime 92d07846ea8ea54172f8c0112a47ae3d fortran-2 eb14fa8f4c3b9977b8d26c2c653ca325 multilib 3972ca401cf7dbb430df9995f5d8d580 python-single-r1 f0877a50e1277a64cd4fe5855250102b python-utils-r1 7d52f592fc09a002ea150d69507b5bad toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=07854d0804057c722d3b3d94119dafb2
+_md5_=edb9a116d9f7a937d9dc38686d78f9c5
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.10 b/metadata/md5-cache/sys-cluster/galera-25.3.10
index ea5a9ffc964d..cb54416c9d58 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.10
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.10
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install preinst prepare
DEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0= dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.4.8[ssl?] dev-util/scons
-DESCRIPTION=Synchronous multi-master replication engine that provides its service through wsrep API
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
EAPI=5
HOMEPAGE=http://www.galeracluster.com
IUSE=cpu_flags_x86_sse4_2 garbd ssl test
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0=
SLOT=0
SRC_URI=http://releases.galeracluster.com/source/galera-3-25.3.10.tar.gz
_eclasses_=eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib 3972ca401cf7dbb430df9995f5d8d580 scons-utils b7d634f772db55c8af429f50aeec6ee0 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0010d8ca77e3e64f3414f0e238e49cb6
+_md5_=16ffe581b63728343b86845ce2f93ef5
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.12 b/metadata/md5-cache/sys-cluster/galera-25.3.12
index d71044fe21ca..cdff797ad3e3 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.12
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.12
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install preinst prepare
DEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0= dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.4.8[ssl?] dev-util/scons
-DESCRIPTION=Synchronous multi-master replication engine that provides its service through wsrep API
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
EAPI=5
HOMEPAGE=http://www.galeracluster.com
IUSE=cpu_flags_x86_sse4_2 garbd ssl test
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0=
SLOT=0
SRC_URI=http://releases.galeracluster.com/source/galera-3-25.3.12.tar.gz
_eclasses_=eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib 3972ca401cf7dbb430df9995f5d8d580 scons-utils b7d634f772db55c8af429f50aeec6ee0 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=b8cd8bce23336dea2921a1e9d4c98306
+_md5_=375f7b293433d8ec5df795e7b40ac940
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.13 b/metadata/md5-cache/sys-cluster/galera-25.3.13
new file mode 100644
index 000000000000..ea403f4c7ab8
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare
+DEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0= dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.4.8[ssl?] dev-util/scons
+DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
+EAPI=5
+HOMEPAGE=http://www.galeracluster.com
+IUSE=cpu_flags_x86_sse4_2 garbd ssl test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2 BSD
+RDEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41:0=
+SLOT=0
+SRC_URI=http://releases.galeracluster.com/source/galera-3-25.3.13.tar.gz
+_eclasses_=eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib 3972ca401cf7dbb430df9995f5d8d580 scons-utils b7d634f772db55c8af429f50aeec6ee0 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=b7a4c6f350561c14f9b7daa0e81eb86c
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.5 b/metadata/md5-cache/sys-cluster/galera-25.3.5
deleted file mode 100644
index be154f27fe94..000000000000
--- a/metadata/md5-cache/sys-cluster/galera-25.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41 dev-libs/check >=sys-devel/gcc-4.4 >=dev-cpp/asio-1.4.8[ssl?] dev-util/scons
-DESCRIPTION=Synchronous multi-master replication engine that provides its service through wsrep API
-EAPI=5
-HOMEPAGE=http://www.codership.org/
-IUSE=garbd ssl test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 BSD
-RDEPEND=ssl? ( dev-libs/openssl:0= ) >=dev-libs/boost-1.41 garbd? ( || ( net-analyzer/netcat net-analyzer/netcat6 net-analyzer/gnu-netcat net-analyzer/openbsd-netcat ) )
-SLOT=0
-SRC_URI=https://launchpad.net/galera/3.x/25.3.5/+download/galera-25.3.5-src.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils f813d23e417656bf3917483643165d5a flag-o-matic 85dc1eac3c64d8141374490ed64122e5 multilib 3972ca401cf7dbb430df9995f5d8d580 scons-utils b7d634f772db55c8af429f50aeec6ee0 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 user 906f3c8eb3a2350a4f1191a89baa3e46 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=59f19f1d240926f77c3bcb06611d8eab
diff --git a/metadata/md5-cache/www-apps/kibana-bin-4.0.3 b/metadata/md5-cache/www-apps/kibana-bin-4.0.3
deleted file mode 100644
index 6bc0856392e3..000000000000
--- a/metadata/md5-cache/www-apps/kibana-bin-4.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=visualize logs and time-stamped data
-EAPI=5
-HOMEPAGE=http://www.elasticsearch.org/overview/kibana/
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=app-misc/elasticsearch-1.4.4
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://download.elasticsearch.org/kibana/kibana/kibana-4.0.3-linux-x64.tar.gz
-_eclasses_=user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=1815e129b1d29539633356806e3ea0bb
diff --git a/metadata/md5-cache/www-apps/kibana-bin-4.1.1 b/metadata/md5-cache/www-apps/kibana-bin-4.1.1
deleted file mode 100644
index f2719261f2ce..000000000000
--- a/metadata/md5-cache/www-apps/kibana-bin-4.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=visualize logs and time-stamped data
-EAPI=5
-HOMEPAGE=https://www.elastic.co/products/kibana
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=app-misc/elasticsearch-1.4.4
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://download.elastic.co/kibana/kibana/kibana-4.1.1-linux-x64.tar.gz
-_eclasses_=user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=63b254523a06f9c470dd31be309080bc
diff --git a/metadata/md5-cache/www-apps/kibana-bin-4.1.2 b/metadata/md5-cache/www-apps/kibana-bin-4.1.3
similarity index 58%
rename from metadata/md5-cache/www-apps/kibana-bin-4.1.2
rename to metadata/md5-cache/www-apps/kibana-bin-4.1.3
index 3e199ccd9576..ca5d7f6381a9 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-4.1.2
+++ b/metadata/md5-cache/www-apps/kibana-bin-4.1.3
@@ -1,11 +1,11 @@
DEFINED_PHASES=install postinst setup
-DESCRIPTION=visualize logs and time-stamped data
+DESCRIPTION=Explore and visualize data
EAPI=5
HOMEPAGE=https://www.elastic.co/products/kibana
KEYWORDS=~amd64
LICENSE=Apache-2.0
RESTRICT=strip
SLOT=0
-SRC_URI=https://download.elastic.co/kibana/kibana/kibana-4.1.2-linux-x64.tar.gz
+SRC_URI=https://download.elastic.co/kibana/kibana/kibana-4.1.3-linux-x64.tar.gz
_eclasses_=user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=63155d8c7e45db037709798777ff73a0
+_md5_=d1fa8f6e8a0444356010950db2252bfd
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.58_p1 b/metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.69_p1
similarity index 94%
rename from metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.58_p1
rename to metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.69_p1
index b211677bec7f..fc7cbb91ebf5 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.58_p1
+++ b/metadata/md5-cache/www-client/google-chrome-beta-47.0.2526.69_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.58-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.58-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.69-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.69-1_i386.deb )
_eclasses_=chromium e6257bd55bfdac1269e99d4d7ed21cda eutils f813d23e417656bf3917483643165d5a fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils 588052cacdf74572e68bdfeaece20534 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils 9dd3f9de6dccb2463faf55e568439d1c readme.gentoo e37aea783a61ae55fab947df247eebea toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=e88fc47a85a24fbb33454285c72ef915
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.10_p1
similarity index 90%
rename from metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.10_p1
index f4e632e5f03c..205a457d271c 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.8_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-48.0.2564.10_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.10-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.10-1_i386.deb )
_eclasses_=chromium e6257bd55bfdac1269e99d4d7ed21cda eutils f813d23e417656bf3917483643165d5a fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils 588052cacdf74572e68bdfeaece20534 linux-info 8f92e5ac1a1da684c5450b1b21a1f56a multilib 3972ca401cf7dbb430df9995f5d8d580 pax-utils 9dd3f9de6dccb2463faf55e568439d1c readme.gentoo e37aea783a61ae55fab947df247eebea toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=49372245cbd11c5a50fa5cc3552ff71b
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.58_beta1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.69_beta1
similarity index 84%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.58_beta1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.69_beta1
index 232c12cdbe6e..77c6b65bbfa6 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.58_beta1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-47.0.2526.69_beta1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
RESTRICT=bindist mirror strip
SLOT=beta
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.58-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.58-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.69-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_47.0.2526.69-1_i386.deb )
_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813
_md5_=a298ad95eeea170c424be0b43ae88a8b
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.10_alpha1
similarity index 75%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.10_alpha1
index 0283b22d968a..f957bbe9c70e 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.8_alpha1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-48.0.2564.10_alpha1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
RESTRICT=bindist mirror strip
SLOT=unstable
-SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.8-1_i386.deb )
+SRC_URI=amd64? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.10-1_amd64.deb ) x86? ( https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_48.0.2564.10-1_i386.deb )
_eclasses_=multilib 3972ca401cf7dbb430df9995f5d8d580 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 unpacker 1d149d9bda7723e740cfd28118f27813
_md5_=a298ad95eeea170c424be0b43ae88a8b
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ee616bd57d21..033ce3af6368 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Nov 2015 12:54:29 +0000
+Sat, 21 Nov 2015 04:55:00 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 06d12e671e5b..afabe1e3c715 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Nov 20 12:53:34 UTC 2015
+Sat Nov 21 04:54:04 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f99e0daf912e..eea657f91d4b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 20 Nov 2015 13:00:01 +0000
+Sat, 21 Nov 2015 21:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 42859178309b..3a945fe5c332 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1448023801 Fri 20 Nov 2015 12:50:01 PM UTC
+1448081401 Sat 21 Nov 2015 04:50:01 AM UTC
diff --git a/net-misc/spice-gtk/spice-gtk-0.30.ebuild b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
similarity index 96%
rename from net-misc/spice-gtk/spice-gtk-0.30.ebuild
rename to net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
index 16b291a7774a..8f6f00b659fd 100644
--- a/net-misc/spice-gtk/spice-gtk-0.30.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.30-r1.ebuild
@@ -8,7 +8,7 @@ WANT_AUTOMAKE="1.12"
VALA_MIN_API_VERSION="0.14"
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
inherit autotools eutils multibuild python-single-r1 vala
@@ -67,11 +67,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}
>=app-emulation/spice-protocol-0.12.10
- dev-lang/python
- dev-python/pyparsing
dev-perl/Text-CSV
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40.0
+ ${PYTHON_DEPS}
>=sys-devel/gettext-0.17
virtual/pkgconfig
vala? ( $(vala_depend) )
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index f1d619eef470..7960002a3b02 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,2 +1,2 @@
DIST tor-0.2.6.10.tar.gz 3587211 SHA256 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d SHA512 4d1fd794d48ada725af829e1c1f3f3b7d8d04f2d1dd22e4f175ddc49401834f2001f04d78b011cdc7e953fe44972f2859d87078489a08ae126b44f93f6b9a438 WHIRLPOOL ba2685454ecb0dd94c568e05fb14526cd06beea6e9c6f7b27328f85c555392b6f42f35dc7860ae25299a830c7f6643963a9b9719a2557c28a7216019c96caf21
-DIST tor-0.2.7.4-rc.tar.gz 4830972 SHA256 6741c3e6abfedb76be781b767b77f794ee1a0f554cc4ccf083e44d4d9dc8af67 SHA512 e637cad37d26f7ceec52e2f78ff53ff2d9e362cefe0796b91fc91c7e2b01652d0333be44e48497cb54650ece3f606b20a7201b806775e9349eef99a288420e59 WHIRLPOOL 85dc797558391dc5e577fcdcb802ea027ff4ac787acfadd90b363bd6c60c7654fa16b15de74a84152ec081dda008a122029198cee5b12bf92730c5d160f7407b
+DIST tor-0.2.7.5.tar.gz 4838541 SHA256 7d2a9e4db1bd99deb8395609b59cac217b0c1ee9ff2eeb0f088b91a5d8f6aa5f SHA512 c57b3ee6ecc36456182c7130db671c5581914cddf973c9460625cd5ecd10d128f3e4832f1520269f6ab145cc0dcb218df2a19fb659b778fb31d9f69de5362678 WHIRLPOOL d80b5949f6e23d1c3f501d5175a22eb54702266d87ff5a28bb6c727cfc8b656ca717d3bd7bf9031a56748f8b743cafecae7dd7fb14d6713271df20998e5bc562
diff --git a/net-misc/tor/tor-0.2.7.4_rc.ebuild b/net-misc/tor/tor-0.2.7.5.ebuild
similarity index 100%
rename from net-misc/tor/tor-0.2.7.4_rc.ebuild
rename to net-misc/tor/tor-0.2.7.5.ebuild
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index fb564428352e..ec5fd2d78ad4 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -3,12 +3,19 @@
# Jason Zaman (27 Jun 2015)
# SystemD has no support in the SELinux policy at the moment.
# Please see: https://wiki.gentoo.org/wiki/SELinux/FAQ#Can_I_use_SELinux_with_SystemD.3F
+app-eselect/eselect-gnome-shell-extensions
sys-apps/systemd
app-admin/calamares
dev-python/python-systemd
gnome-base/gdm
gnome-base/gnome
+gnome-base/gnome-light
gnome-extra/gnome-logs
+gnome-extra/gnome-shell-extensions
+gnome-extra/gnome-shell-frippery
+gnome-extra/gnome-shell-extensions-topicons
+gnome-extra/gnome-tweak-tool
+x11-themes/zukitwo-shell
gnome-extra/office-runner
kde-misc/systemd-kcm
net-firewall/firewalld
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index 983b5c484154..0c276eb8dad1 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -25,6 +25,10 @@ www-servers/uwsgi uwsgi_plugins_systemd_logger
x11-wm/mutter kms
x11-misc/xscreensaver gdm
xfce-extra/xfswitch-plugin gdm
+app-misc/workrave gnome
+net-misc/wicd gnome-shell
+x11-misc/gpaste gnome
+x11-terms/gnome-terminal gnome-shell
# Alex Brandt (6 Sep 2015)
# app-emulation/rkt[rkt_stage1_src] requires systemd which isn't available with selinux.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b9ec318d8cfc..f242e7379c30 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3143,6 +3143,7 @@ gnome-base/gvfs:archive - Enables support for accessing files in archives transp
gnome-base/gvfs:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray
gnome-base/gvfs:fuse - Enables fuse mount points in $HOME/.gvfs for legacy application access
gnome-base/gvfs:gnome-online-accounts - Enable configuration panel for net-libs/gnome-online-accounts accounts
+gnome-base/gvfs:google - Enables support for accessing Google accounts via dev-libs/libgdata
gnome-base/gvfs:http - Enable the HTTP/DAV backend using net-libs/libsoup-gnome
gnome-base/gvfs:libsecret - Enable app-crypt/libsecret support to store login credentials.
gnome-base/gvfs:nfs - Enable NFS client support via net-fs/libnfs.
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index b652c10ac592..f7881302f198 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,7 +1,13 @@
DIST stars_4_1v0_0.cat 17275482 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7 SHA512 442fb8fa0d9a82401056a313ae2e229bb68057f3f0fd5557e966d645de1ac438c357e2b68f3deeb17ffdea78fb61ce004ab264204f42ebb19c2a00af900db217 WHIRLPOOL d19564d27fb9ac1c5c9e27eb61775c1dddb9382b1d8ea4d863aece2b88eb16fffb7863859cf589c5501fa0d1434b0b95dd41fb68f747b05f21cadf2a49927868
+DIST stars_4_1v0_1.cat 17040932 SHA256 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a WHIRLPOOL 36267ddb117ed5100bb491760ec5589f8752bf0c655f45e78f7aad500f00d6dae1fdadd1af5d7663b81b8c2df4afed7cd07c652e056391beb531639739bd866c
DIST stars_5_2v0_0.cat 46096018 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931 SHA512 f1eb3f6ecee9da050177ad35d98104ba265d74c5d7017c7db35e25517a31fdc29c54355a1f93126a27e7210c24552c86cd95b599c9d1600c5aca7bb468005d94 WHIRLPOOL 0499b37739e22c1a0b34d99d1fcb8bed4695ff988bbf4af95b64f8fcb0473e8e2988d891def2d1842a0a8d37c588900f4fb4a011e7d0d0980a91bac1687e4fa0
+DIST stars_5_2v0_1.cat 42580300 SHA256 c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164 SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0 WHIRLPOOL 946a7b57367ae21eae3c2ba59238b8502064d93511f43bc70b26f1383d75e403ba21e6ca0ee60f859521630a213f179ceab51f0380cbbacf92b255812cf69166
DIST stars_6_2v0_0.cat 160019110 SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379 SHA512 d693b7058bc1cce049a468e7082337d438958afc3465378df90fbfe473a6bb64fa1cadbf5e09fdb986ced3bcada7edb4a8d79ffeca1cb2b1dd4349c56313e4bb WHIRLPOOL 5f17613bdb1db1f9c4859ef39916a18c82782e4a3e15be73c2423a9d1445776d2a181b1a877df59d3776a50a54f6df4d66fc3621f74139786a3fed00c999ae06
+DIST stars_6_2v0_1.cat 148352404 SHA256 5794c7cd035f52d25608e9a2bd40c35f1d65f0327ef80c87fde93ef4047fc555 SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977 WHIRLPOOL 1c4c12ce12dd3cd1d7a2e0e11cd34b378ae4c5f2a61f2b6a8e4889b61e78944e4caacae6a0ee78fc00ad022c90944fa7a6e3021f0f2c57c605f377c199a77486
DIST stars_7_2v0_0.cat 348268348 SHA256 730ca2d9182af5ebd4efcc5f87461ad9156caf79cadf1a79708fa970acb809fe SHA512 d6f974e5bf17616d016e6dc74bd5627c93ea53ff4844d86aebbdafac6256ac85c777769f9e3d774f5c75cfe9fbca200dca4778e604dafbbb54af93d8d74e2247 WHIRLPOOL 3c8c52c5eda6f4749df0c1ddbee062037297a496705ec4a4a8325e1b9c925bb296822de3fec6857a5cac7fc45dc64ca6e0091526efec46200750ed152733ec59
+DIST stars_7_2v0_1.cat 305710678 SHA256 4d812c078f03d01c9b24bacedf6e688a4382d92468bab2aba2b96a9a0358a406 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3 WHIRLPOOL 6647e41ae573b0c2a2eb3c22ea0a34a50f077ef8c89fab35f101c08dcf1657b0a7d7d2812b73dc53c6992d25ccb3915ebdfbe7b7faafbda3bb69f81a2c82c2d9
DIST stars_8_2v0_0.cat 706781416 SHA256 91b79dcf97464b4ca0f6c604e745dac2c6ca02e25ed986dbec2de5f6d6e8a1f9 SHA512 f94360e8cca9a3261017adbddf1cb74878771d16d1d6062cead8e9343ad28d26bcfa2b23cdd0a182bc1d5fa0a000ac96f722510118b0ad38886f548f4595f03b WHIRLPOOL cf1c37274bc9ebc99d5021fccdfba92ee17509e60b708eaa47ee5cdef2ada9424bda1543c454670207e29e6cadbc178460adbfc45480bee1caebfeee95a7e211
+DIST stars_8_2v0_1.cat 559068934 SHA256 f1c0b3f25737f405ed4a2a045091d348885ffceb47258c3e32a2f4a800cac482 SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4 WHIRLPOOL a467e7aef3851ad219103a401e20896a89efe01615e5df753c63a74876442dcf22c78d838b269dca50af58e9484f1d1abfd56f2ecdfdb57fdb3e1087e2e7136e
DIST stellarium-0.12.4.tar.gz 79343617 SHA256 0fae1b6e2231ccfaba8fd00abf816a88bd89b5dc61387ac84edf479b363c6684 SHA512 324a8c930281e26e91d45356cf3aab89cf708c7e64636b7e89de95af3f6d2569830caf05fb44ebef88f65dda55cb6dd18dcf4ee54d46da3910c456dc2daac478 WHIRLPOOL 8bce980d157904c4032368da335263a9afd2136386b0fd19d27e10f1c8b33712780130ed6845f26b3bac43f00d2de4aee80c47a0648a6cf6b4741bf69301f110
DIST stellarium-0.13.3.tar.gz 135870690 SHA256 3202b7657906caf0e1079ee5c3f82b21acc01deaa4fcf654307d13d5baf886d6 SHA512 9d8b8d4e045dd3e8052a7f6af4dd21205c2e66c2e4db254fbb6e897f3df1f049a6e2080f6598210da162917e1f6a3535972c8826e5e696f4ab954a5b26d0d083 WHIRLPOOL 735365c9c13257487f785d9407c1725ec7bd345bace43f809105d270ea6a83764dd2c55c1c5010bbe72263ef99dc16913f9e8df706d82f40d3b02187cab1c028
+DIST stellarium-0.14.0.tar.gz 139333669 SHA256 5225087732b97d27c019f0cb1a9f183d511e26eeb3538e16c3790df2dd541f15 SHA512 d5271b4caeddc3fade7dcd98f150ba7bcb644d54c8dc7787dd3fcb33550032dbf7c8517ac6b8d950e3f35f0a2bbc046afd624fbc6e6d4b988e46d58236b77943 WHIRLPOOL b97b38ec481edc5c7817a4b9138ab2f10cbd630ef3b9bab980c50191a3f8cfe03efb9eeface14819bee9982dfc72dfe32db63255a07ce5226e3707f89832423e
diff --git a/sci-astronomy/stellarium/stellarium-0.14.0.ebuild b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
new file mode 100644
index 000000000000..7d8c7cfa1821
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.14.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="http://www.stellarium.org/"
+SRC_URI="
+ mirror://sourceforge/stellarium/${P}.tar.gz
+ stars? (
+ mirror://sourceforge/stellarium/stars_4_1v0_1.cat
+ mirror://sourceforge/stellarium/stars_5_2v0_1.cat
+ mirror://sourceforge/stellarium/stars_6_2v0_1.cat
+ mirror://sourceforge/stellarium/stars_7_2v0_1.cat
+ mirror://sourceforge/stellarium/stars_8_2v0_1.cat
+ )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls sound stars"
+
+RESTRICT="test"
+
+RDEPEND="
+ media-fonts/dejavu
+ dev-qt/qtcore:5
+ dev-qt/qtquick1:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtscript:5
+ virtual/opengl
+ sound? ( dev-qt/qtmultimedia:5[widgets] )"
+DEPEND="${RDEPEND}
+ dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
+ nls? ( dev-qt/linguist-tools:5 )"
+DOCS=( AUTHORS ChangeLog README )
+
+LANGS=(
+ af ak am ar as ast az be bg bn bo br bs ca cs
+ cy da de el en en_CA en_GB en_US eo es et eu fa fi fil fr
+ ga gd gl gu he hi hr hu hy ia id is it ja ka kk kn ko ky
+ la lb lo lt lv mk ml mn mr ms mt nan nb nl nn oc pa pl pt pt_BR ro
+ ru se si sk sl sq sr sv sw ta te tg th tl tr tt uk uz vi
+ zh_CN zh_HK zh_TW zu
+ )
+
+for X in "${LANGS[@]}" ; do
+ IUSE+=" linguas_${X}"
+done
+
+src_prepare() {
+ if [[ -n ${LINGUAS} ]] ; then
+ sed -i \
+ -e '/aa ab ae/d' \
+ -e "/GETTEXT_CREATE_TRANSLATIONS/a \ ${LINGUAS}" \
+ po/stellarium{,-skycultures}/CMakeLists.txt || die #403647
+ fi
+ sed -i -e '/SimpleDrawLine/s: 0 : 1 :g' CMakeLists.txt || die
+ use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable nls)
+ $(cmake-utils_use_enable sound)
+ )
+ CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # use the more up-to-date system fonts
+ rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+ dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+ dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+ if use stars ; then
+ insinto /usr/share/${PN}/stars/default
+ doins "${DISTDIR}"/stars_[45678]_[12]v0_1*.cat
+ fi
+ newicon doc/images/stellarium-logo.png ${PN}.png
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index a329b060841f..a69e2090fe48 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,4 +1,4 @@
DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
-DIST linux-gpib-3.2.20.tar.gz 1254951 SHA256 cde3e77c3fd968e1ee5785abc2d6e09f0f66711fc2612abfc7b05c72c16c2e9a SHA512 679c3895ac5077b3246c43818c7c85ae53597d4a7e70ff2306978472337214952798c41eca9a4ae8be20aa3afa4bc78a7b796fccd6b63a8e1a879fcd144adea9 WHIRLPOOL 653ea123c81ccaf5d55055e70609152584adf36eb6cd0e421f10f5c86d24781e44ced125e9ac417901594c6ac83bed1f7123de27578ad3c841612bb9955eab85
DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d
DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153
+DIST linux-gpib-4.0.2.tar.gz 1233294 SHA256 0a352a168d69ab564a2cc03ce7239370d944d187d6bc187697fb704c6e49d98f SHA512 20e504fa8e72c6c04b7cda70898cf520343d777825dfe976ea7fd11ee6aa4a8337c0badeec6c5c3c0bd20853d831802b0641c018817439677756654295ff65d6 WHIRLPOOL 8abc1afcd7010a6c585ca643c87813ab071b9a26a742d3ae3bb4349af17e16692d9f7d0b2a48c539f4c419108bcfc109e080ddc95fc8b1d28db560eab2544f74
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild
deleted file mode 100644
index 02f86820cbff..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-3.2.20-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PERL_EXPORT_PHASE_FUNCTIONS=no
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="http://linux-gpib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
- firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
-
-COMMONDEPEND="
- tcl? ( dev-lang/tcl:0= )
- guile? ( dev-scheme/guile:12 )
- perl? ( dev-lang/perl:= )
- php? ( dev-lang/php:= )
- python? ( ${PYTHON_DEPS} )
- firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
- doc? ( app-text/docbook-sgml-utils )
- perl? ( virtual/perl-ExtUtils-MakeMaker )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2.15-build.patch
- "${FILESDIR}"/${PN}-3.2.16-perl.patch
- "${FILESDIR}"/${PN}-3.2.16-reallydie.patch
-)
-
-pkg_setup () {
- use perl && perl_set_version
- use python && python_setup
- linux-mod_pkg_setup
-
- if kernel_is -lt 2 6 8; then
- die "Kernel versions older than 2.6.8 are not supported."
- fi
-
- # https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
- if use pcmcia && kernel_is -ge 2 6 38; then
- die "pcmcia support is broken on kernels newer 2.6.38"
- fi
-}
-
-src_prepare () {
- epatch ${PATCHES[@]}
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- set_arch_to_kernel
- econf \
- $(use_enable isa) \
- $(use_enable pcmcia) \
- $(use_enable static) \
- $(use_enable debug driver-debug) \
- $(use_enable guile guile-binding) \
- $(use_enable perl perl-binding) \
- $(use_enable php php-binding) \
- $(use_enable python python-binding) \
- $(use_enable tcl tcl-binding) \
- $(use_enable doc documentation) \
- --with-linux-srcdir=${KV_DIR}
-}
-
-src_compile() {
- set_arch_to_kernel
- FIRM_DIR=/usr/share/usb
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
- USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
- docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- set_arch_to_kernel
- FIRM_DIR=/usr/share/usb
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
- USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
- docdir=/usr/share/doc/${PF}/html install
-
- if use perl; then
- einfo "Installing perl module"
- cd "${S}"/language/perl || die
- DESTDIR=${D} perl-module_src_install
- cd "${S}" || die
- fi
-
- echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
- udev_dorules 99-gpib.rules
-
- dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
-
- insinto /etc
- newins util/templates/gpib.conf gpib.conf
- newins util/templates/gpib.conf gpib.conf.example
-
- if use pcmcia; then
- dodir /etc/pcmcia
- insinto /etc/pcmcia
- doins "${S}"/etc/pcmcia/*
- fi
-
- if use firmware; then
- insinto "${FIRM_DIR}"/agilent_82357a
- doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
-
- insinto "${FIRM_DIR}"/ni_gpib_usb_b
- doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
-
- insinto /usr/share/linux-gpib/hp_82341
- # do not install precompiled generate_firmware
- doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
- fi
-}
-
-pkg_preinst () {
- linux-mod_pkg_preinst
- use perl && perl_set_version
- enewgroup gpib
-}
-
-pkg_postinst () {
- linux-mod_pkg_postinst
-
- einfo "You need to run the 'gpib_config' utility to setup the driver before"
- einfo "you can use it. In order to do it automatically you can add to your"
- einfo "start script something like this (supposing the appropriate driver"
- einfo "is loaded on the startup):"
- einfo " gpib_config --minor 0"
- einfo ""
- einfo "To give a user access to the computer's gpib board you will have to add"
- einfo "them to the group 'gpib' or, you could change the permissions on the device"
- einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
- einfo ""
- einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
- einfo "to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for"
- einfo "more information."
- einfo ""
-
- if use pcmcia; then
- einfo "For PCMCIA cards:"
- einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
- einfo "You may wish to edit the options passed to the gpib_config call in the"
- einfo "/etc/pcmcia/linux-gpib-pcmcia script."
- einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
- einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
- einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
- einfo "The driver module will be loaded as needed by the cardmgr."
- einfo ""
- fi
-
- if use firmware; then
- einfo "For Agilent (HP) 82341C and 82341D cards:"
- einfo "The firmware for these boards is uploaded by passing the appropriate"
- einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
- einfo "gpib_config using the -I or --init-data command line option. Example:"
- einfo "gpib_config --minor 0 --init-data \\"
- einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
- einfo ""
- fi
-
-}
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild
similarity index 90%
rename from sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
rename to sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild
index e00810be7fad..72a254f65583 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild
@@ -13,11 +13,12 @@ inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs
DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
HOMEPAGE="http://linux-gpib.sourceforge.net/"
SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
- firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )"
+ firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
+"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
COMMONDEPEND="
@@ -85,6 +86,7 @@ src_compile() {
DESTDIR="${D}" \
INSTALL_MOD_PATH="${D}" \
HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+ UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \
USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
docdir=/usr/share/doc/${PF}/html
}
@@ -96,6 +98,7 @@ src_install() {
DESTDIR="${D}" \
INSTALL_MOD_PATH="${D}" \
HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+ UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \
USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
docdir=/usr/share/doc/${PF}/html install
@@ -180,4 +183,10 @@ pkg_postinst () {
einfo ""
fi
+ if [[ $REPLACING_VERSIONS < "3.2.21-r1" ]]; then
+ ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
+ ewarn "interface. You may need to reboot to make sure the newly built driver modules"
+ ewarn "are used (some of the driver modules cannot be unloaded)."
+ ewarn "If you do not do this, every gpib call will just result in an error message."
+ fi
}
diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild
index 1ccb466fdb7b..f498a73c472f 100644
--- a/sci-physics/root/root-6.04.06.ebuild
+++ b/sci-physics/root/root-6.04.06.ebuild
@@ -421,7 +421,7 @@ cleanup_install() {
rm -r etc/root/daemons || die
# these should be in PATH
mv etc/root/proof/utils/pq2/pq2* usr/bin/ || die
- rm ${DOC_DIR#/}/{INSTALL,LICENSE} || die
+ rm ${DOC_DIR#/}/INSTALL || die
use examples || rm -r ${DOC_DIR#/}/examples || die
# clean hardcoded sandbox paths
@@ -448,11 +448,6 @@ src_install() {
python_optimize "${D}/usr/$(get_libdir)/root"
fi
use emacs && elisp-install ${PN} build/misc/*.{el,elc}
- if use examples; then
- # these should really be taken care of by the root make install
- insinto ${DOC_DIR}/examples/tutorials/tmva
- doins -r tmva/test
- fi
doenvd 99root
# The build system installs Emacs support unconditionally in the wrong
@@ -465,12 +460,6 @@ src_install() {
# do not copress files used by ROOT's CLI (.credit, .demo, .license)
docompress -x "${DOC_DIR}"/{CREDITS,examples/tutorials}
- # needed for .license command to work
- cat > "${DOC_DIR}/LICENSE" <<- EOF
- Please visit
- https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html
- for the full license test
- EOF
}
pkg_postinst() {
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 2f875c5dad59..f4776ed78345 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,3 +1,3 @@
-DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
+DIST galera-3-25.3.13.tar.gz 2989201 SHA256 193db0c1ccf1c3cfbd46b23d26441fe022ffe82788ed467c6b2df02abc4b814d SHA512 6c83dca5f6087cfbbc6aa30ac4b3f47ce08e7d958875f5c07c260ec8e9677c0e3d9e1ebb347615e0842e85f952c8b7713ee02f6148c9049ae336b29c28dc2ade WHIRLPOOL f6fcda502c3145d0430496a4de9e2368e102769a254d905fb9594b082e9bc386ab6a40edc00e084a3dfa04f800368e45d449f94a634343a8d4f61725c849f23b
diff --git a/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
new file mode 100644
index 000000000000..972152d1e97e
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.13-strip-extra-cflags.patch
@@ -0,0 +1,70 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript 2015-03-16 07:18:42.000000000 -0400
++++ b/galerautils/src/SConscript 2015-04-07 15:03:21.661301200 -0400
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+
+ libgalerautils_env = env.Clone()
+
+@@ -39,21 +39,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+
+-if x86:
+- crc32c_env.Append(CFLAGS = ' -msse4.2')
+- if sysname == 'sunos':
+- # Ideally we want to simply strip SSE4.2 flag from the resulting
+- # crc32.pic.o
+- # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+- # but that requires some serious scons-fu, so we just don't
+- # compile hardware support in if host CPU does not have it.
+- from subprocess import check_call
+- try:
+- check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+- except:
+- libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+- crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+ libgalerautils_objs + crc32c_objs)
+
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct 2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct 2015-09-15 09:18:41.160091000 -0400
+@@ -67,7 +67,7 @@
+ build_target = 'all'
+
+ # Optimization level
+-opt_flags = ' -g -O3 -DNDEBUG'
++opt_flags = ' -DNDEBUG'
+
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -97,26 +97,6 @@
+ if dbug:
+ opt_flags = opt_flags + ' -DGU_DBUG_ON'
+
+-if sysname == 'sunos':
+- compile_arch = ' -mtune=native'
+-elif x86:
+- if bits == 32:
+- if machine == 'x86_64':
+- compile_arch = ' -mx32'
+- else:
+- compile_arch = ' -m32 -march=i686'
+- if sysname == 'linux':
+- link_arch = ' -Wl,-melf_i386'
+- else:
+- compile_arch = ' -m64'
+- if sysname == 'linux':
+- link_arch = ' -Wl,-melf_x86_64'
+- link_arch = compile_arch + link_arch
+-elif machine == 's390x':
+- compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
+- if bits == 32:
+- compile_arch += ' -m32'
+-
+ boost = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
+ ssl = int(ARGUMENTS.get('ssl', 1))
diff --git a/sys-cluster/galera/galera-25.3.10.ebuild b/sys-cluster/galera/galera-25.3.10.ebuild
index c6651f72e018..98c8a2d45245 100644
--- a/sys-cluster/galera/galera-25.3.10.ebuild
+++ b/sys-cluster/galera/galera-25.3.10.ebuild
@@ -7,7 +7,7 @@ EAPI=5
MY_P="${PN}-3-${PV}"
inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
HOMEPAGE="http://www.galeracluster.com"
SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
LICENSE="GPL-2 BSD"
diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild
index bd9f80e109b1..ec06ecaaff67 100644
--- a/sys-cluster/galera/galera-25.3.12.ebuild
+++ b/sys-cluster/galera/galera-25.3.12.ebuild
@@ -7,7 +7,7 @@ EAPI=5
MY_P="${PN}-3-${PV}"
inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
HOMEPAGE="http://www.galeracluster.com"
SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
LICENSE="GPL-2 BSD"
diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.13.ebuild
similarity index 67%
rename from sys-cluster/galera/galera-25.3.5.ebuild
rename to sys-cluster/galera/galera-25.3.13.ebuild
index 5a3472d3563f..64794367115e 100644
--- a/sys-cluster/galera/galera-25.3.5.ebuild
+++ b/sys-cluster/galera/galera-25.3.13.ebuild
@@ -4,22 +4,22 @@
EAPI=5
-MY_P="${PN}-${PV}-src"
+MY_P="${PN}-3-${PV}"
-inherit scons-utils multilib toolchain-funcs base versionator eutils user flag-o-matic
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
-HOMEPAGE="http://www.codership.org/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="garbd ssl test"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
CDEPEND="
ssl? ( dev-libs/openssl:0= )
- >=dev-libs/boost-1.41
+ >=dev-libs/boost-1.41:0=
"
DEPEND="${DEPEND}
${CDEPEND}
@@ -28,13 +28,7 @@ DEPEND="${DEPEND}
>=dev-cpp/asio-1.4.8[ssl?]
"
#Run time only
-RDEPEND="${CDEPEND}
- garbd? ( || (
- net-analyzer/netcat
- net-analyzer/netcat6
- net-analyzer/gnu-netcat
- net-analyzer/openbsd-netcat
- ) )"
+RDEPEND="${CDEPEND}"
S="${WORKDIR}/${MY_P}"
@@ -50,7 +44,7 @@ src_prepare() {
rm -r "${S}/asio" || die
# Respect {C,LD}FLAGS.
- epatch "${FILESDIR}/respect-flags.patch"
+ epatch "${FILESDIR}/galera-3.13-strip-extra-cflags.patch"
#Remove optional garbd daemon
if ! use garbd ; then
@@ -62,6 +56,12 @@ src_prepare() {
src_configure() {
tc-export CC CXX
+ # Uses hardware specific code that seems to depend on SSE4.2
+ if use cpu_flags_x86_sse4_2 ; then
+ append-cflags -msse4.2
+ else
+ append-cflags -DCRC32C_NO_HARDWARE
+ fi
# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
# and -Wold-style-cast
myesconsargs=(
@@ -81,6 +81,7 @@ src_install() {
dobin garb/garbd
newconfd "${FILESDIR}/garb.cnf" garbd
newinitd "${FILESDIR}/garb.sh" garbd
+ doman man/garbd.8
fi
exeinto /usr/$(get_libdir)/${PN}
doexe libgalera_smm.so
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 79468cc3185b..e49501229a07 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,3 +1 @@
-DIST kibana-4.0.3-linux-x64.tar.gz 14331227 SHA256 320a43ed11f8f3f95709ceaec11ef8192c9bc2e64ea73a5f973b43aa8a422922 SHA512 745faffd9d8d67d6322f64223b829eb8eff4fba5d2f435a72b0c52c64e1578f0f5e741285c20904b6215d0c8da2cc5833fead86fc519bb4fdc51e8d51a18c465 WHIRLPOOL 2e67b9ba702ff78b9e775517333739cb96ad7dc88ab413768b897374f5ec25daa3b861f420b54451906231eca0ce5558306613a6597a7c85d340d897da0a0a08
-DIST kibana-4.1.1-linux-x64.tar.gz 11676499 SHA256 6f42d25f337fd49f38e2af81b9ab6e0c987a199a8c0b2e1410d072f812cb4520 SHA512 d72f235704e2a85b4d993f55550b5d8b6de049f05f4ff7781e122af65fca88d3966db188a8bbc877928751aacd69f8ecf4c412cd05bfa88d1a9e785fa952aeed WHIRLPOOL a60321cf7ae511dd03c2099b61ea0fe5abb479b264842150a84d6791e8b9ba6682dc1c95059800a8cf714898350ec533440eb43240fa78491836fa3b7d6ef23d
-DIST kibana-4.1.2-linux-x64.tar.gz 11787239 SHA256 5f6213f7ac7ef71016a6750f09e7316ccc9bca139bc5389b417395b179bc370c SHA512 08e8a8d5582019ee977a43e25afe874cd34fe0097ed17dc4738abaf6493c224061997a2558a297748f53bbee97bcd83b1dc54d0287594ba60d917d19c0baca9b WHIRLPOOL dd537add18d7a01622541850ff7385ec72174f473c6f89d56172a41cc3eac79d49e2df3079fef3160acb6f7c390eae5afb614b14402ebdf21cfba67289fb5142
+DIST kibana-4.1.3-linux-x64.tar.gz 11800636 SHA256 f2cb5389ad0acfbc4006f739d75d5ede541483d1fa6be728bbf547a9d7ddeb4a SHA512 81549c881ec222bcac73a0cf60766752591031ea8f3d28cce98ce06458376036f119353e7b820faef2cb42b23e5f6ef96cd98c1f256b3361513e71877082301c WHIRLPOOL 0d2272361a1b07984cfa7539d4d36e2465b87cdc046ae7cd6d2b6e5da69861feca0e74d9e0ad467d7f4cef9865b72c0bcc1a769bbc6458227fe590e1f99a21b1
diff --git a/www-apps/kibana-bin/files/kibana.initd b/www-apps/kibana-bin/files/kibana.initd
deleted file mode 100644
index 9effc545218e..000000000000
--- a/www-apps/kibana-bin/files/kibana.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-command="/opt/kibana/bin/kibana"
-pidfile="/run/kibana.pid"
-KIBANA_USER=${KIBANA_USER:="kibana"}
-
-depend() {
- need elasticsearch
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
-
- start-stop-daemon --start \
- --user $KIBANA_USER \
- --background \
- --make-pidfile \
- --pidfile $pidfile \
- --stdout /var/log/kibana/kibana.log \
- --stderr /var/log/kibana/kibana.err \
- --exec $command
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
-
- start-stop-daemon --stop \
- --pidfile $pidfile
-
-
- eend $?
-}
diff --git a/www-apps/kibana-bin/files/kibana.initd-r1 b/www-apps/kibana-bin/files/kibana.initd-r1
deleted file mode 100644
index 3fdcec648c8e..000000000000
--- a/www-apps/kibana-bin/files/kibana.initd-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-KIBANA_USER=${KIBANA_USER:-kibana}
-
-command="/opt/kibana/bin/kibana"
-pidfile="/run/kibana.pid"
-command_background="true"
-start_stop_daemon_args="--user=\"${KIBANA_USER}\" --stdout /var/log/kibana/kibana.log --stderr /var/log/kibana/kibana.err"
-
-depend() {
- need elasticsearch
-}
-
-start_pre() {
- checkpath -d -o "${KIBANA_USER}" -m750 "/var/log/kibana"
-}
diff --git a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild b/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild
deleted file mode 100644
index ee1c13e71b72..000000000000
--- a/www-apps/kibana-bin/kibana-bin-4.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="kibana"
-MY_P=${MY_PN}-${PV/_rc/-rc}
-
-DESCRIPTION="visualize logs and time-stamped data"
-HOMEPAGE="http://www.elasticsearch.org/overview/kibana/"
-SRC_URI="https://download.elasticsearch.org/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-misc/elasticsearch-1.4.4"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/kibana/node/bin/node"
-
-S="${WORKDIR}/${MY_P}-linux-x64"
-
-pkg_setup() {
- enewgroup ${MY_PN}
- enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_install() {
- keepdir /opt/${MY_PN}
- keepdir /var/log/${MY_PN}
-
- newinitd "${FILESDIR}"/kibana.initd "${MY_PN}"
-
- mv * "${D}/opt/${MY_PN}"
-}
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild
deleted file mode 100644
index 4ee1ab1c47ad..000000000000
--- a/www-apps/kibana-bin/kibana-bin-4.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="kibana"
-MY_P=${MY_PN}-${PV/_rc/-rc}
-
-DESCRIPTION="visualize logs and time-stamped data"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-misc/elasticsearch-1.4.4"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/kibana/node/bin/node"
-
-S="${WORKDIR}/${MY_P}-linux-x64"
-
-pkg_setup() {
- enewgroup ${MY_PN}
- enewuser ${MY_PN} -1 -1 /opt/${MY_PN} ${MY_PN}
-}
-
-src_install() {
- keepdir /opt/${MY_PN}
- keepdir /var/log/${MY_PN}
-
- newinitd "${FILESDIR}"/kibana.initd-r1 "${MY_PN}"
-
- mv * "${D}/opt/${MY_PN}"
-}
diff --git a/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild b/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
similarity index 75%
rename from www-apps/kibana-bin/kibana-bin-4.1.2.ebuild
rename to www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
index fdace00486f3..facd6af6d492 100644
--- a/www-apps/kibana-bin/kibana-bin-4.1.2.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-4.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
EAPI=5
@@ -9,7 +9,7 @@ inherit user
MY_PN="kibana"
MY_P=${MY_PN}-${PV/_rc/-rc}
-DESCRIPTION="visualize logs and time-stamped data"
+DESCRIPTION="Explore and visualize data"
HOMEPAGE="https://www.elastic.co/products/kibana"
SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}-linux-x64.tar.gz"
@@ -34,13 +34,13 @@ src_install() {
keepdir /opt/${MY_PN}
keepdir /var/log/${MY_PN}
- insinto "/etc/logrotate.d"
- newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
- newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
- newinitd "${FILESDIR}"/kibana.initd-r2 "${MY_PN}"
+ newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+ newinitd "${FILESDIR}"/${MY_PN}.initd-r2 ${MY_PN}
- mv * "${D}/opt/${MY_PN}"
+ mv * "${D}"/opt/${MY_PN}
}
pkg_postinst() {
diff --git a/www-apps/kibana-bin/metadata.xml b/www-apps/kibana-bin/metadata.xml
index cf1b4281a444..4069bfc92038 100644
--- a/www-apps/kibana-bin/metadata.xml
+++ b/www-apps/kibana-bin/metadata.xml
@@ -3,6 +3,7 @@
idella4@gentoo.org
+ Ian Delaney
hydrapolic@gmail.com
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 68a33336c60f..9e7cff64bac5 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_47.0.2526.58-1_amd64.deb 47469772 SHA256 7cc64b7f209135e979a01c78f088ee86f75a5e0968afdfb2e69031638a46fa55 SHA512 2875a2ed3c840455d798d34c53d82582762b3a8dc02a452d88ba68f1ff11749909981857dc00df9edacc7a0be91fbfc97e60ee2e4b4e7121f9707cf56550febb WHIRLPOOL c4e64a9e54df93b3cbc23b682f60983176166f9f09c28c216b9fac2414f82d6ff99fef52308c1fb7d89e5c73f9b1d6d6827781a25fd41705139ecc804b2fb821
-DIST google-chrome-beta_47.0.2526.58-1_i386.deb 47137450 SHA256 9bd238abadc0c390bb393518aec8359f61439b4a531df18ce4e2644bfecdbbea SHA512 9ad5b2ed3cecab383c4bb0f9185eaf161512fff5e4cb588e407650bceaa91ed7ac0116682f79260e7ee039a726feee8f2e2a6b2aaa1b91cbdea277125ea64464 WHIRLPOOL 13295cc8e745a7d89196ff20561523151a868a6d889822305c2ea8668cb4b465cd63959dd207cbdb4632ce866eb1bf0d483268b37684f45d65dd2b866fc0aa3f
+DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7
+DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.58_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-47.0.2526.58_p1.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-47.0.2526.69_p1.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f80411242df4..61376eb1b85a 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1
-DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd
+DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
+DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.8_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a9d10610b19c..384281884604 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_47.0.2526.58-1_amd64.deb 47469772 SHA256 7cc64b7f209135e979a01c78f088ee86f75a5e0968afdfb2e69031638a46fa55 SHA512 2875a2ed3c840455d798d34c53d82582762b3a8dc02a452d88ba68f1ff11749909981857dc00df9edacc7a0be91fbfc97e60ee2e4b4e7121f9707cf56550febb WHIRLPOOL c4e64a9e54df93b3cbc23b682f60983176166f9f09c28c216b9fac2414f82d6ff99fef52308c1fb7d89e5c73f9b1d6d6827781a25fd41705139ecc804b2fb821
-DIST google-chrome-beta_47.0.2526.58-1_i386.deb 47137450 SHA256 9bd238abadc0c390bb393518aec8359f61439b4a531df18ce4e2644bfecdbbea SHA512 9ad5b2ed3cecab383c4bb0f9185eaf161512fff5e4cb588e407650bceaa91ed7ac0116682f79260e7ee039a726feee8f2e2a6b2aaa1b91cbdea277125ea64464 WHIRLPOOL 13295cc8e745a7d89196ff20561523151a868a6d889822305c2ea8668cb4b465cd63959dd207cbdb4632ce866eb1bf0d483268b37684f45d65dd2b866fc0aa3f
+DIST google-chrome-beta_47.0.2526.69-1_amd64.deb 47749092 SHA256 4ee64918613ea0fd182e0fdbbf5a39a0ba8d859a51fc7989e7904d21a25dfb05 SHA512 a423853de756f908a7e6cc09a9bfb64167d41a55e6dbb0a570de04f4143c5fb488f3d14caa7114ff4f42ea672bde683f615cc57e66fa09e2be89141cca8bf211 WHIRLPOOL 463ce80490e64bc8f59fbec9e52700bd65d811f4aaf841ecdc6d36acbcdf99c272721fdf07a6e040bf21082ef1900a1713bc1b53be8e390640eee9e93ba24ea7
+DIST google-chrome-beta_47.0.2526.69-1_i386.deb 47275062 SHA256 9cabe93c212d626e66a62c79c3bcce5236e962e1d8924109706f8f3b03b997f9 SHA512 3910267cea409f5307385ace660dfb5d1774033f2916d2a7c184f07198306c5737b039398b429bfef40130cd5366a2ab9cac244538eee0398685de2bc99f3e01 WHIRLPOOL eb9ae7952368e1939c19e633ecb04e23a1c4a0c30ffc23d5681a887b66acc816d02c1102fb360cba67f63e040d8d74f660b4fce345d7e1ea50df827e324169e2
DIST google-chrome-stable_46.0.2490.86-1_amd64.deb 47301590 SHA256 29c434fe640825a88ca5871ce31b8cba9994776dc5c3c99e579998f14e3455ac SHA512 5fd15fa740843d4003c7fe64b7c0c45a07f26b9087a6dfb7f58d3c758f2e6045b20b4e8395c4bb790bf15d74fe56346fe2dc55c2cfbe517e8f793e1defd64013 WHIRLPOOL ceb26bfde2c58e86fd387ecc5c774a84d3cc8c69ec9ca1eb8e91e135f2bcc715c1105ba8e555544e27f8c562a8747e33a0dd40f55b68194cb804069d94f4dccf
DIST google-chrome-stable_46.0.2490.86-1_i386.deb 47021428 SHA256 c8e8d548af976508d235f36fd73fd91515842dab4371b8cd6732e2c8b283016d SHA512 bee7901cd1e18981460f2d8158a7568fb0efc5030c28e017b73d5abe7ecdd8344965e50bb34a911f91fd8cf93b0978e7c91f2dffde55f8209fb39674ea6dfca5 WHIRLPOOL b551f698ab5fb1e04940826d85729e04bcab6e67f2240b48aef00284704d85a6018abcde4370b4436f7d8fb22f159ea489bfc6c1b73ffd25c8ee5059239198a2
-DIST google-chrome-unstable_48.0.2564.8-1_amd64.deb 47870498 SHA256 1998d1667650b3864f154ec43ad55197b8743b56fcffbdad4a5442692e3d7101 SHA512 0e35be65548c961d1e9c9df7c9dff43f8791b477e821c79bd1aa7df04cd4c6d421b04e4498e872f2c85959391d5bf9974a95ba1590dc9981a1f90448fd424216 WHIRLPOOL 7053207b56910c120c5c2dcc8956327875bf1087b3970617c926fd71c1e76505bf60e480c0084fd25b0a443306f2b32284482bfc28cd11cf99cbbea032e554e1
-DIST google-chrome-unstable_48.0.2564.8-1_i386.deb 47645970 SHA256 4c6bfb140c627f05076f4cb297a21808b61d13c5c264ad1fc66d7dac3b47e2bc SHA512 a410d7cae3deef2a570cd7b14b63db9637cf0296e81fdd871c9f10bc6c3644bdbae80532af0ff1630daf68230bba9e5cef09e297a0d2df9a39ab42ea64ba582e WHIRLPOOL 4f997426fea60bbed8898b825303e131e188c18ae4c66ddc0c5ed5351627eebb637bb7d8b2340d939571656f2fb7bc50b721f8c025d5f9bbebdb579b43cf1dfd
+DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
+DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.58_beta1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.69_beta1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.58_beta1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.69_beta1.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.8_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.10_alpha1.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.8_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.10_alpha1.ebuild