commit: a7f88142c85368ee38e755ce023d60a3f5b1aa1f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 23:21:12 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 23:30:27 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a7f88142
gnome-base/gnome-session: 3.12.1-r1 → 3.14.0
---
.../files/{defaults.list-r1 => defaults.list-r2} | 86 +++++++++++-----------
...n-3.12.1.ebuild => gnome-session-3.14.0.ebuild} | 7 +-
gnome-base/gnome-session/gnome-session-9999.ebuild | 7 +-
3 files changed, 49 insertions(+), 51 deletions(-)
diff --git a/gnome-base/gnome-session/files/defaults.list-r1
b/gnome-base/gnome-session/files/defaults.list-r2
similarity index 86%
rename from gnome-base/gnome-session/files/defaults.list-r1
rename to gnome-base/gnome-session/files/defaults.list-r2
index e3aa854..0d98512 100644
--- a/gnome-base/gnome-session/files/defaults.list-r1
+++ b/gnome-base/gnome-session/files/defaults.list-r2
@@ -61,49 +61,49 @@ image/tiff=evince.desktop;
application/x-cbr=evince.desktop;
application/x-cbz=evince.desktop;
application/x-cb7=evince.desktop;
-application/x-7z-compressed=file-roller.desktop;
-application/x-7z-compressed-tar=file-roller.desktop;
-application/x-ace=file-roller.desktop;
-application/x-alz=file-roller.desktop;
-application/x-ar=file-roller.desktop;
-application/x-arj=file-roller.desktop;
-application/x-bzip=file-roller.desktop;
-application/x-bzip-compressed-tar=file-roller.desktop;
-application/x-bzip1=file-roller.desktop;
-application/x-bzip1-compressed-tar=file-roller.desktop;
-application/x-cabinet=file-roller.desktop;
-application/x-cd-image=file-roller.desktop;
-application/x-compress=file-roller.desktop;
-application/x-compressed-tar=file-roller.desktop;
-application/x-cpio=file-roller.desktop;
-application/x-deb=file-roller.desktop;
-application/x-ear=file-roller.desktop;
-application/x-gtar=file-roller.desktop;
-application/x-gzip=file-roller.desktop;
-application/x-java-archive=file-roller.desktop;
-application/x-lha=file-roller.desktop;
-application/x-lhz=file-roller.desktop;
-application/x-lzip=file-roller.desktop;
-application/x-lzip-compressed-tar=file-roller.desktop;
-application/x-lzma=file-roller.desktop;
-application/x-lzma-compressed-tar=file-roller.desktop;
-application/x-lzop=file-roller.desktop;
-application/x-lzop-compressed-tar=file-roller.desktop;
-application/x-rar=file-roller.desktop;
-application/x-rar-compressed=file-roller.desktop;
-application/x-rpm=file-roller.desktop;
-application/x-rzip=file-roller.desktop;
-application/x-tar=file-roller.desktop;
-application/x-tarz=file-roller.desktop;
-application/x-stuffit=file-roller.desktop;
-application/x-war=file-roller.desktop;
-application/x-xz=file-roller.desktop;
-application/x-xz-compressed-tar=file-roller.desktop;
-application/x-zip=file-roller.desktop;
-application/x-zip-compressed=file-roller.desktop;
-application/x-zoo=file-roller.desktop;
-application/zip=file-roller.desktop;
-multipart/x-zip=file-roller.desktop;
+application/x-7z-compressed=org.gnome.FileRoller.desktop;
+application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-ace=org.gnome.FileRoller.desktop;
+application/x-alz=org.gnome.FileRoller.desktop;
+application/x-ar=org.gnome.FileRoller.desktop;
+application/x-arj=org.gnome.FileRoller.desktop;
+application/x-bzip=org.gnome.FileRoller.desktop;
+application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-bzip1=org.gnome.FileRoller.desktop;
+application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cabinet=org.gnome.FileRoller.desktop;
+application/x-cd-image=org.gnome.FileRoller.desktop;
+application/x-compress=org.gnome.FileRoller.desktop;
+application/x-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-cpio=org.gnome.FileRoller.desktop;
+application/x-deb=org.gnome.FileRoller.desktop;
+application/x-ear=org.gnome.FileRoller.desktop;
+application/x-gtar=org.gnome.FileRoller.desktop;
+application/x-gzip=org.gnome.FileRoller.desktop;
+application/x-java-archive=org.gnome.FileRoller.desktop;
+application/x-lha=org.gnome.FileRoller.desktop;
+application/x-lhz=org.gnome.FileRoller.desktop;
+application/x-lzip=org.gnome.FileRoller.desktop;
+application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzma=org.gnome.FileRoller.desktop;
+application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-lzop=org.gnome.FileRoller.desktop;
+application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-rar=org.gnome.FileRoller.desktop;
+application/x-rar-compressed=org.gnome.FileRoller.desktop;
+application/x-rpm=org.gnome.FileRoller.desktop;
+application/x-rzip=org.gnome.FileRoller.desktop;
+application/x-tar=org.gnome.FileRoller.desktop;
+application/x-tarz=org.gnome.FileRoller.desktop;
+application/x-stuffit=org.gnome.FileRoller.desktop;
+application/x-war=org.gnome.FileRoller.desktop;
+application/x-xz=org.gnome.FileRoller.desktop;
+application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
+application/x-zip=org.gnome.FileRoller.desktop;
+application/x-zip-compressed=org.gnome.FileRoller.desktop;
+application/x-zoo=org.gnome.FileRoller.desktop;
+application/zip=org.gnome.FileRoller.desktop;
+multipart/x-zip=org.gnome.FileRoller.desktop;
text/plain=gedit.desktop;
text/css=gedit.desktop;
text/javascript=gedit.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.12.1.ebuild
b/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
similarity index 95%
rename from gnome-base/gnome-session/gnome-session-3.12.1.ebuild
rename to gnome-base/gnome-session/gnome-session-3.14.0.ebuild
index bb2c3ff..323a886 100644
--- a/gnome-base/gnome-session/gnome-session-3.12.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.14.0.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="Gnome session manager"
HOMEPAGE="https://git.gnome.org/browse/gnome-session";
@@ -20,7 +20,7 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome
below).
# gdk-pixbuf used in the inhibit dialog
COMMON_DEPEND="
- >=dev-libs/glib-2.35.0:2
+ >=dev-libs/glib-2.40.0:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/json-glib-0.10
@@ -75,7 +75,6 @@ src_configure() {
# switch, even if USE=-doc
gnome2_src_configure \
--disable-deprecation-flags \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
@@ -96,7 +95,7 @@ src_install() {
dodir /usr/share/gnome/applications/
insinto /usr/share/gnome/applications/
- newins "${FILESDIR}/defaults.list-r1" defaults.list
+ newins "${FILESDIR}/defaults.list-r2" defaults.list
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild
b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 263c849..2e040da 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -27,7 +27,7 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome
below).
# gdk-pixbuf used in the inhibit dialog
COMMON_DEPEND="
- >=dev-libs/glib-2.35.0:2
+ >=dev-libs/glib-2.40.0:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/json-glib-0.10
@@ -82,7 +82,6 @@ src_configure() {
# switch, even if USE=-doc
gnome2_src_configure \
--disable-deprecation-flags \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
@@ -103,7 +102,7 @@ src_install() {
dodir /usr/share/gnome/applications/
insinto /usr/share/gnome/applications/
- newins "${FILESDIR}/defaults.list-r1" defaults.list
+ newins "${FILESDIR}/defaults.list-r2" defaults.list
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
