Closes: https://bugs.gentoo.org/596674 Signed-off-by: Matt Turner <matts...@gentoo.org> --- eclass/gnome2.eclass | 82 ++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 60 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 1a4ff451df3..9c2428532a9 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -4,7 +4,7 @@ # @ECLASS: gnome2.eclass # @MAINTAINER: # gn...@gentoo.org -# @SUPPORTED_EAPIS: 4 5 6 +# @SUPPORTED_EAPIS: 5 6 # @BLURB: Provides phases for Gnome/Gtk+ based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the @@ -20,7 +20,7 @@ GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} inherit eutils libtool ltprune gnome.org gnome2-utils xdg case "${EAPI:-0}" in - 4|5) + 5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; 6) @@ -29,13 +29,6 @@ case "${EAPI:-0}" in *) die "EAPI=${EAPI} is not supported" ;; esac -# @ECLASS-VARIABLE: DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# String containing documents passed to dodoc command for eapi4. -# In eapi5 we rely on einstalldocs (from eutils.eclass) and for newer EAPIs we -# follow PMS spec. - # @ECLASS-VARIABLE: ELTCONF # @DEFAULT_UNSET # @DESCRIPTION: @@ -48,7 +41,7 @@ ELTCONF=${ELTCONF:-""} # Extra configure opts passed to econf. # Deprecated, pass extra arguments to gnome2_src_configure. # Banned in eapi6 and newer. -if has ${EAPI:-0} 4 5; then +if has ${EAPI:-0} 5; then G2CONF=${G2CONF:-""} fi @@ -64,7 +57,7 @@ fi # # Banned since eapi6 as upstream is moving away from this obsolete macro in favor # of autoconf-archive macros, that do not expose this issue (bug #270919) -if has ${EAPI:-0} 4 5; then +if has ${EAPI:-0} 5; then if [[ ${GCONF_DEBUG} != "no" ]]; then IUSE="debug" fi @@ -77,23 +70,18 @@ fi # @ECLASS-VARIABLE: GNOME2_LA_PUNT # @DESCRIPTION: -# For eapi4 it sets if we should delete ALL or none of the .la files -# For eapi5 and newer it relies on prune_libtool_files (from eutils.eclass) +# It relies on prune_libtool_files (from ltprune.eclass) # for this. Available values for GNOME2_LA_PUNT: # - "no": will not clean any .la files # - "yes": will run prune_libtool_files --modules # - If it is not set, it will run prune_libtool_files -if has ${EAPI:-0} 4; then - GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} -else - GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} -fi +GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} # @FUNCTION: gnome2_src_unpack # @DESCRIPTION: # Stub function for old EAPI. gnome2_src_unpack() { - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then unpack ${A} cd "${S}" else @@ -115,7 +103,7 @@ gnome2_src_prepare() { # We stop to run it from eapi6 as scrollkeeper helpers from # rarian are not running anything and, then, access violations # shouldn't occur. - has ${EAPI:-0} 4 5 && gnome2_omf_fix + has ${EAPI:-0} 5 && gnome2_omf_fix # Disable all deprecation warnings gnome2_disable_deprecation_warning @@ -135,7 +123,7 @@ gnome2_src_prepare() { gnome2_src_configure() { # Deprecated for a long time now and banned since eapi6, see Gnome team policies if [[ -n ${G2CONF} ]] ; then - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" else die "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" @@ -144,7 +132,7 @@ gnome2_src_configure() { local g2conf=() - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then if [[ ${GCONF_DEBUG} != 'no' ]] ; then if use debug ; then g2conf+=( --enable-debug=yes ) @@ -164,11 +152,7 @@ gnome2_src_configure() { # rebuild docs. # Preserve old behavior for older EAPI. if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then - if has ${EAPI:-0} 4 && in_iuse doc ; then - g2conf+=( $(use_enable doc gtk-doc) ) - else - g2conf+=( --disable-gtk-doc ) - fi + g2conf+=( --disable-gtk-doc ) fi # Pass --disable-maintainer-mode when needed @@ -182,13 +166,6 @@ gnome2_src_configure() { g2conf+=( --disable-scrollkeeper ) fi - # Pass --disable-silent-rules when possible (not needed since eapi5), bug #429308 - if has ${EAPI:-0} 4; then - if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then - g2conf+=( --disable-silent-rules ) - fi - fi - # Pass --disable-schemas-install when possible if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then g2conf+=( --disable-schemas-install ) @@ -210,20 +187,20 @@ gnome2_src_configure() { fi # Pass --docdir with proper directory, bug #482646 (not needed since eapi6) - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then g2conf+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} ) fi fi # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then addwrite "$(unset HOME; echo ~)/.gnome2" else addpredict "$(unset HOME; echo ~)/.gnome2" fi - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then econf ${g2conf[@]} ${G2CONF} "$@" else econf ${g2conf[@]} "$@" @@ -234,7 +211,7 @@ gnome2_src_configure() { # @DESCRIPTION: # Only default src_compile for now gnome2_src_compile() { - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then emake else default @@ -255,7 +232,7 @@ gnome2_src_install() { # # if this is not present, scrollkeeper-update may segfault and # create bogus directories in /var/lib/ - if has ${EAPI:-0} 4 5; then + if has ${EAPI:-0} 5; then dodir "${sk_tmp_dir}" || die "dodir failed" emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" else @@ -267,12 +244,7 @@ gnome2_src_install() { # Handle documentation as 'default' for eapi5, bug #373131 # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING # files that are really common in gnome packages (bug #573390) - if has ${EAPI:-0} 4; then - # Manual document installation - if [[ -n "${DOCS}" ]]; then - dodoc ${DOCS} || die "dodoc failed" - fi - elif has ${EAPI:-0} 5; then + if has ${EAPI:-0} 5; then einstalldocs else local d @@ -293,21 +265,11 @@ gnome2_src_install() { rm -fr "${ED}/usr/share/applications/mimeinfo.cache" # Delete all .la files - if has ${EAPI:-0} 4; then - if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then - ebegin "Removing .la files" - if ! in_iuse static-libs || ! use static-libs ; then - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" - fi - eend - fi - else - case "${GNOME2_LA_PUNT}" in - yes) prune_libtool_files --modules;; - no) ;; - *) prune_libtool_files;; - esac - fi + case "${GNOME2_LA_PUNT}" in + yes) prune_libtool_files --modules;; + no) ;; + *) prune_libtool_files;; + esac } # @FUNCTION: gnome2_pkg_preinst -- 2.26.2