| 1 |
commit: 79ca32d4bc3f86dc0ec288a223241f26143ea78c |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Thu Sep 10 01:33:07 2020 +0000 |
| 4 |
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 19:17:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ca32d4 |
| 7 |
|
| 8 |
x11-base/xorg-server: refactor init files to display-manager-init |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 11 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 12 |
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> |
| 13 |
|
| 14 |
.../{xorg-server-9999.ebuild => xorg-server-1.20.10-r1.ebuild} | 9 +++------ |
| 15 |
x11-base/xorg-server/xorg-server-9999.ebuild | 5 +---- |
| 16 |
2 files changed, 4 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild |
| 19 |
similarity index 96% |
| 20 |
copy from x11-base/xorg-server/xorg-server-9999.ebuild |
| 21 |
copy to x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild |
| 22 |
index 09eb63d40ba..76dc03e58d8 100644 |
| 23 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 24 |
+++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild |
| 25 |
@@ -4,14 +4,13 @@ |
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
XORG_DOC=doc |
| 29 |
-XORG_EAUTORECONF="yes" |
| 30 |
inherit xorg-3 multilib flag-o-matic toolchain-funcs |
| 31 |
EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 32 |
|
| 33 |
DESCRIPTION="X.Org X servers" |
| 34 |
SLOT="0/${PV}" |
| 35 |
if [[ ${PV} != 9999* ]]; then |
| 36 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 37 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 38 |
fi |
| 39 |
|
| 40 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 41 |
@@ -101,6 +100,7 @@ DEPEND="${CDEPEND} |
| 42 |
)" |
| 43 |
|
| 44 |
RDEPEND="${CDEPEND} |
| 45 |
+ gui-libs/display-manager-init |
| 46 |
selinux? ( sec-policy/selinux-xserver ) |
| 47 |
" |
| 48 |
|
| 49 |
@@ -169,6 +169,7 @@ pkg_setup() { |
| 50 |
--disable-linux-acpi |
| 51 |
--without-dtrace |
| 52 |
--without-fop |
| 53 |
+ --with-os-vendor=Gentoo |
| 54 |
--with-sha1=libcrypto |
| 55 |
CPP="$(tc-getPROG CPP cpp)" |
| 56 |
) |
| 57 |
@@ -198,10 +199,6 @@ src_install() { |
| 58 |
dodoc "${S}"/hw/xfree86/xorg.conf.example |
| 59 |
fi |
| 60 |
|
| 61 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 62 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 63 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 64 |
- |
| 65 |
# install the @x11-module-rebuild set for Portage |
| 66 |
insinto /usr/share/portage/config/sets |
| 67 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 68 |
|
| 69 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 70 |
index 09eb63d40ba..3452ef412c4 100644 |
| 71 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
| 72 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
| 73 |
@@ -101,6 +101,7 @@ DEPEND="${CDEPEND} |
| 74 |
)" |
| 75 |
|
| 76 |
RDEPEND="${CDEPEND} |
| 77 |
+ gui-libs/display-manager-init |
| 78 |
selinux? ( sec-policy/selinux-xserver ) |
| 79 |
" |
| 80 |
|
| 81 |
@@ -198,10 +199,6 @@ src_install() { |
| 82 |
dodoc "${S}"/hw/xfree86/xorg.conf.example |
| 83 |
fi |
| 84 |
|
| 85 |
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 86 |
- newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 87 |
- newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 88 |
- |
| 89 |
# install the @x11-module-rebuild set for Portage |
| 90 |
insinto /usr/share/portage/config/sets |
| 91 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
Archives