From 136675c2b8d4897466e8fee48b3ae6cbfcb8ad33 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 25 Jan 2010 12:28:40 +0530 Subject: NetworkManager and friends have moved to tree --- gnome-extra/nm-applet/Manifest | 2 - gnome-extra/nm-applet/nm-applet-0.8.0_rc3.ebuild | 59 ---------- net-misc/mobile-broadband-provider-info/Manifest | 3 - .../mobile-broadband-provider-info/metadata.xml | 13 -- .../mobile-broadband-provider-info-20100122.ebuild | 19 --- net-misc/modemmanager/Manifest | 2 - net-misc/modemmanager/modemmanager-0.3.ebuild | 46 -------- net-misc/networkmanager/Manifest | 5 - .../files/networkmanager-0.7.1-confchanges.patch | 16 --- .../files/networkmanager-0.8-read-hostname.patch | 76 ------------ .../networkmanager/files/nm-system-settings.conf | 2 - .../networkmanager/networkmanager-0.8.0_rc3.ebuild | 131 --------------------- 12 files changed, 374 deletions(-) delete mode 100644 gnome-extra/nm-applet/Manifest delete mode 100644 gnome-extra/nm-applet/nm-applet-0.8.0_rc3.ebuild delete mode 100644 net-misc/mobile-broadband-provider-info/Manifest delete mode 100644 net-misc/mobile-broadband-provider-info/metadata.xml delete mode 100644 net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild delete mode 100644 net-misc/modemmanager/Manifest delete mode 100644 net-misc/modemmanager/modemmanager-0.3.ebuild delete mode 100644 net-misc/networkmanager/Manifest delete mode 100644 net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch delete mode 100644 net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch delete mode 100644 net-misc/networkmanager/files/nm-system-settings.conf delete mode 100644 net-misc/networkmanager/networkmanager-0.8.0_rc3.ebuild diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest deleted file mode 100644 index acd355c..0000000 --- a/gnome-extra/nm-applet/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST network-manager-applet-0.8.0_rc3.tar.bz2 690216 RMD160 a0a5a5fe0acf58b99f11295f183ca3b4a697efcf SHA1 9966b32585f2d80e9ea2849158260ccc51a2320d SHA256 ce5b3a0abf063cb29632565d8d17d30b6f5c6a5681306969986210e3397b1b1c -EBUILD nm-applet-0.8.0_rc3.ebuild 1469 RMD160 a42f31870e08cfdeb6d099930b22763122f87ce2 SHA1 61891830622722b4d550bb7a05b66287648c3bda SHA256 cf99d180b429fd019aa718147566395fc424f45e4d3f6261396bb3a3d03b30da diff --git a/gnome-extra/nm-applet/nm-applet-0.8.0_rc3.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.0_rc3.ebuild deleted file mode 100644 index 1a4428d..0000000 --- a/gnome-extra/nm-applet/nm-applet-0.8.0_rc3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.0_pre20091105.ebuild,v 1.1 2009/11/05 14:33:36 dagger Exp $ - -EAPI="2" - -inherit autotools gnome2 eutils - -MY_P="${P/nm-applet/network-manager-applet}" - -DESCRIPTION="Gnome applet for NetworkManager." -HOMEPAGE="http://projects.gnome.org/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~nirbheek/files/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="bluetooth" - -# FIXME: bluetooth is automagic -# depend on dbus-1.2.6 when it goes stable -RDEPEND=">=dev-libs/glib-2.16 - >=dev-libs/dbus-glib-0.74 - >=sys-apps/dbus-1.2 - >=x11-libs/gtk+-2.14 - >=gnome-base/gconf-2.20 - >=gnome-extra/polkit-gnome-0.92 - >=x11-libs/libnotify-0.4.3 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-2.20 - - >=dev-libs/libnl-1.1 - >=net-misc/networkmanager-${PV} - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.5.7 - || ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer ) - net-misc/mobile-broadband-provider-info - bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35" - -DOCS="AUTHORS ChangeLog NEWS README" -# USE_DESTDIR="1" - -S=${WORKDIR}/${MY_P} - -pkg_setup () { - G2CONF="${G2CONF} - --disable-more-warnings - --localstatedir=/var" -} - -src_prepare() { - # git snapshot - intltoolize --force - eautoreconf -} diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest deleted file mode 100644 index a2d116a..0000000 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mobile-broadband-provider-info-20100122.tar.bz2 63811 RMD160 96d82f86415ef6b483c9afe8c0b8dc0e74ccfc35 SHA1 b16b2e635c25bbd2ed150d9328a5e1521dbfa7ca SHA256 4aed0c48306b10ab5a5758c5e547fc9bee2c9857f854b442cb6dc49874f3d620 -EBUILD mobile-broadband-provider-info-20100122.ebuild 648 RMD160 815352adc4c8550413851115e444646533db074e SHA1 976f38ab6bb6676eee2e5035df3430e9a6b41c96 SHA256 07bd47e377c88cd94a189a7eeb3a5bc52d9b221a4cee6cbd268aa3b381b389ed -MISC metadata.xml 436 RMD160 1391013dc0b1d9237918da3f7c27b66e3a2cb070 SHA1 642c889624d32361976ea58d3aac3a4462e252aa SHA256 6839aefc3c1f087c12140590d49cc77a69e8aaaa693cb771b60f83bec78532d4 diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml deleted file mode 100644 index 3fb2ed5..0000000 --- a/net-misc/mobile-broadband-provider-info/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - no-herd - - dagger@gentoo.org - Robert Piasek - - - nirbheek@gentoo.org - Nirbheek Chauhan - - diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild deleted file mode 100644 index 54640ab..0000000 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20100122.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20090602.ebuild,v 1.1 2009/08/24 13:21:52 dagger Exp $ - -DESCRIPTION="Database of mobile broadband service providers" -HOMEPAGE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="CC-PD" -SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest deleted file mode 100644 index 51d13dc..0000000 --- a/net-misc/modemmanager/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ModemManager-0.3.tar.bz2 131988 RMD160 5695a22f6b9590d4a9cd7323eb81a100c26486f0 SHA1 7ec588c02f494aa23242a3b98539149a27ae41cc SHA256 89306a233bd0451e0ac86e60c98cece49baea32e368dc3214985f0bb20f881aa -EBUILD modemmanager-0.3.ebuild 1142 RMD160 71d01005f4bc1c77117a5193222cdd5998065d32 SHA1 9e086157044b4cff1d3fe2bcdae44ffdccd3c76f SHA256 8739ac8f2615ee4ea67bd4e7b31f854ba6217d170dfaa66f021a64a19e2261f7 diff --git a/net-misc/modemmanager/modemmanager-0.3.ebuild b/net-misc/modemmanager/modemmanager-0.3.ebuild deleted file mode 100644 index e956b13..0000000 --- a/net-misc/modemmanager/modemmanager-0.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.2_p20091123.ebuild,v 1.1 2009/11/23 15:34:50 dagger Exp $ - -EAPI=2 - -inherit autotools eutils - -# ModemManager likes itself with capital letters -MY_PN=${PN/modemmanager/ModemManager} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="http://mail.gnome.org/archives/networkmanager-list/2008-July/msg00274.html" -SRC_URI="http://cgit.freedesktop.org/${MY_PN}/${MY_PN}/snapshot/${MY_P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc test" - -RDEPEND=">=dev-libs/glib-2.18 - >=dev-libs/dbus-glib-0.75 - net-dialup/ppp" -DEPEND=">=sys-fs/udev-145[extras] - dev-util/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # git snapshot - eautoreconf -} - -src_configure() { - econf \ - --disable-more-warnings \ - --with-udev-base-dir=/etc/udev/ \ - $(use_with doc docs) \ - $(use_with test tests) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest deleted file mode 100644 index b54e4ae..0000000 --- a/net-misc/networkmanager/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437 -AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe -AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21 -DIST NetworkManager-0.8-rc3.tar.bz2 775283 RMD160 a8442395b341fa4b5a6a6181a1d0b42058792186 SHA1 d69a0c57c61d6138a4c25a110bc75c55f9d008dd SHA256 c603034ad7765aca802bb87b3c1318c9ac1fad26a8102b45cd15b0cfa8dc59de -EBUILD networkmanager-0.8.0_rc3.ebuild 3773 RMD160 cdb61892705d80a8144e0392cca0b18309034296 SHA1 107d569e58fc2e1221de080146573a2b96562098 SHA256 da358403b5f451de5d2acf4ac822a77e550bc0cf48dc56c69c6623bc325a4974 diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch deleted file mode 100644 index ca53328..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/NetworkManager.conf NetworkManager-0.7.1/src/NetworkManager.conf ---- NetworkManager-0.7.1.orig/src/NetworkManager.conf 2009-03-03 11:55:47.000000000 -0500 -+++ NetworkManager-0.7.1/src/NetworkManager.conf 2009-05-01 20:04:33.000000000 -0400 -@@ -15,6 +15,12 @@ - - -+ -+ -+ -+ -+ - - - diff --git a/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch b/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch deleted file mode 100644 index ac59fe2..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch +++ /dev/null @@ -1,76 +0,0 @@ -When reading hostname from NM keyfile, if no hostname is set, read from the -system file at /etc/conf.d/hostname to set hostname. This patch is not meant to -be ever upstreamed. Proper fix is to write a gentoo-specific ifcfg plugin. - -To change hostname, touch nm-system-settings.conf, which will reload the keyfile -and cause /etc/conf.d/hostname to be reloaded. - -This horrible hack fixes http://bugs.gentoo.org/176873 - -Author: Nirbheek Chauhan -Reviewed-by: Arun Raghavan - ---- ---- system-settings/plugins/keyfile/plugin.c -+++ system-settings/plugins/keyfile/plugin.c -@@ -43,6 +43,9 @@ - #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." - - #define CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" -+#ifdef TARGET_GENTOO -+#define HOSTNAME_FILE SYSCONFDIR "/conf.d/hostname" -+#endif - - static char *plugin_get_hostname (SCPluginKeyfile *plugin); - static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class); -@@ -381,6 +384,12 @@ - GKeyFile *key_file; - char *hostname = NULL; - GError *error = NULL; -+#ifdef TARGET_GENTOO -+ char *contents = NULL; -+ char **lines = NULL, **line; -+ GError *contents_err = NULL; -+ gsize contents_len = 0; -+#endif - - key_file = g_key_file_new (); - if (g_key_file_load_from_file (key_file, CONF_FILE, G_KEY_FILE_NONE, &error)) -@@ -392,7 +401,37 @@ - - g_key_file_free (key_file); - -+ if (hostname) -+ goto out; -+#ifdef TARGET_GENTOO -+ /* If hostname is unset in keyfile, read system file to get hostname */ -+ if (!g_file_get_contents (HOSTNAME_FILE, &contents, -+ &contents_len, &contents_err)) -+ goto out; -+ -+ lines = g_strsplit_set (contents, "\n\r", 0); -+ if (!lines) -+ goto out; -+ -+ for (line = lines; *line; line++) { -+ if (!g_str_has_prefix (*line, "hostname=")) -+ continue; -+ hostname = g_strsplit_set (g_strsplit_set (*line, "=", 0)[1], "#", 0)[0]; -+ g_strstrip (hostname); -+ if (!hostname) -+ goto out; -+ /* Remove quotes surrounding hostname */ -+ if (hostname[0] == '"' && hostname[strlen(hostname)-1] == '"') -+ contents = g_strndup(&hostname[1], strlen(hostname)-2); -+ /* Un-escape before using to imitate librc behaviour */ -+ hostname = g_strcompress (contents); -+ } -+ -+out: -+ g_error_free(contents_err); -+ - return hostname; -+#endif - } - - static gboolean diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf deleted file mode 100644 index c37b596..0000000 --- a/net-misc/networkmanager/files/nm-system-settings.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/net-misc/networkmanager/networkmanager-0.8.0_rc3.ebuild b/net-misc/networkmanager/networkmanager-0.8.0_rc3.ebuild deleted file mode 100644 index 09993a3..0000000 --- a/net-misc/networkmanager/networkmanager-0.8.0_rc3.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.0_pre20091105.ebuild,v 1.2 2009/11/05 15:52:12 dagger Exp $ - -EAPI="2" - -inherit autotools eutils - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -MY_P=${MY_PN}-${PV/0.8.0_rc/0.8-rc} - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://cgit.freedesktop.org/${MY_PN}/${MY_PN}/snapshot/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd 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.2 - >=net-wireless/wpa_supplicant-0.5.10[dbus] - bluetooth? ( net-wireless/bluez ) - || ( sys-libs/e2fsprogs-libs =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-3.0.0 ) ) - !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 - >=dev-util/gtk-doc-1.8 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch" - - # Hack keyfile plugin to read hostname file, fixes bug 176873 - epatch "${FILESDIR}/${PN}-0.8-read-hostname.patch" - - # git snapshot - gtkdocize || die "gtkdocize failed" - intltoolize --force - eautoreconf -} - -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-dhcp-client=dhcpcd" - else - ECONF="${ECONF} --with-dhcp-client=dhclient" - fi - else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - 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" nm-system-settings.conf \ - || die "newins failed" -} - -pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." - elog "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' -} -- cgit v1.2.3-65-gdbad