diff options
| -rw-r--r-- | net-misc/networkmanager/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 6abaab6..21496dd 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -6,6 +6,6 @@ DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc DIST modem-manager-patches.tar.bz2 38126 RMD160 cad4501e43404890079018243fadeb86885a21f3 SHA1 13ee77388d0f510a069f9b68100d328d8e93cc0b SHA256 7d80d18a140ec2927559464bedba3c4e7a5da84a2bfc47dd9472cd15f82b4ca8 DIST networkmanager-patches1.tar.bz2 22756 RMD160 419b330ba9011040254043bb4f66a6b67823ab58 SHA1 168d62bfc0d59f54fae102f71f3bf48f49724ea3 SHA256 598fdf48716f147669f2ff7e30e8a9d8b382abaa0cefc006f0c9d83074ed9f01 EBUILD networkmanager-0.7.0-r2.ebuild 3999 RMD160 f1c74923dc71c2b187e8dedea8f376c7bd3bb704 SHA1 8b111230af016d2e0f6aeabaf9783cb041271f31 SHA256 69f2aed55416eb91aedd38a19f96c895f7bba8f35d3b954aa81e8d9a39c0840b -EBUILD networkmanager-0.7.1_rc2.ebuild 3972 RMD160 84e6041a12334bdec2747e79423776f87fb952dc SHA1 0171096f8c218b5232d496d95e4e53b4b3f3d8d8 SHA256 5158f1d45989d6a45a34ca5a438f81a70d6bf9f80f0d44d3a5ff38a47468e331 +EBUILD networkmanager-0.7.1_rc2.ebuild 3895 RMD160 08342ab45740d92df9c1f241d241f6fdc628d5ab SHA1 b679fcbba07c8f4e13c8bc48ca9444fb68419575 SHA256 bf04b84c16a70181cc8c46d2f252cb44545e29f01df3c787279a36ec2f1cd112 EBUILD networkmanager-9999.ebuild 3811 RMD160 e5f4c6a0c55fce91c0d8f53548413048c23e0153 SHA1 cf8efdef173979c07df1ea48b61aa8bb668384ea SHA256 d3d4f45a9fc6c6988868052a3ba4a5d4f67c97234adc747771b94190e0146247 MISC metadata.xml 942 RMD160 d7fbb33279cb272b0e362a910b44398a893f6025 SHA1 e94ee026e4fe5701573f12afd0df09d3287c013f SHA256 7d34a1d393ce3d1a52f506abe55c226e5d5d25174198e0c04e2a3e20ce130c07 diff --git a/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild b/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild index 918ab74..020cf77 100644 --- a/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild +++ b/net-misc/networkmanager/networkmanager-0.7.1_rc2.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils +EAPI="2" +inherit eutils autotools # NetworkManager likes itself with capital letters MY_PN=${PN/networkmanager/NetworkManager} @@ -27,7 +28,7 @@ RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/glib-2.16 >=sys-auth/policykit-0.8 >=dev-libs/libnl-1.1 - >=net-wireless/wpa_supplicant-0.5.10 + >=net-wireless/wpa_supplicant-0.5.10[dbus] || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) gnutls? ( @@ -53,16 +54,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -pkg_setup() { - if ! built_with_use net-wireless/wpa_supplicant dbus ; then - eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag." - die "Fix wpa_supplicant first." - fi -} - -src_unpack () { - unpack ${A} - cd "${S}" +src_prepare() { # Fix up the dbus conf file to use plugdev group epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" @@ -70,7 +62,7 @@ src_unpack () { # EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1" # EPATCH_SUFFIX="patch" -# use modemmanager && epatch +# use modemmanager && epatch && autoreconf } @@ -135,6 +127,9 @@ pkg_postinst() { elog 'send host-name "YOURHOSTNAME";' elog 'supersede host-name "YOURHOSTNAME";' elog "" + elog "If you're using dhcpcd please remove" + elog "host_name option from /etc/dhcpcd.conf" + elog "" elog "You will need to restart DBUS if this is your first time" elog "installing NetworkManager." elog "" |