[gentoo-commits] proj/gnome:master commit in: net-misc/networkmanager-vpnc/, net-misc/networkmanager-openvpn/, ...

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     a9133abcbdf4a3ada558a137642dca47a7116473
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 06:39:04 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 06:39:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a9133abc

networkmanager & friends: 0.8.997 → 0.8.998

---
 ...let-0.8.997.ebuild => nm-applet-0.8.998.ebuild} |    4 +-
 .../networkmanager-openvpn-0.8.998.ebuild          |   55 ++++++++++++++++++++
 .../networkmanager-pptp-0.8.998.ebuild             |   53 +++++++++++++++++++
 .../networkmanager-vpnc-0.8.998.ebuild             |   55 ++++++++++++++++++++
 ....8.997.ebuild => networkmanager-0.8.998.ebuild} |   11 ++--
 5 files changed, 171 insertions(+), 7 deletions(-)

diff --git a/gnome-extra/nm-applet/nm-applet-0.8.997.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
similarity index 96%
rename from gnome-extra/nm-applet/nm-applet-0.8.997.ebuild
rename to gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
index 829ef42..8232c7f 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.997.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.998.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.1 2010/11/10 13:05:32 dagger Exp $
 
-EAPI="2"
+EAPI="3"
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
 
 inherit gnome2
 
-MY_PN="${PN/nm-applet/${GNOME_ORG_MODULE}}"
+MY_PN="${GNOME_ORG_MODULE}"
 
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"

diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.998.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.998.ebuild
new file mode 100644
index 0000000..7ef2945
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.8.998.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager-openvpn"
+
+inherit gnome.org
+
+# NetworkManager likes itself with capital letters
+MY_PN="${GNOME_ORG_MODULE}"
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome test"
+
+RDEPEND="
+	>=net-misc/networkmanager-${PV}
+	>=dev-libs/dbus-glib-0.74
+	>=net-misc/openvpn-2.1_rc9
+	gnome? (
+		>=x11-libs/gtk+-2.91.4:3
+		gnome-base/gnome-keyring
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# FAIL: (tls-import-data) unexpected 'ca' secret value
+#RESTRICT="test"
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		--with-gtkver=3.0
+		$(use_with gnome)
+		$(use_with test tests)"
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+}

diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.998.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.998.ebuild
new file mode 100644
index 0000000..e1cd5c9
--- /dev/null
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.8.998.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager-pptp"
+
+inherit gnome.org
+
+# NetworkManager likes itself with capital letters
+MY_PN="${GNOME_ORG_MODULE}"
+
+DESCRIPTION="NetworkManager PPTP plugin"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome test"
+
+RDEPEND="
+	>=net-misc/networkmanager-${PV}
+	>=dev-libs/dbus-glib-0.74
+	net-dialup/ppp
+	net-dialup/pptpclient
+	gnome? (
+		>=x11-libs/gtk+-2.91.4:3
+		gnome-base/gnome-keyring
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		--with-gtkver=3.0
+		$(use_with gnome)
+		$(use_with test tests)"
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+}

diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.998.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.998.ebuild
new file mode 100644
index 0000000..ad8fe9b
--- /dev/null
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.8.998.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GNOME_ORG_MODULE="NetworkManager-vpnc"
+
+inherit gnome.org
+
+# NetworkManager likes itself with capital letters
+MY_PN="${GNOME_ORG_MODULE}"
+
+DESCRIPTION="NetworkManager VPNC plugin"
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome test"
+
+RDEPEND="
+	>=net-misc/networkmanager-${PV}
+	>=dev-libs/dbus-glib-0.74
+	>=net-misc/vpnc-0.5
+	gnome? (
+		>=x11-libs/gtk+-2.91.4:3
+		gnome-base/gnome-keyring
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# XXX: https://bugzilla.gnome.org/show_bug.cgi?id=608348
+RESTRICT="test"
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--disable-static
+		--with-dist-version=Gentoo
+		--with-gtkver=3.0
+		$(use_with gnome)
+		$(use_with test tests)"
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
+}

diff --git a/net-misc/networkmanager/networkmanager-0.8.997.ebuild b/net-misc/networkmanager/networkmanager-0.8.998.ebuild
similarity index 95%
rename from net-misc/networkmanager/networkmanager-0.8.997.ebuild
rename to net-misc/networkmanager/networkmanager-0.8.998.ebuild
index 39bd459..f4298b6 100644
--- a/net-misc/networkmanager/networkmanager-0.8.997.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.998.ebuild
@@ -8,7 +8,7 @@ GNOME_ORG_MODULE="NetworkManager"
 inherit autotools eutils gnome.org linux-info
 
 # NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/${GNOME_ORG_MODULE}}
+MY_PN=${GNOME_ORG_MODULE}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
@@ -21,8 +21,8 @@ kernel_linux +ppp resolvconf connection-sharing wimax"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 REQUIRED_USE="
-	nss? ( !gnutls ) !nss? ( gnutls )
-	dhcpcd? ( !dhclient ) !dhcpcd? ( dhclient )"
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
@@ -124,10 +124,11 @@ src_install() {
 	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
 	keepdir /etc/NetworkManager/dispatcher.d
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
 	# Add keyfile plugin support
 	keepdir /etc/NetworkManager/system-connections
 	insinto /etc/NetworkManager
 	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
+
+	# Remove useless .la files
+	find "${D}" -name '*.la' -exec rm -f {} +
 }