diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-04-03 12:29:14 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-04-03 12:29:14 +0000 |
| commit | 070ec8eeb91804c52eba98362b4285e2346d66cd (patch) | |
| tree | 1dd7df99aa5e72353f1a6f2f7aa87131764a0f50 /dev-util/xxdiff | |
| parent | stable on x86. Bug #37184,#46258 (diff) | |
| download | historical-070ec8eeb91804c52eba98362b4285e2346d66cd.tar.gz historical-070ec8eeb91804c52eba98362b4285e2346d66cd.tar.bz2 historical-070ec8eeb91804c52eba98362b4285e2346d66cd.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/xxdiff')
| -rw-r--r-- | dev-util/xxdiff/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/xxdiff/Manifest | 12 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-2.9.2-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-util/xxdiff/xxdiff-3.0.2.ebuild | 6 |
4 files changed, 20 insertions, 11 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/Manifest b/dev-util/xxdiff/Manifest index 1be240878c1d..2499c5da40d2 100644 --- a/dev-util/xxdiff/Manifest +++ b/dev-util/xxdiff/Manifest @@ -1,10 +1,10 @@ -MD5 7f2caf6f4f6d578e14f2b9f99fbe5a5a ChangeLog 2141 +MD5 a7279cc57ccf7ce50a0c8ec0fc59bcc7 ChangeLog 2358 +MD5 244fe48553198802a49b20708fccfa66 xxdiff-3.0.2.ebuild 1531 MD5 668bde156159b60076a92f62384ec8eb xxdiff-2.6.ebuild 1007 -MD5 e1304523310671a55cc5556457f51643 xxdiff-2.9.2-r1.ebuild 1148 MD5 6d9c48283db1e92a4d60469e2a7705e4 xxdiff-2.9.2.ebuild 1012 -MD5 a67ca90e708569eb9640529fa48c874e xxdiff-3.0.2.ebuild 1426 +MD5 8999890ebf30a4686f50b509230e2ce7 xxdiff-2.9.2-r1.ebuild 1253 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 -MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588 MD5 fbf14d026d67672a85470077dd5a75c3 files/digest-xxdiff-3.0.2 65 +MD5 90983c130466c6d73a77a59889fbc673 files/kdesupport.patch 588 +MD5 a533ffd20699e97c403fff6cdd3dcf37 files/digest-xxdiff-2.9.2-r1 64 +MD5 a533ffd20699e97c403fff6cdd3dcf37 files/digest-xxdiff-2.9.2 64 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 } |