--- libraw-0.16.0-r1.ebuild	2014-12-06 18:01:12.000000000 +0100
+++ libraw-0.17.0_alpha1.ebuild	2015-03-08 20:46:08.673928197 +0100
@@ -1,13 +1,13 @@
-# 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/media-libs/libraw/libraw-0.16.0-r1.ebuild,v 1.4 2014/12/06 16:36:38 ago Exp $
+# $Header: $
 
 EAPI=5
 
-inherit cmake-multilib toolchain-funcs
+inherit autotools-multilib eutils toolchain-funcs
 
 MY_PN=LibRaw
-MY_PV=${PV/_b/-B}
+MY_PV=${PV/_a/-A}
 MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
@@ -22,8 +22,8 @@
 # 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 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0/11" # subslot = libraw soname version
+KEYWORDS=""
 IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
@@ -36,31 +36,19 @@
 
 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
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable demosaic demosaic-pack-gpl2) \
+		$(use_enable demosaic demosaic-pack-gpl3) \
+		$(use_enable examples) \
+		$(use_enable jpeg) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable lcms) \
+		$(use_enable openmp)
 }