summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-09-28 09:25:35 +0000
committerPacho Ramos <pacho@gentoo.org>2013-09-28 09:25:35 +0000
commit76eba74ceb67effcf13ab7c3eaef71c9e680ccce (patch)
tree95e478c18758ac54a3f58b517511c76dbf43d275 /gnome-base
parentMask openrc-force USE flag (#480336) (diff)
downloadgentoo-2-76eba74ceb67effcf13ab7c3eaef71c9e680ccce.tar.gz
gentoo-2-76eba74ceb67effcf13ab7c3eaef71c9e680ccce.tar.bz2
gentoo-2-76eba74ceb67effcf13ab7c3eaef71c9e680ccce.zip
Provide masked openrc-force USE (#480336)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-settings-daemon/ChangeLog7
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild123
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.4.ebuild128
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild15
-rw-r--r--gnome-base/gnome-settings-daemon/metadata.xml4
5 files changed, 22 insertions, 255 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 2cad55205945..bde5105c1b23 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-settings-daemon
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.124 2013/09/08 15:06:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.125 2013/09/28 09:25:35 pacho Exp $
+
+ 28 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+ -gnome-settings-daemon-3.8.3-r1.ebuild, -gnome-settings-daemon-3.8.4.ebuild,
+ gnome-settings-daemon-3.8.5.ebuild, metadata.xml:
+ Provide masked openrc-force USE (#480336)
*gnome-settings-daemon-3.8.5 (08 Sep 2013)
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild
deleted file mode 100644
index 417595964815..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild,v 1.2 2013/07/25 06:23:32 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-REQUIRED_USE="
- packagekit? ( udev )
- smartcard? ( udev )
-"
-
-# require colord-0.1.27 dependency for connection type support
-COMMON_DEPEND="
- >=dev-libs/glib-2.35.3:2
- >=x11-libs/gtk+-3.7.8:3
- >=gnome-base/gnome-desktop-3.7.90:3=
- >=gnome-base/gsettings-desktop-schemas-3.7.2.1
- >=gnome-base/librsvg-2.36.2
- media-fonts/cantarell
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.9.11
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- i18n? ( >=app-i18n/ibus-1.4.99 )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom )
- packagekit? ( >=app-admin/packagekit-base-0.7.4 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/udev[gudev] )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- sys-apps/systemd
- >=x11-themes/gnome-themes-standard-2.91
- >=x11-themes/gnome-icon-theme-2.91
- >=x11-themes/gnome-icon-theme-symbolic-2.91
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=621836
- # Apparently this change severely affects touchpad usability for some
- # people, so revert it if USE=short-touchpad-timeout.
- # Revisit if/when upstream adds a setting for customizing the timeout.
- use short-touchpad-timeout &&
- epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
-
- # Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.7.90-optional-color-wacom.patch"
-
- # Apply patches from gnome-3.8 branch
- epatch "${WORKDIR}"/${P}-patches/*.patch
-
- epatch_user
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable i18n ibus) \
- $(use_enable packagekit) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- Xemake check
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.4.ebuild
deleted file mode 100644
index 0175a03c54f7..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.4.ebuild,v 1.3 2013/07/28 12:46:23 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 systemd virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev"
-REQUIRED_USE="
- packagekit? ( udev )
- smartcard? ( udev )
-"
-
-# require colord-0.1.27 dependency for connection type support
-COMMON_DEPEND="
- >=dev-libs/glib-2.35.3:2
- >=x11-libs/gtk+-3.7.8:3
- >=gnome-base/gnome-desktop-3.7.90:3=
- >=gnome-base/gsettings-desktop-schemas-3.7.2.1
- >=gnome-base/librsvg-2.36.2
- media-fonts/cantarell
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra[gtk3]
- >=media-sound/pulseaudio-2
- >=sys-power/upower-0.9.11
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/libnotify-0.7.3:=
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-libs/libXi
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXtst
- x11-libs/libXxf86misc
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- i18n? ( >=app-i18n/ibus-1.4.99 )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom )
- packagekit? ( >=app-admin/packagekit-base-0.7.4 )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/udev[gudev] )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
- gnome-base/dconf
- sys-apps/systemd
- >=x11-themes/gnome-themes-standard-2.91
- >=x11-themes/gnome-icon-theme-2.91
- >=x11-themes/gnome-icon-theme-symbolic-2.91
- !<gnome-base/gnome-control-center-2.22
- !<gnome-extra/gnome-color-manager-3.1.1
- !<gnome-extra/gnome-power-manager-3.1.3
-
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
- cups? ( sys-apps/sed )
- dev-libs/libxml2:2
- sys-devel/gettext
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- x11-proto/inputproto
- x11-proto/xf86miscproto
- >=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=621836
- # Apparently this change severely affects touchpad usability for some
- # people, so revert it if USE=short-touchpad-timeout.
- # Revisit if/when upstream adds a setting for customizing the timeout.
- use short-touchpad-timeout &&
- epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
-
- # Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.7.90-optional-color-wacom.patch"
-
- epatch_user
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-man \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable debug more-warnings) \
- $(use_enable i18n ibus) \
- $(use_enable packagekit) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- Xemake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! systemd_is_booted; then
- ewarn "${PN} needs Systemd to be *running* for working"
- ewarn "properly. Please follow the this guide to migrate:"
- ewarn "http://wiki.gentoo.org/wiki/Systemd"
- fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild
index d3e94aafd070..4487e09c14c1 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild,v 1.1 2013/09/08 15:06:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild,v 1.2 2013/09/28 09:25:35 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
REQUIRED_USE="
packagekit? ( udev )
smartcard? ( udev )
@@ -61,7 +61,7 @@ COMMON_DEPEND="
# systemd needed for power and session management, bug #464944
RDEPEND="${COMMON_DEPEND}
gnome-base/dconf
- sys-apps/systemd
+ !openrc-force? ( sys-apps/systemd )
>=x11-themes/gnome-themes-standard-2.91
>=x11-themes/gnome-icon-theme-2.91
>=x11-themes/gnome-icon-theme-symbolic-2.91
@@ -120,9 +120,18 @@ src_test() {
pkg_postinst() {
gnome2_pkg_postinst
+
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow the this guide to migrate:"
ewarn "http://wiki.gentoo.org/wiki/Systemd"
fi
+
+ if use openrc-force; then
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
+ ewarn "this can lead to unexpected problems and is not supported neither by"
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
+ ewarn "you will need to disable this USE flag system wide and retest before"
+ ewarn "opening any bug report."
+ fi
}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 8b4133233cc5..ee514e6e0b09 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -7,6 +7,10 @@
<pkg>x11-misc/colord</pkg></flag>
<flag name="i18n">Enable support for enhanced input methods through
<pkg>app-i18n/ibus</pkg></flag>
+ <flag name="openrc-force">Skip systemd dependency (#480336),
+ enabling this flag will become your setup to be fully
+ unsupported by upstream and downstream Gnome team. Do not
+ try to enable it unless completely needed</flag>
<flag name="packagekit">Enable support for the distro-neutral package
manager GUI <pkg>app-admin/packagekit</pkg></flag>
<flag name="short-touchpad-timeout">Change the touchpad timeout so that