Bump to latest rc.

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

3 files changed, 157 insertions, 5 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index 054f843fa0ae..efc4944b7288 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.15 2010/05/18 11:22:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.16 2010/06/12 06:58:06 flameeyes Exp $
+
+*perf-2.6.35_rc3 (12 Jun 2010)
+
+  12 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +perf-2.6.35_rc3.ebuild:
+  Bump to latest rc.
 
 *perf-2.6.34 (18 May 2010)
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 1124b3b640b2..33253b4f1924 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 DIST linux-2.6.33.tar.bz2 66266488 RMD160 7f0897db8113bc17249d82d61ca41e3b91eb4664 SHA1 acc8db00f30c7dfb4f04183a88ba35a32b6f8e8d SHA256 63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6
 DIST linux-2.6.34.tar.bz2 67633622 RMD160 dafd721b00c13e3652405b517b379eed10020bf4 SHA1 4188857ba71f301991dc56285f593e9c311e5824 SHA256 fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
 DIST patch-2.6.33.1.bz2 46688 RMD160 2d00aa5bce2c812ce56e18e3c46a6cd8038bfd2c SHA1 79aac313ea212259b753f006bc66d55100dbb872 SHA256 31a6a7f5840b9d87d44366a9af2003eabe3e3c22baa0236d2354691ff5a01861
+DIST patch-2.6.35-rc3.bz2 7574936 RMD160 3ed7c68bdc1caf48627f4da9ff27d4a13f50aa7d SHA1 3014dfc3c3aa228575181a37e7415b4270dec945 SHA256 edd71c6e9edf9dd120f92f456a4165e0b9b9c40c8769bbac8bce6b6128a342c0
 EBUILD perf-2.6.33.1.ebuild 3915 RMD160 9e737d26c4326818861e0c1feddadeeb09e322f1 SHA1 62d529925dea539cc1829c0f61a4a12246283619 SHA256 b1294c9c4bf079fdec4f0ecde83b0373553aacb50fff4956cfadb6c67aeeef98
 EBUILD perf-2.6.34.ebuild 4010 RMD160 4bfea98f271cdad99add8db08f9c19bd9d662596 SHA1 98dd587c8092a1e6d67612d96df42720c993448d SHA256 8a0ba75c8851930b930f353bd36820e61c023fce121226f74b6cddc532a9de16
-MISC ChangeLog 3110 RMD160 211c979b617434704b59a5b60ec97a10910f6f71 SHA1 ec4197e94d70fb2e41d1058b1bb4d9e99c9b0728 SHA256 9ace245af6471d15c1d85a828fa29aeaed36805421100895ee1b6137645622b4
+EBUILD perf-2.6.35_rc3.ebuild 4014 RMD160 b05d6078e0ebcbc2b01346ca44d725e2a41fdfb8 SHA1 9a194909c7dc8f322606be67cc1eaaca2d7c490a SHA256 3b4e4f40eee819b44267d609b97dbf9a499b8bc52281c0d889dec6b792999320
+MISC ChangeLog 3247 RMD160 1ab46c4b9070a57a854ae20ea9317ed61720af05 SHA1 61968e06fe30da8487424e02708f150d9d0c369f SHA256 b9862cdc0ee709f94650a7e300ca76fd57c44ec42ae8e933d3127beb8803c410
 MISC metadata.xml 918 RMD160 72052da2565fb1655ac426cdfccbbadeb1f94198 SHA1 c79d28f3862278ae78ccdbf918b9101cfd2bf2f9 SHA256 7aa8ab7b4037d1423055f535178c88ef0a6de8e0673acd981c227514f389cf1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvyeLYACgkQAiZjviIA2Xjj8wCg4KigfJqd5eCPw7bUh3WWaQva
-+v8AoIKa/dJlWEwXgkD53HHr6iQg3/Ez
-=etin
+iEYEARECAAYFAkwTL8gACgkQAiZjviIA2Xi95gCgjLPA43kz/nIjB/B/lYy2uOgt
+ZlkAn13chVOyYaUxGQH76nwWztGztCJz
+=tGaW
 -----END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-2.6.35_rc3.ebuild b/dev-util/perf/perf-2.6.35_rc3.ebuild
new file mode 100644
index 000000000000..0df0aed1ed3d
--- /dev/null
+++ b/dev-util/perf/perf-2.6.35_rc3.ebuild
@@ -0,0 +1,144 @@
+# 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.35_rc3.ebuild,v 1.1 2010/06/12 06:58:06 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}"
+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
+
+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 python"
+
+RDEPEND="demangle? ( sys-devel/binutils )
+	perl? ( || ( >=dev-lang/perl-5.10 sys-devel/libperl ) )
+	python? ( dev-lang/python )
+	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"
+
+	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
+		[[ ${_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\|PYTHON\)_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= "
+	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
+}