Add missing REQUIRED_USE (#511192 by Kent Fredric), drop old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 13 insertions, 240 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index cfc13073435d..0ca123ab1f30 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.38 2014/05/16 02:15:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.39 2014/05/25 13:54:50 pacho Exp $
+
+  25 May 2014; Pacho Ramos <pacho@gentoo.org> -cinnamon-2.2.6.ebuild,
+  cinnamon-2.2.9.ebuild:
+  Add missing REQUIRED_USE (#511192 by Kent Fredric), drop old.
 
 *cinnamon-2.2.9 (16 May 2014)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 1466f7982474..050f201ba6a5 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -16,22 +16,16 @@ AUX menu_editor.patch 34725 SHA256 9e6c1ab7612ce67ebc310888186b9a626e3251da8d525
 AUX remove_GC.patch 3772 SHA256 3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680 SHA512 6796ff6735c3480013ca59b2df4c1ac5aebfc66e6137df8d06ab06e5d6b8ae6213e452d7219e50c1eb973ebbd8b7fdd962b90c119a6bd4d3e82678dd94ed8573 WHIRLPOOL b6c36992a7dee94d76e6288d3d1350a9d08b1758ad7abba3b93f83df43b7236608e420954c7f31d9709042093ccc3d26b1dc95ca1d0c69792da1793d56097e4f
 AUX screensaver.patch 2218 SHA256 d931ca3ac5e5294a5a8afde9b861116d2b2688acaec7f31009f00debbfae9cd9 SHA512 b5a6f413333f5c9196eaab95e7376d46eb69de9cf5392eccf31f78f2bb045eac550fe0fec5760056f8828f729eeda31d8bc519aec30b74fd039bfae9e799d7c9 WHIRLPOOL 8147366ccb45f4940df7884539a55e09141adcd1624950b6772afd3403378a40b2525a9d23667e0708f6cded50179bbfb3b371da9ba101f61902ad80e4471127
 DIST cinnamon-1.8.8.1.tar.gz 4347516 SHA256 100cf6ca9b2622d74532323278bdefb06ac76b750bbf326cc9dadd14e99909bb SHA512 a709781b4e6cecfe97f6fb4bad4b953f6c11ec49ebacabbfcc186e57a2e6a28abebc163d7081248d6cbac24996732a4aea7e5d54991e6c09b9701b7e64a91a0f WHIRLPOOL 49533ec7c6c40aae5e76377a67efa88f16a7ae2a6b2c3b3ab9316cb61d40fbca544f00f402e2a75b54bd90537f0813dfb5ba4d3a17a2ad3ce5d7e67e88a6c543
-DIST cinnamon-2.2.6.tar.gz 2655005 SHA256 dc264a85ff066832e132fa5dec7e6c0bad81d310f13ae4889bfaba13736bcfe3 SHA512 dc132c1657ea15c98801b87e9568e9ad8eab431c93b4e2b37d46141d13595f1affefbbff0408179b6201538ab1202ff5b8f0c2666f29a5579591e5dc2e54d0f2 WHIRLPOOL ca388ce003585708cb477d87f6516a47e33d8cf8801676ebe4d9730b9bc5571e4d69a2639d19b508ca880de416690ffd966b332c1c811bde111b244a30a180e8
 DIST cinnamon-2.2.9.tar.gz 2655818 SHA256 26b42a99a59d334b485565421a8eb52e8346ab908a0e235902f089d5f6efa8af SHA512 f0499232698bee548b83cd7482c7bfca3ea21328e68d84e19feef73bd8cf62627cff84ae1aa5fa76f0523d8a14b254b3029323415391eaf6d971cb0dc83b1beb WHIRLPOOL 5cca19150cb9a2fc9f7fcac521cbd81cc6b56cee01d74c7eaad2633494c512630463deb2e703ce55b5b01948ecafff8916a6da0443b5d761cc6047ce0d911402
 DIST gnome-3.8.patch 138356 SHA256 840cebcefc183076f9e9208421354e5e9cbccec62824c788b17cb564c2d2519a SHA512 1fd95720a6398607330ff445bd55f1f898dac03dda542d7a7246f81127e55793b02a4df4cc8c759a5f6c11dd7e5a6609bf0bfc05266a87e65034eab0f94077f2 WHIRLPOOL 84899979f7a4c1c6f7cb4f3d356e45e3b49f798605e48c768c3f43a90b828b3f1e9051e9e176bc099c9051d8fb4107e7d127cef27dc4797189b7c9479edf9bd5
 EBUILD cinnamon-1.8.8.1-r2.ebuild 8423 SHA256 7d74fbf78c227b4d63d28e708bc85363824e5714b3f9ada5489f25d5c9905f4e SHA512 761eab37565cb53f307c37460723c356fdb7760bb07dacdc8838e5569712c85070c25ffdf5c1b598ed1b631514ebd9fa666d7b7e44c341b5811610f7857396dc WHIRLPOOL 1913fc317f4210da88a260e31a7e16523a95b54e88ef7ee68f3823c5f14b3cc5375be8fb05534a6d624f7a3be9c1547815a4479e437c983a89778362c3fc428e
-EBUILD cinnamon-2.2.6.ebuild 7963 SHA256 73360bd7feb8bad063f9608f61be2d415dfbf772fc7bea6e206d70d51c6d30bf SHA512 5eec260877a0cf30a0d154b558bdfa1e4e1b632037d4a94bf2a8d251b9b51e329652f656e51c986369b576513219ddae203dbe6288463367f00ee26f73064d42 WHIRLPOOL 1b4ef5c8933664cf3d2c17f0c6034048402a93ac9c748445f77fe149e1388634a0bb46de9ea58dddcde4631b0ee25fa035ec6c0da6afa092095909fc8ea0ded0
-EBUILD cinnamon-2.2.9.ebuild 7963 SHA256 2154e5236a2b4a6484d3f45b34d7074b8ed832cc26a189dba3475e459b557928 SHA512 d4ce507259ca5b5f8853efc2b2cfc162ff5bd1bead3e4ae809253a832eeac272827984418320b579d7c5e9c86c3ba69fddd66ae66d8218d5b9cb4bee7da8865d WHIRLPOOL b68b9fd67ee1d245c1565add560b2562f9bb0b8b59eace6ad3b518279e72b874201d101aac34bf70325c1da6aa77642a9f38ef7213475c7aeb34336808244ff5
-MISC ChangeLog 9072 SHA256 21da6ad098a842bd43d3abeee6da9b8c63eec943b906abe39f77e849981226de SHA512 6b846133fc58e7697df701040ffe96626175cd7e0e62f7aa932edc925b587909e2d8e6577ca62af01921e16ca3ec07de1d20f6d4c39645bfdb1d113dc37c7209 WHIRLPOOL b76b3c18062bc73ffb534966de2c9b8f998c8b95dec513e8535a9cd33986d755e5879c5b277a68dc618e07df2ba7e7348b8a2f828fefda1bfacc769bffdbf610
+EBUILD cinnamon-2.2.9.ebuild 7998 SHA256 fcaa925a3fd9ac2c4b17b029d419adacd7f5a923b114100b3d12791f7104a431 SHA512 c4d022aad090fdd243969bc9698ba5ef0e5e17b272209d46af2cbf7f094a8c29f0947ca1812b0476f93660bf525a8758016e4d4ea70efed1db88378b67c558c7 WHIRLPOOL f6330ea87b82804dbf616eff84a90ed50cdd6195fd89e1b4d84408b5f8cf9543e7ebdb62b60b5c964e4399dc0c33ea4250baf448819d311550c64130fc3f3ebf
+MISC ChangeLog 9228 SHA256 8671fd935a8990093ed4fc3cc91bfdef31decffdeb07d7aca5b5cebece54fe6c SHA512 7cb58425d22db47b71be77bdaf6f0c618235488ec01a08adf1a0cc8b94e841361f07ffb26902bb2530ba298194ba19adab742ff5d554e4040755347b4bc608f4 WHIRLPOOL 442950aa9727aeb7a34e56fef31add44fb7bfb4f3b78796fd4b358e0fdf9d40272d1f1746e041be1b56635339f81d53ede92a8de51b04b2c2713c950bb79b763
 MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTdXR1AAoJEJ0WA1zPCt1h5kkH/182zFIBsA5o8Y/ixFcr34aR
-Ld7QV3gE93V8aaAy3EGX7/4kxbIb2Z7uRxx2b4koFjI5AWpSAECBS/aU0xwzJrME
-b5bSdsPgOErFVIWvBcxxlG60Vms0yU17VrVmlYwnEdtW/kRHHvvGmRYGH9wspmxh
-Ulrs5M7hC0wGRcNsuUJZMGIem3weqIudX9oe4UbKqb59t7hmFCsj2KIi4qwXOxqJ
-UE5f1wrJgKjhXw3+fcqhqXO9PDZkRoXDAmp/uwWS/7oj30VAjQ+jd6mlaI6eVKci
-DaC4+hsPViu2EaxS4L9kvGlcD8sUxguoAG1ie7QYNAEyJWC7KA5FEV6iB0Cl8ds=
-=JXmH
+iEYEAREIAAYFAlOB9isACgkQCaWpQKGI+9Rj6gCeNjt2mbi+yzAPMXgzYC1PeFX1
+4MoAmwYQMWGIKlkPfGJv2PU4rDMgdIZy
+=WW+6
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.6.ebuild
deleted file mode 100644
index d92808c0e0b7..000000000000
--- a/gnome-extra/cinnamon/cinnamon-2.2.6.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.6.ebuild,v 1.2 2014/05/16 02:15:08 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz
-	http://dev.gentoo.org/~pacho/gnome/cinnamon-1.8/gnome-3.8.patch"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+bluetooth +l10n +networkmanager"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-1.0:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-1.9.0
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/libcanberra
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-1.9.1[introspection]
-	${PYTHON_DEPS}
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-# note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	gnome-extra/cinnamon-session
-
-	gnome-extra/cinnamon-settings-daemon
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-libs/gksu
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-
-	x11-themes/gnome-icon-theme-symbolic
-
-	gnome-extra/nemo
-	gnome-extra/cinnamon-control-center
-	gnome-extra/cinnamon-screensaver
-
-	bluetooth? ( net-wireless/cinnamon-bluetooth )
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[${PYTHON_USEDEP}]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix GNOME 3.8 support
-	epatch "${FILESDIR}/background.patch"
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch"
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch"
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py \
-		-i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
-		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		-i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \
-		-i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \
-		-i files/usr/lib/cinnamon-settings/bin/*.py \
-		-i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \
-		-i files/usr/lib/cinnamon-menu-editor/cme/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Don't error out on warnings
-	gnome2_src_configure \
-		--disable-jhbuild-wrapper-script \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users}
-	# Fix broken shebangs
-	sed -e "s%#!.*python%#!${PYTHON}%" \
-		-i "${ED}usr/bin/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users} \
-		-i "${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py" || die
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
index fb229009dcf8..4ed31943b244 100644
--- a/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.1 2014/05/16 02:15:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.2.9.ebuild,v 1.2 2014/05/25 13:54:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -22,6 +22,8 @@ SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+bluetooth +l10n +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="