From c7daa5fd168c5a989c55578b0ffc494fcc3acbee Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 24 Oct 2020 12:24:17 +0200 Subject: [PATCH] =?UTF-8?q?www-apps/libravatarserv:=20Update=20eclass:=20c?= =?UTF-8?q?make-utils=20=E2=86=92=20cmake.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libravatarserv-0.7.2.ebuild | 8 +++---- .../libravatarserv/libravatarserv-9999.ebuild | 21 ++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild b/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild index 7e5baeb..b7f1a58 100644 --- a/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild +++ b/www-apps/libravatarserv/libravatarserv-0.7.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -45,7 +45,7 @@ if [[ "${PV}" != "9999" ]]; then fi src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \ CMakeLists.txt || die "Build script modification failed" } diff --git a/www-apps/libravatarserv/libravatarserv-9999.ebuild b/www-apps/libravatarserv/libravatarserv-9999.ebuild index 7e5baeb..8dce345 100644 --- a/www-apps/libravatarserv/libravatarserv-9999.ebuild +++ b/www-apps/libravatarserv/libravatarserv-9999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake if [[ "${PV}" == "9999" ]]; then inherit git-r3 fi -DESCRIPTION="Simple libravatar server." +DESCRIPTION="Simple libravatar server" HOMEPAGE="https://schlomp.space/tastytea/libravatarserv" if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://schlomp.space/tastytea/libravatarserv.git" @@ -33,19 +33,10 @@ RDEPEND=" dev-libs/libxdg-basedir dev-cpp/identiconpp " -DEPEND=" - dev-util/cmake - ${RDEPEND} -" +DEPEND="${RDEPEND}" -DOCS="README.md doc/nginx-example.conf" +DOCS=("README.md" "doc/nginx-example.conf") if [[ "${PV}" != "9999" ]]; then S="${WORKDIR}/${PN}" fi - -src_prepare() { - cmake-utils_src_prepare - sed -i "s|\${CMAKE_INSTALL_DOCDIR}|\${CMAKE_INSTALL_DATAROOTDIR}/doc/${P}|" \ - CMakeLists.txt || die "Build script modification failed" -}