Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 435828 - gnome-extra/cinnamon-1.6.0 version bump request
Summary: gnome-extra/cinnamon-1.6.0 version bump request
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] GNOME (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo Linux Gnome Desktop Team
URL:
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2012-09-22 08:23 UTC by Anton Bolshakov
Modified: 2012-09-28 08:13 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
cinnamon-1.6.0.ebuild (cinnamon-1.6.0.ebuild,7.60 KB, text/plain)
2012-09-22 08:23 UTC, Anton Bolshakov
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Anton Bolshakov 2012-09-22 08:23:02 UTC
Created attachment 324592 [details]
cinnamon-1.6.0.ebuild

The attached ebuild is based on a copy from gentoo-zh overlay.


@@ -95,6 +95,7 @@
 
 	dev-python/dbus-python
 	dev-python/gconf-python:2
+	dev-python/imaging
 
 	x11-themes/gnome-icon-theme-symbolic
 
@@ -122,7 +123,6 @@
 		--disable-schemas-compile
 		--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"
 	python_set_active_version 2
Comment 1 Jeroen Roovers (RETIRED) gentoo-dev 2012-09-22 17:00:30 UTC
Comment on attachment 324592 [details]
cinnamon-1.6.0.ebuild

--- cinnamon-1.4_p1-r1.ebuild   2012-09-11 10:27:57.000000000 +0200
+++ -   2012-09-22 18:59:47.833475026 +0200
@@ -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.4_p1-r1.ebuild,v 1.1 2012/09/11 08:27:57 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.4.ebuild,v 1.4 2012/05/22 03:22:44 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,15 +8,12 @@
 PYTHON_DEPEND="2:2.5"
 PYTHON_USE_WITH="xml"
 
-inherit autotools eutils gnome2 multilib pax-utils python
+inherit autotools eutils gnome2 multilib pax-utils python vcs-snapshot
 
 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/tarball/${MY_PV} -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,25 +25,25 @@
 # 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
+COMMON_DEPEND=">=dev-libs/glib-2.30: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]
+       >=x11-libs/gtk+-3.4[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[introspection]
-       >=gnome-base/gsettings-desktop-schemas-2.91.91
-       >=gnome-extra/evolution-data-server-2.91.6
+       >=gnome-base/gnome-desktop-3.4:3[introspection]
+       >=gnome-base/gsettings-desktop-schemas-3.4
+       >=gnome-extra/evolution-data-server-3.4
        >=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]
        >=sys-auth/polkit-0.100[introspection]
-       >=x11-wm/muffin-1.0.2[introspection]
+       >=x11-wm/muffin-1.1.0
 
        dev-libs/dbus-glib
        dev-libs/libxml2:2
@@ -54,7 +51,7 @@
        >=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/gnome-menus-3.4:3[introspection]
        gnome-base/librsvg
        media-libs/libcanberra
        media-sound/pulseaudio
@@ -80,7 +77,6 @@
 # 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
-# 11. timedated or DateTimeMechanism implementation for cinnamon-settings
 RDEPEND="${COMMON_DEPEND}
        >=gnome-base/dconf-0.4.1
        >=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -99,20 +95,16 @@
 
        dev-python/dbus-python
        dev-python/gconf-python:2
+       dev-python/imaging
 
        x11-themes/gnome-icon-theme-symbolic
 
        dev-python/pygtk
-       gnome-base/gnome-menus:0[python]
+       gnome-base/gnome-menus: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[introspection]
-       >=gnome-base/gsettings-desktop-schemas-2.91.91
-       >=gnome-extra/evolution-data-server-2.91.6
+       >=gnome-base/gnome-desktop-3.4:3[introspection]
+       >=gnome-base/gsettings-desktop-schemas-3.4
+       >=gnome-extra/evolution-data-server-3.4
        >=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]
        >=sys-auth/polkit-0.100[introspection]
-       >=x11-wm/muffin-1.0.2[introspection]
+       >=x11-wm/muffin-1.1.0

        dev-libs/dbus-glib
        dev-libs/libxml2:2
@@ -54,7 +51,7 @@
        >=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/gnome-menus-3.4:3[introspection]
        gnome-base/librsvg
        media-libs/libcanberra
        media-sound/pulseaudio
@@ -80,7 +77,6 @@
 # 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
-# 11. timedated or DateTimeMechanism implementation for cinnamon-settings
 RDEPEND="${COMMON_DEPEND}
        >=gnome-base/dconf-0.4.1
        >=gnome-base/libgnomekbd-2.91.4[introspection]
@@ -99,20 +95,16 @@

        dev-python/dbus-python
        dev-python/gconf-python:2
+       dev-python/imaging

        x11-themes/gnome-icon-theme-symbolic

        dev-python/pygtk
-       gnome-base/gnome-menus:0[python]
+       gnome-base/gnome-menus:3[introspection]

-       || (
-               app-admin/openrc-settingsd
-               >=sys-apps/systemd-30
-               <gnome-base/gnome-settings-daemon-3.3.5 )
+       net-misc/mobile-broadband-provider-info
+       sys-libs/timezone-data "

-       networkmanager? (
-               net-misc/mobile-broadband-provider-info
-               sys-libs/timezone-data )"
 DEPEND="${COMMON_DEPEND}
        >=sys-devel/gettext-0.17
        virtual/pkgconfig
@@ -122,7 +114,6 @@
 # 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-af1653f"
 
 pkg_setup() {
        DOCS="AUTHORS NEWS README"
@@ -132,7 +123,6 @@
                --disable-schemas-compile
                --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"
        python_set_active_version 2
@@ -143,18 +133,6 @@
        # Fix automagic gnome-bluetooth dep, bug #398145
        epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"

-       # Make networkmanager optional, bug #398593
-       epatch "${FILESDIR}/${PN}-1.3.1-optional-networkmanager.patch"
-
-       # Fix building with gnome-bluetooth-3.4
-       epatch "${FILESDIR}/${MY_P}-gnome-bluetooth-3.4-"{1,2}.patch
-
-       # cinnamon-settings spin button fix, in UP2
-       epatch "${FILESDIR}/${MY_P}-spin-buttons.patch"
-
-       # https://github.com/linuxmint/Cinnamon/issues/515, bug #434494
-       epatch "${FILESDIR}/${MY_P}-timedated.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"
Comment 2 Mark Wood 2012-09-28 02:57:46 UTC
1.6.1 is now available, info here: http://cinnamon.linuxmint.com/?p=216
Comment 3 Alexandre Rostovtsev (RETIRED) gentoo-dev 2012-09-28 08:13:44 UTC
gnome-extra/cinnamon-1.6.1, x11-wm/muffin-1.1.1, and gnome-extra/nemo-1.0.2 are now in portage.

>*cinnamon-1.6.1 (28 Sep 2012)
>
>  28 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cinnamon-1.4.ebuild,
>  cinnamon-1.4_p1.ebuild, cinnamon-1.4_p1-r1.ebuild, +cinnamon-1.6.1.ebuild,
>  +files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch,
>  +files/cinnamon-1.6.1-optional-networkmanager.patch:
>  Version bump to the stable 1.6 series (bug #435828, thanks to Anton
>  Bolshakov). Lots of new features - nameable workspaces, new applets, and a
>  new file manager. See http://cinnamon.linuxmint.com/?p=207 and
>  http://cinnamon.linuxmint.com/?p=216 for the release notes.