Sync with portage [Wed Oct 28 15:09:15 MSK 2015].

9 years ago · c70b3afeb5
parent d8f5becb2f
commit c70b3afeb5
243 changed files with 3032 additions and 1355 deletions
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@ -1,2 +1,2 @@
-DIST drush-5.8.tar.gz 409642 SHA256 15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480 SHA512 85f7572aece8590d23164dc938e00b740718a5b9bf20ca866083f9e8ce2025ec07f57e06234bf50bfe2351f407f5bad21789103c1e04d18d2fd202fa735637e6 WHIRLPOOL 68f4a8ca09fc61c36de3d6cc6e3aeaab2021b677ba9d732a65f4d5a9940ebbee3cd63dc84f165e119770168547b1997aff6c23497dc50dbe548df348c296188c
 DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc
+DIST drush-6.6.0.tar.gz 511330 SHA256 67f7a1f08238c8c3f61d4e93f8c7c83508f392086c9931865fd1022981e8f698 SHA512 d7d361628406dd0f0fc5b07e7a318abd04ca7ac63da9d3fa705b0a64b531394f6e45e944dbd1c2e7eaec6643a92792b9b8558aea6ebb5311ce7acd32aa438a21 WHIRLPOOL ff0f2b1f20cc7a5767513be78b6f7ce1d09fb8929089ac918c4982e57f7c5c4f174c5dfd75235dafde57e65b90717844d4d9dfa199871e5c65bc4deda19b6b8c
--- a/app-admin/drush/drush-5.8.ebuild
+++ b/app-admin/drush/drush-5.8.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit bash-completion-r1
-
-DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
-HOMEPAGE="http://drupal.org/project/drush"
-SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+examples"
-
-DEPEND="dev-lang/php[cli,ctype,simplexml]
-	dev-php/pear
-	dev-php/PEAR-Console_Table
-	dev-php/PEAR-Console_Getopt"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.txt!\0.bz2!g" \
-		includes/bootstrap.inc || die
-	sed -i \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		commands/core/docs.drush.inc || die
-	sed \
-		-e "1,2d" \
-		-e "5,11d" \
-		drush.complete.sh > drush.bashcomp
-}
-
-src_install() {
-	local docs="README.txt docs"
-	use examples && docs="${docs} examples"
-	insinto /usr/share/drush
-	doins -r .
-	exeinto /usr/share/drush
-	doexe drush
-	dosym /usr/share/drush/drush /usr/bin/drush
-	dodoc -r ${docs}
-	# cleanup
-	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore \
-		.gitignore .travis.yml drush.complete.sh ; do
-		rm -rf "${D}/usr/share/drush/${i}"
-	done
-	keepdir /etc/drush
-	newbashcomp drush.bashcomp drush
-}
--- a/app-admin/drush/drush-6.6.0.ebuild
+++ b/app-admin/drush/drush-6.6.0.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+	dev-php/PEAR-Console_Table"
+
+src_prepare() {
+	# Fix the bash completion script, check the patch for Gentoo/upstream
+	# bug numbers.
+	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym /usr/share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
--- a/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct python redis smtp spoof-source systemd tcpd"
 RESTRICT="test"

--- a/app-admin/vault/files/vault.initd
+++ b/app-admin/vault/files/vault.initd
@ -8,7 +8,7 @@ group=${group:-${SVCNAME}}
 pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
 user=${user:-${SVCNAME}}

-command="/usr/sbin/${SVCNAME}"
+command="/usr/bin/${SVCNAME}"
 command_args="agent -config-dir=/etc/vault.d ${command_args}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>
@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pgpius</remote-id>
+		<remote-id type="github">jaymzh/pius</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
@ -11,8 +11,9 @@ inherit python-r1

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit-dev.git
-		https://anongit.gentoo.org/git/proj/gentoolkit-dev.git"
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/gentoolkit.git
+		https://anongit.gentoo.org/git/proj/gentoolkit.git"
+	EGIT_BRANCH="gentoolkit-dev"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
--- a/app-text/blogc/blogc-0.4.ebuild
+++ b/app-text/blogc/blogc-0.4.ebuild
@ -10,6 +10,8 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3 autotools
 fi

+inherit eutils
+
 DESCRIPTION="A blog compiler"
 HOMEPAGE="http://blogc.org/"

@ -42,6 +44,7 @@ DEPEND="${DEPEND}

 src_prepare() {
 	[[ ${PV} = *9999* ]] && eautoreconf
+	epatch_user
 	default
 }

--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@ -10,6 +10,8 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3 autotools
 fi

+inherit eutils
+
 DESCRIPTION="A blog compiler"
 HOMEPAGE="http://blogc.org/"

@ -42,6 +44,7 @@ DEPEND="${DEPEND}

 src_prepare() {
 	[[ ${PV} = *9999* ]] && eautoreconf
+	epatch_user
 	default
 }

--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
@ -8,4 +8,7 @@
 	<use>
 		<flag name="network-uri">use network-uri package</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ddssff/haskell-extra</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-haskell/fclabels/metadata.xml
+++ b/dev-haskell/fclabels/metadata.xml
@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
 		This package provides first class labels that can act as
 		bidirectional record fields. The labels can be derived
-		automatically using Template Haskell which means you don&#39;t have
+		automatically using Template Haskell which means you don't have
 		to write any boilerplate yourself. The labels are implemented as
 		lenses and are fully composable. Labels can be used to /get/,
 		/set/ and /modify/ parts of a datatype in a consistent way.
 		
-		See &quot;Data.Label&quot; for an introductory explanation.
+		See "Data.Label" for an introductory explanation.
 		
 		Internally lenses are not tied to Haskell functions directly,
 		but are implemented as arrows. Arrows allow the lenses to be run
@ -18,9 +18,12 @@
 		make partial lenses that point to fields of multi-constructor
 		datatypes in an elegant way.
 		
-		See the &quot;Data.Label.Maybe&quot; module for the use of partial labels.
+		See the "Data.Label.Maybe" module for the use of partial labels.
 		
 		&gt; 1.0.3 -&gt; 1.0.4
 		&gt;   - Bugfix to compile on GHC 6.12 again.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">sebastiaanvisser/fclabels</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
 		Scrap Your Boilerplate utilities for the GHC API.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">nominolo/ghc-syb</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-haskell/monad-journal/metadata.xml
+++ b/dev-haskell/monad-journal/metadata.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>
@ -10,4 +10,7 @@
 		sink them through `IO` if you're logging in
 		`(MonadIO m) =&gt; m`.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">phaazon/monad-journal</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/guava/guava-13.0.1-r3.ebuild
+++ b/dev-java/guava/guava-13.0.1-r3.ebuild
@ -15,12 +15,12 @@ LICENSE="Apache-2.0"
 SLOT="13"
 KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-DEPEND="
+CDEPEND="
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${DEPEND}
+RDEPEND="${CDEPEND}
 	virtual/jre:1.7"
-DEPEND="${DEPEND}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://github.com/google/guava/issues/1738
 JAVA_GENTOO_CLASSPATH="jsr305"
--- a/dev-java/guava/guava-14.0.1.ebuild
+++ b/dev-java/guava/guava-14.0.1.ebuild
@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$

 LICENSE="Apache-2.0"
 SLOT="14"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635

--- a/dev-java/guava/guava-15.0.ebuild
+++ b/dev-java/guava/guava-15.0.ebuild
@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$

 LICENSE="Apache-2.0"
 SLOT="15"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635

--- a/dev-java/guava/guava-16.0.1.ebuild
+++ b/dev-java/guava/guava-16.0.1.ebuild
@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$

 LICENSE="Apache-2.0"
 SLOT="16"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635

--- a/dev-java/guava/guava-17.0.ebuild
+++ b/dev-java/guava/guava-17.0.ebuild
@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$

 LICENSE="Apache-2.0"
 SLOT="17"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635

--- a/dev-java/guava/guava-18.0.ebuild
+++ b/dev-java/guava/guava-18.0.ebuild
@ -13,15 +13,15 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/$

 LICENSE="Apache-2.0"
 SLOT="18"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

-COMMON_DEP="
+CDEPEND="
 	dev-java/javax-inject:0
 	dev-java/jsr305:0
 	java-virtuals/jdk-with-com-sun:0"
-RDEPEND="${COMMON_DEP}
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.7 virtual/jre:1.6 )"
-DEPEND="${COMMON_DEP}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	virtual/jdk:1.7" # https://code.google.com/p/guava-libraries/issues/detail?id=635

--- a/dev-java/jsr223/jsr223-1.0-r1.ebuild
+++ b/dev-java/jsr223/jsr223-1.0-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE=""
-
-inherit java-pkg-2
-
-DESCRIPTION="Scripting for the Java(TM) Platform"
-HOMEPAGE="http://jcp.org/en/jsr/detail?id=223"
-
-# http://download.java.net/openjdk/jdk6/promoted/b19/openjdk-6-src-b19-15_apr_2010.tar.gz
-# tar xvf openjdk-6-src-b19-15_apr_2010.tar.gz jdk/src/share/classes/javax/script
-# tar cjvf jsr223-openjdk-6-src-b19.tar.bz2 jdk/
-SRC_URI="mirror://gentoo/jsr223-openjdk-6-src-b19.tar.bz2"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_compile() {
-	mkdir build || die
-	ejavac -d build jdk/src/share/classes/javax/script/*.java
-	jar -cf script-api.jar -C build javax || die
-}
-
-src_install() {
-	java-pkg_dojar script-api.jar
-}
--- a/dev-java/jsr223/jsr223-1.0-r2.ebuild
+++ b/dev-java/jsr223/jsr223-1.0-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${PN}-openjdk-6-src-b19.tar.bz2"

 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""

 RDEPEND=">=virtual/jre-1.6"
--- a/dev-java/jsr305/Manifest
+++ b/dev-java/jsr305/Manifest
@ -1,2 +1 @@
-DIST jsr-305-source.tar.gz 36865 SHA256 87bcc526872fb430a8f02a1e0445175b38e73b809392398601570158373aa9b6 SHA512 7821865ade33e1ca4f59da3e6c8b888f26c21853aa0f8578299a4205cd931900be294aaf85036ba54646a66efe3d9ae0a5653ef756710521be03882b9e0b82e5 WHIRLPOOL 0768571aeef2ae0758ed70c8569f06567ac45ad7900808ad7843ee01e1311c0521f76ff750e45983cbdf585ab9e4df5eb3a1ffd8bdf27d9fb7afd02cae424007
 DIST jsr305-3.0.1-sources.jar 16622 SHA256 56c80429d828bfaaefbf0358334c2629228a0ca25c073707be589e9d6c9406e6 SHA512 ca9902929de94fbc03b848599bb1f5f542898ade724eb0d6022f799733c9093bb27c0a565f0a90f47dba7bff72d5a6d24de687746721a1bec2050c2061ecd148 WHIRLPOOL d57e98eb34fc46b82946287cb73fb1009ab5347fad6e4407e7d94e9337ccc1d4552084a2eda0fb4c5b9d29b68d1ab97cdf6d6880352559b4b022e8ffb1021a99
--- a/dev-java/jsr305/jsr305-1.0-r1.ebuild
+++ b/dev-java/jsr305/jsr305-1.0-r1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc examples source test"
-inherit eutils java-pkg-2 java-ant-2
-MY_PN=jsr-305
-
-DESCRIPTION="Reference implementation for JSR 305: Annotations for Software Defect Detection in Java"
-SRC_URI="mirror://gentoo/${MY_PN}-source.tar.gz"
-HOMEPAGE="https://code.google.com/p/jsr-305/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	# create jar
-	cd ri
-	mkdir -p build/classes
-	ejavac -sourcepath src/main/java -d build/classes $(find src/main/java -name "*.java") \
-		|| die "Cannot compile sources"
-	mkdir dist
-	cd build/classes
-	jar -cvf "${S}"/ri/dist/${PN}.jar javax || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"/ri
-		mkdir javadoc
-		javadoc -d javadoc -sourcepath src/main/java -subpackages javax \
-			|| die "Javadoc creation failed"
-	fi
-}
-
-src_install() {
-	cd ri
-	java-pkg_dojar dist/${PN}.jar
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples/
-		cp -r "${S}"/sampleUses/* "${D}"/usr/share/doc/${PF}/examples/ || die "Could not install examples"
-	fi
-
-	if use source ; then
-		cd "${S}"/ri/src/main/java
-		java-pkg_dosrc javax
-	fi
-
-	if use doc ; then
-		cd "${S}"/ri
-		java-pkg_dojavadoc javadoc
-	fi
-}
--- a/dev-java/jsr305/jsr305-3.0.1.ebuild
+++ b/dev-java/jsr305/jsr305-3.0.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://central.maven.org/maven2/com/google/code/findbugs/${PN}/${PV}/${

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""

 RDEPEND=">=virtual/jre-1.6"
--- a/dev-lang/orc/metadata.xml
+++ b/dev-lang/orc/metadata.xml
@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gstreamer</herd>
+<use>
+  <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
+</use>
 </pkgmetadata>
--- a/dev-lang/orc/orc-0.4.24.ebuild
+++ b/dev-lang/orc/orc-0.4.24.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 LICENSE="BSD BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples hardened static-libs"
+IUSE="examples pax_kernel static-libs"

 RDEPEND=""
 DEPEND="${RDEPEND}
@ -40,7 +40,7 @@ src_configure() {

 src_install() {
 	autotools-multilib_src_install
-	if use hardened; then
+	if use pax_kernel; then
 		pax-mark m "${ED}"usr/bin/orc-bugreport
 		pax-mark m "${ED}"usr/bin/orcc
 		pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so*
@ -48,7 +48,7 @@ src_install() {
 }

 pkg_postinst() {
-	if use hardened; then
+	if use pax_kernel; then
 		ewarn "Please run \"revdep-pax\" after installation".
 		ewarn "It's provided by sys-apps/elfix."
 	fi
--- a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
+++ b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="http://www.angelcode.com/angelscript/"
 SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"

 LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"

--- a/dev-libs/angelscript/metadata.xml
+++ b/dev-libs/angelscript/metadata.xml
@ -2,7 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
 	</maintainer>
+	<slots>
+		<subslots>
+			Reflects ABI compatibility of libangelscript.so.
+			Since there is practically no compatibility, this is $PV.
+		</subslots>
+	</slots>
 </pkgmetadata>

--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@ -1,3 +1,2 @@
 DIST libsodium-1.0.2.tar.gz 1673394 SHA256 961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19 SHA512 15fc47516f0e35906c1c304205fa991e74a273e4e6fc2186b6c16f0e41523de24493e149262b97ef03e4adc221232372ef1f283c4c23f96e4c5d99023d361e14 WHIRLPOOL 18509d9911c1d0ec6e8b9a8735abfeb2c1623669d31045abc6d9dd1289571fbe3a055f960f42a86779e7c03967532d71d7b9d0597ecfe457672e69b27b577e48
-DIST libsodium-1.0.3.tar.gz 1679664 SHA256 cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288 SHA512 7d58ddf973bfc456c2d196129d2c3a9ddec6e40b977797251385cd42bdd1234987779566903b7c2251cae02aab7e1c5246967af4c887be8a3451ae3f745c1ae5 WHIRLPOOL 1722d2c9f8bb18fe5d74b1ffe3600fe0a17779569315558324fd3262d63c0db5c9368d3bf9a6bb421802882dd1fd2c701ad062938a5f414190670f8c7f244231
-DIST libsodium-1.0.4.tar.gz 1787241 SHA256 e4f75d4b2bd860068e0401163207415c9d41048d7601409897ff2951839fd310 SHA512 9fe83a06a85fca2bf6ab869acf3acc7d0c5f74fce924c794f1e84a3f0ea98b3b8030ff2a1bc9b5c4675b4749edd12e2ac4c1dad3130168865bad323f6222c9c3 WHIRLPOOL 687fa836ece3bbb845de3c894576e1b6cac07157636b386765a67731ab11bb3b709fdc9730af9b4e385d33b5b6e026ac609262ffe2dbcfd2f1cbc2a5b34fb234
+DIST libsodium-1.0.5.tar.gz 1787478 SHA256 bfcafc678c7dac87866c50f9b99aa821750762edcf8e56fc6d13ba0ffbef8bab SHA512 978867f7499ec07817a95213baea79fd45d3cdd48c343723490471f79a1b0df2fa0638a91c46a08717fe03a1d8b68789445cb34be969d91023ba7edc8750835c WHIRLPOOL a46f6ca3eb98151cbc230aa1fd344b4038415f717382fa912f1750c83ed73bcc778fd634cdb7ae9c81b79c94b2d3e949a63d10adaf1ec822ba4be4e4b6fd7620
--- a/dev-libs/libsodium/libsodium-1.0.4.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.4.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom"
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
--- a/dev-libs/libsodium/libsodium-1.0.5.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.5.ebuild
--- a/dev-lisp/sbcl/sbcl-1.2.16.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
@ -43,7 +43,7 @@ IUSE="debug doc source +threads +unicode pax_kernel zlib"
 CDEPEND=">=dev-lisp/asdf-3.1:="
 DEPEND="${CDEPEND}
 		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-		pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+		pax_kernel? ( sys-apps/elfix )"
 RDEPEND="${CDEPEND}
 		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"

@ -148,7 +148,7 @@ src_compile() {

 	strip-unsupported-flags ; filter-flags -fomit-frame-pointer

-	if host-is-pax ; then
+	if use pax_kernel ; then
 		# To disable PaX on hardened systems
 		pax-mark -mr "${bindir}"/src/runtime/sbcl

--- a/dev-python/cassandra-driver/Manifest
+++ b/dev-python/cassandra-driver/Manifest
@ -0,0 +1 @@
+DIST cassandra-driver-2.7.2.tar.gz 413805 SHA256 dcff93964334902c5707a3024b500c063ec254da61adae9ab8b3824d56088cd5 SHA512 7548764f2a315dc6f6d4a00138767e6ba6b453a7d7ff19c0913f8c931ae6cb163092644c2d24b87e9efefcdf8568d7e84dccf9f990ab498f187a1bb0c498f415 WHIRLPOOL 219a4017d0e129d14aa2cf87ac5f4875c671777e8064cbaf240f84b22df171b3be902fabeec8327e4064b6417c8b44d12b4d9d462bc491d71ae6ec3149612898
--- a/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild
+++ b/dev-python/cassandra-driver/cassandra-driver-2.7.2.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils vcs-snapshot
+
+DESCRIPTION="DataStax python driver for Apache Cassandra"
+HOMEPAGE="https://github.com/datastax/python-driver https://pypi.python.org/pypi/cassandra-driver/${PV}"
+SRC_URI="https://github.com/datastax/python-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cython doc +libev +murmur test"
+
+RDEPEND="
+	$(python_gen_cond_dep '=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/six-1.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	cython? (
+		>=dev-python/cython-0.20[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	libev? (
+		dev-libs/libev
+	)
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+	)
+"
+
+python_configure_all() {
+	mydistutilsargs=( $(usex cython "" --no-cython)
+					  $(usex libev "" --no-libev)
+					  $(usex murmur "" --no-murmur3) )
+}
+
+python_compile_all() {
+	use doc && esetup.py doc
+}
+
+python_test() {
+	nosetests -v tests.unit || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all "${@}"
+	use doc && dohtml -r docs/_build/${PV}/.
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some behaviors of this driver are enabled at run-time"
+	einfo "when certain libs are detected.  Compression support is"
+	einfo "enabled if dev-python/lz4 or dev-python/snappy are"
+	einfo "installed.  Also scales (for metrics) and blist (for"
+	einfo "sorted sets) provide additional features, though there"
+	einfo "are not packages in the tree yet (install with pip)."
+	einfo
+}
+
+# TODO
+# - dev-python/eventlet and dev-python/gevent appear to be
+#   optional runtime deps but the docs never explicitly mention them.
+#   Is it maybe the case that one of the two is required, but only
+#   if libev is built?
--- a/dev-python/cassandra-driver/metadata.xml
+++ b/dev-python/cassandra-driver/metadata.xml
@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>stasibear@gentoo.org</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
+	<longdescription>
+		A modern, feature-rich and highly-tunable Python
+		client library for Apache Cassandra (1.2+) and
+		DataStax Enterprise (3.1+) using exclusively
+		Cassandra's binary protocol and Cassandra Query
+		Language v3.
+	</longdescription>
+	<use>
+		<flag name="cython">
+			Optimize core modules and build custom extensions
+		</flag>
+		<flag name="libev">
+			libev event loop integration
+		</flag>
+		<flag name="murmur">
+			Faster hashing for token-aware routing
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">datastax/python-driver</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@ -1,4 +1,5 @@
 DIST coloredlogs-1.0.1.tar.gz 13926 SHA256 11067ca91532ba4a316fa53b005152a08b3e015dcb1234d393cfc25af88ebc3e SHA512 098aa22b371ffdb6400fac7d2f000aa73f8956eae71f48ceed2110eb35a4b4d11f814f8cacca643c4deccd82da058a750c700264e7c71c2351514a6f887101a5 WHIRLPOOL 71b447498d5e91a0cda131046f7545230bc0c13aa814f0d79cf8888bd60934dee7c5cc54a729dd36b0a937451f80302384fb0733fd94e43e09c2ce9258c950fd
 DIST coloredlogs-2.0.tar.gz 15486 SHA256 532198042eac7560f5292961bfb6f844343132fda805575684f67deeb780b2c2 SHA512 b42e18b563caef4506377fba754e976fed31b7402d418ca79d1875504986572b36fe90b602afcb952dc8b06b9f7bc7ed6861abc2239ae5b5340e006377f9a14d WHIRLPOOL 6cbec16a204f91a218428c8056e2c39d94aeaedbf3356b2548fa288a386b8583bf639a40f0c40dc596096bf44ccb28acb7c2d66403d19cf72143599ba88a82b5
 DIST coloredlogs-3.1.2.tar.gz 22914 SHA256 ad559e2f2e08eadfb63a210344acf0d00855ba0896fc5662e8d57e1a488e3209 SHA512 872d041f732bb30a0cc3decd5dc677cf58aad300d6cd37fc0a38dcdb24bad2e6640f332ab58e469b07e2a37d6b7fdbfdf6e804431df175c48add00d86a3b5624 WHIRLPOOL 6d9593d8db8eac3ec558581a0772e7264e74e3c4e084c76af58402b2627b3b97689f947ee6eb871bd1fc65c3a2855d66f9f64434b8f612d55b7cefbf3670edf2
+DIST coloredlogs-3.1.3.tar.gz 22911 SHA256 d2195daa0e310bfaaf3dae47e22feaa3ee3631885e2ffc19aa765ad02196bf03 SHA512 81ff3476ee44dae3b08b1849189cfd03f7eb0e3c97414b463aeba1f7c6b3a3539f234dd058a0b05a503c5e5f4490236e8145fcb8bc019abb1888d8f10f542ca9 WHIRLPOOL 78f668fbac2ac9c61aa82a831c1ca2fd36bbb52557677f565b495dc9ce3206f048fd6e3d6493166559f9a7111f97f9466782d7a643675cea9615303d6a9dbc53
 DIST coloredlogs-3.1.tar.gz 22876 SHA256 d3efaaaa1ae85c3a1af335f116f634832691873dd87e5872b94bee1dd0a1e43a SHA512 01ed7841a79278b21fc0588b527803f8092b371c866785949d57f8c04649457fbe34c98ec77d3921f05f224b6d21e1a8fc8f835e4ea542886b948124d9d02bb1 WHIRLPOOL c59cbbd0e773763dcc95c45986385ca518ed9f0c59030d2421af0a4f62c9e3a08586f894e5910000058dc5e3cfb3a2c39c7886ec0673d59c40d1d811755bd109
--- a/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild
+++ b/dev-python/coloredlogs/coloredlogs-3.1.3.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/humanfriendly-1.42[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0-skip-cli-test.patch )
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/d2to1/metadata.xml
+++ b/dev-python/d2to1/metadata.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
@ -9,5 +9,6 @@
 		which will slurp its arguments from the setup.cfg.</longdescription>
 	<upstream>
 		<remote-id type="pypi">d2to1</remote-id>
+		<remote-id type="github">embray/d2to1</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@ -0,0 +1 @@
+DIST dj-database-url-0.3.0.tar.gz 2747 SHA256 f2e273ed34acbb560962d5cf12917936d8df02297df09bd3089b8546d4584138 SHA512 a27fa974edcc0fcfb99f8b74b25324a7afbf70ae4161576ec72733a3b305e170b23677106b85dbc075c5888330d6187ad9e95fbecc41cf7455c26ebf6f3f86e3 WHIRLPOOL 60e0c50f353ea314c6562a05d5a39042e3db15aca4018e8b35646c991a15fda59ed72b213fcbdef303d3eb47a2cff856b1c1d3d80c3e7868bc619794cf0330f3
--- a/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.3.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="https://pypi.python.org/pypi/dj-database-url https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+	"${PYTHON}" test_dj_database_url.py || die
+}
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">kennethreitz/dj-database-url</remote-id>
+    <remote-id type="pypi">dj-database-url</remote-id>
+  </upstream>
+</pkgmetadata>
--- a/dev-python/django-nose/Manifest
+++ b/dev-python/django-nose/Manifest
@ -1,3 +1,4 @@
 DIST django-nose-1.3.tar.gz 25149 SHA256 3667d26a41fec30364a0ef72580832ca5328802d553f6d6e72af5ac21cb36365 SHA512 0e7f18d32340f912fcde96c3ed4ff63caec71ad178f9bd01e61087a228d7e93ecfd87c5d320a66093bce438561638daacd586a4ecb3198573b28607d33eb853f WHIRLPOOL 0acbbe147c0e434ef641843d10f9781ef26f3dc428ba8e613165ed43d6f5d1dea27bf513d9efcbd551c38c7a1945ae3b06aafb0a6d01c8714479f0c4836f1863
 DIST django-nose-1.4.1.tar.gz 26792 SHA256 224dd1bfd8fcdb9f67256c5430147b4c0105d72f6ac8ce3bca6b486449ec6062 SHA512 9ba42767bdfb0c359d9c693c5a7775767ba1a56c54531e75ff2b97e2e12d2a9f535c771c5b076b9024f3662a4143f115aa4bd84b9844ce8cb71f99c47722dcef WHIRLPOOL 49c285867adcbf0b17a388bfd6c8cd2603d8c7b50ec162b088409c1a049e43718f9bc37167d914327d474f6177fb38e01797a80f0c47bc02fd7db31cbe7e8761
+DIST django-nose-1.4.2.tar.gz 44842 SHA256 736ae53e3ec47dbbb3049999c18ce54585af299ef88172d9a27cb5fda29daa00 SHA512 b29ac1e9b10b8316c851857498c4cea7e76f91da87583d83591d28348622be9aba19cde6067185a4870274c349857654ef4debde29fdd91974eb539cd5c7a281 WHIRLPOOL 03b6bbd16b079a1f9042d4b57af7f59f669798403927a619ab658f7c16001cf586dd3d661eb4efbff94ae7870007fcadfc852fb93fc09e3bd400f29acd5f6cb9
 DIST django-nose-1.4.tar.gz 26477 SHA256 26cef3c6f62df2eee955a25195de6f793881317c0f5fd1a1c6f9e22f351a9313 SHA512 2df1377146304bc0356e24a212bee8ee55c05ccaafcd6fceca4afe5ae528335192c4a89c842f4c2df6965965c9536f0862903aff2141139cfc83695b41d56e32 WHIRLPOOL 7da21678b2b955972f14dc806aac7c5615048b5edae96bdcc17ee4d1302d714519a223356398f89b0d512aa3aa6979567682dd81b8bb6c99cd7cdd340fa66293
--- a/dev-python/django-nose/django-nose-1.4.2.ebuild
+++ b/dev-python/django-nose/django-nose-1.4.2.ebuild
@ -0,0 +1,31 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Django test runner that uses nose"
+HOMEPAGE="https://github.com/jbalogh/django-nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+#RESTRICT="test"  # The testsuite currently broken See notes below
+
+RDEPEND="
+	>=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+	dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	./runtests.sh --verbose || die
+}
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et_xmlfile/metadata.xml
@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
+  <upstream>
+    <remote-id type="bitbucket">openpyxl/et_xmlfile</remote-id>
+    <remote-id type="pypi">et_xmlfile</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@ -1,2 +1,3 @@
 DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
 DIST Mako-1.0.2.tar.gz 564592 SHA256 2550c2e4528820db68cbcbe668add5c71ab7fa332b7eada7919044bf8697679e SHA512 d297f9050049ac37612b10d61d3f1bb2cb7f6e238e7afdce092ba95d6117e064b4dfebaa3219093d88f75c6ef691fe3a0aaebd4188a5ba571867d3a3dfe986bc WHIRLPOOL 63f1b0a094dcbd5ab9fb86ba56764ad517b60c24d58b7e51b5220d2df4426e47d0c65d0409f9f7c499c7eaa0747b5bac06326718574038c2276b4b52147274fe
+DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Caching support" dev-python/beaker
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
@ -7,5 +7,6 @@
  </use>
  <upstream>
    <remote-id type="pypi">Markdown</remote-id>
+    <remote-id type="github">waylan/Python-Markdown</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@ -1,3 +1,3 @@
 DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae
 DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7
-DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82
+DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700
--- a/dev-python/pypax/pypax-0.9.2.ebuild
+++ b/dev-python/pypax/pypax-0.9.2.ebuild
--- a/dev-python/pytidylib/metadata.xml
+++ b/dev-python/pytidylib/metadata.xml
@ -1,5 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <herd>python</herd>
+  <upstream>
+    <remote-id type="github">countergram/pytidylib</remote-id>
+    <remote-id type="pypi">pytidylib</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/pyxdg/files/pyxdg-subprocess.patch
+++ b/dev-python/pyxdg/files/pyxdg-subprocess.patch
@ -1,38 +0,0 @@
-#Patch sent to upstream on March 1st, 2009
-#Jesus Rivero (Neurogeek)
-#Replaced deprecated os.popen3 for subprocess
-
-diff -uNr xdg.orig/Menu.py xdg/Menu.py
--- xdg.orig/Menu.py	2009-03-01 04:34:38.000000000 -0430
-+++ xdg/Menu.py	2009-03-01 04:41:27.000000000 -0430
-@@ -12,6 +12,7 @@
- 
- import xdg.Locale
- import xdg.Config
-+from subprocess import Popen, PIPE
- 
- ELEMENT_NODE = xml.dom.Node.ELEMENT_NODE
- 
-@@ -841,13 +842,16 @@
-         return m
- 
- def __parseKDELegacyDirs(filename, parent):
-    f=os.popen3("kde-config --path apps")
-    output = f[1].readlines()
-     try:
-        for dir in output[0].split(":"):
-            __parseLegacyDir(dir,"kde", filename, parent)
-    except IndexError:
-        pass
-+        f=Popen("kde-config --path apps", shell=True, stdout=PIPE).stdout
-+        output = f.readlines()
-+        try:
-+            for dir in output[0].split(":"):
-+                __parseLegacyDir(dir,"kde", filename, parent)
-+        except IndexError:
-+            pass
-+    except:
-+        raise Exception, "kde-config failed"
- 
- # remove duplicate entries from a list
- def __removeDuplicates(list):
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
+  <upstream>
+    <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
+    <bugs-to>https://bugs.freedesktop.org/</bugs-to>
+    <remote-id type="pypi">pyxdg</remote-id>
+    <remote-id type="launchpad">pyxdg</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@ -1,2 +1,3 @@
 DIST simplejson-3.7.2.tar.gz 74877 SHA256 8358ecc05541be4068109acf26a4ae89ba14450d20e92e0973d0d67bea3d7431 SHA512 5e2874c4d627035b3e205b5208b46beb172ac934742b0cb68f43f70aa2f401ec568c2b69fccdb1d870bf5196df0f6e37b790332a6e4d7969a296c8c104bdfe0b WHIRLPOOL 26f5e23250031d9b20b121a7110a1b623f32128721281b2554f2727f815b03b39b0680d21b41bb8729288f2774d38e92301bcf72188d054aa03497818edefdca
 DIST simplejson-3.8.0.tar.gz 75875 SHA256 217e4797da3a9a4a9fbe6722e0db98070b8443a88212d7acdbd241a7668141d9 SHA512 c985a0f56170f78b6c6e8f0e4b4bf50f258c8f2639524f5b14d8e07b547e336acf96ac55cf562243fff06752ceba4a05f1e6dd43f6c918159a7b3640af0f0c1d WHIRLPOOL 368779f57bc1186d3b30ae80f74d0eca50709dfe6063d52c359d665eaacc9caa751fbbb9f4437e8bf8908f3569f85424632208d8f7c6146ebc8e8cc9c77b723d
+DIST simplejson-3.8.1.tar.gz 76033 SHA256 428ac8f3219c78fb04ce05895d5dff9bd813c05a9a7922c53dc879cd32a12493 SHA512 9c135347a015f5fbb4373da61282230430320c89bc1114f7487eb632bccbe29a4b2c396d724c6c72af5c7df78f1676869a037be9d137b4f29f18e82a9eb2b1f5 WHIRLPOOL 8441ccaff4e4115d58461f528179c4fc25139b5f7f86cc85826798e392e664154468f1fa2471f18fc7bd518adf06a75b493218765ca4df022d92e6ee24552e38
--- a/dev-python/simplejson/simplejson-3.8.1.ebuild
+++ b/dev-python/simplejson/simplejson-3.8.1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="http://undefined.org/python/#simplejson https://pypi.python.org/pypi/simplejson"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( README.rst CHANGES.txt )
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	esetup.py test
+}
--- a/dev-ros/robot_state_publisher/Manifest
+++ b/dev-ros/robot_state_publisher/Manifest
@ -1 +1,2 @@
 DIST robot_state_publisher-1.10.4.tar.gz 22728 SHA256 3d3ef47bb0a1f3d0540bd9b00ae22d736ffa5e445600929fc311bbec4c98978c SHA512 71690ee2a9ee666a86fd6083d9ca4e3f1b5ddd8bc0a33af5e3f745a828c0afcdc16d82a26f7524fb65dd6a2871b68287260fb147fe87ca538ed265b36763d851 WHIRLPOOL d26f94ab973aede595a79fa60f55f83c9fc0642dff8bd6ffaf9381de251f40aca76b88393d26bcbf4628ec9615fc5f258ad95aa3a897033a06f747cbdc76941c
+DIST robot_state_publisher-1.12.0.tar.gz 23259 SHA256 97c2ca34359976c2c4d4a98229ac451d0cea9856a0b67f051508e84886af5809 SHA512 1d2fb58c60849033d2ca479624a2fb14eacf9fcfe555193e8205be0138bdb046e50ac482005fd3c747cd41f86068363cf6f3634980df9851de6c4c80ec7600db WHIRLPOOL 063f95ac4d31bc6ff00178ecd47d7de99bb155f5eb72445bb850bfdaea78ee184dc2d333840af30e7a4084a394aabe5daaed56ae5da809fc50e9c7a75ae1c186
--- a/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-1.12.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_state_publisher"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Package for publishing the state of a robot to tf"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/kdl_parser
+	dev-cpp/eigen:3
+	sci-libs/orocos_kdl
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/rostime
+	dev-ros/tf2_ros
+	dev-ros/tf2_kdl
+	dev-ros/kdl_conversions
+	dev-ros/sensor_msgs
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
+++ b/dev-ros/robot_state_publisher/robot_state_publisher-9999.ebuild
@ -20,8 +20,8 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rosconsole
 	dev-ros/rostime
-	dev-ros/tf
-	dev-ros/tf_conversions
+	dev-ros/tf2_ros
+	dev-ros/tf2_kdl
 	dev-ros/kdl_conversions
 	dev-ros/sensor_msgs
 "
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@ -5,4 +5,7 @@
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">alexdalitz/dnsruby</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@ -1,4 +1,2 @@
-DIST jwt-1.2.1.gem 9216 SHA256 b0cfc9e85b2f851aa49931a4c07156127888fbf003e7ef971d4d6c2e91f98661 SHA512 d9d53b2b7766c9315de9dad3b63f85bbbbc2c8d980098ae5c570ba4890f87dfa1aad21132580210bc622e78172f5ed6fea0a8de4049cc5da5e910620abdfa4a6 WHIRLPOOL f63f18cb18d30b57b8549a5367b0319ad7dc9c8a58e34ba3022662dad6951b9cdbe26da14df6c133c68b2b2df2f75614fb5e2e984e5e9869a28ea2363b78cfc5
-DIST jwt-1.4.1.gem 10752 SHA256 9c29b4b45e805a351e124f32a5c54b20653badf10065b6d410de084668493d0d SHA512 d05a9f08cab8b232d8d11fa97f85ee0b6a261d55a2c3c27f4592e8a649c5986e2cf30e98438112154e9ab59a6d3b9daf2d914f18d6fd39b8ca640d396b9626bf WHIRLPOOL 7d2325f88930c723d3f82c16be15d9408bcfc37fae0e861961c96a3df2dac78b86943b59cd17e81afeb484c7d769e2e3cde14b010f7e954f04b917852eb21677
-DIST jwt-1.5.0.gem 11264 SHA256 0bd816489c49052070c9be711cb01c4181f213308d41d5d4bb220bc16041e500 SHA512 fbaf8cae0e388eea9777e539b41f8b53ac4be67a6cbb3ec5a20864360f24da2d8d401c1f7e9b4b7c236767bc692538a3e3fbcbe1bfc0d96536ea1a24904f561b WHIRLPOOL 2de9601a077fc054ebfb6afbb81be805a44e0b9641a014357e0c9a55eca9b134c53eb884d7fa17cc09cd2a05a1f1f0319a5af7a6ace323198b11fd8b24814558
 DIST jwt-1.5.1.gem 12288 SHA256 d3d39adde503148c2f35eb37d4b0ef3da85fc0b295ee339b59b6d76c2763658d SHA512 a0ea17ce11046041316a9dcad63bf5af3b501d257716398cd23b50ea72ecb04f82670552246f71e9731a2a92429f7652d0ad5944ea97e4a9a6e98f612fecbf0e WHIRLPOOL b845fed75bb5403d721cb5b60cb097942988187e620314a79bc011855e767499b1a53a6df354c36d1901a857c70e48a756dd13f4f5491b5a9a2618e9ca8f0660
+DIST jwt-1.5.2.tar.gz 21131 SHA256 6e628b77e541929f13118344e57511ca9dc08de7dcaf0dc0b6dc5dd3793faeb5 SHA512 9b56bf1fad65318f4c6a6d3bb09bad2ac2661704e4d0ae01eaac5b71bf0486abba573536afa1fa0f00b2b68ea445350f723ac5b73319b238c4d69f10b21d0773 WHIRLPOOL 87a9881eef08b15fdf1295543d332465280d56340d371b021c16663f2d6788944638bf4c9560f3d2f4b6982a105986d59824c0491c64ad40120e52ce252d1b88
--- a/dev-ruby/jwt/jwt-1.2.1.ebuild
+++ b/dev-ruby/jwt/jwt-1.2.1.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
--- a/dev-ruby/jwt/jwt-1.5.0.ebuild
+++ b/dev-ruby/jwt/jwt-1.5.0.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
--- a/dev-ruby/jwt/jwt-1.5.2.ebuild
+++ b/dev-ruby/jwt/jwt-1.5.2.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_RECIPE_TEST="rspec3"

@ -12,9 +12,19 @@ RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 inherit ruby-fakegem

 DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
-HOMEPAGE="https://github.com/progrium/ruby-jwt"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
+
+RUBY_S="ruby-jwt-${P}"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.configure/,/^end/ s:^:#:' \
+		-e '/codeclimate/I s:^:#:' \
+		spec/spec_helper.rb || die
+}
--- a/dev-ruby/jwt/metadata.xml
+++ b/dev-ruby/jwt/metadata.xml
@ -3,6 +3,6 @@
 <pkgmetadata>
  <herd>ruby</herd>
  <upstream>
-    <remote-id type="github">progrium/ruby-jwt</remote-id>
+    <remote-id type="github">jwt/ruby-jwt</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@ -1,4 +1,2 @@
-DIST rspectacular-0.61.0.gem 14336 SHA256 fffd8099063f110244314aa87e20058899d8dca15378eb4de21f740c2c0c4f82 SHA512 bdabc855ea9bb0cdcb222de47773be6d9ea2d9208bef416e3ab24195a16fc59b2d1af045b9c59851f87dd3ce7cc0ffe479d9ac5e07f4b5418c530dd3a8f7c922 WHIRLPOOL 0b3d98b3ec2991ce70d0a8d50f769f1715353fb9760ae1a7b23e7f53f7793b6bf702e640eaf95f36b9cb9647570d6c44cac634129dadd21dab6b0954728a19b6
-DIST rspectacular-0.62.1.gem 15360 SHA256 2a5e394b96f56ad5f96dbd491666ea96d3ec542815cf3fc6b206bb14141508ca SHA512 60579982d6551b355648237acb0eeb962bf61afe11049fd25e86dc9305612896453edb139ea73e42af0149aa80b39b04ea8698b016bbafb6e197e6a0315da0ba WHIRLPOOL 7766e6e67fbdd757046640d92faaf862241e0d4e4d66146eb1797a0f134b9db423f92baa8b69d5aa35ac8b000f23e56c6ecb833506182f081ccbc19c31be25b6
-DIST rspectacular-0.63.0.gem 15360 SHA256 2bd2ffda1727f789815fdc8bc3e6833de0b13d050eee09e1e82218fd20cdb51d SHA512 9e41f8b94542f7f82554b6473452ce23c81f15994f0b260dc7def3ada7bbbab2e4e65be57c42db6df04bb8dd98efd4ba40cf9c866814aa6812a6485d8d7c623f WHIRLPOOL 09463a228625d75949ffc909142d35d2d5e95e610e3949828426cb0acd3da981732e5e1c2dfcb7cb12dfc17302cb13cf12473aefac9c41a3f9b6fa367d2d2387
 DIST rspectacular-0.64.0.gem 15360 SHA256 280a50e4dc11198ccd68873ddd365c460ebbd3335e96ed842f331d731bb74412 SHA512 7fdd7d7c339d368a80dc8c1b200d627dc74a1467d540ee5fbd7652b36af15057491f89721387e9138b1c3f48fcc5938204cebb0bcc51e10bf90a8c2ff9094732 WHIRLPOOL 84aecdb41e62a71de39b3f9820b1a4c53a1e56f8dadb6a23b4b193d056ec7f51fe25bf53f2c4d38b622c89721cb0a49cb98da0acd38145968df16c9351b9228e
+DIST rspectacular-0.68.0.gem 15872 SHA256 b0432a85d318a6875e7552c500a768e978a86a2ff55846b84299e9458e3a5b1b SHA512 c77e90f5e6cc1c7191bc69d8a118ece6287350502850320976ba2f00feead68533cb31253d3c1370a36507f9dfc316edea87f3e5479f35d614794458419ec2f3 WHIRLPOOL 4913729de3161ded3d683a9f8615abab01f93a527d1db9e6c764cff2610ca5c2558ef3ede4a06555c049279df50c147e4912c1175100ad733797109c33b3236d
--- a/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.61.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
--- a/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.62.1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2"
--- a/dev-ruby/rspectacular/rspectacular-0.68.0.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.68.0.ebuild
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@ -1,2 +1,2 @@
-DIST ruby-filemagic-0.6.3.gem 216064 SHA256 f9e89cbbeeb69ec4b3181d16cd3efc900b0f1c561b57c6e7a04423501d25d87f SHA512 9d52360805d5ef389293e75cbd205be3f93fc4e2158ff07b653e308262b5c63bd067eea58a86e1e69546e424b037ca11e66bca9feebe04fc33d435d4e49f69b8 WHIRLPOOL d6f4f27fce72f4c6eef3f6852586f37d01ad39d42332790f01d67b031c8fe8c43a39b7b2d2fae03c57ef77fafc996004c2791f9295903c1751fb05ae44ced38f
 DIST ruby-filemagic-0.7.0.gem 229376 SHA256 e28af7f49955d800c3dfd1a2335c5c1aa9f380e57eda16050250e4345ad0e460 SHA512 ba257ac7ae58e664d0a45c319c9159650a267144941fdf558f2bd7aa442133f8303637153ab1eb89611c8709303afebbab42f1c3674cca89d15f5037c9bc9d43 WHIRLPOOL 8f64cdea5c7ec028e2d9bf116700e34cda12264946ae847ae5cbd014bd0518368788c6769c49c09775f7cdb3f647a6391cfffc4af29b139be4637a34ad4296eb
+DIST ruby-filemagic-0.7.1.gem 229376 SHA256 811de93cdc7d13dbd84d5fd3a35d699092e71a768af366637951ca109cbc7eed SHA512 9a05699fd299c20a52443d4a0213761229fa600157731712c8322e25e18cfc1f467075b8cb5e8c1790caeae9778e83cae83bb1c63475ea220a9b2d9ed896cd46 WHIRLPOOL 82d41b0264f16a2acc402ea297bc6db5ab489bdcc9a50933e916b26bf6103f483220e485ff0b102ed4b33a55898dd874a87be630884b847019d51c12ee208c41
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild
+++ b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.1.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"

 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
@ -13,7 +13,7 @@ RUBY_FAKEGEM_TASK_TEST=""
 inherit multilib ruby-fakegem

 DESCRIPTION="Ruby binding to libmagic"
-HOMEPAGE="http://ruby-filemagic.rubyforge.org/"
+HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"

 LICENSE="Ruby"
 SLOT="0"
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@ -1,3 +1,2 @@
 DIST net-ldap-0.11.gem 87040 SHA256 fc5487b0c81cbf2beaede0e6c07af036559deb4ab6df185f61ac16562949d8f5 SHA512 8894fac34df186f03b879e707504ce8952030d38d88e902c8a98f195503765f7780771f26775606ff84a7940cd3b1a8193e028f85d05130940d583c222b4cc1f WHIRLPOOL 67d40f4ca3cb640aeb4a315ab2df44256357a6528c9fa3c69be20e1c2a26f1672c7a2c15afb5111f731dd8f0613000b1f6a9c2624230b62ebd67f64dab6f8ce0
-DIST net-ldap-0.7.0.gem 70656 SHA256 d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4 SHA512 71000b05bcf7db8a3c40f6311e16385f2569df12c5b193c454dc2ebd043af0183d650626d8805c0e58e59aa842091da1fba37e35cdb58789279ef5b93ad13e7f WHIRLPOOL 6fbbe9a6ffe1832db61d2eb5cacba4675be9cf9bb7dc9d7102e3c04f244dc7572e2a19d96c62b5e6c77b64467d6efe0e76ad9fcc74837b2404387f2ea8c5ea94
-DIST net-ldap-0.8.0.gem 72704 SHA256 e1b7f21b58a4c2ff6f2c3361f584342017f46d4a965f377f192b4cd8855b0242 SHA512 3083a9bb61a048213d524d9795ac61b38d07abd4788b5504b9d642062f9fcf947120c98e10a76d8e3be0dc91b680bae50b056bd9fcd75cdb4a1af2e907953cf9 WHIRLPOOL e6767bc2985faa6262743d9a6273abe2d693c4d12b21fb5dcc256a49634b059fc2bf831a21ce37128158ff18045e8630790eea2bbda8106dca262b392533ddfa
+DIST net-ldap-0.12.0.gem 89600 SHA256 cfac33a3b76dd03938f272fefcdbfdc20e0ad419c4b79b6e9d8edb6c003b8a04 SHA512 7ccda246c983a290b2b26ee5117526332c93750f44dae7ba9eb1f193f8953557b20cf3268912aa4f33f93199e3dfc27bdde4f465a63f145fd74d91e42bfa18c1 WHIRLPOOL 0456ef77866338faf1f5369ed04ed195e5487eb5c522b73ff9406c9df9de36ac82238c036a1108885fc7687a7673cdea6e28e8ff963b93934070c0ca7dfee036
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.12.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_TEST="test spec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_NAME="net-ldap"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure ruby LDAP client implementation"
+HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.7.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# jruby: requires ruby 1.9 compatibility
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0
-	>=dev-ruby/metaid-1
-	dev-ruby/test-unit:2
-	dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/common.rb || die
-
-	# Avoid an integration spec that hangs due to setting up pipes and
-	# intercepting openssl connect calls.
-	rm spec/integration/ssl_ber_spec.rb || die
-}
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.8.0.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# jruby: requires ruby 1.9 compatibility
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0
-	>=dev-ruby/metaid-1
-	dev-ruby/test-unit:2
-	dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "test-unit"' test/common.rb || die
-
-	# Fix Specs until RSpec:3 is in tree
-	sed -i -e 's/truthy/true/' spec/unit/ldap_spec.rb || die
-	# Avoid an integration spec that hangs due to setting up pipes and
-	# intercepting openssl connect calls.
-	rm spec/integration/ssl_ber_spec.rb || die
-}
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@ -1 +1,2 @@
 DIST RBTools-0.7.4.tar.gz 158594 SHA256 1626d449eae9d03a8e3e5c0125f77a86eefdc615b86ba7ee1368b238521de198 SHA512 c12d254f1eeb7a8d06a1ab7cbb952f45975da355b436a7514cf9fa0c3fe60b713daa79874c8cf7df05b13acb22441cf6ae06e442b238b5481a01cdaf15f6c5c9 WHIRLPOOL b6116eb6445994dadb3c6003e8fdecf60d9fa17257988c9822b69c5cf19ae369e31c9a07315c14e27cdce35697f0eef16207306f0e6a5ec8fa47a9d0aa66680b
+DIST RBTools-0.7.5.tar.gz 160657 SHA256 4f252a3d5ad4a2d25883b9adf0c6ee17ef56146bd9c0586e0aa2a2790748c069 SHA512 f5c795929d8fb09b3f39c18e747096d56205c6fbf73e4a04a5898b5adc058d092e41f835ba6cea8b4b94bc5747cbbdf988131ad66e637cc77e0d59a4509786ef WHIRLPOOL ee414239c9289b1ac17b6fa6e63fcb42c058bde9cd3bb69a8d13e5c038c77a942de48d63091c5e8b499dc47e62f5b469d22ebbba66050138b35c355c02d98d89
--- a/dev-util/rbtools/rbtools-0.7.5.ebuild
+++ b/dev-util/rbtools/rbtools-0.7.5.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PN="RBTools"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command line tools for use with Review Board"
+HOMEPAGE="http://www.reviewboard.org/"
+SRC_URI="http://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+S=${WORKDIR}/${MY_P}
--- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
@ -0,0 +1,118 @@
+--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:24.591876404 +0100
+++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:35.345993247 +0100
+@@ -859,7 +859,7 @@
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+ {	int byte;
+ 	int count;
+ 	int i;
+@@ -870,12 +870,14 @@
+ 	U32 u;
+ 
+ 	unsigned char* q;
+	unsigned char* end;
+ 
+ 	for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0;
+ 
+ 	byte = 0;
+ 	x = 0;
+ 	q = pixels;
+	end = pixels + bmp->width * bmp->height;
+ 
+ 	for (y = 0; y < bmp->height; )
+ 	{	count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@
+ 		{	/* Encoded mode. */
+ 			byte = ReadBlobByte (src);
+ 			for (i = 0; i < count; i++)
+-			{	if (compression == 1)
+			{	
+				if (q == end)
+					return 0;
+			 	if (compression == 1)
+ 				{	(*(q++)) = (unsigned char) byte;
+ 				}
+ 				else
+@@ -896,13 +901,15 @@
+ 		else
+ 		{	/* Escape mode. */
+ 			count = ReadBlobByte (src);
+-			if (count == 0x01) return;
+			if (count == 0x01) return 1;
+ 			switch (count)
+ 			{
+ 			case 0x00:
+ 			 {	/* End of line. */
+ 				x = 0;
+ 				y++;
+				if (y >= bmp->height)
+					return 0;
+ 				q = pixels + y * bmp->width;
+ 				break;
+ 			 }
+@@ -910,13 +917,20 @@
+ 			 {	/* Delta mode. */
+ 				x += ReadBlobByte (src);
+ 				y += ReadBlobByte (src);
+				if (y >= bmp->height)
+					return 0;
+				if (x >= bmp->width)
+					return 0;
+ 				q = pixels + y * bmp->width + x;
+ 				break;
+ 			 }
+ 			default:
+ 			 {	/* Absolute mode. */
+ 				for (i = 0; i < count; i++)
+-				{	if (compression == 1)
+				{
+					if (q == end)
+						return 0;
+					if (compression == 1)
+ 					{	(*(q++)) = ReadBlobByte (src);
+ 					}
+ 					else
+@@ -943,7 +957,7 @@
+ 	byte = ReadBlobByte (src);  /* end of line */
+ 	byte = ReadBlobByte (src);
+ 
+-	return;
+	return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@
+ 		}
+ 	}
+ 	else
+-	{	/* Convert run-length encoded raster pixels. */
+-		DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
+	{
+		if (bmp_info.bits_per_pixel == 8)	/* Convert run-length encoded raster pixels. */
+		{
+			if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image))
+			{	WMF_ERROR (API,"corrupt bmp");
+				API->err = wmf_E_BadFormat;
+			}
+		}
+		else
+		{	WMF_ERROR (API,"Unexpected pixel depth");
+			API->err = wmf_E_BadFormat;
+		}
+ 	}
+ 
+ 	if (ERR (API))
+--- libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:24.590876393 +0100
+++ libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:35.345993247 +0100
+@@ -48,7 +48,7 @@
+ static unsigned short ReadBlobLSBShort (BMPSource*);
+ static unsigned long  ReadBlobLSBLong (BMPSource*);
+ static long           TellBlob (BMPSource*);
+-static void           DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+static int            DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+ static void           ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*);
+ static int            ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int);
+ static void           SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int);
--- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
@ -0,0 +1,56 @@
+--- libwmf-0.2.8.4/src/player/meta.h
+++ libwmf-0.2.8.4/src/player/meta.h
+@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
+	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
--- a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
@ -0,0 +1,23 @@
+--- libwmf-0.2.8.4/src/player/meta.h
+++ libwmf-0.2.8.4/src/player/meta.h
+@@ -2585,6 +2585,8 @@
+ 			polyrect.BR[i] = clip->rects[i].BR;
+ 		}
+ 
+		if (FR->region_clip) FR->region_clip (API,&polyrect);
+
+ 		wmf_free (API,polyrect.TL);
+ 		wmf_free (API,polyrect.BR);
+ 	}
+@@ -2593,9 +2595,10 @@
+ 		polyrect.BR = 0;
+ 
+ 		polyrect.count = 0;
+	
+		if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 	}
+ 
+-	if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 
+ 	return (changed);
+ }
--- a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome2-utils
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="X debug doc expat xml"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	media-libs/freetype:2=
+	>=media-libs/libpng-1.4:0=
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg:0=
+	xml? (
+		expat? ( dev-libs/expat )
+		!expat? (  dev-libs/libxml2 )
+	)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+REQUIRED_USE="expat? ( xml )"
+
+DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-intoverflow.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-pngfix.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-use-system-fonts.patch
+	"${FILESDIR}"/${P}-gdk-pixbuf.patch
+	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
+	"${FILESDIR}"/${P}-CVE-2015-4695.patch
+	"${FILESDIR}"/${P}-CVE-2015-4696.patch
+	)
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
+
+src_prepare() {
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am || die
+	fi
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	if use expat; then
+		myeconfargs+=( --without-libxml2 )
+	else
+		myeconfargs+=( $(use_with xml libxml2) )
+	fi
+
+	myeconfargs+=(
+		--disable-static
+		$(use_enable debug)
+		$(use_with X x)
+		$(use_with expat)
+		--disable-gd
+		--with-sys-gd
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+	autotools-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	gnome2_gdk_pixbuf_update
+}
--- a/media-sound/mpd/mpd-0.19.10.ebuild
+++ b/media-sound/mpd/mpd-0.19.10.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@ -2,6 +2,7 @@ DIST mythtv-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 179540 SHA256
 DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb
 DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec
 DIST mythtv-0.27.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820
+DIST mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz 28096 SHA256 f51bd541cccb0f5b5f20441774d9ee5e10c7a44abba5e6b9795d3c5ce21d0bf0 SHA512 585bcfa6c3fc4ecc384665b40e50362ecd083f2fa22ce9adea8167d4e38a7cbfc7519eee3813f76d7327d093c29d5ca97d9026eb5d180ff4cb7d9af91d7bc428 WHIRLPOOL d2ca6b3c7a6ecc94c4a21dee6a7ad38bdd72b880c00df1e8ac529382cd0aa7618ddfa2b5ba9721a2b99f828c9eaa6ca8ce1b1ac5e23bfff85c28327dfb862884
 DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961
 DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
--- a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://www.exit1.org/dvdrip/dist/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid"
+
+DEPEND=">=dev-perl/Event-ExecFlow-0.64
+	>=dev-perl/Event-RPC-0.89
+	dev-perl/gtk2-perl
+	>=dev-perl/gtk2-ex-formfactory-0.65
+	>=dev-perl/libintl-perl-1.16
+	|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
+	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
+	>=virtual/perl-podlators-2.5.3
+"
+RDEPEND="${DEPEND}
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:2
+	ffmpeg? (
+		libav? ( media-video/libav )
+		!libav? ( media-video/ffmpeg:0 )
+	)
+	fping? ( >=net-analyzer/fping-2.2 )
+	mplayer? ( media-video/mplayer )
+	ogg? ( media-sound/ogmtools )
+	subtitles? ( media-video/subtitleripper )
+	vcd? (
+		media-video/transcode[mjpeg]
+		>=media-video/mjpegtools-1.6.0
+	)
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( media-video/xine-ui )
+	xvid? ( media-video/xvid4conf )
+	>=media-video/lsdvd-0.15
+"
+
+pkg_setup() {
+	filter-flags -ftracer
+	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
+
+	perl_set_version
+}
+
+src_prepare() {
+	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
+	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
+	# Fix default device for >=udev-180 wrt #224559
+	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
+
+	# Ubuntu patch for supporting libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
+
+src_install() {
+	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+	make_desktop_entry dvdrip dvd::rip
+
+	mydoc="Changes* Credits README TODO" perl-module_src_install
+}
+
+pkg_postinst() {
+	# bug 173924
+	if use fping; then
+		ewarn "For dvdrip-master to work correctly with cluster mode,"
+		ewarn "the fping binary must be setuid."
+		ewarn ""
+		ewarn "Run this command to fix it:"
+		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+		ewarn ""
+		ewarn "Note that this is a security risk when enabled."
+	fi
+}
--- a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
@ -0,0 +1,29 @@
+Description: Port from ffmpeg to avconv.
+Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
+
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm
+++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
+@@ -114,10 +114,10 @@ my %TOOLS = (
+     },
+     ffmpeg => {
+         order       => ++$ORDER,
+-        command     => "ffmpeg",
+        command     => "avconv",
+         comment     => __ "FFmpeg video converter command line program",
+         optional    => 1,
+-        version_cmd => "ffmpeg -version",
+        version_cmd => "avconv -version",
+         get_version => sub {
+             my ($cmd) = @_;
+             qx[$cmd 2>&1] =~ /version ([^\s]+)/i;
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm
+++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm
+@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command {
+         . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} "
+         . "-M 0 -d 0 -P /dev/null | "
+         . "tcextract -t vob -a 0 -x mpeg2 -d 0 | "
+-        . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
+        . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
+ 
+     $command .= " && "
+         . "execflow convert"
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@ -315,7 +315,7 @@ multilib_src_configure() {
 		if use aac || use amrenc ; then
 			myconf+=( --enable-version3 )
 		fi
-		if use aacplus || use faac ; then
+		if use aacplus || use faac || use nvenc ; then
 			myconf+=( --enable-nonfree )
 		fi
 	else
--- a/media-video/videotrans/files/videotrans-1.6.1-libav.patch
+++ b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
@ -0,0 +1,52 @@
+Description: Migrate from ffmpeg to avconv.
+Author: Alessio Treglia <alessio@debian.org>
+---
+ data/library.sh.in  |    8 ++++----
+ src/movie-title.in  |    2 +-
+ src/movie-to-dvd.in |    2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+--- videotrans.orig/data/library.sh.in
+++ videotrans/data/library.sh.in
+@@ -250,15 +250,15 @@ audio_params()
+ 	then
+ 		if [ "${force_or_auto}" = "ac3" ]
+ 		then
+-			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
+			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
+ 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			elif [ "${new_ch}" = "2" ]
+ 			then
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			else
+-				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
+ 			fi
+ 			audio_ext="ac3"
+ 		else
+--- videotrans.orig/src/movie-title.in
+++ videotrans/src/movie-title.in
+@@ -961,7 +961,7 @@ else
+ 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
+ 		mplayer_pid="$!"
+ 
+-		# Start mp2enc or ffmpeg to encode the audio
+		# Start mp2enc or avconv to encode the audio
+ 
+ 		{
+ 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
+--- videotrans.orig/src/movie-to-dvd.in
+++ videotrans/src/movie-to-dvd.in
+@@ -698,7 +698,7 @@ do
+ 	} > "${TEMP}.video" 2>&1 &
+ 	video_enc_pid="$!"
+ 
+-	# Start mp2enc or ffmpeg to encode the audio
+	# Start mp2enc or avconv to encode the audio
+ 
+ 	{
+ 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
--- a/media-video/videotrans/videotrans-1.6.1-r1.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r1.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A package to convert movies to DVD format and to build DVDs with"
+HOMEPAGE="http://videotrans.sourceforge.net/"
+SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libav"
+
+DEPEND="
+	media-video/mplayer
+	media-video/mjpegtools[png]
+	media-video/dvdauthor
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	libav? ( media-video/libav )
+	!libav? ( media-video/ffmpeg:0 )
+"
+
+RDEPEND="${DEPEND}
+	www-client/lynx
+	app-shells/bash
+	sys-devel/bc
+"
+
+DOCS="aspects.txt CHANGES THANKS TODO"
+
+src_prepare() {
+	# fixing LDFLAGS usage
+	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
+
+	# Debian patch to support libav
+	use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
--- a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
+++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
@ -0,0 +1,15 @@
+https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd
+--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
+@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
+     {
+         for( i_index = 0; ; i_index++ )
+         {
+            if ( MP4_Box_Function[i_index].i_parent &&
+                 p_box->p_father &&
+                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
+                continue;
+
+             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
+                 ( MP4_Box_Function[i_index].i_type == 0 ) )
+             {
--- a/media-video/vlc/vlc-2.2.1-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@ -250,6 +250,7 @@ src_prepare() {
 	# We are not in a real git checkout due to the absence of a .git directory.
 	touch src/revision.txt || die

+	# PATCHES
 	# Fix build system mistake.
 	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch

@ -271,6 +272,8 @@ src_prepare() {
 	# Add missed header imgproc_c.h, imgproc.hpp, bug #554562
 	epatch "${FILESDIR}"/opencv-3.0.0.patch

+	epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch
+
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 27 Oct 2015 16:11:24 +0000
+Wed, 28 Oct 2015 11:41:25 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 27 Oct 2015 16:11:24 +0000
+Wed, 28 Oct 2015 11:41:25 +0000
--- a/metadata/md5-cache/app-admin/drush-5.8
+++ b/metadata/md5-cache/app-admin/drush-5.8
@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/php[cli,ctype,simplexml] dev-php/pear dev-php/PEAR-Console_Table dev-php/PEAR-Console_Getopt
-DESCRIPTION=Drush is a command line shell and scripting interface for Drupal
-EAPI=4
-HOMEPAGE=http://drupal.org/project/drush
-IUSE=+examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,ctype,simplexml] dev-php/pear dev-php/PEAR-Console_Table dev-php/PEAR-Console_Getopt
-SLOT=0
-SRC_URI=http://ftp.drupal.org/files/projects/drush-7.x-5.8.tar.gz -> drush-5.8.tar.gz
-_eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=2881bf3f384c5a716e74577fdbe83359
--- a/metadata/md5-cache/app-admin/drush-6.6.0
+++ b/metadata/md5-cache/app-admin/drush-6.6.0
@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Command line shell and scripting interface for Drupal
+EAPI=5
+HOMEPAGE=https://github.com/drush-ops/drush
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[cli,ctype,json,simplexml] dev-php/PEAR-Console_Table
+SLOT=0
+SRC_URI=https://github.com/drush-ops/drush/archive/6.6.0.tar.gz -> drush-6.6.0.tar.gz
+_eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=6ca3485b80c33b6427091d5f3ea296f6
--- a/metadata/md5-cache/app-admin/syslog-ng-3.7.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.7.1
@ -4,11 +4,11 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=5
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
 IUSE=amqp caps dbi geoip ipv6 json mongodb pacct python redis smtp spoof-source systemd tcpd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.8.3 ) geoip? ( >=dev-libs/geoip-1.5.0 ) json? ( >=dev-libs/json-c-0.9 ) python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) redis? ( dev-libs/hiredis ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/libpcre dev-libs/openssl:0= >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.1/syslog-ng-3.7.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-any-r1	b81ab4852d108e3d9c940fa03bce80e1	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bfc76f23225cf9710149ae23462b4c0a
+_md5_=f41b1779ec735bd94b88f1b252128e0d
--- a/metadata/md5-cache/app-portage/gentoolkit-dev-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-dev-9999
@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	git-r3	1502b9838d043db47700b8120083e637	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=dd80a84f2657549974f95af82e3a7173
+_md5_=7aafa772676277a43b3674d87e00ff9e
--- a/metadata/md5-cache/app-text/blogc-0.4
+++ b/metadata/md5-cache/app-text/blogc-0.4
@ -8,4 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/blogc/blogc/releases/download/v0.4/blogc-0.4.tar.xz
-_md5_=ce646fd25cfb6c60a2dc72f28396c935
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=014fd6d4cf670f2c422e6e25774136ed
--- a/metadata/md5-cache/app-text/blogc-9999
+++ b/metadata/md5-cache/app-text/blogc-9999
@ -7,4 +7,4 @@ IUSE=test
 LICENSE=BSD
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	git-r3	1502b9838d043db47700b8120083e637	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ce646fd25cfb6c60a2dc72f28396c935
+_md5_=014fd6d4cf670f2c422e6e25774136ed
--- a/metadata/md5-cache/dev-java/guava-13.0.1-r3
+++ b/metadata/md5-cache/dev-java/guava-13.0.1-r3
@ -10,4 +10,4 @@ RDEPEND=dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 virtual/jre:1.7 >=dev
 SLOT=13
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/13.0.1/guava-13.0.1-sources.jar
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	002bfd79a6cd417a199bb3bd8704334e	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=337b3d0397ff398e34564436f8f8e316
+_md5_=90baa5c6a0dd56bb17d996fa676757c1
--- a/metadata/md5-cache/dev-java/guava-14.0.1
+++ b/metadata/md5-cache/dev-java/guava-14.0.1
@ -4,10 +4,10 @@ DESCRIPTION=A collection of Google's core Java libraries
 EAPI=5
 HOMEPAGE=https://code.google.com/p/guava-libraries/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=14
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/14.0.1/guava-14.0.1-sources.jar
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	002bfd79a6cd417a199bb3bd8704334e	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=12ddbad0ba388405b7236d4fdd727279
+_md5_=0f020c653efe07463594efd3aa64dc91
--- a/metadata/md5-cache/dev-java/guava-15.0
+++ b/metadata/md5-cache/dev-java/guava-15.0
@ -4,10 +4,10 @@ DESCRIPTION=A collection of Google's core Java libraries
 EAPI=5
 HOMEPAGE=https://code.google.com/p/guava-libraries/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=15
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0/guava-15.0-sources.jar
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	002bfd79a6cd417a199bb3bd8704334e	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=00327412f212d8693e1f6caf28fed305
+_md5_=14bda81ffc1446f61368bf2047531ee4
--- a/metadata/md5-cache/dev-java/guava-16.0.1
+++ b/metadata/md5-cache/dev-java/guava-16.0.1
@ -4,10 +4,10 @@ DESCRIPTION=A collection of Google's core Java libraries
 EAPI=5
 HOMEPAGE=https://code.google.com/p/guava-libraries/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=dev-java/javax-inject:0 dev-java/jsr305:0 java-virtuals/jdk-with-com-sun:0 || ( virtual/jre:1.7 virtual/jre:1.6 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=16
 SRC_URI=http://search.maven.org/remotecontent?filepath=com/google/guava/guava/16.0.1/guava-16.0.1-sources.jar
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	002bfd79a6cd417a199bb3bd8704334e	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0659b8bd6463425e9f56815974c36dc8
+_md5_=f4f0cd2c82ae19e1abd228d8f00dd6d0
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST cassandra-driver-2.7.2.tar.gz 413805 SHA256 dcff93964334902c5707a3024b500c063ec254da61adae9ab8b3824d56088cd5 SHA512 7548764f2a315dc6f6d4a00138767e6ba6b453a7d7ff19c0913f8c931ae6cb163092644c2d24b87e9efefcdf8568d7e84dccf9f990ab498f187a1bb0c498f415 WHIRLPOOL 219a4017d0e129d14aa2cf87ac5f4875c671777e8064cbaf240f84b22df171b3be902fabeec8327e4064b6417c8b44d12b4d9d462bc491d71ae6ec3149612898`
				`@ -0,0 +1 @@`
				`DIST dj-database-url-0.3.0.tar.gz 2747 SHA256 f2e273ed34acbb560962d5cf12917936d8df02297df09bd3089b8546d4584138 SHA512 a27fa974edcc0fcfb99f8b74b25324a7afbf70ae4161576ec72733a3b305e170b23677106b85dbc075c5888330d6187ad9e95fbecc41cf7455c26ebf6f3f86e3 WHIRLPOOL 60e0c50f353ea314c6562a05d5a39042e3db15aca4018e8b35646c991a15fda59ed72b213fcbdef303d3eb47a2cff856b1c1d3d80c3e7868bc619794cf0330f3`