Fix bug 379835, accidental dropping of optional modemmanager

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index abd649d8181edc3cc7aa1e19c5c7a7379caed20a..95ad0d41344f22ee763c899c514501eb5f19017d 100644 (file)
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.112 2011/08/22 13:57:13 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.113 2011/08/23 15:33:25 nirbheek Exp $
+
+  23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  networkmanager-0.9_rc3.ebuild:
+  Fix bug 379835, accidental dropping of optional modemmanager
 
   22 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
   networkmanager-0.8.4.0-r2.ebuild:

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 8411578ee02aa2d50c46d830fa68f60854fff8c7..45b3c150651077d1673bf9eb3268f079f35379f3 100644 (file)
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -41,13 +41,23 @@ EBUILD networkmanager-0.8.2-r10.ebuild 5162 RMD160 b3b47263265abfdbba1983a4dcc1e
 EBUILD networkmanager-0.8.2-r2.ebuild 4435 RMD160 7249b21ae02a841b23f2172bc46812ff62d65051 SHA1 725a5c38d2a2ab55ce54e38aac89a206e1fffc05 SHA256 9a1147f4f1cfe1d7ba4657b8f882156131a167fac8ef0261dd7db3623c9e5fbf
 EBUILD networkmanager-0.8.2-r6.ebuild 4868 RMD160 ead47fc353be537ded684c2e2354b3b059c6e5cc SHA1 1e0ebce7be636d607cf46f66c3e51eec6a5ef248 SHA256 25c4e44d68034154583adaaaa5ec35a8f6af654c1ef593708ac15755a83f1aa7
 EBUILD networkmanager-0.8.4.0-r2.ebuild 4332 RMD160 d06262800c6c619f11bcbdf1d5c7e4538fcfa4d8 SHA1 8bdb092a633237c88cb6ebd100229c9dd43f5aed SHA256 55d14379f1b44113a35ffa0004bd09cb856d7e3f76b9f9a4bc947e8ac86c9935
-EBUILD networkmanager-0.9_rc3.ebuild 4343 RMD160 ed15196f100e6f2ef300bebdcc2af0bc4336b0ce SHA1 c925d34b697de38ac1f8f5674f874d0c40048c04 SHA256 2d699cf5cf2316a03a756bdb4ec34a05fae33f139b8261d89d0878787d12383c
-MISC ChangeLog 23413 RMD160 1f7beb4e5f5c90a3f80b9ab8d448175ded562b31 SHA1 8851888a35d9adeced81f081a6196bffe644da91 SHA256 53012fb89d0e32a49d6838cfb234fe310d1512bd933166afc5c8b8bd021a7960
+EBUILD networkmanager-0.9_rc3.ebuild 4346 RMD160 587ff72cbd21d72c39ed4f9e0d5d01842c20c298 SHA1 5dc646291ca90208479417f73620db522bc4c221 SHA256 64a6ba757af05509c19db2d54d765e79db0ce697eab565468b02365fb86e995c
+MISC ChangeLog 23564 RMD160 d570e7a86dc28ef1e095e96e6e3ed92aaed1b5bb SHA1 6310d2c6fb542bfe507059624907d47f8467a3d5 SHA256 72d19379cd9ff1b19d94876cf5d32d2a272a65f3c8f57ed9a7e411e6657b5677
 MISC metadata.xml 1352 RMD160 43c095002b318a9416c32143367cba2bbbd5b9c2 SHA1 08d18471431c10dcc4cdb3e9f73333ea9f2a4cb6 SHA256 12cd5b02bfa2583f7d25b47c918cf1befaca6e41ece7f44975b74b712f292810
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5SYDwACgkQp5vW4rUFj5rjlgCfd7hBcfOqM7IyafD8XPklnWBz
-zMsAoJl2pXXwizMporclkxbeGrSKjPvq
-=foyy
+iQIcBAEBAgAGBQJOU8hMAAoJEO/kOhxWD91kxBsP+wVb0QLlK9WhhYMIJQBfn84S
+pPshyc9NDF3m3YG2pCI6PWAAgTcqsJEosNq4ODAoqhAUT65fngz+hFtalyPdDviZ
+jHVmckberkOEm+nOuDtxIgSPaUM69ZzUWXgv6sQAc5pcYhImPVGfuvilZcgOXOwc
+DAvHRfA/6gRViC1VFyX5v16SbWabq11aAdDlQcwVdK3Yu1dbmk0V3zt4FzB3COOU
+twsMiw+zplvRLuLogK9pzANc90B6WGAZj8cd+JJcL2LKW2a//RkdntWvmI6AGOzQ
+Zqnjvln2qb+BJiHdHoHRMS/A5ViZa6cCK+EjBq5CmYTodSb2CZlcZTrokmoZHQao
+Tr/yYF9FMD2L/ow3sjkhodj4NjmfgR+9aZCY/r8yFx+heDJLn3Tdk/NeCG5+UE50
+kg9mE1JMuzVCFLsF/oFbSn7c5K5L8vtCzygQpCfjAeA08kCHFsPR62y+gE2eDUKE
+UjwgsePgKcUHmxXVwKMyrmDLOfeO9hMegcP2NtDlUc3gcwMG7xvLM+00TGPXkZoY
+VaM06JTOLDn9xRJEnT4wHAOOj6f2fdQw228Ah3Cff4OAlO3O3sjy2YxHFghzIr0k
+qjz8g5iPwx3Rt39HHcaeB+/lAav/A8EBt23qrx+UoAB17nPx98TwsJOgF/iSbqZa
+VXvU1AN3tWayOCeuMZci
+=Qnfx
 -----END PGP SIGNATURE-----

diff --git a/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
index 5b92d0d45ceec5afdd03f2e1f1e7aae0d1693705..f7e6514cb896d778487fbe45e5b76649ead09961 100644 (file)
--- a/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_rc3.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/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild,v 1.2 2011/08/16 10:07:01 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild,v 1.3 2011/08/23 15:33:25 nirbheek Exp $
 
 EAPI="4"
 PATCHSET="${PN}-0.9-patches-0.1"
@@ -36,7 +36,6 @@ COMMON_DEPEND=">=sys-apps/dbus-1.2
        >=dev-libs/glib-2.26
        >=sys-auth/polkit-0.97
        >=dev-libs/libnl-1.1
-       >=net-misc/modemmanager-0.4
        >=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
        bluetooth? ( >=net-wireless/bluez-4.82 )
        avahi? ( net-dns/avahi[autoipd] )
@@ -47,7 +46,9 @@ COMMON_DEPEND=">=sys-apps/dbus-1.2
        dhclient? ( net-misc/dhcp )
        dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
        introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-       ppp? ( >=net-dialup/ppp-2.4.5 )
+       ppp? (
+               >=net-misc/modemmanager-0.4
+               >=net-dialup/ppp-2.4.5 )
        resolvconf? ( net-dns/openresolv )
        connection-sharing? (
                net-dns/dnsmasq