commit: 3594233609e0eef42888ccc23940d0620cb10f01
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 20:03:18 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sun Mar 22 20:03:18 2015 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=35942336
openafs: next iteration of fixes for testing
net-fs/openafs-kernel/Manifest | 4 +-
net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild | 29 +++-----
net-fs/openafs/Manifest | 8 +-
net-fs/openafs/files/openafs-client.conf | 54 --------------
net-fs/openafs/files/openafs-client.service | 17 -----
net-fs/openafs/files/openafs-server.service | 11 ---
.../openafs/files/tmpfiles.d/openafs-client.conf | 1 -
net-fs/openafs/openafs-1.6.11.ebuild | 87 ++++++++++++----------
8 files changed, 61 insertions(+), 150 deletions(-)
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 077ba96..1123195 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,6 +1,6 @@
DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256
d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512
9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67
WHIRLPOOL
1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
+DIST openafs-1.6.11-patches.tar.xz 9628 SHA256
16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512
8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d
WHIRLPOOL
9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256
cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512
4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c
WHIRLPOOL
fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
-DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256
bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512
f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56
WHIRLPOOL
93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
-EBUILD openafs-kernel-1.6.11.ebuild 3588 SHA256
3c67f6934e24ef7515374bc1fed229cad061367161bd5b21afedaa5ec68d5e06 SHA512
7c2461efc2f20099ec7afb2a4e60701badff03da456690cb6b262c5d9569f2ebcba7d18b32e6594a8fb949f0ee7206a8c00366140df20e1032026e379ed75bce
WHIRLPOOL
3cb8c5000112e0a494503be4e62af42463d93ba0e4cf91c2e1d91044b71391832886fc6f02424abf7de28b2c43bf101d1e4f3a0686a4edce3ada9bb970327631
+EBUILD openafs-kernel-1.6.11.ebuild 3375 SHA256
e14f3ae88fe578cf0c0cfed0ace2da2cfb04fdfa3a7f04814ec550147c7ad437 SHA512
a2005f1260427294769950701c192b1292e42a5820c1c00ffecfca10356c7368e95101457a14cdfeda151fb2a6b2630ab13901c186dd49e3079326bc4e7bc202
WHIRLPOOL
29cb64cba7854b52f0b9b56d793f82d00e7b81a80045b06ff908d19aac25b765e433795470c132a22c507fa0bba51cb9f52f9aee33b58a980042dae1b0edb471
MISC ChangeLog 27456 SHA256
a007968bb807bd43b57552bf7fb3c0c10bf5724eb56b7e5f5d5de787be9408b0 SHA512
f8982a0c1be4ba49b1ec3a218cbab1df7494bd37665ccb194859486d5562feef85465498c4a02f983ce2a1f09b07bc6700cc7594f9ece053a75bd4ee0700adb2
WHIRLPOOL
399eb26cd762839426489570b76d64c641ec6bca838665aef501358be2f5f012810097107ca32ae0a2e3dea2a5169b22e641139b3a0c18db4b4ebca1b0d28054
MISC metadata.xml 777 SHA256
ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512
4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4
WHIRLPOOL
4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
index e30c728..76d2883 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit autotools eutils multilib linux-mod versionator toolchain-funcs
+inherit autotools eutils linux-mod multilib toolchain-funcs versionator
MY_PV=$(delete_version_separator '_')
MY_P="${PN/-kernel}-${MY_PV}"
@@ -14,18 +14,12 @@ OAFS_PVER="1.6.5"
DESCRIPTION="The OpenAFS distributed file system kernel module"
HOMEPAGE="http://www.openafs.org/";
# We always d/l the doc tarball as man pages are not USE=doc material
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="
-
http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-
http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
- "
-else
- SRC_URI="
- http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
- "
-fi
-SRC_URI+=" mirror://gentoo/${PN/-kernel/}-${OAFS_PVER}-patches-${PVER}.tar.bz2"
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+ http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+ http://dev.gentoo.org/~bircoph/patches/${MY_P}-patches.tar.xz
+"
LICENSE="IBM BSD openafs-krb5-a APSL-2"
SLOT="0"
@@ -45,9 +39,7 @@ QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
pkg_pretend() {
if use kernel_linux && kernel_is ge 4 ; then
ewarn "Gentoo supports kernels which are supported by OpenAFS"
- ewarn "which are limited to the following kernel versions:"
- ewarn "<sys-kernel/gentoo-sources-4.0"
- ewarn "<sys-kernel/vanilla-sources-4.0"
+ ewarn "which are limited to the kernel versions: <4.0"
ewarn ""
ewarn "You are free to utilize epatch_user to provide whatever"
ewarn "support you feel is appropriate, but will not receive"
@@ -64,7 +56,8 @@ pkg_setup() {
}
src_prepare() {
- EPATCH_EXCLUDE="012_all_kbuild.patch 020_all_fbsd.patch" \
+ # do not tamper with CFLAGS for the kernel module
+ EPATCH_EXCLUDE="040_all_flags.patch" \
EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}"/gentoo/patches
epatch_user
@@ -94,7 +87,7 @@ src_configure() {
}
src_compile() {
- ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs ||
die
+ ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
}
src_install() {
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index b42d4af..35b1f6e 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,10 +1,6 @@
-AUX openafs-client.conf 2967 SHA256
8697386dd67c321240189392483b460443f47bb388ada3578d0f63c38ecf87f3 SHA512
789030e6d599dd18a9c90960f325b308a579b1c7044953dbdb18f3b4a0de8a8976f564f4d8567c2c6325bcd2332255a599c11b16279aa5a6752b2501d86822d4
WHIRLPOOL
7562870102734198e1dd775cca1b26420e6513838b85b8c3f76604ae56ed9df1f985f152ad29a40eca1613f02dd3fee31236add657dc12302aced677e491bdc2
-AUX openafs-client.service 426 SHA256
07a68694d53c212eb7d61120c421ba43b6506ce34b4da10680a4b626ca18aaa5 SHA512
dc85f13aed5512bafca8f399523d0e0af30f665c293d7b5eb3b59a71327455430ab82a3d3c089769ad8277d4c5175bc5b3e7ce05697a8b0c597187fe046881b2
WHIRLPOOL
141441a4e1cc0233dab97b42c48a45e684dbdbba99fc09e4de29d53a35cdea5592f27e7bfa961424bd4b1c3f0fedba7ee10939e1061b0847ae21c4fbdc987fbb
-AUX openafs-server.service 291 SHA256
fac0f11c34d37da33b9aa914678b9b10c8a5a71b23c3d4885abcf9247d3a2242 SHA512
6ca0d45724dd6946202a91527f15f7a62ae9263b3c2e61e3ad7c0c87bda4fd7cc8fe0fd8f656ca497796cc951c010b69939754451958b8dbbaa0c41b41bd9eb6
WHIRLPOOL
b9b719ed3566e97d06f4cc9da89555c9444f5c6d5f29087cba8869832206c8709866b3a559dfe91237f2e8bbbf9b517bb0b4167b10630a0f58c1f5a7b80cafc1
-AUX tmpfiles.d/openafs-client.conf 22 SHA256
974eb8b845df8e06d517fff7a65f15b4e599af3245aca44eb9f5021d0877ca3f SHA512
ee8daa10c6fac2d05085f74b0a807e27e327124380ae6e642f29bfe0b2f3b3909da3024a1c4f6b86a712e05ed05875d36c3b1cc06543a1f390f713a16a2baca6
WHIRLPOOL
5166e31a4a7f705ea45d49be53016c1e7012db5dd1b4745384c32406e104481ba61196d59d82b9e01e002f7576322cbad33f0e375a7309143a61ac99771c8b1f
DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256
d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512
9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67
WHIRLPOOL
1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
+DIST openafs-1.6.11-patches.tar.xz 9628 SHA256
16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512
8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d
WHIRLPOOL
9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256
cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512
4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c
WHIRLPOOL
fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
-DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256
bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512
f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56
WHIRLPOOL
93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
-EBUILD openafs-1.6.11.ebuild 4887 SHA256
cb158c6c6278816edb9642bf6e6833491437cd929d17647ea8d95743e25e40ba SHA512
f9b4056b52be21b8c2c31a6537474baac07d0cacdda45437d469033f0edf6258bd898a5234993b4db3af070e1dd0915a8c638e95f19561e056e50ddd693b8766
WHIRLPOOL
59e27f791647bc8181101c9de14e23a699e17a7d1147e80ebe7410daafcf5f80a1144231d619823d6b6e2e56c337f6cb15779702b7a40c3f553aa4ed9a36047d
+EBUILD openafs-1.6.11.ebuild 5051 SHA256
aa8fb87eddc83408f0fb034f9fe11f2141c9f2ae8c52e1b7f36c87ed062ff621 SHA512
4bc22a4ff85697c42cfbe8f161cd93e54cf8eced5412bb8166e9b96ebb13f21b1603e239811a7ebb6d8fcc3b33e5d81a04b88ac22dc70f7442883b1c40d29fbc
WHIRLPOOL
7c9978268e69ab48ecb6e8482dca5a13b6047b8b6ab5ad63f505ad095a17883f247d123c8200f05bef5f193a608dd2fa8199f2d61348b56985ad729edd366609
MISC ChangeLog 32208 SHA256
d60a626da52deca400e0127993098d84d53b43776ea7b979d0cbb193506e875e SHA512
6da1946bd75013ac8330ebc7ae336bc293918e43a5f20611b440a5e925f4d6d99838a52565788dba167c30a4e7bd18d76b4b8aa040a347dce02458745fd2062d
WHIRLPOOL
1dd2536264568151d517ab7fec5ea72189144ccfcf409234baee6b68de2b3495ac46845d9b1d9feca9e2783f0887148af9cbe96d28c4cbeb8254a41cbd72a380
MISC metadata.xml 777 SHA256
ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512
4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4
WHIRLPOOL
4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
diff --git a/net-fs/openafs/files/openafs-client.conf
b/net-fs/openafs/files/openafs-client.conf
deleted file mode 100644
index 45d5747..0000000
--- a/net-fs/openafs/files/openafs-client.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ENABLE_AFSDB and ENABLE_DYNROOT determine whether AFSDB support and
-# Dynroot support (dynamically generated /afs), respectively, should be
-# enabled in the AFS client.
-ENABLE_AFSDB="no"
-ENABLE_DYNROOT="yes"
-
-# AFS client configuration options:
-# ---------------------------------------------------------------------------
-# possible AFS client afsd configuration options (from 1.3.74) are
-# -blocks The number of blocks available in the workstation cache.
-# -files The target number of files in the workstation cache
(Default:
-# 1000).
-# -rootvol The name of the root volume to use.
-# -stat The number of stat cache entries.
-# -hosts List of servers to check for volume location info FOR THE
-# HOME CELL.
-# -memcache Use an in-memory cache rather than disk.
-# -cachedir The base directory for the workstation cache.
-# -mountdir The directory on which the AFS is to be mounted.
-# -confdir The configuration directory .
-# -nosettime Don't keep checking the time to avoid drift.
-# -verbose Be chatty.
-# -debug Print out additional debugging info.
-# -kerndev [OBSOLETE] The kernel device for AFS.
-# -dontfork [OBSOLETE] Don't fork off as a new process.
-# -daemons The number of background daemons to start (Default: 2).
-# -rmtsys Also fires up an afs remote sys call (e.g. pioctl, setpag)
-# support daemon
-# -chunksize [n] 2^n is the chunksize to be used. 0 is default.
-# -dcache The number of data cache entries.
-# -biods Number of bkg I/O daemons (AIX3.1 only)
-# -prealloc Number of preallocated "small" memory blocks
-# -pininodes Number of inodes which can be spared from inode[] for
-# pointing at Vfiles. If this is set too high, you may have
-# system problems, which can only be ameliorated by changing
-# NINODE (or equivalent) and rebuilding the kernel.
-# This option is now disabled.
-# -logfile Place where to put the logfile (default in
<cache>/etc/AFSLog.
-# -waitclose make close calls always synchronous (slows em down, tho)
-# -files_per_subdir [n] number of files per cache subdir. (def=2048)
-# -shutdown Shutdown afs daemons
-# ---------------------------------------------------------------------------
-# examples of options with disk cacke
-#XXLARGE="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
-#XLARGE="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
-#LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-#MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-#SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-
-# default is to use memcache
-OPTIONS="-nosettime -memcache -fakestat -dynroot"
diff --git a/net-fs/openafs/files/openafs-client.service
b/net-fs/openafs/files/openafs-client.service
deleted file mode 100644
index 8606b28..0000000
--- a/net-fs/openafs/files/openafs-client.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=OpenAFS Client Service
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/openafs-client
-ExecStartPre=/sbin/modprobe libafs
-ExecStart=/usr/sbin/afsd $OPTIONS
-ExecStop=/bin/umount /afs
-ExecStopPost=/usr/sbin/afsd -shutdown
-ExecStopPost=/sbin/rmmod libafs
-KillMode=none
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target remote-fs.target
diff --git a/net-fs/openafs/files/openafs-server.service
b/net-fs/openafs/files/openafs-server.service
deleted file mode 100644
index 3c82d3a..0000000
--- a/net-fs/openafs/files/openafs-server.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenAFS Server Service
-After=syslog.target network.target
-
-[Service]
-EnvironmentFile=/etc/conf.d/openafs-server
-ExecStart=/usr/sbin/bosserver -nofork $BOSSERVER_OPTIONS
-ExecStop=/usr/bin/bos shutdown localhost -wait -localauth
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-fs/openafs/files/tmpfiles.d/openafs-client.conf
b/net-fs/openafs/files/tmpfiles.d/openafs-client.conf
deleted file mode 100644
index 52a9eee..0000000
--- a/net-fs/openafs/files/tmpfiles.d/openafs-client.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /afs 0755 root root
diff --git a/net-fs/openafs/openafs-1.6.11.ebuild
b/net-fs/openafs/openafs-1.6.11.ebuild
index b033d90..a56666e 100644
--- a/net-fs/openafs/openafs-1.6.11.ebuild
+++ b/net-fs/openafs/openafs-1.6.11.ebuild
@@ -2,50 +2,55 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
-inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
systemd
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
versionator
MY_PV=$(delete_version_separator '_')
MY_P="${PN}-${MY_PV}"
-PVER="1"
-OAFS_PVER="1.6.5"
DESCRIPTION="The OpenAFS distributed file system"
HOMEPAGE="http://www.openafs.org/";
# We always d/l the doc tarball as man pages are not USE=doc material
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="
-
http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-src.tar.bz2
-
http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
- "
-else
- SRC_URI="
- http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
- "
-fi
-SRC_URI+=" mirror://gentoo/${PN}-${OAFS_PVER}-patches-${PVER}.tar.bz2"
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+ http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+ http://dev.gentoo.org/~bircoph/patches/${P}-patches.tar.xz
+"
LICENSE="IBM BSD openafs-krb5-a APSL-2"
SLOT="0"
KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc kerberos pam"
+IUSE="doc kerberos +modules pam"
-RDEPEND="~net-fs/openafs-kernel-${PV}
+CDEPEND="
sys-libs/ncurses
pam? ( sys-libs/pam )
kerberos? ( virtual/krb5 )"
+DEPEND="${CDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )"
+
+RDEPEND="${CDEPEND}
+ modules? ( ~net-fs/openafs-kernel-${PV} )"
+
S="${WORKDIR}/${MY_P}"
src_prepare() {
- EPATCH_EXCLUDE="020_all_fbsd.patch" \
+ EPATCH_EXCLUDE="050_all_job_server.patch" \
EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}"/gentoo/patches
epatch_user
+ # fixing 2-nd level makefiles to honor flags
+ sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/;
s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+ src/*/Makefile.in || die '*/Makefile.in sed failed'
+
# packaging is f-ed up, so we can't run eautoreconf
# run autotools commands based on what is listed in regen.sh
eaclocal -I src/cf
@@ -57,29 +62,29 @@ src_prepare() {
}
src_configure() {
- # cannot use "use_with" macro, as --without-krb5-config crashes the
econf
- local myconf=""
- if use kerberos; then
- myconf="--with-krb5-conf=$(type -p krb5-config)"
- fi
-
AFS_SYSKVERS=26 \
- XCFLAGS="${CFLAGS}" \
econf \
- $(use_enable pam) \
- --enable-supergroups \
--disable-kernel-module \
--disable-strip-binaries \
- ${myconf}
+ --enable-supergroups \
+ $(use_enable pam) \
+ $(use_with doc html-xsl
/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+ $(use_with kerberos krb5)
}
src_compile() {
emake all_nolibafs
+ local d
+ if use doc; then
+ for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+ emake -C "${d}" html;
+ done
+ fi
}
src_install() {
- local CONFDIR=${WORKDIR}/gentoo/configs
- local SCRIPTDIR=${WORKDIR}/gentoo/scripts
+ local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+ local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
emake DESTDIR="${ED}" install_nolibafs
@@ -113,22 +118,22 @@ src_install() {
# minimal documentation
use pam && doman src/pam/pam_afs.5
- dodoc "${CONFDIR}"/README src/afsd/CellServDB
+ dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
# documentation package
if use doc ; then
- find doc/{arch,examples,pdf,protocol,txt}/ -type f -exec dodoc
{} +
- dohtml -A xml -r doc/{html,xml}/*
+ dodoc -r doc/{arch,examples,protocol,txt}
+ dohtml -r doc/xml/*
fi
# Gentoo related scripts
- newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
- newconfd "${CONFDIR}"/openafs-client openafs-client || die
- newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
- newconfd "${CONFDIR}"/openafs-server openafs-server || die
- systemd_dotmpfilesd "${FILESDIR}"/tmpfiles.d/openafs-client.conf
- systemd_dounit "${FILESDIR}"/openafs-client.service
- systemd_dounit "${FILESDIR}"/openafs-server.service
+ newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+ newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+ newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+ newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+ systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+ systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+ systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
# used directories: client
keepdir /etc/openafs
