[gentoo-commits] repo/gentoo:master commit in: net-misc/apt-cacher-ng/

[Jeroen Roovers]

commit:     6f387d44f8d37ce6bf772ae260bcd19ad88c44e6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 07:39:54 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 07:46:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f387d44

net-misc/apt-cacher-ng: cmake-utils.eclass -> cmake.eclass

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild | 5 ++---
 net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index 4fc61df2c95..362e497b3c1 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils user
+inherit cmake user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -31,7 +31,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -71,7 +70,7 @@ src_configure() {
 		mycmakeargs+=( "-DUSE_GOLD=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }

diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 6b25935a9cb..8ecaae37d3c 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils git-r3 user
+inherit cmake git-r3 user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -29,7 +29,6 @@ COMMON_DEPEND="
 "
 BDEPEND="
 	${COMMON_DEPEND}
-	dev-util/cmake
 	virtual/pkgconfig
 "
 RDEPEND="
@@ -65,7 +64,7 @@ src_configure() {
 		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }