Revert
authorRaúl Porcel <armin76@gentoo.org>
Tue, 2 Mar 2010 19:50:13 +0000 (19:50 +0000)
committerRaúl Porcel <armin76@gentoo.org>
Tue, 2 Mar 2010 19:50:13 +0000 (19:50 +0000)
Package-Manager: portage-2.1.7.17/cvs/Linux ia64

net-misc/tigervnc/ChangeLog
net-misc/tigervnc/Manifest
net-misc/tigervnc/tigervnc-1.0.0-r3.ebuild [deleted file]

index 29afadbffc024ccfafd3c6ea363f7d266901f632..630a7eba1a4c98c5cd9b813a9189cb93d82c7005 100644 (file)
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.36 2010/03/02 19:13:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.37 2010/03/02 19:50:13 armin76 Exp $
+
+  02 Mar 2010; Raúl Porcel <armin76@gentoo.org> -tigervnc-1.0.0-r3.ebuild:
+  Revert
 
 *tigervnc-1.0.0-r3 (02 Mar 2010)
 
index 038e8f7161f691b52cdc2500b8631c869947f9e0..6aa52cf8f1f5ce65cf014cd458a40a031b07a907 100644 (file)
@@ -4,6 +4,5 @@ AUX vncviewer.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12
 DIST tigervnc-1.0.0.tar.bz2 2720182 RMD160 759bff85653bf68a29c2a336553bbfadada12223 SHA1 9017f31fe75d0bc49cc9d9f9f6b9f336bf306bd6 SHA256 75c54bf1f976182dd64c2cab5051fcf392091d74636014c2b74ce5b712efbfda
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 EBUILD tigervnc-1.0.0-r2.ebuild 4603 RMD160 d678ec4e14039db7da27d1bfba361fd9f5bc6cd5 SHA1 c80e52260edb2668b45b58be2277c9cb26535c1f SHA256 8a71ebf7917af132e2c08172d98d6a05a2c89fc22f8aff6e89511f4ee7ecaa19
-EBUILD tigervnc-1.0.0-r3.ebuild 4645 RMD160 a253db0807a16e5806d3ce791b51dda26871d237 SHA1 682ea5743ba101bb2ef29a445ae47a3eed093688 SHA256 84111545c097cf511f554b06e6e7af1cbb82c704d804f4027dd509552e58efe6
-MISC ChangeLog 4510 RMD160 66866abbb0329fa1a90da11975be42d66c90b96d SHA1 9d222110275824bbacee64f6544037ba9a3fa803 SHA256 eb704c2d4d932983624dfb109a0ec219baae355a105e9c9be6f81dded57508e9
+MISC ChangeLog 4596 RMD160 1a6c7c9115293cb9c5f8b4091b353430db268068 SHA1 a4cad07b1b9d5c5b58dff6f91cf694670327a2f0 SHA256 9d20d44adcdc7a4c67f9b8ca6ae39e7fb484cc448e58999a525e1ede79df3c41
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.0.0-r3.ebuild
deleted file mode 100644 (file)
index 0498e9e..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r3.ebuild,v 1.1 2010/03/02 19:13:41 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.6.5"
-#kPATCH="${P/_p*/}-patches-0.3"
-PATCH="${PN}-0.0.90-patches-0.3"
-OPENGL_DIR="xorg-x11"
-
-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
-       server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2  )"
-
-#      mirror://gentoo/${PATCH}.tar.bz2
-#      http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+opengl server +xorgmodule"
-
-RDEPEND="sys-libs/zlib
-       media-libs/freetype
-       x11-libs/libSM
-       x11-libs/libXtst
-       app-admin/eselect-opengl
-       server? (
-               x11-libs/libXi
-               x11-libs/libXfont
-               x11-libs/libXmu
-               x11-libs/libxkbfile
-               x11-libs/libXrender
-               x11-libs/pixman
-               x11-apps/xauth
-               x11-apps/xsetroot
-               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} )
-       )
-       !net-misc/vnc
-       !net-misc/tightvnc
-       !net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-       x86? ( dev-lang/nasm )
-       >=x11-proto/inputproto-1.5
-       >=x11-proto/xextproto-7.0.3
-       >=x11-proto/xproto-7.0.13
-       server? (
-               x11-proto/bigreqsproto
-               x11-proto/compositeproto
-               x11-proto/damageproto
-               x11-proto/dri2proto
-               x11-proto/fixesproto
-               x11-proto/fontsproto
-               >=x11-proto/randrproto-1.2.99
-               x11-proto/resourceproto
-               x11-proto/scrnsaverproto
-               x11-proto/trapproto
-               x11-proto/videoproto
-               x11-proto/xcmiscproto
-               x11-proto/xineramaproto
-               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
-       )"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-       if ! use server ; then
-               echo
-               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)"
-               eselect opengl set ${OPENGL_DIR}
-       fi
-}
-
-switch_opengl_implem() {
-       # Switch to the xorg implementation.
-       # Use new opengl-update that will not reset user selected
-       # OpenGL interface ...
-       echo
-       eselect opengl set ${OLD_IMPLEM}
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       if use server ; then
-               cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-#      else
-#              rm -f "${WORKDIR}"/patch/*tigervnc-server*
-       fi
-
-#      EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-
-       cd unix
-       eautoreconf
-       if use server ; then
-               epatch xserver16.patch
-               cd xserver
-               eautoreconf
-       fi
-}
-
-src_compile() {
-       cd unix
-       econf || die "econf failed"
-       emake || die "emake failed"
-
-       if use server ; then
-               cd 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 \
-                       --enable-glx \
-                       --disable-config-dbus \
-                       --disable-config-hal \
-                       $(use_enable opengl glx) \
-                       --without-included-zlib --with-system-jpeg \
-                       || die "econf server failed"
-               emake || die "emake server failed"
-       fi
-}
-
-src_install() {
-       cd unix
-       emake DESTDIR="${D}" install || die "emake install failed"
-       newman vncviewer/vncviewer.man vncviewer.1
-       dodoc README
-
-       doicon "${FILESDIR}"/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"
-               ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-               newconfd "${FILESDIR}"/${PN}.confd ${PN}
-               newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-               rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-       else
-               cd "${D}"
-               for f in vncserver vncpasswd x0vncserver vncconfig; do
-                       rm usr/bin/$f
-                       rm usr/share/man/man1/$f.1
-               done
-       fi
-}
-
-pkg_postinst() {
-       use server && switch_opengl_implem
-}