From: Timothy Redaelli Date: Wed, 28 Feb 2007 09:24:31 +0000 (+0000) Subject: Add use pch (as suggested by X on comment 2 of bug #167428). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d792cf4b90c09a3542826eea12940f9c198515a3;p=gentoo.git Add use pch (as suggested by X on comment 2 of bug #167428). Accept also qt with sqlite3 use (thanks to desowin wrt bug #166215). Remove unuseful dependencies. Package-Manager: portage-2.1.2-r11 --- diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index 5c53d820321b..97527093b72f 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -6,14 +6,14 @@ 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 DIST mumble-0.9.4.tar.bz2 250137 RMD160 96fe8968d888a4b491fe35894a4da46bc39c3765 SHA1 0cfd59658a814457764201fe85e0fa12161c1fc5 SHA256 cf02411ad244dbe6537f4bdfe64b0accc6dcb668d47e4b371c08572052b6259d -EBUILD mumble-0.9.4.ebuild 1431 RMD160 d70118eae2fd540c6ba80322b67402c79619d8e7 SHA1 1aa6c8f7d35bbb7d985fe1db5f5fa899c5931c45 SHA256 69c983206364fbd83c4dcdae8bb033456c6ef6cd30a8b488735a159f6853e648 -MD5 fce2c0cac9607ce0d4357998f609da24 mumble-0.9.4.ebuild 1431 -RMD160 d70118eae2fd540c6ba80322b67402c79619d8e7 mumble-0.9.4.ebuild 1431 -SHA256 69c983206364fbd83c4dcdae8bb033456c6ef6cd30a8b488735a159f6853e648 mumble-0.9.4.ebuild 1431 -MISC ChangeLog 791 RMD160 ffe0b300e5428a089b29bef3188abb755518ffef SHA1 5b61d2d2c15897b9299752f5405d86d22cfccfea SHA256 38a39830b1b98819041de09e2911bdfe42177f912c0a2d9c778f5a41323d1f8c -MD5 c951832f631822baacd40f550c984f56 ChangeLog 791 -RMD160 ffe0b300e5428a089b29bef3188abb755518ffef ChangeLog 791 -SHA256 38a39830b1b98819041de09e2911bdfe42177f912c0a2d9c778f5a41323d1f8c ChangeLog 791 +EBUILD mumble-0.9.4.ebuild 1516 RMD160 21b1aa0458a8e61883c6040b684fdd7b3b47427a SHA1 aabad211c33bdd5b8e62269aa15f110fc1529934 SHA256 57504cb695efbfd59590e24ecf114e9860bafececfa12e262b810a5c2bb6c15a +MD5 971c7eb51ac1403070f98b24a21513e5 mumble-0.9.4.ebuild 1516 +RMD160 21b1aa0458a8e61883c6040b684fdd7b3b47427a mumble-0.9.4.ebuild 1516 +SHA256 57504cb695efbfd59590e24ecf114e9860bafececfa12e262b810a5c2bb6c15a mumble-0.9.4.ebuild 1516 +MISC ChangeLog 999 RMD160 d47c4aea657c84b9380190f23b73de10799614fb SHA1 4eebfbb69f35ac6322f7708a0756458e95fdeff4 SHA256 c1bd7df98ad32a4d99f0cf1f4a6d2011ec8c11aa56f49279210682689c356c82 +MD5 bbf8b3f6c14a787ca44e2cc671a2e537 ChangeLog 999 +RMD160 d47c4aea657c84b9380190f23b73de10799614fb ChangeLog 999 +SHA256 c1bd7df98ad32a4d99f0cf1f4a6d2011ec8c11aa56f49279210682689c356c82 ChangeLog 999 MISC metadata.xml 363 RMD160 102575523319353cc60e28189e68b28f59a07f0f SHA1 75130f6e4f918296cbd65ec77a06109c1151b44b SHA256 443f75198b71c6b920850b016d9c020315da4b672a9e474d82acf7ac02eeaa06 MD5 a32c99e88c3e3e0271a1d6ca7d9da262 metadata.xml 363 RMD160 102575523319353cc60e28189e68b28f59a07f0f metadata.xml 363 @@ -22,9 +22,9 @@ MD5 08f2afb232db5f6d9178ec45c2791b87 files/digest-mumble-0.9.4 241 RMD160 71523f6c7a5192ac9743b321596c60e4a0330e86 files/digest-mumble-0.9.4 241 SHA256 c39405f998fec0788de7d48221b7ea3d26183cf7fa5e63e670587eaf36a554fd files/digest-mumble-0.9.4 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFy3BbGDyatLGpTbYRAuuwAKCGGyzOKmcZEqRvd4ELfvdlq6MxWwCeKAP/ -6Nd//8P98tOzGzJQ8MQfulk= -=wzuw +iD8DBQFF5UqJGDyatLGpTbYRAnVSAJ4mq2m3VZFdLwwhwQYTGhopDKLWYQCfSAHp +zbcgBsyhlUHAX1x9L358RSA= +=+EDP -----END PGP SIGNATURE----- diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog index 2e87ac9993bc..97a70b21fb8e 100644 --- a/media-sound/murmur/ChangeLog +++ b/media-sound/murmur/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/murmur # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.2 2007/02/08 18:48:24 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.3 2007/02/28 09:24:31 drizzt Exp $ + + 28 Feb 2007; Timothy Redaelli murmur-0.9.4.ebuild: + Add use pch (as suggested by X on comment 2 of bug #167428). + Accept also qt with sqlite3 use (thanks to desowin wrt bug #166215). + Remove unuseful dependencies. 08 Feb 2007; Timothy Redaelli murmur-0.9.4.ebuild: Fix speex depend thanks to Gorch wrt bug #165927 diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 8bab75576921..aee073365804 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -10,14 +10,14 @@ MD5 45c752952162dc1ac941c89565859afd files/murmur.rc 586 RMD160 3bc9d1638ac97bdeba820d14d8071973cf2dc096 files/murmur.rc 586 SHA256 f7b6fa2d4caf730cd6b3dc4d9b8bc9da46d56abe704f9db807ae8d96f22561bf files/murmur.rc 586 DIST mumble-0.9.4.tar.bz2 250137 RMD160 96fe8968d888a4b491fe35894a4da46bc39c3765 SHA1 0cfd59658a814457764201fe85e0fa12161c1fc5 SHA256 cf02411ad244dbe6537f4bdfe64b0accc6dcb668d47e4b371c08572052b6259d -EBUILD murmur-0.9.4.ebuild 1266 RMD160 a9de98a44be064da25bdb59f8de0a4047f324d7c SHA1 f9b68c454a73dff4c520c12545189f0833b521ba SHA256 c120d118cb65d189ef62e15a10c4dcf4cc445991865d6dde9c26f00a95a5151d -MD5 46591773e6246acceb625eefadee1d2a murmur-0.9.4.ebuild 1266 -RMD160 a9de98a44be064da25bdb59f8de0a4047f324d7c murmur-0.9.4.ebuild 1266 -SHA256 c120d118cb65d189ef62e15a10c4dcf4cc445991865d6dde9c26f00a95a5151d murmur-0.9.4.ebuild 1266 -MISC ChangeLog 548 RMD160 affe2db2b781c65c99dc7b52e27884d8a3f1dfcf SHA1 01690df332f42eface1100b828e72a0e18492a11 SHA256 e4c6aaffc5322925a5fb3cd3915b9dd4dae6da7d47c3ddbe29240e5d69681682 -MD5 80d1976477003f2741646f9dba93b856 ChangeLog 548 -RMD160 affe2db2b781c65c99dc7b52e27884d8a3f1dfcf ChangeLog 548 -SHA256 e4c6aaffc5322925a5fb3cd3915b9dd4dae6da7d47c3ddbe29240e5d69681682 ChangeLog 548 +EBUILD murmur-0.9.4.ebuild 1313 RMD160 58d72a075c2323af98cb7f0f4b1cd6281346c6ee SHA1 e10d36131485ac4b62dafc2ea3ddb65b6095c18f SHA256 f9793eeeaa1316dac3161811985d7c4282d33633ea345043861a3e5dea279bcf +MD5 2f01f04de42c60bc0e92877450583e9d murmur-0.9.4.ebuild 1313 +RMD160 58d72a075c2323af98cb7f0f4b1cd6281346c6ee murmur-0.9.4.ebuild 1313 +SHA256 f9793eeeaa1316dac3161811985d7c4282d33633ea345043861a3e5dea279bcf murmur-0.9.4.ebuild 1313 +MISC ChangeLog 788 RMD160 ad84eb84ccd6ad98aa1bb80f4ec53f62dc1e3c12 SHA1 b9d329ee26e7c7dc19cab77951f5f37d5b865797 SHA256 e68d3a294b49752176f7b9c786dd4ca646a01722b0d32685447cf800fac9f716 +MD5 56bc73d6ef5dce141e9c53ebbcec4d1f ChangeLog 788 +RMD160 ad84eb84ccd6ad98aa1bb80f4ec53f62dc1e3c12 ChangeLog 788 +SHA256 e68d3a294b49752176f7b9c786dd4ca646a01722b0d32685447cf800fac9f716 ChangeLog 788 MISC metadata.xml 363 RMD160 102575523319353cc60e28189e68b28f59a07f0f SHA1 75130f6e4f918296cbd65ec77a06109c1151b44b SHA256 443f75198b71c6b920850b016d9c020315da4b672a9e474d82acf7ac02eeaa06 MD5 a32c99e88c3e3e0271a1d6ca7d9da262 metadata.xml 363 RMD160 102575523319353cc60e28189e68b28f59a07f0f metadata.xml 363 @@ -26,9 +26,9 @@ MD5 08f2afb232db5f6d9178ec45c2791b87 files/digest-murmur-0.9.4 241 RMD160 71523f6c7a5192ac9743b321596c60e4a0330e86 files/digest-murmur-0.9.4 241 SHA256 c39405f998fec0788de7d48221b7ea3d26183cf7fa5e63e670587eaf36a554fd files/digest-murmur-0.9.4 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFy3B/GDyatLGpTbYRAkzFAJ0X9NOnqooIYm5GTrfkTbjhy9YazwCfZwbl -Mux1KhKfIccXOJ1qpsLVvjY= -=yXmp +iD8DBQFF5UpWGDyatLGpTbYRAqiGAJ9g4QkLsr4n553RErJVll7e5ef5DQCgmMCa +F3SIbCmdd3g3moGUPnga+ZM= +=OYg1 -----END PGP SIGNATURE----- diff --git a/media-sound/murmur/murmur-0.9.4.ebuild b/media-sound/murmur/murmur-0.9.4.ebuild index 162031990191..8e71461dec6d 100644 --- a/media-sound/murmur/murmur-0.9.4.ebuild +++ b/media-sound/murmur/murmur-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/murmur/murmur-0.9.4.ebuild,v 1.2 2007/02/08 18:48:24 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-0.9.4.ebuild,v 1.3 2007/02/28 09:24:31 drizzt Exp $ inherit eutils toolchain-funcs @@ -13,27 +13,29 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~x86 ~amd64" -IUSE="" +IUSE="pch" -DEPEND="dev-libs/boost - =x11-libs/qt-4* - >=media-libs/speex-1.1.12 - media-libs/alsa-lib - x11-libs/libXevie" +DEPEND="=x11-libs/qt-4*" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MY_P} pkg_setup() { - if ! built_with_use =x11-libs/qt-4* sqlite ; then + if ! built_with_use -o =x11-libs/qt-4* sqlite sqlite3; then echo - ewarn "You need to build Qt4 with the sqlite use flag" + ewarn "You need to build Qt4 with the sqlite and/or sqlite3 use flag" echo die "Your Qt4 has no sqlite support" fi } +src_unpack() { + unpack ${A} + cd "${S}" + use pch || sed -i -e '3s: precompile_header$::' mumble.pri +} + src_compile() { qmake murmur.pro || die "qmake failed" emake CC="$(tc-getCC) ${CFLAGS}" \