summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-07-10 22:47:18 +0000
committerJonathan Callen <abcd@gentoo.org>2011-07-10 22:47:18 +0000
commitf345fe02159c4e9fae9994a13e9e48e250e39368 (patch)
treeed341a8738d2a7764c98e230497c878e93842e56 /kde-base
parentVersion bump wrt #362869 by Arfrever Frehtes Taifersar Arahesis (diff)
downloadgentoo-2-f345fe02159c4e9fae9994a13e9e48e250e39368.tar.gz
gentoo-2-f345fe02159c4e9fae9994a13e9e48e250e39368.tar.bz2
gentoo-2-f345fe02159c4e9fae9994a13e9e48e250e39368.zip
Fix call to python_merge_intermediate_installation_images
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/pykde4/ChangeLog5
-rw-r--r--kde-base/pykde4/pykde4-4.6.5-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 5dd3b6281ac1..15042486f235 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/pykde4
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.123 2011/07/10 15:06:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.124 2011/07/10 22:47:18 abcd Exp $
+
+ 10 Jul 2011; Jonathan Callen <abcd@gentoo.org> pykde4-4.6.5-r1.ebuild:
+ Fix call to python_merge_intermediate_installation_images
10 Jul 2011; Markos Chandras <hwoarang@gentoo.org> pykde4-4.6.3-r1.ebuild:
Stable on amd64 wrt bug #374587
diff --git a/kde-base/pykde4/pykde4-4.6.5-r1.ebuild b/kde-base/pykde4/pykde4-4.6.5-r1.ebuild
index ec274e0e7d60..1e51f01428db 100644
--- a/kde-base/pykde4/pykde4-4.6.5-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.5-r1.ebuild,v 1.1 2011/07/09 15:14:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.5-r1.ebuild,v 1.2 2011/07/10 22:47:18 abcd Exp $
EAPI=3
@@ -138,7 +138,7 @@ src_install() {
}
python_execute_function installation
- python_merge_intermediate_installation_images "${T}/images/${PYTHON_ABI}"
+ python_merge_intermediate_installation_images "${T}/images"
# As we don't call the eclass's src_install, we have to install the docs manually
DOCS=("${S}"/${KMMODULE}/{AUTHORS,NEWS,README})