Better handling of the case where www-client/w3m is built with "async" in USE; Resolves Bug #127429.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 109 insertions, 8 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 5d83d2588092..579a1ea3ad47 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/emacs-w3m
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.37 2005/09/17 15:15:42 kloeri Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.38 2006/04/26 17:16:32 mkennedy Exp $
+
+*emacs-w3m-1.4.4-r1 (26 Apr 2006)
+
+  26 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +emacs-w3m-1.4.4-r1.ebuild:
+  Better handling of the case where www-client/w3m is built with "async" in
+  USE; Resolves Bug #127429.
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> emacs-w3m-1.4.4.ebuild:
   Stable on alpha.
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 379a6b6901ac..96c9ac979ba9 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,22 +1,52 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 3ea5898fe91a5a89713c09ceb8c0f6fc ChangeLog 5490
+RMD160 427aaefd92ddcb191ca3af75b37daf2140b8694a ChangeLog 5490
+SHA256 4628d09295ba55891d06af25d1d5cf453989442e9eaed1a6b5d1bfa7858551c3 ChangeLog 5490
 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
 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
 MD5 be681fa523c844480ea9f2ec7d40479c emacs-w3m-1.4.3.ebuild 1564
+RMD160 3dd589a4aae82b5f12ace9db6bbc2cae204f5d4a emacs-w3m-1.4.3.ebuild 1564
+SHA256 30e1eb9cbeefedc0c88651d78c8abdfb4acf9395efd1942b0972f8a78de92583 emacs-w3m-1.4.3.ebuild 1564
+MD5 a059cc30185dfcb2649ae8529295a038 emacs-w3m-1.4.4-r1.ebuild 1435
+RMD160 19c2ed451b6ab71fb77ea65691b72b86684a52f4 emacs-w3m-1.4.4-r1.ebuild 1435
+SHA256 27f00b422b3178e726cfeabfb15ceb6cadb1d783657bf07f5501c3b6d2898581 emacs-w3m-1.4.4-r1.ebuild 1435
 MD5 3fbb27f7e279c659e4ce9086bcd2cf5c emacs-w3m-1.4.4.ebuild 1552
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 c9d8dab0dd3b51ef80b863c9dcbbb037 ChangeLog 5264
+RMD160 3c9e871b688a9f1f4ab48d76127964073fa6ed0e emacs-w3m-1.4.4.ebuild 1552
+SHA256 aa7ee184369b772c1ebc5d320e2d817a2916b635882971fd2fde77debd6b8366 emacs-w3m-1.4.4.ebuild 1552
 MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
+RMD160 1fcae926280f1edd35c1f5134ecd194e15a8d825 files/70emacs-w3m-gentoo.el 605
+SHA256 211c4e257142482667b071c5c7c56936e758911ec6532635eedc3b6226904ef3 files/70emacs-w3m-gentoo.el 605
 MD5 51951f89d5a4c0bed84788a881adc286 files/digest-emacs-w3m-1.3.6 67
+RMD160 c0bf36847a3d5b06509522cae51ebc328bd4c7f2 files/digest-emacs-w3m-1.3.6 67
+SHA256 53f8b78cecaaf220e6111d2f500b78efce9b26055c6d5b30afc9d40aebf27bac files/digest-emacs-w3m-1.3.6 67
 MD5 1a86c5bfcbb063dad0683ef554222234 files/digest-emacs-w3m-1.4.3 67
+RMD160 07da1745999fb735a179fd2318b489b1a8fbfaf9 files/digest-emacs-w3m-1.4.3 67
+SHA256 aa4fe4cfb75989d0c249961cd77854ff2d666aa9a0d593ec7ecf3511ee9c77dc files/digest-emacs-w3m-1.4.3 67
 MD5 844c0dc28b4157331c3dab94c9adecd7 files/digest-emacs-w3m-1.4.3-r2 123
+RMD160 615a1775e39d74f1c3d1d7a2b9a2d066f9b91ae8 files/digest-emacs-w3m-1.4.3-r2 123
+SHA256 22ed5492e8d6ae49370878e4472e78adf8e29a7664fa8c8234dd40101e89e717 files/digest-emacs-w3m-1.4.3-r2 123
 MD5 399b14135c7df63ea110530a7b2c1cc3 files/digest-emacs-w3m-1.4.4 67
+RMD160 47ba772ef8d97d1570141c9578de29f06b0a7437 files/digest-emacs-w3m-1.4.4 67
+SHA256 adbba6a2b1ce99b2a98c1f667eeb22006b13c321c4c6e9b1dff081ed9078b172 files/digest-emacs-w3m-1.4.4 67
+MD5 e83acc72e359bcde575e4e5135ebcf89 files/digest-emacs-w3m-1.4.4-r1 247
+RMD160 5b5a7b50ba790fd51a2ff8399012ebfb72f4405f files/digest-emacs-w3m-1.4.4-r1 247
+SHA256 37b8272dba71025b4bc410d552572e003d380928a21ea16431019c7ce9734dc0 files/digest-emacs-w3m-1.4.4-r1 247
 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
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDLDM2Kf2g/qXtneoRAvNJAJ9g2p1GvFr2spoPrYnOgP0yMvrzlwCcDjKq
-/ILGB1I2JyUHLZikX3jJwPY=
-=fij8
+iD8DBQFET6r7yiNZaEAZA+ARAovqAJ4nY9yyM/dDOdNpL8T5E/auXUe7rACgg332
+uzsT0gWbFXJ8SN3e2jiHAwE=
+=8lvp
 -----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
new file mode 100644
index 000000000000..f3e5fe12db0d
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r1.ebuild
@@ -0,0 +1,61 @@
+# 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.1 2006/04/26 17:16:32 mkennedy Exp $
+
+inherit elisp eutils
+
+IUSE=""
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs."
+HOMEPAGE="http://emacs-w3m.namazu.org"
+SRC_URI="http://emacs-w3m.namazu.org/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="virtual/w3m"
+
+pkg_setup() {
+	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
+}
+
+src_compile() {
+	./configure --prefix=/usr \
+		--with-lispdir=${SITELISP}/${PN} \
+		--with-icondir=/usr/share/${PN}/icon
+
+	make || die
+}
+
+src_install () {
+	make lispdir=${D}/${SITELISP}/${PN} \
+		infodir=${D}/usr/share/info \
+		ICONDIR=${D}/usr/share/${PN}/icon \
+		install || die
+
+	make lispdir=${D}/${SITELISP}/${PN} \
+		ICONDIR=${D}/usr/share/${PN}/icon \
+		install-icons || die
+
+	elisp-site-file-install ${FILESDIR}/70emacs-w3m-gentoo.el
+
+	dodoc ChangeLog* README*
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	einfo "Please see /usr/share/doc/${P}/README.gz."
+	einfo
+	einfo "If you want to use shimbun library, please emerge app-emacs/apel and app-emacs/flim."
+	einfo
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r1 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r1
new file mode 100644
index 000000000000..299af32318ec
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r1
@@ -0,0 +1,3 @@
+MD5 6e592a9c0ab22fb532ebc3bcb21a45b1 emacs-w3m-1.4.4.tar.gz 796123
+RMD160 d57a1296bcfcb422c379c9e8f35311ff2ac7d702 emacs-w3m-1.4.4.tar.gz 796123
+SHA256 a3e5e8374f7cfcedd5107feec84659248aad52fa302dec1e85f48529e71c77a4 emacs-w3m-1.4.4.tar.gz 796123