Fixing parse error in translation, bug #268348, Fixing pre-stripped files, bug #252015, Respecting CXX variable, cleaning out old versions

(Portage version: 2.1.6.13/cvs/Linux i686)

8 files changed, 33 insertions, 158 deletions

diff --git a/net-voip/kphone/ChangeLog b/net-voip/kphone/ChangeLog
index 6774c4abc0d6..c587de8ebeca 100644
--- a/net-voip/kphone/ChangeLog
+++ b/net-voip/kphone/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-voip/kphone
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/ChangeLog,v 1.2 2009/05/02 21:24:41 swegener Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/ChangeLog,v 1.3 2009/08/19 17:49:53 vostorga Exp $
+
+  19 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> -kphone-4.1.0.ebuild,
+  -files/kphone-4.1.0-Makefiles.patch, -kphone-4.1.1.ebuild,
+  -files/kphone-4.1.1-gcc34.patch, -kphone-4.2.ebuild, kphone-4.2-r1.ebuild,
+  +files/kphone-4.2-parse-fr.diff:
+  Fixing parse error in translation, bug #268348 , patch thanks to
+  Olivier Huber <oli.huber@gmail.com>
+  Fixing pre-stripped files, bug #252015
+  Respecting CXX variable, cleaning out old versions
 
   28 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
   +files/kphone-4.1.0-Makefiles.patch, +files/kphone-4.1.1-gcc34.patch,
diff --git a/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch b/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch
deleted file mode 100644
index d111283772a2..000000000000
--- a/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- po/Makefile.in.orig	2004-12-12 14:30:00.690467152 +0000
-+++ po/Makefile.in	2004-12-12 14:31:02.614053336 +0000
-@@ -4,11 +4,11 @@
- PO_DIR=$(SHAREDIR)/translations/
- 
- install:
--	install --mode=0755 --directory $(PO_DIR)
-+	install --mode=0755 --directory $(DESTDIR)/$(PO_DIR)
- 	for T in *.qm; do \
--		install --mode=0644 $$T $(PO_DIR); \
-+		install --mode=0644 $$T $(DESTDIR)/$(PO_DIR); \
- 	done
- 
- uninstall:
--	rm -r $(PO_DIR)
-+	rm -r $(DESTDIR)/$(PO_DIR)
- 
diff --git a/net-voip/kphone/files/kphone-4.1.1-gcc34.patch b/net-voip/kphone/files/kphone-4.1.1-gcc34.patch
deleted file mode 100644
index 830c6cc30107..000000000000
--- a/net-voip/kphone/files/kphone-4.1.1-gcc34.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur kphone.orig/kphone/dspoutalsa.cpp kphone/kphone/dspoutalsa.cpp
---- kphone.orig/kphone/dspoutalsa.cpp	2005-04-22 14:09:34.000000000 +0200
-+++ kphone/kphone/dspoutalsa.cpp	2005-05-27 11:57:48.000000000 +0200
-@@ -189,7 +189,8 @@
- #ifdef ALSADEBUG
- 			fprintf(stderr,  "write %d instead of %d frames !\n", rc, (int)count/2);
- #endif
--			(int8_t*) buf += rc*4;
-+			int8_t *buff = (int8_t*) buf;
-+			buff += rc*4;
- 			count -= rc*2;
- 			continue;
- 		}
diff --git a/net-voip/kphone/files/kphone-4.2-parse-fr.diff b/net-voip/kphone/files/kphone-4.2-parse-fr.diff
new file mode 100644
index 000000000000..cf0c47a4f65a
--- /dev/null
+++ b/net-voip/kphone/files/kphone-4.2-parse-fr.diff
@@ -0,0 +1,16 @@
+diff -NrU5 kphone.original/po/kphone_fr.ts kphone/po/kphone_fr.ts
+--- kphone.original/po/kphone_fr.ts	2009-08-19 16:59:45.000000000 +0000
++++ kphone/po/kphone_fr.ts	2009-08-19 17:02:09.000000000 +0000
+@@ -199,11 +199,11 @@
+         <source>WARNING: nonmonophonic driver, forced into stereo mode (experimental)</source>
+         <translation>ATTENTION: pilote mono, force le mode stéréo (expérimental)</translation>
+     </message>
+     <message>
+         <source>WARNING: driver rounded %d Hz request to %d Hz, off by %f%%</source>
+-        <translation>ATTENTION: le pilote a arrondi la requ&eacirc;te %d Hz vers %d Hz, de %f%%</translation>
++        <translation>ATTENTION: le pilote a arrondi la requête %d Hz vers %d Hz, de %f%%</translation>
+     </message>
+     <message>
+         <source>Device Not Open</source>
+         <translation>Périphérique Non Ouvert</translation>
+     </message>
diff --git a/net-voip/kphone/kphone-4.1.0.ebuild b/net-voip/kphone/kphone-4.1.0.ebuild
deleted file mode 100644
index 2bf0cbbfb100..000000000000
--- a/net-voip/kphone/kphone-4.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/kphone-4.1.0.ebuild,v 1.1 2009/04/28 15:54:37 volkmar Exp $
-
-inherit eutils kde
-
-DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
-HOMEPAGE="http://www.wirlab.net/kphone/index.html"
-SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
-
-KEYWORDS="x86 ~amd64 sparc ~ppc"
-LICENSE="GPL-2"
-
-IUSE="alsa jack"
-SLOT="0"
-
-S=${WORKDIR}/kphone
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}"
-
-need-kde 3
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefiles.patch
-}
-
-src_compile(){
-	# Fix for our kde location
-	myconf="$myconf --with-extra-libs=$KDEDIR/lib --prefix=/usr `use_enable alsa` `use_enable jack`"
-	econf ${myconf} || die "econf failed"
-	emake
-}
diff --git a/net-voip/kphone/kphone-4.1.1.ebuild b/net-voip/kphone/kphone-4.1.1.ebuild
deleted file mode 100644
index b053696dd08a..000000000000
--- a/net-voip/kphone/kphone-4.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/kphone-4.1.1.ebuild,v 1.1 2009/04/28 15:54:37 volkmar Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
-HOMEPAGE="http://www.wirlab.net/kphone/index.html"
-SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="alsa debug jack"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}"
-
-need-qt 3
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix compilation with gcc-3.4. Applied in CVS.
-	epatch "${FILESDIR}/${P}-gcc34.patch"
-}
-
-src_compile() {
-	local myconf="$(use_enable alsa) $(use_enable jack)
-	              $(use_enable debug)"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGES README
-}
diff --git a/net-voip/kphone/kphone-4.2-r1.ebuild b/net-voip/kphone/kphone-4.2-r1.ebuild
index 2dbe9ee1257c..3f9271e4eff6 100644
--- a/net-voip/kphone/kphone-4.2-r1.ebuild
+++ b/net-voip/kphone/kphone-4.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/kphone-4.2-r1.ebuild,v 1.1 2009/04/28 15:54:37 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/kphone-4.2-r1.ebuild,v 1.2 2009/08/19 17:49:53 vostorga Exp $
 
-inherit qt3 eutils
+inherit qt3 eutils toolchain-funcs
 
 DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
 HOMEPAGE="http://sourceforge.net/projects/kphone"
@@ -27,14 +27,17 @@ src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/kphone-4.2-gcc4.diff
 	epatch "${FILESDIR}"/kphone-4.2-CVE-2006-2442.diff
+	epatch "${FILESDIR}"/${P}-parse-fr.diff
 	sed -i -e "s:\$CFLAGS -O3:\$CFLAGS $CFLAGS:" "${S}"/configure
+	#Pre-stripped file, bug 252015
+	sed -i -e "/install --strip/ s:--strip::" "${S}"/kphone/Makefile.in
 }
 
 src_compile() {
 	local myconf="$(use_enable alsa) $(use_enable jack)
 	              $(use_enable debug) --disable-srtp"
 	econf ${myconf} || die
-	emake || die
+	emake CXX="$(tc-getCXX)" || die "emake failed"
 }
 
 src_install() {
diff --git a/net-voip/kphone/kphone-4.2.ebuild b/net-voip/kphone/kphone-4.2.ebuild
deleted file mode 100644
index feddfbd4ef90..000000000000
--- a/net-voip/kphone/kphone-4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/kphone/kphone-4.2.ebuild,v 1.1 2009/04/28 15:54:37 volkmar Exp $
-
-inherit qt3 eutils
-
-DESCRIPTION="A SIP user agent for Linux, with which you can initiate VoIP connections over the Internet."
-HOMEPAGE="http://www.wirlab.net/kphone/index.html"
-SRC_URI="http://www.wirlab.net/kphone/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86"
-IUSE="alsa debug jack"
-
-S=${WORKDIR}/${PN}
-
-RDEPEND="=x11-libs/qt-3*
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}"
-
-# TODO: support for Secure RTP, needs libSRTP in portage
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/kphone-4.2-gcc4.diff
-}
-
-src_compile() {
-	local myconf="$(use_enable alsa) $(use_enable jack)
-	              $(use_enable debug) --disable-srtp"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGES README
-}