diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-09-22 13:10:12 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-09-22 13:10:12 +0000 |
commit | f014a73b99d68b70052fdce42b1362b001044855 (patch) | |
tree | aa8b824a5103002fdc13985e02353a754c303c5e /gnome-base/gnome-session | |
parent | Stable on ppc/ppc64, bug #522820 (diff) | |
download | gentoo-2-f014a73b99d68b70052fdce42b1362b001044855.tar.gz gentoo-2-f014a73b99d68b70052fdce42b1362b001044855.tar.bz2 gentoo-2-f014a73b99d68b70052fdce42b1362b001044855.zip |
file-roller desktop file was renamed at this cycle, drop old
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'gnome-base/gnome-session')
-rw-r--r-- | gnome-base/gnome-session/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-base/gnome-session/files/defaults.list-r2 | 334 | ||||
-rw-r--r-- | gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild (renamed from gnome-base/gnome-session/gnome-session-3.10.1.ebuild) | 32 |
3 files changed, 355 insertions, 19 deletions
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog index 357a0074e596..7f39dda35056 100644 --- a/gnome-base/gnome-session/ChangeLog +++ b/gnome-base/gnome-session/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/gnome-session # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.340 2014/07/27 08:44:05 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.341 2014/09/22 13:10:12 pacho Exp $ + +*gnome-session-3.12.1-r1 (22 Sep 2014) + + 22 Sep 2014; Pacho Ramos <pacho@gentoo.org> +files/defaults.list-r2, + +gnome-session-3.12.1-r1.ebuild, -gnome-session-3.10.1.ebuild: + file-roller desktop file was renamed at this cycle, drop old 27 Jul 2014; Pacho Ramos <pacho@gentoo.org> gnome-session-3.12.1.ebuild: Newer glib is needed per bug #518074 by Hans de Graff diff --git a/gnome-base/gnome-session/files/defaults.list-r2 b/gnome-base/gnome-session/files/defaults.list-r2 new file mode 100644 index 000000000000..0d98512dbb0b --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list-r2 @@ -0,0 +1,334 @@ +[Default Applications] +application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/x-abiword=abiword.desktop; +text/abiword=abiword.desktop; +text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop; +text/x-abiword=abiword.desktop; +text/x-xml-abiword=abiword.desktop; +x-content/blank-bd=brasero-nautilus.desktop; +x-content/blank-dvd=brasero-nautilus.desktop; +x-content/blank-cd=brasero-nautilus.desktop; +x-content/blank-hddvd=brasero-nautilus.desktop; +application/x-dia-diagram=dia.desktop; +image/bmp=eog.desktop; +image/gif=eog.desktop; +image/jpeg=eog.desktop; +image/jpg=eog.desktop; +image/pjpeg=eog.desktop; +image/png=eog.desktop; +image/svg+xml=eog.desktop; +image/svg+xml-compressed=eog.desktop; +image/x-bmp=eog.desktop; +image/x-gray=eog.desktop; +image/x-icb=eog.desktop; +image/x-ico=eog.desktop; +image/x-pcx=eog.desktop; +image/x-png=eog.desktop; +image/x-portable-anymap=eog.desktop; +image/x-portable-bitmap=eog.desktop; +image/x-portable-graymap=eog.desktop; +image/x-portable-pixmap=eog.desktop; +image/x-xbitmap=eog.desktop; +image/x-xpixmap=eog.desktop; +image/vnd.wap.wbmp=eog.desktop; +image/g3fax=gimp.desktop; +image/x-compressed-xcf=gimp.desktop; +image/x-fits=gimp.desktop; +image/x-icon=gimp.desktop; +image/x-psd=gimp.desktop; +image/x-sgi=gimp.desktop; +image/x-sun-raster=gimp.desktop; +image/x-tga=gimp.desktop; +image/x-xcf=gimp.desktop; +image/x-xwindowdump=gimp.desktop; +application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +application/pdf=evince.desktop; +application/x-bzpdf=evince.desktop; +application/x-gzpdf=evince.desktop; +application/postscript=evince.desktop; +application/x-bzpostscript=evince.desktop; +application/x-gzpostscript=evince.desktop; +image/x-eps=evince.desktop; +image/x-bzeps=evince.desktop; +image/x-gzeps=evince.desktop; +application/x-dvi=evince.desktop; +application/x-bzdvi=evince.desktop; +application/x-gzdvi=evince.desktop; +image/vnd.djvu=evince.desktop; +image/tiff=evince.desktop; +application/x-cbr=evince.desktop; +application/x-cbz=evince.desktop; +application/x-cb7=evince.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; +text/mathml=gedit.desktop; +text/x-csrc=gedit.desktop; +text/x-chdr=gedit.desktop; +text/x-dtd=gedit.desktop; +text/x-java=gedit.desktop; +text/x-javascript=gedit.desktop; +text/x-patch=gedit.desktop; +text/x-perl=gedit.destkop +text/x-php=gedit.destkop +text/x-python=gedit.destkop +text/x-sql=gedit.desktop; +text/xml=gedit.desktop; +application/javascript=gedit.destkop +application/x-cgi=gedit.desktop; +application/x-javascript=gedit.desktop; +application/x-perl=gedit.desktop; +application/x-php=gedit.desktop; +application/x-python=gedit.desktop; +application/xml=gedit.desktop; +application/xml-dtd=gedit.desktop; +application/x-font-ttf=gnome-font-viewer.desktop; +application/x-font-pcf=gnome-font-viewer.desktop; +application/x-font-type1=gnome-font-viewer.desktop; +application/x-font-otf=gnome-font-viewer.desktop; +application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-applix-spreadsheet=gnumeric.desktop; +application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-gnumeric=gnumeric.desktop; +application/x-mps=gnumeric.desktop; +application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-oleo=gnumeric.desktop; +application/x-planperfect=gnumeric.desktop; +application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/x-sc=gnumeric.desktop; +application/x-sylk=gnumeric.desktop; +application/x-xbase=gnumeric.desktop; +application/x-xls=gnumeric.desktop; +application/xls=gnumeric.desktop; +text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop; +zz-application/zz-winassoc-xls=gnumeric.desktop; +x-content/software=nautilus-autorun-software.desktop; +x-content/unix-software=nautilus-autorun-software.desktop; +x-directory/gnome-default-handler=nautilus-folder-handler.desktop;nautilus.desktop; +x-directory/normal=nautilus-folder-handler.desktop;nautilus.desktop; +inode/directory=nautilus-folder-handler.desktop;nautilus.desktop; +application/x-gnome-saved-search=nautilus-folder-handler.desktop;nautilus.desktop; +application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop; +application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop; +application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop; +application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop; +application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop; +application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop; +x-content/audio-player=rhythmbox.desktop; +x-content/audio-cdda=sound-juicer.desktop; +application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop; +application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop; +application/mxf=totem.desktop; +application/ogg=totem.desktop; +application/ram=totem.desktop; +application/sdp=totem.desktop; +application/smil=totem.desktop; +application/smil+xml=totem.desktop; +application/vnd.ms-wpl=totem.desktop; +application/vnd.rn-realmedia=totem.desktop; +application/x-extension-m4a=totem.desktop; +application/x-extension-mp4=totem.desktop; +application/x-flac=totem.desktop; +application/x-flash-video=totem.desktop; +application/x-matroska=totem.desktop; +application/x-netshow-channel=totem.desktop; +application/x-ogg=totem.desktop; +application/x-quicktime-media-link=totem.desktop; +application/x-quicktimeplayer=totem.desktop; +application/x-shorten=totem.desktop; +application/x-smil=totem.desktop; +application/xspf+xml=totem.desktop; +audio/3gpp=totem.desktop; +audio/ac3=totem.desktop; +audio/AMR=totem.desktop; +audio/AMR-WB=totem.desktop; +audio/basic=totem.desktop; +audio/midi=totem.desktop; +audio/mp4=totem.desktop; +audio/mpeg=totem.desktop; +audio/mpegurl=totem.desktop; +audio/ogg=totem.desktop; +audio/prs.sid=totem.desktop; +audio/vnd.rn-realaudio=totem.desktop; +audio/x-ape=totem.desktop; +audio/x-flac=totem.desktop; +audio/x-gsm=totem.desktop; +audio/x-it=totem.desktop; +audio/x-m4a=totem.desktop; +audio/x-matroska=totem.desktop; +audio/x-mod=totem.desktop; +audio/x-mp3=totem.desktop; +audio/x-mpeg=totem.desktop; +audio/x-mpegurl=totem.desktop; +audio/x-ms-asf=totem.desktop; +audio/x-ms-asx=totem.desktop; +audio/x-ms-wax=totem.desktop; +audio/x-ms-wma=totem.desktop; +audio/x-musepack=totem.desktop; +audio/x-pn-aiff=totem.desktop; +audio/x-pn-au=totem.desktop; +audio/x-pn-realaudio=totem.desktop; +audio/x-pn-realaudio-plugin=totem.desktop; +audio/x-pn-wav=totem.desktop; +audio/x-pn-windows-acm=totem.desktop; +audio/x-realaudio=totem.desktop; +audio/x-real-audio=totem.desktop; +audio/x-sbc=totem.desktop; +audio/x-scpls=totem.desktop; +audio/x-speex=totem.desktop; +audio/x-tta=totem.desktop; +audio/x-vorbis=totem.desktop; +audio/x-vorbis+ogg=totem.desktop; +audio/x-wav=totem.desktop; +audio/x-wavpack=totem.desktop; +audio/x-xm=totem.desktop; +image/vnd.rn-realpix=totem.desktop; +image/x-pict=totem.desktop; +misc/ultravox=totem.desktop; +text/google-video-pointer=totem.desktop; +text/x-google-video-pointer=totem.desktop; +video/3gpp=totem.desktop; +video/dv=totem.desktop; +video/fli=totem.desktop; +video/flv=totem.desktop; +video/mp2t=totem.desktop; +video/mp4=totem.desktop; +video/mp4v-es=totem.desktop; +video/mpeg=totem.desktop; +video/msvideo=totem.desktop; +video/ogg=totem.desktop; +video/quicktime=totem.desktop; +video/vivo=totem.desktop; +video/vnd.divx=totem.desktop; +video/vnd.rn-realvideo=totem.desktop; +video/vnd.vivo=totem.desktop; +video/webm=totem.desktop; +video/x-anim=totem.desktop; +video/x-avi=totem.desktop; +video/x-flc=totem.desktop; +video/x-fli=totem.desktop; +video/x-flic=totem.desktop; +video/x-flv=totem.desktop; +video/x-m4v=totem.desktop; +video/x-matroska=totem.desktop; +video/x-mpeg=totem.desktop; +video/x-ms-asf=totem.desktop; +video/x-ms-asx=totem.desktop; +video/x-msvideo=totem.desktop; +video/x-ms-wm=totem.desktop; +video/x-ms-wmv=totem.desktop; +video/x-ms-wmx=totem.desktop; +video/x-ms-wvx=totem.desktop; +video/x-nsv=totem.desktop; +video/x-ogm+ogg=totem.desktop; +video/x-theora+ogg=totem.desktop; +video/x-totem-stream=totem.desktop; +x-content/video-dvd=totem.desktop; +x-content/video-vcd=totem.desktop; +x-content/video-svcd=totem.desktop; +x-scheme-handler/ghelp=yelp.desktop; +x-scheme-handler/help=yelp.desktop; +x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop; +x-scheme-handler/mailto=evolution.desktop; diff --git a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild b/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild index e2e916da49e5..13d40ac4ed35 100644 --- a/gnome-base/gnome-session/gnome-session-3.10.1.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.8 2014/06/01 08:03:47 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.12.1-r1.ebuild,v 1.1 2014/09/22 13:10:12 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" -inherit eutils gnome2 +inherit gnome2 DESCRIPTION="Gnome session manager" HOMEPAGE="https://git.gnome.org/browse/gnome-session" LICENSE="GPL-2 LGPL-2 FDL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc elibc_FreeBSD gconf ipv6 systemd" # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and @@ -20,13 +20,12 @@ 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 >=dev-libs/dbus-glib-0.76 >=gnome-base/gnome-desktop-3.9.91:3= - || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) elibc_FreeBSD? ( dev-libs/libexecinfo ) virtual/opengl @@ -59,6 +58,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 + dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig !<gnome-base/gdm-2.20.4 @@ -69,25 +69,21 @@ DEPEND="${COMMON_DEPEND} # gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore -src_prepare() { - # Allow people to configure startup apps, bug #464968, upstream bug #663767 - sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die - - # Blacklist nv25 (from 'master') - epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch - - gnome2_src_prepare -} - src_configure() { + # 1. Avoid automagic on old upower releases + # 2. xsltproc is always checked due to man 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) \ $(use_enable ipv6) \ - $(use_enable systemd) + $(use_enable systemd) \ + UPOWER_CFLAGS="" \ + UPOWER_LIBS="" + # gnome-session-selector pre-generated man page is missing + #$(usex !doc XSLTPROC=$(type -P true)) } src_install() { @@ -99,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/ |