diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-08-21 15:42:09 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-08-21 15:42:09 +0000 |
| commit | d7849e0bb43dcfe5862103cea0112faaebc057a4 (patch) | |
| tree | 08f7cd1d6232382fe84712cb43ceecc15cd8ade5 /dev-util/devhelp | |
| parent | old (diff) | |
| download | historical-d7849e0bb43dcfe5862103cea0112faaebc057a4.tar.gz historical-d7849e0bb43dcfe5862103cea0112faaebc057a4.tar.bz2 historical-d7849e0bb43dcfe5862103cea0112faaebc057a4.zip | |
Fix botched gecko-home value from previous commit
Package-Manager: portage-2.2_rc38/cvs/Linux i686
Diffstat (limited to 'dev-util/devhelp')
| -rw-r--r-- | dev-util/devhelp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/devhelp/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-0.21-r1.ebuild | 18 |
3 files changed, 23 insertions, 5 deletions
diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog index ab908a4e7c07..9bcacf87dae5 100644 --- a/dev-util/devhelp/ChangeLog +++ b/dev-util/devhelp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/devhelp # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.95 2009/08/21 15:24:42 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.96 2009/08/21 15:42:09 nirbheek Exp $ + + 21 Aug 2009; Nirbheek Chauhan <nirbheek@gentoo.org> + devhelp-0.21-r1.ebuild: + Fix botched gecko-home value from previous commit 21 Aug 2009; Nirbheek Chauhan <nirbheek@gentoo.org> devhelp-0.21-r1.ebuild: diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest index a52a424a087c..a77d35440e6d 100644 --- a/dev-util/devhelp/Manifest +++ b/dev-util/devhelp/Manifest @@ -3,9 +3,9 @@ AUX devhelp-0.23-fix-anchor-links.patch 4786 RMD160 6199792bcb910cd9e9ad49f4f788 DIST devhelp-0.21.tar.bz2 549576 RMD160 885112d07c86a4d1c91a46bfc74ff6638c9a6c92 SHA1 3acf06d8d58cbae5319795a59d987b97e4ec849e SHA256 f2f76e1804afcad248216d494ebc331b670851ccf701dacd295baf87f1273c20 DIST devhelp-0.23.1.tar.bz2 475037 RMD160 c6521c8f48449ac73e6115187423ee9ce2f25506 SHA1 9ce37ef216adb2a7573a111a3181ae5e4ed7b7a6 SHA256 186d6e658d9da31e0fdb51b42ccdd65cf535b3afc136a0191057cfffc48e6714 DIST devhelp-0.23.tar.bz2 521287 RMD160 324b74336570291c1a966e63c2d7450f3ae7b678 SHA1 a7ed9c56cd77bb46fb041df539285ce3012ad177 SHA256 60f336ac396f67a0cce70d71ea931545727ab48e9d09bf36415098965f9a7ef2 -EBUILD devhelp-0.21-r1.ebuild 1614 RMD160 db4b3766588a2ea6425cf55d584b42f36e75b068 SHA1 34275102f5513d219b7267e036554deae42b6058 SHA256 700d2d05cbb8be6b84da2336b94c414af7d522da30d2ec56697ca82bd62608b9 +EBUILD devhelp-0.21-r1.ebuild 2095 RMD160 f2ed363e1dc7d742bfeb8eda71ec8fc706284c3c SHA1 ba3149e372e5f5b611cec282faa8da2c5c3cff3a SHA256 a4fdc26a83cb5aa462bae1160a694dd6d152ac4cc341e04ca89e387f5d8f43c1 EBUILD devhelp-0.21.ebuild 1222 RMD160 ef3c60c0352dabdbf82cdbbb36f053d9e063ef9a SHA1 2a2575a986a526bd5980f428a69ede800393d544 SHA256 56e00fc1c2b03381151bc5704b6633ea91e2aa841fa01d990f21cef2c6bb13f4 EBUILD devhelp-0.23-r1.ebuild 1433 RMD160 ebefaca665f457a5db59bb5c8afe207b4220526f SHA1 2298239eb97a02469a69e91b8af74d32e086a0b2 SHA256 028795d33733a131e9d610c742303bb884f6cab42271d520710df8656f2d2d2d EBUILD devhelp-0.23.1.ebuild 1381 RMD160 618934fd4dd9b1274091345a93c48c66d6806b4b SHA1 883714c9be6c5283730d5a3c997500ce01a21462 SHA256 27185d5650a77d827ea17460e592448a4b654c162cf1a75cdaa4c79485721d3b -MISC ChangeLog 12456 RMD160 acd9b5bd866d5b0ecf8eb0c75597f1957f889662 SHA1 cac3a15beeac8221167c1565e1ab5892b426a603 SHA256 eabdbdf64dc936b115f50fff8834be4977f813fe2cac29ad84c82caed16ffd93 +MISC ChangeLog 12589 RMD160 336716f1cd84e52af9d238baa35f03bcaf54f2e5 SHA1 84a900e5933b53ff13aa3bd49f674e412048a52e SHA256 285cb96958acde8f5e00d53a91bfdba92b970cb5bd3cc4f1478a6e1be93fbb16 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 diff --git a/dev-util/devhelp/devhelp-0.21-r1.ebuild b/dev-util/devhelp/devhelp-0.21-r1.ebuild index dc0e8fdeba15..e2d874b15031 100644 --- a/dev-util/devhelp/devhelp-0.21-r1.ebuild +++ b/dev-util/devhelp/devhelp-0.21-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.21-r1.ebuild,v 1.7 2009/08/21 15:24:42 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-0.21-r1.ebuild,v 1.8 2009/08/21 15:42:09 nirbheek Exp $ EAPI="2" GCONF_DEBUG="no" @@ -48,8 +48,22 @@ pkg_setup() { fi G2CONF="$(use_with zlib) - --with-gecko=libxul + --with-gecko=libxul" + + # Properly detect dir for libxul.so etc. + # No, really, don't ask. + if has_version "=net-libs/xulrunner-1.9.0*"; then + # xulrunner-1.9.0* dir structure is broken + G2CONF="${G2CONF} + --with-gecko-home=/usr/$(get_libdir)/xulrunner-1.9" + elif has_version "=net-libs/xulrunner-1.9.1*"; then + # xulrunner-1.9.1 dir structure is fine, but the build system pukes on + # auto-detect + G2CONF="${G2CONF} --with-gecko-home=$(pkg-config --variable=sdkdir libxul)/bin" + else + die "Unknown xulrunner version, unable to auto-detect gecko-home" + fi # ICC is crazy, silence warnings (bug #154010) if [[ $(tc-getCC) == "icc" ]] ; then |