Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 308965 Details for
Bug 301311
gnome2.eclass installs empty /var/lib for many packages
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gnome2-utils.eclass.patch
gnome2-utils.eclass.patch (text/plain), 2.86 KB, created by
Gilles Dartiguelongue (RETIRED)
on 2012-04-14 18:44:51 UTC
(
hide
)
Description:
gnome2-utils.eclass.patch
Filename:
MIME Type:
Creator:
Gilles Dartiguelongue (RETIRED)
Created:
2012-04-14 18:44:51 UTC
Size:
2.86 KB
patch
obsolete
>Index: gnome2-utils.eclass >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v >retrieving revision 1.26 >diff -u -B -u -r1.26 gnome2-utils.eclass >--- gnome2-utils.eclass 8 Apr 2012 02:29:44 -0000 1.26 >+++ gnome2-utils.eclass 14 Apr 2012 18:29:12 -0000 >@@ -62,6 +62,12 @@ > # @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 >@@ -274,10 +279,14 @@ > 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 ./ -name "Makefile.in" -o -name "Makefile.am" |sort) ; do >+ for filename in $(find "${S}" -name "Makefile.in" -o -name "Makefile.am" |sort) ; do > omf_makefiles="${omf_makefiles} ${filename}" > done > >@@ -287,12 +296,10 @@ > 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 >+ if [[ $retval -ne 0 ]] ; then > debug-print "updating of ${omf} failed" > > # Add to the list of failures >@@ -309,16 +316,39 @@ > 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}" >- if [[ -x "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" ]]; then >- einfo "Updating scrollkeeper database ..." >- "${EROOT}${SCROLLKEEPER_UPDATE_BIN}" -q -p "${EROOT}${SCROLLKEEPER_DIR}" >+ 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 301311
:
308963
| 308965