Indentation fixes, added missing dodoc, einstall broke file locations, replaced with make. Added missing dev-perl/XML-Parser and media-libs/speex dependencies.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 30 insertions, 31 deletions

diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog
index 7dbac87a590c..4cac11e64b76 100644
--- a/net-misc/linphone/ChangeLog
+++ b/net-misc/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/linphone
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.2 2005/07/14 20:09:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.3 2005/07/14 22:02:13 stkn Exp $
+
+  14 Jul 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.0.1.ebuild:
+  Indentation fixes, added missing dodoc, replaced einstall with make
+  (einstall completely broke file locations), added missing
+  dev-perl/XML-Parser and speex dependencies.
 
 *linphone-1.0.1 (14 Jul 2005)
 
diff --git a/net-misc/linphone/Manifest b/net-misc/linphone/Manifest
index 1372d20b6a23..cf35e2c41b3d 100644
--- a/net-misc/linphone/Manifest
+++ b/net-misc/linphone/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca3150e1c2d5ab08bd5eda750fb5c611 ChangeLog 3063
-MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
-MD5 339685aec8a9df716c358f64f877a2f6 files/digest-linphone-1.0.1 67
+MD5 e2507f7ba7c7a904ee70862d032ace21 linphone-1.0.1.ebuild 1309
 MD5 de0086c1f53a825df1cfa28b327a527a linphone-0.10.2.ebuild 1288
-MD5 5729527db5d5b7493562ce1f40c50319 linphone-1.0.1.ebuild 1226
 MD5 bf329e2b298c08082a3ff4dfe6c236b3 metadata.xml 315
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1saZI1lqEGTUzyQRAgNiAJ0QUsjqg1R7kAWs2O3WFViZ6m8gsQCgoLeF
-OV71Z5MHlrJ/HIhh8VdZdSQ=
-=617J
------END PGP SIGNATURE-----
+MD5 010826ca4bcd77c7ab6649618e2d24ee ChangeLog 3308
+MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
+MD5 339685aec8a9df716c358f64f877a2f6 files/digest-linphone-1.0.1 67
diff --git a/net-misc/linphone/linphone-1.0.1.ebuild b/net-misc/linphone/linphone-1.0.1.ebuild
index 708843bc47e9..a2ef8291d937 100644
--- a/net-misc/linphone/linphone-1.0.1.ebuild
+++ b/net-misc/linphone/linphone-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.0.1.ebuild,v 1.1 2005/07/14 19:01:14 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.0.1.ebuild,v 1.2 2005/07/14 22:02:13 stkn Exp $
 
 MY_DPV="${PV%.*}.x"
 
@@ -14,16 +14,19 @@ KEYWORDS="~x86 ~ppc"
 IUSE="xv ipv6 gnome alsa"
 
 DEPEND="dev-libs/glib
-		>=net-libs/libosip-2.2
-		x86? 	( xv? ( dev-lang/nasm ) )
-		gnome? 	( 	>=gnome-base/gnome-panel-2
-					>=gnome-base/libgnome-2
-					>=gnome-base/libgnomeui-2
-					>=x11-libs/gtk+-2 )
-		alsa? 	( media-libs/alsa-lib )"
+	dev-perl/XML-Parser
+	>=net-libs/libosip-2.2.0
+	|| ( >=media-libs/speex-1.1.6
+	     <media-libs/speex-1.1.0 )
+	x86? 	( xv? ( dev-lang/nasm ) )
+	gnome? 	( >=gnome-base/gnome-panel-2
+		  >=gnome-base/libgnome-2
+		  >=gnome-base/libgnomeui-2
+		  >=x11-libs/gtk+-2 )
+	alsa? 	( media-libs/alsa-lib )"
 
 src_compile() {
-	local myconf withgnome
+	local withgnome
 
 	if use gnome; then
 		einfo "Building with GNOME interface."
@@ -32,17 +35,18 @@ src_compile() {
 		withgnome="no"
 	fi
 
-	myconf="--enable-glib \
-			--enable-gnome_ui=${withgnome} \
-			`use_enable ipv6` \
-			`use_enable alsa`"
+	econf --enable-glib \
+		--with-speex=/usr \
+		--enable-gnome_ui=${withgnome} \
+		`use_enable ipv6` \
+		`use_enable alsa` \
+		|| die "Unable to configure"
 
-	econf ${myconf} || die "Unable to configure"
 	emake || die "Unable to make"
 }
 
 src_install () {
 	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README
-	README.arm TODO
-	einstall DESTDIR=${D} || die "Failed to install"
+	dodoc README.arm TODO
+	make DESTDIR=${D} install || die "Failed to install"
 }