1 |
commit: 33e94eb4f087951e0edda7402095f02c56db08f2 |
2 |
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Sep 7 12:26:24 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 7 15:36:06 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e94eb4 |
7 |
|
8 |
sys-freebsd/freebsd-sources: Drop freebsd-sources-7.1-types.h-fix.patch. |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/592776 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/2270 |
12 |
|
13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
14 |
|
15 |
.../{freebsd-lib-10.3-r1.ebuild => freebsd-lib-10.3-r2.ebuild} | 3 +-- |
16 |
.../{freebsd-sources-10.3-r4.ebuild => freebsd-sources-10.3-r5.ebuild} | 1 - |
17 |
2 files changed, 1 insertion(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild |
20 |
similarity index 99% |
21 |
rename from sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild |
22 |
rename to sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild |
23 |
index 14d49e5..ed4d9a8 100644 |
24 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r1.ebuild |
25 |
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r2.ebuild |
26 |
@@ -50,7 +50,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
27 |
!sys-freebsd/freebsd-headers" |
28 |
DEPEND="${RDEPEND} |
29 |
>=sys-devel/flex-2.5.31-r2 |
30 |
- =sys-freebsd/freebsd-sources-${RV}*" |
31 |
+ >=sys-freebsd/freebsd-sources-10.3-r5" |
32 |
RDEPEND="${RDEPEND} |
33 |
=sys-freebsd/freebsd-share-${RV}* |
34 |
>=virtual/libiconv-0-r2" |
35 |
@@ -206,7 +206,6 @@ src_prepare() { |
36 |
cd "${WORKDIR}" |
37 |
# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it |
38 |
# shouldn't be a symlink to /usr/src/sys (which should be already patched) |
39 |
- epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch |
40 |
epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch |
41 |
return 0 |
42 |
fi |
43 |
|
44 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r5.ebuild |
45 |
similarity index 99% |
46 |
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.3-r4.ebuild |
47 |
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.3-r5.ebuild |
48 |
index 7de7634..e01278e 100644 |
49 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r4.ebuild |
50 |
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r5.ebuild |
51 |
@@ -58,7 +58,6 @@ KERN_BUILD=GENTOO |
52 |
PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
53 |
"${FILESDIR}/${PN}-10.0-gentoo.patch" |
54 |
"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
55 |
- "${FILESDIR}/${PN}-7.1-types.h-fix.patch" |
56 |
"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
57 |
"${FILESDIR}/${PN}-7.1-includes.patch" |
58 |
"${FILESDIR}/${PN}-9.0-sysctluint.patch" |