From 269ad8e55916c0270fde8d5afa3dadf65402526f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:32:02 -0400
Subject: [PATCH 1/3] sublime-merge: unrestrict, merge template with
 sublime-merge-bin

---
 srcpkgs/sublime-merge-bin                     |  1 +
 srcpkgs/sublime-merge-bin/template            | 46 -----------------
 srcpkgs/sublime-merge/INSTALL.msg             |  4 --
 srcpkgs/sublime-merge/template                | 49 ++++++++++++++++---
 .../update                                    |  0
 5 files changed, 44 insertions(+), 56 deletions(-)
 create mode 120000 srcpkgs/sublime-merge-bin
 delete mode 100644 srcpkgs/sublime-merge-bin/template
 delete mode 100644 srcpkgs/sublime-merge/INSTALL.msg
 rename srcpkgs/{sublime-merge-bin => sublime-merge}/update (100%)

diff --git a/srcpkgs/sublime-merge-bin b/srcpkgs/sublime-merge-bin
new file mode 120000
index 00000000000000..521a4f32931630
--- /dev/null
+++ b/srcpkgs/sublime-merge-bin
@@ -0,0 +1 @@
+sublime-merge
\ No newline at end of file
diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
deleted file mode 100644
index b2d4b79214cb7c..00000000000000
--- a/srcpkgs/sublime-merge-bin/template
+++ /dev/null
@@ -1,46 +0,0 @@
-# Template file for 'sublime-merge-bin'
-pkgname=sublime-merge-bin
-version=2074
-revision=1
-archs="x86_64"
-wrksrc=sublime_merge
-hostmakedepends="w3m"
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="New Git client, from the makers of Sublime Text"
-maintainer="mobinmob <mobinmob@disroot.org>"
-license="custom:EULA"
-homepage="https://www.sublimemerge.com"
-changelog="https://www.sublimemerge.com/download"
-distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=444a39f4ba62d1f9803a9d1725ae08967dd52b147991188ca73db37eacf5310b
-_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
-nopie=yes
-repository=nonfree
-restricted=yes
-replaces="sublime-merge>0"
-
-post_extract() {
-	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
-	sed -n '
-		/is licensed.*not sold/p
-		/<ol>/,${ /<\/ol>/{x;p;d}; H }
-		$a </ol>
-	' <eula | w3m -dump -I utf-8 -T text/html >EULA
-
-	filesum="$(xbps-digest EULA)"
-	if [ "$filesum" != "$_license_checksum" ]; then
-		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
-	fi
-}
-
-do_install() {
-	vmkdir "usr/bin"
-	vmkdir "opt/sublime_merge"
-	vcopy "*" opt/sublime_merge
-	vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
-	for size in 16 32 48 128 256; do
-		vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
-	vlicense EULA
-}
diff --git a/srcpkgs/sublime-merge/INSTALL.msg b/srcpkgs/sublime-merge/INSTALL.msg
deleted file mode 100644
index baae44d2cb82ef..00000000000000
--- a/srcpkgs/sublime-merge/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-sublime-merge is replaced with the restricted sublime-merge-bin
-package, due to its license that restricts redistribution. 
-In order to install it you have to build it with xbps-src, please see:
-https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-merge/template b/srcpkgs/sublime-merge/template
index 896d059634342a..5a29d273a990ae 100644
--- a/srcpkgs/sublime-merge/template
+++ b/srcpkgs/sublime-merge/template
@@ -1,13 +1,50 @@
 # Template file for 'sublime-merge'
 pkgname=sublime-merge
-version=2032
-revision=1
-build_style=meta
-short_desc="Empty meta-package for sublime-merge"
+version=2074
+revision=2
+archs="x86_64"
+wrksrc=sublime_merge
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="New Git client, from the makers of Sublime Text"
 maintainer="mobinmob <mobinmob@disroot.org>"
-license="custom:EULA" #no vlicense check
+license="custom:EULA"
 homepage="https://www.sublimemerge.com"
+changelog="https://www.sublimemerge.com/download"
+distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
+checksum=444a39f4ba62d1f9803a9d1725ae08967dd52b147991188ca73db37eacf5310b
+_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
+nopie=yes
+repository=nonfree
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
 
 do_install() {
-	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
+	vmkdir "usr/bin"
+	vmkdir "opt/sublime_merge"
+	vcopy "*" opt/sublime_merge
+	vinstall "sublime_merge.desktop" 644 "usr/share/applications/"
+	for size in 16 32 48 128 256; do
+		vinstall "Icon/${size}x${size}/sublime-merge.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /opt/sublime_merge/sublime_merge ${DESTDIR}/usr/bin/subl-merge
+	vlicense EULA
+}
+
+sublime-merge-bin_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="sublime-merge>=${version}_${revision}"
 }
diff --git a/srcpkgs/sublime-merge-bin/update b/srcpkgs/sublime-merge/update
similarity index 100%
rename from srcpkgs/sublime-merge-bin/update
rename to srcpkgs/sublime-merge/update

From e5ff5882c40322493e8a2b12e59a8d8987580063 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:33:22 -0400
Subject: [PATCH 2/3] sublime-text3: unrestrict, merge template with
 sublime-text3-bin

---
 srcpkgs/sublime-text3-bin          |  1 +
 srcpkgs/sublime-text3-bin/template | 55 ----------------------------
 srcpkgs/sublime-text3/INSTALL.msg  |  4 ---
 srcpkgs/sublime-text3/template     | 57 +++++++++++++++++++++++++++---
 srcpkgs/sublime-text3/update       |  2 ++
 5 files changed, 55 insertions(+), 64 deletions(-)
 create mode 120000 srcpkgs/sublime-text3-bin
 delete mode 100644 srcpkgs/sublime-text3-bin/template
 delete mode 100644 srcpkgs/sublime-text3/INSTALL.msg
 create mode 100644 srcpkgs/sublime-text3/update

diff --git a/srcpkgs/sublime-text3-bin b/srcpkgs/sublime-text3-bin
new file mode 120000
index 00000000000000..009ce821bd43d2
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin
@@ -0,0 +1 @@
+sublime-text3
\ No newline at end of file
diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
deleted file mode 100644
index 73d67ea9c63185..00000000000000
--- a/srcpkgs/sublime-text3-bin/template
+++ /dev/null
@@ -1,55 +0,0 @@
-# Template file for 'sublime-text3-bin'
-pkgname=sublime-text3-bin
-version=3211
-revision=1
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-hostmakedepends="w3m"
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
-maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:EULA"
-homepage="http://www.sublimetext.com/3dev"
-_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
-repository="nonfree"
-restricted=yes
-nopie=yes
-replaces="sublime-text3>0"
-
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
-post_extract() {
-	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
-	sed -n '
-		/is licensed.*not sold/p
-		/<ol>/,${ /<\/ol>/{x;p;d}; H }
-		$a </ol>
-	' <eula | w3m -dump -I utf-8 -T text/html >EULA
-
-	filesum="$(xbps-digest EULA)"
-	if [ "$filesum" != "$_license_checksum" ]; then
-		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
-	fi
-}
-
-
-do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
-	vlicense EULA
-}
diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
deleted file mode 100644
index cf4c4e70a7a9d6..00000000000000
--- a/srcpkgs/sublime-text3/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-sublime-text3 is replaced with the restricted sublime-text3-bin
-package, due to its license that restricts redistribution.
-In order to install it you have to build it with xbps-src, please see:
-https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c077963863d352..44eb22ee257c95 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,15 +1,62 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=3
+revision=4
 archs="i686 x86_64"
-build_style=meta
-short_desc="Empty meta-package for sublime-text3"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:EULA" #no vlicense check
+license="custom:EULA"
 homepage="http://www.sublimetext.com/3dev"
 repository="nonfree"
+nopie=yes
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64)
+		distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+		checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+		;;
+	i686)
+		distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+		checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+		;;
+esac
+_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
 
 do_install() {
-	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}
+
+sublime-text3-bin_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="sublime-text3>=${version}_${revision}"
 }
diff --git a/srcpkgs/sublime-text3/update b/srcpkgs/sublime-text3/update
new file mode 100644
index 00000000000000..db2af5b98e430c
--- /dev/null
+++ b/srcpkgs/sublime-text3/update
@@ -0,0 +1,2 @@
+site="https://www.sublimetext.com/3"
+pattern='sublime_text_3_build_\K[-.\d]+(?=_x64\.tar)'

From 0fe35b691847a0acf046a682805c929cadcfda75 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 16 Jun 2022 23:34:03 -0400
Subject: [PATCH 3/3] sublime-text4: unrestrict

---
 srcpkgs/sublime-text4/template | 11 +++++------
 srcpkgs/sublime-text4/update   |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/sublime-text4/update

diff --git a/srcpkgs/sublime-text4/template b/srcpkgs/sublime-text4/template
index 8f3edc50ad743d..b98cecea99fed9 100644
--- a/srcpkgs/sublime-text4/template
+++ b/srcpkgs/sublime-text4/template
@@ -1,7 +1,7 @@
 # Template file for 'sublime-text4'
 pkgname=sublime-text4
 version=4126
-revision=1
+revision=2
 archs="x86_64 aarch64"
 wrksrc="sublime_text"
 hostmakedepends="w3m"
@@ -10,22 +10,21 @@ short_desc="Sophisticated text editor for code, markup and prose"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="custom:EULA"
 homepage="https://www.sublimetext.com/"
-conflicts="sublime-text3"
+conflicts="sublime-text3 sublime-text3-bin"
 repository="nonfree"
-restricted=yes
 nopie=yes
-_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 
 case "$XBPS_TARGET_MACHINE" in
-		x86_64)
+	x86_64)
 		distfiles="https://download.sublimetext.com/sublime_text_build_${version}_x64.tar.xz"
 		checksum=5c64e534cce0032e54d3c7028e8d6b3bdef28f3fd28a26244a360a2ce75450a1
 		;;
-		aarch64)
+	aarch64)
 		distfiles="https://download.sublimetext.com/sublime_text_build_${version}_arm64.tar.xz"
 		checksum=0ad4ac168d47034c47ab31faaa0d8b6b4f27e233ea4e48634b930bf999efb63e
 		;;
 esac
+_license_checksum=287d037b0ecedb68ae1e3138411d54b87172156effecd1987a5f85834aa26a24
 
 post_extract() {
 	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
diff --git a/srcpkgs/sublime-text4/update b/srcpkgs/sublime-text4/update
new file mode 100644
index 00000000000000..e6992cff6d8aa2
--- /dev/null
+++ b/srcpkgs/sublime-text4/update
@@ -0,0 +1,2 @@
+site="https://www.sublimetext.com/download"
+pattern='<p class="latest"><i>Version:</i> Build \K[-.\d]+(?=</p>)'