| 1 |
commit: d0902b3203b95700277805ddd8d18d7fd718b7f4 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 26 10:25:42 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 26 10:25:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0902b32 |
| 7 |
|
| 8 |
net-misc/tigervnc: remove 1.4.2-r2 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-misc/tigervnc/Manifest | 2 - |
| 13 |
.../tigervnc/files/tigervnc-1.4.2-byteorder.patch | 21 --- |
| 14 |
net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild | 201 --------------------- |
| 15 |
3 files changed, 224 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
| 18 |
index 0e5a2ce..5e456b5 100644 |
| 19 |
--- a/net-misc/tigervnc/Manifest |
| 20 |
+++ b/net-misc/tigervnc/Manifest |
| 21 |
@@ -1,7 +1,5 @@ |
| 22 |
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481 |
| 23 |
-DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f WHIRLPOOL 420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5 |
| 24 |
DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135 WHIRLPOOL a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec |
| 25 |
DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004 WHIRLPOOL 63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668 |
| 26 |
DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c |
| 27 |
-DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 |
| 28 |
DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f |
| 29 |
|
| 30 |
diff --git a/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch b/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index bd2dc51..00000000 |
| 33 |
--- a/net-misc/tigervnc/files/tigervnc-1.4.2-byteorder.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,21 +0,0 @@ |
| 36 |
---- a/include/dix-config.h.in |
| 37 |
-+++ b/include/dix-config.h.in |
| 38 |
-@@ -3,6 +3,14 @@ |
| 39 |
- #ifndef _DIX_CONFIG_H_ |
| 40 |
- #define _DIX_CONFIG_H_ |
| 41 |
- |
| 42 |
-+#ifndef X_BIG_ENDIAN |
| 43 |
-+# define X_BIG_ENDIAN 4321 |
| 44 |
-+#endif |
| 45 |
-+ |
| 46 |
-+#ifndef X_LITTLE_ENDIAN |
| 47 |
-+# define X_LITTLE_ENDIAN 1234 |
| 48 |
-+#endif |
| 49 |
-+ |
| 50 |
- /* Support BigRequests extension */ |
| 51 |
- #undef BIGREQS |
| 52 |
- |
| 53 |
--- |
| 54 |
-2.3.5 |
| 55 |
- |
| 56 |
- |
| 57 |
|
| 58 |
diff --git a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild b/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild |
| 59 |
deleted file mode 100644 |
| 60 |
index 76e4ff2..00000000 |
| 61 |
--- a/net-misc/tigervnc/tigervnc-1.4.2-r2.ebuild |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,201 +0,0 @@ |
| 64 |
-# Copyright 1999-2016 Gentoo Foundation |
| 65 |
-# Distributed under the terms of the GNU General Public License v2 |
| 66 |
-# $Id$ |
| 67 |
- |
| 68 |
-EAPI="4" |
| 69 |
- |
| 70 |
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic |
| 71 |
- |
| 72 |
-PATCHVER="0.1" |
| 73 |
-XSERVER_VERSION="1.17.1" |
| 74 |
-OPENGL_DIR="xorg-x11" |
| 75 |
-#MY_P="${PN}-1.2.80-20130314svn5065" |
| 76 |
-#S="${WORKDIR}/${MY_P}" |
| 77 |
- |
| 78 |
-DESCRIPTION="Remote desktop viewer display system" |
| 79 |
-HOMEPAGE="http://www.tigervnc.org" |
| 80 |
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 81 |
- mirror://gentoo/${PN}.png |
| 82 |
- mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2 |
| 83 |
- https://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.tar.bz2 |
| 84 |
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
| 85 |
- |
| 86 |
-LICENSE="GPL-2" |
| 87 |
-SLOT="0" |
| 88 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86" |
| 89 |
-IUSE="gnutls java nptl +opengl pam server +xorgmodule" |
| 90 |
- |
| 91 |
-RDEPEND="virtual/jpeg:0 |
| 92 |
- sys-libs/zlib |
| 93 |
- >=x11-libs/libXtst-1.0.99.2 |
| 94 |
- >=x11-libs/fltk-1.3.1 |
| 95 |
- gnutls? ( net-libs/gnutls ) |
| 96 |
- java? ( >=virtual/jre-1.5 ) |
| 97 |
- pam? ( virtual/pam ) |
| 98 |
- server? ( |
| 99 |
- dev-lang/perl |
| 100 |
- >=x11-libs/libXi-1.2.99.1 |
| 101 |
- >=x11-libs/libXfont-1.4.2 |
| 102 |
- >=x11-libs/libxkbfile-1.0.4 |
| 103 |
- x11-libs/libXrender |
| 104 |
- >=x11-libs/pixman-0.27.2 |
| 105 |
- >=x11-apps/xauth-1.0.3 |
| 106 |
- x11-apps/xsetroot |
| 107 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 108 |
- opengl? ( >=app-eselect/eselect-opengl-1.0.8 ) |
| 109 |
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
| 110 |
- ) |
| 111 |
- !net-misc/vnc |
| 112 |
- !net-misc/tightvnc |
| 113 |
- !net-misc/xf4vnc" |
| 114 |
-DEPEND="${RDEPEND} |
| 115 |
- amd64? ( dev-lang/nasm ) |
| 116 |
- x86? ( dev-lang/nasm ) |
| 117 |
- >=x11-proto/inputproto-2.2.99.1 |
| 118 |
- >=x11-proto/xextproto-7.2.99.901 |
| 119 |
- >=x11-proto/xproto-7.0.26 |
| 120 |
- java? ( >=virtual/jdk-1.5 ) |
| 121 |
- server? ( |
| 122 |
- virtual/pkgconfig |
| 123 |
- media-fonts/font-util |
| 124 |
- x11-misc/util-macros |
| 125 |
- >=x11-proto/bigreqsproto-1.1.0 |
| 126 |
- >=x11-proto/compositeproto-0.4 |
| 127 |
- >=x11-proto/damageproto-1.1 |
| 128 |
- >=x11-proto/fixesproto-5.0 |
| 129 |
- >=x11-proto/fontsproto-2.1.3 |
| 130 |
- >=x11-proto/glproto-1.4.17 |
| 131 |
- >=x11-proto/randrproto-1.4.0 |
| 132 |
- >=x11-proto/renderproto-0.11 |
| 133 |
- >=x11-proto/resourceproto-1.2.0 |
| 134 |
- >=x11-proto/scrnsaverproto-1.1 |
| 135 |
- >=x11-proto/videoproto-2.2.2 |
| 136 |
- >=x11-proto/xcmiscproto-1.2.0 |
| 137 |
- >=x11-proto/xineramaproto-1.1.3 |
| 138 |
- >=x11-libs/xtrans-1.3.3 |
| 139 |
- >=x11-proto/dri2proto-2.8 |
| 140 |
- opengl? ( >=media-libs/mesa-7.8_rc[nptl=] ) |
| 141 |
- )" |
| 142 |
- |
| 143 |
-CMAKE_IN_SOURCE_BUILD=1 |
| 144 |
- |
| 145 |
-pkg_setup() { |
| 146 |
- if ! use server ; then |
| 147 |
- echo |
| 148 |
- einfo "The 'server' USE flag will build tigervnc's server." |
| 149 |
- einfo "If '-server' is chosen only the client is built to save space." |
| 150 |
- einfo "Stop the build now if you need to add 'server' to USE flags.\n" |
| 151 |
- else |
| 152 |
- ewarn "Forcing on xorg-x11 for new enough glxtokens.h..." |
| 153 |
- OLD_IMPLEM="$(eselect opengl show)" |
| 154 |
- eselect opengl set ${OPENGL_DIR} |
| 155 |
- fi |
| 156 |
-} |
| 157 |
- |
| 158 |
-switch_opengl_implem() { |
| 159 |
- # Switch to the xorg implementation. |
| 160 |
- # Use new opengl-update that will not reset user selected |
| 161 |
- # OpenGL interface ... |
| 162 |
- echo |
| 163 |
- eselect opengl set ${OLD_IMPLEM} |
| 164 |
-} |
| 165 |
- |
| 166 |
-src_prepare() { |
| 167 |
- if use server ; then |
| 168 |
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver |
| 169 |
- else |
| 170 |
- rm "${WORKDIR}"/patches/*_server_* |
| 171 |
- fi |
| 172 |
- |
| 173 |
- EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="*100*" \ |
| 174 |
- EPATCH_FORCE="yes" epatch |
| 175 |
- |
| 176 |
- if use server ; then |
| 177 |
- cd unix/xserver |
| 178 |
- epatch "${WORKDIR}"/patches/1000_server_xserver-1.16-rebased.patch |
| 179 |
- epatch "${WORKDIR}"/patches/1005_server_xserver-1.17.patch |
| 180 |
- epatch "${FILESDIR}"/tigervnc-1.4.2-byteorder.patch |
| 181 |
- eautoreconf |
| 182 |
- fi |
| 183 |
-} |
| 184 |
- |
| 185 |
-src_configure() { |
| 186 |
- |
| 187 |
- use arm || use hppa && append-flags "-fPIC" |
| 188 |
- |
| 189 |
- mycmakeargs=( |
| 190 |
- -G "Unix Makefiles" |
| 191 |
- $(cmake-utils_use_enable gnutls GNUTLS) |
| 192 |
- $(cmake-utils_use_enable pam PAM) |
| 193 |
- $(cmake-utils_use_build java JAVA) |
| 194 |
- ) |
| 195 |
- |
| 196 |
- cmake-utils_src_configure |
| 197 |
- |
| 198 |
- if use server; then |
| 199 |
- cd unix/xserver |
| 200 |
- econf \ |
| 201 |
- $(use_enable nptl glx-tls) \ |
| 202 |
- $(use_enable opengl glx) \ |
| 203 |
- --disable-config-hal \ |
| 204 |
- --disable-config-udev \ |
| 205 |
- --disable-devel-docs \ |
| 206 |
- --disable-dmx \ |
| 207 |
- --disable-dri \ |
| 208 |
- --disable-dri3 \ |
| 209 |
- --disable-kdrive \ |
| 210 |
- --disable-selective-werror \ |
| 211 |
- --disable-silent-rules \ |
| 212 |
- --disable-static \ |
| 213 |
- --disable-unit-tests \ |
| 214 |
- --disable-xephyr \ |
| 215 |
- --disable-xinerama \ |
| 216 |
- --disable-xnest \ |
| 217 |
- --disable-xorg \ |
| 218 |
- --disable-xvfb \ |
| 219 |
- --disable-xwin \ |
| 220 |
- --disable-xwayland \ |
| 221 |
- --enable-dri2 \ |
| 222 |
- --with-pic \ |
| 223 |
- --without-dtrace \ |
| 224 |
- --disable-present \ |
| 225 |
- --disable-unit-tests |
| 226 |
- fi |
| 227 |
-} |
| 228 |
- |
| 229 |
-src_compile() { |
| 230 |
- cmake-utils_src_compile |
| 231 |
- |
| 232 |
- if use server ; then |
| 233 |
- cd unix/xserver |
| 234 |
- emake |
| 235 |
- fi |
| 236 |
-} |
| 237 |
- |
| 238 |
-src_install() { |
| 239 |
- cmake-utils_src_install |
| 240 |
- |
| 241 |
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png |
| 242 |
- make_desktop_entry vncviewer vncviewer vncviewer Network |
| 243 |
- |
| 244 |
- if use server ; then |
| 245 |
- cd unix/xserver/hw/vnc |
| 246 |
- emake DESTDIR="${D}" install |
| 247 |
- ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg |
| 248 |
- |
| 249 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 250 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 251 |
- |
| 252 |
- rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la |
| 253 |
- else |
| 254 |
- cd "${D}" |
| 255 |
- for f in vncserver vncpasswd x0vncserver vncconfig; do |
| 256 |
- rm usr/bin/$f |
| 257 |
- rm usr/share/man/man1/$f.1 |
| 258 |
- done |
| 259 |
- fi |
| 260 |
-} |
| 261 |
- |
| 262 |
-pkg_postinst() { |
| 263 |
- use server && switch_opengl_implem |
| 264 |
-} |
Archives