commit: 0a47dc5c6b99ff282fbf11c9dc72dd51ec0659af
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat May 17 10:34:52 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat May 17 10:34:52 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0a47dc5c
sys-freebsd/*-9.9999: bumped to EAPI=3, sync some code 10.0
---
sys-freebsd/boot0/Manifest | 2 +-
sys-freebsd/boot0/boot0-9.9999.ebuild | 2 +-
sys-freebsd/freebsd-bin/Manifest | 2 +-
sys-freebsd/freebsd-bin/freebsd-bin-9.9999.ebuild | 2 ++
sys-freebsd/freebsd-cddl/Manifest | 2 +-
sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild | 6 ++++--
sys-freebsd/freebsd-contrib/Manifest | 2 +-
sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild | 2 ++
sys-freebsd/freebsd-libexec/Manifest | 2 +-
sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild | 4 +++-
sys-freebsd/freebsd-pam-modules/Manifest | 2 +-
.../freebsd-pam-modules/freebsd-pam-modules-9.9999.ebuild | 6 +++---
sys-freebsd/freebsd-pf/Manifest | 2 +-
sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild | 7 ++++---
sys-freebsd/freebsd-sbin/Manifest | 2 +-
sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild | 6 ++++--
sys-freebsd/freebsd-share/Manifest | 2 +-
sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild | 6 +++---
sys-freebsd/freebsd-usbin/Manifest | 2 +-
sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild | 9 ++++-----
20 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 687c1e7..2f37784 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,4 +1,4 @@
AUX boot0-9.2-gcc46.patch 2119 SHA256
745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512
ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9
WHIRLPOOL
0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
AUX boot0-9.3-gcc46.patch 2180 SHA256
a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512
a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6
WHIRLPOOL
2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8
EBUILD boot0-10.0.9999.ebuild 1772 SHA256
00b21d6078ed8a67649ec0f9b7f2c0b20e0f0bdeac9ccf29c64b563f48fc6bf2 SHA512
2eea99df63f70b0b63e1880baec0563cbbc0ff9ad2a66641f56001a560da4b980518d06681951c584118d4f5cc39cbc680b30997d05010bb8a399d592ba6513f
WHIRLPOOL
34dafb6ebb5a6c383642838ce3a21901a57dd1d20b64266997702764632dc735f53bd537651487ec2cbba1c8faa0bf9d3a4348b3939652241aaca05439f7d93f
-EBUILD boot0-9.9999.ebuild 1687 SHA256
f93e9c8eee348c0085e5d0521f4449e82cbadd6f408eeccbb666645adecb7d37 SHA512
fe1ca5f0b8850e49e10d9eea7f0d9b9888816eb5c495f19747814e1288763a9cd0479103a7895e015eb84f60fa51444390abbb04b808dd84c24a7636b9a6ea2e
WHIRLPOOL
8fd067d33816f6fae329b42bdc747fe674c665a56c480d47bf09f79aed41ff199d71da1a94b9963245bb4ab0f452bed495cd038bde4fe3518923a890365f6b24
+EBUILD boot0-9.9999.ebuild 1687 SHA256
b89ca199c5a7984a38eb8dfcbe317d61b470ad57ffa3623e8a9dab91419eada9 SHA512
3b2e878e48d3d195cb760bd6acb81b68a242dfebaa090fca4eaecf2ef2091e3b8b74092dac48074e497e2f002b6575dead4823c56990691103f6a6cb22a697ba
WHIRLPOOL
6f9c5ddb5046d0bbfa237cc5b3c76df017a38398efa5dea334147dd4f6bf2fea7c1030ebc6508e65bbeda086f61f244feb5b4b39bd9ec1555087a7e6679d71dd
diff --git a/sys-freebsd/boot0/boot0-9.9999.ebuild
b/sys-freebsd/boot0/boot0-9.9999.ebuild
index 947feb7..39e1705 100644
--- a/sys-freebsd/boot0/boot0-9.9999.ebuild
+++ b/sys-freebsd/boot0/boot0-9.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=3
inherit bsdmk freebsd flag-o-matic toolchain-funcs
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 3bd9deb..7274d5f 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,2 +1,2 @@
EBUILD freebsd-bin-10.0.9999.ebuild 899 SHA256
50597db60e48c9c12b3bbc5b27af2b5b50c5e02fc810ddecf341b99f9d867934 SHA512
ba96121a11bf381525a1eacfc55bc3aaf867c79d4666fa050a4f3143e7a5a82eb0916dbe62d5dc29b146adc336b0b44101144bd1784179f8f3d204f18687f4ab
WHIRLPOOL
acd5685ba8fedaca0b8abfdae789d33bb11d32c1cba46c34f8b049b3b5b7207d1ef0c8b0f8ba9c55233159426cef7a43ce5abf72f328bd8241fff17d02cd1d79
-EBUILD freebsd-bin-9.9999.ebuild 879 SHA256
7e4e7f5bafd7f5fa783f569d7342f7dc591683d2dcde820442ecc9ff0dccee27 SHA512
06d885e48911bfbbaae7977cc1bdaa6ea0807719c623db523569f7d28cb86bf023d213ba44e8a05a1cae7c235d2865dbaadbd2cd54589eee7849c40c7a47129f
WHIRLPOOL
301b086c677b2045f7f0316d6b1d20d97bda1c5ebb448b8fbc0c07df0e80b71f27353088af958dee1e41a1e90dbe86a75a575bd898ed977bee345567cc343192
+EBUILD freebsd-bin-9.9999.ebuild 887 SHA256
0ba352302f3294bacc36502ccd6b1ffa4a4e9a7e4cc8c68809e547fa8439e26d SHA512
d509ef885fe84f14988a7fec10334da997efce4659a4c6aaaf9ce0157691d84581ce1fc873a61a14630762018f9abc1b22b6e461603abb1ce2394fad8a9da12e
WHIRLPOOL
d5f3428241b49752b2d967adb75881f90b860501432c1504b303a94d82dce69409102b2c9f2b720c705cbb4655f8db4436c6c713ec5de61f36059d6743ab8dd4
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.9999.ebuild
b/sys-freebsd/freebsd-bin/freebsd-bin-9.9999.ebuild
index 14c6e7b..9887ef9 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.9999.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=3
+
inherit bsdmk freebsd
DESCRIPTION="FreeBSD /bin tools"
diff --git a/sys-freebsd/freebsd-cddl/Manifest
b/sys-freebsd/freebsd-cddl/Manifest
index 1d7b6e3..9d9ee4c 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -6,4 +6,4 @@ AUX freebsd-cddl-9.2-underlink.patch 967 SHA256
43ede354a9e0e3db0496eeccaf64a974
AUX zfs.initd 481 SHA256
8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512
9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843
WHIRLPOOL
766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
AUX zvol.initd-9.0 930 SHA256
5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512
998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3
WHIRLPOOL
361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
EBUILD freebsd-cddl-10.0.9999.ebuild 1510 SHA256
f987838a5db4415b187ba6dbb283320a19d70eb69ae4e3816fff87699d788d73 SHA512
9d4223729e66cee65cfa448ac88c4eea049fc83caeba83aec7a6b1bc06465020073e7084c67fef1315b89e2f9704d5779acd28c0145265afd1acd723116b67ae
WHIRLPOOL
d4c007208fc9c0383f29672573e39135670cfe63c97890ca75271472c64c956527ea1adf2ee33bdeac5d9ee230bf2391a20bfc0bcad213b14f700ce56ffaaf09
-EBUILD freebsd-cddl-9.9999.ebuild 1488 SHA256
842257490d55a6039bec0250e5bbbf72a7a323f94ac3686ed1bedcdd772e1111 SHA512
5bb7ce26a8ee89f0036f1a28e85f441900ad7c553c4d17b46734e074d2bf63001205e4babe872dc1d42cadaa578f8a5bde5052982fe506d2a98ceeb8b8e73291
WHIRLPOOL
1b75eeb5366dea218f969f4c58dff25e7aa9acf051bc30e113250a3191dc49e379095ac00db317433d54b75df6ea7116202906612e2123ce11ed60b636a2ea38
+EBUILD freebsd-cddl-9.9999.ebuild 1536 SHA256
554b77961c6c7df25fcc0dc3af38c80d4f52f4967cf37c2b772dab576fe02b51 SHA512
7bf1e533aa4900f844751391fd84bc11b86e5f8acdb45326db7173acea393dd5ed6f4de14e99d9742180d561eb933f6a8d39ac9b7b88eab764933d678a208f15
WHIRLPOOL
5592afee4f4ed8828957b4537b03354793a410dbc59cac6949c5e7df0486d166f83d170273f70ed7cc7680235244013d7e002a5b9bdbf27ffbe831f3f47666f3
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
index 4ba6c48..69f8a72 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
@@ -42,8 +42,10 @@ PATCHES=(
src_unpack() {
freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking
/usr/include.."
+ if [[ ! -e "${WORKDIR}/include" ]]; then
+ # Link in include headers.
+ ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking
/usr/include.."
+ fi
}
src_install() {
diff --git a/sys-freebsd/freebsd-contrib/Manifest
b/sys-freebsd/freebsd-contrib/Manifest
index b726636..f1db92a 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1 +1 @@
-EBUILD freebsd-contrib-9.9999.ebuild 1092 SHA256
b9d5c10da5706924fde036b79dabcb869407827c9d8a39e23f4e45e78e47ac7d SHA512
8d326feece2805327e9d0704d35a964af5a8bc5b86fce25a1b172a07eb602e2db98d595467574ba6176d66f2c9d7f86fdeb38c1c8093c954b741a21991a72f5d
WHIRLPOOL
8bdfdf16b1d9a208d86d51c6b045c1644489f44fb356da3d33b77c93655021290b7b18999c56c8f4a2d4859d23df691a476abc6219dd6b2695791243f27b957b
+EBUILD freebsd-contrib-9.9999.ebuild 1100 SHA256
7fa23e0b75c815f366a4f7540e56bd60fbf26f39732db4e8b78fd6095b440519 SHA512
b7c6cff521c5d81e2af93b992ae259c8e517e49c8280d45be51d87f3bc38cbd889af4b7d335d2c12a9d5fb2325486f37955f230612c9ae0e222e40ba62d90e01
WHIRLPOOL
cd20905631c99632337fe80ac2627d71010ce035b749cda1fc6b053dcebf7e8b5d2cc9a3dd92e50a615ddba2e7c8991436fc8c22fafa773c66c2d48507d25ce4
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
index a024105..6f1dc1a 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.9999.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=3
+
inherit bsdmk freebsd flag-o-matic multilib
DESCRIPTION="Contributed sources for FreeBSD."
diff --git a/sys-freebsd/freebsd-libexec/Manifest
b/sys-freebsd/freebsd-libexec/Manifest
index da93434..0002053 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -8,4 +8,4 @@ AUX rusersd.xinetd 220 SHA256
271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991
AUX sprayd.xinetd 216 SHA256
5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512
a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
WHIRLPOOL
3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
AUX walld.xinetd 215 SHA256
b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512
ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
WHIRLPOOL
013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
EBUILD freebsd-libexec-10.0.9999.ebuild 2519 SHA256
9c2a8ea10adc7a7015a0a1be1a35556a07bc3329c81391416a3792efe88b2362 SHA512
959e6027da56dd075f2eab63905d972621746b4b59cfadfd9c3a28112011d4e6bf8d0524fec14992bf56f7ce1e8acc7874c50719cd3eb54d59391f5c8a856908
WHIRLPOOL
8c24bc3198ddf9a947feea6f9aa1bbf74272fdcf2a202dc759428e1b242416c3632c2b2dae6a2c64a894fffffff5003b2276e19036dfb81f8b3befc22db8d48b
-EBUILD freebsd-libexec-9.9999.ebuild 2402 SHA256
7c671fc671bc17a5f62bbdf001d6aa0ea5c06556f2154713ca1ab141f8588c78 SHA512
ea1847228aa65bcae5299483f657e5bf2f65c8c4fb74cc6643cc20cf2eb8f808c2ad44270faa415784d0675b40e4e84cc7ab15dab1baf7c9fe0b1b78228c2c82
WHIRLPOOL
c00a30d1ffe6cc174361e50d8db81158385548b1e7c5f08b2024a60442e0d49577e138d3457db5e4abf0b96152e6e680873ad0bee3a794057e9c9254d6c446a1
+EBUILD freebsd-libexec-9.9999.ebuild 2484 SHA256
3ce34ec17af06590dda720857a64bfb75a5a7f85fd0c38d7f10b72ab0d65af5f SHA512
1d0badf22482005a70ce2428c7b23c5730f7c19684b37bec0cb00b30a2ca9c4dec6eae2f4f77ad3da7324e1e62f00d33d30ea0da8c5300db863a7150f045c524
WHIRLPOOL
07c1464cd7a9e779e288d592d695c2b0aff9c5573ceff108fda196932419251a4cbeabecc2612255aeb12882354d4c8e77d1b17b872d3835e605a56db31e7975
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
index d0c9d60..9c20080 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.9999.ebuild
@@ -49,7 +49,9 @@ pkg_setup() {
}
src_prepare() {
- ln -s /usr/include "${WORKDIR}/include"
+ if [[ ! -e "${WORKDIR}/include" ]]; then
+ ln -s /usr/include "${WORKDIR}/include" || die "Symlinking
/usr/include.."
+ fi
}
setup_multilib_vars() {
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest
b/sys-freebsd/freebsd-pam-modules/Manifest
index ff851f2..71476f1 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,4 +1,4 @@
AUX README.pamd 2965 SHA256
2d3cea2b59ddee2ca6639ca7d14068e1499acee4194181c255bdfea81964d5ac SHA512
e278fd0a5056ae8c1de2f6104bfb4766adc89c7c357a4b965cb08ee555a071b326462c937fd63cd8fc7bd7e2a880f939cecdf2997a3d2c33c1b962afee12d38e
WHIRLPOOL
8ee79582595a2b79f3936863bd5fdb144930380a4073a74ec81967b3a11d61a40ca0becaf36dfa760c0c6110efa2041a4acd6041615e0d006f032e1d9c819aff
AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256
b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512
752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0
WHIRLPOOL
168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
EBUILD freebsd-pam-modules-10.0.9999.ebuild 1124 SHA256
b631cab5061193c283ffa26c044d6554f8f1a4ff34713190b5c37f213fbd12fa SHA512
8af9f32f80ff40bf9bbfb2dea69694f13eedfb18e0d1619efea1f5438e572dba2c2099013fd7e5b09f79914c9a8504f2873fab94cde0094f633fc539c61d9d2b
WHIRLPOOL
a4ddf2176f0b497c83ea63f97340afe48d39ae9c932209ed269147b8235aa097282626c4552aa124e0c460ab289d6189d84b3f678e82dc6236a81ef787baab8f
-EBUILD freebsd-pam-modules-9.9999.ebuild 1121 SHA256
4f555681667ac29a0d0abf3647c84e860f8b1537033d3e26202450425abff991 SHA512
2c12d700c43d144179bc40e840f79279f0a9e3860153ec0bfbf79cd4bdd268c27f611711018eb23610fb3faeef698af5933adb833e8a223afe4a4be8f5264399
WHIRLPOOL
1d03ce88a5c5fb0f8ad3f77d5e5b17ed13bc28dfaec9689677fa99a31a1c03625c694785754870e757dbbcff2fbec921bc0fa168bee121643dfc4a1b0d4774bc
+EBUILD freebsd-pam-modules-9.9999.ebuild 1109 SHA256
83e05f34236f61f73e3db23029b32b3543017e22c4ad4ef2955cce3380a0d791 SHA512
6dd0e338936662a9a3b37fa1f2be1a3f0dadf2114998c51245988fabe66ad48ad79a291e2e4a06fbee0051105a0b63e5b3ab941a49bc1e4b2853cce7b86afc34
WHIRLPOOL
68859464d43e1d2667ef9eb6710b935c1481c591123199c147c8c1eaebad4e58050ad8754f9468689f88bf165f27fa49de7ea1353bb2dba59134a4cd1258b900
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.9999.ebuild
b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.9999.ebuild
index fb2c9c5..591835a 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.9999.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.9999.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=3
+
inherit bsdmk freebsd multilib pam
DESCRIPTION="FreeBSD's PAM authentication modules"
@@ -32,9 +34,7 @@ pkg_setup() {
use nis || mymakeopts="${mymakeopts} NO_NIS= "
}
-src_unpack() {
- freebsd_src_unpack
-
+src_prepare() {
for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
sed -i -e "s:${module}::" "${S}"/modules.inc
done
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index d58102a..e6391fd 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -8,4 +8,4 @@ AUX freebsd-pf-9.0-pflogd.patch 332 SHA256
fc832fdfa406603a2cb185b8f0f746b13f767
AUX pf.confd 274 SHA256
dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512
bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5
WHIRLPOOL
fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc
AUX pf.initd 916 SHA256
b0cf7dadb825a1133fb52069e63eda10042aa62e3fa702bfbee53cd455837ac9 SHA512
cd55eccc9735f5a9e41297049a12c23b3fb4ef0987236b25bbfeeb01e7e0be697ff60fe8c9827dbb6a3da93211d6534e018a9693a6d1d48d60723738a21e7485
WHIRLPOOL
babaa4fdcb885262ec9e89b9bd076aa4fec0c82764025d3192dda6986366b2f0169235c4c771510ea742444deb0c7bccf56f4ab23fb592351decae445b9cc158
EBUILD freebsd-pf-10.0.9999.ebuild 1678 SHA256
3bc74457178d6c6496c2080943e80de01853e45b4427e27ba10e53ad6c51b093 SHA512
f7eb1b7f5db59329cbe19b94db51d5372529e43a4e4e925d8fea1801d75220fb8c8073a40fb7d85240557c3a02b8239fc8dabfaaaefae1062afaab7679cf6128
WHIRLPOOL
287a0be6dac4bb133954829d35886c478768a5b81d6a7e416bf1c47cb1f6b24558145b757749f647d9326acfb95f99de79a5859b8323b1f3e02ac53cf9cc6610
-EBUILD freebsd-pf-9.9999.ebuild 1660 SHA256
0c10a014c0417b4b5bfb00a242b2c7f99b11443129ab4686dc2e43f4829e8b6b SHA512
6a85e40e23177e220e0f44c01732aa13a554b064478317891ed8af7668836ae80dcffc7b27a8c82f08a59b332e6bed067a34766fa003a1a624886ad510aa4a66
WHIRLPOOL
2de4e5fcfa95a729b1f359262525343d59549315f3a254500844e51d04f0dc817bc4db1cd8561b2ce0723054ba19352fa5e016caaa54451c56208be64b218ef0
+EBUILD freebsd-pf-9.9999.ebuild 1680 SHA256
020a048ac9a95eefd39e8999dffe54bd493c4307f3626ece54a5f8a021d0446d SHA512
4d52667af56d50d39501471f209954d8186679ec70588d2b5397b46d83452b9e49df002382d995088b25dc7e1c62d2b1beafd1831808416325328c024b3cc1f2
WHIRLPOOL
1787a07b62c9058dd622980779f0c762eaf46813b797d1f18ed29ffbdd0f3aeab5f0520749cf4f61c4a60fdd565e8fc7e8b277c3861bfca4764fae6a48749078
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
index c6289f9..3dc3197 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-9.9999.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=3
+
inherit bsdmk freebsd user
DESCRIPTION="FreeBSD's base system libraries"
@@ -33,8 +35,7 @@ pkg_setup() {
mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
}
-src_unpack() {
- freebsd_src_unpack
+src_prepare() {
# pcap-int.h redefines snprintf as pcap_snprintf
epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
# Use system's libevent
@@ -43,7 +44,7 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
epatch "${FILESDIR}/${PN}-9.0-getline.patch"
# Link in kernel sources
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
+ [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
}
src_compile() {
diff --git a/sys-freebsd/freebsd-sbin/Manifest
b/sys-freebsd/freebsd-sbin/Manifest
index 837fdd3..537c670 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -7,4 +7,4 @@ AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256
f40f55bec52d0e3e0205c363ad624a113
AUX freebsd-sbin-setXid.patch 541 SHA256
2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512
e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e
WHIRLPOOL
a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d
AUX idmapd.initd 440 SHA256
e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512
d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a
WHIRLPOOL
eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16
EBUILD freebsd-sbin-10.0.9999.ebuild 2723 SHA256
4e547ff6a7352ea0e0035cb77e967424a95ff1c265c1d0dbc4f6fe196fea772e SHA512
a1069aad64bffbddd0389927267d3a45537bb871a5a3ecf68909b5d65fd10afeb00382941249b98d5196161da412124283bae63ff25eb025adf694e34a2c6a67
WHIRLPOOL
02e319e6a04a1ec83e55bdc46a95738cdef506f531bec2585d9306b39ecccc6ba4cd08144ed11c73493f67baec266e3f18cf2b96795d4851908fc9a30c6ef789
-EBUILD freebsd-sbin-9.9999.ebuild 2686 SHA256
75d15f6b3d940ee8cea594a6fbbe3f071ced64636a533ae06e6de49a158ec3ae SHA512
80783f1a3fd38c244a8acddaa4a909cb2be0c7bc484100062b41976a32f09b8289cfe3233fafc986c0d3519146fe47e8709ffe0865fb708d569493fa79198ad6
WHIRLPOOL
536b7883024d431991ef4e9a10453c9aaf0a5baaaf42bc6badeae96712d664d7ca77694f0f75de38d9c4537b32da83086cb6f3161eb5ae18b857f8630eb51f27
+EBUILD freebsd-sbin-9.9999.ebuild 2729 SHA256
231858c2a2e3210891d0a8add3639fcaf009ae3436e1bdb3a3dc0f0029fbd2bb SHA512
a519e95555c210be68f0f1f9faca5e0323a37f998257a5a30a4dd3767527c5be855198c387f5b091207fd38c312e0f9fe01ad217353627c42481b8bec9770059
WHIRLPOOL
9b5dfe9c3bfeb9f584433a1e057fc27d2c65137facb1568451f733074683b58b42f93363ea87d9de4950ca525ebb832dad69ed910705978cc7f58ede0ed082fc
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
index 8161ed4..dd0d6a4 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=3
inherit bsdmk freebsd multilib
@@ -55,7 +55,9 @@ PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
"${FILESDIR}/${PN}-bsdxml2expat.patch" )
src_prepare() {
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
+ if [[ ! -e "${WORKDIR}/sys" ]]; then
+ use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
+ fi
}
src_install() {
diff --git a/sys-freebsd/freebsd-share/Manifest
b/sys-freebsd/freebsd-share/Manifest
index 890ea0a..fe1f0a7 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -5,5 +5,5 @@ AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256
20b3761bd18d4ff8e7257ab006f
AUX freebsd-share-9.0-gentoowaydir.patch 314 SHA256
68ddc9d6d95c95fc295f3ed3f7d7562de01ff6894b002bd7455d2da72cf4e2f2 SHA512
ef325e79806d78ede26567268829949de3aab02db1b7ea5f1dd834d4deeeddee8338679f7196fee6dc1a5682ccd79c1a0bdd73c96349961a8e1c2153fcf84afd
WHIRLPOOL
10448b2cd090068b698d2d9037f2a217cdc20cebcfce4a13f98111ae4e4a2073ce4cb274ec3a7011c2e89acc1b2ab1b5e8e3d141817c065fdb35d1879ae31c37
AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256
0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512
b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e
WHIRLPOOL
ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
EBUILD freebsd-share-10.0.9999.ebuild 3043 SHA256
1a7c9dfcf8a1cab305808b29fa8f427b0a9f450aa05b4ae96ac8cf2d6e3ce554 SHA512
5fcf89942246ea345f3986a3ddde62a004443f1bbb7530c946ac8b1873ba62bc61727766ccc40b17a5542bef3ee691e5651c7070deb0c8059cbe641310e6f85a
WHIRLPOOL
dee8dc8eda79a508ee24b845d957ae02a3ddba46ebd5b825939c07ddbf96380c31d5ead653b367f2c19afb7b0bc6e061651329ff50768ca24d6bca4783a1771d
-EBUILD freebsd-share-9.9999.ebuild 2782 SHA256
19d163221b2339798e26c9f3b3313cefe143561b5f5c308cbb6f2066cd6abb07 SHA512
a0b5f51b35b1d846a2315329e52d7e92e9258a4a16405c4deef086b0425273855da16ec6b74a9a28e3cfa5454374544d0dbe7858b717985abd2ec359536c87a1
WHIRLPOOL
50988e064b4af2c87bada78a7ba09e7dd802e8edd2f2a9caec0cf7aac6ea089db4a957789efe2bc1a9de46f431709e41862c677a0d0a1d5593fa2ca2b72b4b33
+EBUILD freebsd-share-9.9999.ebuild 2770 SHA256
5f1d9daf17d7455820e26bf4fe4f467cce62982500f679eae42020fa2d9a0c0c SHA512
35b637ddc5d384925846980b26d91eae247dc9e311f1377ba888e746d3fc0eca0241009e60cfeec4b75fcbb676bb56f39d4f0fb05b9b64814424531c26d2adb7
WHIRLPOOL
21fd24ec40f3ee82559b506d3dab9278360329a396f1f317770843419b74b2090851cd2c5f4bd8ef0fdbc86dd2129737100c42911b5756349d61c7d9ee947bae
MISC metadata.xml 223 SHA256
5c9860c4ce81b51fef51a6c5e87081bfd13e74ba452c27191a1abc0ca5ff0aa0 SHA512
3dc7fea8c9f850d63d4f9f24af639fb41d406c2e87439eb960c401412b37e7dc7ab6822d446ec113eb079aba30967391e95cd71dceb889753ed969bc51f6064e
WHIRLPOOL
577570d1260a6ef86155c1647e3d90c18aa9b83a89027dcea28b70d22df60e413cee353083d7e915d81129f447772dc7dc4ea766e478a9cf363dabce5d9042de
diff --git a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
index fd801d3..b4e199f 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.9999.ebuild
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+EAPI=3
+
inherit bsdmk freebsd
DESCRIPTION="FreeBSD shared tools/files"
@@ -44,9 +46,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
"${FILESDIR}/${PN}-9.2-gnu-miscfiles.patch" )
-src_unpack() {
- freebsd_src_unpack
-
+src_prepare() {
# Remove make.conf manpage as it describes bsdmk's make.conf.
sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
# Remove rc.conf manpage as it describes bsd's rc.conf.
diff --git a/sys-freebsd/freebsd-usbin/Manifest
b/sys-freebsd/freebsd-usbin/Manifest
index 935bf1d..2889501 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -22,4 +22,4 @@ AUX syscons.confd 464 SHA256
7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b
AUX syscons.initd 1711 SHA256
16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512
41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76
WHIRLPOOL
7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
AUX syslogd.initd 571 SHA256
3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512
0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb
WHIRLPOOL
e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
EBUILD freebsd-usbin-10.0.9999.ebuild 5394 SHA256
809e5c8ff04b70fd30dda8e73e19c01920ebb5cee11239dc4b2951b896672ba0 SHA512
0db2df64096169c470f5f9c6d54091e936b04163d0f1abe745e3e38ba42fcda4fae6d040128ffa6fee3da6fc0ab6be156f1b4ad0ec27e98cc4d017c54951b6ff
WHIRLPOOL
bfad1b78162fb63a61f4e4709942613197c29218cd1fcc2aeda5fe197b550e518123eefd252f6bd41dcb0966870ecd2d6cc27c50e25f2950b03ec4568a8a402f
-EBUILD freebsd-usbin-9.9999.ebuild 5493 SHA256
c6f8ea917ec7c751796da3957a139e47fbb8cb8002a2c5f5919828293f224b9d SHA512
dfcadee78b1eadcbe2e328decb62e8284c4deefa2b6bf468c411c74ac106a27427d7ea30de0fec870a057cb037895239094ea715370f4b5ec933c4c6c2ba74e0
WHIRLPOOL
9fc00ff1f2201e045b3fd1a6823bf8abd9aef81b95e13894825451e8421ed9cccbf29850d3ec5a4bc1f44d32c7085631e0b796cc02a41365c109121717f2fd71
+EBUILD freebsd-usbin-9.9999.ebuild 5542 SHA256
d1d03a895fbf61262eb2564953bdeeccc1deea94cd704ffe09e8c598fe26b2a4 SHA512
038e50122d6e2fa5e3f3bd21b2a72d6c3a7ebad7f65b2f0cf1a554134fd474879e06164fd0ba682529c6f0da0b2d0e607af55c586ba9045864d239cb16d402cf
WHIRLPOOL
2f16129a2ddcbcb8bfaa390571c2050392a4e0dff5439f9e6ffbcea266b91e0421ba76464ff0b5971c8b501bdd60226b462289a100ea1d67e969ec439f204e6d
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
index 3e786b6..d874c51 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=3
inherit bsdmk freebsd flag-o-matic eutils
@@ -26,7 +26,6 @@ fi
RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
=sys-freebsd/freebsd-libexec-${RV}*
=sys-freebsd/freebsd-contrib-${RV}*
- acpi? ( sys-power/iasl )
build? ( sys-apps/baselayout )
ssl? ( dev-libs/openssl )
>=app-arch/libarchive-3
@@ -88,8 +87,8 @@ REMOVE_SUBDIRS="
src_prepare() {
if ! use build; then
- ln -s "/usr/src/sys" "${WORKDIR}/sys"
- ln -s "/usr/include" "${WORKDIR}/include"
+ [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys"
"${WORKDIR}/sys"
+ [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include"
"${WORKDIR}/include"
else
dummy_mk mount_smbfs
fi
@@ -120,7 +119,7 @@ src_install() {
mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
# Most of these now come from openrc.
- for util in nfs rpc.statd rpc.lockd; do
+ for util in nfs nfsuserd rpc.statd rpc.lockd; do
newinitd "${FILESDIR}/"${util}.initd ${util} || die
if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
newconfd "${FILESDIR}"/${util}.confd ${util} || die
