summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/networkmanager/Manifest5
-rw-r--r--net-misc/networkmanager/files/networkmanager-0.9_beta1-fix-tests.patch23
-rw-r--r--net-misc/networkmanager/networkmanager-0.9_beta3.ebuild (renamed from net-misc/networkmanager/networkmanager-0.9_beta2.ebuild)9
3 files changed, 3 insertions, 34 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 75c6193..968367d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,7 +1,6 @@
-AUX networkmanager-0.9_beta1-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e30015e73841bb265aeef SHA1 28592f3c7fdebc7838a476b0436bb58e4e561b0a SHA256 a16a3ad7eb1a1a8a3562fbc15b200cfd22fc9444e410ba94399dcff5627f9357
AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.8.996.tar.bz2 1798026 RMD160 988f0013c7a60ce6389a41fa7679a702b3473a20 SHA1 5bb96ae204c4037baa3432798e0922beebc3e7ec SHA256 3ccca66610a4896c5bc17e653dcde70320ed7c8278aa4419507e7221131d8550
+DIST NetworkManager-0.8.997.tar.bz2 2048464 RMD160 6c8b685065540500b5fc4510f7b99338b6364be1 SHA1 385b094f2806703edac2d9a5dfb38f1ad8bfbd8e SHA256 332cdd94f480099d23f39d56b3aee9925e435ffe91d088a9476d9b8b3586887a
DIST ifnet-0.9.tar.bz2 5351 RMD160 a936dcd50fca5d8b89cd119223f4c4c9c6a8fc68 SHA1 f2fe16ee3b36698977ac48bbd17d60373336214d SHA256 e23addc579ec2f40ad8babb5073f15abc5f2368c6313e4a983999c54ef9479ed
-EBUILD networkmanager-0.9_beta2.ebuild 4183 RMD160 2e704ea4717d42d584466888827ba8f54a4452ee SHA1 4dca3eae25aeb2a0321bfcfff81d82436758d7b9 SHA256 137c1bb5b52a20871aceb53b8afb75a306725ab40ac3c64c32ce10bf8c81c219
+EBUILD networkmanager-0.9_beta3.ebuild 4010 RMD160 480e33a182241ea665706b0894db8b928954d410 SHA1 278cce3b003ec642874053ac76d18a63a929fca1 SHA256 595636c765c65110efdf31385bce56697d4a1353950874fc97832c2810c57a9e
MISC ChangeLog 13714 RMD160 d527dda4eafb8aef2547bd0ee54514588eb5d47a SHA1 8ce7174a11ed35dc522ea7a0bb4318fd1ffcd913 SHA256 fb4a4a61edf20acfefbef3598d134f225edb8d215e7c2544939af59a7fb7ad52
MISC metadata.xml 1190 RMD160 50f2c2962026f1e2c6b7d199fbe336f0a5e4979f SHA1 2e43144f0318d30c62221875c4e6682bde9cb78f SHA256 2407742dbcfe0171431274ac31b198b185a2f642965c09ab922e9fb93ad12836
diff --git a/net-misc/networkmanager/files/networkmanager-0.9_beta1-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.9_beta1-fix-tests.patch
deleted file mode 100644
index 0b74152..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.9_beta1-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN NetworkManager-0.8.995/configure.ac NetworkManager-0.8.995-patched//configure.ac
---- NetworkManager-0.8.995/configure.ac 2011-03-05 04:39:53.000000000 +0800
-+++ NetworkManager-0.8.995-patched//configure.ac 2011-03-09 15:30:18.831000026 +0800
-@@ -577,7 +577,6 @@
- src/settings/plugins/ifupdown/Makefile
- src/settings/plugins/ifupdown/tests/Makefile
- src/settings/plugins/ifnet/Makefile
--src/settings/plugins/ifnet/tests/Makefile
- src/settings/plugins/ifcfg-rh/Makefile
- src/settings/plugins/ifcfg-rh/tests/Makefile
- src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
-diff -urN NetworkManager-0.8.995/src/settings/plugins/ifnet/Makefile.in NetworkManager-0.8.995-patched//src/settings/plugins/ifnet/Makefile.in
---- NetworkManager-0.8.995/src/settings/plugins/ifnet/Makefile.in 2011-03-05 04:40:28.000000000 +0800
-+++ NetworkManager-0.8.995-patched//src/settings/plugins/ifnet/Makefile.in 2011-03-09 15:30:54.228000025 +0800
-@@ -367,7 +367,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = . tests
-+SUBDIRS = .
- INCLUDES = \
- -I$(top_srcdir)/src/settings \
- -I$(top_srcdir)/include \
diff --git a/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild b/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild
index a7f63f7..d0ec03b 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild
@@ -11,7 +11,7 @@ inherit eutils linux-info
# NetworkManager likes itself with capital letters
MY_PN=${PN/networkmanager/NetworkManager}
# Use 0.9 beta/rc rather then 0.8.9xx
-MY_PV=${PV/0.9_beta2/0.8.996}
+MY_PV=${PV/0.9_beta3/0.8.997}
MY_P=${MY_PN}-${MY_PV}
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
@@ -90,13 +90,6 @@ pkg_setup() {
fi
}
-src_prepare() {
- # fix tests
- epatch "${FILESDIR}/${P/beta2/beta1}-fix-tests.patch"
-
- EPATCH_SOURCE="${WORKDIR}/ifnet-0.9" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
-}
-
src_configure() {
ECONF="--disable-more-warnings
--localstatedir=/var