From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q89JR-0005Of-Ht for garchives@archives.gentoo.org; Fri, 08 Apr 2011 10:53:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A76151C011; Fri, 8 Apr 2011 10:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 400731C011 for ; Fri, 8 Apr 2011 10:52:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98FCE1B4035 for ; Fri, 8 Apr 2011 10:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 094F180065 for ; Fri, 8 Apr 2011 10:52:10 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <6c59899a85102161d5c1e3835a0472010578d37b.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-session/files/15-xdg-data-gnome gnome-base/gnome-session/files/defaults.list gnome-base/gnome-session/gnome-session-3.0.0.ebuild gnome-base/gnome-session/gnome-session-9999.ebuild X-VCS-Directories: gnome-base/gnome-session/files/ gnome-base/gnome-session/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 6c59899a85102161d5c1e3835a0472010578d37b Date: Fri, 8 Apr 2011 10:52:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f9274ac8c140c6dc26dea1f4694daca9 commit: 6c59899a85102161d5c1e3835a0472010578d37b Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Apr 7 14:30:18 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Apr 8 08:52:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D6c59899a gnome-base/gnome-session: QAed * Import changes from gentoo-x86 * Use proper phase name for configuration (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- gnome-base/gnome-session/files/15-xdg-data-gnome | 9 + gnome-base/gnome-session/files/defaults.list | 333 ++++++++++++++= ++++++ .../gnome-session/gnome-session-3.0.0.ebuild | 17 +- gnome-base/gnome-session/gnome-session-9999.ebuild | 17 +- 4 files changed, 366 insertions(+), 10 deletions(-) diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-bas= e/gnome-session/files/15-xdg-data-gnome new file mode 100644 index 0000000..e62f3e1 --- /dev/null +++ b/gnome-base/gnome-session/files/15-xdg-data-gnome @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ "$DESKTOP_SESSION" =3D "gnome" ]; then + if [ -z "$XDG_DATA_DIRS" ]; then + export XDG_DATA_DIRS=3D/usr/share/gnome:/usr/local/share/:/usr/share/ + else + export XDG_DATA_DIRS=3D/usr/share/gnome:"$XDG_DATA_DIRS" + fi +fi diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gn= ome-session/files/defaults.list new file mode 100644 index 0000000..1fee954 --- /dev/null +++ b/gnome-base/gnome-session/files/defaults.list @@ -0,0 +1,333 @@ +[Default Applications] +application/rtf=3Dabiword.desktop +application/x-abiword=3Dabiword.desktop +text/abiword=3Dabiword.desktop +text/richtext=3Dabiword.desktop +text/rtf=3Dabiword.desktop +text/x-abiword=3Dabiword.desktop +text/x-xml-abiword=3Dabiword.desktop +x-content/blank-bd=3Dbrasero-nautilus.desktop +x-content/blank-dvd=3Dbrasero-nautilus.desktop +x-content/blank-cd=3Dbrasero-nautilus.desktop +x-content/blank-hddvd=3Dbrasero-nautilus.desktop +application/x-dia-diagram=3Ddia.desktop +image/bmp=3Deog.desktop +image/gif=3Deog.desktop +image/jpeg=3Deog.desktop +image/jpg=3Deog.desktop +image/pjpeg=3Deog.desktop +image/png=3Deog.desktop +image/svg+xml=3Deog.desktop +image/svg+xml-compressed=3Deog.desktop +image/x-bmp=3Deog.desktop +image/x-gray=3Deog.desktop +image/x-icb=3Deog.desktop +image/x-ico=3Deog.desktop +image/x-pcx=3Deog.desktop +image/x-png=3Deog.desktop +image/x-portable-anymap=3Deog.desktop +image/x-portable-bitmap=3Deog.desktop +image/x-portable-graymap=3Deog.desktop +image/x-portable-pixmap=3Deog.desktop +image/x-xbitmap=3Deog.desktop +image/x-xpixmap=3Deog.desktop +image/vnd.wap.wbmp=3Deog.desktop +image/g3fax=3Dgimp.desktop +image/x-compressed-xcf=3Dgimp.desktop +image/x-fits=3Dgimp.desktop +image/x-icon=3Dgimp.desktop +image/x-psd=3Dgimp.desktop +image/x-sgi=3Dgimp.desktop +image/x-sun-raster=3Dgimp.desktop +image/x-tga=3Dgimp.desktop +image/x-xcf=3Dgimp.desktop +image/x-xwindowdump=3Dgimp.desktop +application/xhtml+xml=3Dfirefox.desktop;firefox-3.6.desktop;epiphany.des= ktop +text/html=3Dfirefox.desktop;firefox-3.6.desktop;epiphany.desktop +application/pdf=3Devince.desktop +application/x-bzpdf=3Devince.desktop +application/x-gzpdf=3Devince.desktop +application/postscript=3Devince.desktop +application/x-bzpostscript=3Devince.desktop +application/x-gzpostscript=3Devince.desktop +image/x-eps=3Devince.desktop +image/x-bzeps=3Devince.desktop +image/x-gzeps=3Devince.desktop +application/x-dvi=3Devince.desktop +application/x-bzdvi=3Devince.desktop +application/x-gzdvi=3Devince.desktop +image/vnd.djvu=3Devince.desktop +image/tiff=3Devince.desktop +application/x-cbr=3Devince.desktop +application/x-cbz=3Devince.desktop +application/x-cb7=3Devince.desktop +application/x-7z-compressed=3Dfile-roller.desktop +application/x-7z-compressed-tar=3Dfile-roller.desktop +application/x-ace=3Dfile-roller.desktop +application/x-alz=3Dfile-roller.desktop +application/x-ar=3Dfile-roller.desktop +application/x-arj=3Dfile-roller.desktop +application/x-bzip=3Dfile-roller.desktop +application/x-bzip-compressed-tar=3Dfile-roller.desktop +application/x-bzip1=3Dfile-roller.desktop +application/x-bzip1-compressed-tar=3Dfile-roller.desktop +application/x-cabinet=3Dfile-roller.desktop +application/x-cd-image=3Dfile-roller.desktop +application/x-compress=3Dfile-roller.desktop +application/x-compressed-tar=3Dfile-roller.desktop +application/x-cpio=3Dfile-roller.desktop +application/x-deb=3Dfile-roller.desktop +application/x-ear=3Dfile-roller.desktop +application/x-gtar=3Dfile-roller.desktop +application/x-gzip=3Dfile-roller.desktop +application/x-java-archive=3Dfile-roller.desktop +application/x-lha=3Dfile-roller.desktop +application/x-lhz=3Dfile-roller.desktop +application/x-lzip=3Dfile-roller.desktop +application/x-lzip-compressed-tar=3Dfile-roller.desktop +application/x-lzma=3Dfile-roller.desktop +application/x-lzma-compressed-tar=3Dfile-roller.desktop +application/x-lzop=3Dfile-roller.desktop +application/x-lzop-compressed-tar=3Dfile-roller.desktop +application/x-rar=3Dfile-roller.desktop +application/x-rar-compressed=3Dfile-roller.desktop +application/x-rpm=3Dfile-roller.desktop +application/x-rzip=3Dfile-roller.desktop +application/x-tar=3Dfile-roller.desktop +application/x-tarz=3Dfile-roller.desktop +application/x-stuffit=3Dfile-roller.desktop +application/x-war=3Dfile-roller.desktop +application/x-xz=3Dfile-roller.desktop +application/x-xz-compressed-tar=3Dfile-roller.desktop +application/x-zip=3Dfile-roller.desktop +application/x-zip-compressed=3Dfile-roller.desktop +application/x-zoo=3Dfile-roller.desktop +application/zip=3Dfile-roller.desktop +multipart/x-zip=3Dfile-roller.desktop +text/plain=3Dgedit.desktop +text/css=3Dgedit.desktop +text/javascript=3Dgedit.desktop +text/mathml=3Dgedit.desktop +text/x-csrc=3Dgedit.desktop +text/x-chdr=3Dgedit.desktop +text/x-dtd=3Dgedit.desktop +text/x-java=3Dgedit.desktop +text/x-javascript=3Dgedit.desktop +text/x-patch=3Dgedit.desktop +text/x-perl=3Dgedit.destkop +text/x-php=3Dgedit.destkop +text/x-python=3Dgedit.destkop +text/x-sql=3Dgedit.desktop +text/xml=3Dgedit.desktop +application/javascript=3Dgedit.destkop +application/x-cgi=3Dgedit.desktop +application/x-javascript=3Dgedit.desktop +application/x-perl=3Dgedit.desktop +application/x-php=3Dgedit.desktop +application/x-python=3Dgedit.desktop +application/xml=3Dgedit.desktop +application/xml-dtd=3Dgedit.desktop +application/x-font-ttf=3Dgnome-font-viewer.desktop +application/x-font-pcf=3Dgnome-font-viewer.desktop +application/x-font-type1=3Dgnome-font-viewer.desktop +application/x-font-otf=3Dgnome-font-viewer.desktop +application/csv=3Dgnumeric.desktop +application/excel=3Dgnumeric.desktop +application/msexcel=3Dgnumeric.desktop +application/tab-separated-values=3Dgnumeric.desktop +application/vnd.lotus-1-2-3=3Dgnumeric.desktop +application/vnd.ms-excel=3Dgnumeric.desktop +application/x-123=3Dgnumeric.desktop +application/x-applix-spreadsheet=3Dgnumeric.desktop +application/x-dbase=3Dgnumeric.desktop +application/x-dbf=3Dgnumeric.desktop +application/x-dos_ms_excel=3Dgnumeric.desktop +application/x-excel=3Dgnumeric.desktop +application/x-gnumeric=3Dgnumeric.desktop +application/x-mps=3Dgnumeric.desktop +application/x-ms-excel=3Dgnumeric.desktop +application/x-msexcel=3Dgnumeric.desktop +application/x-oleo=3Dgnumeric.desktop +application/x-planperfect=3Dgnumeric.desktop +application/x-quattropro=3Dgnumeric.desktop +application/x-sc=3Dgnumeric.desktop +application/x-sylk=3Dgnumeric.desktop +application/x-xbase=3Dgnumeric.desktop +application/x-xls=3Dgnumeric.desktop +application/xls=3Dgnumeric.desktop +text/comma-separated-values=3Dgnumeric.desktop +text/csv=3Dgnumeric.desktop +text/spreadsheet=3Dgnumeric.desktop +text/tab-separated-values=3Dgnumeric.desktop +text/x-comma-separated-values=3Dgnumeric.desktop +text/x-csv=3Dgnumeric.desktop +zz-application/zz-winassoc-xls=3Dgnumeric.desktop +x-content/software=3Dnautilus-autorun-software.desktop +x-directory/gnome-default-handler=3Dnautilus-folder-handler.desktop +x-directory/normal=3Dnautilus-folder-handler.desktop +inode/directory=3Dnautilus-folder-handler.desktop +application/x-gnome-saved-search=3Dnautilus-folder-handler.desktop +application/vnd.oasis.opendocument.spreadsheet=3Dopenoffice.org-calc.des= ktop +application/vnd.oasis.opendocument.spreadsheet-template=3Dopenoffice.org= -calc.desktop +application/vnd.sun.xml.calc=3Dopenoffice.org-calc.desktop +application/vnd.sun.xml.calc.template=3Dopenoffice.org-calc.desktop +application/vnd.stardivision.calc=3Dopenoffice.org-calc.desktop +application/vnd.stardivision.chart=3Dopenoffice.org-calc.desktop +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=3Dopen= office.org-calc.desktop +application/vnd.ms-excel.sheet.macroenabled.12=3Dopenoffice.org-calc.des= ktop +application/vnd.openxmlformats-officedocument.spreadsheetml.template=3Do= penoffice.org-calc.desktop +application/vnd.ms-excel.template.macroenabled.12=3Dopenoffice.org-calc.= desktop +application/vnd.ms-excel.sheet.binary.macroenabled.12=3Dopenoffice.org-c= alc.desktop +application/vnd.oasis.opendocument.graphics=3Dopenoffice.org-draw.deskto= p +application/vnd.oasis.opendocument.graphics-template=3Dopenoffice.org-dr= aw.desktop +application/vnd.sun.xml.draw=3Dopenoffice.org-draw.desktop +application/vnd.sun.xml.draw.template=3Dopenoffice.org-draw.desktop +application/vnd.stardivision.draw=3Dopenoffice.org-draw.desktop +application/vnd.oasis.opendocument.presentation=3Dopenoffice.org-impress= .desktop +application/vnd.oasis.opendocument.presentation-template=3Dopenoffice.or= g-impress.desktop +application/vnd.sun.xml.impress=3Dopenoffice.org-impress.desktop +application/vnd.sun.xml.impress.template=3Dopenoffice.org-impress.deskto= p +application/vnd.stardivision.impress=3Dopenoffice.org-impress.desktop +application/mspowerpoint=3Dopenoffice.org-impress.desktop +application/vnd.ms-powerpoint=3Dopenoffice.org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.presentatio= n=3Dopenoffice.org-impress.desktop +application/vnd.ms-powerpoint.presentation.macroenabled.12=3Dopenoffice.= org-impress.desktop +application/vnd.openxmlformats-officedocument.presentationml.template=3D= openoffice.org-impress.desktop +application/vnd.ms-powerpoint.template.macroenabled.12=3Dopenoffice.org-= impress.desktop +application/vnd.oasis.opendocument.formula=3Dopenoffice.org-math.desktop +application/vnd.sun.xml.math=3Dopenoffice.org-math.desktop +application/vnd.stardivision.math=3Dopenoffice.org-math.desktop +application/vnd.oasis.opendocument.text=3Dopenoffice.org-writer.desktop +application/vnd.oasis.opendocument.text-template=3Dopenoffice.org-writer= .desktop +application/vnd.oasis.opendocument.text-web=3Dopenoffice.org-writer.desk= top +application/vnd.oasis.opendocument.text-master=3Dopenoffice.org-writer.d= esktop +application/vnd.sun.xml.writer=3Dopenoffice.org-writer.desktop +application/vnd.sun.xml.writer.template=3Dopenoffice.org-writer.desktop +application/vnd.sun.xml.writer.global=3Dopenoffice.org-writer.desktop +application/vnd.stardivision.writer=3Dopenoffice.org-writer.desktop +application/msword=3Dopenoffice.org-writer.desktop +application/vnd.ms-word=3Dopenoffice.org-writer.desktop +application/x-doc=3Dopenoffice.org-writer.desktop +application/vnd.wordperfect=3Dopenoffice.org-writer.desktop +application/wordperfect=3Dopenoffice.org-writer.desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.document=3D= openoffice.org-writer.desktop +application/vnd.ms-word.document.macroenabled.12=3Dopenoffice.org-writer= .desktop +application/vnd.openxmlformats-officedocument.wordprocessingml.template=3D= openoffice.org-writer.desktop +application/vnd.ms-word.template.macroenabled.12=3Dopenoffice.org-writer= .desktop +x-content/audio-player=3Drhythmbox.desktop +x-content/audio-cdda=3Dsound-juicer.desktop +application/x-shockwave-flash=3Dswfdec-player.desktop +application/futuresplash=3Dswfdec-player.desktop +application/mxf=3Dtotem.desktop +application/ogg=3Dtotem.desktop +application/ram=3Dtotem.desktop +application/sdp=3Dtotem.desktop +application/smil=3Dtotem.desktop +application/smil+xml=3Dtotem.desktop +application/vnd.ms-wpl=3Dtotem.desktop +application/vnd.rn-realmedia=3Dtotem.desktop +application/x-extension-m4a=3Dtotem.desktop +application/x-extension-mp4=3Dtotem.desktop +application/x-flac=3Dtotem.desktop +application/x-flash-video=3Dtotem.desktop +application/x-matroska=3Dtotem.desktop +application/x-netshow-channel=3Dtotem.desktop +application/x-ogg=3Dtotem.desktop +application/x-quicktime-media-link=3Dtotem.desktop +application/x-quicktimeplayer=3Dtotem.desktop +application/x-shorten=3Dtotem.desktop +application/x-smil=3Dtotem.desktop +application/xspf+xml=3Dtotem.desktop +audio/3gpp=3Dtotem.desktop +audio/ac3=3Dtotem.desktop +audio/AMR=3Dtotem.desktop +audio/AMR-WB=3Dtotem.desktop +audio/basic=3Dtotem.desktop +audio/midi=3Dtotem.desktop +audio/mp4=3Dtotem.desktop +audio/mpeg=3Dtotem.desktop +audio/mpegurl=3Dtotem.desktop +audio/ogg=3Dtotem.desktop +audio/prs.sid=3Dtotem.desktop +audio/vnd.rn-realaudio=3Dtotem.desktop +audio/x-ape=3Dtotem.desktop +audio/x-flac=3Dtotem.desktop +audio/x-gsm=3Dtotem.desktop +audio/x-it=3Dtotem.desktop +audio/x-m4a=3Dtotem.desktop +audio/x-matroska=3Dtotem.desktop +audio/x-mod=3Dtotem.desktop +audio/x-mp3=3Dtotem.desktop +audio/x-mpeg=3Dtotem.desktop +audio/x-mpegurl=3Dtotem.desktop +audio/x-ms-asf=3Dtotem.desktop +audio/x-ms-asx=3Dtotem.desktop +audio/x-ms-wax=3Dtotem.desktop +audio/x-ms-wma=3Dtotem.desktop +audio/x-musepack=3Dtotem.desktop +audio/x-pn-aiff=3Dtotem.desktop +audio/x-pn-au=3Dtotem.desktop +audio/x-pn-realaudio=3Dtotem.desktop +audio/x-pn-realaudio-plugin=3Dtotem.desktop +audio/x-pn-wav=3Dtotem.desktop +audio/x-pn-windows-acm=3Dtotem.desktop +audio/x-realaudio=3Dtotem.desktop +audio/x-real-audio=3Dtotem.desktop +audio/x-sbc=3Dtotem.desktop +audio/x-scpls=3Dtotem.desktop +audio/x-speex=3Dtotem.desktop +audio/x-tta=3Dtotem.desktop +audio/x-vorbis=3Dtotem.desktop +audio/x-vorbis+ogg=3Dtotem.desktop +audio/x-wav=3Dtotem.desktop +audio/x-wavpack=3Dtotem.desktop +audio/x-xm=3Dtotem.desktop +image/vnd.rn-realpix=3Dtotem.desktop +image/x-pict=3Dtotem.desktop +misc/ultravox=3Dtotem.desktop +text/google-video-pointer=3Dtotem.desktop +text/x-google-video-pointer=3Dtotem.desktop +video/3gpp=3Dtotem.desktop +video/dv=3Dtotem.desktop +video/fli=3Dtotem.desktop +video/flv=3Dtotem.desktop +video/mp2t=3Dtotem.desktop +video/mp4=3Dtotem.desktop +video/mp4v-es=3Dtotem.desktop +video/mpeg=3Dtotem.desktop +video/msvideo=3Dtotem.desktop +video/ogg=3Dtotem.desktop +video/quicktime=3Dtotem.desktop +video/vivo=3Dtotem.desktop +video/vnd.divx=3Dtotem.desktop +video/vnd.rn-realvideo=3Dtotem.desktop +video/vnd.vivo=3Dtotem.desktop +video/webm=3Dtotem.desktop +video/x-anim=3Dtotem.desktop +video/x-avi=3Dtotem.desktop +video/x-flc=3Dtotem.desktop +video/x-fli=3Dtotem.desktop +video/x-flic=3Dtotem.desktop +video/x-flv=3Dtotem.desktop +video/x-m4v=3Dtotem.desktop +video/x-matroska=3Dtotem.desktop +video/x-mpeg=3Dtotem.desktop +video/x-ms-asf=3Dtotem.desktop +video/x-ms-asx=3Dtotem.desktop +video/x-msvideo=3Dtotem.desktop +video/x-ms-wm=3Dtotem.desktop +video/x-ms-wmv=3Dtotem.desktop +video/x-ms-wmx=3Dtotem.desktop +video/x-ms-wvx=3Dtotem.desktop +video/x-nsv=3Dtotem.desktop +video/x-ogm+ogg=3Dtotem.desktop +video/x-theora+ogg=3Dtotem.desktop +video/x-totem-stream=3Dtotem.desktop +x-content/video-dvd=3Dtotem.desktop +x-content/video-vcd=3Dtotem.desktop +x-content/video-svcd=3Dtotem.desktop +x-scheme-handler/ghelp=3Dyelp.desktop; +x-scheme-handler/help=3Dyelp.desktop; +x-scheme-handler/http=3Dfirefox.desktop;epiphany.desktop +x-scheme-handler/https=3Dfirefox.desktop;epiphany.desktop +x-scheme-handler/mailto=3Devolution.desktop \ No newline at end of file diff --git a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild b/gnome-= base/gnome-session/gnome-session-3.0.0.ebuild index 7c1537e..70f950a 100644 --- a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.0.0.ebuild @@ -12,13 +12,13 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2 FDL-1.1" SLOT=3D"0" -IUSE=3D"doc ipv6 elibc_FreeBSD" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi +IUSE=3D"doc ipv6 elibc_FreeBSD" =20 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_D= IRs, and # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRE= CTORY_* @@ -26,7 +26,7 @@ fi COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28.0:2 >=3Dx11-libs/gtk+-2.90.7:3 >=3Ddev-libs/dbus-glib-0.76 - >=3Dgnome-base/gconf-2 + >=3Dgnome-base/gconf-2:2 >=3Dsys-power/upower-0.9.0 gnome-base/librsvg:2 elibc_FreeBSD? ( dev-libs/libexecinfo ) @@ -59,7 +59,7 @@ DEPEND=3D"${COMMON_DEPEND} # gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore =20 -src_prepare() { +pkg_setup() { # TODO: convert libnotify to a configure option G2CONF=3D"${G2CONF} --disable-deprecation-flags @@ -69,8 +69,6 @@ src_prepare() { $(use_enable doc docbook-docs) $(use_enable ipv6)" DOCS=3D"AUTHORS ChangeLog NEWS README" - - gnome2_src_prepare } =20 src_install() { @@ -79,7 +77,16 @@ src_install() { dodir /etc/X11/Sessions || die "dodir failed" exeinto /etc/X11/Sessions doexe "${FILESDIR}/Gnome" || die "doexe failed" + + dodir /usr/share/gnome/applications/ || die + insinto /usr/share/gnome/applications/ + doins "${FILESDIR}/defaults.list" || die + + dodir /etc/X11/xinit/xinitrc.d/ || die exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}/15-xdg-data-gnome" || die + + # FIXME: this should be done by x11-misc/xdg-user-dirs doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed" } =20 diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-b= ase/gnome-session/gnome-session-9999.ebuild index 7c1537e..70f950a 100644 --- a/gnome-base/gnome-session/gnome-session-9999.ebuild +++ b/gnome-base/gnome-session/gnome-session-9999.ebuild @@ -12,13 +12,13 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2 LGPL-2 FDL-1.1" SLOT=3D"0" -IUSE=3D"doc ipv6 elibc_FreeBSD" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" else KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd = ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi +IUSE=3D"doc ipv6 elibc_FreeBSD" =20 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_D= IRs, and # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRE= CTORY_* @@ -26,7 +26,7 @@ fi COMMON_DEPEND=3D">=3Ddev-libs/glib-2.28.0:2 >=3Dx11-libs/gtk+-2.90.7:3 >=3Ddev-libs/dbus-glib-0.76 - >=3Dgnome-base/gconf-2 + >=3Dgnome-base/gconf-2:2 >=3Dsys-power/upower-0.9.0 gnome-base/librsvg:2 elibc_FreeBSD? ( dev-libs/libexecinfo ) @@ -59,7 +59,7 @@ DEPEND=3D"${COMMON_DEPEND} # gnome-common needed for eautoreconf # gnome-base/gdm does not provide gnome.desktop anymore =20 -src_prepare() { +pkg_setup() { # TODO: convert libnotify to a configure option G2CONF=3D"${G2CONF} --disable-deprecation-flags @@ -69,8 +69,6 @@ src_prepare() { $(use_enable doc docbook-docs) $(use_enable ipv6)" DOCS=3D"AUTHORS ChangeLog NEWS README" - - gnome2_src_prepare } =20 src_install() { @@ -79,7 +77,16 @@ src_install() { dodir /etc/X11/Sessions || die "dodir failed" exeinto /etc/X11/Sessions doexe "${FILESDIR}/Gnome" || die "doexe failed" + + dodir /usr/share/gnome/applications/ || die + insinto /usr/share/gnome/applications/ + doins "${FILESDIR}/defaults.list" || die + + dodir /etc/X11/xinit/xinitrc.d/ || die exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}/15-xdg-data-gnome" || die + + # FIXME: this should be done by x11-misc/xdg-user-dirs doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed" } =20