Version bump using cmake instead unsupported autoconf script (#183323).

(Portage version: 2.1.2.7)

8 files changed, 175 insertions, 98 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 61feba62d45e..8e8ff37c7e80 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.39 2007/06/19 06:46:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.40 2007/07/01 10:34:13 mrness Exp $
+
+*gammu-1.12.0 (01 Jul 2007)
+
+  01 Jul 2007; Alin Năstac <mrness@gentoo.org>
+  -files/gammu-1.08.00-as-needed.patch,
+  -files/gammu-1.08.00-backup-limits.patch,
+  +files/gammu-1.12.0-fixups.patch, -gammu-1.08.00.ebuild,
+  +gammu-1.12.0.ebuild:
+  Version bump using cmake instead unsupported autoconf script (#183323).
 
   19 Jun 2007; Christian Faulhammer <opfer@gentoo.org> gammu-1.11.0.ebuild:
   stable x86, bug 178635
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.08.00 b/app-mobilephone/gammu/files/digest-gammu-1.08.00
deleted file mode 100644
index e3759d62e23f..000000000000
--- a/app-mobilephone/gammu/files/digest-gammu-1.08.00
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e934c756419b045e9c128103cb02644b gammu-1.08.00.tar.gz 1104688
-RMD160 1297b9f5cc38c3cc8a90ac124e925181847f8c76 gammu-1.08.00.tar.gz 1104688
-SHA256 1336fcf24b36dfba411e5147ba301d6f5c1b501ddbb2ae714de3196e65cc7b55 gammu-1.08.00.tar.gz 1104688
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.12.0 b/app-mobilephone/gammu/files/digest-gammu-1.12.0
new file mode 100644
index 000000000000..2778219b6cd5
--- /dev/null
+++ b/app-mobilephone/gammu/files/digest-gammu-1.12.0
@@ -0,0 +1,3 @@
+MD5 260035c1647bab396dfd9b35d78a3ad8 gammu-1.12.0.tar.bz2 940565
+RMD160 a44b351777ab6c5d635401e968eb853d2508102b gammu-1.12.0.tar.bz2 940565
+SHA256 4ab84e05440f82bcc440030752fcf482a15d284f40de08f2240d43bc528c4fa1 gammu-1.12.0.tar.bz2 940565
diff --git a/app-mobilephone/gammu/files/gammu-1.08.00-as-needed.patch b/app-mobilephone/gammu/files/gammu-1.08.00-as-needed.patch
deleted file mode 100644
index ec00483b8023..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.08.00-as-needed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru gammu-1.08.00.orig/cfg/Makefile.glo gammu-1.08.00/cfg/Makefile.glo
---- gammu-1.08.00.orig/cfg/Makefile.glo	2006-05-19 20:44:18.000000000 +0300
-+++ gammu-1.08.00/cfg/Makefile.glo	2006-07-12 22:52:40.069027750 +0300
-@@ -126,7 +126,7 @@
- 
- $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
- 	@echo Linking gammu
--	@$(CC) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu $(LDFLAGS)
-+	@$(CC) $(LDFLAGS) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu
- 
- gammu: $(TOPDIR)/gammu/gammu
- 
-@@ -136,7 +136,7 @@
- 
- $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR): $(COMMON)
- 	@echo Linking libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
--	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) $(LDFLAGS)
-+	@$(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) $(COMMON) $(LDLIBS) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
- 	@$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR)
- 	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(TOPDIR)/common/libGammu.so
- 
-@@ -148,7 +148,7 @@
-  
- $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
- 	@echo Linking gammu-shared
--	@$(CC) -L$(TOPDIR)/common -lGammu $(LDFLAGS) $(SMSD_LIBS) $(LDLIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared
-+	@$(CC) $(LDFLAGS) -L$(TOPDIR)/common $(GAMMU) -lGammu $(SMSD_LIBS) $(LDLIBS) -o $(TOPDIR)/gammu/gammu-shared
- 
- shared: $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.a $(TOPDIR)/gammu/gammu-shared
-  
diff --git a/app-mobilephone/gammu/files/gammu-1.08.00-backup-limits.patch b/app-mobilephone/gammu/files/gammu-1.08.00-backup-limits.patch
deleted file mode 100644
index 3d38242e61d6..000000000000
--- a/app-mobilephone/gammu/files/gammu-1.08.00-backup-limits.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru gammu-1.08.00.orig/common/service/backup/backgen.h gammu-1.08.00/common/service/backup/backgen.h
---- gammu-1.08.00.orig/common/service/backup/backgen.h	2006-06-02 21:03:12.000000000 +0300
-+++ gammu-1.08.00/common/service/backup/backgen.h	2006-06-02 21:03:26.084773750 +0300
-@@ -14,9 +14,9 @@
- #include "../gsmmisc.h"
- #include "../sms/gsmsms.h"
- 
--#define GSM_BACKUP_MAX_PHONEPHONEBOOK 	501
-+#define GSM_BACKUP_MAX_PHONEPHONEBOOK 	1001
- #define GSM_BACKUP_MAX_SIMPHONEBOOK 	251
--#define GSM_BACKUP_MAX_CALLER	 	6
-+#define GSM_BACKUP_MAX_CALLER	 	20
- #define GSM_BACKUP_MAX_SMSC		10
- #define GSM_BACKUP_MAX_WAPBOOKMARK	40
- #define GSM_BACKUP_MAX_WAPSETTINGS	30
diff --git a/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch b/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch
new file mode 100644
index 000000000000..8d50feb92eac
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.12.0-fixups.patch
@@ -0,0 +1,81 @@
+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/gammu-1.08.00.ebuild b/app-mobilephone/gammu/gammu-1.08.00.ebuild
deleted file mode 100644
index c059639ddba2..000000000000
--- a/app-mobilephone/gammu/gammu-1.08.00.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.08.00.ebuild,v 1.6 2007/06/17 10:56:46 armin76 Exp $
-
-inherit eutils
-
-MY_MAJOR_VER=${PV:0:3}
-
-DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
-HOMEPAGE="http://www.gammu.org"
-SRC_URI="http://www.mwiacek.com/zips/gsm/${PN}/stable/${MY_MAJOR_VER/./_}x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug bluetooth irda mysql"
-
-RDEPEND="bluetooth? ( net-wireless/bluez-libs )
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-backup-limits.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debug"
-	use bluetooth && myconf="${myconf} --with-bluedir=/usr/lib" \
-		|| myconf="${myconf} --disable-bluetooth"
-	use mysql || myconf="${myconf} --disable-mysql"
-	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
new file mode 100644
index 000000000000..d8ba0dc4a517
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.12.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 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.1 2007/07/01 10:34:13 mrness 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? ( dev-db/postgresql )
+	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"
+}