Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 529868 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-5 / +8 lines)
Line  Link Here
0
-- /var/pms/portage/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.11.ebuild
0
++ /var/pms/overlay/local/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.2.11.ebuild
Lines 14-20 Link Here
14
14
15
LICENSE="GPL-2+"
15
LICENSE="GPL-2+"
16
SLOT="0"
16
SLOT="0"
17
IUSE="+colord +cups input_devices_wacom socialweb"
17
IUSE="+colord +cups input_devices_wacom networkmanager socialweb"
18
KEYWORDS="amd64 x86"
18
KEYWORDS="amd64 x86"
19
19
20
# False positives caused by nested configure scripts
20
# False positives caused by nested configure scripts
Lines 30-41 Link Here
30
	>=gnome-extra/cinnamon-desktop-1.0:0=
30
	>=gnome-extra/cinnamon-desktop-1.0:0=
31
	>=gnome-extra/cinnamon-menus-1.0:0=
31
	>=gnome-extra/cinnamon-menus-1.0:0=
32
	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
32
	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
33
	>=gnome-extra/nm-applet-0.9.8
34
	media-libs/fontconfig
33
	media-libs/fontconfig
35
	>=media-libs/libcanberra-0.13[gtk3]
34
	>=media-libs/libcanberra-0.13[gtk3]
36
	>=media-sound/pulseaudio-1.1[glib]
35
	>=media-sound/pulseaudio-1.1[glib]
37
	net-misc/modemmanager
38
	>=net-misc/networkmanager-0.8.9[modemmanager]
39
	>=sys-auth/polkit-0.103
36
	>=sys-auth/polkit-0.103
40
	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
37
	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
41
	>=x11-libs/gdk-pixbuf-2.23.0:2
38
	>=x11-libs/gdk-pixbuf-2.23.0:2
Lines 49-54 Link Here
49
		>=dev-libs/libwacom-0.7
46
		>=dev-libs/libwacom-0.7
50
		>=x11-libs/gtk+-3.8:3
47
		>=x11-libs/gtk+-3.8:3
51
		>=x11-libs/libXi-1.2 )
48
		>=x11-libs/libXi-1.2 )
49
	networkmanager? (
50
		>=gnome-extra/nm-applet-0.9.8
51
		net-misc/modemmanager
52
		>=net-misc/networkmanager-0.8.9[modemmanager] )
52
	socialweb? ( net-libs/libsocialweb )
53
	socialweb? ( net-libs/libsocialweb )
53
54
54
"
55
"
Lines 86-91 Link Here
86
	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
87
	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
87
	# fix wrong nm-applet dependency
88
	# fix wrong nm-applet dependency
88
	epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
89
	epatch "${FILESDIR}"/${PN}-2.2.5-nm-applet.patch
90
	# make networkmananger optional
91
	epatch "${FILESDIR}"/allow_optional_nm.patch
89
92
90
	epatch_user
93
	epatch_user
91
94

Return to bug 529868