From: Nirbheek Chauhan Date: Sun, 14 Aug 2011 09:04:08 +0000 (+0000) Subject: Various ebuild fixes, bug 378225 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3201df41a24205ab6c2d70d6d8f9375950b16a29;p=gentoo.git Various ebuild fixes, bug 378225 Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64 --- 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 + networkmanager-0.8.4.0-r2.ebuild: + Various ebuild fixes, bug 378225 12 Aug 2011; Mu Qiao networkmanager-0.8.4.0-r2.ebuild: Fix building with USE="-ppp" (bug #377183) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index d67b1e54b393..797572f550c2 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -37,17 +37,23 @@ EBUILD networkmanager-0.8.2-r1.ebuild 4162 RMD160 d6714216d6c159c78912472dbff3bd EBUILD networkmanager-0.8.2-r10.ebuild 5162 RMD160 b3b47263265abfdbba1983a4dcc1e1308a6340b0 SHA1 bb33a27176a0599bad743d83514f7375ad3cea2e SHA256 88b651dfd163c89e81c8dc6037e9f1620c273c734f57676d92f89dc02170614c EBUILD networkmanager-0.8.2-r2.ebuild 4435 RMD160 7249b21ae02a841b23f2172bc46812ff62d65051 SHA1 725a5c38d2a2ab55ce54e38aac89a206e1fffc05 SHA256 9a1147f4f1cfe1d7ba4657b8f882156131a167fac8ef0261dd7db3623c9e5fbf EBUILD networkmanager-0.8.2-r6.ebuild 4868 RMD160 ead47fc353be537ded684c2e2354b3b059c6e5cc SHA1 1e0ebce7be636d607cf46f66c3e51eec6a5ef248 SHA256 25c4e44d68034154583adaaaa5ec35a8f6af654c1ef593708ac15755a83f1aa7 -EBUILD networkmanager-0.8.4.0-r2.ebuild 4348 RMD160 2040db7f0e7f61ce14b3c9e916a46e5a74d227e2 SHA1 e20581da295470610eddecd6505c1fb4d805bb1e SHA256 0dc63b16b12365882b0eba128d0e63a3570f5a336b78335f157a9e1244ae18f3 -MISC ChangeLog 22688 RMD160 dd5502996b49d8945feb2dbb78d2bd10b44e7489 SHA1 7b98401cd7f3f452187ca30e899d9bd8344ef435 SHA256 58505d3f001e330c0e172188b10d28dcff64305c12319a3745274884e59f1154 +EBUILD networkmanager-0.8.4.0-r2.ebuild 4333 RMD160 51e3243161875d25bd098b235566824cbfd5cd92 SHA1 440db0b22d6c17538447539f774d460f21f493e7 SHA256 e553000c99702e32853d627e3b391f4f6e4ab192b3168b4343721e112cd7820a +MISC ChangeLog 22815 RMD160 ffa4bda9a5a7f6b8d22b2ac592ae48f6eb04513f SHA1 8a81d1999a90e91b77dd53262cbf8476781bf31d SHA256 eaf09c8a5ac3f3ec2ae5c70c0b9d9879b9527a8a845523566886121994aeb01b MISC metadata.xml 1195 RMD160 e23c0167d814c2c2a82480af73308c85c8dc61be SHA1 b5bade2efe86e708abfa5da6e07a992e02058ef8 SHA256 00767138c2ec00a7e090ecbeddaba7ea49924258a6c737f59d52f89f41b3d04e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJORNgKAAoJEDCzDeQXsVfpFUgH/injfbtpwOlDk0KsednzpkPy -mq5/Sfz0ix73/j3vC5GaHn+DY5yL1XOjlAPE60AnI8pbeKQE/QbkKc2Zx9zc8Cb1 -bFhOFtoBbqa7SLOs3tQyt53AkXPvEtzXkiAh53YQK5OEezX/Luj1gAVvxLu+aOlB -kugH+h4OjGcl6tnPocSvWYLXsS71MXCWUnVSPS+x7stsT7GOPY7KTL5nbWVqiyU2 -z56gHoIMvo07+69j78JqFt9/Kk20dkDI1yNAQ93a0+uyFzfYG+jUxi7GbYjowmzW -Wpna5+YfRSinO1l6mGocnKGdEXxNREHGF3Jb9ft5YIJG2uYRq64RHQyGpMwioFg= -=Cizl +iQIcBAEBAgAGBQJOR4+NAAoJEO/kOhxWD91kXFMP/2ZwUBf236lBM3zy1N5b6zuP +QkgHp+87cBv8IVcExb/9J4msTWjW1E4lWe4B+TYBLSIfUui13/XXf+NtF2EXReco +xov2j1dA2UWzHX+7My8xWwGk8C75jWKsv7LTCDmbRresgpY07OcXXlhcpPeUDHhw +vkHIDNwsEXJ2wO+D9qlGHlDSSvHqCbTnaQCuI/z2uhmA2Hetj47hRdCoNYryaRYL +cSEEAasgReehyLNWC5oDv0QlPAzhogfIXlKaZz75ARnWlmjo5RVDODvp+QnpTzx6 +lHFch3t660w7JJqURPhPRkDVfWQWVimXbad60Mk7QjwMNMo+93D5+GJqbqDvTMpz +jHUq6GgE3fvJSaNi6uvqBcSTlI10PW0cXfvowRz9zJoRmPZdQMoJK+gfaBNDQib9 +x/0tdu8HADaf5zOGcP6gLFcvxS6Ra+mBmd6iWz4H0ZXq43qX60n3Uzrs1rxjMcD2 +uVNnRDm4Ss2SqWMNPnYguHUarOITSRjyiCt1teds8hM/gdIvlNrUj/DSBNia8NDK +JtWPxNbZ7Cc6uvAAXMH6qaKS4UVINPS7BsZhJvkIu0WshShT0Y8oYKO54QBNVS4H +2DmqwoA+p3owzNhHgRkfx8chKardiFIQPhYp0gNfl1mnfvg0fJDjBA9XuG+VvI7e +UNzKkXEYT2gWvDCGvnw+ +=77yL -----END PGP SIGNATURE----- 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() {