Make ebuild use /compat/linux/proc on FreeBSD; Keyword ~x64-freebsd

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 70 insertions, 17 deletions

diff --git a/sys-process/htop/ChangeLog b/sys-process/htop/ChangeLog
index c84d54691156..360e4680921d 100644
--- a/sys-process/htop/ChangeLog
+++ b/sys-process/htop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/htop
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.119 2012/07/12 18:14:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/ChangeLog,v 1.120 2012/08/05 08:34:11 ryao Exp $
+
+*htop-1.0.1-r1 (05 Aug 2012)
+
+  05 Aug 2012; Richard Yao <ryao@gentoo.org> +htop-1.0.1-r1.ebuild,
+  htop-1.0.1.ebuild:
+  Make ebuild use /compat/linux/proc on FreeBSD; Keyword ~x64-freebsd
 
   12 Jul 2012; Christian Ruppert <idl0r@gentoo.org> htop-1.0.1.ebuild:
   Inherit autotools eclass for the auto* dependencies
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index ad3a6b3895ae..b8f5172bcc86 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,24 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX htop-0.9-debug.patch 1001 SHA256 fe2600badc33e7fee7f75f8a5bfd4d4b78619bc2a17d6302c7469d7d39fdb1db SHA512 e59882e1b19d74fbcf8582a04eb177a8784fa4923b2e38e225bc5a9b31b95fb93294aa77b0601776f5bc624a5b08e4442834cb01ae37837561115755399c3158 WHIRLPOOL d450da30f9848b7f3c152a222e203f4d9c88883d74296ecbd2a944466cf69897e9e00aea4b0b00468eb78453a40b9fefca85bdf818ffd460198ef8f553686e52
 AUX htop-0.9-small-width.patch 1117 SHA256 1a21490b9d72774c30abb386f20fbdd7e6ebe5bb3e31034bd99f9033d01f5efa SHA512 e391750057b538d354180449751955978ed35d0e42836e0c6e3018b90185e75189c4ae50aaf7357bb34329daf7962ef5e93d49a678a2ae0c6129005e9664ace2 WHIRLPOOL 2a759d1f312c5c2ae8924bbe0c586ee06929e7dfcc76b5530fd1a1ff5b80a4802fb9ec0779e5b84720030fd8b4140dfed5e56544519388ec3610454ef087ad1d
 AUX htop-0.9-uclibc.patch 1423 SHA256 3e37b5166048011168238ff72e3a26b53a4c1e0d2730555598fcb2ab3ee3a3f6 SHA512 832ece72fc8a9540fde67b3cad48231294d5c2b598b8c5f0751c6a32ac5128ab7b6f5c61250b45d7b2e1eb3a71221f5741c906f585c0d3cee048569b55cbf7ea WHIRLPOOL 90639e1fc4e4c460396147033e27b2c404faad778a55aab40012d6fb828b3c414d852bad350de8db763c72510222ba52efea978e3a6c91164ef1d29a88ac0bc5
 DIST htop-0.9.tar.gz 418767 SHA256 4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd
 DIST htop-1.0.1.tar.gz 384683 SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2 SHA512 9cc442fd63fb3270929e489f645d1a63fdcba2bee4ea0e606a86257badb55fa02794b7a97de4070c951f5558b7d40a677e10801a1c42c0832521a453f956997c WHIRLPOOL 4091088071cc247fead93df788a5ecb64ce32d026e4119276acce7a91a5061561700dbb26236b17ea51b399829b60654e059ca3124f74892ab507efae370053b
 EBUILD htop-0.9-r2.ebuild 1750 SHA256 756f2f9a474d648e842c58243d592ee97fd41bb206c5bec5b5cac5369fc6b2b6 SHA512 52c03d176b621cb600cf9976f20a080c1e403263d170b27bebd7d37839d992f38ccf00ad5cf3f4a2df487a6ed428389aac4b91444dcf0d5f80b5634e25daef0e WHIRLPOOL 88740cae6287777cbd4850cdb7a471862d1d71405996240d0c889ae9ea69f382d0b76d1cc4828876350f960a0446962b1c9b2d19717c086b9036979dcc513228
+EBUILD htop-1.0.1-r1.ebuild 1859 SHA256 7774e87ba8459c4c7f7fc2770eda1364b20ef41601e140b75b1b086c01e24808 SHA512 a6fd97d4b407980747996ee3cf240010f2a98d735678feb94cb75234a189066b23f363de620ec168b18a23d1a53d31caa2d4105a49590451967e605fbcfb533c WHIRLPOOL 77a1a452bfdcc02d2a16f78f36151e7fb2d85c433ce92cc82cc762cb3b434e8cb51d3d00a577a6147a4535faa5d04b03e13fae046c02457b605e7c7e0b6bc3ac
 EBUILD htop-1.0.1.ebuild 1554 SHA256 6b8dc12916eeeccabc9ebffcfac21c4ff0f18eedf60e4d87703c35fcb99ab941 SHA512 3bc242fd6d3d25d621e2edb18df82bf48b954057b04dbdcfa04fe0102132c689b32148218254ce2a5ae085c70af9141b0cfa1e676f5a1d6162967d65414abc1c WHIRLPOOL 6e8dc59815e71a728dc3d872cd5c25bf8efd2ef86c344754b69310e3c06b1747121f9dd2a5fe605575082dd50fb1435f088327689c2a0b319a11c41e651f8fcd
-MISC ChangeLog 15883 SHA256 2b6569b6c89cd9ddb4e7589ef354c5ce6617781651db62af7971e37c36b4592d SHA512 ba76cff6b89281fe8f9b02fc3476cc56d3a36f2222396e33afae365967bd309f7ad771c98f1b4a79d74139ff4d80b16224e63b509b96478614aa7c1dd1c8fedb WHIRLPOOL 09fea832671f547543d20a9031d28a1eabc05ef32cf188698d0ac5765bdcb6112026b863ea65d9624c4329bc089311ff774cc8708495007ff3e8821a138ea806
-MISC core 2236416 SHA256 e6299c9f5ab7e2cc559be1bdf6a4d06cf12f11d697ed2d57d90d6655930bbb36 SHA512 14ec26ec8eac6949c462d114d57f9223a12f9c5e1342dc80f1ace4a6ea24bdf7127357774694c0a0ac4245f4fdfcc1cf63be76f8422efd3aac45f03af6dabdea WHIRLPOOL e2d824fbc92b85c6f9325e6dee6e1c807ba8859d5315312c0ef56002ad7e7c0daca58ee0105b2c4da7fb9039c6d07c68a1ea426339284a4dd42fdf1c0a1b6515
+MISC ChangeLog 16072 SHA256 c01e33e96e071bb9cf4ffcc0f5007034c13c85ee30ff8e3df79f260b3a6e4c8a SHA512 253eb3fbddfc228d0354bb7c5e0d49febac3874302f836708b95036f3a17d54e300017ba0a9002eb103aafa911a5c6be92af02866df037aba7fd98d2f883cd1f WHIRLPOOL 6f1328acb0d647c35ab48013cde20e7023ff5580657fa3f72050a7926bb4a4c3f915657566c06388bb279379bd768003dcf91acdd559eeba534f9ae2b9fa9c65
 MISC metadata.xml 624 SHA256 ea0be2cf5721cb1d68215f060919177204937290083dd2635b45d043095838ec SHA512 1e4871bb46014b82071ffb3f3535c93f334fed90217ceef32d880f14c754167c5b13aaa990c585b09d7ca12a93509411ea7e362d0e1d71a63144afd709456dbf WHIRLPOOL 2cca5290c631769f9f53d6c1dd2155bffe0b0b12b33319c050898b7281f47c90a54bb72dd74937b35e930f7d6bce4b70eb172aacddf5143c73091d2daf9ca7bf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJP/xRVAAoJEMOx0zmdw4Z1hucIAL/3U2JBRm13y/zqwsLX8pyg
-B9zlPXA11D1SRaBl2idYFnQNoy3z3t4VhLN45h6f3TyztcDQ8Mp0lANpTF1RNMcP
-V19ovkJ1va3rc15cAFE/5S4EhXlefN0Phhzz/5Bi4+MjH1KingBUnJd5phPKH4bu
-eXFiWKlAG/rpkw56HVCBdaxEnEfk3vlK8l54PlfCX0jTWK7dRIU1vLSBadtAd4Hh
-YfYeuScoZ4JDavBZRui4B6f9HM58J1/VjiNpl+QWcrGy/uwwCorbmH7iehV3hhqR
-bk21u0YBesd/hztVw1M7S5zfT2flYVnnsNvL3qnhLhusjOh6cQ3DchCaknQBnvU=
-=C34Q
------END PGP SIGNATURE-----
diff --git a/sys-process/htop/htop-1.0.1-r1.ebuild b/sys-process/htop/htop-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..0391044db3d4
--- /dev/null
+++ b/sys-process/htop/htop-1.0.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1-r1.ebuild,v 1.1 2012/08/05 08:34:11 ryao Exp $
+
+EAPI=4
+
+# autotools for auto* dependencies
+inherit autotools
+
+DESCRIPTION="interactive process viewer"
+HOMEPAGE="http://htop.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
+
+RDEPEND="sys-libs/ncurses[unicode?]"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README )
+
+pkg_setup() {
+	if use kernel_FreeBSD && ! [[ -f ${ROOT}/compat/linux/proc/stat && -f ${ROOT}/compat/linux/proc/meminfo ]]; then
+		eerror
+		eerror "htop requires linprocfs mounted at /compat/linux/proc to build and function."
+		eerror "To mount it, type:"
+		[ -d /compat/linux/proc ] || eerror "mkdir -p /compat/linux/proc"
+		eerror "mount -t linprocfs none /compat/linux/proc"
+		eerror "Alternatively, place this information into /etc/fstab"
+		eerror
+		die "htop needs /compat/linux/proc mounted"
+	fi
+
+	if ! has_version sys-process/lsof; then
+		ewarn "To use lsof features in htop(what processes are accessing"
+		ewarn "what files), you must have sys-process/lsof installed."
+	fi
+}
+
+src_prepare() {
+	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
+		scripts/MakeHeader.py || die
+}
+
+src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
+
+	myconf=''
+
+	use kernel_FreeBSD && myconf="${myconf} --with-proc=/compat/linux/proc"
+
+	econf \
+		$(use_enable openvz) \
+		$(use_enable kernel_linux cgroup) \
+		$(use_enable vserver) \
+		$(use_enable unicode) \
+		--enable-taskstats \
+		${myconf}
+}