removed old version. added patches from bug #66097 compile fault and bug #67747 - another compile fault

(Portage version: 2.1_pre4-r1)

8 files changed, 58 insertions, 71 deletions

diff --git a/net-im/gnophone/ChangeLog b/net-im/gnophone/ChangeLog
index 34ec96d08429..61931a8b3e8f 100644
--- a/net-im/gnophone/ChangeLog
+++ b/net-im/gnophone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gnophone
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/ChangeLog,v 1.11 2005/03/23 16:18:32 seemant Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/ChangeLog,v 1.12 2006/02/04 23:41:12 dragonheart Exp $
+
+  05 Feb 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/gnophone-0.2.4-audio-phone-compilefault.patch,
+  +files/gnophone-0.2.4-casecompile.patch, -gnophone-0.2.4.ebuild,
+  gnophone-0.2.4-r1.ebuild:
+  removed old version. added patches from bug #66097 thanks to Luther Blissett
+  (compile fault) and bug #67747 thanks to Steve Egbert
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gnophone-0.2.4.ebuild,
   gnophone-0.2.4-r1.ebuild:
diff --git a/net-im/gnophone/Manifest b/net-im/gnophone/Manifest
index 57577afbe5f7..d45cf4eecdda 100644
--- a/net-im/gnophone/Manifest
+++ b/net-im/gnophone/Manifest
@@ -1,8 +1,24 @@
 MD5 8f44d14237cc9ca87d5b7354e1064a61 ChangeLog 1665
-MD5 eb70c4a1fee3b2b8a62fd420406a9cbd gnophone-0.2.4-r1.ebuild 1350
-MD5 ee0017f778ffc34674bcc067338503a2 gnophone-0.2.4.ebuild 1416
-MD5 1c3e9641b79caf979de0b8f8e341ab93 metadata.xml 373
-MD5 caf70915f318d848269f9905180332bb files/digest-gnophone-0.2.4 66
-MD5 caf70915f318d848269f9905180332bb files/digest-gnophone-0.2.4-r1 66
+RMD160 c200cca8dd6ab447e43d931b39df5b98576b0673 ChangeLog 1665
+SHA256 f70cdc42db5d42ae159f6745aa50c7b216b0bdab2e77f18b7a56c2320484b4f0 ChangeLog 1665
+MD5 70f32588122d45f4b2b539976753dab6 files/digest-gnophone-0.2.4-r1 244
+RMD160 b8461b331e328b191c2a1ab0c2f5c2faf0d7fb8c files/digest-gnophone-0.2.4-r1 244
+SHA256 f4de909508755ca5235859cada3d6e9db310acad7d130e0d2d3334e0b2cf7ab6 files/digest-gnophone-0.2.4-r1 244
+MD5 968257f8182b4b491bd786640766b9dc files/gnophone-0.2.4-audio-phone-compilefault.patch 326
+RMD160 f33501921345e1c7b011972a136f1f3625707137 files/gnophone-0.2.4-audio-phone-compilefault.patch 326
+SHA256 11612609fe136ab4eb1802f892e2a0ce032960ce2699e86744709f09eb9af699 files/gnophone-0.2.4-audio-phone-compilefault.patch 326
+MD5 42e9d5c98bddac76ca676038b669ed87 files/gnophone-0.2.4-casecompile.patch 234
+RMD160 ff8c01d74a012985ae1e7cd17896e79b2bc6d978 files/gnophone-0.2.4-casecompile.patch 234
+SHA256 d5eb906217d2f82576b7429cdc4379cf0cdac179d31a5c4e42699109544e1d4b files/gnophone-0.2.4-casecompile.patch 234
 MD5 6cd74b6387f8377850159ed555dc1af0 files/gnophone-0.2.4-mkdtmf.c.patch 873
+RMD160 29ad210dd63f8ee86850c8413b3a660ae373fca2 files/gnophone-0.2.4-mkdtmf.c.patch 873
+SHA256 df5d1d227b60729da07bc0e0a01ccdba505aa70622b7705b0d476f4f8e1abd63 files/gnophone-0.2.4-mkdtmf.c.patch 873
 MD5 4491f5ada043c04c52d153a8ca3e3e1a files/gnophone-0.2.4-raw2h.c.patch 1109
+RMD160 df8b7fbe224ac11c5947bcf05a7b50bf70a64322 files/gnophone-0.2.4-raw2h.c.patch 1109
+SHA256 3306128121a8e38804f424114ae35e10fd5b53302e1bc767cd32e20e1c5a73af files/gnophone-0.2.4-raw2h.c.patch 1109
+MD5 0ceede473105164acbdfd5500ced97d7 gnophone-0.2.4-r1.ebuild 1449
+RMD160 1c2c55ec9e39384af192bc2bae509732ee9acbf6 gnophone-0.2.4-r1.ebuild 1449
+SHA256 fd25c3be093fc9d33bfde72a5b1df38dd4abf4885c81ead87c486a4ff6ba89da gnophone-0.2.4-r1.ebuild 1449
+MD5 1c3e9641b79caf979de0b8f8e341ab93 metadata.xml 373
+RMD160 4b7e6d826cfe0502b8d79f1fa443be20ab7d4baf metadata.xml 373
+SHA256 89218dd64351b5135859cd75a97bf733f197bbe6a94957e72c0191eda20a7a03 metadata.xml 373
diff --git a/net-im/gnophone/files/digest-gnophone-0.2.4 b/net-im/gnophone/files/digest-gnophone-0.2.4
deleted file mode 100644
index d9f49af9de92..000000000000
--- a/net-im/gnophone/files/digest-gnophone-0.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75cee76acbd930ccdf473352b1beab30 gnophone-0.2.4.tar.gz 467136
diff --git a/net-im/gnophone/files/digest-gnophone-0.2.4-r1 b/net-im/gnophone/files/digest-gnophone-0.2.4-r1
index d9f49af9de92..67844b80f672 100644
--- a/net-im/gnophone/files/digest-gnophone-0.2.4-r1
+++ b/net-im/gnophone/files/digest-gnophone-0.2.4-r1
@@ -1 +1,3 @@
 MD5 75cee76acbd930ccdf473352b1beab30 gnophone-0.2.4.tar.gz 467136
+RMD160 b5a4e8e46e5d07b253bc643f43acceb30a500b5a gnophone-0.2.4.tar.gz 467136
+SHA256 0229687495b74ae6062828cf2cf20d67ff0fd665bb1030f0d0d8e9708ff1e8fc gnophone-0.2.4.tar.gz 467136
diff --git a/net-im/gnophone/files/gnophone-0.2.4-audio-phone-compilefault.patch b/net-im/gnophone/files/gnophone-0.2.4-audio-phone-compilefault.patch
new file mode 100644
index 000000000000..514cd0d36b2b
--- /dev/null
+++ b/net-im/gnophone/files/gnophone-0.2.4-audio-phone-compilefault.patch
@@ -0,0 +1,12 @@
+--- src/modules/audio-phone.c.orig	2006-02-05 11:02:22.000000000 +1100
++++ src/modules/audio-phone.c	2006-02-05 11:02:53.000000000 +1100
+@@ -25,6 +25,9 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <linux/telephony.h>
++#ifndef __user
++#define __user
++#endif
+ #ifdef IXJ_ENHANCED
+ #include <linux/ixjuser.h>
+ #endif
diff --git a/net-im/gnophone/files/gnophone-0.2.4-casecompile.patch b/net-im/gnophone/files/gnophone-0.2.4-casecompile.patch
new file mode 100644
index 000000000000..aa21110676cc
--- /dev/null
+++ b/net-im/gnophone/files/gnophone-0.2.4-casecompile.patch
@@ -0,0 +1,10 @@
+--- src/gnophone_gui.c.orig	2001-11-10 07:48:15.000000000 +1100
++++ src/gnophone_gui.c	2006-02-05 10:56:26.000000000 +1100
+@@ -1395,7 +1395,6 @@
+ 	case GDK_BUTTON_RELEASE:
+ 		p->moving = 0;
+ 		break;
+-	default:
+ 	}
+ 	return FALSE;
+ }
diff --git a/net-im/gnophone/gnophone-0.2.4-r1.ebuild b/net-im/gnophone/gnophone-0.2.4-r1.ebuild
index d47daa873ccc..e4455d156cb3 100644
--- a/net-im/gnophone/gnophone-0.2.4-r1.ebuild
+++ b/net-im/gnophone/gnophone-0.2.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/gnophone-0.2.4-r1.ebuild,v 1.8 2005/03/23 16:18:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/gnophone-0.2.4-r1.ebuild,v 1.9 2006/02/04 23:41:12 dragonheart Exp $
 
 inherit eutils
 
@@ -32,6 +32,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-raw2h.c.patch
 	epatch ${FILESDIR}/${P}-mkdtmf.c.patch
+	epatch ${FILESDIR}/${P}-casecompile.patch
+	epatch ${FILESDIR}/${P}-audio-phone-compilefault.patch
 }
 
 src_compile() {
diff --git a/net-im/gnophone/gnophone-0.2.4.ebuild b/net-im/gnophone/gnophone-0.2.4.ebuild
deleted file mode 100644
index 8a20f39cc274..000000000000
--- a/net-im/gnophone/gnophone-0.2.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/gnophone-0.2.4.ebuild,v 1.10 2005/03/23 16:18:32 seemant Exp $
-
-IUSE="esd mozilla"
-
-DESCRIPTION="internet telephone"
-HOMEPAGE="http://www.gnophone.com/"
-LICENSE="GPL-2"
-DEPEND="media-sound/gsm
-	net-libs/iax
-	media-sound/sox
-	mozilla? ( www-client/mozilla )
-	esd? ( media-sound/esound )
-	x11-libs/gtk+
-	media-libs/gdk-pixbuf
-	dev-libs/glib
-	media-libs/imlib
-	virtual/libc"
-RDEPEND="media-sound/gsm
-	net-libs/iax
-	media-sound/sox
-	mozilla? ( www-client/mozilla )
-	esd? ( media-sound/esound )
-	x11-libs/gtk+
-	media-libs/gdk-pixbuf
-	dev-libs/glib
-	media-libs/imlib
-	virtual/libc"
-SLOT="0"
-SRC_URI="ftp://ftp.gnophone.com/pub/gnophone/${P}.tar.gz"
-
-D_PREFIX=/usr
-
-KEYWORDS="x86"
-
-src_compile() {
-	local myconf
-
-	use mozilla \
-		&& myconf="${myconf}
-			--with-mozilla-home=/usr/lib/mozilla
-			--with-mozilla-lib=/usr/lib/mozilla
-			--with-mozilla-include=/usr/lib/mozilla/include" \
-		|| myconf="${myconf} --disable-mozilla"
-	use esd \
-		|| myconf="${myconf} --disable-esd"
-
-	./configure ${myconf} \
-		--prefix=${D_PREFIX} --enable-upgrade --disable-zaptel \
-		|| die "./configure failed"
-
-	pushd ${S}/sounds && make && popd # -j2 breaks the sound build
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/${D_PREFIX} install
-	dodoc NEWS COPYING AUTHORS README
-}