From 4b23242a2f2e4817ca2f2ae2326771a507fc673d Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Fri, 19 May 2023 17:34:08 +0200
Subject: [PATCH] Rename util-macros to xorg-util-macros

to match arch and cygwin
---
 PKGMETA.yml                                |  3 ---
 {util-macros => xorg-util-macros}/PKGBUILD | 13 ++++++++-----
 xorgproto/PKGBUILD                         |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename {util-macros => xorg-util-macros}/PKGBUILD (74%)

diff --git a/PKGMETA.yml b/PKGMETA.yml
index a1e508e6..af2fd7ed 100644
--- a/PKGMETA.yml
+++ b/PKGMETA.yml
@@ -59,9 +59,6 @@ packages:
   tzcode:
     references:
       archlinux: tzdata
-  util-macros:
-    references:
-      archlinux: xorg-util-macros
   base-devel:
     internal: true
   base:
diff --git a/util-macros/PKGBUILD b/xorg-util-macros/PKGBUILD
similarity index 74%
rename from util-macros/PKGBUILD
rename to xorg-util-macros/PKGBUILD
index 40b8a54f..322cd817 100644
--- a/util-macros/PKGBUILD
+++ b/xorg-util-macros/PKGBUILD
@@ -1,12 +1,15 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
-pkgname=util-macros
+pkgname=xorg-util-macros
 pkgver=1.19.3
 pkgrel=1
 pkgdesc='X.Org Autotools macros'
 arch=('any')
 groups=('development')
 license=('custom')
+provides=('util-macros')
+replaces=('util-macros')
+conflicts=('util-macros')
 url="https://xorg.freedesktop.org/"
 depends=()
 makedepends=('autotools')
@@ -14,23 +17,23 @@ source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
 sha256sums=('0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   autoreconf -fiv
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   make install DESTDIR="${pkgdir}"
 
   install -m755 -d "${pkgdir}/usr/lib"
diff --git a/xorgproto/PKGBUILD b/xorgproto/PKGBUILD
index 4c2101f2..0c54023c 100644
--- a/xorgproto/PKGBUILD
+++ b/xorgproto/PKGBUILD
@@ -11,7 +11,7 @@ conflicts=('xproto')
 provides=('xproto')
 replaces=('xproto')
 url="https://xorg.freedesktop.org/"
-makedepends=('util-macros' 'meson' 'ninja' 'gcc')
+makedepends=('xorg-util-macros' 'meson' 'ninja' 'gcc')
 source=("https://xorg.freedesktop.org/archive/individual/proto/${pkgname}-${pkgver}.tar.xz")
 sha256sums=('5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e')