summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-11-03 20:37:16 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-11-03 20:37:16 +0000
commitc3269fde4d5104cc0d9686555549dfbc50bcba0d (patch)
tree47a71329b2431cb9f5c2dad3c963551c9e1d0daf /dev-util/perf
parentVersion bump to 4.0.4 , bug #205129 (diff)
downloadgentoo-2-c3269fde4d5104cc0d9686555549dfbc50bcba0d.tar.gz
gentoo-2-c3269fde4d5104cc0d9686555549dfbc50bcba0d.tar.bz2
gentoo-2-c3269fde4d5104cc0d9686555549dfbc50bcba0d.zip
Version bump to latest rc, make sure the ebuild is fixed to fetch properly (was broken before), remove previous stuff.
(Portage version: 2.2_rc48/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/perf')
-rw-r--r--dev-util/perf/ChangeLog9
-rw-r--r--dev-util/perf/perf-2.6.31.ebuild79
-rw-r--r--dev-util/perf/perf-2.6.32_rc6.ebuild (renamed from dev-util/perf/perf-2.6.32_rc5.ebuild)10
3 files changed, 14 insertions, 84 deletions
diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index 695e29c911bd..3138d96703e4 100644
--- a/dev-util/perf/ChangeLog
+++ b/dev-util/perf/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-util/perf
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.3 2009/10/31 11:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.4 2009/11/03 20:37:16 flameeyes Exp $
+
+*perf-2.6.32_rc6 (03 Nov 2009)
+
+ 03 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> -perf-2.6.31.ebuild,
+ -perf-2.6.32_rc5.ebuild, +perf-2.6.32_rc6.ebuild:
+ Version bump to latest rc, make sure the ebuild is fixed to fetch properly
+ (was broken before), remove previous stuff.
31 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
perf-2.6.32_rc5.ebuild, metadata.xml:
diff --git a/dev-util/perf/perf-2.6.31.ebuild b/dev-util/perf/perf-2.6.31.ebuild
deleted file mode 100644
index c43b94d35291..000000000000
--- a/dev-util/perf/perf-2.6.31.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.31.ebuild,v 1.1 2009/10/30 19:30:24 flameeyes Exp $
-
-EAPI=2
-
-inherit versionator eutils toolchain-funcs linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_SOURCES=linux-${MY_PV}.tar.bz2
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="http://perf.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v$(get_version_component_range 1-2)/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+demangle"
-
-DEPEND="demangle? ( sys-devel/binutils )
- dev-libs/elfutils"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/linux-${MY_PV}/tools/perf"
-
-CONFIG_CHECK="PERF_EVENTS KALLSYMS"
-
-src_unpack() {
- # We expect the tar implementation to support the -j option (both
- # GNU tar and libarchive's tar support that).
- tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} linux-${MY_PV}/{tools/perf,include,lib,"arch/*/include"}
-
- [[ -n ${A/${LINUX_SOURCES}/} ]] && unpack ${A/${LINUX_SOURCES}/}
-}
-
-src_prepare() {
- # Drop some upstream too-developer-oriented flags and fix the
- # Makefile in general
- sed -i \
- -e 's:-Werror::' \
- -e 's:-ggdb3::' \
- -e 's:-fstack-protector-all::' \
- -e 's:^LDFLAGS =:EXTLIBS +=:' \
- -e '/-x c - /s:\$(ALL_LDFLAGS):\0 $(EXTLIBS):' \
- -e '/^ALL_CFLAGS =/s:$: $(CFLAGS_OPTIMIZE):' \
- -e '/^ALL_LDFLAGS =/s:$: $(LDFLAGS_OPTIMIZE):' \
- "${S}"/Makefile
-}
-
-src_compile() {
- local makeargs=
-
- use demangle || makeargs="${makeargs} NO_DEMANGLE= "
-
- emake ${makeargs} \
- CC="$(tc-getCC)" AR="$(tc-getAR)" \
- prefix="/usr" bindir_relative="sbin" \
- CFLAGS_OPTIMIZE="${CFLAGS}" \
- LDFLAGS_OPTIMIZE="${LDFLAGS}" || die
-}
-
-src_test() {
- :
-}
-
-src_install() {
- # Don't use make install or it'll be re-building the stuff :(
- dosbin perf || die
-
- dodoc CREDITS || die
-}
-
-pkg_postinst() {
- elog "We currently provide no documentation with perf; we're sorry"
- elog "but there will be no man page nor --help output."
-}
diff --git a/dev-util/perf/perf-2.6.32_rc5.ebuild b/dev-util/perf/perf-2.6.32_rc6.ebuild
index 58b523f4a740..553d6e341d41 100644
--- a/dev-util/perf/perf-2.6.32_rc5.ebuild
+++ b/dev-util/perf/perf-2.6.32_rc6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32_rc5.ebuild,v 1.3 2009/10/31 11:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32_rc6.ebuild,v 1.1 2009/11/03 20:37:16 flameeyes Exp $
EAPI=2
@@ -12,18 +12,20 @@ MY_PV="${MY_PV/-pre/-git}"
DESCRIPTION="Userland tools for Linux Performance Counters"
HOMEPAGE="http://perf.wiki.kernel.org/"
+LINUX_V=$(get_version_component_range 1-2)
+
if [ ${PV/_rc} != ${PV} ]; then
LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
PATCH_VERSION=$(get_version_component_range 1-3)
LINUX_PATCH=patch-${PV//_/-}.bz2
- SRC_URI="mirror://kernel/linux/kernel/testing/${LINUX_PATCH}
- mirror://kernel/linux/kernel/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+ SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+ mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
else
LINUX_VER=${PV}
fi
LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
-SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v$(get_version_component_range 1-2)/${LINUX_SOURCES}"
+SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"