| 1 |
scarabeus 11/05/01 13:55:25 |
| 2 |
|
| 3 |
Modified: ChangeLog kdelibs-4.6.2-r2.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.747 kde-base/kdelibs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.747&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.747&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.746&r2=1.747 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
| 19 |
retrieving revision 1.746 |
| 20 |
retrieving revision 1.747 |
| 21 |
diff -u -r1.746 -r1.747 |
| 22 |
--- ChangeLog 18 Apr 2011 20:27:15 -0000 1.746 |
| 23 |
+++ ChangeLog 1 May 2011 13:55:25 -0000 1.747 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for kde-base/kdelibs |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.746 2011/04/18 20:27:15 dilfridge Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.747 2011/05/01 13:55:25 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 01 May 2011; Tomáš Chvátal <scarabeus@g.o> kdelibs-4.6.2-r2.ebuild: |
| 31 |
+ Add pkg_pretend check for gcc. Just moves the functionality from eclass to |
| 32 |
+ the pkg. Technically it is sync from overlay so it bumped eapi and removed |
| 33 |
+ useless dies. |
| 34 |
|
| 35 |
18 Apr 2011; Andreas K. Huettel <dilfridge@g.o> |
| 36 |
kdelibs-4.6.2-r2.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.5 kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild?rev=1.5&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild?rev=1.5&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild?r1=1.4&r2=1.5 |
| 45 |
|
| 46 |
Index: kdelibs-4.6.2-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild,v |
| 49 |
retrieving revision 1.4 |
| 50 |
retrieving revision 1.5 |
| 51 |
diff -u -r1.4 -r1.5 |
| 52 |
--- kdelibs-4.6.2-r2.ebuild 18 Apr 2011 20:27:15 -0000 1.4 |
| 53 |
+++ kdelibs-4.6.2-r2.ebuild 1 May 2011 13:55:25 -0000 1.5 |
| 54 |
@@ -1,15 +1,15 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
-EAPI=3 |
| 61 |
+EAPI=4 |
| 62 |
|
| 63 |
CPPUNIT_REQUIRED="optional" |
| 64 |
DECLARATIVE_REQUIRED="always" |
| 65 |
OPENGL_REQUIRED="optional" |
| 66 |
WEBKIT_REQUIRED="always" |
| 67 |
KDE_SCM="git" |
| 68 |
-inherit kde4-base fdo-mime |
| 69 |
+inherit kde4-base fdo-mime toolchain-funcs |
| 70 |
|
| 71 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
| 72 |
HOMEPAGE="http://www.kde.org/" |
| 73 |
@@ -140,6 +140,12 @@ |
| 74 |
"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch" |
| 75 |
) |
| 76 |
|
| 77 |
+pkg_pretend() { |
| 78 |
+ [[ $(gcc-major-version) -lt 4 ]] || \ |
| 79 |
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ |
| 80 |
+ && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." |
| 81 |
+} |
| 82 |
+ |
| 83 |
src_prepare() { |
| 84 |
kde4-base_src_prepare |
| 85 |
use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch" |
| 86 |
@@ -255,13 +261,13 @@ |
| 87 |
# use system certificates |
| 88 |
rm -f "${ED}/${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die |
| 89 |
dosym /etc/ssl/certs/ca-certificates.crt \ |
| 90 |
- "${KDEDIR}"/share/apps/kssl/ca-bundle.crt || die |
| 91 |
+ "${KDEDIR}"/share/apps/kssl/ca-bundle.crt |
| 92 |
|
| 93 |
if use doc; then |
| 94 |
einfo "Installing API documentation. This could take a bit of time." |
| 95 |
cd "${S}"/doc/api/ |
| 96 |
docinto /HTML/en/kdelibs-apidox |
| 97 |
- dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" |
| 98 |
+ dohtml -r ${P}-apidocs/* |
| 99 |
fi |
| 100 |
|
| 101 |
if use aqua; then |
| 102 |
@@ -285,8 +291,8 @@ |
| 103 |
|
| 104 |
einfo Installing environment file. |
| 105 |
echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" |
| 106 |
- echo "QT_PLUGIN_PATH=${EROOT}/${KDEDIR}/$(get_libdir)/kde4/plugins/" >> "${T}/77kde" |
| 107 |
- doenvd "${T}/77kde" || die |
| 108 |
+ echo "QT_PLUGIN_PATH=${EKDEDIR}/$(get_libdir)/kde4/plugins" >> "${T}/77kde" |
| 109 |
+ doenvd "${T}/77kde" |
| 110 |
} |
| 111 |
|
| 112 |
pkg_postinst() { |
Archives