From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q6ug7-0002hi-JL for garchives@archives.gentoo.org; Tue, 05 Apr 2011 01:03:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E73B4E08A6; Tue, 5 Apr 2011 00:57:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A25C2E08A2 for ; Tue, 5 Apr 2011 00:57:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 424531B40E5 for ; Tue, 5 Apr 2011 00:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 93CE180019 for ; Tue, 5 Apr 2011 00:57:42 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <87ab7bf424538af1114104c0800a235b60401a87.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, net-misc/networkmanager/, ... X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild gnome-base/gnome-shell/gnome-shell-3.0.0.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild net-misc/networkmanager/files/networkmanager-0.8.996-fix-introspection.patch net-misc/networkmanager/networkmanager-0.8.996-r1.ebuild net-misc/networkmanager/networkmanager-0.8.997.ebuild X-VCS-Directories: gnome-base/gnome-shell/ net-misc/networkmanager/ net-misc/networkmanager/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 87ab7bf424538af1114104c0800a235b60401a87 Date: Tue, 5 Apr 2011 00:57:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 39cb5cb10b2146dba122b09129d28876 commit: 87ab7bf424538af1114104c0800a235b60401a87 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Apr 4 22:07:03 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Apr 5 00:29:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D87ab7bf4 net-misc/networkmanager: 0.8.996-r1 =E2=86=92 0.8.997 --- ...ell-2.91.93.ebuild =3D> gnome-shell-3.0.0.ebuild} | 6 +- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 2 +- .../networkmanager-0.8.996-fix-introspection.patch | 51 --------------= ------ ...996-r1.ebuild =3D> networkmanager-0.8.997.ebuild} | 26 ++-------- 4 files changed, 10 insertions(+), 75 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild b/gnome-ba= se/gnome-shell/gnome-shell-3.0.0.ebuild similarity index 96% rename from gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.0.0.ebuild index b31d84a..da01a14 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.0.0.ebuild @@ -40,7 +40,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.93[introspection] + >=3Dx11-wm/mutter-3.0.0[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 @@ -76,8 +76,8 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-control-center-2.91.92-r1 =20 nm-applet? ( - >=3Dgnome-extra/nm-applet-0.8.996 - >=3Dnet-misc/networkmanager-0.8.996-r1[introspection] )" + >=3Dgnome-extra/nm-applet-0.8.997 + >=3Dnet-misc/networkmanager-0.8.997[introspection] )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index b31d84a..fa14e4b 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -40,7 +40,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.93[introspection] + >=3Dx11-wm/mutter-3.0.0[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.996-fix-int= rospection.patch b/net-misc/networkmanager/files/networkmanager-0.8.996-f= ix-introspection.patch deleted file mode 100644 index 0e488c3..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.996-fix-introspect= ion.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3ac6aa8008970b9cbafaa7a7134c9dc2f455d2f7 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Tue, 15 Mar 2011 20:37:29 +0100 -Subject: [PATCH] include: mark flags as such - -If the /*< flags >*/ annotation is missing, enums are picked as -enumerations, so bindings won't allow passing combinations of them. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D643011 ---- - include/NetworkManager.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/include/NetworkManager.h b/include/NetworkManager.h -index d8f29c5..d421aff 100644 ---- a/include/NetworkManager.h -+++ b/include/NetworkManager.h -@@ -138,6 +138,7 @@ typedef enum { -=20 - /* 802.11 Access Point flags */ - typedef enum { -+ /*< flags >*/ - NM_802_11_AP_FLAGS_NONE =3D 0x00000000, - NM_802_11_AP_FLAGS_PRIVACY =3D 0x00000001 - } NM80211ApFlags; -@@ -150,6 +151,7 @@ typedef enum { - * information elements. - */ - typedef enum { -+ /*< flags >*/ - NM_802_11_AP_SEC_NONE =3D 0x00000000, - NM_802_11_AP_SEC_PAIR_WEP40 =3D 0x00000001, - NM_802_11_AP_SEC_PAIR_WEP104 =3D 0x00000002, -@@ -183,6 +185,7 @@ typedef enum { - * Bluetooth device. - */ - typedef enum { -+ /*< flags >*/ - NM_BT_CAPABILITY_NONE =3D 0x00000000, - NM_BT_CAPABILITY_DUN =3D 0x00000001, - NM_BT_CAPABILITY_NAP =3D 0x00000002, -@@ -205,6 +208,7 @@ typedef enum { - * API. - */ - typedef enum { -+ /*< flags >*/ - NM_DEVICE_MODEM_CAPABILITY_NONE =3D 0x00000000, - NM_DEVICE_MODEM_CAPABILITY_POTS =3D 0x00000001, - NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO =3D 0x00000002, ---=20 -1.7.4 \ No newline at end of file diff --git a/net-misc/networkmanager/networkmanager-0.8.996-r1.ebuild b/n= et-misc/networkmanager/networkmanager-0.8.997.ebuild similarity index 84% rename from net-misc/networkmanager/networkmanager-0.8.996-r1.ebuild rename to net-misc/networkmanager/networkmanager-0.8.997.ebuild index 201783c..39bd459 100644 --- a/net-misc/networkmanager/networkmanager-0.8.996-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.997.ebuild @@ -3,17 +3,16 @@ # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanage= r-0.8.995.ebuild,v 1.1 2011/03/09 07:56:21 qiaomuf Exp $ =20 EAPI=3D"4" +GNOME_ORG_MODULE=3D"NetworkManager" =20 inherit autotools eutils gnome.org linux-info =20 # NetworkManager likes itself with capital letters -MY_PN=3D${PN/networkmanager/NetworkManager} +MY_PN=3D${PN/networkmanager/${GNOME_ORG_MODULE}} MY_P=3D${MY_PN}-${PV} =20 DESCRIPTION=3D"Network configuration and management in an easy way. Desk= top environment independent." HOMEPAGE=3D"http://www.gnome.org/projects/NetworkManager/" -SRC_URI=3D"${SRC_URI//${PN}/${MY_PN}} - http://dev.gentoo.org/~dagger/files/ifnet-0.9.tar.bz2" =20 LICENSE=3D"GPL-2" SLOT=3D"0" @@ -71,7 +70,7 @@ sysfs_deprecated_check() { eend $? } =20 -pkg_setup() { +pkg_pretend() { if use kernel_linux; then get_version if linux_config_exists; then @@ -86,14 +85,8 @@ pkg_setup() { } =20 src_prepare() { - # disable tests + # Don't build tests epatch "${FILESDIR}/${PN}-fix-tests.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D643011 - # Merged upstream, not needed for next release - epatch "${FILESDIR}/${P}-fix-introspection.patch" - - EPATCH_SOURCE=3D"${WORKDIR}/ifnet-0.9" EPATCH_SUFFIX=3D"diff" EPATCH_FO= RCE=3D"yes" epatch eautoreconf default } @@ -131,17 +124,10 @@ src_install() { # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scri= pts keepdir /etc/NetworkManager/dispatcher.d =20 - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" + dodoc AUTHORS ChangeLog NEWS README TODO =20 # Add keyfile plugin support keepdir /etc/NetworkManager/system-connections insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.c= onf \ - || die "newins failed" -} - -pkg_postinst() { - elog "You will need to reload DBus if this is your first time installin= g" - elog "NetworkManager, or if you're upgrading from 0.7 or older." - elog "" + newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.c= onf }