diff --git a/dev-libs/Ice/Ice-3.7.7-r1.ebuild b/dev-libs/Ice/Ice-3.7.7-r1.ebuild index a52bdcc..68313b8 100644 --- a/dev-libs/Ice/Ice-3.7.7-r1.ebuild +++ b/dev-libs/Ice/Ice-3.7.7-r1.ebuild @@ -86,12 +86,7 @@ src_prepare() { src_configure() { MAKE_RULES=( - "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)" "V=1" ) @@ -188,10 +183,17 @@ src_install() { use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" ) einstalldocs + MAKE_RULES_INSTALL=( + "prefix=\"${ED}/usr\"" + "install_docdir=\"${ED}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED}/usr/share/${P}/config\"" + "install_mandir=\"${ED}/usr/share/man/man1\"" + ) + insinto /usr/share/${P} doins -r slice - emake -C cpp "${MAKE_RULES[@]}" install + emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install if use examples; then docinto examples-cpp @@ -234,6 +236,7 @@ src_install() { emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ + "${MAKE_RULES_INSTALL[@]}" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \ install @@ -244,7 +247,11 @@ src_install() { fi if use ruby; then + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + ) dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install fi } diff --git a/dev-libs/Ice/Ice-3.7.7-r2.ebuild b/dev-libs/Ice/Ice-3.7.7-r2.ebuild index b9f5903..531e750 100644 --- a/dev-libs/Ice/Ice-3.7.7-r2.ebuild +++ b/dev-libs/Ice/Ice-3.7.7-r2.ebuild @@ -86,12 +86,7 @@ src_prepare() { src_configure() { MAKE_RULES=( - "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)" "V=1" ) @@ -188,10 +183,17 @@ src_install() { use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" ) einstalldocs + MAKE_RULES_INSTALL=( + "prefix=\"${ED}/usr\"" + "install_docdir=\"${ED}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED}/usr/share/${P}/config\"" + "install_mandir=\"${ED}/usr/share/man/man1\"" + ) + insinto /usr/share/${P} doins -r slice - emake -C cpp "${MAKE_RULES[@]}" install + emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install if use examples; then docinto examples-cpp @@ -234,6 +236,7 @@ src_install() { emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ + "${MAKE_RULES_INSTALL[@]}" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \ install @@ -244,7 +247,11 @@ src_install() { fi if use ruby; then + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + ) dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install fi } diff --git a/dev-libs/Ice/Ice-3.7.7.ebuild b/dev-libs/Ice/Ice-3.7.7.ebuild index 343c1fc..493d43a 100644 --- a/dev-libs/Ice/Ice-3.7.7.ebuild +++ b/dev-libs/Ice/Ice-3.7.7.ebuild @@ -86,12 +86,7 @@ src_prepare() { src_configure() { MAKE_RULES=( - "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)" "V=1" ) @@ -188,10 +183,17 @@ src_install() { use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" ) einstalldocs + MAKE_RULES_INSTALL=( + "prefix=\"${ED}/usr\"" + "install_docdir=\"${ED}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED}/usr/share/${P}/config\"" + "install_mandir=\"${ED}/usr/share/man/man1\"" + ) + insinto /usr/share/${P} doins -r slice - emake -C cpp "${MAKE_RULES[@]}" install + emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install if use examples; then docinto examples-cpp @@ -234,6 +236,7 @@ src_install() { emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ + "${MAKE_RULES_INSTALL[@]}" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \ install @@ -244,7 +247,11 @@ src_install() { fi if use ruby; then + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + ) dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install fi } diff --git a/dev-libs/Ice/Ice-3.7.9999.ebuild b/dev-libs/Ice/Ice-3.7.9999.ebuild index a8b29c9..59233ab 100644 --- a/dev-libs/Ice/Ice-3.7.9999.ebuild +++ b/dev-libs/Ice/Ice-3.7.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..10} ) RUBY_OPTIONAL="yes" USE_RUBY="ruby31" @@ -88,12 +88,7 @@ src_prepare() { src_configure() { MAKE_RULES=( - "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)" "V=1" ) @@ -189,10 +184,17 @@ src_install() { local DOCS=( CHANGELOG*.md README.md ) einstalldocs + MAKE_RULES_INSTALL=( + "prefix=\"${ED}/usr\"" + "install_docdir=\"${ED}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED}/usr/share/${P}/config\"" + "install_mandir=\"${ED}/usr/share/man/man1\"" + ) + insinto /usr/share/${P} doins -r slice - emake -C cpp "${MAKE_RULES[@]}" install + emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install if use examples; then docinto examples-cpp @@ -235,6 +237,7 @@ src_install() { emake -C "${BUILD_DIR}" \ "${MAKE_RULES[@]}" \ + "${MAKE_RULES_INSTALL[@]}" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \ install @@ -245,7 +248,11 @@ src_install() { fi if use ruby; then + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + ) dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install fi }