Add missing dependency on gnome-icon-theme-symbolic (bug #403503). Drop old.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 14 insertions, 204 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index bf6402ea536e..afd6de04a430 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.7 2012/02/07 21:07:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.8 2012/02/14 04:45:20 tetromino Exp $
+
+  14 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cinnamon-1.1.3.ebuild, cinnamon-1.2-r1.ebuild:
+  Add missing dependency on gnome-icon-theme-symbolic (bug #403503). Drop old.
 
   07 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   cinnamon-1.1.3.ebuild:
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index fa984938c1a0..1e513620b99c 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -5,17 +5,14 @@ AUX cinnamon-1.1.3-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef7
 AUX cinnamon-1.1.3-extensionjs_path.patch 1136 RMD160 8fea3328501f749dcd9e1459b948b2f88350d13c SHA1 18def1c34675a5f4eecc51cd90d08cb7311cc101 SHA256 a937cfd70a6c5e63cc74d0b72387fd6b3d9f4286e42b2c9615b7f8f458cab19c
 AUX cinnamon-1.1.3-xdg-open.patch 944 RMD160 68cc5eda9affdd83b49b25e09c8bf25ba0ef1621 SHA1 772a75130d50acc66d7bd252e857dc3ffce724ae SHA256 87ec3b57829107e1d3cb56cd75bf3d1125c71193a14087296bfce3f18780b7d5
 AUX cinnamon-1.2-optional-networkmanager.patch 7316 RMD160 af86c18994299fce0685393f1f6e8257eeb75ddf SHA1 130e0dbe524e94f70268858dab80c41991f5c59d SHA256 04773bf99e82c477474a8a8b42baff8ca5f76afb78bd57ac6cfa44d4885dac1d
-DIST cinnamon-1.1.3.tar.gz 2273742 RMD160 37f6cc48c6c46c69c8da16c647af3675ee3c0347 SHA1 fa563ab939d3cc47ab4833f611bfb2904ca32257 SHA256 dc349c4d924503468a34f61513c768d83aaef685811ec388f2ee826e195ff65c
 DIST cinnamon-1.2.tar.gz 2375269 RMD160 66844177f0b9a331c2bf59434ffbfa39504f4854 SHA1 bdf91cef0e01ccbdf4d1b4e35c0f51ad04adacbd SHA256 caa83d0536bc08e2446277bb744efdf141b40cf705f4cf86ffbb91dea5d6d488
-DIST cinnamon-session_1.0.0_all.deb 1634 RMD160 3420dd6144fe184cd0b049f9a7dc0b033b3cdb5a SHA1 f963e4473dbdb28964357f742119cf1c87c3361f SHA256 720e07da6f3163346db9d01fff1b8771aaf145c2d406a4e88435826a38de0134
-EBUILD cinnamon-1.1.3.ebuild 6855 RMD160 a8011a3edf141fe3753b8c500c70a4fce803502d SHA1 6911c1116c505d305dc4831509d3f6a93f1d7d98 SHA256 eac6f4f40bf5554d5ad3a750f00a008faf2daf4e1529a86a0da819fbc4e6f58a
-EBUILD cinnamon-1.2-r1.ebuild 7521 RMD160 40f4ad3d0a5cd7605aa009f46f898bc76a1a358d SHA1 ecb96593304b1aafde726e8ca3a88a17f88dfc75 SHA256 42536c29b56a8ee56305cc66da512f276418070bd09d77d9f97a130f239858c6
-MISC ChangeLog 1873 RMD160 461f73a43ac110e403be744762e14e7b34bd916f SHA1 3ddd34c91900ccea1d9fe582b39d4dcb9497efd5 SHA256 48380461e749c1a16fb33ed1fb10124ab243ba2a9e87702eaf058291bc0d98a5
+EBUILD cinnamon-1.2-r1.ebuild 7616 RMD160 c3470aae62d24ec763a43e94cd509717777e5e54 SHA1 612e7cf8c308d783ce14a072b84c4e6196f0865d SHA256 1c1bbf5ed01e259fad869238063b9e8a0932ff40ae2c6c53fed5249af823cc36
+MISC ChangeLog 2062 RMD160 e0ee08fd502ddf48c10d89a12fc49e5532a72c9c SHA1 44970352e55d2e32b350dfa56566b57a7192384d SHA256 eeefc2ee051386bda15a7b7d5d68fe19afab539419517340525e4de939d2ce53
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8xkqkACgkQdjK8w9WeBnB4jwD/eE0eutO+5NZqh0LgXWy2wa34
-2Kzt1aP8u8hDlY33qOcBAJRajZwdP2mKH8RRclEAC8JsmzVgjoU57XviKqmm4rA+
-=0ULh
+iF4EAREIAAYFAk855uYACgkQdjK8w9WeBnCOtQD+KgIL+gsITxc+LF1CoveACS9d
+wK4oaSRdA8GPQKed2RsA+QFoDPq++cATeC8T7Pk3uI/tEvL05c5rsn5ewqpmEIOi
+=t77Q
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild b/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild
deleted file mode 100644
index 11a17b9e2142..000000000000
--- a/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild,v 1.3 2012/02/07 21:07:47 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.5"
-
-inherit autotools eutils gnome2 multilib python
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz
-	https://github.com/downloads/linuxmint/Cinnamon/cinnamon-session_1.0.0_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluetooth"
-KEYWORDS="~amd64 ~x86"
-
-# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
-# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
-# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
-# libXfixes-5.0 needed for pointer barriers
-# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome
-COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
-	>=dev-libs/gjs-1.29.18
-	>=dev-libs/gobject-introspection-0.10.1
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	app-misc/ca-certificates
-	>=dev-libs/folks-0.5.2
-	>=dev-libs/json-glib-0.13.2
-	>=gnome-base/gnome-desktop-2.91.2:3
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-2.91.6
-	>=media-libs/gstreamer-0.10.16:0.10
-	>=media-libs/gst-plugins-base-0.10.16:0.10
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=net-libs/telepathy-glib-0.15.5[introspection]
-	>=net-misc/networkmanager-0.8.999[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-3.2.1[introspection]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	x11-libs/pango[introspection]
-	>=dev-libs/libcroco-0.6.2:0.6
-
-	gnome-base/gconf:2[introspection]
-	>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection]
-	gnome-base/librsvg
-	media-libs/libcanberra
-	media-sound/pulseaudio
-
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[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
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/pango[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-
-	>=gnome-base/gnome-settings-daemon-2.91
-	>=gnome-base/gnome-control-center-2.91.92-r1
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/pkgconfig-0.22
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	|| ( app-arch/deb2targz sys-devel/binutils )
-	!!=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}/linuxmint-Cinnamon-dae5da1"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	# Don't error out on warnings
-	G2CONF="${G2CONF}
-		--enable-compile-warnings=maximum
-		--disable-schemas-compile
-		--disable-jhbuild-wrapper-script
-		$(use_with bluetooth)
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	default
-	cd "${WORKDIR}"
-	unpack ./data.tar.gz
-}
-
-src_prepare() {
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
-
-	# Do not depend on libgnome (patch from gnome-shell 3.3.x)
-	epatch "${FILESDIR}/${PN}-1.1.3-extensionjs_path.patch"
-	epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch"
-
-	# Gentoo uses /usr/libexec
-	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
-		-i "${WORKDIR}/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
-	# Note: sed Makefile.in because it is generated from several Makefile.ams
-	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
-		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 2 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${D}"/usr/bin/cinnamon-extension-tool
-
-	insinto /usr/share/gnome-session/sessions/
-	doins "${WORKDIR}/usr/share/gnome-session/sessions/cinnamon.session"
-	insinto /usr/share/xsessions/
-	doins "${WORKDIR}/usr/share/xsessions/cinnamon.desktop"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
-	   ! has_version 'media-plugins/gst-plugins-vp8'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
-		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.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 use GNOME in"
-		ewarn "fallback mode, or switch to open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]"; 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
-
-	if has_version "media-libs/mesa[video_cards_intel]"; then
-		elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers."
-		elog "Make sure that classic architecture for i915 and i965 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[classic]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=classic."
-		fi
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
index b1ea8c7ff152..bf09148e14ed 100644
--- a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.3 2012/02/04 18:14:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild,v 1.4 2012/02/14 04:45:20 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -74,6 +74,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 # 6. caribou needed for on-screen keyboard
 # 7. xdg-utils needed for xdg-open, used by extension tool
 # 8. gconf-python needed for cinnamon-settings
+# 9. gnome-icon-theme-symbolic needed for various icons
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -92,6 +93,8 @@ RDEPEND="${COMMON_DEPEND}
 
 	dev-python/gconf-python:2
 
+	x11-themes/gnome-icon-theme-symbolic
+
 	networkmanager? (
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )"