3 files changed, 11 insertions, 36 deletions
diff --git a/sys-apps/cpuid/ChangeLog b/sys-apps/cpuid/ChangeLog
index b9f294076848..8937303a9eb5 100644
--- a/sys-apps/cpuid/ChangeLog
+++ b/sys-apps/cpuid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/cpuid
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/ChangeLog,v 1.6 2013/07/20 17:11:07 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/ChangeLog,v 1.7 2014/01/29 01:42:54 dirtyepic Exp $
+
+*cpuid-20140123 (29 Jan 2014)
+
+  29 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> -cpuid-20120225.ebuild,
+  -cpuid-20120601.ebuild, +cpuid-20140123.ebuild:
+  Version bump (bug #499616).
 
 *cpuid-20130610 (20 Jul 2013)
 
diff --git a/sys-apps/cpuid/cpuid-20120601.ebuild b/sys-apps/cpuid/cpuid-20120601.ebuild
deleted file mode 100644
index 143d9d79ac0b..000000000000
--- a/sys-apps/cpuid/cpuid-20120601.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/cpuid-20120601.ebuild,v 1.1 2012/07/19 21:45:46 hwoarang Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to get detailed information about the CPU(s) using the
-CPUID instruction"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-20110305-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install
-}
diff --git a/sys-apps/cpuid/cpuid-20120225.ebuild b/sys-apps/cpuid/cpuid-20140123.ebuild
index a9f32178d0ea..15ec8be80210 100644
--- a/sys-apps/cpuid/cpuid-20120225.ebuild
+++ b/sys-apps/cpuid/cpuid-20140123.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/cpuid-20120225.ebuild,v 1.1 2012/03/10 06:03:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/cpuid-20140123.ebuild,v 1.1 2014/01/29 01:42:54 dirtyepic Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils toolchain-funcs