diff --git a/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch b/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch
deleted file mode 100644
index 161294ee0e5..00000000000
--- a/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Source: Gentoo (Adapted)
-Upstream: No
-Reason: Fixes compilation with lightdm newer than 1.19.3
-
-diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c
-index 4204d14..80c2a2f 100644
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -948,11 +948,11 @@ start_authentication (const gchar *username)
-     {
-         gtk_widget_show (GTK_WIDGET (username_entry));
-         gtk_widget_show (GTK_WIDGET (cancel_button));
--        lightdm_greeter_authenticate (greeter, NULL);
-+        lightdm_greeter_authenticate (greeter, NULL, &error);
-     }
-     else if (g_strcmp0 (username, "*guest") == 0)
-     {
--        lightdm_greeter_authenticate_as_guest (greeter);
-+        lightdm_greeter_authenticate_as_guest (greeter, &error);
-     }
-     else
-     {
-@@ -972,7 +972,7 @@ start_authentication (const gchar *username)
-             set_language (NULL);
-         }
- 
--        lightdm_greeter_authenticate (greeter, username);
-+        lightdm_greeter_authenticate (greeter, username, &error);
-     }
- }
- 
-@@ -982,6 +982,7 @@ cancel_authentication (void)
-     GtkTreeModel *model;
-     GtkTreeIter iter;
-     gboolean other = FALSE;
-+    GError *error = NULL;
- 
-     if (pending_questions)
-     {
-@@ -994,7 +995,7 @@ cancel_authentication (void)
-     if (lightdm_greeter_get_in_authentication (greeter))
-     {
-         cancelling = TRUE;
--        lightdm_greeter_cancel_authentication (greeter);
-+        lightdm_greeter_cancel_authentication (greeter, &error);
-         set_message_label ("");
-     }
- 
-@@ -1031,7 +1032,7 @@ start_session (void)
- 
-     language = get_language ();
-     if (language)
--        lightdm_greeter_set_language (greeter, language);
-+        lightdm_greeter_set_language (greeter, language, &error);
-     g_free (language);
- 
-     session = get_session ();
-@@ -1362,6 +1363,8 @@ G_MODULE_EXPORT
- void
- login_cb (GtkWidget *widget)
- {
-+    GError *error = NULL;
-+
-     /* Reset to default screensaver values */
-     if (lightdm_greeter_get_lock_hint (greeter))
-         XSetScreenSaver(gdk_x11_display_get_xdisplay(gdk_display_get_default ()), timeout, interval, prefer_blanking, allow_exposures);        
-@@ -1375,7 +1378,7 @@ login_cb (GtkWidget *widget)
-         start_session ();
-     else if (lightdm_greeter_get_in_authentication (greeter))
-     {
--        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
-+        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), &error);
-         /* If we have questions pending, then we continue processing
-          * those, until we are done. (Otherwise, authentication will
-          * not complete.) */
diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 987e1a952d0..c982cf8cc89 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,23 +1,24 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
-version=1.8.5
-revision=6
+version=2.0.9
+revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
- --enable-compile-warnings=no"
-conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="gtk+-devel lightdm-devel libxklavier-devel"
+configure_args="--disable-static --disable-maintainer-mode"
+hostmakedepends="pkg-config gettext"
+makedepends="gtk+3-devel lightdm-devel libayatana-appindicator-devel
+ ayatana-ido-devel"
 depends="hicolor-icon-theme"
-short_desc="Light Display Manager GTK+ Greeter (GTK+ 2.x)"
+conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
+short_desc="Light Display Manager GTK+ Greeter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://launchpad.net/lightdm-gtk-greeter"
-distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
-checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
-conflicts="lightdm-gtk3-greeter>=0"
+homepage="https://github.com/Xubuntu/lightdm-gtk-greeter"
+distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz"
+checksum=c8fdf198aa9a3f9d0dad0b48dfe23c2277b79107e8fcfc62965290f1081f645d
 provides="lightdm-greeter-1_0"
 
-post_patch() {
-	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+lightdm-gtk3-greeter_package() {
+	build_style=meta
+	depends="lightdm-gtk-greeter>=2"
+	short_desc+=" - transition"
 }
diff --git a/srcpkgs/lightdm-gtk-greeter/update b/srcpkgs/lightdm-gtk-greeter/update
deleted file mode 100644
index 71b926a2841..00000000000
--- a/srcpkgs/lightdm-gtk-greeter/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="1.9.* [2-9].* ??.*"
diff --git a/srcpkgs/lightdm-gtk3-greeter b/srcpkgs/lightdm-gtk3-greeter
new file mode 120000
index 00000000000..e3005a3998a
--- /dev/null
+++ b/srcpkgs/lightdm-gtk3-greeter
@@ -0,0 +1 @@
+lightdm-gtk-greeter
\ No newline at end of file
diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template
deleted file mode 100644
index f1f7517ea4e..00000000000
--- a/srcpkgs/lightdm-gtk3-greeter/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'lightdm-gtk3-greeter'
-pkgname=lightdm-gtk3-greeter
-version=2.0.9
-revision=1
-build_style=gnu-configure
-configure_args="--disable-static --disable-maintainer-mode"
-hostmakedepends="pkg-config gettext"
-makedepends="gtk+3-devel lightdm-devel libayatana-appindicator-devel
- ayatana-ido-devel"
-depends="hicolor-icon-theme"
-conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
-short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/Xubuntu/lightdm-gtk-greeter"
-distfiles="https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-$version/lightdm-gtk-greeter-$version.tar.gz"
-checksum=c8fdf198aa9a3f9d0dad0b48dfe23c2277b79107e8fcfc62965290f1081f645d
-conflicts="lightdm-gtk-greeter>=0"
-provides="lightdm-greeter-1_0"
diff --git a/srcpkgs/lightdm-gtk3-greeter/update b/srcpkgs/lightdm-gtk3-greeter/update
deleted file mode 100644
index d9620689f63..00000000000
--- a/srcpkgs/lightdm-gtk3-greeter/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=${pkgname/3/}