version bump

5 files changed, 40 insertions, 32 deletions

diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 01e7f96bfe56..3d0641c1b273 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/xxdiff
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.2 2002/02/28 22:55:43 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.3 2002/07/02 05:05:40 seemant Exp $
+
+*xxdiff-2.6 (01 Jul 2002)
+
+  01 Jul 2002; Seemant Kulleen <seemant@gentoo.org> xxdiff-2.6.ebuild
+  files/digest-xxdiff-2.6 :
+
+  Version bump to work with qt-3 and gcc-3.1, thenkas to:
+  j_r_fonseca@yahoo.co.uk (Jose' Fonseca) in bug #4345.
 
 *xxdiff-2.5 (28 Feb 2002)
 
diff --git a/dev-util/xxdiff/files/digest-xxdiff-1.9 b/dev-util/xxdiff/files/digest-xxdiff-1.9
deleted file mode 100644
index 3f160ed04e0a..000000000000
--- a/dev-util/xxdiff/files/digest-xxdiff-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b3d0a2e2922a3dc8311b61441583661 xxdiff-1.9.src.tar.gz 689758
diff --git a/dev-util/xxdiff/files/digest-xxdiff-2.6 b/dev-util/xxdiff/files/digest-xxdiff-2.6
new file mode 100644
index 000000000000..3b77e964e866
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-2.6
@@ -0,0 +1 @@
+MD5 45e58050949445123c69874edb2e5642 xxdiff-2.6.tar.gz 799022
diff --git a/dev-util/xxdiff/xxdiff-1.9.ebuild b/dev-util/xxdiff/xxdiff-1.9.ebuild
deleted file mode 100644
index dfce9e37c02b..000000000000
--- a/dev-util/xxdiff/xxdiff-1.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-1.9.ebuild,v 1.5 2002/05/27 17:27:38 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
-SRC_URI="mirror://sourceforge/xxdiff/${P}.src.tar.gz"
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	=x11-libs/qt-2.3*
-	>=sys-devel/gcc-2.95.3"
-
-RDEPEND="sys-apps/diffutils"
-
-src_compile() {
-	QTDIR=/usr/qt/2 ./configure --prefix=/usr --mandir=/usr/share/man || die
-
-	make || die
-}
-
-src_install () {
-	dobin src/xxdiff
-	newman src/xxdiff.man xxdiff.1
-	dodoc README COPYING CHANGES ChangeLog 
-	dodoc copyright.txt doc/xxdiff-doc.sgml
-}
-
-# vim: ai et sw=4 ts=4
diff --git a/dev-util/xxdiff/xxdiff-2.6.ebuild b/dev-util/xxdiff/xxdiff-2.6.ebuild
new file mode 100644
index 000000000000..ca49a1d8ad2f
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.6.ebuild,v 1.1 2002/07/02 05:05:40 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
+SRC_URI="mirror://sourceforge/xxdiff/${P}.tar.gz"
+HOMEPAGE="http://xxdiff.sourceforge.net/"
+
+DEPEND="=x11-libs/qt-3*
+	>=dev-util/tmake-1.8-r1"
+
+RDEPEND="sys-apps/diffutils"
+
+SLOT=""
+LICENSE="GPL"
+
+src_compile() {
+	cd src
+	tmake -o Makefile xxdiff.pro
+
+	emake || die
+}
+
+src_install () {
+	dobin src/xxdiff
+	doman src/xxdiff.1
+	dodoc README COPYING CHANGES TODO
+	dodoc copyright.txt
+}