From 08fa0cbd562f100a64fde7d079d7828e824b1004 Mon Sep 17 00:00:00 2001
From: Andrew Savchenko <bircoph@gentoo.org>
Date: Wed, 23 Aug 2017 09:11:26 +0300
Subject: [PATCH] dev-util/oprofile: drop event files filtering

Event files may be used in nontrivial way, so filtering them out
may result in broken oprofile, see
https://bugs.gentoo.org/show_bug.cgi?id=580016#c2

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
---
 ...le-1.2.0.ebuild => oprofile-1.2.0-r1.ebuild} | 15 ---------------
 ...ild => oprofile-1.2.0_pre20161027-r1.ebuild} | 17 +----------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 rename dev-util/oprofile/{oprofile-1.2.0.ebuild => oprofile-1.2.0-r1.ebuild} (84%)
 rename dev-util/oprofile/{oprofile-1.2.0_pre20161027.ebuild => oprofile-1.2.0_pre20161027-r1.ebuild} (84%)

diff --git a/dev-util/oprofile/oprofile-1.2.0.ebuild b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
similarity index 84%
rename from dev-util/oprofile/oprofile-1.2.0.ebuild
rename to dev-util/oprofile/oprofile-1.2.0-r1.ebuild
index c548ac8146e9..c34d294d89f5 100644
--- a/dev-util/oprofile/oprofile-1.2.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
@@ -52,21 +52,6 @@ src_install() {
 	dodoc ChangeLog* README TODO
 	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die
 	doenvd "${T}/10${PN}"
-
-	# filter out event files for alien arches, bug 580016
-	cd "${D}/usr/share/${PN}" || die
-	local arch="${ARCH}" f
-	case "${arch}" in
-		x86)
-			arch=i386
-			;;
-		amd64)
-			arch=x86-64
-			;;
-	esac
-	for f in $(find -O3 -mindepth 1 -maxdepth 1 -type d ! -name "${arch}" ); do
-		rm -r "${f}" || die
-	done
 }
 
 pkg_postinst() {
diff --git a/dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild b/dev-util/oprofile/oprofile-1.2.0_pre20161027-r1.ebuild
similarity index 84%
rename from dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild
rename to dev-util/oprofile/oprofile-1.2.0_pre20161027-r1.ebuild
index 0c0f35aa14a1..5eafde5bdbce 100644
--- a/dev-util/oprofile/oprofile-1.2.0_pre20161027.ebuild
+++ b/dev-util/oprofile/oprofile-1.2.0_pre20161027-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -65,21 +65,6 @@ src_install() {
 	dodoc ChangeLog* README TODO
 	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die
 	doenvd "${T}/10${PN}"
-
-	# filter out event files for alien arches, bug 580016
-	cd "${D}/usr/share/${PN}" || die
-	local arch="${ARCH}" f
-	case "${arch}" in
-		x86)
-			arch=i386
-			;;
-		amd64)
-			arch=x86-64
-			;;
-	esac
-	for f in $(find -O3 -mindepth 1 -maxdepth 1 -type d ! -name "${arch}" ); do
-		rm -r "${f}" || die
-	done
 }
 
 pkg_postinst() {
-- 
2.26.2