Switch to CPU_FLAGS_X86.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 16 insertions, 15 deletions

diff --git a/sys-fs/dd-rescue/ChangeLog b/sys-fs/dd-rescue/ChangeLog
index ce66d1fb76ab..c5d348f2a0b8 100644
--- a/sys-fs/dd-rescue/ChangeLog
+++ b/sys-fs/dd-rescue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/dd-rescue
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/ChangeLog,v 1.38 2014/10/17 19:52:51 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/ChangeLog,v 1.39 2015/01/28 22:34:03 mgorny Exp $
+
+  28 Jan 2015; Michał Górny <mgorny@gentoo.org> dd-rescue-1.45.ebuild,
+  dd-rescue-1.46.ebuild, metadata.xml:
+  Switch to CPU_FLAGS_X86.
 
 *dd-rescue-1.46 (17 Oct 2014)
 
diff --git a/sys-fs/dd-rescue/dd-rescue-1.45.ebuild b/sys-fs/dd-rescue/dd-rescue-1.45.ebuild
index 51a1a4e34d72..a972730267b2 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.45.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.45.ebuild
@@ -1,6 +1,6 @@
-# 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/sys-fs/dd-rescue/dd-rescue-1.45.ebuild,v 1.1 2014/06/01 01:53:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.45.ebuild,v 1.2 2015/01/28 22:34:03 mgorny Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="avx2 lzo sse4_2 static xattr"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
 	xattr? ( sys-apps/attr )"
@@ -54,8 +54,8 @@ _emake() {
 	emake \
 		MACH="${arch}" \
 		OS="${os}" \
-		HAVE_SSE42=$(usex sse4_2 1 0) \
-		HAVE_AVX2=$(usex avx2 1 0) \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
 		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CFLAGS_OPT='$(CFLAGS)' \
 		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
diff --git a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild
index dbb30e3c11a2..771497092099 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild
@@ -1,6 +1,6 @@
-# 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/sys-fs/dd-rescue/dd-rescue-1.46.ebuild,v 1.1 2014/10/17 19:52:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/dd-rescue/dd-rescue-1.46.ebuild,v 1.2 2015/01/28 22:34:03 mgorny Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="avx2 lzo sse4_2 static xattr"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
 	xattr? ( sys-apps/attr )"
@@ -56,8 +56,8 @@ _emake() {
 	emake \
 		MACH="${arch}" \
 		OS="${os}" \
-		HAVE_SSE42=$(usex sse4_2 1 0) \
-		HAVE_AVX2=$(usex avx2 1 0) \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
 		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CFLAGS_OPT='$(CFLAGS)' \
 		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
index 9be067c490b3..96a2d586367d 100644
--- a/sys-fs/dd-rescue/metadata.xml
+++ b/sys-fs/dd-rescue/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<use>
- <flag name='sse4_2'>Use the SSE4.2 instruction set</flag>
-</use>
 </pkgmetadata>