[gentoo-commits] proj/x11:master commit in: x11-apps/xinit/, x11-apps/xinit/files/

[gentoo-commits] proj/x11:master commit in: x11-apps/xinit/, x11-apps/xinit/files/

[Chi-Thanh Christopher Nguyen]

commit:     3a1c137d68b5ca2cba99178d3f542b5650b96dde
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 08:03:20 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Dec  1 08:03:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3a1c137d

x11-apps/xinit: import Xsession.desktop from portage

---
 x11-apps/xinit/files/Xsession.desktop |    9 +++++++++
 x11-apps/xinit/xinit-9999.ebuild      |    3 +++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
new file mode 100644
index 0000000..4ed3a5c
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=XSession
+Comment=This session logs you into your custom Xsession
+Exec=/etc/X11/Sessions/Xsession
+TryExec=/etc/X11/Sessions/Xsession
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application

diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index b1264d4..e2162f3 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -50,6 +50,9 @@ src_install() {
 	doexe "${FILESDIR}"/xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/Xsession.desktop"
 }
 
 pkg_postinst() {

[gentoo-commits] proj/x11:master commit in: x11-apps/xinit/, x11-apps/xinit/files/

[Chi-Thanh Christopher Nguyen]

commit:     b328f6d1e382a2a9df1f3fb303c43ca4696ef2fa
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 19:57:02 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Sep 11 19:57:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b328f6d1

x11-apps/xinit: update failing patch for bug #472176, Sync keywords with portage

---
 ...o-customizations.patch => xinit-1.3.3-gentoo-customizations.patch} | 4 ++--
 x11-apps/xinit/xinit-9999.ebuild                                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
similarity index 93%
rename from x11-apps/xinit/files/0001-Gentoo-customizations.patch
rename to x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
index a25ef4b..48dceab 100644
--- a/x11-apps/xinit/files/0001-Gentoo-customizations.patch
+++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
@@ -35,8 +35,8 @@ index 049a8e4..80c3ad9 100644
 +fi
 +
  if [ -d XINITDIR/xinitrc.d ] ; then
--	for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
-+	for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
+-	for f in XINITDIR/xinitrc.d/?*.sh ; do
++	for f in XINITDIR/xinitrc.d/?* ; do
  		[ -x "$f" ] && . "$f"
  	done
  	unset f

diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 409dae5..e8f2ded 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
@@ -28,7 +28,7 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
 src_configure() {

[gentoo-commits] proj/x11:master commit in: x11-apps/xinit/, x11-apps/xinit/files/

[Chi-Thanh Christopher Nguyen]

commit:     d8e4737e54d5c8fb3187444377fe64f94378d598
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 14:44:11 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Fri Mar 14 14:44:11 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d8e4737e

x11-apps/xinit: import changes to xserverrc for bug #451956.

---
 x11-apps/xinit/files/xserverrc   | 2 --
 x11-apps/xinit/files/xserverrc.1 | 6 ++++++
 x11-apps/xinit/xinit-9999.ebuild | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
deleted file mode 100755
index b4de252..0000000
--- a/x11-apps/xinit/files/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"

diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
new file mode 100755
index 0000000..6b57eeb
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.1
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi

diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 25feda1..4a5d44a 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -46,7 +46,7 @@ src_install() {
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/Xsession
 	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc
+	newexe "${FILESDIR}"/xserverrc.1 xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"