Bump to version 2.6.32_rc5 already, add support for patching in an RC version.

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

3 files changed, 127 insertions, 5 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index b28df263c5fa..88d4420fd75e 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.1 2009/10/30 19:30:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.2 2009/10/30 22:18:21 flameeyes Exp $
+
+*perf-2.6.32_rc5 (30 Oct 2009)
+
+  30 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +perf-2.6.32_rc5.ebuild:
+  Bump to version 2.6.32_rc5 already, add support for patching in an RC
+  version.
 
 *perf-2.6.31 (30 Oct 2009)
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 2604669c8d87..c100227eea4d 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST linux-2.6.31.tar.bz2 61494822 RMD160 c0d88e63740abf0d4f9d82557260a31643f5a01b SHA1 c6e0e6b473ba2b80d164e37cfabf294e783c03d9 SHA256 0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
+DIST patch-2.6.32-rc5.bz2 11254293 RMD160 45512b3095fddf512cac6c0bee9fa8b03499c929 SHA1 6bed29f75329debf88334f509f39406fd6601d49 SHA256 ad987e300a084bbba52e1c12d1f451f532b0ccb9685c4cee7ceede2c56801b30
 EBUILD perf-2.6.31.ebuild 2034 RMD160 af52f4c05909134364dff7a4492964b77f6f0265 SHA1 982454b0305613f772645050ffc970db83178ac7 SHA256 4c400cd01ccdf28c8406520a88a861054b719df34dd7c1c633341c7f58250cf1
-MISC ChangeLog 387 RMD160 20263c2f098790270429be94d705dff919dbd40e SHA1 632241a2dd02ddfdf417ea7ca360ece7da23e22b SHA256 38c9f01277a80a5a10f981919d8d7a5a309596c9d6d70ab5f87f17752d139831
+EBUILD perf-2.6.32_rc5.ebuild 2967 RMD160 89d3b183de72a36c39ab5a2d4ce5a38aaaab8237 SHA1 962c9307200864a797f9249c9bd6801946a992ac SHA256 7eb859451866c2b0d592e4cea824e557579bfbefd13c0546b95aa7677c31839b
+MISC ChangeLog 586 RMD160 d2a947364aa23cd50ff62fadc343f3e8196c91ab SHA1 84de418b1c5c3a1125e0690a5adeaf69afbcb1d2 SHA256 d4afc079d9b6923e66c1186d4cec7792ac2d27bb944e4d48955a6b3d3c6c9dc4
 MISC metadata.xml 498 RMD160 1480414657051f164fddc85f157441befde54c2e SHA1 96ffea9b90dc3e0a53ef3a1084fa6df1ec00e580 SHA256 bcb0a6db4a990d7b689bd8736f9cefe021325a408f7e71e383a92e01f70c4426
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrrPtwACgkQAiZjviIA2XiG6QCdHkWErjXZjyBS3FjSnNeINPjI
-mnwAn27UIgn1wH+PApSrh0h6IQhdsKTK
-=n7d0
+iEYEARECAAYFAkrrZjIACgkQAiZjviIA2XhRBgCg8YM0t0W5tY4ALLbvEC+KL/Tn
+KVMAn3r0p8V7J7Q4GgvF+vSTogI1PuD0
+=XQ2R
 -----END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-2.6.32_rc5.ebuild b/dev-util/perf/perf-2.6.32_rc5.ebuild
new file mode 100644
index 000000000000..d9817855f368
--- /dev/null
+++ b/dev-util/perf/perf-2.6.32_rc5.ebuild
@@ -0,0 +1,113 @@
+# 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.1 2009/10/30 22:18:21 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/"
+
+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}"
+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}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+demangle"
+
+RDEPEND="demangle? ( sys-devel/binutils )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}"
+
+if [[ -n ${LINUX_PATH} ]]; 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).
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} ${_tarpattern} || die
+	filterdiff ${_filterdiff} -z "${DISTDIR}"/${LINUX_PATCH} > ${P}.patch || die
+
+	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
+}
+
+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."
+}