Version bump (#254391).

Package-Manager: portage-2.1.4.5

5 files changed, 164 insertions, 70 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index d5068aa1a7a0..72235ad19ccc 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gammu
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.59 2008/11/08 13:16:28 nixnut Exp $
+# 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 $
+
+*gammu-1.22.1 (17 Jan 2009)
+
+  17 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  +files/gammu-1.22.1-debug-test.patch, -gammu-1.17.0.ebuild,
+  -gammu-1.18.0.ebuild, +gammu-1.22.1.ebuild:
+  Version bump (#254391).
 
   08 Nov 2008; nixnut <nixnut@gentoo.org> gammu-1.20.0-r1.ebuild:
   Stable on ppc wrt bug 231597
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f2f40b2fe5eb..04f08cebc28b 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,10 +1,19 @@
-DIST gammu-1.17.0.tar.bz2 1027284 RMD160 f5d7758a2be0281410a475566b40a33a14b7982c SHA1 44c2dd5299ad1eee79e065c9a34f71424060b21d SHA256 1bb7e12f80b7133c8b45965c4886abb1a7d3e87c74ccaf16b828605ad376f2b8
-DIST gammu-1.18.0.tar.bz2 1054802 RMD160 8251f2f64925fb5bae8e3af1328dc08aa534a74a SHA1 2f24590239ef0c0c0e7e84dccefe81698cee289d SHA256 d5b9308b51e2d5dd1d8feb07d325d3c394c89f43ca0c5f4a379f284cd48296e9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gammu-1.22.1-debug-test.patch 4024 RMD160 c146e520d2011bb36e4fa30711374479e04ff320 SHA1 d9dc9d4ca296c00e2ed878d2da9a8efe1b06c70e SHA256 0a186b2536eb95ecfabbbde176c26c4a2ea39957228c274c7e8af52a0a36953c
 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
-EBUILD gammu-1.17.0.ebuild 1603 RMD160 cdd3cd53d12efd6e8e7678c153030e726b2c82d7 SHA1 36abdbd2dfc3bdcdc2efb26958dd43107fc59d77 SHA256 08b17613d2668eebdcf50e5e4730aa10203f00b18f352d4e6dedf7894cacff85
-EBUILD gammu-1.18.0.ebuild 1606 RMD160 fa05d3d56d4e08374fac5c28e9e1000aeab5f533 SHA1 3a4f17b666c54c9f0f14faefb141e97688525962 SHA256 b3e8e47d93020b103c7ad80f413fabf47028c9f078873a89e2ead0c0ad6e3201
+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
-MISC ChangeLog 12453 RMD160 66e572fc1460c667840fab48eb056d77ea45e614 SHA1 4066d2767fa21bef8f6339fdd35e90cee49757f2 SHA256 1a0a02fc7b58a624adb152f9fc87be17f963e731c3e6e77da42f1041bc6ece5f
+EBUILD gammu-1.22.1.ebuild 1952 RMD160 291d26bab23ef50c8fd76e83674a1203a61078fd SHA1 3a334daa63f5343f8934e98ca9c6ff972985d0e8 SHA256 1ff9d85f42cc3d1639ea3fc3518f809598190f78dcc86611801acffca1bf377c
+MISC ChangeLog 12665 RMD160 631bf8538aec6b1876ffa319b0bd97a2aa79b7b4 SHA1 2a254a6a2049351db6fbf4c426d303e67875af6b SHA256 55b53f4dd3045a1eb5af19d085c733d4ec2bcb8fe80de562ba49d9e0fa4be412
 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
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..850823721f33
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.22.1-debug-test.patch
@@ -0,0 +1,121 @@
+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/gammu-1.17.0.ebuild b/app-mobilephone/gammu/gammu-1.17.0.ebuild
deleted file mode 100644
index f6c3e6d4e760..000000000000
--- a/app-mobilephone/gammu/gammu-1.17.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.17.0.ebuild,v 1.5 2008/05/21 15:51:48 dev-zero 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-libs )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )
-	dev-util/dialog"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/cmake"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs de es it pl ru"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_unpack() {
-	unpack ${A}
-
-	# sys-devel/gettext is needed for creating .mo files
-	cd "${S}/locale"
-	local lang
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i -e "/^[[:space:]]*${lang}[[:space:]]*$/d" CMakeLists.txt
-		fi
-	done
-}
-
-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) \
-		-DENABLE_SHARED=ON"
-	cmake-utils_src_compile
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
-}
diff --git a/app-mobilephone/gammu/gammu-1.18.0.ebuild b/app-mobilephone/gammu/gammu-1.22.1.ebuild
index 490f0fc11cec..f80905fe2064 100644
--- a/app-mobilephone/gammu/gammu-1.18.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.22.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.18.0.ebuild,v 1.2 2008/05/21 15:51:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.22.1.ebuild,v 1.1 2009/01/17 11:49:24 mrness Exp $
 
 inherit cmake-utils
 
@@ -22,22 +22,34 @@ DEPEND="${RDEPEND}
 	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 it pl ru"
+MY_AVAILABLE_LINGUAS=" cs de es id it pl ru"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 src_unpack() {
 	unpack ${A}
 
-	# sys-devel/gettext is needed for creating .mo files
-	cd "${S}/locale"
-	local lang
+	epatch "${FILESDIR}"/${P}-debug-test.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
-			sed -i -e "/^[[:space:]]*${lang}[[:space:]]*$/d" CMakeLists.txt
+		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() {