summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2013-10-12 14:41:34 +0000
committerRaúl Porcel <armin76@gentoo.org>2013-10-12 14:41:34 +0000
commit1fbca90e5fb78050e264c9bb06c9115249731c69 (patch)
tree4501c59c65649e03a8b23faf6b2422f7960cec03 /net-misc/tigervnc
parentVersion bump giggle to 0.7 (bug 476902). (diff)
downloadhistorical-1fbca90e5fb78050e264c9bb06c9115249731c69.tar.gz
historical-1fbca90e5fb78050e264c9bb06c9115249731c69.tar.bz2
historical-1fbca90e5fb78050e264c9bb06c9115249731c69.zip
Version bump wrt #486800, remove old
Package-Manager: portage-2.2.1/cvs/Linux x86_64 Manifest-Sign-Key: 0xF6AD3240
Diffstat (limited to 'net-misc/tigervnc')
-rw-r--r--net-misc/tigervnc/ChangeLog8
-rw-r--r--net-misc/tigervnc/Manifest17
-rw-r--r--net-misc/tigervnc/tigervnc-1.3.0.ebuild (renamed from net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild)157
3 files changed, 95 insertions, 87 deletions
diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index b60971f9e376..bf10f51f1854 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/tigervnc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.164 2013/10/12 13:26:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.165 2013/10/12 14:41:26 armin76 Exp $
+
+*tigervnc-1.3.0 (12 Oct 2013)
+
+ 12 Oct 2013; Raúl Porcel <armin76@gentoo.org> -tigervnc-1.1.0-r7.ebuild,
+ +tigervnc-1.3.0.ebuild:
+ Version bump wrt #486800, remove old
12 Oct 2013; Jeroen Roovers <jer@gentoo.org> tigervnc-1.1.0-r7.ebuild,
tigervnc-1.2.0.ebuild:
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a48548f15d5a..aee1b23258a2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,26 +6,25 @@ AUX 1.1.0-gethomedir.patch 889 SHA256 4b85a9ddb9980e88c2f66c0cb56f6e8f00e4789ba2
AUX 1.1.0-xorg-1.12_fix.patch 829 SHA256 250b4cece83917026b958aaf625b458232027e176c97047be959f091a25c2abf SHA512 9e0c59835328e13569c9e819a69d9fd37feab3e0f228e2a8b1f0aa733dd564caa896c1d6169da1a265b73d9c8a5b5ce458a96d25517ba9483ce17e75360e0958 WHIRLPOOL 8cb1ba215b357f3b73830734b954e369d1d4d370a437fc6a0593a1e198c5d393eebd1bb5dbbff1350a9391cc2fe96c3e5bb2dc751de6e13944b9a575859eba36
AUX tigervnc.confd 346 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4 WHIRLPOOL 9911713196cb57057b2200c0303b832fe7708520453cbf4ca1b9ed945738c734afff3f4d1f96e361e487e59b39f3ef44ac939234e1ea56e2e9e4e612cd5d70ee
AUX tigervnc.initd 2088 SHA256 bd0cadea7f885dcfaae56c45791a8b41e0b34865ea50173335179d7209ae99e6 SHA512 a98bfb996440fe5604ed4811adc141220b178de42482c521818b3e3e4b1b1268aa32d49b560208f0c23f5becadb4a1f392b650f6a4761bc13c3eb87752acec89 WHIRLPOOL b5e38cb5f5dc8d1636b2969aa5ca807c72dc83272182c51e0e75251a90f8e3fa02d2f319cc028ff194757797689d355d1e2ec3d5dedc2d9de744507a34edab01
-DIST tigervnc-1.1.0.tar.gz 2742707 SHA256 594b70825a2c24863afd7b8dd2a5bc1935807118c6726e1d98396dee44d060f4 SHA512 60e95892e2bc9e55683d174e6cfcb803309b81533db2ce87d1e02157df816cc8075cdc3583c8e1d9aeeaf1949b00083c79a0e014a5e441032a518f297cbfa93f WHIRLPOOL 619f09936974ce34e599ab8b1bffa57ee99be4027631ccc78ac99b86f8c7ce5cd3854395235c32eb90ddbb6b7809000f4335319c4b36aee73599ca59c3653b6e
-DIST tigervnc-1.1.0_xorg-1.11.patch.bz2 2140 SHA256 f529f2e8f898fbea99b543d58965c2f53a29787b2bce4d649b84ef16ca2c3d75 SHA512 5a0d139df77f7f327cbef95aa40412c45df52e5f978acca8d6b6389f4936456af2e620c02b89db040255977d210bed6d1d288d150ecfdd95a773222bbd625078 WHIRLPOOL 76787751a85fc447dca0b7533b4e12e49898d8d7938b48417ef5f90b46f25f712924d655a3462768a9e18987e96b5fa0792c9d5e5f34df10f5c1d4eca94435e5
-DIST tigervnc-1.1.0_xorg-1.12.patch.bz2 2290 SHA256 110a630a57c5f284ad4644310f7f8f9efdc240d8e1de7124457c523a9122164f SHA512 9d9293b40eb16bb60d61e4415532dda2ee7aa8b8c0950fa71d74959e804d6c9e305ad90ad92fa3c6ad6afe68b3656e5c6a7958d36c0bd1baf232c9cfda7b874c WHIRLPOOL 570b15ba8994482a3ca36cffe7def4424e30f74c7383ebd6725f736e21aa04df355da9bfa51673e5f78566cc7de0fb5c5ef92fd7c40490a3af9233541f04726b
DIST tigervnc-1.2.0-patches-0.1.tar.bz2 10194 SHA256 cf58845892b50f1a9f01567747d262ba0619df85fe3bd67e61ebcb3229f75ff5 SHA512 f4061c85572901b160b41107960a46b7faea59d8bee9301bfb62ade26678711b4e86951bda74ca3ce0e51ba1fcddb37404da8e8e469353e8620a72d450fd816a WHIRLPOOL 80a40306cb138a137155b848f471a2bc54f8973eb869cbc90753a23a53361469f0c793389d2dcb341d3cf8bf403c5636f7c1f34722c7a86f7ff58f5afd80dbe9
DIST tigervnc-1.2.0.tar.gz 2487050 SHA256 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53 SHA512 a1ffe59f0db394455859a8de0551819f15f976689565fffc72c5eff9953e9678ff02f10dc0fc51931e251b6b8aee27c5c75c008ee6a7557f3db42911a90a27e5 WHIRLPOOL 5d2fc9be4cf9e281a29d27fc14362471d98b83bf3c396521ab267ad6fea24ed5c5ebeb81775af11ed06f3d0977fcda6976ea6dd16cfe798ed828442ef76a2c78
DIST tigervnc-1.2.80-20130314svn5065.tar.bz2 1048377 SHA256 bdb1b4ded129ca45e0ad9b9616851ae6f86ffed83e961991dc04bfef767a3b68 SHA512 ca2662864e8cd4d059bc8efbc755ee8db336e7491a098cc891fded67637d6a63c5e4ce1a9eabe6904d0c73b4238e0d0fcd3444c472eb8affb40f51e316b909a2 WHIRLPOOL d76a928efdf1e6be46b4237cce41c58dddaaff1164410d556b0badbbc1e8d9904348f2feb311abfeb7d4332c11cc08f3d47f7465ec021997954b0dd481c166ff
DIST tigervnc-1.2.80_p5065-patches-0.1.tar.bz2 6912 SHA256 16d3f5feeb017dfaccbb536c391fc66cd35465a56fb7b702c621a06cc0f8ca49 SHA512 cd04d6bfa1b64db0a964ab04fb813ad370855ff7ad4ebfe377a74bcd0dbfe1603bb8bc908befab038c428830ea286fbcceff2f3ac992d8f1aaeabc9ee952f640 WHIRLPOOL dec7b0c485302236375cc4abfe5409b2d3e0ea02b27ff5ed048e30ab1e51ef54fdad713850de6d7445e3e0b5eb9d4b483d61f7079069a301c6dccea6b9dbdbbd
+DIST tigervnc-1.3.0-patches-0.1.tar.bz2 6940 SHA256 fa9c29a544b2826fb78cfedc9d4e3fd0100e56f7572f78d7c32a7ad752c3f22e SHA512 862965a708ce5cbc35409aff7947ebc8330c020b03ed69c2298aec81bc6d85b6492408bb4cea112b221dcc6c5c1e7ad1ec5e424df10536329930a58021712fa1 WHIRLPOOL 5970c6d0ace4c8b9846e9916052114ae45f84f3bc89227e958333ea4facd2fd2f5749121b545d5d157dec2cf35d403e6aaff96b17a9ef56fd20d64ad1d4d8906
+DIST tigervnc-1.3.0.tar.bz2 1069481 SHA256 61e5a78118c3a4adbc3b3026615a1068aed43839c2ad62815832bbc780f38c5a SHA512 ccd6e5586fe9546939b5d08c8dd515cf0a18d14716e46e66b31e606c7fcaee9d47d18499acfba74fd9e1b286b5e8b5511846399bbafbe1be2d00fee54f563bdc WHIRLPOOL 4b8ff8e71c730e184369495c0582b00fdac2dafafe033b539bb71fcf7e389bec18222fc33470a196437a907829af7d5080147ebb02eb02e5400d7fa9337545d0
DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
DIST xorg-server-1.13.0.tar.bz2 5469168 SHA256 548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a SHA512 840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014 WHIRLPOOL f52984556237f7c1dd4537727050e6b8347592ef5cd8e6787c65c3fee9bdcadb9709315929636fdc89a2fb4cdfd30f5224072954ed091eafb10fd8cd64a5ac30
DIST xorg-server-1.14.2.tar.bz2 5490488 SHA256 f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b SHA512 5a8caf61039b1605a85da9cba36ff525ccf9deda2f52be2b3f6360171d058b929a3a49e97db24b0587c4933009b2c479514f31d364eba54918a20a7e26a9060c WHIRLPOOL e20b6f60a806065184bb51d718eb50cad5b2809b7e0fe322f865ad5db3ed53cd3e9c7e6f8b577becde9c0cbec171435370087d1a19f496ed8645d4f93e2bac50
-EBUILD tigervnc-1.1.0-r7.ebuild 5207 SHA256 b71224fa34bf86b673b55f83a8d07151b9f29a0a468f94c949dd4b8901e13b0d SHA512 4792f3f590b552d47954f9b651d4b963379f77b4772c3dca4348c3dd341d58fa436d8694d8c91dc448dfff7ce17443ae6c9dff242e37097d0453a1f6495952fb WHIRLPOOL 3a46d2118e98d828611ffd88004225d396c5bb62ac1bccd1a3727887587d326fe6969cfac6782bf4df45c9b21880617d78121dac03bbfff66b612a420ea4719b
+DIST xorg-server-1.14.3.tar.bz2 5502845 SHA256 02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e SHA512 d5379e2f52e93985ab2636ca02f503baadd359a4ec05bed80162213392e16d433a2b7308e90cdd18c1a0bd283429f2c8b8758b5a2c585923533cced6245de989 WHIRLPOOL 241feac891f48bdc7470891d54abec0e13921cc127898b083665778ab87920d2bf10088536ac05b9db200cc2cc8b002307873786223995624aa70098370ba183
EBUILD tigervnc-1.2.0.ebuild 4878 SHA256 8c4517f734417e3a0ef75809ee49d23a7df1ff24280b2ebe6c355783e6be1b35 SHA512 b89b3bada718885efb220624938c4ece28ba2b6ba63134163a1a93ccbe5daeb96d87823b8bd6a4bb7740593d73268b6fbde08b767c2c4cdfb9fb2a0c80bba29e WHIRLPOOL b530fc7ad8bfa6cce606087563326e31d4d0eb9b59a34f27aebf754b5ad1c75089ff1652e9e856e6fefe5b4486cb406145322713bdb812adc24cc092d1047bf4
EBUILD tigervnc-1.2.80_p5065.ebuild 4910 SHA256 1812d31c11795ace49d02c0fe809ff1e33fd23bc51de0c5e11d57076be7731bc SHA512 5586e83922a4709a34d4497120fdde1c8c3113e5f3225ac2566aa951c7c05b747217e22cd0d718737ffa11b52785f39ccaebdfc99498a65d3775d3c9f09443cd WHIRLPOOL d853389a9cc5c081eaeb9e8dc6dec41cdf0ff9cf058614aaa0cc54b5452af4188d425ddf91ac2a8c2a89a11e832129db4c50ca9775d462f25834c5a012aaac74
-MISC ChangeLog 22075 SHA256 8ca222d9cd7397490b98deeb666b0492f77ac8e59002300838d77d219ae8d390 SHA512 e0870267e9934d35d3b13cd9d14ec4cc42d9a047496b493bb41014995047fac57729dc79160801a8b4f2f87cac4596e02cbc6b2baa6d8873a642f370b8e94cd2 WHIRLPOOL 7d161a680cba6f4fc33d26988c41c1975de95a04add53b31c161c0a19ec5c434b02400d57a6dfd82fb18e5a9477fcd14a0fff128bc6643b275c6f23d3ae6c583
+EBUILD tigervnc-1.3.0.ebuild 4805 SHA256 06935d361263b8fbf32ea0494a581f3c094f731ed6ad52467e84a36973397160 SHA512 2e84600c9949798893a68fcb73f82184c0a9cc36279823f0e9de31ecb0f440d99da7a5d24bf622af34e38e39cbc27ebcb2e9bead5f8473f61bf356a3493d2534 WHIRLPOOL 04b5c2a27ae680443755bb64f58e4b3abafec472208c45a3adde3946ba27202fd77d20bca819e04a7faa91ed2e0cfc12be6abfdf29103cc1d4642604f378418f
+MISC ChangeLog 22252 SHA256 aecacaaaf77f3b48373a6a2259883913b9a982fe30e701bffa409d54b11face8 SHA512 3c27a97f78cd3ade7c22da133d26cf5ffa01e77d1ea6b68f56813ee86975fa965d2590fd1b2dca8476a9626ff18e80a38f149b477fb6d99002051595048ed223 WHIRLPOOL d6ec7128299a9abd701b8e1385dd4958c5381aad7722dc7b8a7f9ed059a2f41c7293f3d037eadbcf4e981adaa6e8f7c489a5235cb24797eba24d721c2991bb2d
MISC metadata.xml 419 SHA256 86dbc1cfbd6cbb2e25c6e597dd377f99e50f315eaaebcc4402df4a3196e14042 SHA512 994d090964ed1dfd0404a7fd0abea328472587617cfb86c76fb73525479fa4c1db65d33d9413935df5472ab834bc27687793ad84b0996e82e3894aef456ae9a3 WHIRLPOOL 8bf5c41547ac54c04042cf22c4fc7d432842997e8530a72e4c8f0a508c4fc1f0e77689f382290824c1d3b83510447d1763e36db8606a875ab0e5af845ea2efcf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlJZTggACgkQVWmRsqeSphNBBwCeOiOvj+/1VDeIRhsyc4nIWyu2
-eFMAnAlZ8XUoTLQyyJYs3B/uwuC69e3Q
-=dLWh
+iEUEAREIAAYFAlJZX5oACgkQuQc30/atMkC4vQCYwRn7G82VrU/Eq9oqWejYXqH7
+QwCaAmWkBzkEMn2HrB0hbs+1JhqI+5k=
+=YAPT
-----END PGP SIGNATURE-----
diff --git a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.3.0.ebuild
index bdae7522c59e..38dfd04fb3ea 100644
--- a/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.3.0.ebuild
@@ -1,51 +1,49 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.1.0-r7.ebuild,v 1.14 2013/10/12 13:26:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.0.ebuild,v 1.1 2013/10/12 14:41:26 armin76 Exp $
-EAPI="1"
+EAPI="4"
-inherit eutils toolchain-funcs multilib autotools
+inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-XSERVER_VERSION="1.12.4"
+PATCHVER="0.1"
+XSERVER_VERSION="1.14.3"
OPENGL_DIR="xorg-x11"
+#MY_P="${PN}-1.2.80-20130314svn5065"
+#S="${WORKDIR}/${MY_P}"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="http://www.tigervnc.org"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2
-# http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
+SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.bz2
mirror://gentoo/${PN}.png
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2
- mirror://gentoo/tigervnc-1.1.0_xorg-1.11.patch.bz2
- mirror://gentoo/tigervnc-1.1.0_xorg-1.12.patch.bz2 )"
+ mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
+ http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="nptl +opengl server +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="gnutls java nptl +opengl pam server +xorgmodule"
RDEPEND="virtual/jpeg:0
sys-libs/zlib
- media-libs/freetype
- x11-libs/libSM
>=x11-libs/libXtst-1.0.99.2
- >=app-admin/eselect-opengl-1.0.8
+ >=x11-libs/fltk-1.3.1
+ gnutls? ( net-libs/gnutls )
+ java? ( >=virtual/jre-1.5 )
+ pam? ( virtual/pam )
server? (
+ dev-lang/perl
>=x11-libs/libXi-1.2.99.1
>=x11-libs/libXfont-1.4.2
- >=x11-libs/libXmu-1.0.3
>=x11-libs/libxkbfile-1.0.4
x11-libs/libXrender
>=x11-libs/pixman-0.21.8
>=x11-apps/xauth-1.0.3
x11-apps/xsetroot
>=x11-misc/xkeyboard-config-2.4.1-r3
- media-fonts/font-adobe-100dpi
- media-fonts/font-adobe-75dpi
- media-fonts/font-alias
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- xorgmodule? ( ~x11-base/xorg-server-${XSERVER_VERSION} )
+ opengl? ( >=app-admin/eselect-opengl-1.0.8 )
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
)
!net-misc/vnc
!net-misc/tightvnc
@@ -53,9 +51,10 @@ RDEPEND="virtual/jpeg:0
DEPEND="${RDEPEND}
amd64? ( dev-lang/nasm )
x86? ( dev-lang/nasm )
- >=x11-proto/inputproto-1.5
- >=x11-proto/xextproto-7.0.3
- >=x11-proto/xproto-7.0.13
+ >=x11-proto/inputproto-2.1.99.3
+ >=x11-proto/xextproto-7.1.99
+ >=x11-proto/xproto-7.0.22
+ java? ( >=virtual/jdk-1.5 )
server? (
virtual/pkgconfig
media-fonts/font-util
@@ -63,29 +62,21 @@ DEPEND="${RDEPEND}
>=x11-proto/bigreqsproto-1.1.0
>=x11-proto/compositeproto-0.4
>=x11-proto/damageproto-1.1
- >=x11-proto/dri2proto-2.6
>=x11-proto/fixesproto-5.0
>=x11-proto/fontsproto-2.0.2
- >=x11-proto/randrproto-1.2.99
+ >=x11-proto/randrproto-1.4.0
+ >=x11-proto/renderproto-0.11
>=x11-proto/resourceproto-1.0.2
>=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
>=x11-proto/videoproto-2.2.2
>=x11-proto/xcmiscproto-1.2.0
>=x11-proto/xineramaproto-1.1.3
- x11-proto/xf86bigfontproto
- x11-proto/xf86dgaproto
- x11-proto/xf86driproto
- x11-proto/xf86miscproto
- x11-proto/xf86vidmodeproto
- opengl? ( >=x11-proto/glproto-1.4.10 )
- >=media-libs/mesa-7.1
- >=x11-proto/renderproto-0.9.3
- x11-libs/libpciaccess
>=x11-libs/xtrans-1.2.2
+ >=x11-proto/dri2proto-2.8
+ opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
)"
-#S="${WORKDIR}/${PN}"
+CMAKE_IN_SOURCE_BUILD=1
pkg_setup() {
if ! use server ; then
@@ -93,8 +84,6 @@ pkg_setup() {
einfo "The 'server' USE flag will build tigervnc's server."
einfo "If '-server' is chosen only the client is built to save space."
einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- ebeep
- epause 5
else
ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
OLD_IMPLEM="$(eselect opengl show)"
@@ -110,68 +99,82 @@ switch_opengl_implem() {
eselect opengl set ${OLD_IMPLEM}
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
if use server ; then
cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
+ else
+ rm "${WORKDIR}"/patches/*_server_*
fi
- eautoreconf
- cd unix
+ EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" epatch
if use server ; then
- epatch xserver110.patch
- epatch "${WORKDIR}"/${P}_xorg-1.11.patch
- epatch "${WORKDIR}"/${P}_xorg-1.12.patch
- cd xserver
- epatch "${FILESDIR}"/1.1.0-export_missing_symbol.patch
- epatch "${FILESDIR}"/1.1.0-gethomedir.patch
- epatch "${FILESDIR}"/1.1.0-xorg-1.12_fix.patch
+ cd unix/xserver
+ epatch ../xserver114.patch
eautoreconf
fi
}
-src_compile() {
- econf --without-included-zlib --with-system-jpeg || die "econf failed"
- emake || die "emake failed"
+src_configure() {
- if use server ; then
+ use arm || use hppa && append-flags "-fPIC"
+
+ mycmakeargs=(
+ -G "Unix Makefiles"
+ $(cmake-utils_use_enable gnutls GNUTLS)
+ $(cmake-utils_use_enable pam PAM)
+ $(cmake-utils_use_build java JAVA)
+ )
+
+ cmake-utils_src_configure
+
+ if use server; then
cd unix/xserver
econf \
- --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
- --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
- --disable-static --disable-xinerama \
- --disable-composite \
- --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
- --enable-install-libxf86config \
- --enable-dri2 \
+ $(use_enable nptl glx-tls) \
+ $(use_enable opengl glx) \
--disable-config-dbus \
--disable-config-hal \
- --with-xmlto=no \
- --disable-unit-tests \
+ --disable-config-udev \
--disable-devel-docs \
- $(use_enable opengl glx) \
- $(use_enable nptl glx-tls) \
- || die "econf server failed"
- emake || die "emake server failed"
+ --disable-dmx \
+ --disable-dri \
+ --disable-kdrive \
+ --disable-selective-werror \
+ --disable-silent-rules \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ --disable-xinerama \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace
fi
}
-src_install() {
- dodoc README.txt
+src_compile() {
+ cmake-utils_src_compile
- cd unix
- emake DESTDIR="${D}" install || die "emake install failed"
- newman vncviewer/vncviewer.man vncviewer.1
+ if use server ; then
+ cd unix/xserver
+ emake
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
newicon "${DISTDIR}"/tigervnc.png vncviewer.png
make_desktop_entry vncviewer vncviewer vncviewer Network
if use server ; then
- cd xserver/hw/vnc
- emake DESTDIR="${D}" install || die "emake install failed"
+ cd unix/xserver/hw/vnc
+ emake DESTDIR="${D}" install
! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
newconfd "${FILESDIR}"/${PN}.confd ${PN}