Version bump.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 148 insertions, 5 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index 8e370d0c4e51..51c7363f9209 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.12 2010/01/31 10:27:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.13 2010/02/09 15:50:58 flameeyes Exp $
+
+*perf-2.6.33_rc7 (09 Feb 2010)
+
+  09 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +perf-2.6.33_rc7.ebuild:
+  Version bump.
 
 *perf-2.6.33_rc6 (31 Jan 2010)
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 9e65861b024b..322052191a9e 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -3,14 +3,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
 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
-MISC ChangeLog 2634 RMD160 57a71dc2995622a2cf589bf849f471a1649db086 SHA1 79b70be0acada0bbfe9de0f223586d8c00207e2b SHA256 50a2f601d65d225eae4bcf8f434f96e339b024fd792011c1f08455dbc33b223d
+EBUILD perf-2.6.33_rc7.ebuild 3664 RMD160 c1642b6d2ff2752bd07b081b11af29764c96918c SHA1 b71b9890b2a365287e8f1e3ca6e0faf43a8a7c97 SHA256 1ea366ccba1581762e718969263f21c43187de081705ec6164b42101a2b68f12
+MISC ChangeLog 2766 RMD160 6306a827be78903b92dfc7138d886dbd6499074f SHA1 4167ffb35f2f61e36bae822b1f93cd4c526b2d3c SHA256 0e8fa8d378cecd1eca77ab3330a6eb7e323246d5ae3c7fa3bdf7aa5c1e7f26db
 MISC metadata.xml 919 RMD160 35247c31e6b8259ef822c000bfc4d3d2e88abaa8 SHA1 d9789c5d3f286f9f4c0672270450e57c54aaa497 SHA256 0a9ff10033b8ed30a10e72c0abc6d7494c967d8790585c484f2f1219ea007f2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktlWxMACgkQAiZjviIA2XjWjQCfZ66/QClXgUmqw6FWYQ1d/HGk
-h1IAnisEJl4r+1ASQTlNXhwdqJfVTJ9C
-=rbdA
+iEYEARECAAYFAktxhHgACgkQAiZjviIA2XjzVwCgpTMdOJP9iKz2/9tfx6AlOIoR
+Bh8AoOGXEWIUMufAhtW0qU7JBqir10r+
+=8L2B
 -----END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-2.6.33_rc7.ebuild b/dev-util/perf/perf-2.6.33_rc7.ebuild
new file mode 100644
index 000000000000..b43ae29a1dee
--- /dev/null
+++ b/dev-util/perf/perf-2.6.33_rc7.ebuild
@@ -0,0 +1,135 @@
+# 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
+}