fixed build_with_use check for w3m, reported by <pflm52td@w6.dion.ne.jp> in bug ...

Package-Manager: portage-2.1.1-r1

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index d21fde5f6f992fe7b7bd951f10c8f381ed408cda..1b2779d34cc3e9dc23cdc64f1d923e527667a1bf 100644 (file)
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.44 2006/05/19 23:01:45 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.45 2006/11/17 10:18:09 opfer Exp $
+
+  17 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
+  emacs-w3m-1.4.4-r1.ebuild:
+  fixed build_with_use check for w3m, reported by <pflm52td@w6.dion.ne.jp> in
+  bug #154759
 
   19 May 2006; Thomas Cort <tcort@gentoo.org> emacs-w3m-1.4.4-r1.ebuild:
   Stable on alpha wrt Bug #127429.

diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 737577a45727c40c0e941097cfeba656a3f1b223..84063e5bac72f8b4d3356c903e4ba7ca0fea3dcd 100644 (file)
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,14 +1,65 @@
-MD5 b13e9f23d846de1d3abcb9e554c7fd46 ChangeLog 6447
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 70emacs-w3m-gentoo.el 605 RMD160 1fcae926280f1edd35c1f5134ecd194e15a8d825 SHA1 ee6bbb11a4b0de0cf974677eda884f4e00810953 SHA256 211c4e257142482667b071c5c7c56936e758911ec6532635eedc3b6226904ef3
+MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
+RMD160 1fcae926280f1edd35c1f5134ecd194e15a8d825 files/70emacs-w3m-gentoo.el 605
+SHA256 211c4e257142482667b071c5c7c56936e758911ec6532635eedc3b6226904ef3 files/70emacs-w3m-gentoo.el 605
+AUX emacs-w3m-1.4.3-e23.diff 1048 RMD160 1674b705d4e26befa686f804f27bd5012a1c08ab SHA1 210a009b78684fc7a25e4403ad310f9d9f42d400 SHA256 341eecc26c07090e95dbba13866eb44f9054211b91b49311f0083f15c8527349
+MD5 a6227ba936faf41fe9c67abc735b06c7 files/emacs-w3m-1.4.3-e23.diff 1048
+RMD160 1674b705d4e26befa686f804f27bd5012a1c08ab files/emacs-w3m-1.4.3-e23.diff 1048
+SHA256 341eecc26c07090e95dbba13866eb44f9054211b91b49311f0083f15c8527349 files/emacs-w3m-1.4.3-e23.diff 1048
+DIST emacs-w3m-1.3.6.tar.gz 569994 RMD160 5012ac42b7223d20afd5550ad4b167717907a056 SHA256 fb0e344209a6a5123370d9e39b0af31eae29a286d370b4a63ebb4d77117c784c
+DIST emacs-w3m-1.4.3.tar.gz 725109 RMD160 7359676cf25a221c671e0c6f518ac0c779f8a9e5 SHA256 91b6edf9efa1086e5db753acb6b03277390888883e08b4cdc8b2ed411648facb
+DIST emacs-w3m-1.4.4.tar.gz 796123 RMD160 d57a1296bcfcb422c379c9e8f35311ff2ac7d702 SHA1 e7b85e5af9d05fbb836c49b75b9aa76d90bbbde8 SHA256 a3e5e8374f7cfcedd5107feec84659248aad52fa302dec1e85f48529e71c77a4
+DIST w3m-e23.el.gz 7689 RMD160 2fa9e515782481680c597d67646ab346d971608e SHA256 446ad60ba39e538fd5c8137f2b7a598f7adac965f8b6f12c0bab6c950aea0fc9
+EBUILD emacs-w3m-1.3.6.ebuild 1532 RMD160 8b679701104a6b0cea33838d1fa23397f7827462 SHA1 4b0fd6e4c709d343db53f6962b6a02c7ec71db92 SHA256 03184a1cf2e0eb3c1ed2d5e0d218134abc47123ed8138b80cb69562571ec1d48
 MD5 7deaac185fc43a11f5a61d9c77ce74bc emacs-w3m-1.3.6.ebuild 1532
+RMD160 8b679701104a6b0cea33838d1fa23397f7827462 emacs-w3m-1.3.6.ebuild 1532
+SHA256 03184a1cf2e0eb3c1ed2d5e0d218134abc47123ed8138b80cb69562571ec1d48 emacs-w3m-1.3.6.ebuild 1532
+EBUILD emacs-w3m-1.4.3-r2.ebuild 1706 RMD160 110e4341d2ebd8aff54aee391f1840eafb93018c SHA1 a4c8f9e0de8c542e7e703a86edce74d2618c3d95 SHA256 081c6b18e163b30fe6efa30a3a79f8675b711a3153d5f2080495545ebb861ee6
 MD5 aeadb3c65c5fa0cbf5489ca07e155fd1 emacs-w3m-1.4.3-r2.ebuild 1706
+RMD160 110e4341d2ebd8aff54aee391f1840eafb93018c emacs-w3m-1.4.3-r2.ebuild 1706
+SHA256 081c6b18e163b30fe6efa30a3a79f8675b711a3153d5f2080495545ebb861ee6 emacs-w3m-1.4.3-r2.ebuild 1706
+EBUILD emacs-w3m-1.4.3.ebuild 1564 RMD160 3dd589a4aae82b5f12ace9db6bbc2cae204f5d4a SHA1 adaac97ce204032c841a4671ff227f3ebb6070a0 SHA256 30e1eb9cbeefedc0c88651d78c8abdfb4acf9395efd1942b0972f8a78de92583
 MD5 be681fa523c844480ea9f2ec7d40479c emacs-w3m-1.4.3.ebuild 1564
-MD5 f83939f3745366acd504a8118d720c66 emacs-w3m-1.4.4-r1.ebuild 1428
+RMD160 3dd589a4aae82b5f12ace9db6bbc2cae204f5d4a emacs-w3m-1.4.3.ebuild 1564
+SHA256 30e1eb9cbeefedc0c88651d78c8abdfb4acf9395efd1942b0972f8a78de92583 emacs-w3m-1.4.3.ebuild 1564
+EBUILD emacs-w3m-1.4.4-r1.ebuild 1475 RMD160 b89c962f1a9d21234288e06c49212b60e99ccb17 SHA1 a81d09835ab6e7e6be1b9272001fcf2e556813a7 SHA256 92168968911d82ea563327cf63a0c4d04c175ad18c1914cf6703c61207cd066d
+MD5 9a01110ab4824abf5c15d7adf1acd934 emacs-w3m-1.4.4-r1.ebuild 1475
+RMD160 b89c962f1a9d21234288e06c49212b60e99ccb17 emacs-w3m-1.4.4-r1.ebuild 1475
+SHA256 92168968911d82ea563327cf63a0c4d04c175ad18c1914cf6703c61207cd066d emacs-w3m-1.4.4-r1.ebuild 1475
+EBUILD emacs-w3m-1.4.4.ebuild 1552 RMD160 3c9e871b688a9f1f4ab48d76127964073fa6ed0e SHA1 cd87dd03c7ff4ba290e12b0abd46802f6ed41401 SHA256 aa7ee184369b772c1ebc5d320e2d817a2916b635882971fd2fde77debd6b8366
 MD5 3fbb27f7e279c659e4ce9086bcd2cf5c emacs-w3m-1.4.4.ebuild 1552
-MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
+RMD160 3c9e871b688a9f1f4ab48d76127964073fa6ed0e emacs-w3m-1.4.4.ebuild 1552
+SHA256 aa7ee184369b772c1ebc5d320e2d817a2916b635882971fd2fde77debd6b8366 emacs-w3m-1.4.4.ebuild 1552
+MISC ChangeLog 6624 RMD160 ea6075ac67353d31126fd05f54057d36f8cc08dc SHA1 898e7572b51a91adf20ef14af2ca05680e49d3c1 SHA256 9d4a933d51ccdc1fd4f6bf6d62da649b4fa1093b9550f687f123af7b61289804
+MD5 bbce13779fa02bae2c35ad7ec8fbba3d ChangeLog 6624
+RMD160 ea6075ac67353d31126fd05f54057d36f8cc08dc ChangeLog 6624
+SHA256 9d4a933d51ccdc1fd4f6bf6d62da649b4fa1093b9550f687f123af7b61289804 ChangeLog 6624
+MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
 MD5 c2f333ff5388cab135f740983a3d6ec8 files/digest-emacs-w3m-1.3.6 247
+RMD160 1ca9fb59a644d0b7778eca1fab213f72d831add9 files/digest-emacs-w3m-1.3.6 247
+SHA256 648181edd38e14cdc2e5b3c6c26e46e47ff418c77cc99f78c28c9dc5a8b60617 files/digest-emacs-w3m-1.3.6 247
 MD5 f668d76456716dcdf7b3dc85824a5500 files/digest-emacs-w3m-1.4.3 247
+RMD160 037b215fcac4d562d21c25acbf580604284b1060 files/digest-emacs-w3m-1.4.3 247
+SHA256 f4342319559278d6cffa3b0751b2fd16817d80ce903ca6e18c3f05eba727500e files/digest-emacs-w3m-1.4.3 247
 MD5 3998a4568c94b0e99edaf7716a80f5f5 files/digest-emacs-w3m-1.4.3-r2 461
+RMD160 1e88ea14d4fe66f8d5b9ad4e0df2774193399a57 files/digest-emacs-w3m-1.4.3-r2 461
+SHA256 db27a9a979a125b09dd0ebb08ce77906daaff8b8370f94da3c39f871bc3c30d4 files/digest-emacs-w3m-1.4.3-r2 461
 MD5 e83acc72e359bcde575e4e5135ebcf89 files/digest-emacs-w3m-1.4.4 247
+RMD160 5b5a7b50ba790fd51a2ff8399012ebfb72f4405f files/digest-emacs-w3m-1.4.4 247
+SHA256 66ed27e28474a85c04daf6152362b95f8bc726c4d0fbc616726df862ccc49455 files/digest-emacs-w3m-1.4.4 247
 MD5 e83acc72e359bcde575e4e5135ebcf89 files/digest-emacs-w3m-1.4.4-r1 247
-MD5 a6227ba936faf41fe9c67abc735b06c7 files/emacs-w3m-1.4.3-e23.diff 1048
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 5b5a7b50ba790fd51a2ff8399012ebfb72f4405f files/digest-emacs-w3m-1.4.4-r1 247
+SHA256 66ed27e28474a85c04daf6152362b95f8bc726c4d0fbc616726df862ccc49455 files/digest-emacs-w3m-1.4.4-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFXYzuNQqtfCuFneMRArAOAJoCpjZwklRq4TE+Uj9IyNeapyZ3MQCeKAVK
+P1u5E+7xGFkWQaOXOxaUvI0=
+=1y9V
+-----END PGP SIGNATURE-----

diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild
index dff91248b2ce74ff644ec73fcb3e068ded6da7cc..abd4a0b23d132337e7645e0a39da0aecd4bb95f6 100644 (file)
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild,v 1.5 2006/05/19 23:01:45 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild,v 1.6 2006/11/17 10:18:09 opfer Exp $
 
 inherit elisp eutils
 
@@ -19,9 +19,11 @@ KEYWORDS="alpha ~amd64 ppc sparc x86"
 DEPEND="virtual/w3m"
 
 pkg_setup() {
-       if built_with_use www-client/w3m async; then
+       if has_version www-client/w3m; then
+          if built_with_use www-client/w3m async; then
                eerror "emacs-w3m hangs if you build w3m with async support."
                die "re-emerge www-client/w3m with USE=\"-async\""
+          fi
        fi
 }