Added separate file for system-settings with Gentoo plugin.

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

5 files changed, 19 insertions, 21 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 5954d6a47723..c4c0ab884edb 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.80 2010/08/20 10:18:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.81 2010/08/23 10:49:53 dagger Exp $
+
+  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
+  networkmanager-0.8-r1.ebuild, files/nm-system-settings.conf,
+  +files/nm-system-settings.conf-ifnet:
+  Added separate file for system-settings with Gentoo plugin.
 
   20 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
   networkmanager-0.8-r1.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 977b7596d6fc..9ef8db3a6ced 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
 AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
@@ -18,7 +15,8 @@ AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a61482
 AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
 AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
 AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
-AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
+AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
 DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 RMD160 201e68e6760d6154744e0570e63fc4c7b62bdfb7 SHA1 c2df56df89f652a84287951dcb5c89497fc62b46 SHA256 e4684f0c49c3f1c55f8028a1a2fbe18d726a9aa1592f25e1bd61b9443bfe3060
 DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
@@ -29,14 +27,7 @@ DIST networkmanager-ifnet-308267b4.patch 263345 RMD160 ceefeacea0c2e6cedb4ded62b
 EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
 EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98
 EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab
-EBUILD networkmanager-0.8-r1.ebuild 3516 RMD160 56de5ff74f120675aa1d1036623b36e9b059ca91 SHA1 23efd7a329fe52fbaa3c2eed03be3a170d0bc457 SHA256 1be30d8ca7b4d5addce5c2ffc6d2c57240153ea3a90108d73feec0bcf42f1f4c
+EBUILD networkmanager-0.8-r1.ebuild 3520 RMD160 7f7266c764f243ff84afe206164434e325a265bb SHA1 bce9dd9c0da812a31265907d6c339d8f521db433 SHA256 a1fa2bcd81376b0569d0c1ee56c3990fdf263adb72dd67138c174e07458f5a82
 EBUILD networkmanager-0.8.1-r3.ebuild 3713 RMD160 10d3055f84550a3bf75abcddf66360d6f42045cb SHA1 8dc399feeb0daff8e9c9702220b24ae932982026 SHA256 0c355e96bd4aa8b0dd6e1751f2399d59afb635efad32478b6048b74a5d55390c
-MISC ChangeLog 16916 RMD160 e7ca9f100a0ec7b77f4b25d6c63ccc232b627c95 SHA1 dc7ec17715411617b94df5ee9cec889effc336fb SHA256 e3acfa7170032ebee43f8aa315e9d73af2ec0d7cfa835e62d273342401610d9d
+MISC ChangeLog 17129 RMD160 fced1f7b2fb0b4f08b03642c3f6a641f19af0c4f SHA1 638c16e87de44bf4650c740683665f99ed15df17 SHA256 fcc69474852486ddaf4cbe7dac11010cdda6b46207d193e46ed507f5a9012855
 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxuVxMACgkQ9/cejkQaxBDi7QCeLzICGZl0SGlXa0cpyCBP7hNZ
-AgYAnRddTCeAoGpnMSORCVghFJehp4Nu
-=eRmV
------END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
index 4d14ee7b8041..c37b59680034 100644
--- a/net-misc/networkmanager/files/nm-system-settings.conf
+++ b/net-misc/networkmanager/files/nm-system-settings.conf
@@ -1,6 +1,2 @@
 [main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false
+plugins=keyfile
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
new file mode 100644
index 000000000000..4d14ee7b8041
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
@@ -0,0 +1,6 @@
+[main]
+plugins=ifnet,keyfile
+
+[ifnet]
+managed=true
+auto_refresh=false
diff --git a/net-misc/networkmanager/networkmanager-0.8-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8-r1.ebuild
index ebf88b170c77..476f17c66ea7 100644
--- a/net-misc/networkmanager/networkmanager-0.8-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.6 2010/08/20 10:18:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.7 2010/08/23 10:49:53 dagger Exp $
 
 EAPI="2"
 
@@ -114,7 +114,7 @@ src_install() {
 	# Add keyfile plugin support
 	keepdir /etc/NetworkManager/system-connections
 	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
 		|| die "newins failed"
 }