3 files changed, 7 insertions, 103 deletions
diff --git a/dev-util/valkyrie/ChangeLog b/dev-util/valkyrie/ChangeLog
index 143363c8dd8b..c8c257f32cde 100644
--- a/dev-util/valkyrie/ChangeLog
+++ b/dev-util/valkyrie/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/valkyrie
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.10 2008/11/26 00:45:04 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.11 2009/01/05 19:02:24 griffon26 Exp $
+
+  05 Jan 2009; Maurice van der Pot <griffon26@gentoo.org>
+  -files/valkyrie-1.2.0-warnings.patch, -valkyrie-1.2.0.ebuild:
+  Removed old valkyrie version in preparation for clean-up of old valgrind
+  ebuilds.
 
   26 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/valkyrie-1.3.0-asneeded.patch, valkyrie-1.3.0.ebuild:
diff --git a/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch b/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch
deleted file mode 100644
index 7dccfe1e9407..000000000000
--- a/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp
-===================================================================
---- valkyrie-1.2.0.orig/valkyrie/tool_utils/vglog.cpp
-+++ valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp
-@@ -863,7 +863,7 @@ bool VgLog::mergeErrors( VgErrorList sEr
- {
-    VgErrCounts mErrCounts = errorcounts();
- 
--   vklmPrint( 2, "--- update matches (n=%d) --- ", sErrors.count());
-+   vklmPrint( 2, "--- update matches (n=%zu) --- ", sErrors.count());
- 
-    /* --- find matches: update master err, delete slave err ---  */
- 
-@@ -927,7 +927,7 @@ bool VgLog::mergeErrors( VgErrorList sEr
-       vklmPrint( 2, " ");
-    }
- 
--   vklmPrint( 2, "--- append non-matches (n=%d) --- ", sErrors.count() );
-+   vklmPrint( 2, "--- append non-matches (n=%zu) --- ", sErrors.count() );
- 
-    /* if no errcounts, and sErrors > 0, create empty errcounts */
-    if ( mErrCounts.isNull() && sErrors.count() > 0 ) {
-@@ -965,7 +965,7 @@ bool VgLog::mergeErrors( VgErrorList sEr
- 
- bool VgLog::mergeLeakErrors( VgErrorList sLeakErrors )
- {
--   vklmPrint( 2, "--- update matches (n=%d) ---", sLeakErrors.count() );
-+   vklmPrint( 2, "--- update matches (n=%zu) ---", sLeakErrors.count() );
- 
-    /* --- for each leak in master ---  */
-    VgErrorList errs = leaks();
-@@ -1001,7 +1001,7 @@ bool VgLog::mergeLeakErrors( VgErrorList
-       vklmPrint( 2, " ");
-    }
- 
--   vklmPrint( 2, "--- append non-matches (n=%d) ---", sLeakErrors.count() );
-+   vklmPrint( 2, "--- append non-matches (n=%zu) ---", sLeakErrors.count() );
- 
-    /* --- append remaining slave leaks to master --- */
-    VgErrorList::Iterator sIt;
-Index: valkyrie-1.2.0/valkyrie/vk_file_utils.cpp
-===================================================================
---- valkyrie-1.2.0.orig/valkyrie/vk_file_utils.cpp
-+++ valkyrie-1.2.0/valkyrie/vk_file_utils.cpp
-@@ -3021,7 +3021,7 @@ void FileDialog::urlFinished( QNetworkOp
-       if ( d->paths->hasFocus() )
-          d->ignoreNextKeyPress = true;
- 
--		vkWarn( this, "Error", op->protocolDetail().latin1() );
-+		vkWarn( this, "Error", "%s", op->protocolDetail().latin1() );
-       switch ( op->errorCode() ) {
-       case QNetworkProtocol::ErrParse:
-       case QNetworkProtocol::ErrValid:
diff --git a/dev-util/valkyrie/valkyrie-1.2.0.ebuild b/dev-util/valkyrie/valkyrie-1.2.0.ebuild
deleted file mode 100644
index f21146bc2326..000000000000
--- a/dev-util/valkyrie/valkyrie-1.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-1.2.0.ebuild,v 1.6 2008/07/27 21:42:32 carlo Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.open-works.co.uk/projects/valkyrie.html"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt:3"
-RDEPEND="${DEPEND}
-	=dev-util/valgrind-3.2*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-warnings.patch"
-}
-
-src_compile() {
-	use debug || sed -i -e '/#define DEBUG_ON/ s:1:0:' \
-		"${S}/valkyrie/vk_utils.h"
-
-	econf \
-		--disable-dependency-tracking \
-		--with-Qt-dir="${QTDIR}" || die "econf failed"
-
-	# Use the right path for the documentation
-	sed -i -e '/VK_DOC_PATH/ s:/doc/:/share/doc/'${PF}'/html/:g' \
-		"${S}/config.h"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install
-
-	dodoc README README_DEVELOPERS AUTHORS
-}