bump

8 files changed, 18 insertions, 207 deletions

diff --git a/net-dialup/gnokii/ChangeLog b/net-dialup/gnokii/ChangeLog
index e22a0b2a6558..0a37f27c5157 100644
--- a/net-dialup/gnokii/ChangeLog
+++ b/net-dialup/gnokii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/gnokii
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/ChangeLog,v 1.6 2003/11/19 14:28:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/ChangeLog,v 1.7 2003/11/25 17:59:21 lanius Exp $
+
+*gnokii-0.5.5 (25 Nov 2003)
+
+  25 Nov 2003; Heinrich Wendel <lanius@gentoo.org> gnokii-0.5.5.ebuild:
+  version bump
 
   19 Nov 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml:
   metadata
diff --git a/net-dialup/gnokii/Manifest b/net-dialup/gnokii/Manifest
index 414b8cbdcdf8..593d94a85b86 100644
--- a/net-dialup/gnokii/Manifest
+++ b/net-dialup/gnokii/Manifest
@@ -1,14 +1,9 @@
-MD5 38c980ef2dc664da3de1e2b02e1c7bb2 gnokii-0.5.2.ebuild 2236
 MD5 a0a25b133c01c4fa888923bda65f62cc gnokii-0.5.4.ebuild 1772
 MD5 2220de3fdb025118e8c6b473ec37e025 gnokii-0.4.3.ebuild 2352
-MD5 ee91af875e71f45563dcb7ece229316d gnokii-0.5.2-r1.ebuild 1615
-MD5 0b2eb95872a2ea4cf3f6857b0196ab03 ChangeLog 1104
+MD5 5085461697c45aae26efbf661ccccca3 ChangeLog 1221
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 a0a25b133c01c4fa888923bda65f62cc gnokii-0.5.5.ebuild 1772
-MD5 6aed2cdf84c80ebcf50f20895d8e7a62 files/digest-gnokii-0.5.2-r1 66
+MD5 238cfa9d4e1160dc263188c4dc5e8ded gnokii-0.5.5.ebuild 1778
 MD5 c090b40eb79ae5472e82a22256d7c396 files/gnokii-0.5.4-nounix98pty.patch 2279
-MD5 9150004a3eff911d296d8a7457d31de3 files/gnokii-0.5.2-nounix98pty.patch 3833
 MD5 0513ee1bbaef4507f8dd27f9b40d1fa2 files/digest-gnokii-0.4.3 65
-MD5 6aed2cdf84c80ebcf50f20895d8e7a62 files/digest-gnokii-0.5.2 66
 MD5 ceba5cce129f7cc9958fbd441d951443 files/digest-gnokii-0.5.4 66
 MD5 d5b2795e811bdb29384e2649356d118b files/digest-gnokii-0.5.5 66
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.5.2 b/net-dialup/gnokii/files/digest-gnokii-0.5.2
deleted file mode 100644
index 4b5ff587d4b5..000000000000
--- a/net-dialup/gnokii/files/digest-gnokii-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e11c7eb39f346cea125bcda8098c242a gnokii-0.5.2.tar.bz2 1358432
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1 b/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1
deleted file mode 100644
index 4b5ff587d4b5..000000000000
--- a/net-dialup/gnokii/files/digest-gnokii-0.5.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e11c7eb39f346cea125bcda8098c242a gnokii-0.5.2.tar.bz2 1358432
diff --git a/net-dialup/gnokii/files/digest-gnokii-0.5.5 b/net-dialup/gnokii/files/digest-gnokii-0.5.5
new file mode 100644
index 000000000000..fd889d1f0f39
--- /dev/null
+++ b/net-dialup/gnokii/files/digest-gnokii-0.5.5
@@ -0,0 +1 @@
+MD5 8033f9e1e8e1dd1e852db53d44a1df5e gnokii-0.5.5.tar.bz2 1402650
diff --git a/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch b/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch
deleted file mode 100644
index cb9951a99a2a..000000000000
--- a/net-dialup/gnokii/files/gnokii-0.5.2-nounix98pty.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- 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/gnokii-0.5.2.ebuild b/net-dialup/gnokii/gnokii-0.5.2.ebuild
deleted file mode 100644
index 403babd50c5e..000000000000
--- a/net-dialup/gnokii/gnokii-0.5.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.ebuild,v 1.3 2003/09/08 11:42:21 msterret Exp $
-
-S=$WORKDIR/${P}
-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"
-DEPEND="X? ( virtual/x11 x11-libs/gtk+ )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SANDBOX_DISABLED="1"
-
-src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-	econf \
-		--prefix=/usr \
-	    --enable-security \
-	    ${myconf} || die
-	make CC="gcc ${CFLAGS}" || die "make failed (myconf=${myconf})"
-}
-
-src_install () {
-	groupadd gnokii
-	make DESTDIR=$D install-ss || die "install failed"
-
-	dodoc Docs/Bugs Docs/CREDITS Docs/DataCalls-QuickStart Docs/FAQ Docs/Makefile
-	dodoc Docs/README Docs/README-2110 Docs/README-3810 Docs/README-6110 Docs/README-6510 Docs/README-7110
-	dodoc Docs/README-MacOSX Docs/README-WIN32 Docs/README-dancall Docs/README-ericsson Docs/README-siemens Docs/README.libsms
-	dodoc Docs/gettext-howto Docs/gnokii-IrDA-Linux Docs/gnokii-hackers-howto Docs/gnokii-ir-howto
-	dodoc Docs/gnokii.nol Docs/logos.txt Docs/packaging-howto Docs/ringtones.txt
-	dodoc Docs/protocol/dancall.txt Docs/protocol/nk2110.txt Docs/protocol/nk3110.txt Docs/protocol/nk6110.txt Docs/protocol/nk6160.txt Docs/protocol/nk6185.txt Docs/protocol/nk640.txt Docs/protocol/nk6510.txt Docs/protocol/nk7110.txt Docs/protocol/nokia.txt
-
-	dodoc Docs/sample/logo/bronto.xpm Docs/sample/logo/gnokii.xpm Docs/sample/logo/gnokiiop.xpm Docs/sample/logo/horse.xpm Docs/sample/logo/horse2.xpm Docs/sample/logo/pacman.xpm
-	dodoc Docs/sample/gnokiirc Docs/sample/magic
-	dodoc Docs/sample/ringtone/star.imelody Docs/sample/ringtone/star.rtttl
-	dodoc Docs/sample/vCalendar/test.vcs
-
-	doman Docs/man/gnokii.1 Docs/man/gnokiid.8 Docs/man/mgnokiidev.8 Docs/man/todologo.1 Docs/man/xgnokii.1x
-	mkdir $D/etc
-	sed 's#/usr/local/sbin/#/usr/sbin/#' <Docs/sample/gnokiirc > $D/etc/gnokiirc
-}
-
-src_postrm () {
-	groupdel gnokii
-}
diff --git a/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild b/net-dialup/gnokii/gnokii-0.5.5.ebuild
index 0a6f4d19bc47..9523d40001ee 100644
--- a/net-dialup/gnokii/gnokii-0.5.2-r1.ebuild
+++ b/net-dialup/gnokii/gnokii-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnokii/gnokii-0.5.5.ebuild,v 1.1 2003/11/25 17:59:21 lanius Exp $
 
 DESCRIPTION="a client that plugs into your handphone"
 SRC_URI="http://freesoftware.fsf.org/download/${PN}/${P}.tar.bz2"
@@ -22,7 +22,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-nounix98pty.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.5.4-nounix98pty.patch
 }
 
 src_compile() {
@@ -40,20 +40,25 @@ 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
+	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 () {