diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-03-16 11:02:43 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-03-16 11:02:43 +0000 |
commit | 3ce18d8846a3da072f38bcb04f592e3ce57ff7ef (patch) | |
tree | 965e3093215df822346fccd022017f95ccb44206 /dev-util | |
parent | keyword ~x86-fbsd (diff) | |
download | historical-3ce18d8846a3da072f38bcb04f592e3ce57ff7ef.tar.gz historical-3ce18d8846a3da072f38bcb04f592e3ce57ff7ef.tar.bz2 historical-3ce18d8846a3da072f38bcb04f592e3ce57ff7ef.zip |
Version bump and remove older RCs.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/perf/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/perf/Manifest | 15 | ||||
-rw-r--r-- | dev-util/perf/perf-2.6.33.1.ebuild (renamed from dev-util/perf/perf-2.6.33_rc6.ebuild) | 23 | ||||
-rw-r--r-- | dev-util/perf/perf-2.6.33_rc7.ebuild | 135 |
4 files changed, 29 insertions, 152 deletions
diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog index 51c7363f9209..0273a6dca366 100644 --- a/dev-util/perf/ChangeLog +++ b/dev-util/perf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/perf # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.13 2010/02/09 15:50:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.14 2010/03/16 11:02:43 flameeyes Exp $ + +*perf-2.6.33.1 (16 Mar 2010) + + 16 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -perf-2.6.33_rc6.ebuild, -perf-2.6.33_rc7.ebuild, +perf-2.6.33.1.ebuild: + Version bump and remove older RCs. *perf-2.6.33_rc7 (09 Feb 2010) diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index f3c1de447b61..40fdeb9e5a4b 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -2,17 +2,16 @@ Hash: SHA1 DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e -DIST patch-2.6.33-rc6.bz2 10414342 RMD160 cda487173d9d9cc15ce675aa487a1bba3428f368 SHA1 082dc6048eb7423c4beda0a62e785a010752b49a SHA256 8b8ac844b7154d952469587bcb9d2cff089cc71ccd7522e38eedcdc1f2c007a5 -DIST patch-2.6.33-rc7.bz2 10488988 RMD160 c8e00f5f77a54dbce90a209c1bb1782565768330 SHA1 4d908c14082d755824ecae91fd4e7c34f7d23e14 SHA256 8cd304b686ea9a29843952bbb43b9ae53fce6884d3c22187407c30d1acf83664 +DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb4664 SHA1 acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6 +DIST patch-2.6.33.1.bz2 46688 RMD160 2d00aa5bce2c812ce56e18e3c46a6cd8038bfd2c SHA1 79aac313ea212259b753f006bc66d55100dbb872 SHA256 31a6a7f5840b9d87d44366a9af2003eabe3e3c22baa0236d2354691ff5a01861 EBUILD perf-2.6.32.ebuild 3487 RMD160 f86f2e8878b280aee1fa0a4ff2eb5f9f00da335d SHA1 f9c016bb6edf5c41aa8418f30aaaf24dab07c566 SHA256 312862ca7008b1a38a3b16b98b7a57f1af89ab4c4892de6c47811f0756081560 -EBUILD perf-2.6.33_rc6.ebuild 3664 RMD160 75cce602fe408fe1c5d027f5baebbfbb5b86c6ba SHA1 c086cb02959fcab69423d54da5cd782bb51041f8 SHA256 398ec397d7f1e22a6f47e3f0ba3e6c1880923c085aff4d88e8776fa6a7cfd0f7 -EBUILD perf-2.6.33_rc7.ebuild 3664 RMD160 c1642b6d2ff2752bd07b081b11af29764c96918c SHA1 b71b9890b2a365287e8f1e3ca6e0faf43a8a7c97 SHA256 1ea366ccba1581762e718969263f21c43187de081705ec6164b42101a2b68f12 -MISC ChangeLog 2766 RMD160 6306a827be78903b92dfc7138d886dbd6499074f SHA1 4167ffb35f2f61e36bae822b1f93cd4c526b2d3c SHA256 0e8fa8d378cecd1eca77ab3330a6eb7e323246d5ae3c7fa3bdf7aa5c1e7f26db +EBUILD perf-2.6.33.1.ebuild 3915 RMD160 9e737d26c4326818861e0c1feddadeeb09e322f1 SHA1 62d529925dea539cc1829c0f61a4a12246283619 SHA256 b1294c9c4bf079fdec4f0ecde83b0373553aacb50fff4956cfadb6c67aeeef98 +MISC ChangeLog 2965 RMD160 d37a23e3e55f1ac50106eed60e4c94651837dfbb SHA1 8034c4e4d1c81c3129f377749750b7631b180ae6 SHA256 ad8f9927e9eca716f6a297dbbce06a90d1d4e98289fcf5bbefc36cffba1a859d MISC metadata.xml 918 RMD160 72052da2565fb1655ac426cdfccbbadeb1f94198 SHA1 c79d28f3862278ae78ccdbf918b9101cfd2bf2f9 SHA256 7aa8ab7b4037d1423055f535178c88ef0a6de8e0673acd981c227514f389cf1e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuZVlQACgkQdz7hIScOURFjdACgwf8lDGF56NWitlrCMikC9Dze -D0QAn05bYWe6qKn9HcJJdDzS61F9vzo9 -=gL/7 +iEYEARECAAYFAkufZVsACgkQAiZjviIA2XhWKACePf2AFGSahSbB+Hm4+Y785WWs +8PoAn3g7F7OdzioBZs+A9HPs+g9gujng +=jf2I -----END PGP SIGNATURE----- diff --git a/dev-util/perf/perf-2.6.33_rc6.ebuild b/dev-util/perf/perf-2.6.33.1.ebuild index be686e7162e7..2759a5901939 100644 --- a/dev-util/perf/perf-2.6.33_rc6.ebuild +++ b/dev-util/perf/perf-2.6.33.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.33_rc6.ebuild,v 1.1 2010/01/31 10:27:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.33.1.ebuild,v 1.1 2010/03/16 11:02:43 flameeyes Exp $ EAPI=2 @@ -20,6 +20,11 @@ if [ ${PV/_rc} != ${PV} ]; then 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}" +elif [ $(get_version_component_count) == 4 ]; then + # stable-release series + LINUX_VER=$(get_version_component_range 1-3) + LINUX_PATCH=patch-${PV}.bz2 + SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" else LINUX_VER=${PV} fi @@ -57,9 +62,11 @@ src_unpack() { tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} ${_tarpattern} eend $? || die "tar failed" - ebegin "Filtering partial source patch" - filterdiff -p1 ${_filterdiff} -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die - eend $? || die "filterdiff failed" + if [[ -n ${LINUX_PATCH} ]]; then + ebegin "Filtering partial source patch" + filterdiff -p1 ${_filterdiff} -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die + eend $? || die "filterdiff failed" + fi MY_A= for _AFILE in ${A}; do @@ -71,10 +78,10 @@ src_unpack() { } src_prepare() { - if [[ -n ${LINUX_PATCH} ]]; then - cd "${WORKDIR}"/linux-"${LINUX_VER}" - epatch "${WORKDIR}"/${P}.patch - fi + if [[ -n ${LINUX_PATCH} ]]; then + cd "${WORKDIR}"/linux-"${LINUX_VER}" + epatch "${WORKDIR}"/${P}.patch + fi # Drop some upstream too-developer-oriented flags and fix the # Makefile in general diff --git a/dev-util/perf/perf-2.6.33_rc7.ebuild b/dev-util/perf/perf-2.6.33_rc7.ebuild deleted file mode 100644 index b43ae29a1dee..000000000000 --- a/dev-util/perf/perf-2.6.33_rc7.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.33_rc7.ebuild,v 1.1 2010/02/09 15:50:58 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 perl" - -RDEPEND="demangle? ( sys-devel/binutils ) - perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) ) - dev-libs/elfutils" -DEPEND="${RDEPEND} - ${LINUX_PATCH+dev-util/patchutils} - doc? ( app-text/asciidoc app-text/xmlto )" - -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 -p1 ${_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() { - if [[ -n ${LINUX_PATCH} ]]; then - cd "${WORKDIR}"/linux-"${LINUX_VER}" - epatch "${WORKDIR}"/${P}.patch - fi - - # 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 '/PERL_EMBED_LDOPTS/s:ALL_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= " - use perl || makeargs="${makeargs} NO_LIBPERL= " - - 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 :( - dobin 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 -} |