diff --git a/dev-lang/nasm/Manifest b/dev-lang/nasm/Manifest
index 469a2b0..5063288 100644
--- a/dev-lang/nasm/Manifest
+++ b/dev-lang/nasm/Manifest
@@ -1 +1 @@
-DIST nasm-2.09.10.tar.bz2 803380 RMD160 04aa353571216eaf4724ff59e772c4f8d722f4be SHA1 ca57a7454b29e18c64018e49cdf5c832937497ab SHA256 e3afb011f762144b4d13acb1f2d9363e4a73264dc6f2d3f4dab358c8203dd59e
+DIST nasm-2.10.07.tar.xz 680892 SHA256 d08ca2c0a9d141c0d279774e933e24bcc01dbb6dc20416ad8d9672a08019376f SHA512 400504dd0ed9131112d5d38ca8cad2f7070fed98f3fd2cb32600ebe784e645532f98a9ac80ed4a5656b5a975a6af5db350954eb407e2a97b475dc57cf8f20a4f WHIRLPOOL 1b19931fd482b703d746df2a8b630f99e3aea18916995eee9427110118bf10bf6892855eabdf1c2d9bbac32a289169b942d85a0b3492841409f1b09c65ef1659
diff --git a/dev-lang/nasm/nasm-2.09.10.ebuild b/dev-lang/nasm/nasm-2.10.07.ebuild
similarity index 60%
rename from dev-lang/nasm/nasm-2.09.10.ebuild
rename to dev-lang/nasm/nasm-2.10.07.ebuild
index 1311004..af3bb28 100644
--- a/dev-lang/nasm/nasm-2.09.10.ebuild
+++ b/dev-lang/nasm/nasm-2.10.07.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.09.10.ebuild,v 1.1 2011/08/14 20:54:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-2.10.07.ebuild,v 1.5 2013/02/14 12:09:23 ago Exp $
 
-EAPI=2
+EAPI=5
 inherit flag-o-matic
 
 DESCRIPTION="groovy little assembler"
 HOMEPAGE="http://nasm.sourceforge.net/"
-SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.bz2"
+SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="*"
 IUSE="doc"
 
 DEPEND="dev-lang/perl
@@ -26,15 +26,13 @@
 }
 
 src_compile() {
-	emake nasmlib.o || die
-	emake all || die
-	if use doc ; then
-		emake doc || die
-	fi
+	emake nasmlib.o
+	emake all
+	use doc && emake doc
 }
 
 src_install() {
-	emake INSTALLROOT="${D}" install install_rdf || die
+	emake INSTALLROOT="${D}" install install_rdf
 	dodoc AUTHORS CHANGES ChangeLog README TODO
 	if use doc ; then
 		doinfo doc/info/*
diff --git a/metadata/md5-cache/dev-lang/nasm-2.09.10 b/metadata/md5-cache/dev-lang/nasm-2.10.07
similarity index 66%
rename from metadata/md5-cache/dev-lang/nasm-2.09.10
rename to metadata/md5-cache/dev-lang/nasm-2.10.07
index f355b32..029437c 100644
--- a/metadata/md5-cache/dev-lang/nasm-2.09.10
+++ b/metadata/md5-cache/dev-lang/nasm-2.10.07
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install
 DEPEND=dev-lang/perl doc? ( app-text/ghostscript-gpl sys-apps/texinfo )
 DESCRIPTION=groovy little assembler
-EAPI=2
+EAPI=5
 HOMEPAGE=http://nasm.sourceforge.net/
 IUSE=doc
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=*
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.09.10/nasm-2.09.10.tar.bz2
+SRC_URI=http://www.nasm.us/pub/nasm/releasebuilds/2.10.07/nasm-2.10.07.tar.xz
 _eclasses_=eutils	a108f00cccac414097bcbbbb5de01762	flag-o-matic	c3131dc67d3bd39f044e92b8280505e4	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=799d28addcd8690c0d542c7f851fd028
+_md5_=2ed68042c7cb39801c4a6277dbaf483e