* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2018-02-16 16:12 Sobhan Mohammadpour
0 siblings, 0 replies; 94+ messages in thread
From: Sobhan Mohammadpour @ 2018-02-16 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 41c5d038737efab26380b3429a087d08331afc27
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 16:11:47 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 16:11:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=41c5d038
gnome-meson.eclass: remove gnome-meson_use function
eclass/gnome-meson.eclass | 7 -------
1 file changed, 7 deletions(-)
diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass
index 3f013a18..cd322b13 100644
--- a/eclass/gnome-meson.eclass
+++ b/eclass/gnome-meson.eclass
@@ -159,10 +159,3 @@ gnome-meson_pkg_postrm() {
gnome2_giomodule_cache_update
fi
}
-
-# @FUNTION: gnome-meson_use
-# @DESCRIPTION:
-# Make setting arguments easier taken from https://github.com/Heather/gentoo-gnome/blob/4f61803890da76026f4fed772c34c4394e1d2959/gnome-base/nautilus/nautilus-3.27.2.ebuild#L83
-gnome-meson_use() {
- echo "-Denable-${2:-${1}}=$(usex ${1} 'true' 'false')"
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2022-08-16 14:16 Matt Turner
0 siblings, 0 replies; 94+ messages in thread
From: Matt Turner @ 2022-08-16 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 90fadbe11f150e205bae326406f4f9552eb34203
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 14:14:20 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 14:14:20 2022 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=90fadbe1
gnome-meson.eclass: Remove
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
eclass/gnome-meson.eclass | 161 ----------------------------------------------
1 file changed, 161 deletions(-)
diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass
deleted file mode 100644
index cd322b13..00000000
--- a/eclass/gnome-meson.eclass
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: gnome-meson.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @BLURB: Provides phases for Gnome/Gtk+ based packages that use meosn.
-# @DESCRIPTION:
-# Exports portage base functions used by ebuilds written for packages using the
-# GNOME framework and meson. For additional functions, see gnome2-utils.eclass.
-
-inherit eutils gnome.org gnome2-utils meson xdg
-
-case "${EAPI:-0}" in
- 6)
- EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
- ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: GNOME-MESON_ECLASS_GIO_MODULES
-# @INTERNAL
-# @DESCRIPTION:
-# Array containing glib GIO modules
-
-# @FUNCTION: gnome-meson_src_prepare
-# @DESCRIPTION:
-# Prepare environment for build, fix build of scrollkeeper documentation,
-# run elibtoolize.
-gnome-meson_src_prepare() {
- # FIXME add gtk-doc stuff if needed
- xdg_src_prepare
-
- # Prevent assorted access violations and test failures
- gnome2_environment_reset
-}
-
-# @FUNCTION: gnome-meson_src_configure
-# @DESCRIPTION:
-# Gnome specific configure handling
-gnome-meson_src_configure() {
- # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
- addpredict "$(unset HOME; echo ~)/.gnome2"
-
- #FIXME are these valid/needed
- # "-Dgtk-doc=no"
- # "-Dmaintainer-mode=no"
- # "-Dschemas-install=no"
- # "-Dupdate-mimedb=no"
- # "-Dcompile-warnings=minimum"
- local emesonargs=(
- "$@"
- )
-
- meson_src_configure
-}
-
-# @FUNCTION: gnome-meson_src_compile
-# @DESCRIPTION:
-# Only default src_compile for now
-gnome-meson_src_compile() {
- meson_src_compile
-}
-
-# @FUNCTION: gnome-meson_src_install
-# @DESCRIPTION:
-# Gnome specific install. Handles typical GConf and scrollkeeper setup
-# in packages and removal of .la files if requested
-gnome-meson_src_install() {
- # install docs
- default
-
- # files that are really common in gnome packages (bug #573390)
- local d
- for d in HACKING MAINTAINERS; do
- [[ -s "${d}" ]] && dodoc "${d}"
- done
-
- # Make sure this one doesn't get in the portage db
- rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
-
- # Delete all .la files
- case "${GNOME2_LA_PUNT}" in
- yes) prune_libtool_files --modules;;
- no) ;;
- *) prune_libtool_files;;
- esac
-
- meson_src_install
-}
-
-# @FUNCTION: gnome-meson_pkg_preinst
-# @DESCRIPTION:
-# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
-gnome-meson_pkg_preinst() {
- xdg_pkg_preinst
- gnome2_gconf_savelist
- gnome2_icon_savelist
- gnome2_schemas_savelist
- gnome2_scrollkeeper_savelist
- gnome2_gdk_pixbuf_savelist
-
- local f
-
- GNOME2_ECLASS_GIO_MODULES=()
- while IFS= read -r -d '' f; do
- GNOME2_ECLASS_GIO_MODULES+=( ${f} )
- done < <(cd "${D}" && find usr/$(get_libdir)/gio/modules -type f -print0 2>/dev/null)
-
- export GNOME2_ECLASS_GIO_MODULES
-}
-
-# @FUNCTION: gnome-meson_pkg_postinst
-# @DESCRIPTION:
-# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
-# database updates.
-gnome-meson_pkg_postinst() {
- xdg_pkg_postinst
- gnome2_gconf_install
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
- gnome2_icon_cache_update
- fi
- if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
- gnome2_schemas_update
- fi
- gnome2_scrollkeeper_update
- gnome2_gdk_pixbuf_update
-
- if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
- gnome2_giomodule_cache_update
- fi
-
- # This should only be in the overlay
- ewarn "**************************************************************"
- ewarn "This is the *experimental* Gentoo GNOME Overlay"
- ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
- ewarn "Do NOT go to upstream with bugs without checking with us first"
- ewarn "**************************************************************"
-}
-
-# # FIXME Handle GConf schemas removal
-#gnome2_pkg_prerm() {
-# gnome2_gconf_uninstall
-#}
-
-# @FUNCTION: gnome-meson_pkg_postrm
-# @DESCRIPTION:
-# GSettings, Icons, desktop and mime database updates.
-gnome-meson_pkg_postrm() {
- xdg_pkg_postrm
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
- gnome2_icon_cache_update
- fi
- if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
- gnome2_schemas_update
- fi
-
- if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
- gnome2_giomodule_cache_update
- fi
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2021-01-30 20:02 Mart Raudsepp
0 siblings, 0 replies; 94+ messages in thread
From: Mart Raudsepp @ 2021-01-30 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 84a2c5b69f7447c8f5cb3001c6549420764d10ea
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 19:58:28 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 20:02:41 2021 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=84a2c5b6
eclass: Drop various unnecessary or redundant main tree copies
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
eclass/gnome2-python.eclass | 53 -----
eclass/gnome2-utils.eclass | 522 --------------------------------------------
eclass/multibuild.eclass | 282 ------------------------
3 files changed, 857 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
deleted file mode 100644
index a16e931e..00000000
--- a/eclass/gnome2-python.eclass
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: gnome2-python.eclass
-# @MAINTAINER:
-# Gentoo GNOME Project <gnome@gentoo.org>
-# Gentoo Python Project <python@gentoo.org>
-# @BLURB: Eclass for GNOME Python packages supporting installation for multiple Python ABIs
-# @DESCRIPTION:
-# The gnome2-python eclass defines phase functions for GNOME Python packages supporting
-# installation for multiple Python ABIs.
-
-inherit gnome2 python
-
-# Stolen from git.eclass
-EXPORTED_FUNCTIONS="pkg_setup src_compile src_test src_install"
-case "${EAPI:-0}" in
- 2|3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
- 0|1) ;;
- *) die "Unknown EAPI, bug eclass maintainers." ;;
-esac
-
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-gnome2-python_pkg_setup() {
- python_pkg_setup
-}
-
-gnome2-python_src_prepare() {
- gnome2_src_prepare
- python_clean_py-compile_files
- python_copy_sources
-}
-
-gnome2-python_src_configure() {
- configure() {
- gnome2_src_configure PYTHON=$(PYTHON -a) "$@"
- }
- python_execute_function -s configure
-}
-
-gnome2-python_src_compile() {
- python_execute_function -s gnome2_src_compile "$@"
-}
-
-gnome2-python_src_test() {
- python_execute_function -s -d
-}
-
-gnome2-python_src_install() {
- python_execute_function -s gnome2_src_install
- python_clean_installation_image
-}
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
deleted file mode 100644
index 9b4296c1..00000000
--- a/eclass/gnome2-utils.eclass
+++ /dev/null
@@ -1,522 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: gnome2-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @BLURB: Auxiliary functions commonly used by Gnome packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most Gnome
-# packages. It may be used by non-Gnome packages as needed for handling various
-# Gnome stack related functions such as:
-# * Gtk+ icon cache management
-# * GSettings schemas management
-# * GConf schemas management
-# * scrollkeeper (old Gnome help system) management
-
-[[ ${EAPI:-0} == [012345] ]] && inherit multilib
-inherit eutils xdg-utils
-
-case "${EAPI:-0}" in
- 0|1|2|3|4|5|6) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: GCONFTOOL_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gconftool-2
-: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
-
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
-
-# @ECLASS-VARIABLE: GTK_UPDATE_ICON_CACHE
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gtk-update-icon-cache
-: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
-
-# @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS
-# @INTERNAL
-# @DESCRIPTION:
-# Path to glib-compile-schemas
-: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GConf schemas provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_ICONS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of icons provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_SCROLLS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of scrolls (documentation files) provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_GLIB_SCHEMAS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of GSettings schemas provided by the package
-
-# @ECLASS-VARIABLE: GNOME2_ECLASS_GDK_PIXBUF_LOADERS
-# @INTERNAL
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# List of gdk-pixbuf loaders provided by the package
-
-DEPEND=">=sys-apps/sed-4"
-
-
-# @FUNCTION: gnome2_environment_reset
-# @DESCRIPTION:
-# Reset various variables inherited from root's evironment to a reasonable
-# default for ebuilds to help avoid access violations and test failures.
-gnome2_environment_reset() {
- xdg_environment_reset
-
- # Respected by >=glib-2.30.1-r1
- export G_HOME="${T}"
-
- # GST_REGISTRY is to work around gst utilities trying to read/write /root
- export GST_REGISTRY="${T}/registry.xml"
-
- # Ensure we don't rely on dconf/gconf while building, bug #511946
- export GSETTINGS_BACKEND="memory"
-
- if has ${EAPI:-0} 6; then
- # Try to cover the packages honoring this variable, bug #508124
- export GST_INSPECT="$(type -P true)"
-
- # Stop relying on random DISPLAY variable values, bug #534312
- unset DISPLAY
- fi
-}
-
-# @FUNCTION: gnome2_gconf_savelist
-# @DESCRIPTION:
-# Find the GConf schemas that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCHEMAS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_gconf_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
- export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
- popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_gconf_install
-# @DESCRIPTION:
-# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2.
-# This function should be called from pkg_postinst.
-gnome2_gconf_install() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GCONFTOOL_BIN}"
-
- if [[ ! -x "${updater}" ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- debug-print "No GNOME 2 GConf schemas found"
- return
- fi
-
- # We are ready to install the GCONF Scheme now
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
- einfo "Installing GNOME 2 GConf schemas"
-
- local F
- for F in ${GNOME2_ECLASS_SCHEMAS}; do
- if [[ -e "${EROOT}${F}" ]]; then
- debug-print "Installing schema: ${F}"
- "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
- fi
- done
-
- # have gconf reload the new schemas
- pids=$(pgrep -x gconfd-2)
- if [[ $? == 0 ]] ; then
- ebegin "Reloading GConf schemas"
- kill -HUP ${pids}
- eend $?
- fi
-}
-
-# @FUNCTION: gnome2_gconf_uninstall
-# @DESCRIPTION:
-# Removes schema files previously installed by the current ebuild from Gconf's
-# database.
-gnome2_gconf_uninstall() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GCONFTOOL_BIN}"
-
- if [[ ! -x "${updater}" ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- debug-print "No GNOME 2 GConf schemas found"
- return
- fi
-
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
-
- einfo "Uninstalling GNOME 2 GConf schemas"
-
- local F
- for F in ${GNOME2_ECLASS_SCHEMAS}; do
- if [[ -e "${EROOT}${F}" ]]; then
- debug-print "Uninstalling gconf schema: ${F}"
- "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
- fi
- done
-
- # have gconf reload the new schemas
- pids=$(pgrep -x gconfd-2)
- if [[ $? == 0 ]] ; then
- ebegin "Reloading GConf schemas"
- kill -HUP ${pids}
- eend $?
- fi
-}
-
-# @FUNCTION: gnome2_icon_savelist
-# @DESCRIPTION:
-# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_icon_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_icon_cache_update
-# @DESCRIPTION:
-# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
-# have installed anything under that location.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_icon_cache_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
-
- if [[ ! -x "${updater}" ]] ; then
- debug-print "${updater} is not executable"
- return
- fi
-
- ebegin "Updating icons cache"
-
- local retval=0
- local fails=( )
-
- for dir in "${EROOT%/}"/usr/share/icons/*
- do
- if [[ -f "${dir}/index.theme" ]] ; then
- local rv=0
-
- "${updater}" -qf "${dir}"
- rv=$?
-
- if [[ ! $rv -eq 0 ]] ; then
- debug-print "Updating cache failed on ${dir}"
-
- # Add to the list of failures
- fails+=( "${dir}" )
-
- retval=2
- fi
- elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
- # Clear stale cache files after theme uninstallation
- rm "${dir}/icon-theme.cache"
- fi
-
- if [[ -z $(ls "${dir}") ]]; then
- # Clear empty theme directories after theme uninstallation
- rmdir "${dir}"
- fi
- done
-
- eend ${retval}
-
- for f in "${fails[@]}" ; do
- eerror "Failed to update cache with icon $f"
- done
-}
-
-# @FUNCTION: gnome2_omf_fix
-# @DESCRIPTION:
-# Workaround applied to Makefile rules in order to remove redundant
-# calls to scrollkeeper-update and sandbox violations.
-# This function should be called from src_prepare.
-gnome2_omf_fix() {
- local omf_makefiles filename
-
- omf_makefiles="$@"
-
- if [[ -f ${S}/omf.make ]] ; then
- omf_makefiles="${omf_makefiles} ${S}/omf.make"
- fi
-
- if [[ -f ${S}/gnome-doc-utils.make ]] ; then
- omf_makefiles="${omf_makefiles} ${S}/gnome-doc-utils.make"
- fi
-
- # testing fixing of all makefiles found
- # The sort is important to ensure .am is listed before the respective .in for
- # maintainer mode regeneration not kicking in due to .am being newer than .in
- for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
- omf_makefiles="${omf_makefiles} ${filename}"
- done
-
- ebegin "Fixing OMF Makefiles"
-
- local retval=0
- local fails=( )
-
- for omf in ${omf_makefiles} ; do
- sed -i -e 's:scrollkeeper-update:true:' "${omf}"
- retval=$?
-
- if [[ $retval -ne 0 ]] ; then
- debug-print "updating of ${omf} failed"
-
- # Add to the list of failures
- fails[$(( ${#fails[@]} + 1 ))]=$omf
-
- retval=2
- fi
- done
-
- eend $retval
-
- for f in "${fails[@]}" ; do
- eerror "Failed to update OMF Makefile $f"
- done
-}
-
-# @FUNCTION: gnome2_scrollkeeper_savelist
-# @DESCRIPTION:
-# Find the scrolls that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCROLLS environment variable.
-# This function should be called from pkg_preinst.
-gnome2_scrollkeeper_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
- export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
- popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_scrollkeeper_update
-# @DESCRIPTION:
-# Updates the global scrollkeeper database.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_scrollkeeper_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${SCROLLKEEPER_UPDATE_BIN}"
-
- if [[ ! -x "${updater}" ]] ; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
- debug-print "No scroll cache to update"
- return
- fi
-
- ebegin "Updating scrollkeeper database ..."
- "${updater}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
- eend $?
-}
-
-# @FUNCTION: gnome2_schemas_savelist
-# @DESCRIPTION:
-# Find if there is any GSettings schema to install and save the list in
-# GNOME2_ECLASS_GLIB_SCHEMAS variable.
-# This function should be called from pkg_preinst.
-gnome2_schemas_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
- export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
- popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_schemas_update
-# @USAGE: gnome2_schemas_update
-# @DESCRIPTION:
-# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_schemas_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-
- if [[ ! -x ${updater} ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- ebegin "Updating GSettings schemas"
- ${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
- eend $?
-}
-
-# @FUNCTION: gnome2_gdk_pixbuf_savelist
-# @DESCRIPTION:
-# Find if there is any gdk-pixbuf loader to install and save the list in
-# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable.
-# This function should be called from pkg_preinst.
-gnome2_gdk_pixbuf_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
- export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
- popd > /dev/null || die
-}
-
-# @FUNCTION: gnome2_gdk_pixbuf_update
-# @USAGE: gnome2_gdk_pixbuf_update
-# @DESCRIPTION:
-# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_gdk_pixbuf_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
-
- if [[ ! -x ${updater} ]]; then
- updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders"
- fi
-
- if [[ ! -x ${updater} ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
- debug-print "gdk-pixbuf loader cache does not need an update"
- return
- fi
-
- ebegin "Updating gdk-pixbuf loader cache"
- local tmp_file=$(emktemp)
- ${updater} 1> "${tmp_file}" &&
- chmod 0644 "${tmp_file}" &&
- cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
- rm "${tmp_file}" # don't replace this with mv, required for SELinux support
- eend $?
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk2
-# @USAGE: gnome2_query_immodules_gtk2
-# @DESCRIPTION:
-# Updates gtk2 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk2() {
- local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
- [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
-
- ebegin "Updating gtk2 input method module cache"
- GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
- "${updater}" --update-cache
- eend $?
-}
-
-# @FUNCTION: gnome2_query_immodules_gtk3
-# @USAGE: gnome2_query_immodules_gtk3
-# @DESCRIPTION:
-# Updates gtk3 immodules/gdk-pixbuf loaders listing.
-gnome2_query_immodules_gtk3() {
- local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
- [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
-
- ebegin "Updating gtk3 input method module cache"
- GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
- "${updater}" --update-cache
- eend $?
-}
-
-# @FUNCTION: gnome2_giomodule_cache_update
-# @USAGE: gnome2_giomodule_cache_update
-# @DESCRIPTION:
-# Updates glib's gio modules cache.
-# This function should be called from pkg_postinst and pkg_postrm.
-gnome2_giomodule_cache_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}/usr/bin/${CHOST}-gio-querymodules"
-
- if [[ ! -x ${updater} ]]; then
- updater="${EROOT}/usr/bin/gio-querymodules"
- fi
-
- if [[ ! -x ${updater} ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- ebegin "Updating GIO modules cache"
- ${updater} "${EROOT%/}"/usr/$(get_libdir)/gio/modules
- eend $?
-}
-
-# @FUNCTION: gnome2_disable_deprecation_warning
-# @DESCRIPTION:
-# Disable deprecation warnings commonly found in glib based packages.
-# Should be called from src_prepare.
-gnome2_disable_deprecation_warning() {
- local retval=0
- local fails=( )
- local makefile
-
- ebegin "Disabling deprecation warnings"
- # The sort is important to ensure .am is listed before the respective .in for
- # maintainer mode regeneration not kicking in due to .am being newer than .in
- while read makefile ; do
- if ! grep -qE "(DISABLE_DEPRECATED|GSEAL_ENABLE)" "${makefile}"; then
- continue
- fi
-
- LC_ALL=C sed -r -i \
- -e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(/bin/true):g' \
- -e 's:-DGSEAL_ENABLE(=[A-Za-z0-9_]*)?:$(/bin/true):g' \
- -i "${makefile}"
-
- if [[ $? -ne 0 ]]; then
- # Add to the list of failures
- fails+=( "${makefile}" )
- retval=2
- fi
- done < <(find "${S}" -name "Makefile.in" \
- -o -name "Makefile.am" -o -name "Makefile.decl" \
- | sort; [[ -f "${S}"/configure ]] && echo configure)
-# TODO: sedding configure.ac can trigger maintainer mode; bug #439602
-# -o -name "configure.ac" -o -name "configure.in" \
-# | sort; echo configure)
- eend ${retval}
-
- for makefile in "${fails[@]}" ; do
- ewarn "Failed to disable deprecation warnings in ${makefile}"
- done
-}
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
deleted file mode 100644
index c29f4d89..00000000
--- a/eclass/multibuild.eclass
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: multibuild.eclass
-# @MAINTAINER:
-# Michał Górny <mgorny@gentoo.org>
-# @AUTHOR:
-# Author: Michał Górny <mgorny@gentoo.org>
-# @BLURB: A generic eclass for building multiple variants of packages.
-# @DESCRIPTION:
-# The multibuild eclass aims to provide a generic framework for building
-# multiple 'variants' of a package (e.g. multilib, Python
-# implementations).
-
-case "${EAPI:-0}" in
- 0|1|2|3)
- die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
- ;;
- 4|5|6)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
-esac
-
-if [[ ! ${_MULTIBUILD} ]]; then
-
-# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
-# @DESCRIPTION:
-# An array specifying all enabled variants which multibuild_foreach*
-# can execute the process for.
-#
-# In ebuild, it can be set in global scope. Eclasses should set it
-# locally in function scope to support nesting properly.
-#
-# Example:
-# @CODE
-# python_foreach_impl() {
-# local MULTIBUILD_VARIANTS=( python{2_5,2_6,2_7} ... )
-# multibuild_foreach_variant python_compile
-# }
-# @CODE
-
-# @ECLASS-VARIABLE: MULTIBUILD_VARIANT
-# @DESCRIPTION:
-# The current variant which the function was executed for.
-#
-# If nested multibuilds are used, this value can be an array. In that
-# case, the first element will name the deepest multibuild, and the next
-# elements will go outwards.
-#
-# Example value:
-# @CODE
-# python2_6
-# @CODE
-
-# @ECLASS-VARIABLE: MULTIBUILD_ID
-# @DESCRIPTION:
-# The unique identifier for a multibuild run. In a simple run, it is
-# equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it
-# contains the complete selection tree.
-#
-# It can be used to create variant-unique directories and files.
-#
-# If nested multibuilds are used, this value can be an array. In that
-# case, the first element will name the deepest multibuild, and the next
-# elements will go outwards.
-#
-# Example value:
-# @CODE
-# amd64-double
-# @CODE
-
-# @ECLASS-VARIABLE: BUILD_DIR
-# @DESCRIPTION:
-# The current build directory. In global scope, it is supposed
-# to contain an 'initial' build directory. If unset, ${S} is used.
-#
-# multibuild_foreach_variant() sets BUILD_DIR locally
-# to variant-specific build directories based on the initial value
-# of BUILD_DIR.
-#
-# If nested multibuilds are used, this value can be an array. In that
-# case, the first element will name the deepest multibuild, and the next
-# elements will go outwards.
-#
-# Example value:
-# @CODE
-# ${WORKDIR}/foo-1.3-python2_6
-# @CODE
-
-# @FUNCTION: multibuild_foreach_variant
-# @USAGE: [<argv>...]
-# @DESCRIPTION:
-# Run the passed command repeatedly for each of the enabled package
-# variants.
-#
-# Each of the runs will have variant-specific BUILD_DIR set, and output
-# teed to a separate log in ${T}.
-#
-# The function returns 0 if all commands return 0, or the first non-zero
-# exit status otherwise. However, it performs all the invocations
-# nevertheless. It is preferred to call 'die' inside of the passed
-# function.
-multibuild_foreach_variant() {
- debug-print-function ${FUNCNAME} "${@}"
-
- [[ ${MULTIBUILD_VARIANTS} ]] \
- || die "MULTIBUILD_VARIANTS need to be set"
-
- local bdir=${BUILD_DIR:-${S}}
-
- # Avoid writing outside WORKDIR if S=${WORKDIR}.
- [[ ${bdir%%/} == ${WORKDIR%%/} ]] && bdir=${WORKDIR}/build
-
- local prev_id=${MULTIBUILD_ID:+${MULTIBUILD_ID}-}
- local ret=0 lret=0 v
-
- debug-print "${FUNCNAME}: initial build_dir = ${bdir}"
-
- for v in "${MULTIBUILD_VARIANTS[@]}"; do
- local MULTIBUILD_VARIANT=( "${v}" "${MULTIBUILD_VARIANT[@]}" )
- local MULTIBUILD_ID=( "${prev_id}${v}" "${MULTIBUILD_ID[@]}" )
- local BUILD_DIR=( "${bdir%%/}-${v}" "${BUILD_DIR[@]}" )
-
- _multibuild_run() {
- # find the first non-private command
- local i=1
- while [[ ${!i} == _* ]]; do
- (( i += 1 ))
- done
-
- [[ ${i} -le ${#} ]] && einfo "${v}: running ${@:${i}}"
- "${@}"
- }
-
- _multibuild_run "${@}" \
- > >(exec tee -a "${T}/build-${MULTIBUILD_ID}.log") 2>&1
- lret=${?}
- done
- [[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
-
- return ${ret}
-}
-
-# @FUNCTION: multibuild_parallel_foreach_variant
-# @USAGE: [<argv>...]
-# @DESCRIPTION:
-# Run the passed command repeatedly for each of the enabled package
-# variants. This used to run the commands in parallel but now it's
-# just a deprecated alias to multibuild_foreach_variant.
-#
-# The function returns 0 if all commands return 0, or the first non-zero
-# exit status otherwise. However, it performs all the invocations
-# nevertheless. It is preferred to call 'die' inside of the passed
-# function.
-multibuild_parallel_foreach_variant() {
- debug-print-function ${FUNCNAME} "${@}"
-
- [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
-
- multibuild_foreach_variant "${@}"
-}
-
-# @FUNCTION: multibuild_for_best_variant
-# @USAGE: [<argv>...]
-# @DESCRIPTION:
-# Run the passed command once, for the best of the enabled package
-# variants.
-#
-# The run will have a proper, variant-specificBUILD_DIR set, and output
-# teed to a separate log in ${T}.
-#
-# The function returns command exit status.
-multibuild_for_best_variant() {
- debug-print-function ${FUNCNAME} "${@}"
-
- [[ ${MULTIBUILD_VARIANTS} ]] \
- || die "MULTIBUILD_VARIANTS need to be set"
-
- # bash-4.1 can't handle negative subscripts
- local MULTIBUILD_VARIANTS=(
- "${MULTIBUILD_VARIANTS[$(( ${#MULTIBUILD_VARIANTS[@]} - 1 ))]}"
- )
- multibuild_foreach_variant "${@}"
-}
-
-# @FUNCTION: multibuild_copy_sources
-# @DESCRIPTION:
-# Create per-variant copies of source tree. The source tree is assumed
-# to be in ${BUILD_DIR}, or ${S} if the former is unset. The copies will
-# be placed in directories matching BUILD_DIRs used by
-# multibuild_foreach().
-multibuild_copy_sources() {
- debug-print-function ${FUNCNAME} "${@}"
-
- local _MULTIBUILD_INITIAL_BUILD_DIR=${BUILD_DIR:-${S}}
-
- einfo "Will copy sources from ${_MULTIBUILD_INITIAL_BUILD_DIR}"
-
- local cp_args=()
- if cp --reflink=auto --version &>/dev/null; then
- # enable reflinking if possible to make this faster
- cp_args+=( --reflink=auto )
- fi
-
- _multibuild_create_source_copy() {
- einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
- cp -p -R "${cp_args[@]}" \
- "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
- }
-
- multibuild_foreach_variant _multibuild_create_source_copy
-}
-
-# @FUNCTION: run_in_build_dir
-# @USAGE: <argv>...
-# @DESCRIPTION:
-# Run the given command in the directory pointed by BUILD_DIR.
-run_in_build_dir() {
- debug-print-function ${FUNCNAME} "${@}"
- local ret
-
- [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
- [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
-
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- "${@}"
- ret=${?}
- popd >/dev/null || die
-
- return ${ret}
-}
-
-# @FUNCTION: multibuild_merge_root
-# @USAGE: <src-root> <dest-root>
-# @DESCRIPTION:
-# Merge the directory tree (fake root) from <src-root> to <dest-root>
-# (the real root). Both directories have to be real, absolute paths
-# (i.e. including ${D}). Source root will be removed.
-multibuild_merge_root() {
- local src=${1}
- local dest=${2}
-
- local ret
-
- if use userland_BSD; then
- # Most of BSD variants fail to copy broken symlinks, #447370
- # also, they do not support --version
-
- tar -C "${src}" -f - -c . \
- | tar -x -f - -C "${dest}"
- [[ ${PIPESTATUS[*]} == '0 0' ]]
- ret=${?}
- else
- local cp_args=()
-
- if cp -a --version &>/dev/null; then
- cp_args+=( -a )
- else
- cp_args+=( -P -R -p )
- fi
-
- if cp --reflink=auto --version &>/dev/null; then
- # enable reflinking if possible to make this faster
- cp_args+=( --reflink=auto )
- fi
-
- cp "${cp_args[@]}" "${src}"/. "${dest}"/
- ret=${?}
- fi
-
- if [[ ${ret} -ne 0 ]]; then
- die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed."
- fi
-
- rm -rf "${src}"
-}
-
-_MULTIBUILD=1
-fi
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2021-01-30 20:02 Mart Raudsepp
0 siblings, 0 replies; 94+ messages in thread
From: Mart Raudsepp @ 2021-01-30 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 9a3e97683af38a7b9242a3a66e13a88cfbd8ac46
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 20:00:25 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 20:02:41 2021 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a3e9768
gnome2.eclass: sync with main repository
Just a copy with the ewarn about experimental overlay kept for now
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
eclass/gnome2.eclass | 104 ++++++++++++++++-----------------------------------
1 file changed, 33 insertions(+), 71 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 2cc54393..3d745c01 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: gnome2.eclass
# @MAINTAINER:
# gnome@gentoo.org
+# @SUPPORTED_EAPIS: 5 6 7
# @BLURB: Provides phases for Gnome/Gtk+ based packages.
# @DESCRIPTION:
# Exports portage base functions used by ebuilds written for packages using the
@@ -16,25 +17,19 @@
GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""}
[[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools
-inherit eutils libtool gnome.org gnome2-utils xdg
+[[ ${EAPI} == [56] ]] && inherit eutils ltprune
+inherit libtool gnome.org gnome2-utils xdg
-case "${EAPI:-0}" in
- 4|5)
+case ${EAPI:-0} in
+ 5)
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
- 6)
+ 6|7)
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
*) 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:
@@ -47,7 +42,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} 5; then
G2CONF=${G2CONF:-""}
fi
@@ -63,7 +58,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} 5; then
if [[ ${GCONF_DEBUG} != "no" ]]; then
IUSE="debug"
fi
@@ -76,27 +71,22 @@ 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)
-# for this. Available values for GNOME2_LA_PUNT:
+# In EAPIs 5 and 6, it relies on prune_libtool_files (from ltprune.eclass) for
+# this. Later EAPIs use find ... -delete. 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} 5; then
unpack ${A}
cd "${S}"
else
- die "gnome2_src_unpack is banned from eapi6"
+ die "gnome2_src_unpack is banned since eapi6"
fi
}
@@ -114,7 +104,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} 5 && gnome2_omf_fix
# Disable all deprecation warnings
gnome2_disable_deprecation_warning
@@ -134,7 +124,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} 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"
@@ -143,7 +133,7 @@ gnome2_src_configure() {
local g2conf=()
- if has ${EAPI:-0} 4 5; then
+ if has ${EAPI} 5; then
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then
g2conf+=( --enable-debug=yes )
@@ -155,19 +145,14 @@ gnome2_src_configure() {
fi
fi
- # Starting with EAPI=5, we consider packages installing gtk-doc to be
- # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to
- # relink URLs in documentation to already installed documentation.
- # This decision also greatly helps with constantly broken doc generation.
+ # We consider packages installing gtk-doc to be handled by adding
+ # DEPEND="dev-util/gtk-doc-am" which provides tools to relink URLs in
+ # documentation to already installed documentation. This decision also
+ # greatly helps with constantly broken doc generation.
# Remember to drop 'doc' USE flag from your package if it was only used to
# 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
@@ -181,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 )
@@ -209,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} 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} 5; then
addwrite "$(unset HOME; echo ~)/.gnome2"
else
addpredict "$(unset HOME; echo ~)/.gnome2"
fi
- if has ${EAPI:-0} 4 5; then
+ if has ${EAPI} 5; then
econf ${g2conf[@]} ${G2CONF} "$@"
else
econf ${g2conf[@]} "$@"
@@ -233,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} 5; then
emake
else
default
@@ -254,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} 5; then
dodir "${sk_tmp_dir}" || die "dodir failed"
emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
else
@@ -266,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} 5; then
einstalldocs
else
local d
@@ -292,20 +265,16 @@ 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 ! use_if_iuse static-libs ; then
- find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
- fi
- eend
- fi
- else
+ if has ${EAPI} 5 6; then
case "${GNOME2_LA_PUNT}" in
yes) prune_libtool_files --modules;;
no) ;;
*) prune_libtool_files;;
esac
+ else
+ if [[ ${GNOME2_LA_PUNT} != 'no' ]]; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
fi
}
@@ -315,7 +284,6 @@ gnome2_src_install() {
gnome2_pkg_preinst() {
xdg_pkg_preinst
gnome2_gconf_savelist
- gnome2_icon_savelist
gnome2_schemas_savelist
gnome2_scrollkeeper_savelist
gnome2_gdk_pixbuf_savelist
@@ -337,9 +305,6 @@ gnome2_pkg_preinst() {
gnome2_pkg_postinst() {
xdg_pkg_postinst
gnome2_gconf_install
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
- gnome2_icon_cache_update
- fi
if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
gnome2_schemas_update
fi
@@ -368,9 +333,6 @@ gnome2_pkg_postinst() {
# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
gnome2_pkg_postrm() {
xdg_pkg_postrm
- if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
- gnome2_icon_cache_update
- fi
if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
gnome2_schemas_update
fi
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2019-02-24 8:40 Mart Raudsepp
0 siblings, 0 replies; 94+ messages in thread
From: Mart Raudsepp @ 2019-02-24 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 0c5ffc8bc9d1816b6a6880e112a664faddcd3cce
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 08:39:57 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 08:39:57 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0c5ffc8b
gnome2-live.eclass: Update repo URI to gitlab
Closes: https://bugs.gentoo.org/678106
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
eclass/gnome2-live.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 4140e27c..80a72852 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -50,7 +50,7 @@ ELTCONF=${ELTCONF:-}
# @ECLASS-VARIABLE: EGIT_REPO_URI
# @DESCRIPTION:
# git URI for the project, uses GNOME_LIVE_MODULE by default
-: "${EGIT_REPO_URI:="git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
+: "${EGIT_REPO_URI:="https://gitlab.gnome.org/GNOME/${GNOME_LIVE_MODULE}.git"}"
# @ECLASS-VARIABLE: PATCHES
# @DESCRIPTION:
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2019-02-23 20:37 Mart Raudsepp
0 siblings, 0 replies; 94+ messages in thread
From: Mart Raudsepp @ 2019-02-23 20:37 UTC (permalink / raw
To: gentoo-commits
commit: d11d461899b51fd681deac780ff7d50b0f636e69
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 23 20:10:47 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 23 20:10:47 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d11d4618
vala.eclass: remove outdated eclass
Main tree version supports newer than 0.36 vala too, plus other
changes needed for supporting 0.40+ vala.
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
eclass/vala.eclass | 148 -----------------------------------------------------
1 file changed, 148 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
deleted file mode 100644
index f8c4319c..00000000
--- a/eclass/vala.eclass
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: vala.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @AUTHOR:
-# Alexandre Rostovtsev <tetromino@gentoo.org>
-# @BLURB: Sets up the environment for using a specific version of vala.
-# @DESCRIPTION:
-# This eclass sets up commonly used environment variables for using a specific
-# version of dev-lang/vala to configure and build a package. It is needed for
-# packages whose build systems assume the existence of certain unversioned vala
-# executables, pkgconfig files, etc., which Gentoo does not provide.
-#
-# This eclass provides one phase function: src_prepare.
-
-inherit eutils multilib
-
-case "${EAPI:-0}" in
- 0) die "EAPI=0 is not supported" ;;
- 1) ;;
- *) EXPORT_FUNCTIONS src_prepare ;;
-esac
-
-# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
-# @DESCRIPTION:
-# Minimum vala API version (e.g. 0.32).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.32}
-
-# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
-# @DESCRIPTION:
-# Maximum vala API version (e.g. 0.32).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.38}
-
-# @ECLASS-VARIABLE: VALA_USE_DEPEND
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# USE dependencies that vala must be built with (e.g. vapigen).
-
-# @FUNCTION: vala_api_versions
-# @DESCRIPTION:
-# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
-# VALA_MIN_API_VERSION.
-vala_api_versions() {
- [[ ${VALA_MIN_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MIN_API_VERSION"
- [[ ${VALA_MAX_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MAX_API_VERSION"
-
- local minimal_supported_minor_version minor_version
-
- # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
- minimal_supported_minor_version="32"
-
- for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
- if ((minor_version >= minimal_supported_minor_version)); then
- echo "0.${minor_version}"
- fi
- done
-}
-
-# @FUNCTION: vala_depend
-# @DESCRIPTION:
-# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to
-# VALA_MIN_API_VERSION
-vala_depend() {
- local u v versions=$(vala_api_versions)
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
-
- echo -n "|| ("
- for v in ${versions}; do
- echo -n " dev-lang/vala:${v}${u}"
- done
- echo " )"
-}
-
-# @FUNCTION: vala_best_api_version
-# @DESCRIPTION:
-# Returns the highest installed vala API version satisfying
-# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
-vala_best_api_version() {
- local u v
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
- for v in $(vala_api_versions); do
- has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
- done
-}
-
-# @FUNCTION: vala_src_prepare
-# @USAGE: [--ignore-use] [--vala-api-version api_version]
-# @DESCRIPTION:
-# Sets up the environment variables and pkgconfig files for the
-# specified API version, or, if no version is specified, for the
-# highest installed vala API version satisfying
-# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
-# Is a no-op if called without --ignore-use when USE=-vala.
-# Dies if the USE check is passed (or ignored) and a suitable vala
-# version is not available.
-vala_src_prepare() {
- local p d valafoo version ignore_use
-
- while [[ $1 ]]; do
- case $1 in
- "--ignore-use" )
- ignore_use=1 ;;
- "--vala-api-version" )
- shift
- version=$1
- [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter."
- esac
- shift
- done
-
- if [[ -z ${ignore_use} ]]; then
- in_iuse vala && ! use vala && return 0
- fi
-
- if [[ ${version} ]]; then
- has_version "dev-lang/vala:${version}" || die "No installed vala:${version}"
- else
- version=$(vala_best_api_version)
- [[ ${version} ]] || die "No installed vala in $(vala_depend)"
- fi
-
- export VALAC=$(type -P valac-${version})
-
- valafoo=$(type -P vala-gen-introspect-${version})
- [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT="${valafoo}"
-
- valafoo=$(type -P vapigen-${version})
- [[ ${valafoo} ]] && export VAPIGEN="${valafoo}"
-
- valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen"
- [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}"
-
- export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi"
-
- mkdir -p "${T}/pkgconfig" || die "mkdir failed"
- for p in libvala vapigen; do
- for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do
- if [[ -e ${d}/${p}-${version}.pc ]]; then
- ln -s "${d}/${p}-${version}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed"
- break
- fi
- done
- done
- : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}
- export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}"
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2018-02-01 10:37 Sobhan Mohammadpour
0 siblings, 0 replies; 94+ messages in thread
From: Sobhan Mohammadpour @ 2018-02-01 10:37 UTC (permalink / raw
To: gentoo-commits
commit: e19dbf35e56e689ca97593372e6244681e31f511
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 1 10:17:10 2018 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 1 10:17:10 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e19dbf35
vala.eclass: increase VALA_MAX_API_VERSION to 0.38
eclass/vala.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index f8a45cde..f8c4319c 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -31,7 +31,7 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.32}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
# Maximum vala API version (e.g. 0.32).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.36}
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.38}
# @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2018-01-29 7:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2018-01-29 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 308fde12eadda2a65ce732960577e46c65f77849
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 07:40:27 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 07:41:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=308fde12
eclass: sync vala.eclass with gentoo repository
eclass/vala.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index f2243dd1..f8a45cde 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -25,13 +25,13 @@ esac
# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
# @DESCRIPTION:
-# Minimum vala API version (e.g. 0.26).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.26}
+# Minimum vala API version (e.g. 0.32).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.32}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
# Maximum vala API version (e.g. 0.32).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.32}
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.36}
# @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET
@@ -49,7 +49,7 @@ vala_api_versions() {
local minimal_supported_minor_version minor_version
# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
- minimal_supported_minor_version="26"
+ minimal_supported_minor_version="32"
for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
if ((minor_version >= minimal_supported_minor_version)); then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2018-01-29 7:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2018-01-29 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 252e03bdf22002317e64e6882567ff2dd6051ed9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 07:38:41 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 07:41:03 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=252e03bd
eclass: drop $Id$ header
eclass/gnome2-live.eclass | 3 ---
eclass/gnome2-python.eclass | 1 -
eclass/multibuild.eclass | 1 -
eclass/vala.eclass | 1 -
4 files changed, 6 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 8bcc4ea4..4140e27c 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -1,8 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
# @ECLASS: gnome2-live.eclass
# @MAINTAINER:
# gnome@gentoo.org
@@ -12,7 +10,6 @@
# @DESCRIPTION:
# Exports additional functions used by live ebuilds written for GNOME packages
# Always to be imported *AFTER* gnome2.eclass
-#
inherit autotools eutils gnome2 gnome2-utils libtool git-r3 xdg
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index 5ee12d6e..a16e931e 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: gnome2-python.eclass
# @MAINTAINER:
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 912545c7..c29f4d89 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: multibuild.eclass
# @MAINTAINER:
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index a70c9d87..f2243dd1 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: vala.eclass
# @MAINTAINER:
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2017-12-26 12:20 Mart Raudsepp
0 siblings, 0 replies; 94+ messages in thread
From: Mart Raudsepp @ 2017-12-26 12:20 UTC (permalink / raw
To: gentoo-commits
commit: db7676425e418293840de0a5598b2cd286f6f2e5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 12:19:56 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 12:19:56 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=db767642
gnome2.eclass: Fix accidental reverse of schema update conditional
commit ffb6f9396884aaf7a9c84faa994cde3c458eb83f sync from main tree.
Otherwise e.g gnome-todo fails to run right after install due to no schemas found.
eclass/gnome2.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 93a0501e..2cc54393 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -340,7 +340,7 @@ gnome2_pkg_postinst() {
if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
gnome2_icon_cache_update
fi
- if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
gnome2_schemas_update
fi
gnome2_scrollkeeper_update
@@ -371,7 +371,7 @@ gnome2_pkg_postrm() {
if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
gnome2_icon_cache_update
fi
- if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
gnome2_schemas_update
fi
gnome2_scrollkeeper_update
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2017-12-10 18:37 Sobhan Mohammadpour
0 siblings, 0 replies; 94+ messages in thread
From: Sobhan Mohammadpour @ 2017-12-10 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 22cfda9c891082e0ecb003d15fe364ff2c8e0c0d
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 18:35:18 2017 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 18:35:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=22cfda9c
gnome-meson.eclass Many fixes
Fix the installations of docs, show warning message for the overl-
ay.
eclass/gnome-meson.eclass | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass
index 0e2466cb..3f013a18 100644
--- a/eclass/gnome-meson.eclass
+++ b/eclass/gnome-meson.eclass
@@ -28,26 +28,26 @@ esac
# Prepare environment for build, fix build of scrollkeeper documentation,
# run elibtoolize.
gnome-meson_src_prepare() {
+ # FIXME add gtk-doc stuff if needed
xdg_src_prepare
# Prevent assorted access violations and test failures
gnome2_environment_reset
-
- # Disable all deprecation warnings
- gnome2_disable_deprecation_warning
}
# @FUNCTION: gnome-meson_src_configure
# @DESCRIPTION:
# Gnome specific configure handling
gnome-meson_src_configure() {
- #FIXME: handle gtk-doc
-
- #FIXME is this still valid ?
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addpredict "$(unset HOME; echo ~)/.gnome2"
-
+ #FIXME are these valid/needed
+ # "-Dgtk-doc=no"
+ # "-Dmaintainer-mode=no"
+ # "-Dschemas-install=no"
+ # "-Dupdate-mimedb=no"
+ # "-Dcompile-warnings=minimum"
local emesonargs=(
"$@"
)
@@ -67,21 +67,19 @@ gnome-meson_src_compile() {
# Gnome specific install. Handles typical GConf and scrollkeeper setup
# in packages and removal of .la files if requested
gnome-meson_src_install() {
- # we must delay gconf schema installation due to sandbox
- export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
+ # install docs
+ default
- # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING
# files that are really common in gnome packages (bug #573390)
local d
for d in HACKING MAINTAINERS; do
[[ -s "${d}" ]] && dodoc "${d}"
done
+ # Make sure this one doesn't get in the portage db
+ rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
+
# Delete all .la files
-
case "${GNOME2_LA_PUNT}" in
yes) prune_libtool_files --modules;;
no) ;;
@@ -131,6 +129,13 @@ gnome-meson_pkg_postinst() {
if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
gnome2_giomodule_cache_update
fi
+
+ # This should only be in the overlay
+ ewarn "**************************************************************"
+ ewarn "This is the *experimental* Gentoo GNOME Overlay"
+ ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
+ ewarn "Do NOT go to upstream with bugs without checking with us first"
+ ewarn "**************************************************************"
}
# # FIXME Handle GConf schemas removal
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2017-12-10 4:04 Sobhan Mohammadpour
0 siblings, 0 replies; 94+ messages in thread
From: Sobhan Mohammadpour @ 2017-12-10 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 25e51618ccb10172768758cfb00339ac9c652a4b
Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 17:03:40 2017 +0000
Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 17:18:11 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=25e51618
gnome-meson.eclass: A new eclass to help with gnome packages using meson
The gnome-meson.eclass is equivalent of the gnome2.eclass for packages
that are using meson instead of other build systems. It is based on
gnome2.eclass.
eclass/gnome-meson.eclass | 163 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 163 insertions(+)
diff --git a/eclass/gnome-meson.eclass b/eclass/gnome-meson.eclass
new file mode 100644
index 00000000..0e2466cb
--- /dev/null
+++ b/eclass/gnome-meson.eclass
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: gnome-meson.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @BLURB: Provides phases for Gnome/Gtk+ based packages that use meosn.
+# @DESCRIPTION:
+# Exports portage base functions used by ebuilds written for packages using the
+# GNOME framework and meson. For additional functions, see gnome2-utils.eclass.
+
+inherit eutils gnome.org gnome2-utils meson xdg
+
+case "${EAPI:-0}" in
+ 6)
+ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+ ;;
+ *) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+# @ECLASS-VARIABLE: GNOME-MESON_ECLASS_GIO_MODULES
+# @INTERNAL
+# @DESCRIPTION:
+# Array containing glib GIO modules
+
+# @FUNCTION: gnome-meson_src_prepare
+# @DESCRIPTION:
+# Prepare environment for build, fix build of scrollkeeper documentation,
+# run elibtoolize.
+gnome-meson_src_prepare() {
+ xdg_src_prepare
+
+ # Prevent assorted access violations and test failures
+ gnome2_environment_reset
+
+ # Disable all deprecation warnings
+ gnome2_disable_deprecation_warning
+}
+
+# @FUNCTION: gnome-meson_src_configure
+# @DESCRIPTION:
+# Gnome specific configure handling
+gnome-meson_src_configure() {
+ #FIXME: handle gtk-doc
+
+ #FIXME is this still valid ?
+ # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
+ addpredict "$(unset HOME; echo ~)/.gnome2"
+
+
+ local emesonargs=(
+ "$@"
+ )
+
+ meson_src_configure
+}
+
+# @FUNCTION: gnome-meson_src_compile
+# @DESCRIPTION:
+# Only default src_compile for now
+gnome-meson_src_compile() {
+ meson_src_compile
+}
+
+# @FUNCTION: gnome-meson_src_install
+# @DESCRIPTION:
+# Gnome specific install. Handles typical GConf and scrollkeeper setup
+# in packages and removal of .la files if requested
+gnome-meson_src_install() {
+ # we must delay gconf schema installation due to sandbox
+ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+
+ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+
+ # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING
+ # files that are really common in gnome packages (bug #573390)
+ local d
+ for d in HACKING MAINTAINERS; do
+ [[ -s "${d}" ]] && dodoc "${d}"
+ done
+
+ # Delete all .la files
+
+ case "${GNOME2_LA_PUNT}" in
+ yes) prune_libtool_files --modules;;
+ no) ;;
+ *) prune_libtool_files;;
+ esac
+
+ meson_src_install
+}
+
+# @FUNCTION: gnome-meson_pkg_preinst
+# @DESCRIPTION:
+# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
+gnome-meson_pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_gconf_savelist
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
+ gnome2_scrollkeeper_savelist
+ gnome2_gdk_pixbuf_savelist
+
+ local f
+
+ GNOME2_ECLASS_GIO_MODULES=()
+ while IFS= read -r -d '' f; do
+ GNOME2_ECLASS_GIO_MODULES+=( ${f} )
+ done < <(cd "${D}" && find usr/$(get_libdir)/gio/modules -type f -print0 2>/dev/null)
+
+ export GNOME2_ECLASS_GIO_MODULES
+}
+
+# @FUNCTION: gnome-meson_pkg_postinst
+# @DESCRIPTION:
+# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
+# database updates.
+gnome-meson_pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_gconf_install
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
+ if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ gnome2_schemas_update
+ fi
+ gnome2_scrollkeeper_update
+ gnome2_gdk_pixbuf_update
+
+ if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+ gnome2_giomodule_cache_update
+ fi
+}
+
+# # FIXME Handle GConf schemas removal
+#gnome2_pkg_prerm() {
+# gnome2_gconf_uninstall
+#}
+
+# @FUNCTION: gnome-meson_pkg_postrm
+# @DESCRIPTION:
+# GSettings, Icons, desktop and mime database updates.
+gnome-meson_pkg_postrm() {
+ xdg_pkg_postrm
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
+ if [[ -n ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ gnome2_schemas_update
+ fi
+
+ if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+ gnome2_giomodule_cache_update
+ fi
+}
+
+# @FUNTION: gnome-meson_use
+# @DESCRIPTION:
+# Make setting arguments easier taken from https://github.com/Heather/gentoo-gnome/blob/4f61803890da76026f4fed772c34c4394e1d2959/gnome-base/nautilus/nautilus-3.27.2.ebuild#L83
+gnome-meson_use() {
+ echo "-Denable-${2:-${1}}=$(usex ${1} 'true' 'false')"
+}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2017-09-13 22:19 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-13 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 20a5f7d5c1612ad252ed409fd7b7cf3745dd8e2e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 22:16:54 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 22:16:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=20a5f7d5
eclass/*: sync with gentoo repository
eclass/gnome2-utils.eclass | 33 +++++++++++----------------------
eclass/gnome2.eclass | 34 ++++++++++++++++++++++++++--------
2 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 63855da1..9b4296c1 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: gnome2-utils.eclass
# @MAINTAINER:
@@ -100,12 +99,12 @@ gnome2_environment_reset() {
export GST_REGISTRY="${T}/registry.xml"
# Ensure we don't rely on dconf/gconf while building, bug #511946
- export GSETTINGS_BACKEND="memory"
+ export GSETTINGS_BACKEND="memory"
if has ${EAPI:-0} 6; then
# Try to cover the packages honoring this variable, bug #508124
export GST_INSPECT="$(type -P true)"
-
+
# Stop relying on random DISPLAY variable values, bug #534312
unset DISPLAY
fi
@@ -231,40 +230,35 @@ gnome2_icon_cache_update() {
return
fi
- if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
- debug-print "No icon cache to update"
- return
- fi
-
ebegin "Updating icons cache"
local retval=0
local fails=( )
- for dir in ${GNOME2_ECLASS_ICONS}
+ for dir in "${EROOT%/}"/usr/share/icons/*
do
- if [[ -f "${EROOT}${dir}/index.theme" ]] ; then
+ if [[ -f "${dir}/index.theme" ]] ; then
local rv=0
- "${updater}" -qf "${EROOT}${dir}"
+ "${updater}" -qf "${dir}"
rv=$?
if [[ ! $rv -eq 0 ]] ; then
- debug-print "Updating cache failed on ${EROOT}${dir}"
+ debug-print "Updating cache failed on ${dir}"
# Add to the list of failures
- fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
+ fails+=( "${dir}" )
retval=2
fi
- elif [[ $(ls "${EROOT}${dir}") = "icon-theme.cache" ]]; then
+ elif [[ $(ls "${dir}") = "icon-theme.cache" ]]; then
# Clear stale cache files after theme uninstallation
- rm "${EROOT}${dir}/icon-theme.cache"
+ rm "${dir}/icon-theme.cache"
fi
- if [[ -z $(ls "${EROOT}${dir}") ]]; then
+ if [[ -z $(ls "${dir}") ]]; then
# Clear empty theme directories after theme uninstallation
- rmdir "${EROOT}${dir}"
+ rmdir "${dir}"
fi
done
@@ -387,11 +381,6 @@ gnome2_schemas_update() {
return
fi
- if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
- debug-print "No GSettings schemas to update"
- return
- fi
-
ebegin "Updating GSettings schemas"
${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
eend $?
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 45d1d633..93a0501e 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# @ECLASS: gnome2.eclass
# @MAINTAINER:
@@ -10,6 +9,13 @@
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
+# @ECLASS-VARIABLE: GNOME2_EAUTORECONF
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Run eautoreconf instead of only elibtoolize
+GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""}
+
+[[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools
inherit eutils libtool gnome.org gnome2-utils xdg
case "${EAPI:-0}" in
@@ -62,7 +68,7 @@ if has ${EAPI:-0} 4 5; then
IUSE="debug"
fi
fi
-
+
# @ECLASS-VARIABLE: GNOME2_ECLASS_GIO_MODULES
# @INTERNAL
# @DESCRIPTION:
@@ -113,9 +119,13 @@ gnome2_src_prepare() {
# Disable all deprecation warnings
gnome2_disable_deprecation_warning
- # Run libtoolize
+ # Run libtoolize or eautoreconf, bug #591584
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
- elibtoolize ${ELTCONF}
+ if [[ ${GNOME2_EAUTORECONF} == 'yes' ]]; then
+ eautoreconf
+ else
+ elibtoolize ${ELTCONF}
+ fi
}
# @FUNCTION: gnome2_src_configure
@@ -327,8 +337,12 @@ gnome2_pkg_preinst() {
gnome2_pkg_postinst() {
xdg_pkg_postinst
gnome2_gconf_install
- gnome2_icon_cache_update
- gnome2_schemas_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
+ if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ gnome2_schemas_update
+ fi
gnome2_scrollkeeper_update
gnome2_gdk_pixbuf_update
@@ -354,8 +368,12 @@ gnome2_pkg_postinst() {
# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
gnome2_pkg_postrm() {
xdg_pkg_postrm
- gnome2_icon_cache_update
- gnome2_schemas_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
+ if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ gnome2_schemas_update
+ fi
gnome2_scrollkeeper_update
if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2016-10-30 11:44 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-30 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 5f5cf8cfd67aecdcb2d6782e2503c2656cdf3efd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:25:28 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:32:35 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5f5cf8cf
eclass/gnome2-live: sync src_prepare with gnome2.eclass
Use xdg eclass to clean environment, etc
eclass/gnome2-live.eclass | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 7771c50..0e725d0 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -14,7 +14,7 @@
# Always to be imported *AFTER* gnome2.eclass
#
-inherit autotools eutils gnome2 gnome2-utils libtool git-r3
+inherit autotools eutils gnome2 gnome2-utils libtool git-r3 xdg
EXPORTED_FUNCTIONS=" "
case "${EAPI:-0}" in
@@ -105,9 +105,7 @@ gnome2-live_src_prepare() {
### Keep this in-sync with gnome2.eclass!
- # Don't use the session bus address inherited via the environment
- # causes test and introspection-building failures
- unset DBUS_SESSION_BUS_ADDRESS
+ xdg_src_prepare
# Prevent assorted access violations and test failures
gnome2_environment_reset
@@ -115,7 +113,8 @@ gnome2-live_src_prepare() {
# Prevent scrollkeeper access violations
gnome2_omf_fix
- # Libtool patching
+ # Run libtoolize
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
elibtoolize ${ELTCONF}
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2016-10-30 11:44 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-30 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 29ace82844506914a4bc6af204e140ccdc730800
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:36:40 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:36:40 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=29ace828
eclass/gnome2-live: add EAPI 6 support
eclass/gnome2-live.eclass | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 0e725d0..8bcc4ea 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -21,6 +21,9 @@ case "${EAPI:-0}" in
4|5)
EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst
;;
+ 6)
+ EXPORT_FUNCTIONS src_prepare pkg_postinst
+ ;;
*)
die "Unknown EAPI, Bug eclass maintainers." ;;
esac
@@ -75,11 +78,15 @@ gnome2-live_get_var() {
# Calls git-2_src_unpack, and unpacks ${A} if required.
# Also calls gnome2-live_src_prepare for older EAPI.
gnome2-live_src_unpack() {
- if test -n "${A}"; then
- unpack ${A}
+ if has ${EAPI:-0} 4 5 ; then
+ if test -n "${A}"; then
+ unpack ${A}
+ fi
+ git-r3_src_unpack
+ gnome2-live_src_prepare
+ else
+ die "gnome2-live_src_unpack is banned starting with EAPI=6"
fi
- git-r3_src_unpack
- gnome2-live_src_prepare
}
# @FUNCTION: gnome2-live_src_prepare
@@ -88,11 +95,13 @@ gnome2-live_src_unpack() {
# Creates blank ChangeLog and necessary macro dirs. Runs various autotools
# programs if required, and finally runs eautoreconf.
gnome2-live_src_prepare() {
- for i in ${PATCHES}; do
- epatch "${i}"
- done
+ if has ${EAPI:-0} 4 5 ; then
+ for i in ${PATCHES}; do
+ epatch "${i}"
+ done
- epatch_user
+ epatch_user
+ fi
# If ChangeLog doesn't exist, maybe it's autogenerated
# Avoid a `dodoc` failure by adding an empty ChangeLog
@@ -100,18 +109,21 @@ gnome2-live_src_prepare() {
echo > ChangeLog
fi
- # eautoreconf is smart enough to run all necessary commands
- eautoreconf
-
### Keep this in-sync with gnome2.eclass!
xdg_src_prepare
+ # eautoreconf is smart enough to run all necessary commands
+ eautoreconf
+
# Prevent assorted access violations and test failures
gnome2_environment_reset
# Prevent scrollkeeper access violations
- gnome2_omf_fix
+ # We stop to run it from EAPI=6 as scrollkeeper helpers from
+ # rarian are not running anything and, then, access violations
+ # shouldn't occur.
+ has ${EAPI:-0} 4 5 && gnome2_omf_fix
# Run libtoolize
# https://bugzilla.gnome.org/show_bug.cgi?id=655517
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2016-10-30 11:44 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2016-10-30 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 3935bd2bcac001faa89fbfb5b80b9c99e5e476cd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:22:41 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:23:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3935bd2b
eclass: drop support for older EAPIs in gnome2-live
eclass/gnome2-live.eclass | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 9a810e8..7771c50 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -16,14 +16,14 @@
inherit autotools eutils gnome2 gnome2-utils libtool git-r3
-# Stolen from git.eclass
-EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
+EXPORTED_FUNCTIONS=" "
case "${EAPI:-0}" in
- 2|3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
- 0|1) ;;
- *) die "Unknown EAPI, Bug eclass maintainers." ;;
+ 4|5)
+ EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst
+ ;;
+ *)
+ die "Unknown EAPI, Bug eclass maintainers." ;;
esac
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
# DEPEND on
# app-text/gnome-doc-utils for gnome-doc-*
@@ -79,7 +79,7 @@ gnome2-live_src_unpack() {
unpack ${A}
fi
git-r3_src_unpack
- has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
+ gnome2-live_src_prepare
}
# @FUNCTION: gnome2-live_src_prepare
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2016-09-05 22:05 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2016-09-05 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 4f37fde27700ee6f07923cedf2996b889336862a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 21:29:37 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 21:31:21 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4f37fde2
eclass: sync with gentoo
eclass/gnome2-utils.eclass | 43 ++++++++++-
eclass/gnome2.eclass | 181 ++++++++++++++++++++++++++++++++-------------
eclass/vala.eclass | 10 +--
3 files changed, 174 insertions(+), 60 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 83a3610..63855da 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,10 +15,11 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-inherit eutils multilib xdg-utils
+[[ ${EAPI:-0} == [012345] ]] && inherit multilib
+inherit eutils xdg-utils
case "${EAPI:-0}" in
- 0|1|2|3|4|5) ;;
+ 0|1|2|3|4|5|6) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
@@ -97,6 +98,17 @@ gnome2_environment_reset() {
# GST_REGISTRY is to work around gst utilities trying to read/write /root
export GST_REGISTRY="${T}/registry.xml"
+
+ # Ensure we don't rely on dconf/gconf while building, bug #511946
+ export GSETTINGS_BACKEND="memory"
+
+ if has ${EAPI:-0} 6; then
+ # Try to cover the packages honoring this variable, bug #508124
+ export GST_INSPECT="$(type -P true)"
+
+ # Stop relying on random DISPLAY variable values, bug #534312
+ unset DISPLAY
+ fi
}
# @FUNCTION: gnome2_gconf_savelist
@@ -457,6 +469,29 @@ gnome2_query_immodules_gtk3() {
eend $?
}
+# @FUNCTION: gnome2_giomodule_cache_update
+# @USAGE: gnome2_giomodule_cache_update
+# @DESCRIPTION:
+# Updates glib's gio modules cache.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_giomodule_cache_update() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}/usr/bin/${CHOST}-gio-querymodules"
+
+ if [[ ! -x ${updater} ]]; then
+ updater="${EROOT}/usr/bin/gio-querymodules"
+ fi
+
+ if [[ ! -x ${updater} ]]; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ ebegin "Updating GIO modules cache"
+ ${updater} "${EROOT%/}"/usr/$(get_libdir)/gio/modules
+ eend $?
+}
+
# @FUNCTION: gnome2_disable_deprecation_warning
# @DESCRIPTION:
# Disable deprecation warnings commonly found in glib based packages.
@@ -475,8 +510,8 @@ gnome2_disable_deprecation_warning() {
fi
LC_ALL=C sed -r -i \
- -e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
- -e 's:-DGSEAL_ENABLE+[A-Z_]:$(NULL):g' \
+ -e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(/bin/true):g' \
+ -e 's:-DGSEAL_ENABLE(=[A-Za-z0-9_]*)?:$(/bin/true):g' \
-i "${makefile}"
if [[ $? -ne 0 ]]; then
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index ed233b0..45d1d63 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -16,25 +16,18 @@ case "${EAPI:-0}" in
4|5)
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
+ 6)
+ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
+ ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
-# @ECLASS-VARIABLE: G2CONF
+# @ECLASS-VARIABLE: DOCS
# @DEFAULT_UNSET
# @DESCRIPTION:
-# Extra configure opts passed to econf.
-# Deprecated, pass extra arguments to gnome2_src_configure.
-G2CONF=${G2CONF:-""}
-
-# @ECLASS-VARIABLE: GNOME2_LA_PUNT
-# @DESCRIPTION:
-# Should we delete ALL the .la files?
-# NOT to be used without due consideration.
-if has ${EAPI:-0} 4; then
- GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
-else
- GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
-fi
+# 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
@@ -42,10 +35,15 @@ fi
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-""}
-# @ECLASS-VARIABLE: DOCS
+# @ECLASS-VARIABLE: G2CONF
# @DEFAULT_UNSET
# @DESCRIPTION:
-# String containing documents passed to dodoc command.
+# 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
+ G2CONF=${G2CONF:-""}
+fi
# @ECLASS-VARIABLE: GCONF_DEBUG
# @DEFAULT_UNSET
@@ -56,18 +54,44 @@ ELTCONF=${ELTCONF:-""}
# harder. This variable should be set to yes for such packages for the eclass
# to handle it properly. It will enable minimal debug with USE=-debug.
# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
+#
+# 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 [[ ${GCONF_DEBUG} != "no" ]]; then
+ IUSE="debug"
+ fi
+fi
+
+# @ECLASS-VARIABLE: GNOME2_ECLASS_GIO_MODULES
+# @INTERNAL
+# @DESCRIPTION:
+# Array containing glib GIO modules
-
-if [[ ${GCONF_DEBUG} != "no" ]]; then
- IUSE="debug"
+# @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)
+# 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
# @FUNCTION: gnome2_src_unpack
# @DESCRIPTION:
# Stub function for old EAPI.
gnome2_src_unpack() {
- unpack ${A}
- cd "${S}"
+ if has ${EAPI:-0} 4 5; then
+ unpack ${A}
+ cd "${S}"
+ else
+ die "gnome2_src_unpack is banned from eapi6"
+ fi
}
# @FUNCTION: gnome2_src_prepare
@@ -81,36 +105,43 @@ gnome2_src_prepare() {
gnome2_environment_reset
# Prevent scrollkeeper access violations
- gnome2_omf_fix
+ # 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
# Disable all deprecation warnings
gnome2_disable_deprecation_warning
# Run libtoolize
- # Everything is fatal EAPI 4 onwards
- nonfatal elibtoolize ${ELTCONF}
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ elibtoolize ${ELTCONF}
}
# @FUNCTION: gnome2_src_configure
# @DESCRIPTION:
# Gnome specific configure handling
gnome2_src_configure() {
- # Need to catch all offenders before switching behavior
- if [[ -z ${GCONF_DEBUG} ]] ; then
- eqawarn "GCONF_DEBUG not set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#GCONF_DEBUG"
- fi
-
- # Deprecated for a long time now, see Gnome team policies
+ # Deprecated for a long time now and banned since eapi6, see Gnome team policies
if [[ -n ${G2CONF} ]] ; then
- eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure"
+ if has ${EAPI:-0} 4 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"
+ fi
fi
local g2conf=()
- # Update the GNOME configuration options
- if [[ ${GCONF_DEBUG} != 'no' ]] ; then
- if use debug ; then
- g2conf+=( --enable-debug=yes )
+ if has ${EAPI:-0} 4 5; then
+ if [[ ${GCONF_DEBUG} != 'no' ]] ; then
+ if use debug ; then
+ g2conf+=( --enable-debug=yes )
+ fi
+ fi
+ else
+ if [[ -n ${GCONF_DEBUG} ]] ; then
+ die "GCONF_DEBUG is banned since eapi6 in favor of each ebuild taking care of the proper handling of debug configure option"
fi
fi
@@ -140,7 +171,7 @@ gnome2_src_configure() {
g2conf+=( --disable-scrollkeeper )
fi
- # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
+ # 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 )
@@ -157,27 +188,46 @@ gnome2_src_configure() {
g2conf+=( --disable-schemas-compile )
fi
+ # Pass --disable-update-mimedb when possible
+ if grep -q "disable-update-mimedb" "${ECONF_SOURCE:-.}"/configure; then
+ g2conf+=( --disable-update-mimedb )
+ fi
+
# Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug #471336
if grep -q "enable-compile-warnings" "${ECONF_SOURCE:-.}"/configure; then
g2conf+=( --enable-compile-warnings=minimum )
fi
- # Pass --docdir with proper directory, bug #482646
- if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then
- g2conf+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
+ # Pass --docdir with proper directory, bug #482646 (not needed since eapi6)
+ if has ${EAPI:-0} 4 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)
- addwrite "$(unset HOME; echo ~)/.gnome2"
+ if has ${EAPI:-0} 4 5; then
+ addwrite "$(unset HOME; echo ~)/.gnome2"
+ else
+ addpredict "$(unset HOME; echo ~)/.gnome2"
+ fi
- econf ${g2conf[@]} ${G2CONF} "$@"
+ if has ${EAPI:-0} 4 5; then
+ econf ${g2conf[@]} ${G2CONF} "$@"
+ else
+ econf ${g2conf[@]} "$@"
+ fi
}
# @FUNCTION: gnome2_src_compile
# @DESCRIPTION:
# Only default src_compile for now
gnome2_src_compile() {
- emake
+ if has ${EAPI:-0} 4 5; then
+ emake
+ else
+ default
+ fi
}
# @FUNCTION: gnome2_src_install
@@ -185,27 +235,39 @@ gnome2_src_compile() {
# Gnome specific install. Handles typical GConf and scrollkeeper setup
# in packages and removal of .la files if requested
gnome2_src_install() {
- # if this is not present, scrollkeeper-update may segfault and
- # create bogus directories in /var/lib/
- local sk_tmp_dir="/var/lib/scrollkeeper"
- dodir "${sk_tmp_dir}" || die "dodir failed"
-
# we must delay gconf schema installation due to sandbox
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
- debug-print "Installing with 'make install'"
- emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
+ local sk_tmp_dir="/var/lib/scrollkeeper"
+ # scrollkeeper-update from rarian doesn't do anything. Then, since eapi6
+ # we stop taking care of it
+ #
+ # if this is not present, scrollkeeper-update may segfault and
+ # create bogus directories in /var/lib/
+ if has ${EAPI:-0} 4 5; then
+ dodir "${sk_tmp_dir}" || die "dodir failed"
+ emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed"
+ else
+ default
+ fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- # Handle documentation as 'default' for eapi5 and newer, bug #373131
+ # 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
- else
+ elif has ${EAPI:-0} 5; then
einstalldocs
+ else
+ local d
+ for d in HACKING MAINTAINERS; do
+ [[ -s "${d}" ]] && dodoc "${d}"
+ done
fi
# Do not keep /var/lib/scrollkeeper because:
@@ -247,6 +309,15 @@ gnome2_pkg_preinst() {
gnome2_schemas_savelist
gnome2_scrollkeeper_savelist
gnome2_gdk_pixbuf_savelist
+
+ local f
+
+ GNOME2_ECLASS_GIO_MODULES=()
+ while IFS= read -r -d '' f; do
+ GNOME2_ECLASS_GIO_MODULES+=( ${f} )
+ done < <(cd "${D}" && find usr/$(get_libdir)/gio/modules -type f -print0 2>/dev/null)
+
+ export GNOME2_ECLASS_GIO_MODULES
}
# @FUNCTION: gnome2_pkg_postinst
@@ -261,6 +332,10 @@ gnome2_pkg_postinst() {
gnome2_scrollkeeper_update
gnome2_gdk_pixbuf_update
+ if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+ gnome2_giomodule_cache_update
+ fi
+
# This should only be in the overlay
ewarn "**************************************************************"
ewarn "This is the *experimental* Gentoo GNOME Overlay"
@@ -282,4 +357,8 @@ gnome2_pkg_postrm() {
gnome2_icon_cache_update
gnome2_schemas_update
gnome2_scrollkeeper_update
+
+ if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then
+ gnome2_giomodule_cache_update
+ fi
}
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 895743b..a70c9d8 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -26,13 +26,13 @@ esac
# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
# @DESCRIPTION:
-# Minimum vala API version (e.g. 0.20).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
+# Minimum vala API version (e.g. 0.26).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.26}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
-# Maximum vala API version (e.g. 0.30).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.30}
+# Maximum vala API version (e.g. 0.32).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.32}
# @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET
@@ -50,7 +50,7 @@ vala_api_versions() {
local minimal_supported_minor_version minor_version
# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
- minimal_supported_minor_version="20"
+ minimal_supported_minor_version="26"
for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
if ((minor_version >= minimal_supported_minor_version)); then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-12-24 1:18 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-12-24 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 527cf7a49319cd2f8d6cc364fb50aeec54e85deb
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 01:15:52 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 01:15:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=527cf7a4
multibuild.eclass: sync with gentoo.git
eclass/multibuild.eclass | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index ede0f03..912545c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.20 2014/12/13 08:42:42 mgorny Exp $
+# $Id$
-# @ECLASS: multibuild
+# @ECLASS: multibuild.eclass
# @MAINTAINER:
# Michał Górny <mgorny@gentoo.org>
# @AUTHOR:
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
0|1|2|3)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
- 4|5)
+ 4|5|6)
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -158,6 +158,8 @@ multibuild_foreach_variant() {
multibuild_parallel_foreach_variant() {
debug-print-function ${FUNCNAME} "${@}"
+ [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
multibuild_foreach_variant "${@}"
}
@@ -205,7 +207,7 @@ multibuild_copy_sources() {
_multibuild_create_source_copy() {
einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
- cp -pr "${cp_args[@]}" \
+ cp -p -R "${cp_args[@]}" \
"${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-12-24 1:18 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-12-24 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 885eb1409f0d9693ffb52cb51d8e09ef7b285662
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 01:13:39 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 01:13:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=885eb140
gnome2-live.eclass: fix a typo raised by eclass-manpages build
eclass/gnome2-live.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 1681293..9a810e8 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -70,7 +70,7 @@ gnome2-live_get_var() {
echo $(sed -ne "s/${var}(\(.*\))/\1/p" "${f}" | tr -d '[]')
}
-# @FUNCTION: gnome2-live_get_var
+# @FUNCTION: gnome2-live_src_unpack
# @DESCRIPTION:
# Calls git-2_src_unpack, and unpacks ${A} if required.
# Also calls gnome2-live_src_prepare for older EAPI.
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-11-26 22:46 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-11-26 22:46 UTC (permalink / raw
To: gentoo-commits
commit: f41b572c1cafbfef54548d6359d1f609ef014601
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 22:46:04 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:46:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f41b572c
*.eclass: sync with gentoo-x86
eclass/gnome2-utils.eclass | 38 ++++++++++------
eclass/gnome2.eclass | 4 +-
eclass/vala.eclass | 4 +-
eclass/xdg-utils.eclass | 111 ---------------------------------------------
eclass/xdg.eclass | 68 ---------------------------
5 files changed, 27 insertions(+), 198 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 7df00ae..83a3610 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,7 +15,7 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-inherit multilib
+inherit eutils multilib xdg-utils
case "${EAPI:-0}" in
0|1|2|3|4|5) ;;
@@ -90,6 +90,8 @@ DEPEND=">=sys-apps/sed-4"
# Reset various variables inherited from root's evironment to a reasonable
# default for ebuilds to help avoid access violations and test failures.
gnome2_environment_reset() {
+ xdg_environment_reset
+
# Respected by >=glib-2.30.1-r1
export G_HOME="${T}"
@@ -104,9 +106,9 @@ gnome2_environment_reset() {
# This function should be called from pkg_preinst.
gnome2_gconf_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &> /dev/null
+ pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
- popd &> /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: gnome2_gconf_install
@@ -198,9 +200,9 @@ gnome2_gconf_uninstall() {
# This function should be called from pkg_preinst.
gnome2_icon_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &> /dev/null
+ pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- popd &> /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: gnome2_icon_cache_update
@@ -319,9 +321,9 @@ gnome2_omf_fix() {
# This function should be called from pkg_preinst.
gnome2_scrollkeeper_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &> /dev/null
+ pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
- popd &> /dev/null
+ popd > /dev/null || die
}
# @FUNCTION: gnome2_scrollkeeper_update
@@ -354,9 +356,9 @@ gnome2_scrollkeeper_update() {
# This function should be called from pkg_preinst.
gnome2_schemas_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &>/dev/null
+ pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
- popd &>/dev/null
+ popd > /dev/null || die
}
# @FUNCTION: gnome2_schemas_update
@@ -390,9 +392,9 @@ gnome2_schemas_update() {
# This function should be called from pkg_preinst.
gnome2_gdk_pixbuf_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" 1>/dev/null
+ pushd "${ED}" > /dev/null || die
export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
- popd 1>/dev/null
+ popd > /dev/null || die
}
# @FUNCTION: gnome2_gdk_pixbuf_update
@@ -419,7 +421,7 @@ gnome2_gdk_pixbuf_update() {
fi
ebegin "Updating gdk-pixbuf loader cache"
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+ local tmp_file=$(emktemp)
${updater} 1> "${tmp_file}" &&
chmod 0644 "${tmp_file}" &&
cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
@@ -435,7 +437,10 @@ gnome2_query_immodules_gtk2() {
local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
- "${updater}" --update-cache
+ ebegin "Updating gtk2 input method module cache"
+ GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
+ "${updater}" --update-cache
+ eend $?
}
# @FUNCTION: gnome2_query_immodules_gtk3
@@ -446,7 +451,10 @@ gnome2_query_immodules_gtk3() {
local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
- "${updater}" --update-cache
+ ebegin "Updating gtk3 input method module cache"
+ GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
+ "${updater}" --update-cache
+ eend $?
}
# @FUNCTION: gnome2_disable_deprecation_warning
@@ -478,7 +486,7 @@ gnome2_disable_deprecation_warning() {
fi
done < <(find "${S}" -name "Makefile.in" \
-o -name "Makefile.am" -o -name "Makefile.decl" \
- | sort; echo configure)
+ | sort; [[ -f "${S}"/configure ]] && echo configure)
# TODO: sedding configure.ac can trigger maintainer mode; bug #439602
# -o -name "configure.ac" -o -name "configure.in" \
# | sort; echo configure)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index bb33bce..ed233b0 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -21,9 +21,9 @@ esac
# @ECLASS-VARIABLE: G2CONF
# @DEFAULT_UNSET
-# @DEPRECATED
# @DESCRIPTION:
-# Extra configure opts passed to econf
+# Extra configure opts passed to econf.
+# Deprecated, pass extra arguments to gnome2_src_configure.
G2CONF=${G2CONF:-""}
# @ECLASS-VARIABLE: GNOME2_LA_PUNT
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index a90d4bf..895743b 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -31,8 +31,8 @@ VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
-# Maximum vala API version (e.g. 0.26).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.28}
+# Maximum vala API version (e.g. 0.30).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.30}
# @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
deleted file mode 100644
index 779a413..0000000
--- a/eclass/xdg-utils.eclass
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: xdg-utils.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @BLURB: Auxiliary functions commonly used by XDG compliant packages.
-# @DESCRIPTION:
-# This eclass provides a set of auxiliary functions needed by most XDG
-# compliant packages.
-# It provides XDG stack related functions such as:
-# * XDG .desktop files cache management
-# * XDG mime information database management
-
-case "${EAPI:-0}" in
- 4|5) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-desktop-database
-: ${DESKTOP_DATABASE_UPDATE_BIN:="/usr/bin/update-desktop-database"}
-
-# @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${DESKTOP_DATABASE_DIR="/usr/share/applications"}
-
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to update-desktop-database
-: ${MIMEINFO_DATABASE_UPDATE_BIN:="/usr/bin/update-mime-database"}
-
-# @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR
-# @INTERNAL
-# @DESCRIPTION:
-# Directory where .desktop files database is stored
-: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"}
-
-# @FUNCTION: xdg_desktopfiles_savelist
-# @DESCRIPTION:
-# Find the .desktop files about to be installed and save their location
-# in the XDG_ECLASS_DESKTOPFILES environment variable.
-# This function should be called from pkg_preinst.
-xdg_desktopfiles_savelist() {
- pushd "${D}" &> /dev/null
- export XDG_ECLASS_DESKTOPFILES=$(find 'usr/share/applications' -type f 2> /dev/null)
- popd &> /dev/null
-}
-
-# @FUNCTION: fdo-xdg_desktop_database_update
-# @DESCRIPTION:
-# Updates the .desktop files database.
-# Generates a list of mimetypes linked to applications that can handle them
-xdg_desktop_database_update() {
- local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
-
- if [[ ! -x "${updater}" ]] ; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${XDG_ECLASS_DESKTOPFILES}" ]]; then
- debug-print "No .desktop files to add to database"
- return
- fi
-
- ebegin "Updating .desktop files database ..."
- "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
- eend $?
-}
-
-# @FUNCTION: xdg_mimeinfo_savelist
-# @DESCRIPTION:
-# Find the mime information files about to be installed and save their location
-# in the XDG_ECLASS_MIMEINFOFILES environment variable.
-# This function should be called from pkg_preinst.
-xdg_mimeinfo_savelist() {
- pushd "${D}" &> /dev/null
- export XDG_ECLASS_MIMEINFOFILES=$(find 'usr/share/mime' -type f 2> /dev/null)
- popd &> /dev/null
-}
-
-# @FUNCTION: xdg_mimeinfo_database_update
-# @DESCRIPTION:
-# Update the mime database.
-# Creates a general list of mime types from several sources
-xdg_mimeinfo_database_update() {
- local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
-
- if [[ ! -x "${updater}" ]] ; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${XDG_ECLASS_MIMEINFOFILES}" ]]; then
- debug-print "No mime info files to add to database"
- return
- fi
-
- ebegin "Updating shared mime info database ..."
- "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
- eend $?
-}
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
deleted file mode 100644
index 8b9de2b..0000000
--- a/eclass/xdg.eclass
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# @ECLASS: xdg.eclass
-# @MAINTAINER:
-# freedesktop-bugs@gentoo.org
-# @AUTHOR:
-# Original author: Gilles Dartiguelongue <eva@gentoo.org>
-# @BLURB: Provides phases for XDG compliant packages.
-# @DESCRIPTION:
-# Utility eclass to update the desktop and shared mime info as laid
-# out in the freedesktop specs & implementations
-
-inherit xdg-utils
-
-case "${EAPI:-0}" in
- 4|5)
- EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
- ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-DEPEND="
- dev-util/desktop-file-utils
- x11-misc/shared-mime-info
-"
-
-# @FUNCTION: xdg_src_prepare
-# @DESCRIPTION:
-# Prepare sources to work with XDG standards.
-xdg_src_prepare() {
- # Prepare XDG base directories
- export XDG_DATA_HOME="${T}/.local/share"
- export XDG_CONFIG_HOME="${T}/.config"
- export XDG_CACHE_HOME="${T}/.cache"
- export XDG_RUNTIME_DIR="${T}/run"
- mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
- "${XDG_RUNTIME_DIR}"
- # This directory needs to be owned by the user, and chmod 0700
- # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
- chmod 0700 "${XDG_RUNTIME_DIR}"
-}
-
-# @FUNCTION: xdg_pkg_preinst
-# @DESCRIPTION:
-# Finds .desktop and mime info files for later handling in pkg_postinst
-xdg_pkg_preinst() {
- xdg_desktopfiles_savelist
- xdg_mimeinfo_savelist
-}
-
-# @FUNCTION: xdg_pkg_postinst
-# @DESCRIPTION:
-# Handle desktop and mime info database updates.
-xdg_pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-# @FUNCTION: xdg_pkg_postrm
-# @DESCRIPTION:
-# Handle desktop and mime info database updates.
-xdg_pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-05-25 16:08 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-25 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 6f14db878539ac475c7edd9a05d9f55cc21d8778
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 15:49:19 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 15:49:19 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6f14db87
eclass: add XDG eclass to replace fdo-mime
fdo-mime eclass is just a collection of helpers that is most often
forgotten and/or not properly used in ebuilds having .desktop files or
shared mime infos.
On top of that, most packages where missing the implicit dependency on
the tools used as can be seen in bug #208047.
Finally, most packages complying with XDG specifications nowadays expect
base directories to be present at various stages of package build as can
be seen in the many eclasses implementing handling for this (cmake, gnome2,
gstreamer, kde4-base, mono and qt4) so provide it through a simple phase
function.
eclass/xdg-utils.eclass | 111 ++++++++++++++++++++++++++++++++++++++++++++++++
eclass/xdg.eclass | 68 +++++++++++++++++++++++++++++
2 files changed, 179 insertions(+)
diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
new file mode 100644
index 0000000..6dfe66f
--- /dev/null
+++ b/eclass/xdg-utils.eclass
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: xdg-utils.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @AUTHOR:
+# Original author: Gilles Dartiguelongue <eva@gentoo.org>
+# @BLURB: Auxiliary functions commonly used by XDG compliant packages.
+# @DESCRIPTION:
+# This eclass provides a set of auxiliary functions needed by most XDG
+# compliant packages.
+# It provides XDG stack related functions such as:
+# * XDG .desktop files cache management
+# * XDG mime information database management
+
+case "${EAPI:-0}" in
+ 4|5) ;;
+ *) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+# @ECLASS-VARIABLE: DESKTOP_DATABASE_UPDATE_BIN
+# @INTERNAL
+# @DESCRIPTION:
+# Path to update-desktop-database
+: ${DESKTOP_DATABASE_UPDATE_BIN:="/usr/bin/update-desktop-database"}
+
+# @ECLASS-VARIABLE: DESKTOP_DATABASE_DIR
+# @INTERNAL
+# @DESCRIPTION:
+# Directory where .desktop files database is stored
+: ${DESKTOP_DATABASE_DIR="/usr/share/applications"}
+
+# @ECLASS-VARIABLE: MIMEINFO_DATABASE_UPDATE_BIN
+# @INTERNAL
+# @DESCRIPTION:
+# Path to update-desktop-database
+: ${MIMEINFO_DATABASE_UPDATE_BIN:="/usr/bin/update-mime-database"}
+
+# @ECLASS-VARIABLE: MIMEINFO_DATABASE_DIR
+# @INTERNAL
+# @DESCRIPTION:
+# Directory where .desktop files database is stored
+: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"}
+
+# @FUNCTION: xdg_desktopfiles_savelist
+# @DESCRIPTION:
+# Find the .desktop files about to be installed and save their location
+# in the XDG_ECLASS_DESKTOPFILES environment variable.
+# This function should be called from pkg_preinst.
+xdg_desktopfiles_savelist() {
+ pushd "${D}" &> /dev/null
+ export XDG_ECLASS_DESKTOPFILES=$(find 'usr/share/applications' -type f 2> /dev/null)
+ popd &> /dev/null
+}
+
+# @FUNCTION: fdo-xdg_desktop_database_update
+# @DESCRIPTION:
+# Updates the .desktop files database.
+# Generates a list of mimetypes linked to applications that can handle them
+xdg_desktop_database_update() {
+ local updater="${EROOT}${DESKTOP_DATABASE_UPDATE_BIN}"
+
+ if [[ ! -x "${updater}" ]] ; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${XDG_ECLASS_DESKTOPFILES}" ]]; then
+ debug-print "No .desktop files to add to database"
+ return
+ fi
+
+ ebegin "Updating .desktop files database ..."
+ "${updater}" -q "${EROOT}${DESKTOP_DATABASE_DIR}"
+ eend $?
+}
+
+# @FUNCTION: xdg_mimeinfo_savelist
+# @DESCRIPTION:
+# Find the mime information files about to be installed and save their location
+# in the XDG_ECLASS_MIMEINFOFILES environment variable.
+# This function should be called from pkg_preinst.
+xdg_mimeinfo_savelist() {
+ pushd "${D}" &> /dev/null
+ export XDG_ECLASS_MIMEINFOFILES=$(find 'usr/share/mime' -type f 2> /dev/null)
+ popd &> /dev/null
+}
+
+# @FUNCTION: xdg_mimeinfo_database_update
+# @DESCRIPTION:
+# Update the mime database.
+# Creates a general list of mime types from several sources
+xdg_mimeinfo_database_update() {
+ local updater="${EROOT}${MIMEINFO_DATABASE_UPDATE_BIN}"
+
+ if [[ ! -x "${updater}" ]] ; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${XDG_ECLASS_MIMEINFOFILES}" ]]; then
+ debug-print "No mime info files to add to database"
+ return
+ fi
+
+ ebegin "Updating shared mime info database ..."
+ "${updater}" "${EROOT}${MIMEINFO_DATABASE_DIR}"
+ eend $?
+}
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
new file mode 100644
index 0000000..af5fa8a
--- /dev/null
+++ b/eclass/xdg.eclass
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: xdg.eclass
+# @MAINTAINER:
+# freedesktop-bugs@gentoo.org
+# @AUTHOR:
+# Original author: Gilles Dartiguelongue <eva@gentoo.org>
+# @BLURB: Provides phases for XDG compliant packages.
+# @DESCRIPTION:
+# Utility eclass to update the desktop and shared mime info as laid
+# out in the freedesktop specs & implementations
+
+inherit xdg-utils
+
+case "${EAPI:-0}" in
+ 4|5)
+ EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
+ ;;
+ *) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+DEPEND="
+ dev-util/desktop-file-utils
+ x11-misc/shared-mime-info
+"
+
+# @FUNCTION: xdg_src_prepare
+# @DESCRIPTION:
+# Prepare sources to work with XDG standards.
+xdg_src_prepare() {
+ # Prepare XDG base directories
+ export XDG_DATA_HOME="${T}/.local/share"
+ export XDG_CONFIG_HOME="${T}/.config"
+ export XDG_CACHE_HOME="${T}/.cache"
+ export XDG_RUNTIME_DIR="${T}/run"
+ mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
+ "${XDG_RUNTIME_DIR}"
+ # This directory needs to be owned by the user, and chmod 0700
+ # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ chmod 0700 "${XDG_RUNTIME_DIR}"
+}
+
+# @FUNCTION: xdg_pkg_preinst
+# @DESCRIPTION:
+# Finds .desktop and mime info files for later handling in pkg_postinst
+xdg_pkg_preinst() {
+ xdg_desktopfiles_savelist
+ xdg_mimeinfo_savelist
+}
+
+# @FUNCTION: xdg_pkg_postinst
+# @DESCRIPTION:
+# Handle desktop and mime info database updates.
+xdg_pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+# @FUNCTION: xdg_pkg_postrm
+# @DESCRIPTION:
+# Handle desktop and mime info database updates.
+xdg_pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-05-25 16:08 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-25 16:08 UTC (permalink / raw
To: gentoo-commits
commit: f1f7e5b963209fefcc2acc77261dd7eb69700165
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 16:07:47 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon May 25 16:07:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f1f7e5b9
eclass/gnome2.eclass: switch to xdg eclass
eclass/gnome2-utils.eclass | 12 ------------
eclass/gnome2.eclass | 11 ++++++-----
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 4c7d0c8..650c57d 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -95,18 +95,6 @@ gnome2_environment_reset() {
# GST_REGISTRY is to work around gst utilities trying to read/write /root
export GST_REGISTRY="${T}/registry.xml"
-
- # XXX: code for resetting XDG_* directories should probably be moved into
- # a separate function in a non-gnome eclass
- export XDG_DATA_HOME="${T}/.local/share"
- export XDG_CONFIG_HOME="${T}/.config"
- export XDG_CACHE_HOME="${T}/.cache"
- export XDG_RUNTIME_DIR="${T}/run"
- mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
- "${XDG_RUNTIME_DIR}"
- # This directory needs to be owned by the user, and chmod 0700
- # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
- chmod 0700 "${XDG_RUNTIME_DIR}"
}
# @FUNCTION: gnome2_gconf_savelist
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 9d1730d..7fc3423 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -10,7 +10,7 @@
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
-inherit eutils fdo-mime libtool gnome.org gnome2-utils
+inherit eutils libtool gnome.org gnome2-utils xdg
case "${EAPI:-0}" in
4|5)
@@ -75,6 +75,8 @@ gnome2_src_unpack() {
# Prepare environment for build, fix build of scrollkeeper documentation,
# run elibtoolize.
gnome2_src_prepare() {
+ xdg_src_prepare
+
# Prevent assorted access violations and test failures
gnome2_environment_reset
@@ -239,6 +241,7 @@ gnome2_src_install() {
# @DESCRIPTION:
# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
gnome2_pkg_preinst() {
+ xdg_pkg_preinst
gnome2_gconf_savelist
gnome2_icon_savelist
gnome2_schemas_savelist
@@ -251,9 +254,8 @@ gnome2_pkg_preinst() {
# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
# database updates.
gnome2_pkg_postinst() {
+ xdg_pkg_postinst
gnome2_gconf_install
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
gnome2_icon_cache_update
gnome2_schemas_update
gnome2_scrollkeeper_update
@@ -276,8 +278,7 @@ gnome2_pkg_postinst() {
# @DESCRIPTION:
# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
gnome2_pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_pkg_postrm
gnome2_icon_cache_update
gnome2_schemas_update
gnome2_scrollkeeper_update
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-05-24 16:33 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-24 16:33 UTC (permalink / raw
To: gentoo-commits
commit: a6623741bbd2f45976d9445d3c28acf26113f8e5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 4 13:44:03 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:32:40 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a6623741
multibuild.eclass: supporting introspecting all layers of nested multibuild
Transform MULTIBUILD_VARIANT, MULTIBUILD_ID and BUILD_DIR into arrays
preserving values for each nested multibuild layer. For example, if you
do something like:
MULTIBUILD_VARIANTS=( a b c )
multibuild_foreach_variant multilib_foreach_abi python_foreach_impl ..
then the function called last would have:
MULTIBUILD_VARIANT=( python2.7 abi_x86_64.amd64 a )
MULTIBUILD_ID=( a-abi_x86_64.amd64-python2.7 a-abi_x86_64.amd64 a )
and BUILD_DIR alike it. Which means that using ${MULTIBUILD_VARIANT[2]}
you can get your initial 'a' without having to copy intermediate values.
Of course, if you want to nest multibuild you still need to ensure to
set proper MULTIBUILD_VARIANTS in the scope of multibuild_foreach*
invocation.
And before you start to worry, this is fully backwards-compatible.
In bash, ${MULTIBUILD_VARIANT} is equivalent to ${MULTIBUILD_VARIANT[0]}
in context of an array, and since index 0 stores deepmost value ---
nothing changes :).
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=483758
eclass/multibuild.eclass | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index d9a86e9..a236894 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -46,6 +46,10 @@ if [[ ! ${_MULTIBUILD} ]]; then
# @DESCRIPTION:
# The current variant which the function was executed for.
#
+# If nested multibuilds are used, this value can be an array. In that
+# case, the first element will name the deepest multibuild, and the next
+# elements will go outwards.
+#
# Example value:
# @CODE
# python2_6
@@ -59,6 +63,10 @@ if [[ ! ${_MULTIBUILD} ]]; then
#
# It can be used to create variant-unique directories and files.
#
+# If nested multibuilds are used, this value can be an array. In that
+# case, the first element will name the deepest multibuild, and the next
+# elements will go outwards.
+#
# Example value:
# @CODE
# amd64-double
@@ -73,6 +81,10 @@ if [[ ! ${_MULTIBUILD} ]]; then
# to variant-specific build directories based on the initial value
# of BUILD_DIR.
#
+# If nested multibuilds are used, this value can be an array. In that
+# case, the first element will name the deepest multibuild, and the next
+# elements will go outwards.
+#
# Example value:
# @CODE
# ${WORKDIR}/foo-1.3-python2_6
@@ -108,9 +120,9 @@ multibuild_foreach_variant() {
debug-print "${FUNCNAME}: initial build_dir = ${bdir}"
for v in "${MULTIBUILD_VARIANTS[@]}"; do
- local MULTIBUILD_VARIANT=${v}
- local MULTIBUILD_ID=${prev_id}${v}
- local BUILD_DIR=${bdir%%/}-${v}
+ local MULTIBUILD_VARIANT=( "${v}" "${MULTIBUILD_VARIANT[@]}" )
+ local MULTIBUILD_ID=( "${prev_id}${v}" "${MULTIBUILD_ID[@]}" )
+ local BUILD_DIR=( "${bdir%%/}-${v}" "${BUILD_DIR[@]}" )
_multibuild_run() {
# find the first non-private command
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-05-24 16:33 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-24 16:33 UTC (permalink / raw
To: gentoo-commits
commit: a587649916a3aec02884cff22128493143f64f4d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 14:49:24 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:32:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a5876499
eclass: import multibuild.eclass
eclass/multibuild.eclass | 269 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 269 insertions(+)
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
new file mode 100644
index 0000000..d9a86e9
--- /dev/null
+++ b/eclass/multibuild.eclass
@@ -0,0 +1,269 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.20 2014/12/13 08:42:42 mgorny Exp $
+
+# @ECLASS: multibuild
+# @MAINTAINER:
+# Michał Górny <mgorny@gentoo.org>
+# @AUTHOR:
+# Author: Michał Górny <mgorny@gentoo.org>
+# @BLURB: A generic eclass for building multiple variants of packages.
+# @DESCRIPTION:
+# The multibuild eclass aims to provide a generic framework for building
+# multiple 'variants' of a package (e.g. multilib, Python
+# implementations).
+
+case "${EAPI:-0}" in
+ 0|1|2|3)
+ die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+ ;;
+ 4|5)
+ ;;
+ *)
+ die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+ ;;
+esac
+
+if [[ ! ${_MULTIBUILD} ]]; then
+
+# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
+# @DESCRIPTION:
+# An array specifying all enabled variants which multibuild_foreach*
+# can execute the process for.
+#
+# In ebuild, it can be set in global scope. Eclasses should set it
+# locally in function scope to support nesting properly.
+#
+# Example:
+# @CODE
+# python_foreach_impl() {
+# local MULTIBUILD_VARIANTS=( python{2_5,2_6,2_7} ... )
+# multibuild_foreach_variant python_compile
+# }
+# @CODE
+
+# @ECLASS-VARIABLE: MULTIBUILD_VARIANT
+# @DESCRIPTION:
+# The current variant which the function was executed for.
+#
+# Example value:
+# @CODE
+# python2_6
+# @CODE
+
+# @ECLASS-VARIABLE: MULTIBUILD_ID
+# @DESCRIPTION:
+# The unique identifier for a multibuild run. In a simple run, it is
+# equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it
+# contains the complete selection tree.
+#
+# It can be used to create variant-unique directories and files.
+#
+# Example value:
+# @CODE
+# amd64-double
+# @CODE
+
+# @ECLASS-VARIABLE: BUILD_DIR
+# @DESCRIPTION:
+# The current build directory. In global scope, it is supposed
+# to contain an 'initial' build directory. If unset, ${S} is used.
+#
+# multibuild_foreach_variant() sets BUILD_DIR locally
+# to variant-specific build directories based on the initial value
+# of BUILD_DIR.
+#
+# Example value:
+# @CODE
+# ${WORKDIR}/foo-1.3-python2_6
+# @CODE
+
+# @FUNCTION: multibuild_foreach_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command repeatedly for each of the enabled package
+# variants.
+#
+# Each of the runs will have variant-specific BUILD_DIR set, and output
+# teed to a separate log in ${T}.
+#
+# The function returns 0 if all commands return 0, or the first non-zero
+# exit status otherwise. However, it performs all the invocations
+# nevertheless. It is preferred to call 'die' inside of the passed
+# function.
+multibuild_foreach_variant() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${MULTIBUILD_VARIANTS} ]] \
+ || die "MULTIBUILD_VARIANTS need to be set"
+
+ local bdir=${BUILD_DIR:-${S}}
+
+ # Avoid writing outside WORKDIR if S=${WORKDIR}.
+ [[ ${bdir%%/} == ${WORKDIR%%/} ]] && bdir=${WORKDIR}/build
+
+ local prev_id=${MULTIBUILD_ID:+${MULTIBUILD_ID}-}
+ local ret=0 lret=0 v
+
+ debug-print "${FUNCNAME}: initial build_dir = ${bdir}"
+
+ for v in "${MULTIBUILD_VARIANTS[@]}"; do
+ local MULTIBUILD_VARIANT=${v}
+ local MULTIBUILD_ID=${prev_id}${v}
+ local BUILD_DIR=${bdir%%/}-${v}
+
+ _multibuild_run() {
+ # find the first non-private command
+ local i=1
+ while [[ ${!i} == _* ]]; do
+ (( i += 1 ))
+ done
+
+ [[ ${i} -le ${#} ]] && einfo "${v}: running ${@:${i}}"
+ "${@}"
+ }
+
+ _multibuild_run "${@}" \
+ > >(exec tee -a "${T}/build-${MULTIBUILD_ID}.log") 2>&1
+ lret=${?}
+ done
+ [[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
+
+ return ${ret}
+}
+
+# @FUNCTION: multibuild_parallel_foreach_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command repeatedly for each of the enabled package
+# variants. This used to run the commands in parallel but now it's
+# just a deprecated alias to multibuild_foreach_variant.
+#
+# The function returns 0 if all commands return 0, or the first non-zero
+# exit status otherwise. However, it performs all the invocations
+# nevertheless. It is preferred to call 'die' inside of the passed
+# function.
+multibuild_parallel_foreach_variant() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ multibuild_foreach_variant "${@}"
+}
+
+# @FUNCTION: multibuild_for_best_variant
+# @USAGE: [<argv>...]
+# @DESCRIPTION:
+# Run the passed command once, for the best of the enabled package
+# variants.
+#
+# The run will have a proper, variant-specificBUILD_DIR set, and output
+# teed to a separate log in ${T}.
+#
+# The function returns command exit status.
+multibuild_for_best_variant() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${MULTIBUILD_VARIANTS} ]] \
+ || die "MULTIBUILD_VARIANTS need to be set"
+
+ # bash-4.1 can't handle negative subscripts
+ local MULTIBUILD_VARIANTS=(
+ "${MULTIBUILD_VARIANTS[$(( ${#MULTIBUILD_VARIANTS[@]} - 1 ))]}"
+ )
+ multibuild_foreach_variant "${@}"
+}
+
+# @FUNCTION: multibuild_copy_sources
+# @DESCRIPTION:
+# Create per-variant copies of source tree. The source tree is assumed
+# to be in ${BUILD_DIR}, or ${S} if the former is unset. The copies will
+# be placed in directories matching BUILD_DIRs used by
+# multibuild_foreach().
+multibuild_copy_sources() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local _MULTIBUILD_INITIAL_BUILD_DIR=${BUILD_DIR:-${S}}
+
+ einfo "Will copy sources from ${_MULTIBUILD_INITIAL_BUILD_DIR}"
+
+ local cp_args=()
+ if cp --reflink=auto --version &>/dev/null; then
+ # enable reflinking if possible to make this faster
+ cp_args+=( --reflink=auto )
+ fi
+
+ _multibuild_create_source_copy() {
+ einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}"
+ cp -pr "${cp_args[@]}" \
+ "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die
+ }
+
+ multibuild_foreach_variant _multibuild_create_source_copy
+}
+
+# @FUNCTION: run_in_build_dir
+# @USAGE: <argv>...
+# @DESCRIPTION:
+# Run the given command in the directory pointed by BUILD_DIR.
+run_in_build_dir() {
+ debug-print-function ${FUNCNAME} "${@}"
+ local ret
+
+ [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
+ [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
+
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+ "${@}"
+ ret=${?}
+ popd >/dev/null || die
+
+ return ${ret}
+}
+
+# @FUNCTION: multibuild_merge_root
+# @USAGE: <src-root> <dest-root>
+# @DESCRIPTION:
+# Merge the directory tree (fake root) from <src-root> to <dest-root>
+# (the real root). Both directories have to be real, absolute paths
+# (i.e. including ${D}). Source root will be removed.
+multibuild_merge_root() {
+ local src=${1}
+ local dest=${2}
+
+ local ret
+
+ if use userland_BSD; then
+ # Most of BSD variants fail to copy broken symlinks, #447370
+ # also, they do not support --version
+
+ tar -C "${src}" -f - -c . \
+ | tar -x -f - -C "${dest}"
+ [[ ${PIPESTATUS[*]} == '0 0' ]]
+ ret=${?}
+ else
+ local cp_args=()
+
+ if cp -a --version &>/dev/null; then
+ cp_args+=( -a )
+ else
+ cp_args+=( -P -R -p )
+ fi
+
+ if cp --reflink=auto --version &>/dev/null; then
+ # enable reflinking if possible to make this faster
+ cp_args+=( --reflink=auto )
+ fi
+
+ cp "${cp_args[@]}" "${src}"/. "${dest}"/
+ ret=${?}
+ fi
+
+ if [[ ${ret} -ne 0 ]]; then
+ die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed."
+ fi
+
+ rm -rf "${src}"
+}
+
+_MULTIBUILD=1
+fi
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2015-05-10 21:27 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-10 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 4228c2db83d2710605adade9f5d531f66481c7d0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 21:26:25 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 21:26:25 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4228c2db
eclass/gnome2.eclass: move QA warnings to src_configure
Having them in global scope does not work as expected and src_configure
is a better place to be sure to catch all usage of these anyway.
eclass/gnome2.eclass | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 9225355..9d1730d 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -26,11 +26,6 @@ esac
# Extra configure opts passed to econf
G2CONF=${G2CONF:-""}
-# Deprecated for a long time now, see Gnome team policies
-if [[ -n ${G2CONF} ]] ; then
- eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure"
-fi
-
# @ECLASS-VARIABLE: GNOME2_LA_PUNT
# @DESCRIPTION:
# Should we delete ALL the .la files?
@@ -67,11 +62,6 @@ if [[ ${GCONF_DEBUG} != "no" ]]; then
IUSE="debug"
fi
-# Need to catch all offenders before switching behavior
-if [[ -z ${GCONF_DEBUG} ]] ; then
- eqawarn "GCONF_DEBUG not set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#GCONF_DEBUG"
-fi
-
# @FUNCTION: gnome2_src_unpack
# @DESCRIPTION:
# Stub function for old EAPI.
@@ -103,6 +93,16 @@ gnome2_src_prepare() {
# @DESCRIPTION:
# Gnome specific configure handling
gnome2_src_configure() {
+ # Need to catch all offenders before switching behavior
+ if [[ -z ${GCONF_DEBUG} ]] ; then
+ eqawarn "GCONF_DEBUG not set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#GCONF_DEBUG"
+ fi
+
+ # Deprecated for a long time now, see Gnome team policies
+ if [[ -n ${G2CONF} ]] ; then
+ eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure"
+ fi
+
local g2conf=()
# Update the GNOME configuration options
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-23 22:35 Remi Cardona
0 siblings, 0 replies; 94+ messages in thread
From: Remi Cardona @ 2014-11-23 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 3099078f4416d9805ffc341fd7d023256ceba1dc
Author: Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 22:32:01 2014 +0000
Commit: Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 22:32:40 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3099078f
eclass: sync with portage
---
eclass/gnome2-utils.eclass | 37 ++++++++-----------------------------
eclass/gnome2.eclass | 35 +++++++----------------------------
eclass/vala.eclass | 6 +++---
3 files changed, 18 insertions(+), 60 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 3ec3c4d..4c7d0c8 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -439,39 +439,15 @@ gnome2_gdk_pixbuf_update() {
eend $?
}
-
# @FUNCTION: gnome2_query_immodules_gtk2
# @USAGE: gnome2_query_immodules_gtk2
# @DESCRIPTION:
# Updates gtk2 immodules/gdk-pixbuf loaders listing.
gnome2_query_immodules_gtk2() {
- if has_version ">=x11-libs/gtk+-2.24.20:2"; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" --update-cache
- else
- local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
-
- local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
- local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- local gtk_conf_dir=$(dirname "${gtk_conf}")
-
- einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
- einfo "-> ${gtk_conf}"
-
- mkdir -p "${gtk_conf_dir}"
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
- if [ -z "${tmp_file}" ]; then
- ewarn "gtk_query_immodules: cannot create temporary file"
- return 1
- fi
+ local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
+ [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
- if ${query_exec} > "${tmp_file}"; then
- cat "${tmp_file}" > "${gtk_conf}" || \
- ewarn "Failed to write to ${gtk_conf}"
- else
- ewarn "Cannot update gtk.immodules, file generation failed"
- fi
- rm "${tmp_file}"
- fi
+ "${updater}" --update-cache
}
# @FUNCTION: gnome2_query_immodules_gtk3
@@ -479,7 +455,10 @@ gnome2_query_immodules_gtk2() {
# @DESCRIPTION:
# Updates gtk3 immodules/gdk-pixbuf loaders listing.
gnome2_query_immodules_gtk3() {
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+ local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
+ [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
+
+ "${updater}" --update-cache
}
# @FUNCTION: gnome2_disable_deprecation_warning
@@ -501,7 +480,7 @@ gnome2_disable_deprecation_warning() {
LC_ALL=C sed -r -i \
-e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
- -e 's:-DGSEAL_ENABLE:$(NULL):g' \
+ -e 's:-DGSEAL_ENABLE+[A-Z_]:$(NULL):g' \
-i "${makefile}"
if [[ $? -ne 0 ]]; then
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 24635a9..f77dace 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -14,6 +14,13 @@ inherit eutils fdo-mime libtool gnome.org gnome2-utils
case "${EAPI:-0}" in
0|1)
+ eqawarn
+ eqawarn "${CATEGORY}/${PF}: EAPI 0/1 support is now deprecated."
+ eqawarn "If you are the package maintainer, please"
+ eqawarn "update this package to a newer EAPI."
+ eqawarn "Support for EAPIs 0 and 1 for gnome2.eclass will be dropped"
+ eqawarn "in a month (around 23rd December)."
+ eqawarn
EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
2|3|4|5)
@@ -22,23 +29,6 @@ case "${EAPI:-0}" in
*) die "EAPI=${EAPI} is not supported" ;;
esac
-#if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
-# die "
-#
-#The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
-#These are unstable, potentially incompatible with 3.2, and may well
-#break your system in intriguing ways.
-#
-#If you enabled the GNOME overlay to get GNOME 3.2, please disable
-#it now, since GNOME 3.2 is already in portage and unmasked.
-#
-#If you really do want experimental GNOME 3.3.x, please add
-#I_WANT_GNOME_3_3_X=yes
-#to your /etc/make.conf and continue.
-#
-#"
-#fi
-
# @ECLASS-VARIABLE: G2CONF
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -102,17 +92,6 @@ gnome2_src_unpack() {
# Prepare environment for build, fix build of scrollkeeper documentation,
# run elibtoolize.
gnome2_src_prepare() {
- # Reset various variables inherited via the environment.
- # Causes test failures, introspection-build failures, and access violations
- # FIXME: seems to have no effect for exported variables, at least with
- # portage-2.2.0_alpha74
- unset DBUS_SESSION_BUS_ADDRESS
- unset DISPLAY
- unset GNOME_KEYRING_CONTROL
- unset GNOME_KEYRING_PID
- unset XAUTHORITY
- unset XDG_SESSION_COOKIE
-
# Prevent assorted access violations and test failures
gnome2_environment_reset
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 8ac199a..49c9e36 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -26,8 +26,8 @@ esac
# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
# @DESCRIPTION:
-# Minimum vala API version (e.g. 0.18).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.18}
+# Minimum vala API version (e.g. 0.20).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.20}
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
@@ -50,7 +50,7 @@ vala_api_versions() {
local minimal_supported_minor_version minor_version
# Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
- minimal_supported_minor_version="18"
+ minimal_supported_minor_version="20"
for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
if ((minor_version >= minimal_supported_minor_version)); then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 1dc3e93d1d1aab43e5cea648336785a17010260b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:05:55 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:05:55 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1dc3e93d
eclass/gnome2-live.eclass: switch to git-r3
Seems to work just fine and has submodule checkout working out of the
box which should fix bug #508964.
---
eclass/gnome2-live.eclass | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 11424ef..286c6ee 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -14,7 +14,7 @@
# Always to be imported *AFTER* gnome2.eclass
#
-inherit autotools gnome2 gnome2-utils libtool git-2
+inherit autotools gnome2 gnome2-utils libtool git-r3
# Stolen from git.eclass
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
@@ -78,7 +78,7 @@ gnome2-live_src_unpack() {
if test -n "${A}"; then
unpack ${A}
fi
- git-2_src_unpack
+ git-r3_src_unpack
has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
}
@@ -88,9 +88,6 @@ gnome2-live_src_unpack() {
# Creates blank ChangeLog and necessary macro dirs. Runs various autotools
# programs if required, and finally runs eautoreconf.
gnome2-live_src_prepare() {
- # Blame git.eclass
- cd "${S}"
-
for i in ${PATCHES}; do
epatch "${i}"
done
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 33350aa465751806b3a3aab344aead4ccb07f682
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:12:17 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:12:17 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=33350aa4
eclass/vala.eclass: sync with gentoo-x86
Invalid slot filtering.
---
eclass/vala.eclass | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index c2c6282..8ac199a 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.8 2014/05/04 06:13:55 tetromino Exp $
+# $Header: $
# @ECLASS: vala.eclass
# @MAINTAINER:
@@ -44,7 +44,19 @@ VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.26}
# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
# VALA_MIN_API_VERSION.
vala_api_versions() {
- eval "echo 0.{${VALA_MAX_API_VERSION#0.}..${VALA_MIN_API_VERSION#0.}..2}"
+ [[ ${VALA_MIN_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MIN_API_VERSION"
+ [[ ${VALA_MAX_API_VERSION} =~ ^0\.[[:digit:]]+$ ]] || die "Invalid syntax of VALA_MAX_API_VERSION"
+
+ local minimal_supported_minor_version minor_version
+
+ # Dependency atoms are not generated for Vala versions older than 0.${minimal_supported_minor_version}.
+ minimal_supported_minor_version="18"
+
+ for ((minor_version = ${VALA_MAX_API_VERSION#*.}; minor_version >= ${VALA_MIN_API_VERSION#*.}; minor_version = minor_version - 2)); do
+ if ((minor_version >= minimal_supported_minor_version)); then
+ echo "0.${minor_version}"
+ fi
+ done
}
# @FUNCTION: vala_depend
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: aa7722c3d97d1bfea987ff74fba2b35ae278d046
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:11:32 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:11:32 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=aa7722c3
eclass/gnome2-utils.eclass: sync with gentoo-x86
Support for multilib gdk-pixbuf.
---
eclass/gnome2-utils.eclass | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index a70e322..3ec3c4d 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.33 2013/09/15 19:29:11 pacho Exp $
+# $Header: $
# @ECLASS: gnome2-utils.eclass
# @MAINTAINER:
@@ -52,12 +52,6 @@ esac
# Path to glib-compile-schemas
: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-# @ECLASS-VARIABLE: GDK_PIXBUF_UPDATE_BIN
-# @INTERNAL
-# @DESCRIPTION:
-# Path to gdk-pixbuf-query-loaders
-: ${GDK_PIXBUF_UPDATE_BIN:="/usr/bin/gdk-pixbuf-query-loaders"}
-
# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
# @INTERNAL
# @DEFAULT_UNSET
@@ -409,7 +403,7 @@ gnome2_schemas_update() {
gnome2_gdk_pixbuf_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" 1>/dev/null
- export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find "usr/$(get_libdir)/gdk-pixbuf-2.0" -type f 2>/dev/null)
+ export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
popd 1>/dev/null
}
@@ -420,7 +414,11 @@ gnome2_gdk_pixbuf_savelist() {
# This function should be called from pkg_postinst and pkg_postrm.
gnome2_gdk_pixbuf_update() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GDK_PIXBUF_UPDATE_BIN}"
+ local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders"
+
+ if [[ ! -x ${updater} ]]; then
+ updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders"
+ fi
if [[ ! -x ${updater} ]]; then
debug-print "${updater} is not executable"
@@ -436,7 +434,8 @@ gnome2_gdk_pixbuf_update() {
local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
${updater} 1> "${tmp_file}" &&
chmod 0644 "${tmp_file}" &&
- mv -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
+ rm "${tmp_file}" # don't replace this with mv, required for SELinux support
eend $?
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: f936ed1f9bd63c94d5ef25a6c67e89f59a807828
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:06:59 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:06:59 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f936ed1f
eclass/gnome2-live.eclass: enable epatch_user
Will ease users life when testing out live tree.
---
eclass/gnome2-live.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 286c6ee..627f93e 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -14,7 +14,7 @@
# Always to be imported *AFTER* gnome2.eclass
#
-inherit autotools gnome2 gnome2-utils libtool git-r3
+inherit autotools eutils gnome2 gnome2-utils libtool git-r3
# Stolen from git.eclass
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
@@ -92,6 +92,8 @@ gnome2-live_src_prepare() {
epatch "${i}"
done
+ epatch_user
+
# If ChangeLog doesn't exist, maybe it's autogenerated
# Avoid a `dodoc` failure by adding an empty ChangeLog
if ! test -e ChangeLog; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 3506e079c6d3da91ea7a0b501a1d13616eff0c34
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:07:36 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:07:36 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3506e079
eclass/gnome2-live.eclass: use eautoreconf power
Someone (I think flameeyes) made eautoreconf do this for us a few months
ago. Let us just use it and be happy.
---
eclass/gnome2-live.eclass | 55 ++---------------------------------------------
1 file changed, 2 insertions(+), 53 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 627f93e..1a32b2a 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -100,59 +100,8 @@ gnome2-live_src_prepare() {
echo > ChangeLog
fi
- # Find and create macro dirs
- local macro_dirs=($(gnome2-live_get_var AC_CONFIG_MACRO_DIR configure.*))
- for i in "${macro_dirs[@]}"; do
- mkdir -p "$i"
- done
-
- # We don't run gettextize because that does too much stuff
- if grep -qe 'GETTEXT' configure.*; then
- # Generate po/Makefile.in.in if it doesn't exist for packages that use
- # AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION (e.g. media-libs/cogl).
- # Logic is inspired by gnome-autogen.sh
- if ! grep -qe '^AM_GLIB_GNU_GETTEXT' configure.* &&
- grep -qe '^AM_GNU_GETTEXT_VERSION' configure.* &&
- [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
- eautopoint --force
- fi
- local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
- mkdir -p "${aux_dir}"
- test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"
- test -e "${aux_dir}/ABOUT-NLS" || cp "${ROOT}/usr/share/gettext/ABOUT-NLS" "${aux_dir}"
- fi
-
- if grep -qe 'GTK_DOC' configure.*; then
- ebegin "Running gtkdocize"
- gtkdocize
- eend $?
- fi
- if grep -qe 'GNOME_DOC_INIT' configure.*; then
- ebegin "Running gnome-doc-common"
- gnome-doc-common
- eend $?
- ebegin "Running gnome-doc-prepare --automake"
- gnome-doc-prepare --automake
- eend $?
- fi
- if grep -qe "IT_PROG_INTLTOOL" -e "AC_PROG_INTLTOOL" configure.*; then
- if grep -qe "AC_PROG_INTLTOOL" configure.*; then
- eqawarn "This package is using deprecated AC_PROG_INTLTOOL macro."
- eqawarn "Please fill a bug to the upstream of this package."
- fi
- ebegin "Running intltoolize --force"
- intltoolize --force
- eend $?
- fi
- if test -e m4; then
- AT_M4DIR=m4 eautoreconf
- else
- eautoreconf
- fi
-
- # Disable pyc compiling. Doesn't harm if DNE
- echo > py-compile
- chmod +x py-compile
+ # eautoreconf is smart enough to run all necessary commands
+ eautoreconf
### Keep this in-sync with gnome2.eclass!
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-03 23:24 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-03 23:24 UTC (permalink / raw
To: gentoo-commits
commit: a1b31140f22020e06651500b999ebd39d0653419
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 3 23:08:36 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 3 23:08:36 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a1b31140
eclass/gnome2-live.eclass: sync bits with gnome2.eclass
---
eclass/gnome2-live.eclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 1a32b2a..f01dea0 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -109,6 +109,9 @@ gnome2-live_src_prepare() {
# causes test and introspection-building failures
unset DBUS_SESSION_BUS_ADDRESS
+ # Prevent assorted access violations and test failures
+ gnome2_environment_reset
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-11-02 15:58 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-02 15:58 UTC (permalink / raw
To: gentoo-commits
commit: f793496cbf2ce2827019e775c75c99397945e718
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 2 14:08:55 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 2 14:08:55 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f793496c
eclass/vala.eclass: use on-if-missing USE flag notation
As discussed on the mail alias.
---
eclass/vala.eclass | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 38feda2..c2c6282 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -53,15 +53,11 @@ vala_api_versions() {
# VALA_MIN_API_VERSION
vala_depend() {
local u v versions=$(vala_api_versions)
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
echo -n "|| ("
for v in ${versions}; do
- if [[ "$v" = "0.26" ]]; then
- echo -n " dev-lang/vala:${v}"
- else
- echo -n " dev-lang/vala:${v}${u}"
- fi
+ echo -n " dev-lang/vala:${v}${u}"
done
echo " )"
}
@@ -72,13 +68,9 @@ vala_depend() {
# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
vala_best_api_version() {
local u v
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}(+)]"
for v in $(vala_api_versions); do
- if [[ "$v" = "0.26" ]]; then
- has_version "dev-lang/vala:${v}" && echo "${v}" && return
- else
- has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
- fi
+ has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
done
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-04-20 23:44 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 23:44 UTC (permalink / raw
To: gentoo-commits
commit: ef659445f388bb0dd8ae57609bf77ef88fa3e00f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 23:42:07 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 23:43:39 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ef659445
eclass: add vala.eclass with 0.24 support
---
eclass/vala.eclass | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 137 insertions(+)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
new file mode 100644
index 0000000..b3ae5c5
--- /dev/null
+++ b/eclass/vala.eclass
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.7 2013/10/04 22:11:54 tetromino Exp $
+
+# @ECLASS: vala.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @AUTHOR:
+# Alexandre Rostovtsev <tetromino@gentoo.org>
+# @BLURB: Sets up the environment for using a specific version of vala.
+# @DESCRIPTION:
+# This eclass sets up commonly used environment variables for using a specific
+# version of dev-lang/vala to configure and build a package. It is needed for
+# packages whose build systems assume the existence of certain unversioned vala
+# executables, pkgconfig files, etc., which Gentoo does not provide.
+#
+# This eclass provides one phase function: src_prepare.
+
+inherit eutils multilib
+
+case "${EAPI:-0}" in
+ 0) die "EAPI=0 is not supported" ;;
+ 1) ;;
+ *) EXPORT_FUNCTIONS src_prepare ;;
+esac
+
+# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
+# @DESCRIPTION:
+# Minimum vala API version (e.g. 0.16).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.10}
+
+# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
+# @DESCRIPTION:
+# Maximum vala API version (e.g. 0.20).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.24}
+
+# @ECLASS-VARIABLE: VALA_USE_DEPEND
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# USE dependencies that vala must be built with (e.g. vapigen).
+
+# @FUNCTION: vala_api_versions
+# @DESCRIPTION:
+# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
+# VALA_MIN_API_VERSION.
+vala_api_versions() {
+ eval "echo 0.{${VALA_MAX_API_VERSION#0.}..${VALA_MIN_API_VERSION#0.}..2}"
+}
+
+# @FUNCTION: vala_depend
+# @DESCRIPTION:
+# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to
+# VALA_MIN_API_VERSION
+vala_depend() {
+ local u v versions=$(vala_api_versions)
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+
+ echo -n "|| ("
+ for v in ${versions}; do
+ echo -n " dev-lang/vala:${v}${u}"
+ done
+ echo " )"
+}
+
+# @FUNCTION: vala_best_api_version
+# @DESCRIPTION:
+# Returns the highest installed vala API version satisfying
+# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
+vala_best_api_version() {
+ local u v
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+ for v in $(vala_api_versions); do
+ has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
+ done
+}
+
+# @FUNCTION: vala_src_prepare
+# @USAGE: [--ignore-use] [--vala-api-version api_version]
+# @DESCRIPTION:
+# Sets up the environment variables and pkgconfig files for the
+# specified API version, or, if no version is specified, for the
+# highest installed vala API version satisfying
+# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
+# Is a no-op if called without --ignore-use when USE=-vala.
+# Dies if the USE check is passed (or ignored) and a suitable vala
+# version is not available.
+vala_src_prepare() {
+ local p d valafoo version ignore_use
+
+ while [[ $1 ]]; do
+ case $1 in
+ "--ignore-use" )
+ ignore_use=1 ;;
+ "--vala-api-version" )
+ shift
+ version=$1
+ [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter."
+ esac
+ shift
+ done
+
+ if [[ -z ${ignore_use} ]]; then
+ in_iuse vala && ! use vala && return 0
+ fi
+
+ if [[ ${version} ]]; then
+ has_version "dev-lang/vala:${version}" || die "No installed vala:${version}"
+ else
+ version=$(vala_best_api_version)
+ [[ ${version} ]] || die "No installed vala in $(vala_depend)"
+ fi
+
+ export VALAC=$(type -P valac-${version})
+
+ valafoo=$(type -P vala-gen-introspect-${version})
+ [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT="${valafoo}"
+
+ valafoo=$(type -P vapigen-${version})
+ [[ ${valafoo} ]] && export VAPIGEN="${valafoo}"
+
+ valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen"
+ [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}"
+
+ export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi"
+
+ mkdir -p "${T}/pkgconfig" || die "mkdir failed"
+ for p in libvala vapigen; do
+ for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do
+ if [[ -e ${d}/${p}-${version}.pc ]]; then
+ ln -s "${d}/${p}-${version}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed"
+ break
+ fi
+ done
+ done
+ : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}
+ export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}"
+}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2014-04-20 22:57 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 22:57 UTC (permalink / raw
To: gentoo-commits
commit: d214c68e9c43c08bf998ea34c9b4faa42ca82586
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 20:15:41 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 22:54:52 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d214c68e
eclass/gnome2.eclass: sync with gentoo-x86
---
eclass/gnome2.eclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index af95a5b..24635a9 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -191,6 +191,11 @@ gnome2_src_configure() {
G2CONF="--enable-compile-warnings=minimum ${G2CONF}"
fi
+ # Pass --docdir with proper directory, bug #482646
+ if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then
+ G2CONF="--docdir="${EPREFIX}"/usr/share/doc/${PF} ${G2CONF}"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2013-12-11 23:44 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-11 23:44 UTC (permalink / raw
To: gentoo-commits
commit: 6e514c4c1a602f3a97e276f6e07084561f3ae897
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 23:41:34 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 23:43:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6e514c4c
eclass: sync with gentoo-x86
---
eclass/gnome2-utils.eclass | 98 ++++++++++++++++++++++++++++++++++++----------
eclass/gnome2.eclass | 31 +++++++--------
2 files changed, 92 insertions(+), 37 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 2da7528..a70e322 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.31 2012/10/27 22:24:10 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.33 2013/09/15 19:29:11 pacho Exp $
# @ECLASS: gnome2-utils.eclass
# @MAINTAINER:
@@ -15,6 +15,8 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
+inherit multilib
+
case "${EAPI:-0}" in
0|1|2|3|4|5) ;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -50,6 +52,12 @@ esac
# Path to glib-compile-schemas
: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
+# @ECLASS-VARIABLE: GDK_PIXBUF_UPDATE_BIN
+# @INTERNAL
+# @DESCRIPTION:
+# Path to gdk-pixbuf-query-loaders
+: ${GDK_PIXBUF_UPDATE_BIN:="/usr/bin/gdk-pixbuf-query-loaders"}
+
# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
# @INTERNAL
# @DEFAULT_UNSET
@@ -74,6 +82,12 @@ esac
# @DESCRIPTION:
# List of GSettings schemas provided by the package
+# @ECLASS-VARIABLE: GNOME2_ECLASS_GDK_PIXBUF_LOADERS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of gdk-pixbuf loaders provided by the package
+
DEPEND=">=sys-apps/sed-4"
@@ -387,34 +401,78 @@ gnome2_schemas_update() {
eend $?
}
+# @FUNCTION: gnome2_gdk_pixbuf_savelist
+# @DESCRIPTION:
+# Find if there is any gdk-pixbuf loader to install and save the list in
+# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable.
+# This function should be called from pkg_preinst.
+gnome2_gdk_pixbuf_savelist() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+ pushd "${ED}" 1>/dev/null
+ export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find "usr/$(get_libdir)/gdk-pixbuf-2.0" -type f 2>/dev/null)
+ popd 1>/dev/null
+}
+
+# @FUNCTION: gnome2_gdk_pixbuf_update
+# @USAGE: gnome2_gdk_pixbuf_update
+# @DESCRIPTION:
+# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_gdk_pixbuf_update() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${GDK_PIXBUF_UPDATE_BIN}"
+
+ if [[ ! -x ${updater} ]]; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then
+ debug-print "gdk-pixbuf loader cache does not need an update"
+ return
+ fi
+
+ ebegin "Updating gdk-pixbuf loader cache"
+ local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+ ${updater} 1> "${tmp_file}" &&
+ chmod 0644 "${tmp_file}" &&
+ mv -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+ eend $?
+}
+
+
# @FUNCTION: gnome2_query_immodules_gtk2
# @USAGE: gnome2_query_immodules_gtk2
# @DESCRIPTION:
# Updates gtk2 immodules/gdk-pixbuf loaders listing.
gnome2_query_immodules_gtk2() {
- local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
+ if has_version ">=x11-libs/gtk+-2.24.20:2"; then
+ "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" --update-cache
+ else
+ local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
- local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
- local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- local gtk_conf_dir=$(dirname "${gtk_conf}")
+ local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+ local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ local gtk_conf_dir=$(dirname "${gtk_conf}")
- einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
- einfo "-> ${gtk_conf}"
+ einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+ einfo "-> ${gtk_conf}"
- mkdir -p "${gtk_conf_dir}"
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
- if [ -z "${tmp_file}" ]; then
- ewarn "gtk_query_immodules: cannot create temporary file"
- return 1
- fi
+ mkdir -p "${gtk_conf_dir}"
+ local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+ if [ -z "${tmp_file}" ]; then
+ ewarn "gtk_query_immodules: cannot create temporary file"
+ return 1
+ fi
- if ${query_exec} > "${tmp_file}"; then
- cat "${tmp_file}" > "${gtk_conf}" || \
- ewarn "Failed to write to ${gtk_conf}"
- else
- ewarn "Cannot update gtk.immodules, file generation failed"
+ if ${query_exec} > "${tmp_file}"; then
+ cat "${tmp_file}" > "${gtk_conf}" || \
+ ewarn "Failed to write to ${gtk_conf}"
+ else
+ ewarn "Cannot update gtk.immodules, file generation failed"
+ fi
+ rm "${tmp_file}"
fi
- rm "${tmp_file}"
}
# @FUNCTION: gnome2_query_immodules_gtk3
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 53ffe22..af95a5b 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -150,7 +150,7 @@ gnome2_src_configure() {
# Remember to drop 'doc' USE flag from your package if it was only used to
# rebuild docs.
# Preserve old behavior for older EAPI.
- if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
+ if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then
if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
else
@@ -160,32 +160,37 @@ gnome2_src_configure() {
# Pass --disable-maintainer-mode when needed
if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
- ${ECONF_SOURCE:-.}/configure.*; then
+ "${ECONF_SOURCE:-.}"/configure.*; then
G2CONF="--disable-maintainer-mode ${G2CONF}"
fi
# Pass --disable-scrollkeeper when possible
- if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-scrollkeeper" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-scrollkeeper ${G2CONF}"
fi
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
if has ${EAPI:-0} 0 1 2 3 4; then
- if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-silent-rules ${G2CONF}"
fi
fi
# Pass --disable-schemas-install when possible
- if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-schemas-install ${G2CONF}"
fi
# Pass --disable-schemas-compile when possible
- if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
+ if grep -q "disable-schemas-compile" "${ECONF_SOURCE:-.}"/configure; then
G2CONF="--disable-schemas-compile ${G2CONF}"
fi
+ # Pass --enable-compile-warnings=minimum as we don't want -Werror* flags, bug #471336
+ if grep -q "enable-compile-warnings" "${ECONF_SOURCE:-.}"/configure; then
+ G2CONF="--enable-compile-warnings=minimum ${G2CONF}"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
@@ -231,17 +236,7 @@ gnome2_src_install() {
dodoc ${DOCS} || die "dodoc failed"
fi
else
- if ! declare -p DOCS >/dev/null 2>&1 ; then
- local d
- for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
- FAQ CREDITS CHANGELOG ; do
- [[ -s "${d}" ]] && dodoc "${d}"
- done
- elif declare -p DOCS | grep -q '^declare -a' ; then
- dodoc "${DOCS[@]}"
- else
- dodoc ${DOCS}
- fi
+ einstalldocs
fi
# Do not keep /var/lib/scrollkeeper because:
@@ -281,6 +276,7 @@ gnome2_pkg_preinst() {
gnome2_icon_savelist
gnome2_schemas_savelist
gnome2_scrollkeeper_savelist
+ gnome2_gdk_pixbuf_savelist
}
# @FUNCTION: gnome2_pkg_postinst
@@ -294,6 +290,7 @@ gnome2_pkg_postinst() {
gnome2_icon_cache_update
gnome2_schemas_update
gnome2_scrollkeeper_update
+ gnome2_gdk_pixbuf_update
# This should only be in the overlay
ewarn "**************************************************************"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2013-01-16 22:56 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2013-01-16 22:56 UTC (permalink / raw
To: gentoo-commits
commit: a6ed6a0f98ba1f7a297862bd1b46063e8d400465
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 22:55:31 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 22:55:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a6ed6a0f
eclass/gnome2.eclass: sync documentation updates with gx86
---
eclass/gnome2.eclass | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 592585c..53ffe22 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: gnome2.eclass
# @MAINTAINER:
# gnome@gentoo.org
-# @BLURB:
+# @BLURB: Provides phases for Gnome/Gtk+ based packages.
# @DESCRIPTION:
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
@@ -40,7 +40,7 @@ esac
#fi
# @ECLASS-VARIABLE: G2CONF
-# @DEFAULT-UNSET
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Extra configure opts passed to econf
G2CONF=${G2CONF:-""}
@@ -56,20 +56,19 @@ else
fi
# @ECLASS-VARIABLE: ELTCONF
-# @DEFAULT-UNSET
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-""}
# @ECLASS-VARIABLE: USE_EINSTALL
-# @DEFAULT-UNSET
-# @DEPRECATED
+# @DEFAULT_UNSET
# @DESCRIPTION:
-# Should we use EINSTALL instead of DESTDIR
+# Should we use EINSTALL instead of DESTDIR. DEPRECATED
USE_EINSTALL=${USE_EINSTALL:-""}
# @ECLASS-VARIABLE: DOCS
-# @DEFAULT-UNSET
+# @DEFAULT_UNSET
# @DESCRIPTION:
# String containing documents passed to dodoc command.
@@ -304,8 +303,6 @@ gnome2_pkg_postinst() {
ewarn "**************************************************************"
}
-# @#FUNCTION: gnome2_pkg_prerm
-# @#DESCRIPTION:
# # FIXME Handle GConf schemas removal
#gnome2_pkg_prerm() {
# gnome2_gconf_uninstall
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-29 20:21 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-29 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 9f3214f45f22cc805686d6e8b1a3e0ce8fa92449
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:22:30 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 17:55:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9f3214f4
eclass: add gnome2-utils.eclass for local tests
---
eclass/gnome2-utils.eclass | 466 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 466 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
new file mode 100644
index 0000000..2da7528
--- /dev/null
+++ b/eclass/gnome2-utils.eclass
@@ -0,0 +1,466 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.31 2012/10/27 22:24:10 tetromino Exp $
+
+# @ECLASS: gnome2-utils.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @BLURB: Auxiliary functions commonly used by Gnome packages.
+# @DESCRIPTION:
+# This eclass provides a set of auxiliary functions needed by most Gnome
+# packages. It may be used by non-Gnome packages as needed for handling various
+# Gnome stack related functions such as:
+# * Gtk+ icon cache management
+# * GSettings schemas management
+# * GConf schemas management
+# * scrollkeeper (old Gnome help system) management
+
+case "${EAPI:-0}" in
+ 0|1|2|3|4|5) ;;
+ *) die "EAPI=${EAPI} is not supported" ;;
+esac
+
+# @ECLASS-VARIABLE: GCONFTOOL_BIN
+# @INTERNAL
+# @DESCRIPTION:
+# Path to gconftool-2
+: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
+
+# @ECLASS-VARIABLE: SCROLLKEEPER_DIR
+# @INTERNAL
+# @DESCRIPTION:
+# Directory where scrollkeeper-update should do its work
+: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
+
+# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE_BIN
+# @INTERNAL
+# @DESCRIPTION:
+# Path to scrollkeeper-update
+: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
+
+# @ECLASS-VARIABLE: GTK_UPDATE_ICON_CACHE
+# @INTERNAL
+# @DESCRIPTION:
+# Path to gtk-update-icon-cache
+: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
+
+# @ECLASS-VARIABLE: GLIB_COMPILE_SCHEMAS
+# @INTERNAL
+# @DESCRIPTION:
+# Path to glib-compile-schemas
+: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
+
+# @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of GConf schemas provided by the package
+
+# @ECLASS-VARIABLE: GNOME2_ECLASS_ICONS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of icons provided by the package
+
+# @ECLASS-VARIABLE: GNOME2_ECLASS_SCROLLS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of scrolls (documentation files) provided by the package
+
+# @ECLASS-VARIABLE: GNOME2_ECLASS_GLIB_SCHEMAS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of GSettings schemas provided by the package
+
+DEPEND=">=sys-apps/sed-4"
+
+
+# @FUNCTION: gnome2_environment_reset
+# @DESCRIPTION:
+# Reset various variables inherited from root's evironment to a reasonable
+# default for ebuilds to help avoid access violations and test failures.
+gnome2_environment_reset() {
+ # Respected by >=glib-2.30.1-r1
+ export G_HOME="${T}"
+
+ # GST_REGISTRY is to work around gst utilities trying to read/write /root
+ export GST_REGISTRY="${T}/registry.xml"
+
+ # XXX: code for resetting XDG_* directories should probably be moved into
+ # a separate function in a non-gnome eclass
+ export XDG_DATA_HOME="${T}/.local/share"
+ export XDG_CONFIG_HOME="${T}/.config"
+ export XDG_CACHE_HOME="${T}/.cache"
+ export XDG_RUNTIME_DIR="${T}/run"
+ mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
+ "${XDG_RUNTIME_DIR}"
+ # This directory needs to be owned by the user, and chmod 0700
+ # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ chmod 0700 "${XDG_RUNTIME_DIR}"
+}
+
+# @FUNCTION: gnome2_gconf_savelist
+# @DESCRIPTION:
+# Find the GConf schemas that are about to be installed and save their location
+# in the GNOME2_ECLASS_SCHEMAS environment variable.
+# This function should be called from pkg_preinst.
+gnome2_gconf_savelist() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+ pushd "${ED}" &> /dev/null
+ export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
+ popd &> /dev/null
+}
+
+# @FUNCTION: gnome2_gconf_install
+# @DESCRIPTION:
+# Applies any schema files installed by the current ebuild to Gconf's database
+# using gconftool-2.
+# This function should be called from pkg_postinst.
+gnome2_gconf_install() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${GCONFTOOL_BIN}"
+
+ if [[ ! -x "${updater}" ]]; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+ debug-print "No GNOME 2 GConf schemas found"
+ return
+ fi
+
+ # We are ready to install the GCONF Scheme now
+ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+ einfo "Installing GNOME 2 GConf schemas"
+
+ local F
+ for F in ${GNOME2_ECLASS_SCHEMAS}; do
+ if [[ -e "${EROOT}${F}" ]]; then
+ debug-print "Installing schema: ${F}"
+ "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
+ fi
+ done
+
+ # have gconf reload the new schemas
+ pids=$(pgrep -x gconfd-2)
+ if [[ $? == 0 ]] ; then
+ ebegin "Reloading GConf schemas"
+ kill -HUP ${pids}
+ eend $?
+ fi
+}
+
+# @FUNCTION: gnome2_gconf_uninstall
+# @DESCRIPTION:
+# Removes schema files previously installed by the current ebuild from Gconf's
+# database.
+gnome2_gconf_uninstall() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${GCONFTOOL_BIN}"
+
+ if [[ ! -x "${updater}" ]]; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
+ debug-print "No GNOME 2 GConf schemas found"
+ return
+ fi
+
+ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+ einfo "Uninstalling GNOME 2 GConf schemas"
+
+ local F
+ for F in ${GNOME2_ECLASS_SCHEMAS}; do
+ if [[ -e "${EROOT}${F}" ]]; then
+ debug-print "Uninstalling gconf schema: ${F}"
+ "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
+ fi
+ done
+
+ # have gconf reload the new schemas
+ pids=$(pgrep -x gconfd-2)
+ if [[ $? == 0 ]] ; then
+ ebegin "Reloading GConf schemas"
+ kill -HUP ${pids}
+ eend $?
+ fi
+}
+
+# @FUNCTION: gnome2_icon_savelist
+# @DESCRIPTION:
+# Find the icons that are about to be installed and save their location
+# in the GNOME2_ECLASS_ICONS environment variable.
+# This function should be called from pkg_preinst.
+gnome2_icon_savelist() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+ pushd "${ED}" &> /dev/null
+ export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+ popd &> /dev/null
+}
+
+# @FUNCTION: gnome2_icon_cache_update
+# @DESCRIPTION:
+# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
+# have installed anything under that location.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_icon_cache_update() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
+
+ if [[ ! -x "${updater}" ]] ; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
+ debug-print "No icon cache to update"
+ return
+ fi
+
+ ebegin "Updating icons cache"
+
+ local retval=0
+ local fails=( )
+
+ for dir in ${GNOME2_ECLASS_ICONS}
+ do
+ if [[ -f "${EROOT}${dir}/index.theme" ]] ; then
+ local rv=0
+
+ "${updater}" -qf "${EROOT}${dir}"
+ rv=$?
+
+ if [[ ! $rv -eq 0 ]] ; then
+ debug-print "Updating cache failed on ${EROOT}${dir}"
+
+ # Add to the list of failures
+ fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
+
+ retval=2
+ fi
+ elif [[ $(ls "${EROOT}${dir}") = "icon-theme.cache" ]]; then
+ # Clear stale cache files after theme uninstallation
+ rm "${EROOT}${dir}/icon-theme.cache"
+ fi
+
+ if [[ -z $(ls "${EROOT}${dir}") ]]; then
+ # Clear empty theme directories after theme uninstallation
+ rmdir "${EROOT}${dir}"
+ fi
+ done
+
+ eend ${retval}
+
+ for f in "${fails[@]}" ; do
+ eerror "Failed to update cache with icon $f"
+ done
+}
+
+# @FUNCTION: gnome2_omf_fix
+# @DESCRIPTION:
+# Workaround applied to Makefile rules in order to remove redundant
+# calls to scrollkeeper-update and sandbox violations.
+# This function should be called from src_prepare.
+gnome2_omf_fix() {
+ local omf_makefiles filename
+
+ omf_makefiles="$@"
+
+ if [[ -f ${S}/omf.make ]] ; then
+ omf_makefiles="${omf_makefiles} ${S}/omf.make"
+ fi
+
+ if [[ -f ${S}/gnome-doc-utils.make ]] ; then
+ omf_makefiles="${omf_makefiles} ${S}/gnome-doc-utils.make"
+ fi
+
+ # testing fixing of all makefiles found
+ # The sort is important to ensure .am is listed before the respective .in for
+ # maintainer mode regeneration not kicking in due to .am being newer than .in
+ for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
+ omf_makefiles="${omf_makefiles} ${filename}"
+ done
+
+ ebegin "Fixing OMF Makefiles"
+
+ local retval=0
+ local fails=( )
+
+ for omf in ${omf_makefiles} ; do
+ sed -i -e 's:scrollkeeper-update:true:' "${omf}"
+ retval=$?
+
+ if [[ $retval -ne 0 ]] ; then
+ debug-print "updating of ${omf} failed"
+
+ # Add to the list of failures
+ fails[$(( ${#fails[@]} + 1 ))]=$omf
+
+ retval=2
+ fi
+ done
+
+ eend $retval
+
+ for f in "${fails[@]}" ; do
+ eerror "Failed to update OMF Makefile $f"
+ done
+}
+
+# @FUNCTION: gnome2_scrollkeeper_savelist
+# @DESCRIPTION:
+# Find the scrolls that are about to be installed and save their location
+# in the GNOME2_ECLASS_SCROLLS environment variable.
+# This function should be called from pkg_preinst.
+gnome2_scrollkeeper_savelist() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+ pushd "${ED}" &> /dev/null
+ export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
+ popd &> /dev/null
+}
+
+# @FUNCTION: gnome2_scrollkeeper_update
+# @DESCRIPTION:
+# Updates the global scrollkeeper database.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_scrollkeeper_update() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${SCROLLKEEPER_UPDATE_BIN}"
+
+ if [[ ! -x "${updater}" ]] ; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then
+ debug-print "No scroll cache to update"
+ return
+ fi
+
+ ebegin "Updating scrollkeeper database ..."
+ "${updater}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
+ eend $?
+}
+
+# @FUNCTION: gnome2_schemas_savelist
+# @DESCRIPTION:
+# Find if there is any GSettings schema to install and save the list in
+# GNOME2_ECLASS_GLIB_SCHEMAS variable.
+# This function should be called from pkg_preinst.
+gnome2_schemas_savelist() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
+ pushd "${ED}" &>/dev/null
+ export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
+ popd &>/dev/null
+}
+
+# @FUNCTION: gnome2_schemas_update
+# @USAGE: gnome2_schemas_update
+# @DESCRIPTION:
+# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some.
+# This function should be called from pkg_postinst and pkg_postrm.
+gnome2_schemas_update() {
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
+
+ if [[ ! -x ${updater} ]]; then
+ debug-print "${updater} is not executable"
+ return
+ fi
+
+ if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
+ debug-print "No GSettings schemas to update"
+ return
+ fi
+
+ ebegin "Updating GSettings schemas"
+ ${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
+ eend $?
+}
+
+# @FUNCTION: gnome2_query_immodules_gtk2
+# @USAGE: gnome2_query_immodules_gtk2
+# @DESCRIPTION:
+# Updates gtk2 immodules/gdk-pixbuf loaders listing.
+gnome2_query_immodules_gtk2() {
+ local GTK2_CONFDIR="/etc/gtk-2.0/$(get_abi_CHOST)"
+
+ local query_exec="${EPREFIX}/usr/bin/gtk-query-immodules-2.0"
+ local gtk_conf="${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+ local gtk_conf_dir=$(dirname "${gtk_conf}")
+
+ einfo "Generating Gtk2 immodules/gdk-pixbuf loaders listing:"
+ einfo "-> ${gtk_conf}"
+
+ mkdir -p "${gtk_conf_dir}"
+ local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+ if [ -z "${tmp_file}" ]; then
+ ewarn "gtk_query_immodules: cannot create temporary file"
+ return 1
+ fi
+
+ if ${query_exec} > "${tmp_file}"; then
+ cat "${tmp_file}" > "${gtk_conf}" || \
+ ewarn "Failed to write to ${gtk_conf}"
+ else
+ ewarn "Cannot update gtk.immodules, file generation failed"
+ fi
+ rm "${tmp_file}"
+}
+
+# @FUNCTION: gnome2_query_immodules_gtk3
+# @USAGE: gnome2_query_immodules_gtk3
+# @DESCRIPTION:
+# Updates gtk3 immodules/gdk-pixbuf loaders listing.
+gnome2_query_immodules_gtk3() {
+ "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+}
+
+# @FUNCTION: gnome2_disable_deprecation_warning
+# @DESCRIPTION:
+# Disable deprecation warnings commonly found in glib based packages.
+# Should be called from src_prepare.
+gnome2_disable_deprecation_warning() {
+ local retval=0
+ local fails=( )
+ local makefile
+
+ ebegin "Disabling deprecation warnings"
+ # The sort is important to ensure .am is listed before the respective .in for
+ # maintainer mode regeneration not kicking in due to .am being newer than .in
+ while read makefile ; do
+ if ! grep -qE "(DISABLE_DEPRECATED|GSEAL_ENABLE)" "${makefile}"; then
+ continue
+ fi
+
+ LC_ALL=C sed -r -i \
+ -e 's:-D[A-Z_]+_DISABLE_DEPRECATED:$(NULL):g' \
+ -e 's:-DGSEAL_ENABLE:$(NULL):g' \
+ -i "${makefile}"
+
+ if [[ $? -ne 0 ]]; then
+ # Add to the list of failures
+ fails+=( "${makefile}" )
+ retval=2
+ fi
+ done < <(find "${S}" -name "Makefile.in" \
+ -o -name "Makefile.am" -o -name "Makefile.decl" \
+ | sort; echo configure)
+# TODO: sedding configure.ac can trigger maintainer mode; bug #439602
+# -o -name "configure.ac" -o -name "configure.in" \
+# | sort; echo configure)
+ eend ${retval}
+
+ for makefile in "${fails[@]}" ; do
+ ewarn "Failed to disable deprecation warnings in ${makefile}"
+ done
+}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-27 22:54 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-27 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 019c9a2db2f26aac9064626664b125d585371092
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:54:11 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:54:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=019c9a2d
eclass/gnome2.eclass: update wrt comment on bug #383901
---
eclass/gnome2.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 750f20b..592585c 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -260,7 +260,7 @@ gnome2_src_install() {
if has ${EAPI:-0} 0 1 2 3 4; then
if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
ebegin "Removing .la files"
- if ! { in_iuse static-libs && use static-libs; }; then
+ if ! use_if_iuse static-libs ; then
find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
fi
eend
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-27 22:51 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-27 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 6be2fa225f4655384af261dbf05307b8c30b97e9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:50:27 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:51:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6be2fa22
eclass/gnome2.eclass: allow ebuild override of eclass generated econf
---
eclass/gnome2.eclass | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e2540d1..750f20b 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -140,7 +140,7 @@ gnome2_src_configure() {
# Update the GNOME configuration options
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then
- G2CONF="${G2CONF} --enable-debug=yes"
+ G2CONF="--enable-debug=yes ${G2CONF}"
fi
fi
@@ -153,44 +153,44 @@ gnome2_src_configure() {
# Preserve old behavior for older EAPI.
if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
- G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+ G2CONF="$(use_enable doc gtk-doc) ${G2CONF}"
else
- G2CONF="${G2CONF} --disable-gtk-doc"
+ G2CONF="--disable-gtk-doc ${G2CONF}"
fi
fi
# Pass --disable-maintainer-mode when needed
if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
${ECONF_SOURCE:-.}/configure.*; then
- G2CONF="${G2CONF} --disable-maintainer-mode"
+ G2CONF="--disable-maintainer-mode ${G2CONF}"
fi
# Pass --disable-scrollkeeper when possible
if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
- G2CONF="${G2CONF} --disable-scrollkeeper"
+ G2CONF="--disable-scrollkeeper ${G2CONF}"
fi
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
if has ${EAPI:-0} 0 1 2 3 4; then
if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
- G2CONF="${G2CONF} --disable-silent-rules"
+ G2CONF="--disable-silent-rules ${G2CONF}"
fi
fi
# Pass --disable-schemas-install when possible
if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
- G2CONF="${G2CONF} --disable-schemas-install"
+ G2CONF="--disable-schemas-install ${G2CONF}"
fi
# Pass --disable-schemas-compile when possible
if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
- G2CONF="${G2CONF} --disable-schemas-compile"
+ G2CONF="--disable-schemas-compile ${G2CONF}"
fi
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
- econf "$@" ${G2CONF}
+ econf ${G2CONF} "$@"
}
# @FUNCTION: gnome2_src_compile
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-27 22:51 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-27 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 5ee04d7b026922353a92969a00c8fe8236b96985
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:39:05 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:51:26 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5ee04d7b
eclass/gnome2.eclass: drop deprecated SCROLLKEEPER_UPDATE
---
eclass/gnome2.eclass | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e263232..e2540d1 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -68,12 +68,6 @@ ELTCONF=${ELTCONF:-""}
# Should we use EINSTALL instead of DESTDIR
USE_EINSTALL=${USE_EINSTALL:-""}
-# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE
-# @DEPRECATED
-# @DESCRIPTION:
-# Whether to run scrollkeeper for this package or not.
-SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
-
# @ECLASS-VARIABLE: DOCS
# @DEFAULT-UNSET
# @DESCRIPTION:
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-27 22:19 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-27 22:19 UTC (permalink / raw
To: gentoo-commits
commit: f3c55f4fd61a2abccd1d7c528d76804e45da88a9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:03:47 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:03:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f3c55f4f
eclass/gnome2.eclass: switch IUSE tests to in_iuse, bug #383901
---
eclass/gnome2.eclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 70eb491..e263232 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -158,7 +158,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} 0 1 2 3 4 && has doc ${IUSE} ; then
+ if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
else
G2CONF="${G2CONF} --disable-gtk-doc"
@@ -266,7 +266,7 @@ gnome2_src_install() {
if has ${EAPI:-0} 0 1 2 3 4; then
if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
ebegin "Removing .la files"
- if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+ if ! { in_iuse static-libs && use static-libs; }; then
find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
fi
eend
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-27 22:19 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-27 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 49813f5a667e33eca42b50fde51b5bcc72920b5d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 22:03:40 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 27 22:03:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=49813f5a
eclass/gnome2.eclass: sync with gx86
---
eclass/gnome2.eclass | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 1c7e6f8..70eb491 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -150,11 +150,12 @@ gnome2_src_configure() {
fi
fi
- # 2012-11-25
# Starting with EAPI=5, we consider packages installing gtk-doc to be
# handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to
# relink URLs in documentation to already installed documentation.
# This decision also greatly helps with constantly broken doc generation.
+ # Remember to drop 'doc' USE flag from your package if it was only used to
+ # rebuild docs.
# Preserve old behavior for older EAPI.
if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
@@ -230,9 +231,24 @@ gnome2_src_install() {
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- # Manual document installation
- if [[ -n "${DOCS}" ]]; then
- dodoc ${DOCS} || die "dodoc failed"
+ # Handle documentation as 'default' for eapi5 and newer, bug #373131
+ if has ${EAPI:-0} 0 1 2 3 4; then
+ # Manual document installation
+ if [[ -n "${DOCS}" ]]; then
+ dodoc ${DOCS} || die "dodoc failed"
+ fi
+ else
+ if ! declare -p DOCS >/dev/null 2>&1 ; then
+ local d
+ for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+ FAQ CREDITS CHANGELOG ; do
+ [[ -s "${d}" ]] && dodoc "${d}"
+ done
+ elif declare -p DOCS | grep -q '^declare -a' ; then
+ dodoc "${DOCS[@]}"
+ else
+ dodoc ${DOCS}
+ fi
fi
# Do not keep /var/lib/scrollkeeper because:
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-16 14:16 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-16 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 0e16b6e189c5668558d379c6a2ddccc0602033cf
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 14:16:31 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 14:16:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0e16b6e1
eclass/gnome2.eclass: sync disable-schemas-compile from gx86
---
eclass/gnome2.eclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 59d5396..1c7e6f8 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -187,6 +187,11 @@ gnome2_src_configure() {
G2CONF="${G2CONF} --disable-schemas-install"
fi
+ # Pass --disable-schemas-compile when possible
+ if grep -q "disable-schemas-compile" ${ECONF_SOURCE:-.}/configure; then
+ G2CONF="${G2CONF} --disable-schemas-compile"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-16 14:16 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-16 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 2fa870eba1590fb08976fe0343b5f3e2ac79092f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 14:15:55 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 14:15:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2fa870eb
eclass/gnome2.eclass: sync ECONF_SOURCE fixes from gx86
---
eclass/gnome2.eclass | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 8fac19c..59d5396 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -156,7 +156,7 @@ gnome2_src_configure() {
# relink URLs in documentation to already installed documentation.
# This decision also greatly helps with constantly broken doc generation.
# Preserve old behavior for older EAPI.
- if grep -q "enable-gtk-doc" configure ; then
+ if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
else
@@ -165,24 +165,25 @@ gnome2_src_configure() {
fi
# Pass --disable-maintainer-mode when needed
- if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+ if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" \
+ ${ECONF_SOURCE:-.}/configure.*; then
G2CONF="${G2CONF} --disable-maintainer-mode"
fi
# Pass --disable-scrollkeeper when possible
- if grep -q "disable-scrollkeeper" configure; then
+ if grep -q "disable-scrollkeeper" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-scrollkeeper"
fi
# Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
if has ${EAPI:-0} 0 1 2 3 4; then
- if grep -q "disable-silent-rules" configure; then
+ if grep -q "disable-silent-rules" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-silent-rules"
fi
fi
# Pass --disable-schemas-install when possible
- if grep -q "disable-schemas-install" configure; then
+ if grep -q "disable-schemas-install" ${ECONF_SOURCE:-.}/configure; then
G2CONF="${G2CONF} --disable-schemas-install"
fi
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-05 21:59 Alexandre Rostovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Rostovtsev @ 2012-12-05 21:59 UTC (permalink / raw
To: gentoo-commits
commit: e4ebba0a9c562540055f933cf133f25ed61707b0
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 5 21:21:48 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 5 21:21:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e4ebba0a
eclass/gnome2-live.eclass: enable EAPI5
---
eclass/gnome2-live.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 897adf8..11424ef 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -19,7 +19,7 @@ inherit autotools gnome2 gnome2-utils libtool git-2
# Stolen from git.eclass
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
case "${EAPI:-0}" in
- 2|3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
+ 2|3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
0|1) ;;
*) die "Unknown EAPI, Bug eclass maintainers." ;;
esac
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-03 23:43 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-03 23:43 UTC (permalink / raw
To: gentoo-commits
commit: 0a19e7e55b7cbf372fa3e85294cf28b88734bc64
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 3 23:40:51 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 3 23:40:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0a19e7e5
eclass: gstreamer eclasses moved to gentoo-x86
---
eclass/gst-plugins-bad.eclass | 43 ------
eclass/gst-plugins-base.eclass | 31 -----
eclass/gst-plugins-good.eclass | 42 ------
eclass/gst-plugins-ugly.eclass | 31 -----
eclass/gst-plugins10.eclass | 276 ----------------------------------------
5 files changed, 0 insertions(+), 423 deletions(-)
diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass
deleted file mode 100644
index 1f20d6c..0000000
--- a/eclass/gst-plugins-bad.eclass
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: gst-plugins10-bad.eclass
-# @MAINTAINER:
-# gstreamer@gentoo.org
-# @AUTHOR:
-# Gilles Dartiguelongue <eva@gentoo.org>
-# Saleem Abdulrasool <compnerd@gentoo.org>
-# foser <foser@gentoo.org>
-# zaheerm <zaheerm@gentoo.org>
-# @BLURB: Manages build for invididual ebuild for gst-plugins-bad.
-# @DESCRIPTION:
-# See gst-plugins10.eclass documentation.
-
-GST_ORG_MODULE="gst-plugins-bad"
-
-inherit eutils gst-plugins10
-
-case "${EAPI:-0}" in
- 1|2|3|4|5)
- ;;
- 0)
- die "EAPI=\"${EAPI}\" is not supported anymore"
- ;;
- *)
- die "EAPI=\"${EAPI}\" is not supported yet"
- ;;
-esac
-
-
-if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
-# -bad-0.10.20 uses orc optionally instead of liboil unconditionally.
-# While <0.10.20 configure always check for liboil, it is used only by
-# non-split plugins in gst/ (legacyresample and mpegdemux), so we only
-# builddep for all old packages, and have a RDEPEND in old versions of
-# media-libs/gst-plugins-bad
- if [[ ${SLOT} = "0.10" ]] && ! version_is_at_least "0.10.20"; then
- DEPEND="${DEPEND} >=dev-libs/liboil-0.3.8"
- fi
-fi
-
diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass
deleted file mode 100644
index eb4bc84..0000000
--- a/eclass/gst-plugins-base.eclass
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: gst-plugins-base.eclass
-# @MAINTAINER:
-# gstreamer@gentoo.org
-# @AUTHOR:
-# Gilles Dartiguelongue <eva@gentoo.org>
-# Saleem Abdulrasool <compnerd@gentoo.org>
-# foser <foser@gentoo.org>
-# zaheerm <zaheerm@gentoo.org>
-# @BLURB: Manages build for invididual ebuild for gst-plugins-base.
-# @DESCRIPTION:
-# See gst-plugins10.eclass documentation.
-
-GST_ORG_MODULE="gst-plugins-base"
-
-inherit gst-plugins10
-
-case "${EAPI:-0}" in
- 1|2|3|4|5)
- ;;
- 0)
- die "EAPI=\"${EAPI}\" is not supported anymore"
- ;;
- *)
- die "EAPI=\"${EAPI}\" is not supported yet"
- ;;
-esac
-
diff --git a/eclass/gst-plugins-good.eclass b/eclass/gst-plugins-good.eclass
deleted file mode 100644
index a400b89..0000000
--- a/eclass/gst-plugins-good.eclass
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: gst-plugins-good.eclass
-# @MAINTAINER:
-# gstreamer@gentoo.org
-# @AUTHOR:
-# Gilles Dartiguelongue <eva@gentoo.org>
-# Saleem Abdulrasool <compnerd@gentoo.org>
-# foser <foser@gentoo.org>
-# zaheerm <zaheerm@gentoo.org>
-# @BLURB: Manages build for invididual ebuild for gst-plugins-good.
-# @DESCRIPTION:
-# See gst-plugins10.eclass documentation.
-
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit eutils gst-plugins10
-
-case "${EAPI:-0}" in
- 1|2|3|4|5)
- ;;
- 0)
- die "EAPI=\"${EAPI}\" is not supported anymore"
- ;;
- *)
- die "EAPI=\"${EAPI}\" is not supported yet"
- ;;
-esac
-
-
-if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
-# -good-0.10.24 uses orc optionally instead of liboil unconditionally.
-# While <0.10.24 configure always checks for liboil, it is linked to only by
-# non-split plugins in gst/, so we only builddep for all old packages, and have
-# a RDEPEND in old versions of media-libs/gst-plugins-good
- if [[ ${SLOT} = "0.10" ]] && ! version_is_at_least "0.10.24"; then
- DEPEND="${DEPEND} >=dev-libs/liboil-0.3.8"
- fi
-fi
-
diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass
deleted file mode 100644
index 787ce4f..0000000
--- a/eclass/gst-plugins-ugly.eclass
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: gst-plugins-ugly.eclass
-# @MAINTAINER:
-# gstreamer@gentoo.org
-# @AUTHOR:
-# Gilles Dartiguelongue <eva@gentoo.org>
-# Saleem Abdulrasool <compnerd@gentoo.org>
-# foser <foser@gentoo.org>
-# zaheerm <zaheerm@gentoo.org>
-# @BLURB: Manages build for invididual ebuild for gst-plugins-ugly.
-# @DESCRIPTION:
-# See gst-plugins10.eclass documentation.
-
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gst-plugins10
-
-case "${EAPI:-0}" in
- 1|2|3|4|5)
- ;;
- 0)
- die "EAPI=\"${EAPI}\" is not supported anymore"
- ;;
- *)
- die "EAPI=\"${EAPI}\" is not supported yet"
- ;;
-esac
-
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
deleted file mode 100644
index 835f09b..0000000
--- a/eclass/gst-plugins10.eclass
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: gst-plugins10.eclass
-# @MAINTAINER:
-# gstreamer@gentoo.org
-# @AUTHOR:
-# Gilles Dartiguelongue <eva@gentoo.org>
-# Saleem Abdulrasool <compnerd@gentoo.org>
-# foser <foser@gentoo.org>
-# zaheerm <zaheerm@gentoo.org>
-# @BLURB: Manages build for invididual ebuild for gst-plugins.
-# @DESCRIPTION:
-# Eclass to make external gst-plugins emergable on a per-plugin basis and
-# to solve the problem with gst-plugins generating far too much unneeded
-# dependancies.
-#
-# GStreamer consuming applications should depend on the specific plugins they
-# need as defined in their source code.
-#
-# In case of spider usage, obtain recommended plugins to use from Gentoo
-# developers responsible for gstreamer <gstreamer@gentoo.org> or the application
-# developer.
-
-inherit eutils multilib toolchain-funcs versionator
-
-GST_EXPF=""
-case "${EAPI:-0}" in
- 2|3|4|5)
- GST_EXPF="src_configure src_compile src_install"
- ;;
- 1)
- GST_EXPF="src_compile src_install"
- ;;
- 0)
- die "EAPI=\"${EAPI:-0}\" is not supported anymore"
- ;;
- *)
- die "EAPI=\"${EAPI}\" is not supported yet"
- ;;
-esac
-EXPORT_FUNCTIONS ${GST_EXPF}
-
-# @ECLASS-VARIABLE: GST_LA_PUNT
-# @DESCRIPTION:
-# Should we delete all the .la files?
-# NOT to be used without due consideration.
-if has "${EAPI:-0}" 0 1 2 3; then
- : ${GST_LA_PUNT:="no"}
-else
- : ${GST_LA_PUNT:="yes"}
-fi
-
-# @ECLASS-VARIABLE: GST_PLUGINS_BUILD
-# @DESCRIPTION:
-# Defines the plugins to be built.
-# May be set by an ebuild and contain more than one indentifier, space
-# seperated (only src_configure can handle mutiple plugins at this time).
-GST_PLUGINS_BUILD=${PN/gst-plugins-/}
-
-# @ECLASS-VARIABLE: GST_PLUGINS_BUILD_DIR
-# @DESCRIPTION:
-# Actual build directory of the plugin.
-# Most often the same as the configure switch name.
-GST_PLUGINS_BUILD_DIR=${PN/gst-plugins-/}
-
-# @ECLASS-VARIABLE: GST_TARBALL_SUFFIX
-# @DESCRIPTION:
-# Most projects hosted on gstreamer.freedesktop.org mirrors provide tarballs as
-# tar.bz2 or tar.xz. This eclass defaults to bz2 for EAPI 0, 1, 2, 3 and
-# defaults to xz for everything else. This is because the gstreamer mirrors
-# are moving to only have xz tarballs for new releases.
-if has "${EAPI:-0}" 0 1 2 3; then
- : ${GST_TARBALL_SUFFIX:="bz2"}
-else
- : ${GST_TARBALL_SUFFIX:="xz"}
-fi
-
-# Even though xz-utils are in @system, they must still be added to DEPEND; see
-# http://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml
-if [[ ${GST_TARBALL_SUFFIX} == "xz" ]]; then
- DEPEND="${DEPEND} app-arch/xz-utils"
-fi
-
-# @ECLASS-VARIABLE: GST_ORG_MODULE
-# @DESCRIPTION:
-# Name of the module as hosted on gstreamer.freedesktop.org mirrors.
-# Leave unset if package name matches module name.
-: ${GST_ORG_MODULE:=$PN}
-
-# @ECLASS-VARIABLE: GST_ORG_PVP
-# @INTERNAL
-# @DESCRIPTION:
-# Major and minor numbers of the version number.
-: ${GST_ORG_PVP:=$(get_version_component_range 1-2)}
-
-
-DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE}-${PV}.tar.${GST_TARBALL_SUFFIX}"
-
-LICENSE="GPL-2"
-SLOT="${GST_ORG_PVP}"
-
-S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
-
-RDEPEND="
- >=dev-libs/glib-2.6:2
- media-libs/gstreamer:${SLOT}
-"
-DEPEND="
- >=sys-apps/sed-4
- virtual/pkgconfig
-"
-
-if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
- # Do not run test phase for invididual plugin ebuilds.
- RESTRICT="test"
- RDEPEND="${RDEPEND} >=media-libs/${GST_ORG_MODULE}-${PV}:${SLOT}"
-else
- IUSE="nls"
- DEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )"
-fi
-
-#if [[ ${SLOT} == "0.10" ]]; then
-# XXX: verify with old ebuilds.
-# DEPEND="${DEPEND} dev-libs/liboil"
-#fi
-
-DEPEND="${DEPEND} ${RDEPEND}"
-
-# @FUNCTION: gst-plugins10_get_plugins
-# @INTERNAL
-# @DESCRIPTION:
-# Get the list of plugins requiring external dependencies.
-gst-plugins10_get_plugins() {
- # Must be called from src_prepare/src_configure
- GST_PLUGINS_LIST=$(sed -rn 's/^AG_GST_CHECK_FEATURE\((\w+),.*/ \1 /p' \
- "${S}"/configure.* | tr '[:upper:]' '[:lower:]')
-}
-
-# @FUNCTION: gst-plugins10_find_plugin_dir
-# @INTERNAL
-# @DESCRIPTION:
-# Finds plugin build directory and cd to it.
-gst-plugins10_find_plugin_dir() {
- if [[ ! -d ${S}/ext/${GST_PLUGINS_BUILD_DIR} ]]; then
- if [[ ! -d ${S}/sys/${GST_PLUGINS_BUILD_DIR} ]]; then
- ewarn "No such plugin directory"
- die
- fi
- einfo "Building system plugin ${GST_PLUGINS_BUILD_DIR} ..."
- cd "${S}"/sys/${GST_PLUGINS_BUILD_DIR}
- else
- einfo "Building external plugin ${GST_PLUGINS_BUILD_DIR} ..."
- cd "${S}"/ext/${GST_PLUGINS_BUILD_DIR}
- fi
-}
-
-# @FUNCTION: gst-plugins10_system_link
-# @USAGE: gst-plugins10_system_link gst-libs/gst/audio:gstreamer-audio [...]
-# @DESCRIPTION:
-# Walks through makefiles in order to make sure build will link against system
-# librairies.
-# Takes a list of path fragments and corresponding pkgconfig libraries
-# separated by colon (:). Will replace the path fragment by the output of
-# pkgconfig.
-gst-plugins10_system_link() {
- local directory libs pkgconfig pc tuple
- pkgconfig=$(tc-getPKG_CONFIG)
-
- gst-plugins10_find_plugin_dir
-
- for tuple in $@ ; do
- directory="$(echo ${tuple} | cut -f1 -d':')"
- pc="$(echo ${tuple} | cut -f2 -d':')-${SLOT}"
- libs="$(${pkgconfig} --libs-only-l ${pc})"
-
- sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
- -i Makefile.am Makefile.in || die
- done
-}
-
-# @FUNCTION: gst-plugins10_remove_unversioned_binaries
-# @INTERNAL
-# @DEPRECATED
-# @DESCRIPTION:
-# Remove the unversioned binaries gstreamer provides to prevent file collision
-# with other slots.
-gst-plugins10_remove_unversioned_binaries() {
- cd "${D}"/usr/bin
- local gst_bins
- for gst_bins in *-${SLOT} ; do
- [[ -e ${gst_bins} ]] || continue
- rm ${gst_bins/-${SLOT}/}
- einfo "Removed ${gst_bins/-${SLOT}/}"
- done
-}
-
-# @FUNCTION: gst-plugins10_src_configure
-gst-plugins10_src_configure() {
- local plugin gst_conf
-
- if has ${EAPI:-0} 0 1 2 3 ; then
- gst_conf="${gst_conf} --disable-dependency-tracking"
- fi
-
- if has ${EAPI:-0} 0 1 2 3 4 ; then
- gst_conf="${gst_conf} --disable-silent-rules"
- fi
-
- gst-plugins10_get_plugins
-
- for plugin in ${GST_PLUGINS_LIST} ; do
- if has ${plugin} ${GST_PLUGINS_BUILD} ; then
- gst_conf="${gst_conf} --enable-${plugin}"
- else
- gst_conf="${gst_conf} --disable-${plugin}"
- fi
- done
-
- if grep -q "ORC_CHECK" configure.* ; then
- if in_iuse orc ; then
- gst_conf="${gst_conf} $(use_enable orc)"
- else
- gst_conf="${gst_conf} --disable-orc"
- fi
- fi
-
- if grep -q "AM_MAINTAINER_MODE" configure.* ; then
- gst_conf="${gst_conf} --disable-maintainer-mode"
- fi
-
- if grep -q "disable-schemas-compile" configure ; then
- gst_conf="${gst_conf} --disable-schemas-compile"
- fi
-
- if [[ ${PN} == ${GST_ORG_MODULE} ]]; then
- gst_conf="${gst_conf} $(use_enable nls)"
- fi
-
- einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
- econf \
- --with-package-name="Gentoo GStreamer ebuild" \
- --with-package-origin="http://www.gentoo.org" \
- ${gst_conf} $@
-}
-
-# @FUNCTION: gst-plugins10_src_compile
-gst-plugins10_src_compile() {
- has ${EAPI:-0} 0 1 && gst-plugins10_src_configure "$@"
-
- gst-plugins10_find_plugin_dir
-
- if has "${EAPI:-0}" 0 1 2 3 ; then
- emake || die
- else
- default
- fi
-}
-
-# @FUNCTION: gst-plugins10_src_install
-gst-plugins10_src_install() {
- gst-plugins10_find_plugin_dir
-
- if has "${EAPI:-0}" 0 1 2 3 ; then
- emake install DESTDIR="${D}" || die
- [[ -e README ]] && dodoc README
- else
- default
- fi
-
- [[ ${GST_LA_PUNT} = "yes" ]] && prune_libtool_files --modules
-}
-
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-02 16:02 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-02 16:02 UTC (permalink / raw
To: gentoo-commits
commit: d4d5e1bdd68161dada9453da5a38581224fec4c3
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 16:02:40 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 16:02:40 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d4d5e1bd
eclass/gst-plugins10.eclass: add missing EAPI=1 compatibility code
---
eclass/gst-plugins10.eclass | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index e391b45..835f09b 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -27,8 +27,11 @@ inherit eutils multilib toolchain-funcs versionator
GST_EXPF=""
case "${EAPI:-0}" in
- 1|2|3|4|5)
- GST_EXPF="${GST_EXPF} src_configure src_compile src_install"
+ 2|3|4|5)
+ GST_EXPF="src_configure src_compile src_install"
+ ;;
+ 1)
+ GST_EXPF="src_compile src_install"
;;
0)
die "EAPI=\"${EAPI:-0}\" is not supported anymore"
@@ -246,6 +249,8 @@ gst-plugins10_src_configure() {
# @FUNCTION: gst-plugins10_src_compile
gst-plugins10_src_compile() {
+ has ${EAPI:-0} 0 1 && gst-plugins10_src_configure "$@"
+
gst-plugins10_find_plugin_dir
if has "${EAPI:-0}" 0 1 2 3 ; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-02 14:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-02 14:50 UTC (permalink / raw
To: gentoo-commits
commit: a1493bf1729411b3b06ede7bd73fc5d1994af255
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 14:09:54 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 14:49:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a1493bf1
eclass/gst-plugins10.eclass: cleanup/updates
* Fix cosmetic issue with EAPI=0 die message.
* Group R/DEPEND definitions.
* Add support for optional nls support for base pack plugins since
they do support it.
---
eclass/gst-plugins10.eclass | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index 4a18c36..db6102d 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -31,7 +31,7 @@ case "${EAPI:-0}" in
GST_EXPF="${GST_EXPF} src_configure src_compile src_install"
;;
0)
- die "EAPI=\"${EAPI}\" is not supported anymore"
+ die "EAPI=\"${EAPI:-0}\" is not supported anymore"
;;
*)
die "EAPI=\"${EAPI}\" is not supported yet"
@@ -100,34 +100,32 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE
LICENSE="GPL-2"
SLOT="${GST_ORG_PVP}"
-if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
- # Do not run test phase for invididual plugin ebuilds.
- RESTRICT="test"
-fi
+S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
-RDEPEND="${RDEPEND}
+RDEPEND="
>=dev-libs/glib-2.6:2
media-libs/gstreamer:${SLOT}
"
+DEPEND="
+ >=sys-apps/sed-4
+ virtual/pkgconfig
+"
-#else
-# XXX: verify with old ebuilds.
-# DEPEND="${DEPEND} dev-libs/liboil"
-
-# added to remove circular deps
-# 6/2/2006 - zaheerm
if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
+ # Do not run test phase for invididual plugin ebuilds.
+ RESTRICT="test"
RDEPEND="${RDEPEND} >=media-libs/${GST_ORG_MODULE}-${PV}:${SLOT}"
+else
+ IUSE="nls"
+ DEPEND="${DEPEND} nls? ( >=sys-devel/gettext-0.17 )"
fi
-DEPEND="${RDEPEND} ${DEPEND}
- >=sys-apps/sed-4
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
+#if [[ ${SLOT} == "0.10" ]]; then
+# XXX: verify with old ebuilds.
+# DEPEND="${DEPEND} dev-libs/liboil"
+#fi
+DEPEND="${DEPEND} ${RDEPEND}"
# @FUNCTION: gst-plugins10_get_plugins
# @INTERNAL
@@ -227,6 +225,10 @@ gst-plugins10_src_configure() {
gst_conf="${gst_conf} --disable-schemas-compile"
fi
+ if [[ ${PN} == ${GST_ORG_MODULE} ]]; then
+ gst_conf="${gst_conf} $(use_enable nls)"
+ fi
+
einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..."
econf \
--with-package-name="Gentoo GStreamer ebuild" \
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-02 14:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-02 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 0d491728803cb213dbccde4a82846c826240ae27
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 14:09:36 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 14:49:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0d491728
eclass/gst-plugins10.eclass: drop GST_ORC support
Still handle configure part of orc to avoid useless per ebuild
src_configure definition.
---
eclass/gst-plugins10.eclass | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index 30ba87b..4a18c36 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -23,9 +23,6 @@
# developers responsible for gstreamer <gstreamer@gentoo.org> or the application
# developer.
-# XXX: what was GST_ORC intended for. Isn't it better to leave it to the
-# ebuild reponsability ?
-
inherit eutils multilib toolchain-funcs versionator
GST_EXPF=""
@@ -52,11 +49,6 @@ else
: ${GST_LA_PUNT:="yes"}
fi
-# @ECLASS-VARIABLE: GST_ORC
-# @DESCRIPTION:
-# Ebuild supports dev-lang/orc.
-: ${GST_ORC:="no"}
-
# @ECLASS-VARIABLE: GST_PLUGINS_BUILD
# @DESCRIPTION:
# Defines the plugins to be built.
@@ -118,13 +110,9 @@ RDEPEND="${RDEPEND}
media-libs/gstreamer:${SLOT}
"
-if [[ ${GST_ORC} = "yes" ]]; then
- IUSE="+orc"
- RDEPEND="${RDEPEND} orc? ( >=dev-lang/orc-0.4.6 )"
#else
# XXX: verify with old ebuilds.
# DEPEND="${DEPEND} dev-libs/liboil"
-fi
# added to remove circular deps
# 6/2/2006 - zaheerm
@@ -224,16 +212,11 @@ gst-plugins10_src_configure() {
done
if grep -q "ORC_CHECK" configure.* ; then
- if [[ ${GST_ORC} = "yes" ]]; then
+ if in_iuse orc ; then
gst_conf="${gst_conf} $(use_enable orc)"
else
gst_conf="${gst_conf} --disable-orc"
fi
- else
- if [[ ${GST_ORC} = "yes" ]]; then
- eqawarn "This ebuild declares supporting USE=orc but does not."
- eqawarn "Please report this as a bug at http://bugs.gentoo.org/"
- fi
fi
if grep -q "AM_MAINTAINER_MODE" configure.* ; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-02 14:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-02 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 0ea02c1566cfcae05548e42677b24267b29ac0d0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 14:40:21 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 14:49:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0ea02c15
eclass/gst-plugins10.eclass: do not pass invalid --enable value
This allows all base pack ebuilds to not unset GST_PLUGINS_BUILD and
avoids showing configuration option twice which is confusing.
---
eclass/gst-plugins10.eclass | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index db6102d..c41de2c 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -202,11 +202,11 @@ gst-plugins10_src_configure() {
gst-plugins10_get_plugins
for plugin in ${GST_PLUGINS_LIST} ; do
- gst_conf="${gst_conf} --disable-${plugin}"
- done
-
- for plugin in ${GST_PLUGINS_BUILD} ; do
- gst_conf="${gst_conf} --enable-${plugin}"
+ if has ${plugin} ${GST_PLUGINS_BUILD} ; then
+ gst_conf="${gst_conf} --enable-${plugin}"
+ else
+ gst_conf="${gst_conf} --disable-${plugin}"
+ fi
done
if grep -q "ORC_CHECK" configure.* ; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-12-02 14:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-02 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 935b4c6b2e61bb27dbf3e29cbfc8b45367050f87
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 14:49:37 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 14:50:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=935b4c6b
eclass/gst-plugins10.eclass: add default configure flag for older EAPIs
---
eclass/gst-plugins10.eclass | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index c41de2c..e391b45 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -199,6 +199,14 @@ gst-plugins10_remove_unversioned_binaries() {
gst-plugins10_src_configure() {
local plugin gst_conf
+ if has ${EAPI:-0} 0 1 2 3 ; then
+ gst_conf="${gst_conf} --disable-dependency-tracking"
+ fi
+
+ if has ${EAPI:-0} 0 1 2 3 4 ; then
+ gst_conf="${gst_conf} --disable-silent-rules"
+ fi
+
gst-plugins10_get_plugins
for plugin in ${GST_PLUGINS_LIST} ; do
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-26 21:35 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-26 21:35 UTC (permalink / raw
To: gentoo-commits
commit: 8d2b8ebb693c605aa3ea3ab7973bf26c677d1d8b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 26 21:34:47 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 21:34:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8d2b8ebb
eclass/gnome2.eclass: always disable gtk-doc for EAPI=5
---
eclass/gnome2.eclass | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index d38dbc4..8fac19c 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -150,9 +150,18 @@ gnome2_src_configure() {
fi
fi
- # Prevent a QA warning
- if has doc ${IUSE} ; then
- grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+ # 2012-11-25
+ # Starting with EAPI=5, we consider packages installing gtk-doc to be
+ # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to
+ # relink URLs in documentation to already installed documentation.
+ # This decision also greatly helps with constantly broken doc generation.
+ # Preserve old behavior for older EAPI.
+ if grep -q "enable-gtk-doc" configure ; then
+ if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
+ G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+ else
+ G2CONF="${G2CONF} --disable-gtk-doc"
+ fi
fi
# Pass --disable-maintainer-mode when needed
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-25 22:38 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-25 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 0e7ac882b4974d2410b0959182c70d9b61fdea0e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 22:24:42 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 22:24:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0e7ac882
eclass/gst-plugins10.eclass: pull proper gst module base version
We want at least the same version of GST_ORG_MODULE than the package
being built to avoid build inconsistencies.
---
eclass/gst-plugins10.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index 8849ae3..30ba87b 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -129,7 +129,7 @@ fi
# added to remove circular deps
# 6/2/2006 - zaheerm
if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
- RDEPEND="${RDEPEND} media-libs/${GST_ORG_MODULE}:${SLOT}"
+ RDEPEND="${RDEPEND} >=media-libs/${GST_ORG_MODULE}-${PV}:${SLOT}"
fi
DEPEND="${RDEPEND} ${DEPEND}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-18 19:11 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-18 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 97566f0ec473e53ba998e94108ce3d6fde46a50c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 19:09:07 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 19:09:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=97566f0e
eclass/gnome2.eclass: sync with gentoo-x86
* Disable schemas compile if configure option exists.
* Disable silent rules for EAPI<5 as discussed on mail alias.
* Leave la files cleanup to prune_libtool_files for EAPI>4.
---
eclass/gnome2.eclass | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 95c11bf..d38dbc4 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -10,7 +10,7 @@
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
-inherit fdo-mime libtool gnome.org gnome2-utils
+inherit eutils fdo-mime libtool gnome.org gnome2-utils
case "${EAPI:-0}" in
0|1)
@@ -47,9 +47,13 @@ G2CONF=${G2CONF:-""}
# @ECLASS-VARIABLE: GNOME2_LA_PUNT
# @DESCRIPTION:
-# Should we delete all the .la files?
+# Should we delete ALL the .la files?
# NOT to be used without due consideration.
-GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+if has ${EAPI:-0} 0 1 2 3 4; then
+ GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+else
+ GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""}
+fi
# @ECLASS-VARIABLE: ELTCONF
# @DEFAULT-UNSET
@@ -161,6 +165,18 @@ gnome2_src_configure() {
G2CONF="${G2CONF} --disable-scrollkeeper"
fi
+ # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308
+ if has ${EAPI:-0} 0 1 2 3 4; then
+ if grep -q "disable-silent-rules" configure; then
+ G2CONF="${G2CONF} --disable-silent-rules"
+ fi
+ fi
+
+ # Pass --disable-schemas-install when possible
+ if grep -q "disable-schemas-install" configure; then
+ G2CONF="${G2CONF} --disable-schemas-install"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
@@ -216,12 +232,20 @@ gnome2_src_install() {
rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
# Delete all .la files
- if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
- ebegin "Removing .la files"
- if ! { has static-libs ${IUSE//+} && use static-libs; }; then
- find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ if has ${EAPI:-0} 0 1 2 3 4; then
+ if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
+ ebegin "Removing .la files"
+ if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ fi
+ eend
fi
- eend
+ else
+ case "${GNOME2_LA_PUNT}" in
+ yes) prune_libtool_files --modules;;
+ no) ;;
+ *) prune_libtool_files;;
+ esac
fi
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-18 18:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-18 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 4c92b1eb0849f9d3669aeeadbe88b03166ecc4d0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 18:49:28 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 18:49:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4c92b1eb
eclass/gst-plugins10.eclass: make _system_link actually useful
---
eclass/gst-plugins10.eclass | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index ef4e5b3..e7986e3 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -26,7 +26,7 @@
# XXX: what was GST_ORC intended for. Isn't it better to leave it to the
# ebuild reponsability ?
-inherit eutils multilib versionator
+inherit eutils multilib toolchain-funcs versionator
GST_EXPF=""
case "${EAPI:-0}" in
@@ -170,15 +170,26 @@ gst-plugins10_find_plugin_dir() {
}
# @FUNCTION: gst-plugins10_system_link
+# @USAGE: gst-plugins10_system_link gst-libs/gst/audio:gstreamer-audio [...]
# @DESCRIPTION:
# Walks through makefiles in order to make sure build will link against system
# librairies.
+# Takes a list of path fragments and corresponding pkgconfig libraries
+# separated by colon (:). Will replace the path fragment by the output of
+# pkgconfig.
gst-plugins10_system_link() {
- local directory lib
- for directory in $@ ; do
- lib=$(basename $directory)
- sed -e "s:\$(top_builddir)gst-libs/gst/${directory}:${ROOT}/usr/$(get_libdir)/${lib}:" \
- -i Makefile.am Makefile.in
+ local directory libs pkgconfig pc tuple
+ pkgconfig=$(tc-getPKG_CONFIG)
+
+ gst-plugins10_find_plugin_dir
+
+ for tuple in $@ ; do
+ directory="$(echo ${tuple} | cut -f1 -d':')"
+ pc="$(echo ${tuple} | cut -f2 -d':')-${SLOT}"
+ libs="$(${pkgconfig} --libs-only-l ${pc})"
+
+ sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+ -i Makefile.am Makefile.in || die
done
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-18 18:50 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-18 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 724a95c2ffde50160a93cee142530d5f6a57aba2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 18:50:30 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 18:50:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=724a95c2
eclass/gst-plugins10.eclass: fix indentation issue
---
eclass/gst-plugins10.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index e7986e3..8849ae3 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -226,7 +226,7 @@ gst-plugins10_src_configure() {
if grep -q "ORC_CHECK" configure.* ; then
if [[ ${GST_ORC} = "yes" ]]; then
gst_conf="${gst_conf} $(use_enable orc)"
- else
+ else
gst_conf="${gst_conf} --disable-orc"
fi
else
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-11-18 18:25 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-18 18:25 UTC (permalink / raw
To: gentoo-commits
commit: e5b176daa090195c2c777c07291727b72d39369d
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 18:24:33 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 18:24:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e5b176da
eclass/gst-*: clean up code
* Drop commented out (and unused code)
* Cleanup unused inherits
* Fix cosmetic issues (indentation, ...)
---
eclass/gst-plugins-bad.eclass | 16 +---------------
eclass/gst-plugins-base.eclass | 24 ++----------------------
eclass/gst-plugins-good.eclass | 6 +++---
eclass/gst-plugins-ugly.eclass | 2 +-
eclass/gst-plugins10.eclass | 2 +-
5 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass
index c0b6a52..1f20d6c 100644
--- a/eclass/gst-plugins-bad.eclass
+++ b/eclass/gst-plugins-bad.eclass
@@ -16,7 +16,7 @@
GST_ORG_MODULE="gst-plugins-bad"
-inherit eutils gst-plugins10 multilib versionator
+inherit eutils gst-plugins10
case "${EAPI:-0}" in
1|2|3|4|5)
@@ -41,17 +41,3 @@ if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
fi
fi
-# @FUNCTION: gst-plugins-bad_src_prepare
-# @DESCRIPTION:
-# Makes sure build will use system librairies.
-#gst-plugins-bad_src_prepare() {
-# # Link with the syswide installed gst-libs if needed
-# gst-plugins10_find_plugin_dir
-# gst-plugins10_system_link (
-# 'interfaces/libgstphotography'
-# 'signalprocessor/libgstsignalprocessor'
-# 'video/libgstbasevideo'
-# 'basecamerabinsrc/libgstbasecamerabinsrc'
-# )
-#}
-
diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass
index dc4040d..eb4bc84 100644
--- a/eclass/gst-plugins-base.eclass
+++ b/eclass/gst-plugins-base.eclass
@@ -16,9 +16,9 @@
GST_ORG_MODULE="gst-plugins-base"
-inherit eutils gst-plugins10 multilib
+inherit gst-plugins10
-case ${EAPI:-0} in
+case "${EAPI:-0}" in
1|2|3|4|5)
;;
0)
@@ -29,23 +29,3 @@ case ${EAPI:-0} in
;;
esac
-
-# @FUNCTION: gst-plugins-base_src_prepare
-# @DESCRIPTION:
-# Makes sure build will use system librairies.
-#gst-plugins-base_src_prepare() {
-#
-# # Link with the syswide installed gst-libs if needed
-# gst-plugins10_find_plugin_dir
-# gst-plugins10_system_link (
-# 'interfaces/libgstinterfaces'
-# 'audio/libgstaudio'
-# 'cdda/libgstcdda'
-# 'riff/libgstriff'
-# 'tag/libgsttag'
-# 'video/libgstvideo'
-# 'netbuffer/libgstnetbuffer'
-# 'rtp/libgstrtp'
-# )
-#}
-
diff --git a/eclass/gst-plugins-good.eclass b/eclass/gst-plugins-good.eclass
index 33f963b..a400b89 100644
--- a/eclass/gst-plugins-good.eclass
+++ b/eclass/gst-plugins-good.eclass
@@ -16,9 +16,9 @@
GST_ORG_MODULE="gst-plugins-good"
-inherit eutils gst-plugins10 versionator
+inherit eutils gst-plugins10
-case ${EAPI:-0} in
+case "${EAPI:-0}" in
1|2|3|4|5)
;;
0)
@@ -30,7 +30,7 @@ case ${EAPI:-0} in
esac
-if [ "${PN}" != "${GST_ORG_MODULE}" ]; then
+if [[ ${PN} != ${GST_ORG_MODULE} ]]; then
# -good-0.10.24 uses orc optionally instead of liboil unconditionally.
# While <0.10.24 configure always checks for liboil, it is linked to only by
# non-split plugins in gst/, so we only builddep for all old packages, and have
diff --git a/eclass/gst-plugins-ugly.eclass b/eclass/gst-plugins-ugly.eclass
index 91ef0f3..787ce4f 100644
--- a/eclass/gst-plugins-ugly.eclass
+++ b/eclass/gst-plugins-ugly.eclass
@@ -16,7 +16,7 @@
GST_ORG_MODULE="gst-plugins-ugly"
-inherit eutils gst-plugins10 versionator
+inherit gst-plugins10
case "${EAPI:-0}" in
1|2|3|4|5)
diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass
index 2995fa5..ef4e5b3 100644
--- a/eclass/gst-plugins10.eclass
+++ b/eclass/gst-plugins10.eclass
@@ -179,7 +179,7 @@ gst-plugins10_system_link() {
lib=$(basename $directory)
sed -e "s:\$(top_builddir)gst-libs/gst/${directory}:${ROOT}/usr/$(get_libdir)/${lib}:" \
-i Makefile.am Makefile.in
- done
+ done
}
# @FUNCTION: gst-plugins10_remove_unversioned_binaries
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-10-27 8:42 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-27 8:42 UTC (permalink / raw
To: gentoo-commits
commit: 9c5c10262764bb4835700db61564b0cc7ae6cff4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 08:41:21 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 08:41:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c5c1026
eclass/gnome2.eclass: sync eclass with gentoo-x86
---
eclass/gnome2.eclass | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index f3c3d72..95c11bf 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -16,7 +16,7 @@ case "${EAPI:-0}" in
0|1)
EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
- 2|3|4)
+ 2|3|4|5)
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -122,6 +122,9 @@ gnome2_src_prepare() {
# Prevent scrollkeeper access violations
gnome2_omf_fix
+ # Disable all deprecation warnings
+ gnome2_disable_deprecation_warning
+
# Run libtoolize
if has ${EAPI:-0} 0 1 2 3; then
elibtoolize ${ELTCONF}
@@ -145,7 +148,7 @@ gnome2_src_configure() {
# Prevent a QA warning
if has doc ${IUSE} ; then
- G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
+ grep -q "enable-gtk-doc" configure && G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
fi
# Pass --disable-maintainer-mode when needed
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-09-12 20:23 Alexandre Rostovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-12 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 3c280e85f4adfee44a9db53741bf0dbde8415cf3
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 20:23:06 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 20:23:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3c280e85
eclass/vala.eclass: moved to gx86
---
eclass/vala.eclass | 121 ----------------------------------------------------
1 files changed, 0 insertions(+), 121 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
deleted file mode 100644
index 606ff49..0000000
--- a/eclass/vala.eclass
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: vala.eclass
-# @MAINTAINER:
-# gnome@gentoo.org
-# @AUTHOR:
-# Alexandre Rostovtsev <tetromino@gentoo.org>
-# @BLURB: Sets up the environment for using a specific version of vala.
-# @DESCRIPTION:
-# This eclass sets up commonly used environment variables for using a specific
-# version of dev-lang/vala to configure and build a package. It is needed for
-# packages whose build systems assume the existence of certain unversioned vala
-# executables, pkgconfig files, etc., which Gentoo does not provide.
-#
-# This eclass provides one phase function: src_prepare.
-
-inherit multilib
-
-case "${EAPI:-0}" in
- 0) die "EAPI=0 is not supported" ;;
- 1) ;;
- *) EXPORT_FUNCTIONS src_prepare ;;
-esac
-
-# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Minimum vala API version (e.g. 0.16).
-VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.10}
-
-# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Maximum vala API version (e.g. 0.18).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.18}
-
-# @ECLASS-VARIABLE: VALA_USE_DEPEND
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# USE dependencies that vala must be built with (e.g. vapigen).
-
-# @FUNCTION: vala_api_versions
-# @DESCRIPTION:
-# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
-# VALA_MIN_API_VERSION.
-vala_api_versions() {
- eval "echo 0.{${VALA_MAX_API_VERSION#0.}..${VALA_MIN_API_VERSION#0.}..2}"
-}
-
-# @FUNCTION: vala_depend
-# @DESCRIPTION:
-# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to
-# VALA_MIN_API_VERSION
-vala_depend() {
- local u v versions=$(vala_api_versions)
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
-
- echo -n "|| ("
- for v in ${versions}; do
- echo -n " dev-lang/vala:${v}${u}"
- done
- echo " )"
-}
-
-# @FUNCTION: vala_best_api_version
-# @DESCRIPTION:
-# Returns the highest installed vala API version satisfying
-# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
-vala_best_api_version() {
- local u v
- [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
- for v in $(vala_api_versions); do
- has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
- done
-}
-
-# @FUNCTION: vala_src_prepare
-# @USAGE: [--vala-api-version api_version]
-# @DESCRIPTION:
-# Sets up the environment variables and pkgconfig files for the
-# specified API version, or, if no version is specified, for the
-# highest installed vala API version satisfying
-# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
-vala_src_prepare() {
- local p d valafoo version
-
- if [[ $1 = "--vala-api-version" ]]; then
- version=$2
- [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter."
- else
- version=$(vala_best_api_version)
- [[ ${version} ]] || die "No installed vala in $(vala_depend)"
- fi
-
- export VALAC=$(type -P valac-${version})
-
- valafoo=$(type -P vala-gen-introspect-${VALA_API_VERSION})
- [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT=$(type -P vala-gen-introspect-${version})
-
- valafoo=$(type -P vapigen-${VALA_API_VERSION})
- [[ ${valafoo} ]] && export VAPIGEN="${valafoo}"
-
- valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen"
- [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}"
-
- export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi"
-
- mkdir -p "${T}/pkgconfig" || die "mkdir failed"
- for p in libvala vapigen; do
- for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do
- if [[ -e ${d}/${p}-${VALA_API_VERSION}.pc ]]; then
- ln -s "${d}/${p}-${VALA_API_VERSION}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed"
- break
- fi
- done
- done
- : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}
- export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}"
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-09-10 2:17 Alexandre Rostovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-10 2:17 UTC (permalink / raw
To: gentoo-commits
commit: 2a5037f91dea5642e7b1d2885060297469fd062d
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 02:17:25 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 02:17:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2a5037f9
eclass/vala.eclass: new eclass added for testing
---
eclass/vala.eclass | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 0 deletions(-)
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
new file mode 100644
index 0000000..606ff49
--- /dev/null
+++ b/eclass/vala.eclass
@@ -0,0 +1,121 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# @ECLASS: vala.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @AUTHOR:
+# Alexandre Rostovtsev <tetromino@gentoo.org>
+# @BLURB: Sets up the environment for using a specific version of vala.
+# @DESCRIPTION:
+# This eclass sets up commonly used environment variables for using a specific
+# version of dev-lang/vala to configure and build a package. It is needed for
+# packages whose build systems assume the existence of certain unversioned vala
+# executables, pkgconfig files, etc., which Gentoo does not provide.
+#
+# This eclass provides one phase function: src_prepare.
+
+inherit multilib
+
+case "${EAPI:-0}" in
+ 0) die "EAPI=0 is not supported" ;;
+ 1) ;;
+ *) EXPORT_FUNCTIONS src_prepare ;;
+esac
+
+# @ECLASS-VARIABLE: VALA_MIN_API_VERSION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Minimum vala API version (e.g. 0.16).
+VALA_MIN_API_VERSION=${VALA_MIN_API_VERSION:-0.10}
+
+# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Maximum vala API version (e.g. 0.18).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.18}
+
+# @ECLASS-VARIABLE: VALA_USE_DEPEND
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# USE dependencies that vala must be built with (e.g. vapigen).
+
+# @FUNCTION: vala_api_versions
+# @DESCRIPTION:
+# Outputs a list of vala API versions from VALA_MAX_API_VERSION down to
+# VALA_MIN_API_VERSION.
+vala_api_versions() {
+ eval "echo 0.{${VALA_MAX_API_VERSION#0.}..${VALA_MIN_API_VERSION#0.}..2}"
+}
+
+# @FUNCTION: vala_depend
+# @DESCRIPTION:
+# Outputs a ||-dependency string on vala from VALA_MAX_API_VERSION down to
+# VALA_MIN_API_VERSION
+vala_depend() {
+ local u v versions=$(vala_api_versions)
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+
+ echo -n "|| ("
+ for v in ${versions}; do
+ echo -n " dev-lang/vala:${v}${u}"
+ done
+ echo " )"
+}
+
+# @FUNCTION: vala_best_api_version
+# @DESCRIPTION:
+# Returns the highest installed vala API version satisfying
+# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
+vala_best_api_version() {
+ local u v
+ [[ ${VALA_USE_DEPEND} ]] && u="[${VALA_USE_DEPEND}]"
+ for v in $(vala_api_versions); do
+ has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
+ done
+}
+
+# @FUNCTION: vala_src_prepare
+# @USAGE: [--vala-api-version api_version]
+# @DESCRIPTION:
+# Sets up the environment variables and pkgconfig files for the
+# specified API version, or, if no version is specified, for the
+# highest installed vala API version satisfying
+# VALA_MAX_API_VERSION, VALA_MIN_API_VERSION, and VALA_USE_DEPEND.
+vala_src_prepare() {
+ local p d valafoo version
+
+ if [[ $1 = "--vala-api-version" ]]; then
+ version=$2
+ [[ ${version} ]] || die "'--vala-api-version' option requires API version parameter."
+ else
+ version=$(vala_best_api_version)
+ [[ ${version} ]] || die "No installed vala in $(vala_depend)"
+ fi
+
+ export VALAC=$(type -P valac-${version})
+
+ valafoo=$(type -P vala-gen-introspect-${VALA_API_VERSION})
+ [[ ${valafoo} ]] && export VALA_GEN_INTROSPECT=$(type -P vala-gen-introspect-${version})
+
+ valafoo=$(type -P vapigen-${VALA_API_VERSION})
+ [[ ${valafoo} ]] && export VAPIGEN="${valafoo}"
+
+ valafoo="${EPREFIX}/usr/share/vala/Makefile.vapigen"
+ [[ -e ${valafoo} ]] && export VAPIGEN_MAKEFILE="${valafoo}"
+
+ export VAPIGEN_VAPIDIR="${EPREFIX}/usr/share/vala/vapi"
+
+ mkdir -p "${T}/pkgconfig" || die "mkdir failed"
+ for p in libvala vapigen; do
+ for d in "${EPREFIX}/usr/$(get_libdir)/pkgconfig" "${EPREFIX}/usr/share/pkgconfig"; do
+ if [[ -e ${d}/${p}-${VALA_API_VERSION}.pc ]]; then
+ ln -s "${d}/${p}-${VALA_API_VERSION}.pc" "${T}/pkgconfig/${p}.pc" || die "ln failed"
+ break
+ fi
+ done
+ done
+ : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}
+ export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}"
+}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-05-03 0:03 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2012-05-03 0:03 UTC (permalink / raw
To: gentoo-commits
commit: 77e2d8cd14cbe8aba5cf8e8aa9d658b28bd34258
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 00:03:20 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 3 00:03:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=77e2d8cd
eclass/gnome2.eclass: sync with gx86
---
eclass/gnome2.eclass | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e057217..f3c3d72 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -153,6 +153,11 @@ gnome2_src_configure() {
G2CONF="${G2CONF} --disable-maintainer-mode"
fi
+ # Pass --disable-scrollkeeper when possible
+ if grep -q "disable-scrollkeeper" configure; then
+ G2CONF="${G2CONF} --disable-scrollkeeper"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
@@ -200,10 +205,9 @@ gnome2_src_install() {
# 1. The scrollkeeper database is regenerated at pkg_postinst()
# 2. ${ED}/var/lib/scrollkeeper contains only indexes for the current pkg
# thus it makes no sense if pkg_postinst ISN'T run for some reason.
- if [[ -z "$(find "${D}" -name '*.omf')" ]]; then
- export SCROLLKEEPER_UPDATE="0"
- fi
rm -rf "${ED}${sk_tmp_dir}"
+ rmdir "${ED}/var/lib" 2>/dev/null
+ rmdir "${ED}/var" 2>/dev/null
# Make sure this one doesn't get in the portage db
rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
@@ -225,6 +229,7 @@ gnome2_pkg_preinst() {
gnome2_gconf_savelist
gnome2_icon_savelist
gnome2_schemas_savelist
+ gnome2_scrollkeeper_savelist
}
# @FUNCTION: gnome2_pkg_postinst
@@ -237,10 +242,8 @@ gnome2_pkg_postinst() {
fdo-mime_mime_database_update
gnome2_icon_cache_update
gnome2_schemas_update
+ gnome2_scrollkeeper_update
- if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
- gnome2_scrollkeeper_update
- fi
# This should only be in the overlay
ewarn "**************************************************************"
ewarn "This is the *experimental* Gentoo GNOME Overlay"
@@ -264,8 +267,5 @@ gnome2_pkg_postrm() {
fdo-mime_mime_database_update
gnome2_icon_cache_update
gnome2_schemas_update
-
- if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
- gnome2_scrollkeeper_update
- fi
+ gnome2_scrollkeeper_update
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-04-24 3:36 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2012-04-24 3:36 UTC (permalink / raw
To: gentoo-commits
commit: 8f2b704bffd6d4db2860f6e8f43855922659a562
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 24 03:34:10 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Apr 24 03:34:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8f2b704b
eclass/gnome2.eclass: stop requiring I_WANT_GNOME_3_3_X
Now that gnome-3.4 is out, anyone using the overlay will be expecting
3.4 and nothing else, so the check is no longer useful and just confuses
people. Thanks to hoverbear on IRC for reporting.
---
eclass/gnome2.eclass | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 3af0b8b..e057217 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -22,22 +22,22 @@ case "${EAPI:-0}" in
*) die "EAPI=${EAPI} is not supported" ;;
esac
-if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
- die "
-
-The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
-These are unstable, potentially incompatible with 3.2, and may well
-break your system in intriguing ways.
-
-If you enabled the GNOME overlay to get GNOME 3.2, please disable
-it now, since GNOME 3.2 is already in portage and unmasked.
-
-If you really do want experimental GNOME 3.3.x, please add
-I_WANT_GNOME_3_3_X=yes
-to your /etc/make.conf and continue.
-
-"
-fi
+#if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
+# die "
+#
+#The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
+#These are unstable, potentially incompatible with 3.2, and may well
+#break your system in intriguing ways.
+#
+#If you enabled the GNOME overlay to get GNOME 3.2, please disable
+#it now, since GNOME 3.2 is already in portage and unmasked.
+#
+#If you really do want experimental GNOME 3.3.x, please add
+#I_WANT_GNOME_3_3_X=yes
+#to your /etc/make.conf and continue.
+#
+#"
+#fi
# @ECLASS-VARIABLE: G2CONF
# @DEFAULT-UNSET
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-02-26 21:53 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2012-02-26 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 8bf5ad5e45728379f788709fa3230dedc286e3d4
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 21:39:04 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Feb 26 21:39:04 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8bf5ad5e
eclass/gnome2-live.eclass: add gnome-tools to DEPEND
Lots of live ebuilds in gnome-3.4 need yelp.m4
---
eclass/gnome2-live.eclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 109473e..897adf8 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -32,6 +32,7 @@ EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
# gnome-base/gnome-common for GNOME_COMMON_INIT
DEPEND="${DEPEND}
app-text/gnome-doc-utils
+ app-text/yelp-tools
dev-util/gtk-doc
dev-util/intltool
gnome-base/gnome-common
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-02-12 15:32 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2012-02-12 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 9d923f9881786cd4103ecca5024b679eb72dbea0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 15:31:36 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 15:31:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9d923f98
eclass/gnome2-python: use py-compile cleanup function
---
eclass/gnome2-python.eclass | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index 8eb7cfa..7330f39 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -28,14 +28,8 @@ gnome2-python_pkg_setup() {
}
gnome2-python_src_prepare() {
- # disable pyc compiling
- if [[ -f py-compile ]]; then
- rm py-compile
- echo > py-compile
- chmod +x py-compile
- fi
-
gnome2_src_prepare
+ python_clean_py-compile_files
python_copy_sources
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2012-01-03 11:56 Priit Laes
0 siblings, 0 replies; 94+ messages in thread
From: Priit Laes @ 2012-01-03 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 226b8ca0b690510e9336c5f01e2137f84badbd71
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 3 11:50:17 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 3 11:50:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=226b8ca0
Compatibility fix for automake-1.11.2's py-compile changes
Thanks to nirbheek and ssuominen for suggestions and solutions.
---
eclass/gnome2-live.eclass | 2 +-
eclass/gnome2-python.eclass | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 1d9988a..bf6ca7f 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -151,7 +151,7 @@ gnome2-live_src_prepare() {
fi
# Disable pyc compiling. Doesn't harm if DNE
- ln -sf $(type -P true) py-compile
+ > py-compile
### Keep this in-sync with gnome2.eclass!
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index d4dc393..6fbe441 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -28,10 +28,9 @@ gnome2-python_pkg_setup() {
}
gnome2-python_src_prepare() {
+ # disable pyc compiling
if [ -f py-compile ]; then
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
+ > py-compile
fi
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-12-18 5:26 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-12-18 5:26 UTC (permalink / raw
To: gentoo-commits
commit: a84a32969d112bcf57eaa9dd106d4bce72cada04
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 05:24:40 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Dec 18 05:24:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a84a3296
eclass/gnome2.eclass: the overlay is marked broken
As discussed with Nirbheek, the overlay is marked broken by a "die" in
gnome2.eclass global scope. To continue using the overlay, one should
add I_WANT_GNOME_3_3_X=yes to make.conf.
This warning should probably be removed in 2 weeks or so.
---
eclass/gnome2.eclass | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index b57bafc..3af0b8b 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -22,6 +22,23 @@ case "${EAPI:-0}" in
*) die "EAPI=${EAPI} is not supported" ;;
esac
+if [[ "${I_WANT_GNOME_3_3_X}" != "yes" ]]; then
+ die "
+
+The GNOME overlay is switching to GNOME 3.3.x prerelease packages.
+These are unstable, potentially incompatible with 3.2, and may well
+break your system in intriguing ways.
+
+If you enabled the GNOME overlay to get GNOME 3.2, please disable
+it now, since GNOME 3.2 is already in portage and unmasked.
+
+If you really do want experimental GNOME 3.3.x, please add
+I_WANT_GNOME_3_3_X=yes
+to your /etc/make.conf and continue.
+
+"
+fi
+
# @ECLASS-VARIABLE: G2CONF
# @DEFAULT-UNSET
# @DESCRIPTION:
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-12-14 19:46 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-12-14 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 2fcc0bcd055152dc904d1025fc987d39d67b9cb7
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 19:32:25 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Dec 14 19:46:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2fcc0bcd
eclass/gnome2.eclass: do not use gnome2_schemas_update --uninstall (#394501)
Do not use gnome2_schemas_update --uninstall; --uninstall has no effect
since glib-2.25.11, and will cause an error starting with 2.31.x
(bug #394501, thanks to Marc-Antoine Perennou for reporting).
---
eclass/gnome2.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index e0c2bf9..b57bafc 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -246,7 +246,7 @@ gnome2_pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
- gnome2_schemas_update --uninstall
+ gnome2_schemas_update
if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
gnome2_scrollkeeper_update
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-11-15 1:31 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-11-15 1:31 UTC (permalink / raw
To: gentoo-commits
commit: c80d652e31ba7c13735694dbfd4803e0c141db1a
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 23:19:51 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 01:31:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c80d652e
gnome2-live.eclass: don't forget to run gnome2_pkg_postinst
---
eclass/gnome2-live.eclass | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 0d15887..1d9988a 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -184,6 +184,8 @@ gnome2_src_prepare() {
# @DESCRIPTION:
# Must be run manually for ebuilds that have a custom pkg_postinst
gnome2-live_pkg_postinst() {
+ gnome2_pkg_postinst
+
ewarn "This is a live ebuild, upstream trunks will mostly be UNstable"
ewarn "Do NOT report bugs about this package to Gentoo"
ewarn "Report upstream bugs (with patches if possible) instead."
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-11-14 7:01 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-11-14 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 3eac3e2cac4ad4db1d7cddfd3396a9a32d6aaaff
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 06:15:23 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Nov 14 06:15:23 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3eac3e2c
eclass/gnome2.eclass: sync with gx86
Use the new gnome2_environment_reset from gnome2-utils for XDG_* etc.
resetting.
Note that *unsetting* variables that had been exported in root's
environment currently does not seem to work (they reappear in the next
ebuild stage, at least with portage-2.2.0_alpha74).
---
eclass/gnome2.eclass | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index cc3f8ac..e0c2bf9 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -90,6 +90,8 @@ gnome2_src_unpack() {
gnome2_src_prepare() {
# Reset various variables inherited via the environment.
# Causes test failures, introspection-build failures, and access violations
+ # FIXME: seems to have no effect for exported variables, at least with
+ # portage-2.2.0_alpha74
unset DBUS_SESSION_BUS_ADDRESS
unset DISPLAY
unset GNOME_KEYRING_CONTROL
@@ -97,19 +99,8 @@ gnome2_src_prepare() {
unset XAUTHORITY
unset XDG_SESSION_COOKIE
- # Reset the XDG_* directories to avoid access violations
- export XDG_DATA_HOME="${T}/.local/share"
- export XDG_CONFIG_HOME="${T}/.config"
- export XDG_CACHE_HOME="${T}/.cache"
- export XDG_RUNTIME_DIR="${T}/run"
- mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
- "${XDG_RUNTIME_DIR}"
- # This directory needs to be owned by the user, and chmod 0700
- # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
- chmod 0700 "${XDG_RUNTIME_DIR}"
-
- # GST_REGISTRY is to work around gst utilities trying to read/write /root
- export GST_REGISTRY="${T}/registry.xml"
+ # Prevent assorted access violations and test failures
+ gnome2_environment_reset
# Prevent scrollkeeper access violations
gnome2_omf_fix
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-11-04 20:35 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-11-04 20:35 UTC (permalink / raw
To: gentoo-commits
commit: c2813caebcc5536a93d3c6d7413c288ea9869612
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 20:34:49 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Nov 4 20:34:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c2813cae
eclass/gnome2-python.eclass: support EAPI4
No reason to restrict to EAPI3 since python.eclass gained support for 4.
---
eclass/gnome2-python.eclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index 7b05342..d4dc393 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -16,9 +16,9 @@ inherit gnome2 python
# Stolen from git.eclass
EXPORTED_FUNCTIONS="pkg_setup src_compile src_test src_install"
case "${EAPI:-0}" in
- 2|3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
+ 2|3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
0|1) ;;
- *) die "Unknown EAPI, Bug eclass maintainers." ;;
+ *) die "Unknown EAPI, bug eclass maintainers." ;;
esac
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-09-27 13:36 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-09-27 13:36 UTC (permalink / raw
To: gentoo-commits
commit: 0d8ef45b03e593a01d209ce44407b2a0fec40e36
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 13:29:22 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 13:35:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0d8ef45b
gnome2-live.eclass: use GNOME_ORG_MODULE for git URI, port to use eclass doc
---
eclass/gnome2-live.eclass | 55 +++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 3a4dd6a..0d15887 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -3,14 +3,16 @@
# $Header: $
#
-# gnome2-live.eclass
-#
+# @ECLASS: gnome2-live.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @AUTHOR:
+# Nirbheek Chauhan <nirbheek@gentoo.org>
+# @BLURB: Live ebuild phases for GNOME packages
+# @DESCRIPTION:
# Exports additional functions used by live ebuilds written for GNOME packages
# Always to be imported *AFTER* gnome2.eclass
#
-# Author: Nirbheek Chauhan <nirbheek@gentoo.org>
-#
-
inherit autotools gnome2 gnome2-utils libtool git-2
@@ -38,15 +40,28 @@ DEPEND="${DEPEND}
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-}
-# Default git module name
-GNOME_LIVE_MODULE=${GNOME_LIVE_MODULE:-"${PN}"}
+# @ECLASS-VARIABLE: GNOME_LIVE_MODULE
+# @DESCRIPTION:
+# Default git module name is assumed to be the same as the gnome.org module name
+# used on ftp.gnome.org. We have GNOME_ORG_MODULE because we inherit gnome.org
+: ${GNOME_LIVE_MODULE:="${GNOME_ORG_MODULE}"}
-# GIT URI for the project
-EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
+# @ECLASS-VARIABLE: EGIT_REPO_URI
+# @DESCRIPTION:
+# git URI for the project, uses GNOME_LIVE_MODULE by default
+: "${EGIT_REPO_URI:="git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
+
+# @ECLASS-VARIABLE: PATCHES
+# @DESCRIPTION:
+# Whitespace-separated list of patches to apply after cloning
+: ${PATCHES:=""}
# Unset SRC_URI auto-set by gnome2.eclass
SRC_URI=""
+# @FUNCTION: gnome2-live_get_var
+# @DESCRIPTION:
+# Get macro variable values from configure.ac, etc
gnome2-live_get_var() {
local var f
var="$1"
@@ -54,6 +69,10 @@ gnome2-live_get_var() {
echo $(sed -ne "s/${var}(\(.*\))/\1/p" "${f}" | tr -d '[]')
}
+# @FUNCTION: gnome2-live_get_var
+# @DESCRIPTION:
+# Calls git-2_src_unpack, and unpacks ${A} if required.
+# Also calls gnome2-live_src_prepare for older EAPI.
gnome2-live_src_unpack() {
if test -n "${A}"; then
unpack ${A}
@@ -62,9 +81,15 @@ gnome2-live_src_unpack() {
has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
}
+# @FUNCTION: gnome2-live_src_prepare
+# @DESCRIPTION:
+# Lots of magic to workaround autogen.sh quirks in various packages
+# Creates blank ChangeLog and necessary macro dirs. Runs various autotools
+# programs if required, and finally runs eautoreconf.
gnome2-live_src_prepare() {
# Blame git.eclass
cd "${S}"
+
for i in ${PATCHES}; do
epatch "${i}"
done
@@ -141,17 +166,23 @@ gnome2-live_src_prepare() {
elibtoolize ${ELTCONF}
}
-# So that it replaces gnome2_src_unpack in ebuilds that call it
+# @FUNCTION: gnome2_src_unpack
+# @DESCRIPTION:
+# Defined so that it replaces gnome2_src_unpack in ebuilds that call it
gnome2_src_unpack() {
gnome2-live_src_unpack
}
-# So that it replaces gnome2_src_prepare in ebuilds that call it
+# @FUNCTION: gnome2_src_prepare
+# @DESCRIPTION:
+# Defined so that it replaces gnome2_src_prepare in ebuilds that call it
gnome2_src_prepare() {
gnome2-live_src_prepare
}
-# Run manually for ebuilds that have a custom pkg_postinst
+# @FUNCTION: gnome2-live_pkg_postinst
+# @DESCRIPTION:
+# Must be run manually for ebuilds that have a custom pkg_postinst
gnome2-live_pkg_postinst() {
ewarn "This is a live ebuild, upstream trunks will mostly be UNstable"
ewarn "Do NOT report bugs about this package to Gentoo"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-09-26 4:46 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 4:46 UTC (permalink / raw
To: gentoo-commits
commit: 2a71614be24720df1d584944f2a29dd6e3a92c42
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 04:00:41 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 04:46:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2a71614b
eclass/gnome2.eclass: sync with gx86 for --disable-maintainer-mode
Add the following change from gx86:
Sun Sep 25 15:15:21 2011 UTC by pacho
Pass --disable-maintainer-mode when needed, thanks to Nirbheek for his help.
---
eclass/gnome2.eclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 5803826..cc3f8ac 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -140,6 +140,11 @@ gnome2_src_configure() {
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
fi
+ # Pass --disable-maintainer-mode when needed
+ if grep -q "^[[:space:]]*AM_MAINTAINER_MODE(\[enable\])" configure.*; then
+ G2CONF="${G2CONF} --disable-maintainer-mode"
+ fi
+
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-09-25 20:37 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-09-25 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 4df7f022bd1fc830931ef0d0673c27b34963a53a
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 20:31:19 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Sep 25 20:37:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4df7f022
eclass/gnome2-live.eclass: switch to git-2.eclass
Now that bug #383761 has been fixed, we can switch to git-2 without
forcing live users to reclone all their repositories. Acked by Nirbheek
on IRC.
---
eclass/gnome2-live.eclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 638cdc9..3a4dd6a 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -12,7 +12,7 @@
#
-inherit autotools gnome2 gnome2-utils libtool git
+inherit autotools gnome2 gnome2-utils libtool git-2
# Stolen from git.eclass
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
@@ -58,7 +58,7 @@ gnome2-live_src_unpack() {
if test -n "${A}"; then
unpack ${A}
fi
- git_src_unpack
+ git-2_src_unpack
has src_prepare ${EXPORTED_FUNCTIONS} || gnome2-live_src_prepare
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-09-20 2:17 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-09-20 2:17 UTC (permalink / raw
To: gentoo-commits
commit: 338831052cd98081a23e1a3bd745972dd9bd2d46
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 02:12:30 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 20 02:17:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=33883105
eclass/gnome2-live.eclass: fix autopoint logic
Borrow the logic from gnome-autogen.sh to only run autopoint for
packages that use AM_GNU_GETTEXT_VERSION and do not use
AM_GLIB_GNU_GETTEXT. Otherwise, running autopoint will result in
failures such as
autopoint: *** Missing version: please specify in configure.in through a
line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package
is using
Thanks to Steev Klimaszewski for pointing out such a failure on IRC.
The eclass now appears to work both for packages that require autopoint
(e.g. cogl) and those that cannot use it (e.g. mutter).
---
eclass/gnome2-live.eclass | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 6c4aefd..638cdc9 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -81,13 +81,16 @@ gnome2-live_src_prepare() {
mkdir -p "$i"
done
- # Generate po/Makefile.in.in if it doesn't exist
- if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
- eautopoint --force
- fi
-
# We don't run gettextize because that does too much stuff
if grep -qe 'GETTEXT' configure.*; then
+ # Generate po/Makefile.in.in if it doesn't exist for packages that use
+ # AM_GNU_GETTEXT and AM_GNU_GETTEXT_VERSION (e.g. media-libs/cogl).
+ # Logic is inspired by gnome-autogen.sh
+ if ! grep -qe '^AM_GLIB_GNU_GETTEXT' configure.* &&
+ grep -qe '^AM_GNU_GETTEXT_VERSION' configure.* &&
+ [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
+ eautopoint --force
+ fi
local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
mkdir -p "${aux_dir}"
test -e "${aux_dir}/config.rpath" || :> "${aux_dir}/config.rpath"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-09-20 0:12 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-09-20 0:12 UTC (permalink / raw
To: gentoo-commits
commit: b479d918ea4b5976d0b050b9c46e1a2858af1303
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 23:20:03 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Sep 20 00:12:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b479d918
eclass/gnome2-live.eclass: add eautopoint
Packages like media-libs/cogl require eautopoint to be run in addition
to eautoreconf. Thanks to Steev Klimaszewski (steev_) for reporting on
IRC.
---
eclass/gnome2-live.eclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 3b4ea78..6c4aefd 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -81,6 +81,11 @@ gnome2-live_src_prepare() {
mkdir -p "$i"
done
+ # Generate po/Makefile.in.in if it doesn't exist
+ if [[ -d po && ! -e po/Makefile.in.in && ! -e po/Makefile.am ]]; then
+ eautopoint --force
+ fi
+
# We don't run gettextize because that does too much stuff
if grep -qe 'GETTEXT' configure.*; then
local aux_dir=${S}/$(gnome2-live_get_var AC_CONFIG_AUX_DIR configure.*)
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-08-28 18:46 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-08-28 18:46 UTC (permalink / raw
To: gentoo-commits
commit: 0199b94ed8ce96209018cfa13d56411af5e4ffa8
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 28 18:06:22 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 28 18:08:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0199b94e
eclass/gnome2.eclass: sync with gx86 (${T} instead of ${S})
Add the following change from gx86:
Thu Aug 25 18:08:59 2011 UTC by nirbheek
Use ${T} instead of ${S} for the gstreamer registry
---
eclass/gnome2.eclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c177b4f..5803826 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -109,7 +109,7 @@ gnome2_src_prepare() {
chmod 0700 "${XDG_RUNTIME_DIR}"
# GST_REGISTRY is to work around gst utilities trying to read/write /root
- export GST_REGISTRY="${S}/registry.xml"
+ export GST_REGISTRY="${T}/registry.xml"
# Prevent scrollkeeper access violations
gnome2_omf_fix
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-08-24 7:04 Arun Raghavan
0 siblings, 0 replies; 94+ messages in thread
From: Arun Raghavan @ 2011-08-24 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 72d496183b7c2c0a97f8c1763c68e1c5912a5167
Author: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 06:49:06 2011 +0000
Commit: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 06:50:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=72d49618
eclass/gnome2.eclass: Move GST_REGISTRY export to src_prepare
We might end up calling gst functions anywhere (gupnp-dlna calls it in
documentation generation, for example).
---
eclass/gnome2.eclass | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 49a0556..c177b4f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -108,6 +108,9 @@ gnome2_src_prepare() {
# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
chmod 0700 "${XDG_RUNTIME_DIR}"
+ # GST_REGISTRY is to work around gst utilities trying to read/write /root
+ export GST_REGISTRY="${S}/registry.xml"
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
@@ -140,8 +143,7 @@ gnome2_src_configure() {
# Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
addwrite "$(unset HOME; echo ~)/.gnome2"
- # GST_REGISTRY is to work around gst-inspect trying to read/write /root
- GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
+ econf "$@" ${G2CONF}
}
# @FUNCTION: gnome2_src_compile
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-08-21 7:06 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-08-21 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 253814510e7a508e5fb44388334e13e472d065a8
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 06:51:58 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 21 07:06:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=25381451
eclass/gnome2.eclass: sync with gx86
Add the following change from gx86:
Revision 1.99
Sun Aug 14 03:46:33 2011 UTC by nirbheek
For ebuilds with USE=static-libs, remove .la files conditionally for
GNOME2_LA_PUNT
---
eclass/gnome2.eclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c655269..49a0556 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -196,7 +196,9 @@ gnome2_src_install() {
# Delete all .la files
if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
ebegin "Removing .la files"
- find "${D}" -name '*.la' -exec rm -f {} + || die
+ if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ fi
eend
fi
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-07-19 0:22 Alexandre Restovtsev
0 siblings, 0 replies; 94+ messages in thread
From: Alexandre Restovtsev @ 2011-07-19 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 245129652c43bf9a52fde33ae303f4cc744018dc
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 00:13:33 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 19 00:18:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=24512965
eclass/gnome2.eclass: fixes from gx86 for hasq, ~/.gnome2
Add the following changes from gentoo-x86 CVS:
Revision 1.97 Fri Jul 8 11:35:01 2011 UTC by ssuominen
Convert every instance of hasq to has.
Revision 1.98 Fri Jul 15 17:31:37 2011 UTC by zmedico
Bug #345659 - fix hardcoded /root/.gnome2
This uses a special $(unset HOME; echo ~) trick to query the home
directory that gnome-vfs uses from the password database, as suggested
by Jonathan Callen <abcd <AT> gentoo.org> in bug 345659, comment #24.
---
eclass/gnome2.eclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index c127655..c655269 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -133,12 +133,12 @@ gnome2_src_configure() {
fi
# Prevent a QA warning
- if hasq doc ${IUSE} ; then
+ if has doc ${IUSE} ; then
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
fi
- # Avoid sandbox violations caused by misbehaving packages (bug #128289)
- addwrite "/root/.gnome2"
+ # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659)
+ addwrite "$(unset HOME; echo ~)/.gnome2"
# GST_REGISTRY is to work around gst-inspect trying to read/write /root
GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-05-08 18:54 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 8062112d79cbf0c6bcc052d60dc09f84d0b60bda
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 18:51:34 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 18:53:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8062112d
eclass/gnome2-python: add support for arguments to some functions
---
eclass/gnome2-python.eclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index 3f98649..90df4ac 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -40,13 +40,13 @@ gnome2-python_src_prepare() {
gnome2-python_src_configure() {
configure() {
- gnome2_src_configure PYTHON=$(PYTHON -a)
+ gnome2_src_configure PYTHON=$(PYTHON -a) "$@"
}
python_execute_function -s configure
}
gnome2-python_src_compile() {
- python_execute_function -s gnome2_src_compile
+ python_execute_function -s gnome2_src_compile "$@"
}
gnome2-python_src_test() {
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-05-08 18:54 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 5a5df3165db085622cbe276eca5458f274a564a2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 18:50:39 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 18:53:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5a5df316
eclass/gnome2-python: import header from eclass submitted by Arfrever
---
eclass/gnome2-python.eclass | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index fa31067..3f98649 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -2,10 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-#
-# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
-# Purpose:
-#
+# @ECLASS: gnome2-python.eclass
+# @MAINTAINER:
+# Gentoo GNOME Project <gnome@gentoo.org>
+# Gentoo Python Project <python@gentoo.org>
+# @BLURB: Eclass for GNOME Python packages supporting installation for multiple Python ABIs
+# @DESCRIPTION:
+# The gnome2-python eclass defines phase functions for GNOME Python packages supporting
+# installation for multiple Python ABIs.
inherit gnome2 python
^ permalink raw reply related [flat|nested] 94+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-05-08 18:54 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 18:54 UTC (permalink / raw
To: gentoo-commits
commit: faa18cfe82826a0b77ce6188cce4124191bb0d97
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 18:53:19 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 18:53:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=faa18cfe
eclass/gnome2-python: drop pkg_{postinst,postrm} until a better idea comes out
---
eclass/gnome2-python.eclass | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
index 90df4ac..7b05342 100644
--- a/eclass/gnome2-python.eclass
+++ b/eclass/gnome2-python.eclass
@@ -14,7 +14,7 @@
inherit gnome2 python
# Stolen from git.eclass
-EXPORTED_FUNCTIONS="pkg_setup src_compile src_test src_install pkg_postinst pkg_postrm"
+EXPORTED_FUNCTIONS="pkg_setup src_compile src_test src_install"
case "${EAPI:-0}" in
2|3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
0|1) ;;
@@ -53,20 +53,7 @@ gnome2-python_src_test() {
python_execute_function -s -d
}
-
gnome2-python_src_install() {
python_execute_function -s gnome2_src_install
python_clean_installation_image
}
-
-
-gnome2-python_pkg_postinst() {
- gnome2_pkg_postinst
- python_mod_optimize ${GNOME_ORG_MODULE}
-}
-
-
-gnome2-python_pkg_postrm() {
- gnome2_pkg_postrm
- python_mod_cleanup ${GNOME_ORG_MODULE}
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-04-21 22:09 Gilles Dartiguelongue
0 siblings, 0 replies; 94+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-21 22:09 UTC (permalink / raw
To: gentoo-commits
commit: c2bda2cb3b9c132dd969616d0981c6d73d44e158
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 21:21:52 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 20:48:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c2bda2cb
eclass: quick and dirty gnome2-python
---
eclass/gnome2-python.eclass | 68 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-python.eclass b/eclass/gnome2-python.eclass
new file mode 100644
index 0000000..fa31067
--- /dev/null
+++ b/eclass/gnome2-python.eclass
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
+# Purpose:
+#
+
+inherit gnome2 python
+
+# Stolen from git.eclass
+EXPORTED_FUNCTIONS="pkg_setup src_compile src_test src_install pkg_postinst pkg_postrm"
+case "${EAPI:-0}" in
+ 2|3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
+ 0|1) ;;
+ *) die "Unknown EAPI, Bug eclass maintainers." ;;
+esac
+
+EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
+
+gnome2-python_pkg_setup() {
+ python_pkg_setup
+}
+
+gnome2-python_src_prepare() {
+ if [ -f py-compile ]; then
+ # disable pyc compiling
+ mv py-compile py-compile.orig
+ ln -s $(type -P true) py-compile
+ fi
+
+ gnome2_src_prepare
+ python_copy_sources
+}
+
+gnome2-python_src_configure() {
+ configure() {
+ gnome2_src_configure PYTHON=$(PYTHON -a)
+ }
+ python_execute_function -s configure
+}
+
+gnome2-python_src_compile() {
+ python_execute_function -s gnome2_src_compile
+}
+
+gnome2-python_src_test() {
+ python_execute_function -s -d
+}
+
+
+gnome2-python_src_install() {
+ python_execute_function -s gnome2_src_install
+ python_clean_installation_image
+}
+
+
+gnome2-python_pkg_postinst() {
+ gnome2_pkg_postinst
+ python_mod_optimize ${GNOME_ORG_MODULE}
+}
+
+
+gnome2-python_pkg_postrm() {
+ gnome2_pkg_postrm
+ python_mod_cleanup ${GNOME_ORG_MODULE}
+}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-04-20 20:39 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-04-20 20:39 UTC (permalink / raw
To: gentoo-commits
commit: 4ed77a4609bb55081f91a5f3c6afeeffc1196216
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 20:38:50 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 20:38:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ed77a46
gnome2-live.eclass: fix module path breakage, bug 363219
---
eclass/gnome2-live.eclass | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index e85a9c9..3b4ea78 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,7 +17,7 @@ inherit autotools gnome2 gnome2-utils libtool git
# Stolen from git.eclass
EXPORTED_FUNCTIONS="src_unpack pkg_postinst"
case "${EAPI:-0}" in
- 2|3) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
+ 2|3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
0|1) ;;
*) die "Unknown EAPI, Bug eclass maintainers." ;;
esac
@@ -39,10 +39,10 @@ DEPEND="${DEPEND}
ELTCONF=${ELTCONF:-}
# Default git module name
-GNOME_LIVE_MODULE=${MODPATH:-"${PN}"}
+GNOME_LIVE_MODULE=${GNOME_LIVE_MODULE:-"${PN}"}
# GIT URI for the project
-EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${MODPATH}"}"
+EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${GNOME_LIVE_MODULE}"}"
# Unset SRC_URI auto-set by gnome2.eclass
SRC_URI=""
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-04-20 18:58 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-04-20 18:58 UTC (permalink / raw
To: gentoo-commits
commit: c0c6ebbfec667192e0b659029ab66b55080052b7
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 18:55:33 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 18:55:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c0c6ebbf
gnome2.eclass: port eclass doc changes from the tree
---
eclass/gnome2.eclass | 82 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index f861b8f..c127655 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,16 +1,14 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.87 2010/04/26 19:37:25 abcd Exp $
+# $Header: $
-#
-# gnome2.eclass
-#
+# @ECLASS: gnome2.eclass
+# @MAINTAINER:
+# gnome@gentoo.org
+# @BLURB:
+# @DESCRIPTION:
# Exports portage base functions used by ebuilds written for packages using the
# GNOME framework. For additional functions, see gnome2-utils.eclass.
-#
-# Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
-#
-
inherit fdo-mime libtool gnome.org gnome2-utils
@@ -24,22 +22,51 @@ case "${EAPI:-0}" in
*) die "EAPI=${EAPI} is not supported" ;;
esac
+# @ECLASS-VARIABLE: G2CONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
# Extra configure opts passed to econf
G2CONF=${G2CONF:-""}
+# @ECLASS-VARIABLE: GNOME2_LA_PUNT
+# @DESCRIPTION:
# Should we delete all the .la files?
-# Do NOT use without due consideration
+# NOT to be used without due consideration.
GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+# @ECLASS-VARIABLE: ELTCONF
+# @DEFAULT-UNSET
+# @DESCRIPTION:
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-""}
+# @ECLASS-VARIABLE: USE_EINSTALL
+# @DEFAULT-UNSET
+# @DEPRECATED
+# @DESCRIPTION:
# Should we use EINSTALL instead of DESTDIR
USE_EINSTALL=${USE_EINSTALL:-""}
-# Run scrollkeeper for this package?
+# @ECLASS-VARIABLE: SCROLLKEEPER_UPDATE
+# @DEPRECATED
+# @DESCRIPTION:
+# Whether to run scrollkeeper for this package or not.
SCROLLKEEPER_UPDATE=${SCROLLKEEPER_UPDATE:-"1"}
+# @ECLASS-VARIABLE: DOCS
+# @DEFAULT-UNSET
+# @DESCRIPTION:
+# String containing documents passed to dodoc command.
+
+# @ECLASS-VARIABLE: GCONF_DEBUG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Whether to handle debug or not.
+# Some gnome applications support various levels of debugging (yes, no, minimum,
+# etc), but using --disable-debug also removes g_assert which makes debugging
+# harder. This variable should be set to yes for such packages for the eclass
+# to handle it properly. It will enable minimal debug with USE=-debug.
+# Note that this is most commonly found in configure.ac as GNOME_DEBUG_CHECK.
if [[ ${GCONF_DEBUG} != "no" ]]; then
@@ -47,13 +74,19 @@ if [[ ${GCONF_DEBUG} != "no" ]]; then
fi
-
+# @FUNCTION: gnome2_src_unpack
+# @DESCRIPTION:
+# Stub function for old EAPI.
gnome2_src_unpack() {
unpack ${A}
cd "${S}"
has ${EAPI:-0} 0 1 && gnome2_src_prepare
}
+# @FUNCTION: gnome2_src_prepare
+# @DESCRIPTION:
+# Prepare environment for build, fix build of scrollkeeper documentation,
+# run elibtoolize.
gnome2_src_prepare() {
# Reset various variables inherited via the environment.
# Causes test failures, introspection-build failures, and access violations
@@ -88,6 +121,9 @@ gnome2_src_prepare() {
}
+# @FUNCTION: gnome2_src_configure
+# @DESCRIPTION:
+# Gnome specific configure handling
gnome2_src_configure() {
# Update the GNOME configuration options
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
@@ -108,11 +144,18 @@ gnome2_src_configure() {
GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
}
+# @FUNCTION: gnome2_src_compile
+# @DESCRIPTION:
+# Stub function for old EAPI.
gnome2_src_compile() {
has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
emake || die "compile failure"
}
+# @FUNCTION: gnome2_src_install
+# @DESCRIPTION:
+# Gnome specific install. Handles typical GConf and scrollkeeper setup
+# in packages and removal of .la files if requested
gnome2_src_install() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
# if this is not present, scrollkeeper-update may segfault and
@@ -158,12 +201,19 @@ gnome2_src_install() {
fi
}
+# @FUNCTION: gnome2_pkg_preinst
+# @DESCRIPTION:
+# Finds Icons, GConf and GSettings schemas for later handling in pkg_postinst
gnome2_pkg_preinst() {
gnome2_gconf_savelist
gnome2_icon_savelist
gnome2_schemas_savelist
}
+# @FUNCTION: gnome2_pkg_postinst
+# @DESCRIPTION:
+# Handle scrollkeeper, GConf, GSettings, Icons, desktop and mime
+# database updates.
gnome2_pkg_postinst() {
gnome2_gconf_install
fdo-mime_desktop_database_update
@@ -182,10 +232,16 @@ gnome2_pkg_postinst() {
ewarn "**************************************************************"
}
+# @#FUNCTION: gnome2_pkg_prerm
+# @#DESCRIPTION:
+# # FIXME Handle GConf schemas removal
#gnome2_pkg_prerm() {
# gnome2_gconf_uninstall
#}
+# @FUNCTION: gnome2_pkg_postrm
+# @DESCRIPTION:
+# Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
gnome2_pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
@@ -196,5 +252,3 @@ gnome2_pkg_postrm() {
gnome2_scrollkeeper_update
fi
}
-
-# pkg_prerm
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: ad0b66fb93f9bf52178c0d15943304c28e38cc1c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 22:11:28 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Apr 5 00:29:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ad0b66fb
gnome2-live.eclass: use GNOME_LIVE_MODULE instead of MODPATH
---
eclass/gnome2-live.eclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index 03654ae..e85a9c9 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -38,8 +38,8 @@ DEPEND="${DEPEND}
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-}
-# Default module svn path
-MODPATH=${MODPATH:-"${PN}"}
+# Default git module name
+GNOME_LIVE_MODULE=${MODPATH:-"${PN}"}
# GIT URI for the project
EGIT_REPO_URI="${EGIT_REPO_URI:-"git://git.gnome.org/${MODPATH}"}"
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: a012f48813f2fa144607f7a8194548c1825a565c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 14:19:16 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 15:47:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a012f488
gnome2.eclass: add EAPI 4 support, remove cruft
* The introspection warning was never being displayed
and it's displayed in gobject-introspection now
* Remove unnecessary quotes around {} in find call
---
eclass/gnome2.eclass | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index bf38bbd..f861b8f 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -18,7 +18,7 @@ case "${EAPI:-0}" in
0|1)
EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
- 2|3)
+ 2|3|4)
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm
;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -79,7 +79,13 @@ gnome2_src_prepare() {
gnome2_omf_fix
# Run libtoolize
- elibtoolize ${ELTCONF}
+ if has ${EAPI:-0} 0 1 2 3; then
+ elibtoolize ${ELTCONF}
+ else
+ # Everything is fatal EAPI 4 onwards
+ nonfatal elibtoolize ${ELTCONF}
+ fi
+
}
gnome2_src_configure() {
@@ -99,20 +105,11 @@ gnome2_src_configure() {
addwrite "/root/.gnome2"
# GST_REGISTRY is to work around gst-inspect trying to read/write /root
- GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF} || die "configure failed"
+ GST_REGISTRY="${S}/registry.xml" econf "$@" ${G2CONF}
}
gnome2_src_compile() {
has ${EAPI:-0} 0 1 && gnome2_src_configure "$@"
-
- # Whenever new API is added to glib/cairo/libxml2 etc, gobject-introspection
- # needs to be rebuilt so that the typelibs/girs contain the new API data
- if has introspection ${IUSE} && use introspection; then
- ewarn "If you get a compilation failure related to introspection, try"
- ewarn "rebuilding dev-libs/gobject-introspection so that it's updated"
- ewarn "for any new glib, cairo, etc APIs"
- fi
-
emake || die "compile failure"
}
@@ -156,7 +153,7 @@ gnome2_src_install() {
# Delete all .la files
if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
ebegin "Removing .la files"
- find "${D}" -name '*.la' -exec rm -f '{}' + || die
+ find "${D}" -name '*.la' -exec rm -f {} + || die
eend
fi
}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-03-26 2:17 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-03-26 2:17 UTC (permalink / raw
To: gentoo-commits
commit: c86772db9002e58d9f0d6ccc051ac0c0b4b90474
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 02:15:41 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 02:15:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c86772db
gnome2.eclass: add massive ewarn to pkg_postinst about reporting bugs
* Some users have been going straight to upstream which wastes upstream time
* They should check with us first
---
eclass/gnome2.eclass | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 878cd50..bf38bbd 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -177,6 +177,12 @@ gnome2_pkg_postinst() {
if [[ "${SCROLLKEEPER_UPDATE}" = "1" ]]; then
gnome2_scrollkeeper_update
fi
+ # This should only be in the overlay
+ ewarn "**************************************************************"
+ ewarn "This is the *experimental* Gentoo GNOME Overlay"
+ ewarn "Please report bugs at #gentoo-desktop @ FreeNode"
+ ewarn "Do NOT go to upstream with bugs without checking with us first"
+ ewarn "**************************************************************"
}
#gnome2_pkg_prerm() {
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-03-20 22:15 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-03-20 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 4d9125329d9a4041d586484fc8b6beeb2a18648e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 22:15:09 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 22:15:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4d912532
waf-utils.eclass: moved to tree
---
eclass/waf-utils.eclass | 74 -----------------------------------------------
1 files changed, 0 insertions(+), 74 deletions(-)
diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass
deleted file mode 100644
index a36c161..0000000
--- a/eclass/waf-utils.eclass
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: waf-utils.eclass
-# @MAINTAINER:
-# ?@gentoo.org
-#
-# @CODE
-# Original Author: Gilles Dartiguelongue <eva@gentoo.org>
-# @CODE
-# @BLURB: common ebuild functions for waf-based packages
-# @DESCRIPTION:
-# The waf-utils eclass contains functions that make creating ebuild for
-# waf-based packages much easier.
-# Its main features are support of common portage default settings.
-
-inherit base eutils multilib python
-
-case ${EAPI:-0} in
- 3|2) EXPORT_FUNCTIONS pkg_setup src_configure src_compile src_install ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# @ECLASS-VARIABLE: DOCS
-# @DESCRIPTION:
-# Documents passed to dodoc command.
-
-# @FUNCTION: waf-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with waf.
-waf-utils_pkg_setup() {
- python_set_active_version 2
-}
-
-# @FUNCTION: waf-utils_src_configure
-# @DESCRIPTION:
-# General function for configuring with waf.
-waf-utils_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${S}"/waf \
- --prefix=/usr \
- --libdir=/usr/$(get_libdir) \
- $@ \
- configure || die "configure failed"
-}
-
-# @FUNCTION: waf-utils_src_compile
-# @DESCRIPTION:
-# General function for compiling with waf.
-waf-utils_src_compile() {
- debug-print-function ${FUNCNAME} "$@"
-
- local jobs=$(sed \
- -e 's/.*\(\-j[ 0-9]\+\) .*/\1/' \
- -e 's/--jobs=\?/-j/' \
- -e 's/-j/--jobs=/' <<< ${MAKEOPTS})
- "${S}"/waf build ${jobs} || die "build failed"
-}
-
-# @FUNCTION: waf-utils_src_install
-# @DESCRIPTION:
-# Function for installing the package.
-waf-utils_src_install() {
- debug-print-function ${FUNCNAME} "$@"
- has ${EAPI:-0} 2 && ! use prefix && ED="${D}"
-
- "${S}"/waf --destdir="${ED}" install || die "Make install failed"
-
- # Manual document installation
- [[ -n "${DOCS}" ]] && { dodoc ${DOCS} || die "dodoc failed" ; }
-}
-
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-03-20 21:46 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-03-20 21:46 UTC (permalink / raw
To: gentoo-commits
commit: aeae4a681639753531354e5471dba3bb4b8aba8c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 21:46:33 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:46:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=aeae4a68
gnome2-utils.eclass: moved to tree
---
eclass/gnome2-utils.eclass | 268 --------------------------------------------
1 files changed, 0 insertions(+), 268 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
deleted file mode 100644
index c488dd9..0000000
--- a/eclass/gnome2-utils.eclass
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.13 2008/10/22 21:04:53 eva Exp $
-
-#
-# gnome2-utils.eclass
-#
-# Set of auxiliary functions used to perform actions commonly needed by packages
-# using the GNOME framework.
-#
-# Maintained by Gentoo's GNOME herd <gnome@gentoo.org>
-#
-
-case "${EAPI:-0}" in
- 0|1|2|3) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# Path to gconftool-2
-: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
-
-# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
-
-# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}
-
-# Path to gtk-update-icon-cache
-: ${GTK_UPDATE_ICON_CACHE:="/usr/bin/gtk-update-icon-cache"}
-
-# Path to glib-compile-schemas
-: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}
-
-
-
-DEPEND=">=sys-apps/sed-4"
-
-
-
-# Find the GConf schemas that are about to be installed and save their location
-# in the GNOME2_ECLASS_SCHEMAS environment variable
-gnome2_gconf_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &> /dev/null
- export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
- popd &> /dev/null
-}
-
-
-# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2
-gnome2_gconf_install() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GCONFTOOL_BIN}"
-
- if [[ ! -x "${updater}" ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- debug-print "No GNOME 2 GConf schemas found"
- return
- fi
-
- # We are ready to install the GCONF Scheme now
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${EROOT};")"
-
- einfo "Installing GNOME 2 GConf schemas"
-
- local F
- for F in ${GNOME2_ECLASS_SCHEMAS}; do
- if [[ -e "${EROOT}${F}" ]]; then
- debug-print "Installing schema: ${F}"
- "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
- fi
- done
-
- # have gconf reload the new schemas
- pids=$(pgrep -x gconfd-2)
- if [[ $? == 0 ]] ; then
- ebegin "Reloading GConf schemas"
- kill -HUP ${pids}
- eend $?
- fi
-}
-
-
-# Removes schema files previously installed by the current ebuild from Gconf's
-# database.
-gnome2_gconf_uninstall() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GCONFTOOL_BIN}"
-
- if [[ ! -x "${updater}" ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- debug-print "No GNOME 2 GConf schemas found"
- return
- fi
-
- unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${EROOT};")"
-
- einfo "Uninstalling GNOME 2 GConf schemas"
-
- local F
- for F in ${GNOME2_ECLASS_SCHEMAS}; do
- if [[ -e "${EROOT}${F}" ]]; then
- debug-print "Uninstalling gconf schema: ${F}"
- "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
- fi
- done
-
- # have gconf reload the new schemas
- pids=$(pgrep -x gconfd-2)
- if [[ $? == 0 ]] ; then
- ebegin "Reloading GConf schemas"
- kill -HUP ${pids}
- eend $?
- fi
-}
-
-
-# Find the icons that are about to be installed and save their location
-# in the GNOME2_ECLASS_ICONS environment variable
-# That function should be called from pkg_preinst
-gnome2_icon_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &> /dev/null
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
- popd &> /dev/null
-}
-
-
-# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
-# have installed anything under that location.
-gnome2_icon_cache_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GTK_UPDATE_ICON_CACHE}"
-
- if [[ ! -x "${updater}" ]] ; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
- debug-print "No icon cache to update"
- return
- fi
-
- ebegin "Updating icons cache"
-
- local retval=0
- local fails=( )
-
- for dir in ${GNOME2_ECLASS_ICONS}
- do
- if [[ -f "${ROOT}${dir}/index.theme" ]] ; then
- local rv=0
-
- "${updater}" -qf "${EROOT}${dir}"
- rv=$?
-
- if [[ ! $rv -eq 0 ]] ; then
- debug-print "Updating cache failed on ${EROOT}${dir}"
-
- # Add to the list of failures
- fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
-
- retval=2
- fi
- fi
- done
-
- eend ${retval}
-
- for f in "${fails[@]}" ; do
- eerror "Failed to update cache with icon $f"
- done
-}
-
-
-# Workaround applied to Makefile rules in order to remove redundant
-# calls to scrollkeeper-update and sandbox violations.
-gnome2_omf_fix() {
- local omf_makefiles filename
-
- omf_makefiles="$@"
-
- if [[ -f ${S}/omf.make ]] ; then
- omf_makefiles="${omf_makefiles} ${S}/omf.make"
- fi
-
- # testing fixing of all makefiles found
- # The sort is important to ensure .am is listed before the respective .in for
- # maintainer mode regeneration not kicking in due to .am being newer than .in
- for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am" |sort) ; do
- omf_makefiles="${omf_makefiles} ${filename}"
- done
-
- ebegin "Fixing OMF Makefiles"
-
- local retval=0
- local fails=( )
-
- for omf in ${omf_makefiles} ; do
- local rv=0
-
- sed -i -e 's:scrollkeeper-update:true:' "${omf}"
- retval=$?
-
- if [[ ! $rv -eq 0 ]] ; then
- debug-print "updating of ${omf} failed"
-
- # Add to the list of failures
- fails[$(( ${#fails[@]} + 1 ))]=$omf
-
- retval=2
- fi
- done
-
- eend $retval
-
- for f in "${fails[@]}" ; do
- eerror "Failed to update OMF Makefile $f"
- done
-}
-
-
-# Updates the global scrollkeeper database.
-gnome2_scrollkeeper_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- if [[ -x "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
- einfo "Updating scrollkeeper database ..."
- "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
- fi
-}
-
-gnome2_schemas_savelist() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" &>/dev/null
- export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
- popd &>/dev/null
-}
-
-gnome2_schemas_update() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
- local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
-
- if [[ ! -x ${updater} ]]; then
- debug-print "${updater} is not executable"
- return
- fi
-
- if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
- debug-print "No GSettings schemas to update"
- return
- fi
-
- ebegin "Updating GSettings schemas"
- ${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
- eend $?
-}
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-03-16 20:20 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-03-16 20:20 UTC (permalink / raw
To: gentoo-commits
commit: c63c943813469df5904140ad94e820b3a0444d1e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 20:20:24 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 20:20:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c63c9438
gnome2.eclass: unset more vars, set XDG_* vars
---
eclass/gnome2.eclass | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index f206fc1..878cd50 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -55,9 +55,25 @@ gnome2_src_unpack() {
}
gnome2_src_prepare() {
- # Don't use the session bus address inherited via the environment
- # causes test and introspection-building failures
+ # Reset various variables inherited via the environment.
+ # Causes test failures, introspection-build failures, and access violations
unset DBUS_SESSION_BUS_ADDRESS
+ unset DISPLAY
+ unset GNOME_KEYRING_CONTROL
+ unset GNOME_KEYRING_PID
+ unset XAUTHORITY
+ unset XDG_SESSION_COOKIE
+
+ # Reset the XDG_* directories to avoid access violations
+ export XDG_DATA_HOME="${T}/.local/share"
+ export XDG_CONFIG_HOME="${T}/.config"
+ export XDG_CACHE_HOME="${T}/.cache"
+ export XDG_RUNTIME_DIR="${T}/run"
+ mkdir -p "${XDG_DATA_HOME}" "${XDG_CONFIG_HOME}" "${XDG_CACHE_HOME}" \
+ "${XDG_RUNTIME_DIR}"
+ # This directory needs to be owned by the user, and chmod 0700
+ # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+ chmod 0700 "${XDG_RUNTIME_DIR}"
# Prevent scrollkeeper access violations
gnome2_omf_fix
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-02-28 10:19 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-02-28 10:19 UTC (permalink / raw
To: gentoo-commits
commit: b88fd03c2c6cc596843ea82ef6d5e18cb7dc2035
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 09:07:30 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 09:07:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b88fd03c
gnome2.eclass: remove stray debug message
---
eclass/gnome2.eclass | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 192fc16..f206fc1 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -67,7 +67,6 @@ gnome2_src_prepare() {
}
gnome2_src_configure() {
- einfo dbus:$DBUS_SESSION_BUS_ADDRESS
# Update the GNOME configuration options
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then
^ permalink raw reply related [flat|nested] 94+ messages in thread* [gentoo-commits] proj/gnome:master commit in: eclass/
@ 2011-02-25 23:34 Nirbheek Chauhan
0 siblings, 0 replies; 94+ messages in thread
From: Nirbheek Chauhan @ 2011-02-25 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 8a28f2cbf3ca8e52a456d49989f9d1449dd459a5
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 22:33:14 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 22:33:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8a28f2cb
eclass/{gnome2,gnome2-live}: unset DBUS_SESSION_BUS_ADDRESS
---
eclass/gnome2-live.eclass | 5 +++++
eclass/gnome2.eclass | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index f119624..03654ae 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -121,6 +121,11 @@ gnome2-live_src_prepare() {
ln -sf $(type -P true) py-compile
### Keep this in-sync with gnome2.eclass!
+
+ # Don't use the session bus address inherited via the environment
+ # causes test and introspection-building failures
+ unset DBUS_SESSION_BUS_ADDRESS
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a335698..192fc16 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -55,6 +55,10 @@ gnome2_src_unpack() {
}
gnome2_src_prepare() {
+ # Don't use the session bus address inherited via the environment
+ # causes test and introspection-building failures
+ unset DBUS_SESSION_BUS_ADDRESS
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
@@ -63,6 +67,7 @@ gnome2_src_prepare() {
}
gnome2_src_configure() {
+ einfo dbus:$DBUS_SESSION_BUS_ADDRESS
# Update the GNOME configuration options
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then
^ permalink raw reply related [flat|nested] 94+ messages in thread
end of thread, other threads:[~2022-08-16 14:16 UTC | newest]
Thread overview: 94+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-16 16:12 [gentoo-commits] proj/gnome:master commit in: eclass/ Sobhan Mohammadpour
-- strict thread matches above, loose matches on Subject: below --
2022-08-16 14:16 Matt Turner
2021-01-30 20:02 Mart Raudsepp
2021-01-30 20:02 Mart Raudsepp
2019-02-24 8:40 Mart Raudsepp
2019-02-23 20:37 Mart Raudsepp
2018-02-01 10:37 Sobhan Mohammadpour
2018-01-29 7:50 Gilles Dartiguelongue
2018-01-29 7:50 Gilles Dartiguelongue
2017-12-26 12:20 Mart Raudsepp
2017-12-10 18:37 Sobhan Mohammadpour
2017-12-10 4:04 Sobhan Mohammadpour
2017-09-13 22:19 Gilles Dartiguelongue
2016-10-30 11:44 Gilles Dartiguelongue
2016-10-30 11:44 Gilles Dartiguelongue
2016-10-30 11:44 Gilles Dartiguelongue
2016-09-05 22:05 Gilles Dartiguelongue
2015-12-24 1:18 Gilles Dartiguelongue
2015-12-24 1:18 Gilles Dartiguelongue
2015-11-26 22:46 Gilles Dartiguelongue
2015-05-25 16:08 Gilles Dartiguelongue
2015-05-25 16:08 Gilles Dartiguelongue
2015-05-24 16:33 Gilles Dartiguelongue
2015-05-24 16:33 Gilles Dartiguelongue
2015-05-10 21:27 Gilles Dartiguelongue
2014-11-23 22:35 Remi Cardona
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-03 23:24 Gilles Dartiguelongue
2014-11-02 15:58 Gilles Dartiguelongue
2014-04-20 23:44 Gilles Dartiguelongue
2014-04-20 22:57 Gilles Dartiguelongue
2013-12-11 23:44 Gilles Dartiguelongue
2013-01-16 22:56 Gilles Dartiguelongue
2012-12-29 20:21 Gilles Dartiguelongue
2012-12-27 22:54 Gilles Dartiguelongue
2012-12-27 22:51 Gilles Dartiguelongue
2012-12-27 22:51 Gilles Dartiguelongue
2012-12-27 22:19 Gilles Dartiguelongue
2012-12-27 22:19 Gilles Dartiguelongue
2012-12-16 14:16 Gilles Dartiguelongue
2012-12-16 14:16 Gilles Dartiguelongue
2012-12-05 21:59 Alexandre Rostovtsev
2012-12-03 23:43 Gilles Dartiguelongue
2012-12-02 16:02 Gilles Dartiguelongue
2012-12-02 14:50 Gilles Dartiguelongue
2012-12-02 14:50 Gilles Dartiguelongue
2012-12-02 14:50 Gilles Dartiguelongue
2012-12-02 14:50 Gilles Dartiguelongue
2012-11-26 21:35 Gilles Dartiguelongue
2012-11-25 22:38 Gilles Dartiguelongue
2012-11-18 19:11 Gilles Dartiguelongue
2012-11-18 18:50 Gilles Dartiguelongue
2012-11-18 18:50 Gilles Dartiguelongue
2012-11-18 18:25 Gilles Dartiguelongue
2012-10-27 8:42 Gilles Dartiguelongue
2012-09-12 20:23 Alexandre Rostovtsev
2012-09-10 2:17 Alexandre Rostovtsev
2012-05-03 0:03 Alexandre Restovtsev
2012-04-24 3:36 Alexandre Restovtsev
2012-02-26 21:53 Alexandre Restovtsev
2012-02-12 15:32 Gilles Dartiguelongue
2012-01-03 11:56 Priit Laes
2011-12-18 5:26 Alexandre Restovtsev
2011-12-14 19:46 Alexandre Restovtsev
2011-11-15 1:31 Nirbheek Chauhan
2011-11-14 7:01 Alexandre Restovtsev
2011-11-04 20:35 Alexandre Restovtsev
2011-09-27 13:36 Nirbheek Chauhan
2011-09-26 4:46 Alexandre Restovtsev
2011-09-25 20:37 Alexandre Restovtsev
2011-09-20 2:17 Alexandre Restovtsev
2011-09-20 0:12 Alexandre Restovtsev
2011-08-28 18:46 Alexandre Restovtsev
2011-08-24 7:04 Arun Raghavan
2011-08-21 7:06 Alexandre Restovtsev
2011-07-19 0:22 Alexandre Restovtsev
2011-05-08 18:54 Gilles Dartiguelongue
2011-05-08 18:54 Gilles Dartiguelongue
2011-05-08 18:54 Gilles Dartiguelongue
2011-04-21 22:09 Gilles Dartiguelongue
2011-04-20 20:39 Nirbheek Chauhan
2011-04-20 18:58 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-04-05 0:57 Nirbheek Chauhan
2011-03-26 2:17 Nirbheek Chauhan
2011-03-20 22:15 Nirbheek Chauhan
2011-03-20 21:46 Nirbheek Chauhan
2011-03-16 20:20 Nirbheek Chauhan
2011-02-28 10:19 Nirbheek Chauhan
2011-02-25 23:34 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox