summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-01-17 07:22:20 +0000
committerJohannes Huber <johu@gentoo.org>2012-01-17 07:22:20 +0000
commit8488abd740b965e60c7698df090849ad0bb7d1cc (patch)
tree54346b94d504f84b100c3770f7c4edecf43fbbfd /kde-misc/kdiff3
parentRemove intermediate version. (diff)
downloadgentoo-2-8488abd740b965e60c7698df090849ad0bb7d1cc.tar.gz
gentoo-2-8488abd740b965e60c7698df090849ad0bb7d1cc.tar.bz2
gentoo-2-8488abd740b965e60c7698df090849ad0bb7d1cc.zip
Fix sed, thanks to Clemmitt M. Sigler <cmsigler@gmail.com>.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/ChangeLog5
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.96.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 3b06c47a7d91..0f629e72c4bb 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.52 2012/01/16 17:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.53 2012/01/17 07:22:20 johu Exp $
+
+ 17 Jan 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
+ Fix sed, thanks to Clemmitt M. Sigler <cmsigler@gmail.com>.
16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> kdiff3-0.9.96.ebuild:
Stable for AMD64, wrt bug #399093
diff --git a/kde-misc/kdiff3/kdiff3-0.9.96.ebuild b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
index 8830de10c958..0d9abe850d79 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.96.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.4 2012/01/16 17:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.96.ebuild,v 1.5 2012/01/17 07:22:20 johu Exp $
EAPI=4
@@ -50,8 +50,7 @@ src_unpack(){
src_prepare() {
if ! use kde; then
# adapt to Gentoo paths
- sed -e s,documentation.path.*$,documentation.path\ =\
- "${EPREFIX}"/usr/share/doc/"${PF}", \
+ sed -e s,documentation.path.*$,documentation.path\ =\ "${EPREFIX}"/usr/share/doc/"${PF}", \
-e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
"${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
else