diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 4e61c890083a7..2c4451aefa33b 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,9 +1,6 @@
-DIST LibRaw-0.16.0.tar.gz 1472935 SHA256 71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96 SHA512 192e0e78e8f32235618007d6917f92153e7cb8a2d83ca0933f21d4fce3d550c507f5410ba18d86b0f0a16b0ac81ba8cc4cf788fa217080507ac0b3c39e51a9ef WHIRLPOOL 0a74ea969ba77f1b9509c5a576a05c1fb50aabc1f1650e25e84b023bbd56581b1b16024e138a2587fe1210c34b086a66d69c77ee13163ca43bb4310c6ca2b4be
 DIST LibRaw-0.16.2.tar.gz 1476575 SHA256 6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187 SHA512 c8fa974b72c1e2d255254527ca241a059b9a2e0943044c1b3c85257f987d451305fe94b4b901e9efd90ebab71ff602d442686a710c205d51862e88b2dfd13855 WHIRLPOOL 94f5fa4eb100a478d965516dd3c9048ca47bc0253bfd0482ebe3f410269e863a0f484c18bd2e07d44c324dbdbd84c1fd1768466b2b23e6909bc7d534f2a1f9fe
 DIST LibRaw-0.17.0.tar.gz 1468635 SHA256 e643c20945d548aac1eaa1f5573bf74050e0f49ec6a53a6843dc2a2cfb647310 SHA512 a9a92879fecd484b09f31f92da8a7e1aaa6ac48cd6f42f42502fbd8e41f99a644415f21532e4934471d2a109e9eb4fdac50d431c0db72ede9736a53e12ad505e WHIRLPOOL 92aee1c9e52b76398ffa22e5a7702e31bd089281f2cd16aab7ba545aafc3416cb4fdee0cb44b6ce3970b6cce862da22ec33b52e2ade33cb09dde61e9a51ce018
-DIST LibRaw-demosaic-pack-GPL2-0.16.0.tar.gz 31663 SHA256 749d49694ce729166ec7a1faf7580780687ef190c756931bb075455ee8ed6697 SHA512 807063cfe292f19a0f7f7c2be532983843480ed43768f97753aa474bd64335989b1816b370fb43b3be2e265b5fa9ab9a27639b3cfc9919e81311b1d260f09d03 WHIRLPOOL ae1ec29b74a7a67ad1bd12dd3b9a4c5f26a97cb5483b975e3f0acdba0caafa809fbb5209a0289520558d611e5b1e7fe54806898f0d94b26c285862cac2257bae
 DIST LibRaw-demosaic-pack-GPL2-0.16.2.tar.gz 32652 SHA256 2218f08d59866e7852938356c197b96a6f47d0b9221a261280e010540477e77b SHA512 e41574f48bd3cda5755503b2693859de47b98064611771b9d950a198ad8f197c929c959de18599033c91fc7200d883074900e74ab154a4354d198af98a460903 WHIRLPOOL 56db7577a9a77347ea1f14a52e02925ef6191de1b1a98d7b870bf9e2fb49ffa460255ae5c662f01ef138346d23720333976d5029ddf91ccd99c13ba8cda260c3
 DIST LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz 31281 SHA256 3c5982772f55f0b70c3c7604bc73e8b55f1de7b040e8f144cb220ee88e8bc346 SHA512 eb64ae5f356e276824522a400fd9763e4ef0afc7e3fed648715e52175fb9a17a611110ee90f2465d260c06b92a899ddf2e649e6ed3c9441b8e2fb0b1a4a9b5d4 WHIRLPOOL cab107fbe6adcbda5b4c3806a13d9306a14a6bb2dc11008c6004f1d05f3e16aa4359db43c4c651dd5761858b97d0eb410f17d9f115bee276bfbee26701e892b9
-DIST LibRaw-demosaic-pack-GPL3-0.16.0.tar.gz 38791 SHA256 f2e904f9baa7d173b5ade163c795f26e110255a758e31bd213086a5a61500b5c SHA512 c01b9dfc6fec2a85cbab0bf2b45a7de93e378bc1fd1e15381f8ce9ed27423da0f5230568143d87d442b137d0d2f4e20241fe7084274b1c40c515086e0425bcc8 WHIRLPOOL 62d7ee33e406d6bf32aa28b424e717fa37d892603396cbada95449e1e834253390c76a8f273ddd3dd8d54f4a2517e186ef33db8abe5f3d3aae64d475fd8625ae
 DIST LibRaw-demosaic-pack-GPL3-0.16.2.tar.gz 39457 SHA256 749b5baa3a4f1f5c4ea4169b9293b02b0d2a0714aa01729327f23f82621c9735 SHA512 1cc1ea98f544ac485a797718448e138d3aeab7d4bfce77706161b42ec1edf265e177437ecff2a58c452048102359088a326b0bb4aa63b3d79e76c6156c9374d2 WHIRLPOOL 470a3a673671af6057e4baf268e63742192c3cce88a7dd1cdf7b793d51da2dcf641a6c9b11059b13d82507ab726355c84635eb926a634822b344454ba40e5e65
 DIST LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz 39153 SHA256 deca57ed524ab4f9915060360d74c5748e6fe8065fd60ca5e969fe9f578a8a0a SHA512 71a11cccd681978f89e9df6dd0346da45cb448994f82be73f92fe47acb810dd31dde2e20b4e47c6527ae0b8dfccc685c3b68ab67f9a183f8a44b7df8f80aad4b WHIRLPOOL 79c82fd2beb378e56209310a7e1c8061738b37ff582dbcf7850b4f7c176f36c0e410ecc3bac8ac7f20c68a2614d66ed0c4c98268478a6d62d77c7391bd6fcbc9
diff --git a/media-libs/libraw/libraw-0.16.0-r1.ebuild b/media-libs/libraw/libraw-0.16.0-r1.ebuild
deleted file mode 100644
index e22e6263fb936..0000000000000
--- a/media-libs/libraw/libraw-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib toolchain-funcs
-
-MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
-HOMEPAGE="http://www.libraw.org/"
-SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
-	demosaic? (
-		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-${MY_PV}.tar.gz
-		http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-${MY_PV}.tar.gz
-	)"
-
-# Libraw also has it's own license, which is a pdf file and
-# can be obtained from here:
-# http://www.libraw.org/data/LICENSE.LibRaw.pdf
-LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
-SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/jasper-1.900.1-r6[${MULTILIB_USEDEP}] )
-	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( Changelog.txt README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-docs.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-automagic-jasper.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-lcms2-first.patch
-	"${FILESDIR}"/${PN}-0.16.0_alpha2-custom-demosaic-paths.patch
-	"${FILESDIR}"/${PN}-0.16.0-pc.patch
-)
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable openmp OPENMP)
-		$(cmake-utils_use_enable jpeg JPEG)
-		$(cmake-utils_use_enable jpeg2k JASPER)
-		$(cmake-utils_use_enable lcms LCMS)
-		$(cmake-utils_use_enable examples EXAMPLES)
-		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL2)
-		$(cmake-utils_use_enable demosaic DEMOSAIC_PACK_GPL3)
-		-DDEMOSAIC_PACK_GPL2_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL2-${MY_PV}"
-		-DDEMOSAIC_PACK_GPL3_PATH="${WORKDIR}/${MY_PN}-demosaic-pack-GPL3-${MY_PV}"
-	)
-	cmake-multilib_src_configure
-}