as-needed patch from TGL <degrenier@easyconnect.fr>, fixes #132558

Package-Manager: portage-2.1_pre10-r3

4 files changed, 39 insertions, 15 deletions

diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 30d39b93c1e9..b69fde727e92 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.52 2006/05/06 13:03:23 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.53 2006/05/07 14:49:01 allanonjl Exp $
+
+  07 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/vino-2.13.5-as-needed.patch, vino-2.13.5.ebuild:
+  as-needed patch from TGL <degrenier@easyconnect.fr>, fixes #132558
 
   06 May 2006; John N. Laliberte <allanonjl@gentoo.org> vino-2.13.5.ebuild:
   drop hppa,ia64,mips, bug filed. prep for 2.14 unmask
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 85afb45b3109..7adf85e09ad9 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -6,6 +6,10 @@ AUX vino-2.11-zlib_fix.patch 633 RMD160 1b9d0e35f0a1a7dd934b3b3fad522973de0f01a3
 MD5 4bd66cdedeb8bff32c00a891417978e9 files/vino-2.11-zlib_fix.patch 633
 RMD160 1b9d0e35f0a1a7dd934b3b3fad522973de0f01a3 files/vino-2.11-zlib_fix.patch 633
 SHA256 73c7522b312f1c615535ffba432b17dc050c57add00f0d5c45dc79ab70655f36 files/vino-2.11-zlib_fix.patch 633
+AUX vino-2.13.5-as-needed.patch 358 RMD160 e8faabdeec90067e51ea41b3687a1b1833775517 SHA1 d5d845b1319e9e13d4eb45f3af7156f41ab40566 SHA256 b0e6f24d9b87452358e2f8ef1d65410bc9f150229661d073b998b8528e5f165d size 358
+MD5 66e2d98639476f282f00bb952bc70aba files/vino-2.13.5-as-needed.patch 358
+RMD160 e8faabdeec90067e51ea41b3687a1b1833775517 files/vino-2.13.5-as-needed.patch 358
+SHA256 b0e6f24d9b87452358e2f8ef1d65410bc9f150229661d073b998b8528e5f165d files/vino-2.13.5-as-needed.patch 358
 DIST vino-2.10.0.tar.bz2 581602 RMD160 2fc09c8b28eda82e4da5116fccaf7f38d7d1c34e SHA256 c27c0c95f0a40b727ea5a5405ebf1595ce2731fc18f8f6d033de08b618759e71 size 581602
 DIST vino-2.12.0.tar.bz2 564627 RMD160 31090b5b9e272ec8ca5532a9bd17f82224be476d SHA256 235780a5ff2b714c9a514ec64b0e7dd04a230655b094c0ad2dcd8fa0c4dea627 size 564627
 DIST vino-2.13.5.tar.bz2 566620 RMD160 9daeb18df6d5cbbe3d993325c1ed0800327a7b68 SHA256 58ee9c77070a8865cce6d25dd6b68fae02b307b64b203d78bd492e33c8e0c89f size 566620
@@ -22,18 +26,18 @@ EBUILD vino-2.12.0.ebuild 1271 RMD160 b34453396d857b8aaaa70d31ebed32e59f2f77d8 S
 MD5 b782cde94a2f88ee7a5ee948ffc92e13 vino-2.12.0.ebuild 1271
 RMD160 b34453396d857b8aaaa70d31ebed32e59f2f77d8 vino-2.12.0.ebuild 1271
 SHA256 e21628709b2c99078d9f2d0224921a120dc8606143120a9877ef6b85a8672f51 vino-2.12.0.ebuild 1271
-EBUILD vino-2.13.5.ebuild 1337 RMD160 bf2abb943b3626607f072eabb2f9f9a21c75e786 SHA1 3fc3ad2a57481596f9af7795c9f327a65616eaa6 SHA256 9b2a66ada564c281e1b7f1c5da0691c2a440b42afc5df1f4e53a7120f204879d size 1337
-MD5 e4d2302fac514b6a89d3ccfc932336c3 vino-2.13.5.ebuild 1337
-RMD160 bf2abb943b3626607f072eabb2f9f9a21c75e786 vino-2.13.5.ebuild 1337
-SHA256 9b2a66ada564c281e1b7f1c5da0691c2a440b42afc5df1f4e53a7120f204879d vino-2.13.5.ebuild 1337
+EBUILD vino-2.13.5.ebuild 1426 RMD160 1735cfcb750817779713e97aeffcb3c560ce13fd SHA1 ed9ffa1c43eb92ab701357a5ccc9c1249f9cd1a1 SHA256 67997db122a9f441a57dee9ce6adeb9ae8a154d92648292a88dee2deb2f6a729 size 1426
+MD5 ae7d886973622c19d8faf43b3d197b6d vino-2.13.5.ebuild 1426
+RMD160 1735cfcb750817779713e97aeffcb3c560ce13fd vino-2.13.5.ebuild 1426
+SHA256 67997db122a9f441a57dee9ce6adeb9ae8a154d92648292a88dee2deb2f6a729 vino-2.13.5.ebuild 1426
 EBUILD vino-2.8.1.ebuild 973 RMD160 8c022d26792a9327039ac9da6a1788ed7d2a80bf SHA1 04e72e21ab318a888884270db33bfc7b274ad8f8 SHA256 ba50943c00e2910c34890feeaa485cac456bcca7decf4089c0fc42428455eb08 size 973
 MD5 b355d978b16a86813ab93eef55b5890f vino-2.8.1.ebuild 973
 RMD160 8c022d26792a9327039ac9da6a1788ed7d2a80bf vino-2.8.1.ebuild 973
 SHA256 ba50943c00e2910c34890feeaa485cac456bcca7decf4089c0fc42428455eb08 vino-2.8.1.ebuild 973
-MISC ChangeLog 5769 RMD160 d799ac8897799f138d6368b60c4376815b9594e5 SHA1 36d4a373dc07281b7a5f6ee8aa67e7f38c2a102b SHA256 6f46afe9116cdb27fd3d5b70b13c258a3e230a18d2a1b77e219fd598796bcc37 size 5769
-MD5 74d0f03051fd0862e1fd58c65579fb63 ChangeLog 5769
-RMD160 d799ac8897799f138d6368b60c4376815b9594e5 ChangeLog 5769
-SHA256 6f46afe9116cdb27fd3d5b70b13c258a3e230a18d2a1b77e219fd598796bcc37 ChangeLog 5769
+MISC ChangeLog 5953 RMD160 990208858d10becb2df2e4d91d5131f6e4c16d4a SHA1 77dcb54727f845b53d304138e227e512838d1a76 SHA256 03839482ee5258edd2ad3e1a60008a26372f91251206353742ebcaef4f898792 size 5953
+MD5 6834638af29b227a4eee290fb6895cc9 ChangeLog 5953
+RMD160 990208858d10becb2df2e4d91d5131f6e4c16d4a ChangeLog 5953
+SHA256 03839482ee5258edd2ad3e1a60008a26372f91251206353742ebcaef4f898792 ChangeLog 5953
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/net-misc/vino/files/vino-2.13.5-as-needed.patch b/net-misc/vino/files/vino-2.13.5-as-needed.patch
new file mode 100644
index 000000000000..9e6c01fe742b
--- /dev/null
+++ b/net-misc/vino/files/vino-2.13.5-as-needed.patch
@@ -0,0 +1,13 @@
+--- vino-2.13.5/server/libvncserver/Makefile.am.orig	2006-05-07 14:53:51.000000000 +0200
++++ vino-2.13.5/server/libvncserver/Makefile.am	2006-05-07 14:58:02.000000000 +0200
+@@ -32,6 +32,10 @@
+ 	zrletypes.h 		\
+ 	$(NULL)
+ 
++libvncserver_la_LIBADD =	\
++	$(LIBGNUTLS_LIBS)		\
++	$(LIBGCRYPT_LIBS)
++
+ EXTRA_DIST =			\
+ 	tableinit24.c		\
+ 	tableinittctemplate.c	\
diff --git a/net-misc/vino/vino-2.13.5.ebuild b/net-misc/vino/vino-2.13.5.ebuild
index a4e37b93f2e4..de1f9d39acb3 100644
--- a/net-misc/vino/vino-2.13.5.ebuild
+++ b/net-misc/vino/vino-2.13.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.13.5.ebuild,v 1.2 2006/05/06 13:03:23 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-2.13.5.ebuild,v 1.3 2006/05/07 14:49:01 allanonjl Exp $
 
-inherit eutils gnome2
+inherit eutils gnome2 autotools
 
 DESCRIPTION="An integrated VNC server for GNOME"
 HOMEPAGE="http://www.gnome.org/"
@@ -38,12 +38,15 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack "${A}"
-	cd "${S}"
+	gnome2_src_unpack
 
 	# Fix compilation if --without-libz is passed
-	epatch ${FILESDIR}/${PN}-2.11-zlib_fix.patch
+	epatch "${FILESDIR}"/${PN}-2.11-zlib_fix.patch
 
 	# Fix compilation for Gentoo/FreeBSD
-	epatch ${FILESDIR}/${PN}-2.10.0-fbsd.patch
+	epatch "${FILESDIR}"/${PN}-2.10.0-fbsd.patch
+
+	# fix as-needed #132558
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
 }