Fix errors when test phase is executed by root.

Package-Manager: portage-2.1.4.5

6 files changed, 305 insertions, 130 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 72235ad19ccc..494aa04d3538 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.60 2009/01/17 11:49:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.61 2009/01/17 12:38:14 mrness Exp $
+
+  17 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  +files/gammu-1.22.1-assert.patch, -files/gammu-1.22.1-debug-test.patch,
+  +files/gammu-1.22.1-skip-locktest.patch, gammu-1.22.1.ebuild:
+  Fix errors when test phase is executed by root.
 
 *gammu-1.22.1 (17 Jan 2009)
 
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 04f08cebc28b..ee2b9a389323 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gammu-1.22.1-debug-test.patch 4024 RMD160 c146e520d2011bb36e4fa30711374479e04ff320 SHA1 d9dc9d4ca296c00e2ed878d2da9a8efe1b06c70e SHA256 0a186b2536eb95ecfabbbde176c26c4a2ea39957228c274c7e8af52a0a36953c
+AUX gammu-1.22.1-assert.patch 8780 RMD160 39de83bf457ff06c3628c36f0053e7432792e8fb SHA1 090a5bbe8f1c19eac9867dccf7894436093be340 SHA256 ffd531c3fc6236716ab35f74f4e23c7f472eb8aa936e71e614efdea20f0e67b4
+AUX gammu-1.22.1-skip-locktest.patch 584 RMD160 65e7f6ac7851d57c3096842841cf493f5c404f81 SHA1 5332aca814ba23b6da27be18f8a65192712085e0 SHA256 ff69362a3da7a7010bd0383f88c511db6786755a62ec430eb8ef676655a59f51
 DIST gammu-1.20.0.tar.bz2 1070774 RMD160 9afecf9fa4600c96b3992105f861158b7e57b0b0 SHA1 08bbe0c3ec9f75e9d761e04ef549fdfc6d723606 SHA256 7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
 DIST gammu-1.21.0.tar.bz2 1116272 RMD160 4443405d8e25082ac058bde472152893bf15a2a6 SHA1 68378390abac737cafef18bb64c7187ba150846d SHA256 20efdc4bd3a7a1fd37c2f26e152dbeb6c769fca101f5b87b227248bf1ae2e39e
 DIST gammu-1.22.1.tar.bz2 1151897 RMD160 f5e8fdbd5281004af1ff49e9f11da13f2fc81531 SHA1 be48205d1c7c9957b6b3a4db11f08fcc14e2c651 SHA256 1dfbbd9b71dc333b1b674d4a881d5610e88b46755a8b5d677795f436031add6b
 EBUILD gammu-1.20.0-r1.ebuild 1904 RMD160 ca79a312872f9d5fef8eca286ecd14f0d3425480 SHA1 0f0f250f3e4803e62806670d74f8435ccf0f7653 SHA256 e095432d39b4159cb407e0eac399c4cf8ab0ed88134c7921a14a8198cf4936dd
 EBUILD gammu-1.21.0.ebuild 1907 RMD160 f5b7d5da292a59a290c6b6966f7f30d6af4d41af SHA1 1d8b25c35df13aadcf7d4e5bc63b4dfc7e7d6d88 SHA256 8e9d17f8ad94970cd8e6a694c494811c0ba60e7be098fecf928e9fb4c0abdae0
-EBUILD gammu-1.22.1.ebuild 1952 RMD160 291d26bab23ef50c8fd76e83674a1203a61078fd SHA1 3a334daa63f5343f8934e98ca9c6ff972985d0e8 SHA256 1ff9d85f42cc3d1639ea3fc3518f809598190f78dcc86611801acffca1bf377c
-MISC ChangeLog 12665 RMD160 631bf8538aec6b1876ffa319b0bd97a2aa79b7b4 SHA1 2a254a6a2049351db6fbf4c426d303e67875af6b SHA256 55b53f4dd3045a1eb5af19d085c733d4ec2bcb8fe80de562ba49d9e0fa4be412
+EBUILD gammu-1.22.1.ebuild 1995 RMD160 57895885280cbb34aadf07d026464f550fa66e3f SHA1 b26c4a382981efc98a98ff1e3484eb98f9ad71e6 SHA256 78a14cb1d3c2976bfdde205c74d630946550b76c2e0cd78d5deaef35ce7c10d8
+MISC ChangeLog 12902 RMD160 2fbd130deddeee55302ba597037cd50d26ec975e SHA1 628315ca8e55bab34b387b2ea1f325dd8bb07c4e SHA256 903cab599e146a5a6e2e4923044b044e8a77123f865ecb6eaef2421db875c464
 MISC metadata.xml 229 RMD160 0c295ced7fda3c265c0313a695aff8c722bbf9dd SHA1 a6fe5468dbafc4e4d8b1498d6c819bbeafdcd091 SHA256 fed1e1bfcb2cbd13a20c2c0d49bed3546ae0d48e958ce0473684c4e2c9b6098f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklxxdIACgkQts85UDFmaOVTxwCggpSsqwmYarcp/H5zf07FClXT
-1BMAn2WoM0qdOcLzer+NUXTBYnRL6u5v
-=vn2a
+iEYEARECAAYFAklx0UUACgkQts85UDFmaOU+/wCfTYFggG3sWqZoWTWnVTLdfut0
+6nUAnj/6HAk3aAowbjyBUX6XRYGTr0Ka
+=LKPK
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch b/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch
new file mode 100644
index 000000000000..ceb6626428bd
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch
@@ -0,0 +1,277 @@
+diff -Nru gammu-1.22.1.orig/tests/at-parser.c gammu-1.22.1/tests/at-parser.c
+--- gammu-1.22.1.orig/tests/at-parser.c	2008-12-10 09:07:19.000000000 +0000
++++ gammu-1.22.1/tests/at-parser.c	2009-01-17 11:58:44.000000000 +0000
+@@ -4,12 +4,19 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <assert.h>
+ #include "../common/phone/at/atgen.h"
+ #include "../common/protocol/protocol.h" /* Needed for GSM_Protocol_Message */
+ #include "../common/gsmstate.h" /* Needed for state machine internals */
+ #include "../common/gsmphones.h" /* Phone data */
+ 
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
++
+ #define BUFFER_SIZE ((size_t)16384)
+ 
+ int main(int argc UNUSED, char **argv UNUSED)
+diff -Nru gammu-1.22.1.orig/tests/cal-read.c gammu-1.22.1/tests/cal-read.c
+--- gammu-1.22.1.orig/tests/cal-read.c	2008-12-10 09:07:19.000000000 +0000
++++ gammu-1.22.1/tests/cal-read.c	2009-01-17 11:58:56.000000000 +0000
+@@ -11,7 +11,14 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <assert.h>
++
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
+ 
+ int main(int argc, char **argv)
+ {
+diff -Nru gammu-1.22.1.orig/tests/debug.c gammu-1.22.1/tests/debug.c
+--- gammu-1.22.1.orig/tests/debug.c	2009-01-17 11:59:46.000000000 +0000
++++ gammu-1.22.1/tests/debug.c	2009-01-17 11:54:34.000000000 +0000
+@@ -1,17 +1,24 @@
+ #include <gammu.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <assert.h>
+ 
+ GSM_StateMachine *s;
+ 
+ #ifdef WIN32
+ # define NUL "NUL"
++char debug_filename[] = ".\\gammu-debug-test.log";
+ #else
+ # define NUL "/dev/null"
++char debug_filename[] = "./gammu-debug-test.log";
+ #endif
+ 
+-char debug_filename[] = "gammu-debug-test-XXXXXX";
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
+ 
+ NORETURN void fail(int errcode)
+ {
+@@ -57,9 +64,6 @@
+ int main(int argc UNUSED, char **argv UNUSED)
+ {
+ 	FILE *debug_file;
+-#ifndef WIN32
+-	int debug_fd;
+-#endif
+ 	GSM_Debug_Info *di_sm, *di_global;
+ 
+ 	/* Allocates state machine */
+@@ -69,16 +73,6 @@
+ 		fail(1);
+ 	}
+ 
+-#ifndef WIN32
+-	/* Create file for logs */
+-	debug_fd = mkstemp(debug_filename);
+-	if (debug_fd == -1) {
+-		printf("Could not create temporary file!\n");
+-		fail(2);
+-	}
+-	close(debug_fd);
+-#endif
+-
+ 	/* Get debug handles */
+ 	di_sm = GSM_GetDebug(s);
+ 	di_global = GSM_GetGlobalDebug();
+@@ -95,6 +89,7 @@
+ 	 * Test 2 - global /dev/null, local tempfile, do not use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
+@@ -107,6 +102,7 @@
+ 	 * Test 3 - global /dev/null, local tempfile, use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
+@@ -119,6 +115,7 @@
+ 	 * Test 4 - global tempfile, local /dev/null, use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
+@@ -131,6 +128,7 @@
+ 	 * Test 5 - global tempfile, local /dev/null, do not use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
+@@ -142,6 +140,7 @@
+ 	 * Test 6 - global /dev/null, local tempfile, do not use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
+@@ -155,6 +154,7 @@
+ 	 * Test 7 - global /dev/null, local tempfile, use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
+@@ -168,6 +168,7 @@
+ 	 * Test 8 - global tempfile, local /dev/null, use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
+@@ -181,6 +182,7 @@
+ 	 * Test 9 - global tempfile, local /dev/null, do not use global
+ 	 */
+ 	debug_file = fopen(debug_filename, "w+");
++	assert(debug_file != NULL);
+ 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
+ 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
+ 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
+diff -Nru gammu-1.22.1.orig/tests/get-smsc-at.c gammu-1.22.1/tests/get-smsc-at.c
+--- gammu-1.22.1.orig/tests/get-smsc-at.c	2008-12-10 09:07:19.000000000 +0000
++++ gammu-1.22.1/tests/get-smsc-at.c	2009-01-17 11:59:08.000000000 +0000
+@@ -4,13 +4,20 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <assert.h>
+ #include "../common/protocol/protocol.h" /* Needed for GSM_Protocol_Message */
+ #include "../common/gsmstate.h" /* Needed for state machine internals */
+ #include "../common/gsmphones.h" /* Phone data */
+ 
+ #define BUFFER_SIZE 16384
+ 
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
++
+ extern GSM_Error ATGEN_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *s);
+ 
+ int main(int argc, char **argv)
+diff -Nru gammu-1.22.1.orig/tests/locking.c gammu-1.22.1/tests/locking.c
+--- gammu-1.22.1.orig/tests/locking.c	2008-11-13 08:50:32.000000000 +0000
++++ gammu-1.22.1/tests/locking.c	2009-01-17 11:58:09.000000000 +0000
+@@ -1,7 +1,14 @@
+ #include <gammu.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <assert.h>
++
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
+ 
+ 
+ extern GSM_Error 	lock_device	(const char* port, char **lock_device);
+diff -Nru gammu-1.22.1.orig/tests/sms-nokia-05.c gammu-1.22.1/tests/sms-nokia-05.c
+--- gammu-1.22.1.orig/tests/sms-nokia-05.c	2008-11-13 08:50:32.000000000 +0000
++++ gammu-1.22.1/tests/sms-nokia-05.c	2009-01-17 11:57:51.000000000 +0000
+@@ -3,12 +3,19 @@
+ #include <gammu.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <assert.h>
+ #include "../common/protocol/protocol.h" /* Needed for GSM_Protocol_Message */
+ #include "../common/gsmstate.h" /* Needed for state machine internals */
+ 
+ #include "sms-printing.h"
+ 
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
++
+ unsigned char data[] = {
+ 	0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9F, 0x00, 0x00, 0x02, 0x51, 0x00, 0x00, 0x00, 0x00,
+ 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+diff -Nru gammu-1.22.1.orig/tests/statemachine-init.c gammu-1.22.1/tests/statemachine-init.c
+--- gammu-1.22.1.orig/tests/statemachine-init.c	2008-11-13 08:50:32.000000000 +0000
++++ gammu-1.22.1/tests/statemachine-init.c	2009-01-17 11:58:22.000000000 +0000
+@@ -1,7 +1,6 @@
+ #include <gammu.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <assert.h>
+ 
+ #ifdef WIN32
+ # define NUL "NUL"
+@@ -9,6 +8,14 @@
+ # define NUL "/dev/null"
+ #endif
+ 
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
++
+ GSM_StateMachine *s;
+ 
+ void single_check(const char *device, const char *connection, const char *model, GSM_Error expected)
+diff -Nru gammu-1.22.1.orig/tests/vcard-read.c gammu-1.22.1/tests/vcard-read.c
+--- gammu-1.22.1.orig/tests/vcard-read.c	2008-12-12 09:34:12.000000000 +0000
++++ gammu-1.22.1/tests/vcard-read.c	2009-01-17 11:59:21.000000000 +0000
+@@ -11,7 +11,14 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <assert.h>
++
++#define assert(val) \
++{ \
++	if (!(val)) {\
++        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
++        exit(2); \
++    } \
++}
+ 
+ int main(int argc, char **argv)
+ {
diff --git a/app-mobilephone/gammu/files/gammu-1.22.1-debug-test.patch b/app-mobilephone/gammu/files/gammu-1.22.1-debug-test.patch
deleted file mode 100644
index 850823721f33..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.22.1-debug-test.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Nru gammu-1.22.1.orig/tests/debug.c gammu-1.22.1/tests/debug.c
---- gammu-1.22.1.orig/tests/debug.c	2008-11-13 08:50:32.000000000 +0000
-+++ gammu-1.22.1/tests/debug.c	2009-01-17 11:43:26.000000000 +0000
-@@ -1,17 +1,24 @@
- #include <gammu.h>
- #include <stdlib.h>
- #include <stdio.h>
--#include <assert.h>
- 
- GSM_StateMachine *s;
- 
- #ifdef WIN32
- # define NUL "NUL"
-+char debug_filename[] = ".\\gammu-debug-test.log";
- #else
- # define NUL "/dev/null"
-+char debug_filename[] = "./gammu-debug-test.log";
- #endif
- 
--char debug_filename[] = "gammu-debug-test-XXXXXX";
-+#define assert(val) \
-+{ \
-+	if (!(val)) {\
-+        fprintf(stderr, "Test \"%s\" failed!\n", ""#val); \
-+        exit(2); \
-+    } \
-+}
- 
- NORETURN void fail(int errcode)
- {
-@@ -57,9 +64,6 @@
- int main(int argc UNUSED, char **argv UNUSED)
- {
- 	FILE *debug_file;
--#ifndef WIN32
--	int debug_fd;
--#endif
- 	GSM_Debug_Info *di_sm, *di_global;
- 
- 	/* Allocates state machine */
-@@ -69,16 +73,6 @@
- 		fail(1);
- 	}
- 
--#ifndef WIN32
--	/* Create file for logs */
--	debug_fd = mkstemp(debug_filename);
--	if (debug_fd == -1) {
--		printf("Could not create temporary file!\n");
--		fail(2);
--	}
--	close(debug_fd);
--#endif
--
- 	/* Get debug handles */
- 	di_sm = GSM_GetDebug(s);
- 	di_global = GSM_GetGlobalDebug();
-@@ -95,6 +89,7 @@
- 	 * Test 2 - global /dev/null, local tempfile, do not use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
-@@ -107,6 +102,7 @@
- 	 * Test 3 - global /dev/null, local tempfile, use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
-@@ -119,6 +115,7 @@
- 	 * Test 4 - global tempfile, local /dev/null, use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
-@@ -131,6 +128,7 @@
- 	 * Test 5 - global tempfile, local /dev/null, do not use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
-@@ -142,6 +140,7 @@
- 	 * Test 6 - global /dev/null, local tempfile, do not use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
-@@ -155,6 +154,7 @@
- 	 * Test 7 - global /dev/null, local tempfile, use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_global) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_sm) == ERR_NONE);
-@@ -168,6 +168,7 @@
- 	 * Test 8 - global tempfile, local /dev/null, use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(false, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
-@@ -181,6 +182,7 @@
- 	 * Test 9 - global tempfile, local /dev/null, do not use global
- 	 */
- 	debug_file = fopen(debug_filename, "w+");
-+	assert(debug_file != NULL);
- 	assert(GSM_SetDebugGlobal(true, di_sm) == true);
- 	assert(GSM_SetDebugFile(NUL, di_sm) == ERR_NONE);
- 	assert(GSM_SetDebugFileDescriptor(debug_file, true, di_global) == ERR_NONE);
diff --git a/app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch b/app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch
new file mode 100644
index 000000000000..157dd17c4d75
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch
@@ -0,0 +1,12 @@
+diff -Nru gammu-1.22.1.orig/tests/CMakeLists.txt gammu-1.22.1/tests/CMakeLists.txt
+--- gammu-1.22.1.orig/tests/CMakeLists.txt	2008-12-10 09:05:02.000000000 +0000
++++ gammu-1.22.1/tests/CMakeLists.txt	2009-01-17 12:26:47.000000000 +0000
+@@ -424,7 +424,7 @@
+ 
+ # Test for locking, only on !WIN32 and if we can write to lock dir
+ if (NOT WIN32)
+-    execute_process(COMMAND test -w /var/lock/ RESULT_VARIABLE VAR_LOCK_WRITABLE)
++    set (VAR_LOCK_WRITABLE 1)
+     if (VAR_LOCK_WRITABLE EQUAL 0)
+         add_executable(locking locking.c)
+         target_link_libraries(locking libGammu)
diff --git a/app-mobilephone/gammu/gammu-1.22.1.ebuild b/app-mobilephone/gammu/gammu-1.22.1.ebuild
index f80905fe2064..1ebc51a82a4c 100644
--- a/app-mobilephone/gammu/gammu-1.22.1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.22.1.ebuild,v 1.1 2009/01/17 11:49:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.22.1.ebuild,v 1.2 2009/01/17 12:38:14 mrness Exp $
 
 inherit cmake-utils
 
@@ -31,7 +31,8 @@ IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-debug-test.patch
+	epatch "${FILESDIR}"/${P}-assert.patch
+	epatch "${FILESDIR}"/${P}-skip-locktest.patch
 
 	pushd "${S}"/locale || die "locale directory not found"
 	local lang support_linguas=no