5 files changed, 2 insertions, 121 deletions
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 43b67ab5efb0..7b35e2f362f2 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,9 +1,5 @@
-AUX oprofile-1.1.0-gcc6-template-depth.patch 454 BLAKE2B 5250e083156853905ca8e1107a0af51eeadbef93881c39f407ed28af41b5f75ebe4003c96b9bc6e5be8a6445e8b7cd6cd4e499d6d44769d258242c8ba0192a9d SHA512 c5356ff2e0b31b792eac13c4f19123f6fadfc5fa0154bd422a86185514410eef48eabc321c32d344b1dbf9357de888130e0a84336d08551cea7c787478f9f21e
-AUX oprofile-1.1.0-gcc6.patch 777 BLAKE2B a4def027ba0f8e8c1eb877105f4e0e215599fd5004a4c59d3e3b77c2bda356736b96dc2030a994a179c1596e452e7e7a9303f0676eb68997b4922c9fe3374899 SHA512 de907f9583255a313c719eaf8163385de15a40d4ea76eb13e91f223375597f9d1ef41ad21bf129e550536e6a6a316beb3cd2c528fd38cb17e3fc22256f1dbc38
-DIST oprofile-1.1.0.tar.gz 1468502 BLAKE2B 5c0abdf1ce6f3fa9b7140036ff654b2f5d5e29d996afec834014c141a4669e57c1d4ac60d6705c35ee1dce23ce790e07063b58508abd39b6562b7298744e2eb4 SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758
 DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
-EBUILD oprofile-1.1.0-r1.ebuild 1835 BLAKE2B 16d17d42849a4fcba8f3946aa39b7ccb517d257942405bba521bde11d278baa88a465f3ef9ff8c07178933748ab0fb6feca648e943272affbc9cc0e59a035da5 SHA512 d53e071b01e6f2e9247444ea9130debd07db16c6df589709ee1a3e71a3d5f923af5f2c22ef4f721ddce3fd37c26b4744284d0bbf43138040dbddcae79960b4ed
-EBUILD oprofile-1.2.0-r1.ebuild 1598 BLAKE2B 64a4a17df9ce3dcf1fb03a55355c800a1dfd47483cd5909d27679a259fa91beeb272ef4a9dfe0af66ac587dcd81573e72acfdbfc989904d8a81e6a2d3b94ba8a SHA512 2727999c46d8bbfa1f52e07f12ea2fdd065716a5c034d195fdd7498c401cfa879aebcbd08c48e9115349127567127b0b723d99be9cd5c122db8cc373e224aba4
+EBUILD oprofile-1.2.0-r1.ebuild 1594 BLAKE2B 9a571f914951aea903761991e020fb481602e3288a4ffaf53b14c5e46fbd0eb7e071e3689faa1422446a64b3f38d4fe915c28ca275d1d087ea8737ddcef3477b SHA512 83e6b5441251e157a3334a0b0412b31dddc7b9465fc9efdcdd5af672a11ecd513197b89b7bc164da723f95916e3addf23fc155c6c10b592243aa13e1581b30d4
 EBUILD oprofile-1.3.0.ebuild 1603 BLAKE2B c8dedc640704b79251bed321963bd048dd2a6d542d54e34eeebad6cfa9b5efdded9ee65d3aa33c51427dc68600723898141557d78433f88a14ca2f04d68c3b26 SHA512 a98f49a3b850744c4b6db4dc3aed7a3aca874fe256b18648805661e452475dac20679eb646386a7325a8ef8f7256bfe7141b126146748c3d7a11654a890ce2cf
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
deleted file mode 100644
index 01fc86910a3a..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- oprofile-1.1.0/configure.ac.orig	2015-07-21 17:53:27.000000000 +0300
-+++ oprofile-1.1.0/configure.ac	2016-11-22 01:15:31.329067697 +0300
-@@ -320,7 +320,6 @@
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-Wall])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-fno-common])
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-fno-common])
--AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-ftemplate-depth-50])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-Wdeclaration-after-statement])
- 
- dnl enable option to use GCC test coverage
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
deleted file mode 100644
index ab3ca7c1b142..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/libop/op_alloc_counter.c
-+++ b/libop/op_alloc_counter.c
-@@ -171,7 +171,7 @@
- 	/* no counters then probably perfmon managing perfmon hw */
- 	if (nr_counters <= 0) {
- 		nr_counters = op_get_nr_counters(cpu_type);
--		unavailable_counters = (~0) << nr_counters;
-+		unavailable_counters = (~0U) << nr_counters;
- 	}
- 
- 	/* Check to see if we have enough physical counters to map events*/
---- a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@
- {
- 	op_bfd_symbol const & sym = syms[sym_idx];
- 
--	bool const verbose = cverb << (vbfd & vlevel1);
--
- 	if (anon_obj)
- 		start = sym.vma();
- 	else
- 		start = sym.filepos();
- 	end = start + sym.size();
- 
--	if (!verbose)
-+	if (!(cverb << (vbfd & vlevel1)))
- 		return;
- 
- 	io_state state(cverb << (vbfd & vlevel1));
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
deleted file mode 100644
index 2c8a16f7a16f..000000000000
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils java-pkg-opt-2 linux-info multilib user
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="java pch"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
-	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
-	java? ( >=virtual/jdk-1.5:= )
-	ppc64? ( dev-libs/libpfm )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.31"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="PERF_EVENTS"
-ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! kernel_is -ge 2 6 31; then
-		echo
-		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
-		echo
-	fi
-
-	# Required for JIT support, see README_PACKAGERS
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
-	use java && java-pkg_init
-}
-
-src_prepare() {
-	# fix bug #594178
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
-	# bug #600000
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6-template-depth.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable pch) \
-		$(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
-	dodoc ChangeLog* README TODO
-	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}"
-	doenvd "${T}/10${PN}"
-}
-
-pkg_postinst() {
-	echo
-	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
-	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
-	elog "Please read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/${PN}.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
index 3a5dc70fb4a7..336fc665809c 100644
--- a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1