lots of cleanups and version bump

7 files changed, 359 insertions, 3 deletions

diff --git a/net-dialup/gnokii/Manifest b/net-dialup/gnokii/Manifest
index db609ac921c9..53b7a8426160 100644
--- a/net-dialup/gnokii/Manifest
+++ b/net-dialup/gnokii/Manifest
@@ -1,10 +1,11 @@
-MD5 4a6c94862d82c05653eb6561a0613060 ChangeLog 623
+MD5 e34a8462bf5678e5840718f25425f9ca ChangeLog 1028
 MD5 2220de3fdb025118e8c6b473ec37e025 gnokii-0.4.3.ebuild 2352
-MD5 860b40703f7e8f2d07019aefaa9e3f20 gnokii-0.5.2-r1.ebuild 1613
+MD5 ee91af875e71f45563dcb7ece229316d gnokii-0.5.2-r1.ebuild 1615
 MD5 38c980ef2dc664da3de1e2b02e1c7bb2 gnokii-0.5.2.ebuild 2236
-MD5 00c466d9d658aa1dca9f0f8de907acb0 gnokii-0.5.4.ebuild 1620
+MD5 070f4b79047eb11db989445ee3ff6182 gnokii-0.5.4.ebuild 1775
 MD5 0513ee1bbaef4507f8dd27f9b40d1fa2 files/digest-gnokii-0.4.3 65
 MD5 6aed2cdf84c80ebcf50f20895d8e7a62 files/digest-gnokii-0.5.2 66
 MD5 6aed2cdf84c80ebcf50f20895d8e7a62 files/digest-gnokii-0.5.2-r1 66
 MD5 ceba5cce129f7cc9958fbd441d951443 files/digest-gnokii-0.5.4 66
 MD5 9150004a3eff911d296d8a7457d31de3 files/gnokii-0.5.2-nounix98pty.patch 3833
+MD5 c090b40eb79ae5472e82a22256d7c396 files/gnokii-0.5.4-nounix98pty.patch 2279
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1 b/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1
new file mode 100644
index 000000000000..4b5ff587d4b5
--- /dev/null
+++ b/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1
@@ -0,0 +1 @@
+MD5 e11c7eb39f346cea125bcda8098c242a gnokii-0.5.2.tar.bz2 1358432
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.5.4 b/net-dialup/gnokii/files/digest-gnokii-0.5.4
new file mode 100644
index 000000000000..86fa48f36b27
--- /dev/null
+++ b/net-dialup/gnokii/files/digest-gnokii-0.5.4
@@ -0,0 +1 @@
+MD5 20a639fa89a4a1746d5c3a7bcae1d2dd gnokii-0.5.4.tar.bz2 1320404
diff --git a/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch b/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch
new file mode 100644
index 000000000000..cb9951a99a2a
--- /dev/null
+++ b/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch
@@ -0,0 +1,136 @@
+--- gnokii-0.5.2/configure	2003-06-13 10:02:33.000000000 +0100
++++ gnokii-0.5.2/configure	2003-09-12 22:43:25.564995784 +0100
+@@ -7864,133 +7864,6 @@
+ 
+ fi;
+ 
+-echo "$as_me:$LINENO: checking for grantpt" >&5
+-echo $ECHO_N "checking for grantpt... $ECHO_C" >&6
+-if test "${ac_cv_func_grantpt+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char grantpt (); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char grantpt ();
+-char (*f) ();
+-
+-int
+-main ()
+-{
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_grantpt) || defined (__stub___grantpt)
+-choke me
+-#else
+-f = grantpt;
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext 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='test -s 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
+-  ac_cv_func_grantpt=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_grantpt=no
+-fi
+-rm -f 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
+-#line $LINENO "configure"
+-#include "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
+-cat 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.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+-
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
diff --git a/net-dialup/gnokii/files/gnokii-0.5.4-nounix98pty.patch b/net-dialup/gnokii/files/gnokii-0.5.4-nounix98pty.patch
new file mode 100644
index 000000000000..080eb6e6bba7
--- /dev/null
+++ b/net-dialup/gnokii/files/gnokii-0.5.4-nounix98pty.patch
@@ -0,0 +1,84 @@
+--- configure	2003-09-22 22:18:59.000000000 +0100
++++ configure.new	2003-10-01 00:35:18.563306296 +0100
+@@ -9088,81 +9088,6 @@
+ fi
+ rm -f 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
+-#line $LINENO "configure"
+-/* 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.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+-fi
+-
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
diff --git a/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild b/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..0a6f4d19bc47
--- /dev/null
+++ b/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild,v 1.1 2003/10/01 00:04:33 liquidx Exp $
+
+DESCRIPTION="a client that plugs into your handphone"
+SRC_URI="http://freesoftware.fsf.org/download/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.gnokii.org"
+
+IUSE="nls X bluetooth irda"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+RDEPEND="X? ( =x11-libs/gtk+-1.2* )
+	bluetooth? ( net-wireless/bluez-libs )
+	irda? (	sys-kernel/linux-headers )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-nounix98pty.patch
+}
+
+src_compile() {
+	local myconf
+
+	econf \
+		`use_enable nls` \
+		`use_with X x` \
+	    --enable-security || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "install failed"
+
+	dodoc Docs/*
+	docinto /usr/share/doc/${PF}/protocol
+	dodoc Docs/protocol/*
+	cp -r Docs/sample ${D}/usr/share/doc/${PF}/sample
+
+	doman Docs/man/*
+
+	dodir /etc
+	sed -e 's:/usr/local/sbin:/usr/sbin:' ${S}/Docs/sample/gnokiirc > ${D}/etc/gnokiirc
+}
+
+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"
+}
+
+pkg_postrm () {
+	# leaving to clean up the old mess we used to leave behind
+	# since we don't _really_ need suid gnokii, just the make sure
+	# the use has the right perms
+	groupdel gnokii
+}
diff --git a/net-dialup/gnokii/gnokii-0.5.4.ebuild b/net-dialup/gnokii/gnokii-0.5.4.ebuild
new file mode 100644
index 000000000000..9c6e8d0c7cc6
--- /dev/null
+++ b/net-dialup/gnokii/gnokii-0.5.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.5.4.ebuild,v 1.1 2003/10/01 00:04:33 liquidx Exp $
+
+DESCRIPTION="a client that plugs into your handphone"
+SRC_URI="http://freesoftware.fsf.org/download/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.gnokii.org"
+
+IUSE="nls X bluetooth irda"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+RDEPEND="X? ( =x11-libs/gtk+-1.2* )
+	bluetooth? ( net-wireless/bluez-libs )
+	irda? (	sys-kernel/linux-headers )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-nounix98pty.patch
+}
+
+src_compile() {
+	local myconf
+
+	econf \
+		`use_enable nls` \
+		`use_with X x` \
+	    --enable-security || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "install failed"
+
+	dodoc Docs/*
+	cp -r Docs/sample ${D}/usr/share/doc/${PF}/sample
+	cp -r Docs/protocol ${D}/usr/share/doc/${PF}/protocol	
+
+	doman Docs/man/*
+
+	dodir /etc
+	sed -e 's:/usr/local/sbin:/usr/sbin:' ${S}/Docs/sample/gnokiirc > ${D}/etc/gnokiirc
+	
+	# only one file needs suid root to make a psuedo device
+	fperms 4755 /usr/sbin/mgnokiidev
+}
+
+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"
+	
+	# clean up old gnokii group perms
+	groupdel gnokii
+}
+
+pkg_postrm () {
+	# leaving to clean up the old mess we used to leave behind
+	# since we don't _really_ need suid gnokii, just the make sure
+	# the use has the right perms
+	groupdel gnokii
+}