Remove old version, set valgrind dep to 2.0/2.2

Package-Manager: portage-2.0.51.22-r2

6 files changed, 10 insertions, 63 deletions

diff --git a/dev-util/callgrind/ChangeLog b/dev-util/callgrind/ChangeLog
index 86028ebadc29..744cd2bedace 100644
--- a/dev-util/callgrind/ChangeLog
+++ b/dev-util/callgrind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/callgrind
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/ChangeLog,v 1.12 2005/08/10 12:38:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/ChangeLog,v 1.13 2005/08/10 12:43:13 caleb Exp $
+
+  10 Aug 2005; Caleb Tennis <caleb@gentoo.org>
+  -files/callgrind-sim-pic.patch, -callgrind-0.9.10-r1.ebuild,
+  callgrind-0.9.11-r1.ebuild:
+  Remove old version, make dep set to valgrind 2.0/2.2
 
 *callgrind-0.9.12 (10 Aug 2005)
 
diff --git a/dev-util/callgrind/Manifest b/dev-util/callgrind/Manifest
index 92842e07bf25..a5999bd30c79 100644
--- a/dev-util/callgrind/Manifest
+++ b/dev-util/callgrind/Manifest
@@ -1,10 +1,7 @@
 MD5 7b2c4bbdbf212df3e8e328a568822e17 callgrind-0.9.12.ebuild 727
-MD5 5a66e3a7dae241d8572dec5e332d6b30 callgrind-0.9.10-r1.ebuild 804
-MD5 6003ed61753a36d871f5b7452279498d ChangeLog 1692
+MD5 7b77c12c1908c6c3f1b96fdf620387ac ChangeLog 1888
 MD5 ce27d2d79c120eec4ba4563651b7e5c1 metadata.xml 261
-MD5 7bc61d086a6a668d2f8e8c0eea1c8d08 callgrind-0.9.11-r1.ebuild 811
-MD5 e8bd705fcb2d6df113583a3775210fd6 files/digest-callgrind-0.9.10-r1 68
+MD5 1b042a95b298f8d41e5deda5df97acc0 callgrind-0.9.11-r1.ebuild 807
 MD5 9fec370836b1b35ed92c7fcc97732b29 files/digest-callgrind-0.9.11-r1 68
 MD5 d9e50bb8e3fba3a9dc46f344a0c1b68a files/digest-callgrind-0.9.12 68
 MD5 fd019cb535b08fdbae43cb0a32b840cc files/callgrind-0.9.11-pic.patch 796
-MD5 477bede0293a25c4565eba10d7a25e41 files/callgrind-sim-pic.patch 725
diff --git a/dev-util/callgrind/callgrind-0.9.10-r1.ebuild b/dev-util/callgrind/callgrind-0.9.10-r1.ebuild
deleted file mode 100644
index f2d0e0e8c529..000000000000
--- a/dev-util/callgrind/callgrind-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/callgrind-0.9.10-r1.ebuild,v 1.3 2005/03/28 13:33:54 caleb Exp $
-
-inherit eutils
-
-DESCRIPTION="A plugin for cachegrind that adds call-graph profiling, needed by kcachegrind"
-HOMEPAGE="http://kcachegrind.sourceforge.net/"
-SRC_URI="http://kcachegrind.sourceforge.net/${P}.tar.gz"
-
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-RDEPEND="=dev-util/valgrind-2.2*"
-DEPEND="${RDEPEND}
-	!dev-util/calltree"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/callgrind-sim-pic.patch
-}
-
-src_install() {
-	einstall || die
-	rm -rf ${D}/usr/share/doc/valgrind
-	dodoc AUTHORS INSTALL README || die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
-}
diff --git a/dev-util/callgrind/callgrind-0.9.11-r1.ebuild b/dev-util/callgrind/callgrind-0.9.11-r1.ebuild
index bcdaa7a8744c..a6cf3002b2c9 100644
--- a/dev-util/callgrind/callgrind-0.9.11-r1.ebuild
+++ b/dev-util/callgrind/callgrind-0.9.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/callgrind-0.9.11-r1.ebuild,v 1.4 2005/07/19 21:35:46 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/callgrind/callgrind-0.9.11-r1.ebuild,v 1.5 2005/08/10 12:43:13 caleb Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=dev-util/valgrind-2.2.0
+DEPEND="=dev-util/valgrind-2*
 	!dev-util/calltree"
 
 src_unpack() {
diff --git a/dev-util/callgrind/files/callgrind-sim-pic.patch b/dev-util/callgrind/files/callgrind-sim-pic.patch
deleted file mode 100644
index 64b7d49235eb..000000000000
--- a/dev-util/callgrind/files/callgrind-sim-pic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- callgrind-0.9.10/src/sim.c.orig	2005-01-28 11:40:35.000000000 +0100
-+++ callgrind-0.9.10/src/sim.c	2005-01-28 11:50:00.000000000 +0100
-@@ -309,11 +309,22 @@
- 
- static __inline__ void cpuid(Int n, UInt *a, UInt *b, UInt *c, UInt *d)
- {
-+#ifdef __PIC__
-+   __asm__ __volatile__ (
-+    "pushl %%ebx\n\t"\
-+    "cpuid\n\t"\
-+    "movl %%ebx,%1\n\t"\
-+    "popl %%ebx"
-+    : "=a" (*a), "=r" (*b), "=c" (*c), "=d" (*d)      /* output */
-+    : "0" (n)         /* input */
-+    );
-+#else
-    __asm__ __volatile__ (
-     "cpuid"
-     : "=a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)      /* output */
-     : "0" (n)         /* input */
-     );
-+#endif
- }
- 
- static void micro_ops_warn(Int actual_size, Int used_size, Int line_size)
diff --git a/dev-util/callgrind/files/digest-callgrind-0.9.10-r1 b/dev-util/callgrind/files/digest-callgrind-0.9.10-r1
deleted file mode 100644
index ba9004c28cbf..000000000000
--- a/dev-util/callgrind/files/digest-callgrind-0.9.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddfd883491f7d564dca15a2e9336854f callgrind-0.9.10.tar.gz 255698