summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2004-01-31 12:28:20 +0000
committerMartin Holzer <mholzer@gentoo.org>2004-01-31 12:28:20 +0000
commit5729f5534b6bcf8a765f20af903072f7b1c7d84c (patch)
tree27996583045c4071f3982494ce565365dd43beb8 /dev-util/xxdiff
parentVersion bumped. (diff)
downloadgentoo-2-5729f5534b6bcf8a765f20af903072f7b1c7d84c.tar.gz
gentoo-2-5729f5534b6bcf8a765f20af903072f7b1c7d84c.tar.bz2
gentoo-2-5729f5534b6bcf8a765f20af903072f7b1c7d84c.zip
Version bumped.
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/ChangeLog7
-rw-r--r--dev-util/xxdiff/Manifest4
-rw-r--r--dev-util/xxdiff/files/digest-xxdiff-3.0.21
-rw-r--r--dev-util/xxdiff/xxdiff-3.0.2.ebuild56
4 files changed, 65 insertions, 3 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 1754d0ad1cc8..53205a16c119 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/xxdiff
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.10 2004/01/25 19:10:45 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.11 2004/01/31 12:27:59 mholzer Exp $
+
+*xxdiff-3.0.2 (31 Jan 2004)
+
+ 31 Jan 2004; Martin Holzer <mholzer@gentoo.org> xxdiff-3.0.2.ebuild:
+ Version bumped. Thx to Christian Savard <savardc@pobox.com> in #39783
25 Jan 2004; Martin Holzer <mholzer@gentoo.org> xxdiff-2.6.ebuild,
xxdiff-2.9.2-r1.ebuild, xxdiff-2.9.2.ebuild:
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index f3f10d7af94b..9f7bb2f7100f 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,8 +1,8 @@
-MD5 eaa270c6b4776b50055d15d8ad71aaad ChangeLog 1893
+MD5 1eb42b8130e0f0e1cc6a5825c6eff0da ChangeLog 1893
MD5 4f6d5af3e198e42590a3203ac1a00880 xxdiff-2.6.ebuild 760
MD5 8224b0b485149b9cab6d0b9145e0d404 xxdiff-2.9.2-r1.ebuild 901
MD5 fba5cb2f99493a67786d0a70081d73b6 xxdiff-2.9.2.ebuild 768
-MD5 f2d3fd8a396399d74f7679de08518bac xxdiff-3.0.2.ebuild 1329
+MD5 a67ca90e708569eb9640529fa48c874e xxdiff-3.0.2.ebuild 1426
MD5 4f4300258e4761329eba40d2a8cfb899 files/digest-xxdiff-2.6 62
MD5 a533ffd20699e97c403fff6cdd3dcf37 files/digest-xxdiff-2.9.2 64
MD5 a533ffd20699e97c403fff6cdd3dcf37 files/digest-xxdiff-2.9.2-r1 64
diff --git a/dev-util/xxdiff/files/digest-xxdiff-3.0.2 b/dev-util/xxdiff/files/digest-xxdiff-3.0.2
new file mode 100644
index 000000000000..ce2a73819e9c
--- /dev/null
+++ b/dev-util/xxdiff/files/digest-xxdiff-3.0.2
@@ -0,0 +1 @@
+MD5 3c3eeedc2c710a43794894d29c1d5db7 xxdiff-3.0.2.tar.gz 1064508
diff --git a/dev-util/xxdiff/xxdiff-3.0.2.ebuild b/dev-util/xxdiff/xxdiff-3.0.2.ebuild
new file mode 100644
index 000000000000..69820c6ffc70
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-3.0.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/01/31 12:27:59 mholzer Exp $
+
+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.0.0
+ =dev-util/tmake-1.8*
+ kde? ( >=kde-base/kdelibs-3.1.0 )"
+
+RDEPEND="${DEPEND}
+ sys-apps/diffutils"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="kde"
+
+src_unpack()
+{
+ unpack ${A}
+ if [ `use kde` ]; then
+ cd ${S}/src
+ epatch ${FILESDIR}/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
+}