From 3ac1aea42814a62a62fe1a48f29568bbdbab8a33 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Fri, 4 Dec 2009 16:33:24 +0000 Subject: Bump to final .32 version. Package-Manager: portage-2.2_rc55/cvs/Linux x86_64 --- dev-util/perf/ChangeLog | 8 ++- dev-util/perf/Manifest | 13 ++-- dev-util/perf/perf-2.6.32.ebuild | 135 +++++++++++++++++++++++++++++++++++ dev-util/perf/perf-2.6.32_rc7.ebuild | 135 ----------------------------------- 4 files changed, 148 insertions(+), 143 deletions(-) create mode 100644 dev-util/perf/perf-2.6.32.ebuild delete mode 100644 dev-util/perf/perf-2.6.32_rc7.ebuild (limited to 'dev-util') diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog index c4be5893ce07..a45c391cd3ef 100644 --- a/dev-util/perf/ChangeLog +++ b/dev-util/perf/ChangeLog @@ -1,6 +1,12 @@ # 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.6 2009/11/16 17:09:23 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.7 2009/12/04 16:33:24 flameeyes Exp $ + +*perf-2.6.32 (04 Dec 2009) + + 04 Dec 2009; Diego E. Pettenò + -perf-2.6.32_rc7.ebuild, +perf-2.6.32.ebuild: + Bump to final .32 version. *perf-2.6.32_rc7 (16 Nov 2009) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index e294c2a1fb45..246509fb788c 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -1,15 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 -DIST patch-2.6.32-rc7.bz2 11404261 RMD160 2570e25e7df208ea71468b1d0155b283310142b0 SHA1 5ce86c2260cbeea120ed336966f4ef75e66f119e SHA256 f4814707d648b570b06d06e0763e8cf3fe8932b467e320d9e42689804ec71a3b -EBUILD perf-2.6.32_rc7.ebuild 3491 RMD160 feaac1c1f83753c4d5c48963046d85253c435924 SHA1 c58b50865f130dd48a595025e77d0c680179ed06 SHA256 9c7f06ea203236a245409fb1c467226a0792f21bc0b5b8f9b5cba77b14d0558c -MISC ChangeLog 1399 RMD160 e59f9dc022a4bb6fbe1517aa263cdd68ce488664 SHA1 2a5b481fe0bf712c46dead11e47e79fee83befdc SHA256 bd53b80e9b096aa6349a5bf10d257cb78cb4d3083690f35f63c10405e716efbd +DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e +EBUILD perf-2.6.32.ebuild 3487 RMD160 f86f2e8878b280aee1fa0a4ff2eb5f9f00da335d SHA1 f9c016bb6edf5c41aa8418f30aaaf24dab07c566 SHA256 312862ca7008b1a38a3b16b98b7a57f1af89ab4c4892de6c47811f0756081560 +MISC ChangeLog 1561 RMD160 9c75aac45b7ad77b683dae6d180ad895521b9a88 SHA1 d253660456fe777010818ad1115a49f0c8ae56a3 SHA256 2731d641d6c4a6720c82bce12fdf6d5d82479247352ad82144173160c43de0ff MISC metadata.xml 817 RMD160 333bacd0646c4aa7c16cc1209cd9032f5e7b2fed SHA1 c2bb6e9042768acd4a396f1d878ff3f29f389740 SHA256 77b02a80478445f267b4fd90809cebc2cb1fa7f2b4c8b31986b0bac9e0ec2b1d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAksBh0cACgkQAiZjviIA2Xj27ACgwhevzPM6Kp61LWc1x0CNCOl3 -3ksAoLW7/MVpv0iEVbJXsbXf73hY5Lqf -=X5y0 +iEYEARECAAYFAksZOdAACgkQAiZjviIA2XisiQCeN10goaC3PuCZO7rvYR9jLYL5 +b7MAn3ihlFkB+gVUDfE9OJItS7Cm11Ev +=gf/m -----END PGP SIGNATURE----- diff --git a/dev-util/perf/perf-2.6.32.ebuild b/dev-util/perf/perf-2.6.32.ebuild new file mode 100644 index 000000000000..f798d2ab5b93 --- /dev/null +++ b/dev-util/perf/perf-2.6.32.ebuild @@ -0,0 +1,135 @@ +# 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.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $ + +EAPI=2 + +inherit versionator eutils toolchain-funcs linux-info + +MY_PV="${PV/_/-}" +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/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${LINUX_V}/${LINUX_SOURCES}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+demangle +doc" + +RDEPEND="demangle? ( sys-devel/binutils ) + dev-libs/elfutils" +DEPEND="${RDEPEND} + doc? ( app-text/asciidoc app-text/xmlto )" + +if [[ -n ${LINUX_PATCH} ]]; then + DEPEND="${DEPEND} + dev-util/patchutils" +fi + +S="${WORKDIR}/linux-${LINUX_VER}/tools/perf" + +CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" + +src_unpack() { + local _tarpattern= + local _filterdiff= + for _pattern in {tools/perf,include,lib,"arch/*/include"}; do + _tarpattern="${_tarpattern} linux-${LINUX_VER}/${_pattern}" + _filterdiff="${_filterdiff} -i ${_pattern}/*" + done + + # We expect the tar implementation to support the -j option (both + # GNU tar and libarchive's tar support that). + ebegin "Unpacking partial source tarball" + tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} ${_tarpattern} + eend $? || die "tar failed" + + ebegin "Filtering partial source patch" + filterdiff ${_filterdiff} -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die + eend $? || die "filterdiff failed" + + MY_A= + for _AFILE in ${A}; do + [[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue + [[ ${_AFILE} == ${LINUX_PATCH} ]] && continue + MY_A="${MY_A} ${_AFILE}" + done + [[ -n ${MY_A} ]] && unpack ${MY_A} +} + +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 + + if [[ -n ${LINUX_PATCH} ]]; then + epatch "${WORKDIR}"/${P}.patch + fi +} + +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 + + if use doc; then + pushd Documentation + emake ${makeargs} || die + popd + fi +} + +src_test() { + : +} + +src_install() { + # Don't use make install or it'll be re-building the stuff :( + dosbin perf || die + + dodoc CREDITS || die + + if use doc; then + dodoc Documentation/*.txt || die + dohtml Documentation/*.html || die + doman Documentation/*.1 || die + fi +} + +pkg_postinst() { + if ! use doc; then + elog "Without the doc USE flag you won't get any documentation nor man pages." + elog "And without man pages, you won't get any --help output for perf and its" + elog "sub-tools." + fi +} diff --git a/dev-util/perf/perf-2.6.32_rc7.ebuild b/dev-util/perf/perf-2.6.32_rc7.ebuild deleted file mode 100644 index 2d7f98677a66..000000000000 --- a/dev-util/perf/perf-2.6.32_rc7.ebuild +++ /dev/null @@ -1,135 +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.32_rc7.ebuild,v 1.1 2009/11/16 17:09:23 flameeyes Exp $ - -EAPI=2 - -inherit versionator eutils toolchain-funcs linux-info - -MY_PV="${PV/_/-}" -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/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${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+demangle +doc" - -RDEPEND="demangle? ( sys-devel/binutils ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - doc? ( app-text/asciidoc app-text/xmlto )" - -if [[ -n ${LINUX_PATCH} ]]; then - DEPEND="${DEPEND} - dev-util/patchutils" -fi - -S="${WORKDIR}/linux-${LINUX_VER}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -src_unpack() { - local _tarpattern= - local _filterdiff= - for _pattern in {tools/perf,include,lib,"arch/*/include"}; do - _tarpattern="${_tarpattern} linux-${LINUX_VER}/${_pattern}" - _filterdiff="${_filterdiff} -i ${_pattern}/*" - done - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - ebegin "Unpacking partial source tarball" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} ${_tarpattern} - eend $? || die "tar failed" - - ebegin "Filtering partial source patch" - filterdiff ${_filterdiff} -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die - eend $? || die "filterdiff failed" - - MY_A= - for _AFILE in ${A}; do - [[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue - [[ ${_AFILE} == ${LINUX_PATCH} ]] && continue - MY_A="${MY_A} ${_AFILE}" - done - [[ -n ${MY_A} ]] && unpack ${MY_A} -} - -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 - - if [[ -n ${LINUX_PATCH} ]]; then - epatch "${WORKDIR}"/${P}.patch - fi -} - -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 - - if use doc; then - pushd Documentation - emake ${makeargs} || die - popd - fi -} - -src_test() { - : -} - -src_install() { - # Don't use make install or it'll be re-building the stuff :( - dosbin perf || die - - dodoc CREDITS || die - - if use doc; then - dodoc Documentation/*.txt || die - dohtml Documentation/*.html || die - doman Documentation/*.1 || die - fi -} - -pkg_postinst() { - if ! use doc; then - elog "Without the doc USE flag you won't get any documentation nor man pages." - elog "And without man pages, you won't get any --help output for perf and its" - elog "sub-tools." - fi -} -- cgit v1.2.3-65-gdbad