summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-12-23 01:37:37 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-12-23 01:37:37 +0000
commit719cf2a21d3caca12554b13a6f9e23739e47564a (patch)
treec9a53fad34b0d4f6861b1744ecd9c4291563b21e /kde-base/pykde4
parentFix prefix support (diff)
downloadhistorical-719cf2a21d3caca12554b13a6f9e23739e47564a.tar.gz
historical-719cf2a21d3caca12554b13a6f9e23739e47564a.tar.bz2
historical-719cf2a21d3caca12554b13a6f9e23739e47564a.zip
Pull in changes from overlay and prefix support
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base/pykde4')
-rw-r--r--kde-base/pykde4/ChangeLog5
-rw-r--r--kde-base/pykde4/pykde4-4.3.4.ebuild24
2 files changed, 16 insertions, 13 deletions
diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 3f238de54619..326896c51d88 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/pykde4
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.42 2009/12/10 23:53:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.43 2009/12/23 01:37:37 abcd Exp $
+
+ 23 Dec 2009; Jonathan Callen <abcd@gentoo.org> pykde4-4.3.4.ebuild:
+ Pull in changes from overlay and prefix support
10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -pykde4-4.3.1.ebuild:
Drop KDE SC-4.3.1.
diff --git a/kde-base/pykde4/pykde4-4.3.4.ebuild b/kde-base/pykde4/pykde4-4.3.4.ebuild
index c2c99fbaa3ae..68bebfebacbb 100644
--- a/kde-base/pykde4/pykde4-4.3.4.ebuild
+++ b/kde-base/pykde4/pykde4-4.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.4.ebuild,v 1.1 2009/12/01 11:31:37 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.3.4.ebuild,v 1.2 2009/12/23 01:37:37 abcd Exp $
EAPI="2"
@@ -14,15 +14,15 @@ DESCRIPTION="Python bindings for KDE4"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="akonadi debug examples policykit semantic-desktop"
-COMMON_DEPEND="
- >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X]
+DEPEND="
$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
+ aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,aqua] )
+ !aqua? ( >=dev-python/PyQt4-4.5[dbus,sql,svg,webkit,X] )
akonadi? ( $(add_kdebase_dep kdepimlibs) )
policykit? ( >=sys-auth/policykit-qt-0.9.2 )
"
-DEPEND="${COMMON_DEPEND}"
# blocker added due to compatibility issues and error during compile time
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
!dev-python/pykde
"
@@ -41,14 +41,14 @@ src_prepare() {
}
src_configure() {
- mycmakeargs="${mycmakeargs}
+ mycmakeargs=(
-DWITH_QScintilla=OFF
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use_with semantic-desktop Nepomuk)
$(cmake-utils_use_with akonadi)
$(cmake-utils_use_with akonadi KdepimLibs)
$(cmake-utils_use_with policykit PolkitQt)
- "
+ )
kde4-meta_src_configure
}
@@ -57,19 +57,19 @@ src_install() {
kde4-meta_src_install
rm -f \
- "${D}$(python_get_sitedir)"/PyKDE4/*.py[co] \
- "${D}${PREFIX}"/share/apps/"${PN}"/*.py[co]
+ "${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+ "${ED}${PREFIX}"/share/apps/"${PN}"/*.py[co]
}
pkg_postinst() {
kde4-meta_pkg_postinst
- python_mod_optimize "${ROOT}$(python_get_sitedir)"/PyKDE4
+ python_mod_optimize "$(python_get_sitedir)"/PyKDE4
if use examples; then
echo
elog "PyKDE4 examples have been installed to"
- elog "${PREFIX}/share/apps/${PN}/examples"
+ elog "${EKDEDIR}/share/apps/${PN}/examples"
echo
fi
}
@@ -77,5 +77,5 @@ pkg_postinst() {
pkg_postrm() {
kde4-meta_pkg_postrm
- python_mod_cleanup "${ROOT}$(python_get_sitedir)"/PyKDE4
+ python_mod_cleanup "$(python_get_sitedir)"/PyKDE4
}