commit:     221647fa64007ade935173f6727b1841a5aa587e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 30 14:53:32 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 17:50:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221647fa

net-dns/https_dns_proxy: update EAPI 7 -> 8

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/https_dns_proxy-0_pre20200925-cmake4.patch | 20 ++++++++++++++++++++
 .../https_dns_proxy-0_pre20200925.ebuild             | 17 ++++++++++-------
 net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild  | 15 ++++++++-------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git 
a/net-dns/https_dns_proxy/files/https_dns_proxy-0_pre20200925-cmake4.patch 
b/net-dns/https_dns_proxy/files/https_dns_proxy-0_pre20200925-cmake4.patch
new file mode 100644
index 000000000000..d4c4f7c23fd8
--- /dev/null
+++ b/net-dns/https_dns_proxy/files/https_dns_proxy-0_pre20200925-cmake4.patch
@@ -0,0 +1,20 @@
+From 04db5de69c6f030b432f44fc2a17cd9a28f91e61 Mon Sep 17 00:00:00 2001
+From: baranyaib90 <[email protected]>
+Date: Wed, 28 Jul 2021 20:18:56 +0200
+Subject: [PATCH] Warning fixes
+
+---
+ CMakeLists.txt     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad116df..a5c0a28 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -0,5 +0,5 @@
++cmake_minimum_required(VERSION 3.7)
+ project(HttpsDnsProxy)
+-cmake_minimum_required(VERSION 2.8)
+ 
+ set(CMAKE_BUILD_TYPE "Debug")
+ #set(CMAKE_BUILD_TYPE "Release")

diff --git a/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild 
b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
index d2ca352cd24f..8af7751fbb9e 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-0_pre20200925.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit cmake
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
        EGIT_REPO_URI="https://github.com/aarond10/https_dns_proxy.git";
        inherit git-r3
 else
-       MY_COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
-       
SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${MY_COMMIT}.tar.gz
 -> ${P}.tar.gz"
+       COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
+       
SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
-       S="${WORKDIR}/${PN}-${MY_COMMIT}"
+       S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
-DESCRIPTION="A lightweight DNS-over-HTTPS proxy"
+DESCRIPTION="Lightweight DNS-over-HTTPS proxy"
 HOMEPAGE="https://github.com/aarond10/https_dns_proxy";
 
 LICENSE="MIT"
@@ -26,6 +27,8 @@ RDEPEND="
        net-misc/curl[http2,ssl]"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-cmake4.patch" ) # git master
+
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_GTest=ON

diff --git a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild 
b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
index d2ca352cd24f..57ad56c18cc7 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit cmake
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
        EGIT_REPO_URI="https://github.com/aarond10/https_dns_proxy.git";
        inherit git-r3
 else
-       MY_COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
-       
SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${MY_COMMIT}.tar.gz
 -> ${P}.tar.gz"
+       COMMIT="2d9285e2b94bce21c588c8160f8fac660806987a"
+       
SRC_URI="https://github.com/aarond10/https_dns_proxy/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
-       S="${WORKDIR}/${PN}-${MY_COMMIT}"
+       S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
-DESCRIPTION="A lightweight DNS-over-HTTPS proxy"
+DESCRIPTION="Lightweight DNS-over-HTTPS proxy"
 HOMEPAGE="https://github.com/aarond10/https_dns_proxy";
 
 LICENSE="MIT"

Reply via email to