From: Gregorio Guidi <greg_g@gentoo.org>
Date: Tue, 11 Oct 2005 09:39:51 +0000 (+0000)
Subject: Cosmetic.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af58a2f2dfcd0b34f3f19a07960920f523aba518;p=gentoo.git

Cosmetic.
Package-Manager: portage-2.0.51.22-r3
---

diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 6357c8a9bd92..c03bab90584b 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,7 +1,5 @@
-MD5 8c446e0c86049f29aee18136e0da81da xxdiff-3.0.2-r1.ebuild 1561
 MD5 70f06600556327dcfbc31fa03f610042 metadata.xml 155
 MD5 11067a32aae8383dc170eebb0168a614 ChangeLog 4074
-MD5 6cadabbe76b931197cd72505d95e6f0c xxdiff-3.0.2.ebuild 1543
+MD5 e98e2c40d5cd9527666c4efd50e2dcc3 xxdiff-3.0.2-r1.ebuild 1547
 MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588
-MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2 65
 MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2-r1 65
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.0.2 b/dev-util/xxdiff/files/digest-xxdiff-3.0.2
deleted file mode 100644
index ce2a73819e9c..000000000000
--- a/dev-util/xxdiff/files/digest-xxdiff-3.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c3eeedc2c710a43794894d29c1d5db7 xxdiff-3.0.2.tar.gz 1064508
diff --git a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
index eb6907cbcbaf..0c3cddb4d7a7 100644
--- a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.0.2-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/xxdiff/xxdiff-3.0.2-r1.ebuild,v 1.6 2005/09/11 02:21:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild,v 1.7 2005/10/11 09:39:50 greg_g Exp $
 
 inherit eutils kde-functions
 
@@ -22,7 +22,6 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	=dev-util/tmake-1.8*"
 
-set-qtdir 3
 set-kdedir 3
 
 src_unpack()
diff --git a/dev-util/xxdiff/xxdiff-3.0.2.ebuild b/dev-util/xxdiff/xxdiff-3.0.2.ebuild
deleted file mode 100644
index 2525befb9fa4..000000000000
--- a/dev-util/xxdiff/xxdiff-3.0.2.ebuild
+++ /dev/null
@@ -1,59 +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/xxdiff/xxdiff-3.0.2.ebuild,v 1.14 2005/07/07 04:35:10 caleb Exp $
-
-inherit eutils
-
-DESCRIPTION="A graphical file and directories comparator and merge tool."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-
-DEPEND="=x11-libs/qt-3*
-	=dev-util/tmake-1.8*
-	kde? ( >=kde-base/kdelibs-3.1.0 )"
-
-RDEPEND="sys-apps/diffutils"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ~sparc ~x86"
-IUSE="kde"
-
-src_unpack()
-{
-	unpack ${A}
-	if use kde; then
-		cd ${S}/src
-		cp ${FILESDIR}/kdesupport.patch .
-		sed -e "s:/usr/kde/3.1:`ls -d /usr/kde/* | tail -n 1`:g" -i kdesupport.patch
-		epatch kdesupport.patch
-	fi
-}
-
-src_compile() {
-	cd src
-	tmake -o Makefile xxdiff.pro
-
-	### borrowed from kde.eclass #
-	#
-	# fix the sandbox errors "can't writ to .kde or .qt" problems.
-	# this is a fake homedir that is writeable under the sandbox, so that the build
-	# process can do anything it wants with it.
-	REALHOME="$HOME"
-	mkdir -p $T/fakehome/.kde
-	mkdir -p $T/fakehome/.qt
-	export HOME="$T/fakehome"
-	addwrite "${QTDIR}/etc/settings"
-
-	# things that should access the real homedir
-	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-
-	emake || die
-}
-
-src_install () {
-	dobin bin/xxdiff bin/xxdiff-cvs-diff bin/xxdiff-encrypted bin/xxdiff-find-grep-sed bin/xxdiff-match
-	doman src/xxdiff.1
-	dodoc README COPYING CHANGES TODO
-}