Ebuild redesign imposed by upstream changes (#118074). The new ebuild don't add --enable-6210calendar to configure line since it forces gammu to use Nokia 6210 frames for calendar, frames that are incompatible with other models (#117350).

(Portage version: 2.0.53)

6 files changed, 73 insertions, 53 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 98756f4cca49..69fae170cddb 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,16 @@
 # 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.8 2006/01/02 18:10:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.9 2006/01/07 13:07:11 mrness Exp $
+
+*gammu-1.04.0-r1 (07 Jan 2006)
+
+  07 Jan 2006; Alin Nastac <mrness@gentoo.org>
+  +files/gammu-1.04.0-devfunc-sock.patch, -gammu-1.04.0.ebuild,
+  +gammu-1.04.0-r1.ebuild:
+  Ebuild redesign imposed by upstream changes (#118074). The new ebuild don\t
+  add --enable-6210calendar to configure line since it forces gammu to use
+  Nokia 6210 frames for calendar, frames that are incompatible with other
+  models (#117350).
 
   02 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> gammu-1.02.0.ebuild:
   Stable on ppc.
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index f5b4d7aaf00b..8fb3f811a971 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -1,9 +1,10 @@
 MD5 dbf609e5dd47608b5857e49c11af7584 ChangeLog 4209
 MD5 fe619bd2a9bf0758cba9ac45162c8758 files/digest-gammu-1.01.0-r1 64
 MD5 468e231ccea93dcde78c5b1d767f6601 files/digest-gammu-1.02.0 64
-MD5 33f5aa8593cdf2bf3524869f6f128ec5 files/digest-gammu-1.04.0 64
+MD5 33f5aa8593cdf2bf3524869f6f128ec5 files/digest-gammu-1.04.0-r1 64
 MD5 c99ecf9019c20984a405aeea6c2c6e60 files/gammu-1.01.0-caller.patch 1021
+MD5 2dba94c27d92141070e9b76dba40f24b files/gammu-1.04.0-devfunc-sock.patch 381
 MD5 6c95de75bc61252ba025920f0a90675c gammu-1.01.0-r1.ebuild 1655
 MD5 ca8fe507eb178df89cbf153ea4efbbb3 gammu-1.02.0.ebuild 1573
-MD5 6a9944686c94254a7a2875379f02bd40 gammu-1.04.0.ebuild 1575
+MD5 36cdf174307a55a0e899551bcbe90ac4 gammu-1.04.0-r1.ebuild 1326
 MD5 e161c5ddb0e2ddbe68a21690f41e90e1 metadata.xml 227
diff --git a/app-mobilephone/gammu/files/digest-gammu-1.04.0 b/app-mobilephone/gammu/files/digest-gammu-1.04.0-r1
index 17a6a5475d98..17a6a5475d98 100644
--- a/app-mobilephone/gammu/files/digest-gammu-1.04.0
+++ b/app-mobilephone/gammu/files/digest-gammu-1.04.0-r1
diff --git a/app-mobilephone/gammu/files/gammu-1.04.0-devfunc-sock.patch b/app-mobilephone/gammu/files/gammu-1.04.0-devfunc-sock.patch
new file mode 100644
index 000000000000..d8e31b0e536c
--- /dev/null
+++ b/app-mobilephone/gammu/files/gammu-1.04.0-devfunc-sock.patch
@@ -0,0 +1,11 @@
+diff -Nru gammu-1.04.0.orig/common/device/devfunc.c gammu-1.04.0/common/device/devfunc.c
+--- gammu-1.04.0.orig/common/device/devfunc.c	2005-11-20 22:01:18.000000000 +0200
++++ gammu-1.04.0/common/device/devfunc.c	2006-01-07 14:53:03.056366000 +0200
+@@ -22,6 +22,7 @@
+ #else
+ #  include <errno.h>
+ #  include <signal.h>
++#  include <sys/socket.h>
+ #endif
+ 
+ #include "../gsmstate.h"
diff --git a/app-mobilephone/gammu/gammu-1.04.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.04.0-r1.ebuild
new file mode 100644
index 000000000000..dd3d2639b219
--- /dev/null
+++ b/app-mobilephone/gammu/gammu-1.04.0-r1.ebuild
@@ -0,0 +1,48 @@
+# 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.04.0-r1.ebuild,v 1.1 2006/01/07 13:07:11 mrness Exp $
+
+inherit eutils
+
+MY_MAJOR_VER=${PV:0:3}
+
+DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
+SRC_URI="http://www.mwiacek.com/zips/gsm/${PN}/stable/${MY_MAJOR_VER/./_}x/${P}.tar.gz"
+HOMEPAGE="http://www.gammu.net/projects/gammu.php"
+
+IUSE="debug bluetooth irda mysql"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="bluetooth? ( net-wireless/bluez-libs )
+	mysql? ( dev-db/mysql )"
+DEPEND="${RDEPEND}
+	irda? ( virtual/os-headers )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-devfunc-sock.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 || die "make failed"
+}
+
+src_install () {
+	make "DESTDIR=${D}" install || die "install failed"
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}"
+}
diff --git a/app-mobilephone/gammu/gammu-1.04.0.ebuild b/app-mobilephone/gammu/gammu-1.04.0.ebuild
deleted file mode 100644
index 02d8f0e2912f..000000000000
--- a/app-mobilephone/gammu/gammu-1.04.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.04.0.ebuild,v 1.1 2006/01/02 12:59:24 mrness Exp $
-
-inherit eutils
-
-MY_MAJOR_VER=${PV:0:3}
-
-DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
-SRC_URI="http://www.mwiacek.com/zips/gsm/${PN}/stable/${MY_MAJOR_VER/./_}x/${P}.tar.gz"
-HOMEPAGE="http://www.gammu.net/projects/gammu.php"
-
-IUSE="bluetooth irda mysql nls ssl"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="mysql? ( dev-db/mysql )
-	ssl? ( >=dev-libs/openssl-0.9.7d )
-	bluetooth? ( net-wireless/bluez-libs )"
-
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use bluetooth && myconf="${myconf} --with-bluedir=/usr/lib" \
-		|| myconf="${myconf} --disable-bluefbus --disable-blueobex --disable-bluephonet --disable-blueat --disable-bluerfsearch --disable-fbusblue"
-	use irda || myconf="${myconf} --disable-irdaat --disable-irdaphonet"
-	sed -e 's:-lbluetooth -lsdp:-lbluetooth:g' \
-		-i ${S}/cfg/autoconf/configure.in
-	econf \
-		`use_enable nls` \
-		--prefix=/usr \
-		--enable-cb \
-		--enable-7110incoming \
-		--enable-6210calendar \
-		${myconf} || die "configure failed"
-
-	sed -e 's:-lz  -pthread:-lz  -lpthread -lssl:g' \
-		-i ${S}/cfg/Makefile.cfg
-	emake || die "make failed"
-}
-
-src_install () {
-	make DESTDIR=${D} installlib || die "install failed"
-	doman docs/docs/english/gammu.1
-	mv ${D}/usr/share/doc/${PN} ${D}/usr/share/doc/${P}
-}