move autotools to src_unpack and make sure we force proper automake as well

Package-Manager: portage-2.1.2_pre3-r9

diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 393a3649136a06d846907f65d327f6b3adde897d..8ebd3de6396c6e840f20e1e54ac903d4f75b1c83 100644 (file)
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vnc-4.0/imake-tmpdir.patch 1062 RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 SHA1 49e5fe6384a9ac406551c9ceb22b87321031cb42 SHA256 390d3f94d014b9e428907771e6982426e69a1b4c27ef28333042ddca56ce9f78
 MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
 RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 files/vnc-4.0/imake-tmpdir.patch 1062
@@ -65,10 +68,10 @@ EBUILD vnc-4.0-r1.ebuild 3033 RMD160 4460a3b0355206751d4835e61682c987c8413c2d SH
 MD5 7659aa4bd1d3fbeafb3c414995936a41 vnc-4.0-r1.ebuild 3033
 RMD160 4460a3b0355206751d4835e61682c987c8413c2d vnc-4.0-r1.ebuild 3033
 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186 vnc-4.0-r1.ebuild 3033
-EBUILD vnc-4.1.2.ebuild 4001 RMD160 f6e702f22fa2bc5160bc904476ddc011bf8e9028 SHA1 695e5f2c020d44cef24e2515ba498485262e7efd SHA256 615e75693f451952c638e7d2a77b0a9769e114fa106c79cf3edfda5ddbe22362
-MD5 756013638c9f391623e21ad59c164e8d vnc-4.1.2.ebuild 4001
-RMD160 f6e702f22fa2bc5160bc904476ddc011bf8e9028 vnc-4.1.2.ebuild 4001
-SHA256 615e75693f451952c638e7d2a77b0a9769e114fa106c79cf3edfda5ddbe22362 vnc-4.1.2.ebuild 4001
+EBUILD vnc-4.1.2.ebuild 4005 RMD160 8853fc499dbd90dbd0ca6cfa15a7d576ba2e6196 SHA1 117e9e66edaa0e63d8ff85e04aedccd57c769cc1 SHA256 25dcd819476c32973e210ecc391ceb6b62bfb2291f4734424458cc12ba017e3a
+MD5 5d8aa0a127d3221cc4bd334d7fac344b vnc-4.1.2.ebuild 4005
+RMD160 8853fc499dbd90dbd0ca6cfa15a7d576ba2e6196 vnc-4.1.2.ebuild 4005
+SHA256 25dcd819476c32973e210ecc391ceb6b62bfb2291f4734424458cc12ba017e3a vnc-4.1.2.ebuild 4005
 MISC ChangeLog 9703 RMD160 7707e8218049e2b3d50c02d82aa03c2c2a0a83d1 SHA1 d0d1ef0739a2ce88d7f8bb020717866c24287a0c SHA256 f5d356ee89e6a8d0214b1416274ebd7b3ea5067e9081d475ef54424578bde250
 MD5 420f5fa4475913b8dbf8995d3f075047 ChangeLog 9703
 RMD160 7707e8218049e2b3d50c02d82aa03c2c2a0a83d1 ChangeLog 9703
@@ -83,3 +86,10 @@ SHA256 1e694d4447a1e2c8c532281c1eca8ae0026c92ccaca7727b37077731d073b0b7 files/di
 MD5 bcb7ad8ddc08c70d8bc3784881744a61 files/digest-vnc-4.1.2 771
 RMD160 0f6b7d9d71582f332be5921e4409e51f4245d0f0 files/digest-vnc-4.1.2 771
 SHA256 c3a13cfc07fb44ef982f138a19d4ae3780691308bdae0415c9bb16177bf73db6 files/digest-vnc-4.1.2 771
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFQV9SamhnQswr0vIRAsfgAKCkPmYpoRGVBReijm0yJMR7XLidLACdEAD8
+WeuIovlw3ezTsBCFbfvELNA=
+=HGKP
+-----END PGP SIGNATURE-----

diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild
index 30cf0edace8adcaeffb226a927d020a704302ea1..0617744664337214b72e0a8780761de073c578a6 100644 (file)
--- a/net-misc/vnc/vnc-4.1.2.ebuild
+++ b/net-misc/vnc/vnc-4.1.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2006 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.ebuild,v 1.18 2006/10/26 19:13:30 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.19 2006/10/27 01:21:22 vapier Exp $
 
 WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 inherit eutils toolchain-funcs multilib autotools
 
 XSERVER_VERSION="1.1.1"
@@ -83,29 +84,34 @@ src_unpack() {
                rm -f "${WORKDIR}"/patch/*vnc-server*
        fi
        EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+       cd unix
+       eautoreconf
+       cd ../common
+       eautoreconf
 
        if use server ; then
-               cp -a "${S}"/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
-                       "${S}"/unix/xc/programs/Xserver/Xvnc.man \
-                       "${S}"/unix/xc/programs/Xserver/vnc/*.{h,cc} \
-                       "${S}"/unix/xorg-server-*/hw/vnc
-               cp -a "${S}"/unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
-               cp -a "${S}"/unix/xorg-server-*/{fb/fb.h,hw/vnc}
-               cp -a "${S}"/unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
+               cd "${S}"
+               cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+                       unix/xc/programs/Xserver/Xvnc.man \
+                       unix/xc/programs/Xserver/vnc/*.{h,cc} \
+                       unix/xorg-server-*/hw/vnc
+               cp -a unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
+               cp -a unix/xorg-server-*/{fb/fb.h,hw/vnc}
+               cp -a unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
                sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
-                       "${S}"/unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
+                       unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
+               cd xorg-server-*
+               eautoreconf
        fi
 }
 
 src_compile() {
        cd unix
-       eautoreconf
        econf --with-installed-zlib --with-fb || die "econf failed"
        emake || die "emake failed"
 
-       if use server; then
+       if use server ; then
                cd xorg-server-*
-               eautoreconf
                econf \
                        --enable-xorg \
                        --disable-dependency-tracking \
@@ -137,11 +143,12 @@ src_install() {
        dodoc README
 
        if ! use server ; then
-               rm "${D}"/usr/bin/vncserver
-               rm "${D}"/usr/bin/x0vncserver
-               rm "${D}"/usr/share/man/man1/vnc{passwd,config,server}.1
-               rm "${D}"/usr/share/man/man1/x0vncserver.1
-               rm "${D}"/usr/bin/vncpasswd
-               rm "${D}"/usr/bin/vncconfig
+               cd "${D}"
+               rm usr/bin/vncserver
+               rm usr/bin/x0vncserver
+               rm usr/share/man/man1/vnc{passwd,config,server}.1
+               rm usr/share/man/man1/x0vncserver.1
+               rm usr/bin/vncpasswd
+               rm usr/bin/vncconfig
        fi
 }