version bump; install errors cleaned up; translation of gnokii-bindir.patch into a sed call

8 files changed, 272 insertions, 16 deletions

diff --git a/net-dialup/gnokii/ChangeLog b/net-dialup/gnokii/ChangeLog
index 342b7a1f71b5..e3913f504dee 100644
--- a/net-dialup/gnokii/ChangeLog
+++ b/net-dialup/gnokii/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/gnokii
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/ChangeLog,v 1.24 2004/11/17 21:55:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/ChangeLog,v 1.25 2004/11/17 23:07:36 mrness Exp $
+
+*gnokii-0.6.4 (18 Nov 2004)
+
+  18 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  +files/gnokii-0.6.3-nounix98pty.patch,
+  -files/gnokii-0.6.3-nounix98pty.patch.bz2,
+  +files/gnokii-0.6.4-nounix98pty.patch, gnokii-0.6.3.ebuild,
+  +gnokii-0.6.4.ebuild:
+  Version bump with install errors cleaned up.
 
   17 Nov 2004; Alin Nastac <mrness@gentoo.org> gnokii-0.6.3.ebuild:
   Stable on x86
diff --git a/net-dialup/gnokii/Manifest b/net-dialup/gnokii/Manifest
index bc3539520c25..f94a33e8a670 100644
--- a/net-dialup/gnokii/Manifest
+++ b/net-dialup/gnokii/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a4c7db1b81b5852ac39ccd368beb0723 ChangeLog 3184
+MD5 16c9061be395a3833172df023ae0d888 ChangeLog 3480
 MD5 36c47ce64b8c3ed43a9e78d9624c274a gnokii-0.6.0.ebuild 1734
-MD5 34ff3092bb6ea5f8753aa87596b194e3 gnokii-0.6.3.ebuild 2022
+MD5 9e2bd67659c8af910681231b2e752289 gnokii-0.6.3.ebuild 2018
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 204de330b1b122b2c7a2993c6f9a45a7 gnokii-0.5.10.ebuild 1727
+MD5 ca70841a48ed05262096767a74dcb77c gnokii-0.6.4.ebuild 2161
 MD5 0bbebda960877f78a4e41b6799c0b653 files/digest-gnokii-0.5.10 67
 MD5 18ace349b5a90256f80dfbcafb097441 files/digest-gnokii-0.6.0 66
 MD5 a5368c4063484bca17cb363705d3caa2 files/digest-gnokii-0.6.3 66
 MD5 c090b40eb79ae5472e82a22256d7c396 files/gnokii-0.5.4-nounix98pty.patch 2279
-MD5 9488d33f3f7b858c918549abe13588dd files/gnokii-0.6.3-nounix98pty.patch.bz2 988
 MD5 2f2f572bc05f2ee40468130dcdd7e946 files/gnokii-bindir.patch 461
 MD5 135df3cf24c3041ccb20a5896482ed59 files/gnokii.desktop 260
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBm8jYjtv59x0+BrURAiqnAJ490SES3r+kh9+LQIKkhmX+po6D3ACg6slN
-m3+5wGID8MtSKgeluU6b1GI=
-=s4SF
------END PGP SIGNATURE-----
+MD5 e99ea660638e47400dc8320ea630d0b8 files/digest-gnokii-0.6.4 66
+MD5 a94c289dfef59e2ddbf2fd186d180f5f files/gnokii-0.6.3-nounix98pty.patch 2258
+MD5 e7cbb30653687bd875e5eff32b913b6c files/gnokii-0.6.4-nounix98pty.patch 2259
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.6.4 b/net-dialup/gnokii/files/digest-gnokii-0.6.4
new file mode 100644
index 000000000000..3848e52c4210
--- /dev/null
+++ b/net-dialup/gnokii/files/digest-gnokii-0.6.4
@@ -0,0 +1 @@
+MD5 e48e72b4038481509f32e2a7596dc2d5 gnokii-0.6.4.tar.bz2 2006834
diff --git a/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch b/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch
new file mode 100644
index 000000000000..6566c768a957
--- /dev/null
+++ b/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch
@@ -0,0 +1,83 @@
+--- configure	2004-04-13 23:28:02.000000000 +0200
++++ configure.new	2004-05-15 01:31:01.364191640 +0200
+@@ -28863,80 +28863,6 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_grantpt" >&5
+-echo "${ECHO_T}$ac_cv_func_grantpt" >&6
+-if test $ac_cv_func_grantpt = yes; then
+-   if test "$cross_compiling" = yes; then
+-  { echo "$as_me:$LINENO: WARNING: \"Ensure to disable unix98ptys when crosscompiling\"" >&5
+-echo "$as_me: WARNING: \"Ensure to disable unix98ptys when crosscompiling\"" >&2;}
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#define  _XOPEN_SOURCE 500
+-
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+-#include <unistd.h>
+-
+-int main()
+-{
+-	char *name = NULL;
+-        int master, err;
+-
+-        master = open("/dev/ptmx", O_RDWR | O_NOCTTY | O_NONBLOCK);
+-        if (master >= 0) {
+-                err = grantpt(master);
+-                err = err || unlockpt(master);
+-                if (!err) {
+-                        name = ptsname(master);
+-                } else {
+-                        exit(-1);
+-                }
+-        } else {
+-		exit(-1);
+-	}
+-	close(master);
+-	exit(0);
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  cat >>confdefs.h <<\_ACEOF
+-#define USE_UNIX98PTYS 1
+-_ACEOF
+-
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: WARNING: \"No unix98ptys\"" >&5
+-echo "$as_me: WARNING: \"No unix98ptys\"" >&2;}
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch.bz2 b/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch.bz2
deleted file mode 100644
index 86dc8611073b..000000000000
--- a/net-dialup/gnokii/files/gnokii-0.6.3-nounix98pty.patch.bz2
+++ /dev/null
diff --git a/net-dialup/gnokii/files/gnokii-0.6.4-nounix98pty.patch b/net-dialup/gnokii/files/gnokii-0.6.4-nounix98pty.patch
new file mode 100644
index 000000000000..5b4e55f9da49
--- /dev/null
+++ b/net-dialup/gnokii/files/gnokii-0.6.4-nounix98pty.patch
@@ -0,0 +1,83 @@
+--- configure.orig	2004-10-17 22:44:38.000000000 +0300
++++ configure	2004-11-18 00:24:20.496016136 +0200
+@@ -29417,80 +29417,6 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_grantpt" >&5
+-echo "${ECHO_T}$ac_cv_func_grantpt" >&6
+-if test $ac_cv_func_grantpt = yes; then
+-   if test "$cross_compiling" = yes; then
+-  { echo "$as_me:$LINENO: WARNING: \"Ensure to disable unix98ptys when crosscompiling\"" >&5
+-echo "$as_me: WARNING: \"Ensure to disable unix98ptys when crosscompiling\"" >&2;}
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#define  _XOPEN_SOURCE 500
+-
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <fcntl.h>
+-#include <unistd.h>
+-
+-int main()
+-{
+-	char *name = NULL;
+-        int master, err;
+-
+-        master = open("/dev/ptmx", O_RDWR | O_NOCTTY | O_NONBLOCK);
+-        if (master >= 0) {
+-                err = grantpt(master);
+-                err = err || unlockpt(master);
+-                if (!err) {
+-                        name = ptsname(master);
+-                } else {
+-                        exit(-1);
+-                }
+-        } else {
+-		exit(-1);
+-	}
+-	close(master);
+-	exit(0);
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  cat >>confdefs.h <<\_ACEOF
+-#define USE_UNIX98PTYS 1
+-_ACEOF
+-
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ echo "$as_me:$LINENO: WARNING: \"No unix98ptys\"" >&5
+-echo "$as_me: WARNING: \"No unix98ptys\"" >&2;}
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/net-dialup/gnokii/gnokii-0.6.3.ebuild b/net-dialup/gnokii/gnokii-0.6.3.ebuild
index 235999fc1783..842a8ec44023 100644
--- a/net-dialup/gnokii/gnokii-0.6.3.ebuild
+++ b/net-dialup/gnokii/gnokii-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.6.3.ebuild,v 1.11 2004/11/17 21:55:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.6.3.ebuild,v 1.12 2004/11/17 23:07:36 mrness Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-bindir.patch
-	epatch ${FILESDIR}/${PN}-0.6.3-nounix98pty.patch.bz2
+	epatch ${FILESDIR}/${PN}-0.6.3-nounix98pty.patch
 }
 
 src_compile() {
diff --git a/net-dialup/gnokii/gnokii-0.6.4.ebuild b/net-dialup/gnokii/gnokii-0.6.4.ebuild
new file mode 100644
index 000000000000..75d31102eb50
--- /dev/null
+++ b/net-dialup/gnokii/gnokii-0.6.4.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.6.4.ebuild,v 1.1 2004/11/17 23:07:36 mrness Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="a client that plugs into your handphone"
+HOMEPAGE="http://www.gnokii.org/"
+SRC_URI="http://www.gnokii.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~alpha ~ppc64"
+IUSE="nls X bluetooth irda sms postgres mysql"
+
+RDEPEND="X? ( =x11-libs/gtk+-1.2* )
+	bluetooth? ( net-wireless/bluez-libs )
+	irda? ( virtual/os-headers )
+	sms? ( postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S} && \
+		sed -i -e 's:/usr/local/:/usr/:g' Docs/sample/gnokiirc && \
+		epatch ${FILESDIR}/${P}-nounix98pty.patch || \
+			die "something has changed in this package"
+}
+
+src_compile() {
+	append-ldflags "-Wl,-z,now" #avoid QA notices
+
+	econf \
+		`use_enable nls` \
+		`use_with X x` \
+	    --enable-security || die "configure failed"
+
+	emake -j1 || die "make failed"
+
+	if use sms
+	then
+		cd ${S}/smsd
+
+		if use postgres; then
+			emake libpq.la || die "smsd make failed"
+		elif use mysql; then
+			emake libmysql.la || die "smsd make failed"
+		else
+			emake libfile.la || die "smsd make failed"
+		fi
+	fi
+}
+
+src_install() {
+	einstall || die "make install failed"
+
+	insinto /etc
+	doins Docs/sample/gnokiirc
+
+	doman Docs/man/*
+	dodir /usr/share/doc/${PF}
+	cp -r Docs/sample ${D}/usr/share/doc/${PF}/sample
+	cp -r Docs/protocol ${D}/usr/share/doc/${PF}/protocol
+	rm -rf Docs/man Docs/sample Docs/protocol
+	dodoc Docs/*
+
+	# only one file needs suid root to make a psuedo device
+	fperms 4755 /usr/sbin/mgnokiidev
+
+	if use sms;	then
+		cd ${S}/smsd
+
+		einstall || die "smsd make install failed"
+	fi
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${PN}.desktop
+}
+
+pkg_postinst() {
+	einfo "gnokii does not need it's own group anymore."
+	einfo "Make sure the user that runs gnokii has read/write access to the device"
+	einfo "which your phone is connected to. eg. chown <user> /dev/ttyS0"
+}