TDE
/
tde-packaging-gentoo
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo
0
0
Fork 0
Code Issues Releases Wiki Activity

Changed from cmake-utils to cmake and added support for eapi8 to eclass

Browse Source 
Signed-off-by: ormorph <roma251078@mail.ru>
pull/250/head
ormorph 3 years ago
parent 4649aa4f7c
commit f0da2936f4
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File

23
eclass/trinity-base-2.eclass
Unescape View File

@ -1,10 +1,11 @@
# Copyright 1999-2020 Gentoo Authors # Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project # Copyright 2020-2022 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# #
# Original Author: fat-zer # Original Author: fat-zer
# Ported to git-r3 eclass and EAPI7 by E. Liddell # Ported to git-r3 eclass and EAPI7 by E. Liddell
# Ported to cmake eclass and EAPI8 by ormorh
# Purpose: Support ebuilds for the Trinity Desktop (KDE3 fork). # Purpose: Support ebuilds for the Trinity Desktop (KDE3 fork).
# #
@ -15,7 +16,7 @@ inherit trinity-functions-2
# The value of this variable determines the package build mode. # The value of this variable determines the package build mode.
# If set to "yes", the module "admin" is used for assembly.The build # If set to "yes", the module "admin" is used for assembly.The build
# is done using the 'trinity-econf' and 'emake' functions. # is done using the 'trinity-econf' and 'emake' functions.
# If set to "no", inherit cmake-utils. # If set to "no", inherit cmake.
: ${TRINITY_BUILD_ADMIN:=no} : ${TRINITY_BUILD_ADMIN:=no}
@ -23,7 +24,7 @@ case ${TRINITY_BUILD_ADMIN} in
yes) yes)
;; ;;
no) no)
inherit cmake-utils inherit cmake
;; ;;
*) *)
eerror "Unknown value for \${CHECK_ADMIN}" eerror "Unknown value for \${CHECK_ADMIN}"
@ -39,7 +40,7 @@ addpredict "/usr/tqt3/etc/settings"
# ban EAPI 0-6 # ban EAPI 0-6
case ${EAPI} in case ${EAPI} in
0|1|2|3|4|5|6) die "EAPI=${EAPI} is not supported" ;; 0|1|2|3|4|5|6) die "EAPI=${EAPI} is not supported" ;;
7) ;; 7|8) ;;
*) die "Unknown EAPI=${EAPI}" *) die "Unknown EAPI=${EAPI}"
esac esac
@ -356,14 +357,14 @@ trinity-base-2_src_prepare() {
trinity-gen-configure trinity-gen-configure
eapply_user eapply_user
elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then
cmake-utils_src_prepare cmake_src_prepare
fi fi
} }
# @FUNCTION: trinity-base-2_src_configure # @FUNCTION: trinity-base-2_src_configure
# @DESCRIPTION: # @DESCRIPTION:
# Call standard cmake-utils_src_onfigure and add some common arguments. # Call standard cmake_src_onfigure and add some common arguments.
trinity-base-2_src_configure() { trinity-base-2_src_configure() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
local eg_cmakeargs local eg_cmakeargs
@ -408,26 +409,26 @@ trinity-base-2_src_configure() {
if [[ ${TRINITY_BUILD_ADMIN} == "yes" ]] ; then if [[ ${TRINITY_BUILD_ADMIN} == "yes" ]] ; then
trinity-econf trinity-econf
elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then
cmake-utils_src_configure cmake_src_configure
fi fi
} }
# @FUNCTION: trinity-base-2_src_compile # @FUNCTION: trinity-base-2_src_compile
# @DESCRIPTION: # @DESCRIPTION:
# Just call cmake-utils_src_compile. # Just call cmake_src_compile.
trinity-base-2_src_compile() { trinity-base-2_src_compile() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
if [[ ${TRINITY_BUILD_ADMIN} == "yes" ]] ; then if [[ ${TRINITY_BUILD_ADMIN} == "yes" ]] ; then
emake emake
elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then
cmake-utils_src_compile cmake_src_compile
fi fi
} }
# @FUNCTION: trinity-base-2_src_install # @FUNCTION: trinity-base-2_src_install
# @DESCRIPTION: # @DESCRIPTION:
# Call standard cmake-utils_src_install and installs common documentation. # Call standard cmake_src_install and installs common documentation.
trinity-base-2_src_install() { trinity-base-2_src_install() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
@ -436,7 +437,7 @@ trinity-base-2_src_install() {
emake install DESTDIR="${D}" emake install DESTDIR="${D}"
fi fi
elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then elif [[ ${TRINITY_BUILD_ADMIN} == "no" ]] ; then
cmake-utils_src_install cmake_src_install
fi fi
if [[ -z "${TRINITY_BASE_NO_INSTALL_DOC}" || if [[ -z "${TRINITY_BASE_NO_INSTALL_DOC}" ||

3
eclass/trinity-functions-2.eclass
Unescape View File

@ -1,10 +1,11 @@
# Copyright 1999-2020 Gentoo Authors # Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project # Copyright 2020-2022 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# #
# Original Author: Alexander Golubev (Fat-Zer) # Original Author: Alexander Golubev (Fat-Zer)
# Ported to git-r3 eclass and EAPI7 by E. Liddell # Ported to git-r3 eclass and EAPI7 by E. Liddell
# Ported to cmake eclass and EAPI8 by ormorh
# Purpose: Basic Trinity eclass functions and variables # Purpose: Basic Trinity eclass functions and variables
# #

3
eclass/trinity-meta-2.eclass
Unescape View File

@ -1,10 +1,11 @@
# Copyright 1999-2020 Gentoo Authors # Copyright 1999-2020 Gentoo Authors
# Copyright 2020 The Trinity Desktop Project # Copyright 2020-2022 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# #
# Original Author: fat-zer # Original Author: fat-zer
# Ported to git-r3 eclass and EAPI7 by E. Liddell # Ported to git-r3 eclass and EAPI7 by E. Liddell
# Ported to cmake eclass and EAPI8 by ormorh
# Purpose: Make it easy to install Trinity ebuilds. # Purpose: Make it easy to install Trinity ebuilds.
# #

Write Preview
Loading…
Cancel
Save