Version bump (#139546). Fix link error when build with --as-needed (#139540).

(Portage version: 2.1-r1)

8 files changed, 111 insertions, 1 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 08e0f0def7de..b630d4444ef2 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.18 2006/06/10 09:26:56 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.19 2006/07/12 20:01:28 mrness Exp $
+
+*gammu-1.07.00 (12 Jul 2006)
+
+  12 Jul 2006; Alin Nastac <mrness@gentoo.org>
+  +files/gammu-1.07.00-as-needed.patch,
+  +files/gammu-1.07.00-backup-limits.patch, +gammu-1.07.00.ebuild:
+  Version bump (#139546). Fix link error when build with --as-needed (#139540).
 
   10 Jun 2006; Michael Hanselmann <hansmi@gentoo.org> gammu-1.05.00.ebuild:
   Stable on ppc.
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.04.0-r2 b/app-mobilephone/gammu/files/digest-gammu-1.04.0-r2
index 17a6a5475d98..95d5be0eadb5 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.04.0-r2
+++ b/app-mobilephone/gammu/files/digest-gammu-1.04.0-r2
@@ -1 +1,3 @@
 MD5 6c9b4428961eedc983e2925e364321d3 gammu-1.04.0.tar.gz 929495
+RMD160 bada535bd1a28bf615c3b1fb9baa8b7c016abfc1 gammu-1.04.0.tar.gz 929495
+SHA256 383caa0633d32b28b7531856ace64e24d03ca217d41e606cf67f9c1432787067 gammu-1.04.0.tar.gz 929495
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.05.00 b/app-mobilephone/gammu/files/digest-gammu-1.05.00
index 7f62dbc5f630..ab2696b97c42 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.05.00
+++ b/app-mobilephone/gammu/files/digest-gammu-1.05.00
@@ -1 +1,3 @@
 MD5 d63df5146f6bbe27b758e874d28423d7 gammu-1.05.00.tar.gz 1017137
+RMD160 9133425dec6b2a7ea0186cdb97e07af469a25049 gammu-1.05.00.tar.gz 1017137
+SHA256 da95d899bd610b367457c631c91bf2f018da3fa0dc51fad98093e81dbe6bd6b6 gammu-1.05.00.tar.gz 1017137
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.06.00 b/app-mobilephone/gammu/files/digest-gammu-1.06.00
index a9534a99bc19..fde0d616ef65 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.06.00
+++ b/app-mobilephone/gammu/files/digest-gammu-1.06.00
@@ -1 +1,3 @@
 MD5 bc96e1851fecf5795048ce657c8bd67b gammu-1.06.00.tar.gz 1014476
+RMD160 4f85c761968ad045b68f8e61b014789b32542d2f gammu-1.06.00.tar.gz 1014476
+SHA256 b922563007de16a301874023aa47ae36605d91394bb00877e0ecbf579f92617b gammu-1.06.00.tar.gz 1014476
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.07.00 b/app-mobilephone/gammu/files/digest-gammu-1.07.00
new file mode 100644
index 000000000000..f1628f1038b1
--- /dev/null
+++ b/app-mobilephone/gammu/files/digest-gammu-1.07.00
@@ -0,0 +1,3 @@
+MD5 b706e35a6f003acc47f8c2bb71fa8036 gammu-1.07.00.tar.gz 1081816
+RMD160 630bd52bf7fc611014a0827350adb0c7aba42fc7 gammu-1.07.00.tar.gz 1081816
+SHA256 d1acd0fd5b7bd81baf41d99af1a0bb5a276332b1fc88c5262389ca16ff9b4a03 gammu-1.07.00.tar.gz 1081816
diff --git a/app-mobilephone/gammu/files/gammu-1.07.00-as-needed.patch b/app-mobilephone/gammu/files/gammu-1.07.00-as-needed.patch
new file mode 100644
index 000000000000..181b89f838c5
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.07.00-as-needed.patch
@@ -0,0 +1,30 @@
+diff -Nru gammu-1.07.00.orig/cfg/Makefile.glo gammu-1.07.00/cfg/Makefile.glo
+--- gammu-1.07.00.orig/cfg/Makefile.glo	2006-05-19 20:44:18.000000000 +0300
++++ gammu-1.07.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) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
+ 	@$(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.07.00-backup-limits.patch b/app-mobilephone/gammu/files/gammu-1.07.00-backup-limits.patch
new file mode 100644
index 000000000000..72476cd3613e
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.07.00-backup-limits.patch
@@ -0,0 +1,15 @@
+diff -Nru gammu-1.07.00.orig/common/service/backup/backgen.h gammu-1.07.00/common/service/backup/backgen.h
+--- gammu-1.07.00.orig/common/service/backup/backgen.h	2006-06-02 21:03:12.000000000 +0300
++++ gammu-1.07.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/gammu-1.07.00.ebuild b/app-mobilephone/gammu/gammu-1.07.00.ebuild
new file mode 100644
index 000000000000..08b5b75f1a4d
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.07.00.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.07.00.ebuild,v 1.1 2006/07/12 20:01:28 mrness 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 ~ia64 ~ppc ~x86"
+IUSE="debug bluetooth irda mysql"
+
+RDEPEND="bluetooth? ( net-wireless/bluez-libs )
+	mysql? ( dev-db/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}"
+}