eww-git: unsplit package due to upstream fixes

2 files changed, 8 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16f00d30d557..36ad32756240 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eww-git
 	pkgdesc = ElKowar's wacky widgets
-	pkgver = 0.4.0.r36.g4a9455b
+	pkgver = 0.4.0.r47.ga9a35c1
 	pkgrel = 1
 	url = https://github.com/elkowar/eww
 	arch = x86_64
@@ -16,11 +16,4 @@ pkgbase = eww-git
 	validpgpkeys = 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23
 	b2sums = SKIP
 
-pkgname = eww-x11-git
-	pkgdesc = ElKowar's wacky widgets (X11 backend)
-	depends = gtk3
-
-pkgname = eww-wayland-git
-	pkgdesc = ElKowar's wacky widgets (Wayland backend)
-	depends = gtk3
-	depends = gtk-layer-shell
+pkgname = eww-git
diff --git a/PKGBUILD b/PKGBUILD
index e74927578842..5fd7629d4bc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,8 @@
 # Contributor: Atif Chowdhury <iftakhar dot awal at gmail dot com>
 
 _pkgname=eww
-pkgbase="$_pkgname-git"
-pkgname=($_pkgname-{x11,wayland}-git)
-pkgver=0.4.0.r36.g4a9455b
+pkgname="$_pkgname-git"
+pkgver=0.4.0.r47.ga9a35c1
 pkgrel=1
 pkgdesc="ElKowar's wacky widgets"
 arch=(x86_64)
@@ -23,7 +22,6 @@ validpgpkeys=(
 
 prepare() {
 	cd $_pkgname
-
 	export RUSTUP_TOOLCHAIN=nightly
 	cargo update
 	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
@@ -36,31 +34,14 @@ pkgver() {
 build() {
 	cd $_pkgname
 	export RUSTUP_TOOLCHAIN=nightly
-
-	export CARGO_TARGET_DIR=target_x11
-	cargo build --frozen --release --no-default-features --features=x11
-
-	export CARGO_TARGET_DIR=target_wayland
-	cargo build --frozen --release --no-default-features --features=wayland
+	export CARGO_TARGET_DIR=target
+	cargo build --frozen --release
 }
 
-_pkg() {
+package() {
 	cd $_pkgname
 	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 	install -d "$pkgdir/etc/xdg/$_pkgname/"
 	cp -r examples/eww-bar "$pkgdir/etc/xdg/$_pkgname/"
-}
-
-package_eww-wayland-git() {
-	pkgdesc+=" (Wayland backend)"
-	depends=(gtk3 gtk-layer-shell)
-	_pkg
-	install -Dm755 target_wayland/release/$_pkgname -t "$pkgdir/usr/bin/"
-}
-
-package_eww-x11-git() {
-	pkgdesc+=" (X11 backend)"
-	depends=(gtk3)
-	_pkg
-	install -Dm755 target_x11/release/$_pkgname -t "$pkgdir/usr/bin/"
+	install -Dm755 target/release/$_pkgname -t "$pkgdir/usr/bin/"
 }