fixed headers

This commit is contained in:
grepwood@sucs.org 2020-02-11 23:41:55 +01:00
parent b6ec576908
commit c85339e8ba
3 changed files with 23 additions and 27 deletions

View File

@ -1,21 +1,18 @@
# Copyright 1999-2018 Gentoo Foundation # Copyright 2019-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# #
# @DEAD # @ECLASS: icecatconfig-v6.60.eclass
# All consumers are gone. Removal in 14 days
#
# @ECLASS: mozconfig-v6.60.eclass
# @MAINTAINER: # @MAINTAINER:
# mozilla team <mozilla@gentoo.org> # moog621@gmail.com
# @SUPPORTED_EAPIS: 5 6 7 # @SUPPORTED_EAPIS: 5 6 7
# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6 # @BLURB: the new gnuzilla common configuration eclass for FF33 and newer, v6
# @DESCRIPTION: # @DESCRIPTION:
# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey) # This eclass is used in gnuzilla ebuilds (icecat)
# to provide a single common place for the common mozilla engine compoments. # to provide a single common place for the common gnuzilla engine compoments.
# #
# The eclass provides all common dependencies as well as common use flags. # The eclass provides all common dependencies as well as common use flags.
# #
# Some use flags which may be optional in particular mozilla packages can be # Some use flags which may be optional in particular gnuzilla packages can be
# supported through setting eclass variables. # supported through setting eclass variables.
# #
# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3, # This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
@ -77,7 +74,7 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v6
# Set the variable to "enabled" if the use flag should be enabled by default. # Set the variable to "enabled" if the use flag should be enabled by default.
# Set the variable to any value if the use flag should exist but not be default-enabled. # Set the variable to any value if the use flag should exist but not be default-enabled.
# use-flags common among all mozilla ebuilds # use-flags common among all gnuzilla ebuilds
IUSE="${IUSE} clang dbus debug neon pulseaudio selinux startup-notification IUSE="${IUSE} clang dbus debug neon pulseaudio selinux startup-notification
system-icu system-jpeg system-libevent system-sqlite system-libvpx" system-icu system-jpeg system-libevent system-sqlite system-libvpx"
@ -210,7 +207,7 @@ RDEPEND+="
# @FUNCTION: mozconfig_config # @FUNCTION: mozconfig_config
# @DESCRIPTION: # @DESCRIPTION:
# Set common configure options for mozilla packages. # Set common configure options for gnuzilla packages.
# Call this within src_configure() phase, after mozconfig_init # Call this within src_configure() phase, after mozconfig_init
# #
# Example: # Example:
@ -297,7 +294,7 @@ mozconfig_config() {
mozconfig_use_enable jit ion mozconfig_use_enable jit ion
fi fi
# These are enabled by default in all mozilla applications # These are enabled by default in all gnuzilla applications
mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX}"/usr
mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX}"/usr
mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir) mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX}"/usr/include --x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
@ -339,10 +336,10 @@ mozconfig_config() {
fi fi
mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit}
# Instead of the standard --build= and --host=, mozilla uses --host instead # Instead of the standard --build= and --host=, gnuzilla uses --host instead
# of --build, and --target intstead of --host. # of --build, and --target intstead of --host.
# Note, mozilla also has --build but it does not do what you think it does. # Note, gnuzilla also has --build but it does not do what you think it does.
# Set both --target and --host as mozilla uses python to guess values otherwise # Set both --target and --host as gnuzilla uses python to guess values otherwise
mozconfig_annotate '' --target="${CHOST}" mozconfig_annotate '' --target="${CHOST}"
mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
@ -384,7 +381,7 @@ mozconfig_config() {
# @FUNCTION: mozconfig_install_prefs # @FUNCTION: mozconfig_install_prefs
# @DESCRIPTION: # @DESCRIPTION:
# Set preferences into the prefs.js file specified as a parameter to # Set preferences into the prefs.js file specified as a parameter to
# the function. This sets both some common prefs to all mozilla # the function. This sets both some common prefs to all gnuzilla
# packages, and any prefs that may relate to the use flags administered # packages, and any prefs that may relate to the use flags administered
# by mozconfig_config(). # by mozconfig_config().
# #

View File

@ -1,14 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 2019-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# @ECLASS: icecatlinguas-v2.eclass # @ECLASS: icecatlinguas-v2.eclass
# @MAINTAINER: # @MAINTAINER:
# mozilla@gentoo.org # moog621@gmail.com
# @AUTHOR: # @AUTHOR:
# Nirbheek Chauhan <nirbheek@gentoo.org> # moog621@gmail.com
# Ian Stakenvicius <axs@gentoo.org>
# @SUPPORTED_EAPIS: 2 3 4 5 6 # @SUPPORTED_EAPIS: 2 3 4 5 6
# @BLURB: Handle language packs for mozilla products # @BLURB: Handle language packs for gnuzilla products
# @DESCRIPTION: # @DESCRIPTION:
# Sets IUSE according to MOZ_LANGS (language packs available). Also exports # Sets IUSE according to MOZ_LANGS (language packs available). Also exports
# src_unpack, src_compile and src_install for use in ebuilds, and provides # src_unpack, src_compile and src_install for use in ebuilds, and provides
@ -82,8 +81,8 @@ esac
# @DESCRIPTION: # @DESCRIPTION:
# The status of the langpack, used to differentiate within # The status of the langpack, used to differentiate within
# Manifests and on Gentoo mirrors as to when the langpacks are # Manifests and on Gentoo mirrors as to when the langpacks are
# generated officially by Mozilla or if they were generated # generated officially by gnuzilla or if they were generated
# unofficially by others (ie the Gentoo mozilla team). When # unofficially by others. When
# this var is set, the distfile will have a .unofficial.xpi # this var is set, the distfile will have a .unofficial.xpi
# suffix. # suffix.
: ${MOZ_LANGPACK_UNOFFICIAL:=""} : ${MOZ_LANGPACK_UNOFFICIAL:=""}
@ -204,7 +203,7 @@ icecatlinguas_export() {
for lingua in "${MOZ_LANGS[@]}"; do for lingua in "${MOZ_LANGS[@]}"; do
# strip region subtag if $x is in the list # strip region subtag if $x is in the list
if has ${lingua} en en-US; then if has ${lingua} en en-US; then
# For mozilla products, en and en_US are handled internally # For gnuzilla products, en and en_US are handled internally
continue continue
elif has ${lingua} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then elif has ${lingua} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
lflag=${lingua%%-*} lflag=${lingua%%-*}
@ -216,7 +215,7 @@ icecatlinguas_export() {
# Compatibility code - Check LINGUAS and warn if anything set there isn't enabled via l10n # Compatibility code - Check LINGUAS and warn if anything set there isn't enabled via l10n
for lingua in ${LINGUAS}; do for lingua in ${LINGUAS}; do
if has ${lingua//[_@]/-} en en-US; then if has ${lingua//[_@]/-} en en-US; then
# For mozilla products, en and en_US are handled internally # For gnuzilla products, en and en_US are handled internally
continue continue
# If this language is supported by ${P}, # If this language is supported by ${P},
elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then

View File

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors # Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6