From 6957f5c65b02bba533954eabc0b62f5de36be206 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Apr 2018 17:26:49 +0100 Subject: gentoo resync : 10.04.2018 --- eclass/Manifest.gz | Bin 41027 -> 40702 bytes eclass/common-lisp-common.eclass | 211 --------------------------------------- eclass/common-lisp.eclass | 81 --------------- eclass/java-vm-2.eclass | 6 +- eclass/xfconf.eclass | 14 +-- 5 files changed, 10 insertions(+), 302 deletions(-) delete mode 100644 eclass/common-lisp-common.eclass delete mode 100644 eclass/common-lisp.eclass (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index aedd7bf21d67..e6b5438731d3 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/common-lisp-common.eclass b/eclass/common-lisp-common.eclass deleted file mode 100644 index f67aee59decf..000000000000 --- a/eclass/common-lisp-common.eclass +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: common-lisp-common.eclass -# @MAINTAINER: -# Common Lisp project -# @AUTHOR: Matthew Kennedy -# @BLURB: eclass for installing Common Lisp packages. -# @DESCRIPTION: -# Sundry code common to many Common Lisp related ebuilds. - -inherit eutils multilib - -# Some handy constants -CLFASLROOT=/usr/$(get_libdir)/common-lisp/ -CLSOURCEROOT=/usr/share/common-lisp/source/ -CLSYSTEMROOT=/usr/share/common-lisp/systems/ - -# Many of our Common Lisp ebuilds are either inspired by, or actually -# use packages and files from the Debian project's archives. - -do-debian-credits() { - docinto debian - for i in copyright README.Debian changelog; do - # be silent, since all files are not always present - dodoc "${S}"/debian/${i} &>/dev/null || true - done - docinto . -} - -# Most of the code below is from Debian's Common Lisp Controller -# package - -register-common-lisp-implementation() { - PROGNAME=$(basename $0) - # first check if there is at least a compiler-name: - if [ -z "$1" ] ; then - cat <&2 ; exit 3) - mkdir /usr/$(get_libdir)/common-lisp/$IMPL &>/dev/null || true - chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/$IMPL - - # now recompile the stuff - for i in /usr/share/common-lisp/systems/*.asd ; do - if [ -f $i -a -r $i ] ; then - i=${i%.asd} - package=${i##*/} - clc-autobuild-check $IMPL $package - if [ $? = 0 ]; then - echo recompiling package $package for implementation $IMPL - /usr/bin/clc-send-command --quiet recompile $package $IMPL - fi - fi - done - for i in /usr/share/common-lisp/systems/*.system ; do - if [ -f $i -a -r $i ] ; then - i=${i%.system} - package=${i##*/} - clc-autobuild-check $IMPL $package - if [ $? = 0 ]; then - echo recompiling package $package for implementation $IMPL - /usr/bin/clc-send-command --quiet recompile $package $IMPL - fi - fi - done - echo "$PROGNAME: Compiler $IMPL installed" -} - -unregister-common-lisp-implementation() { - PROGNAME=$(basename $0) - if [ `id -u` != 0 ] ; then - echo $PROGNAME: you need to be root to run this program - exit 1 - fi - if [ -z "$1" ] ; then - cat <&2 - clc-autobuild-impl $IMPL inherit - # Just remove the damn subtree - (cd / ; rm -rf "/usr/$(get_libdir)/common-lisp/$IMPL/" ; true ) - echo "$PROGNAME: Common Lisp implementation $IMPL uninstalled" -} - -reregister-all-common-lisp-implementations() { - # Rebuilds all common lisp implementations - # Written by Kevin Rosenberg - # GPL-2 license - local clc_bin_dir=/usr/$(get_libdir)/common-lisp/bin - local opt=$(shopt nullglob); shopt -s nullglob - cd $clc_bin_dir - for impl_bin in *.sh; do - impl=$(echo $impl_bin | sed 's/\(.*\).sh/\1/') - unregister-common-lisp-implementation $impl - register-common-lisp-implementation $impl - done - cd - >/dev/null - [[ $opt = *off ]] && shopt -u nullglob -} - -# BIG FAT HACK: Since the Portage emerge step kills file timestamp -# information, we need to compensate by ensuring all FASL files are -# more recent than their source files. - -# The following `impl-*-timestamp-hack' functions SHOULD NOT be used -# outside of this eclass. - -impl-save-timestamp-hack() { - local impl=$1 - dodir /usr/share/${impl} - tar cpjf "${D}"/usr/share/${impl}/portage-timestamp-compensate -C "${D}"/usr/$(get_libdir)/${impl} . -} - -impl-restore-timestamp-hack() { - local impl=$1 - tar xjpfo /usr/share/${impl}/portage-timestamp-compensate -C /usr/$(get_libdir)/${impl} -} - -impl-remove-timestamp-hack() { - local impl=$1 - rm -rf /usr/$(get_libdir)/${impl} &>/dev/null || true -} - -test-in() { - local symbol=$1 - shift - for i in $@; do - if [ $i == ${symbol} ]; then - return 0 # true - fi - done - false -} - -standard-impl-postinst() { - local impl=$1 - rm -rf /usr/$(get_libdir)/common-lisp/${impl}/* &>/dev/null || true - chown cl-builder:cl-builder /usr/$(get_libdir)/common-lisp/${impl} - if test-in ${impl} cmucl sbcl; then - impl-restore-timestamp-hack ${impl} - fi - chown -R root:0 /usr/$(get_libdir)/${impl} - /usr/bin/clc-autobuild-impl ${impl} yes - register-common-lisp-implementation ${impl} -} - -standard-impl-postrm() { - local impl=$1 impl_binary=$2 - # Since we keep our own time stamps we must manually remove them - # here. - if [ ! -x ${impl_binary} ]; then - if test-in ${impl} cmucl sbcl; then - impl-remove-timestamp-hack ${impl} - fi - rm -rf /usr/$(get_libdir)/common-lisp/${impl}/* - fi -} - -# Local Variables: *** -# mode: shell-script *** -# tab-width: 4 *** -# End: *** diff --git a/eclass/common-lisp.eclass b/eclass/common-lisp.eclass deleted file mode 100644 index e5ad3361f43c..000000000000 --- a/eclass/common-lisp.eclass +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: common-lisp.eclass -# @MAINTAINER: -# Common Lisp project -# @AUTHOR: Matthew Kennedy -# @BLURB: eclass for installing Common Lisp packages. -# @DESCRIPTION: -# This eclass supports the common-lisp-controller installation of many -# Common Lisp libraries - -inherit common-lisp-common - -CLPACKAGE= -DEPEND="dev-lisp/common-lisp-controller" - -EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm - -common-lisp_pkg_postinst() { - if [ -z "${CLPACKAGE}" ]; then - die "CLPACKAGE was empty or undefined upon call to pkg_prerm" - else - for package in ${CLPACKAGE}; do - einfo "Registering Common Lisp source for ${package}" - register-common-lisp-source ${package} - done - fi -} - -common-lisp_pkg_postrm() { - if [ -z "${CLPACKAGE}" ]; then - die "CLPACKAGE was empty or undefined upon call to pkg_prerm" - else - for package in ${CLPACKAGE}; do - if [ ! -d ${CLSOURCEROOT}/${package} ]; then - einfo "Unregistering Common Lisp source for ${package}" -# rm -rf ${CLFASLROOT}/*/${package} - unregister-common-lisp-source ${package} - fi - done - fi -} - -# -# In pkg_preinst, we remove the FASL files for the previous version of -# the source. -# -common-lisp_pkg_preinst() { - if [ -z "${CLPACKAGE}" ]; then - die "CLPACKAGE was empty or undefined upon call to pkg_preinst" - else - for package in ${CLPACKAGE}; do - einfo "Removing FASL files for previous version of Common Lisp package ${package}" - rm -rf ${CLFASLROOT}/*/${package} || true - done - fi -} - -common-lisp-install() { - insinto ${CLSOURCEROOT}/${CLPACKAGE} - doins $@ -} - -common-lisp-system-symlink() { - dodir ${CLSYSTEMROOT}/`dirname ${CLPACKAGE}` - if [ $# -eq 0 ]; then - dosym ${CLSOURCEROOT}/${CLPACKAGE}/${CLPACKAGE}.asd \ - ${CLSYSTEMROOT}/${CLPACKAGE}.asd - else - for package in "$@" ; do - dosym ${CLSOURCEROOT}/$CLPACKAGE/${package}.asd \ - ${CLSYSTEMROOT}/${package}.asd - done - fi -} - -# Local Variables: *** -# mode: shell-script *** -# tab-width: 4 *** -# End: *** diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 9deef1c8eedf..82cfe4d3e3e7 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -14,7 +14,7 @@ case ${EAPI:-0} in *) die "EAPI=${EAPI} is not supported" ;; esac -inherit fdo-mime multilib pax-utils prefix +inherit multilib pax-utils prefix xdg-utils EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_prerm pkg_postrm @@ -86,7 +86,7 @@ java-vm-2_pkg_postinst() { fi fi - fdo-mime_desktop_database_update + xdg_desktop_database_update } @@ -112,7 +112,7 @@ java-vm-2_pkg_prerm() { # Update mime database. java-vm-2_pkg_postrm() { - fdo-mime_desktop_database_update + xdg_desktop_database_update } diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass index 4cbcb8fa9a4e..496c42d5cf13 100644 --- a/eclass/xfconf.eclass +++ b/eclass/xfconf.eclass @@ -25,7 +25,7 @@ fi unset _xfconf_live [[ $PV == *9999* ]] && _xfconf_live=git-2 -inherit ${_xfconf_live} autotools eutils fdo-mime gnome2-utils libtool +inherit ${_xfconf_live} autotools eutils gnome2-utils libtool xdg-utils EGIT_BOOTSTRAP=autogen.sh EGIT_REPO_URI="git://git.xfce.org/xfce/${MY_PN:-${PN}}" @@ -134,11 +134,11 @@ xfconf_pkg_preinst() { # @FUNCTION: xfconf_pkg_postinst # @DESCRIPTION: -# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update xfconf_pkg_postinst() { debug-print-function ${FUNCNAME} "$@" - fdo-mime_desktop_database_update - fdo-mime_mime_database_update + xdg_desktop_database_update + xdg_mimeinfo_database_update if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then gnome2_icon_cache_update fi @@ -146,11 +146,11 @@ xfconf_pkg_postinst() { # @FUNCTION: xfconf_pkg_postrm # @DESCRIPTION: -# Run fdo-mime_{desktop,mime}_database_update and gnome2_icon_cache_update +# Run xdg_{desktop,mimeinfo}_database_update and gnome2_icon_cache_update xfconf_pkg_postrm() { debug-print-function ${FUNCNAME} "$@" - fdo-mime_desktop_database_update - fdo-mime_mime_database_update + xdg_desktop_database_update + xdg_mimeinfo_database_update if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then gnome2_icon_cache_update fi -- cgit v1.2.3