mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Merge updates from master
This commit is contained in:
Repository mirror & CI
@@ -82,9 +82,9 @@ src_configure() {
|
||||
src_install() {
|
||||
default
|
||||
if use user-permissions; then
|
||||
udev_dorules data/etc/udev/rules.d/60-ddcutil-i2c.rules
|
||||
udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-i2c.rules
|
||||
if use usb-monitor; then
|
||||
udev_dorules data/etc/udev/rules.d/60-ddcutil-usb.rules
|
||||
udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-usb.rules
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
# "Gentoo's Haskell Language team" <haskell@gentoo.org>
|
||||
# @AUTHOR:
|
||||
# Original Author: Andres Loeh <kosmikus@gentoo.org>
|
||||
# @SUPPORTED_EAPIS: 6 7 8
|
||||
# @SUPPORTED_EAPIS: 7 8
|
||||
# @BLURB: This eclass helps with the Glasgow Haskell Compiler's package configuration utility.
|
||||
# @DESCRIPTION:
|
||||
# Helper eclass to handle ghc installation/upgrade/deinstallation process.
|
||||
@@ -16,7 +16,6 @@ inherit multiprocessing
|
||||
# Maintain version-testing compatibility with ebuilds not using EAPI 7.
|
||||
case ${EAPI} in
|
||||
7|8) ;;
|
||||
6) inherit eapi7-ver ;;
|
||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||
esac
|
||||
|
||||
@@ -24,7 +23,7 @@ esac
|
||||
# QA check generates false positive because it assumes
|
||||
# presence of GCC-specific sections.
|
||||
#
|
||||
# Workaround false positiove by disabling the check completely.
|
||||
# Workaround false positive by disabling the check completely.
|
||||
# bug #722078, bug #677600
|
||||
QA_FLAGS_IGNORED='.*'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# @AUTHOR:
|
||||
# Original author: Andres Loeh <kosmikus@gentoo.org>
|
||||
# Original author: Duncan Coutts <dcoutts@gentoo.org>
|
||||
# @SUPPORTED_EAPIS: 6 7 8
|
||||
# @SUPPORTED_EAPIS: 7 8
|
||||
# @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal)
|
||||
# @DESCRIPTION:
|
||||
# Basic instructions:
|
||||
@@ -35,15 +35,13 @@
|
||||
# package it might cause cause the test-suite to fail with
|
||||
# errors like:
|
||||
# > <command line>: cannot satisfy -package-id singletons-2.7-3Z7pnljD8tU1NrslJodXmr
|
||||
# Workaround re-reginsters the package to avoid the failure
|
||||
# Workaround re-registers the package to avoid the failure
|
||||
# (and rebuilds changes).
|
||||
# FEATURE can be removed once https://github.com/haskell/cabal/issues/7213
|
||||
# is fixed.
|
||||
|
||||
case ${EAPI} in
|
||||
# eutils is for eqawarn
|
||||
6) inherit eutils ;;
|
||||
8|7) ;;
|
||||
7|8) ;;
|
||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||
esac
|
||||
|
||||
@@ -99,7 +97,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_test src_in
|
||||
# CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests"
|
||||
: "${CABAL_EXTRA_HSCOLOUR_FLAGS:=}"
|
||||
|
||||
|
||||
# @ECLASS_VARIABLE: CABAL_EXTRA_TEST_FLAGS
|
||||
# @USER_VARIABLE
|
||||
# @DESCRIPTION:
|
||||
@@ -157,7 +154,7 @@ S="${WORKDIR}/${CABAL_P}"
|
||||
# @DESCRIPTION:
|
||||
# The location of the .cabal file for the Haskell package. This defaults to
|
||||
# "${S}/${CABAL_PN}.cabal".
|
||||
#
|
||||
#
|
||||
# NOTE: If $S is redefined in the ebuild after inheriting this eclass,
|
||||
# $CABAL_FILE will also need to be redefined as well.
|
||||
: "${CABAL_FILE:="${S}/${CABAL_PN}.cabal"}"
|
||||
@@ -763,7 +760,7 @@ cabal_src_compile() {
|
||||
fi
|
||||
if [[ -n "${CABAL_REBUILD_AFTER_DOC_WORKAROUND}" ]]; then
|
||||
ewarn "rebuild-after-doc-workaround is enabled. This is a"
|
||||
ewarn "temporary worakround to deal with https://github.com/haskell/cabal/issues/7213"
|
||||
ewarn "temporary workaround to deal with https://github.com/haskell/cabal/issues/7213"
|
||||
ewarn "until the upstream issue can be resolved."
|
||||
cabal-build
|
||||
fi
|
||||
@@ -1104,7 +1101,7 @@ cabal-register-inplace() {
|
||||
# needed by the executable. (Needed libraries are automatically added to
|
||||
# LD_LIBRARY_PATH by haskell-cabal_src_compile().)
|
||||
#
|
||||
# This is only inteded to be run in the test and install phases.
|
||||
# This is only intended to be run in the test and install phases.
|
||||
cabal-run-dist-bin() {
|
||||
einfo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
|
||||
case "$EBUILD_PHASE_FUNC" in
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
# Joerg Bornkessel <hd_brummy@gentoo.org>
|
||||
# Christian Ruppert <idl0r@gentoo.org>
|
||||
# (undisclosed contributors)
|
||||
# @SUPPORTED_EAPIS: 6 7 8
|
||||
# @SUPPORTED_EAPIS: 7 8
|
||||
# @BLURB: common vdr plugin ebuild functions
|
||||
# @DESCRIPTION:
|
||||
# Eclass for easing maintenance of vdr plugin ebuilds
|
||||
@@ -61,14 +61,13 @@
|
||||
# @CODE
|
||||
|
||||
case ${EAPI} in
|
||||
6|7|8) ;;
|
||||
7|8) ;;
|
||||
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
|
||||
esac
|
||||
|
||||
if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then
|
||||
_VDR_PLUGIN_2_ECLASS=1
|
||||
|
||||
[[ ${EAPI} == 6 ]] && inherit eutils
|
||||
inherit flag-o-matic strip-linguas toolchain-funcs unpacker
|
||||
|
||||
# Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes
|
||||
@@ -82,18 +81,9 @@ DESCRIPTION="vdr Plugin: ${VDRPLUGIN} (based on vdr-plugin-2.eclass)"
|
||||
S="${WORKDIR}/${VDRPLUGIN}-${PV}"
|
||||
|
||||
# depend on headers for DVB-driver and vdr-scripts
|
||||
case ${EAPI} in
|
||||
6)
|
||||
DEPEND="media-tv/gentoo-vdr-scripts
|
||||
virtual/linuxtv-dvb-headers
|
||||
virtual/pkgconfig"
|
||||
;;
|
||||
*)
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
DEPEND="media-tv/gentoo-vdr-scripts
|
||||
virtual/linuxtv-dvb-headers"
|
||||
;;
|
||||
esac
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
DEPEND="media-tv/gentoo-vdr-scripts
|
||||
virtual/linuxtv-dvb-headers"
|
||||
RDEPEND="media-tv/gentoo-vdr-scripts
|
||||
app-eselect/eselect-vdr"
|
||||
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
|
||||
-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
|
||||
-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
|
||||
+set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/")
|
||||
+set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/")
|
||||
+set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/")
|
||||
+set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/")
|
||||
|
||||
message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
|
||||
message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
inherit python-any-r1 cmake
|
||||
inherit python-any-r1 cmake prefix
|
||||
|
||||
CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014
|
||||
|
||||
@@ -30,7 +30,6 @@ BDEPEND="
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gentoo.patch
|
||||
"${FILESDIR}"/${PN}-0.4.0-gcc13.patch
|
||||
)
|
||||
|
||||
@@ -44,8 +43,9 @@ src_prepare() {
|
||||
src_configure() {
|
||||
cd libkineto
|
||||
local mycmakeargs=(
|
||||
-DLIBKINETO_THIRDPARTY_DIR=/usr/include/
|
||||
-DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/
|
||||
)
|
||||
eapply $(prefixify_ro "${FILESDIR}"/${P}-gentoo.patch)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user