Version bump to latest rc, make sure the ebuild is fixed to fetch properly (was broken before), remove previous stuff.

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

4 files changed, 17 insertions, 98 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index 695e29c911bd..3138d96703e4 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.3 2009/10/31 11:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.4 2009/11/03 20:37:16 flameeyes Exp $
+
+*perf-2.6.32_rc6 (03 Nov 2009)
+
+  03 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> -perf-2.6.31.ebuild,
+  -perf-2.6.32_rc5.ebuild, +perf-2.6.32_rc6.ebuild:
+  Version bump to latest rc, make sure the ebuild is fixed to fetch properly
+  (was broken before), remove previous stuff.
 
   31 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   perf-2.6.32_rc5.ebuild, metadata.xml:
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 1ed36c3aa5df..96cf91674f26 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
-EBUILD perf-2.6.32_rc5.ebuild 3301 RMD160 414156c06457e18490e6bb641947c8cf725b3559 SHA1 28c264fc2200e03479063d7754d537835d589f06 SHA256 0e91c6ae5605b2bbea9c7dd45292394687ccf05fc9b1761727f04c4c32add789
-MISC ChangeLog 740 RMD160 e492058f194b0129f35964208e2571900fd54659 SHA1 aba9cba79d51ce519459b2e1fe0218959db0ac6a SHA256 786c2bf5cba00dc0814936c3d80e18c7a73ad47ae337d961045586f2c1745f0a
+DIST patch-2.6.32-rc6.bz2 11308185 RMD160 c47856f681222f061995cab31809655c1d34f594 SHA1 50b54248763d08c6b00d9ea6c0e211843f41a1f7 SHA256 8741d7bfec9f465263d951b5515ffc472031d037f6ac29d21f245c493bf69f59
+EBUILD perf-2.6.32_rc6.ebuild 3345 RMD160 b0052d52d9f0a7f3e95fa7ea1f8b85d5cf4ee3ea SHA1 10a9681a65f094cf70f5a5388808ad42b3740120 SHA256 82c2fa04f25e9d8b5c56db1dc12399a46ecf345113db53a5fa06428080ab9bbe
+MISC ChangeLog 1025 RMD160 b701e1e35d8d450c80a84151badcb28dc8bbf1a3 SHA1 1b381ca69a78b828168aef5134a7b382030e5f3f SHA256 4e58ad322bca8d85835eb1fe0d1dbcb0e7dd58f3579be0765d16cc33cca80148
 MISC metadata.xml 817 RMD160 333bacd0646c4aa7c16cc1209cd9032f5e7b2fed SHA1 c2bb6e9042768acd4a396f1d878ff3f29f389740 SHA256 77b02a80478445f267b4fd90809cebc2cb1fa7f2b4c8b31986b0bac9e0ec2b1d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrsJmsACgkQAiZjviIA2XiVzgCbBQjvfMQ+S2PNNbGlTyIYWhn5
-L+UAoJM2GaWuQK12dO6Cl9Mbxc0pRqAy
-=qRE5
------END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-2.6.31.ebuild b/dev-util/perf/perf-2.6.31.ebuild
deleted file mode 100644
index c43b94d35291..000000000000
--- a/dev-util/perf/perf-2.6.31.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.31.ebuild,v 1.1 2009/10/30 19:30:24 flameeyes Exp $
-
-EAPI=2
-
-inherit versionator eutils toolchain-funcs linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_SOURCES=linux-${MY_PV}.tar.bz2
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="http://perf.wiki.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v$(get_version_component_range 1-2)/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+demangle"
-
-DEPEND="demangle? ( sys-devel/binutils )
-	dev-libs/elfutils"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/linux-${MY_PV}/tools/perf"
-
-CONFIG_CHECK="PERF_EVENTS KALLSYMS"
-
-src_unpack() {
-	# 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} linux-${MY_PV}/{tools/perf,include,lib,"arch/*/include"}
-
-	[[ -n ${A/${LINUX_SOURCES}/} ]] && unpack ${A/${LINUX_SOURCES}/}
-}
-
-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
-}
-
-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."
-}
diff --git a/dev-util/perf/perf-2.6.32_rc5.ebuild b/dev-util/perf/perf-2.6.32_rc6.ebuild
index 58b523f4a740..553d6e341d41 100644
--- a/dev-util/perf/perf-2.6.32_rc5.ebuild
+++ b/dev-util/perf/perf-2.6.32_rc6.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/10/31 11:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-2.6.32_rc6.ebuild,v 1.1 2009/11/03 20:37:16 flameeyes Exp $
 
 EAPI=2
 
@@ -12,18 +12,20 @@ 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/testing/${LINUX_PATCH}
-		mirror://kernel/linux/kernel/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+	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$(get_version_component_range 1-2)/${LINUX_SOURCES}"
+SRC_URI="${SRC_URI} mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"