public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/
Date: Wed, 12 Sep 2012 08:24:54 +0000 (UTC)	[thread overview]
Message-ID: <1347438180.6758ca38636778c0e39736bf0bfa88b4ba0e7f34.nirbheek@gentoo> (raw)

commit:     6758ca38636778c0e39736bf0bfa88b4ba0e7f34
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 08:22:57 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 08:23:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6758ca38

gnome-base/gdm: misc small fixes to the ebuild

GDM still doesn't start up. It looks like we're missing something here.
Perhaps GDM will *not* spawn the greeter any more? Unsure.

---
 gnome-base/gdm/gdm-3.5.91.ebuild |   47 +++++++++++++++++++++-----------------
 gnome-base/gdm/gdm-9999.ebuild   |   47 +++++++++++++++++++++-----------------
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/gnome-base/gdm/gdm-3.5.91.ebuild b/gnome-base/gdm/gdm-3.5.91.ebuild
index 0a34787..8a6351f 100644
--- a/gnome-base/gdm/gdm-3.5.91.ebuild
+++ b/gnome-base/gdm/gdm-3.5.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.2 2012/06/07 22:18:53 zmedico Exp $
+# $Header: $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -11,11 +11,11 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
+HOMEPAGE="https://live.gnome.org/GDM"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama +xklavier"
+IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -65,17 +65,6 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-39 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	xinerama? ( x11-libs/libXinerama )"
-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-0.17
-	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
@@ -101,6 +90,20 @@ RDEPEND="${COMMON_DEPEND}
 		sys-auth/pam_pkcs11 )
 
 	!gnome-extra/fast-user-switch-applet"
+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-0.17
+	x11-proto/inputproto
+	x11-proto/randrproto
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools"
+fi
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -111,7 +114,6 @@ pkg_setup() {
 	# --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
@@ -122,12 +124,12 @@ pkg_setup() {
 		--with-initial-vt=7
 		$(use_with accessibility xevie)
 		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
 		$(use_with consolekit console-kit)
-		$(use_with plymouth ply-boot-client)
+		$(use_with plymouth)
 		$(use_with systemd)
 		$(use_with tcpd tcp-wrappers)
 		$(use_with xinerama)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
 	enewgroup gdm
 	enewgroup video # Just in case it hasn't been created yet
@@ -150,6 +152,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.5.91-fix-daemonize-regression.patch"
 
 	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
+	# XXX: We can now pass a hard-coded initial value; temporary fix
 	#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
 
 	# make custom session work, bug #216984
@@ -167,9 +170,11 @@ src_prepare() {
 			-i data/00-upstream-settings || die "sed failed"
 	fi
 
-	mkdir -p "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	if [[ ${PV} != 9999 ]]; then
+		mkdir -p "${S}"/m4
+		intltoolize --force --copy --automake || die "intltoolize failed"
+		eautoreconf
+	fi
 
 	gnome2_src_prepare
 }
@@ -232,7 +237,7 @@ pkg_postinst() {
 		elog "password on your keyring. Use app-crypt/seahorse for that."
 	fi
 
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+	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

diff --git a/gnome-base/gdm/gdm-9999.ebuild b/gnome-base/gdm/gdm-9999.ebuild
index 0a34787..8a6351f 100644
--- a/gnome-base/gdm/gdm-9999.ebuild
+++ b/gnome-base/gdm/gdm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.2 2012/06/07 22:18:53 zmedico Exp $
+# $Header: $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -11,11 +11,11 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
+HOMEPAGE="https://live.gnome.org/GDM"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama +xklavier"
+IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth smartcard systemd tcpd test xinerama"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -65,17 +65,6 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-39 )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	xinerama? ( x11-libs/libXinerama )"
-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-0.17
-	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
@@ -101,6 +90,20 @@ RDEPEND="${COMMON_DEPEND}
 		sys-auth/pam_pkcs11 )
 
 	!gnome-extra/fast-user-switch-applet"
+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-0.17
+	x11-proto/inputproto
+	x11-proto/randrproto
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools"
+fi
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -111,7 +114,6 @@ pkg_setup() {
 	# --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
@@ -122,12 +124,12 @@ pkg_setup() {
 		--with-initial-vt=7
 		$(use_with accessibility xevie)
 		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
 		$(use_with consolekit console-kit)
-		$(use_with plymouth ply-boot-client)
+		$(use_with plymouth)
 		$(use_with systemd)
 		$(use_with tcpd tcp-wrappers)
 		$(use_with xinerama)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
 	enewgroup gdm
 	enewgroup video # Just in case it hasn't been created yet
@@ -150,6 +152,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.5.91-fix-daemonize-regression.patch"
 
 	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
+	# XXX: We can now pass a hard-coded initial value; temporary fix
 	#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
 
 	# make custom session work, bug #216984
@@ -167,9 +170,11 @@ src_prepare() {
 			-i data/00-upstream-settings || die "sed failed"
 	fi
 
-	mkdir -p "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	if [[ ${PV} != 9999 ]]; then
+		mkdir -p "${S}"/m4
+		intltoolize --force --copy --automake || die "intltoolize failed"
+		eautoreconf
+	fi
 
 	gnome2_src_prepare
 }
@@ -232,7 +237,7 @@ pkg_postinst() {
 		elog "password on your keyring. Use app-crypt/seahorse for that."
 	fi
 
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+	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


             reply	other threads:[~2012-09-12  8:25 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-12  8:24 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:59 [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/ Mart Raudsepp
2018-09-10 21:33 Gilles Dartiguelongue
2018-02-23 11:29 Sobhan Mohammadpour
2018-02-06 16:00 Sobhan Mohammadpour
2016-04-20  6:25 Remi Cardona
2016-03-25  0:56 Ole Reifschneider
2015-04-19 12:50 Ole Reifschneider
2014-12-22 23:11 Gilles Dartiguelongue
2014-10-15 22:26 Gilles Dartiguelongue
2014-10-11 23:11 Gilles Dartiguelongue
2014-04-22 21:35 Gilles Dartiguelongue
2013-03-14  4:30 Alexandre Rostovtsev
2012-12-01 14:17 Gilles Dartiguelongue
2012-11-18 19:33 Gilles Dartiguelongue
2012-10-30  7:23 Gilles Dartiguelongue
2012-09-28  5:09 Alexandre Rostovtsev
2012-09-27  9:47 Alexandre Rostovtsev
2012-09-27  8:10 Alexandre Rostovtsev
2012-09-14 19:10 Alexandre Rostovtsev
2012-09-12 12:11 Nirbheek Chauhan
2012-05-24  9:11 Alexandre Restovtsev
2012-03-31  9:14 Nirbheek Chauhan
2011-10-23 16:35 Alexandre Restovtsev
2011-10-04 22:23 Alexandre Restovtsev
2011-06-02 14:43 Nirbheek Chauhan
2011-04-08 10:52 Gilles Dartiguelongue
2011-04-08  5:29 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-09 17:46 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347438180.6758ca38636778c0e39736bf0bfa88b4ba0e7f34.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox