summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-08-14 09:04:08 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-08-14 09:04:08 +0000
commit2dce3b4bce443e10d4c9d1de08492bb813fcebc8 (patch)
tree57d05fd9f29f43cb18930f35cb60076d9b09cb70 /net-misc
parentVarious ebuild fixes, bug 378849 (diff)
downloadgentoo-2-2dce3b4bce443e10d4c9d1de08492bb813fcebc8.tar.gz
gentoo-2-2dce3b4bce443e10d4c9d1de08492bb813fcebc8.tar.bz2
gentoo-2-2dce3b4bce443e10d4c9d1de08492bb813fcebc8.zip
Various ebuild fixes, bug 378225
(Portage version: 2.2.0_alpha39_p14/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/networkmanager/ChangeLog6
-rw-r--r--net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild16
2 files changed, 12 insertions, 10 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index c5b35caab635..248768f66f68 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/networkmanager
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.108 2011/08/12 07:36:11 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.109 2011/08/14 09:04:08 nirbheek Exp $
+
+ 14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ networkmanager-0.8.4.0-r2.ebuild:
+ Various ebuild fixes, bug 378225
12 Aug 2011; Mu Qiao <qiaomuf@gentoo.org> networkmanager-0.8.4.0-r2.ebuild:
Fix building with USE="-ppp" (bug #377183)
diff --git a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
index bf75a889d029..82864fc6ceca 100644
--- a/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild
@@ -1,18 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild,v 1.2 2011/08/12 07:36:11 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.4.0-r2.ebuild,v 1.3 2011/08/14 09:04:08 nirbheek Exp $
-EAPI="2"
+EAPI="3"
+GNOME_ORG_MODULE="NetworkManager"
inherit autotools eutils gnome.org linux-info systemd
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-MY_P=${MY_PN}-${PV}
-
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
LICENSE="GPL-2"
SLOT="0"
@@ -51,8 +47,6 @@ DEPEND="${RDEPEND}
dev-util/intltool
doc? ( >=dev-util/gtk-doc-1.8 )"
-S=${WORKDIR}/${MY_P}
-
sysfs_deprecated_check() {
ebegin "Checking for SYSFS_DEPRECATED support"
@@ -89,6 +83,7 @@ src_prepare() {
src_configure() {
ECONF="--disable-more-warnings
+ --disable-static
--localstatedir=/var
--with-distro=gentoo
--with-dbus-sys-dir=/etc/dbus-1/system.d
@@ -141,6 +136,9 @@ src_install() {
insinto /etc/NetworkManager
newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
|| die "newins failed"
+
+ # Remove useless .la files
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
}
pkg_postinst() {