Fix modular X dependencies for 0.9.34 for bug 124091. Thanks to Mauricio L. Pilla <pilla at gentoodot org>. Kill X dependency for 0.9.32, since graphical frontend is not being built anyway. Add nls patch for 0.9.34 so that it builds with --disable-nls.

(Portage version: 2.1_pre4-r1 vanquishing potions will fly)

6 files changed, 65 insertions, 12 deletions

diff --git a/net-misc/pavuk/ChangeLog b/net-misc/pavuk/ChangeLog
index bf56e09332e4..493f21794408 100644
--- a/net-misc/pavuk/ChangeLog
+++ b/net-misc/pavuk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/pavuk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.25 2006/01/20 15:40:52 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/ChangeLog,v 1.26 2006/02/25 20:27:36 vanquirius Exp $
+
+  25 Feb 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/pavuk-0.9.34-nls.patch, pavuk-0.9.32.ebuild, pavuk-0.9.34.ebuild:
+  Fix modular X dependencies for 0.9.34 for bug 124091. Thanks to Mauricio L.
+  Pilla <pilla at gentoodot org>. Kill X dependency for 0.9.32, since
+  graphical frontend is not being built anyway. Add nls patch for 0.9.34 so
+  that it builds with --disable-nls.
 
   20 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> pavuk-0.9.34.ebuild:
   Use gtk instead of X, adding GUI option for bug 114189. Thanks to Robert
diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
index c606cdcb9610..9cee8c85df86 100644
--- a/net-misc/pavuk/Manifest
+++ b/net-misc/pavuk/Manifest
@@ -1,6 +1,21 @@
 MD5 a77d08c522a8fc8e0eefca3621ab523e ChangeLog 3951
+RMD160 e7f2f0736abce2eb4129b617c4aa29fbed70debb ChangeLog 3951
+SHA256 9e8590d615cb03d81f90f4c86b0c9d94bd3571135219f052d1cf3bde62413af0 ChangeLog 3951
 MD5 452e79ff147b4c40cfee016d4c88c3bc files/digest-pavuk-0.9.32 65
-MD5 e4a50a3e679a376dae3b3080da6fba23 files/digest-pavuk-0.9.34 65
+RMD160 d1ab3595613c79a76408930a77969d9a2f20eb33 files/digest-pavuk-0.9.32 65
+SHA256 9181c871dc547f357937a1aaf9c31318b321a4115bb2569e39834549b399d256 files/digest-pavuk-0.9.32 65
+MD5 5e13d1863681bbc308a7b7cd4384f38c files/digest-pavuk-0.9.34 241
+RMD160 68a5df29acf3c91fcca5cce8d49d4eb7fd5b4e90 files/digest-pavuk-0.9.34 241
+SHA256 e553457b888503ca9903d9d9aded5c2437720ca27ab594c8b6b642e7f34eec66 files/digest-pavuk-0.9.34 241
+MD5 62ee06200d65da9ffc1fdb54ecede940 files/pavuk-0.9.34-nls.patch 450
+RMD160 8a3261f85051e3bd5634732420d6693f8384832c files/pavuk-0.9.34-nls.patch 450
+SHA256 85cb6decf10e0219a374fd0c03a2c4640daa22ab60aeb1d076b8b723c41176db files/pavuk-0.9.34-nls.patch 450
 MD5 3eed8420335479b400d01f3817b3936a metadata.xml 252
-MD5 7f80757d2db657a9f51fb876b6057283 pavuk-0.9.32.ebuild 1386
-MD5 fc8f2fd89be01eb2fd84c33c91f52d96 pavuk-0.9.34.ebuild 1434
+RMD160 7f92b6106b3217210f3564f0bab9688fd1278d37 metadata.xml 252
+SHA256 63df1f680725e30fa30fe14ea493071196d1026493b4abbdb54f441cbbcd8db4 metadata.xml 252
+MD5 4e7c21dcb46f82b54b58037967dc9b15 pavuk-0.9.32.ebuild 1346
+RMD160 cddfedcdc33c896023417eb3c34412b69c8b2097 pavuk-0.9.32.ebuild 1346
+SHA256 23a739076a3d527a7d6f55e7d5fedd7a38d6a2be3032d2e613201b4bf3e61413 pavuk-0.9.32.ebuild 1346
+MD5 d37d216968060a3dd652eaa6188251e7 pavuk-0.9.34.ebuild 1761
+RMD160 b3ba743ab08c551044abf27aefb5272e551d215b pavuk-0.9.34.ebuild 1761
+SHA256 afee193af1bc6fb1340c244467a53999d9537562274d5c66b3bac8956f27af63 pavuk-0.9.34.ebuild 1761
diff --git a/net-misc/pavuk/files/digest-pavuk-0.9.34 b/net-misc/pavuk/files/digest-pavuk-0.9.34
index dcb318c39351..abef59a0a971 100644
--- a/net-misc/pavuk/files/digest-pavuk-0.9.34
+++ b/net-misc/pavuk/files/digest-pavuk-0.9.34
@@ -1 +1,3 @@
 MD5 d5d4c8b4a119a42cb4bc7a214605a451 pavuk-0.9.34.tar.bz2 647199
+RMD160 b844cca1a293d4f7d251242f6e285f1c5f3e656b pavuk-0.9.34.tar.bz2 647199
+SHA256 f9e13dfe8fd02951e74362b57e9637fc831c139810da62bc22020ac086558dd6 pavuk-0.9.34.tar.bz2 647199
diff --git a/net-misc/pavuk/files/pavuk-0.9.34-nls.patch b/net-misc/pavuk/files/pavuk-0.9.34-nls.patch
new file mode 100644
index 000000000000..0015f06e69d4
--- /dev/null
+++ b/net-misc/pavuk/files/pavuk-0.9.34-nls.patch
@@ -0,0 +1,13 @@
+diff --exclude='*~' -Naur pavuk-0.9.34.orig/src/pavuk.c pavuk-0.9.34/src/pavuk.c
+--- pavuk-0.9.34.orig/src/pavuk.c	2006-02-25 16:35:27.000000000 -0300
++++ pavuk-0.9.34/src/pavuk.c	2006-02-25 16:47:43.000000000 -0300
+@@ -134,9 +134,7 @@
+   char pom[PATH_MAX];
+   struct hostent *hp = NULL;
+   struct passwd *pwstruct;
+-#ifdef GETTEXT_NLS
+   int i;
+-#endif
+   memset(&cfg, '\0', sizeof(cfg));
+ #ifdef I_FACE
+   memset(&gui_cfg, '\0', sizeof(gui_cfg));
diff --git a/net-misc/pavuk/pavuk-0.9.32.ebuild b/net-misc/pavuk/pavuk-0.9.32.ebuild
index e164822d4daf..05dc198544da 100644
--- a/net-misc/pavuk/pavuk-0.9.32.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.32.ebuild,v 1.6 2005/04/09 19:10:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.32.ebuild,v 1.7 2006/02/25 20:27:37 vanquirius Exp $
 
 inherit eutils
 
@@ -17,7 +17,6 @@ DEPEND=">=sys-apps/sed-4
 	sys-devel/gettext
 	sys-libs/zlib
 	ssl? ( dev-libs/openssl )
-	X? ( virtual/x11 )
 	gnome? ( gnome-base/gnome-libs )
 	mozilla? ( www-client/mozilla )"
 
@@ -27,7 +26,6 @@ src_compile() {
 		--with-regex=auto \
 		--disable-gtk \
 		--disable-socks \
-		$(use_with X x) \
 		$(use_enable ssl) \
 		$(use_enable gnome) \
 		$(use_enable mozilla js) \
diff --git a/net-misc/pavuk/pavuk-0.9.34.ebuild b/net-misc/pavuk/pavuk-0.9.34.ebuild
index 542b8ecb152c..3643070efb05 100644
--- a/net-misc/pavuk/pavuk-0.9.34.ebuild
+++ b/net-misc/pavuk/pavuk-0.9.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.34.ebuild,v 1.2 2006/01/20 15:40:52 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/pavuk/pavuk-0.9.34.ebuild,v 1.3 2006/02/25 20:27:37 vanquirius Exp $
 
 inherit eutils
 
@@ -15,13 +15,31 @@ IUSE="gnome gtk mozilla nls ssl"
 
 DEPEND=">=sys-apps/sed-4
 	sys-devel/gettext
-	sys-libs/zlib
 	ssl? ( dev-libs/openssl )
 	gnome? ( gnome-base/gnome-libs )
 	mozilla? ( www-client/mozilla )
 	=dev-libs/glib-1.2*
-	gtk? ( >=x11-libs/gtk+-2.8.8
-	virtual/x11 )"
+	gtk? (	>=x11-libs/gtk+-2.8.8
+		( || (	x11-proto/xproto
+			virtual/x11 )
+		) )"
+
+RDEPEND="gtk? ( >=x11-libs/gtk+-2.8.8
+	|| ( (	x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libX11 )
+		virtual/x11 )
+	)
+	virtual/libintl
+	ssl? ( dev-libs/openssl )
+	gnome? ( gnome-base/gnome-libs )
+	mozilla? ( www-client/mozilla )"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-0.9.34-nls.patch
+}
+
 
 src_compile() {
 	econf \