Skip to content

Commit

Permalink
Adjust chromium and electron ebuilds after clang was moved.
Browse files Browse the repository at this point in the history
  • Loading branch information
@stikonas @PF4Public
stikonas authored and PF4Public committed Dec 24, 2024
1 parent 39f29f1 commit 6af7ab6
Show file tree
Hide file tree
Showing 39 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions dev-util/electron/electron-19.1.8.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down Expand Up @@ -1483,7 +1483,7 @@ src_prepare() {

use vdpau && eapply "${FILESDIR}/vdpau-support-r4.patch"

if has_version ">=sys-devel/clang-15"; then
if has_version ">=llvm-core/clang-15"; then
eapply "${FILESDIR}/clang-15.patch"
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-19.1.9-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down Expand Up @@ -1485,7 +1485,7 @@ src_prepare() {

use vdpau && eapply "${FILESDIR}/vdpau-support-r4.patch"

if has_version ">=sys-devel/clang-15"; then
if has_version ">=llvm-core/clang-15"; then
eapply "${FILESDIR}/clang-15.patch"
fi

Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-19.1.9.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down Expand Up @@ -1484,7 +1484,7 @@ src_prepare() {

use vdpau && eapply "${FILESDIR}/vdpau-support-r4.patch"

if has_version ">=sys-devel/clang-15"; then
if has_version ">=llvm-core/clang-15"; then
eapply "${FILESDIR}/clang-15.patch"
fi

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-20.3.12-r1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-21.4.4.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-23.3.12.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-23.3.13.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
js-type-check? ( virtual/jre )
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-24.8.7.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ BDEPEND="
>=sys-devel/bison-2.4.3
sys-devel/flex
virtual/pkgconfig
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
2 changes: 1 addition & 1 deletion dev-util/electron/electron-24.8.8.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ BDEPEND="
>=sys-devel/bison-2.4.3
sys-devel/flex
virtual/pkgconfig
clang? ( sys-devel/clang sys-devel/lld )
clang? ( llvm-core/clang llvm-core/lld )
sys-apps/yarn
"

Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-25.9.7.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1268,8 +1268,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-25.9.8.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,8 +1269,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-26.6.10.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1210,8 +1210,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-26.6.9.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1209,8 +1209,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-27.3.10.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,8 +1233,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-27.3.11.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,8 +1234,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-28.3.2.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1227,8 +1227,8 @@ BDEPEND="
app-alternatives/lex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-28.3.3.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,8 +1228,8 @@ BDEPEND="
app-alternatives/lex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-17 >=sys-devel/lld-17 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-17 >=llvm-core/lld-17 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-29.4.5.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1244,8 +1244,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-18 >=sys-devel/lld-18 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-18 >=llvm-core/lld-18 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-29.4.6.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,8 +1245,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-18 >=sys-devel/lld-18 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-18 >=llvm-core/lld-18 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-30.5.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1247,8 +1247,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-18 >=sys-devel/lld-18 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-18 >=llvm-core/lld-18 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-30.5.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,8 +1248,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >=sys-devel/clang-18 >=sys-devel/lld-18 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >=llvm-core/clang-18 >=llvm-core/lld-18 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-31.7.5.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1295,8 +1295,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-31.7.6.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1296,8 +1296,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-32.2.6.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1342,8 +1342,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-32.2.7.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1343,8 +1343,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-33.2.1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1349,8 +1349,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
4 changes: 2 additions & 2 deletions dev-util/electron/electron-33.3.0.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
sys-apps/yarn
"
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-128.0.6613.113_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-128.0.6613.119_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-128.0.6613.137_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-129.0.6668.100_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-129.0.6668.42_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
6 changes: 3 additions & 3 deletions www-client/ungoogled-chromium/ungoogled-chromium-129.0.6668.58_p1.ebuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
clang? (
pgo? ( >sys-devel/clang-19.0.0_pre20240518 >sys-devel/lld-19.0.0_pre20240518 )
!pgo? ( sys-devel/clang sys-devel/lld )
pgo? ( >llvm-core/clang-19.0.0_pre20240518 >llvm-core/lld-19.0.0_pre20240518 )
!pgo? ( llvm-core/clang llvm-core/lld )
)
cfi? ( sys-devel/clang-runtime[sanitize] )
cfi? ( llvm-core/clang-runtime[sanitize] )
"

if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
Expand Down
Loading

0 comments on commit 6af7ab6

Please sign in to comment.