1 |
commit: 2690a3ffcbb264ed988553fa62f436e68438b044 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 28 18:26:15 2019 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 28 20:02:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2690a3ff |
7 |
|
8 |
profiles: Rollover media-libs/opencv IUSE changes |
9 |
|
10 |
Follow-up to 165c752d53b6d8ba6a9cd23daf79958c27d4c1c1 |
11 |
|
12 |
Closes: https://github.com/gentoo/gentoo/pull/13786 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
15 |
|
16 |
profiles/arch/amd64/package.use.mask | 2 +- |
17 |
profiles/arch/amd64/package.use.stable.mask | 2 +- |
18 |
profiles/arch/arm/package.use.mask | 2 +- |
19 |
profiles/arch/arm64/package.use.mask | 2 +- |
20 |
profiles/arch/arm64/package.use.stable.mask | 2 +- |
21 |
profiles/arch/base/package.use.mask | 2 +- |
22 |
profiles/arch/powerpc/package.use.mask | 2 +- |
23 |
profiles/arch/x86/package.use.stable.mask | 2 +- |
24 |
profiles/base/package.use.stable.mask | 2 +- |
25 |
9 files changed, 9 insertions(+), 9 deletions(-) |
26 |
|
27 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
28 |
index 4d08305a170..7338b1ce520 100644 |
29 |
--- a/profiles/arch/amd64/package.use.mask |
30 |
+++ b/profiles/arch/amd64/package.use.mask |
31 |
@@ -114,7 +114,7 @@ sys-boot/grub -libzfs |
32 |
|
33 |
# Amy Liffey <amynka@g.o> (2017-09-19) |
34 |
# [cuda] is unmasked in this profiles. |
35 |
-media-libs/opencv -contrib_xfeatures2d |
36 |
+media-libs/opencv -contribxfeatures2d |
37 |
|
38 |
# David Seifert <soap@g.o> (2017-05-20) |
39 |
# cpyrit-cuda does not support GCC 4.9 or later |
40 |
|
41 |
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask |
42 |
index 000ff03db33..0cc07951442 100644 |
43 |
--- a/profiles/arch/amd64/package.use.stable.mask |
44 |
+++ b/profiles/arch/amd64/package.use.stable.mask |
45 |
@@ -46,7 +46,7 @@ dev-qt/qtsql oci8 |
46 |
|
47 |
# Amy Liffey <amynka@g.o> (2019-01-15) |
48 |
# Mask experimental contrib repo |
49 |
-media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract |
50 |
+media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract |
51 |
|
52 |
# Mikle Kolyada <zlogene@g.o> (2018-11-07) |
53 |
# unmask sssd for sudo |
54 |
|
55 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
56 |
index 0e9e238f0eb..2419bc77098 100644 |
57 |
--- a/profiles/arch/arm/package.use.mask |
58 |
+++ b/profiles/arch/arm/package.use.mask |
59 |
@@ -121,7 +121,7 @@ net-p2p/deluge geoip |
60 |
|
61 |
# Amy Liffey <amynka@g.o (2018-01-21) |
62 |
# dev-libs/cereal not keyworded for arm |
63 |
-media-libs/opencv contrib_dnn |
64 |
+media-libs/opencv contribdnn |
65 |
|
66 |
# Michał Górny <mgorny@g.o> (2017-12-30) |
67 |
# Moved from use.mask since they are flags local to one package. |
68 |
|
69 |
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask |
70 |
index cef1785e54a..c46008969e6 100644 |
71 |
--- a/profiles/arch/arm64/package.use.mask |
72 |
+++ b/profiles/arch/arm64/package.use.mask |
73 |
@@ -186,7 +186,7 @@ sys-cluster/neutron haproxy |
74 |
dev-python/ipython notebook |
75 |
dev-python/networkx scipy |
76 |
dev-ruby/haml test |
77 |
-media-libs/opencv contrib_dnn |
78 |
+media-libs/opencv contribdnn |
79 |
net-analyzer/icinga2 classicui |
80 |
|
81 |
# Matthew Thode <prometheanfire@g.o> (2018-02-16) |
82 |
|
83 |
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask |
84 |
index fdccdea6027..d89fc52e588 100644 |
85 |
--- a/profiles/arch/arm64/package.use.stable.mask |
86 |
+++ b/profiles/arch/arm64/package.use.stable.mask |
87 |
@@ -40,7 +40,7 @@ virtual/notification-daemon gnome |
88 |
|
89 |
# Aaron Bauman <bman@g.o> (2019-05-15) |
90 |
# packages for these USE flags fail tests |
91 |
-media-libs/opencv contrib_cvv contrib_hdf contrib_sfm glog gstreamer |
92 |
+media-libs/opencv contribcvv contribhdf contribsfm glog gstreamer |
93 |
|
94 |
# Mart Raudsepp <leio@g.o> (2019-01-18) |
95 |
# Respective x11-drivers/ not tested and stable yet |
96 |
|
97 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
98 |
index 5d31f0daff2..78ea5c5b805 100644 |
99 |
--- a/profiles/arch/base/package.use.mask |
100 |
+++ b/profiles/arch/base/package.use.mask |
101 |
@@ -102,7 +102,7 @@ app-laptop/pbbuttonsd macbook |
102 |
|
103 |
# Amy Liffey <amynka@g.o> (2017-09-19) |
104 |
# Requires [cuda] which is masked in most of the profiles. |
105 |
-media-libs/opencv contrib_xfeatures2d |
106 |
+media-libs/opencv contribxfeatures2d |
107 |
|
108 |
# Rick Farina <zerochaos@g.o> (2017-05-11) |
109 |
# the needed deps are amd64/x86 only |
110 |
|
111 |
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask |
112 |
index ba2002551f5..856281f7b40 100644 |
113 |
--- a/profiles/arch/powerpc/package.use.mask |
114 |
+++ b/profiles/arch/powerpc/package.use.mask |
115 |
@@ -79,7 +79,7 @@ app-emulation/qemu capstone |
116 |
|
117 |
# Amy Liffey <amynka@g.o (2018-01-21) |
118 |
# dev-libs/cereal not keyworded for ppc |
119 |
-media-libs/opencv contrib_dnn |
120 |
+media-libs/opencv contribdnn |
121 |
|
122 |
# Robin H. Johnson <robbat2@g.o> (2017-11-10) |
123 |
# Masked for dependencies: |
124 |
|
125 |
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask |
126 |
index 78c8a76399d..c1b987d076a 100644 |
127 |
--- a/profiles/arch/x86/package.use.stable.mask |
128 |
+++ b/profiles/arch/x86/package.use.stable.mask |
129 |
@@ -41,7 +41,7 @@ dev-qt/qtsql oci8 |
130 |
|
131 |
# Amy Liffey <amynka@g.o> (2019-01-15) |
132 |
# Mask experimental contrib repo |
133 |
-media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract |
134 |
+media-libs/opencv contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d gflags glog tesseract |
135 |
|
136 |
# Mikle Kolyada <zlogene@g.o> (2018-11-07) |
137 |
# unmask sssd for sudo |
138 |
|
139 |
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask |
140 |
index 98e0390c6ee..e8bf04fd052 100644 |
141 |
--- a/profiles/base/package.use.stable.mask |
142 |
+++ b/profiles/base/package.use.stable.mask |
143 |
@@ -59,7 +59,7 @@ media-gfx/alembic arnold maya |
144 |
media-plugins/grilo-plugins chromaprint |
145 |
|
146 |
# Andreas Sturmlechner <asturm@g.o> (2019-02-16) |
147 |
-# media-libs/opencv[contrib,contrib_dnn], net-libs/libmediawiki, |
148 |
+# media-libs/opencv[contrib,contribdnn], net-libs/libmediawiki, |
149 |
# net-libs/libkvkontakte all not stable anywhere. |
150 |
kde-apps/kipi-plugins mediawiki vkontakte |
151 |
media-gfx/digikam dnn vkontakte |