diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /metadata/md5-cache/x11-base/xorg-server-1.20.5 | |
parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) |
gentoo resync : 28.09.2019
Diffstat (limited to 'metadata/md5-cache/x11-base/xorg-server-1.20.5')
-rw-r--r-- | metadata/md5-cache/x11-base/xorg-server-1.20.5 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.5 b/metadata/md5-cache/x11-base/xorg-server-1.20.5 index aaba723d3d00..d78f2d5fc123 100644 --- a/metadata/md5-cache/x11-base/xorg-server-1.20.5 +++ b/metadata/md5-cache/x11-base/xorg-server-1.20.5 @@ -12,5 +12,10 @@ RDEPEND=libglvnd? ( media-libs/libglvnd !app-eselect/eselect-opengl ) !libglvnd? REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !glamor !wayland ) xephyr? ( kdrive ) SLOT=0/1.20.5 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2 +<<<<<<< HEAD _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 _md5_=b46122bb7125932d1dca68fa1007bd3d +======= +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xorg-3 f7ca8dca6425a439b1b40844e6eb1ae7 +_md5_=ec5908aee3335bd7b63b5c14c1a14b59 +>>>>>>> next |