Purge old, fix install paths netfs

8 files changed, 8 insertions, 343 deletions

diff --git a/sys-cluster/netfs/Manifest b/sys-cluster/netfs/Manifest
index 1422ed0..716b14b 100644
--- a/sys-cluster/netfs/Manifest
+++ b/sys-cluster/netfs/Manifest
@@ -1,16 +1,4 @@
 AUX icebox.config 147 SHA256 9bab43ab1489843ad1192c41996847cd9b4ce9029753b57dfd12107a283d9fbc SHA512 0f03533c737935d2a4f08158a312478ad16a8fe0a3aa5117f50b0200b2d83f9d8e8fc5bcc7ccc3dddf7fe66d68e5c015f72f282c891d576421317deebc6c1562 WHIRLPOOL a8d095f40fa16a64aeb2df90e03ab303e618a0551521c196ec7c70278fbb2d0b1bad64fbfe552232bb343e3d1570fec3708f2753f970a10f0698257211846ef2
 AUX service.conf 29 SHA256 b0067022178abdb011499a24aea33c09862d7a8f348bf7a203289a68323c0124 SHA512 0b78e9051294ff11abe938ddc0759284dc0eb0ad4a37f90396605248b86c4bb7685ff303c5fda6ee80d95c50c21e0d122fe93914da48ca9ec2e1c5c36ca32507 WHIRLPOOL 09736cb4b056d22ccd7439d8ad32984469b59409d24f4440fbc866c4a52dc5f2936a2e7405782308cf05c18b6dc48ec880ad672f80f01ee6b14978489cd5204b
-DIST netfs-1.1.2.tar.bz2 21977 SHA256 3e7ee02971626f080a8812fd0158158723573364bca995d939b728bd5599e238 SHA512 47fae081aab8f11fc3e8df7106be0e4b228339378f2704ca72a9ce1312b3def0336dc86ce733f52e799f77d0a832f4d6e55401a7654420923c0951d21118752c WHIRLPOOL e0e572df1b4964829ac618d469a042e00e01aff860170a8f58a384ec75048345a535ea1141a53948fb816f9cff3480fbe8b2d966992dd479fc3379dfa700c928
-DIST netfs-1.1.3.tar.bz2 21488 SHA256 6c290205c8e553200685c7d88b6328a9e518a599c6cff898b0355fbfe4f35f57 SHA512 32c13c0a47792990acc2809998584a85528e054d3382242b407e7d0b991ac0b6add6f683df38d487c0c66ee1a04df8e0ab73efb85d1dfac33675f42bfaa17396 WHIRLPOOL b9af4a400d61d350b7c2d3a3f81b6cc743f2d0ff19203e51d10b19854ba5e1d5c7c04d587ab91bcd8e12dda0aae9cbc913237d215d25ff36ca5f0674b9f9ef5c
-DIST netfs-1.1.4.1.tar.bz2 16554 SHA256 008ce79084c792641051e12a0746a319910343153686312f9fa10c3114464b59 SHA512 01c99d0f62baf950b40e8cd61a56a5537cb5b4438d81037f101107b8909c04f3ba022e015c653b42422d519c8491f299bfbc2ee20d75e451e9fb0507d8260429 WHIRLPOOL 99b8b8a4583709285fa66c46d39884513d2d5fcde88d1951318649fbc3c0f6c7f397ff49f6c1b56b3e3eeda3d700848ad644c821e7a670ebbd13a7e7164c3556
-DIST netfs-1.1.5.2.tar.bz2 16470 SHA256 7f51c620fb47c91b95795df65bba23283c46d2d7c85394865df87701b7854b41 SHA512 012d1aeaecef36654bb9569e5d0cda8e6c72bac33853ff0f7a6870e1102c54b1d70598d263bef506d86df1cb3e71fd994c6fa9f06a3a85c8cbe2961614a0272d WHIRLPOOL d8a668ceb87c435b8eea6caf49e1566ea913019a6c2ebc2c8f0f143e0dda37f6a8414172e8a6d7aa15644a119f7098930a1c121b6d9e0d33b30ebd268cadc356
-DIST netfs-1.1.5.tar.bz2 16570 SHA256 7d96de0d67334b20f86ea31d7d0aa556254e31ed94346d465437beb2b0dd03c3 SHA512 faf8d3e4ca48cf8243701caaab44df7043250b0898ed9885ea389574e7a8db1bf9996d18a27c8fa356579f5be0dee1535bc1486054bf0e0fb268be5a7051904d WHIRLPOOL 971339a76adf9e85a65ab9342b1f662506a95ac7e61c4befb8dc073bdf23f95a6013c9143f11626cfdd32921da384cbe269af831c1551baebdf3898b32739ed5
-DIST netfs-1.1.6.1.tar.bz2 17338 SHA256 286e7fc11fb1c663ce03f8e4e289940c00c8670d2394ee303d9a4c011e80ba9b SHA512 3c2c8e1725060cebaab470972fd587127199ba94b7544abd0cacc0707238a76bcbd07aa2f0bd7be1ce39c6a31c271de2ee96ba9a4d543ce19f4136fbbf28f0a9 WHIRLPOOL 861c49ab348991458e1561f9107354aa8c1ff30bf6d69afc3308cdbb576cd66c531d5c0de629812825fc83d49a905013587ad4ac10d8a0c2b42fff5c514e0122
 DIST netfs-1.2.0.4.tar.xz 18996 SHA256 e2e3dedc7b2c6933562c57446559121af0d40369171aef26510b5657a53c4af1 SHA512 c3c6beb62ca66d9380672faffb87e9f9ddb6917a350f73d001a8517772e8d8d26d49a09dfd2911bc12f97795994e4b3bf0d20ba938c8cd3eb1616d0926900a34 WHIRLPOOL 022d150bc04e7adec698f845ae25c3ec6b3964e6613faf12eaf0e14a659c47294bba5a425269687fcc5e7a3fd9eb196ed1a6b5619ca95688f145362cebdddecf
-EBUILD netfs-1.1.2.ebuild 1228 SHA256 9aa3d645d489b45f253e625eb03df10288f9223ec983f684f3ca4385a5a365e5 SHA512 c7f4f4a4cf13c4f167bf791be325290ef5017e7946d76347464aaa217be83a068a9178e2b917519f4d84277e80b895163d988eb315f5cf31c3ad5cb91cb88e7e WHIRLPOOL 3c016ad4f46bb72a43a901193aabe4e7de847332543625d60d569e1c1234272d437fe524c30ed43c814f0c40c273a7ec3d5d3c566da3acf7f38715f7f838022e
-EBUILD netfs-1.1.3.ebuild 1228 SHA256 9aa3d645d489b45f253e625eb03df10288f9223ec983f684f3ca4385a5a365e5 SHA512 c7f4f4a4cf13c4f167bf791be325290ef5017e7946d76347464aaa217be83a068a9178e2b917519f4d84277e80b895163d988eb315f5cf31c3ad5cb91cb88e7e WHIRLPOOL 3c016ad4f46bb72a43a901193aabe4e7de847332543625d60d569e1c1234272d437fe524c30ed43c814f0c40c273a7ec3d5d3c566da3acf7f38715f7f838022e
-EBUILD netfs-1.1.4.1-r1.ebuild 1421 SHA256 6687c35ec18e8788785e053a79826dd3696eaa0e9c7cdb03d1213e8b85a4e957 SHA512 545c0b4116b73b04c545732c2b35f496ab808ee6a07f5d43cf81fb8539be3fa349da03d65755fa2cf2755669830457fd959535696306e21162edc1708d6e4e59 WHIRLPOOL 0973663ce773ac6485b2ae72e8d4bbf3e462323668657f05c3d6a9e52e98678dc26f90d37de8ee0d897929ea17ce4c2f1b227db1db59786ab7454fb8265bb8ad
-EBUILD netfs-1.1.5.2.ebuild 1593 SHA256 6bf9ba7272741f2f834d648bf8f27c1a403adcdc4a8b44912439676fdc497d73 SHA512 f88c506c4b7425a7760f16e3e7e503b6ddee8bc11d35c5796f2e33cea7377afc8e124a01bc7e9c8c1aafe2240e46c8635a1c1bd92006db21410ec8b93bd05015 WHIRLPOOL e026b536b4e03cad35de6619d36be79e410bd87c7aedfa339cf55403116be1e690c0c87265276689e595374180ca0c3397ad09cb4bbfd5a0866cae86953be115
-EBUILD netfs-1.1.5.ebuild 1577 SHA256 6d061d97c23978bd65a231431c2df11273a4477f3a3904986ce296dac2b124e8 SHA512 085b861974f89e5a7463a13c8c1a49effac51355980121dc426a0ad68607ab586e84200f9ef94c10bbace43774cae27d6b7cbe749f5d18abcfd9fcffa4cbe7d6 WHIRLPOOL 41fa9a7a70fdab08b86ea63e2b36ea2158a5455784ef24cdefd6328a3bfbcb5d731836cf79b30875c42544152edd7ce911a54492bb374cb0b70e59bd2e9bb06e
-EBUILD netfs-1.1.6.1.ebuild 1593 SHA256 6bf9ba7272741f2f834d648bf8f27c1a403adcdc4a8b44912439676fdc497d73 SHA512 f88c506c4b7425a7760f16e3e7e503b6ddee8bc11d35c5796f2e33cea7377afc8e124a01bc7e9c8c1aafe2240e46c8635a1c1bd92006db21410ec8b93bd05015 WHIRLPOOL e026b536b4e03cad35de6619d36be79e410bd87c7aedfa339cf55403116be1e690c0c87265276689e595374180ca0c3397ad09cb4bbfd5a0866cae86953be115
-EBUILD netfs-1.2.0.4.ebuild 1063 SHA256 9e3dc2d9fab0e051d8d3947cb060d68eda498c1156128b0916161cfe921cd990 SHA512 ac3ca5a138d8875a8d4ecc2985d453339b368265b04e3360b9ee6e8cda901f651a539502d56594b15427f339042c4aedaeebfd1c8e3c7534dd2eca2f0b5f5f88 WHIRLPOOL d4a40d25526f7c0f455b105e94e4799d5f9c6e57cf87975bfecf32db00f98d5cbc9206292cc22882a37d5a96bc01eabfb1b14f7cc2d369fd098617e6c7f63a64
+EBUILD netfs-1.2.0.4.ebuild 1005 SHA256 c8988451f9f7b523b16eb0b9b3d4a2aec21639d60b3bd4ec321f0ef7ac39fb2b SHA512 06a09cff7eb526567eaa57145a6dcc79be2e47a134b004e288195253004534b4864ff4938ea7ab0ba1e9bb1ef84ecd647e0679a348082ab160175b102176928e WHIRLPOOL fd34b2d870893d92701d5ac16a009e8e5ffa971518f096a429e897f35229a61aaf1ba8f5afa7436be201ee534dcf85bf5fff201684086bdc1ca6ce9c3d872ba1
diff --git a/sys-cluster/netfs/netfs-1.1.2.ebuild b/sys-cluster/netfs/netfs-1.1.2.ebuild
deleted file mode 100644
index 4e00cc6..0000000
--- a/sys-cluster/netfs/netfs-1.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-DEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	sys-fs/fuse
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release fuse//netfs daemon//netfsd -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib  || die
-	insinto /usr/include/netfs || die
-	doins ${S}/netfs/ice/*.h || die
-	doins ${S}/netfs/ice/bin/*/*/*.h || die
-
-	dosym ../usr/bin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/etc/client.xml || die
-	insinto /usr/share/netfs/ice || die
-	doins ice/*.ice || die
-}
diff --git a/sys-cluster/netfs/netfs-1.1.3.ebuild b/sys-cluster/netfs/netfs-1.1.3.ebuild
deleted file mode 100644
index 4e00cc6..0000000
--- a/sys-cluster/netfs/netfs-1.1.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-DEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	sys-fs/fuse
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release fuse//netfs daemon//netfsd -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib  || die
-	insinto /usr/include/netfs || die
-	doins ${S}/netfs/ice/*.h || die
-	doins ${S}/netfs/ice/bin/*/*/*.h || die
-
-	dosym ../usr/bin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/etc/client.xml || die
-	insinto /usr/share/netfs/ice || die
-	doins ice/*.ice || die
-}
diff --git a/sys-cluster/netfs/netfs-1.1.4.1-r1.ebuild b/sys-cluster/netfs/netfs-1.1.4.1-r1.ebuild
deleted file mode 100644
index bbcc48a..0000000
--- a/sys-cluster/netfs/netfs-1.1.4.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-
-DEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	sys-apps/icebox-service
-	dev-libs/libadhocutil:=
-	sys-fs/fuse
-	dev-libs/boost
-	dev-util/boost-build"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release fuse//netfs daemon//netfsd -q || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL ${BJAM} ${BJAMOPTS} variant=release install -q --bindir=${D}/usr/bin --libdir=${D}/usr/lib  || die
-	insinto /usr/include/netfs || die
-	doins ${S}/netfs/ice/*.h || die
-	doins ${S}/netfs/ice/bin/*/*/*.h || die
-
-	dosym ../usr/bin/netfs /sbin/mount.netfs || die
-
-	newinitd ${S}/netfs/etc/init netfsd || die
-	insinto /etc/netfs || die
-	doins ${S}/netfs/etc/daemon.xml || die
-	doins ${S}/netfs/etc/client.xml || die
-	doins ${FILESDIR}/icebox.config || die
-	insinto /usr/share/netfs/ice || die
-	doins ice/*.ice || die
-	insinto /usr/lib/systemd/system/icebox@netfsd.service.d || die
-	doins ${FILESDIR}/service.conf || die
-}
diff --git a/sys-cluster/netfs/netfs-1.1.5.2.ebuild b/sys-cluster/netfs/netfs-1.1.5.2.ebuild
deleted file mode 100644
index 0c8787f..0000000
--- a/sys-cluster/netfs/netfs-1.1.5.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="client server systemd"
-
-RDEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	server? (
-			sys-apps/icebox-service
-		)
-	>=dev-libs/libadhocutil-0.3.4:=
-	client? (
-			sys-fs/fuse
-	   )
-	dev-libs/boost"
-DEPEND="${DEPEND}
-	dev-util/boost-build"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//netfs) \
-			$(use server && echo daemon//netfsd) \
-			ice//netfsComms || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//install) \
-			$(use server && echo daemon//install) \
-			ice//install \
-			--prefix=${D}/usr --includedir=${D}/usr/include/${PN}  || die
-
-	if use client ; then
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/client.xml || die
-		dosym ../usr/bin/netfs /sbin/mount.netfs || die
-	fi
-	if use server ; then
-		if use systemd ; then
-			insinto /usr/lib/systemd/system/icebox@netfsd.service.d || die
-			doins ${FILESDIR}/service.conf || die
-		else
-			newinitd ${S}/netfs/etc/init netfsd || die
-		fi
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/daemon.xml || die
-		doins ${FILESDIR}/icebox.config || die
-	fi
-}
diff --git a/sys-cluster/netfs/netfs-1.1.5.ebuild b/sys-cluster/netfs/netfs-1.1.5.ebuild
deleted file mode 100644
index 658dc64..0000000
--- a/sys-cluster/netfs/netfs-1.1.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="client server systemd"
-
-RDEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	server? (
-			sys-apps/icebox-service
-		)
-	dev-libs/libadhocutil:=
-	client? (
-			sys-fs/fuse
-	   )
-	dev-libs/boost"
-DEPEND="${DEPEND}
-	dev-util/boost-build"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//netfs) \
-			$(use server && echo daemon//netfsd) \
-			ice//netfsComms || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//install) \
-			$(use server && echo daemon//install) \
-			ice//install \
-			--prefix=${D}/usr --includedir=${D}/usr/include/${PN}  || die
-
-	if use client ; then
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/client.xml || die
-		dosym ../usr/bin/netfs /sbin/mount.netfs || die
-	fi
-	if use server ; then
-		if use systemd ; then
-			insinto /usr/lib/systemd/system/icebox@netfsd.service.d || die
-			doins ${FILESDIR}/service.conf || die
-		else
-			newinitd ${S}/netfs/etc/init netfsd || die
-		fi
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/daemon.xml || die
-		doins ${FILESDIR}/icebox.config || die
-	fi
-}
diff --git a/sys-cluster/netfs/netfs-1.1.6.1.ebuild b/sys-cluster/netfs/netfs-1.1.6.1.ebuild
deleted file mode 100644
index 0c8787f..0000000
--- a/sys-cluster/netfs/netfs-1.1.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-EAPI="5"
-
-DESCRIPTION="Cluster capable network filesytem"
-HOMEPAGE="http://netfs.randomdan.homeip.net/"
-
-SRC_URI="http://releases.randomdan.homeip.net/git-modules/${P}.tar.bz2"
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="client server systemd"
-
-RDEPEND="dev-libs/Ice
-	=dev-cpp/slicer-1.3*:=[xml]
-	server? (
-			sys-apps/icebox-service
-		)
-	>=dev-libs/libadhocutil-0.3.4:=
-	client? (
-			sys-fs/fuse
-	   )
-	dev-libs/boost"
-DEPEND="${DEPEND}
-	dev-util/boost-build"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//netfs) \
-			$(use server && echo daemon//netfsd) \
-			ice//netfsComms || die
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/netfs || die
-	setarch $(uname -m) -RL b2 ${BJAMOPTS} variant=release -q \
-			$(use client && echo fuse//install) \
-			$(use server && echo daemon//install) \
-			ice//install \
-			--prefix=${D}/usr --includedir=${D}/usr/include/${PN}  || die
-
-	if use client ; then
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/client.xml || die
-		dosym ../usr/bin/netfs /sbin/mount.netfs || die
-	fi
-	if use server ; then
-		if use systemd ; then
-			insinto /usr/lib/systemd/system/icebox@netfsd.service.d || die
-			doins ${FILESDIR}/service.conf || die
-		else
-			newinitd ${S}/netfs/etc/init netfsd || die
-		fi
-		insinto /etc/netfs || die
-		doins ${S}/netfs/etc/daemon.xml || die
-		doins ${FILESDIR}/icebox.config || die
-	fi
-}
diff --git a/sys-cluster/netfs/netfs-1.2.0.4.ebuild b/sys-cluster/netfs/netfs-1.2.0.4.ebuild
index a842b04..1a3128d 100644
--- a/sys-cluster/netfs/netfs-1.2.0.4.ebuild
+++ b/sys-cluster/netfs/netfs-1.2.0.4.ebuild
@@ -26,16 +26,16 @@ DEPEND="${DEPEND}
 
 src_compile() {
 	bjambuild \
-			$(use client && echo netfs/fuse//netfs) \
-			$(use server && echo netfs/daemon//netfsd) \
-			netfs/ice//netfs-api
+		$(use client && echo netfs/fuse//netfs) \
+		$(use server && echo netfs/daemon//netfsd) \
+		netfs/ice//netfs-api
 }
 
 src_install() {
-	bjambuild --prefix=${D}/usr --includedir=${D}/usr/include/${PN} \
-			$(use client && echo netfs/fuse//install) \
-			$(use server && echo netfs/daemon//install) \
-			netfs/ice//install
+	bjaminstall \
+		$(use client && echo netfs/fuse//install) \
+		$(use server && echo netfs/daemon//install) \
+		netfs/ice//install
 
 	if use client ; then
 		insinto /etc/netfs