Version bump, see http://cinnamon.linuxmint.com/?p=182 for the release notes. Drop old.

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

3 files changed, 43 insertions, 22 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 8d0651c60c99..b7b8a16a94cd 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2012/02/21 01:33:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.10 2012/03/15 06:05:24 tetromino Exp $
+
+*cinnamon-1.4 (15 Mar 2012)
+
+  15 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cinnamon-1.2-r1.ebuild, +cinnamon-1.4.ebuild:
+  Version bump, see http://cinnamon.linuxmint.com/?p=182 for the release notes.
+  Drop old.
 
 *cinnamon-1.3.1 (21 Feb 2012)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e911b871edb8..27dfaa93be53 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -6,16 +6,16 @@ AUX cinnamon-1.1.3-extensionjs_path.patch 1136 RMD160 8fea3328501f749dcd9e1459b9
 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
 AUX cinnamon-1.3.1-optional-networkmanager.patch 6649 RMD160 458403c896c245240207d034b74218031d71331d SHA1 2207b02f60694f267d4511fb4538565618873750 SHA256 37bb34e61dbf4700d1a7ff92a47b1544a35edf3fc4eb5d863c295e2372613f01
-DIST cinnamon-1.2.tar.gz 2375269 RMD160 66844177f0b9a331c2bf59434ffbfa39504f4854 SHA1 bdf91cef0e01ccbdf4d1b4e35c0f51ad04adacbd SHA256 caa83d0536bc08e2446277bb744efdf141b40cf705f4cf86ffbb91dea5d6d488
 DIST cinnamon-1.3.1.tar.gz 2401810 RMD160 ee4247eb7c9cf4350b3587e61c7cc53a9f31b836 SHA1 9461223ace49a3a05c12bb17c51d2c1e87574fc3 SHA256 fc31110c746c2597aff3a05045a3e8082d0d850add333f87ca3f665e4139dd02
-EBUILD cinnamon-1.2-r1.ebuild 7616 RMD160 c3470aae62d24ec763a43e94cd509717777e5e54 SHA1 612e7cf8c308d783ce14a072b84c4e6196f0865d SHA256 1c1bbf5ed01e259fad869238063b9e8a0932ff40ae2c6c53fed5249af823cc36
+DIST cinnamon-1.4.tar.gz 2639153 RMD160 2282c0adb00d199f8dbf11f9e5a35600784aa795 SHA1 405db74662f23e99cc5646e74d2b5581adc860b5 SHA256 26fa922bfd73d3b8f4c954e6b79b97450bd6be4875680acafd823814bfd6d20f
 EBUILD cinnamon-1.3.1.ebuild 7851 RMD160 12929940d6362aeb4bdcea5a3d572faf258735b9 SHA1 a742e269158450da4781229eb4c996af651cea96 SHA256 e6a9b2204bbe753108c0b636f635dca233c4e5f50cc9a735174512d42b345a20
-MISC ChangeLog 2320 RMD160 ddb55f18fe39126853db6fa16f607f73613fa3ca SHA1 73a0686289408ed5cf96c9969fab993b3d9558c5 SHA256 dbd78a141a29bf1240a7f8c408f7940f4f9e8e89b9b08807d8eb49de2ab66a9d
+EBUILD cinnamon-1.4.ebuild 7994 RMD160 7307d14543b48935159e3230d18744d17fd45e91 SHA1 3ca1d630b5509d1311f91a567600248876816064 SHA256 fdc100a20f2aa5cec8115a4a193a49f1fb4cc4c6b12e676f03c38fc52b3ac160
+MISC ChangeLog 2551 RMD160 018304e499deab166160491e13831df45d59aa74 SHA1 98b44fcdf1298c67517dceb87f8c78e6b126c541 SHA256 d2bf79798d7520d1bc6ebfefba5b7626e1631dcade41ca92f888b38a82ca3ffd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9C9FgACgkQdjK8w9WeBnAtUwEAuoKRL65zmgo7ZoM9Udwq+c2Z
-a+ZwUJWDbUGNztEf1c8A/05BRGU8xm5ib2kOFQg7BZaxdB19kslpbYET0+snAMO/
-=NSg3
+iF4EAREIAAYFAk9hhqoACgkQdjK8w9WeBnDt2QD9FbV4thxUdPhDCyflYtvusIYf
+Y/OHu+gAXYbXSkqueDIA/i9/JCX/VeettyUwxpjnBE5OZrEeZWLSBn8Yuv4uhzGC
+=BIWn
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild b/gnome-extra/cinnamon/cinnamon-1.4.ebuild
index bf09148e14ed..bb208e2fc58c 100644
--- a/gnome-extra/cinnamon/cinnamon-1.2-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.4.ebuild
@@ -1,11 +1,12 @@
 # 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.4 2012/02/14 04:45:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4.ebuild,v 1.1 2012/03/15 06:05:24 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="xml"
 
 inherit autotools eutils gnome2 multilib pax-utils python
 
@@ -33,7 +34,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 	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/gnome-desktop-2.91.2:3[introspection]
 	>=gnome-base/gsettings-desktop-schemas-2.91.91
 	>=gnome-extra/evolution-data-server-2.91.6
 	>=media-libs/gstreamer-0.10.16:0.10
@@ -42,7 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 	net-libs/libsoup:2.4[introspection]
 	>=net-libs/telepathy-glib-0.15.5[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/muffin-1.0.0[introspection]
+	>=x11-wm/muffin-1.0.2[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
@@ -75,6 +76,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
 # 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
+# 10. pygtk and gnome-menus:0 needed for menu editor
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -91,10 +93,14 @@ RDEPEND="${COMMON_DEPEND}
 
 	x11-misc/xdg-utils
 
+	dev-python/dbus-python
 	dev-python/gconf-python:2
 
 	x11-themes/gnome-icon-theme-symbolic
 
+	dev-python/pygtk
+	gnome-base/gnome-menus:0[python]
+
 	networkmanager? (
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )"
@@ -106,7 +112,8 @@ DEPEND="${COMMON_DEPEND}
 	!!=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-185383f"
+
+S="${WORKDIR}/linuxmint-Cinnamon-a8b1a03"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS README"
@@ -128,26 +135,32 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
 
 	# Make networkmanager optional, bug #398593
-	epatch "${FILESDIR}/${PN}-1.2-optional-networkmanager.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"
+	epatch "${FILESDIR}/${PN}-1.3.1-optional-networkmanager.patch"
 
 	# Gentoo uses /usr/libexec
 	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
 		-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
 
 	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/cinnamon-settings:/usr/$(get_libdir)/cinnamon-settings:" \
+	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+		-i files/usr/bin/cinnamon-menu-editor \
+		-i files/usr/bin/cinnamon-settings \
+		-i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \
 		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		   files/usr/bin/cinnamon-settings \
-		   files/cinnamon-settings.pot \
-		   files/makepot || die "sed 2 failed"
+		-i files/generate_desktop_files || die "sed 2 failed"
 	if [[ "$(get_libdir)" != lib ]]; then
 		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
 	fi
 
+	if ! use bluetooth; then
+		rm -rv files/usr/share/cinnamon/applets/bluetooth@cinnamon.org || die
+	fi
+
+	if ! use networkmanager; then
+		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+	fi
+
 	eautoreconf
 	gnome2_src_prepare
 
@@ -160,6 +173,7 @@ src_prepare() {
 src_install() {
 	gnome2_src_install
 	python_convert_shebangs 2 "${ED}usr/bin/cinnamon-extension-tool" \
+		"${ED}usr/bin/cinnamon-menu-editor" \
 		"${ED}usr/bin/cinnamon-settings" \
 		"${ED}usr/$(get_libdir)/cinnamon-settings/cinnamon-settings.py"
 
@@ -169,7 +183,7 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize /usr/$(get_libdir)/cinnamon-settings
+	python_mod_optimize "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
 
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
 	   ! has_version 'media-plugins/gst-plugins-vp8'; then
@@ -212,5 +226,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/cinnamon-settings
+	python_mod_cleanup "/usr/$(get_libdir)/"cinnamon-{menu-editor,settings}
 }