summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-04-03 12:29:14 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-04-03 12:29:14 +0000
commit21c6cbb27f59e59cd97ad6230aa431c9c1d89bd1 (patch)
tree3b7a1aeadbc993dd24abadc16ae64b3140cd62dd /dev-util
parentstable on x86. Bug #37184,#46258 (Manifest recommit) (diff)
downloadgentoo-2-21c6cbb27f59e59cd97ad6230aa431c9c1d89bd1.tar.gz
gentoo-2-21c6cbb27f59e59cd97ad6230aa431c9c1d89bd1.tar.bz2
gentoo-2-21c6cbb27f59e59cd97ad6230aa431c9c1d89bd1.zip
Added a check to the ebuild to update the patch to use the latest available KDE version instead of 3.1. Closes bug #40472.
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/xxdiff/ChangeLog7
-rw-r--r--dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild6
-rw-r--r--dev-util/xxdiff/xxdiff-3.0.2.ebuild6
3 files changed, 14 insertions, 5 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 50b2d934c0be..c7fdc4dc4997 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.13 2004/03/14 05:54:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.14 2004/04/03 12:29:14 plasmaroo Exp $
+
+ 03 Apr 2004; <plasmaroo@gentoo.org> xxdiff-2.9.2-r1.ebuild,
+ xxdiff-3.0.2.ebuild:
+ Added a check to the ebuild to update the patch to use the latest available
+ KDE version instead of 3.1. Closes bug #40472.
13 Mar 2004; Jason Wever <weeve@gentoo.org> xxdiff-2.9.2.ebuild:
Stable on sparc.
diff --git a/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild b/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild
index 3a69ebf1a792..119566a2888c 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.6 2004/02/11 18:15:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild,v 1.7 2004/04/03 12:29:14 plasmaroo Exp $
DESCRIPTION="A graphical file and directories comparator and merge tool."
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -24,7 +24,9 @@ src_unpack()
unpack ${A}
if [ `use kde` ]; then
cd ${S}/src
- epatch ${FILESDIR}/kdesupport.patch
+ 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
}
diff --git a/dev-util/xxdiff/xxdiff-3.0.2.ebuild b/dev-util/xxdiff/xxdiff-3.0.2.ebuild
index 69820c6ffc70..6ad4296f7c3c 100644
--- a/dev-util/xxdiff/xxdiff-3.0.2.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.0.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-3.0.2.ebuild,v 1.1 2004/01/31 12:27:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.0.2.ebuild,v 1.2 2004/04/03 12:29:14 plasmaroo Exp $
DESCRIPTION="A graphical file and directories comparator and merge tool."
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -24,7 +24,9 @@ src_unpack()
unpack ${A}
if [ `use kde` ]; then
cd ${S}/src
- epatch ${FILESDIR}/kdesupport.patch
+ 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
}