[gentoo-commits] repo/proj/guru:master commit in: net-vpn/candy/

["Julien Roy" <julien@jroy.ca>]

commit:     7e57689bc0f7401976e044a0da02632726e6340d
Author:     Xin Yang <yangmame <AT> icloud <DOT> com>
AuthorDate: Tue Mar  5 03:28:59 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed Mar  6 00:58:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7e57689b

net-vpn/candy: version bump to 4.1, drop olds

Signed-off-by: Xin Yang <yangmame <AT> icloud.com>
Closes: https://github.com/gentoo/guru/pull/148
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 net-vpn/candy/Manifest                             |  3 +-
 net-vpn/candy/candy-3.9.1.ebuild                   | 52 ----------------------
 .../candy/{candy-4.0.ebuild => candy-4.1.ebuild}   |  6 ---
 3 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/net-vpn/candy/Manifest b/net-vpn/candy/Manifest
index ae1de07b3a..8691142b70 100644
--- a/net-vpn/candy/Manifest
+++ b/net-vpn/candy/Manifest
@@ -1,2 +1 @@
-DIST candy-3.9.1.tar.gz 37847 BLAKE2B af7c857a8a41f0e98bd744162be563b973e20a630fb505de91155ab9fb7a17679a2bb9f69db8c737258d1293c5d77ad96a65a2b22455512b8f97390a7368165f SHA512 aa9727c74ab7c9536331098f11a2837daa51aa58503cbf5b43536afedf5eea8d30db296f515c4689cf44c980eea5a88e06ad161836fe64d4146de4fdce9d99ac
-DIST candy-4.0.tar.gz 43112 BLAKE2B 84c3fbab30dc1d40ba73e7c90a02bf6c13b9bb0de2339fe128c958242213986dc2c490c680032c98f9a3a849e237f1f22274b600e55ed94aea91d9529bf972bf SHA512 9f76ab338cec381e1421040055ba73882a32f6b2b9bebe8fbc289c1c0e418506a57698fa8e551a31a918dfbcfa668dbb6c1d82390a2496a7fe35d6a17adacd64
+DIST candy-4.1.tar.gz 43205 BLAKE2B c999099302690f759bfb877fdd9213e7b4d5a2cce649936913a3c6a40e79a72149a1dc971649ff9773fd0bfc1d56c1a8b97edffeaa724c2656bb846ee26827d9 SHA512 f019de51cec3942b854d7ffd35f9f7a669a26a967e78383bab6c5f2c58fca02f40e8fe9f502bd6e395623f917f2ccc6c8a2f05b96d4f164de4f018f763913cda

diff --git a/net-vpn/candy/candy-3.9.1.ebuild b/net-vpn/candy/candy-3.9.1.ebuild
deleted file mode 100644
index 843aa73cde..0000000000
--- a/net-vpn/candy/candy-3.9.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd
-
-DESCRIPTION="Another virtual private network that supports peer-to-peer connections"
-HOMEPAGE="https://github.com/lanthora/candy"
-SRC_URI="https://github.com/lanthora/candy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	dev-libs/uriparser
-	dev-libs/libconfig
-	net-libs/ixwebsocket[ws]
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-libs/libfmt
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/spdlog
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-use-system-ixwebsocket.patch"
-	cmake_src_prepare
-	default
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-	)
-	cmake_src_configure
-}
-
-src_install(){
-	cmake_src_install
-	default
-
-	insinto /etc
-	doins candy.conf
-	fperms 0644 /etc/candy.conf
-
-	systemd_dounit candy.service
-	systemd_dounit candy@.service
-}

diff --git a/net-vpn/candy/candy-4.0.ebuild b/net-vpn/candy/candy-4.1.ebuild
similarity index 86%
rename from net-vpn/candy/candy-4.0.ebuild
rename to net-vpn/candy/candy-4.1.ebuild
index 70b9c5a55e..4067f7cd8d 100644
--- a/net-vpn/candy/candy-4.0.ebuild
+++ b/net-vpn/candy/candy-4.1.ebuild
@@ -24,12 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	eapply "${FILESDIR}/${P}-show-version-and-use-cflags-env.patch"
-	cmake_src_prepare
-	default
-}
-
 src_install(){
 	cmake_src_install
 	default