diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 96df92116fd4a..228cf67f44c54 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.591 2015/07/04 13:24:46 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.592 2015/07/05 04:01:57 radhermit Exp $
+
+*imagemagick-6.9.1.7 (05 Jul 2015)
+
+  05 Jul 2015; Tim Harder <radhermit@gentoo.org> +imagemagick-6.9.1.7.ebuild:
+  Version bump.
 
 *imagemagick-6.9.1.4 (04 Jul 2015)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5a0bec846612f..2148cc34e82d1 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8
 DIST ImageMagick-6.9.1-4.tar.xz 7978216 SHA256 74973478058069ce44040ff76b61df713d70adcadfd207836cc0622cadf1e4bf SHA512 b3c8cc0882d3941053dd7052048f6839c268a2969637ba39067422dca9a2b0f442303d5ec647c6f1372723da5b59c30ee014902ad338d2157b75b8741526c698 WHIRLPOOL 0b3473bcfa43ae4fca0c084ea5bdff8c533e138f58ba782d79dd22d46e55a82b4cd8565fe0be5928a148eb969507e7d4b05764a8db08d8f5e862f00952772792
+DIST ImageMagick-6.9.1-7.tar.xz 8284892 SHA256 b610e5261c01664e19c91e513e21b3c2d76d583b497ee3c7cf2f20876d742328 SHA512 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434 WHIRLPOOL 1751ac644916389292c306998df1c1d635d8acbaac23666a18b216b1b9867be39e7c1300a0f5d465ea3f3990af2dfac77efd8f23efca3f6f18e0beca439ceee5
 EBUILD imagemagick-6.9.0.3.ebuild 5143 SHA256 1fb20671ee6d05d11b90dd25642b14ad3b40a7377e55ea2e0aba63318c1f2693 SHA512 5df7ff759bd6b17290205787d48c39a9ff56cb4dff65d8cff6deb98b882ab5703fcde28075ef5ade61e17245aff217b2cd4f89ca46e7af9d5e839903936b31a3 WHIRLPOOL 0d373cdaf1e71aa7df1c622eb3ef9e13ab13c4d4354e63c89d8925fdff2122d89b92e966f1d10379a4171c292f840ae69580c1740b0304387ab0fb3c6b287d80
 EBUILD imagemagick-6.9.1.4.ebuild 5153 SHA256 6047b21bffd70ec66da9a19000413e6637cadc2c9e515aa58830c2ad0cec976f SHA512 533c77a0aa13417070bf09514c7933ab8c88177ee348e33c25b72d261a49a8b26e722c61dd9238ed49023e0dc1e5ae167cae7c5bcdf8af5adf02c02cc8543d65 WHIRLPOOL 7a5a99834f0b48887aeffade35fa4de810e67edbf3855598f927c3b0ccdd83d12c8ec66f4d5bc84a1921814f02f36bfb0a508efddbb1401392153707523f2a36
-MISC ChangeLog 87231 SHA256 842740b71a7cc09fd4b4c923817d2b41b8dd590f102810c9de7abe2d96806aab SHA512 ad1df6396f6861e3c4a5967eb67fdd93dde6cbe3598bf1e62706b5897844724cc1c39ddfae474a93e8a9f1cebfcba10cb0204fcfa2f74d976e768615d7c03281 WHIRLPOOL 79cafa72a3b7fb1f640c2c0909909f7a4f32c73f1e2bc0751d5ce6b576f9379b56c3edd74c526be41f07f724c86e64efa058ec6cc63e210b8b080677024f7716
+EBUILD imagemagick-6.9.1.7.ebuild 5132 SHA256 e10316b52b5bcb547880271a94987600d7f37b37a5d5c3dd0d9fb11d0cfd8ad8 SHA512 a8a6ce246a143bb847bffd7de1339d35fe170f5257864c9b666e0e1d60c31648871a534f7d2df5935c10502f71f5d06fe2d7bc71f2500d74589f065b38cce4a0 WHIRLPOOL c0e1953a71acbbb789f6b3b83b3a639a7e788832914c73d47221ec1a25d78bccb33281def87e2d10b12c6fcb940978f9b8b904f900ba2ca4f56a7f6dbb054c09
+MISC ChangeLog 87366 SHA256 614a198b9b42336c5d4b5c60fa8e200a0f820dfa8e1f11ab7ff65e515a9fd1bf SHA512 f8e3d663e2095bebc7d1b4bf2b70f29187dc21118a31c4ddf55032b2c571ffcec6b9746bd1d5ad1e42b86b8d8e58f54eb6686d4980186638fd18287075a46bd8 WHIRLPOOL 4d55cb9945f1d288a73fd9c39ae19d02bebd44b97dc9827b3812e4ce006d0ce9ebf9fa61492b49022b0a93439323a41135397b0133bcf25a74feddd95f40ecf0
 MISC metadata.xml 1049 SHA256 aa6c00be430056ff297b25bbb9ee0c64baa60d7d039e860e01b4cd7148f65fb5 SHA512 97a8a8ebdb3366cd81036185ac2e81ab5df22bb5dfd8f106c1361276e91c9069ae6dafee74b3fe08e6afc5ce5e65c8b10fe431f4294dd4fb3e32d66e0d2c8f44 WHIRLPOOL e45a43998a456485e1e236737b60ca25ed28f01848d771b4eaff586dc594c85838e7d5155b875dbf31766f2927fc6f9d651e8ccb91ac8cb3c522d4a388b44beb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVmKw4AAoJEEqz6FtPBkyjIcgH/jOPcQUbk/IQkT6bGGm+XaHC
+O34uUaxiE+sxuoL6G1yW+HaPOWZ7xJ9yDcnV9BXGt1rjzzpIILKIXTls2ilOIc/f
+4vV/GRy9b+m1NMNJSpGt9RQfe/HQSR9KYB7FqmwFHhjx9VZwCehRr1BWMZXCNuJk
+h5rNlRWGMC+ZdgdbP4EDwypbARXx4Ejfv3/5unSvp4ZdKb+tF0bJDwAJEYKa2s1R
+XzmfJkjlVu/1+Jz3NNq7Y7g77Brf1JmJgnzTb517r6cnvB7r1MABUQR623tFnWCf
+PYLvFvYKUKsP0EX9EXvPknQV4Lef1Ex8B6YLhIWHH0T2T20yqzltF8xK2iLQ6zY=
+=wwo2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
new file mode 100644
index 0000000000000..3898e4c3eef32
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.9.1.7.ebuild,v 1.1 2015/07/05 04:01:57 radhermit Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch_user
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see http://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	CONFIG_SHELL=$(type -P bash) \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with postscript dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with postscript gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjp2) \
+		$(use_with lcms) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp \
+		--with-gcc-arch=no-automagic
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake -j1 check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3b8534a99156e..942b8932797f8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Jul 2015 03:36:49 +0000
+Sun, 05 Jul 2015 04:36:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3b8534a99156e..bc0ef86a43d92 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Jul 2015 03:36:49 +0000
+Sun, 05 Jul 2015 04:36:50 +0000
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.1.7 b/metadata/md5-cache/media-gfx/imagemagick-6.9.1.7
new file mode 100644
index 0000000000000..4a1b1c1f183e3
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.1.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
+DESCRIPTION=A collection of tools and libraries for many image formats
+EAPI=5
+HOMEPAGE=http://www.imagemagick.org/
+IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=imagemagick
+RDEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
+REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
+RESTRICT=perl? ( userpriv )
+SLOT=0/6.9.1.7
+SRC_URI=mirror://imagemagick/ImageMagick-6.9.1-7.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a0f44e13bd81145aa896942428228bca
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.06.25 b/metadata/md5-cache/net-misc/youtube-dl-2015.06.25-r1
similarity index 98%
rename from metadata/md5-cache/net-misc/youtube-dl-2015.06.25
rename to metadata/md5-cache/net-misc/youtube-dl-2015.06.25-r1
index 15db3757297cb..3b95c7b0d9b1b 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2015.06.25
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.06.25-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4
 SLOT=0
 SRC_URI=http://youtube-dl.org/downloads/2015.06.25/youtube-dl-2015.06.25.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	8fd6db5e1c80bd7c6d640bce0413569e	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	351da1aa73960a282591217fb57c1bb8	python-utils-r1	ae9becb5d45344c01939c3f57df0d3fd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=eec4c7ca14d22cc34b0c82a1be612bf7
+_md5_=9095b19b289af8b170a4e79802672129
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2015.07.04 b/metadata/md5-cache/net-misc/youtube-dl-2015.07.04
new file mode 100644
index 0000000000000..70770e415bcae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2015.07.04
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?] test? ( dev-python/nose[coverage(+)] ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=5
+HOMEPAGE=http://rg3.github.com/youtube-dl/
+IUSE=offensive test python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python2_7(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2015.07.04/youtube-dl-2015.07.04.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	8fd6db5e1c80bd7c6d640bce0413569e	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	351da1aa73960a282591217fb57c1bb8	python-utils-r1	ae9becb5d45344c01939c3f57df0d3fd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=97975889b53b1e62d31f068a47fa2673
diff --git a/metadata/md5-cache/sys-apps/texinfo-5.2 b/metadata/md5-cache/sys-apps/texinfo-5.2
index 4a7d09876030d..754e712333bb4 100644
--- a/metadata/md5-cache/sys-apps/texinfo-5.2
+++ b/metadata/md5-cache/sys-apps/texinfo-5.2
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2 dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-5.2.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e41db7bee93fdfc88a59fe1b2cfdb5fa
+_md5_=1fc22d19955f69ee6b040f559710b37f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 99f280b59fc39..ad07f52aeeadc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Jul 2015 03:36:53 +0000
+Sun, 05 Jul 2015 04:36:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6751ed83a53cc..24a7beeee8cda 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul  5 03:36:49 UTC 2015
+Sun Jul  5 04:36:49 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8a451fe544a31..48a91497bd94a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 05 Jul 2015 03:45:01 +0000
+Sun, 05 Jul 2015 04:45:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9671829db5730..e2c10c1306608 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1436067302 Sun 05 Jul 2015 03:35:02 AM UTC
+1436070901 Sun 05 Jul 2015 04:35:01 AM UTC
diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 2d9296afc177b..d1b5636b13c67 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.488 2015/06/26 06:24:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.490 2015/07/05 04:05:06 jer Exp $
+
+*youtube-dl-2015.07.04 (05 Jul 2015)
+
+  05 Jul 2015; Jeroen Roovers <jer@gentoo.org> youtube-dl-2015.06.25-r1.ebuild,
+  +youtube-dl-2015.07.04.ebuild:
+  Version bump.
+
+*youtube-dl-2015.06.25-r1 (05 Jul 2015)
+
+  05 Jul 2015; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2015.06.25.ebuild,
+  +youtube-dl-2015.06.25-r1.ebuild:
+  Fix USE=-offensive (bug #553668 by Vasco Gervasi).
 
 *youtube-dl-2015.06.25 (26 Jun 2015)
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7d9c7a3a85cdf..9917f6e6a03e8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
 DIST youtube-dl-2015.06.15.tar.gz 1582537 SHA256 5a30bb0e62bbdf7797b61d29678e672d67dddc0d3fa502d133d3017061b67c9a SHA512 8215aec52c96adf5c91bafb4235aa063c253389f310fc853b3bc66255fb79a6b30432c8a61390913b61156a3893228cfa245b4f34f42f5ab285fcdd16e7b8bfe WHIRLPOOL bc24d41f6b60a9fdf7d71f0321b27a3e6b5c3f0141634b7912acc5d8911ce00e6cee078f4df9b23e2af9e306051c7d760b1afa296618ab21a652756ee9784fe5
 DIST youtube-dl-2015.06.25.tar.gz 1596889 SHA256 6e64f50ba8e74e11318be19c72be56bdcf00673841ea77716a10967e04c48628 SHA512 babcac26709fd818796b4d50a3eec197ed718eddade450411c446884be396cceba1f636d46c97eaf703d222cec5c7ae060357d2d2927cffa8f6564fd45515e52 WHIRLPOOL 147c4be938becc0c9c67ffbfc96991bb6c083bf7c7d296b7ccf1a38d22bde88c05cef7549345bad51f60efa34f93d264f94e56c3530ff8d35758cd790bbb8f72
+DIST youtube-dl-2015.07.04.tar.gz 1616810 SHA256 cad69f6343c8e2f285ff2ff1b1b2d1631d6f28ac773555082a0f9c214d69dca5 SHA512 4f0ae1a04fd9050bba58248bf9d0972d91c3ba5fd16b2fa8e7ecdac0fc1640382b8d1d4565cb4b1d92da4377c949a41bdbb491be4f415fb3cd2d78f2b64ac9d8 WHIRLPOOL 34c62fb9a19cdc240e544b710fdae81090f5e88d2d017625e52479332fd73e5dc8943ffd26f9e611493c88886996e3d646b10dddcc734489636ea7ba152af58d
 EBUILD youtube-dl-2015.04.03.ebuild 2083 SHA256 2c9363e4cb7fdb28415fcc9c99a253ca72ce039562be40b3dbc126a375465811 SHA512 c2fa8b3190ddc1490f9c10b56dd74e25ae9ec70eec08816e2d90720c82380cf3fb4074bcd81dbbf36e2e18e557c10871bbed9402c233e55aeb889ed4f5799987 WHIRLPOOL ae9f125600d9cad00bcbb18eb20e57c27d76ec9c93191d3d46b8042c34f13eb428912f6370fcee85af9100e3ac5fe6fcb41d5d11fe24c84e0f37ac8afbddc148
 EBUILD youtube-dl-2015.06.15-r1.ebuild 2298 SHA256 f51a3168ab9ebb409cd4e5ec19377ce69da0d2b39c9eb57820ee32c90ca4f472 SHA512 20fe1fad068d5982c3c8a00382242d60abeeb23612ede76fba32578bc6bba24c06e6092dfc089c589d697eee84dc436ef978d63f59f78af33ce5027db673070d WHIRLPOOL 121c77a4eec0093973115cf912347cede7553ce130a40387fa5a2e35ffd7315553a4f11d1851260a563d7c332c87c9b94f33e13657c119278c100970e2b50669
-EBUILD youtube-dl-2015.06.25.ebuild 2295 SHA256 22568ebc37c6509f32e656473eef4014513c86dbde00d982083ae4423cbd0d18 SHA512 4cbd39a840e781e009910fff9b9e03cdd4bef78454fd51537879a72fc6348c6422d506b5ff5ee00e37885d14d34455cfdc666178244b590b0a3250aeed99ed50 WHIRLPOOL f7444c0e368577c78867a63e130594bc98291e17a2f5354509f56fe5a35675a81ce59f26890636f7058e19cc039a426b7e7162d4da4f982a6f7358f06317bfa6
-MISC ChangeLog 74186 SHA256 13248f7f0f8f310ad565c268bcd46aa5e469860a49f1f9839020955b4153bab3 SHA512 03f6c344ad843857325cadb51cc7035311358d29af031ad8562d31db2c275a2c526b788e75463c0b1aa52b8a6a1feeee68295d398286c27ac4e653b5a062e69b WHIRLPOOL f99d62e0a6ce86df9a20004562e79c8e26588f3b34b2c642525d56fa615a68a2d95517c4480005adc86a15f01573cef9f0321ed83cade09a3dc7d60cafeddb70
+EBUILD youtube-dl-2015.06.25-r1.ebuild 2298 SHA256 ff391712a935d868593f04a0665d6128277a832da93fa11dd9ed77974e60d1ec SHA512 93bd09fb682b38bbfe5488a38561fdc544c46d3d8428b7b1dc4fe9cf73ddd5bb3834d417e4774b68a41583333d76cdfb90d6b7dd44933b2bfd99e15f75ee8b6f WHIRLPOOL c12aa1ed7853db3b5342bca86cb47b3065ebd312794004870472b002935391d3e4802196156914b7afb1231dde8b42e2f4121e6fa25849cee98d54d810a8b57c
+EBUILD youtube-dl-2015.07.04.ebuild 2287 SHA256 280632a3f8a00cb6795c9e81e4cf9fc3c34056514ffce3215ec2ca0ceded5f5e SHA512 e4dcb5b7ec2183b532e8e3db38325c06c3e82070730cba74e13bda64ddcdcabcafac2664b3670d3a373829d03fcb6cbc41e43159e255985bbea113f85e25c4b1 WHIRLPOOL 3b9850e3c9428273246956486ff5fb53d23268ae0276d6be4a98f472f44d35380f508cad2748adbf84d67eec08f2c48f26f0b40628eb5da84bc67d9aaffc6619
+MISC ChangeLog 74563 SHA256 e348e97bd9d655f023c4ab6557469a78c56d45b875964e1eb0639634f8c72cfe SHA512 783399bc08d71f3d984747435cd38f977bbb47f24e9f8e2dfb2058c2ff04497acccad2d9f7410ecfa792745dc8d8257c4ba88324ef2213d0e56ecf8c721ee6ae WHIRLPOOL 3d466ba5a30716859bc36a9e11470bad9db988f78dc8eb7dd666a997542c6de52bf04db2a01e99a53856e46455d5f9ea40e65f7aef286ce8931a72e5de2218a4
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWM8BsACgkQVWmRsqeSphOJHQCeJ7Zyu/UpekKkU13cRFIF3LDC
-fXcAn0HfnNkb2/EJigsG/0sQd4gboAMn
-=O7RI
+iEYEAREIAAYFAlWYrPQACgkQVWmRsqeSphNqQQCffYuYCRGL4/zwyW6Kb180hwdQ
+ILsAniafwCVuk3/wH5UmPF4wuZgWs9Yp
+=kWGM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/youtube-dl-2015.06.25.ebuild b/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild
similarity index 91%
rename from net-misc/youtube-dl/youtube-dl-2015.06.25.ebuild
rename to net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild
index d43cc9d1b80fb..04ad216e2ba18 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.06.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.06.25.ebuild,v 1.1 2015/06/26 06:24:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.06.25-r1.ebuild,v 1.2 2015/07/05 04:05:06 jer Exp $
 
 EAPI=5
 
@@ -34,12 +34,12 @@ src_prepare() {
 			extremetube fourtube foxgay goshgay hellporno hentaistigma
 			hornbunny keezmovies mofosex motherless porn91 pornhd pornotube
 			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
-			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef
-			xhamster xnxx xtube xvideos xxxymovies youjizz youporn
+			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef xnxx
+			xtube xvideos xxxymovies youjizz youporn
 		)
 		# these have multi-line import statements
 		local mxxx=(
-			pornhub
+			pornhub xhamster
 		)
 		# do single line imports
 		sed -i \
diff --git a/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild b/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild
new file mode 100644
index 0000000000000..02fab5f9bc421
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.07.04.ebuild,v 1.1 2015/07/05 04:05:06 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink drtuber eporner eroprofile extremetube
+			fourtube foxgay goshgay hellporno hentaistigma hornbunny keezmovies
+			mofosex motherless porn91 pornhd pornotube pornovoisines pornoxo
+			redtube sexykarma sexu sunporno slutload spankbang spankwire thisav
+			tnaflix trutube tube8 vporn xbef xnxx xtube xvideos xxxymovies
+			youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/__init__.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			youtube_dl/extractor/tumblr.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	epatch_user
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog
index 408b4224d934f..b87221e2a0e79 100644
--- a/sys-apps/texinfo/ChangeLog
+++ b/sys-apps/texinfo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/texinfo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.136 2015/06/30 08:03:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.137 2015/07/05 03:46:16 jer Exp $
+
+  05 Jul 2015; Jeroen Roovers <jer@gentoo.org> texinfo-5.2.ebuild:
+  Stable for HPPA (bug #527998).
 
 *texinfo-6.0 (30 Jun 2015)
 
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index dcd90cc4a8aa3..0f0bb1cba7de2 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -10,24 +10,14 @@ DIST texinfo-4.13.tar.lzma 1563777 SHA256 6d28b0ceae866e3536142fc552e7a3bc9f84c8
 DIST texinfo-5.2.tar.xz 3812944 SHA256 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda SHA512 6f9c5142db3b155bd601149b5632807b3c20dcfa7006ce5f7e120e6fc4b2174a3f4671c18232c040ffd69ebfb5950be5c563ac5cc08b88d03eb5a9f1b0f96c04 WHIRLPOOL 609f0c2ac4deccf85f99cae3f681ce3892c7822988a84970171dec0f1224052861b3ac3fac97e666016bac4469b0e8446133c775a20f7201ff6dffa90fc84290
 DIST texinfo-6.0.tar.xz 4086712 SHA256 11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4 SHA512 36f82288dfb7c2385630043faf75ccef5af625952d792c669c5eea673ae5b3474c148041bf1935f87ddeaae7114103731277e715d0d510c6fb41e0211ab12494 WHIRLPOOL 1d1facd5670321aca908407f65ff6a8769f3d7528c4535d77cf3fc6d948d766acc1e3f592e74554c427fca51a9e54048d54774586543d6316b664ac3c92d06c8
 EBUILD texinfo-4.13-r2.ebuild 1638 SHA256 c3c093e7cb7d6686d4638ae4fd0adfe0ef6082a3af242464741d01760c306cc0 SHA512 774386f0d82debe7706d96eef0b4e0619d4c0e95c319efd19f967f38b65e8da5952cdf0c3b363463a712ee04ef2670771c1d101a63849e02351a640edb58cc09 WHIRLPOOL b4fa3de68fb6ad03ac717a446aa353e6b7c9b7de58ab5a02d855de43b292e85917cde06dd0457821afa33af0a93989af67c07435c1fb6427e0c59cad8bd9d4e5
-EBUILD texinfo-5.2.ebuild 1067 SHA256 407851f8ba2f8bff90f4b5d016bf8fdb51138deefb2e21f02e22a1cdf9b26727 SHA512 e03b6c5e6a3beda40f9554897cfe53bda9e71d4fe6a25c286a89aee0e8cab8f352537a059bab8e4276966185ce99b9796ed6b8fe75ccc9ceb40f095d426a7bac WHIRLPOOL c4bd195aa987d095bd84e72cff293725c81a5c9e43240444e9a739b34ffcdfcc8fbcf2fbad5cc2d7546c5cf4d77fbadad7716c35afc8c4180f237a13556819d0
+EBUILD texinfo-5.2.ebuild 1063 SHA256 afae1784ce13f82f13f235d614cc474c127eb1f0bf3e68886dc53fe6aa604ffb SHA512 c64c95de3ae82b47c24950361c1f49716ba4b200677c80b9c9189c30be9cdf94d6fb5317a22db433a4db3111b9234ac01066a6c0634931b0fae457ddb5e50ef2 WHIRLPOOL 18eff5a6995a670a005667e76a1ec7fc415c30cf393ea9287310b37ec7d79252a1793abdb77669c716c3fa6ca0c4e039973695cc718a8a7ec75f2c824ded5ba6
 EBUILD texinfo-6.0.ebuild 1073 SHA256 9682c812b82196be1cbb5ec49dd6d1a605c6dcf6033314e2ce968fe172850b0a SHA512 3a37a68a4112180b618c48ffa709afe1c6ca64256d58772e814f4d3419c1b6434d0fd2388d10bb1b5466bdc0429d830437df15672996a347ed006c4f31846d76 WHIRLPOOL 5652cbae5b7e576d848ed1d17c1c2cff5e7e4e6c92d6e1f77972dfa1de3c4e894904ac42b6639c6035abd8a799905dee38db0cae51e21f8f4c054ceb7b76bb9a
-MISC ChangeLog 16493 SHA256 e330d6a84f7bbe9aab686035a205d1db828802e479f98a038c18f6e6d87bf141 SHA512 6bf75ad6eee7e13fef09cf81a385d2f9d56ccfb318ae421395e1a18c65b0851139824bdc84c6424eb6a001c6dfafe3e004dd2a543a73174bddd5da9d1d49cd6f WHIRLPOOL e70c99455cd94f743f2f3993ab2116f88c50f7a0361cfbba7a3132fec188caf8471ac29cb07da6b1545682a28c4925f9163acfedb02f80a547b3052f33ecc572
+MISC ChangeLog 16585 SHA256 80de950208a4098e1f083a141cbe2e68ed8d21be43acd91ec8405b698675cd8c SHA512 acfa3fff310e5d43191d9f9f9c91c2ae79922f6443bb068bc6222c3482077dfdb8cfb536b98bca1f6b743fff43bace6f961666ad0583ac35cf937db9b1ff070b WHIRLPOOL 0f8e55e24108cd73520cc334abd9146d41bb73ee937605c27aba555dd107235bbe99716ddf987e9279231c8b06629967f80fc94d4747e4d38cf48cd4701644dd
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVkk1tAAoJEPiazRVxLXTFbYUP+waIBtsrme+shpgeAYzIrZM+
-Qm9nk71TDCN1Y279Gj96cKPylbtPYNk9RQ1vL7ErclLqyXJ7Ka9Hs0Ov29NncJ46
-xEv2lFl95D2RLFjyUQe6e5Ym8bpGHxvC5n7T0wH07b8UNO+tn9wzyW4M8J1/zdlx
-Kv5+wNfJnW5riLyJ46TQTWn1PJNoIXv/SoHQwPLXApkWgzS9DT4BHN3KXVRJgsT3
-uaOzVACNve0jdEFvto/F9rKB8KucguqnzCSf4TdMmnpjdTmbpGS8ybcOiMScT2Mx
-dcLP6pQ4e17JvwAzhsW+f+7n1ds4HfcdCiPly98OEagtC22fSDKpdNy5e/pQYnts
-gEX+HZ6cUABpGAVW9ilhE5oVSp5zcXtKSzSyV7zttao+6prt1ff6HD/SDTrhuN2p
-Q63woG8Dc9QO2d3k5k9yN7i39/PPJ5j5R7TdVyMN0EYGJ495MzflfHQmqJhetIMw
-jEgVF+MqejlwyM0be6sMQ5ax1pRzem4SMizB+nNQlzCfJ3bqKiSNc8Fur4ROhCXu
-IQrKSy6AUONKVFAFZQUry7hCwhERI0nXBvfXAKHGxR3Tc/8zQdQk+PRYuBTKuvfZ
-yfACUVdZoj891xlyyrB6G1V6G7o3bZH0E/AvuFZ1PBMm+rB/nkJGRxkeoihpA+DM
-wrE7FxL33W5a5NcRSVUk
-=BlhW
+iEYEAREIAAYFAlWYqIkACgkQVWmRsqeSphPoxgCfZkYsqrNtK7WMTVJzA22QM3P8
+KfUAn1mrf1heKqvx3JicvJtF8f9JfKMe
+=SQ++
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/texinfo/texinfo-5.2.ebuild b/sys-apps/texinfo/texinfo-5.2.ebuild
index 869a2fd4a8343..51c1f9f1c90b6 100644
--- a/sys-apps/texinfo/texinfo-5.2.ebuild
+++ b/sys-apps/texinfo/texinfo-5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-5.2.ebuild,v 1.2 2014/01/18 19:27:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-5.2.ebuild,v 1.3 2015/07/05 03:46:16 jer Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="!=app-text/tetex-2*