Add a revision bump for xorg-server-1.3.0.0, bug 175923

Package-Manager: portage-2.1.2.5

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 75b8daf23b003a2a7470dceb33144b3ad073d347..0443ccf756cc759741491250171a6026fce464cb 100644 (file)
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.73 2007/04/25 18:22:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.74 2007/04/27 15:04:14 armin76 Exp $
+
+*vnc-4.1.2-r3 (27 Apr 2007)
+
+  27 Apr 2007; Raúl Porcel <armin76@gentoo.org> +vnc-4.1.2-r3.ebuild:
+  Add a revision bump for xorg-server-1.3.0.0, bug 175923
 
   25 Apr 2007; Raúl Porcel <armin76@gentoo.org> vnc-4.1.2-r2.ebuild:
   ia64 stable wrt bug 175985

diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 0e817f1f24054e6b1b8b1d853d56b8ed3b1c9e6f..cb15173d2f036d96ed16c5769e377bc82765143c 100644 (file)
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -16,6 +16,7 @@ DIST vnc-4.1.2-r2-patches-0.1.tar.bz2 16206 RMD160 34c23d0eb270810efdb5bfafb9fd9
 DIST vnc-4_1_2-unixsrc.tar.gz 537713 RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 SHA1 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7 SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
 DIST xorg-server-1.2.0.tar.bz2 6014596 RMD160 0bbc5ccb5cbbe7627b4f09f17848b188e8be2a50 SHA1 85fa0e8fa7d6bea6f1a73c66a57488ea68dffa17 SHA256 e3e56b35ee13098f4ee79948beb20bfc9a06d1a7a35fb906405ff1531b92bb85
+DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
 EBUILD vnc-4.1.2-r1.ebuild 4226 RMD160 9ef544a3dc65530825022c68055dab28075b0549 SHA1 9b2de192b055727243a14212e39e1950f2309b0d SHA256 986d63aa512c712ccd1829701848c1c1e6b4dbf39234544ef41d2a5d9e2f934c
 MD5 ac1efb08e9b4dbef83d59d7a3f8431ac vnc-4.1.2-r1.ebuild 4226
 RMD160 9ef544a3dc65530825022c68055dab28075b0549 vnc-4.1.2-r1.ebuild 4226
@@ -24,14 +25,18 @@ EBUILD vnc-4.1.2-r2.ebuild 4681 RMD160 c681ea89e854c823a9f4dab067f3f06bf820ace1
 MD5 bd0da550bcbdd2533bbe1bbbbc460a9a vnc-4.1.2-r2.ebuild 4681
 RMD160 c681ea89e854c823a9f4dab067f3f06bf820ace1 vnc-4.1.2-r2.ebuild 4681
 SHA256 0842469c01a0db9083284d170e3985b81b47f6e20dc2e5e2d7a802dbc0e21ce2 vnc-4.1.2-r2.ebuild 4681
+EBUILD vnc-4.1.2-r3.ebuild 4596 RMD160 6a6d20148d606957e30eda8f5c0b0c936afeabc7 SHA1 5ae4d7c16e538f757d82c1add41fd49b4ec0316b SHA256 9592673a1eaa9438e393a982125515e090748a49fb702f6298618edb00e9de1a
+MD5 5d0f1e3df7561643acbf25ecc2bdf7c7 vnc-4.1.2-r3.ebuild 4596
+RMD160 6a6d20148d606957e30eda8f5c0b0c936afeabc7 vnc-4.1.2-r3.ebuild 4596
+SHA256 9592673a1eaa9438e393a982125515e090748a49fb702f6298618edb00e9de1a vnc-4.1.2-r3.ebuild 4596
 EBUILD vnc-4.1.2.ebuild 4195 RMD160 be4425e8cc8dbec2df4c051588bca61b0004171c SHA1 9f5c407f9d425b235af8787759b02d767ba2242b SHA256 964caa85e96db3b854a71fd9b553535dbfbb734a57febb10e685a3af9c337631
 MD5 4b215a222ab6da3a9a3eb17d26473c6e vnc-4.1.2.ebuild 4195
 RMD160 be4425e8cc8dbec2df4c051588bca61b0004171c vnc-4.1.2.ebuild 4195
 SHA256 964caa85e96db3b854a71fd9b553535dbfbb734a57febb10e685a3af9c337631 vnc-4.1.2.ebuild 4195
-MISC ChangeLog 11499 RMD160 46b7558f9fda5c747fe13a2934fd01d4a45c705d SHA1 d628c76c81a50f0ded9d147331f3f24b288cab1c SHA256 fa4eee9eb7806aecfa3c2c6db66aee1ac798d576ea348451cb094e3f4bed9005
-MD5 1bf3ab01f20ec754a0875eaa8dd0aca4 ChangeLog 11499
-RMD160 46b7558f9fda5c747fe13a2934fd01d4a45c705d ChangeLog 11499
-SHA256 fa4eee9eb7806aecfa3c2c6db66aee1ac798d576ea348451cb094e3f4bed9005 ChangeLog 11499
+MISC ChangeLog 11658 RMD160 d6960ee9783bfb198965cfc6669af250b608d602 SHA1 4c61c41503e3823c09c5e2f01dd4f26bc0fd8e1b SHA256 37e3b25b2de370577ac1cd49d5dfc4ae71ecbfd37b66fa5a913febef63e9dec8
+MD5 3577a46af2caa22d75dbec8d86d3e548 ChangeLog 11658
+RMD160 d6960ee9783bfb198965cfc6669af250b608d602 ChangeLog 11658
+SHA256 37e3b25b2de370577ac1cd49d5dfc4ae71ecbfd37b66fa5a913febef63e9dec8 ChangeLog 11658
 MISC metadata.xml 285 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 SHA1 2c95c236b44a86f17fe3ecc7fa7d775587443ba3 SHA256 78f00ad3b66ff4b0ec0bca5c771f4d4ba69dab3ea88c198a5d54fb83fe8fddff
 MD5 3ba05c3b9f15d67563d5699dad396690 metadata.xml 285
 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 metadata.xml 285
@@ -45,3 +50,6 @@ SHA256 5eb4302ba1cf811fa33812c0d20eb3ab8f8becaf895e842985a7f4ea17021d5a files/di
 MD5 e60c54a52e54da2a84e4a158616f9850 files/digest-vnc-4.1.2-r2 786
 RMD160 ccb59eae5aeeb72d322c2e460b2840c9cac38332 files/digest-vnc-4.1.2-r2 786
 SHA256 bba19adca9ddeb55317d1137340665169362de8ce664f44e4756ea540823e718 files/digest-vnc-4.1.2-r2 786
+MD5 51faf21e0ee6d1c0e6c6f3064e31c7a1 files/digest-vnc-4.1.2-r3 792
+RMD160 b9ac0368d9622c5ba7f382e84e925f03be674211 files/digest-vnc-4.1.2-r3 792
+SHA256 fd218a05f2b3eb987d2ed2e2b3998aefb92d0d0db677df89cd1d93a95071d6ac files/digest-vnc-4.1.2-r3 792

diff --git a/net-misc/vnc/files/digest-vnc-4.1.2-r3 b/net-misc/vnc/files/digest-vnc-4.1.2-r3
new file mode 100644 (file)
index 0000000..ab1c778
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-4.1.2-r3
@@ -0,0 +1,9 @@
+MD5 36557e5c43ca8068cf0199ab21641548 vnc-4.1.2-r2-patches-0.1.tar.bz2 16206
+RMD160 34c23d0eb270810efdb5bfafb9fd9ca3545c1ddb vnc-4.1.2-r2-patches-0.1.tar.bz2 16206
+SHA256 698428d6a5e829c3a68d03f639fc6315b27773d8c46819519b13b4cfc473a5dc vnc-4.1.2-r2-patches-0.1.tar.bz2 16206
+MD5 cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz 537713
+RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 vnc-4_1_2-unixsrc.tar.gz 537713
+SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542 vnc-4_1_2-unixsrc.tar.gz 537713
+MD5 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 5968263
+RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 xorg-server-1.3.0.0.tar.bz2 5968263
+SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975 xorg-server-1.3.0.0.tar.bz2 5968263

diff --git a/net-misc/vnc/vnc-4.1.2-r3.ebuild b/net-misc/vnc/vnc-4.1.2-r3.ebuild
new file mode 100644 (file)
index 0000000..c64bba8
--- /dev/null
+++ b/net-misc/vnc/vnc-4.1.2-r3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r3.ebuild,v 1.1 2007/04/27 15:04:14 armin76 Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.3.0.0"
+PATCH="${P}-r2-patches-0.1"
+
+MY_P="vnc-4_1_2-unixsrc"
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.realvnc.com/"
+SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz
+       http://ftp.plusline.de/FreeBSD/distfiles/xc/${MY_P}.tar.gz
+       mirror://gentoo/${PATCH}.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="server"
+
+RDEPEND="sys-libs/zlib
+       media-libs/freetype
+       x11-libs/libSM
+       x11-libs/libXtst
+       server? (
+               x11-libs/libXi
+               x11-libs/libXfont
+               x11-libs/libXmu
+               x11-libs/libxkbfile
+               x11-libs/libXrender
+               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
+               ~x11-base/xorg-server-${XSERVER_VERSION}
+       )
+       !net-misc/tightvnc"
+DEPEND="${RDEPEND}
+       x11-proto/xextproto
+       server? (
+               x11-proto/compositeproto
+               x11-proto/damageproto
+               x11-proto/fixesproto
+               x11-proto/fontsproto
+               x11-proto/randrproto
+               x11-proto/resourceproto
+               x11-proto/scrnsaverproto
+               x11-proto/trapproto
+               x11-proto/videoproto
+               x11-proto/xineramaproto
+               x11-proto/xf86bigfontproto
+               x11-proto/xf86dgaproto
+               x11-proto/xf86miscproto
+               x11-proto/xf86vidmodeproto
+       )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       if ! use server ; then
+               echo
+               einfo "The 'server' USE flag will build vnc'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
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       if use server ; then
+               mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/xorg-x11-server-source
+       else
+               rm -f "${WORKDIR}"/patch/*vnc-server*
+       fi
+
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+       cd common
+       eautoreconf
+       cd ../unix
+       eautoreconf
+
+       if use server ; then
+               cp -a xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+                       xc/programs/Xserver/Xvnc.man \
+                       xc/programs/Xserver/vnc/*.{h,cc} \
+                       xorg-x11-server-source/hw/vnc
+               cp -a xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
+               cp -a xorg-x11-server-source/{fb/fb.h,hw/vnc}
+               cp -a xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
+               sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
+                       xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
+               cd xorg-x11-server-source
+               eautoreconf
+       fi
+}
+
+src_compile() {
+       cd common
+       econf || die "econf failed"
+       emake || die "emake failed"
+       cd ../unix
+       econf || die "econf failed"
+       emake || die "emake failed"
+
+       if use server ; then
+               cd xorg-x11-server-source
+               econf \
+                       --enable-xorg \
+                       --disable-xnest --disable-xvfb --disable-dmx \
+                       --disable-xwin --disable-xephyr --disable-kdrive \
+                       --with-pic \
+                       --disable-xorgcfg \
+                       --disable-xprint \
+                       --disable-static \
+                       --enable-composite \
+                       --enable-xtrap \
+                       --enable-xcsecurity \
+                       --with-xkb-output=/usr/share/X11/xkb \
+                       --with-rgb-path=/usr/share/X11/rgb.txt \
+                       --disable-xevie \
+                       --disable-dri \
+                       --enable-glx \
+                       --with-int10=stub \
+                       --with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+                       || die "econf server failed"
+               emake || die "emake server failed"
+       fi
+}
+
+src_install() {
+       cd common
+       emake DESTDIR="${D}" install || die "emake install failed"
+       cd ../unix
+       emake DESTDIR="${D}" install || die "emake install failed"
+       newman vncviewer/vncviewer.man vncviewer.1
+       cd ..
+       dodoc README
+
+       doicon ${FILESDIR}/vncviewer.png
+       make_desktop_entry vncviewer vncviewer vncviewer.png Network
+
+       if use server ; then
+               cd unix
+               dobin vncserver || die "dobin failed"
+               for f in vncviewer/vncviewer vncpasswd/vncpasswd \
+                       vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
+                       mv $f.man $f.1
+                       doman $f.1
+               done
+
+               cd xorg-x11-server-source/hw/vnc
+               emake DESTDIR="${D}" install || die "emake install failed"
+
+               newman Xvnc.man Xvnc.1
+               newconfd "${FILESDIR}"/vnc.confd vnc
+               newinitd "${FILESDIR}"/vnc.initd vnc
+
+               rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+       else
+               cd "${D}"
+               rm usr/bin/x0vncserver
+               rm usr/bin/vncpasswd
+               rm usr/bin/vncconfig
+       fi
+
+       rm ${D}/usr/$(get_libdir)/librfb.{a,la,so}
+}