summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMu Qiao <qiaomuf@gentoo.org>2010-11-30 21:30:07 +0800
committerMu Qiao <qiaomuf@gentoo.org>2010-11-30 21:30:07 +0800
commitcd84be3762e901afa397c2e76bc59382e17bac67 (patch)
tree125b77b4d5af0edab3174453b8b7b1adaaa89b04
parentAdd networkmanager live ebuild for testing (diff)
downloadqiaomuf-cd84be3762e901afa397c2e76bc59382e17bac67.tar.gz
qiaomuf-cd84be3762e901afa397c2e76bc59382e17bac67.tar.bz2
qiaomuf-cd84be3762e901afa397c2e76bc59382e17bac67.zip
Remove nm-0.8.2-r1 since it's been added to portage tree
(Portage version: 2.1.9.25/git/Linux x86_64, signed Manifest commit with key 17B157E9)
-rw-r--r--net-misc/networkmanager/ChangeLog3
-rw-r--r--net-misc/networkmanager/Manifest18
-rw-r--r--net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild146
3 files changed, 11 insertions, 156 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 6aab51b..65e8415 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.88 2010/11/10 12:57:16 dagger Exp $
+ 30 Nov 2010; <gentoo@gentoo.org> -networkmanager-0.8.2-r1.ebuild:
+ Remove nm-0.8.2-r1 since it's been added to portage tree
+
*networkmanager-0.8.2-r1 (24 Nov 2010)
24 Nov 2010; <gentoo@gentoo.org> +networkmanager-0.8.2-r1.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 11ad5a5..8a8250b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,19 +5,17 @@ AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98
AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
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.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
-EBUILD networkmanager-0.8.2-r1.ebuild 4128 RMD160 360430675e3359934a864f9a224a2e2be758314c SHA1 07cc58f21053dbcca675a0899a6412dbe2fcbbac SHA256 da32da81a20a8e73cad7155a4ba4ebaa7aeeac96b0de92926d7dd8c0031cb12e
EBUILD networkmanager-9999.ebuild 4197 RMD160 4a64e0b4141d174eda2716f2a08f6ce5f0a52ed8 SHA1 fd2a1e026e7625312431048ccca94216c3936b76 SHA256 006eea72c4dfc9e605d353c47ad85b8a6a70cbd0eb784aa363b49397b53e393a
-MISC ChangeLog 18787 RMD160 3eb8af0a176bb70ed8fe0c0607562b7d8ae79f76 SHA1 26ef400c8336013edc023e2d25235a2ce9f1f6ea SHA256 35feb2559377e0a60c9b5c9c91f82670bcab1adfe1385d6ee37911d9ca5ae8d4
+MISC ChangeLog 18915 RMD160 6b010bfb98563502a1503c06f962ab2c030043f3 SHA1 88a338f79f4c7980b0322642aa055bb2ffb2adb9 SHA256 c4f984efef8828c8d04cc34ec4b42b187f012515bcb4675ae10fa1005f97f00d
MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iQEcBAEBAgAGBQJM8l3zAAoJEDCzDeQXsVfpGQMH/juS8QWU6eRrm0yPZi7suWi5
-hcpUtZwe0k41vqwLptq4T0aS45TiysRznf/rLVEm2nBbDOCDU5r6dvsvaPTxIgvV
-eI+erYl8hhAC8wtjFYgCBs3gTb5nMSq/mGy7wcdh5cGdCxGzMdeTqoKOrqkZtN8k
-17SoM7TaUHqdyr/Ok9gyZC8hEoPp8gDpKsB1n0PIBjEwXnOsWY9aW2WM7ClYQt80
-6vvG9o/2mecKGAC4XDSy9ALSgqmgpYuB2cjuqgVSJG9/byn0DEokecNkBYogZ9n4
-LZ7xfgt4dZiRLSFp1yc2PCZ3YfmPfhU+svdlLFpdKAmZpMG1f1MUPdzkUNbX7tE=
-=S4Xw
+iQEcBAEBAgAGBQJM9PxfAAoJEDCzDeQXsVfpUNcH/jgu8ThoTnMLpsBtFXFdYjvz
+rIyfYJNTFWj6LMfeta8UXTcmolBvciRQoUKqQ6DCoA7Vf98A38C0j26d4LJzIiZI
+iwmgiABW7wwFIm5BNNHt5Y9CgHzMVwaahHAPjFD+VsAy4/J6cj41z0ghyZXqdrlm
+vA5KYKXT9othUYcH+99hRA/JggjSVHCgSjDjxvPikJgXDOemGtBIki53IXuyx3wX
+2LAqvp3evFlkKGabC+mTYhEryY+sCK497fNfF+bjZMEMnwn2d7vZ/qGTHFa/loH+
+a5uR4p09jQQr78iLtPauDmn3k7Diuy9ZgKPyBepu55G6GC3cv4s5yItrLDqDxiQ=
+=Raai
-----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild
deleted file mode 100644
index d1dfdf9..0000000
--- a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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.2.ebuild,v 1.1 2010/11/10 12:57:16 dagger Exp $
-
-EAPI="2"
-
-inherit gnome.org linux-info
-
-# NetworkManager likes itself with capital letters
-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="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
-
-RDEPEND=">=sys-apps/dbus-1.2
- >=dev-libs/dbus-glib-0.75
- >=net-wireless/wireless-tools-28_pre9
- >=sys-fs/udev-145[extras]
- >=dev-libs/glib-2.18
- >=sys-auth/polkit-0.92
- >=dev-libs/libnl-1.1
- >=net-misc/modemmanager-0.4
- >=net-wireless/wpa_supplicant-0.5.10[dbus]
- bluetooth? ( net-wireless/bluez )
- || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
- avahi? ( net-dns/avahi[autoipd] )
- gnutls? (
- nss? ( >=dev-libs/nss-3.11 )
- !nss? ( dev-libs/libgcrypt
- net-libs/gnutls ) )
- !gnutls? ( >=dev-libs/nss-3.11 )
- dhclient? (
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- !dhcpcd? ( net-misc/dhcp ) )
- !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- resolvconf? ( net-dns/openresolv )
- connection-sharing? (
- net-dns/dnsmasq
- net-firewall/iptables )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool
- >=net-dialup/ppp-2.4.5
- doc? ( >=dev-util/gtk-doc-1.8 )"
-
-S=${WORKDIR}/${MY_P}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See http://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_setup() {
-
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See http://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-src_prepare() {
- # accept "gw" in /etc/conf.d/net (bug #339215)
- epatch "${FILESDIR}/${P}-accept-gw.patch"
-}
-
-src_configure() {
- ECONF="--disable-more-warnings
- --localstatedir=/var
- --with-distro=gentoo
- --with-dbus-sys-dir=/etc/dbus-1/system.d
- --with-udev-dir=/etc/udev
- --with-iptables=/sbin/iptables
- $(use_enable doc gtk-doc)
- $(use_with doc docs)
- $(use_with resolvconf)"
-
- # default is dhcpcd (if none or both are specified), ISC dchclient otherwise
- if use dhclient ; then
- if use dhcpcd ; then
- ECONF="${ECONF} --with-dhcpcd --without-dhclient"
- else
- ECONF="${ECONF} --with-dhclient --without-dhcpcd"
- fi
- else
- ECONF="${ECONF} --with-dhcpcd --without-dhclient"
- fi
-
- # default is NSS (if none or both are specified), GnuTLS otherwise
- if use gnutls ; then
- if use nss ; then
- ECONF="${ECONF} --with-crypto=nss"
- else
- ECONF="${ECONF} --with-crypto=gnutls"
- fi
- else
- ECONF="${ECONF} --with-crypto=nss"
- fi
-
- econf ${ECONF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- # Need to keep the /var/run/NetworkManager directory
- keepdir /var/run/NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-
- # Add keyfile plugin support
- keepdir /etc/NetworkManager/system-connections
- insinto /etc/NetworkManager
- newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
- || die "newins failed"
-}
-
-pkg_postinst() {
- elog "You will need to reload DBus if this is your first time installing"
- elog "NetworkManager, or if you're upgrading from 0.7 or older."
- elog ""
-}