Adding -bin suffix for vscode and vscodium packages to avoid confusio…

…ns with source-based ones, as mentioned in #176

app-editors/visual-studio-code-bin/Manifest

@@ -0,0 +1,6 @@
+AUX visual-studio-code.desktop 219 BLAKE2B 76da7de95bb06cab2feaef664aee550b9ea68b58ecf3a9affa82fa11e1aeb8e754498cf1aa0b2dc18030fc2d800173c4b7ffd9c17dc0dc9de012fafd631d0060 SHA512 97b81eb1461225f5fef1187709387679d081e377897660e825a6ea356753b2c95e690552e5e75d76371126551786f36a43cd141b06c3cde436ccfb4a75347b03
+AUX visual-studio-code.png 30538 BLAKE2B 16cf4c0e8f6c59451e38049b2531b08cfac9c0ef570b0f4c28c16a51ebfa81e95db2c5286dd4c1ddb0fa535858f3373cff2f76a21a2859321cd80529c2d6ef52 SHA512 fabb74b9ab860d8003798ea85db2a3c79c1b683897acc5b580884a8946fa060276f8cdf459a9fb5fd9a560094b250838a3dfa2e5e5f8032601a155466dffa160
+DIST visual-studio-code-1.35.1-amd64.tar.gz 68383648 BLAKE2B 27f6df0b5326999b10f5d601dc31a342c7a6b14dd338b7e4f5ecaa9a3b7dc26c2db1b1faba9a62357a6540f3400c7d43687af88ad07e6faa720fe0c2e201c6b9 SHA512 84959245e0adfec04fe31ff0f30862313dbc89291bf47772f784e29e17a6e955ec21f9a1d23f8f1b6717c747517063db2563650bb42a5094ee17dad131606b92
+DIST visual-studio-code-1.35.1-x86.tar.gz 69348209 BLAKE2B 40ae0b6ca47056b95c407e633df348aa1042b200b51b4287c9bf445a1f760a997ca060ce81e69f86ee9a17dad16f7f3d6ce2cc25d38d25913160557eb4f6964e SHA512 49920c90cdaedb8319efee655d353e9286e1d656860accf60f7e7753a69673aeac13f0c6b0e80632963c641f5be4d830612b5f81813e5aed0a4d0fc8159ca80b
+EBUILD visual-studio-code-bin-1.35.1.ebuild 1668 BLAKE2B 94ea374d4ff8f31c3baa0f763897acbcfa0b6f57e60fd53a7b756d7aadf752a2dca8cac38f78a4297b75784cfb33799b257bde01e6ff8740f9513170114fa91d SHA512 c84e66b31579e0bcd88955227ff2cae7af94b5a74ddcaac1aa5d366297e2f141f383201f5717db2978b79eb3bf79e30cc25e19053ca63f757e347a467909a13e
+MISC metadata.xml 454 BLAKE2B af3ad261cba719d579e32b92172a6ef104c0a5c6e200632aef50a37ca2ef73888cfade48b3f440b063e97aff23d661919948648b2dc59b8732f14266ea326a72 SHA512 a5ec6d87a4494cbe485a052552fdd9ac48b10ecc003cf351180794712d8a71e0ae6b9c45ee12c75f91006106a988b0ddb0ab8f09edf1ef2c19acd00b3aecf2d4

app-editors/visual-studio-code/visual-studio-code-1.35.0.ebuild → app-editors/visual-studio-code-bin/visual-studio-code-bin-1.35.1.ebuild

@@ -5,12 +5,15 @@ EAPI=7
 
 inherit desktop pax-utils
 
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+MY_PN="${PN/-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft (binary version)"
 HOMEPAGE="https://code.visualstudio.com"
 
 SRC_URI="
-	x86? ( https://update.code.visualstudio.com/${PV}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+	x86? ( https://update.code.visualstudio.com/${PV}/linux-ia32/stable ->  ${MY_P}-x86.tar.gz )
+	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${MY_P}-amd64.tar.gz )
 	"
 RESTRICT="mirror strip bindist"
 
@@ -25,6 +28,7 @@ DEPEND="
 	x11-libs/cairo
 	gnome-base/gconf
 	x11-libs/libXtst
+	!app-editors/visual-studio-code
 "
 
 RDEPEND="
@@ -44,8 +48,8 @@ RDEPEND="
 
 DOCS=( resources/app/LICENSE.rtf )
 
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
+QA_PRESTRIPPED="opt/${MY_PN}/code"
+QA_PREBUILT="opt/${MY_PN}/code"
 
 pkg_setup(){
 	use amd64 && S="${WORKDIR}/VSCode-linux-x64"
@@ -54,11 +58,11 @@ pkg_setup(){
 
 src_install(){
 	pax-mark m code
-	mkdir -p "${D}/opt/${PN}"
-	cp -r . "${D}/opt/${PN}/"
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" ${PN}.png
+	mkdir -p "${D}/opt/${MY_PN}"
+	cp -r . "${D}/opt/${MY_PN}/"
+	dosym "/opt/${PN}/bin/code" "/usr/bin/${MY_PN}"
+	make_desktop_entry "${MY_PN}" "Visual Studio Code" "${MY_PN}" "Development;IDE"
+	newicon "resources/app/resources/linux/code.png" ${MY_PN}.png
 	einstalldocs
 }
 

app-editors/vscodium-bin/Manifest

@@ -0,0 +1,4 @@
+DIST VSCodium-linux-ia32-1.35.1.tar.gz 69046250 BLAKE2B a9375c6649a1c44d8a7da7f4373997b1ccee97eeebc7b08d2b60ab90adcb7faf3190e13625cb74faf535a7a60a42d35715e5e386a7b2a535dc8f39c85ab069c2 SHA512 754dea7d7cb78f413c964e9391aaf88e3e9b5f903917d639af88cbb699d829573fd34cdc824e905e92bb018c2bcc4d4e756c076347b4769e20735fba0b399039
+DIST VSCodium-linux-x64-1.35.1.tar.gz 67118371 BLAKE2B c45afeaa66207c3511f6272ba81dc078670d8f24881264c226f7c7507c528fb3489e8d707aaea45134075347518d8cd5109b8dd6c62c934ab25c1fdc502c6cd4 SHA512 df188332b7ed41c5bfdc45ae0519991afe129688656558ca836351c13f744cbdf8a61f107e6f15a58a2397fcc1ede3af6e8a3b1acfb8170fade8763f0edb7536
+EBUILD vscodium-bin-1.35.1.ebuild 1413 BLAKE2B b21f04df04447ab7cbcf8b641b38b5cc0960bba6161908eca2b32da702855b8be11e10ba38a84e4a959a69e943278df93291ff3707c476f38b6a60ee6f3abe49 SHA512 7dde9b8492af15ecee29e7531e5965a831df598e5fd4b34c0fe38104a1ad538b7126ce9cbf4209a2a17b426f415a31e330fdabde785d92e367859b01ab729ee2
+MISC metadata.xml 454 BLAKE2B af3ad261cba719d579e32b92172a6ef104c0a5c6e200632aef50a37ca2ef73888cfade48b3f440b063e97aff23d661919948648b2dc59b8732f14266ea326a72 SHA512 a5ec6d87a4494cbe485a052552fdd9ac48b10ecc003cf351180794712d8a71e0ae6b9c45ee12c75f91006106a988b0ddb0ab8f09edf1ef2c19acd00b3aecf2d4

app-editors/vscodium/vscodium-1.34.0.ebuild → app-editors/vscodium-bin/vscodium-bin-1.35.1.ebuild

@@ -5,7 +5,9 @@ EAPI=7
 
 inherit desktop pax-utils
 
-DESCRIPTION="Free/Libre Open Source Software Binaries of VSCode"
+MY_PN="${PN/-bin}"
+
+DESCRIPTION="Free/Libre Open Source Software Binaries of VSCode (binary version)"
 HOMEPAGE="https://vscodium.com"
 
 SRC_URI="
@@ -25,6 +27,7 @@ DEPEND="
 	x11-libs/cairo
 	gnome-base/gconf
 	x11-libs/libXtst
+	!app-editors/vscodium
 "
 
 RDEPEND="
@@ -42,17 +45,18 @@ RDEPEND="
 	)
 "
 
-QA_PRESTRIPPED="opt/${PN}/vscodium"
-QA_PREBUILT="opt/${PN}/vscodium"
+QA_PRESTRIPPED="opt/${MY_PN}/vscodium"
+QA_PREBUILT="opt/${MY_PN}/vscodium"
 
 S="${WORKDIR}"
 
 src_install(){
 	pax-mark m vscodium
-	mkdir -p "${D}/opt/${PN}"
-	cp -r . "${D}/opt/${PN}/"
-	dosym "/opt/${PN}/bin/vscodium" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "VSCodium" "${PN}" "Development;IDE"
-	newicon "resources/app/resources/linux/code.png" ${PN}.png
+	mkdir -p "${D}/opt/${MY_PN}"
+	cp -r . "${D}/opt/${MY_PN}/"
+	dosym "/opt/${MY_PN}/bin/codium" "/usr/bin/${PN}"
+	dosym "/opt/${MY_PN}/bin/codium" "/usr/bin/codium"
+	make_desktop_entry "${MY_PN}" "VSCodium" "${PN}" "Development;IDE"
+	newicon "resources/app/resources/linux/code.png" ${MY_PN}.png
 }