summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-06-24 22:54:18 +0000
committerMike Frysinger <vapier@gentoo.org>2014-06-24 22:54:18 +0000
commit453e2ce707f568411fb95c025b700855a31e2ab1 (patch)
tree6436be0583f4090d6776294316b57b102235ee31 /net-fs
parentLower dev-libs/glib dep to first known EAPI=5 version, requested by Funtoo fo... (diff)
downloadhistorical-453e2ce707f568411fb95c025b700855a31e2ab1.tar.gz
historical-453e2ce707f568411fb95c025b700855a31e2ab1.tar.bz2
historical-453e2ce707f568411fb95c025b700855a31e2ab1.zip
Hack up the systemd scripts a bit more #514372 by Juergen Rose.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/nfs-utils/ChangeLog5
-rw-r--r--net-fs/nfs-utils/Manifest30
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.3.0.ebuild7
3 files changed, 24 insertions, 18 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index e9fb5fbb3dc1..4d4b2d42b65d 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/nfs-utils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.248 2014/06/24 22:54:16 vapier Exp $
+
+ 24 Jun 2014; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.3.0.ebuild:
+ Hack up the systemd scripts a bit more #514372 by Juergen Rose.
*nfs-utils-1.3.0 (20 Jun 2014)
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ab32c2bf2482..d3373eeac69d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -78,23 +78,23 @@ EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800
EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016
EBUILD nfs-utils-1.2.9-r3.ebuild 4455 SHA256 f323aa2791bd33f1a24a96b3aaee6a775ea4e98bc28eed6bc471971a7c64da69 SHA512 453afdbf85c536de08b62dcceec04ef7a02822e80e7b91d2cd8110be6e03e2ffabfebd8b608abdbd51cf8445af9c578a6734c940e463c128f6acff948411fa33 WHIRLPOOL 420a105cf9feb150d18a1b53dd2a9365215420448fd4dd0ea079525363ba47e155f4301479d29cebd3a0b14d8b0ddb45f314188922e081d18b853d0c9b11ed3b
EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
-EBUILD nfs-utils-1.3.0.ebuild 4347 SHA256 c545533de6b57d82f1aedc9d39cdb2d315c9d14cd70e64495a71ff10345c0897 SHA512 541603e2bba85d11c455ee66382cb0acbf211fdf11d7816b6c03055f769e5a747c5ad9a6c2fca834582ee8a1ad262f078f2958bf1294d782a5018e2715b6cbf0 WHIRLPOOL 49049147b065ce83abd2f88c3d2e863239ce53aad8a3f6cb852c7add9a2d35755091c370924d4d721048280e0e0a4407fac4cb47d6bfe809eb34cd16627cc81f
-MISC ChangeLog 39069 SHA256 e63be3131bc7607cff8211b39d9d1e49f44b938a3bba5130b4ae17835734d8a1 SHA512 de601c1d89fffad36288fdfd0eb45613005cad5d3e447b2ae61341623384166499d448209e27f04e1f1ea1e15ac86f77792815186fb8aa28bcf8fe373d34c400 WHIRLPOOL b05260690297071734cb37a6ef9cc01c219ce1577266982ff701f1589a2fa641ed625847ec836d9faca8032f8fc2d9f5e7c095e79472e4e39a23780d3765b4c4
+EBUILD nfs-utils-1.3.0.ebuild 4504 SHA256 76e2828c96f7eb33e0ac047096768381f9f1db3eb5eea56242b7ad7cad3afcd8 SHA512 07c9ff32c74a882662bfc5fc7289188e1f89290fa86ac5dcfe8d38c092cd37d5ce90aafec13ac6a8ce0e5facc8e0c686e8bf3d208da680a2a50483879669baf3 WHIRLPOOL 3a4707775c088dcebfa3e96f4f80c2bc8243a6002b4e60dd74c04715f0049624115415ffdfc21287babe53725dbfde5dbe5ede409ca51f2336ce7ca427daa1bc
+MISC ChangeLog 39210 SHA256 42cb183ac3c5e09c450f09651e85659c87561ca9f913514627f611d53febba05 SHA512 e0ce37986dd2cc6f45c956387b511ec18246591f70cbfa5713de02f7e38e17e1569486eb38061d17b5471751f72fcb88781a943217b9ba544613dc71c1a871f2 WHIRLPOOL 66b606e505b560a82ebdc35e928ed128b0b8ba31d80b1734f229f9dfd38c90298330b2f3f29b41e7607bfdd3881482a88a7c10abd66177bfc613748dc7ce378d
MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTo9OjAAoJEPGu1DbS6WIADnIP/1Z0jusyTALT+j5CRGDvAPmL
-CYil7AEvf6cFDly2Uup/FnWJHlCbPPG8LiGwW/vJ1INtx1eR3Rt4yEBqmq7fJYHq
-RIR0DQCvWqudflDiXgf9CV4fNFfqGjXlv2Erh9hMQPQRxoUwKpK7983ZcGf0nYp7
-Eaa5IavJ6LTjm1KO9wsyrWJIigx/myOjVdBzZrudEj9Zs85gjJsnbAnqfuBBEKhM
-BI/Mdco4bvEIBvC0lamFJBhvC4Kmh8ip8jpTKRd9G1Ka3UrzIybTZ0Dl2xGCT8Qn
-X2TJnHsecYqVTVcngTuFQFzR5CNbQmmBs7G7ccLvHVfH3usiQy6U57qdzPdshvQc
-4dl/cpAyn7P+dA1Yl/hGHpOO849gKIpaK3OusTElDBXn4A662ogeXxwt4JeUe+Ft
-Ran7DXABF6ACk9hKy3HLRPw5wSyndFBek5Zcr75DaO5WsmOFY2ubJkzIb5VhtkUk
-prIN19XGI2vXQuzrVWo6OgZpuxrqMfVygfuBecTArJnyuYSjn+kYy5J2ZySdNd19
-QpwQgWV17BELER91DSGo4mSw2JaRR0yUhCQbgsJSrs0ZkfMGFr0ci56ylxZnegEI
-ueBGVmEJ77k3w5A0QwPj5u0cgfNZY6EpaEkaf7PLU2Eq1rxj8TZv4fEozJuY0Yc5
-UmvMYfENDZi0ME6Xk01S
-=8XnO
+iQIcBAEBCAAGBQJTqgGeAAoJEPGu1DbS6WIAsIMP/jLPoLNXzaolgZI91s+J5ZWL
+iZxII1HjDHZgDGm+w0Kq+huyWy5LqeZsHP3zeUS/Y/hT3Iva7OQELBFFBLOuAru8
+kJwOs4Rgk6+xQeFprB8Jp/kI4WFITonxbQ59PCZE3fSXqBoUXF/AHiyKca0Rwd2M
+8w4H4rWX8Fi/koFY4iJc5wBltdzKOw9AxrEuG7647dvLuACtDbGahW3CqMZ7J1nv
+9/ne1Vw1T7kwkOIH8BiWFhRCc35PvCNLlE+AAjf/BxGlRww1ODFoVk2vjqoglKg+
+wc6KzFF6a+2k2mXdK0mQcmcrjUKeXDUK5hji2kuY+8PjX0JB+iKJLceqy8JkQLUB
+9UC9tAIIIk4UXcre/3viiEQ+fBhb7167huRrjjuDswcQNAQqsy5quAdL9WEBN7o4
+8lTR1C3IsSkuzhyrQxEzJcy9fNn6vhRHQ/VXf7becr7mOhHol5VNGCBKayLUASIL
+dxtGoe7IwDm5wR5BU46pd6RIG+eTpAcXFU3j2387wo51zu4CvrdXcRA74dP2lAOS
+8ysk9hfk+rttdSCvPeg2yaltLYdK4WNN1cLoXjVDKD+dV1KEtemmc2uWNQrsA9V/
+Mf18elHjAys2Amp//c/JZKICbI6FWL5TrqDMTY/p1QnciAXJEO/0uyLlvEdpSdac
+Me0e1VIi1RRg4vICVeUn
+=n84h
-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
index 836d676ade2c..ba5d0f29599d 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.2 2014/06/24 22:54:16 vapier Exp $
EAPI="4"
@@ -134,8 +134,11 @@ src_install() {
if ! use nfsv4 || ! use kerberos ; then
rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
fi
- sed -i \
+ rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
+ sed -i -r \
-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+ -e '/^(After|Wants)=nfs-config.service$/d' \
+ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
"${D}$(systemd_get_unitdir)"/* || die
}