diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 13:55:25 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-01 13:55:25 +0000 |
| commit | 569c0e8ad96601f1ef0121bd7f84de0d1479fdda (patch) | |
| tree | 9726df825039ffed3a65fc344ce584fbe5f9dd70 /kde-base/kdelibs | |
| parent | Rework the gcc checkup to be less time consuming and move to git-2 eclass (diff) | |
| download | gentoo-2-569c0e8ad96601f1ef0121bd7f84de0d1479fdda.tar.gz gentoo-2-569c0e8ad96601f1ef0121bd7f84de0d1479fdda.tar.bz2 gentoo-2-569c0e8ad96601f1ef0121bd7f84de0d1479fdda.zip | |
Add pkg_pretend check for gcc. Just moves the functionality from eclass to the pkg. Technically it is sync from overlay so it bumped eapi and removed useless dies.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild | 20 |
2 files changed, 19 insertions, 8 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 2ea5946d631b..645d8ddf9895 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.746 2011/04/18 20:27:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.747 2011/05/01 13:55:25 scarabeus Exp $ + + 01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> kdelibs-4.6.2-r2.ebuild: + Add pkg_pretend check for gcc. Just moves the functionality from eclass to + the pkg. Technically it is sync from overlay so it bumped eapi and removed + useless dies. 18 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org> kdelibs-4.6.2-r2.ebuild: diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild index 6536dd61d974..cad88ad09eb8 100644 --- a/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild +++ b/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.4 2011/04/18 20:27:15 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v 1.5 2011/05/01 13:55:25 scarabeus Exp $ -EAPI=3 +EAPI=4 CPPUNIT_REQUIRED="optional" DECLARATIVE_REQUIRED="always" OPENGL_REQUIRED="optional" WEBKIT_REQUIRED="always" KDE_SCM="git" -inherit kde4-base fdo-mime +inherit kde4-base fdo-mime toolchain-funcs DESCRIPTION="KDE libraries needed by all KDE programs." HOMEPAGE="http://www.kde.org/" @@ -140,6 +140,12 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" ) +pkg_pretend() { + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." +} + src_prepare() { kde4-base_src_prepare use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" @@ -255,13 +261,13 @@ src_install() { # use system certificates rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die dosym /etc/ssl/certs/ca-certificates.crt \ - "${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die + "${KDEDIR}"/share/apps/kssl/ca-bundle.crt if use doc; then einfo "Installing API documentation. This could take a bit of time." cd "${S}"/doc/api/ docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" + dohtml -r ${P}-apidocs/* fi if use aqua; then @@ -285,8 +291,8 @@ src_install() { einfo Installing environment file. echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EROOT}/${KDEDIR}/$(get_libdir)/kde4/plugins/" >> "${T}/77kde" - doenvd "${T}/77kde" || die + echo "QT_PLUGIN_PATH=${EKDEDIR}/$(get_libdir)/kde4/plugins" >> "${T}/77kde" + doenvd "${T}/77kde" } pkg_postinst() { |