summaryrefslogtreecommitdiff
path: root/x11-apps
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
commitde49812990871e1705b64051c35161d5e6400269 (patch)
tree5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /x11-apps
parent536c3711867ec947c1738f2c4b96f22e4863322d (diff)
gentoo resync : 24.12.2018
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/Manifest.gzbin14687 -> 14690 bytes
-rw-r--r--x11-apps/fonttosfnt/Manifest2
-rw-r--r--x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild13
-rw-r--r--x11-apps/xauth/Manifest2
-rw-r--r--x11-apps/xauth/xauth-1.0.10.ebuild2
-rw-r--r--x11-apps/xinit/Manifest2
-rw-r--r--x11-apps/xinit/files/xserverrc.26
-rw-r--r--x11-apps/xinit/xinit-1.4.0-r1.ebuild67
8 files changed, 77 insertions, 17 deletions
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 6f5d4f40a8d3..b4e48d35281e 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
Binary files differ
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index d1939cb9bcc3..16646cdf582e 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,5 +1,3 @@
-DIST fonttosfnt-1.0.4.tar.bz2 106121 BLAKE2B 9ae24fa3824ef530865af68a22e38e8343e7b4978270f911b0ab3d7f0efc14536c1c8f713f299c75e78ad1f8d5b89eec9ad31227c894333d2e52799e5bebfdc8 SHA512 15764d51f581a18c5f25224312a4cf0558bd6b1676d8e5e58f8eb4ae156908bb679726e848b46a316b54a8120e664122f96f7b1233da372b2351923652920b1e
DIST fonttosfnt-1.0.5.tar.bz2 141446 BLAKE2B 277f7f182d0c45ed06fd67ad0c839c2b116d64d801fbd623b81b8a9cbe5ee77a89b6b5cd277d3090a9b6be6e006bea36e1cf98e2dbdb2917e54ddfa30d0b659b SHA512 dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297
-EBUILD fonttosfnt-1.0.4-r1.ebuild 329 BLAKE2B dd2860f48c379482944ebaa798f488d0c6892adb481b478aea629d7a5c6d7cc60373eaf45dd88ce819dac46ca05b341d724cdd31fc861eed4f7d23b77c12b651 SHA512 44e32e04d8fc92970f80a519b43ac0d40e4348f3a84738b4750240acb8de8b53973065a3396108e7286b4fb2a04d9a9db00d81b6f7ec834a0d06c203f53fde93
EBUILD fonttosfnt-1.0.5.ebuild 328 BLAKE2B e79415219a00bbce13b41b43fe9b1136dbd3125cbcfbe1918b7528401657b4eb53a0f100df172a4c46868ee7cb55a352a2e5390cd0a154bd3482379941fe8946 SHA512 9902c7c8f38da3f4bd88e5838efa3cb8d9461f8366d0a8b3dde8a8eceebb505e771a69e8f732ebfac5df38d5d96d443dcd07b148cc3db36385b634532ced1a64
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
deleted file mode 100644
index 61d81756292b..000000000000
--- a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
- =media-libs/freetype-2*
- x11-libs/libfontenc"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index eb1b9f4bc86f..b2c5c30ea0b5 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
DIST xauth-1.0.10.tar.bz2 162176 BLAKE2B 0a3a70360357f0f1a36a72e54b404526e62ddabbdc8b2e6ed992ceb56847fa983b9cec1ba23aab92f4b2fe0712f097a8721d7c50a4b4ead217a5704cda76ea82 SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f
-EBUILD xauth-1.0.10.ebuild 631 BLAKE2B b1bba46d6675869528a9b055c892f83fb2848ca0410db1677e51e47315a98c4bb997943ce7adf559c38605312d9c873f404fa745325308a2f2d575e7b611a3bb SHA512 70ace09fc9f382f16c41cb05d65ead7abb6664d3668ee563cb59d41f664bc801c2513b726a41e81144e7686a1faae9a9de93ac3668fc0770712636cc381617b1
+EBUILD xauth-1.0.10.ebuild 630 BLAKE2B 382d7687208b375b6bf7dee3db4af3770f8ce82012a1a50ebded0bae819d2c06eed6cf239deb8168c8b82763c9a43ba797b597144d5353a0308f4eb39f005051 SHA512 bf1634d2f3b8b5522ed20ab66fa3f69e041b3f1d0e3436ff783964d995a898e8c118d71bde331da404e9541ba72938ce68525f6fdcac43719216e8b4715ef14b
EBUILD xauth-9999.ebuild 545 BLAKE2B 4b97293aa97ef5d05644508ab8bd6c055fb65d5c484981fa1cb786e5012e45e378d393b39c76d0744680e1385c36bc2da55a35192fdea22ff2e4b4ed18b23412 SHA512 99b1c10111900c48a7debdef3020905899018844fcc9b52b72e304e6a7f9702145565e2363bc8a7908cb7feb13e2bba0a62fd9afe64616ad14400e8e9c3c4c81
MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.0.10.ebuild b/x11-apps/xauth/xauth-1.0.10.ebuild
index 598152ecf467..e767892c43f5 100644
--- a/x11-apps/xauth/xauth-1.0.10.ebuild
+++ b/x11-apps/xauth/xauth-1.0.10.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils xorg-2
DESCRIPTION="X authority file utility"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
IUSE="ipv6 test"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8853684105df..c5b0412f13ce 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -6,6 +6,8 @@ AUX startDM.sh 818 BLAKE2B b9ccb2e8dc8c711b6ca550a0e94b15af38df59bb3a508666e5768
AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
+AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f23a8717f836819da3a947b72bd99c7a14516534e9771033bcd1e26d167f2f7083be20eae3b2f SHA512 61afea54f66b9f397860e467cf87a41e1d9f97d7194930bccc254e44dd4178bca7b402bff7aa2a1d6f44a91680f3f1ee10a5b57e527aaff80438623edc1b07c5
DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
+EBUILD xinit-1.4.0-r1.ebuild 1770 BLAKE2B 6343cde4a856b90eb3ed64a0d3023aa20465cf26cd1208d5b50ca45b9dbee22a0161ce56462c256716223c3a9261805d216ec550760a401b6e3df7ed51e7890d SHA512 691439582460fb1f0681683524e3914800f710c57410bd467192dd66de62180b1307281096611233f3adcc0dc5719f8b0014d07e8cdabe741f069b72c70aaf91
EBUILD xinit-1.4.0.ebuild 1749 BLAKE2B 4c676cb420ce5eec590e71b24fca1f90c3858fc250bdea1a9d351a83b33d839090ce779005a4145deae2b35550aed4f562377b0632c5f139e8a1dd543a6fdf41 SHA512 71824c125bfa102a46db4101096991bb1fab3a604f3ff6a933213d00f935648b2ed191438fd31efd2088b990f2f089fb6b0b00709fbfe6ed34c52549dbef4be9
MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/files/xserverrc.2 b/x11-apps/xinit/files/xserverrc.2
new file mode 100644
index 000000000000..8d5b2c3f790c
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.2
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+ exec /usr/bin/X -nolisten tcp "$@"
+else
+ exec /usr/bin/X -nolisten tcp -keeptty "$@" "vt$XDG_VTNR"
+fi
diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..13cf2917ed8c
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+ !<x11-base/xorg-server-1.8.0
+ x11-apps/xauth
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+ !minimal? (
+ x11-apps/xclock
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+ "${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /etc/X11
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}"/Xsession
+ exeinto /etc/X11/xinit
+ newexe "${FILESDIR}"/xserverrc.2 xserverrc
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/00-xhost
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+ ewarn "any executable. When you run startx, it will run this as the login session."
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+ ewarn "Here's an example of setting it for the whole system:"
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+ ewarn " env-update && source /etc/profile"
+}