orangefs: add build control over usrint libs

6 files changed, 52 insertions, 9 deletions

diff --git a/sys-cluster/orangefs/ChangeLog b/sys-cluster/orangefs/ChangeLog
index 8aed203..91db5e6 100644
--- a/sys-cluster/orangefs/ChangeLog
+++ b/sys-cluster/orangefs/ChangeLog
@@ -2,9 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*orangefs-2.8.6-r1 (31 Aug 2012)
+
+  31 Aug 2012; Andrew Savchenko <bircoph@gmail.com> -orangefs-2.8.6.ebuild,
+  +orangefs-2.8.6-r1.ebuild, +files/orangefs-2.8.6-ucache.patch,
+  files/README.Gentoo, metadata.xml:
+  Add build control over user interface libraries and friends.
+  Add ucached and fix its installation.
+
   30 Aug 2012; Andrew Savchenko <bircoph@gmail.com> orangefs-2.8.6.ebuild,
   +files/orangefs-2.8.6-parallel-make.patch:
-  orangefs: fix parallel build in 2.8.6
+  fix parallel build in 2.8.6
 
 *orangefs-2.8.6 (30 Aug 2012)
 
diff --git a/sys-cluster/orangefs/Manifest b/sys-cluster/orangefs/Manifest
index 54505e6..55203f5 100644
--- a/sys-cluster/orangefs/Manifest
+++ b/sys-cluster/orangefs/Manifest
@@ -1,4 +1,4 @@
-AUX README.Gentoo 4882 SHA256 21f6f0ea8e6b48170c3a4e025b1967b5534cfdfaa82c132e9e16f7542e2fe8fa SHA512 2b5bd3baab4ce341b4f6ae599afd48ac7beaade353bfc5661563d428c267446db152f334070e1da97fa139b6b08f4db37fbfefd71b6e5c069183ac0609a648a5 WHIRLPOOL db9f691404f95574f92ed2d87a079e6e54e39ee73609c5b7c51da47ab9af18721fb9f2aa4f7e7327412c71b4db4bd018f3e48115cce49739bd5f56fc159fa202
+AUX README.Gentoo 5203 SHA256 07608186031213ea962db14c7cbc90c9cb018974ede40cc67bcabf86f47d85c7 SHA512 0bf08b92a70ffa48500419b8cd8b851c54912660727cb7e0a975cbfedfa3baf89370c808c8b09d92609d80d8023bf40021d286a18c33855731ecd796f4ff8454 WHIRLPOOL 8067d3997e76e196ae000cf1da24b1408c44ff53003af17d8abd060927f947693ff9c6cbce46b357ab21bf1321d29c6bb19555a9e409ca2891419679d75b1462
 AUX orangefs-2.8.5-fuse-install.patch 311 SHA256 6e74796eae966af102e2cf892ea311b18959e2c7903dfff583c795cd27df7230 SHA512 7674fbc8309ce5ea0aa840470567bf616acef3e45f90751fbd680e48ef7afaa5405df6a09bac8960e80b5b6bf28dc3ba24b9bd8a72a88713777b2905000aa941 WHIRLPOOL 9212a651df3617fb375b6989f6e6984eb6eb2583690cf39287df0fb420798392160db0daa37be78a846e7b75bcd5103fe89208be50422b493e2b0dfee8d80b26
 AUX orangefs-2.8.5-fuse-perms.patch 659 SHA256 b5b0101961be1beb68ff39342507043adef5b1144356bbcc87156dec83988551 SHA512 c4beb06c15157cffbaa581a116c1c9e85495a417917f546a3ef4ddb4c83c6b785fcb24eba93670b600b7478e3413416ef1bba426234d2069919e909384250d9f WHIRLPOOL 3105391eafb87c7e5a173e756c292bb4b2e8bbfeee72a57ad668b5595af947ea63ca3df259b5398dce8d742dd7a175ad16e267396af686a2c5025d3155703d50
 AUX orangefs-2.8.5-layout.patch 4186 SHA256 3aefae1d569039dec50b283411d0caaea93022a9a3c925ac302ac4e983e375fe SHA512 09c8d8524c389ec3a04531e1d98495feba3241c7b74a10abee8ec50e24bc74dc2ac35afc56b524f79a71ce1e629d6adf73b9303f41b20d143330ebc1d4fe0f8f WHIRLPOOL 375c3b8103a1e7e8a9b426b28875aae6cd44bee13fb363323d0a4552a367a8342e583396e2a748ce70c728ab0a622b06fa2a50dc18537a52b52b192958fb3998
@@ -9,6 +9,7 @@ AUX orangefs-2.8.5-static-server.patch 625 SHA256 69b0d94a9b17c3c9fa37644dc6d864
 AUX orangefs-2.8.5-vis.patch 2410 SHA256 88c139a3eb35832860911c2580af8e1bb699437a399549d4dfb39f882af98520 SHA512 1be2d7ee50d83cec4ae342279638988866f43340a117763efd20cc402c9caf963b47194c94b41c08dc8049dbb61dc669efd07bcbf26d0e1c4dbeca961d77cf8d WHIRLPOOL 3564092b6aaaa9fceb23eb13c9bead7e04698fb8ba5821ae71c012eb7c2f4f30e878bad7bc2ea5c0c3fd53ae86ffc860ed114b826176af41f55ec8bc741c33d7
 AUX orangefs-2.8.6-layout.patch 4407 SHA256 5bb0646fa483fc4eb51ae71d3a1fc9e3cc43e0b1a525e8fd3939c6eddf2561a1 SHA512 8d8d463bc302382d612dc9515adf3ece4523f7f1039338a57a6f1dc3f35490c441031dd2539d4a3f80e4f4c0b4ea5ee2354e26a7942f156aa8fe59d6a2617630 WHIRLPOOL 1473407bd68a32b3a50499fa9abea4ef394cf5ed38b4a39a45e4b45d4ca0233f725b8d2fac816901044b51085753c818d70066f14b47402945dfc030178174ed
 AUX orangefs-2.8.6-parallel-make.patch 744 SHA256 07beba9f30b704452f78ea0dee075fe682605ec698810b5f42ca220e32c47e95 SHA512 aac8471f5f80b7d555a8f02a916139efc141fdd3289660b973e24b0225cbac02fc4ebc28ac2ca1559d56a9c1acd8296a675830b0db89db16f4ae7384793a9e23 WHIRLPOOL 149bb040f155492b6fdfc6fa081db78ad07be3f10d0d5abd11b94c0cd03fc7116afead0c7b305ee0f71f6e3bcd1b9557f0977323497161110adbcddb4c365da9
+AUX orangefs-2.8.6-ucache.patch 366 SHA256 3cc2509542417560f9977215a41de612f4e8a9c2e19ca2b45f03bfc0f567b9d8 SHA512 097098599838e48998c60b843732919bf81c70fa64ca3bec7f30c3ddf1a0c3ef82bc6bd013deba0a15935e7966ae81c31162d3c724caf7c846f793219f309c5f WHIRLPOOL a54f6d2b0ee77b86e6a27745281aeb91a32688e980b5364fa982fd33e165bcb020513413fb2245294dcf1d1a93971c1544f3bb083ef0504c87c3477f38e7de21
 AUX pvfs2-client-conf.d 2204 SHA256 c12b1be67e02d011b3c234283ffd3d9b85b8a7d7a2e0644487c4cfc8c3a8536e SHA512 d3e2f2cf4e4072171c39b77117b58346333a8d9501f40aea7a49c001330ef1b1b78da0375deaa6aa94b7d31c4450a6699fe624c7093736bfa94ff98ef6390399 WHIRLPOOL 986cde79995604a818da72508be7dd802bfdc0e27c92d2886ecb64683fdc7eb903068368c7f04149a1ec97db7d59a037fa545a7a5c9cc6d921e23500e851235c
 AUX pvfs2-client-init.d 6617 SHA256 d4042e6ed227f7488f7026da0693098f7eaf01e3d69d15a06d800936e26d18b5 SHA512 0174268be306b2c2313ddbf14a9e541a6613b884abb0933b0955a050c9e22b8d6ea68e6b89d2ba6be4955612bcf03a728d6c81e2f7ec732750189b97e440a9a7 WHIRLPOOL 337718b218a8313726f031473f66d2cf0378fff89e5da099204a809647eb85445dfa1e51bcc87e447d4e3c2e1bc4005f18ed00a38b9e683576738f17d1434692
 AUX pvfs2-server-conf.d 846 SHA256 ee0a05a593e4d78b867aa7ef008dbd553c02bb97c2bfec7865173b46c45f30d0 SHA512 25d6c1c1ca0c5c72fcb28ed30c9ffd9c833736b660d9022569ef9f224352f2e8bff1b761acc27b2bbad5b7f7a92e6172cedea9d9f543d436d53351559199f706 WHIRLPOOL ed1f45a1e563e966a0d07ae22a65c00b954089b4ad20b22364c5c6dd017c188b0e28406fcd62fe9baad0f255010360a8a14aa1450f172116d7232b162073b3c8
@@ -16,6 +17,6 @@ AUX pvfs2-server-init.d 4484 SHA256 644dbe0e7a276e383a79c9ce2fea1a3cd69bedd96232
 DIST orangefs-2.8.5.tar.gz 10163182 SHA256 00dd5bf1fea76573e0203aaad206dfe4ef087cdbfcfda1e7fd0969dafd16a0d3 SHA512 8a71d192130db022a862402bd57b3769b221e423b3d7e321d7fe9c2ec192718365455d25cee1be23d2ea8ae861ec84f02e9cf192ea3734a388fbabc111eeef8f WHIRLPOOL d6cfbaae8c9277f0973eb7a284b0b56c7494f33b292d1f34d05e77cabc29b20da0d200d518180781cdeb7b986a1f323159b38974de50391ed670dd27d34aaa8f
 DIST orangefs-2.8.6.tar.gz 2778466 SHA256 cc2a9df9750abe6ea97c9e6259083a45d22d8cbf56bc4a8c35376940ba8108f8 SHA512 0eb22b217fdfc4bd1384551bbe4c946223eba09db1dae361204cc3624abc0c681a1b99265f7b2c01034fbdcb3d52a5366f43e941639ef7ee5c2ce0bccc140697 WHIRLPOOL f8ac9dccc0bd7f76978173f501e58ed92d75d280198e1426bdd3fa8953821c9dc47dbd088ea5d5b546bee7c330e8e3edb55d2829ee61e04980e58cbd8122fdc5
 EBUILD orangefs-2.8.5-r1.ebuild 7496 SHA256 fd21bf129cd2e0a9a3c04826724c2e87234d78736e2db6acebb290398d5fbfdc SHA512 c12e251cdae702e2064b767b88355d51ac171ad573e9e2afae62e2ef48abbaa51d882bf2342ed5b8bb14d436d57e453a9b9c5cd38b53724a671c4237205622b1 WHIRLPOOL 4ea24fd0964117ac3b68420697232c2003008f4eea942f4ffe372f12f3ac8f489b464ffc811eb7e8bfa1e3abe5e5d6f2d0cfad03067df680a52ca16c28d31b50
-EBUILD orangefs-2.8.6.ebuild 6969 SHA256 2454f7e695abdbb66d944031f8d1a7e71d93b4d756c05ab796a70f92a33affcd SHA512 059ea9c7542e59149cba20cdf2df1260bbc558619ae837294e86dbffc46c508dafad1d95dba81d81c2dd81b19112dd5847704e6186ffc1259f0c90c4a2484c18 WHIRLPOOL f4ae889267c7da13b14c4ae1b52d763f0c96354a59a7e48e11cd83bad9b4768f2f2de7203d2651ad76142d48704df34cc5c44debb385c9d079e552727d479b96
-MISC ChangeLog 6422 SHA256 fc6898c9a2a6749be19abc571811715866c2b77e359e921ef17ba92327569185 SHA512 f76891acf42567b07368e43b612a7215ec636ef9ffa7561fda1a51b6ae2214bb356d4f9bd6abead5df43612aa7474f75d5e558e0c56988505af53dc33937604c WHIRLPOOL 7ff1e823c1f5089d74c4f0b7f8d7804a8358eaf9dc7714ef327a3abe5ee4a389b37e248325e9a1322506d2fe595a50c9a97ad7110052bec2dcc7c07bc1b54942
-MISC metadata.xml 1636 SHA256 e471df95801404fbfa1b2bbda973b18868a839f7148879911b093f32e8e24756 SHA512 68475f3c406de29f2c852a0dd311abee9ec9ad0e3b53c01590fc8e122cb96e92a99b2b3c0c939c16abeeb6999676386be83981b66fae528ad49c8486871a9e4f WHIRLPOOL 332ae4d82dfa20f262fed28606fe4f6b2253fef336f5c8e84b279031b60ff9fa05b26bc6e6d797de6d80726735f9a3a98b7dabf809303c7495902e9c6d9f7323
+EBUILD orangefs-2.8.6-r1.ebuild 7341 SHA256 d2e4a8b96b233d723f53f1fd57396c53b599d5d35eda6e45a3411105b2a97480 SHA512 3418ea01f4193dc6d481ef297c18d42af1b38c9994695525e0935ff3d2609688ebc02bf214b8551623b27bec4e4222ac89e01612888173aac6bf48418c385a68 WHIRLPOOL c7f9f9f47dfc36348317dcf9f9618c5be1aa2d39d83bed4a8399d7b503b29efe3afcd6f36649b087f9501534cc9274d727df712a477facef9545bd370d045170
+MISC ChangeLog 6728 SHA256 52e60f88bb34900d5cf957e98f4bb710f647f15b24c1caacca0603658ff49024 SHA512 591e42e722e5d7478349a4537a18ba55d0117b0d128169d99c6d0d6a1b3bc59a02bba3bbd52dc56d3f701486a84444d000b476d2656161f99e13f65b4c283409 WHIRLPOOL 521d3b65a4df30c9e197765465eb66b978e580d15011280f0974f96ebf34ed67d93bae7f1d4a9acf4e4a16ea07b8f7c810cb697aebb1af2135de34524b68da73
+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 dd28dc7..002225b 100644
--- a/sys-cluster/orangefs/files/README.Gentoo
+++ b/sys-cluster/orangefs/files/README.Gentoo
@@ -92,8 +92,9 @@ Please not that you cannot use both interfaces for init script.
 
 c) Userspace library.
 
-You may use userspace library (libpvfs2) to access filesystem
-directly from your applications. An overview is available here:
+You may use userspace library (libofs*) to access filesystem
+directly from your applications, USE="usrint" is required to do so.
+An overview is available here:
 http://www.orangefs.org/trac/orangefs/wiki/High%20performance%20user%20interface
 For further details please refer to PVFS documentation.
 
@@ -106,6 +107,13 @@ USE="romio" flag.
 
 4) Warnings and known issues.
 
+Please change the following USE flags carefully and only if you
+fully understand how they will affect your PVFS2 setup (read
+documentation and the code to do so):
+
+  apidocs, kmod-threads, memtrace, reset-file-pos, sendfile, usrint,
+  usrint-cache, usrint-cwd, usrint-kmount, valgrind.
+
 Kernels >= 3.3 are not yet supported, please use other access
 methods or older kernel.
 	 
diff --git a/sys-cluster/orangefs/files/orangefs-2.8.6-ucache.patch b/sys-cluster/orangefs/files/orangefs-2.8.6-ucache.patch
new file mode 100644
index 0000000..5bae21a
--- /dev/null
+++ b/sys-cluster/orangefs/files/orangefs-2.8.6-ucache.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2012-08-31 01:49:18.000000000 +0400
++++ Makefile.in	2012-08-31 10:30:35.566866909 +0400
+@@ -1260,6 +1260,7 @@
+ 	install -m 755 $(ADMINTOOLS) $(bindir)
+ 	install -m 755 $(USERTOOLS) $(bindir)
+ ifdef BUILD_UCACHE
++	install -d $(sbindir)
+ 	install -m 755 $(UCACHEDTOOLS) $(sbindir)
+ endif
+ 	# for compatibility in case anyone really wants "lsplus"
diff --git a/sys-cluster/orangefs/metadata.xml b/sys-cluster/orangefs/metadata.xml
index 775a33e..38ccd21 100644
--- a/sys-cluster/orangefs/metadata.xml
+++ b/sys-cluster/orangefs/metadata.xml
@@ -23,6 +23,10 @@
 	<flag name='sendfile'>Enable kernel sendfile support (recommended for serving of large files only)</flag>
 	<flag name='server'>Enable compilation of server code</flag>
 	<flag name='tcp'>Use TCP interface in BMI library (you must use it unless you have Myrinet or InfiniBand available)</flag>
+	<flag name='usrint'>Build user interface libraries</flag>
+	<flag name='usrint-cache'>Build ucached (user interface data cache daemon)</flag>
+	<flag name='usrint-cwd'>Enable current working directory calls in user interface libraries</flag>
+	<flag name='usrint-kmount'>Assume that FS is mounted via kervel VFS in user interface libraries</flag>
 	<flag name='valgrind'>Use <pkg>dev-util/valgrind</pkg> for memory debugging</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-cluster/orangefs/orangefs-2.8.6.ebuild b/sys-cluster/orangefs/orangefs-2.8.6-r1.ebuild
index 5def2cc..166b3fc 100644
--- a/sys-cluster/orangefs/orangefs-2.8.6.ebuild
+++ b/sys-cluster/orangefs/orangefs-2.8.6-r1.ebuild
@@ -14,7 +14,8 @@ 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
-static-libs +tcp +threads valgrind"
+static-libs +tcp +threads +usrint usrint-cache +usrint-cwd usrint-kmount
+valgrind"
 
 CDEPEND="
 	dev-lang/perl
@@ -51,11 +52,15 @@ DEPEND="${CDEPEND}
 REQUIRED_USE="
 	aio? ( modules )
 	apidocs? ( doc )
-	sendfile? ( modules )
 	kmod-threads? ( modules threads )
 	memtrace? ( debug )
+	reset-file-pos? ( modules )
+	sendfile? ( modules )
 	static? ( server static-libs )
 	tcp? ( !infiniband !open-mx )
+	usrint-cache? ( usrint )
+	usrint-cwd? ( usrint )
+	usrint-kmount? ( usrint )
 	valgrind? ( debug )
 	|| ( infiniband open-mx tcp )
 "
@@ -86,6 +91,9 @@ src_prepare() {
 	# Fix parallel build deps, sent upstream
 	epatch "${FILESDIR}"/${P}-parallel-make.patch
 
+	# Fix ucache installation, sent upstream
+	epatch "${FILESDIR}"/${P}-ucache.patch
+
 	# Change defalt server logfile location to more appropriate value
 	# used by init script.
 	sed -i "s%/tmp/pvfs2-server.log%/var/log/pvfs2/server.log%g" \
@@ -130,6 +138,10 @@ src_configure() {
 	    $(use_enable server) \
 	    $(use_enable static static-server) \
 	    $(use_enable static-libs static) \
+	    $(use_enable usrint) \
+	    $(use_enable usrint-cache ucache) \
+	    $(use_enable usrint-cwd) \
+	    $(use_enable usrint-kmount) \
 	    $(use_with infiniband openib "${EPREFIX}"/usr/) \
 	    $(use_with memtrace mtrace) \
 	    $(use_with open-mx mx "${EPREFIX}"/usr/) \