Merge pull request ocaml#25549 from jmid/conf-efl-fix

conf-efl: clean-up logic and fix Debian and Ubuntu package names

packages/conf-efl/conf-efl.1.8/opam

@@ -6,17 +6,20 @@ license: "various"
 build: [["pkg-config" "elementary" "--atleast-version=1.8"]]
 depends: ["conf-pkg-config" {build}]
 depexts: [
-  ["efl"] {os-distribution = "arch" & os = "linux"}
-  ["libelementary-dev"] {os-family = "debian" & os-distribution != "ubuntu" & os = "linux"}
-  ["elementary-devel"] {os-distribution = "fedora" & os = "linux"}
+  ["efl"] {os-distribution = "arch"}
+  ["efl-dev"] {os-distribution = "alpine"}
+  ["libefl-all-dev"] {os-family = "debian" | os-family = "ubuntu"}
+  ["elementary-devel"] {os-distribution = "fedora"}
   ["efl"] {os = "freebsd"}
   ["efl"] {os-distribution = "gentoo"}
   ["efl"] {os = "macos" & os-distribution = "homebrew"}
-  ["efl"] {(os-family = "suse" | os-distribution = "opensuse") & os = "linux"}
-  ["libelementary-dev"] {os-distribution = "ubuntu" & os = "linux"}
+  ["efl-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["elementary-devel"] {os-distribution = "centos"}
   ["efl"] {os-distribution = "mageia"}
 ]
+x-ci-accept-failures: [
+  "oraclelinux-8" "oraclelinux-9"
+]
 synopsis: "Virtual package relying on the EFL system installation"
 description:
   "This package can only install if the EFL are installed on the system."