public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/lightdm/
@ 2011-09-14 17:39 Markos Chandras
  0 siblings, 0 replies; 4+ messages in thread
From: Markos Chandras @ 2011-09-14 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     9e2473d235fb119e2670ce34789575315f8ca6f9
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 17:35:56 2011 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 17:35:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=9e2473d2

lightdm: Make gtk default when qt4&gtk are enabled

---
 x11-misc/lightdm/Manifest             |    2 +-
 x11-misc/lightdm/lightdm-0.9.5.ebuild |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index ce190c3..b8d8ecd 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 AUX lightdm-0.9.5-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
 DIST lightdm-0.9.5.tar.gz 624153 RMD160 fe0c4659e0c7535b4b25d53de63176bf89209118 SHA1 eefc13e1bd1f6800d01873ae9c91e58b9f8faf54 SHA256 6ed73abb163be7861a7bd9f4c1abef2ffd221fd20dfe2c8172b16a9175457bed
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-0.9.5.ebuild 3034 RMD160 f02d43f951de59fcdd92f245f487059b18a149a1 SHA1 a83ff4632981dccb9ca2b12984e563a7c85dea92 SHA256 d648d9aff9d425444f0008448e75b767c1bddbc9dfb529d99f1f0a8a89d49fad
+EBUILD lightdm-0.9.5.ebuild 3110 RMD160 c844d4786b837050f3f155a539bafe362e05114b SHA1 372931805ffb0764d7bf8086ffc347d1e996d940 SHA256 148eeec7978a3d74d0a1c01a4a471f649716f47a964e7357dffaab993247f2bc
 MISC metadata.xml 497 RMD160 9f8f6dade79a2a2c325b3168101d768012a93cae SHA1 9db32e834848c6b7ab062a2b8257676f77464790 SHA256 b2bf41a1c5c128b389d57f0f8e3adda24d765d268904d089bf375c1130b629f9

diff --git a/x11-misc/lightdm/lightdm-0.9.5.ebuild b/x11-misc/lightdm/lightdm-0.9.5.ebuild
index 67a6564..df606ea 100644
--- a/x11-misc/lightdm/lightdm-0.9.5.ebuild
+++ b/x11-misc/lightdm/lightdm-0.9.5.ebuild
@@ -58,8 +58,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local default=gnome greeter=lightdm-gtk-greeter
+	local default=gnome greeter=
+	# gtk has higher priority because Qt4 interface sucks
 	use qt4 && greeter=lightdm-qt-greeter
+	use gtk && greeter=ligthdm-gtk-greeter
 	econf --localstatedir=/var \
 		--disable-static \
 		$(use_enable introspection) \



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/lightdm/
@ 2011-09-15  8:08 Markos Chandras
  0 siblings, 0 replies; 4+ messages in thread
From: Markos Chandras @ 2011-09-15  8:08 UTC (permalink / raw
  To: gentoo-commits

commit:     1aa264907afdef0b1c126ac577231b35961033a4
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 08:06:52 2011 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 08:06:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=1aa26490

Move gentoo background to a new location

---
 x11-misc/lightdm/Manifest             |    2 +-
 x11-misc/lightdm/lightdm-0.9.5.ebuild |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index b8d8ecd..830e614 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 AUX lightdm-0.9.5-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
 DIST lightdm-0.9.5.tar.gz 624153 RMD160 fe0c4659e0c7535b4b25d53de63176bf89209118 SHA1 eefc13e1bd1f6800d01873ae9c91e58b9f8faf54 SHA256 6ed73abb163be7861a7bd9f4c1abef2ffd221fd20dfe2c8172b16a9175457bed
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-0.9.5.ebuild 3110 RMD160 c844d4786b837050f3f155a539bafe362e05114b SHA1 372931805ffb0764d7bf8086ffc347d1e996d940 SHA256 148eeec7978a3d74d0a1c01a4a471f649716f47a964e7357dffaab993247f2bc
+EBUILD lightdm-0.9.5.ebuild 3123 RMD160 0cfb7c7a1a64b5cf5010477209134377a007fea4 SHA1 305393b9ee0dd675481bfcae25a3f389ed8b6c26 SHA256 2d0feb91c6e908c6ef0c8332a7f20daadd6faf676576b8a4cbe817157f539c55
 MISC metadata.xml 497 RMD160 9f8f6dade79a2a2c325b3168101d768012a93cae SHA1 9db32e834848c6b7ab062a2b8257676f77464790 SHA256 b2bf41a1c5c128b389d57f0f8e3adda24d765d268904d089bf375c1130b629f9

diff --git a/x11-misc/lightdm/lightdm-0.9.5.ebuild b/x11-misc/lightdm/lightdm-0.9.5.ebuild
index df606ea..8b2eb6f 100644
--- a/x11-misc/lightdm/lightdm-0.9.5.ebuild
+++ b/x11-misc/lightdm/lightdm-0.9.5.ebuild
@@ -83,9 +83,9 @@ src_install() {
 		insinto /etc/${PN}/
 		doins "${WORKDIR}"/${PN}-gtk-greeter.conf
 		if use branding; then
-			insinto /usr/share/themes/Adwaita/backgrounds/
+			insinto /usr/share/${PN}/backgrounds/
 			doins "${WORKDIR}"/gentoo1024x768.png
-			sed -i -e "/background/s:stripes.jpg:gentoo1024x768.png:" \
+			sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \
 				"${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die
 		fi
 	fi



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/lightdm/
@ 2011-09-16 12:49 Markos Chandras
  0 siblings, 0 replies; 4+ messages in thread
From: Markos Chandras @ 2011-09-16 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     02652d1b54ba7b11411be2b680ad1acda5ae2a6c
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 12:47:37 2011 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 12:47:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=02652d1b

Fix typo. Output default configuration

---
 x11-misc/lightdm/Manifest             |    2 +-
 x11-misc/lightdm/lightdm-0.9.7.ebuild |   19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 5b91081..a295fe1 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
 DIST lightdm-0.9.7.tar.gz 623465 RMD160 2044605ebd78950c8bba232dc17521491223a002 SHA1 878e3ca0d9af50accd95b631b4b867871eeab899 SHA256 72749f1e5a73567bccf0858d3a39934c72dfd997deacfd44b0bf49389c73ae10
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-0.9.7.ebuild 3123 RMD160 0cfb7c7a1a64b5cf5010477209134377a007fea4 SHA1 305393b9ee0dd675481bfcae25a3f389ed8b6c26 SHA256 2d0feb91c6e908c6ef0c8332a7f20daadd6faf676576b8a4cbe817157f539c55
+EBUILD lightdm-0.9.7.ebuild 3469 RMD160 974081bdd0109fbf795dacc6ab281dab9fb6410a SHA1 06de7501c5250c4cc75002e2ea48eb383cd3b158 SHA256 72af879faeb8eef8b5fde68d3fb1addf8cb6846c65b413e9182d6733e46dd3c3
 MISC metadata.xml 497 RMD160 9f8f6dade79a2a2c325b3168101d768012a93cae SHA1 9db32e834848c6b7ab062a2b8257676f77464790 SHA256 b2bf41a1c5c128b389d57f0f8e3adda24d765d268904d089bf375c1130b629f9

diff --git a/x11-misc/lightdm/lightdm-0.9.7.ebuild b/x11-misc/lightdm/lightdm-0.9.7.ebuild
index 8b2eb6f..852b3c4 100644
--- a/x11-misc/lightdm/lightdm-0.9.7.ebuild
+++ b/x11-misc/lightdm/lightdm-0.9.7.ebuild
@@ -58,10 +58,21 @@ src_prepare() {
 }
 
 src_configure() {
-	local default=gnome greeter=
-	# gtk has higher priority because Qt4 interface sucks
+	# Maybe in the future, we can support some automatic session and user
+	# recognition. Until then, use default values
+	local default=gnome greeter= user=root
+
+	# gtk has higher priority because Qt4 interface sucks :)
 	use qt4 && greeter=lightdm-qt-greeter
-	use gtk && greeter=ligthdm-gtk-greeter
+	use gtk && greeter=lightdm-gtk-greeter
+
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${greeter}"
+	einfo "Default session: ${default}"
+	einfo "Greeter user: ${user}"
+
+	# do the actual configuration
 	econf --localstatedir=/var \
 		--disable-static \
 		$(use_enable introspection) \
@@ -69,7 +80,7 @@ src_configure() {
 		$(use_enable gtk liblightdm-gtk) \
 		--with-user-session=${default} \
 		--with-greeter-session=${greeter} \
-		--with-greeter-user=root \
+		--with-greeter-user=${user} \
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
 }
 



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/lightdm/
@ 2011-09-16 15:33 Markos Chandras
  0 siblings, 0 replies; 4+ messages in thread
From: Markos Chandras @ 2011-09-16 15:33 UTC (permalink / raw
  To: gentoo-commits

commit:     9ff7678af90fcc945cd0b8cdf7c2784fd9855e8c
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 15:31:19 2011 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 15:31:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=9ff7678a

Install missing files that mysteriously disappeared

---
 x11-misc/lightdm/Manifest             |    2 +-
 x11-misc/lightdm/lightdm-0.9.7.ebuild |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a295fe1..abacc72 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 AUX lightdm-0.9.7-gtk.patch 915 RMD160 6705c655470de1df7a568c56cd67569257735f36 SHA1 a3946116ad78b4511b75551586a0939d64e19451 SHA256 540a831d53729e97d80b7bc1bccadd1637fe5f1eac2867397d98db1a5228db93
 DIST lightdm-0.9.7.tar.gz 623465 RMD160 2044605ebd78950c8bba232dc17521491223a002 SHA1 878e3ca0d9af50accd95b631b4b867871eeab899 SHA256 72749f1e5a73567bccf0858d3a39934c72dfd997deacfd44b0bf49389c73ae10
 DIST lightdm-gentoo-patch.tar.gz 101983 RMD160 6463f6d96b635922ac0f060fbffe450caaec6a74 SHA1 63348e477bffa27c82839c74fe56d3bc4565a3b1 SHA256 2e56d0ef3926428cea7870fbade77b20bd05a7664ae301aacc56504e07cf39ba
-EBUILD lightdm-0.9.7.ebuild 3469 RMD160 974081bdd0109fbf795dacc6ab281dab9fb6410a SHA1 06de7501c5250c4cc75002e2ea48eb383cd3b158 SHA256 72af879faeb8eef8b5fde68d3fb1addf8cb6846c65b413e9182d6733e46dd3c3
+EBUILD lightdm-0.9.7.ebuild 3554 RMD160 9399ac575e8452dd753245e1173aa6685eb2a444 SHA1 a94de69c4a29e291e63ee900f5de3780d9974b13 SHA256 28b0f2d60b005f509ff60f2afd582786c8391daad496bac2c67ccfd98051d44e
 MISC metadata.xml 497 RMD160 9f8f6dade79a2a2c325b3168101d768012a93cae SHA1 9db32e834848c6b7ab062a2b8257676f77464790 SHA256 b2bf41a1c5c128b389d57f0f8e3adda24d765d268904d089bf375c1130b629f9

diff --git a/x11-misc/lightdm/lightdm-0.9.7.ebuild b/x11-misc/lightdm/lightdm-0.9.7.ebuild
index 852b3c4..4618d0e 100644
--- a/x11-misc/lightdm/lightdm-0.9.7.ebuild
+++ b/x11-misc/lightdm/lightdm-0.9.7.ebuild
@@ -86,6 +86,10 @@ src_configure() {
 
 src_install() {
 	default
+	
+	# Install missing files
+	insinto /etc/${PN}/
+	doins "${S}"/data/{users,keys}.conf
 	# remove .la files
 	find "${ED}" -name "*.la" -exec rm -rf {} +
 	rm -Rf "${ED}"/etc/init || die



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-09-16 15:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-16 15:33 [gentoo-commits] dev/hwoarang:master commit in: x11-misc/lightdm/ Markos Chandras
  -- strict thread matches above, loose matches on Subject: below --
2011-09-16 12:49 Markos Chandras
2011-09-15  8:08 Markos Chandras
2011-09-14 17:39 Markos Chandras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox