orangefs: version bump, remove old

5 files changed, 30 insertions, 25 deletions

diff --git a/sys-cluster/orangefs/ChangeLog b/sys-cluster/orangefs/ChangeLog
index eef3a24..f766acd 100644
--- a/sys-cluster/orangefs/ChangeLog
+++ b/sys-cluster/orangefs/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*orangefs-2.8.7 (14 Sep 2013)
+
+  14 Sep 2013; Andrew Savchenko <bircoph@gmail.com> -orangefs-2.8.6-r4.ebuild,
+  orangefs-2.8.6-r5.ebuild, +orangefs-2.8.7.ebuild, -files/README.Gentoo,
+  +files/README.gentoo:
+  Version bump. Use readme.gentoo eclass for useful, but large in
+  size information. Remove old.
+
 *orangefs-2.8.6-r5 (04 Feb 2013)
 
   04 Feb 2013; Andrew Savchenko <bircoph@gmail.com> -orangefs-2.8.5-r1.ebuild,
diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest
index e876d3c..9644c36 100644
--- a/sys-cluster/orangefs/Manifest
+++ b/sys-cluster/orangefs/Manifest
@@ -1,4 +1,4 @@
-AUX README.Gentoo 5236 SHA256 41de23798dbf8d8d4a8d733e36365b1179b0b898bc0cbb156764af46a9174aa9 SHA512 539eec804c08a20a55fe089c921b84ba00388c7a4b07a08f3fc13543e71f032bb6e57cd0dda0feffee3593db57ad430fc4527779ad94053a8dfffb74ff06e4d4 WHIRLPOOL 96153271a6b0b35b67a041dd1f84a28cfce3788e25da33f0e5fa9f052d5daafe55816707da4a3f7f7facb9c7ba18cedecdc2051e2f7eda60b151ddf07b43ded5
+AUX README.gentoo 5236 SHA256 41de23798dbf8d8d4a8d733e36365b1179b0b898bc0cbb156764af46a9174aa9 SHA512 539eec804c08a20a55fe089c921b84ba00388c7a4b07a08f3fc13543e71f032bb6e57cd0dda0feffee3593db57ad430fc4527779ad94053a8dfffb74ff06e4d4 WHIRLPOOL 96153271a6b0b35b67a041dd1f84a28cfce3788e25da33f0e5fa9f052d5daafe55816707da4a3f7f7facb9c7ba18cedecdc2051e2f7eda60b151ddf07b43ded5
 AUX orangefs-2.8.5-split-kernapps.patch 571 SHA256 fe66b4f82e13c19d11fe002a15f75f251af336055fae37cbb8c2ea57f795f7d8 SHA512 0d74b2738377ab87469f5d17ba49bd364d64940e5c8ea7081ad7eb34d9ca95c48b8a8cb4ffcd294584b665d499e213e63e3055e5dd602a69ae551ef8b5fe80e1 WHIRLPOOL 779e1e79df459142a3bd2ab1d02ac9c1cf90d149cf6f3a0dd771022d2dfc1b199358f045d332efb733fae2e34df1b4bd5c93b1a9422e2a3a118f70b549ebf9b8
 AUX orangefs-2.8.6-layout.patch 4407 SHA256 5bb0646fa483fc4eb51ae71d3a1fc9e3cc43e0b1a525e8fd3939c6eddf2561a1 SHA512 8d8d463bc302382d612dc9515adf3ece4523f7f1039338a57a6f1dc3f35490c441031dd2539d4a3f80e4f4c0b4ea5ee2354e26a7942f156aa8fe59d6a2617630 WHIRLPOOL 1473407bd68a32b3a50499fa9abea4ef394cf5ed38b4a39a45e4b45d4ca0233f725b8d2fac816901044b51085753c818d70066f14b47402945dfc030178174ed
 AUX pvfs2-client-conf.d 2206 SHA256 d312252ae96254b983aa0a27ea5c855298f0910020e843334bf06d34347599a5 SHA512 8daff31699cf9df87a21bd87d7c9695d27f5d83b6a1fbb0ca2a467c0bd3fef5c58a1f7fb21f48469a6a5457c5abff05733c0e007bb112519eaa8076b35ff85ec WHIRLPOOL d8a985aac965b4eacd0a36151202d9dec65faeeee34ee895ab1a023c89837139b49a2fdd6ef52f74b829717e36f864349a7d68ce8887bf7bc67cf03463e11ebd
@@ -7,7 +7,8 @@ AUX pvfs2-server-conf.d 846 SHA256 ee0a05a593e4d78b867aa7ef008dbd553c02bb97c2bfe
 AUX pvfs2-server-init.d 4484 SHA256 644dbe0e7a276e383a79c9ce2fea1a3cd69bedd96232559fae9526d42a38af2e SHA512 2b151e3db540a551b42d09091f786f9795abbfa0d00d56c9683e7f1426d96f0b079df02f93a8e3cb9bb3fe4fdc2bbb8cf90e75fe7d1b342e5fea2a2c5d67997f WHIRLPOOL aa997fae27cc3f838ea84e9016ac1be7a49f049ceba521d952c440531d5fcc4b6f8812f2e0ed7ba30d353ec94148c648e90c6edb74ddb92648f7e09ce4dc6665
 DIST orangefs-2.8.6-r9510.patch.xz 96440 SHA256 d47663f44cc92fafdf77fcf4d2a71a2e4311a651f6764408dc76ab211f39d26b SHA512 25ef9bd1ed36b5e723858e6005d439ab9a3ab5f6c8fb6f9b736dcdccc85c4737a7044a453e322aaf3911f62e7059b001b1da69b5daae3c79c16a36109103745f WHIRLPOOL 38f3d20f0c8fff93fc520ecbf58fc03e9f2540c181c27f562d1ef0c12e0e130f863084531b3acae6a34f82f72d0b1f9d8c02c184614e89f32fde39acfcf5d9f4
 DIST orangefs-2.8.6.tar.gz 2778466 SHA256 cc2a9df9750abe6ea97c9e6259083a45d22d8cbf56bc4a8c35376940ba8108f8 SHA512 0eb22b217fdfc4bd1384551bbe4c946223eba09db1dae361204cc3624abc0c681a1b99265f7b2c01034fbdcb3d52a5366f43e941639ef7ee5c2ce0bccc140697 WHIRLPOOL f8ac9dccc0bd7f76978173f501e58ed92d75d280198e1426bdd3fa8953821c9dc47dbd088ea5d5b546bee7c330e8e3edb55d2829ee61e04980e58cbd8122fdc5
-EBUILD orangefs-2.8.6-r4.ebuild 7339 SHA256 404cd28e21d04e6e2a5cd16ab03444445c2d8a53c47fd03a3a0613e8a3f38d83 SHA512 d70b9cb510d6024901e7c9d9bb7d1260d6907f6411253bb15992e7c748e5fea988a826ef2413afc52334d1ec7d09d5b3aae187f7cbde3cd144bf971291494e4d WHIRLPOOL 94e5e7df3b2b93b722bdadd703a57755c8cc5079a07e57c173911debd7e2bbbe49338c529445d9af5ab81b9c3f6d814d999085425e900b68f6f05567017abccc
-EBUILD orangefs-2.8.6-r5.ebuild 7396 SHA256 b6a25ef2667133e51f3af41ea450646722ea96893ebb660a691e9c1666180ce5 SHA512 297199c6a748fed24499152f27b316b22668f0b4d68323bd26c4941e8435619b3e5156367942a9f26952cfb435727985084a5e242395aa325a1aaf51c7cf78bc WHIRLPOOL 673c8f20370eac8a7912fceb4f73b2e53642dff28bfacccc53b25d2220fdbd179cb468a244aff3e2d18d99233153e68f4c2d4cc5d7980d76f443482c7cd17435
-MISC ChangeLog 8447 SHA256 0241d5fe6065f7051c349489e086c82e7c84d38b497e12dbe17a3d2287bbf757 SHA512 1c8938fe68761f3d4e4f71012db1113f7d45597f0f0038744e669718ae15c26ebac96e0b694797f0ffa5a3b8d17a7aea5c5c9feaf5c5b1c6087c7365c9f14d85 WHIRLPOOL a07bbef2663f61a48012e5fddbd4b988e553d2ca745acc12f3ca37c58b4e66de8b2de4fc737cbf1003f12e481b0ae625d4dfb7796e884657429a1b3c3cf2c4a4
+DIST orangefs-2.8.7.tar.gz 2987688 SHA256 9a441af7ff2f47da816b1d458c52a60493edcdcfee50019a4ade4cdb14e2e57d SHA512 071c92dc93e2e1cd1db9808d22489b1b22eb2279836a6f91271a555fcf157ac7a9ebe6fdce714edb47ee34feea8ae0d11b40bf84788c37082ad6a956a87f8668 WHIRLPOOL b157dda9589cce9eebe9901a71001c859c5ba4bc803b17749a6fa5ec786f163562577d2553a13a1d5b40dddcafef61bc272c0fd7e2bd1b5a3f02c0f3ee834872
+EBUILD orangefs-2.8.6-r5.ebuild 7396 SHA256 e61212b1bfc435d36fc055d56379efa07d525e6425b154be7ac85c68c5b5e25a SHA512 b8d61133fac53a512ffc78ddbe75d75ec14b1aca814eddec0a520e23841a15fdf08f6c97db076daa44f008870f2bdaf60f123cb4c635a66e559de9eadd0ceb2f WHIRLPOOL 76b1d5f5e2f50db8237cec2d05a0ba8dc4750d9c6790fdb04f43eeb83025dd98a72868490e441e2aab563130ac6ad2a3097d9da82ad1cf8ee193da58c7fed294
+EBUILD orangefs-2.8.7.ebuild 7053 SHA256 057c4299be7c5a34e618cbf6f1e10b2a8a9a6e7990d1bc4b317caba8abdedfc9 SHA512 eec4b280c0a3de78e23a71b07f3c640cbb6423333dc1fb31381ce17c627c7115df5a06ae46ff69a6faba2eee8825dff4dfcf4be3e2b049b3305716308103532f WHIRLPOOL 1ff9ecb54583f095c3e668de5f21bd220461e8c15ac6667e45a459fe64a1888e55a4499c070bcef72e27849828d95db5aaee36593809d75c8dd766f218da251f
+MISC ChangeLog 8754 SHA256 e437585e04e710582da55f2bb54c1a12d80add505f11381cbe414e91364836e1 SHA512 ca65f8508d812a65476259ce1a274e5dc88c34e9379f615e99d629ce0dcf57e3407b83f708dcfde6d287c4deee054cdcbe4360a050914bf1a296d21b4541bd37 WHIRLPOOL 735cd03ac9fc4ccc42195757b5f932862dbd96b92fc58f580b9b4c69a953585e58cdb1229284f3735341e89bd7fd004f30999270c969deb548ae5221ed743511
 MISC metadata.xml 1981 SHA256 748a22a5347c060acc9aa5a09f3c36efc78aecccefcbdab1a6e65bba2bd10e12 SHA512 8a9247e9f21ff51de8739b5830c827fa97b3ba14c60751f9d1ab105ef731332743514b28d3cf4638b09d2913c56bcc4935069f9925f06f0b9c400cd786254bf4 WHIRLPOOL 7107788a3522ff9fa8000ab963cc217aa397d5ef31fa778798ff9832df59280268415160cd293c8474d91ca405f744f0073afdf48331dd466cb819ae14f17794
diff --git a/sys-cluster/orangefs/files/README.Gentoo b/sys-cluster/orangefs/files/README.gentoo
index 5f8296a..5f8296a 100644
--- a/sys-cluster/orangefs/files/README.Gentoo
+++ b/sys-cluster/orangefs/files/README.gentoo
diff --git a/sys-cluster/orangefs/orangefs-2.8.6-r5.ebuild b/sys-cluster/orangefs/orangefs-2.8.6-r5.ebuild
index 2f4578b..d97e1db 100644
--- a/sys-cluster/orangefs/orangefs-2.8.6-r5.ebuild
+++ b/sys-cluster/orangefs/orangefs-2.8.6-r5.ebuild
@@ -181,7 +181,7 @@ src_install() {
 
 	keepdir /var/log/pvfs2
 
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README "${FILESDIR}/README.Gentoo"
+	dodoc AUTHORS CREDITS ChangeLog INSTALL README "${FILESDIR}/README.gentoo"
 
 	if use doc; then
 		dodoc doc/{coding/,}*.{pdf,txt} doc/random/*.pdf \
diff --git a/sys-cluster/orangefs/orangefs-2.8.6-r4.ebuild b/sys-cluster/orangefs/orangefs-2.8.7.ebuild
index 7d94801..5ba5696 100644
--- a/sys-cluster/orangefs/orangefs-2.8.6-r4.ebuild
+++ b/sys-cluster/orangefs/orangefs-2.8.7.ebuild
@@ -2,20 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/pvfs2/Attic/pvfs2-2.7.1-r1.ebuild,v 1.3 2011/07/15 13:57:08 xarthisius dead $
 
-EAPI=4
-inherit autotools linux-info linux-mod toolchain-funcs
+EAPI=5
+inherit autotools linux-info linux-mod readme.gentoo
 
-REV="9510"
 DESCRIPTION="OrangeFS is a branch of PVFS2 cluster filesystem"
 HOMEPAGE="http://www.orangefs.org/"
-SRC_URI="http://orangefs.org/downloads/${PV}/source/${P}.tar.gz
-		 ftp://mirror.mephi.ru/projects/${PN}/${P}-r${REV}.patch.xz"
+SRC_URI="http://orangefs.org/downloads/${PV}/source/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+aio apidocs debug doc examples fuse gtk infiniband kmod-threads memtrace
-+mmap +modules open-mx reset-file-pos secure sendfile +server ssl static
+IUSE="aio apidocs debug doc examples fuse gtk infiniband kmod-threads memtrace
++mmap modules open-mx reset-file-pos secure sendfile +server ssl static
 static-libs +tcp +threads +usrint usrint-cache +usrint-cwd usrint-kmount
 valgrind"
 
@@ -70,9 +68,10 @@ BUILD_TARGETS="just_kmod"
 MODULE_NAMES="pvfs2(fs::src/kernel/linux-2.6)"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	if use modules && kernel_is -ge 3 3; then
-		eerror "Sorry, linux kernels >= 3.3 are not support yet."
+	use modules && linux-mod_pkg_setup
+	if use modules && kernel_is -ge 3 4; then
+		eerror "Sorry, linux kernels >= 3.4 are not support yet."
+		eerror "(Well they are, but you'll have a dead lock.)"
 		eerror "You may disable modules use flag and use fuse client to mount filesystem."
 		eerror "PVFS2 server and ROMIO I/O API are still available too."
 		return 1
@@ -80,9 +79,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Latest stable patches (kernel module fix, ucached installation fix)
-	epatch "${DISTDIR}"/${P}-r${REV}.patch.xz
-
 	# Upstream doesn't seem to want to apply this which makes
 	# sense as it probably only matters to us.  Simple patch
 	# to split the installation of the module (which we use
@@ -90,7 +86,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.8.5-split-kernapps.patch
 
 	# Allow data layout control (proposed by upstream)
-	epatch "${FILESDIR}"/${P}-layout.patch
+	epatch "${FILESDIR}"/${PN}-2.8.6-layout.patch
 
 	# Change defalt server logfile location to more appropriate value
 	# used by init script.
@@ -152,7 +148,7 @@ src_configure() {
 src_compile() {
 	emake all
 	if use modules; then
-		linux-mod_src_compile || die "kernel module compilation failed"
+		linux-mod_src_compile
 		emake kernapps
 	fi
 
@@ -166,7 +162,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 	if use modules; then
-		linux-mod_src_install || die
+		linux-mod_src_install
 		emake DESTDIR="${D}" kernapps_install
 
 		newinitd "${FILESDIR}"/pvfs2-client-init.d pvfs2-client
@@ -180,7 +176,8 @@ src_install() {
 
 	keepdir /var/log/pvfs2
 
-	dodoc AUTHORS CREDITS ChangeLog INSTALL README "${FILESDIR}/README.Gentoo"
+	dodoc AUTHORS CREDITS ChangeLog INSTALL README
+	readme.gentoo_create_doc
 
 	if use doc; then
 		dodoc doc/{coding/,}*.{pdf,txt} doc/random/*.pdf \
@@ -200,10 +197,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst || die
+	use modules && linux-mod_pkg_postinst
 
-	ewarn "Plese read ${ROOT}usr/share/doc/${PF}/README.Gentoo documentation carefully!"
-	ewarn "It contains very important usage information and known issues."
+	readme.gentoo_pkg_postinst
 	if ! use modules; then
 		ewarn
 		ewarn "Without modules support you wouldn't be able to use pvfs2-client and mount"