summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2004-02-11 18:15:56 +0000
committerMartin Holzer <mholzer@gentoo.org>2004-02-11 18:15:56 +0000
commit5dacd7eaf039ab2c94f0d54ee9d61aa4b51e2aa5 (patch)
tree61d5db346eb0791b9d8b83008e5ad4973b2407cd /dev-util/xxdiff
parentMake QTDIR/etc/settings a keepdir instead of dodir, so it persists via upgrad... (diff)
downloadhistorical-5dacd7eaf039ab2c94f0d54ee9d61aa4b51e2aa5.tar.gz
historical-5dacd7eaf039ab2c94f0d54ee9d61aa4b51e2aa5.tar.bz2
historical-5dacd7eaf039ab2c94f0d54ee9d61aa4b51e2aa5.zip
adding workaround to compile. closes 37839.
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/ChangeLog6
-rw-r--r--dev-util/xxdiff/Manifest8
-rw-r--r--dev-util/xxdiff/xxdiff-2.6.ebuild11
-rw-r--r--dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild11
-rw-r--r--dev-util/xxdiff/xxdiff-2.9.2.ebuild11
5 files changed, 39 insertions, 8 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 53205a16c119..304910215047 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,10 @@
# 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.11 2004/01/31 12:27:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.12 2004/02/11 18:15:47 mholzer Exp $
+
+ 11 Feb 2004; Martin Holzer <mholzer@gentoo.org> xxdiff-2.6.ebuild,
+ xxdiff-2.9.2-r1.ebuild, xxdiff-2.9.2.ebuild:
+ adding workaround to compile. closes 37839.
*xxdiff-3.0.2 (31 Jan 2004)
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 9f7bb2f7100f..8bacd130ef3b 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,7 +1,7 @@
-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 f769ca1304027f72df50cf086f84bded ChangeLog 2056
+MD5 668bde156159b60076a92f62384ec8eb xxdiff-2.6.ebuild 1007
+MD5 e1304523310671a55cc5556457f51643 xxdiff-2.9.2-r1.ebuild 1148
+MD5 34a2793c5fd78d61646ad97eda0b74c3 xxdiff-2.9.2.ebuild 1015
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
diff --git a/dev-util/xxdiff/xxdiff-2.6.ebuild b/dev-util/xxdiff/xxdiff-2.6.ebuild
index 3fc881a709e6..9b6761bc0593 100644
--- a/dev-util/xxdiff/xxdiff-2.6.ebuild
+++ b/dev-util/xxdiff/xxdiff-2.6.ebuild
@@ -1,6 +1,6 @@
# 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-2.6.ebuild,v 1.8 2004/01/25 19:10:45 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.6.ebuild,v 1.9 2004/02/11 18:15:47 mholzer Exp $
S=${WORKDIR}/${P}
DESCRIPTION="A graphical file comparator and merge tool simular to xdiff."
@@ -22,6 +22,15 @@ src_compile() {
cd src
tmake -o Makefile xxdiff.pro
+ 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
}
diff --git a/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild b/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild
index 2091cd5e653d..3a69ebf1a792 100644
--- a/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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-2.9.2-r1.ebuild,v 1.5 2004/01/25 19:10:45 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild,v 1.6 2004/02/11 18:15:47 mholzer Exp $
DESCRIPTION="A graphical file and directories comparator and merge tool."
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -32,6 +32,15 @@ src_compile() {
cd src
tmake -o Makefile xxdiff.pro
+ 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
}
diff --git a/dev-util/xxdiff/xxdiff-2.9.2.ebuild b/dev-util/xxdiff/xxdiff-2.9.2.ebuild
index 1060b7460671..8521a9166f01 100644
--- a/dev-util/xxdiff/xxdiff-2.9.2.ebuild
+++ b/dev-util/xxdiff/xxdiff-2.9.2.ebuild
@@ -1,6 +1,6 @@
# 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-2.9.2.ebuild,v 1.4 2004/01/25 19:10:45 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.9.2.ebuild,v 1.5 2004/02/11 18:15:47 mholzer Exp $
S=${WORKDIR}/${P}
DESCRIPTION="A graphical file and directories comparator and merge tool."
@@ -23,6 +23,15 @@ src_compile() {
cd src
tmake -o Makefile xxdiff.pro
+ 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
}