diff options
Diffstat (limited to 'kde-base/kdelibs')
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdelibs/Manifest | 22 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.6.2-r2.ebuild | 20 |
3 files changed, 25 insertions, 24 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/Manifest b/kde-base/kdelibs/Manifest index c60cd91fe7dc..c1b8381ffde7 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 @@ -35,23 +35,13 @@ AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085 DIST kdelibs-4.6.2.tar.bz2 12917847 RMD160 3a6f2a95f12d15c2ebfe2c5fb1e8f1fb3f51277f SHA1 b4794a9a69492ce4725abd9eb5d00d3a50e46603 SHA256 61d8d73d56f2e0198e590d1c6f5615dea9aa955fa69676265852744a1133b561 EBUILD kdelibs-4.4.5-r4.ebuild 9431 RMD160 370b23f5eadc02bbf37814485ce3cd5fd702dd99 SHA1 4eea10a2fcbe97f1c4a52bd211caddf0cf64bed3 SHA256 a9dfaaaf91d83c7beadbdc065d0b103f0b7270a4d8ee569ca0849258cd737fa2 -EBUILD kdelibs-4.6.2-r2.ebuild 9955 RMD160 02b81d9608258e9f1d5aa0c5f0b0accfe3598919 SHA1 e403981f7a99e015066c358d75bd3d738dbdd6eb SHA256 d6bd9777f7c0b106cce24bc3c782c3e50e8236f57e6c371a9e1cba78980ae709 -MISC ChangeLog 124474 RMD160 a524cc6fdbe5de78681d9f5c7c87172a41722ac7 SHA1 a182a015d59c34c1324bda751dee7b800a5959d4 SHA256 62281775865f8c2d6348005436370127c929fdc0a9c6f0822fa05bc7a4473576 +EBUILD kdelibs-4.6.2-r2.ebuild 10109 RMD160 038d036bcf51e61e6e6f008eb3f557960dbc89ac SHA1 390e69aba8ceebafc8c784953e1d1a3a81226b58 SHA256 47fee910a34165964101540db01154c641bb1138e0ba686ed6679b43bdf0c700 +MISC ChangeLog 124725 RMD160 e5020b0dd0be90f95f4a6c4d205f953bb50f1350 SHA1 3debc139665f2842c9f781d25643bc8195150ed9 SHA256 45d67189cd77fa4d4650e59629188a3827a5a9590338774f7c8abbbd705d49d5 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNrJ9WAAoJENwGBM22xffe+fMQAKo9SKeMe8aPDI6J7Vh2Ajl8 -5L52o0rTu31bq4q6YW5g/X3A/HBGPR0ZKmz/l2Fpdb50JSwQ4nP6DfXe+tAx3oks -JBftrKzv9k1kNvW77tY9CQsXNRlG3zNLOJQrzAsdyipliSyk1hZh0HTdiEODxq6a -7m0C9mijr7GOIC1NnsPgX58KWkWFloWp3lyEo0xqg2Qxltzdq3nXESBNScJDAA8y -nqENZp2XLMK9JhVyQBwWCzgXdqNYwOvlWDu+4mT/plrZzAjwit5zH71amhzR9DeB -SAbgAq4kKPEMwX/aXMVpQORvPw6MrpATJcza1sxDoUbCWa8Lse2UL9GCDfk6xRG5 -l67lV3CD09+jZop9E46Xj0bGSdlt1rFjgaTYXgUXYKwZKWAkJ6fA1SmIeDC5vTqp -4ebpBnW1yHbdXzf48J/rabT4W8OnptiqB0IQArPZgcJC5bWofDYiVA5v6L6eg+z+ -oMbbJ78KV1zC3BIT9VTg21nxTeYLI5uSnpi+Mknv4IdZPd4JvAusQCXPyvntEKRI -KVjdUgvjp/MCWq7Af4HhlPfNFT+g3vhrs0LDzJdetENwOZsLwb9QZbg6JhK2E1pq -BfwGU+mqKphPVJufYxSyTHRk4bS3TaE0VJt+uOiYjFywJwy5yYEwZFsH7nfseN+B -E+/S7NHc/WWTeqiPMLwg -=pyZt +iEYEARECAAYFAk29ZicACgkQHB6c3gNBRYdvugCfWCKKSppABkwc9krsyVy4hInm +5NwAmwT2EWPBMLHalBYnV1MZiUz96uQL +=XrlX -----END PGP SIGNATURE----- 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() { |