Remove obsolete versions. Version bump (#222503).

Package-Manager: portage-2.1.4.4

9 files changed, 30 insertions, 449 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 6f0993129012..be6734a55ff7 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,15 @@
 # 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.53 2008/05/21 15:51:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.54 2008/06/07 09:42:54 mrness Exp $
+
+*gammu-1.20.0 (07 Jun 2008)
+
+  07 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  -files/gammu-1.11.0-fixups.patch, -files/gammu-1.12.0-fixups.patch,
+  -files/gammu-1.13.0-fixups.patch, -gammu-1.11.0.ebuild,
+  -gammu-1.12.0.ebuild, -gammu-1.13.0.ebuild, -gammu-1.15.0-r1.ebuild,
+  +gammu-1.20.0.ebuild:
+  Remove obsolete versions. Version bump (#222503).
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> gammu-1.11.0.ebuild,
   gammu-1.12.0.ebuild, gammu-1.13.0.ebuild, gammu-1.15.0-r1.ebuild,
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index cb5ee1a42545..60954c98b5e8 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,17 +1,18 @@
-AUX gammu-1.11.0-fixups.patch 1595 RMD160 d3171b3c55ae9ec456b8e79307ced7d49a3f2006 SHA1 eb050c7d26f2dc0d4214b2c780441e3e707ede38 SHA256 ce6cc3323b49e7172a3065b12a863f030ab53927c0e55f34435f281444e887e0
-AUX gammu-1.12.0-fixups.patch 3077 RMD160 034b194cccc3f82c41c15aefa30dbc85439d1281 SHA1 039ee2cf1560b5f105f1f80b42434e20e5f66ff4 SHA256 5213f663574309ba90af8d9f127b794717cfed668791b1a2fedb5de44b181c47
-AUX gammu-1.13.0-fixups.patch 3927 RMD160 3e1d92f54e05e8e6d0b3e4483fc207881c523f44 SHA1 31771cdcaf2b86d5d7e32edcb5ff6a2671e7b58a SHA256 850ffc6bf2437a2785dfff0aa2e43bb0512d48e31c39305b6e5328ef5c09ef03
-DIST gammu-1.11.0.tar.bz2 920489 RMD160 903624c472b9d5225783e064d3a393060a4dcc37 SHA1 8bc28d3dbea86c9076ed5712ced316017c47ccaa SHA256 5d18cbf162edb8f54c47621b8dbf0683359e74ad67a985360cfcc4c810f2a086
-DIST gammu-1.12.0.tar.bz2 940565 RMD160 a44b351777ab6c5d635401e968eb853d2508102b SHA1 0a4fb2745a90cc503e86ad0bb90a27e5e283d2ca SHA256 4ab84e05440f82bcc440030752fcf482a15d284f40de08f2240d43bc528c4fa1
-DIST gammu-1.13.0.tar.bz2 964504 RMD160 6f9ae52adf89cf5e7d16f9b0531017cd0a5f77d2 SHA1 c0d3e9e31b59241553eee39890e3d4321787760b SHA256 543cd847431d85cbbbd96c7914a2dd4d9fdcf74419dbe5693b93d8dc94ba945a
-DIST gammu-1.15.0.tar.bz2 1022842 RMD160 5e38423a56909c3c7a2aa19c8c13d4e221cfb180 SHA1 0988525449a13c36f689661c04c5da1863f6e238 SHA256 1f0987e3fd3fa2d771f5db55c5ad18205a6d561cda9f120af28c1dae6ef0ba35
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-EBUILD gammu-1.11.0.ebuild 1361 RMD160 fe81b17d1b7702c103a3d81fbba5433e480c5756 SHA1 99e357e5ea9542cb984b0883140b1a3677457d7d SHA256 15a99dd9df5ed5b0f306dbf942bb779c55672a9e5eb26afc8dd2641812c582e9
-EBUILD gammu-1.12.0.ebuild 2051 RMD160 ebd8bbbd92d6a10e52218db773278604686b65f9 SHA1 7360f8106f90a03e85ddca90b93af154d19d832f SHA256 5ece4c6305dc0495cbdd8898ded844a167346c0d157af25440688ca5636e9fdc
-EBUILD gammu-1.13.0.ebuild 2052 RMD160 9b0e00db402f4da47b54d8108048427317dcfb55 SHA1 03d9413d8a0b6997f77908d70333729faea201d2 SHA256 bedf7e7fed8980825bada5f9fcba0b5c9573d17627b37d6c91ca39fda46a4a25
-EBUILD gammu-1.15.0-r1.ebuild 1523 RMD160 74910a6b9c1afa9295aff9367e36c80937b0626e SHA1 3c42caf7286d6077b013195735fb1946725e5183 SHA256 89cba83d074023f149e06143084e9d3315e7c3c9ecafccb12e5d1b1de5dd7f59
+DIST gammu-1.20.0.tar.bz2 1070774 RMD160 9afecf9fa4600c96b3992105f861158b7e57b0b0 SHA1 08bbe0c3ec9f75e9d761e04ef549fdfc6d723606 SHA256 7848b7c1992ef202d54a5602904e7d7e190bce0195af69174baa79e741d07e87
 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
-MISC ChangeLog 11457 RMD160 d2d106fbf1b3f31725b39c5d89e80e00c8bd92b1 SHA1 e0178c35c45b4f2f6c339b74fc03198f43c09f8b SHA256 794fdc5bdfa5d57b85c70b60770b24e0a7b6d33bc644a4de93b6c7ab09ff8cac
+EBUILD gammu-1.20.0.ebuild 1613 RMD160 290106d8b848db02e896e804a556ab7ff42cf75b SHA1 20fe5e1bbd469c204d50386fb6497046c5077867 SHA256 e2e91cc01fdd433e28ad90ce495d8afe749ea4133cf37409bd0c26f3669f3b21
+MISC ChangeLog 11808 RMD160 3c87324b0f320dba595ec91a51a51c457da43dd4 SHA1 396ee965b7cad910df374ad1a6bc29780e6a7d8b SHA256 ecb08a1b5dcf2e580788e3e7d05ef4a35c26be18bf0440dea7885302469696f9
 MISC metadata.xml 165 RMD160 1bf9089beacb19ba770d553d02356566ecd76892 SHA1 866903a1177187bfcc803fb62e0e3be2a2674481 SHA256 576ea680ccc744a6279987ce542f52f215515a2b4e95bd08c61a66bba9af1c57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhKWCcACgkQ+fWpoTWIA9FPlgCfTWkW1se+tcZyV4lsEsD+lvIN
+xvEAnjEojPnA7Rlxy63FGW75zWSkG/Yk
+=IYN4
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch
deleted file mode 100644
index 93575a47a50b..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.11.0-fixups.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nru gammu-1.11.0.orig/common/phone/at/atgen.c gammu-1.11.0/common/phone/at/atgen.c
---- gammu-1.11.0.orig/common/phone/at/atgen.c	2007-05-11 11:14:47.000000000 +0300
-+++ gammu-1.11.0/common/phone/at/atgen.c	2007-05-15 19:37:00.000000000 +0300
-@@ -642,7 +642,7 @@
- 		if (GetLineLength(msg.Buffer, Priv->Lines, 2) <= MAX_MANUFACTURER_LENGTH) {
- 			CopyLineString(s->Phone.Data.Manufacturer, msg.Buffer, Priv->Lines, 2);
- 		} else {
--			smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %zd\n", GetLineLength(msg.Buffer, Priv->Lines, 2));
-+			smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %d\n", GetLineLength(msg.Buffer, Priv->Lines, 2));
- 			s->Phone.Data.Manufacturer[0] = 0;
- 		}
- 		/* Sometimes phone adds this before manufacturer (Sagem) */
-diff -Nru gammu-1.11.0.orig/common/service/gsmcal.c gammu-1.11.0/common/service/gsmcal.c
---- gammu-1.11.0.orig/common/service/gsmcal.c	2007-05-03 12:55:44.000000000 +0300
-+++ gammu-1.11.0/common/service/gsmcal.c	2007-05-15 19:39:36.000000000 +0300
-@@ -677,11 +677,11 @@
- 					if (Version == Mozilla_iCalendar) {
- 						if (!header) {
- 							*Length += sprintf(Buffer + (*Length), ";BYDAY=%s",
--								DaysOfWeek[note->Entries[j].Number]);
-+								DaysOfWeek[note->Entries[i].Number]);
- 							header = true;
- 						} else {
- 							*Length += sprintf(Buffer + (*Length), ",%s",
--								DaysOfWeek[note->Entries[j].Number]);
-+								DaysOfWeek[note->Entries[i].Number]);
- 						}
- 					} else {
- 						*Length += sprintf(Buffer + (*Length), " %s",
diff --git a/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch
deleted file mode 100644
index 8d50feb92eac..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nru gammu-1.12.0.orig/CMakeLists.txt gammu-1.12.0/CMakeLists.txt
---- gammu-1.12.0.orig/CMakeLists.txt	2007-06-12 13:30:30.000000000 +0300
-+++ gammu-1.12.0/CMakeLists.txt	2007-07-01 12:12:07.000000000 +0300
-@@ -688,7 +688,7 @@
- 
- install (
-     FILES "${Gammu_BINARY_DIR}/cfg/gammu.pc"
--    DESTINATION "lib/pkgconfig"
-+    DESTINATION "${INSTALL_LIB_DIR}/pkgconfig"
-     COMPONENT "development"
-     )
- 
-diff -Nru gammu-1.12.0.orig/common/phone/nokia/dct4s40/6510/6510file.c gammu-1.12.0/common/phone/nokia/dct4s40/6510/6510file.c
---- gammu-1.12.0.orig/common/phone/nokia/dct4s40/6510/6510file.c	2007-07-01 12:12:34.000000000 +0300
-+++ gammu-1.12.0/common/phone/nokia/dct4s40/6510/6510file.c	2007-07-01 12:01:19.000000000 +0300
-@@ -934,7 +934,7 @@
- 					    msg.Buffer[11]*256*256+
- 					    msg.Buffer[12]*256+
- 					    msg.Buffer[13];
--				smprintf(s,"Size %i bytes\n",File->Used);
-+				smprintf(s,"Size %zi bytes\n",File->Used);
- 			}
- 			File->ReadOnly = false;
- 			if ((msg.Buffer[29] & 1) == 1) {
-diff -Nru gammu-1.12.0.orig/gammu/gammu.c gammu-1.12.0/gammu/gammu.c
---- gammu-1.12.0.orig/gammu/gammu.c	2007-07-01 12:12:34.000000000 +0300
-+++ gammu-1.12.0/gammu/gammu.c	2007-07-01 12:01:19.000000000 +0300
-@@ -2697,7 +2697,7 @@
- 			error = GSM_GetFilePart(s,&File,&Handle,&Size);
- 			if (error == ERR_EMPTY) break;
- 			Print_Error(error);
--			fprintf(stderr, _("%c  Reading: %i percent"),13,File.Used*100/Size);
-+			fprintf(stderr, _("%c  Reading: %i percent"),13, (int)(File.Used*100/Size));
- 		}
- 		fprintf(stderr, "%c",13);
- 
-@@ -8289,7 +8289,7 @@
- 						if (!Files.ModifiedEmpty) {
- 							printf(" %30s",OSDateTime(Files.Modified,false));
- 						} else printf(" %30c",0x20);
--						printf(" %9i",Files.Used);
-+						printf(" %9zi",Files.Used);
- 						printf(" ");
- 					} else printf("|-- ");
- 				} else {
-@@ -8325,7 +8325,7 @@
- 				if (!Files.ModifiedEmpty) {
- 					printf("\"%s\";",OSDateTime(Files.Modified,false));
- 				} else  printf("\"%c\";",0x20);
--				printf("%i;",Files.Used);
-+				printf("%zi;",Files.Used);
- 			} else {
- 				if (error == ERR_FOLDERPART) {
- 					printf(_("Part of folder;"));
-@@ -8440,7 +8440,7 @@
- 			if (!Files.ModifiedEmpty) {
- 				printf("\"%s\";",OSDateTime(Files.Modified,false));
- 			} else  printf("\"%c\";",0x20);
--			printf("%i;",Files.Used);
-+			printf("%zi;",Files.Used);
- 		} else {
- 			printf(_("Folder"));
- 			printf(";\"%s\";",DecodeUnicodeConsole(Files.Name));
-@@ -8495,7 +8495,7 @@
- 			if (Size==0) {
- 				printf("*");
- 			} else {
--				fprintf(stderr, _("%c  %i percent"), 13, File->Used*100/Size);
-+				fprintf(stderr, _("%c  %i percent"), 13, (int)(File->Used*100/Size));
- 				if (File->Used*100/Size >= 2) {
- 					t_time2 = time(NULL);
- 					diff 	= t_time2-t_time1;
-@@ -8676,7 +8676,7 @@
- 		if (File->Used != 0) {
- 			fprintf(stderr, "\r");
- 			fprintf(stderr, "%s", text);
--			fprintf(stderr, _("%3i percent"), Pos * 100 / File->Used);
-+			fprintf(stderr, _("%3i percent"), (int)(Pos * 100 / File->Used));
- 			if (Pos*100/File->Used >= 2) {
- 				GSM_GetCurrentDateTime(&dt);
- 				t_time2 = Fill_Time_T(dt);
diff --git a/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch
deleted file mode 100644
index 68f2818a088e..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.13.0-fixups.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -Nru gammu-1.13.0.orig/common/misc/misc.h gammu-1.13.0/common/misc/misc.h
---- gammu-1.13.0.orig/common/misc/misc.h	2007-08-03 12:19:04.000000000 +0300
-+++ gammu-1.13.0/common/misc/misc.h	2007-09-06 12:55:36.000000000 +0300
-@@ -22,7 +22,7 @@
- 
- /* ------------------------------------------------------------------------- */
- 
--#define MAX_LINES 50
-+#define MAX_LINES 512
- 
- typedef struct {
- 	int numbers[MAX_LINES*2];
-diff -Nru gammu-1.13.0.orig/common/service/backup/backtext.c gammu-1.13.0/common/service/backup/backtext.c
---- gammu-1.13.0.orig/common/service/backup/backtext.c	2007-08-03 16:20:04.000000000 +0300
-+++ gammu-1.13.0/common/service/backup/backtext.c	2007-09-06 12:55:36.000000000 +0300
-@@ -903,7 +903,12 @@
- 
- static void SaveRingtoneEntry(FILE *file, GSM_Ringtone *ringtone, bool UseUnicode)
- {
--	unsigned char buffer[45000];
-+	unsigned char *buffer;
-+
-+	buffer = (unsigned char *)malloc(32 > 2 * ringtone->NokiaBinary.Length ?
-+			32 : 2 * ringtone->NokiaBinary.Length);
-+	if (buffer == NULL)
-+		return;
- 
- 	sprintf(buffer,"Location = %i%c%c",ringtone->Location,13,10);
- 	SaveBackupText(file, "", buffer, UseUnicode);
-@@ -926,6 +931,8 @@
- 	}
- 	sprintf(buffer,"%c%c",13,10);
- 	SaveBackupText(file, "", buffer, UseUnicode);
-+
-+	free(buffer);
- }
- 
- static void SaveOperatorEntry(FILE *file, GSM_Bitmap *bitmap, bool UseUnicode)
-diff -Nru gammu-1.13.0.orig/gammu/backup.c gammu-1.13.0/gammu/backup.c
---- gammu-1.13.0.orig/gammu/backup.c	2007-08-01 17:36:52.000000000 +0300
-+++ gammu-1.13.0/gammu/backup.c	2007-09-06 12:55:36.000000000 +0300
-@@ -165,7 +165,7 @@
-  	GSM_FMStation		FMStation;
-  	GSM_GPRSAccessPoint	GPRSPoint;
- 	bool			DoBackup;
--	char buffer[100];
-+	char buffer[GSM_MAX_INFO_LENGTH];
- 
- 	if (argc == 4 && strcasecmp(argv[3],"-yes") == 0) always_answer_yes = true;
- 
-diff -Nru gammu-1.13.0.orig/gammu/common.c gammu-1.13.0/gammu/common.c
---- gammu-1.13.0.orig/gammu/common.c	2007-08-01 17:36:52.000000000 +0300
-+++ gammu-1.13.0/gammu/common.c	2007-09-06 12:55:36.000000000 +0300
-@@ -224,9 +224,10 @@
- void GSM_Init(bool checkerror)
- {
- 	GSM_File PhoneDB;
--	char model[100];
--	char version[100];
--	unsigned char buff[200], ver[200];
-+	char model[GSM_MAX_MODEL_LENGTH];
-+	char version[GSM_MAX_VERSION_LENGTH];
-+	unsigned char buff[50 + GSM_MAX_MODEL_LENGTH];
-+	unsigned char ver[GSM_MAX_VERSION_LENGTH];
- 	size_t pos = 0, oldpos = 0, i;
- 	GSM_Error error;
- 
-diff -Nru gammu-1.13.0.orig/gammu/misc.c gammu-1.13.0/gammu/misc.c
---- gammu-1.13.0.orig/gammu/misc.c	2007-08-06 12:48:08.000000000 +0300
-+++ gammu-1.13.0/gammu/misc.c	2007-09-06 12:55:36.000000000 +0300
-@@ -97,8 +97,8 @@
- 
- void Identify(int argc, char *argv[])
- {
--	char buffer[100];
--	char date[100];
-+	char buffer[GSM_MAX_INFO_LENGTH];
-+	char date[GSM_MAX_VERSION_DATE_LENGTH];
- 	double num;
- 	GSM_Error error;
- 
-diff -Nru gammu-1.13.0.orig/gammu/search.c gammu-1.13.0/gammu/search.c
---- gammu-1.13.0.orig/gammu/search.c	2007-07-31 19:16:08.000000000 +0300
-+++ gammu-1.13.0/gammu/search.c	2007-09-06 12:55:36.000000000 +0300
-@@ -60,7 +60,7 @@
- void SearchPrintPhoneInfo(OneDeviceInfo * Info, int index, GSM_StateMachine *sm)
- {
- 	GSM_Error error;
--	char buffer[100];
-+	char buffer[GSM_MAX_INFO_LENGTH];
- 
- 	error = GSM_GetManufacturer(sm, buffer);
- 
-diff -Nru gammu-1.13.0.orig/include/gammu-limits.h gammu-1.13.0/include/gammu-limits.h
---- gammu-1.13.0.orig/include/gammu-limits.h	2007-07-23 18:31:42.000000000 +0300
-+++ gammu-1.13.0/include/gammu-limits.h	2007-09-06 12:55:36.000000000 +0300
-@@ -49,6 +49,16 @@
- #define GSM_MAX_IMEI_LENGTH 20
- 
- /**
-+ * Maximal length of various phone information. Just a shorcut for
-+ * functions doing whole identification and use one buffer.
-+ *
-+ * \ingroup Limits
-+ */
-+#define GSM_MAX_INFO_LENGTH MAX(MAX(MAX(GSM_MAX_VERSION_LENGTH, \
-+	GSM_MAX_IMEI_LENGTH), GSM_MAX_MODEL_LENGTH), \
-+	GSM_MAX_MANUFACTURER_LENGTH)
-+
-+/**
-  * Maximal count of SMS messages in folder.
-  *
-  * \ingroup Limits
diff --git a/app-mobilephone/gammu/gammu-1.11.0.ebuild b/app-mobilephone/gammu/gammu-1.11.0.ebuild
deleted file mode 100644
index fb4f7222cde2..000000000000
--- a/app-mobilephone/gammu/gammu-1.11.0.ebuild
+++ /dev/null
@@ -1,49 +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.11.0.ebuild,v 1.6 2008/05/21 15:51:48 dev-zero Exp $
-
-inherit eutils
-
-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"
-
-RDEPEND="bluetooth? ( net-wireless/bluez-libs )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	sys-devel/autoconf-wrapper
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-fixups.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	use bluetooth || myconf="${myconf} --disable-bluetooth"
-	use mysql || myconf="${myconf} --disable-mysql"
-	use postgres || myconf="${myconf} --disable-pgsql"
-	use irda || myconf="${myconf} --disable-irda"
-	econf \
-		--prefix=/usr \
-		--enable-cb \
-		--enable-7110incoming \
-		${myconf} || die "configure failed"
-
-	emake shared || die "make failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" installshared || die "install failed"
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}"
-}
diff --git a/app-mobilephone/gammu/gammu-1.12.0.ebuild b/app-mobilephone/gammu/gammu-1.12.0.ebuild
deleted file mode 100644
index b4f0b6609309..000000000000
--- a/app-mobilephone/gammu/gammu-1.12.0.ebuild
+++ /dev/null
@@ -1,81 +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.12.0.ebuild,v 1.3 2008/05/21 15:51:48 dev-zero Exp $
-
-inherit eutils multilib
-
-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}
-
-	epatch "${FILESDIR}/${P}-fixups.patch"
-
-	# sys-devel/gettext is needed for creating .mo files
-	cd "${S}"
-	local lang
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i -e "/^[ \t]*${lang}[ \t]*$/d" CMakeLists.txt
-		fi
-	done
-}
-
-my_use_with() {
-	local WITH_PREFIX
-	if [ -n "${2}" ]; then
-		WITH_PREFIX="-DWITH_${2}"
-	else
-		WITH_PREFIX="-DWITH_${1}"
-	fi
-	if use $1 ; then
-		echo ${WITH_PREFIX}=ON
-	else
-		echo ${WITH_PREFIX}=OFF
-	fi
-}
-
-src_compile() {
-	local myconf="$(my_use_with bluetooth Bluez) \
-		$(my_use_with irda IrDA) \
-		$(my_use_with mysql MySQL) \
-		$(my_use_with postgres Postgres)"
-	use debug && myconf="${myconf} -DCMAKE_BUILD_TYPE=Debug"
-
-	mkdir "${S}/build" && \
-		cd "${S}/build" && \
-		cmake .. \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DINSTALL_LIB_DIR=/usr/$(get_libdir) \
-			-DINSTALL_DOC_DIR="/usr/share/doc/${P}" \
-			-DENABLE_SHARED=ON \
-			-DHAVE_SIN=NO \
-			${myconf} || die "cmake failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	cd "${S}/build"
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-mobilephone/gammu/gammu-1.13.0.ebuild b/app-mobilephone/gammu/gammu-1.13.0.ebuild
deleted file mode 100644
index 6be28c25d5cb..000000000000
--- a/app-mobilephone/gammu/gammu-1.13.0.ebuild
+++ /dev/null
@@ -1,81 +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.13.0.ebuild,v 1.2 2008/05/21 15:51:48 dev-zero Exp $
-
-inherit eutils multilib
-
-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}
-
-	epatch "${FILESDIR}/${P}-fixups.patch"
-
-	# sys-devel/gettext is needed for creating .mo files
-	cd "${S}"
-	local lang
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			sed -i -e "/^[ \t]*${lang}[ \t]*$/d" CMakeLists.txt
-		fi
-	done
-}
-
-my_use_with() {
-	local WITH_PREFIX
-	if [ -n "${2}" ]; then
-		WITH_PREFIX="-DWITH_${2}"
-	else
-		WITH_PREFIX="-DWITH_${1}"
-	fi
-	if use $1 ; then
-		echo ${WITH_PREFIX}=ON
-	else
-		echo ${WITH_PREFIX}=OFF
-	fi
-}
-
-src_compile() {
-	local myconf="$(my_use_with bluetooth Bluez) \
-		$(my_use_with irda IrDA) \
-		$(my_use_with mysql MySQL) \
-		$(my_use_with postgres Postgres)"
-	use debug && myconf="${myconf} -DCMAKE_BUILD_TYPE=Debug"
-
-	mkdir "${S}/build" && \
-		cd "${S}/build" && \
-		cmake .. \
-			-DCMAKE_INSTALL_PREFIX=/usr \
-			-DINSTALL_LIB_DIR=/usr/$(get_libdir) \
-			-DINSTALL_DOC_DIR="/usr/share/doc/${P}" \
-			-DENABLE_SHARED=ON \
-			-DHAVE_SIN=NO \
-			${myconf} || die "cmake failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	cd "${S}/build"
-	make DESTDIR="${D}" install || die "install failed"
-}
diff --git a/app-mobilephone/gammu/gammu-1.15.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.20.0.ebuild
index 243bfe670fb1..4545ab7caf71 100644
--- a/app-mobilephone/gammu/gammu-1.15.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.20.0.ebuild
@@ -1,6 +1,6 @@
 # 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.15.0-r1.ebuild,v 1.3 2008/05/21 15:51:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.20.0.ebuild,v 1.1 2008/06/07 09:42:54 mrness Exp $
 
 inherit cmake-utils
 
@@ -31,13 +31,14 @@ src_unpack() {
 	unpack ${A}
 
 	# sys-devel/gettext is needed for creating .mo files
-	cd "${S}/locale"
+	pushd "${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
+	popd
 }
 
 src_compile() {
@@ -49,3 +50,7 @@ src_compile() {
 		-DENABLE_SHARED=ON"
 	cmake-utils_src_compile
 }
+
+src_test() {
+	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
+}