diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2012-06-06 09:19:51 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2012-06-06 09:19:51 +0000 |
| commit | b0b2e18c3fd7adc072d06440780baa49d04bae10 (patch) | |
| tree | da15f3672ca206f82e67af6871a64d6c50ea89bd | |
| parent | Another bunch of GNOME 3.5.2 updates (diff) | |
| download | suka-b0b2e18c3fd7adc072d06440780baa49d04bae10.tar.gz suka-b0b2e18c3fd7adc072d06440780baa49d04bae10.tar.bz2 suka-b0b2e18c3fd7adc072d06440780baa49d04bae10.zip | |
And the next GNOME 3.5.2 round...
svn path=/; revision=339
36 files changed, 1795 insertions, 2 deletions
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest new file mode 100644 index 0000000..7c3876a --- /dev/null +++ b/app-arch/file-roller/Manifest @@ -0,0 +1,4 @@ +AUX 3.1.2-packages.match 527 RMD160 3ae6ba4f7123e1c056d0286a9bdf46fa105039a8 SHA1 8041257948511cdae7c29ad1a7923867f8a0756d SHA256 ec3ad7667cb92562659bf76e22e502b57af18c7a2ca8cabf7834a0fca8573e1b +AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 +DIST file-roller-3.5.1.tar.xz 1427356 RMD160 927d29b7e8ed72dfdc5dec527f8970bd18c32818 SHA1 7f0d8eae7fc6782b213494df95ec18891189d60e SHA256 e349075c67bc748e3019e8337aa8bff6ad1272299c3047d7c7718d5897ce85dd +EBUILD file-roller-3.5.1.ebuild 2486 RMD160 b9d7f4ee517fb6afb06c8f81fb2312680cae07e0 SHA1 3ed2e3c8e8297b1ac753f5e9e0ac84e048c3e14a SHA256 18fafd62960bc972ab81e764185592ca99f4a540f197e11470f73481c3248ff6 diff --git a/app-arch/file-roller/file-roller-3.5.1.ebuild b/app-arch/file-roller/file-roller-3.5.1.ebuild new file mode 100644 index 0000000..c9d1fe0 --- /dev/null +++ b/app-arch/file-roller/file-roller-3.5.1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.4.2.ebuild,v 1.1 2012/05/19 23:23:02 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="Archive manager for GNOME" +HOMEPAGE="http://fileroller.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nautilus packagekit" +KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" + +# gdk-pixbuf used extensively in the source +# cairo used in eggtreemultidnd.c +# pango used in fr-window +RDEPEND=">=dev-libs/glib-2.29.14:2 + sys-apps/file + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.4.0:3 + x11-libs/pango + nautilus? ( >=gnome-base/nautilus-3 ) + packagekit? ( app-admin/packagekit-base ) +" +DEPEND="${RDEPEND} + app-text/gnome-doc-utils + >=dev-util/intltool-0.40.0 + sys-devel/gettext + virtual/pkgconfig" +# eautoreconf needs: +# gnome-base/gnome-common + +pkg_setup() { + # --disable-debug because enabling it adds -O0 to CFLAGS + G2CONF="${G2CONF} + --disable-dependency-tracking + --disable-scrollkeeper + --disable-run-in-place + --disable-static + --disable-schemas-compile + --disable-debug + --enable-magic + $(use_enable nautilus nautilus-actions) + $(use_enable packagekit)" + DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO" +} + +src_prepare() { + gnome2_src_prepare + + # Use absolute path to GNU tar since star doesn't have the same + # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar + epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch + + # File providing Gentoo package names for various archivers + cp -f "${FILESDIR}/3.1.2-packages.match" data/packages.match || die +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "${PN} is a frontend for several archiving utilities. If you want a" + elog "particular achive format support, see ${HOMEPAGE}" + elog "and install the relevant package." + elog + elog "for example:" + elog " 7-zip - app-arch/p7zip" + elog " ace - app-arch/unace" + elog " arj - app-arch/arj" + elog " cpio - app-arch/cpio" + elog " deb - app-arch/dpkg" + elog " iso - app-cdr/cdrtools" + elog " jar,zip - app-arch/zip and app-arch/unzip" + elog " lha - app-arch/lha" + elog " lzma - app-arch/xz-utils" + elog " lzop - app-arch/lzop" + elog " rar - app-arch/unrar" + elog " rpm - app-arch/rpm" + elog " unstuff - app-arch/stuffit" + elog " zoo - app-arch/zoo" +} diff --git a/app-arch/file-roller/files/3.1.2-packages.match b/app-arch/file-roller/files/3.1.2-packages.match new file mode 100644 index 0000000..be34bc6 --- /dev/null +++ b/app-arch/file-roller/files/3.1.2-packages.match @@ -0,0 +1,28 @@ +[Package Matches] +arj=app-arch/arj +binutils=sys-devel/binutils +bzip2=app-arch/bzip2 +cpio=app-arch/cpio +genisoimage=virtual/cdrtools +gzip=app-arch/gzip +lha=app-arch/lha +lrzip=app-arch/lrzip +lzip=app-arch/lzip +lzma=app-arch/xz-utils +lzop=app-arch/lzop +ncompress=app-arch/ncompress +p7zip=app-arch/p7zip +p7zip-full= +p7zip-rar= +rar=app-arch/rar +rpm=app-arch/rpm +rzip=app-arch/rzip +tar=app-arch/tar +unace=app-arch/unace +unalz= +unrar=app-arch/unrar +unstaff= +unzip=app-arch/unzip +xz=app-arch/xz-utils +zip=app-arch/zip +zoo=app-arch/zoo diff --git a/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch new file mode 100644 index 0000000..edaa16c --- /dev/null +++ b/app-arch/file-roller/files/file-roller-2.10.3-use_bin_tar.patch @@ -0,0 +1,12 @@ +diff -uNr file-roller-2.10.3/src/fr-command-tar.c file-roller-2.10.3.patched/src/fr-command-tar.c +--- file-roller-2.10.3/src/fr-command-tar.c 2005-04-22 18:39:22.000000000 +0200 ++++ file-roller-2.10.3.patched/src/fr-command-tar.c 2005-06-06 14:29:45.000000000 +0200 +@@ -225,7 +225,7 @@ + if (command != NULL) + fr_process_begin_command (comm->process, command); + else +- fr_process_begin_command (comm->process, "tar"); ++ fr_process_begin_command (comm->process, "/bin/tar"); + g_free (command); + } + diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest new file mode 100644 index 0000000..8faf06f --- /dev/null +++ b/app-text/evince/Manifest @@ -0,0 +1,3 @@ +AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d +DIST evince-3.5.2.tar.xz 6133592 RMD160 29acc2e7f581c6343b7cb9304a7d79083b53013a SHA1 a6069f3861016c6ab4553b83d5b885eb9adb23f7 SHA256 8f359d7f66e64aa43f69616445a7b77995d5b95c44e9bb264556351ec1a293e0 +EBUILD evince-3.5.2.ebuild 3270 RMD160 6ad2ca44b729f410b6e70b3b5a4a05006b5ceac8 SHA1 8efeecdf40681e76dabcfbf8205d0f5f71cdea71 SHA256 026111e084f20925534b738b9462aa7576e5f26ad018fa51138ee2b80d067b4d diff --git a/app-text/evince/evince-3.5.2.ebuild b/app-text/evince/evince-3.5.2.ebuild new file mode 100644 index 0000000..371f942 --- /dev/null +++ b/app-text/evince/evince-3.5.2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.4.0.ebuild,v 1.2 2012/05/10 01:32:11 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="Simple document viewer for GNOME" +HOMEPAGE="http://www.gnome.org/projects/evince/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug djvu doc dvi gnome-keyring +introspection nautilus +ps t1lib tiff xps" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" + +# Since 2.26.2, can handle poppler without cairo support. Make it optional ? +# not mature enough +# atk used in libview +# gdk-pixbuf used all over the place +# libX11 used for totem-screensaver +RDEPEND=" + dev-libs/atk + >=dev-libs/glib-2.25.11:2 + >=dev-libs/libxml2-2.5:2 + sys-libs/zlib + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.0.2:3[introspection?] + x11-libs/libX11 + >=x11-libs/libSM-1 + x11-libs/libICE + gnome-base/gsettings-desktop-schemas + || ( + >=x11-themes/gnome-icon-theme-2.17.1 + >=x11-themes/hicolor-icon-theme-0.10 ) + >=x11-libs/cairo-1.10.0 + >=app-text/poppler-0.20[cairo] + djvu? ( >=app-text/djvu-3.5.17 ) + dvi? ( + virtual/tex-base + dev-libs/kpathsea + t1lib? ( >=media-libs/t1lib-5.0.0 ) ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) + introspection? ( >=dev-libs/gobject-introspection-0.6 ) + nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) + ps? ( >=app-text/libspectre-0.2.0 ) + tiff? ( >=media-libs/tiff-3.6:0 ) + xps? ( >=app-text/libgxps-0.2.1 ) +" +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=app-text/gnome-doc-utils-0.3.2 + app-text/docbook-xml-dtd:4.3 + sys-devel/gettext + >=dev-util/intltool-0.35 + >=dev-util/gtk-doc-am-1.13 + virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1.13 )" + +ELTCONF="--portage" + +# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ +# Releases: http://people.redhat.com/zcerza/dogtail/releases/ +RESTRICT="test" + +pkg_setup() { + # Passing --disable-help would drop offline help, that would be inconsistent + # with helps of the most of Gnome apps that doesn't require network for that. + G2CONF="${G2CONF} + --disable-schemas-compile + --disable-scrollkeeper + --disable-static + --disable-tests + --enable-pdf + --enable-comics + --enable-thumbnailer + --with-smclient=xsmp + --with-platform=gnome + --enable-help + $(use_enable dbus) + $(use_enable djvu) + $(use_enable dvi) + $(use_with gnome-keyring keyring) + $(use_enable introspection) + $(use_enable nautilus) + $(use_enable ps) + $(use_enable t1lib) + $(use_enable tiff) + $(use_enable xps)" + DOCS="AUTHORS ChangeLog NEWS README TODO" +} + +src_prepare() { + # Regenerate marshalers to allow building with <glib-2.32 + rm -v cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.{c,h} \ + cut-n-paste/toolbar-editor/eggmarshalers.{c,h} \ + libview/ev-view-marshal.{c,h} || die "rm failed" + + # Fix .desktop file so menu item shows up + epatch "${FILESDIR}"/${PN}-0.7.1-display-menu.patch + + gnome2_src_prepare + + AT_NOELIBTOOLIZE=yes eautoreconf + + # Do not depend on gnome-icon-theme, bug #326855, #391859 + sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \ + -i configure || die "sed failed" +} diff --git a/app-text/evince/files/evince-0.7.1-display-menu.patch b/app-text/evince/files/evince-0.7.1-display-menu.patch new file mode 100644 index 0000000..9edc43e --- /dev/null +++ b/app-text/evince/files/evince-0.7.1-display-menu.patch @@ -0,0 +1,11 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN evince-0.7.1.orig/data/evince.desktop.in.in evince-0.7.1/data/evince.desktop.in.in +--- evince-0.7.1.orig/data/evince.desktop.in.in 2007-01-10 11:04:20.000000000 -0500 ++++ evince-0.7.1/data/evince.desktop.in.in 2007-01-18 17:30:52.000000000 -0500 +@@ -9,7 +9,6 @@ StartupNotify=true + Terminal=false + Type=Application + Icon=evince +-NoDisplay=true + X-GNOME-DocPath= + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=evince diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest new file mode 100644 index 0000000..082f39b --- /dev/null +++ b/dev-lang/vala/Manifest @@ -0,0 +1,2 @@ +DIST vala-0.17.1.tar.xz 2649464 RMD160 0fcf533e9fd9683ad13714966a818a3593c018d4 SHA1 b04fc01df281d33463ecffb3b1f347a265be5dfa SHA256 e4af511d4b64c0b98339756359ff570bc3d2139f441fcfb8ffd7c1672053f9af +EBUILD vala-0.17.1.ebuild 1250 RMD160 173ec96032cee96839673482156bcbae9e8400c5 SHA1 b29a070b79a013cbfe991b989635409999f84446 SHA256 d7cc2ac6ea5458c9b5351c27c2b0c17f60db244875505075265c174b99922d42 diff --git a/dev-lang/vala/vala-0.17.1.ebuild b/dev-lang/vala/vala-0.17.1.ebuild new file mode 100644 index 0000000..e0976b0 --- /dev/null +++ b/dev-lang/vala/vala-0.17.1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.16.0.ebuild,v 1.9 2012/05/29 18:27:15 aballier Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit alternatives gnome2 + +DESCRIPTION="Vala - Compiler for the GObject type system" +HOMEPAGE="http://live.gnome.org/Vala" + +LICENSE="LGPL-2.1" +SLOT="0.18" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="test +vapigen" + +RDEPEND=">=dev-libs/glib-2.16:2" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + sys-devel/flex + || ( sys-devel/bison dev-util/byacc dev-util/yacc ) + virtual/pkgconfig + dev-libs/libxslt + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-unversioned + $(use_enable vapigen)" + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" +} + +src_install() { + gnome2_src_install + + insinto /usr/share/aclocal + newins vala.m4 vala-${SLOT/./-}.m4 +} + +pkg_postinst() { + gnome2_pkg_postinst + alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4" +} + +pkg_postrm() { + gnome2_pkg_postrm + alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4" +} diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest new file mode 100644 index 0000000..fcb37a8 --- /dev/null +++ b/gnome-base/gdm/Manifest @@ -0,0 +1,15 @@ +AUX 3.2.1.1/gdm 274 RMD160 88c235b0e1907829a38a1be9c8f0fdc262b042d7 SHA1 3b08e4022e421417cb1fd9a03fd01c1ddedb27d5 SHA256 4c26f02021ffa41500fa98aeda61dde6d059243f027cf93f8fb00fde39a9edd3 +AUX 3.2.1.1/gdm-autologin 369 RMD160 2adb17241b378ad4ca10e6241cb21b5a679c0973 SHA1 8372a199f5e00fb0d9d2630d0ced060f190d2af2 SHA256 e964a100e72a8eccea4ed8e1558ae70cbe5b7cbea67415651d0c0bdcea2d06c8 +AUX 3.2.1.1/gdm-fingerprint 466 RMD160 3f63354ccce1de0dacc3c4b304673fa56fb35e4e SHA1 6e2d0d67e4c9cbff1efe3de5f57b1ace137c3314 SHA256 3af315d6abe928dd769f2cc9896d536e187ab373b29667c185e452ac6063d9cc +AUX 3.2.1.1/gdm-password 274 RMD160 88c235b0e1907829a38a1be9c8f0fdc262b042d7 SHA1 3b08e4022e421417cb1fd9a03fd01c1ddedb27d5 SHA256 4c26f02021ffa41500fa98aeda61dde6d059243f027cf93f8fb00fde39a9edd3 +AUX 3.2.1.1/gdm-smartcard 573 RMD160 6e1655b9b6d6cb1710cf052bcf45e0f305ecd244 SHA1 19d459d5970e53ac9a40abdedd183873309b37bf SHA256 9c548668770aa68e730e5d5159d77067dbd0795dae2b7ba6d6ee347f88e90062 +AUX 3.2.1.1/gdm-welcome 326 RMD160 c69bf97510ca352e0da904e9b922c9eadebe7bde SHA1 f626c04e40c838a795f6be599bf01481e16eb854 SHA256 9325241dfd722e58e93dd1dc81714bef4b3b211f4fb8551f39a698415722934a +AUX 3.2.1.1/gdm.service 202 RMD160 0192b184238f97e2060f4462bd6a9dcb0e2ec2f3 SHA1 f457a6f0c9e6e842eb1a8193ca4e27412e4b484b SHA256 21b105f56bc90178e05806583e3be5e74857c02ec6443318669f9ab6f947bb79 +AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 RMD160 4219fec833f0e62a10e52dee89ef5d1a8618d1c1 SHA1 69c5ed6869d5a467e64249f3afe695796c17c463 SHA256 e95e1ebfcfe2c896130e4925fa6f23911bcfe4db27e2a6788229538c6bb2a59d +AUX gdm-2.32.0-fix-vt-problems.patch 6156 RMD160 7c739dd278194e1a30672635e35b05f798ec9996 SHA1 6428abdc3c493c4b9f69fcaef8dcb88a910f4d14 SHA256 12da81b8085d76ce3099f1af0ec588c07c3f020f341f825683f4855c9303731e +AUX gdm-2.32.0-selinux-remove-attr.patch 851 RMD160 10dc29802fb29047188bff7aafe979a5e15e030a SHA1 d78bde425b7a141c91767c3e639ee0011feddadc SHA256 ad13d4b1253dca7d5ac362bcce9f5861c2830a3df32e5370a5a0d975c32ec258 +AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 RMD160 6ea58bdc1fa24d41f3c51fc7cdbabc05417053f0 SHA1 ad98258168b84c80d581085804b61649ac67e4d5 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe +AUX gdm-3.2.1.1-custom-session.patch 1317 RMD160 20a1dd5608f4154fe53fae4def03f509769da878 SHA1 4acf8ed9b11eb531505c0c58805f1b37948fcb77 SHA256 75bd1bdc0d396fee71ff41c2657f922a4c8e290c891cc72f47647ab832d0c285 +AUX gdm-3.3.92.1-disable-accessibility.patch 779 RMD160 559fac385732f3a97bbd5222e0fd94ba3b879a99 SHA1 a6874897dd36210b51497d7d9606b5ade04ce624 SHA256 a32bddeb5e57086df41b9db433152ae290a405d23c39f0ff497d61544f343528 +DIST gdm-3.5.2.tar.xz 1615452 RMD160 aa36b84ef62ffbbbe9d03f72b6091449db8be842 SHA1 fe921682759180939728b49bc397ab784417d559 SHA256 610dc3945b3aafc1aacc2fe574d34565bb6370e8e9efc207344241f4daee930d +EBUILD gdm-3.5.2.ebuild 8230 RMD160 b5478777266631dc823264e361c738faa2fc8330 SHA1 01a05a5e8ab8b12df19561b284d5fa4458152671 SHA256 91692870725f5094cf5c365980b0d325a5934a6cef570b403f3798cdd85e5e0e diff --git a/gnome-base/gdm/files/3.2.1.1/gdm b/gnome-base/gdm/files/3.2.1.1/gdm new file mode 100644 index 0000000..d965eca --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth optional pam_env.so +auth include system-login +auth required pam_nologin.so + +account include system-login + +password include system-login + +session include system-auth +#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-autologin b/gnome-base/gdm/files/3.2.1.1/gdm-autologin new file mode 100644 index 0000000..9d165d6 --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm-autologin @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth optional pam_env.so +auth required pam_nologin.so +auth required pam_permit.so +account include system-login +password include system-login +session include system-auth +# For the keyring to unlock with autologin, you need to set an empty +# password on the keyring. +#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint b/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint new file mode 100644 index 0000000..7d38de9 --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm-fingerprint @@ -0,0 +1,14 @@ +#%PAM-1.0 +# Note: no pam_gnome_keyring.so support since the login password is not used +auth optional pam_env.so +auth required pam_tally2.so onerr=succeed +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_fprintd.so +auth optional pam_permit.so + +account include system-login + +password required pam_deny.so + +session include system-auth diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-password b/gnome-base/gdm/files/3.2.1.1/gdm-password new file mode 100644 index 0000000..d965eca --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm-password @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth optional pam_env.so +auth include system-login +auth required pam_nologin.so + +account include system-login + +password include system-login + +session include system-auth +#Keyring=session optional pam_gnome_keyring.so auto_start diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-smartcard b/gnome-base/gdm/files/3.2.1.1/gdm-smartcard new file mode 100644 index 0000000..5cf884d --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm-smartcard @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth optional pam_env.so +auth required pam_tally2.so onerr=succeed +auth required pam_shells.so +auth required pam_nologin.so +auth [success=done ignore=ignore default=die] pam_pkcs11.so wait_for_card card_only +auth optional pam_permit.so + +account include system-login + +password optional pam_pkcs11.so +password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 +password optional pam_permit.so + +session include system-auth diff --git a/gnome-base/gdm/files/3.2.1.1/gdm-welcome b/gnome-base/gdm/files/3.2.1.1/gdm-welcome new file mode 100644 index 0000000..932eefe --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm-welcome @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so +account required pam_nologin.so +account include system-services +password include system-services +session required pam_loginuid.so +session optional pam_keyinit.so force revoke +session include system-services diff --git a/gnome-base/gdm/files/3.2.1.1/gdm.service b/gnome-base/gdm/files/3.2.1.1/gdm.service new file mode 100644 index 0000000..63bb08e --- /dev/null +++ b/gnome-base/gdm/files/3.2.1.1/gdm.service @@ -0,0 +1,11 @@ +[Unit] +Description=GNOME Display Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/gdm --nodaemon +Type=dbus +BusName=org.gnome.DisplayManager + +[Install] +WantedBy=graphical.target diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch new file mode 100644 index 0000000..2ae7f61 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-fix-daemonize-regression.patch @@ -0,0 +1,126 @@ +From 7f5104b242e6b36e6143183b14582d362763ff2a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 2 Nov 2010 23:16:51 +0100 +Subject: [PATCH 2/6] daemonize so that the boot process can continue + +Gentoo bug: #236701 + +Originally from: Dan Nicholson <dbn.lists@gmail.com> + +Fork gdm-binary, except when -nodaemon is used + +gdm-binary now forks and the parent terminates, except when the +-nodaemon or --nodaemon options are used. This provides compatibility +with xdm. Fixes bug #550170. + +--- + daemon/main.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 64 insertions(+), 0 deletions(-) + +diff --git a/daemon/main.c b/daemon/main.c +index 5b8d66b..191b6e3 100644 +--- a/daemon/main.c ++++ b/daemon/main.c +@@ -513,6 +513,56 @@ is_debug_set (void) + return debug; + } + ++static void ++dup_dev_null (int fd, int flags) ++{ ++ int nullfd; ++ int dupfd; ++ ++ VE_IGNORE_EINTR (nullfd = open ("/dev/null", flags)); ++ if (G_UNLIKELY (nullfd < 0)) { ++ gdm_fail (_("Cannot open /dev/null: %s!"), ++ strerror (errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ VE_IGNORE_EINTR (dupfd = dup2 (nullfd, fd)); ++ if (G_UNLIKELY (dupfd < 0)) { ++ gdm_fail (_("Cannot duplicate /dev/null: %s!"), ++ strerror (errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ VE_IGNORE_EINTR (close (nullfd)); ++} ++ ++static void ++daemonify (void) ++{ ++ pid_t pid; ++ ++ pid = fork (); ++ ++ /* terminate the parent */ ++ if (pid > 0) ++ exit (EXIT_SUCCESS); ++ ++ if (G_UNLIKELY (pid < 0)) { ++ gdm_fail (_("fork () failed: %s!"), strerror (errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ if (G_UNLIKELY (setsid () < 0)) { ++ gdm_fail (_("setsid () failed: %s!"), strerror (errno)); ++ exit (EXIT_FAILURE); ++ } ++ ++ /* reopen stdin, stdout, stderr with /dev/null */ ++ dup_dev_null (STDIN_FILENO, O_RDONLY); ++ dup_dev_null (STDOUT_FILENO, O_RDWR); ++ dup_dev_null (STDERR_FILENO, O_RDWR); ++} ++ + int + main (int argc, + char **argv) +@@ -523,14 +573,17 @@ main (int argc, + DBusGConnection *connection; + GError *error; + int ret; ++ int i; + gboolean res; + gboolean xdmcp_enabled; + GdmSignalHandler *signal_handler; + static gboolean do_timed_exit = FALSE; + static gboolean print_version = FALSE; + static gboolean fatal_warnings = FALSE; ++ static gboolean no_daemon = FALSE; + static GOptionEntry entries [] = { + { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL }, ++ { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL }, + { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL }, + { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL }, + +@@ -547,6 +600,14 @@ main (int argc, + + g_type_init (); + ++ /* preprocess the arguments to support the xdm style ++ * -nodaemon option ++ */ ++ for (i = 0; i < argc; i++) { ++ if (strcmp (argv[i], "-nodaemon") == 0) ++ argv[i] = "--nodaemon"; ++ } ++ + context = g_option_context_new (_("GNOME Display Manager")); + g_option_context_add_main_entries (context, entries, NULL); + g_option_context_set_ignore_unknown_options (context, TRUE); +@@ -617,6 +678,9 @@ main (int argc, + exit (-1); + } + ++ if (no_daemon == FALSE) ++ daemonify (); ++ + /* pid file */ + delete_pid (); + write_pid (); +-- +1.7.3.1 + diff --git a/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch new file mode 100644 index 0000000..f219a14 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-fix-vt-problems.patch @@ -0,0 +1,195 @@ +From 64002e623fea54ab10040206d164c5fdee4a43d2 Mon Sep 17 00:00:00 2001 +From: Nirbheek Chauhan <nirbheek@gentoo.org> +Date: Fri, 15 Apr 2011 22:13:44 +0530 +Subject: [PATCH] Fix VT grab race with getty causing X to grab the wrong VT + +On bootup, if X is spawned without any args, it'll take up the first unused VT. +If GDM starts up before gettys are spawned, X takes up VT1 or VT2 depending on +the init system and bootsplash. + +This is problematic because afterwards getty will come up underneath X, and +cause keyboard problems and eventually crash X. + +So we read /etc/inittab, check for open VTs, compare the two values, and take +the conservative one. +--- + configure.ac | 4 ++ + daemon/Makefile.am | 1 + + daemon/gdm-server.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 110 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ca0f8bb..b9e7462 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -302,6 +302,10 @@ AC_CHECK_TYPE(socklen_t,, + AC_CHECK_HEADERS(sys/sockio.h) + AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv]) + ++dnl Needed for querying the kernel for free VTs ++AC_CHECK_HEADERS(sys/vt.h) ++AC_CHECK_HEADERS(sys/ioctl.h) ++ + dnl checks needed for Darwin compatibility to linux **environ. + AC_CHECK_HEADERS(crt_externs.h) + AC_CHECK_FUNCS(_NSGetEnviron) +diff --git a/daemon/Makefile.am b/daemon/Makefile.am +index da18835..c1b6bda 100644 +--- a/daemon/Makefile.am ++++ b/daemon/Makefile.am +@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DLOGDIR=\"$(logdir)\" \ + -DSBINDIR=\"$(sbindir)\" \ ++ -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ + -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index 339f3cc..29d16dc 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -26,6 +26,8 @@ + #include <unistd.h> + #include <string.h> + #include <sys/types.h> ++#include <sys/ioctl.h> ++#include <sys/vt.h> + #include <sys/wait.h> + #include <errno.h> + #include <ctype.h> +@@ -42,6 +44,7 @@ + #include <glib/gi18n.h> + #include <glib/gstdio.h> + #include <glib-object.h> ++#include <gio/gio.h> + + #include <X11/Xlib.h> /* for Display */ + +@@ -54,6 +57,8 @@ extern char **environ; + + #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) + ++#define INITTAB SYSCONFDIR"/inittab" ++ + /* These are the servstat values, also used as server + * process exit codes */ + #define SERVER_TIMEOUT 2 /* Server didn't start */ +@@ -674,6 +679,105 @@ gdm_server_spawn (GdmServer *server, + } + + /** ++ * Parse the inittab file used by getty to spawn VTs to find unused ttys ++ */ ++static int ++get_free_vt_from_inittab () ++{ ++ GFile *gfile; ++ GFileInputStream *contents; ++ GDataInputStream *dstream; ++ GRegex *getty; ++ GMatchInfo *tty_match = NULL; ++ GSList *tty_list = NULL; ++ GError *error = NULL; ++ gchar *temp = NULL; ++ int vtno = 0; ++ ++ gfile = g_file_new_for_path (INITTAB); ++ contents = g_file_read (gfile, NULL, &error); ++ g_object_unref (gfile); ++ if (!contents) { ++ if (error) { ++ g_debug ("Unable to open file %s", INITTAB); ++ g_error_free (error); ++ } ++ goto out; ++ } ++ ++ dstream = g_data_input_stream_new (G_INPUT_STREAM (contents)); ++ getty = g_regex_new ("^c[0-9]+:.+getty.+tty([0-9]+)", 0, 0, NULL); ++ g_object_unref (contents); ++ ++ while (1) { ++ temp = g_data_input_stream_read_line (dstream, NULL, NULL, &error); ++ if (!temp) ++ break; ++ if (!g_regex_match (getty, temp, 0, &tty_match)) ++ continue; ++ g_free (temp); ++ temp = g_match_info_fetch (tty_match, 1); ++ if (!temp) ++ continue; ++ tty_list = g_slist_insert_sorted (tty_list, temp, (GCompareFunc)g_strcmp0); ++ g_match_info_free (tty_match); ++ } ++ ++ if (error) { ++ g_debug ("Unable to read line from %s", INITTAB); ++ g_error_free (error); ++ goto free; ++ } ++ ++ /* Ignore holes in vt allocation, just take the last one */ ++ temp = g_slist_last (tty_list)->data; ++ if (temp) ++ vtno = (int) g_ascii_strtoull (temp, NULL, 10) + 1; ++ ++free: ++ g_object_unref (dstream); ++ g_regex_unref (getty); ++ g_slist_free_full (tty_list, g_free); ++ g_free (error); ++out: ++ return vtno; ++} ++ ++/** ++ * Query the VT_* kernel ioctls to find an empty tty ++ */ ++static int ++get_free_vt_from_kernel() ++{ ++ int fd, vtno = 0; ++ ++ fd = open ("/dev/tty0", O_WRONLY, 0); ++ if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || (vtno == -1)) { ++ vtno = 0; ++ g_debug ("Unable to find a free vt, falling back to Xorg autodetect"); ++ } ++ return vtno; ++} ++ ++static gchar* ++get_free_vt () ++{ ++ int inittab_vtno, kernel_vtno; ++ gchar* vt = NULL; ++ ++ inittab_vtno = get_free_vt_from_inittab(); ++ if (inittab_vtno > 0) ++ g_debug ("Inittab says vt%i is free\n", inittab_vtno); ++ kernel_vtno = get_free_vt_from_kernel(); ++ if (kernel_vtno > 0) ++ g_debug ("Kernel says vt%i is free\n", kernel_vtno); ++ /* Select the greater of the two because getty will use the others */ ++ if (kernel_vtno != 0 && inittab_vtno != 0) ++ vt = g_strdup_printf ("vt%i", kernel_vtno > inittab_vtno ? kernel_vtno : inittab_vtno); ++ return vt; ++} ++ ++/** + * gdm_server_start: + * @disp: Pointer to a GdmDisplay structure + * +@@ -686,7 +790,7 @@ gdm_server_start (GdmServer *server) + gboolean res; + + /* fork X server process */ +- res = gdm_server_spawn (server, NULL); ++ res = gdm_server_spawn (server, get_free_vt()); + + return res; + } +-- +1.7.3.4 + diff --git a/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch new file mode 100644 index 0000000..e563aa4 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-selinux-remove-attr.patch @@ -0,0 +1,27 @@ +From 41badd6d2ca652a875fec3eea420ae876023076d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 2 Nov 2010 23:15:54 +0100 +Subject: [PATCH 1/6] remove unneeded linker directive for selinux + +Gentoo bug: #41022 + +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ed07dce..71d0247 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then + AC_CHECK_LIB(selinux,setexeccon,/bin/true) + AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) + AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) +- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" ++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" + fi + + dnl --------------------------------------------------------------------------- +-- +1.7.3.1 + diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch new file mode 100644 index 0000000..b1cddf1 --- /dev/null +++ b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch @@ -0,0 +1,32 @@ +From 1cb1841da3a8fedc1671637e2828d5e361af21fa Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 2 Nov 2010 23:19:31 +0100 +Subject: [PATCH 5/6] ssh-agent handling must be done at xinitrc.d + +Gentoo bug: #220603 +--- + data/Xsession.in | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/data/Xsession.in b/data/Xsession.in +index 0da187d..aa49b90 100755 +--- a/data/Xsession.in ++++ b/data/Xsession.in +@@ -189,14 +189,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then + done + fi + +-# add ssh-agent if found +-sshagent="`gdmwhich ssh-agent`" +-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +- command="$sshagent -- $command" +-elif [ -z "$sshagent" ] ; then +- echo "$0: ssh-agent not found!" +-fi +- + echo "$0: Setup done, will execute: $command" + + eval exec $command +-- +1.7.3.1 + diff --git a/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch new file mode 100644 index 0000000..0642f7c --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.2.1.1-custom-session.patch @@ -0,0 +1,51 @@ +From b96c19976b6876648fd91949f78f06cf5d269b18 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Tue, 2 Nov 2010 23:19:07 +0100 +Subject: [PATCH] make custom session work + +Gentoo bug: #216984 + +fix custom sessions not doing sourcing in the proper order. +--- + data/Xsession.in | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/data/Xsession.in b/data/Xsession.in +index 118518c..201be92 100755 +--- a/data/Xsession.in ++++ b/data/Xsession.in +@@ -155,15 +155,6 @@ fi + + xhost +si:localuser:`id -un` || : + +-# run all system xinitrc shell scripts. +-if [ -d /etc/X11/xinit/xinitrc.d ]; then +- for i in /etc/X11/xinit/xinitrc.d/* ; do +- if [ -x "$i" -a ! -d "$i" ]; then +- . "$i" +- fi +- done +-fi +- + if [ "x$command" = "xcustom" ] ; then + if [ -x "$HOME/.xsession" ]; then + command="$HOME/.xsession" +@@ -191,6 +182,15 @@ if [ "x$command" = "xdefault" ] ; then + fi + fi + ++# run all system xinitrc shell scripts. ++if [ -d /etc/X11/xinit/xinitrc.d ]; then ++ for i in /etc/X11/xinit/xinitrc.d/* ; do ++ if [ -x "$i" -a ! -d "$i" ]; then ++ . "$i" ++ fi ++ done ++fi ++ + # add ssh-agent if found + sshagent="`gdmwhich ssh-agent`" + if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then +-- +1.7.7 + diff --git a/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch b/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch new file mode 100644 index 0000000..1df7e58 --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.3.92.1-disable-accessibility.patch @@ -0,0 +1,30 @@ +diff -Naur gdm-3.3.92.1//data/00-upstream-settings gdm-3.3.92.1.new//data/00-upstream-settings +--- gdm-3.3.92.1//data/00-upstream-settings 2012-02-08 04:50:32.000000000 +0530 ++++ gdm-3.3.92.1.new//data/00-upstream-settings 2012-03-25 14:24:01.387842352 +0530 +@@ -7,7 +7,7 @@ + # + + [org/gnome/desktop/a11y/keyboard] +-enable=true ++enable=false + + [org/gnome/desktop/background] + show-desktop-icons=false +@@ -16,7 +16,7 @@ + exec='/bin/true' + + [org/gnome/desktop/interface] +-toolkit-accessibility=true ++toolkit-accessibility=false + + [org/gnome/desktop/lockdown] + disable-application-handlers=true +@@ -35,7 +35,7 @@ + event-sounds=true + + [org/gnome/settings-daemon/plugins/a11y-keyboard] +-active=true ++active=false + + [org/gnome/settings-daemon/plugins/a11y-settings] + active=false diff --git a/gnome-base/gdm/gdm-3.5.2.ebuild b/gnome-base/gdm/gdm-3.5.2.ebuild new file mode 100644 index 0000000..55abda0 --- /dev/null +++ b/gnome-base/gdm/gdm-3.5.2.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 pam systemd + +DESCRIPTION="GNOME Display Manager" +HOMEPAGE="http://www.gnome.org/projects/gdm/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~sh ~x86" + +IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth selinux smartcard systemd tcpd test xinerama +xklavier" + +# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686 +# nspr used by smartcard extension +# dconf, dbus and g-s-d are needed at install time for dconf update +COMMON_DEPEND=" + >=dev-libs/dbus-glib-0.74 + >=dev-libs/glib-2.29.3:2 + >=x11-libs/gtk+-2.91.1:3 + >=x11-libs/pango-1.3 + dev-libs/nspr + >=dev-libs/nss-3.11.1 + >=media-libs/fontconfig-2.5.0 + >=media-libs/libcanberra-0.4[gtk3] + >=x11-misc/xdg-utils-1.0.2-r3 + >=sys-power/upower-0.9 + >=sys-apps/accountsservice-0.6.12 + + gnome-base/dconf + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + sys-apps/dbus + + app-text/iso-codes + + x11-base/xorg-server + x11-libs/libXi + x11-libs/libXau + x11-libs/libX11 + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrandr + x11-apps/sessreg + + virtual/pam + consolekit? ( sys-auth/consolekit ) + + accessibility? ( x11-libs/libXevie ) + gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) + plymouth? ( sys-boot/plymouth ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-39 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + xinerama? ( x11-libs/libXinerama ) + xklavier? ( >=x11-libs/libxklavier-4 )" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-libs/check-0.9.4 ) + xinerama? ( x11-proto/xineramaproto ) + app-text/docbook-xml-dtd:4.1.2 + sys-devel/gettext + x11-proto/inputproto + x11-proto/randrproto + >=dev-util/intltool-0.40.0 + >=app-text/scrollkeeper-0.1.4 + >=app-text/gnome-doc-utils-0.3.2 + virtual/pkgconfig" +# XXX: These deps are from session and desktop files in data/ directory +# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser) +# fprintd is used via dbus by gdm-fingerprint-extension +RDEPEND="${COMMON_DEPEND} + >=gnome-base/gnome-session-2.91.92 + x11-apps/xhost + x11-themes/gnome-icon-theme-symbolic + + accessibility? ( + app-accessibility/gnome-mag + app-accessibility/gok + app-accessibility/orca + gnome-extra/at-spi:1 ) + consolekit? ( gnome-extra/polkit-gnome ) + fallback? ( x11-wm/metacity ) + fprint? ( + sys-auth/fprintd + sys-auth/pam_fprint ) + gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) + !gnome-shell? ( x11-wm/metacity ) + smartcard? ( + app-crypt/coolkey + sys-auth/pam_pkcs11 ) + + !gnome-extra/fast-user-switch-applet" + +pkg_setup() { + DOCS="AUTHORS ChangeLog NEWS README TODO" + + # PAM is the only auth scheme supported + # even though configure lists shadow and crypt + # they don't have any corresponding code. + # --with-at-spi-registryd-directory= needs to be passed explicitly because + # of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4 + G2CONF="${G2CONF} + --disable-schemas-install + --disable-static + --localstatedir=${EPREFIX}/var + --with-xdmcp=yes + --enable-authentication-scheme=pam + --with-pam-prefix=${EPREFIX}/etc + --with-at-spi-registryd-directory=${EPREFIX}/usr/libexec + $(use_with accessibility xevie) + $(use_enable ipv6) + $(use_enable xklavier libxklavier) + $(use_with consolekit console-kit) + $(use_with plymouth) + $(use_with selinux) + $(use_with systemd) + $(use_with tcpd tcp-wrappers) + $(use_with xinerama)" + + enewgroup gdm + enewgroup video # Just in case it hasn't been created yet + enewuser gdm -1 -1 /var/lib/gdm gdm,video + + # For compatibility with certain versions of nvidia-drivers, etc., need to + # ensure that gdm user is in the video group + if ! egetent group video | grep -q gdm; then + # FIXME XXX: is this at all portable, ldap-safe, etc.? + # XXX: egetent does not have a 1-argument form, so we can't use it to + # get the list of gdm's groups + local g=$(groups gdm) + elog "Adding user gdm to video group" + usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed" + fi +} + +src_prepare() { + # remove unneeded linker directive for selinux, bug #41022 + epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch" + + # daemonize so that the boot process can continue, bug #236701 + epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch" + + # GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852 + epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch" + + # make custom session work, bug #216984 + epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch" + + # ssh-agent handling must be done at xinitrc.d, bug #220603 + epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch" + + # fix libxklavier automagic support + epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch" + + # don't load accessibility support at runtime when USE=-accessibility + use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch" + + # make gdm-fallback session the default if USE=-gnome-shell + if ! use gnome-shell; then + sed -e "s:'gdm-shell':'gdm-fallback':" \ + -i data/00-upstream-settings || die "sed failed" + fi + + mkdir -p "${S}"/m4 + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf + + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + + # Install the systemd unit file + systemd_dounit "${FILESDIR}/3.2.1.1/gdm.service" + + # gdm-binary should be gdm to work with our init (#5598) + rm -f "${ED}/usr/sbin/gdm" + ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm" + # our x11's scripts point to /usr/bin/gdm + ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm" + + # log, etc. + keepdir /var/log/gdm + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + # install PAM files + mkdir "${T}/pam.d" || die "mkdir failed" + cp "${FILESDIR}/3.2.1.1"/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome} \ + "${T}/pam.d" || die "cp failed" + use gnome-keyring && sed -i "s:#Keyring=::g" "${T}/pam.d"/* + dopamd "${T}/pam.d"/* +} + +pkg_postinst() { + gnome2_pkg_postinst + + dbus-launch dconf update || die "'dconf update' failed" + + ewarn + ewarn "This is an EXPERIMENTAL release, please bear with its bugs and" + ewarn "visit us on #gentoo-desktop if you have problems." + ewarn + + elog "To make GDM start at boot, edit /etc/conf.d/xdm" + elog "and then execute 'rc-update add xdm default'." + elog "If you already have GDM running, you will need to restart it." + + elog + elog "GDM ignores most non-localization environment variables. If you" + elog "need GDM to launch gnome-session with a particular environment," + elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see" + elog "the pam_env man page for more information." + elog + + if use gnome-keyring; then + elog "For autologin to unlock your keyring, you need to set an empty" + elog "password on your keyring. Use app-crypt/seahorse for that." + fi + + if [ -f "/etc/X11/gdm/gdm.conf" ]; then + elog "You had /etc/X11/gdm/gdm.conf which is the old configuration" + elog "file. It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16" + mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16 + fi + + # https://bugzilla.redhat.com/show_bug.cgi?id=513579 + # Lennart says this problem is fixed, but users are still reporting problems + # XXX: Do we want this elog? +# if has_version "media-libs/libcanberra[pulseaudio]" ; then +# elog +# elog "You have media-libs/libcanberra with the pulseaudio USE flag" +# elog "enabled. GDM will start a pulseaudio process to play sounds. This" +# elog "process should automatically terminate when a user logs into a" +# elog "desktop session. If GDM's pulseaudio fails to terminate and" +# elog "causes problems for users' audio, you can prevent GDM from" +# elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf" +# elog "so it contains the following two lines:" +# elog +# elog "autospawn = no" +# elog "daemon-binary = /bin/true" +# fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if rc-config list default | grep -q xdm; then + elog "To remove GDM from startup please execute" + elog "'rc-update del xdm default'" + fi +} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest new file mode 100644 index 0000000..851ff43 --- /dev/null +++ b/gnome-base/gnome-shell/Manifest @@ -0,0 +1,4 @@ +AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 +DIST gnome-shell-3.5.2.tar.xz 1259328 RMD160 55deb5a9092d1913420d915363a33fe59b9b3188 SHA1 daafbd0271a28fe9da659f0f135599cf2f2147fd SHA256 38d9b32e68e88bb2900cba1706c22fcf86914c3539d98d6a1a69aed674cbe9f4 +EBUILD gnome-shell-3.5.2.ebuild 6215 RMD160 4010b035ea7fb9b6abad4fd4e792c676f7eba0bb SHA1 e57d00e8cd1cb75e6d1da426aabd898a87ec212b SHA256 03e02cbfc4868bd389f460675f27374ceaef8ce70e4560183d2489d6ad74fc23 +EBUILD gnome-shell-9999.ebuild 6369 RMD160 900e234cb1ecbb3f1dc580c95d36630a35af9b44 SHA1 42485adff20227f3eea55a9a31721c6e3ee73d68 SHA256 2c1b51150a8b12789663d10c2d2976ed459a22433224c6f1e5951ece199bed3b diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch new file mode 100644 index 0000000..ae23a6c --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch @@ -0,0 +1,44 @@ +From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001 +From: root <admin@catmur.co.uk> +Date: Sun, 8 Jan 2012 13:55:05 +0000 +Subject: [PATCH] Fix automagic gnome-bluetooth dependency + +https://bugs.gentoo.org/show_bug.cgi?id=398145 + +Ed Catmur 2012-01-08 13:46:22 UTC +libgnome-bluetooth-applet is a private library so they shouldn't be linking +against it anyway. I tried to work out how to tell libtool to add it to rpath +but got totally lost. + +I'll see if I can work out how to fix the automagic gnome-bluetooth dependency +so I can at least merge USE=-bluetooth. +--- + configure.ac | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1c64122..a699838 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) + PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) + + AC_MSG_CHECKING([for bluetooth support]) ++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) ++AS_IF([test "x$with_bluetooth" != "xno"], [ + PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` + BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` +@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [AC_DEFINE([HAVE_BLUETOOTH],[0]) + AC_SUBST([HAVE_BLUETOOTH],[0]) + AC_MSG_RESULT([no])]) ++], [AC_DEFINE([HAVE_BLUETOOTH],[0]) ++ AC_SUBST([HAVE_BLUETOOTH],[0]) ++ AC_MSG_RESULT([no])]) + + PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) + AC_SUBST(CALENDAR_SERVER_CFLAGS) +-- +1.7.8.2 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild new file mode 100644 index 0000000..606eb70 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="2:2.5" + +inherit autotools eutils gnome2 multilib pax-utils python + +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" +HOMEPAGE="http://live.gnome.org/GnomeShell" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+bluetooth systemd" +KEYWORDS="~amd64 ~x86" + +# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop +# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 +# libXfixes-5.0 needed for pointer barriers +COMMON_DEPEND=">=app-crypt/gcr-3.3.90[introspection] + >=dev-libs/glib-2.31.6:2 + >=dev-libs/gjs-1.31.22 + >=dev-libs/gobject-introspection-0.10.1 + >=x11-libs/gtk+-3.3.9:3[introspection] + >=media-libs/clutter-1.9.16:1.0[introspection] + >=dev-libs/folks-0.5.2 + >=dev-libs/json-glib-0.13.2 + >=dev-libs/libcroco-0.6.2:0.6 + >=gnome-base/gnome-desktop-3.5.1:3 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/gnome-keyring-3.3.90 + >=gnome-base/gnome-menus-2.29.10:3[introspection] + gnome-base/libgnome-keyring + >=gnome-extra/evolution-data-server-2.91.6 + >=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/telepathy-glib-0.17.5[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + >=x11-wm/mutter-3.4.1[introspection] + >=x11-libs/startup-notification-0.11 + + app-misc/ca-certificates + dev-libs/dbus-glib + dev-libs/libxml2:2 + gnome-base/librsvg + media-libs/libcanberra + media-libs/mesa + media-sound/pulseaudio + net-libs/libsoup:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) + >=net-misc/networkmanager-0.8.999[introspection] + systemd? ( >=sys-apps/systemd-31 ) +" +# Runtime-only deps are probably incomplete and approximate. +# Each block: +# 1. Pull in polkit-0.101 for pretty authorization dialogs +# 2. Introspection stuff + dconf needed via imports.gi.* +# 3. gnome-session is needed for gnome-session-quit +# 4. Control shell settings +# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast +# user switching with gdm-3.1.x) +# 6. caribou needed for on-screen keyboard +# 7. xdg-utils needed for xdg-open, used by extension tool +# 8. gnome-icon-theme-symbolic neeed for various icons +# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +RDEPEND="${COMMON_DEPEND} + >=sys-auth/polkit-0.101[introspection] + + >=gnome-base/dconf-0.4.1 + sys-power/upower[introspection] + + >=gnome-base/gnome-session-2.91.91 + + >=gnome-base/gnome-settings-daemon-2.91 + >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] + + >=sys-apps/accountsservice-0.6.14[introspection] + + >=app-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + x11-themes/gnome-icon-theme-symbolic + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + + !systemd? ( sys-auth/consolekit ) +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17 + >=dev-util/intltool-0.40 + gnome-base/gnome-common + virtual/pkgconfig + !!=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 + +pkg_setup() { + DOCS="AUTHORS NEWS README" + # Don't error out on warnings + G2CONF="${G2CONF} + --enable-compile-warnings=maximum + --disable-schemas-compile + --disable-jhbuild-wrapper-script + $(use_with bluetooth) + $(use_with systemd) + --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt + BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch" + + gnome2_src_prepare + + # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 + # Note: sed Makefile.in because it is generated from several Makefile.ams + sed -e 's/-DG_DISABLE_DEPRECATED//g' \ + -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" +} + +src_install() { + gnome2_src_install + python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}usr/bin/gnome-shell" +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \ + ! has_version 'media-plugins/gst-plugins-vp8'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version ">=x11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" + ewarn "pointer barriers which will make it easier to use hot corners." + fi + + if has_version "<x11-drivers/ati-drivers-12"; then + ewarn "GNOME Shell has been reported to show graphical corruption under" + ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in" + ewarn "fallback mode, or switch to open-source drivers." + fi + + if has_version "media-libs/mesa[video_cards_radeon]"; then + elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers." + elog "Make sure that gallium architecture for r300 and r600 drivers is" + elog "selected using 'eselect mesa'." + if ! has_version "media-libs/mesa[gallium]"; then + ewarn "You will need to emerge media-libs/mesa with USE=gallium." + fi + fi + + if has_version "media-libs/mesa[video_cards_intel]"; then + elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers." + elog "Make sure that classic architecture for i915 and i965 drivers is" + elog "selected using 'eselect mesa'." + if ! has_version "media-libs/mesa[classic]"; then + ewarn "You will need to emerge media-libs/mesa with USE=classic." + fi + fi +} diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild new file mode 100644 index 0000000..276476c --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="2:2.5" + +inherit autotools eutils gnome2 multilib pax-utils python +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" +HOMEPAGE="http://live.gnome.org/GnomeShell" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+bluetooth +networkmanager systemd" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~x86" +fi + +# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop +# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 +# libXfixes-5.0 needed for pointer barriers +COMMON_DEPEND=">=app-crypt/gcr-3.3.90[introspection] + >=dev-libs/glib-2.31.6:2 + >=dev-libs/gjs-1.31.22 + >=dev-libs/gobject-introspection-0.10.1 + >=x11-libs/gtk+-3.3.9:3[introspection] + >=media-libs/clutter-1.9.16:1.0[introspection] + >=dev-libs/folks-0.5.2 + >=dev-libs/json-glib-0.13.2 + >=dev-libs/libcroco-0.6.2:0.6 + >=gnome-base/gnome-desktop-3.5.1:3 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/gnome-keyring-3.3.90 + >=gnome-base/gnome-menus-2.29.10:3[introspection] + gnome-base/libgnome-keyring + >=gnome-extra/evolution-data-server-2.91.6 + >=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/telepathy-glib-0.17.5[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + >=x11-wm/mutter-3.4.1[introspection] + >=x11-libs/startup-notification-0.11 + + app-misc/ca-certificates + dev-libs/dbus-glib + dev-libs/libxml2:2 + gnome-base/librsvg + media-libs/libcanberra + media-libs/mesa + media-sound/pulseaudio + net-libs/libsoup:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) + >=net-misc/networkmanager-0.8.999[introspection] + systemd? ( >=sys-apps/systemd-31 ) +" +# Runtime-only deps are probably incomplete and approximate. +# Each block: +# 1. Pull in polkit-0.101 for pretty authorization dialogs +# 2. Introspection stuff + dconf needed via imports.gi.* +# 3. gnome-session is needed for gnome-session-quit +# 4. Control shell settings +# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast +# user switching with gdm-3.1.x) +# 6. caribou needed for on-screen keyboard +# 7. xdg-utils needed for xdg-open, used by extension tool +# 8. gnome-icon-theme-symbolic neeed for various icons +# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c +RDEPEND="${COMMON_DEPEND} + >=sys-auth/polkit-0.101[introspection] + + >=gnome-base/dconf-0.4.1 + sys-power/upower[introspection] + + >=gnome-base/gnome-session-2.91.91 + + >=gnome-base/gnome-settings-daemon-2.91 + >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] + + >=sys-apps/accountsservice-0.6.14[introspection] + + >=app-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + x11-themes/gnome-icon-theme-symbolic + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + + !systemd? ( sys-auth/consolekit ) +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17 + >=dev-util/intltool-0.40 + gnome-base/gnome-common + virtual/pkgconfig + !!=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 + +pkg_setup() { + DOCS="AUTHORS NEWS README" + # Don't error out on warnings + G2CONF="${G2CONF} + --enable-compile-warnings=maximum + --disable-schemas-compile + --disable-jhbuild-wrapper-script + $(use_with bluetooth) + $(use_with systemd) + --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt + BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch" + + [[ ${PV} != 9999 ]] && eautoreconf + gnome2_src_prepare + + # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 + # Note: sed Makefile.in because it is generated from several Makefile.ams + sed -e 's/-DG_DISABLE_DEPRECATED//g' \ + -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" +} + +src_install() { + gnome2_src_install + python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}usr/bin/gnome-shell" +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \ + ! has_version 'media-plugins/gst-plugins-vp8'; then + ewarn "To make use of GNOME Shell's built-in screen recording utility," + ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version ">=x11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" + ewarn "pointer barriers which will make it easier to use hot corners." + fi + + if has_version "<x11-drivers/ati-drivers-12"; then + ewarn "GNOME Shell has been reported to show graphical corruption under" + ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in" + ewarn "fallback mode, or switch to open-source drivers." + fi + + if has_version "media-libs/mesa[video_cards_radeon]"; then + elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers." + elog "Make sure that gallium architecture for r300 and r600 drivers is" + elog "selected using 'eselect mesa'." + if ! has_version "media-libs/mesa[gallium]"; then + ewarn "You will need to emerge media-libs/mesa with USE=gallium." + fi + fi + + if has_version "media-libs/mesa[video_cards_intel]"; then + elog "GNOME Shell is unstable under gallium-mode i915/i965 mesa drivers." + elog "Make sure that classic architecture for i915 and i965 drivers is" + elog "selected using 'eselect mesa'." + if ! has_version "media-libs/mesa[classic]"; then + ewarn "You will need to emerge media-libs/mesa with USE=classic." + fi + fi +} diff --git a/gnome-extra/gnome-screenshot/Manifest b/gnome-extra/gnome-screenshot/Manifest new file mode 100644 index 0000000..693baa3 --- /dev/null +++ b/gnome-extra/gnome-screenshot/Manifest @@ -0,0 +1,3 @@ +DIST gnome-screenshot-3.5.2.tar.xz 267016 RMD160 0d47fe9967289c7b2d793e7f6c505d099ac42a3c SHA1 0975c4c362b7c731ba4042ff3f7ac28ffd385103 SHA256 b0ca6401eb7d2ee61de3de84ecfd40a29dceb293aea2b30ab892b218943fb360 +EBUILD gnome-screenshot-3.5.2.ebuild 842 RMD160 b18a62d1784b151bb1a1bcd0cb84219ab054d1c9 SHA1 5185f845ec3156603e5dbc8e8a36ec47fc87e0b7 SHA256 12588812140f251c2579361a835b438a9ecaa63f569d247ca9ddbae2bccf9450 +EBUILD gnome-screenshot-9999.ebuild 842 RMD160 b18a62d1784b151bb1a1bcd0cb84219ab054d1c9 SHA1 5185f845ec3156603e5dbc8e8a36ec47fc87e0b7 SHA256 12588812140f251c2579361a835b438a9ecaa63f569d247ca9ddbae2bccf9450 diff --git a/gnome-extra/gnome-screenshot/gnome-screenshot-3.5.2.ebuild b/gnome-extra/gnome-screenshot/gnome-screenshot-3.5.2.ebuild new file mode 100644 index 0000000..4c6a85c --- /dev/null +++ b/gnome-extra/gnome-screenshot/gnome-screenshot-3.5.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.5.ebuild,v 1.1 2011/02/02 05:53:24 nirbheek Exp $ + +EAPI="4" +GCONF_DEBUG="no" + +inherit gnome2 +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +fi + +RDEPEND=">=dev-libs/glib-2.29.14:2 + >=x11-libs/gtk+-3.0.3:3 + >=media-libs/libcanberra-0.26-r2[gtk3]" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.40" + +DOCS="" diff --git a/gnome-extra/gnome-screenshot/gnome-screenshot-9999.ebuild b/gnome-extra/gnome-screenshot/gnome-screenshot-9999.ebuild new file mode 100644 index 0000000..4c6a85c --- /dev/null +++ b/gnome-extra/gnome-screenshot/gnome-screenshot-9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.5.ebuild,v 1.1 2011/02/02 05:53:24 nirbheek Exp $ + +EAPI="4" +GCONF_DEBUG="no" + +inherit gnome2 +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Collection of GSettings schemas for GNOME desktop" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +fi + +RDEPEND=">=dev-libs/glib-2.29.14:2 + >=x11-libs/gtk+-3.0.3:3 + >=media-libs/libcanberra-0.26-r2[gtk3]" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.40" + +DOCS="" diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest index b81b723..425704e 100644 --- a/gnome-extra/sushi/Manifest +++ b/gnome-extra/sushi/Manifest @@ -1,2 +1,2 @@ -DIST sushi-0.5.1.tar.xz 300932 RMD160 d5d68281c44dbdf699db792f8b8b369aafe55f4a SHA1 104ff2b7972835e34f7bf7cd5c4fbbd14ae9905c SHA256 598c1bdcb7a724304583ac0fb5ef4f1649bfcd37add84eb1f3afa3ac8a074cb7 -EBUILD sushi-0.5.1.ebuild 1507 RMD160 be38b00c0268e24ef2404411a53672e8ab80fa88 SHA1 c3d366974bed3a3523e004debd0e407689511c24 SHA256 f5e381ae5bbe33705e3cb420f416cb431a8be2fc2ff388303b118b216ecd7f05 +DIST sushi-0.5.2.tar.xz 301464 RMD160 9edf4acd4f1864cf01582d04a4e4b35b7e9201e2 SHA1 be971da2da1bf03568629a01f77e72f9a615abb5 SHA256 4f73a64d4c25949c0951bd80210f785f8b8e1e5ba93ceb88aa3164f4982195a1 +EBUILD sushi-0.5.2.ebuild 1507 RMD160 be38b00c0268e24ef2404411a53672e8ab80fa88 SHA1 c3d366974bed3a3523e004debd0e407689511c24 SHA256 f5e381ae5bbe33705e3cb420f416cb431a8be2fc2ff388303b118b216ecd7f05 diff --git a/gnome-extra/sushi/sushi-0.5.1.ebuild b/gnome-extra/sushi/sushi-0.5.2.ebuild index e6cec03..e6cec03 100644 --- a/gnome-extra/sushi/sushi-0.5.1.ebuild +++ b/gnome-extra/sushi/sushi-0.5.2.ebuild diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest new file mode 100644 index 0000000..e4e3980 --- /dev/null +++ b/x11-wm/mutter/Manifest @@ -0,0 +1,3 @@ +AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 RMD160 408acd936e0a474714ffaa3c4a0a5c17bcc160ca SHA1 3705a09d1160c6a7ace480c5f51a3c413ac52a0d SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d +DIST mutter-3.5.2.tar.xz 1638108 RMD160 109db504cb05e45ab31dc95c678cbb2ff44e0f95 SHA1 517769b576a36a57504c6cb7ac55d97dcdd6e600 SHA256 383e65140d8538939e3bbe54c18b19c6026af02249f5b77f30b182982d0ed2c2 +EBUILD mutter-3.5.2.ebuild 2021 RMD160 b9e430cd455a4d399df928b6be38dd8759cfeb9a SHA1 086f8527f20b24ce6ed06e099c682c980cbf25b8 SHA256 b84ab7c995cd6510eb3994118a7b6d11837dd48498ea61d4842521a0bb81c444 diff --git a/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch new file mode 100644 index 0000000..bf4649e --- /dev/null +++ b/x11-wm/mutter/files/mutter-3.2.1-ignore-shadow-and-padding.patch @@ -0,0 +1,91 @@ +Patch author: Timo Kluck <tkluck@infty.nl> Wed, 21 Sep 2011 17:51:28 +0200 + +Patch to silently ignore padding and shadow tags in Ubuntu metacity themes. + +https://bugs.launchpad.net/bugs/800315 +https://bugs.gentoo.org/show_bug.cgi?id=396673 + +diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c +index 9063541..63a881f 100644 +--- a/src/ui/theme-parser.c ++++ b/src/ui/theme-parser.c +@@ -90,7 +90,9 @@ typedef enum + STATE_WINDOW, + /* things we don't use any more but we can still parse: */ + STATE_MENU_ICON, +- STATE_FALLBACK ++ STATE_FALLBACK, ++ /* an ubuntu specific ignore-this-element state */ ++ UBUNTU_STATE_IGNORE + } ParseState; + + typedef struct +@@ -1306,7 +1308,19 @@ parse_toplevel_element (GMarkupParseContext *context, + */ + push_state (info, STATE_FALLBACK); + } +- else ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else + { + set_error (error, context, + G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, +@@ -3027,6 +3041,18 @@ parse_style_element (GMarkupParseContext *context, + + push_state (info, STATE_BUTTON); + } ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } + else + { + set_error (error, context, +@@ -3671,6 +3697,8 @@ start_element_handler (GMarkupParseContext *context, + _("Element <%s> is not allowed inside a <%s> element"), + element_name, "fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ break; + } + } + +@@ -3960,6 +3988,9 @@ end_element_handler (GMarkupParseContext *context, + pop_state (info); + g_assert (peek_state (info) == STATE_THEME); + break; ++ case UBUNTU_STATE_IGNORE: ++ pop_state (info); ++ break; + } + + pop_required_version (info); +@@ -4165,6 +4196,9 @@ text_handler (GMarkupParseContext *context, + case STATE_FALLBACK: + NO_TEXT ("fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ NO_TEXT ("ignored_element"); ++ break; + } + } + diff --git a/x11-wm/mutter/mutter-3.5.2.ebuild b/x11-wm/mutter/mutter-3.5.2.ebuild new file mode 100644 index 0000000..3d71b95 --- /dev/null +++ b/x11-wm/mutter/mutter-3.5.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.4.1-r1.ebuild,v 1.3 2012/05/22 06:38:59 tetromino Exp $ + +EAPI="4" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 + +DESCRIPTION="GNOME 3 compositing window manager based on Clutter" +HOMEPAGE="http://git.gnome.org/browse/mutter/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+introspection test xinerama" +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?] + >=x11-libs/cairo-1.10[X] + x11-libs/gdk-pixbuf:2[introspection?] + >=x11-libs/gtk+-3.3.7:3[introspection?] + >=dev-libs/glib-2.25.11:2 + >=media-libs/clutter-1.9.10:1.0[introspection?] + >=media-libs/cogl-1.9.6:1.0[introspection?] + >=media-libs/libcanberra-0.26[gtk3] + >=x11-libs/startup-notification-0.7 + >=x11-libs/libXcomposite-0.2 + >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] + + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXrender + + gnome-extra/zenity + + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${COMMON_DEPEND} + >=app-text/gnome-doc-utils-0.8 + >=dev-util/intltool-0.35 + sys-devel/gettext + virtual/pkgconfig + test? ( app-text/docbook-xml-dtd:4.5 ) + xinerama? ( x11-proto/xineramaproto ) + x11-proto/xextproto + x11-proto/xproto" +RDEPEND="${COMMON_DEPEND} + !x11-misc/expocity" + +pkg_setup() { + DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt" + G2CONF="${G2CONF} + --disable-static + --enable-shape + --enable-sm + --enable-startup-notification + --enable-xsync + --enable-verbose-mode + --enable-compile-warnings=maximum + --with-libcanberra + $(use_enable introspection) + $(use_enable xinerama)" +} + +src_prepare() { + # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes) + epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch" + + gnome2_src_prepare +} |