From 56fd1f5766ac3a92bde9800b4c1875d154a67428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 10 Dec 2023 15:56:18 +0100 Subject: [PATCH 1/7] vdr-plugin-2.eclass: Drop support for EAPI 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- eclass/vdr-plugin-2.eclass | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index 25df4f124434b..f53e2c23f4f8a 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" From a4008c25b3189ab153ce8d0a4a9b381911fdb491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 10 Dec 2023 15:56:30 +0100 Subject: [PATCH 2/7] haskell-cabal.eclass: Drop support for EAPI 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- eclass/haskell-cabal.eclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index a3e2da6155f36..4ae554d22fe85 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: @@ -41,9 +41,7 @@ # 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"}" From 068f035ebd38bb1ba7eecba4f7cfc30b77aa0f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 10 Dec 2023 15:56:35 +0100 Subject: [PATCH 3/7] ghc-package.eclass: Drop support for EAPI 6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- eclass/ghc-package.eclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 66a14ca971ba6..48936a894d7fd 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 From 8824bbbcb8a264e75a5e9bd812e62a3f973f0385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 10 Dec 2023 16:19:45 +0100 Subject: [PATCH 4/7] haskell-cabal.eclass: Fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- eclass/haskell-cabal.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 4ae554d22fe85..7895d9256eba6 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -35,7 +35,7 @@ # 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. @@ -760,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 @@ -1101,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 From 923de456a3893380151dde2383805d746651d589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Sun, 10 Dec 2023 16:19:51 +0100 Subject: [PATCH 5/7] ghc-package.eclass: Fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- eclass/ghc-package.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 48936a894d7fd..1d9483e012fb2 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -23,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='.*' From 637874b91a93d6eaca80813a60d4ad95f0f0a682 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 11 Dec 2023 08:31:07 +0100 Subject: [PATCH 6/7] app-misc/ddcutil: install correct udev rules Closes: https://bugs.gentoo.org/919691 Signed-off-by: Andrew Ammerlaan --- .../{ddcutil-2.0.0-r1.ebuild => ddcutil-2.0.0-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename app-misc/ddcutil/{ddcutil-2.0.0-r1.ebuild => ddcutil-2.0.0-r2.ebuild} (95%) diff --git a/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild similarity index 95% rename from app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild rename to app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild index 404d40c2fb75d..6eea72eebf9af 100644 --- a/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild +++ b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild @@ -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 } From 837259803593f16223ba81a222b8b7d160362367 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Mon, 11 Dec 2023 15:03:29 +0800 Subject: [PATCH 7/7] sci-libs/kineto: prefixify absolute paths Closes: https://bugs.gentoo.org/919678 Signed-off-by: Yiyang Wu Closes: https://github.com/gentoo/gentoo/pull/34230 Signed-off-by: Alfredo Tupone --- sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch | 4 ++-- sci-libs/kineto/kineto-0.4.0_p20231031.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch index 29804d93161c5..d0f8790ae5a5c 100644 --- a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch +++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch @@ -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}") diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild index fb7e15a451db4..aa8b2eea8a002 100644 --- a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild @@ -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 }