Allow compilation with networkmanager-0.9, bug 387235

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

diff --git a/kde-base/solid/ChangeLog b/kde-base/solid/ChangeLog
index 078f06e5d30ce3b33ba6fae9b9296ec4ea8adf4a..c80d56ef3df67af0469ce6b89a1bed75f1145c5f 100644 (file)
--- a/kde-base/solid/ChangeLog
+++ b/kde-base/solid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/solid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.116 2011/10/15 17:26:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/ChangeLog,v 1.117 2011/10/21 23:56:15 dilfridge Exp $
+
+  21 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> solid-4.7.1.ebuild,
+  solid-4.7.2.ebuild:
+  Allow compilation with networkmanager-0.9, bug 387235
 
   15 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -solid-4.7.0.ebuild:
   Drop KDE 4.7.0

diff --git a/kde-base/solid/Manifest b/kde-base/solid/Manifest
index ca2bf4e3bb2023c75a5073d150a484c1043262e3..ac58b198b2f62439acfb39c1fa13c759edec5c21 100644 (file)
--- a/kde-base/solid/Manifest
+++ b/kde-base/solid/Manifest
@@ -9,24 +9,24 @@ DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
 EBUILD solid-4.6.3.ebuild 827 RMD160 a238bd601ea6f7ee67f75a80903682957dbcfd51 SHA1 640615391f2b9b8321f54f830b0bab8140418038 SHA256 a14e7f41ece63d10a2f9243ba0124d6b263b1d6765e08fb6c38ff5df46a45724
 EBUILD solid-4.6.5.ebuild 828 RMD160 a99f0ac1afdf331242738e8a80aa8aed9d307d2e SHA1 c188f9476be5c8173e104e2e9a478446fab9754e SHA256 81ac98f4da1570d9a0076a9e6a2a8c941eb74d1dfb1508548ee90dc245796a36
-EBUILD solid-4.7.1.ebuild 826 RMD160 db7cc9eed966bdbce659f462510a096cd8ea9a3f SHA1 fe7be7a43b3a902597658633655eebf57ff2677f SHA256 a4a9f95cd22eec3e24e4d0ec36163bb6796c1cf36d7239c09f1eaafad9ab8d60
-EBUILD solid-4.7.2.ebuild 826 RMD160 cb93eb49d4f1e2af0a71b393f6e2cdfe6c3a9ed8 SHA1 45acce0076efabb6516a2cb28101af0709ee669a SHA256 654d4a1f4546dd8d440db7785ed035e204a2dedd3042a517ba4833ab4a432169
-MISC ChangeLog 14649 RMD160 8dab8b579f0627dab2ae55ea37533a279ca55b57 SHA1 9659dc26b00fccccbe0bf1442942b3a3565a7626 SHA256 f7bb0907870e1973abb2e5172f30c3635817c8b932415785d3e4a96ba52983f1
+EBUILD solid-4.7.1.ebuild 821 RMD160 f2aca6f6f80b7fce1925a433241fb77cb56c4704 SHA1 1adb2af03fa6bea76d51d542d3cdc5a7bc0f7ad5 SHA256 90cff3ee13193aca6a6245629fa96e4dad187904186db1bad21db35911b6f1f5
+EBUILD solid-4.7.2.ebuild 821 RMD160 3f7438168056d57be25dfd602495245b0c64e6ac SHA1 6195413c25a12169d4491accf95bffb588ffc1a1 SHA256 1e905550d0645c8263ed71d8eccbb3bea15abff362ecf550a2b29684a021be11
+MISC ChangeLog 14805 RMD160 8f16c5836898b7f18ab3eb0d3e792557ec28cb17 SHA1 9be9a005d0899c280adcef5a17634046029befab SHA256 bad80e59e455e17e43d9879c399c72f3e2ae8d984e15a18095c481046a9034c4
 MISC metadata.xml 243 RMD160 04fc0be8d2565b1a1b4e4d42041a9d9ec98cf76d SHA1 7f5c2d00f44a48f3d4b96cb9c6af36a31ea401d2 SHA256 04f8169f3dc4ab49f95e390f9202644647d58a5af1af3128a72155d42765c8c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmcJ9AAoJENwGBM22xffenOQP/ir8IwP/pBF5ZL4IDvKbh0Dd
-7Rawq7PTP/eDvXMCI49nD6RBWybCiRoTIN2GNgpfHvatxRvKBMWKVWaZgjtV+Lpa
-Wq0qlN8FXkHnVDvP6ClcPTkYHkKprQjSV0ODmauK3avp4UGFmF1DOQUP8ndzJqYd
-W1NLeF+W4OiX9iuN1HOcFA4PMZDVxTERmpZAVlmlD+KrtdC8z4hnaI7kCrZl7bLk
-Y01ipSKv+/12EqVNyF+2/87pYqMR9VV0nG2FPMdotpx9NXAicZdLpKLJdc1aYnnF
-FCTrAa5Yx89OGRKcrN6q23m/jl9MPMyjxfZ93ZAxGOFF+gjY8G2qRRW117qmo8w5
-+Bb+S8Y9h9h0NcAsSTOHKQL4dkkWjN7gtEqqpOOH63N21FXfCjhwr+2fZSgzIib5
-o9A61PTFI3ttm0N8j1Ypy9WgNsTnuvurQb4NLVD1+XAOWrzqZOl02QmN+DkqXjWU
-j/QZvsyST3WM2i0wRIMgCoZY8Vfj83S1NWDBdSyYemD+11PM9ViBTdWOXAkPbtRf
-wCD3tg8wtwrUzRISafQXUb2KyhMkmMeN2HeQFypxIx9k1c0vsUnu7a2J/wvcBZyS
-pOG0nIpvPagTAEGVGdmfU6QoaKuPRuonBGG5/0XaB5mih6UDoOMQ5XM9/k37WWfE
-I/T0QJW3OLeHKCUgHYMK
-=qw8y
+iQIcBAEBCgAGBQJOogaoAAoJENwGBM22xffeTGIP/AoSaQptun/hc+ktelxRZciR
+qqafzbICZCNttmSkBp3drKncSBAmAk1XEu99A4rt6gS3l0+RrnU+3JI+malaLw3S
+hWKwq1TkiAjz6QJ3W79epTrP1hDfg3AO9m6fh5PF+S9Y5MV22Il4J/3q/w/ETXGE
+pBKhSqs5YZp+bL9pkI8dpsNQP3O+uu3b6pDvIWgQ9PDJ1ep2C3fywVJLBxFexcOy
+vCpxf0vUYA1qGfJP65DhvQWCKWYOqq/KRXT9odpR37SpsVXH9OacbT0gPA1CxB/E
+NECnTX9Gj3akXPHPQDFKy/5lHkENsNjfsuT37NI4QChJR4q+AsGip88prxgRtJo1
+9jo6qs3ugljdh8Tgsf9CmvPuDp+dlimTSDkxrTAECSut/Fd8lvpOVXKZdh5Uo6qn
+y2sQy8MDio7D2/LDJ74VZM10oNcSccgLoue7Fdnf419ruQbTinGR2inj5NhGx3Bk
+d0Y8fcw0H8+NncBpOankzr3NgNPjLdG/kyeipF/MxGLUY8EkhGcGtNz0+8EQBYh6
+k2LUBwjufV4OTukvrpYLIc3gTEsbf5PLd3aGKDcg+vTTaZc9XDTsg9ymBUjVTapH
+poPhetochTc4R4IsZyxSanKSUOYEKL3FW6G4ngM2QNkWMJ6+DYAuxMrnrN5NkEeT
+RT4wwK/bSA43sQJX7WJZ
+=ukMF
 -----END PGP SIGNATURE-----

diff --git a/kde-base/solid/solid-4.7.1.ebuild b/kde-base/solid/solid-4.7.1.ebuild
index 65713080164fd50e90bf4449233aaf01760e2199..9aaf30aa0e67d59a9629e6362fa1019f55b088fe 100644 (file)
--- a/kde-base/solid/solid-4.7.1.ebuild
+++ b/kde-base/solid/solid-4.7.1.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/solid/solid-4.7.1.ebuild,v 1.2 2011/10/14 10:03:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.7.1.ebuild,v 1.3 2011/10/21 23:56:15 dilfridge Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug bluetooth networkmanager wicd"
 
 DEPEND="
-       networkmanager? ( <net-misc/networkmanager-0.9 )
+       networkmanager? ( net-misc/networkmanager )
        wicd? ( net-misc/wicd )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-base/solid/solid-4.7.2.ebuild b/kde-base/solid/solid-4.7.2.ebuild
index 7aa03e4e05363b9677dcc3dfe7ba3cd904e131c7..e493ed855a10ee56e52747a1bcd2fe0fd031953e 100644 (file)
--- a/kde-base/solid/solid-4.7.2.ebuild
+++ b/kde-base/solid/solid-4.7.2.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/solid/solid-4.7.2.ebuild,v 1.2 2011/10/14 10:03:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/solid/solid-4.7.2.ebuild,v 1.3 2011/10/21 23:56:15 dilfridge Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug bluetooth networkmanager wicd"
 
 DEPEND="
-       networkmanager? ( <net-misc/networkmanager-0.9 )
+       networkmanager? ( net-misc/networkmanager )
        wicd? ( net-misc/wicd )
 "
 RDEPEND="${DEPEND}