Fix modem connection detecting problem related to wvstreams-4.3, thanks to Grigorij Mozhaev <zcrendel at gmail dot com> (#180314).

Package-Manager: portage-2.1.2.7

5 files changed, 153 insertions, 9 deletions

diff --git a/net-dialup/gnome-ppp/ChangeLog b/net-dialup/gnome-ppp/ChangeLog
index 05b30bb1d74c..ea10f00036f4 100644
--- a/net-dialup/gnome-ppp/ChangeLog
+++ b/net-dialup/gnome-ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/gnome-ppp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnome-ppp/ChangeLog,v 1.21 2007/04/14 10:33:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnome-ppp/ChangeLog,v 1.22 2007/07/14 06:09:11 mrness Exp $
+
+*gnome-ppp-0.3.23-r1 (14 Jul 2007)
+
+  14 Jul 2007; Alin Năstac <mrness@gentoo.org>
+  +files/gnome-ppp-0.3.23-wvdial-notify.patch, +gnome-ppp-0.3.23-r1.ebuild:
+  Fix modem connection detecting problem related to wvstreams-4.3, thanks to
+  Grigorij Mozhaev <zcrendel at gmail dot com> (#180314).
 
   14 Apr 2007; Alin Năstac <mrness@gentoo.org>
   +files/gnome-ppp-0.3.23-implicit-decl.patch, gnome-ppp-0.3.23.ebuild:
diff --git a/net-dialup/gnome-ppp/Manifest b/net-dialup/gnome-ppp/Manifest
index 3ab81ef54447..5d6dc2e05f81 100644
--- a/net-dialup/gnome-ppp/Manifest
+++ b/net-dialup/gnome-ppp/Manifest
@@ -5,15 +5,23 @@ AUX gnome-ppp-0.3.23-implicit-decl.patch 385 RMD160 c90b31048e76624e2a02ea2c6b06
 MD5 63484565aaad0080c208fe3ce0488229 files/gnome-ppp-0.3.23-implicit-decl.patch 385
 RMD160 c90b31048e76624e2a02ea2c6b060a06de170529 files/gnome-ppp-0.3.23-implicit-decl.patch 385
 SHA256 b251368cbde2bf183d8961289c59bf6d40b9fc530ec6e0b311be5f80eeaeb781 files/gnome-ppp-0.3.23-implicit-decl.patch 385
+AUX gnome-ppp-0.3.23-wvdial-notify.patch 3585 RMD160 595868ccad33a6a23e4e6d21c80b703d9424d758 SHA1 65022349f5b1c4164201a62651c40dcbac93d8ff SHA256 7548e97600b4f742f32310d59f2b8ce5958bd4f880829638cddbdbbdffd534c1
+MD5 1e3de36a579ab33438dad64d91fb6d1d files/gnome-ppp-0.3.23-wvdial-notify.patch 3585
+RMD160 595868ccad33a6a23e4e6d21c80b703d9424d758 files/gnome-ppp-0.3.23-wvdial-notify.patch 3585
+SHA256 7548e97600b4f742f32310d59f2b8ce5958bd4f880829638cddbdbbdffd534c1 files/gnome-ppp-0.3.23-wvdial-notify.patch 3585
 DIST gnome-ppp-0.3.23.tar.bz2 330907 RMD160 18f946bf475506f7a5f948b83f64439ca70646c1 SHA1 db6c1981beddb9a9824eaae86f6a410822f9d6b6 SHA256 ec606b5648182375e0d02a5cf365c5bf9aba312fb0fd105c24db683f42646e14
+EBUILD gnome-ppp-0.3.23-r1.ebuild 824 RMD160 c1277d52b1ae644ebe03ac3fc357cae416437e90 SHA1 ed339b11aece54b6d4e72bc8150654e97485d934 SHA256 2faa79de0cc11762920f00208498840462c03de724e6c34e53595214843ea398
+MD5 1912203b686db2859d52d731bdc81049 gnome-ppp-0.3.23-r1.ebuild 824
+RMD160 c1277d52b1ae644ebe03ac3fc357cae416437e90 gnome-ppp-0.3.23-r1.ebuild 824
+SHA256 2faa79de0cc11762920f00208498840462c03de724e6c34e53595214843ea398 gnome-ppp-0.3.23-r1.ebuild 824
 EBUILD gnome-ppp-0.3.23.ebuild 773 RMD160 603287abf067332b87aa49e895fcc7f4d2d0ffb1 SHA1 54ff8d5e2c3947d648fcb4836dbec9a4d3f12228 SHA256 52e3cfbd16676b501ec8be1e2ae26a0c4fff2efedb44fc63a65544ec2a737ca1
 MD5 8a39b33aaefabc1e60179598ab629537 gnome-ppp-0.3.23.ebuild 773
 RMD160 603287abf067332b87aa49e895fcc7f4d2d0ffb1 gnome-ppp-0.3.23.ebuild 773
 SHA256 52e3cfbd16676b501ec8be1e2ae26a0c4fff2efedb44fc63a65544ec2a737ca1 gnome-ppp-0.3.23.ebuild 773
-MISC ChangeLog 3133 RMD160 e108f98e611953af6c8b1f1a845dc65e9739257b SHA1 89ccf504f249df714e1005a73d1c4db2bc2cf349 SHA256 acbe9ac345ec675305b58c81aa9773d34ebeb83c060ed1109e4e4e2a3ff757cd
-MD5 2f1eee393f3343e48155fef378f8dbef ChangeLog 3133
-RMD160 e108f98e611953af6c8b1f1a845dc65e9739257b ChangeLog 3133
-SHA256 acbe9ac345ec675305b58c81aa9773d34ebeb83c060ed1109e4e4e2a3ff757cd ChangeLog 3133
+MISC ChangeLog 3429 RMD160 ffd6e2a5c55e4ae4603e85ea03e58284203c6214 SHA1 d5b62e5c32f48732f4e350a4555000d96db14d1d SHA256 854f40e3eb3be760b4451ab2268225d9ee35a580319636030daba865e4233c85
+MD5 6b5bfcf8d2f1317426efce2d50328538 ChangeLog 3429
+RMD160 ffd6e2a5c55e4ae4603e85ea03e58284203c6214 ChangeLog 3429
+SHA256 854f40e3eb3be760b4451ab2268225d9ee35a580319636030daba865e4233c85 ChangeLog 3429
 MISC metadata.xml 222 RMD160 7598b42a5985d16faaeb6c1093ed22233254b1ed SHA1 e9979c9c1c8dd37b1eff89b09ec55052f59fdcaa SHA256 eb32ddbcff341d5e7618667a8eeab76f2d93ad4f69af66fd1ebb8df827c86e4f
 MD5 202034bd87dab639103a4f2f07b6c376 metadata.xml 222
 RMD160 7598b42a5985d16faaeb6c1093ed22233254b1ed metadata.xml 222
@@ -21,10 +29,13 @@ SHA256 eb32ddbcff341d5e7618667a8eeab76f2d93ad4f69af66fd1ebb8df827c86e4f metadata
 MD5 bb62b8be64e11606528c6d981d50196f files/digest-gnome-ppp-0.3.23 253
 RMD160 a4abb6376ef1ebfbc51c4e1acc4e7ba7d69ee162 files/digest-gnome-ppp-0.3.23 253
 SHA256 fd20e63096744c1fafb35b02a2690c050de0cbefb0b287dfe38023bf2f910a70 files/digest-gnome-ppp-0.3.23 253
+MD5 bb62b8be64e11606528c6d981d50196f files/digest-gnome-ppp-0.3.23-r1 253
+RMD160 a4abb6376ef1ebfbc51c4e1acc4e7ba7d69ee162 files/digest-gnome-ppp-0.3.23-r1 253
+SHA256 fd20e63096744c1fafb35b02a2690c050de0cbefb0b287dfe38023bf2f910a70 files/digest-gnome-ppp-0.3.23-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGIK4SJnxX6mF440QRAuinAJ9X3gE6auklHAanJQM6J4XV3f8Q7gCeLIb2
-ojJZL4ojCKYMCUxv34FyWaw=
-=lqCA
+iD8DBQFGmGiPVSA5X31g7/gRAmrAAJ92V0SulrMZKl7AmTYRYu89dnI+HgCgnOrz
+gMeUzV2/4TEr38JmiczpgQ0=
+=LTpL
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/gnome-ppp/files/digest-gnome-ppp-0.3.23-r1 b/net-dialup/gnome-ppp/files/digest-gnome-ppp-0.3.23-r1
new file mode 100644
index 000000000000..aab945707dd2
--- /dev/null
+++ b/net-dialup/gnome-ppp/files/digest-gnome-ppp-0.3.23-r1
@@ -0,0 +1,3 @@
+MD5 ec2e20fc713a01c953d759bea3df8618 gnome-ppp-0.3.23.tar.bz2 330907
+RMD160 18f946bf475506f7a5f948b83f64439ca70646c1 gnome-ppp-0.3.23.tar.bz2 330907
+SHA256 ec606b5648182375e0d02a5cf365c5bf9aba312fb0fd105c24db683f42646e14 gnome-ppp-0.3.23.tar.bz2 330907
diff --git a/net-dialup/gnome-ppp/files/gnome-ppp-0.3.23-wvdial-notify.patch b/net-dialup/gnome-ppp/files/gnome-ppp-0.3.23-wvdial-notify.patch
new file mode 100644
index 000000000000..b3ec322d5024
--- /dev/null
+++ b/net-dialup/gnome-ppp/files/gnome-ppp-0.3.23-wvdial-notify.patch
@@ -0,0 +1,85 @@
+diff -Nru gnome-ppp-0.3.23.orig/src/gnome-ppp-connected.c gnome-ppp-0.3.23/src/gnome-ppp-connected.c
+--- gnome-ppp-0.3.23.orig/src/gnome-ppp-connected.c	2005-02-07 23:23:10.000000000 +0200
++++ gnome-ppp-0.3.23/src/gnome-ppp-connected.c	2007-07-14 09:00:51.000000000 +0300
+@@ -51,6 +51,8 @@
+ 
+ gboolean on_conn_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
+ {
++	gnome_ppp.connected.show = FALSE;
++	gtk_widget_hide (gnome_ppp.connected.window);
+ 	return TRUE;
+ }
+ 
+diff -Nru gnome-ppp-0.3.23.orig/src/gnome-ppp-wvdial.c gnome-ppp-0.3.23/src/gnome-ppp-wvdial.c
+--- gnome-ppp-0.3.23.orig/src/gnome-ppp-wvdial.c	2005-02-01 21:28:25.000000000 +0200
++++ gnome-ppp-0.3.23/src/gnome-ppp-wvdial.c	2007-07-14 09:01:29.000000000 +0300
+@@ -56,13 +56,13 @@
+ 	
+ 	g_print ("GNOME PPP: STDERR: %s", line);
+ 	
+-	if (g_strrstr (line, "--> Cannot open") != NULL)
++	if (g_strrstr (line, "Cannot open") != NULL)
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Can not open modem."));
+ 	
+-	if (g_strrstr (line, "--> Modem not responding") != NULL)
++	if (g_strrstr (line, "Modem not responding") != NULL)
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Modem not responding."));
+ 	
+-	if (g_strrstr (line, "--> Please enter password") != NULL) {
++	if (g_strrstr (line, "Please enter password") != NULL) {
+ 		const gchar *password;
+ 		
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Sending password..."));
+@@ -75,7 +75,7 @@
+ 		g_io_channel_shutdown (in, TRUE, NULL);
+ 	}
+ 	
+-	if (g_strrstr (line, "--> Configuration does not specify a valid password.") != NULL)
++	if (g_strrstr (line, "Configuration does not specify a valid password.") != NULL)
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("No valid password."));
+ 	
+ 	if (g_strrstr (line, "ATM") != NULL) {
+@@ -90,13 +90,13 @@
+ 		g_free (message);
+ 	}
+ 	
+-	if (g_strrstr (line, "--> Carrier detected.  Waiting for prompt.") != NULL)
++	if (g_strrstr (line, "Carrier detected.  Waiting for prompt.") != NULL)
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Waiting for prompt..."));
+ 	
+ 	if (g_strrstr (line, "Username:") != NULL)
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Authenticating..."));
+ 	
+-	if (g_strrstr (line, "--> Using interface") != NULL) {
++	if (g_strrstr (line, "Using interface") != NULL) {
+ 		gchar iface[255];
+ 		gchar tmp[255];
+ 		
+@@ -104,14 +104,14 @@
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.details.interface), &iface[0]);
+ 	}
+ 	/* in case we are using auto reconnect */
+-	if (g_strrstr (line, "--> Auto Reconnect") != NULL) {
++	if (g_strrstr (line, "Auto Reconnect") != NULL) {
+ 		gtk_label_set_text (GTK_LABEL (gnome_ppp.connecting.msgs), _("Reconnecting..."));
+ 		gtk_widget_hide (gnome_ppp.gnome_ppp.window);
+ 		gtk_widget_hide (gnome_ppp.details.window);
+ 		gtk_widget_show (gnome_ppp.connecting.window);		
+ 	}
+ 	/* we're about to connect (pppd) */
+-	if (g_strrstr (line, "--> Starting pppd") != NULL) {
++	if (g_strrstr (line, "Starting pppd") != NULL) {
+ 		gboolean minimize;
+ 				
+ 		minimize = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gnome_ppp.setup.minimize));
+@@ -135,8 +135,8 @@
+ 		gnome_ppp.connected.update = g_timeout_add (1000, (GSourceFunc)timer, NULL);
+ 	}
+ 	
+-	if (g_strrstr (line, "--> The PPP daemon has died") != NULL
+-		|| g_strrstr (line, "--> Disconnecting") != NULL) {
++	if (g_strrstr (line, "The PPP daemon has died.") != NULL
++		|| g_strrstr (line, "Disconnecting") != NULL) {
+ 	
+ 		if (gnome_ppp.connected.update) {
+ 			g_source_remove (gnome_ppp.connected.update);
diff --git a/net-dialup/gnome-ppp/gnome-ppp-0.3.23-r1.ebuild b/net-dialup/gnome-ppp/gnome-ppp-0.3.23-r1.ebuild
new file mode 100644
index 000000000000..06424e3f76d9
--- /dev/null
+++ b/net-dialup/gnome-ppp/gnome-ppp-0.3.23-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnome-ppp/gnome-ppp-0.3.23-r1.ebuild,v 1.1 2007/07/14 06:09:11 mrness Exp $
+
+inherit gnome2 eutils
+
+MAJOR_V=${PV%.[0-9]*}
+
+DESCRIPTION="A GNOME 2 WvDial frontend"
+HOMEPAGE="None available"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=net-dialup/wvdial-1.54
+	>=gnome-base/libglade-2.4
+	>=x11-libs/gtk+-2.4"
+DEPEND="sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool
+	${RDEPEND}"
+
+USE_DESTDIR="1"
+DOCS="ChangeLog"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-implicit-decl.patch
+	epatch "${FILESDIR}"/${P}-wvdial-notify.patch
+}
+
+src_install() {
+	gnome2_src_install top_builddir="${S}"
+}