From 24b2471760a35870c85ca752666bcb66120289af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Dec 2023 11:18:53 +0000 Subject: gentoo auto-resync : 11:12:2023 - 11:18:53 --- eclass/Manifest.gz | Bin 38943 -> 38938 bytes eclass/ghc-package.eclass | 5 ++--- eclass/haskell-cabal.eclass | 15 ++++++--------- eclass/vdr-plugin-2.eclass | 20 +++++--------------- 4 files changed, 13 insertions(+), 27 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 7ac5eb192bfb..a159a6ab9d1e 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 66a14ca971ba..1d9483e012fb 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -6,7 +6,7 @@ # "Gentoo's Haskell Language team" # @AUTHOR: # Original Author: Andres Loeh -# @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='.*' diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index a3e2da6155f3..7895d9256eba 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Original author: Andres Loeh # Original author: Duncan Coutts -# @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: # > : 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 diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index 25df4f124434..f53e2c23f4f8 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -9,7 +9,7 @@ # Joerg Bornkessel # Christian Ruppert # (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" -- cgit v1.2.3