Remove obsolete versions. Mark version 0.6.8 stable on x86. Version bump (#112566).

(Portage version: 2.0.51.22-r3)

13 files changed, 36 insertions, 433 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 06aed6dfa311..c8b3c4fb0499 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.19 2005/10/13 18:17:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.20 2005/11/15 05:43:22 mrness Exp $
+
+*gnokii-0.6.10 (15 Nov 2005)
+
+  15 Nov 2005; Alin Nastac <mrness@gentoo.org>
+  -files/gnokii-0.6.3-nounix98pty.patch,
+  -files/gnokii-0.6.4-nounix98pty.patch,
+  -files/gnokii-0.6.6-nounix98pty.patch, -gnokii-0.6.3.ebuild,
+  -gnokii-0.6.4.ebuild, -gnokii-0.6.6.ebuild, gnokii-0.6.8.ebuild,
+  +gnokii-0.6.10.ebuild:
+  Remove obsolete versions. Mark version 0.6.8 stable on x86. Version bump
+  (#112566).
 
   13 Oct 2005; Aron Griffis <agriffis@gentoo.org> gnokii-0.6.7-r1.ebuild:
   Mark 0.6.7-r1 stable on alpha
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 00a2c15158ba..ede555fbf32f 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,31 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a5cc607c2f643558b7824f3d4edce0d2 gnokii-0.6.8.ebuild 2326
-MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
-MD5 18357631a2f6f315be23d8ffd7e4bbd4 ChangeLog 6920
 MD5 438e4d861c9041a0b860bf4791a20693 gnokii-0.6.7-r2.ebuild 2329
+MD5 568865d34804ff08547e318ef4fe2d83 gnokii-0.6.10.ebuild 2243
 MD5 cba9a4289ee030177175548bb071572d gnokii-0.6.7-r1.ebuild 2323
-MD5 91616754805a1556f5d46d710bc2cbc6 gnokii-0.6.3.ebuild 2039
-MD5 3781f7f5ce18fe7026f26def07cc4e63 gnokii-0.6.4.ebuild 2177
-MD5 d66670e10887602f0710acdd5696340b gnokii-0.6.6.ebuild 2231
-MD5 3d2fbaa102bd3ea54ac952a1ccc041c3 files/gnokii-0.6.6-nounix98pty.patch 1158
-MD5 a94c289dfef59e2ddbf2fd186d180f5f files/gnokii-0.6.3-nounix98pty.patch 2258
-MD5 607109baacf9af7181a48be37dfa4b2d files/digest-gnokii-0.6.6 66
+MD5 18357631a2f6f315be23d8ffd7e4bbd4 ChangeLog 6920
+MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
+MD5 a5cc607c2f643558b7824f3d4edce0d2 gnokii-0.6.8.ebuild 2326
 MD5 face706c6d0985abc88c5ad34f39d3ee files/gnokii-0.6.8-smsd-glib2.patch 779
-MD5 2f2f572bc05f2ee40468130dcdd7e946 files/gnokii-bindir.patch 461
-MD5 e7cbb30653687bd875e5eff32b913b6c files/gnokii-0.6.4-nounix98pty.patch 2259
-MD5 a5368c4063484bca17cb363705d3caa2 files/digest-gnokii-0.6.3 66
 MD5 c4cdcbc35ff57082908ea21d7aa1f9a3 files/digest-gnokii-0.6.7-r1 66
 MD5 c4cdcbc35ff57082908ea21d7aa1f9a3 files/digest-gnokii-0.6.7-r2 66
-MD5 e99ea660638e47400dc8320ea630d0b8 files/digest-gnokii-0.6.4 66
-MD5 95cfd5d1812300781f2310dc007ed33e files/digest-gnokii-0.6.8 66
 MD5 d35a120458debd2931e2c6f67104d9d1 files/gnokii-0.6.7-smsd-glib2.patch 779
 MD5 135df3cf24c3041ccb20a5896482ed59 files/gnokii.desktop 260
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDTqTUJrHF4yAQTrARAiw3AKDP77S5sGB7ryBaItPTMF/6WynAbQCaAyTV
-NOT8AhXoj+0n03t9RPasVbE=
-=mbAL
------END PGP SIGNATURE-----
+MD5 95cfd5d1812300781f2310dc007ed33e files/digest-gnokii-0.6.8 66
+MD5 1ae951a2b197095da2c0d74c0067181f files/digest-gnokii-0.6.10 67
+MD5 2f2f572bc05f2ee40468130dcdd7e946 files/gnokii-bindir.patch 461
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.10 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.10
new file mode 100644
index 000000000000..9d802afca5c6
--- /dev/null
+++ b/app-mobilephone/gnokii/files/digest-gnokii-0.6.10
@@ -0,0 +1 @@
+MD5 031007358ff9b6e6e2994d408a4fa88a gnokii-0.6.10.tar.bz2 1916536
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.3 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.3
deleted file mode 100644
index 60d24e87d72b..000000000000
--- a/app-mobilephone/gnokii/files/digest-gnokii-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e932688aeaa2ca8be2f2e3b3bf1b90e gnokii-0.6.3.tar.bz2 1824992
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.4 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.4
deleted file mode 100644
index 3848e52c4210..000000000000
--- a/app-mobilephone/gnokii/files/digest-gnokii-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e48e72b4038481509f32e2a7596dc2d5 gnokii-0.6.4.tar.bz2 2006834
diff --git a/app-mobilephone/gnokii/files/digest-gnokii-0.6.6 b/app-mobilephone/gnokii/files/digest-gnokii-0.6.6
deleted file mode 100644
index 07dfa9224beb..000000000000
--- a/app-mobilephone/gnokii/files/digest-gnokii-0.6.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae5548678a3be240c0133e57e78171c3 gnokii-0.6.6.tar.bz2 1935428
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.3-nounix98pty.patch b/app-mobilephone/gnokii/files/gnokii-0.6.3-nounix98pty.patch
deleted file mode 100644
index 6566c768a957..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-0.6.3-nounix98pty.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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/app-mobilephone/gnokii/files/gnokii-0.6.4-nounix98pty.patch b/app-mobilephone/gnokii/files/gnokii-0.6.4-nounix98pty.patch
deleted file mode 100644
index 5b4e55f9da49..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-0.6.4-nounix98pty.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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/app-mobilephone/gnokii/files/gnokii-0.6.6-nounix98pty.patch b/app-mobilephone/gnokii/files/gnokii-0.6.6-nounix98pty.patch
deleted file mode 100644
index 386677f5ee80..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-0.6.6-nounix98pty.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nru gnokii-0.6.6.orig/configure.in gnokii-0.6.6/configure.in
---- gnokii-0.6.6.orig/configure.in	2005-05-12 06:12:04.000000000 +0300
-+++ gnokii-0.6.6/configure.in	2005-05-15 09:24:36.910737760 +0300
-@@ -463,43 +463,6 @@
-    [ win32="no"]
- )
- 
--AC_CHECK_FUNC(grantpt,
--   [ AC_TRY_RUN([
--#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);
--}
--                ],
--                AC_DEFINE(USE_UNIX98PTYS),
--                AC_MSG_WARN("No unix98ptys"),
--		AC_DEFINE(USE_UNIX98PTYS))
--   ]
--)
--
- AC_TRY_COMPILE( [#define _XOPEN_SOURCE 500
- 		 #include <sys/types.h>
- 		 #include <sys/socket.h>],
diff --git a/app-mobilephone/gnokii/gnokii-0.6.6.ebuild b/app-mobilephone/gnokii/gnokii-0.6.10.ebuild
index 6a5380aad868..58720a2e7dcc 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.6.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.6.ebuild,v 1.6 2005/09/01 17:01:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.10.ebuild,v 1.1 2005/11/15 05:43:22 mrness Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic linux-info
 
 DESCRIPTION="user space driver and tools for use with mobile phones"
 HOMEPAGE="http://www.gnokii.org/"
@@ -10,12 +10,13 @@ SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls X bluetooth irda sms postgres mysql"
 
 RDEPEND="X? ( =x11-libs/gtk+-1.2* )
 	bluetooth? ( net-wireless/bluez-libs )
-	sms? ( postgres? ( dev-db/postgresql )
+	sms? ( >=dev-libs/glib-2
+	       postgres? ( dev-db/postgresql )
 	       mysql? ( dev-db/mysql )
 	     )"
 DEPEND="${RDEPEND}
@@ -23,14 +24,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	sys-devel/autoconf"
 
-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"
-}
+CONFIG_CHECK="UNIX98_PTYS"
 
 src_compile() {
 	append-ldflags "-Wl,-z,now" #avoid QA notices
@@ -38,13 +32,14 @@ src_compile() {
 	autoconf && econf \
 		$(use_enable nls) \
 		$(use_with X x) \
+		--disable-debug \
+		--disable-xdebug \
+		--disable-rlpdebug \
 	    --enable-security \
+		--disable-unix98test \
 		|| die "configure failed"
 
-	emake -j1 || die "make failed"
-
-	if use sms
-	then
+	if use sms ; then
 		cd ${S}/smsd
 
 		if use postgres; then
@@ -55,6 +50,8 @@ src_compile() {
 			emake libfile.la || die "smsd make failed"
 		fi
 	fi
+
+	emake -j1 || die "make failed"
 }
 
 src_install() {
@@ -62,6 +59,7 @@ src_install() {
 
 	insinto /etc
 	doins Docs/sample/gnokiirc
+	sed -i -e 's:/usr/local:/usr:' ${D}/etc/gnokiirc
 
 	doman Docs/man/*
 	dodir /usr/share/doc/${PF}
diff --git a/app-mobilephone/gnokii/gnokii-0.6.3.ebuild b/app-mobilephone/gnokii/gnokii-0.6.3.ebuild
deleted file mode 100644
index 4805e96eef27..000000000000
--- a/app-mobilephone/gnokii/gnokii-0.6.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.3.ebuild,v 1.2 2005/09/01 17:01:52 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="user space driver and tools for use with mobile phones"
-HOMEPAGE="http://www.gnokii.org/"
-SRC_URI="http://www.gnokii.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls X bluetooth irda sms postgres mysql"
-
-RDEPEND="X? ( =x11-libs/gtk+-1.2* )
-	bluetooth? ( net-wireless/bluez-libs )
-	sms? ( postgres? ( dev-db/postgresql )
-	mysql? ( dev-db/mysql ) )"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-bindir.patch
-	epatch ${FILESDIR}/${PN}-0.6.3-nounix98pty.patch
-}
-
-src_compile() {
-	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"
-
-	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/*
-
-	insinto /etc
-	doins ${S}/Docs/sample/gnokiirc
-
-	# only one file needs suid root to make a psuedo device
-	fperms 4755 ${D}/usr/sbin/mgnokiidev
-
-	if use sms
-	then
-		cd ${S}/smsd
-
-		einstall || die "smsd make install failed"
-	fi
-
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/${PN}.png
-
-	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"
-}
diff --git a/app-mobilephone/gnokii/gnokii-0.6.4.ebuild b/app-mobilephone/gnokii/gnokii-0.6.4.ebuild
deleted file mode 100644
index 03882fe207b8..000000000000
--- a/app-mobilephone/gnokii/gnokii-0.6.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.4.ebuild,v 1.3 2005/09/01 17:01:52 mrness Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="user space driver and tools for use with mobile phones"
-HOMEPAGE="http://www.gnokii.org/"
-SRC_URI="http://www.gnokii.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
-IUSE="nls X bluetooth irda sms postgres mysql"
-
-RDEPEND="X? ( =x11-libs/gtk+-1.2* )
-	bluetooth? ( net-wireless/bluez-libs )
-	sms? ( postgres? ( dev-db/postgresql )
-	mysql? ( dev-db/mysql ) )"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	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"
-}
diff --git a/app-mobilephone/gnokii/gnokii-0.6.8.ebuild b/app-mobilephone/gnokii/gnokii-0.6.8.ebuild
index 297fc9bdf78f..a93f374c7dc6 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.8.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.8.ebuild,v 1.1 2005/09/01 17:01:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.8.ebuild,v 1.2 2005/11/15 05:43:22 mrness Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="nls X bluetooth irda sms postgres mysql"
 
 RDEPEND="X? ( =x11-libs/gtk+-1.2* )