diff options
| -rw-r--r-- | app-mobilephone/gammu/Manifest | 4 | ||||
| -rw-r--r-- | app-mobilephone/gammu/files/gammu-1.22.1-assert.patch | 277 | ||||
| -rw-r--r-- | app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch | 12 | ||||
| -rw-r--r-- | app-mobilephone/gammu/gammu-1.22.1-r2.ebuild | 73 |
4 files changed, 0 insertions, 366 deletions
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest index 2d8007c2db89..14a7ace6a60f 100644 --- a/app-mobilephone/gammu/Manifest +++ b/app-mobilephone/gammu/Manifest @@ -1,11 +1,7 @@ -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 AUX gammu-1.25.0-skip-locktest.patch 584 RMD160 b18e3187cba72b475c7d53ad96d5852d44641c79 SHA1 feb3a9ac71a4a10ee77f527c9f07c2b58a285139 SHA256 f8c754ba2111cbe8c97a8a53b815d4f4952e6e699df60422889bd3e06a3e3f66 AUX gammu-skip-locktest.patch 522 RMD160 f1b8e663e208a5f683917eb8c6db7e11b3f529ac SHA1 ede02cabb8160e9fa5fd4c70078b273b41e129fd SHA256 fe374362358f1120b1f59a4416c0ee048ba9edaabec02ea7871e812e5404db66 -DIST gammu-1.22.1.tar.bz2 1151897 RMD160 f5e8fdbd5281004af1ff49e9f11da13f2fc81531 SHA1 be48205d1c7c9957b6b3a4db11f08fcc14e2c651 SHA256 1dfbbd9b71dc333b1b674d4a881d5610e88b46755a8b5d677795f436031add6b DIST gammu-1.25.0.tar.bz2 1838498 RMD160 034c2a202b3a425025f13a882dfbae428d91b631 SHA1 379f62217f8f26df2119c9b3204bfc126e3d2161 SHA256 be2c9600d781eb07e1e34975d59d09d8f8701cdb54f3d50a74707f4cdd2d63f5 DIST gammu-1.26.1.tar.bz2 2113622 RMD160 a913ac6c999f81ab4fda7c1656232484033ac540 SHA1 122886f29c566f72020e91da119e1e04f7bfbec6 SHA256 668eb037af6aa81cc104067dcb8e1cf44000b82a58638cfd485297eec76fda8d -EBUILD gammu-1.22.1-r2.ebuild 2181 RMD160 f4a14319407c4350bcd265488a53190cba04e3f2 SHA1 e7b929fb9260c25dddcdfc18c2528d3ce88445d9 SHA256 160337e948c1c189add16bd9bd7c86c753678af91d34f1a637e8d2b0e508c9d8 EBUILD gammu-1.25.0-r1.ebuild 2524 RMD160 264d80a794c27fdfa8c3c1024db887ce67f32fdb SHA1 96ca5b58ef548b91de148f3110c70e070606a96b SHA256 58d013ec9a9ae067203adcd952b5c80c238fb5b8841fc08b3101c91b72b558e9 EBUILD gammu-1.26.1-r1.ebuild 2599 RMD160 e9c8854f34debf836aeefb30a7210f0a81245f6a SHA1 046ff37756a421cd30e4d36643e053367c994e3b SHA256 c204dc1f15234c7a0d2a7219da2dc30f1f05889bc66c4295a249c05c1a109e2e MISC ChangeLog 15446 RMD160 9cb7551d255f2f5ad010757009ba1755f32eb64b SHA1 e942d179c200fec33a93187612424fe4aef7af0d SHA256 0dc2177a9b94f60932388b539f7bcc556ad15070b369182077b8db08ffcc988c diff --git a/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch b/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch deleted file mode 100644 index ceb6626428bd..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.22.1-assert.patch +++ /dev/null @@ -1,277 +0,0 @@ -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-skip-locktest.patch b/app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch deleted file mode 100644 index 157dd17c4d75..000000000000 --- a/app-mobilephone/gammu/files/gammu-1.22.1-skip-locktest.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-r2.ebuild b/app-mobilephone/gammu/gammu-1.22.1-r2.ebuild deleted file mode 100644 index 96b5b939d24e..000000000000 --- a/app-mobilephone/gammu/gammu-1.22.1-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# 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-r2.ebuild,v 1.3 2009/03/08 16:16:21 maekke Exp $ - -inherit cmake-utils - -DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone" -HOMEPAGE="http://www.gammu.org" -SRC_URI="ftp://dl.cihar.com/gammu/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug bluetooth irda mysql postgres nls" - -RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) ) - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-server ) - dev-util/dialog" -DEPEND="${RDEPEND} - irda? ( virtual/os-headers ) - nls? ( sys-devel/gettext ) - dev-util/cmake" - -# sys-devel/gettext is needed for creating .mo files -# Supported languages and translated documentation -# Be sure all languages are prefixed with a single space! -MY_AVAILABLE_LINGUAS=" cs de es id it pl ru" -IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" - -src_unpack() { - unpack ${A} - - epatch "${FILESDIR}"/${P}-assert.patch - epatch "${FILESDIR}"/${P}-skip-locktest.patch - - pushd "${S}"/locale || die "locale directory not found" - local lang support_linguas=no - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if use linguas_${lang} ; then - support_linguas=yes - break - fi - done - # install all languages when all selected LINGUAS aren't supported - if [ "${support_linguas}" = "yes" ]; then - for lang in ${MY_AVAILABLE_LINGUAS} ; do - if ! use linguas_${lang} ; then - sed -i -e "/^[[:space:]]*${lang}[[:space:]]*$/d" CMakeLists.txt - fi - done - fi - popd -} - -src_compile() { - # debug flag is used inside cmake-utils.eclass - local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \ - $(cmake-utils_use_with irda IrDA) \ - $(cmake-utils_use_with mysql MySQL) \ - $(cmake-utils_use_with postgres Postgres) \ - -DBUILD_SHARED_LIBS=ON" - cmake-utils_src_compile -} - -src_test() { - LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test -} - -pkg_preinst() { - # use standard -l options - sed -i -e 's:-l[a-z0-9A-Z_/-]*/lib\([a-z]*\)\.so:-l\1:g' "${D}"/usr/*/pkgconfig/gammu.pc || die "sed failed" -} |