diff options
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/cinnamon-control-center/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild (renamed from gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild) | 11 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gnome-extra/cinnamon-control-center/ChangeLog b/gnome-extra/cinnamon-control-center/ChangeLog index 29aa2e25fd4f..3d122e0d81de 100644 --- a/gnome-extra/cinnamon-control-center/ChangeLog +++ b/gnome-extra/cinnamon-control-center/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/cinnamon-control-center # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.14 2015/01/17 15:39:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/ChangeLog,v 1.15 2015/01/27 09:32:37 pacho Exp $ + +*cinnamon-control-center-2.4.2-r2 (27 Jan 2015) + + 27 Jan 2015; Pacho Ramos <pacho@gentoo.org> + +cinnamon-control-center-2.4.2-r2.ebuild, + -cinnamon-control-center-2.4.2.ebuild: + Remove socialweb support (#537360), drop old *cinnamon-control-center-2.2.11-r1 (17 Jan 2015) *cinnamon-control-center-2.4.2-r1 (17 Jan 2015) diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild index c39170d03a91..c234480675b2 100644 --- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild +++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2.ebuild,v 1.1 2015/01/11 18:35:29 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild,v 1.1 2015/01/27 09:32:37 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar. LICENSE="GPL-2+" SLOT="0" -IUSE="+colord +cups input_devices_wacom socialweb" +IUSE="+colord +cups input_devices_wacom" KEYWORDS="~amd64 ~x86" # False positives caused by nested configure scripts @@ -49,8 +49,6 @@ COMMON_DEPEND=" >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) - socialweb? ( net-libs/libsocialweb ) - " # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x # libgnomekbd needed only for gkbd-keyboard-display tool @@ -85,6 +83,9 @@ src_prepare() { # make some panels optional epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch + # Fix NM version checking, bug #536850 + epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch + epatch_user eautoreconf @@ -97,8 +98,8 @@ src_configure() { --disable-update-mimedb \ --disable-static \ --enable-documentation \ + --without-libsocialweb \ $(use_enable colord color) \ $(use_enable cups) \ - $(use_with socialweb libsocialweb) \ $(use_enable input_devices_wacom wacom) } |