Revision bumped to 0.7.0_rc2

svn path=/overlay/; revision=69

4 files changed, 14 insertions, 9 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 79c0c3c..9ceb05b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,7 +1,7 @@
 AUX nm-applet-0.7.0-confchanges.patch 488 RMD160 14e971a69a04f246f718960e10d2565a06b80b19 SHA1 0dc8bf207536603c9852838abf87bb53eb609c31 SHA256 f38ea0296927388ee66f671b4cac06d1c17f70b0822b3374008fca33c3d9cdfa
 AUX nm-applet-9999-confchanges.patch 906 RMD160 5de99593d5613cebfcfb052e707e12a6a1370632 SHA1 61363aa751e9572ea5ffdce279e0438b1f8f2f8a SHA256 438f068119859e0cba08a8213b197f6ec73f92d64c8bddc46bdadc9bc7485fa0
 DIST network-manager-applet-0.7.0-rc1.tar.gz 1091062 RMD160 4dcae8bccd9cf124316468f36f69a5df79c0d624 SHA1 e7c5eee5cdd7989e3486eb7970da4aae828a374e SHA256 37085b2bd3733ebb9735418b8151cb109fd45653402dddeb71c61130bd07a8fe
-DIST nm-applet-0.7.0_pre20081028.tar.bz2 749095 RMD160 9421609fd41a45db94a23029b88687b4bc2d6d45 SHA1 e491b28781cb9c884823d3fc1ba2d9831d38838d SHA256 6b2a6ab5cd2671852a7d05bec8ca1fdebf4b934c65c83d81bdc9dac32417941d
-EBUILD nm-applet-0.7.0_pre20081028.ebuild 1784 RMD160 17fe863da64ffa11e3ce411635f86d873156b5d1 SHA1 2a09b8ac144f6a15bfa562324bafccda369cf087 SHA256 231746032fb23cba84cff8794be928bbd392ec315e3332653bb973953079dbbf
+DIST network-manager-applet-0.7.0-rc2.tar.gz 1095114 RMD160 7e3c1b8f2ea53b4cdc3bfa80bd9840f6e540dcf0 SHA1 c56c7d48f66bf54e2ad349d70865610536afa46e SHA256 15663efa838a6aa520a65804360daa1eefbe007a4f29a4582d7107e337c45547
 EBUILD nm-applet-0.7.0_rc1.ebuild 1746 RMD160 fcbf8aeeaaf67b59b6b0102cb4634fa5cf88da01 SHA1 2bfcffd02d3decd1941804c4544b577849ad850a SHA256 28306a66f66936b65f922f1ceca3ef8ba862bf9894914d39e152e67e2e5c6da5
+EBUILD nm-applet-0.7.0_rc2.ebuild 1746 RMD160 99b85b8442d3201cfbee61076539c93e89382aec SHA1 46121ec3716fc3ffa838b21418eda13e4509b089 SHA256 1914e20aba40a16fb2f09fd69f28b71bbb4e5123b111b0b234529fdc25b340c1
 EBUILD nm-applet-9999.ebuild 1628 RMD160 1a0a2d2194fd8a2d51543706202407dc1a45f052 SHA1 0c90cc116d592f9d6568b85ae57235360036d4e1 SHA256 4083828de65f713e2f4696349eeaf5bddf4ee004f61e2f9a8c30f8f0455a3405
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0_pre20081028.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild
index a5b4fca..b506440 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.0_pre20081028.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild
@@ -4,10 +4,12 @@
 
 inherit gnome2 eutils
 
+MY_PN="${PN/nm-applet/network-manager-applet}"
+MY_P="${MY_PN}-${PV/_/-}"
+
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://people.redhat.com/dcbw/NetworkManager/"
-#SRC_URI="http://ftp.gnome.org/pub/gnome/sources/network-manager-applet/0.6/network-manager-applet-0.6.5.tar.gz"
-SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${P}.tar.bz2 http://patches.piasek.co.uk/${P}.tar.bz2"
+SRC_URI="http://ftp.gnome.org/pub/gnome/sources/${MY_PN}/0.7/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~x86"
@@ -35,6 +37,8 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 # USE_DESTDIR="1"
 
+S=${WORKDIR}/${P/_rc2/}
+
 pkg_setup () {
 	G2CONF="${G2CONF} \
 		--disable-more-warnings \
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c258a89..a2c1940 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,8 +3,8 @@ AUX networkmanager-0.7.0-resolvconf-perms.patch 559 RMD160 b54ec431e9050176845dc
 AUX networkmanager-0.7.0_pre20070627-updatedbackend.patch 17941 RMD160 343abd3b8a35b7373a5651e7ec8fb10342eb36d7 SHA1 63c7dccf7ed31fb465d57db84e33e08488031dfe SHA256 89ccb2dfc05cdb2ee9bca558f661f30b6923f81b9bd7e2999c61880461b14826
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 DIST NetworkManager-0.7.0-rc1.tar.gz 1463205 RMD160 d3bb5d7a97f47b9e73d454c445ec0d42410f43a3 SHA1 6444211b1dd1461f3fc652ea210078ba56d4211a SHA256 5b1d2bebdf3fec65a053752e18b09c128183cfa8d3e9aa54ddcd64310d9d0105
-DIST NetworkManager-0.7.0_pre20081028.tar.bz2 988248 RMD160 f9032026c57df9318355b052a528b1f0f269cec2 SHA1 b9995ba26170a71259c8aee74e5e2452ca7ee535 SHA256 6d4183a07b9bf93975867c1a021caa77db8ae3f09ea11132f61b388542a76b76
-EBUILD networkmanager-0.7.0_pre20081028.ebuild 3747 RMD160 95cb6c262ef2fcfd3415efa37b3f8e0d7f3b5da1 SHA1 ebf972b63c64b740e40bb3140d06ace18c0a202c SHA256 bc733019ea5853b2a556ce3995c701d95db2969124570621e3e2a578c8000594
+DIST NetworkManager-0.7.0-rc2.tar.gz 1471314 RMD160 eb026af9f08917b456b36dc4c01b3491ceabd2e2 SHA1 c88754775800a4d3592724d9312d8943e953777a SHA256 2a646189f67fe4930a63c550ac5480d3b8f4b30689ee3c0b797b1b7c79fdbcb0
 EBUILD networkmanager-0.7.0_rc1.ebuild 3747 RMD160 015e53dc3956feb39d0d1d17e3d427c94dec7a12 SHA1 cb9137538577deaca32befa142bd0a116a9935c1 SHA256 77f64d32b4d233484fd69e8cab5297e9966c198f200c38792465aa2173d8dbad
+EBUILD networkmanager-0.7.0_rc2.ebuild 3747 RMD160 b70c6124243e072b00ea8a8c22a3721550f01092 SHA1 519220a4691a764f32882e378f7f29e032d7e980 SHA256 cddc87e470de90b807d8e6c4f279601ffe5c9f431e7151259e845bbe8cc26c1a
 EBUILD networkmanager-9999.ebuild 3738 RMD160 e572302105ee0468a58a6ebefe7f66a857f583e2 SHA1 d0865a15b6acdafef63852a722fc774b57b08c50 SHA256 8cdc1bbd524e6f0f493d2d0698fee1928ab50536742ba83407cd78ddede61c53
 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20081028.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild
index c9b9c51..92eaa49 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0_pre20081028.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild
@@ -5,11 +5,12 @@
 inherit eutils
 
 # NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV/_/-}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2 http://patches.piasek.co.uk/${MY_P}.tar.bz2"
+SRC_URI="http://ftp.gnome.org/pub/gnome/sources/$MY_PN/0.7/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -47,7 +48,7 @@ DEPEND="${RDEPEND}
 PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
 	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${MY_P/-rc2/}
 
 pkg_setup() {
 	if ! built_with_use net-wireless/wpa_supplicant dbus ; then