From 9d8d0cb23ab1ea441dbe72b83c94817bbc4d11b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sun, 26 Jun 2022 20:22:58 +0200 Subject: [PATCH] [dev-libs/Ice] fix pkgcheck stuff, jank p3k11, needs patching --- dev-libs/Ice/Ice-3.7.7-r1.ebuild | 18 +++++++++--------- dev-libs/Ice/Ice-3.7.7-r2.ebuild | 18 +++++++++--------- dev-libs/Ice/Ice-3.7.7.ebuild | 18 +++++++++--------- dev-libs/Ice/Ice-3.7.9999.ebuild | 16 ++++++++-------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dev-libs/Ice/Ice-3.7.7-r1.ebuild b/dev-libs/Ice/Ice-3.7.7-r1.ebuild index e279b50..a52bdcc 100644 --- a/dev-libs/Ice/Ice-3.7.7-r1.ebuild +++ b/dev-libs/Ice/Ice-3.7.7-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..10} ) RUBY_OPTIONAL="yes" USE_RUBY="ruby30" @@ -86,10 +86,10 @@ src_prepare() { src_configure() { MAKE_RULES=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" + "prefix=\"${EPREFIX}/usr\"" + "install_docdir=\"${EPREFIX}/usr/share/doc/${PF}\"" + "install_configdir=\"${EPREFIX}/usr/share/${P}/config\"" + "install_mandir=\"${EPREFIX}/usr/share/man/man1\"" "embedded_runpath_prefix=\"${EPREFIX}/usr\"" "new_dtags=yes" "OPTIMIZE=$(usex !debug)" @@ -105,8 +105,8 @@ src_configure() { SITERUBY="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBYARCH="$(ruby30 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" + "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" ) # make it use ruby30 only @@ -171,8 +171,8 @@ src_test() { PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ PYTHON="${EPYTHON}" \ - install_pythondir="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(python_get_sitedir)\"" test + install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \ + install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test } local S="${S}/python" python_foreach_impl testing diff --git a/dev-libs/Ice/Ice-3.7.7-r2.ebuild b/dev-libs/Ice/Ice-3.7.7-r2.ebuild index 7dc40eb..b9f5903 100644 --- a/dev-libs/Ice/Ice-3.7.7-r2.ebuild +++ b/dev-libs/Ice/Ice-3.7.7-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..10} ) RUBY_OPTIONAL="yes" USE_RUBY="ruby31" @@ -86,10 +86,10 @@ src_prepare() { src_configure() { MAKE_RULES=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" + "prefix=\"${EPREFIX}/usr\"" + "install_docdir=\"${EPREFIX}/usr/share/doc/${PF}\"" + "install_configdir=\"${EPREFIX}/usr/share/${P}/config\"" + "install_mandir=\"${EPREFIX}/usr/share/man/man1\"" "embedded_runpath_prefix=\"${EPREFIX}/usr\"" "new_dtags=yes" "OPTIMIZE=$(usex !debug)" @@ -105,8 +105,8 @@ src_configure() { SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" + "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" ) # make it use ruby31 only @@ -171,8 +171,8 @@ src_test() { PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ PYTHON="${EPYTHON}" \ - install_pythondir="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(python_get_sitedir)\"" test + install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \ + install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test } local S="${S}/python" python_foreach_impl testing diff --git a/dev-libs/Ice/Ice-3.7.7.ebuild b/dev-libs/Ice/Ice-3.7.7.ebuild index b22e162..343c1fc 100644 --- a/dev-libs/Ice/Ice-3.7.7.ebuild +++ b/dev-libs/Ice/Ice-3.7.7.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..10} ) RUBY_OPTIONAL="yes" USE_RUBY="ruby27" @@ -86,10 +86,10 @@ src_prepare() { src_configure() { MAKE_RULES=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" + "prefix=\"${EPREFIX}/usr\"" + "install_docdir=\"${EPREFIX}/usr/share/doc/${PF}\"" + "install_configdir=\"${EPREFIX}/usr/share/${P}/config\"" + "install_mandir=\"${EPREFIX}/usr/share/man/man1\"" "embedded_runpath_prefix=\"${EPREFIX}/usr\"" "new_dtags=yes" "OPTIMIZE=$(usex !debug)" @@ -105,8 +105,8 @@ src_configure() { SITERUBY="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" + "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" ) # make it use ruby27 only @@ -171,8 +171,8 @@ src_test() { PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ PYTHON="${EPYTHON}" \ - install_pythondir="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(python_get_sitedir)\"" test + install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \ + install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test } local S="${S}/python" python_foreach_impl testing diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild index d2d5ed3..a8b29c9 100644 --- a/dev-libs/Ice/Ice-3.7.9999.ebuild +++ b/dev-libs/Ice/Ice-3.7.9999.ebuild @@ -88,10 +88,10 @@ src_prepare() { src_configure() { MAKE_RULES=( - "prefix=\"${ED}/usr\"" - "install_docdir=\"${ED}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED}/usr/share/${P}/config\"" - "install_mandir=\"${ED}/usr/share/man/man1\"" + "prefix=\"${EPREFIX}/usr\"" + "install_docdir=\"${EPREFIX}/usr/share/doc/${PF}\"" + "install_configdir=\"${EPREFIX}/usr/share/${P}/config\"" + "install_mandir=\"${EPREFIX}/usr/share/man/man1\"" "embedded_runpath_prefix=\"${EPREFIX}/usr\"" "new_dtags=yes" "OPTIMIZE=$(usex !debug)" @@ -107,8 +107,8 @@ src_configure() { SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( - "install_rubydir=\"${ED}/${SITERUBY}\"" - "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" + "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" ) # make it use ruby31 only @@ -173,8 +173,8 @@ src_test() { PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ PYTHON="${EPYTHON}" \ - install_pythondir="\"${D}/$(python_get_sitedir)\"" \ - install_libdir="\"${D}/$(python_get_sitedir)\"" test + install_pythondir="\"${EPREFIX}/$(python_get_sitedir)\"" \ + install_libdir="\"${EPREFIX}/$(python_get_sitedir)\"" test } local S="${S}/python" python_foreach_impl testing