From c36585460c881a5fa6e201c67b88b69589d6b56e Mon Sep 17 00:00:00 2001
From: bgme <i@bgme.me>
Date: Mon, 15 May 2023 23:25:24 +0800
Subject: [PATCH] import soci from archlinuxcn

---
 repo/rstudio-desktop/lilac.yaml  |  4 +---
 repo/sacd-extract-git/lilac.yaml |  1 +
 repo/soci-git/lilac.yaml         | 18 ------------------
 repo/{soci-git => soci}/PKGBUILD | 15 ++++++---------
 repo/soci/lilac.yaml             | 18 ++++++++++++++++++
 5 files changed, 26 insertions(+), 30 deletions(-)
 delete mode 100644 repo/soci-git/lilac.yaml
 rename repo/{soci-git => soci}/PKGBUILD (82%)
 create mode 100644 repo/soci/lilac.yaml

diff --git a/repo/rstudio-desktop/lilac.yaml b/repo/rstudio-desktop/lilac.yaml
index 05a1480..d12afb0 100644
--- a/repo/rstudio-desktop/lilac.yaml
+++ b/repo/rstudio-desktop/lilac.yaml
@@ -3,9 +3,7 @@ maintainers:
     email: i@bgme.me
 
 repo_depends:
-  - soci-git
-update_on_build:
-  - pkgbase: soci-git
+  - soci
 
 build_prefix: extra-x86_64
 
diff --git a/repo/sacd-extract-git/lilac.yaml b/repo/sacd-extract-git/lilac.yaml
index 46863c1..b020e49 100644
--- a/repo/sacd-extract-git/lilac.yaml
+++ b/repo/sacd-extract-git/lilac.yaml
@@ -6,6 +6,7 @@ build_prefix: extra-x86_64
 
 pre_build_script: |
   aur_pre_build()
+  vcs_update()
   add_makedepends(['git'])
 
 post_build: aur_post_build
diff --git a/repo/soci-git/lilac.yaml b/repo/soci-git/lilac.yaml
deleted file mode 100644
index c2263bb..0000000
--- a/repo/soci-git/lilac.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-maintainers:
-  - github: yingziwu
-    email: i@bgme.me
-
-build_prefix: extra-x86_64
-
-pre_build_script: |
-  aur_pre_build()
-  add_makedepends(['git'])
-
-post_build: aur_post_build
-
-update_on:
-  - source: aur
-    aur: soci-git
-  - source: github
-    github: SOCI/soci
-    branch: release/4.0
diff --git a/repo/soci-git/PKGBUILD b/repo/soci/PKGBUILD
similarity index 82%
rename from repo/soci-git/PKGBUILD
rename to repo/soci/PKGBUILD
index 5a07287..1c4f6ed 100644
--- a/repo/soci-git/PKGBUILD
+++ b/repo/soci/PKGBUILD
@@ -3,33 +3,30 @@
 # Contributor: Daniel Nagy <danielnagy at gmx de>
 # Contributor: Mika Fischer <mika.fischer@zoopnet.de>
 
-pkgname=soci-git
-pkgname_=soci
+pkgname=soci
 pkgver=4.0.3.r0.g438e3549
 pkgrel=1
 pkgdesc="Database access library for C++"
 arch=('x86_64')
 url="http://soci.sf.net"
 license=('custom:boost')
-depends=('postgresql-libs' 'sqlite3' 'unixodbc')
-makedepends=("cmake" "git")
+depends=('postgresql-libs' 'sqlite3' 'unixodbc' 'boost-libs' 'mariadb-libs') 
+makedepends=('cmake' 'git' 'boost')
 optdepends=('instantclient-basic: support for oracle databases'
             'libmysqlclient: support for mysql databases'
             'postgresql-libs: support for postgresql databases'
             'sqlite3: support for sqlite databases'
             'unixodbc: support for ODBC databases')
-provides=("soci=$pkgver")
-conflicts=('soci')
 source=("git+https://github.com/SOCI/soci.git#branch=release/4.0")
 sha1sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname_}"
+    cd "${srcdir}/${pkgname}"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/; s/-/./g'
 }
 
 build() {
-    cmake -B build "${pkgname_}" \
+    cmake -B build "${pkgname}" \
         -DSOCI_TESTS=OFF \
         -DCMAKE_INSTALL_PREFIX="/usr" \
         -DCMAKE_CXX_FLAGS="-Wno-format-overflow" \
@@ -45,6 +42,6 @@ package() {
     if [ -e "${pkgdir}/usr/lib64" ]; then
         mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
     fi
-    install -Dm0644 "${srcdir}/${pkgname_}/LICENSE_1_0.txt" \
+    install -Dm0644 "${srcdir}/${pkgname}/LICENSE_1_0.txt" \
         "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/repo/soci/lilac.yaml b/repo/soci/lilac.yaml
new file mode 100644
index 0000000..84d6ed4
--- /dev/null
+++ b/repo/soci/lilac.yaml
@@ -0,0 +1,18 @@
+# import from archlinuxcn
+# https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/soci
+
+maintainers:
+  - github: yingziwu
+    email: i@bgme.me
+
+build_prefix: extra-x86_64
+
+pre_build: vcs_update
+
+post_build: git_pkgbuild_commit
+
+update_on:
+  - source: github
+    github: SOCI/soci
+    branch: release/4.0
+  - alias: boost