Add vanilla use flag and fixed the patch.

Thanks to Mikkel Krautz wrt bug #177167.

Package-Manager: portage-2.1.2.6

4 files changed, 28 insertions, 20 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 00f336a4bb53..6f70590187c0 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mumble
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.6 2007/05/01 20:37:52 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.7 2007/05/05 19:13:10 drizzt Exp $
+
+  05 May 2007; Timothy Redaelli <drizzt@gentoo.org>
+  files/mumble-0.9.4-path.patch, mumble-0.9.4.ebuild:
+  Add vanilla use flag and fixed the patch.
+  Thanks to Mikkel Krautz wrt bug #177167.
 
   01 May 2007; Timothy Redaelli <drizzt@gentoo.org> mumble-0.9.4.ebuild:
   Remove pch use flags since it does not work anymore. Force
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index e4dfc5dc2390..444c1644827d 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mumble-0.9.4-path.patch 447 RMD160 862ab9f81c026c142c62aeb14692f28098563a9c SHA1 e6872cdffc10c53dacc7c04833b65894e65c3ef6 SHA256 bcd9fd343e4f7694b0056ae2914b7d0e6f060fca1ac6f03da3ca4a5c77f0a4be
-MD5 e2fd5b8062c1c5bd829880b0ff423b19 files/mumble-0.9.4-path.patch 447
-RMD160 862ab9f81c026c142c62aeb14692f28098563a9c files/mumble-0.9.4-path.patch 447
-SHA256 bcd9fd343e4f7694b0056ae2914b7d0e6f060fca1ac6f03da3ca4a5c77f0a4be files/mumble-0.9.4-path.patch 447
+AUX mumble-0.9.4-path.patch 491 RMD160 cea6b97640e6adb81bab01a4b5c9f923af9bac72 SHA1 4f19df671e1fedb78b46c6c6746f4636264b045a SHA256 5ff0c4bcc5ec06129b14048c8fe54cbfea88ec8d0977378fc3fe290ae1f5c8c1
+MD5 5fd2e226a0bb45d54f5dfc1a408aa4c5 files/mumble-0.9.4-path.patch 491
+RMD160 cea6b97640e6adb81bab01a4b5c9f923af9bac72 files/mumble-0.9.4-path.patch 491
+SHA256 5ff0c4bcc5ec06129b14048c8fe54cbfea88ec8d0977378fc3fe290ae1f5c8c1 files/mumble-0.9.4-path.patch 491
 DIST mumble-0.9.4.tar.bz2 250137 RMD160 96fe8968d888a4b491fe35894a4da46bc39c3765 SHA1 0cfd59658a814457764201fe85e0fa12161c1fc5 SHA256 cf02411ad244dbe6537f4bdfe64b0accc6dcb668d47e4b371c08572052b6259d
-EBUILD mumble-0.9.4.ebuild 1638 RMD160 630bc43a78669ab95483302965837c97b15867b5 SHA1 49863afb62e902ae648e0337fbf219e2f57c9505 SHA256 286f6bcf00682521d945927e4ffec21f925dc42b0fd666b45ee7b0e0a8c072d2
-MD5 df050840618fc837cba702445932c436 mumble-0.9.4.ebuild 1638
-RMD160 630bc43a78669ab95483302965837c97b15867b5 mumble-0.9.4.ebuild 1638
-SHA256 286f6bcf00682521d945927e4ffec21f925dc42b0fd666b45ee7b0e0a8c072d2 mumble-0.9.4.ebuild 1638
-MISC ChangeLog 1461 RMD160 c5fe9976bb0fdec112fc4059a90abe1f733c1c09 SHA1 5e4c26a562fe9e2ee8796b21862a67536ae0efaf SHA256 cf782a6b95254a515f0bbcdb8b8f36fd20e1654d189fe89e6adf73e6c5e7d7ef
-MD5 c4361d960549939c53c3e29d9293e350 ChangeLog 1461
-RMD160 c5fe9976bb0fdec112fc4059a90abe1f733c1c09 ChangeLog 1461
-SHA256 cf782a6b95254a515f0bbcdb8b8f36fd20e1654d189fe89e6adf73e6c5e7d7ef ChangeLog 1461
+EBUILD mumble-0.9.4.ebuild 1660 RMD160 b23453b1fe7ed26c5bb850be89af62525db9409a SHA1 049314a9d366e5decb04b2cdc536b3e5a3aaded7 SHA256 3ad62d393b06378bbff6e41cd9564ca5a4a15d10d436cbb4c5ce666fd579fc38
+MD5 5e175df27e46ffc6714dd2287c8b6f6d mumble-0.9.4.ebuild 1660
+RMD160 b23453b1fe7ed26c5bb850be89af62525db9409a mumble-0.9.4.ebuild 1660
+SHA256 3ad62d393b06378bbff6e41cd9564ca5a4a15d10d436cbb4c5ce666fd579fc38 mumble-0.9.4.ebuild 1660
+MISC ChangeLog 1655 RMD160 58148c01d098c0340e35136c9d5eb9bb62d0e7ce SHA1 4f0144ece8cba97b0dc11d02a9c0019f5af0881d SHA256 d1264cb3094f1bde90498bb2153372557144caebebcab571748854903876b80a
+MD5 ab3bbff23fb5a065b7c3b84e5356f893 ChangeLog 1655
+RMD160 58148c01d098c0340e35136c9d5eb9bb62d0e7ce ChangeLog 1655
+SHA256 d1264cb3094f1bde90498bb2153372557144caebebcab571748854903876b80a ChangeLog 1655
 MISC metadata.xml 363 RMD160 102575523319353cc60e28189e68b28f59a07f0f SHA1 75130f6e4f918296cbd65ec77a06109c1151b44b SHA256 443f75198b71c6b920850b016d9c020315da4b672a9e474d82acf7ac02eeaa06
 MD5 a32c99e88c3e3e0271a1d6ca7d9da262 metadata.xml 363
 RMD160 102575523319353cc60e28189e68b28f59a07f0f metadata.xml 363
@@ -24,7 +24,7 @@ SHA256 c39405f998fec0788de7d48221b7ea3d26183cf7fa5e63e670587eaf36a554fd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGN6UmjJyKLBkBVroRAsH8AJwIfgInhhKHzsOU6KPAVJExPDZF2gCg4wU5
-DJaMbQFSGFYJFaxOYOkYztM=
-=6vBg
+iD8DBQFGPNdMjJyKLBkBVroRAhY0AJsHTHvYsIQ840VHOFz1KsY7p+giTwCgnhAg
+d8s1m+095FYse3LygY0coH0=
+=6Mfg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mumble/files/mumble-0.9.4-path.patch b/media-sound/mumble/files/mumble-0.9.4-path.patch
index 7462e91a04f1..1fc24f818c02 100644
--- a/media-sound/mumble/files/mumble-0.9.4-path.patch
+++ b/media-sound/mumble/files/mumble-0.9.4-path.patch
@@ -1,6 +1,6 @@
 --- Database.cpp.orig	2006-11-25 12:13:13.745701315 +0100
 +++ Database.cpp	2006-11-25 12:14:31.167122733 +0100
-@@ -37,10 +37,7 @@
+@@ -37,10 +37,10 @@
  	QStringList datapaths;
  	int i;
  
@@ -8,7 +8,10 @@
 -	datapaths << QDir::homePath();
 -	datapaths << qApp->applicationDirPath();
 -	datapaths << QDir::currentPath();
++	QDir dir;
++
 +	datapaths << QDir::homePath() + "/.qt";
++	dir.mkpath (datapaths[0]);
  	bool found = false;
  
  	for(i = 0; (i < datapaths.size()) && ! found; i++) {
diff --git a/media-sound/mumble/mumble-0.9.4.ebuild b/media-sound/mumble/mumble-0.9.4.ebuild
index 999451e6dbc6..d5f1aed2c5b7 100644
--- a/media-sound/mumble/mumble-0.9.4.ebuild
+++ b/media-sound/mumble/mumble-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-0.9.4.ebuild,v 1.6 2007/05/01 20:37:52 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-0.9.4.ebuild,v 1.7 2007/05/05 19:13:10 drizzt Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="vanilla"
 
 DEPEND="dev-libs/boost
 	=x11-libs/qt-4*
@@ -38,7 +38,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-path.patch
+	use vanilla || epatch "${FILESDIR}"/${P}-path.patch
 }
 
 src_compile() {