Move the docbook stuff to COMMONDEPEND, as it is also needed by later app installatio...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 7a814ac416251daf7d0019fcbf0a1b3dc74367bf..e5580dfc4874e9823b548bb6e9598c413a182b2b 100644 (file)
--- 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.782 2011/08/15 18:40:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.783 2011/08/27 12:11:20 dilfridge Exp $
+
+  27 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.7.0-r1.ebuild:
+  Move the docbook stuff to COMMONDEPEND, as it is also needed by later app
+  installations, bug 379733
 
   15 Aug 2011; Markus Meier <maekke@gentoo.org> kdelibs-4.6.5-r1.ebuild:
   x86 stable, bug #377465

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 59857ed55fca87b73f95f23748b2b864054742ce..f6ad453b08f5c5aff61b11c62535e9d648da3c8b 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 RMD160 80ac0ae419f0f721a044053cdaeaf2f1f982f74e SHA1 80e9a70b108cab0b05efc50d6fa66665b711f149 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
@@ -26,13 +26,23 @@ DIST kdelibs-4.7.0.tar.bz2 12032091 RMD160 8bcc65072818285031f5611f4b183a74ad0f4
 EBUILD kdelibs-4.6.3-r2.ebuild 10274 RMD160 c748b1ac47cd5f75ae30e59659d6f8057a95f868 SHA1 245188128967bcb12a4ebf016cd56a22b6b32360 SHA256 5e468ac3ce1a8af33dcf0faa6dfe999a86d2445b621243e2519dd57d29bd379d
 EBUILD kdelibs-4.6.3-r3.ebuild 10317 RMD160 66ab258e9c360dc84b17e4ae2932ba2b2cdac7aa SHA1 ce71cfa98a6642744cddc5a8f616b7032cef091e SHA256 cdb146d2cd4d45203d91ec3b890a407cb195a7edbaa40d33456ab4553a40a4aa
 EBUILD kdelibs-4.6.5-r1.ebuild 10225 RMD160 aef9c6922a3c5a82c1aa383335917d1245ba06e8 SHA1 1902170d6a79c851b48da35a7d2e8ef119c6228a SHA256 dd3b27125574655dbf525f0d90e8855d3fad786ea5af8bfc99ae81a04b29dd7f
-EBUILD kdelibs-4.7.0-r1.ebuild 9796 RMD160 ab10520201c17a8b74f1bd8dd3a6430c97f3e38d SHA1 6cada2d15ab33643b9429deb362fbd08219e792f SHA256 a78e41dd87b4392c3c5bb4226cad775d4dbb92cda97f92fcce05c64963ce9c05
-MISC ChangeLog 130699 RMD160 b7844fb0b2cc6f5337b0909022e41106c28d68b3 SHA1 ad9e5148c739902412a0e07913206ccda4dfb6df SHA256 460323e6ec24ff5bec9d5debee096b8f4b5a70f961122bde980cac34da75e512
+EBUILD kdelibs-4.7.0-r1.ebuild 9799 RMD160 d26d79209a7d849e40b5710e1071498901578e5c SHA1 895a9ef91374c0a44aa4ff6ac336d2aeaeb6fb5b SHA256 79ebaa6afccb6d1ca93a417f9f4136e0356512077a810f7d88881fa93dae8c4e
+MISC ChangeLog 130891 RMD160 26b3449e2c35e0340cee1ea85d94700996989f90 SHA1 13aec5a6a537f175a40924847d714b0ac2506132 SHA256 554a823a3b5c93f09d64824975794b45e0cff6fdf7cc513214701c674a225c76
 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5JaE0ACgkQkKaRLQcq0GIobwCggpA8GkOh5WET6n7UZBd7v1KP
-Ew0AniWQ+JgMEIwuF78oSPIVmsSXhTm9
-=EaoF
+iQIcBAEBCgAGBQJOWN8SAAoJEEb+UGWnxTyHWwkQAKkzsDCAbgt+CNaM5wstmE74
+KzZMdcUL4DbQQdyTnBa/6bHNql5AII09Fj0Sp5w7Ny3WuEIy0emPuFvBBGLTpU6v
+N+2Z1Mpd5qD28jUv3xkoIIq7Jkex0JSjyuwTlyYC6rNPWie3KIM5pMp3h6EpIw2g
+HnEC4b1PcvEajK1Pp+zsFls55rAHjIUp0FIj1DdSo51ildnEDaa3mXLVJ+LO9YUB
+A46zfxzhbuw4EAw/ivQVik7s/MRn88s7bzJucYOLxWG1yjnqFJ4GjnLwMsEdj+U4
+a2iNBYFgWp6q7uGdNdWFpKF+xP+KkicH3SWVuHCMfUkXv+QVaMnTefQ5Dg5s6Jeu
+B2imYKU1xuLDME3lyCl5KTIqJh4B3cVQFKPNHI0RO0l1rfUEeYCTIBuH3bNroj1A
+QbKVQb5T931NBLHSaVtu9mQg+sKV/yrjkxaqXvY5eWrUfGA82g+f4/swIsvZXk9n
+VmbwOL2sxXDJ96F5N1RPG4reOfMLKXcedHw5ks5LcxP33lgT3i1eSjmrY0b3lasC
+qzvaNk07YEjCNo0Uew3AnWioJP/ntJ6+l8Amx7/dxXwgW2wz/QL+DJOlI8oyB0bw
+CVBz2ZymS5m2O2b8gTUbacKPjweYqQ9PYiHI/Z2yGBGnsNkAdOtaHHv43yaRzj0+
+000F0UxNgwVM4mqztJW9
+=lVXY
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild
index 6c3a370fd6b26ec620c795ee29d300370bd9cb4b..0888a29901f19e03550f86c55fe0131899d28413 100644 (file)
--- a/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.7.0-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/kdelibs/kdelibs-4.7.0-r1.ebuild,v 1.1 2011/08/07 16:54:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.0-r1.ebuild,v 1.2 2011/08/27 12:11:20 dilfridge Exp $
 
 EAPI=4
 
@@ -30,6 +30,8 @@ RESTRICT="test"
 COMMONDEPEND="
        app-crypt/qca:2
        >=app-misc/strigi-0.6.3
+       app-text/docbook-xml-dtd:4.2
+       app-text/docbook-xsl-stylesheets
        >=dev-libs/libattica-0.1.90
        >=dev-libs/libdbusmenu-qt-0.3.2
        dev-libs/libpcre[unicode]
@@ -87,8 +89,6 @@ COMMONDEPEND="
        )
 "
 DEPEND="${COMMONDEPEND}
-       app-text/docbook-xml-dtd:4.2
-       app-text/docbook-xsl-stylesheets
        doc? ( app-doc/doxygen )
        nls? ( virtual/libintl )
 "