2 files changed, 43 insertions, 59 deletions
diff --git a/community/gnome-themes-extra/APKBUILD b/community/gnome-themes-extra/APKBUILD
new file mode 100644
index 0000000000..c3c0b3119a
--- /dev/null
+++ b/community/gnome-themes-extra/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Rasmus Thomsen <oss@cogitri.dev>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
+pkgname=gnome-themes-extra
+pkgver=3.28
+pkgrel=0
+pkgdesc="Misc themes and theme-y tidbits"
+url="https://gitlab.gnome.org/GNOME/gnome-themes-extra"
+arch="noarch"
+license="LGPL-2.1-only"
+depends="ttf-cantarell librsvg adwaita-gtk2-theme"
+makedepends="intltool gtk+3.0-dev gtk+2.0-dev librsvg-dev"
+options="!check" # no tests
+subpackages="$pkgname-lang adwaita-gtk2-theme:_gtk2:all"
+source="https://download.gnome.org/sources/gnome-themes-extra/${pkgver}/gnome-themes-extra-${pkgver}.tar.xz"
+replaces="gnome-themes-standard" # upstream rename
+provides="gnome-themes-standard=$pkgver-r$pkgrel"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+_gtk2() {
+	pkgdesc="Adwaita gtk2 theme"
+
+	mkdir -p "$subpkgdir"/usr/share/themes/Adwaita \
+		"$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/share/themes/Adwaita/gtk-2.0 \
+		"$subpkgdir"/usr/share/themes/Adwaita
+	mv "$pkgdir"/usr/lib/gtk-2.0 "$subpkgdir"/usr/lib
+}
+
+sha512sums="bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0  gnome-themes-extra-3.28.tar.xz"
diff --git a/community/gnome-themes-standard/APKBUILD b/community/gnome-themes-standard/APKBUILD
deleted file mode 100644
index 92dfe17f6c..0000000000
--- a/community/gnome-themes-standard/APKBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: 
-pkgname=gnome-themes-standard
-pkgver=3.22.3
-pkgrel=0
-pkgdesc="Default themes for the GNOME desktop"
-url="http://www.gnome.org"
-arch="all"
-license="GPL-2.0"
-depends="adwaita-gtk2-theme"
-depends_dev="gtk+3.0-dev librsvg-dev"
-makedepends="$depends_dev intltool"
-install=""
-subpackages="$pkgname-lang adwaita-gtk2-theme:_gtk2"
-source="https://download.gnome.org/sources/gnome-themes-standard/${pkgver%.*}/gnome-themes-standard-$pkgver.tar.xz"
-
-_builddir="$srcdir"/gnome-themes-standard-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	cd "$_builddir"
-	DATADIRNAME=share \
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-_gtk2() {
-	pkgdesc="Adwaita gtk2 theme"
-	depends=""
-	mkdir -p "$subpkgdir"/usr/share/themes/Adwaita \
-		"$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/share/themes/Adwaita/gtk-2.0 \
-		"$subpkgdir"/usr/share/themes/Adwaita || return 1
-	mv "$pkgdir"/usr/lib/gtk-2.0 "$subpkgdir"/usr/lib  || return 1
-}
-
-sha512sums="aa2f3ad4d867732cd09df6adb4f48ed2757e3f28930ef791ba97a82007332c810d84dd1074ca518ec0fe71bd7d8b95404854bd799e3b1fe616e1809e8ee33501  gnome-themes-standard-3.22.3.tar.xz"