pacho 15/01/12 17:07:48
Modified: ChangeLog
Added: gnome-control-center-3.14.2-r1.ebuild
gnome-control-center-3.12.1-r2.ebuild
Log:
Fix NM version checking, bug #536224 by poncho
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.160 gnome-base/gnome-control-center/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.160&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?rev=1.160&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/ChangeLog?r1=1.159&r2=1.160
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog 22 Dec 2014 21:35:02 -0000 1.159
+++ ChangeLog 12 Jan 2015 17:07:48 -0000 1.160
@@ -1,6 +1,16 @@
# ChangeLog for gnome-base/gnome-control-center
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v
1.159 2014/12/22 21:35:02 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v
1.160 2015/01/12 17:07:48 pacho Exp $
+
+*gnome-control-center-3.14.2-r1 (12 Jan 2015)
+*gnome-control-center-3.12.1-r2 (12 Jan 2015)
+
+ 12 Jan 2015; Pacho Ramos <pa...@gentoo.org>
+ +files/gnome-control-center-3.12.1-networkmanager-version.patch,
+ +files/gnome-control-center-3.14.2-networkmanager-version.patch,
+ +gnome-control-center-3.12.1-r2.ebuild,
+ +gnome-control-center-3.14.2-r1.ebuild:
+ Fix NM version checking, bug #536224 by poncho
*gnome-control-center-3.14.2 (22 Dec 2014)
1.1
gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: gnome-control-center-3.14.2-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild,v
1.1 2015/01/12 17:07:48 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
inherit autotools bash-completion-r1 eutils gnome2
DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/";
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom
kerberos v4l"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
#
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
>=dev-libs/glib-2.39.91:2
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.13:3
>=gnome-base/gsettings-desktop-schemas-3.13.91
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
gnome-base/libgtop:2=
media-libs/fontconfig
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
>=gnome-extra/nm-applet-0.9.7.995
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
x11-libs/libX11
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
>=x11-libs/colord-gtk-0.1.24 )
cups? (
>=net-print/cups-1.4[dbus]
|| ( >=net-fs/samba-3.6.14-r1[smbclient]
>=net-fs/samba-4.0.0[client] ) )
gnome-online-accounts? (
>=media-libs/grilo-0.2.6:0.2
>=net-libs/gnome-online-accounts-3.9.90 )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
v4l? (
media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
>=media-video/cheese-3.5.91 )
input_devices_wacom? (
>=dev-libs/libwacom-0.7
>=media-libs/clutter-1.11.3:1.0
media-libs/clutter-gtk:1.0
>=x11-libs/libXi-1.2 )
"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit )
>=sys-apps/systemd-31 )
>=sys-apps/accountsservice-0.6.30
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
>=app-admin/system-config-printer-gnome-1.3.5
net-print/cups-pk-helper )
input_devices_wacom? (
gnome-base/gnome-settings-daemon[input_devices_wacom] )
i18n? ( >=gnome-base/libgnomekbd-3 )
!<gnome-base/gdm-2.91.94
!<gnome-extra/gnome-color-manager-3.1.2
!gnome-extra/gnome-media[pulseaudio]
!<gnome-extra/gnome-media-2.32.0-r300
!<net-wireless/gnome-bluetooth-3.3.2
"
# PDEPEND to avoid circular dependency
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
DEPEND="${COMMON_DEPEND}
x11-proto/xproto
x11-proto/xf86miscproto
x11-proto/kbproto
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.40.1
>=sys-devel/gettext-0.17
virtual/pkgconfig
cups? ( sys-apps/sed )
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
# Gentoo handles completions in a different directory, bugs #465094 and
#477390
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
shell/Makefile.am || die "sed completiondir failed"
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
# Fix NM version checking, bug #536224 (from 3.14 branch)
epatch "${FILESDIR}"/${PN}-3.14.2-networkmanager-version.patch
epatch_user
eautoreconf
# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
# We need to touch timedated{c,h} to prevent them from being
# regenerated (bug #415901)
# Upstream think they should be removed, preventing compilation errors
too
# (https://bugzilla.gnome.org/704822)
[[ -f panels/datetime/timedated.h ]] && rm -f
panels/datetime/timedated.h
[[ -f panels/datetime/timedated.c ]] && rm -f
panels/datetime/timedated.c
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-update-mimedb \
--disable-static \
--enable-documentation \
$(use_enable bluetooth) \
$(use_enable colord color) \
$(use_enable cups) \
$(use_enable gnome-online-accounts goa) \
$(use_enable i18n ibus) \
$(use_enable kerberos) \
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
1.1
gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild?rev=1.1&content-type=text/plain
Index: gnome-control-center-3.12.1-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild,v
1.1 2015/01/12 17:07:48 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
inherit autotools bash-completion-r1 eutils gnome2
DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/";
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom
kerberos v4l"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
#
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
>=dev-libs/glib-2.39.91:2
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.11.1:3
>=gnome-base/gsettings-desktop-schemas-3.9.91
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
gnome-base/gnome-menus:3
gnome-base/libgtop:2=
media-libs/fontconfig
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
>=gnome-extra/nm-applet-0.9.7.995
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
virtual/opengl
x11-apps/xmodmap
x11-libs/libX11
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
>=x11-libs/colord-gtk-0.1.24 )
cups? (
>=net-print/cups-1.4[dbus]
|| ( >=net-fs/samba-3.6.14-r1[smbclient]
>=net-fs/samba-4.0.0[client] ) )
gnome-online-accounts? (
>=media-libs/grilo-0.2.6:0.2
>=net-libs/gnome-online-accounts-3.9.90 )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
v4l? (
media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
>=media-video/cheese-3.5.91 )
input_devices_wacom? (
>=dev-libs/libwacom-0.7
>=media-libs/clutter-1.11.3:1.0
media-libs/clutter-gtk:1.0
>=x11-libs/libXi-1.2 )
"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit )
>=sys-apps/systemd-31 )
>=sys-apps/accountsservice-0.6.30
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
>=app-admin/system-config-printer-gnome-1.3.5
net-print/cups-pk-helper )
input_devices_wacom? (
gnome-base/gnome-settings-daemon[input_devices_wacom] )
i18n? ( >=gnome-base/libgnomekbd-3 )
!<gnome-base/gdm-2.91.94
!<gnome-extra/gnome-color-manager-3.1.2
!gnome-extra/gnome-media[pulseaudio]
!<gnome-extra/gnome-media-2.32.0-r300
!<net-wireless/gnome-bluetooth-3.3.2
"
# PDEPEND to avoid circular dependency
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
DEPEND="${COMMON_DEPEND}
x11-proto/xproto
x11-proto/xf86miscproto
x11-proto/kbproto
dev-libs/libxml2:2
dev-libs/libxslt
>=dev-util/intltool-0.40.1
>=sys-devel/gettext-0.17
virtual/pkgconfig
cups? ( sys-apps/sed )
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
# Gentoo handles completions in a different directory, bugs #465094 and
#477390
sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
shell/Makefile.am || die "sed completiondir failed"
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
# Fix NM version checking, bug #536224 (from 3.14 branch)
epatch "${FILESDIR}"/${PN}-3.12.1-networkmanager-version.patch
epatch_user
eautoreconf
# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
# We need to touch timedated{c,h} to prevent them from being
# regenerated (bug #415901)
# Upstream think they should be removed, preventing compilation errors
too
# (https://bugzilla.gnome.org/704822)
[[ -f panels/datetime/timedated.h ]] && rm -f
panels/datetime/timedated.h
[[ -f panels/datetime/timedated.c ]] && rm -f
panels/datetime/timedated.c
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
--disable-update-mimedb \
--disable-static \
--enable-documentation \
$(use_enable bluetooth) \
$(use_enable colord color) \
$(use_enable cups) \
$(use_enable gnome-online-accounts goa) \
$(use_enable i18n ibus) \
$(use_enable kerberos) \
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
