commit: fb0561489e011863f1cd7e97b257e82742fca1df
Author: xdch47 <xdch47 <AT> posteo <DOT> de>
AuthorDate: Sat Dec 23 15:32:02 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 17:11:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb056148
net-misc/tigervnc: tigervnc-1.8.0-r2.ebuild.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild | 13 +++++--------
.../{tigervnc-1.8.0-r1.ebuild => tigervnc-1.8.0-r2.ebuild} | 12 +++++-------
net-misc/tigervnc/tigervnc-1.8.0.ebuild | 13 +++++--------
3 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
index 6a4c05c325f..745ac50ae66 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule xinerama
dri3"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
CDEPEND="virtual/jpeg:0
sys-libs/zlib
@@ -40,10 +40,7 @@ CDEPEND="virtual/jpeg:0
opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
drm? ( x11-libs/libdrm )
- )
- xinerama? ( x11-libs/libXinerama )
- dri3? ( x11-proto/dri3proto )
- "
+ )"
RDEPEND="${CDEPEND}
!net-misc/tightvnc
@@ -124,7 +121,7 @@ src_configure() {
--disable-devel-docs \
--disable-dmx \
--disable-dri \
- $(use_enable dri3) \
+ --disable-dri3 \
--disable-glamor \
--disable-kdrive \
--disable-libunwind \
@@ -136,7 +133,7 @@ src_configure() {
--disable-tslib \
--disable-unit-tests \
--disable-xephyr \
- $(use_enable xinerama) \
+ --disable-xinerama \
--disable-xnest \
--disable-xorg \
--disable-xvfb \
@@ -156,7 +153,7 @@ 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 "") $(usex dri3
dri3 "") randr render damageext miext Xi xkb
+ fb xfixes Xext dbe $(usex opengl glx "") randr render
damageext miext Xi xkb
composite dix mi os hw/vnc
)
for d in "${subdirs[@]}"; do
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
b/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
similarity index 93%
copy from net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
copy to net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
index 6a4c05c325f..fa3f172d4ab 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule xinerama
dri3"
+IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
CDEPEND="virtual/jpeg:0
sys-libs/zlib
@@ -156,7 +156,7 @@ 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 "") $(usex dri3
dri3 "") randr render damageext miext Xi xkb
+ 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
@@ -177,11 +177,9 @@ src_install() {
fi
newconfd "${FILESDIR}"/${PN}.confd ${PN}
- if use systemd; then
- systemd_douserunit
contrib/systemd/user/vncserver@.service
- else
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- fi
+
+ systemd_douserunit contrib/systemd/user/vncserver@.service
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
else
local f
cd "${ED}" || die
diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild
b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
index 3adc2034305..167052d8bef 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule xinerama
dri3"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
CDEPEND="virtual/jpeg:0
sys-libs/zlib
@@ -40,10 +40,7 @@ CDEPEND="virtual/jpeg:0
opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
drm? ( x11-libs/libdrm )
- )
- xinerama? ( x11-libs/libXinerama )
- dri3? ( x11-proto/dri3proto )
- "
+ )"
RDEPEND="${CDEPEND}
!net-misc/tightvnc
@@ -123,7 +120,7 @@ src_configure() {
--disable-devel-docs \
--disable-dmx \
--disable-dri \
- $(use_enable dri3) \
+ --disable-dri3 \
--disable-glamor \
--disable-kdrive \
--disable-libunwind \
@@ -135,7 +132,7 @@ src_configure() {
--disable-tslib \
--disable-unit-tests \
--disable-xephyr \
- $(use_enable xinerama) \
+ --disable-xinerama \
--disable-xnest \
--disable-xorg \
--disable-xvfb \
@@ -155,7 +152,7 @@ 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 "") $(usex dri3
dri3 "") randr render damageext miext Xi xkb
+ fb xfixes Xext dbe $(usex opengl glx "") randr render
damageext miext Xi xkb
composite dix mi os hw/vnc
)
for d in "${subdirs[@]}"; do
