Cleanup due #92799

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

18 files changed, 49 insertions, 699 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 9dffcdd57572..71ba2a08dd59 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.108 2013/04/02 20:56:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.109 2013/07/21 08:54:46 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -exiv2-0.21.1-r1.ebuild,
+  -exiv2-0.21.1-r2.ebuild, -exiv2-0.23.ebuild, metadata.xml:
+  Cleanup due #92799
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> exiv2-0.23-r1.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 91d7f44c84f4..d29a22dd33e9 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -5,29 +5,15 @@ AUX exiv2-0.19-syntax-fix.patch 598 SHA256 41a6fe03d35fca3ad46c43776d682ab9acc0a
 AUX exiv2-0.21.1-time-fix.patch 1979 SHA256 7ea4fe457dae5ff41090eafedb9c6e181c4dd4f214ec49a958e6cce73f790b46 SHA512 ec31644424b1a1be3cf4ecf1b46c5c34ae28813f6856020483a00bfbe258dafa44029b77b021b5d984940241c9a8fc4e120691adac6296abbb11f3b8f3cde217 WHIRLPOOL a47b7f0cc671291c39610ce067a6787269eb36d33027eaf58fac54ca4cb1bc6a7fcfa5733ba470992f7f29064cac05b452fcd3e48183ecc5f2c531f5891a78d9
 AUX exiv2-0.23-boost-fs-contrib.patch 9558 SHA256 1734a14392e6706305582b9099a9ff781e3327fb86d4d0ed6c0cb6fe60b38f85 SHA512 3abc6ae75940de6960afcfeb382754ab9f48cd4e311cdd2e00c644774c1141d2bc9ff191e145f7d37362e3364446a32f4fdcc142f0e80ff5bf8880ed18c5af26 WHIRLPOOL 7164392d53fa5d18671269cf0c6c69813527ab046c19cfba2a1a97e0430ac617f1330f1d75e197e48a84d1fcb10942b79252a96e417bd1dd61cdc9fbf04cc1d3
 DIST exiv2-0.19.tar.gz 2658781 SHA256 1733dab5e81d9cf4e0b3d6eeed009103e5baff4fecfc127ecee016b3a67c51ef SHA512 e73b2e04e0ec5a1667a8e04baccdfbed234e98965cd2777c0462bfaba961c3fbf6d373f0f18fe458c21b2283f17ebef70a9f455367f5ca4cd08dcc67ad12fdca WHIRLPOOL d9fc58a4d94b255e24526f03f7def101d8bf37d2777bd4464aca0a6aa7bc3f5143dc0b71c82819c0a385dd05a73b60e9a11248e4b69a144c5b68c50cb0c0b893
-DIST exiv2-0.21.1.tar.gz 3004521 SHA256 2edae035760f84afdfebdf3123a166e6bbf77870697afe54dea92a783f041817 SHA512 a83a6b10b6c3e7dc8718f1169684e09c4e9c2bab05e93fa29f7767f7babd12bf29203b1c8c46fbd576dad9b694ce3a699f4a47cee1c61dcfa889ae9e22a045b4 WHIRLPOOL b9807082c69dc4b7db47f451fc152dec90790284aa87e28e9b36836be6d67b05350e2bba79553e829369ee749965d3d47fd00968f41f100bfb1d13167ad948fe
 DIST exiv2-0.23.tar.gz 3524381 SHA256 81fa50900be7ab16e24c6551252c21fc97abcfe855fd32c8f7ec55f398786b11 SHA512 5719a9129f0c991c2966fc9bb65021d501ff7ac193f0b1eaabed9044e7dcc331cb41a149a989fc20417ea07ee20e35a8c91e0063a81b9e2d6c3fae033fdaf39a WHIRLPOOL c80e8f7cc988a5aed117cb8d545dd126e1a9f188efc3c364debf2601d49e0d166709c2ab0f7d8dedc439621fc4766bce731ceb9deb0fde35ecae563bd424cde9
 EBUILD exiv2-0.19.ebuild 2955 SHA256 5a09fdbf3711f4c85be35571813d43740f7e3ebb833b0817232331843b0cfe94 SHA512 308cae408a435a9a409b5d9ff3896e904c73129691893b1548a1d1b8b81c7bda0550727baed7cbb849334451804e8d7d8f94b107bcd863253ecd32f3526433b6 WHIRLPOOL a03836e624488a04185b9e5f3b2af54c3317383673d418401badbb67418e48ac3c09b0b432b75ae8b19d431e269a70174739734df72d9b83a2de1dd5b8afe6df
-EBUILD exiv2-0.21.1-r1.ebuild 3567 SHA256 160bf41b212f97605043dca6934ca1a40110b57e9695d5a5052b9c1c38e20096 SHA512 67d2ab2b7b3373df9be9fd78978510356b50d3bf6ed2a3adb6c70eac3ca931e43ead414ae8510d24f417aa76c25365de94e2a1b7983ccefd9a5a3391ec4b46f7 WHIRLPOOL 99a60bdafb11a084c2bdae6c6e3a8aa69fdf4da449c6ccec4c820a78e77930880471d98db8a421405a72e505f2c4bea602742d2b0bd50928d8af5af952a1c3df
-EBUILD exiv2-0.21.1-r2.ebuild 3580 SHA256 e1d693687f31324d02baf9ba54642d0c4b7f56bd9f592e264588f9f39f439fd5 SHA512 f9b9a3be22b0c1252b52151092825ee2dff4d1e4ed1caba378073bb008b8b743add4ccea3d8654e6d551e7ce16e234db9a79539ed3d64a85f3674db1710aaf36 WHIRLPOOL dad7fe6dd0372af6469112f8f4256729398a5cf849227e7f2c507bfe9ea8e4ea3fb25e2af8bbf97a0643bcae66d727dfbfe3f93f4a6ea8348100f633f63ffcc4
 EBUILD exiv2-0.23-r1.ebuild 2962 SHA256 282e659a632a02343a40fca1eb79413e8be4934232b38cf270434d2ea51dd44f SHA512 f1c334deaee2187252f9277d9a2bd98112f1a4e2542d153144d757f4f33bf7cf0d5c57a403e05fbdff3cf433c2d287d04d1e5a2ab2d0f1f84f9711b3f7b7f720 WHIRLPOOL 624e00ceb6b719e2fc157d536416265057dab6946a22cf9fc66af3e0e99c0c323db4dd2fb3b0f09ab700abab2b39c375917e80836104d0e13de5e92da2cede77
-EBUILD exiv2-0.23.ebuild 3207 SHA256 6eea699245abf7529d1f9a30bb274073f7f2ed9090f03332765f31d5e2e72b8e SHA512 128d87d0fe7d87142518bb0b80670da63d803e2fe2af82c10a55d680a592e9c1571e6460f87fb5d39b3c85f5e50dedbc87577e3e1af53a222ecbe05b4b4e1812 WHIRLPOOL d8f9fed7fbd91ecb99ec7db9aaa466a5f768fa025eedf2cdc89d7ba0cd91a30c59544c18917c3639bfc525130497e25cb0712622fcf78ec4c4ff2033a3983253
-MISC ChangeLog 13968 SHA256 21ef8b3f318ac8451457c89d27ace387e33e2f54b8e0ff8375386555318120c8 SHA512 5efa97d55731c18f0d2c6196e1797db805cf567c0108a8c25f3df51cb1eb2b9203d422aeb5f8956ff49c656df4b1a47d4390c051ac33b3768c8596ace0954f33 WHIRLPOOL e2a226f9be26cd71e82a51b1e4623b0927e8546a9e2331cb4c6deab69d7a5604009c9ea3909ef0e323824fe42c54b8a646182284b7b087134d4fd4e10f694e54
-MISC metadata.xml 477 SHA256 17d43fc6d100a119edc3345bf1da39ee04b1e9f8d54b78c2deb05801b2ea79be SHA512 bb21348fc7b90de8f46f2d74b1ef50d12b8cda318af07d35b4c2f7912fe2eb5b413d83e312bfbd3f3b9b3f262c870a04f44c234fbe48b39a69bb3192c8def5e8 WHIRLPOOL c213f0beac6867ae352b94fd7558cef97cc86b5e9026042975a2febf3b077a9ee8b850929582b6e294bfd1d4771d0bbc85992987a47b52e5457a3f1face14be3
+MISC ChangeLog 14124 SHA256 9908da9d3bed5d6cb95a277822e197831b19178184bebc3a54550578c68aed0a SHA512 fccbffb4aad966042edaefbea0af92eae565dc3017d6ae5fc13f3533a79657fb4d2850947151f217e1dac61fdf3bd4129a6faaba4e2286ac2e0ad484910a9de8 WHIRLPOOL 31d9cf38e4f20ef12bb90d1e14641ba898b8ade24b21568f37076a4bf9540f2353dca2abdf13cfa5fcb036d0dc827e7f0da3032438ca9b03e1f264a544e33ec7
+MISC metadata.xml 453 SHA256 1977d7b2d741dc9a38204214e7861fb295a45dd045f5bccdc242bb6b137c839f SHA512 5696d284e8ab8d43d867247a5faa2fcd109246db73e1e1a74cf5326b824dde1a952f3a91ad2835b4663b4568f112525c01645366a05ad8bdb9f67b0dd319583b WHIRLPOOL 2bc777b330f45e6c965c95b74eb351cb4ae493de49073c82c32681acae1a4fc2ce80c7f64cd15287bc1389e3761bb30a3d265dcdaff89b21b83e3434d255049f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW0X8AAoJELp701BxlEWfCF4P/1uTT4h0MgvdcggozOdyeyWS
-bxNnapDDwPB9upVWp+pyLSMU8/XYclRGw7pS2SHjU1yXZps4H6ILBpz6IbV+mVqW
-3aAAvVeIuEPOrEJf3fxrispi6R6wvnbIqzpwHw9XwP5iIePSFke+lJYOL+JcihWs
-YXuFJEJRd22wYbfD1s/YCHKz8akq0sl3HNiAZOYRR4MoYiKdx8gidzHfvwhi9QTk
-q+RaiRkFNz69heE1GxHFNnQtyTp9Sqdcv2al3No9xuhn90L7bZvBW6R13YL5iC8A
-kQtRUCExnZYTFJCkFisZ+eiXtpFu+CkKQxvHNsj7lqLs5v2CmgkhVHNEkXlbCpvG
-9p1t4gr/KcEbQTtmr3y9ggPQduFZV6v1cBXUsEZgAnfQdT/+pXPg0ewji7+bxhtd
-39/izBDfb7YocDH39vd7z37NuQDeP0e7TAHbTwfuv9acO9gp00ACIao5TfgLhD3C
-T/byG3eWaQVOLWJQ2y2PwEIsgAVc0nsmgK7BnQYZVhFiafaQRgxpiag58odecDU6
-go+CNTlGW5V2dbYOo+7c+OmGU+Y7eJC/IMbTmoVCdXmHkxEBwhT8MWoRoOHqC5DE
-Bz0mY/3c+hmxJZtuZGh5NYtLFc0KVLXnE88OW1IZ4n2OF0GlWeXsHQykFtsWEmVh
-h1AOaujsoPH82mF2P9ae
-=xYnV
+iEYEAREIAAYFAlHrodcACgkQCaWpQKGI+9QTMACfT4eOhsebMaI3zrs2oUTAkREE
+LC8AnRSGV6dM0lU54TZrBjxXuKQhadO2
+=WkNB
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild
deleted file mode 100644
index 65458dd42165..000000000000
--- a/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild,v 1.7 2012/07/02 21:51:47 sbriesen Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-inherit eutils multilib toolchain-funcs python
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="contrib doc examples nls xmp zlib"
-IUSE_LINGUAS="de es fi fr pl ru sk"
-IUSE="${IUSE} $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
-
-RDEPEND="
-	virtual/libiconv
-	nls? ( virtual/libintl )
-	xmp? ( dev-libs/expat )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	contrib? ( >=dev-libs/boost-1.37 )
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	# exiv2 fails to build with boost-1.46 due to boost filesystem
-	# API v3 becoming the default. This is easily fixed by adding a
-	#  #define BOOST_FILESYSTEM_VERSION 2
-	# to source files that include boost/filesystem.hpp
-	#
-	# Implemented via sed to avoid patch-file (bug #357605)
-	sed -i -e \
-		's|^\(#include <boost/filesystem.hpp>.*\)|#define BOOST_FILESYSTEM_VERSION 2\n\1|g' \
-		contrib/organize/helpers.hpp
-
-	# fix for off by 1 hour date error for -T option (bug #368419)
-	epatch "${FILESDIR}/${P}-time-fix.patch"
-
-	# convert docs to UTF-8
-	for i in doc/cmd.txt; do
-		einfo "Converting "${i}" to UTF-8"
-		iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-	done
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen 2>&1 >/dev/null -u config/Doxyfile
-	fi
-
-	if use contrib; then
-		# create build environment for contrib
-		ln -snf ../../src contrib/organize/exiv2
-		sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
-			-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
-			contrib/organize/boost.mk
-	fi
-
-	# fix python shebang
-	python_convert_shebangs -r 2 doc/templates
-}
-
-src_configure() {
-	local myconf="$(use_enable nls) $(use_enable xmp)"
-	use zlib || myconf="${myconf} --without-zlib"  # plain 'use_with' fails
-
-	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		use amd64 && myconf="${myconf} --disable-visibility"
-	fi
-
-	econf \
-		--disable-static \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use contrib; then
-		emake -C contrib/organize \
-			LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
-			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \
-		|| die "emake organize failed"
-	fi
-
-	if use doc; then
-		emake doc || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use contrib; then
-		emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed"
-	fi
-
-	dodoc README doc/{ChangeLog,cmd.txt}
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dohtml -r doc/html/.
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.cpp
-	fi
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "PLEASE PLEASE take note of this:"
-	ewarn "Please make *sure* to run revdep-rebuild now"
-	ewarn "Certain things on your system may have linked against a"
-	ewarn "different version of exiv2 -- those things need to be"
-	ewarn "recompiled. Sorry for the inconvenience!"
-	ewarn
-}
diff --git a/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild b/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild
deleted file mode 100644
index 105567934252..000000000000
--- a/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild,v 1.6 2012/07/02 21:51:47 sbriesen Exp $
-
-EAPI=3
-PYTHON_DEPEND="2"
-
-inherit eutils multilib toolchain-funcs python
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${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"
-IUSE="contrib doc examples nls xmp zlib"
-IUSE_LINGUAS="de es fi fr pl ru sk"
-IUSE="${IUSE} $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
-
-RDEPEND="
-	virtual/libiconv
-	nls? ( virtual/libintl )
-	xmp? ( dev-libs/expat )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	contrib? ( >=dev-libs/boost-1.37 )
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	# exiv2 fails to build with boost-1.46 due to boost filesystem
-	# API v3 becoming the default. This is easily fixed by adding a
-	#  #define BOOST_FILESYSTEM_VERSION 2
-	# to source files that include boost/filesystem.hpp
-	#
-	# Implemented via sed to avoid patch-file (bug #357605)
-	sed -i -e \
-		's|^\(#include <boost/filesystem.hpp>.*\)|#define BOOST_FILESYSTEM_VERSION 2\n\1|g' \
-		contrib/organize/helpers.hpp
-
-	# fix for off by 1 hour date error for -T option (bug #368419)
-	epatch "${FILESDIR}/${P}-time-fix.patch"
-
-	# convert docs to UTF-8
-	for i in doc/cmd.txt; do
-		einfo "Converting "${i}" to UTF-8"
-		iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-	done
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen 2>&1 >/dev/null -u config/Doxyfile
-	fi
-
-	if use contrib; then
-		# create build environment for contrib
-		ln -snf ../../src contrib/organize/exiv2
-		sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
-			-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
-			contrib/organize/boost.mk
-	fi
-
-	# fix python shebang
-	python_convert_shebangs -r 2 doc/templates
-}
-
-src_configure() {
-	local myconf="$(use_enable nls) $(use_enable xmp)"
-	use zlib || myconf="${myconf} --without-zlib"  # plain 'use_with' fails
-
-	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		use amd64 && myconf="${myconf} --disable-visibility"
-	fi
-
-	econf \
-		--disable-static \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use contrib; then
-		emake -C contrib/organize \
-			LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
-			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \
-		|| die "emake organize failed"
-	fi
-
-	if use doc; then
-		emake doc || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use contrib; then
-		emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed"
-	fi
-
-	dodoc README doc/{ChangeLog,cmd.txt}
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dohtml -r doc/html/.
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.cpp
-	fi
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "PLEASE PLEASE take note of this:"
-	ewarn "Please make *sure* to run revdep-rebuild now"
-	ewarn "Certain things on your system may have linked against a"
-	ewarn "different version of exiv2 -- those things need to be"
-	ewarn "recompiled. Sorry for the inconvenience!"
-	ewarn
-}
diff --git a/media-gfx/exiv2/exiv2-0.23.ebuild b/media-gfx/exiv2/exiv2-0.23.ebuild
deleted file mode 100644
index c09cf9489935..000000000000
--- a/media-gfx/exiv2/exiv2-0.23.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23.ebuild,v 1.3 2012/07/02 21:51:47 sbriesen Exp $
-
-EAPI=4
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils multilib toolchain-funcs python
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_LINGUAS="de es fi fr pl ru sk"
-IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
-
-RDEPEND="
-	virtual/libiconv
-	nls? ( virtual/libintl )
-	xmp? ( dev-libs/expat )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	contrib? ( >=dev-libs/boost-1.37 )
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-		=dev-lang/python-2*
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-src_prepare() {
-	# exiv2 fails to build with boost-1.46 due to boost filesystem
-	# API v3 becoming the default. This is easily fixed by adding a
-	#  #define BOOST_FILESYSTEM_VERSION 2
-	# to source files that include boost/filesystem.hpp
-	#
-	# Implemented via sed to avoid patch-file (bug #357605)
-	sed -i -e \
-		's|^\(#include <boost/filesystem.hpp>.*\)|#define BOOST_FILESYSTEM_VERSION 2\n\1|g' \
-		contrib/organize/helpers.hpp
-
-	# convert docs to UTF-8
-	local i
-	for i in doc/cmd.txt; do
-		einfo "Converting "${i}" to UTF-8"
-		iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-	done
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen 2>&1 >/dev/null -u config/Doxyfile
-		python_convert_shebangs -r 2 doc/templates
-	fi
-
-	if use contrib; then
-		# create build environment for contrib
-		ln -snf ../../src contrib/organize/exiv2
-		sed -i -e 's:/usr/local/include/.*:/usr/include:g' \
-			-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
-			contrib/organize/boost.mk
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable xmp)
-		$(use_enable static-libs static)
-	)
-
-	# plain 'use_with' fails
-	use zlib || myeconfargs+=("${myconf} --without-zlib")
-
-	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [ $(gcc-major-version) -lt 4 ]; then
-		use amd64 && myeconfargs+=("${myconf} --disable-visibility")
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use contrib; then
-		emake -C contrib/organize \
-			LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
-			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \
-		|| die "emake organize failed"
-	fi
-
-	if use doc; then
-		emake doc || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use contrib; then
-		emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed"
-	fi
-
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dohtml -r doc/html/.
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/examples
-		doins samples/*.cpp
-	fi
-}
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 73756a9201db..f83a55405276 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>sbriesen@gentoo.org</email>
-		<name>Stefan Briesenick</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Exiv2 is a C++ library and a command line utility to read and
diff --git a/media-gfx/iscan-data/ChangeLog b/media-gfx/iscan-data/ChangeLog
index 543e31c80efe..7f5ee81fd9fd 100644
--- a/media-gfx/iscan-data/ChangeLog
+++ b/media-gfx/iscan-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/iscan-data
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/ChangeLog,v 1.13 2013/05/20 08:32:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/ChangeLog,v 1.14 2013/07/21 08:55:25 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -iscan-data-1.13.0.1.ebuild,
+  -iscan-data-1.9.0.1.ebuild, metadata.xml:
+  Cleanup due #92799
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> iscan-data-1.22.0.1.ebuild:
   Stable for x86, wrt bug #463092
diff --git a/media-gfx/iscan-data/Manifest b/media-gfx/iscan-data/Manifest
index 6dc0692a9161..c9936e7c5ea1 100644
--- a/media-gfx/iscan-data/Manifest
+++ b/media-gfx/iscan-data/Manifest
@@ -1,28 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST iscan-data_1.13.0-1.tar.gz 92925 SHA256 fda8040db87a4ac5fa465f7c15527273c51ab3bf4fece37d760c96f602592ea0 SHA512 e2f5360a0e6d8ca7c1bfbc1536368bdec137f7db8ef694ebd6afdd2ca53bcea053a452fd4819a47531695f57022e7dc5953160c54cabe6af2882d54c1af49ec4 WHIRLPOOL b0c7d27a563aba8273a7c819f1352309f28f9078b6e375bc484b3836a6819bfe3fea4ea626de1fee91b17c7a10121c4d6c087a40d9d017892db947ab51012dd3
 DIST iscan-data_1.22.0-1.tar.gz 96626 SHA256 e6ef1c275488d907869f48eb7889d9a01e564ea4b39e291e90843feb59e92ef8 SHA512 2adc6c125045803ffd269abab4f58d6d1c87ebd4c959985e6689d0b2e7f5a84fb1956d0e559c35b1704a1e330bc639e668c37f718c871e076a7ccf6c35562e6f WHIRLPOOL f4b7aaf68396c54295b40999653b4f1f8777d154e38ff1612a2458c2449570a6213fd41abeb13d6d06cba09828f8f35d485a6cce7303e8657a7ce87887657cc2
-DIST iscan-data_1.9.0-1.tar.gz 90850 SHA256 2a1a93281f5cda949b4524bdb198328f0fc70ce56f8a60173c0c458130806f5d SHA512 945b5aaf3946773c58bfd2c8abae3d95e2769e5cc3b61317791d63d0827086618b635a1dcfb331539fff3676bec4c30c9c1e2fa84dfdf89536e23c30850c4fb7 WHIRLPOOL 97121436ccb95c7f267505d0867deb79a648caafa0457c1825fc14e83709daf79f96c450658ebf4046bc0652b925452d085c5ff120af7ceac140d5f2170fc489
-EBUILD iscan-data-1.13.0.1.ebuild 997 SHA256 eb1240ad1e2dcf9a6d3eaad8a9c85d87de2823b7f6827be3b3ca83f2b808c7b9 SHA512 f702b94ac8cd0382b183e607240371041f7e1c3ce62475a7151722b5c245c3d83cc26a8e8f00d184e6872e5a9150ee5cf9c318ec97e664793327c8d1bf7c7c4e WHIRLPOOL 52940ac6b58a03bd1a1fe8d0c903f88f394b51d6eb65e316f37a2f39939b8f74878eeb15141faba37e046b8407ea4c9ce7eac36af71e6fdfc6b18f2fcf7b6e18
 EBUILD iscan-data-1.22.0.1.ebuild 1083 SHA256 0c4f4a0cb5af2562fa056aa2afdf07edf8d8ab5816efbb2900a14616f4b9ab29 SHA512 91660b887a7f0f3d842974dd4275e8240d2bf64d7a0388f01a294b74e558403014e7e0f4447167f9cff7532f388e3f74e2bab54e5ca6082ba106567ced9719ca WHIRLPOOL 1c3abdd991f8541c2d45975b9e4dbec70b4952d4eeee38d30d6ccb99a537268011967358e9ac15ddd943a91e53ac9c750fa59dc8fea8ebe72e2c5e278481b05d
-EBUILD iscan-data-1.9.0.1.ebuild 999 SHA256 faf479c3ade40f2924035d261d6f18f9afebc80a71d3dafe5ce39db6fe4c8563 SHA512 58cd6e4962b5186a72f1cd7234bcfb2718bf3212ebf4dfdd8065805f5c0348594c78df5479f525d641e0501b2e7a6039d0ca8e7c0ea0ff9335ac76a29ad2c412 WHIRLPOOL 8e33fd90205e015098d61275994fef1573961292367f5dc059cfd97911b4012817dda81cbfb6983cdd5894fb3c413f7cd9cc943102d2807bf951e88de81b0a11
-MISC ChangeLog 2109 SHA256 329a402b31e1e288ab787a51ac792119eaac3495e9ae8f3dc13917996d1ac02c SHA512 f8d650ee2bdbb6918ae82528e10e355d5a3eed4c0b73a2afc0cf84b02a866865b5b0f4e737f47617069150cdc36aa5014d797c9c4b053fc8bb01dc9701ebef51 WHIRLPOOL cfca6f6f7824cfba3d802cc413c0c522bc36bc5872984ccf176d1e6aad60ce9e87c3ceea84a21c748cda97534ffaaa8a5bba8a6074ca819e333186551eb027f0
-MISC metadata.xml 482 SHA256 3ef0387033da3d8a93ab6164fe749732d2471b86d38cccb7b7c504ff087de972 SHA512 6de8cb8acf6c8c9c8ad2967c7047d4bccd1d042e8432ba65afed9f20aee4117c547525cd8deb2f27c0b2a28a03a1b847173cc2e5c697a28a0d7499aff936670d WHIRLPOOL 5e89b9bbae5d92b1e1a4e0891826decb45dde16876d7b405ce1ffb84e3a3b8efc99a75edc436b02539afd26c0d9ed36dd1011eea5051df68f0c9a83e8baa9b8c
+MISC ChangeLog 2252 SHA256 d9e4032bf54f8921b9a4d1aa6d071dc6bc5dbc71e373ed1ad53f359cfb9a294d SHA512 4cc40895bf73295360c36e19b8faca38d988610cbe22d90f8c9c88ecd9bc4235002c3b9d70f02ab7eb4b68bb860091cfbad0d46f1bbc724934d1243601c81420 WHIRLPOOL dfac4cdbafa3d5e95ef75b674ab2eacae709ea03d39d529b7686bf331c89fefcf1b7660ffd6ea6119e046ba8da802fc97e5d76fca6239a2a50c23ec5e81ded12
+MISC metadata.xml 458 SHA256 c133cfd5ede1de426d43903b8dc37a7e33bad1e26b7b67a8d150f4137ee856b7 SHA512 820172578f503d348226e93fa7ccf5d18699f639fb90eed066f52870d10e621fa6e42c082059e6adde80944d1460d78792344223967b5a8fa3b27b527c9c0367 WHIRLPOOL 36adbbbf2732e05719977254d6fc03f15178fba5bcfa623dc932e74618e34e86ff653593c7099aed09892af8fe67aec37bb8191578aa2ee1fda0c2723aebabeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRmd+kAAoJELp701BxlEWfgNoP/1evfDcR2SCqMqXbiR5ED3e3
-a6Mmh+aE64qGdhwGoeluFE4rdQeh3IZuEwg+kTVme1wRNuaaFCnkyrFpAgas4aFg
-raGGmCPYcuFD1nAs3pK5/bcOY2pX8uaDTm3VEPQ0/VpQEOtihd31WzfH+/QKTsjg
-b61QT7ZT1KiU5ScvsJ0KsyQPwEVpJI/TSCiJ20k3pvLUrTkh64wDK7+XvVV38CJI
-zCcsQwWS9k/FWBvOTo2W83DJixvBXbN/TS94/mcUkLgkUsm+YCNg05O5aM3K0zBK
-E+xSr0DibLVSRHCdYf4g1XLy8bkymOQNMWXcYoc1CdUA1j4Ab0hHmuEfcQfIiT6f
-HpRhYQgEQcXauIHbCXf0Rdh2z7YOU/PB8SKb8fA1ayj8o/l+8amF2j5AeyFdEwau
-XBOPyAtLdOCXbBmudYIpk8WgZU3pOgoC/58kKVZ6I+0bJt0D7PGlIRuiIxaGz0r6
-tSbBq4fubK5gAskDl4Y0MdHcMUGZ/0Wi6nySfvpblgBRKzR1dSP4SZX30Mm3A1cd
-ib78Xgxr1W87Jt9Xplozd7EwXXGSdM9Lak2VYtlMK35BCS1HKjDMTJUgVhFX1j3R
-B67wzPNvRgOf7blJDrMopuMyu52MXHBsrCBVKu0hJSN1dTAAtcyMSzPAjEC1ZLC6
-40YIs7X7VgMQfY5Oh73h
-=Lyc7
+iEYEAREIAAYFAlHrof4ACgkQCaWpQKGI+9Qt6QCfWwoJVh4IQJMFh3Nv3qTn3CPg
+KuIAn3H3s+HwHwNDe2iZ6de/t18NE82c
+=oP7I
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild
deleted file mode 100644
index c875f64ad0e2..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.13.0.1.ebuild,v 1.1 2012/06/04 21:12:18 flameeyes Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://avasys.jp/english/linux_e/"
-SRC_URI="http://linux.avasys.jp/drivers/${PN}/${MY_PV}/${PN}_$(replace_version_separator 3 -).tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libxslt"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create udev rules
-	dodir /lib/udev/rules.d
-	"${D}usr/lib64/iscan-data/make-policy-file" \
-		--force --quiet --mode udev \
-		-d "${D}usr/share/iscan-data/epkowa.desc" \
-		-o "${D}lib/udev/rules.d/99-iscan.rules"
-
-	# install docs
-	dodoc NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS
-}
diff --git a/media-gfx/iscan-data/iscan-data-1.9.0.1.ebuild b/media-gfx/iscan-data/iscan-data-1.9.0.1.ebuild
deleted file mode 100644
index 5957b3018c72..000000000000
--- a/media-gfx/iscan-data/iscan-data-1.9.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-data/iscan-data-1.9.0.1.ebuild,v 1.3 2011/10/15 23:13:49 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Image Scan! for Linux data files"
-HOMEPAGE="http://avasys.jp/english/linux_e/"
-SRC_URI="http://linux.avasys.jp/drivers/iscan-data/${MY_PV}/${PN}_$(replace_version_separator 3 -).tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxslt"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# create udev rules
-	dodir /lib/udev/rules.d
-	"${D}usr/lib64/iscan-data/make-policy-file" \
-		--force --quiet --mode udev \
-		-d "${D}usr/share/iscan-data/epkowa.desc" \
-		-o "${D}lib/udev/rules.d/99-iscan.rules"
-
-	# install docs
-	dodoc NEWS SUPPORTED-DEVICES KNOWN-PROBLEMS
-}
diff --git a/media-gfx/iscan-data/metadata.xml b/media-gfx/iscan-data/metadata.xml
index 71be5e00baf2..67f43110d545 100644
--- a/media-gfx/iscan-data/metadata.xml
+++ b/media-gfx/iscan-data/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>sbriesen@gentoo.org</email>
-		<name>Stefan Briesenick</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Provides the necessary support files for Image Scan! for Linux,
diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index baa9d61527ca..f65d34593e11 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.54 2013/02/20 19:35:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.55 2013/07/21 08:55:59 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> -iscan-2.28.1.3.ebuild,
+  metadata.xml:
+  Cleanup due #92799
 
   20 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> iscan-2.29.1.5.ebuild:
   Fix QA warning (closes bug #458098).
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 652e2758c17b..4d2236ff4f4f 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -8,24 +8,18 @@ AUX iscan-2.28.1.3+libpng-1.5.patch 1466 SHA256 4d0679a7e9d5b5cf247fd1559474bd26
 AUX iscan-2.29.1-drop-ltdl.patch 2107 SHA256 e81e83b3b3b95533df6a32358617497340d4ef8abe9c23cb784d6d5a459bd10e SHA512 593f9a8c7a85ed4e379553c63a75eec09965e803f2785456a4416895cb2d13048db8c7d731bd427cfb4049386a1270b676edad5cc92c354c7e2eaa4542d930dd WHIRLPOOL e5533b6ced56d4607338ec121e458a6ed89fc649810c1713044b864b572fd89892d3c78c30a7cf48d7e1178b8855f694caea51213972d6bcf9d90cd1ab05d9a9
 AUX iscan-usb.sh 826 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab212590162526d4af669798 SHA512 86382a42031066b11e32680b3d44be0163fdeee938e42e599d8895b7c0909da1b5c32559189da3741175889daf64d5d80ecef91dc12e2d7122c2fae037abbdad WHIRLPOOL b3926928aeb38ede12c284c58e1c9948d21902bc0f84b0c02160faab4b3f89a4206efca5a2cbbc06d15b7e5c85eecd70c7f1d55f87426e1ca80d3cd2b76ae5b0
 DIST iscan_2.26.2-1.tar.gz 1106921 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659 SHA512 82655969a8c0a7006d03d570158219f036cf5fb3fd645088177cedf52c2e30325e85c888c254d8342997ac3ac70b943402a4922cc95f66820a640ed572fd55fb WHIRLPOOL ad905f9cd8ff497f0821fa60d6b44e23e9010f7c5bdccb2fd13f7be50dd7853461da21dd515490d75914c3153e81764f244909411aa227e2df29c389a1910897
-DIST iscan_2.28.1-3.tar.gz 1195938 SHA256 97fbaf4d66697762a32768b96f3ecb59c3582b6fdc1c1919119f8b73aa2d3b13 SHA512 0c7421d3b06ced928dc0d25376eff88496d2f90e61e19c28cd74b403012b6c23652bd5d2f5571aa793e453834604101668ca94c937afef3d301802d286375004 WHIRLPOOL c880672c1123b44e040089797cb6f95b33f708a518822117ed438485cb562804889b45a4e52702886ac7cd5ec86c978cc42135c43b531ad39ad893fefd6958aa
 DIST iscan_2.29.1-5.tar.gz 1217266 SHA256 7198b5fb081bd1b6dd3747ca645c9d36ab1fef03970803145ea3d31d2c1fffb4 SHA512 945dbe0e55670b9172a455f8c067e3175aae88eff79a900fc1d5221c2246f06daadae16673e6a7bd6a0e00f6fc810ed16d5d1f6c7e93237d64dbd1f81416e20e WHIRLPOOL ea9cd332fbbe1f20a843dc45fb1b7edca617b127440f78938c399f763f70d32951a61069b5313c1d9e5fc6e534d9c7b32e15b9fa9638c2521a0bcfe9851d145a
 DIST userg_revL_e.pdf 574224 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876 SHA512 59cb65ed90913669a4f69fffbdd8dcd1965eabad482f08302c384e9aa75252acfe68470f66ae8ac29cc2b4d109d9395115b9723fbd9cbcb31d2847c55fcc4c18 WHIRLPOOL 082cbf872e43604c4359ed7388aa2cd2519aead961187230a1232592b3952161c850fb4c060a787aefbd4bc58c2853a1489c0144687afadd45e65affcad04289
 DIST userg_revQ_e.pdf 627189 SHA256 7f40dfb94bf747a5059c17cba21e72e2485226ea41655453d010b46ed96e8a1c SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc WHIRLPOOL f1497a87ad9b991a05a7a93ff5603944b1cadf00b5162498ff4c0ff1d85615de922324ee5574d0f8540e2d44fc2dede2a25157e562633f51b75eb8e4d4e56dc2
 DIST userg_revQ_j.pdf 734920 SHA256 22d29bd17fe8c5772cdcdfb5201eff54eeaadebe3c94563ee4fcfc04579a1c4d SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90 WHIRLPOOL 0f567a4d3543ea0df1d49e92211ba3811a03f200f828d4348eb00bb695df915ae75001faec52d616ff98d4da617ef6cfe95795ece33eeb114b0378892294647e
 EBUILD iscan-2.26.2.ebuild 4344 SHA256 8a35b66205209a1deb2d88313928b7b109b71bfe3c93b2045c117c85d337104e SHA512 51337cbab6633b4790a2d06dc30674e4bb63b3d5b86747f74f9cdbaf359ca76ad78e0a222493515f2ddce66589984cfc1ba88fddb1580fa4a28bbdc1c260b5da WHIRLPOOL 1d8855152ae5eba2e17d8445c36717f9005c4e3a84f909140b3942d2675cafb86615ff40c54c21bd7dd8138046bcb20d5e02432ac157fffec3613197e6f4515f
-EBUILD iscan-2.28.1.3.ebuild 4415 SHA256 b4cb4945fc2a3b3991886616482effcdad192eaee2f2aa3eab4ed5cc115e41b6 SHA512 9a2289ba0a430e7a8c5a13bc13c8d89de9b00b4654a5aa2c06ad5266c105b12147a3175ce7830932cf2ba7f4cb775eb09c75cccbdbb0cd7b97776832d82ec0cc WHIRLPOOL 935fe0bae0dff80813bfc6794ce1bf34cf1decc6aa4fe22a9e9e40d91c7339b795a4dd57a57ed4cfb8b3bad6ed40225c0134ab11f63631f16d68258606c03689
 EBUILD iscan-2.29.1.5.ebuild 4622 SHA256 797d9e67441b7f443723e5d18bbd2646d043656a070e2d5cf80e9649e7281308 SHA512 4e7ae5faae526092e31b0b28d1d4e0e3179114d65ec52271fbd8ade4b690d0c6afff9da67a7bca0995aa9d50dcc51f976cd62373bea4485d6a1000d87615db32 WHIRLPOOL 4412ecff990a1d917e786cd0511b3f47b9d790d94398dc7cf0f764a2550cfe88224d548e274297ce0dfac9a1be37a8bc545fd2316925f6bb9f027e51f363e7da
-MISC ChangeLog 9521 SHA256 82d190faea7e641271c2a4a9ba3d7e125e65eaf75851d319df71a8dc6d3bdb76 SHA512 684bb65af875a55ca797b5bdf28ba8b1c2fea8f688df145093b84720205a9fe418369ba35585ec841e461628ffd663016285ff9a34eef16bc2cc78e39cca8705 WHIRLPOOL 67fdc0c095d77ece24b26913f37ca96d38ff3b9abf157e79336e1c1330696c9a24b55a672f86ae17d81e608d9b93c3cf0446732b7c08f8749e3e5173be1fa2e3
-MISC metadata.xml 652 SHA256 2eb198fd36ab27077883685af440e0fdfc372c05b4f2df7b8d27ee51eb9bda63 SHA512 04145cd6e675054c4da522093a6e2e61d9f2aa8598dd145127a39f389e3799bb2ce3bb294a2320fa6c7e133e28fced649341b2388f6cda1f1096ab110190895a WHIRLPOOL 50f1de575dda02127e7768a96504446b77aa5c7ab6c23702259845cb872df51f212c9e502ecc656dc7ae6083cced4b7c77eeb79b77f44c4ef276dc8679633dc7
+MISC ChangeLog 9625 SHA256 2404919e28cdf51dba5e06453c7529630dcd8fa95edf4e29a9b09cb28b7c0eba SHA512 a031a68799048417ee858494445163c9c049fd2d6e49090c14dc9d3107796cb7c331770ccca758731b3262a7e0b8b43cc281a28123a4ed44d41be0a64fc50849 WHIRLPOOL 2f45a762646d692a22185bdf6d6c7444bb84482bcfd6747493e55432f83fd858b70659ee6306209cd12631a1148e03625a85a8f24f75bab1758bf79c60caf5fd
+MISC metadata.xml 628 SHA256 2ec1adc22559628a8b38df3e0afe8a047940286facbeb608deb046e6398fb51f SHA512 60356da3aa650bb44b9e256372e4917b28aee035265d5eeab11b1e5e7a588c19a65509b6007c762ac27ac6ac8eae59d879b10cd5a41803e5f1acb957fd4b2f9a WHIRLPOOL 9f4e1d0baceae8d683dc52a7a2693c410123fbdb1657bce7a46eb8bb62367dc1708da1c1e03ebfa51674fd678cca82c5e50c323474cd4b2b855a890f76541663
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRJSWVAAoJEBzRPIrUMBNC2fQH/RQJWWoTenGTUFVEa3K2FHj+
-q2Vn2+bpesoTvwXjZ94j8rCLw7kD4b2iP67KMxmZwVfrTQ2ejZlcQ9B1o+w2V5g0
-ibfxh82D+6axWenrpiPucPgKrtqyfNFk5O2qODyotdrgwhkFJ2XMMGQQORfidmZX
-71NKLgKJSRhaGx0+el8zu4mQD2Bt/SjXFZDUYl0M93S3eGca/Ntu6pudRTTi2FR0
-BIt0FbERHqmiYI9tCcDhUJJ86x7F9PKE6GRH2NBpVu6q0xYdMLgzEUnqy3Jxa3Nj
-rr8QYc6x6K+ayT4P5Dk+7ZZiMZkTP3pcsHFiSCmWEex9/MMXQD78qposZsgsid8=
-=RASU
+iEYEAREIAAYFAlHroiAACgkQCaWpQKGI+9QONACaAiWIK9jArK7lYRenS+ogcY7R
+Zr0Anjmq+ofQUsoY0J2r2uRFLRU8R2/M
+=bIb2
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/iscan/iscan-2.28.1.3.ebuild b/media-gfx/iscan/iscan-2.28.1.3.ebuild
deleted file mode 100644
index 19640ad31ea5..000000000000
--- a/media-gfx/iscan/iscan-2.28.1.3.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.4 2012/12/11 03:42:44 axs Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools versionator
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# Make jpeg/png optional. The problem is, that the configure script ignores --disable-*,
-# if the corresponding lib is found on the system.
-# Furthermore, iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-KEYWORDS="~amd64 ~x86"
-
-MY_PV="$(get_version_component_range 1-3)"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="http://linux.avasys.jp/drivers/${PN}/${MY_PV}/${PN}_$(replace_version_separator 3 -).tar.gz
-	doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )"
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-
-IUSE="X gimp jpeg png tiff doc"
-IUSE_LINGUAS="ar de es fr it ja ko nl pt zh_CN zh_TW"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-RDEPEND="media-gfx/iscan-data
-	media-gfx/sane-backends
-	virtual/udev
-	virtual/libusb:0
-	X? (
-		x11-libs/gtk+:2
-		gimp? ( media-gfx/gimp )
-		png? ( media-libs/libpng )
-		jpeg? ( virtual/jpeg )
-		tiff? ( media-libs/tiff )
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( sys-devel/gettext )"
-
-src_prepare() {
-	local i
-
-	# convert japanese docs to UTF-8
-	if use linguas_ja; then
-		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
-				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
-			fi
-		done
-	fi
-
-	# disable checks for gtk+
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
-	fi
-
-	epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
-	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
-	epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -D_GNU_SOURCE  # needed for 'strndup'
-	local myconf="--enable-dependency-reduction"
-
-	if use X; then
-		myconf="${myconf}
-			--enable-frontend
-			$(use_enable gimp)
-			$(use_enable jpeg)
-			$(use_enable png)
-			$(use_enable tiff)"
-	else
-		myconf="${myconf}
-			--disable-frontend --disable-gimp
-			--disable-jpeg --disable-png --disable-tiff"
-	fi
-
-	econf --disable-static ${myconf}
-}
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# install docs
-	dodoc AUTHORS NEWS README
-	use linguas_ja && dodoc NEWS.ja README.ja
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# install extra docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}/userg_revL_e.pdf"
-	fi
-
-	# link iscan so it is seen as a plugin in gimp
-	if use X && use gimp; then
-		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
-			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
-			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		else
-			die "Can't find GIMP plugin directory."
-		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/iscan "${plugindir}"
-	fi
-
-	# install desktop entry
-	if use X; then
-		make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-	fi
-}
-
-pkg_postinst() {
-	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
-
-	elog
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF}
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 061712b87814..1668e191f084 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>sbriesen@gentoo.org</email>
-		<name>Stefan Briesenick</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		Image Scan! is a graphical scanner utility for people that do not need all
diff --git a/media-gfx/peps/ChangeLog b/media-gfx/peps/ChangeLog
index ba72fd7552e1..e9bea644a7d0 100644
--- a/media-gfx/peps/ChangeLog
+++ b/media-gfx/peps/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/peps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/peps/ChangeLog,v 1.6 2012/12/16 22:48:51 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/peps/ChangeLog,v 1.7 2013/07/21 08:56:16 pacho Exp $
+
+  21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Cleanup due #92799
 
   16 Dec 2012; Ulrich Müller <ulm@gentoo.org> peps-2.0.ebuild:
   Fix LICENSE, see notice in peps.c, bug 445830.
@@ -23,4 +26,3 @@
   16 May 2007; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml,
   +peps-2.0.ebuild:
   initial commit.
-
diff --git a/media-gfx/peps/Manifest b/media-gfx/peps/Manifest
index 78cd2bee5644..37405cbc5c6d 100644
--- a/media-gfx/peps/Manifest
+++ b/media-gfx/peps/Manifest
@@ -3,22 +3,12 @@ Hash: SHA256
 
 DIST peps-2.0.tar.gz 55421 SHA256 b514fed9412548cdcf43a95b6dcf01b2038f314bc9ef363498ebd2779c897a91
 EBUILD peps-2.0.ebuild 1350 SHA256 84cdbf0efedc5a54c64ea7935e5be5ad6067652925123d0a3f9b226a7419baa7 SHA512 0d3f7072fba504bf324db033c87d860b7f41a6e177351c74db1db78fc7d8fe06a584c8eb5b89a45e550897af048da264e9a561007daedb3fa53df12980cbc9e6 WHIRLPOOL 72983fdd687742d48699961342dfd2bf410ece7c09da7e1fc8e2b6648cc89b978b299c76a97196dd82ce4286de2d2e267aaa8515afcfa84c402673c8bd9feb0f
-MISC ChangeLog 964 SHA256 bbceafa12e9b9fb66f5c81281ec365414749ce02467161b475cca502ad5347f5 SHA512 d3aad2979c028810272c3f476dcd7d807d878c0ba56dd856521b41b8102b6d9bb096cebb5023fe2a9261f48d1e18638e5c2b9abd75f9c4314c9cb9817ff3ed7c WHIRLPOOL 8cfe5f05a5131dbac22704226cccbcdc042d8d42f93f701da10451a376323a28f06f207beb40bb89e98d12507ba6deda0490f688fb722f135ee3f7764b025055
-MISC metadata.xml 583 SHA256 8b578d8a533b7a3265c22d9cc44001325b4e8fe0a3f318e36ee501d642697186 SHA512 5284f2b35f841a685f1885398059b95d661783463c0648693225eb029581e0a34b5b6700ba9966fdf3b0f395ed1c4bb0d52ed62f78b9ffab40565734680320a5 WHIRLPOOL 8d4a759268cec4187c3f236770d678fdac7c1a12199350ce470672a905e01a079ba1ef65833450bfe1598f6978e105e1fb1d84c399d6c4ecb4fddfbb1a3e4290
+MISC ChangeLog 1047 SHA256 efadf2ed2bfe46eba773e2d3e6870db8cb6ab6340a1440fe8ca5c303fa9e75b4 SHA512 df7df50bb519f53767c34c1b15d16cb0f918d28931cb5b7d78bae04a132c3a9b4b85c8b732885bdcbf743ae0347995a4271a7615d41c655c57cc5eaf6234a7e7 WHIRLPOOL 67464250e4269456124e9a2ab06daf3165d58911357d4c1908a83e74360dae5329deca23c80d39e310c689fa5f10c85dd75be3998ee509fd9d0ac870e2789675
+MISC metadata.xml 559 SHA256 a99a7b946f45013489e503e94b56f725fae48f966304cee1b40f9bd51c4958a1 SHA512 b1b86e2d9cd99d751f92296b7fa2ddb8d9d7aee3c15f7e362d06da6635d5277bd8f914d82668bcd0b4e1b2e14476aa1c8f51a547100dc9064ce4e38d1d85dc62 WHIRLPOOL 1a6eb6bb1a727b0f2ff23cf6bb4095e831f191fde5f01ad8f2bb7d5d8a22c501cd57c6c0e13aca02267787fb632bba3131262c54cce9dda857a3b84a4c931516
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQzlBGAAoJEDxpGckxwJCBuUMP/1myCcaqMNbtggWo+RpMULjS
-8WWTfLm0S42i6C3FYvrDZjgl1wMHX/v0TXmtMUm7Z7RwKypsIGlUnObstj+DAEct
-X4YE+2FZjkmk0asCbzT1OGuuGInIBN/CeozvzIkILwMFPGltllmmydL1/Bi80sTD
-FvoV1VcvN3PSxsTErH8cvOzfb7a5nzoWVWSjJNuPQKkmaVgDbr7W3e87q8FHriRd
-NZgV2gw9H6hyXopzx8BvE8P7ymZQzsFjInWYmWwvwZECJkoQEiWkiwvlwMEhAvMo
-pj33v1Fy9fda9BDJOe6iLpeq2ZtHpxvcsZ7Euc1r3VDKmBML7eVzTa7fC+jM1Uou
-ZuxNwJBmfV+smu3IC9qSVmYe4Y2RCWPoJHxHhLuwx4YszkXQpE8kBCKHhGqlWhmB
-Ec9+i7dSL8GPbh5A56Wv9Ahw+1KsxOssJEnobE59yE+D7ZXReK7GSQ6BVv87ISqu
-RqWCunvEnO2bNp9gr2/UZs+j0RlDRaDyQmm0f+2kBOsKOS/83Tn1s6ceSkggDtAs
-Y50xX8E+2LpIUQf3m+PTXxJMLUfWZS/XjumTvWyriknSf1JJuatxTA9BspQslZhd
-Qm7pxxa/BXaBr19LLeBcBFYx0dB0uWquKmVyf4ZOGElKM3srMsmsMvKnVLH1e7io
-yycQ9T/z+VZqCT57wx5z
-=5YXD
+iEYEAREIAAYFAlHrojEACgkQCaWpQKGI+9QH+QCeMDr9BJ9sEvJ3Jhdq7Q6SID52
+eF4AoIM0O4JOrKZa4MFp3URhZXXc6m1L
+=Z7DM
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/peps/metadata.xml b/media-gfx/peps/metadata.xml
index 47c75301d73c..3442601e4dfd 100644
--- a/media-gfx/peps/metadata.xml
+++ b/media-gfx/peps/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>sbriesen@gentoo.org</email>
-		<name>Stefan Briesenick</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
 		peps will preprocess encapsulated Postscript files and allow you to