From 1207c376ee15a63469b02a4fc5aed266df8e2377 Mon Sep 17 00:00:00 2001 From: Robert Buchholz Date: Sun, 31 Aug 2008 15:31:46 +0000 Subject: Tarball bump and cleanup svn path=/overlay/; revision=50 --- gnome-extra/nm-applet/Manifest | 4 +- .../nm-applet/nm-applet-0.7.0_pre20080822.ebuild | 58 -- .../nm-applet/nm-applet-0.7.0_pre20080831.ebuild | 58 ++ net-misc/networkmanager-openvpn/Manifest | 7 +- ...digest-networkmanager-openvpn-0.3.3_pre20070621 | 3 - ...-openvpn-0.3.3_pre20070621-libnm-util-dep.patch | 15 - ...networkmanager-openvpn-0.3.3_pre20070621.ebuild | 60 -- ...networkmanager-openvpn-0.7.0_pre20080822.ebuild | 52 -- ...networkmanager-openvpn-0.7.0_pre20080831.ebuild | 52 ++ net-misc/networkmanager-pptp/Manifest | 14 +- .../digest-networkmanager-pptp-0.6.5_p20070820 | 6 - .../digest-networkmanager-pptp-0.7.0_pre20070621 | 3 - .../01_all_nm-dep.patch | 13 - .../02_all_remove-general-dialog.patch | 25 - .../03_all_remove-non-pptp-parts.patch | 825 --------------------- .../04_all_revert-vpn-subsystem-changes.patch | 220 ------ .../05_all_service-name.patch | 29 - .../networkmanager-pptp-0.6.5_p20070820.ebuild | 64 -- .../networkmanager-pptp-0.7.0_pre20070621.ebuild | 50 -- .../networkmanager-pptp-0.7.0_pre20080822.ebuild | 51 -- .../networkmanager-pptp-0.7.0_pre20080831.ebuild | 51 ++ net-misc/networkmanager-vpnc/Manifest | 8 +- .../digest-networkmanager-vpnc-0.7.0_pre20070621 | 3 - .../files/nm-vpnc-dbus_conf.patch | 14 - .../networkmanager-vpnc/files/nm-vpnc-path.patch | 12 - .../networkmanager-vpnc-0.7.0_pre20070621.ebuild | 63 -- .../networkmanager-vpnc-0.7.0_pre20080822.ebuild | 52 -- .../networkmanager-vpnc-0.7.0_pre20080831.ebuild | 52 ++ net-misc/networkmanager/Manifest | 4 +- .../networkmanager-0.7.0_pre20080822.ebuild | 125 ---- .../networkmanager-0.7.0_pre20080831.ebuild | 126 ++++ 31 files changed, 349 insertions(+), 1770 deletions(-) delete mode 100644 gnome-extra/nm-applet/nm-applet-0.7.0_pre20080822.ebuild create mode 100644 gnome-extra/nm-applet/nm-applet-0.7.0_pre20080831.ebuild delete mode 100644 net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.3_pre20070621 delete mode 100644 net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch delete mode 100644 net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.3_pre20070621.ebuild delete mode 100644 net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080822.ebuild create mode 100644 net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080831.ebuild delete mode 100644 net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820 delete mode 100644 net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.7.0_pre20070621 delete mode 100644 net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch delete mode 100644 net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch delete mode 100644 net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch delete mode 100644 net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch delete mode 100644 net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch delete mode 100644 net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild delete mode 100644 net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild delete mode 100644 net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080822.ebuild create mode 100644 net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080831.ebuild delete mode 100644 net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.7.0_pre20070621 delete mode 100644 net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch delete mode 100644 net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch delete mode 100644 net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20070621.ebuild delete mode 100644 net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080822.ebuild create mode 100644 net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080831.ebuild delete mode 100644 net-misc/networkmanager/networkmanager-0.7.0_pre20080822.ebuild create mode 100644 net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest index c4e188c..1fe3221 100644 --- a/gnome-extra/nm-applet/Manifest +++ b/gnome-extra/nm-applet/Manifest @@ -1,5 +1,5 @@ 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 nm-applet-0.7.0_pre20080822.tar.bz2 716608 RMD160 3c839d00ae10eb1128ad391cd6fe13cd046ece66 SHA1 4e0230668cac7b76c07514140d3a10305c5373fd SHA256 d64ea8318856ed6a4ce24cf30570ad3e9a3473dd2a3aae1e4a48dedb2545b359 -EBUILD nm-applet-0.7.0_pre20080822.ebuild 1775 RMD160 b5d7d0d6d69982be20585c50f93a7be7f726c8df SHA1 9bd67436311898a919484a123518f19ab9bf0b18 SHA256 f8a0117ccdb70a320cc952dd3a4366d89886529e523b3969d5d552afce763dd2 +DIST nm-applet-0.7.0_pre20080831.tar.bz2 717955 RMD160 3896442b51027e1e0f764824238b9c3c9b84ef0a SHA1 acf42121ecc17d28f8bf97feabf4d0ffa3b58f6e SHA256 44b5b0ff78c59dc89f3fa56d71600205ed7d5927d5b0fa19fa73e7fa62fe623b +EBUILD nm-applet-0.7.0_pre20080831.ebuild 1775 RMD160 b5d7d0d6d69982be20585c50f93a7be7f726c8df SHA1 9bd67436311898a919484a123518f19ab9bf0b18 SHA256 f8a0117ccdb70a320cc952dd3a4366d89886529e523b3969d5d552afce763dd2 EBUILD nm-applet-9999.ebuild 1790 RMD160 08b7182c6c09d2064263f394a623bbd6e0d8458c SHA1 afbd61d296946fa61e6e32a149337bb8b704efe8 SHA256 a4c61eb45223cfc194142831736646a2e6a2bceb25009ba35cdf70c2e270af16 diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080822.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080822.ebuild deleted file mode 100644 index 9163367..0000000 --- a/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080822.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2008 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.6.6.ebuild,v 1.3 2008/07/28 18:47:49 ken69267 Exp $ - -inherit gnome2 eutils - -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" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="debug doc libnotify" - -RDEPEND=">=sys-apps/dbus-1.2 - >=sys-apps/hal-0.5.9 - >=dev-libs/libnl-1.1 - >=net-misc/networkmanager-0.7.0_pre20080817 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.5.7 - >=dev-libs/glib-2.16 - libnotify? ( >=x11-libs/libnotify-0.4.3 ) - >=x11-libs/gtk+-2.10 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-2.20 - >=gnome-base/gnome-panel-2.20 - >=gnome-base/gconf-2.20 - >=gnome-base/libgnomeui-2.20" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35" - -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" -# USE_DESTDIR="1" - -pkg_setup () { - G2CONF="${G2CONF} \ - --disable-more-warnings \ - --localstatedir=/var \ - --with-dbus-sys=/etc/dbus-1/system.d \ - $(use_with libnotify notify)" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" -} - -pkg_postinst() { - gnome2_pkg_postinst - elog "Your user needs to be in the plugdev group in order to use this" - elog "package. If it doesn't start in Gnome for you automatically after" - elog 'you log back in, simply run "nm-applet --sm-disable"' - elog "You also need the notification area applet on your panel for" - elog "this to show up." -} diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080831.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080831.ebuild new file mode 100644 index 0000000..9163367 --- /dev/null +++ b/gnome-extra/nm-applet/nm-applet-0.7.0_pre20080831.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2008 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.6.6.ebuild,v 1.3 2008/07/28 18:47:49 ken69267 Exp $ + +inherit gnome2 eutils + +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" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~x86" +IUSE="debug doc libnotify" + +RDEPEND=">=sys-apps/dbus-1.2 + >=sys-apps/hal-0.5.9 + >=dev-libs/libnl-1.1 + >=net-misc/networkmanager-0.7.0_pre20080817 + >=net-wireless/wireless-tools-28_pre9 + >=net-wireless/wpa_supplicant-0.5.7 + >=dev-libs/glib-2.16 + libnotify? ( >=x11-libs/libnotify-0.4.3 ) + >=x11-libs/gtk+-2.10 + >=gnome-base/libglade-2 + >=gnome-base/gnome-keyring-2.20 + >=gnome-base/gnome-panel-2.20 + >=gnome-base/gconf-2.20 + >=gnome-base/libgnomeui-2.20" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.35" + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" +# USE_DESTDIR="1" + +pkg_setup () { + G2CONF="${G2CONF} \ + --disable-more-warnings \ + --localstatedir=/var \ + --with-dbus-sys=/etc/dbus-1/system.d \ + $(use_with libnotify notify)" +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" +} + +pkg_postinst() { + gnome2_pkg_postinst + elog "Your user needs to be in the plugdev group in order to use this" + elog "package. If it doesn't start in Gnome for you automatically after" + elog 'you log back in, simply run "nm-applet --sm-disable"' + elog "You also need the notification area applet on your panel for" + elog "this to show up." +} diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest index 437e8cd..c5023c8 100644 --- a/net-misc/networkmanager-openvpn/Manifest +++ b/net-misc/networkmanager-openvpn/Manifest @@ -1,7 +1,4 @@ -AUX networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch 481 RMD160 adc564b482e0bb2ab4c3722c00e10ca278663a06 SHA1 ce96a94801a6a83ee53890e31827d305780ff2e8 SHA256 fb54195f24205b3163ba8dc9e63686bec3b78abe5709b7f706ef18c0ef2adca3 -DIST NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 RMD160 5920a26f5b2814bd14c1221311c32effa75ca208 SHA1 f6dfcd4251874e52613148c615365e7e5ab1e789 SHA256 46300661317924f48b5822346f8f0f3276a2b4d0c8e111855432c93bf4f820ad -DIST NetworkManager-openvpn-0.7.0_pre20080822.tar.bz2 376956 RMD160 1c06ca951d37d963c74d3d2773ef0b99171624f5 SHA1 11460fee39753edaeee926f8e4f0a0828b4c9c72 SHA256 63667f409de5c625673a24d88c211ab131ee06ae063b013c3df6151349e79717 -EBUILD networkmanager-openvpn-0.3.3_pre20070621.ebuild 1396 RMD160 cbe0db1accd3c9e1d49c9bda51c036e23e72607e SHA1 a375b96b88757db6671849685ca2e7710737c675 SHA256 74fe6eaade5871fdc402f8be9c1f2bfb36213fbd262e8a0eeae6fd6ea23b19d7 -EBUILD networkmanager-openvpn-0.7.0_pre20080822.ebuild 1080 RMD160 f6bdc70350c68c527c1bc67613d247304483bd84 SHA1 883239d5ce583b8152895fa332e64f0e55fd5bda SHA256 b65bcc335a4847b2fb688a11c2269a3143cd50c4c73e09b2e9af7d4f2b52f18b +DIST NetworkManager-openvpn-0.7.0_pre20080831.tar.bz2 378094 RMD160 257ad5e5b05fcdbf8c49d6a9a9ecadc7c4a3e99e SHA1 fbdf7fdd8d96b08958440fc5c430df69cf5a4f7c SHA256 ef001b87fea86a02b1950ea8a72ea77e833de49844cdd39dcf3c4b7ef9f029b5 +EBUILD networkmanager-openvpn-0.7.0_pre20080831.ebuild 1080 RMD160 f6bdc70350c68c527c1bc67613d247304483bd84 SHA1 883239d5ce583b8152895fa332e64f0e55fd5bda SHA256 b65bcc335a4847b2fb688a11c2269a3143cd50c4c73e09b2e9af7d4f2b52f18b MISC ChangeLog 340 RMD160 62f8479437be7c62b3425070212efaf6291a6714 SHA1 cf386591a0ef666e91ca25e08600bdd1c74a463f SHA256 1109011d0dfebb8c501e683a116ddfbcbd3ffa99dc625611fb18955b9c00fd3b MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 diff --git a/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.3_pre20070621 b/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.3_pre20070621 deleted file mode 100644 index 0f03c07..0000000 --- a/net-misc/networkmanager-openvpn/files/digest-networkmanager-openvpn-0.3.3_pre20070621 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 18036f3356b49ceca2af3d85f6050c81 NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 -RMD160 5920a26f5b2814bd14c1221311c32effa75ca208 NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 -SHA256 46300661317924f48b5822346f8f0f3276a2b4d0c8e111855432c93bf4f820ad NetworkManager-openvpn-0.3.3_pre20070621.tar.gz 487858 diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch deleted file mode 100644 index 3f9081e..0000000 --- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.3_pre20070621-libnm-util-dep.patch +++ /dev/null @@ -1,15 +0,0 @@ -See http://bugzilla.gnome.org/show_bug.cgi?id=454739 - -Index: configure.in -=================================================================== ---- configure.in (Revision 2627) -+++ configure.in (Arbeitskopie) -@@ -56,7 +56,7 @@ - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - --PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1) -+PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.7.0) - AC_SUBST(NETWORK_MANAGER_CFLAGS) - AC_SUBST(NETWORK_MANAGER_LIBS) - diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.3_pre20070621.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.3_pre20070621.ebuild deleted file mode 100644 index 95da2c1..0000000 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.3_pre20070621.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils autotools - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager OpenVPN plugin." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="crypt doc gnome" - -RDEPEND=">=sys-apps/dbus-0.35.2 - >=sys-apps/hal-0.5 - sys-apps/iproute2 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.8 - >=net-misc/networkmanager-0.7.0_pre20070627 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - !gnome? ( >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 ) - >=net-misc/openvpn-2.0.5 - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" - -src_unpack () { - unpack ${A} - cd "${S}" - - epatch ${FILESDIR}/${P}-libnm-util-dep.patch - eautoreconf -} diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080822.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080822.ebuild deleted file mode 100644 index 0055a52..0000000 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080822.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager OpenVPN plugin." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gnome" - -RDEPEND=" - >=net-misc/networkmanager-0.7.0_pre20080817 - gnome? ( >=x11-libs/gtk+-2.10 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeui-2.20 - >=gnome-base/gconf-2.20 - >=gnome-base/gnome-keyring-2.20 - ) - >=net-misc/openvpn-2.0.6" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -src_unpack () { - unpack ${A} - cd "${S}" -} - -src_compile() { - ECONF="--disable-more-warnings \ - $(use_with gnome)" - - econf ${ECONF} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080831.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080831.ebuild new file mode 100644 index 0000000..0055a52 --- /dev/null +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.0_pre20080831.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +# NetworkManager likes itself with capital letters +MY_P=${P/networkmanager/NetworkManager} + +DESCRIPTION="NetworkManager OpenVPN plugin." +HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" +SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gnome" + +RDEPEND=" + >=net-misc/networkmanager-0.7.0_pre20080817 + gnome? ( >=x11-libs/gtk+-2.10 + >=gnome-base/libglade-2 + >=gnome-base/libgnomeui-2.20 + >=gnome-base/gconf-2.20 + >=gnome-base/gnome-keyring-2.20 + ) + >=net-misc/openvpn-2.0.6" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +S=${WORKDIR}/${MY_P} + +src_unpack () { + unpack ${A} + cd "${S}" +} + +src_compile() { + ECONF="--disable-more-warnings \ + $(use_with gnome)" + + econf ${ECONF} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest index 38c4c4d..3f95b61 100644 --- a/net-misc/networkmanager-pptp/Manifest +++ b/net-misc/networkmanager-pptp/Manifest @@ -1,14 +1,4 @@ -AUX networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch 449 RMD160 e297f283ba715f5f6849f07823d0759f1e7a52c7 SHA1 b54eb9abfb110f97a9d958695a14bf3836714547 SHA256 c6d992353570fc4d60ad9ec311a9a7093535fde453882f0311a4a3c78977d1c0 -AUX networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch 631 RMD160 df5236616e7c095eab594f56f4219786b768a13f SHA1 444f8b3b95ee459ce40e1839b095a56373d27fdb SHA256 65551a10892a61b9e0478f7f900e5c1526984e93eefe71c38a174391725e806c -AUX networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch 33861 RMD160 5176d17e72cc7c3f03a16a7634aaa5588f679d86 SHA1 c33d08813c07ca81624a296d978312b97a8045e0 SHA256 6d398cfcc96479814fde98685cca99dd040b53f98eb2ef37e7cb4aa8794951e4 -AUX networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch 7389 RMD160 5a5fc2417c84af7eb7923d97441df66d2f27670f SHA1 a6ff9898cee5dc3deb990e7983378a07e2e4be4e SHA256 651e554e00302f11aac844f850176d47cbcc473b73a0923a43e0122057cf7dd6 -AUX networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch 921 RMD160 e3882c6848b69ede84f0b70c027500cf0d2a863c SHA1 55f1f3b6f667f3f13ebfa5207f1dad4e857629c1 SHA256 bd97906243d4116b31321fb101f27d96be182c6f7fbddb0bad8d8fdeabd9e3a9 -DIST NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 RMD160 30b9dafa41e616460045847b97efd0e4b8dd3824 SHA1 7f29ffeafb3767e2909b20305fab67863a2e8aa5 SHA256 ea934673c57a50b094797c677c6a76dba8042f696d02ab379dcd57d1a1f19999 -DIST NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989 RMD160 deec889de25bf4295473b85674d554eba4f0ced8 SHA1 da67b135d6974643e3ad32b42987b38e8b9ee590 SHA256 fdb02ce57a55264fa94f2a966f162922e703be7530e988fa698dc4ec54427fa3 -DIST NetworkManager-pptp-0.7.0_pre20080822.tar.bz2 391058 RMD160 21e2c616fd0c144e4a3f9478add3b58ab1b693c1 SHA1 03c43003071732595656ecdb6d0228322d5f210d SHA256 b37ce31cdf9a690a2bbfa1c82fa28e31d6594805971839d32271fc6251aba300 -DIST networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965 RMD160 dff290c0286634d28a8e9b96225755b6c594c6d8 SHA1 a48ca7b2a6b95e7476d68be0fe0f0a593e01c16e SHA256 2aa2efe405875aa1d83b6ee70dc531e5dd7ee146f0dd5f74af6bc5fdb076ca1e -EBUILD networkmanager-pptp-0.6.5_p20070820.ebuild 1731 RMD160 cf493a643e8a27b6cf2bcabaebd4999527d980cd SHA1 bde70c986e8301897bcb6781173435db00b7e151 SHA256 ccbcab47302b38d1ea8b5159ee4abb73e19bd0a78db45b85596edd583cbc29c1 -EBUILD networkmanager-pptp-0.7.0_pre20070621.ebuild 1243 RMD160 48ca1367903ab8f4de0b0c648fdd749cd47f1efa SHA1 1c12aa520e051ef269157c4363be43f414134100 SHA256 07c0dabf3b72932b2cdfca0b718f7a29f65ea228ffc321b24cadd2b8737b01e0 -EBUILD networkmanager-pptp-0.7.0_pre20080822.ebuild 1051 RMD160 522db46163b4c7c3d4fc5a47ce0719b0a81e5377 SHA1 22f25256a17e8585dd374bfcae7ff93cd1553ab7 SHA256 3aa358c8a23708638d24b39787b32718b512e9fce0b478dce3572af8a9a87b61 +DIST NetworkManager-pptp-0.7.0_pre20080831.tar.bz2 391473 RMD160 5bbe41426faaacf0a930849afa4979618b2973eb SHA1 2f0961d3b509a765dbe47a5efc3e73a4ba445d60 SHA256 4ab89d07a8f5ea75990bec34ea06d6634d0eaa939e62b65580704c438872e69f +EBUILD networkmanager-pptp-0.7.0_pre20080831.ebuild 1051 RMD160 522db46163b4c7c3d4fc5a47ce0719b0a81e5377 SHA1 22f25256a17e8585dd374bfcae7ff93cd1553ab7 SHA256 3aa358c8a23708638d24b39787b32718b512e9fce0b478dce3572af8a9a87b61 MISC ChangeLog 331 RMD160 aadb673ecf698668031fa17d45bf8a95f40b5375 SHA1 b321c249b31b344f55054217ded3ffe1fd30dc3a SHA256 13d1e2933ce255bfd644e8873176d0238ce47b6a0ae192dbfcee6516a1f758cf MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 diff --git a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820 b/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820 deleted file mode 100644 index dc502ab..0000000 --- a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.6.5_p20070820 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e13cda2dff8061c1e6965026ecc3da3b NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989 -RMD160 deec889de25bf4295473b85674d554eba4f0ced8 NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989 -SHA256 fdb02ce57a55264fa94f2a966f162922e703be7530e988fa698dc4ec54427fa3 NetworkManager-pptp-0.6.5_p20070820.tar.gz 565989 -MD5 d1976be463b194e3bee0798db9646bcc networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965 -RMD160 dff290c0286634d28a8e9b96225755b6c594c6d8 networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965 -SHA256 2aa2efe405875aa1d83b6ee70dc531e5dd7ee146f0dd5f74af6bc5fdb076ca1e networkmanager-pptp-0.6.5_p20070820-patchset.tar.gz 6965 diff --git a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.7.0_pre20070621 b/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.7.0_pre20070621 deleted file mode 100644 index 897b4af..0000000 --- a/net-misc/networkmanager-pptp/files/digest-networkmanager-pptp-0.7.0_pre20070621 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9af08ddc43a9c9387989b3a83cf76046 NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 -RMD160 30b9dafa41e616460045847b97efd0e4b8dd3824 NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 -SHA256 ea934673c57a50b094797c677c6a76dba8042f696d02ab379dcd57d1a1f19999 NetworkManager-ppp_vpn-0.7.0_pre20070621.tar.gz 568340 diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch deleted file mode 100644 index 3a7ecee..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/01_all_nm-dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 2743) -+++ configure.in (working copy) -@@ -111,7 +111,7 @@ - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - --PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.7.0) -+PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= 0.4.1 libnm-util >= 0.6.5) - AC_SUBST(NETWORK_MANAGER_CFLAGS) - AC_SUBST(NETWORK_MANAGER_LIBS) - diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch deleted file mode 100644 index 7c4ed2e..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/02_all_remove-general-dialog.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (Revision 2743) -+++ configure.in (Arbeitskopie) -@@ -191,7 +191,6 @@ - Makefile - src/Makefile - auth-dialog/Makefile --auth-dialog-general/Makefile - properties/Makefile - po/Makefile.in - ]) -Index: Makefile.am -=================================================================== ---- Makefile.am (Revision 2743) -+++ Makefile.am (Arbeitskopie) -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS = foreign - - if WITH_GNOME --SUBDIRS = src auth-dialog auth-dialog-general properties po -+SUBDIRS = src auth-dialog properties po - else - SUBDIRS = src - endif diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch deleted file mode 100644 index 255c51d..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/03_all_remove-non-pptp-parts.patch +++ /dev/null @@ -1,825 +0,0 @@ -## 03_nm_ppp_dialog.glade.patch.dpatch by Craig Box -## 04_nm_ppp_properties.c.dpatch by Craig Box - ---- properties/nm-ppp-dialog.glade (Revision 2743) -+++ properties/nm-ppp-dialog.glade (Arbeitskopie) -@@ -286,305 +286,6 @@ - - - -- -- -- False -- 4 -- -- -- -- True -- False -- 12 -- -- -- -- True -- Telep_hone number: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 1 -- 0.5 -- 0 -- 0 -- phone-number -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- Host name or IP address of the PPTP server -- True -- True -- True -- 0 -- -- True -- * -- False -- -- -- 0 -- True -- True -- -- -- -- -- 0 -- False -- False -- -- -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- False -- 6 -- -- -- -- True -- 2 -- 2 -- False -- 6 -- 12 -- -- -- -- True -- C_hannel: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- bt-channel -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- 1 -- 1 -- 2 -- fill -- -- -- -- -- -- -- True -- True -- True -- True -- 3 -- -- True -- * -- False -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- -- -- True -- Host name or IP address of the PPTP server -- True -- True -- True -- 17 -- 00:00:00:00 -- True -- * -- False -- -- -- 1 -- 2 -- 0 -- 1 -- -- -- -- -- -- -- True -- False -- 12 -- -- -- -- True -- _Device address: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 1 -- 0.5 -- 0 -- 0 -- bt-bdaddr -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- 0 -- 1 -- 0 -- 1 -- fill -- fill -- -- -- -- -- 0 -- True -- True -- -- -- -- -- -- True -- GTK_BUTTONBOX_END -- 0 -- -- -- -- True -- True -- GTK_RELIEF_NORMAL -- True -- -- -- -- True -- 0.5 -- 0.5 -- 0 -- 0 -- 0 -- 0 -- 0 -- 0 -- -- -- -- True -- False -- 2 -- -- -- -- True -- gtk-find -- 4 -- 0.5 -- 0.5 -- 0 -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- Find Device -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- False -- False -- -- -- -- -- -- -- -- -- -- -- 0 -- True -- True -- -- -- -- -- 0 -- True -- True -- -- - - - 0 -@@ -711,226 +412,6 @@ - - - -- -- 12 -- True -- 4 -- 2 -- False -- 6 -- 12 -- -- -- -- True -- _Access point name: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 1 -- 0.5 -- 0 -- 0 -- gprs-apn -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- 1 -- 0 -- 1 -- fill -- -- -- -- -- -- -- True -- Service providers GPRS access point from device config -- True -- True -- True -- 0 -- -- True -- * -- False -- -- -- 1 -- 2 -- 0 -- 1 -- -- -- -- -- -- -- True -- IP a_ddress: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- gprs-ip-address -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- 1 -- 1 -- 2 -- fill -- -- -- -- -- -- -- True -- Service providers IP address -- True -- True -- True -- 0 -- -- True -- * -- False -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- -- -- True -- _Packet type: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- gprs-packet-type -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- 1 -- 2 -- 3 -- fill -- -- -- -- -- -- -- True -- True -- True -- True -- 0 -- -- True -- * -- False -- 9 -- -- -- 1 -- 2 -- 2 -- 3 -- -- -- -- -- -- -- True -- Context _number: -- True -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0 -- 0.5 -- 0 -- 0 -- gprs-context-num -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- 0 -- 1 -- 3 -- 4 -- fill -- -- -- -- -- -- -- True -- True -- True -- True -- 0 -- -- True -- * -- False -- 3 -- -- -- 1 -- 2 -- 3 -- 4 -- -- -- -- -- -- False -- True -- -- -- -- - - True - GPRS Options -@@ -2075,80 +1556,6 @@ - - - -- -- 12 -- True -- False -- 6 -- -- -- -- True -- True -- _Modem connection -- True -- GTK_RELIEF_NORMAL -- True -- False -- False -- True -- -- -- 0 -- False -- False -- -- -- -- -- -- True -- True -- _Hardware RTS/CTS -- True -- GTK_RELIEF_NORMAL -- True -- False -- False -- True -- -- -- 0 -- False -- False -- -- -- -- -- False -- True -- -- -- -- -- -- True -- Serial Options -- False -- False -- GTK_JUSTIFY_LEFT -- False -- False -- 0.5 -- 0.5 -- 0 -- 0 -- PANGO_ELLIPSIZE_NONE -- -1 -- False -- 0 -- -- -- tab -- -- -- -- - - 12 - True -diff -urNad network-manager-pptp-0.6.4+pptp0.6.5~/properties/nm-ppp-properties.c network-manager-pptp-0.6.4+pptp0.6.5/properties/nm-ppp-properties.c ---- properties/nm-ppp-properties.c 2007-05-26 12:19:31.000000000 +1200 -+++ properties/nm-ppp-properties.c 2007-05-26 12:18:27.000000000 +1200 -@@ -42,7 +42,7 @@ - - #define BUILD_BLUETOOTH - --#define VPNUI_DISPLAY_NAME _("pppd tunnel (PPTP, BTGPRS, Dialup)") -+#define VPNUI_DISPLAY_NAME _("PPTP tunnel") - #define VPNUI_SERVICE_NAME "org.freedesktop.NetworkManager.ppp_starter" - #define VPNUI_BASIC_DEFAULTS "connection-name='';" \ - "ppp-debug=no;" \ -@@ -50,7 +50,7 @@ - "usepeerdns-overtunnel=yes;" \ - "ppp-lock=yes;" \ - "ppp-auth-peer=no;" \ -- "ppp-refuse-eap=no;" \ -+ "ppp-refuse-eap=yes;" \ - "ppp-refuse-chap=no;" \ - "ppp-refuse-mschap=no;" \ - "lcp-echo-failure=10;" \ -@@ -59,26 +59,6 @@ - "routes=;" \ - "ppp-debug=no;" \ - "ppp-extra='';" --#define VPNUI_BTOOTH_DEFAULTS "bt-bdaddr=00:00:00:00:00:00;" \ -- "bt-channel=1;" --#define VPNUI_GPRS_DEFAULTS "gprs-packet-type=IP;" \ -- "gprs-context-num=1;" \ -- "gprs-ip-address=0.0.0.0;" \ -- "gprs-apn=internet;" \ -- "ppp-crtscts=yes;" \ -- "ppp-noipdefault=yes;" \ -- "ppp-modem=yes;" \ -- "usepeerdns=yes;" \ -- "ppp-connect-delay=5000;" --#define VPNUI_BTGPRS_DEFAULTS "ppp-connection-type=btgprs;" \ -- "encrypt-mppe=no;" \ -- "encrypt-mppe-128=no;" \ -- "encrypt-mppe-stateful=no;" \ -- "compress-mppc=no;" \ -- "compress-bsd=no;" \ -- "compress-deflate=no;" \ -- "mru=1000;" \ -- "mtu=1000;" - #define VPNUI_PPTP_DEFAULTS "pptp-remote='';" \ - "ppp-connection-type=pptp;" \ - "encrypt-mppe=no;" \ -@@ -89,18 +69,6 @@ - "compress-deflate=no;" \ - "mru=1416;" \ - "mtu=1416;" --#define VPNUI_DIALUP_DEFAULTS "phone-number=THIS DOESN'T DO ANYTHING;" \ -- "ppp-crtscts=yes;" \ -- "ppp-modem=yes;" \ -- "ppp-connection-type=dialup;" \ -- "encrypt-mppe=no;" \ -- "encrypt-mppe-128=no;" \ -- "encrypt-mppe-stateful=no;" \ -- "compress-mppc=no;" \ -- "compress-bsd=no;" \ -- "compress-deflate=no;" \ -- "mru=1000;" \ -- "mtu=1000;" - - #ifdef NMVPNUI_PPTP_PROPERTIES_C - #endif -@@ -192,51 +160,6 @@ - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); - - opt = vpnui_opt_new( -- "phone-number", VPN_UI_OPTTYPE_STRING, -- "phone-number", "Telephone-Number", _("Telephone Number"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "bt-bdaddr", VPN_UI_OPTTYPE_STRING, -- "bt-bdaddr", "Bluetooth-Address", _("Bluetooth Address"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "bt-channel", VPN_UI_OPTTYPE_STRING, -- "bt-channel", "Bluetooth-Channel", _("Bluetooth Channel"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "gprs-apn", VPN_UI_OPTTYPE_STRING, -- "gprs-apn", "GPRS-Access-Point-Name", _("GPRS APN"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "gprs-ip-address", VPN_UI_OPTTYPE_STRING, -- "gprs-ip-address", "GPRS-IP-Address", _("GPRS IP"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "gprs-context-num", VPN_UI_OPTTYPE_STRING, -- "gprs-context-num", "GPRS-Context-Number", _("GPRS Context No."), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "gprs-packet-type", VPN_UI_OPTTYPE_STRING, -- "gprs-packet-type", "GPRS-Packet-Type", _("GPRS Packet Type"), -- GTK_SIGNAL_FUNC(&editable_changed), &vld_non_empty, impl ); -- -- opt = vpnui_opt_new( -- "ppp-crtscts", VPN_UI_OPTTYPE_YESNO, -- "ppp-crtscts", "PPP-Hardware-CTSRTS", _("Use CTS/RTS flow control"), -- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); -- -- opt = vpnui_opt_new( -- "ppp-modem", VPN_UI_OPTTYPE_YESNO, -- "ppp-modem", "PPP-Modem", _("Connect via a modem"), -- GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); -- -- opt = vpnui_opt_new( - "ppp-noipdefault", VPN_UI_OPTTYPE_YESNO, - "ppp-noipdefault", "PPP-No-IP-Default", _("Require IP to be provided"), - GTK_SIGNAL_FUNC(&editable_changed), NULL, impl ); -@@ -358,29 +281,14 @@ - VPNUI_BASIC_DEFAULTS VPNUI_PPTP_DEFAULTS, - impl); - --#ifdef BUILD_BLUETOOTH -- variant = vpnui_variant_new( "btgprs", "GPRS over Bluetooth (via mobile phone)", -- VPNUI_BASIC_DEFAULTS VPNUI_GPRS_DEFAULTS VPNUI_BTOOTH_DEFAULTS VPNUI_BTGPRS_DEFAULTS, -- impl); --#endif -+ gtk_combo_box_set_active(impl->variant_combo, 0); -+// vpnui_variant_select_byname(impl,"Windows VPN (PPTP)"); - -- variant = vpnui_variant_new( "dialup", "Dialup", -- VPNUI_BASIC_DEFAULTS VPNUI_DIALUP_DEFAULTS, -- impl); - // - // GLADE NAME IMPLEMENTATION_OBJ - // expand= vpnui_expand_new ("routing-expander",impl); --// expand= vpnui_expand_new ("dialup-expander",impl); - // expand= vpnui_expand_new ("pppd-expander",impl); - // expand= vpnui_expand_new ("pptp-expander",impl); --// expand= vpnui_expand_new ("bluetooth-expander",impl); --// expand= vpnui_expand_new ("serial-expander",impl); --// expand= vpnui_expand_new ("gprs-expander",impl); -- --// Attach to press event of the Bluetooth "Find Device" button. --// will need libbtcl --// impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, --// "import-button")); - - // Attach an import_button - impl->w_import_button = GTK_BUTTON (glade_xml_get_widget (impl->xml, -@@ -444,15 +352,11 @@ - void - impl_hide_and_show (NetworkManagerVpnUIImpl *impl) - { -- GtkWidget *serial_options = NULL; -- GtkWidget *gprs_options = NULL; - GtkWidget *auth_options = NULL; - GtkWidget *comp_enc_options = NULL; - GtkWidget *routing_options = NULL; - GtkWidget *ppp_options = NULL; -- GtkWidget *bluetooth_front = NULL; - GtkWidget *pptp_front = NULL; -- GtkWidget *dialup_front = NULL; - GtkComboBox *combo = NULL; - char *variant_name; - -@@ -466,17 +370,9 @@ - auth_options = glade_xml_get_widget(impl->xml, "auth-options"); - comp_enc_options = glade_xml_get_widget(impl->xml, "comp-enc-options"); - routing_options = glade_xml_get_widget(impl->xml, "routing-options"); -- gprs_options = glade_xml_get_widget(impl->xml, "gprs-options"); -- serial_options = glade_xml_get_widget(impl->xml, "serial-options"); -- bluetooth_front = glade_xml_get_widget(impl->xml, "bluetooth-front"); -- dialup_front = glade_xml_get_widget(impl->xml, "dialup-front"); - pptp_front = glade_xml_get_widget(impl->xml, "pptp-front"); - - if (pptp_front) gtk_widget_hide(pptp_front); -- if (bluetooth_front) gtk_widget_hide(bluetooth_front); -- if (dialup_front) gtk_widget_hide(dialup_front); -- if (gprs_options) gtk_widget_hide(gprs_options); -- if (serial_options) gtk_widget_hide(serial_options); - if (ppp_options) gtk_widget_hide(ppp_options); - if (auth_options) gtk_widget_hide(auth_options); - if (comp_enc_options) gtk_widget_hide(comp_enc_options); -@@ -491,20 +387,5 @@ - if (auth_options) gtk_widget_show(auth_options); - if (comp_enc_options) gtk_widget_show(comp_enc_options); - if (routing_options) gtk_widget_show(routing_options); -- } else if (strcmp(variant_name,"dialup")==0) { -- if (dialup_front) gtk_widget_show(dialup_front); -- if (serial_options) gtk_widget_show(serial_options); -- if (ppp_options) gtk_widget_show(ppp_options); -- if (auth_options) gtk_widget_show(auth_options); -- if (comp_enc_options) gtk_widget_show(comp_enc_options); -- if (routing_options) gtk_widget_show(routing_options); -- } else if (strcmp(variant_name,"btgprs")==0) { -- if (bluetooth_front) gtk_widget_show(bluetooth_front); -- if (gprs_options) gtk_widget_show(gprs_options); -- if (serial_options) gtk_widget_show(serial_options); -- if (ppp_options) gtk_widget_show(ppp_options); -- if (auth_options) gtk_widget_show(auth_options); -- if (comp_enc_options) gtk_widget_show(comp_enc_options); -- if (routing_options) gtk_widget_show(routing_options); - } - } diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch deleted file mode 100644 index 05b2808..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/04_all_revert-vpn-subsystem-changes.patch +++ /dev/null @@ -1,220 +0,0 @@ -Index: ChangeLog -=================================================================== ---- ChangeLog (Revision 2679) -+++ ChangeLog (Revision 2678) -@@ -1,9 +1,3 @@ --2007-08-14 Dan Williams -- -- * src/nm-openvpn-service.c -- - Handle NM_VPN_STATE_* -> NM_VPN_SERVICE_STATE_* and NMVPNState -> -- NMVPNServiceState renames -- - 2007-07-26 Dan Williams - - Patch from Kelemen Gábor -Index: src/nm-ppp-starter.c -=================================================================== ---- src/nm-ppp-starter.c (Revision 2679) -+++ src/nm-ppp-starter.c (Revision 2678) -@@ -76,7 +76,7 @@ - { - GMainLoop *loop; - DBusConnection *con; -- NMVPNServiceState state; -+ NMVPNState state; - GPid pid; - guint quit_timer; - guint helper_timer; -@@ -162,7 +162,7 @@ - * Signal the bus that our state changed. - * - */ --static void nm_ppp_dbus_signal_state_change (NmPPPData *data, NMVPNServiceState old_state) -+static void nm_ppp_dbus_signal_state_change (NmPPPData *data, NMVPNState old_state) - { - DBusMessage *message; - -@@ -189,9 +189,9 @@ - * Set our state and make sure to signal the bus. - * - */ --static void nm_ppp_set_state (NmPPPData *data, NMVPNServiceState new_state) -+static void nm_ppp_set_state (NmPPPData *data, NMVPNState new_state) - { -- NMVPNServiceState old_state; -+ NMVPNState old_state; - - g_return_if_fail (data != NULL); - -@@ -356,7 +356,7 @@ - break; - } - -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED); - nm_ppp_schedule_quit_timer (data, 10000); - } - -@@ -425,7 +425,7 @@ - } - - -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED); - nm_ppp_schedule_quit_timer (data, 10000); - } - -@@ -1110,7 +1110,7 @@ - g_return_val_if_fail (message != NULL, FALSE); - g_return_val_if_fail (data != NULL, FALSE); - -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STARTING); -+ nm_ppp_set_state (data, NM_VPN_STATE_STARTING); - - dbus_error_init (&error); - if (!dbus_message_get_args (message, &error, -@@ -1152,7 +1152,7 @@ - dbus_free_string_array (auth_items); - dbus_free_string_array (user_routes); - if (!success) -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED); - return success; - } - -@@ -1169,13 +1169,13 @@ - - if (data->pid > 0) - { -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPING); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPING); - - kill (data->pid, SIGTERM); - nm_info ("Terminated pppd with PID %d.", data->pid); - data->pid = 0; - -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED); - nm_ppp_schedule_quit_timer (data, 10000); - } - -@@ -1194,13 +1194,13 @@ - - if (data->pid > 0) - { -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPING); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPING); - - kill (data->pid, SIGTERM); - nm_info ("Terminated pppd with PID %d.", data->pid); - data->pid = 0; - -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STOPPED); - nm_ppp_schedule_quit_timer (data, 10000); - } - -@@ -1224,22 +1224,22 @@ - - switch (data->state) - { -- case NM_VPN_SERVICE_STATE_STARTING: -+ case NM_VPN_STATE_STARTING: - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STARTING_IN_PROGRESS, - "Could not process the request because the VPN connection is already being started."); - break; - -- case NM_VPN_SERVICE_STATE_STARTED: -+ case NM_VPN_STATE_STARTED: - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_ALREADY_STARTED, - "Could not process the request because a VPN connection was already active."); - break; - -- case NM_VPN_SERVICE_STATE_STOPPING: -+ case NM_VPN_STATE_STOPPING: - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STOPPING_IN_PROGRESS, - "Could not process the request because the VPN connection is being stopped."); - break; - -- case NM_VPN_SERVICE_STATE_STOPPED: -+ case NM_VPN_STATE_STOPPED: - nm_ppp_cancel_quit_timer (data); - nm_ppp_dbus_handle_start_vpn (message, data); - reply = dbus_message_new_method_return (message); -@@ -1270,18 +1270,18 @@ - - switch (data->state) - { -- case NM_VPN_SERVICE_STATE_STOPPING: -+ case NM_VPN_STATE_STOPPING: - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_STOPPING_IN_PROGRESS, - "Could not process the request because the VPN connection is already being stopped."); - break; - -- case NM_VPN_SERVICE_STATE_STOPPED: -+ case NM_VPN_STATE_STOPPED: - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_ALREADY_STOPPED, - "Could not process the request because no VPN connection was active."); - break; - -- case NM_VPN_SERVICE_STATE_STARTING: -- case NM_VPN_SERVICE_STATE_STARTED: -+ case NM_VPN_STATE_STARTING: -+ case NM_VPN_STATE_STARTED: - nm_ppp_dbus_handle_stop_vpn (data); - reply = dbus_message_new_method_return (message); - break; -@@ -1398,7 +1398,7 @@ - g_return_if_fail (message != NULL); - - /* Only accept the config info if we're in STARTING state */ -- if (data->state != NM_VPN_SERVICE_STATE_STARTING) -+ if (data->state != NM_VPN_STATE_STARTING) - return; - - if (dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &error_item, DBUS_TYPE_INVALID)) -@@ -1446,7 +1446,7 @@ - g_return_if_fail (message != NULL); - - /* Only accept the config info if we're in STARTING state */ -- if (data->state != NM_VPN_SERVICE_STATE_STARTING) -+ if (data->state != NM_VPN_STATE_STARTING) - return; - - /* If IP is up then we don't need to leave the auth info lying around */ -@@ -1568,7 +1568,7 @@ - } - - dbus_message_unref (signal); -- nm_ppp_set_state (data, NM_VPN_SERVICE_STATE_STARTED); -+ nm_ppp_set_state (data, NM_VPN_STATE_STARTED); - success = TRUE; - } - -@@ -1608,7 +1608,7 @@ - /* nm_info ("nm_ppp_dbus_message_handler() got method '%s' for path '%s'.", method, path); */ - - /* If we aren't ready to accept dbus messages, don't */ -- if ((data->state == NM_VPN_SERVICE_STATE_INIT) || (data->state == NM_VPN_SERVICE_STATE_SHUTDOWN)) -+ if ((data->state == NM_VPN_STATE_INIT) || (data->state == NM_VPN_STATE_SHUTDOWN)) - { - nm_warning ("Received dbus messages but couldn't handle them due to INIT or SHUTDOWN states."); - reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE_PPP_STARTER, NM_DBUS_VPN_WRONG_STATE, -@@ -1792,7 +1792,7 @@ - vpn_data = g_malloc0 (sizeof (NmPPPData)); - - vpn_data->debug = FALSE; -- vpn_data->state = NM_VPN_SERVICE_STATE_INIT; -+ vpn_data->state = NM_VPN_STATE_INIT; - - vpn_data->loop = g_main_loop_new (NULL, FALSE); - -@@ -1806,7 +1806,7 @@ - sigaction (SIGINT, &action, NULL); - sigaction (SIGTERM, &action, NULL); - -- nm_ppp_set_state (vpn_data, NM_VPN_SERVICE_STATE_STOPPED); -+ nm_ppp_set_state (vpn_data, NM_VPN_STATE_STOPPED); - g_main_loop_run (vpn_data->loop); - - nm_ppp_dbus_handle_stop_vpn (vpn_data); diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch deleted file mode 100644 index 26e5673..0000000 --- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.6.5_p20070820-patchset/05_all_service-name.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (Revision 2743) -+++ Makefile.am (Arbeitskopie) -@@ -15,7 +15,7 @@ - - %.name: %.name.in Makefile - @sed -e "s|%bindir%|$(bindir)|g" \ -- -e "s|%libdir%|$(libdir)|g" \ -+ -e "s|%prefix%|$(prefix)|g" \ - -e "s|%libexecdir%|$(libexecdir)|g" $< > $@ - - if WITH_GNOME -Index: nm-ppp-starter.name.in -=================================================================== ---- nm-ppp-starter.name.in (Revision 2743) -+++ nm-ppp-starter.name.in (Arbeitskopie) -@@ -1,8 +1,8 @@ - [VPN Connection] - name=ppp - service=org.freedesktop.NetworkManager.ppp_starter --program=@bindir@/nm-ppp-starter -+program=%bindir%/nm-ppp-starter - - [GNOME] --auth-dialog=@libexecdir@/nm-ppp-auth-dialog --properties=@prefix@/${LIB}/libnm-ppp-properties -+auth-dialog=%libexecdir%/nm-ppp-auth-dialog -+properties=%prefix%/${LIB}/libnm-ppp-properties diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild deleted file mode 100644 index 9aa9773..0000000 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.6.5_p20070820.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild,v 1.2 2007/08/23 20:01:40 mr_bones_ Exp $ - -inherit gnome2 eutils autotools - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz - http://dev.gentoo.org/~rbu/distfiles/${P}-patchset.tar.gz" -# SRC_URI="mirror://gentoo/${MY_P}.tar.gz -# mirror://gentoo/${P}-patchset.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="crypt debug doc gnome" - -BOTH_DEPEND=">=sys-apps/dbus-0.35.2 - >=dev-libs/glib-2.8 - >=net-misc/networkmanager-0.6.5_p20070823 - net-dialup/ppp - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - !gnome? ( >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 ) - >=net-misc/openvpn-2.0.5 - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${BOTH_DEPEND} - dev-util/pkgconfig - dev-util/intltool" -RDEPEND="${BOTH_DEPEND} - net-dialup/pptpclient" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon - --enable-nm-vpn-dbus-old" - -src_unpack () { - unpack ${A} - cd "${S}" - - EPATCH_SUFFIX="patch" - epatch "${WORKDIR}/${P}-patchset" - eautoreconf -} diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild deleted file mode 100644 index 9424101..0000000 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20070621.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} -MY_P=${MY_P/pptp/ppp_vpn} - -DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="crypt debug doc gnome" - -RDEPEND=">=sys-apps/dbus-0.35.2 - >=dev-libs/glib-2.8 - net-misc/networkmanager - net-dialup/ppp - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - !gnome? ( >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gconf-2 ) - >=net-misc/openvpn-2.0.5 - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080822.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080822.ebuild deleted file mode 100644 index 3d60b64..0000000 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080822.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager PPTP plugin." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gnome" - -RDEPEND=" - >=net-misc/networkmanager-0.7.0_pre20080817 - gnome? ( >=x11-libs/gtk+-2.10 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeui-2.20 - >=gnome-base/gconf-2.20 - >=gnome-base/gnome-keyring-2.20 - )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -src_unpack () { - unpack ${A} - cd "${S}" -} - -src_compile() { - ECONF="--disable-more-warnings \ - $(use_with gnome)" - - econf ${ECONF} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080831.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080831.ebuild new file mode 100644 index 0000000..3d60b64 --- /dev/null +++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.0_pre20080831.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +# NetworkManager likes itself with capital letters +MY_P=${P/networkmanager/NetworkManager} + +DESCRIPTION="NetworkManager PPTP plugin." +HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" +SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gnome" + +RDEPEND=" + >=net-misc/networkmanager-0.7.0_pre20080817 + gnome? ( >=x11-libs/gtk+-2.10 + >=gnome-base/libglade-2 + >=gnome-base/libgnomeui-2.20 + >=gnome-base/gconf-2.20 + >=gnome-base/gnome-keyring-2.20 + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +S=${WORKDIR}/${MY_P} + +src_unpack () { + unpack ${A} + cd "${S}" +} + +src_compile() { + ECONF="--disable-more-warnings \ + $(use_with gnome)" + + econf ${ECONF} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest index 34b53f4..c899d45 100644 --- a/net-misc/networkmanager-vpnc/Manifest +++ b/net-misc/networkmanager-vpnc/Manifest @@ -1,8 +1,4 @@ -AUX nm-vpnc-dbus_conf.patch 715 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c SHA1 0e2799e9f9a8d56ee882af8afc6afe0d3e5a12e1 SHA256 1d4f08479ef0bf5f222f18717f5d3ed7329fb2f09f1118c95a576c995bfee02d -AUX nm-vpnc-path.patch 418 RMD160 cf6138d9847db1310e095e559822f13956a9fc6b SHA1 d9d659deac1ea9981bf53d0671acde9a5eaabc1f SHA256 5557a9956d3dd9921b2722045d5dbb675f8e17dca1de8603cf6adb7fc3fa3672 -DIST NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 RMD160 bdd360b2ba1bdabf9c46ca17e80e5352f720a81f SHA1 60763c9614920bfb87b526d23dc9b967befec759 SHA256 9a0e68e580911ba75fcdc0aff833aa2d3f62d7b28b1f850696b082c8d140e7fd -DIST NetworkManager-vpnc-0.7.0_pre20080822.tar.bz2 358247 RMD160 9a1a84575bbf5bbc31e7b81dd5b1bafa7c6bbcbd SHA1 fecc1877498b138721a732cbdd6ab3f04253f840 SHA256 ec52f559f28696d74ae11773abbb74c093a2417f9d29a7088aa5398d61d7e2a2 -EBUILD networkmanager-vpnc-0.7.0_pre20070621.ebuild 1574 RMD160 864c0e810092ad7eb7d3226d4fde6c9d3c6145b4 SHA1 4de6b04710816cfaa899a4959f1218712c5dde12 SHA256 af035a546c427cafaaaac1227ce830cd21d0e1ca4c8f101ddc247610f81ad019 -EBUILD networkmanager-vpnc-0.7.0_pre20080822.ebuild 1072 RMD160 35e10e6d7e1626485099cc5b070722353a9aa23d SHA1 be0c2e418451a47a7e71d7b2da6e287fccd17069 SHA256 289a5441537795cd447c897af906cd810ada3580a6e254b0416b5f44d210a0a5 +DIST NetworkManager-vpnc-0.7.0_pre20080831.tar.bz2 358787 RMD160 dbaf2a6350d2637d50809bbcf0cb3c4842ec15fd SHA1 188cf3021e665c7871461db8e3171c9b48ac32ae SHA256 44007d6b0daa54fd967953fd936f60e6ddd54fdce2fc58f69ec266a1ff666cda +EBUILD networkmanager-vpnc-0.7.0_pre20080831.ebuild 1072 RMD160 35e10e6d7e1626485099cc5b070722353a9aa23d SHA1 be0c2e418451a47a7e71d7b2da6e287fccd17069 SHA256 289a5441537795cd447c897af906cd810ada3580a6e254b0416b5f44d210a0a5 MISC ChangeLog 331 RMD160 000564e8dba2db4d4829f164e8e4ef21105751b9 SHA1 fbf7a710d1f70bcb6c802e4faee546c34606d7ea SHA256 4dcea8b241faa2df5c887c4b77acd1a24a2b210f3eb549b64b6520a4bacd3567 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 diff --git a/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.7.0_pre20070621 b/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.7.0_pre20070621 deleted file mode 100644 index 2b06b22..0000000 --- a/net-misc/networkmanager-vpnc/files/digest-networkmanager-vpnc-0.7.0_pre20070621 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a18d2e6a59cea637262daa5cd0dd6a1b NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 -RMD160 bdd360b2ba1bdabf9c46ca17e80e5352f720a81f NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 -SHA256 9a0e68e580911ba75fcdc0aff833aa2d3f62d7b28b1f850696b082c8d140e7fd NetworkManager-vpnc-0.7.0_pre20070621.tar.gz 452352 diff --git a/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch b/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch deleted file mode 100644 index ce3d5c3..0000000 --- a/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- NetworkManager-vpnc-0.5.0.orig/nm-vpnc-service.conf 2005-11-13 01:22:50.000000000 -0500 -+++ NetworkManager-vpnc-0.5.0/nm-vpnc-service.conf 2005-11-13 14:35:12.000000000 -0500 -@@ -7,6 +7,11 @@ - - - -+ -+ -+ -+ -+ - - - diff --git a/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch b/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch deleted file mode 100644 index 8595c6b..0000000 --- a/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN NetworkManager-vpnc-0.5.0.orig/src/nm-vpnc-service.c NetworkManager-vpnc-0.5.0/src/nm-vpnc-service.c ---- NetworkManager-vpnc-0.5.0.orig/src/nm-vpnc-service.c 2005-11-15 14:28:05.000000000 -0600 -+++ NetworkManager-vpnc-0.5.0/src/nm-vpnc-service.c 2005-11-15 14:29:06.000000000 -0600 -@@ -51,6 +51,8 @@ - "/usr/sbin/vpnc", - "/sbin/vpnc", - "/usr/local/sbin/vpnc", -+ "/usr/bin/vpnc", -+ "/bin/vpnc", - NULL - }; - diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20070621.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20070621.ebuild deleted file mode 100644 index e66ab28..0000000 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20070621.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit gnome2 eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="crypt doc gnome" - -RDEPEND=">=sys-apps/dbus-0.60 - >=sys-apps/hal-0.5 - sys-apps/iproute2 - >=dev-libs/libnl-1.0_pre6 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.4.8 - >=net-misc/networkmanager-0.7.0_pre20070627 - >=net-misc/vpnc-0.3.3 - >=dev-libs/glib-2.8 - >=x11-libs/libnotify-0.3.2 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - crypt? ( dev-libs/libgcrypt )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -pkg_setup () { - G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --with-dbus-sys=/etc/dbus-1/system.d \ - --enable-notification-icon" -} - -src_unpack () { - unpack ${A} - cd "${S}" - # Gentoo puts vpnc somewhere that the source doesn't expect. - epatch ${FILESDIR}/nm-vpnc-path.patch - # Match the same dbus permissions as NetworkManager - epatch ${FILESDIR}/nm-vpnc-dbus_conf.patch -} diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080822.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080822.ebuild deleted file mode 100644 index 94bd167..0000000 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080822.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="NetworkManager VPNC plugin." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gnome" - -RDEPEND=" - >=net-misc/networkmanager-0.7.0_pre20080817 - gnome? ( >=x11-libs/gtk+-2.10 - >=gnome-base/libglade-2 - >=gnome-base/libgnomeui-2.20 - >=gnome-base/gconf-2.20 - >=gnome-base/gnome-keyring-2.20 - ) - >=net-misc/vpnc-0.5" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" - -S=${WORKDIR}/${MY_P} - -src_unpack () { - unpack ${A} - cd "${S}" -} - -src_compile() { - ECONF="--disable-more-warnings \ - $(use_with gnome)" - - econf ${ECONF} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080831.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080831.ebuild new file mode 100644 index 0000000..94bd167 --- /dev/null +++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.0_pre20080831.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +# NetworkManager likes itself with capital letters +MY_P=${P/networkmanager/NetworkManager} + +DESCRIPTION="NetworkManager VPNC plugin." +HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" +SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gnome" + +RDEPEND=" + >=net-misc/networkmanager-0.7.0_pre20080817 + gnome? ( >=x11-libs/gtk+-2.10 + >=gnome-base/libglade-2 + >=gnome-base/libgnomeui-2.20 + >=gnome-base/gconf-2.20 + >=gnome-base/gnome-keyring-2.20 + ) + >=net-misc/vpnc-0.5" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" + +S=${WORKDIR}/${MY_P} + +src_unpack () { + unpack ${A} + cd "${S}" +} + +src_compile() { + ECONF="--disable-more-warnings \ + $(use_with gnome)" + + econf ${ECONF} || die "econf failed" + emake || die "emake failed" +} + +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 index 41f84a9..2aaf3f6 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,8 +2,8 @@ AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382 AUX networkmanager-0.7.0-resolvconf-perms.patch 559 RMD160 b54ec431e9050176845dcb705a6a667b034a150f SHA1 a6e2f26d320aff3c284b7e5be1908d8b0b935a45 SHA256 92fd3e269e6e9f4b2060418e0fd898f248c620648e59b3d699f1c4733418a481 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_pre20080822.tar.bz2 991461 RMD160 1de32ad0a68031f9e2dcdac241cbc35eeca747b1 SHA1 04458d3b87fd55316cd4e6b9820e149183951610 SHA256 7baa19bd356fb596f7d2a55b899b0c97baec693ced9bf91f85a04f51b2c4481b -EBUILD networkmanager-0.7.0_pre20080822.ebuild 3367 RMD160 2b60d6463eacc29117d6cdd1572c70bbff8ea7e4 SHA1 42a69fabf3a4f977980b9064f5fbce41fc4afe60 SHA256 8ca0b0e5d623bcbbe2682623234fd8c0d54806b8647c8dc9c95561d354a3a96a +DIST NetworkManager-0.7.0_pre20080831.tar.bz2 994250 RMD160 74408ab1f83d57586f0638c1495ba2cf02d22f08 SHA1 5022e27bb4cd8dd247bc2f126450240aa0fe4387 SHA256 321452e4af34debff56059d107e875c9e57ec7626e83d9fe20164394b13d7ee1 +EBUILD networkmanager-0.7.0_pre20080831.ebuild 3425 RMD160 de7f2fea500e81d8aba9170aed70fa3b884e4a62 SHA1 e432d2770db5c7183509f11b8d7f263f41a4522f SHA256 93f026d3d4b2a6aaf9a6da64bede6a3a2a0b623c4bf4750419ebf52bca7da4cc EBUILD networkmanager-9999.ebuild 2279 RMD160 68d729e9d16b793902f690ddcd6b8383fd01cceb SHA1 b04f932f8b8b55f47ac5850adaf3c7263ab828e1 SHA256 5cfddaa3a8f6a1c3fb0f89fa49d3eb12b0a367a906514542c98dcac5a79c027d MISC TODO 153 RMD160 b11fd7eeb70db6d49106b2a661103e3c18e0156e SHA1 d61d60872cf9851f6e3c94ab1d798156ea68be81 SHA256 c96dd5c740ddd175fc29d967f686adb7ba3da6ac45581d92e52008c32479e7cc MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967 diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20080822.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_pre20080822.ebuild deleted file mode 100644 index d79c1a2..0000000 --- a/net-misc/networkmanager/networkmanager-0.7.0_pre20080822.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" -IUSE="doc gnome nss gnutls dhclient dhcpcd" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=sys-apps/hal-0.5.10 - >=net-wireless/wireless-tools-28_pre9 - >=dev-libs/glib-2.16 - >=sys-auth/policykit-0.8 - >=dev-libs/libnl-1.1 - >=net-wireless/wpa_supplicant-0.5.10 - - 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-3.0.0 ) ) - !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - net-dialup/ppp" - -PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 ) - kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )" - -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}" - - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" -} - -src_compile() { - ECONF="--disable-more-warnings \ - --localstatedir=/var \ - --with-distro=gentoo \ - --with-dbus-sys=/etc/dbus-1/system.d - $(use_enable doc gtk-doc) - $(use_with doc docs)" - - # 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=gnults" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} || die "econf failed" - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - dodoc AUTHORS ChangeLog NEWS README TODO - - # Add keyfile plugin support - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf -} - -pkg_postinst() { - elog "You need to be in the plugdev group in order to use NetworkManager" - elog "Problems with your hostname getting changed?" - elog "" - elog "Add the following to /etc/dhcp/dhclient.conf" - elog 'send host-name "YOURHOSTNAME";' - elog 'supersede host-name "YOURHOSTNAME";' - elog "" - 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 "USERNAME"' -} diff --git a/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild new file mode 100644 index 0000000..e4f0028 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-0.7.0_pre20080831.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils + +# NetworkManager likes itself with capital letters +MY_P=${P/networkmanager/NetworkManager} + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc gnome nss gnutls dhclient dhcpcd" + +RDEPEND=">=sys-apps/dbus-1.2 + >=dev-libs/dbus-glib-0.75 + >=sys-apps/hal-0.5.10 + >=net-wireless/wireless-tools-28_pre9 + >=dev-libs/glib-2.16 + >=sys-auth/policykit-0.8 + >=dev-libs/libnl-1.1 + >=net-wireless/wpa_supplicant-0.5.10 + || ( 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 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool + net-dialup/ppp" + +PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 ) + kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )" + +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}" + + # Fix up the dbus conf file to use plugdev group + epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch" +} + +src_compile() { + ECONF="--disable-more-warnings \ + --localstatedir=/var \ + --with-distro=gentoo \ + --with-dbus-sys=/etc/dbus-1/system.d + $(use_enable doc gtk-doc) + $(use_with doc docs)" + + # 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=gnults" + fi + else + ECONF="${ECONF} --with-crypto=nss" + fi + + econf ${ECONF} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + # Need to keep the /var/run/NetworkManager directory + keepdir /var/run/NetworkManager + + dodoc AUTHORS ChangeLog NEWS README TODO + + # Add keyfile plugin support + insinto /etc/NetworkManager + newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf +} + +pkg_postinst() { + elog "You need to be in the plugdev group in order to use NetworkManager" + elog "Problems with your hostname getting changed?" + elog "" + elog "Add the following to /etc/dhcp/dhclient.conf" + elog 'send host-name "YOURHOSTNAME";' + elog 'supersede host-name "YOURHOSTNAME";' + elog "" + 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 "USERNAME"' +} -- cgit v1.2.3-65-gdbad