summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-03 23:26:49 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-03 23:26:49 +0100
commitfd7bf06d88ac431e7d531701551815fd63c73963 (patch)
tree6ec536a36d9e6a2e9096f2b385441c5c56f44922 /net-misc
parent3cf27339901a7ca15df33f6ea134daa93888d5d0 (diff)
gentoo auto-resync : 03:05:2023 - 23:26:49
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin53772 -> 53773 bytes
-rw-r--r--net-misc/tigervnc-xorg-module/Manifest1
-rw-r--r--net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild18
-rw-r--r--net-misc/tigervnc/Manifest7
-rw-r--r--net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch36
-rw-r--r--net-misc/tigervnc/tigervnc-1.13.0.ebuild227
-rw-r--r--net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild1
-rw-r--r--net-misc/tigervnc/tigervnc-9999.ebuild9
8 files changed, 7 insertions, 292 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3ad61593a7cc..d448e33f7663 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index fd2d58c369fe..0afa8da96004 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,3 +1,2 @@
-EBUILD tigervnc-xorg-module-1.13.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
EBUILD tigervnc-xorg-module-1.13.1.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
deleted file mode 100644
index 48f881ebf961..000000000000
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://tigervnc.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
- ~net-misc/tigervnc-${PV}[server]
- =x11-base/xorg-server-${XSERVER_VERSION%.*}*
-"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d8c5c9df4571..b3139939c712 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,13 +3,10 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
-AUX tigervnc-1.13.80-depend-po-files.patch 1590 BLAKE2B d1dea3c951cd636124927a1735482b94cfbc41ffc570c7a1dd82ec953fb02f7e593c542a761177d4714903e3b55d69877475b76548cd7e7b61065485e874dc19 SHA512 35d54da0c95f6c42c6a241f49988439dee2b754ac7d1d79c7616032a854d6197acc04c7857d4559c6947f14b2f0703735294146b002a36f49c4acb171511cb75
-DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d SHA512 55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd9666686b8d4ac5fc3389c6f9319df16b90be8
DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
-EBUILD tigervnc-1.13.0.ebuild 5283 BLAKE2B 1e019a6ed98be9dfcbba682d9e86277a6f0a2c65ae01b40f530e487723ff353a58a9d96c86c97a6f091617c0bd1317bf4f98b8659910d4e103dd22d45d8504d1 SHA512 a2985fed7f368b90c513fe6a9f53e1317d0c6820644982c64ebced4ddd711166229794fed5a93b391c80eb6487c9584bffe01c5d69bc75d58ca6f100bced2030
-EBUILD tigervnc-1.13.1-r1.ebuild 5360 BLAKE2B adb74fb111b5eb77a9d42cdcd38a05d2400512236e642d8deb42bdfef3fe312cf3cb4c573e4b521410eb6685aad421bf4052737f9933fb9e91d416bd9cb5c8ff SHA512 2103e0754064be4fb26421b650676d7f8f3cbdf4efc68e6be9dec219263c2d1b0dff3efe04d43f768992231d9079bb70d9947037a2cccc445a9c4d93671b9261
+EBUILD tigervnc-1.13.1-r1.ebuild 5273 BLAKE2B 5f37d30b30a1785612d36ef3ee1e829bb4979a617d674b823af1cb1f330826c5656bddf44ba999045d91d0eb1554f864e6c6afc2a5925d77de94711929732a62 SHA512 743f8834ca3a9f82089b082a7f4caf161b3dfd9296051aaec3744f79d1a42132cc3c1f57aacfe3103ee42e0a3541988c84a411dd8e619605b85892cdea93b395
EBUILD tigervnc-1.13.1.ebuild 5283 BLAKE2B 1e019a6ed98be9dfcbba682d9e86277a6f0a2c65ae01b40f530e487723ff353a58a9d96c86c97a6f091617c0bd1317bf4f98b8659910d4e103dd22d45d8504d1 SHA512 a2985fed7f368b90c513fe6a9f53e1317d0c6820644982c64ebced4ddd711166229794fed5a93b391c80eb6487c9584bffe01c5d69bc75d58ca6f100bced2030
-EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+EBUILD tigervnc-9999.ebuild 5273 BLAKE2B 5f37d30b30a1785612d36ef3ee1e829bb4979a617d674b823af1cb1f330826c5656bddf44ba999045d91d0eb1554f864e6c6afc2a5925d77de94711929732a62 SHA512 743f8834ca3a9f82089b082a7f4caf161b3dfd9296051aaec3744f79d1a42132cc3c1f57aacfe3103ee42e0a3541988c84a411dd8e619605b85892cdea93b395
MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
deleted file mode 100644
index d611ece53fb1..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Currently the live version does not build because of this dependency. Remove it for now
-
---- a/vncviewer/CMakeLists.txt
-+++ b/vncviewer/CMakeLists.txt
-@@ -81,7 +81,6 @@
- --desktop --template vncviewer.desktop.in
- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -93,7 +92,6 @@
- -d ${CMAKE_SOURCE_DIR}/po
- vncviewer.desktop.intl vncviewer.desktop
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- else()
- add_custom_command(OUTPUT vncviewer.desktop
-@@ -110,7 +108,6 @@
- --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
- -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- elseif(INTLTOOL_MERGE_EXECUTABLE)
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
-@@ -123,7 +120,6 @@
- -x ${CMAKE_SOURCE_DIR}/po
- org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
-- ${CMAKE_SOURCE_DIR}/po/*.po
- )
- else()
- add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
deleted file mode 100644
index 8084b2b74a7b..000000000000
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
-else
- SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
-REQUIRED_USE="
- dri3? ( drm )
- java? ( viewer )
- opengl? ( server )
- || ( server viewer )
-"
-
-# TODO: sys-libs/libselinux
-COMMON_DEPEND="
- dev-libs/gmp:=
- dev-libs/nettle:=
- media-libs/libjpeg-turbo:=
- sys-libs/zlib:=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/pixman
- gnutls? ( net-libs/gnutls:= )
- nls? ( virtual/libiconv )
- server? (
- dev-libs/libbsd
- dev-libs/openssl:0=
- sys-libs/pam
- x11-libs/libXau
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXfixes
- x11-libs/libXfont2
- x11-libs/libXtst
- x11-libs/pixman
- x11-libs/xtrans
- x11-apps/xauth
- x11-apps/xinit
- x11-apps/xkbcomp
- x11-apps/xsetroot
- x11-misc/xkeyboard-config
- opengl? ( media-libs/libglvnd[X] )
- !net-misc/turbovnc[server]
- )
- viewer? (
- media-video/ffmpeg:=
- x11-libs/fltk:1
- x11-libs/libXi
- x11-libs/libXrender
- !net-misc/turbovnc[viewer]
- )
-"
-RDEPEND="${COMMON_DEPEND}
- java? ( virtual/jre:1.8 )
- server? (
- dev-lang/perl
- sys-process/psmisc
- )
-"
-DEPEND="${COMMON_DEPEND}
- drm? ( x11-libs/libdrm )
- server? (
- media-fonts/font-util
- x11-base/xorg-proto
- x11-libs/libxcvt
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrender
- x11-misc/util-macros
- opengl? ( media-libs/mesa )
- )
-"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
- # Restore Java viewer
- "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
- "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
- "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
-)
-[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
-
-src_unpack() {
- if [[ ${PV} == *9999 ]]; then
- git-r3_src_unpack
- use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
- else
- default
- fi
-}
-
-src_prepare() {
- if use server; then
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
- fi
-
- cmake_src_prepare
-
- if use server; then
- cd unix/xserver || die
- eapply ../xserver${XSERVER_VERSION}.patch
- eautoreconf
- sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
- sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
-
- if use drm; then
- cd "${WORKDIR}" && \
- sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
- fi
- fi
-}
-
-src_configure() {
- if use arm || use hppa; then
- append-flags "-fPIC"
- fi
-
- local mycmakeargs=(
- -DENABLE_GNUTLS=$(usex gnutls)
- -DENABLE_NLS=$(usex nls)
- -DBUILD_JAVA=$(usex java)
- -DBUILD_SERVER=$(usex server)
- -DBUILD_VIEWER=$(usex viewer)
- )
-
- cmake_src_configure
-
- if use server; then
- cd unix/xserver || die
- econf \
- $(use_enable opengl glx) \
- $(use_enable drm libdrm) \
- --disable-config-hal \
- --disable-config-udev \
- --disable-devel-docs \
- --disable-dri \
- $(use_enable dri3) \
- --disable-glamor \
- --disable-kdrive \
- --disable-libunwind \
- --disable-linux-acpi \
- --disable-record \
- --disable-selective-werror \
- --disable-static \
- --disable-unit-tests \
- --disable-xephyr \
- $(use_enable xinerama) \
- --disable-xnest \
- --disable-xorg \
- --disable-xvfb \
- --disable-xwin \
- --enable-dri2 \
- --with-pic \
- --without-dtrace \
- --disable-present \
- --with-sha1=libcrypto
- fi
-}
-
-src_compile() {
- cmake_src_compile
-
- if use server; then
- # deps of the vnc module and the module itself
- local d subdirs=(
- fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
- damageext miext Xi xkb composite dix mi os hw/vnc
- )
- for d in "${subdirs[@]}"; do
- emake -C unix/xserver/"${d}"
- done
- fi
-}
-
-src_install() {
- cmake_src_install
-
- if use server; then
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
- rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-
- newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
-
- systemd_douserunit unix/vncserver/vncserver@.service
-
- # comment out pam_selinux.so, the server does not start if missing
- # part of bug #746227
- sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
-
- # install vncserver to /usr/bin too, see bug #836620
- dosym -r /usr/libexec/vncserver /usr/bin/vncserver
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
- use server && \
- optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
- optfeature_header "Install any additional display manager package:" && \
- optfeature "proper session support" ${OPTIONAL_DM}
-}
diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 7c3dbedebb53..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -103,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
-[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
if [[ ${PV} == *9999 ]]; then
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index fc6cb7d77a07..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
CMAKE_IN_SOURCE_BUILD=1
inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
-XSERVER_VERSION="21.1.1"
+XSERVER_VERSION="21.1.8"
+XSERVER_PATCH_VERSION="21.1.1"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="https://tigervnc.org"
@@ -71,13 +72,14 @@ COMMON_DEPEND="
)
"
RDEPEND="${COMMON_DEPEND}
- java? ( virtual/jre:1.8 )
+ java? ( >=virtual/jre-1.8:* )
server? (
dev-lang/perl
sys-process/psmisc
)
"
DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )
drm? ( x11-libs/libdrm )
server? (
media-fonts/font-util
@@ -101,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
-[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
if [[ ${PV} == *9999 ]]; then
@@ -121,7 +122,7 @@ src_prepare() {
if use server; then
cd unix/xserver || die
- eapply ../xserver${XSERVER_VERSION}.patch
+ eapply ../xserver${XSERVER_PATCH_VERSION}.patch
eautoreconf
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die