From d473a706836012853193afc7000922601e4ada61 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Oct 2017 17:57:29 +0100 Subject: gentoo resync : 19.10.2017 --- x11-apps/xinit/Manifest | 7 +--- x11-apps/xinit/files/startDM.sh | 9 ++++- x11-apps/xinit/xinit-1.3.3-r1.ebuild | 66 ------------------------------- x11-apps/xinit/xinit-1.3.3.ebuild | 66 ------------------------------- x11-apps/xinit/xinit-1.3.4-r1.ebuild | 74 ----------------------------------- x11-apps/xinit/xinit-1.3.4-r2.ebuild | 75 ++++++++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+), 213 deletions(-) delete mode 100644 x11-apps/xinit/xinit-1.3.3-r1.ebuild delete mode 100644 x11-apps/xinit/xinit-1.3.3.ebuild delete mode 100644 x11-apps/xinit/xinit-1.3.4-r1.ebuild create mode 100644 x11-apps/xinit/xinit-1.3.4-r2.ebuild (limited to 'x11-apps/xinit') diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 9f27f4276e75..1bce63b8b7e5 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -2,16 +2,13 @@ AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cec AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb AUX Xsession.desktop 229 SHA256 68cc432e350e4c6a94dc5b9d4e6659382a92d8a76b6b30851254d140373f41fe SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d WHIRLPOOL 472f41a4f695723f7bdf89a07f789269607fc4466fa3c060a63b6b50cb8b9e4a1b509f729eed1ad4d05a66fc7171e287fabf980570d7de54fa5a61209667a6c8 AUX chooser.sh 1192 SHA256 1aceac55722a24593314c60e465a1e68982ccaf5fe0cf4d99d01e0a4d6f4cc63 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 WHIRLPOOL ec48a47f3647aff62a6dbe25a38c4b68cbb772c65062bf2978cd5558e128ab58aa1a34cf6081c110eb81a91e8dd047e030812c4342dc77d4947b601e972b1dc3 -AUX startDM.sh 818 SHA256 f343f87c5c89aa1b7112ec946c4df06b25e541d488405f4d98bedbeddd30bd32 SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c WHIRLPOOL f4ad1ac5b9b4bf271df814b549b3eb010489595e02591a91c0641c89943bc8cb110ab701c72fea9343e0186c9172a961f202b91e0049c33ee896fb5ca7de2759 +AUX startDM.sh 950 SHA256 348c1c346fd4861c7cb08e07ce9ae0ca850f30fa5a54abd2d4a09de773cafe40 SHA512 4bb36cdcdb9c65a3956a003dd4c9c90ab64a41a24c5f26bfee6a0b2698e7f441e8343c76f1b13c501d5fe1f869024dd27b382bb5741e24341ec23c3a2cc38374 WHIRLPOOL a1eea734c3e14cba4502eb43ef135f56fe0d33ccf660e753dd6eb2beeac82873bf428eee36bf51816364a6a854de68aa24a99eadda01e0cb303f572e2106ad45 AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95 AUX xinit-1.3.4-startx-current-vt.patch 808 SHA256 04e21eba179787b66e19c15ba11f7ddf5c7a07caa98b1b7dbbb805df7723e9b9 SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9 WHIRLPOOL 83056b768075c35235e0cac451f037a499577db2ebbe47e021c8869e2aa4c86ed93e96e3617c08b1ed132a5f799bf24cb4c67c9515a52757b6b5680d964091fc AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4 AUX xserverrc.1 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c -DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4 DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222 -EBUILD xinit-1.3.3-r1.ebuild 1710 SHA256 cc39d9ecf7d848f8dc8ee86bd48f7ace95ecdadede0423ee50e787f58b6ecc56 SHA512 29936defecb686387f2f2f3ab5a53fae51541e1f7f079e5c9067016d22f771b529111eb425fd05514cf7385d7908054a4c92a7e5e47f960b59e2b1d8a1fd3ffd WHIRLPOOL 4435d3cc04067d4513b0575974591464fe3a1a23c9aa296cbae369a74c03ac553f2c4257bcf9d243281bf0eed4656f016ce38dc9ce51dcb17b3e43be80037f8b -EBUILD xinit-1.3.3.ebuild 1678 SHA256 ef5aad73f82925e54508e804b24e2798388bd83fa42ea7d26c43992290afce5a SHA512 77692a2a2ea8ba21f797421e9cc9095b0f5f27c984757283fd11aae717fa659df109bc2878f6456f309d47cf50ff3c7cc8562d932d03c4c919da132805ab281b WHIRLPOOL 6e90f7eb989b2985355044dad8375da1c438397649d02961a261132a7114e170360ef8268047a8fcea3dd96e2a87561665b35f29ea52e728284d08868f97d9c8 -EBUILD xinit-1.3.4-r1.ebuild 1906 SHA256 b98e6d2ef85d5c22ffec76678ed02ee6f9b7cdbf6499baf0ed7ab324df991fa8 SHA512 b6cf4c297fa7c313b2eb6d29b4c079867755f8ce4aff02bfd710d52397d158a62a8f1d7c3e0f1c67b985f49dc5fbde1555ea851d778be6be0d642f65d1210e5d WHIRLPOOL 1f0f6e3712068e81cffb016bda6005a6aefd11a5bb456d9324f93f23a3b643d6503932d1a6ef3116f477ef834022ba6975c8085036642a4433f2cf42aa5325b5 +EBUILD xinit-1.3.4-r2.ebuild 1947 SHA256 2473d322458cb9cce3ef5908c39cc87699f28834678188437acf3ee74cfc8116 SHA512 a89f374a0333147069e4a3bdded2f2ba71a0725aa3bd2c2295a1352f3ced106036ca54f7e32fdac238cbff28789fa194ef99a64b37a98192d2e3a4d7e49189ed WHIRLPOOL c17fdef20ca92169d7726e6b8ed107c31c33267494865fbc2eaeb9e7415b7979aa6b7e75b8411d063f3257ebc647ecfb9629a7540219ef778bc19ea21e8d30ab MISC ChangeLog 4782 SHA256 47bc98791a0ab8faa1987f7fad293f2b3c936062b715afa1e28c9bcf69e0cead SHA512 bd57878dbe63bc6255c44b95cceceb2737667f2df8189bc7cff16b9df4e782f054e3cbc26943c79c7273bc9e3a50f7f82e48653d554699ebf1d31b089a9502ea WHIRLPOOL 2be90a677295553ac1c4e4991dcb66fe4b18b0c6b078e6a8a9f5447d7a9e577b854e7a0603c6d128f5774d0b6dcc7300c9008e8eb166c8fa9a985b1747e060d6 MISC ChangeLog-2015 39710 SHA256 3f9ad1a503986b8cf8c85390e7cf95f2fcebfaf391c610e3875b01a993f2f01e SHA512 8b3f48beb02722d48166016432bf8e003b2468eb99fd914802b254d8945c0d894c63f714ef97a780e82e9de403f7ff3ebb59d3c36a16f0fd7eefe6f06b024b2d WHIRLPOOL 26e0e971f9adc58f392d3cf3bdaa0a78e2a519ee376bbd38ca8ef6927dc9ac059bb6788942e3a5c14d7f67de1bf67cdcd9d09d00eec31c52cae88f5df74d10a4 MISC metadata.xml 480 SHA256 2f9b94f5a7ec3f0058e3e17aee941e528167c2ace77aef03f081dbd47a5e0093 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55 WHIRLPOOL ce00934da5e14dc640184882aaae61d7071f9fdddf9545671de5ca1827cfe7c99316650dd744039536e28b13667793cb3fbbc1131acecb5464953575cd6f9f6f diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh index 66cceb3a68f5..21fb452df1e3 100644 --- a/x11-apps/xinit/files/startDM.sh +++ b/x11-apps/xinit/files/startDM.sh @@ -1,12 +1,17 @@ #!/bin/sh -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # We need to source /etc/profile for stuff like $LANG to work # bug #10190. . /etc/profile -. /etc/init.d/functions.sh +. /lib/gentoo/functions.sh + +# Bail out early if on a non-OpenRC system: +if [ ! -d /run/openrc ]; then + eerror "$0 should only be used on OpenRC systems" +fi # baselayout-1 compat if ! type get_options >/dev/null 2>/dev/null ; then diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild deleted file mode 100644 index 99c44ccf7a34..000000000000 --- a/x11-apps/xinit/xinit-1.3.3-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 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=" - ! /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" -} diff --git a/x11-apps/xinit/xinit-1.3.3.ebuild b/x11-apps/xinit/xinit-1.3.3.ebuild deleted file mode 100644 index ce597213f6ec..000000000000 --- a/x11-apps/xinit/xinit-1.3.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2013 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+minimal" - -RDEPEND=" - ! /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" -} diff --git a/x11-apps/xinit/xinit-1.3.4-r1.ebuild b/x11-apps/xinit/xinit-1.3.4-r1.ebuild deleted file mode 100644 index 51dc72d6fef8..000000000000 --- a/x11-apps/xinit/xinit-1.3.4-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="+minimal systemd" - -RDEPEND=" - ! /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" -} diff --git a/x11-apps/xinit/xinit-1.3.4-r2.ebuild b/x11-apps/xinit/xinit-1.3.4-r2.ebuild new file mode 100644 index 000000000000..d07cc9662f8d --- /dev/null +++ b/x11-apps/xinit/xinit-1.3.4-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2016 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="+minimal systemd" + +RDEPEND=" + !systemd? ( sys-apps/gentoo-functions ) + ! /etc/env.d/90xsession" + ewarn " env-update && source /etc/profile" +} -- cgit v1.2.3