From 0ccb222096e215e85c7b73a623ef216ce5224a4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Tue, 29 Nov 2011 21:39:30 +0000 Subject: [PATCH] Make new ~arch revision, hard-disable upnp in revision for stable request Package-Manager: portage-2.1.10.37/cvs/Linux x86_64 --- kde-base/kdelibs/ChangeLog | 8 ++++- kde-base/kdelibs/Manifest | 32 +++++++++---------- kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild | 7 ++-- ...-4.7.3.ebuild => kdelibs-4.7.3-r11.ebuild} | 3 +- 4 files changed, 28 insertions(+), 22 deletions(-) rename kde-base/kdelibs/{kdelibs-4.7.3.ebuild => kdelibs-4.7.3-r11.ebuild} (98%) diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 7a1b1037927d..82afc99f83cb 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,12 @@ # 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.803 2011/11/20 22:18:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.804 2011/11/29 21:39:30 dilfridge Exp $ + +*kdelibs-4.7.3-r11 (29 Nov 2011) + + 29 Nov 2011; Andreas K. Huettel -kdelibs-4.7.3.ebuild, + kdelibs-4.7.3-r1.ebuild, +kdelibs-4.7.3-r11.ebuild: + Make new ~arch revision, hard-disable upnp in revision for stable request *kdelibs-4.7.3-r1 (20 Nov 2011) diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 3f7564f411c4..a7ab1b6af10e 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -35,24 +35,24 @@ DIST kdelibs-4.7.3.tar.bz2 12071229 RMD160 e8bb93554a915d97d6619b8a9bfccdd717525 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.2-r1.ebuild 9258 RMD160 a05591fce7408f86176f927c43775266badcf499 SHA1 2c9a33a3c5e7c666a66531e1aa4b9a5fcf3bf1de SHA256 cdbc54608598389e07a3aacf9dae8ddb55fd56aead6105bbb0aa251981a27a71 -EBUILD kdelibs-4.7.3-r1.ebuild 9253 RMD160 98c7e187cd93ed9c8fb2a0bef95910aa03d79255 SHA1 3718085f23eb06be3e4cf866e77754f6da342241 SHA256 c8b14e79c31d5a5491f5d912a0e572b79cbcbb18f6dcb2b6d28b5be9d09870be -EBUILD kdelibs-4.7.3.ebuild 9203 RMD160 5240d9f21818f937f99fa040b9ec856b7550385a SHA1 a5287502235cde6c1b4bd0b3061a0dd3c01e01dd SHA256 e2ca6e80ae78b36a6aa4bba1863cba40bc176ae2d627ee9ada739868d5da6fc1 -MISC ChangeLog 134487 RMD160 dbc0597e7cfd210c87be1fac95d161383138e2c4 SHA1 30f91213b6c2ba1bddd831191af5f9af915b2513 SHA256 2436e32e315e642c28aa7b23cd7a4e6bd064f5fe252eba1cbfb94be9d7c00e14 +EBUILD kdelibs-4.7.3-r1.ebuild 9202 RMD160 29392a99345c164c60f6c514d93051daacd2c0dc SHA1 4fc595a177770f4d1f9d42406b548f380436a7a7 SHA256 3c5852a82f86ad7f863b6f6bc04b442240470aa094329d9acdc2d70eb80aee94 +EBUILD kdelibs-4.7.3-r11.ebuild 9254 RMD160 53939546ca44c8165c5730eca24a013bc69909be SHA1 a72ee48514a3b40fda37621a1bebdbc3db676856 SHA256 814a77e89051f9f494939b49d5f0a53b4c7e3798706107d18bafe551f0586cfa +MISC ChangeLog 134732 RMD160 82aabf02ee47e84c917e9d99a65781052ec800f7 SHA1 14db7fdef6d20035042ae2db0e73cea2d4e3f275 SHA256 2093d6b89470051860174108c0c352a1a3f034d8925e8d62210ad47266400ed0 MISC metadata.xml 443 RMD160 765aa5080e9ecee24e26f5b8a5168e674db2ffd2 SHA1 82f77d1dc84732dbedcdebbac460896bd6b5484b SHA256 79624eb4920e9849ea5ce593a5adc8c7e45cd9670f9f63a64cf00a637de2d701 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOyXzNAAoJENwGBM22xffeLRQP/iXYKGgsV/pslbwhG9bdMc9G -PPKI4ne2X8BFNNIcPHajEDIYrNSDkrQF2EVhIutGEjFBGY7J1lwBhQgzgC9fI53d -/9qCxOpmvMqAEOf4FKFr/IF3x5tJaDaZ9tHd97C9O42yVdfJezYWqOFzlTg4iAav -NtcvpC12EcFcOM6UDup8eWEbnW0st5xVrR7lDJJpJ4v9dl/+pDdF/Sln0MA9XKaV -iRCzO/ix5PlU+zTAG1jHgURV+bOHzQf51BFzkMgkOe0ed6bve6REte+6ByQWB2Es -pQjpAh0l55uY0IY03l7Y+UycYrm0ueyCws17YMr16odNHixMXrAGlqI2ycv194LV -qDep1qIruUajokQzBkBwRzJrMi3zy5rEW7CTN0IKlng6RSDLjDmjPMDDLUd42aTb -tjAulpH6RMmkyaenWkHiQAgxWw0qCsiQWERZjLy3Jm2/+jZzf47INTEY/sd8m2+y -JFr+Fgl7+yJ5QaNNgicratWqE9kipive3Pd4wPTBBMwvFWxxz6gVPv/Z1S0Z/NTA -8p4d148UYPpUbcdDwUDoBJ+f6wQPJ1K8jKsuj9VHyG13RmNraaiJhiQEE47ulPQ5 -UQzBR75sw5/dwhMDwB0A1l4yBYZxkwOGG4AU0ai6g+zSrvYq1+h0D/CTcXnOnZBA -3kZJfix2Fw4FtMCEYjg9 -=ukJ3 +iQIcBAEBCgAGBQJO1VEiAAoJENwGBM22xffe8bcP+wYeV8sOp1WUUOyrpbp3HDA0 +l2woRUPRpw+jp/lLdbSEFlhT1i4BPKM3u2g2EDvVfubDS9/jHBIWhNIm1OxDHXVx +MATs7ScCpAm0i2xZW4VMV8hh3+UBuU/WHB+OqcJNNsRP1nH9HS7cEQWD5jF7TUWx +yVTvJbBAmzLEp+5PF4WL7nzbmX655jLZQ4FT/9UD9YK+I1Q9sfn2XVl1hJMIZ1cg +ENGCmp9cFzpGC+plnJSFzwgIlnUcI7AqkGOflaFGnCjEFo0TcCk6JXl+emCBvi8m +OPul4xe33eTuEe9i36Lb5FtZfd7BKJYlsnEWYDFRqLuCiGDFrPni8xgxcj9wJir8 +m9HL1jsrhVThLudg1BykB6Bd+B9X/rSCLo0F+GUgSDykCU9vBlo4lAT7/x5gZSFE +aRNmC+AB18fOspKllkViTX/jh4sXb5den1WiwBS0tCB0DGJ+a9plIkuc0ZiKYZ8H +6nVR1Xpnf4pdugyh/LXrEFT0ox+Q8vRlveacvlsHLG1NJrGAcsTsvVOpj9ELAvbt +gbmzQq5zjglRftDH7JX00rOn56toFsxmitL+GY8rdaJ9koxuNWh+J8yV/XqBhMJZ +39Z2vAYL32xzKEaPi54mGbwrWbSvU4wgwcFlYi9hb32424QQlsPiz2HA0rhG+BJA +XmPt86W2bQ/Lc8Ez7Mhh +=gSCX -----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 170174b5f015..f9ac1ed2714b 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.1 2011/11/20 22:18:47 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.7.3-r1.ebuild,v 1.2 2011/11/29 21:39:30 dilfridge Exp $ EAPI=4 @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev -+udisks +upower upnp zeroconf" ++udisks +upower zeroconf" REQUIRED_USE=" udisks? ( udev ) @@ -80,7 +80,6 @@ COMMONDEPEND=" spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) udev? ( sys-fs/udev ) - upnp? ( media-libs/herqq ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] @@ -224,7 +223,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with upnp HUpnp) + -DWITH_HUpnp=OFF ) kde4-base_src_configure } diff --git a/kde-base/kdelibs/kdelibs-4.7.3.ebuild b/kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild similarity index 98% rename from kde-base/kdelibs/kdelibs-4.7.3.ebuild rename to kde-base/kdelibs/kdelibs-4.7.3-r11.ebuild index 50d3824b7273..9e1b666992f5 100644 --- a/kde-base/kdelibs/kdelibs-4.7.3.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.ebuild,v 1.1 2011/11/02 20:48:10 alexxy Exp $ +# $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 $ EAPI=4 @@ -126,6 +126,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.90-xslt.patch" "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" "${FILESDIR}/${PN}-4.6.3-bytecode.patch" + "${FILESDIR}/${PN}-4.7.3-customcont.patch" ) pkg_pretend() { -- 2.26.2