Drop ppc64 keyword (#234787). Fix bug in status report reading (#278715).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 42 insertions, 23 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index 2597c2829e99..048fba5b0313 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.95 2009/08/15 09:08:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.96 2009/08/15 09:39:23 mrness Exp $
+
+*gnokii-0.6.27-r3 (15 Aug 2009)
+
+  15 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  -files/gnokii-0.6.26-qa-fixes.patch, +files/gnokii-0.6.27-TP-PI.patch,
+  -gnokii-0.6.26-r2.ebuild, +gnokii-0.6.27-r3.ebuild:
+  Drop ppc64 keyword (#234787). Fix bug in status report reading (#278715).
 
   15 Aug 2009; Alin Năstac <mrness@gentoo.org>
   -files/gnokii-0.6.22-locale.patch, -files/gnokii-0.6.22-xmandir.patch,
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.26-qa-fixes.patch b/app-mobilephone/gnokii/files/gnokii-0.6.26-qa-fixes.patch
deleted file mode 100644
index c29378023365..000000000000
--- a/app-mobilephone/gnokii/files/gnokii-0.6.26-qa-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru gnokii-0.6.26.orig/include/phones/atsag.h gnokii-0.6.26/include/phones/atsag.h
---- gnokii-0.6.26.orig/include/phones/atsag.h	2008-05-30 19:06:03.000000000 +0000
-+++ gnokii-0.6.26/include/phones/atsag.h	2008-07-12 15:43:54.000000000 +0000
-@@ -34,6 +34,6 @@
- 
- #include "gnokii.h"
- 
--void at_sag_init(char* foundmodel, char* setupmodel, struct gn_statemachine *state);
-+void at_sagem_init(char* foundmodel, char* setupmodel, struct gn_statemachine *state);
- 
- #endif
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.27-TP-PI.patch b/app-mobilephone/gnokii/files/gnokii-0.6.27-TP-PI.patch
new file mode 100644
index 000000000000..f47eb6adf804
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.27-TP-PI.patch
@@ -0,0 +1,16 @@
+diff --git a/common/gsm-sms.c b/common/gsm-sms.c
+index 2163757..f93170d 100644
+--- a/common/gsm-sms.c
++++ b/common/gsm-sms.c
+@@ -923,8 +923,8 @@ gn_error gn_sms_pdu2raw(gn_sms_raw *rawsms, unsigned char *pdu, int pdu_len, int
+ 		/* TP-ST   TP-Status */
+ 		rawsms->report              = pdu[offset++];
+ 		/* TP-PI   TP-Parameter-Indicator */
+-		dprintf("TP-Parameter-Indicator: 0x%02x\n", pdu[offset++]);
+-		parameter_indicator         = pdu[offset];
++		dprintf("TP-Parameter-Indicator: 0x%02x\n", pdu[offset]);
++		parameter_indicator         = pdu[offset++];
+ 		/* handle the "extension bit" skipping the following octects, if any (see 9.2.3.27 TP-Parameter-Indicator) */
+ 		while (pdu[offset++] & 0x80)
+ 			;
+
diff --git a/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.27-r3.ebuild
index 7bb0498a5a13..833b7370250d 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.27-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.26-r2.ebuild,v 1.7 2009/08/15 09:08:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r3.ebuild,v 1.1 2009/08/15 09:39:23 mrness Exp $
 
-inherit eutils linux-info
+inherit eutils linux-info autotools
 
 DESCRIPTION="user space driver and tools for use with mobile phones"
 HOMEPAGE="http://www.gnokii.org/"
@@ -10,24 +10,24 @@ SRC_URI="http://www.gnokii.org/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls bluetooth ical irda sms postgres mysql usb X debug"
 
 RDEPEND="!app-mobilephone/smstools
 	sys-apps/pcsc-lite
-	X? ( >=x11-libs/gtk+-2.8.19 )
-	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
+	X? ( >=x11-libs/gtk+-2 )
+	bluetooth? ( || ( net-wireless/bluez >=net-wireless/bluez-libs-2.25 ) )
 	sms? (
 		!app-mobilephone/smstools
-		>=dev-libs/glib-2.10.3
-		postgres? ( >=virtual/postgresql-server-8.0 )
+		>=dev-libs/glib-2
+		postgres? ( >=virtual/postgresql-base-8.0 )
 		mysql? ( >=virtual/mysql-4.1 )
 	)
-	ical? ( >=dev-libs/libical-0.26.6 )
+	ical? ( dev-libs/libical )
 	usb? ( =virtual/libusb-0* )"
 DEPEND="${RDEPEND}
 	irda? ( virtual/os-headers )
-	nls? ( >=sys-devel/gettext-0.14.5 )"
+	nls? ( sys-devel/gettext )"
 
 CONFIG_CHECK="UNIX98_PTYS"
 
@@ -39,7 +39,12 @@ IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-qa-fixes.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-icon.patch
+	epatch "${FILESDIR}"/${P}-disable-database.patch
+	epatch "${FILESDIR}"/${P}-TP-PI.patch
+
+	eautoreconf
 }
 
 src_compile() {
@@ -55,7 +60,9 @@ src_compile() {
 		$(use_enable irda) \
 		$(use_enable bluetooth) \
 		$(use_with X x) \
-		$(use_with sms smsd) \
+		$(use_enable sms smsd) \
+		$(use_enable mysql) \
+		$(use_enable postgres) \
 		$(use_enable debug fulldebug) \
 		${config_xdebug} \
 		$(use_enable debug rlpdebug) \