From 7fedf8d0d783c3e47a87a321ae3e68abbbb86c14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Fri, 16 Dec 2011 22:26:44 +0000 Subject: [PATCH] Add a blocker for kcontrol-4.4 because of file collisions, bug 394991 Package-Manager: portage-2.1.10.40/cvs/Linux x86_64 --- kde-base/kdelibs/ChangeLog | 6 +++- kde-base/kdelibs/Manifest | 36 +++++++++++------------ kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild | 5 +++- kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild | 5 +++- kde-base/kdelibs/kdelibs-4.7.4.ebuild | 5 +++- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index df8da8ca9d67..e292346b80c4 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,10 @@ # 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.809 2011/12/12 01:08:49 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.810 2011/12/16 22:26:44 dilfridge Exp $ + + 16 Dec 2011; Andreas K. Huettel + kdelibs-4.7.3-r1.ebuild, kdelibs-4.7.3-r11.ebuild, kdelibs-4.7.4.ebuild: + Add a blocker for kcontrol-4.4 because of file collisions, bug 394991 12 Dec 2011; Jonathan Callen -files/kdelibs-4.3.80-module-suffix.patch, diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 222f07b97e1a..47ed048c39d2 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -27,25 +27,25 @@ DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd717525 DIST kdelibs-4.7.4.tar.bz2 12084560 RMD160 5666cacb69ebdbd2d0e9ce9300f35ecf6d6ba48c SHA1 78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8 SHA256 fe1d41ecce95d9ef67a9b81cee55afe5ac98aa937e2c2356bd69f9bb31a2af39 EBUILD kdelibs-4.6.3-r3.ebuild 10260 RMD160 219ce682d98ae8fea028ba0de00f8a0bf2dea95e SHA1 4e67a81caded776e57b0c0e56981b96d6481a382 SHA256 765935ae4fd8a94b61c9683275e0b70edb263172a79c7f07db75c30197b57485 EBUILD kdelibs-4.6.5-r2.ebuild 10309 RMD160 79a7b340fcb76abf74abddfbb8d076856bc71f01 SHA1 4b3728dc951e3d09ffe0c2ad35761ec8b11edbdf SHA256 f3d25c3d4cd6bee8defb2c2a7e56ccfbfb1ad1a843e9dabfe7f7c5c8e45cd2bd -EBUILD kdelibs-4.7.3-r1.ebuild 9199 RMD160 9e0af5fbd1a8fff90ee4db093d891734859f9d70 SHA1 26850faebe1343ab84a1438eb55f5e55967a177d SHA256 480d2ae57e961de1d79ad53eb77d057fa73d5fae7cfcca647496d11b31174f4f -EBUILD kdelibs-4.7.3-r11.ebuild 9254 RMD160 53939546ca44c8165c5730eca24a013bc69909be SHA1 a72ee48514a3b40fda37621a1bebdbc3db676856 SHA256 814a77e89051f9f494939b49d5f0a53b4c7e3798706107d18bafe551f0586cfa -EBUILD kdelibs-4.7.4.ebuild 9203 RMD160 89fb0e358e0fb3ca8c7353de2a045944fb325d93 SHA1 dc532faf58f073ebaeb01e8c7915f7ecbc7dab75 SHA256 a8ce220e00bcb8d79738b20d0e8880d5163e24b8839c2e7fa45c9106ab058cbd -MISC ChangeLog 135542 RMD160 cb927ebadb9d45c27f2c1048241e7e824b774265 SHA1 500dcde57aae9d35511743e6bf4a48c86606c7cd SHA256 4714aa35d91c856a43a2b8c5ce417af5083dc68409c3bd7b15382ce5314f8f3c +EBUILD kdelibs-4.7.3-r1.ebuild 9258 RMD160 548c38a475ef5026f7e15b471273239ce83b0ffc SHA1 3a2503920447e418c823e12a938837777e2e95a5 SHA256 409c7827589f9169438134d2e40bffce82ca593756cad574573f32089be051f7 +EBUILD kdelibs-4.7.3-r11.ebuild 9312 RMD160 c4a672ffea8fd177fef6b3afaa9526ab3e8ba4cc SHA1 d83656c8d4ec7cebe36c203092ca9f1daebe9033 SHA256 03010896d7a5880f06136476c92738c2d7ae34a2007ec965b992dd42284db159 +EBUILD kdelibs-4.7.4.ebuild 9264 RMD160 ada5d138f23e87514d6cc8b1d63943b0f999d276 SHA1 9f7d7d22ab01bfe5827f55ea12c5a22faacc7fd9 SHA256 a624a141d121444a4ef1d05ba5e799c2b0c8a7a67a602ed0e140271e11bb2957 +MISC ChangeLog 135752 RMD160 070377c3c9253428161779ac9250cd7ea6bd29fd SHA1 fadb2e5c260796f1b18d2e868e935dc1aae5a534 SHA256 36982955b259e9a14e380f63a675907005139fbd4b8d010699d0e7313bbf9964 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIbBAEBCgAGBQJO5VQmAAoJELHSF2kinlg4AF4P9AuTeWqOqUViWP2HTRBPwNek -JpeXYyz7I/y/WfRGXN4Nk6qAupOqDJ56uXKAfgBNxnGJUwCM9gksu4tC0Oi1u7Df -l2/5dyhFE8Fp4kdzt5lB9Hvd6mUMir/Pcw6Xxde+q3rSITfPpumpFT+fJrgrLvkM -vEUFgGuSY/67XVjCMeBS5f94lLdrzGMn960cm2Bhztt/o94ljwkFS0+6S5vQf7AL -9BeOV0Ngz22XP6aAw4i7aI6eT0mJXZagWcEkTBwCP+hwEiT61zgHHVGdXu2RWIPU -Ku3Nsfb9OaRXcKvmV7xAzYwpc2DqrGP2nBvv5ItjGE4UegUbRmL6AhYy8hYm2hTb -vSSFT7QV+I9UYOKElTqg6NTPRmDqmn8qSZi5XSDEh0FXBCDOhNuwpoyx2+Wru9Ch -xquei++0kW4Z4tg7DDNfE6xPipA5SiA9JeqnicUdRC4JU7T8L+iz6ep/3UHUwWOi -SUC5JhHpUljJLGwvO6PVU08LFCLQAMiHnMZmXcY8abbGH+tFCRmtii7WIR7JyT6F -VDMiTstXkNgdVT1YhX+zpGGcvABHGhoxsysLDoH5CWwJjzHF9Fd3V1jYe76WGls5 -X1hrQACrU/XttLog1G4AWPzlV2LfiXxecJdfJfleuRnZKNQvIvi8YL/SqzihRD0J -6TKBqPoboj+b2VdbqSI= -=WFej +iQIcBAEBCgAGBQJO68WwAAoJENwGBM22xffeJBcQAIH7dn8G6xnkWOwWGjdlp2ni +jVNFBe3Q0n5i8Zu0nhiderOXPXynQkTugZmMZg6osIwWkw8oWNqPTcWfThwSsJ1Z +zn93F/Zm/HxtymbaybD4t6BH1pJUR8hh8PhNHD2cTiwn3EcjksytVj7Bx0xbByfD +zE4i0VF8F5b8VZ2AfLCDk9uyzA4YnwpymVFdm8DPbrgAyD05xEk/K47AIunSY7/i +nixMTruqxh1JoHDOWIFtVJ/LCQM+/V1Xf20DsNKABB4P5/ejazHqWPqN4EwYRhNI +b7ivHWDGHtdHSUw9AiEZYuUhP+1P42qJnafDveq97CF3zkmDSML+n5EgFl1NoIfs +qXeKfJc02192T/9wikYovpLdxe8XZcNdJE3os4fGWDUEcy21qXSI+Ii5qe6nRV4Y +n9pVqRUZx/xBoa79PQhIBgi/8rF0k/1JWLa0PRUfxrQzRxCRWsCqrRzUcNn1edlZ +2eJrvpobmiQc1X1uIOaTGfUrFiflxMSPb/4sU3JEZtvrsztmPb1BnoYExwrhcFY2 +SLEmae2ERrVeWZ+68iVTYFQwVJk/CGTngX/IUARpfx5vaTqIvJOGD6366ZDhTajU +UoddPh9L/NPsQ6fs56L+t/oOzOsYTIhdWN+nGxDWkKKKRhaMSw4Y8aPvyiq0Yxz7 +PQ8182iLM1kgsn4jCXmI +=bl2P -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild index 55de089ff49b..ee6d739292c2 100644 --- a/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.3-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.3-r1.ebuild,v 1.4 2011/12/07 22:13:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.5 2011/12/16 22:26:44 dilfridge Exp $ EAPI=4 @@ -118,6 +118,9 @@ PDEPEND=" # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities add_blocker plasma-workspace 4.7.1 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild index 9e1b666992f5..fbdb321714a3 100644 --- a/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.3-r11.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.3-r11.ebuild,v 1.1 2011/11/29 21:39:30 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $ EAPI=4 @@ -119,6 +119,9 @@ PDEPEND=" # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities add_blocker plasma-workspace 4.7.1 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-4.7.4.ebuild b/kde-base/kdelibs/kdelibs-4.7.4.ebuild index 49b38b59b768..bab97d8cac93 100644 --- a/kde-base/kdelibs/kdelibs-4.7.4.ebuild +++ b/kde-base/kdelibs/kdelibs-4.7.4.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.4.ebuild,v 1.1 2011/12/11 18:52:25 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.4.ebuild,v 1.2 2011/12/16 22:26:44 dilfridge Exp $ EAPI=4 @@ -119,6 +119,9 @@ PDEPEND=" # Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities add_blocker plasma-workspace 4.7.1 +# file collision, bug 394991 +add_blocker kcontrol 4.4.50 + PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" -- 2.26.2