summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2014-08-08 09:48:23 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2014-08-08 09:48:23 +0000
commit4088ec717e8e64f2d2a0c67f85fc8f101e32abff (patch)
tree569373c4c4f05f8b9ffd931f526620d71e2a071d /kde-misc/kdiff3
parentStable for amd64 wrt bug #508764 (diff)
downloadgentoo-2-4088ec717e8e64f2d2a0c67f85fc8f101e32abff.tar.gz
gentoo-2-4088ec717e8e64f2d2a0c67f85fc8f101e32abff.tar.bz2
gentoo-2-4088ec717e8e64f2d2a0c67f85fc8f101e32abff.zip
Fix sed command for USE=-kde, bug #519370
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/ChangeLog5
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.98.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 82fcdd937b9c..17cf3ee88d55 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.73 2014/08/06 16:56:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.74 2014/08/08 09:48:23 voyageur Exp $
+
+ 08 Aug 2014; Bernard Cafarelli <voyageur@gentoo.org> kdiff3-0.9.98.ebuild:
+ Fix sed command for USE=-kde, bug #519370
*kdiff3-0.9.98 (06 Aug 2014)
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild
index 29e8cde66f22..5019aeec1e8a 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.98.ebuild,v 1.1 2014/08/06 16:56:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.98.ebuild,v 1.2 2014/08/08 09:48:23 voyageur Exp $
EAPI=5
@@ -54,8 +54,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