From 5f9cd5c2580d2a4042cd6a568f064553709b923b Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 14 Jul 2023 10:30:36 +0200
Subject: [PATCH] Replace libcrypt-devel with libxcrypt-devel

* Replace/provides so users will be moved over
* Remove libcrypt-devel, so no one can link against it
* Keep the old DLL around for now to avoid breaking
  external users.
---
 libcrypt/PKGBUILD  | 19 ++++---------------
 libxcrypt/PKGBUILD |  4 +++-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libcrypt/PKGBUILD b/libcrypt/PKGBUILD
index 96217697..1dd27c5f 100644
--- a/libcrypt/PKGBUILD
+++ b/libcrypt/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgbase=libcrypt
-pkgname=('libcrypt' 'libcrypt-devel')
+pkgname=('libcrypt')
+# 2023-07-14: TODO: remove this package in a year
 pkgver=2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Encryption/Decryption utility and library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -27,7 +28,7 @@ build() {
   make DESTDIR=${srcdir}/dest install
 }
 
-package_libcrypt() {
+package() {
   pkgdesc="Encryption/Decryption library"
   groups=('libraries')
   depends=('gcc-libs')
@@ -35,15 +36,3 @@ package_libcrypt() {
 
   cp -f ${srcdir}/dest/usr/bin/*.dll ${pkgdir}/usr/bin/
 }
-
-package_libcrypt-devel() {
-  pkgdesc="Libcrypt headers and libraries"
-  groups=('development')
-  depends=("libcrypt=${pkgver}")
-  options=('staticlibs')
-
-  mkdir -p ${pkgdir}/usr
-
-  cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
-  cp -rf ${srcdir}/dest/usr/lib ${pkgdir}/usr/
-}
diff --git a/libxcrypt/PKGBUILD b/libxcrypt/PKGBUILD
index 517700b9..5e13a17a 100644
--- a/libxcrypt/PKGBUILD
+++ b/libxcrypt/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=libxcrypt
 pkgname=('libxcrypt' 'libxcrypt-devel')
 pkgver=4.4.35
-pkgrel=1
+pkgrel=2
 pkgdesc='Modern library for one-way hashing of passwords'
 arch=('i686' 'x86_64')
 url='https://github.com/besser82/libxcrypt/'
@@ -60,6 +60,8 @@ package_libxcrypt() {
 package_libxcrypt-devel() {
   depends=("libxcrypt=${pkgver}")
   conflicts=('libcrypt-devel')
+  provides=('libcrypt-devel')
+  replaces=('libcrypt-devel')
 
   mkdir -p ${pkgdir}/usr