net-proxy/Throne: add 1.0.0, drop 4.3.7

Signed-off-by: Pavel Sobolev <contact@paveloom.dev>

net-proxy/Throne/Manifest

@@ -1,2 +1,2 @@
-DIST nekoray-4.3.7-deps.tar.xz 5024296 BLAKE2B 98921ea6843db450f46f323476a6c2300b52d22097a907ef05afb26ac110a5dd23d1190c9d9e9a04d9b3e77ac77fd2ee9e4ef4378386f470c46d45c3012ec0c4 SHA512 f08025bbc92325adaf0aa3b47056eb8e76747d2ccb89a8e99632fedeaf4a6bba59e3cc2df9d367286e5a379b37a40f8f0b39cdee4b9198bf7932161bd1aedce2
-DIST nekoray-4.3.7.tar.gz 1272145 BLAKE2B 75b9cdedb77afc2d298bab3937e6774cb1dfa0508b0655c247962b6ae6ebd77bc877bf3209a1657ca61cc46b079c4a541223d47557a3c27c76cb331f99e37305 SHA512 036ce6235faa4d455e7cef723175ff496c44263629f59c3ba59133769c807ef557a8e8fd85fa36c637d3da36fc7a7c15610fb8f044ea3c34a9c4e4c27895c6d3
+DIST Throne-1.0.0-deps.tar.xz 5065308 BLAKE2B d3a42a81257f39826aa271a897fc7409c9fa723aa5308f5f1d2fb2ef7b2b2a4053b90945d1ee0b4e92d3721408c68ced81ea7b6f1419ad6270b75ce606a010b2 SHA512 2cce09c9de090232c193e252bd9dfc8b77a576a67979e49eba684724549adeb48017eda930031875fc91a91bd0c60e1fee90ba9f9c22d2d79827e2bd4b0754d1
+DIST Throne-1.0.0.tar.gz 1388531 BLAKE2B 1ad1869899ccd1de6545c9485bdd930265039a276ea336bfc423f9bb6f70b61f5a0156dd0804614d59c39507c8f2f6ff3172a5305e53af3eebad7f0ff9e8c15e SHA512 f48386bbe9638fa2a6835bc71c011294e70f982693eceeccf888d61cbdd234aa221890ab130d053b80f9f825cb82672be8c445d4d9ba48ac2deea33be3396237

net-proxy/Throne/Throne-1.0.0.ebuild

@@ -8,8 +8,8 @@ inherit cmake desktop go-module xdg
 DESCRIPTION="Qt based cross-platform GUI proxy configuration manager"
 HOMEPAGE="https://github.com/throneproj/Throne"
 SRC_URI="
-	https://github.com/throneproj/Throne/archive/refs/tags/${PV}.tar.gz -> nekoray-${PV}.tar.gz
-	https://gitlab.com/api/v4/projects/69517529/packages/generic/nekoray/${PV}/nekoray-${PV}-deps.tar.xz
+	https://github.com/throneproj/Throne/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/69517529/packages/generic/${PN}/${PV}/${P}-deps.tar.xz
 "
 
 # The first line is for the C++ code, the second line is for the Go module
@@ -32,13 +32,15 @@ DEPEND="
 	dev-cpp/fkYAML
 "
 BDEPEND="
+	dev-go/protobuf-go
+	dev-go/protorpc
 	dev-qt/qttools:6[linguist]
 "
 
 PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-Use-system-QHotkey.patch"
+	"${FILESDIR}/${PN}-1.0.0-Use-system-quirc.patch"
 	"${FILESDIR}/nekoray-4.3.7-Use-system-fkYAML.patch"
-	"${FILESDIR}/nekoray-4.3.7-Use-system-QHotkey.patch"
-	"${FILESDIR}/nekoray-4.3.7-Use-system-quirc.patch"
 )
 
 src_unpack() {
@@ -47,9 +49,6 @@ src_unpack() {
 	mkdir -p "${S}/vendor" || die
 
 	go-module_src_unpack
-
-	mv "nekoray-${PV}/core/server/vendor" "${S}/core/server" || die
-	rmdir -p "nekoray-${PV}/core/server" || die
 }
 
 src_prepare() {
@@ -71,6 +70,10 @@ src_compile() {
 
 	cd "${S}/core/server" || die
 
+	pushd gen || die
+	protoc -I . --go_out=. --protorpc_out=. libcore.proto
+	popd || die
+
 	VERSION_SINGBOX=$(go list -m -f '{{.Version}}' github.com/sagernet/sing-box)
 	ego build \
 		-trimpath -ldflags "-w -s -X 'github.com/sagernet/sing-box/constant.Version=${VERSION_SINGBOX}'" \
@@ -78,12 +81,12 @@ src_compile() {
 }
 
 src_install() {
-	exeinto /usr/lib/nekoray
-	doexe "${BUILD_DIR}/nekoray"
-	doexe core/server/nekobox_core
+	exeinto /usr/lib/Throne
+	doexe "${BUILD_DIR}/Throne"
+	doexe core/server/Core
 
-	dosym -r /usr/lib/nekoray/nekoray /usr/bin/nekoray
+	dosym -r /usr/lib/Throne/Throne /usr/bin/Throne
 
-	doicon -s 256 res/public/nekobox.png
-	domenu "${FILESDIR}/nekoray.desktop"
+	doicon -s 256 res/public/Throne.png
+	domenu "${FILESDIR}/Throne.desktop"
 }

net-proxy/Throne/files/Throne-1.0.0-Use-system-QHotkey.patch

@@ -5,7 +5,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -45,7 +45,6 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
+@@ -42,7 +42,6 @@ message("[CMAKE_FIND_ROOT_PATH] ${CMAKE_FIND_ROOT_PATH}")
  
  include("cmake/print.cmake")
  include("cmake/nkr.cmake")
@@ -13,7 +13,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
  
  find_package(Threads)
  
-@@ -57,6 +56,7 @@ include("cmake/myproto.cmake")
+@@ -54,6 +53,7 @@ include("cmake/myproto.cmake")
  list(APPEND NKR_EXTERNAL_TARGETS myproto)
  
  set(BUILD_SHARED_LIBS OFF)
@@ -23,11 +23,11 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
  # Sources
 --- a/src/ui/mainwindow.cpp
 +++ b/src/ui/mainwindow.cpp
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
  #endif
  #include <QToolTip>
  #include <random>
 -#include <3rdparty/QHotkey/qhotkey.h>
 +#include <QHotkey>
- #include <include/api/gRPC.h>
+ #include <3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.hpp>
  #include <include/global/HTTPRequestHelper.hpp>

net-proxy/Throne/files/Throne-1.0.0-Use-system-quirc.patch

@@ -15,7 +15,7 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
      : m_qr(quirc_new())
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -83,11 +83,6 @@ set(PROJECT_SOURCES
+@@ -80,11 +80,6 @@ set(PROJECT_SOURCES
          3rdparty/qv2ray/v2/ui/widgets/speedchart/SpeedWidget.hpp
          3rdparty/qv2ray/v2/proxy/QvProxyConfigurator.cpp
  
@@ -24,14 +24,14 @@ Signed-off-by: Pavel Sobolev <contact@paveloom.dev>
 -        3rdparty/quirc/quirc.c
 -        3rdparty/quirc/version_db.c
 -
-         src/api/gRPC.cpp
- 
-         src/dataStore/Database.cpp
-@@ -263,6 +258,7 @@ target_link_libraries(nekoray PRIVATE
+         3rdparty/protorpc/rpc_client.cc
+         3rdparty/protorpc/rpc_conn.cc
+         3rdparty/protorpc/rpc_wire.cc
+@@ -267,6 +262,7 @@ target_link_libraries(Throne PRIVATE
          Threads::Threads
          ${NKR_EXTERNAL_TARGETS}
          ${PLATFORM_LIBRARIES}
 +        quirc
  )
  
- qt_finalize_executable(nekoray)
+ qt_finalize_executable(Throne)

net-proxy/Throne/files/Throne.desktop

@@ -2,10 +2,10 @@
 Version=1.0
 Terminal=false
 Type=Application
-Name=NekoRay
+Name=Throne
 Categories=Network;
 Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
 Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 sing-box)
 Keywords=Internet;VPN;Proxy;sing-box;
-Exec=nekoray
-Icon=nekobox
+Exec=Throne
+Icon=Throne