Remove old.

Package-Manager: portage-2.2.20/cvs/Linux x86_64

5 files changed, 6 insertions, 407 deletions

diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 2e50a4fece44..929b666b4319 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/exiv2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.140 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.141 2015/05/30 14:22:49 mrueg Exp $
+
+  30 May 2015; Manuel Rüger <mrueg@gentoo.org> -exiv2-0.23-r1.ebuild,
+  -exiv2-0.23-r2.ebuild, -exiv2-0.24.ebuild:
+  Remove old.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> exiv2-0.23-r2.ebuild:
   Drop old Python implementations
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 6440bdd1efab..7f0285896a97 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,33 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX exiv2-0.23-boost-fs-contrib.patch 9558 SHA256 1734a14392e6706305582b9099a9ff781e3327fb86d4d0ed6c0cb6fe60b38f85 SHA512 3abc6ae75940de6960afcfeb382754ab9f48cd4e311cdd2e00c644774c1141d2bc9ff191e145f7d37362e3364446a32f4fdcc142f0e80ff5bf8880ed18c5af26 WHIRLPOOL 7164392d53fa5d18671269cf0c6c69813527ab046c19cfba2a1a97e0430ac617f1330f1d75e197e48a84d1fcb10942b79252a96e417bd1dd61cdc9fbf04cc1d3
 AUX exiv2-0.24-CVE-2014-9449.patch 996 SHA256 3f51b8c92dbc61e0058ba4ce3e5bd613dc0aed6c7f145bb3c163cd43981aaa8c SHA512 e5ce775e1760508841ebcedd482e47eaaf82b3f18dfa774e579ce544d25ba990f476ed2fa351724a08c76d4e93f1278a56903eba5f2fec012831524108e7b5a4 WHIRLPOOL 6b87446cc01c9bd2da5bbf360c42f81606b962710245ee31bc1dc278ee67613c6ace1cba2237866216e6d44d479254d60f575ccd62e835caa2ee24e7f3ece28a
 AUX exiv2-0.24-python3.patch 939 SHA256 ea015f41c4d3a096cd97b9f0a3e1d8507a3d5e57faac5f2adbc993a577393489 SHA512 73ad4d44d61f428cc6bad8558848d15fe6d231a1e84dfecd6ecb634d191d8cd8e3a778d53376cc0896dc9014fc95726e8a3c1ba5f63e505167750b6a24aaa99b WHIRLPOOL c491dcd981e7940bab66830fee8676d9af8bff5905227de913c1f11d4e210fb6e1ab0d054ce9c4eacff4fe1b361f4e2b4e6d5accd1953bd0ecc967be477f9e1c
-DIST exiv2-0.23.tar.gz 3524381 SHA256 81fa50900be7ab16e24c6551252c21fc97abcfe855fd32c8f7ec55f398786b11 SHA512 5719a9129f0c991c2966fc9bb65021d501ff7ac193f0b1eaabed9044e7dcc331cb41a149a989fc20417ea07ee20e35a8c91e0063a81b9e2d6c3fae033fdaf39a WHIRLPOOL c80e8f7cc988a5aed117cb8d545dd126e1a9f188efc3c364debf2601d49e0d166709c2ab0f7d8dedc439621fc4766bce731ceb9deb0fde35ecae563bd424cde9
 DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
-EBUILD exiv2-0.23-r1.ebuild 2971 SHA256 54408b5d3ead00b89fdb2d35a1e64ed23b3c7a0027c2b288cb9b62f828b98792 SHA512 6ae58afa22b3d8dde7d8e0b94393e31fd054825dc80c288baf44e30fa8d4ae1bd44bf697934d79ec2ec544f0ec527301d7acd1b2fac20d8562d33a0c24561a7b WHIRLPOOL 49a2083b8e8926e70714ac291983b1adfb48196bc76087e427c13b7f093440378cb07682d9fac19159b089baaabd5893a8e21a5dad6deae29473962ad9a6d197
-EBUILD exiv2-0.23-r2.ebuild 3228 SHA256 0b7f66bc7c6677d6e489f6a6a1e8f04df0a031236dd115f8de1e8fc361b044c4 SHA512 fbf4012d743c4bdfa17cd6388518badfdfdff0a865b6c602f828b222da77a72b42712cdcd887d4790839b4793490376e548d1e385093b805d4ba51ea910bad38 WHIRLPOOL f3ea200dcff941b4a596c6f819e54d4f8ba0f377f4c5cd3b7f8cac8ac9c0268ed2433ecad9d48d688e5a1ae0779c2dc5cff577fb44e934910f00975fe3492215
 EBUILD exiv2-0.24-r1.ebuild 3523 SHA256 b2c1ef277e6e3305fd2c690bd7ea953e710b423ae60cff0cf9cd2c672ab17c46 SHA512 212ea5675f7c640cbf659c3cdad0a72bec661f5dc0b684146c5107cad6af42c8bd9738cc1f7d54183b4a0129e68364c40f6ce13b489aa2e1b0582023d56b542d WHIRLPOOL e0981e121531278e2b530370c0f7e181959e107cdf071284045081cd475aef57a33b70fcbb25162684d2e550e560854de32099570579b5e1dd211e5f1edcec27
-EBUILD exiv2-0.24.ebuild 3476 SHA256 187bf01a9a519a27427508ef94278a61a681288d67b4f50d54f25d1e5a172447 SHA512 afe3e16eada5dcec2403e382b7bd7beed7a95dc9946a7a1374fcab3ed4376da39ac9df160b8ef11bc23e3a9c493edc18ff5565347bcd32eb40b44ef45efc7f3f WHIRLPOOL e29aa38908e497aa872ade6176ef56240297503ed3e00c8fc3fd35c4bbf6d9c2509bb259e1bc678c813575c0dd9599ef4ced4c88cfe64027ced66948b25f5855
-MISC ChangeLog 18015 SHA256 7db4773cc21cb8ae8f0d66200d09288bc7c5db529d0e110d412544c87ab92b2e SHA512 36b0805cff33c88c78a849402b2c4a12f824511f4e3665c44ba8d0cb5d179194b4f6f3e7ce4f5e03fd48e9636cdfa57e88fcefbb9902b198e3d2f324ed6451a9 WHIRLPOOL 5698104181a1b0d3cda6a9cdef9d24c2f4fa90e48adb7cef41c1450dc0706b8ab0b04f9f3679553b233b1221f4aeba7224f75cdb7fda6843e16e3249ff1de63b
+MISC ChangeLog 18145 SHA256 5a973e551b2244f4f36a767d98cf41bc8bb61789fc40a7809cc5a98ebe80097d SHA512 3d54f43d175e49db9e5d727eadd616fbae08e2fd1017ea6382b818bf6ec300b782d62eb037b4859b190996e63fb963da4eb7862c00c5f24fee7da05a875d69f2 WHIRLPOOL 2ed9a6717cf228be16bd1aaf6cf4820b02afbd77952685c4d8fe7cb49707c61f504c05053bcb5223626ce9b0ea22ea9e7d308b35a7a80a0c15676b9f8ca5af8c
 MISC metadata.xml 419 SHA256 b23b53944ad27145ff517ae6e120a7788b6417358e340aaba5322897b697c810 SHA512 020bb5dd8b13580d300d7931e0d3acc9ef3d43881e06a3548dd887c05a4867493b9ee20464327d007841a5d793576008c464fed384d9dbe25a4ae6be0ccaf073 WHIRLPOOL 46b25df6e357034b8ddbe150cbd9c2da15f65866c4b8ce360d88941be536e39cde8c6189f7c18355dc15ef782ff96d3c7a387d92f28c01137d48aeb90509ae51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJWxGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJUQQAMKlWOHnpaGnu+yRxKVCx1Gg
-YA41xL3IB2oMctodWtaOrRHxuh9WT6Gnd6nfrxZx2o/q3+dnIWh3D4rJTaLLAwyR
-inFE44CMJ6WIqVKsNUJrHNE6RAMiYBWWM+Qi0/vrxDgx8fQxyU+2Ivv+zyQwMUMU
-V7q4iKbPjedh4p5Y8CCn+u1Vlthdcql2yQt4E1vq5ADXoRDnBwH0fp7YmhJqZ7M0
-tTEnP8f08aalUajm0E4Yg+Rrfu2Uau6gx7caocZQVeZoEDSVJiAKrSw0qZccKWb1
-8k8NvXqUUYiD+fGgjme44+yKZ2Gez7SuK2JYXy6CDsVVMTkAj5fCckhjJPlkwZA+
-HUGMOjCYUYA1+NWPmWiZACvGyl/z6SEOEDHxqdJG2jtBnT2jxEu/3KyZO3+qf1ZY
-BZ+82+JOoKnJOBa1jnZmDFFx3yNZ+/57/2+DEBveQaoIeiAyVBwrE7eff83afbzt
-VkuCbhSIvcb/S0ZS1BTahoAQEP8JGtwOBvyZfgqB7ZUKpZ8ZxaYsldWjlKB59XxY
-WKzfJsCj9XKxEQIMCo0AfgdmHMk1IygUNOXEOueG5p0NqeDgWO7lCPRd19xCu5nG
-/Z5QZYeMKSv8+Rgphjj7vTbTV7YCKM0LtczvzxaqBPjL1vvzYhHNlOGDoU3xmEYl
-Jyoe0lsuh5sEsFZhMZjA
-=BJLD
------END PGP SIGNATURE-----
diff --git a/media-gfx/exiv2/exiv2-0.23-r1.ebuild b/media-gfx/exiv2/exiv2-0.23-r1.ebuild
deleted file mode 100644
index beab8734f400..000000000000
--- a/media-gfx/exiv2/exiv2-0.23-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r1.ebuild,v 1.11 2013/09/20 14:35:31 jer 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 ~amd64-fbsd ~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.44 )
-	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() {
-	# 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
-		epatch "${FILESDIR}/${P}-boost-fs-contrib.patch"
-
-		# 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
-
-	# set locale to safe value for the sed commands (bug #382731)
-	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile
-}
-
-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/exiv2-0.23-r2.ebuild b/media-gfx/exiv2/exiv2-0.23-r2.ebuild
deleted file mode 100644
index f59b9136a162..000000000000
--- a/media-gfx/exiv2/exiv2-0.23-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v 1.5 2015/04/08 17:58:14 mgorny Exp $
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib toolchain-funcs python-any-r1 autotools-multilib
-
-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/12"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	contrib? ( >=dev-libs/boost-1.44 )
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-		${PYTHON_DEPS}
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-	fi
-
-	if use contrib; then
-		epatch "${FILESDIR}/${P}-boost-fs-contrib.patch"
-
-		# 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 || die
-	fi
-
-	# set locale to safe value for the sed commands (bug #382731)
-	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile || die
-
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable xmp)
-		$(use_enable static-libs static)
-	)
-
-	# plain 'use_with' fails
-	use zlib || myeconfargs+=( --without-zlib )
-
-	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [[ ${ABI} == amd64 && $(gcc-major-version) -lt 4 ]]; then
-		myeconfargs+=( --disable-visibility )
-	fi
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi; then
-		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"
-		fi
-
-		use doc && emake doc
-	fi
-}
-
-multilib_src_install() {
-	autotools-utils_src_install
-
-	if multilib_is_native_abi; then
-		if use contrib; then
-			emake DESTDIR="${D}" -C contrib/organize install
-		fi
-
-		use doc && dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	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/exiv2-0.24.ebuild b/media-gfx/exiv2/exiv2-0.24.ebuild
deleted file mode 100644
index fe5c4c12560f..000000000000
--- a/media-gfx/exiv2/exiv2-0.24.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.24.ebuild,v 1.9 2014/12/20 16:50:27 maekke Exp $
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils multilib toolchain-funcs python-any-r1 autotools-multilib
-
-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/13"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-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-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	contrib? ( >=dev-libs/boost-1.44 )
-	doc? (
-		app-doc/doxygen
-		dev-libs/libxslt
-		virtual/pkgconfig
-		media-gfx/graphviz
-		${PYTHON_DEPS}
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-	fi
-
-	if use contrib; then
-		# create build environment for contrib
-		ln -snf ../../src contrib/organize/exiv2
-		sed -i -e 's:/usr/local/include/.*:'"${EPREFIX}"'/usr/include:g' \
-			-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \
-			contrib/organize/boost.mk || die
-	fi
-
-	epatch "${FILESDIR}/${PN}-0.24-python3.patch"
-
-	# set locale to safe value for the sed commands (bug #382731)
-	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile || die
-
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable xmp)
-		$(use_enable static-libs static)
-	)
-
-	# plain 'use_with' fails
-	use zlib || myeconfargs+=( --without-zlib )
-
-	# Bug #78720. amd64/gcc-3.4/-fvisibility* fail.
-	if [[ ${ABI} == amd64 && $(gcc-major-version) -lt 4 ]]; then
-		myeconfargs+=( --disable-visibility )
-	fi
-
-	autotools-utils_src_configure
-}
-
-multilib_src_compile() {
-	# Needed for Solaris because /bin/sh is not a bash, bug #245647
-	sed -i -e "s:/bin/sh:${EPREFIX}/bin/sh:" src/Makefile || die "sed failed"
-	emake
-
-	if multilib_is_native_abi; then
-		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"
-		fi
-
-		if use doc; then
-			emake samples
-			emake doc
-		fi
-	fi
-}
-
-multilib_src_install() {
-	autotools-utils_src_install
-
-	if multilib_is_native_abi; then
-		if use contrib; then
-			emake DESTDIR="${D}" -C contrib/organize install
-		fi
-
-		use doc && dohtml -r doc/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		docompress -x /usr/share/doc/${PF}/examples
-		doins samples/*.cpp
-	fi
-}