* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2008-03-22 17:30 Remi Cardona (remi)
0 siblings, 0 replies; 12+ messages in thread
From: Remi Cardona (remi) @ 2008-03-22 17:30 UTC (permalink / raw
To: gentoo-commits
remi 08/03/22 17:30:11
Modified: gnome2-utils.eclass
Log:
gnome2-utils.eclass: hide useless error message from find and remove an old workaround for <bash-3.1
Revision Changes Path
1.10 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.9&r2=1.10
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome2-utils.eclass 22 Mar 2008 10:19:05 -0000 1.9
+++ gnome2-utils.eclass 22 Mar 2008 17:30:11 -0000 1.10
@@ -1,6 +1,6 @@
# 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.9 2008/03/22 10:19:05 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.10 2008/03/22 17:30:11 remi Exp $
#
# gnome2-utils.eclass
@@ -32,7 +32,7 @@
# in the GNOME2_ECLASS_SCHEMAS environment variable
gnome2_gconf_savelist() {
pushd "${D}" &> /dev/null
- export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas')
+ export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
popd &> /dev/null
}
@@ -115,7 +115,7 @@
# That function should be called from pkg_preinst
gnome2_icon_savelist() {
pushd "${D}" &> /dev/null
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d)
+ export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
popd &> /dev/null
}
@@ -206,16 +206,8 @@
eend $retval
- for (( i = 0 ; i < ${#fails[@]} ; i++ )) ; do
- ### HACK!! This is needed until bash 3.1 is unmasked.
- ## The current stable version of bash lists the sizeof fails to be 1
- ## when there are no elements in the list because it is declared local.
- ## In order to prevent the declaration from being in global scope, we
- ## this hack to prevent an empty error message being printed for stable
- ## users. -- compnerd && allanonjl
- if [[ "${fails[i]}" != "" && "${fails[i]}" != "()" ]] ; then
- eerror "Failed to update OMF Makefile ${fails[i]}"
- fi
+ for f in "${fails[@]}" ; do
+ eerror "Failed to update OMF Makefile $f"
done
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2008-09-27 9:16 Mart Raudsepp (leio)
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp (leio) @ 2008-09-27 9:16 UTC (permalink / raw
To: gentoo-commits
leio 08/09/27 09:16:33
Modified: gnome2-utils.eclass
Log:
Sort the list of Makefile.am and Makefile.in files used in gnome2_omf_fix(), so that
it is ensured the .am one is listed before the respective .in for maintainer mode
regeneration to not kick in due to modtime of .am being newer than .in and the listed files
being possibly patched with sed for a scrollkeeper fix.
This maintainer mode build file regeneration is reliably reproducable only if PORTAGE_TMPDIR
is on a filesystem with jiffies-granularity timestamps - tmpfs in particular. In the common
case (ext3 and reiserfs) it is only second-granularity and GNU make rule dependency for
am--refresh doesn't trigger almost never because the timestamp is equal unless it hits a
second boundary pretty exactly in the middle. This should fix bug 236649 and all the few dozen
INVALID bugs Diego Pettenò has filed against GNOME packages that claim the maintainer mode
rebuild is caused by patches in $FILESDIR, while it must have been simply the omf_fix combined
with tmpfs usage.
Revision Changes Path
1.11 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.10&r2=1.11
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome2-utils.eclass 22 Mar 2008 17:30:11 -0000 1.10
+++ gnome2-utils.eclass 27 Sep 2008 09:16:32 -0000 1.11
@@ -1,6 +1,6 @@
# 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.10 2008/03/22 17:30:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.11 2008/09/27 09:16:32 leio Exp $
#
# gnome2-utils.eclass
@@ -179,7 +179,9 @@
fi
# testing fixing of all makefiles found
- for filename in $(find ./ -name "Makefile.in" -o -name "Makefile.am") ; do
+ # 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2008-10-19 10:35 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2008-10-19 10:35 UTC (permalink / raw
To: gentoo-commits
eva 08/10/19 10:35:58
Modified: gnome2-utils.eclass
Log:
gnome2-utils is now ${ROOT} aware, fix bug #238727.
Revision Changes Path
1.12 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.11&r2=1.12
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome2-utils.eclass 27 Sep 2008 09:16:32 -0000 1.11
+++ gnome2-utils.eclass 19 Oct 2008 10:35:58 -0000 1.12
@@ -1,6 +1,6 @@
# 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.11 2008/09/27 09:16:32 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.12 2008/10/19 10:35:58 eva Exp $
#
# gnome2-utils.eclass
@@ -53,7 +53,7 @@
# We are ready to install the GCONF Scheme now
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source)"
+ export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Installing GNOME 2 GConf schemas"
@@ -89,7 +89,7 @@
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE=$("${GCONFTOOL_BIN}" --get-default-source)
+ export GCONF_CONFIG_SOURCE=$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")
einfo "Uninstalling GNOME 2 GConf schemas"
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2008-10-22 21:04 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2008-10-22 21:04 UTC (permalink / raw
To: gentoo-commits
eva 08/10/22 21:04:53
Modified: gnome2-utils.eclass
Log:
Fix quoting, re-fix bug #238727
Revision Changes Path
1.13 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.12&r2=1.13
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome2-utils.eclass 19 Oct 2008 10:35:58 -0000 1.12
+++ gnome2-utils.eclass 22 Oct 2008 21:04:53 -0000 1.13
@@ -1,6 +1,6 @@
# 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.12 2008/10/19 10:35:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.13 2008/10/22 21:04:53 eva Exp $
#
# gnome2-utils.eclass
@@ -89,7 +89,7 @@
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE=$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")
+ export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Uninstalling GNOME 2 GConf schemas"
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2010-12-07 6:21 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07 6:21 UTC (permalink / raw
To: gentoo-commits
eva 10/12/07 06:21:59
Modified: gnome2-utils.eclass
Log:
replace usage of type -P by variables
Revision Changes Path
1.15 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.14&r2=1.15
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome2-utils.eclass 7 Dec 2010 06:18:55 -0000 1.14
+++ gnome2-utils.eclass 7 Dec 2010 06:21:59 -0000 1.15
@@ -1,6 +1,6 @@
# 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.14 2010/12/07 06:18:55 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.15 2010/12/07 06:21:59 eva Exp $
#
# gnome2-utils.eclass
@@ -22,6 +22,12 @@
# Path to scrollkeeper-update
: ${SCROLLKEEPER_UPDATE_BIN:="${ROOT}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"
@@ -123,7 +129,7 @@
# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
# have installed anything under that location.
gnome2_icon_cache_update() {
- local updater="$(type -p gtk-update-icon-cache 2> /dev/null)"
+ local updater="${ROOT}${GTK_UPDATE_ICON_CACHE}"
if [[ ! -x "${updater}" ]] ; then
debug-print "${updater} is not executable"
@@ -229,7 +235,7 @@
}
gnome2_schemas_update() {
- local updater="$(type -P glib-compile-schemas 2>/dev/null)"
+ local updater="${ROOT}${GLIB_COMPILE_SCHEMAS}"
if [[ ! -x ${updater} ]]; then
debug-print "${updater} is not executable"
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2010-12-07 6:23 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07 6:23 UTC (permalink / raw
To: gentoo-commits
eva 10/12/07 06:23:34
Modified: gnome2-utils.eclass
Log:
make sure we refer to $ROOT where needed
Revision Changes Path
1.16 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.15&r2=1.16
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome2-utils.eclass 7 Dec 2010 06:21:59 -0000 1.15
+++ gnome2-utils.eclass 7 Dec 2010 06:23:34 -0000 1.16
@@ -1,6 +1,6 @@
# 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.15 2010/12/07 06:21:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.16 2010/12/07 06:23:34 eva Exp $
#
# gnome2-utils.eclass
@@ -14,13 +14,13 @@
# Path to gconftool-2
-: ${GCONFTOOL_BIN:="${ROOT}usr/bin/gconftool-2"}
+: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}
# Directory where scrollkeeper-update should do its work
-: ${SCROLLKEEPER_DIR:="${ROOT}var/lib/scrollkeeper"}
+: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}
# Path to scrollkeeper-update
-: ${SCROLLKEEPER_UPDATE_BIN:="${ROOT}usr/bin/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"}
@@ -46,9 +46,10 @@
# Applies any schema files installed by the current ebuild to Gconf's database
# using gconftool-2
gnome2_gconf_install() {
+ local updater="${ROOT}${GCONFTOOL_BIN}"
local F
- if [[ ! -x "${GCONFTOOL_BIN}" ]]; then
+ if [[ ! -x "${updater}" ]]; then
return
fi
@@ -59,14 +60,14 @@
# We are ready to install the GCONF Scheme now
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Installing GNOME 2 GConf schemas"
for F in ${GNOME2_ECLASS_SCHEMAS}; do
if [[ -e "${ROOT}${F}" ]]; then
# echo "DEBUG::gconf install ${F}"
- "${GCONFTOOL_BIN}" --makefile-install-rule "${ROOT}${F}" 1>/dev/null
+ "${updater}" --makefile-install-rule "${ROOT}${F}" 1>/dev/null
fi
done
@@ -83,9 +84,10 @@
# Removes schema files previously installed by the current ebuild from Gconf's
# database.
gnome2_gconf_uninstall() {
+ local updater="${ROOT}${GCONFTOOL_BIN}"
local F
- if [[ ! -x "${GCONFTOOL_BIN}" ]]; then
+ if [[ ! -x "${updater}" ]]; then
return
fi
@@ -95,14 +97,14 @@
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${GCONFTOOL_BIN}" --get-default-source | sed "s;:/;:${ROOT};")"
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Uninstalling GNOME 2 GConf schemas"
for F in ${GNOME2_ECLASS_SCHEMAS}; do
if [[ -e "${ROOT}${F}" ]]; then
# echo "DEBUG::gconf uninstall ${F}"
- "${GCONFTOOL_BIN}" --makefile-uninstall-rule "${ROOT}${F}" 1>/dev/null
+ "${updater}" --makefile-uninstall-rule "${ROOT}${F}" 1>/dev/null
fi
done
@@ -222,9 +224,9 @@
# Updates the global scrollkeeper database.
gnome2_scrollkeeper_update() {
- if [[ -x "${SCROLLKEEPER_UPDATE_BIN}" ]]; then
+ if [[ -x "${ROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
einfo "Updating scrollkeeper database ..."
- "${SCROLLKEEPER_UPDATE_BIN}" -q -p "${SCROLLKEEPER_DIR}"
+ "${ROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${ROOT}${SCROLLKEEPER_DIR}"
fi
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2010-12-07 6:25 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07 6:25 UTC (permalink / raw
To: gentoo-commits
eva 10/12/07 06:25:23
Modified: gnome2-utils.eclass
Log:
cosmetic fixes, use debug-print instead of einfo.
Revision Changes Path
1.17 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.16&r2=1.17
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome2-utils.eclass 7 Dec 2010 06:23:34 -0000 1.16
+++ gnome2-utils.eclass 7 Dec 2010 06:25:23 -0000 1.17
@@ -1,6 +1,6 @@
# 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.16 2010/12/07 06:23:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.17 2010/12/07 06:25:23 eva Exp $
#
# gnome2-utils.eclass
@@ -47,14 +47,14 @@
# using gconftool-2
gnome2_gconf_install() {
local updater="${ROOT}${GCONFTOOL_BIN}"
- local F
if [[ ! -x "${updater}" ]]; then
+ debug-print "${updater} is not executable"
return
fi
if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- einfo "No GNOME 2 GConf schemas found"
+ debug-print "No GNOME 2 GConf schemas found"
return
fi
@@ -64,9 +64,10 @@
einfo "Installing GNOME 2 GConf schemas"
+ local F
for F in ${GNOME2_ECLASS_SCHEMAS}; do
if [[ -e "${ROOT}${F}" ]]; then
- # echo "DEBUG::gconf install ${F}"
+ debug-print "Installing schema: ${F}"
"${updater}" --makefile-install-rule "${ROOT}${F}" 1>/dev/null
fi
done
@@ -85,14 +86,14 @@
# database.
gnome2_gconf_uninstall() {
local updater="${ROOT}${GCONFTOOL_BIN}"
- local F
if [[ ! -x "${updater}" ]]; then
+ debug-print "${updater} is not executable"
return
fi
if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then
- einfo "No GNOME 2 GConf schemas found"
+ debug-print "No GNOME 2 GConf schemas found"
return
fi
@@ -101,9 +102,10 @@
einfo "Uninstalling GNOME 2 GConf schemas"
+ local F
for F in ${GNOME2_ECLASS_SCHEMAS}; do
if [[ -e "${ROOT}${F}" ]]; then
- # echo "DEBUG::gconf uninstall ${F}"
+ debug-print "Uninstalling gconf schema: ${F}"
"${updater}" --makefile-uninstall-rule "${ROOT}${F}" 1>/dev/null
fi
done
@@ -139,10 +141,10 @@
fi
if [[ -z "${GNOME2_ECLASS_ICONS}" ]]; then
+ debug-print "No icon cache to update"
return
fi
-
ebegin "Updating icons cache"
local retval=0
@@ -245,7 +247,7 @@
fi
if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then
- debug-print "no schemas to update"
+ debug-print "No GSettings schemas to update"
return
fi
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2010-12-07 6:26 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-12-07 6:26 UTC (permalink / raw
To: gentoo-commits
eva 10/12/07 06:26:37
Modified: gnome2-utils.eclass
Log:
add support for EAPI 3, importing changes from prefix overlay.
Revision Changes Path
1.18 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.17&r2=1.18
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gnome2-utils.eclass 7 Dec 2010 06:25:23 -0000 1.17
+++ gnome2-utils.eclass 7 Dec 2010 06:26:37 -0000 1.18
@@ -1,6 +1,6 @@
# 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.17 2010/12/07 06:25:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.18 2010/12/07 06:26:37 eva Exp $
#
# gnome2-utils.eclass
@@ -11,7 +11,10 @@
# 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"}
@@ -37,7 +40,8 @@
# Find the GConf schemas that are about to be installed and save their location
# in the GNOME2_ECLASS_SCHEMAS environment variable
gnome2_gconf_savelist() {
- pushd "${D}" &> /dev/null
+ 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
}
@@ -46,7 +50,8 @@
# Applies any schema files installed by the current ebuild to Gconf's database
# using gconftool-2
gnome2_gconf_install() {
- local updater="${ROOT}${GCONFTOOL_BIN}"
+ 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"
@@ -60,15 +65,15 @@
# 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};")"
+ 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 "${ROOT}${F}" ]]; then
+ if [[ -e "${EROOT}${F}" ]]; then
debug-print "Installing schema: ${F}"
- "${updater}" --makefile-install-rule "${ROOT}${F}" 1>/dev/null
+ "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null
fi
done
@@ -85,7 +90,8 @@
# Removes schema files previously installed by the current ebuild from Gconf's
# database.
gnome2_gconf_uninstall() {
- local updater="${ROOT}${GCONFTOOL_BIN}"
+ 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"
@@ -98,15 +104,15 @@
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
+ 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 "${ROOT}${F}" ]]; then
+ if [[ -e "${EROOT}${F}" ]]; then
debug-print "Uninstalling gconf schema: ${F}"
- "${updater}" --makefile-uninstall-rule "${ROOT}${F}" 1>/dev/null
+ "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null
fi
done
@@ -124,7 +130,8 @@
# in the GNOME2_ECLASS_ICONS environment variable
# That function should be called from pkg_preinst
gnome2_icon_savelist() {
- pushd "${D}" &> /dev/null
+ 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
}
@@ -133,7 +140,8 @@
# Updates Gtk+ icon cache files under /usr/share/icons if the current ebuild
# have installed anything under that location.
gnome2_icon_cache_update() {
- local updater="${ROOT}${GTK_UPDATE_ICON_CACHE}"
+ 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"
@@ -155,14 +163,14 @@
if [[ -f "${ROOT}${dir}/index.theme" ]] ; then
local rv=0
- "${updater}" -qf "${ROOT}${dir}"
+ "${updater}" -qf "${EROOT}${dir}"
rv=$?
if [[ ! $rv -eq 0 ]] ; then
- debug-print "Updating cache failed on ${ROOT}${dir}"
+ debug-print "Updating cache failed on ${EROOT}${dir}"
# Add to the list of failures
- fails[$(( ${#fails[@]} + 1 ))]="${ROOT}${dir}"
+ fails[$(( ${#fails[@]} + 1 ))]="${EROOT}${dir}"
retval=2
fi
@@ -226,20 +234,23 @@
# Updates the global scrollkeeper database.
gnome2_scrollkeeper_update() {
- if [[ -x "${ROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
+ has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
+ if [[ -x "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
einfo "Updating scrollkeeper database ..."
- "${ROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${ROOT}${SCROLLKEEPER_DIR}"
+ "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${EROOT}${SCROLLKEEPER_DIR}"
fi
}
gnome2_schemas_savelist() {
- pushd "${D}" &>/dev/null
+ 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() {
- local updater="${ROOT}${GLIB_COMPILE_SCHEMAS}"
+ 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"
@@ -252,6 +263,6 @@
fi
ebegin "Updating GSettings schemas"
- ${updater} --allow-any-name "$@" "${ROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
+ ${updater} --allow-any-name "$@" "${EROOT%/}/usr/share/glib-2.0/schemas" &>/dev/null
eend $?
}
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2011-01-20 23:49 Jonathan Callen (abcd)
0 siblings, 0 replies; 12+ messages in thread
From: Jonathan Callen (abcd) @ 2011-01-20 23:49 UTC (permalink / raw
To: gentoo-commits
abcd 11/01/20 23:49:37
Modified: gnome2-utils.eclass
Log:
Fix ROOT vs. EROOT confusion
Revision Changes Path
1.19 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.18&r2=1.19
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnome2-utils.eclass 7 Dec 2010 06:26:37 -0000 1.18
+++ gnome2-utils.eclass 20 Jan 2011 23:49:37 -0000 1.19
@@ -1,6 +1,6 @@
# 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.18 2010/12/07 06:26:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.19 2011/01/20 23:49:37 abcd Exp $
#
# gnome2-utils.eclass
@@ -65,7 +65,7 @@
# 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};")"
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Installing GNOME 2 GConf schemas"
@@ -104,7 +104,7 @@
fi
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${EROOT};")"
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")"
einfo "Uninstalling GNOME 2 GConf schemas"
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2011-01-20 23:50 Jonathan Callen (abcd)
0 siblings, 0 replies; 12+ messages in thread
From: Jonathan Callen (abcd) @ 2011-01-20 23:50 UTC (permalink / raw
To: gentoo-commits
abcd 11/01/20 23:50:49
Modified: gnome2-utils.eclass
Log:
more ROOT vs. EROOT confusion
Revision Changes Path
1.20 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.19&r2=1.20
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnome2-utils.eclass 20 Jan 2011 23:49:37 -0000 1.19
+++ gnome2-utils.eclass 20 Jan 2011 23:50:49 -0000 1.20
@@ -1,6 +1,6 @@
# 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.19 2011/01/20 23:49:37 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.20 2011/01/20 23:50:49 abcd Exp $
#
# gnome2-utils.eclass
@@ -160,7 +160,7 @@
for dir in ${GNOME2_ECLASS_ICONS}
do
- if [[ -f "${ROOT}${dir}/index.theme" ]] ; then
+ if [[ -f "${EROOT}${dir}/index.theme" ]] ; then
local rv=0
"${updater}" -qf "${EROOT}${dir}"
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2011-01-31 17:03 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-01-31 17:03 UTC (permalink / raw
To: gentoo-commits
eva 11/01/31 17:03:45
Modified: gnome2-utils.eclass
Log:
Add EAPI=4 to the list of supported EAPIs (xfconf needs it), bug #353210.
Revision Changes Path
1.21 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.20&r2=1.21
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gnome2-utils.eclass 20 Jan 2011 23:50:49 -0000 1.20
+++ gnome2-utils.eclass 31 Jan 2011 17:03:45 -0000 1.21
@@ -1,6 +1,6 @@
# 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.20 2011/01/20 23:50:49 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.21 2011/01/31 17:03:45 eva Exp $
#
# gnome2-utils.eclass
@@ -12,7 +12,7 @@
#
case "${EAPI:-0}" in
- 0|1|2|3) ;;
+ 0|1|2|3|4) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
^ permalink raw reply [flat|nested] 12+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass
@ 2011-04-03 18:12 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-04-03 18:12 UTC (permalink / raw
To: gentoo-commits
eva 11/04/03 18:12:35
Modified: gnome2-utils.eclass
Log:
Add eclass documentation.
Revision Changes Path
1.22 eclass/gnome2-utils.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.21&r2=1.22
Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome2-utils.eclass 31 Jan 2011 17:03:45 -0000 1.21
+++ gnome2-utils.eclass 3 Apr 2011 18:12:34 -0000 1.22
@@ -1,44 +1,82 @@
# 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.21 2011/01/31 17:03:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.22 2011/04/03 18:12:34 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>
-#
+# @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) ;;
*) 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_GLIB_SCHEMAS
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of GSettings schemas provided by the package
DEPEND=">=sys-apps/sed-4"
-
+# @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
+# 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
@@ -46,9 +84,11 @@
popd &> /dev/null
}
-
+# @FUNCTION: gnome2_gconf_install
+# @DESCRIPTION:
# Applies any schema files installed by the current ebuild to Gconf's database
-# using gconftool-2
+# 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}"
@@ -86,7 +126,8 @@
fi
}
-
+# @FUNCTION: gnome2_gconf_uninstall
+# @DESCRIPTION:
# Removes schema files previously installed by the current ebuild from Gconf's
# database.
gnome2_gconf_uninstall() {
@@ -125,10 +166,11 @@
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
-# That function should be called from pkg_preinst
+# 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
@@ -136,9 +178,11 @@
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}"
@@ -184,9 +228,11 @@
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
@@ -231,8 +277,10 @@
done
}
-
+# @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}"
if [[ -x "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then
@@ -241,6 +289,11 @@
fi
}
+# @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
@@ -248,6 +301,11 @@
popd &>/dev/null
}
+# @FUNCTION: gnome2_schemas_update
+# @USAGE: gnome2_schemas_update [--uninstall]
+# @DESCRIPTION:
+# Updates GSettings schemas if GNOME2_ECLASS_GLIB_SCHEMAS has some.
+# This function should be called from pkg_postinst and pkg_postrm with --uninstall.
gnome2_schemas_update() {
has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}"
local updater="${EROOT}${GLIB_COMPILE_SCHEMAS}"
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-04-03 18:12 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-07 6:23 [gentoo-commits] gentoo-x86 commit in eclass: gnome2-utils.eclass Gilles Dartiguelongue (eva)
-- strict thread matches above, loose matches on Subject: below --
2011-04-03 18:12 Gilles Dartiguelongue (eva)
2011-01-31 17:03 Gilles Dartiguelongue (eva)
2011-01-20 23:50 Jonathan Callen (abcd)
2011-01-20 23:49 Jonathan Callen (abcd)
2010-12-07 6:26 Gilles Dartiguelongue (eva)
2010-12-07 6:25 Gilles Dartiguelongue (eva)
2010-12-07 6:21 Gilles Dartiguelongue (eva)
2008-10-22 21:04 Gilles Dartiguelongue (eva)
2008-10-19 10:35 Gilles Dartiguelongue (eva)
2008-09-27 9:16 Mart Raudsepp (leio)
2008-03-22 17:30 Remi Cardona (remi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox