Version bump.

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

3 files changed, 39 insertions, 24 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index 0273a6dca366..054f843fa0ae 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.14 2010/03/16 11:02:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.15 2010/05/18 11:22:36 flameeyes Exp $
+
+*perf-2.6.34 (18 May 2010)
+
+  18 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> -perf-2.6.32.ebuild,
+  +perf-2.6.34.ebuild:
+  Version bump.
 
 *perf-2.6.33.1 (16 Mar 2010)
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 40fdeb9e5a4b..1124b3b640b2 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 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
-EBUILD perf-2.6.32.ebuild 3487 RMD160 f86f2e8878b280aee1fa0a4ff2eb5f9f00da335d SHA1 f9c016bb6edf5c41aa8418f30aaaf24dab07c566 SHA256 312862ca7008b1a38a3b16b98b7a57f1af89ab4c4892de6c47811f0756081560
 EBUILD perf-2.6.33.1.ebuild 3915 RMD160 9e737d26c4326818861e0c1feddadeeb09e322f1 SHA1 62d529925dea539cc1829c0f61a4a12246283619 SHA256 b1294c9c4bf079fdec4f0ecde83b0373553aacb50fff4956cfadb6c67aeeef98
-MISC ChangeLog 2965 RMD160 d37a23e3e55f1ac50106eed60e4c94651837dfbb SHA1 8034c4e4d1c81c3129f377749750b7631b180ae6 SHA256 ad8f9927e9eca716f6a297dbbce06a90d1d4e98289fcf5bbefc36cffba1a859d
+EBUILD perf-2.6.34.ebuild 4010 RMD160 4bfea98f271cdad99add8db08f9c19bd9d662596 SHA1 98dd587c8092a1e6d67612d96df42720c993448d SHA256 8a0ba75c8851930b930f353bd36820e61c023fce121226f74b6cddc532a9de16
+MISC ChangeLog 3110 RMD160 211c979b617434704b59a5b60ec97a10910f6f71 SHA1 ec4197e94d70fb2e41d1058b1bb4d9e99c9b0728 SHA256 9ace245af6471d15c1d85a828fa29aeaed36805421100895ee1b6137645622b4
 MISC metadata.xml 918 RMD160 72052da2565fb1655ac426cdfccbbadeb1f94198 SHA1 c79d28f3862278ae78ccdbf918b9101cfd2bf2f9 SHA256 7aa8ab7b4037d1423055f535178c88ef0a6de8e0673acd981c227514f389cf1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkufZVsACgkQAiZjviIA2XhWKACePf2AFGSahSbB+Hm4+Y785WWs
-8PoAn3g7F7OdzioBZs+A9HPs+g9gujng
-=jf2I
+iEYEARECAAYFAkvyeLYACgkQAiZjviIA2Xjj8wCg4KigfJqd5eCPw7bUh3WWaQva
++v8AoIKa/dJlWEwXgkD53HHr6iQg3/Ez
+=etin
 -----END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-2.6.32.ebuild b/dev-util/perf/perf-2.6.34.ebuild
index f798d2ab5b93..e361933ee645 100644
--- a/dev-util/perf/perf-2.6.32.ebuild
+++ b/dev-util/perf/perf-2.6.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.32.ebuild,v 1.1 2009/12/04 16:33:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.34.ebuild,v 1.1 2010/05/18 11:22:36 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
@@ -30,18 +35,16 @@ SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+demangle +doc"
+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 )"
 
-if [[ -n ${LINUX_PATCH} ]]; then
-	DEPEND="${DEPEND}
-		dev-util/patchutils"
-fi
-
 S="${WORKDIR}/linux-${LINUX_VER}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
@@ -60,9 +63,11 @@ src_unpack() {
 	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"
+	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
@@ -74,6 +79,11 @@ src_unpack() {
 }
 
 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 \
@@ -81,20 +91,19 @@ src_prepare() {
 		-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
-
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${WORKDIR}"/${P}.patch
-	fi
 }
 
 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)" \
@@ -115,7 +124,7 @@ src_test() {
 
 src_install() {
 	# Don't use make install or it'll be re-building the stuff :(
-	dosbin perf || die
+	dobin perf || die
 
 	dodoc CREDITS || die