dev-db-10.5/mariadb: Update specs

macaroni-os · Apr 11, 2023 · aca304a · aca304a
1 parent d35843f
commit aca304a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/atoms/server/dev-db-10.5/mariadb/build.yaml b/packages/atoms/server/dev-db-10.5/mariadb/build.yaml
@@ -21,8 +21,7 @@ prelude:
   emerge -j ${JOBS} --nodeps {{ ( index .Values.labels "emerge.packages" ) }}
   {{- end }}
 - eval 'rm -rf /pkgdir/ || true' && mkdir -p /pkgdir/{{ .Values.name }} && luet-portage
-  --dir /pkgdir/{{ .Values.name }} {{ ( index .Values.labels "emerge.packages"
-  ) }}
+  --dir /pkgdir/{{ .Values.name }} {{ ( index .Values.labels "emerge.packages" ) }}
 - rm -v /var/cache/distfiles/* ${LUET_PORTAGE_CACHE_PACKAGES}/* || true
 package_dir: /pkgdir/{{ .Values.name }}
 excludes:

diff --git a/packages/atoms/server/dev-db-10.5/mariadb/definition.yaml b/packages/atoms/server/dev-db-10.5/mariadb/definition.yaml
@@ -46,9 +46,6 @@ requires:
 - name: libpcre2
   version: '>=0'
   category: dev-libs
-- name: libxml2
-  version: '>=0'
-  category: dev-libs-2
 - name: lzo
   version: '>=0'
   category: dev-libs-2
@@ -110,7 +107,7 @@ labels:
     ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl?
     ( dev-libs/libressl:0= ) ) server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6
     ) ) ) static? ( sys-libs/ncurses[static-libs] ) jdbc? ( >=dev-java/java-config-2.2.0-r3
-    )'
+    ) sys-apps/shadow'
   IUSE: +backup bindist columnstore cracklib debug extraengine galera innodb-lz4 innodb-lzo
     innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph
     pam +perl profiling rocksdb selinux +server sphinx sst-rsync sst-mariabackup static
@@ -127,7 +124,7 @@ labels:
     dev-libs/judy:0= ) pam? ( sys-libs/pam:0= ) s3? ( net-misc/curl ) ) systemtap?
     ( >=dev-util/systemtap-1.3:0= ) tcmalloc? ( dev-util/google-perftools:0= ) yassl?
     ( net-libs/gnutls:0= ) !yassl? ( !libressl? ( >=dev-libs/openssl-1.0.0:0= ) libressl?
-    ( dev-libs/libressl:0= ) ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
+    ( dev-libs/libressl:0= ) ) !dev-db/mysql-community !dev-db/mariadb-galera !dev-db/percona-server
     !dev-db/mysql-cluster !dev-db/mariadb:0 !dev-db/mariadb:5.5 !dev-db/mariadb:10.1
     !dev-db/mariadb:10.2 !dev-db/mariadb:10.3 !dev-db/mariadb:10.4 !<virtual/mysql-5.6-r11
     !<virtual/libmysqlclient-18-r1 selinux? ( sec-policy/selinux-mysql ) server? (