[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-14 Thread Andreas Sturmlechner
commit: b68900f597b4e1b2a06bbfe5978e787fdd04
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 14 11:11:52 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 14 11:29:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b68900f5

kde5.eclass: Add porting and deprecation notes

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5.eclass | 25 ++---
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ecc16bdae99..ef45ba420d7 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -7,17 +7,18 @@
 # @SUPPORTED_EAPIS: 7
 # @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
-# This eclass is intended to streamline the creation of ebuilds for packages
-# that follow KDE upstream packaging conventions. It's primarily intended for
-# the three upstream release groups (Frameworks, Plasma, Applications) but
-# is also for any package that follows similar conventions.
+# This eclass is *deprecated*. Please read the PORTING notes for switching to
+# ecm.eclass in case the package is using extra-cmake-modules, otherwise just
+# use cmake-utils.eclass instead. For projects hosted on kde.org 
infrastructure,
+# inherit kde.org.eclass to fetch and unpack sources independent of the build
+# system being used.
 #
 # This eclass unconditionally inherits kde5-functions.eclass and all its public
 # functions and variables may be considered as part of this eclass's API.
 #
-# This eclass unconditionally inherits cmake-utils.eclass and all its public
-# variables and helper functions (not phase functions) may be considered as 
part
-# of this eclass's API.
+# This eclass unconditionally inherits kde.org.eclass and cmake-utils.eclass
+# and all their public variables and helper functions (not phase functions) may
+# be considered as part of this eclass's API.
 #
 # This eclass's phase functions are not intended to be mixed and matched, so if
 # any phase functions are overridden the version here should also be called.
@@ -59,6 +60,7 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_compile src_test src_in
 # For any other value, add dependencies on dev-qt/qtcore:5, 
kde-frameworks/kf-env
 # and kde-frameworks/extra-cmake-modules:5. Additionally, required blockers may
 # be set depending on the value of CATEGORY.
+# PORTING: no replacement
 : ${KDE_AUTODEPS:=true}
 
 # @ECLASS-VARIABLE: KDE_DEBUG
@@ -66,6 +68,7 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_compile src_test src_in
 # If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and 
-DQT_NO_DEBUG
 # to CPPFLAGS.
 # Otherwise, add debug to IUSE.
+# PORTING: ECM_DEBUG in ecm.eclass
 : ${KDE_DEBUG:=true}
 
 # @ECLASS-VARIABLE: KDE_DESIGNERPLUGIN
@@ -73,12 +76,14 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_compile src_test src_in
 # If set to "false", do nothing.
 # Otherwise, add "designer" to IUSE to toggle build of designer plugins
 # and add the necessary DEPENDs.
+# PORTING: ECM_DESIGNERPLUGIN in ecm.eclass
 : ${KDE_DESIGNERPLUGIN:=false}
 
 # @ECLASS-VARIABLE: KDE_EXAMPLES
 # @DESCRIPTION:
 # If set to "false", unconditionally ignore a top-level examples subdirectory.
 # Otherwise, add "examples" to IUSE to toggle adding that subdirectory.
+# PORTING: ECM_EXAMPLES in ecm.eclass
 : ${KDE_EXAMPLES:=false}
 
 # @ECLASS-VARIABLE: KDE_HANDBOOK
@@ -90,16 +95,19 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_compile src_test src_in
 # when USE=!handbook. In case package requires KF5KDELibs4Support, see next:
 # If set to "forceoptional", remove a KF5DocTools dependency from the root
 # CMakeLists.txt in addition to the above.
+# PORTING: ECM_HANDBOOK in ecm.eclass
 : ${KDE_HANDBOOK:=false}
 
 # @ECLASS-VARIABLE: KDE_DOC_DIR
 # @DESCRIPTION:
 # Specifies the location of the KDE handbook if not the default.
+# PORTING: ECM_HANDBOOK_DIR in ecm.eclass
 : ${KDE_DOC_DIR:=doc}
 
 # @ECLASS-VARIABLE: KDE_PO_DIRS
 # @DESCRIPTION:
 # Specifies the possible locations of KDE l10n files if not the default.
+# PORTING: ECM_PO_DIRS in ecm.eclass
 : ${KDE_PO_DIRS:="po poqm"}
 
 # @ECLASS-VARIABLE: KDE_QTHELP
@@ -107,6 +115,7 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_compile src_test src_in
 # If set to "false", do nothing.
 # Otherwise, add "doc" to IUSE, add the appropriate dependency, generate
 # and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
+# PORTING: ECM_QTHELP in ecm.eclass
 if [[ ${CATEGORY} = kde-frameworks ]]; then
: ${KDE_QTHELP:=true}
 fi
@@ -124,6 +133,7 @@ fi
 # autotest(s), unittest(s) and test(s) subdirs from *any* CMakeLists.txt in 
${S}
 # and below conditional on BUILD_TESTING. This is always meant as a short-term
 # fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
+# PORTING: ECM_TEST in ecm.eclass
 if [[ ${CATEGORY} = 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-14 Thread Andreas Sturmlechner
commit: cdf3fd8669da47b22c4599ed4231aec869cb5d37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 14 11:25:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 14 11:29:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf3fd86

kde5-functions.eclass: Add porting and deprecation notes

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 5 +
 1 file changed, 5 insertions(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 92a7c90db4a..7bf5a9caa33 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -130,6 +130,7 @@ _add_category_dep() {
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
+# PORTING: no replacement
 add_frameworks_dep() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -162,6 +163,7 @@ add_frameworks_dep() {
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
+# PORTING: no replacement
 add_plasma_dep() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -194,6 +196,7 @@ add_plasma_dep() {
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
+# PORTING: no replacement
 add_kdeapps_dep() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -226,6 +229,7 @@ add_kdeapps_dep() {
 # The output of this should be added directly to DEPEND/RDEPEND, and may be
 # wrapped in a USE conditional (but not an || conditional without an extra set
 # of parentheses).
+# PORTING: no replacement
 add_qt_dep() {
debug-print-function ${FUNCNAME} "$@"
 
@@ -250,6 +254,7 @@ add_qt_dep() {
 # @USAGE:  
 # @DESCRIPTION:
 # Removes a specified dependency from a find_package call with multiple 
components.
+# PORTING: Use ecm_punt_bogus_dep from ecm.eclass instead.
 punt_bogus_dep() {
local prefix=${1}
local dep=${2}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-12 Thread Andreas Sturmlechner
commit: 37fd574a40604440bffe63c557220860fce9206a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 12 02:51:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 12 22:09:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fd574a

kde5-functions.eclass: Drop obsolete minimum version overrides

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 10 --
 1 file changed, 10 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 9e00333dacf..92a7c90db4a 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -32,16 +32,6 @@ if [[ ${PV} = ** ]]; then
 fi
 export KDE_BUILD_TYPE
 
-case ${CATEGORY} in
-   kde-frameworks)
-   [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
-   ;;
-   kde-plasma)
-   [[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
-   [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
-   ;;
-esac
-
 # @ECLASS-VARIABLE: QT_MINIMAL
 # @DESCRIPTION:
 # Minimum version of Qt to require. This affects add_qt_dep.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-11 Thread Michał Górny
commit: 9b887e3b13d38343cc0b72275c495708e4b96a85
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov 11 21:05:36 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov 11 21:06:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b887e3b

python-utils-r1.eclass: Enable python3.8

Signed-off-by: Michał Górny  gentoo.org>

 eclass/python-utils-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 549dd5f2e56..647eb04344d 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -44,7 +44,7 @@ _PYTHON_ALL_IMPLS=(
jython2_7
pypy pypy3
python2_7
-   python3_5 python3_6 python3_7
+   python3_5 python3_6 python3_7 python3_8
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -80,7 +80,7 @@ _python_impl_supported() {
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
-   python2_7|python3_[567]|jython2_7)
+   python2_7|python3_[5678]|jython2_7)
return 0
;;
pypy1_[89]|pypy2_0|python2_[56]|python3_[1234])



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 6d6b164ad9d6cc1f9c4ded718caa88fab08b6195
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  7 14:10:24 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 11 01:14:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6b164a

kde5-functions.eclass: Must not be used directly by ebuild

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 652ed06b7be..9e00333dacf 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -10,7 +10,7 @@
 # This eclass contains functions shared by the other KDE eclasses and forms
 # part of their public API.
 #
-# This eclass should (almost) never be inherited directly by an ebuild.
+# This eclass must not be inherited directly by an ebuild.
 
 if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then
 _KDE5_FUNCTIONS_ECLASS=1



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 0b332dbd6e674d71bb188312d2513036bac7e335
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Sat Nov  2 11:52:49 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 11 01:14:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b332dbd

cmake-utils.eclass: Fix BUILD_SHARED_LIBS variable type

This fixes the following warning:

  CMake Warning (dev) at gentoo_common_config.cmake:8 (SET):
implicitly converting 'BOOLEAN' to 'STRING' type.

Signed-off-by: Alexander Tsoy  tsoy.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/cmake-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 109b584afb3..e7a48116da7 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -649,7 +649,7 @@ cmake-utils_src_configure() {
if [[ ${EAPI} != [56] ]]; then
cat >> "${common_config}" <<- _EOF_ || die
SET (CMAKE_INSTALL_DOCDIR 
"${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "")
-   SET (BUILD_SHARED_LIBS ON CACHE BOOLEAN "")
+   SET (BUILD_SHARED_LIBS ON CACHE BOOL "")
_EOF_
fi
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 58bb5d97167c253535b32e3aca00cf8688cb9c97
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  7 13:39:53 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 11 01:14:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58bb5d97

kde5.eclass: Inherit kde.org.eclass and drop moved functions/vars

Functions moved to kde.org:
- _kde_is_unreleased
- _calculate_src_uri
- _calculate_live_repo
- kde5_pkg_nofetch
- kde5_src_unpack

Variables moved to kde.org:
- KDE_BUILD_TYPE
- KDE_SELINUX_MODULE
- KDE_UNRELEASED
- HOMEPAGE

Variables deprecated:
- KDE_SUBSLOT (define SLOT in ebuild)
- KMNAME (use KDE_ORG_NAME in kde.org.eclass instead)

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5.eclass | 223 -
 1 file changed, 13 insertions(+), 210 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index ee1d3b35aa8..ecc16bdae99 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -25,6 +25,12 @@
 if [[ -z ${_KDE5_ECLASS} ]]; then
 _KDE5_ECLASS=1
 
+# Propagate KMNAME to kde.org.eclass
+# PORTING: Use KDE_ORG_NAME from kde.org.eclass instead
+if [[ -z ${KDE_ORG_NAME} ]]; then
+   KDE_ORG_NAME=${KMNAME:=$PN}
+fi
+
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
 # For proper description see virtualx.eclass manpage.
@@ -32,17 +38,13 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
-
-if [[ ${KDE_BUILD_TYPE} = live ]]; then
-   inherit git-r3
-fi
+inherit cmake-utils flag-o-matic kde.org kde5-functions virtualx xdg
 
 if [[ -v KDE_GCC_MINIMAL ]]; then
EXPORT_FUNCTIONS pkg_pretend
 fi
 
-EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure 
src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_test 
src_install pkg_preinst pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
 # @DESCRIPTION:
@@ -127,37 +129,19 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then
 fi
 : ${KDE_TEST:=false}
 
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
-# @DESCRIPTION:
-# If set to "none", do nothing.
-# For any other value, add selinux to IUSE, and depending on that useflag
-# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
-: ${KDE_SELINUX_MODULE:=none}
-
 # @ECLASS-VARIABLE: KDE_SUBSLOT
 # @DESCRIPTION:
 # If set to "false", do nothing.
 # If set to "true", add a subslot to the package, where subslot is either
 # defined as major.minor version for kde-*/ categories or ${PV} if other.
 # For any other value, that value will be used as subslot.
+# PORTING: no replacement, define in ebuild
 : ${KDE_SUBSLOT:=false}
 
-# @ECLASS-VARIABLE: KDE_UNRELEASED
-# @INTERNAL
-# @DESCRIPTION
-# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
-# Any package matching this will have fetch restriction enabled, and receive
-# a proper error message via pkg_nofetch.
-KDE_UNRELEASED=( )
-
-HOMEPAGE="https://kde.org/;
+# PORTING: LICENSE no longer set by eclass, define in ebuild
 LICENSE="GPL-2"
-
-SLOT=5
-
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-   KDE_SUBSLOT=true
-fi
+# PORTING: SLOT no longer set by eclass except for kde-frameworks
+[[ ${CATEGORY} = kde-frameworks ]] || SLOT=5
 
 case ${KDE_SUBSLOT} in
false)  ;;
@@ -245,154 +229,10 @@ case ${KDE_TEST} in
;;
 esac
 
-case ${KDE_SELINUX_MODULE} in
-   none)   ;;
-   *)
-   IUSE+=" selinux"
-   RDEPEND+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} 
)"
-   ;;
-esac
-
 DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
 
-if [[ -n ${KMNAME} && ${KMNAME} != ${PN} && ${KDE_BUILD_TYPE} = release ]]; 
then
-   S=${WORKDIR}/${KMNAME}-${PV}
-fi
-
-_kde_is_unreleased() {
-   local pair
-   for pair in "${KDE_UNRELEASED[@]}" ; do
-   if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
-   return 0
-   fi
-   done
-
-   return 1
-}
-
-# Determine fetch location for released tarballs
-_calculate_src_uri() {
-   debug-print-function ${FUNCNAME} "$@"
-
-   local _kmname
-
-   if [[ -n ${KMNAME} ]]; then
-   _kmname=${KMNAME}
-   else
-   _kmname=${PN}
-   fi
-
-   case ${PN} in
-   kdelibs4support | \
-   kdewebkit | \
-   khtml | \
-   kjs | \
-   kjsembed | \
-   kmediaplayer | \
-   kross)
-   _kmname="portingAids/${_kmname}"
-   ;;
-   kdesignerplugin)
-   [[ ${PV} = 5.6[01].* ]] || 
_kmname="portingAids/${_kmname}"
-   ;;
-   esac
-
-   case 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 113f57dd066b1f940acb2d323a22d69257dc5b3b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 11 00:16:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 11 00:21:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113f57dd

ecm.eclass: Inherit xdg only if ECM_NONGUI=false

xdg phase functions were already only called based on this var.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/ecm.eclass | 30 +-
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 816feed7219..06c2e9f83ea 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -37,7 +37,23 @@ _ECM_UTILS_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic toolchain-funcs virtualx xdg
+# @ECLASS-VARIABLE: ECM_NONGUI
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# By default, for all CATEGORIES except kde-frameworks, assume we are building
+# a GUI application. Add dependency on kde-frameworks/breeze-icons or
+# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst,
+# pkg_postinst and pkg_postrm. If set to "true", do nothing.
+if [[ ${CATEGORY} = kde-frameworks ]] ; then
+   : ${ECM_NONGUI:=true}
+fi
+: ${ECM_NONGUI:=false}
+
+inherit cmake-utils flag-o-matic toolchain-funcs virtualx
+
+if [[ ${ECM_NONGUI} = false ]] ; then
+   inherit xdg
+fi
 
 case ${EAPI} in
7) ;;
@@ -56,18 +72,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure 
src_test pkg_preinst pkg_po
 # KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing.
 : ${ECM_KDEINSTALLDIRS:=true}
 
-# @ECLASS-VARIABLE: ECM_NONGUI
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# By default, for all CATEGORIES except kde-frameworks, assume we are building
-# a GUI application. Add dependency on kde-frameworks/breeze-icons or
-# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst,
-# pkg_postinst and pkg_postrm. If set to "true", do nothing.
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-   : ${ECM_NONGUI:=true}
-fi
-: ${ECM_NONGUI:=false}
-
 # @ECLASS-VARIABLE: ECM_DEBUG
 # @DESCRIPTION:
 # Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 30af6fc6853f1feab2ef2862ddf583deb5e8360d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 10 23:13:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 23:16:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30af6fc6

ecm.eclass: Fix punt_bogus_dep -> ecm_punt_bogus_dep

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/ecm.eclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index b6fe0616b2a..816feed7219 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -426,7 +426,7 @@ ecm_src_prepare() {
cmake_comment_add_subdirectory ${ECM_HANDBOOK_DIR}
 
if [[ ${ECM_HANDBOOK} = forceoptional ]] ; then
-   punt_bogus_dep KF5 DocTools
+   ecm_punt_bogus_dep KF5 DocTools
sed -i -e "/kdoctools_install/ s/^/#DONT/" 
CMakeLists.txt || die
fi
fi
@@ -454,18 +454,18 @@ ecm_src_prepare() {
# only build unit tests when required
if ! { in_iuse test && use test; } ; then
if [[ ${ECM_TEST} = forceoptional ]] ; then
-   punt_bogus_dep Qt5 Test
+   ecm_punt_bogus_dep Qt5 Test
# if forceoptional, also cover non-kde categories
cmake_comment_add_subdirectory autotests test tests
elif [[ ${ECM_TEST} = forceoptional-recursive ]] ; then
-   punt_bogus_dep Qt5 Test
+   ecm_punt_bogus_dep Qt5 Test
local f pf="${T}/${P}"-tests-optional.patch
touch ${pf} || die "Failed to touch patch file"
for f in $(find . -type f -name "CMakeLists.txt" -exec \
grep -l 
"^\s*add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)" {} \;); do
cp ${f} ${f}.old || die "Failed to prepare 
patch origfile"
pushd ${f%/*} > /dev/null || die
-   punt_bogus_dep Qt5 Test
+   ecm_punt_bogus_dep Qt5 Test
sed -i CMakeLists.txt -e \
"/^#/! 
s/add_subdirectory\s*\(\s*.*\(auto|unit\)\?tests\?\s*)\s*\)/if(BUILD_TESTING)\n&\nendif()/"
 \
|| die



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 75c9442984b7e0a23cf28cb2ac838a8c9102d738
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 10 22:41:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 22:42:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c94429

ecm.eclass: Fix inverted usex handbook logic

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index e24ac68cae3..b6fe0616b2a 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -511,7 +511,7 @@ ecm_src_configure() {
fi
 
if [[ ${ECM_HANDBOOK} = optional ]] ; then
-   cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex 
handbook) )
+   cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=$(usex 
!handbook) )
fi
 
if in_iuse designer && [[ ${ECM_DESIGNERPLUGIN} = true ]]; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: a467ec36d2fdac0e40b1b2f8aaaec10029be7cbc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 10 22:18:59 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 22:19:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a467ec36

ecm.eclass: Fix typo

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/ecm.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index 86ed9fb8e63..e24ac68cae3 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -9,7 +9,7 @@
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
 # that use cmake and KDE Frameworks' extra-cmake-modules, thereby following
-# some of their packaging conventions. It is primarily intended for the tree
+# some of their packaging conventions. It is primarily intended for the three
 # upstream release groups (Frameworks, Plasma, Applications) but also for any
 # other package that follows similar conventions.
 #



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: ed88363282153b52d7ef144f8a52be8fe75e7941
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 10 11:07:57 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 21:30:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed883632

kde.org.eclass: Branching for kde-apps/ switched to "release/YY.MM"

KDE Applications is dead, long live the KDE release service.

See also: https://mail.kde.org/pipermail/release-team/2019-October/011582.html
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde.org.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 3f86779c52e..17f7bcbfe6d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -155,7 +155,7 @@ _calculate_live_repo() {
EGIT_MIRROR=${EGIT_MIRROR:=https://anongit.kde.org}
 
if [[ ${PV} == ??.??.49. && ${CATEGORY} = kde-apps ]]; then
-   EGIT_BRANCH="Applications/$(ver_cut 1-2)"
+   EGIT_BRANCH="release/$(ver_cut 1-2)"
fi
 
if [[ ${PV} !=  && ${CATEGORY} = kde-plasma ]]; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 7b4aad8f3f6fdd53d1978e016b0c5d8fa84cf12b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  7 13:09:12 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 21:30:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4aad8f

ecm.eclass: New eclass

Set up default BDEPEND, DEPEND, RDEPEND.
For ECM_TEST!=false, add RESTRICT+=" !test? ( test )"

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/ecm.eclass | 639 ++
 1 file changed, 639 insertions(+)

diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
new file mode 100644
index 000..86ed9fb8e63
--- /dev/null
+++ b/eclass/ecm.eclass
@@ -0,0 +1,639 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: ecm.eclass
+# @MAINTAINER:
+# k...@gentoo.org
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Support eclass for packages that use KDE Frameworks with ECM.
+# @DESCRIPTION:
+# This eclass is intended to streamline the creation of ebuilds for packages
+# that use cmake and KDE Frameworks' extra-cmake-modules, thereby following
+# some of their packaging conventions. It is primarily intended for the tree
+# upstream release groups (Frameworks, Plasma, Applications) but also for any
+# other package that follows similar conventions.
+#
+# This eclass unconditionally inherits cmake-utils.eclass and all its public
+# variables and helper functions (not phase functions) may be considered as 
part
+# of this eclass's API.
+#
+# This eclass's phase functions are not intended to be mixed and matched, so if
+# any phase functions are overridden the version here should also be called.
+#
+# Porting from kde5.class
+# - Convert all add_*_dep dependency functions to regular dependencies
+# - Manually set LICENSE
+# - Manually set SLOT
+# - Rename vars and function names as needed, see kde5.eclass PORTING comments
+# - Instead of FRAMEWORKS_MINIMAL, define KFMIN in ebuilds and use it for deps
+
+if [[ -z ${_ECM_UTILS_ECLASS} ]]; then
+_ECM_UTILS_ECLASS=1
+
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+# For proper description see virtualx.eclass manpage.
+# Here we redefine default value to be manual, if your package needs virtualx
+# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
+: ${VIRTUALX_REQUIRED:=manual}
+
+inherit cmake-utils flag-o-matic toolchain-funcs virtualx xdg
+
+case ${EAPI} in
+   7) ;;
+   *) die "EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+if [[ -v KDE_GCC_MINIMAL ]]; then
+   EXPORT_FUNCTIONS pkg_pretend
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst 
pkg_postinst pkg_postrm
+
+# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS
+# @DESCRIPTION:
+# Assume the package is using KDEInstallDirs macro and switch
+# KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing.
+: ${ECM_KDEINSTALLDIRS:=true}
+
+# @ECLASS-VARIABLE: ECM_NONGUI
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# By default, for all CATEGORIES except kde-frameworks, assume we are building
+# a GUI application. Add dependency on kde-frameworks/breeze-icons or
+# kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst,
+# pkg_postinst and pkg_postrm. If set to "true", do nothing.
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+   : ${ECM_NONGUI:=true}
+fi
+: ${ECM_NONGUI:=false}
+
+# @ECLASS-VARIABLE: ECM_DEBUG
+# @DESCRIPTION:
+# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure)
+# and -DQT_NO_DEBUG to CPPFLAGS. If set to "false", do nothing.
+: ${ECM_DEBUG:=true}
+
+# @ECLASS-VARIABLE: ECM_DESIGNERPLUGIN
+# @DESCRIPTION:
+# If set to "true", add "designer" to IUSE to toggle build of designer plugins
+# and add the necessary BDEPEND. If set to "false", do nothing.
+: ${ECM_DESIGNERPLUGIN:=false}
+
+# @ECLASS-VARIABLE: ECM_EXAMPLES
+# @DESCRIPTION:
+# By default unconditionally ignore a top-level examples subdirectory.
+# If set to "true", add "examples" to IUSE to toggle adding that subdirectory.
+: ${ECM_EXAMPLES:=false}
+
+# @ECLASS-VARIABLE: ECM_HANDBOOK
+# @DESCRIPTION:
+# Will accept "true", "false", "optional", "forceoptional". If set to "false",
+# do nothing.
+# Otherwise, add "+handbook" to IUSE, add the appropriate dependency, and let
+# KF5DocTools generate and install the handbook from docbook file(s) found in
+# ECM_HANDBOOK_DIR. However if !handbook, disable build of ECM_HANDBOOK_DIR
+# in CMakeLists.txt.
+# If set to "optional", build with -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
+# when !handbook. In case package requires KF5KDELibs4Support, see next:
+# If set to "forceoptional", remove a KF5DocTools dependency from the root
+# CMakeLists.txt in addition to the above.
+: ${ECM_HANDBOOK:=false}
+
+# @ECLASS-VARIABLE: ECM_HANDBOOK_DIR
+# @DESCRIPTION:
+# Specifies the directory containing the docbook file(s) relative to ${S} to
+# be processed by KF5DocTools 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: 2b6b192652521c28dc1ec1522c2d3d08736fceef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  7 13:08:56 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 21:30:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6b1926

kde.org.eclass: New eclass

Support eclass for packages that are hosted on kde.org infrastructure.

This eclass is mainly providing facilities for the upstream release groups
Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs,
set up git-r3.eclass for stable/master branch versions or restrict access to
unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
be also used by any other package hosted on kde.org.
It also contains default meta variables for settings not specific to any
particular build system.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde.org.eclass | 241 ++
 1 file changed, 241 insertions(+)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
new file mode 100644
index 000..3f86779c52e
--- /dev/null
+++ b/eclass/kde.org.eclass
@@ -0,0 +1,241 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: kde.org.eclass
+# @MAINTAINER:
+# k...@gentoo.org
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Support eclass for packages that are hosted on kde.org 
infrastructure.
+# @DESCRIPTION:
+# This eclass is mainly providing facilities for the upstream release groups
+# Frameworks, Plasma, Applications to assemble default SRC_URI for tarballs,
+# set up git-r3.eclass for stable/master branch versions or restrict access to
+# unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may
+# be also used by any other package hosted on kde.org.
+# It also contains default meta variables for settings not specific to any
+# particular build system.
+
+if [[ -z ${_KDE_ORG_ECLASS} ]]; then
+_KDE_ORG_ECLASS=1
+
+# @ECLASS-VARIABLE: KDE_BUILD_TYPE
+# @DESCRIPTION:
+# If PV matches "**", this is automatically set to "live".
+# Otherwise, this is automatically set to "release".
+KDE_BUILD_TYPE="release"
+if [[ ${PV} = ** ]]; then
+   KDE_BUILD_TYPE="live"
+fi
+export KDE_BUILD_TYPE
+
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+   inherit git-r3
+fi
+
+EXPORT_FUNCTIONS pkg_nofetch src_unpack
+
+# @ECLASS-VARIABLE: KDE_ORG_NAME
+# @DESCRIPTION:
+# If unset, default value is set to ${PN}.
+# Name of the package as hosted on kde.org mirrors.
+: ${KDE_ORG_NAME:=$PN}
+
+# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @DESCRIPTION:
+# If set to "none", do nothing.
+# For any other value, add selinux to IUSE, and depending on that useflag
+# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
+: ${KDE_SELINUX_MODULE:=none}
+
+case ${KDE_SELINUX_MODULE} in
+   none)   ;;
+   *)
+   IUSE+=" selinux"
+   RDEPEND+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} 
)"
+   ;;
+esac
+
+if [[ ${CATEGORY} = kde-frameworks ]]; then
+   SLOT=5/${PV}
+   [[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
+fi
+
+# @ECLASS-VARIABLE: KDE_UNRELEASED
+# @INTERNAL
+# @DESCRIPTION
+# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream.
+# Any package matching this will have fetch restriction enabled, and receive
+# a proper error message via pkg_nofetch.
+KDE_UNRELEASED=( )
+
+HOMEPAGE="https://kde.org/;
+
+_kde_is_unreleased() {
+   local pair
+   for pair in "${KDE_UNRELEASED[@]}" ; do
+   if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then
+   return 0
+   fi
+   done
+
+   return 1
+}
+
+# Determine fetch location for released tarballs
+_calculate_src_uri() {
+   debug-print-function ${FUNCNAME} "$@"
+
+   local _src_uri="mirror://kde/"
+
+   case ${CATEGORY} in
+   kde-apps)
+   case ${PV} in
+   ??.??.[6-9]? )
+   
_src_uri+="unstable/applications/${PV}/src/"
+   RESTRICT+=" mirror"
+   ;;
+   *) _src_uri+="stable/applications/${PV}/src/" ;;
+   esac
+   ;;
+   kde-frameworks)
+   _src_uri+="stable/frameworks/$(ver_cut 1-2)/"
+   case ${PN} in
+   kdelibs4support | \
+   kdewebkit | \
+   khtml | \
+   kjs | \
+   kjsembed | \
+   kmediaplayer | \
+   kross)
+   _src_uri+="portingAids/"
+   ;;
+   

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Andreas Sturmlechner
commit: aa612de84bec0ee1508b4bf868320d6df1fb7f9b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 10 17:02:06 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 10 21:30:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa612de8

kde.org.eclass: Standard HOMEPAGE for kde-plasma and kde-frameworks

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde.org.eclass | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 17f7bcbfe6d..8e13232bb9d 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -55,11 +55,6 @@ case ${KDE_SELINUX_MODULE} in
;;
 esac
 
-if [[ ${CATEGORY} = kde-frameworks ]]; then
-   SLOT=5/${PV}
-   [[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 1)/$(ver_cut 1-2)
-fi
-
 # @ECLASS-VARIABLE: KDE_UNRELEASED
 # @INTERNAL
 # @DESCRIPTION
@@ -70,6 +65,18 @@ KDE_UNRELEASED=( )
 
 HOMEPAGE="https://kde.org/;
 
+case ${CATEGORY} in
+   kde-plasma)
+   HOMEPAGE="https://kde.org/plasma-desktop;
+   ;;
+   kde-frameworks)
+   HOMEPAGE="https://kde.org/products/frameworks/;
+   SLOT=5/${PV}
+   [[ ${KDE_BUILD_TYPE} = release ]] && SLOT=$(ver_cut 
1)/$(ver_cut 1-2)
+   ;;
+   *) ;;
+esac
+
 _kde_is_unreleased() {
local pair
for pair in "${KDE_UNRELEASED[@]}" ; do



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Michał Górny
commit: 2329b8403de08bc2b797b3bc0f871a93d94a56ad
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 10 20:36:21 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 10 20:40:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2329b840

freebsd.eclass: Remove

Signed-off-by: Michał Górny  gentoo.org>

 eclass/freebsd.eclass | 338 --
 1 file changed, 338 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
deleted file mode 100644
index baebf439159..000
--- a/eclass/freebsd.eclass
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# FreeBSD project is dead, and all consumers are gone.
-# Bug #683284.  Removal in 14 days.
-
-#
-# @MAINTAINER:
-# maintainer-nee...@gentoo.org
-# @AUTHOR:
-# Diego Pettenò 
-
-inherit versionator eutils flag-o-matic bsdmk
-
-# Drop patch level from ${PV}
-MY_PV=${PV/_p*}
-PLEVEL=${PV##*_p}
-
-LICENSE="BSD"
-HOMEPAGE="http://www.freebsd.org/;
-
-# Define global package names
-LIB="freebsd-lib-${PV}"
-BIN="freebsd-bin-${PV}"
-CONTRIB="freebsd-contrib-${PV}"
-SHARE="freebsd-share-${PV}"
-UBIN="freebsd-ubin-${PV}"
-USBIN="freebsd-usbin-${PV}"
-CRYPTO="freebsd-crypto-${PV}"
-LIBEXEC="freebsd-libexec-${PV}"
-SBIN="freebsd-sbin-${PV}"
-GNU="freebsd-gnu-${PV}"
-ETC="freebsd-etc-${PV}"
-SYS="freebsd-sys-${PV}"
-INCLUDE="freebsd-include-${PV}"
-RESCUE="freebsd-rescue-${PV}"
-CDDL="freebsd-cddl-${PV}"
-SECURE="freebsd-secure-${PV}"
-
-# Release version (5.3, 5.4, 6.0, etc)
-RV="$(get_version_component_range 1-2 ${MY_PV})"
-
-# SVN ebuild support.
-#   9.1.0. --> release/9.1.0
-#  9.1.   -->  releng/9.1
-#   9. --> stable/9
-#   -->head
-#
-# svn revision can be specified by patch level:
-#  freebsd-lib-9._p247000 --> set svn -r 247000
-
-if [[ ${MY_PV} == ** ]]; then
-   inherit subversion
-
-   # Set SVN revision using patch level.
-   [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
-
-   case ${MY_PV%.} in
-   *.*.*)  BRANCH="release";;
-   *.*)BRANCH="releng" ;;
-   )   BRANCH="head"   ;;
-   *)  BRANCH="stable" ;;
-   esac
-
-   if [[ ${BRANCH} == head ]]  ; then
-   SVN_SUB_URI="${BRANCH}"
-   else
-   SVN_SUB_URI="${BRANCH}/${MY_PV%.}"
-   fi
-
-   ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
-   ESVN_PROJECT="freebsd-${BRANCH}"
-fi
-
-# Use the original source code.
-if [[ ${MY_PV} != ** ]] && version_is_at_least 10.0 ${RV} ; then
-   DL_PV=${MY_PV/_rc/-RC}
-   DL_PV=${DL_PV/_beta/-BETA}
-   DL_PV=${DL_PV/_alpha/-ALPHA}
-   if [[ ${DL_PV} == ${MY_PV} ]]; then
-   DL_PV="${DL_PV}-RELEASE"
-   fi
-   SRC_URI="mirror://gentoo/freebsd-src-${MY_PV}.tar.xz"
-fi
-
-IUSE="profile"
-
-#unalias -a
-alias install-info='/usr/bin/bsdinstall-info'
-
-EXPORT_FUNCTIONS src_compile src_install src_unpack
-
-# doperiodic   ...
-doperiodic() {
-   local kind=$1
-   shift
-
-   ( # dont want to pollute calling env
-   insinto /etc/periodic/${kind}
-   insopts -m 0755
-   doins "$@"
-   )
-}
-
-freebsd_get_bmake() {
-   local bmake
-   bmake=$(get_bmake)
-   if version_is_at_least 11.0 ${RV} ; then
-   if [[ ${CBUILD} == *-freebsd* ]] ; then
-   bmake="${bmake} -m /usr/share/mk/system"
-   else
-   bmake="${bmake} -m /usr/share/mk/freebsd/system"
-   fi
-   else
-   [[ ${CBUILD} == *-freebsd* ]] || bmake="${bmake} -m 
/usr/share/mk/freebsd"
-   fi
-
-   echo "${bmake}"
-}
-
-# Generates SRC_URI or DISTDIR for the upstream patch.
-freebsd_upstream_patches() {
-   local opt=$1
-   [[ ${#UPSTREAM_PATCHES[@]} -eq 0 ]] && return 1
-   for x in "${UPSTREAM_PATCHES[@]}"
-   do
-   local out=${PN}-${x/\//-}
-   out=${out/:/}
-   if [[ ${opt} == -s ]] ; then
-   echo "${DISTDIR}/${out}"
-   else
-   echo "https://security.freebsd.org/patches/${x} -> 
${out}"
-   fi
-   done
-}
-
-freebsd_do_patches() {
-   if [[ ${#PATCHES[@]} -gt 1 ]] ; then
-   for x in "${PATCHES[@]}"; do
-   epatch "${x}"
-   done
-   else
-   for x in ${PATCHES} ; do
-   epatch "${x}"
-   done
-   fi
-
-   # Upstream patches need to be applied on WORKDIR.
-   if [[ ${#UPSTREAM_PATCHES[@]} -gt 0 ]] ; then
-   cd "${WORKDIR}" || die
-   epatch $(freebsd_upstream_patches -s)
-   cd "${S}" || die
-   fi
-   epatch_user
-}
-

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Michał Górny
commit: 911a502dbe7bf4551258142a8b3c2e443dd59bca
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 10 20:36:58 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 10 20:40:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911a502d

perl-app.eclass: Remove

Signed-off-by: Michał Górny  gentoo.org>

 eclass/perl-app.eclass | 52 --
 1 file changed, 52 deletions(-)

diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
deleted file mode 100644
index 3fb897917c6..000
--- a/eclass/perl-app.eclass
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# This eclass is dead and all its consumers have been removed from
-# the tree.
-# Please use perl-module.eclass if you need phase functions, and
-# perl-functions.eclass if you don't.
-# In overlays, perl-app.eclass usage can be replaced by
-# perl-module.eclass without further changes.
-# Bug 637836.  Removal in 14 days.
-
-# Author: Michael Cummings 
-# Maintained by the Perl herd 
-# @SUPPORTED_EAPIS: 5
-
-# If the ebuild doesn't override this, ensure we do not depend on the perl 
subslot value
-: ${GENTOO_DEPEND_ON_PERL_SUBSLOT:="no"}
-inherit perl-module
-
-case "${EAPI:-0}" in
-   5)
-   ;;
-   6)
-   die "EAPI=${EAPI} is not supported by perl-app.eclass. Please 
use perl-module.eclass instead."
-   ;;
-   *)
-   die "EAPI=${EAPI} is not supported by perl-app.eclass"
-   ;;
-esac
-
-# @FUNCTION: perl-app_src_prep
-# @DESCRIPTION:
-# This is a wrapper function to perl-app_src_configure().
-perl-app_src_prep() {
-   perl-app_src_configure
-}
-
-# @FUNCTION: perl-app_src_configure
-# @DESCRIPTION:
-# This is a wrapper function to perl-module_src_configure().
-perl-app_src_configure() {
-   perl-module_src_configure
-}
-
-# @FUNCTION: perl-app_src_compile
-# @DESCRIPTION:
-# This is a wrapper function to perl-module_src_compile().
-perl-app_src_compile() {
-   has "${EAPI:-0}" 0 1 && perl-app_src_prep
-   perl-module_src_compile
-}



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Michał Górny
commit: 13cd1e51ec36a08c4a8ce510782109d7567c28ba
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov  4 20:57:58 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 10 20:17:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cd1e51

distutils-r1.eclass: Add distutils_enable_tests to ease testing

Add a helpful function to handle adding common stuff for the most common
test runners.

Signed-off-by: Michał Górny  gentoo.org>

 eclass/distutils-r1.eclass | 60 ++
 1 file changed, 60 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index d3eb8f22ead..2edffdb2d7c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -232,6 +232,66 @@ fi
 # }
 # @CODE
 
+# @FUNCTION: distutils_enable_tests
+# @USAGE: 
+# @DESCRIPTION:
+# Set up IUSE, RESTRICT, BDEPEND and python_test() for running tests
+# with the specified test runner.  Also copies the current value
+# of RDEPEND to test?-BDEPEND.  The test-runner argument must be one of:
+#
+# - nose: nosetests (dev-python/nose)
+# - pytest: dev-python/pytest
+# - unittest: for built-in Python unittest module
+#
+# This function is meant as a helper for common use cases, and it only
+# takes care of basic setup.  You still need to list additional test
+# dependencies manually.  If you have uncommon use case, you should
+# not use it and instead enable tests manually.
+#
+# This function must be called in global scope, after RDEPEND has been
+# declared.  Take care not to overwrite the variables set by it.
+distutils_enable_tests() {
+   debug-print-function ${FUNCNAME} "${@}"
+   [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: 
test-runner"
+
+   [[ ${EAPI} == [56] ]] && local BDEPEND
+
+   IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
+   BDEPEND+=" test? ("
+
+   case ${1} in
+   nose)
+   BDEPEND+=" dev-python/nose[${PYTHON_USEDEP}]"
+   python_test() {
+   nosetests -v || die "Tests fail with ${EPYTHON}"
+   }
+   ;;
+   pytest)
+   BDEPEND+=" dev-python/pytest[${PYTHON_USEDEP}]"
+   python_test() {
+   pytest -vv || die "Tests fail with ${EPYTHON}"
+   }
+   ;;
+   unittest)
+   python_test() {
+   "${EPYTHON}" -m unittest discover -v ||
+   die "Tests fail with ${EPYTHON}"
+   }
+   ;;
+   *)
+   die "${FUNCNAME}: unsupported argument: ${1}"
+   esac
+
+   BDEPEND+=" ${RDEPEND} )"
+
+   [[ ${EAPI} == [56] ]] && DEPEND+=" ${BDEPEND}"
+
+   # we need to ensure successful return in case we're called last,
+   # otherwise Portage may wrongly assume sourcing failed
+   return 0
+}
+
 # @FUNCTION: esetup.py
 # @USAGE: [...]
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Sergei Trofimovich
commit: bdd18e075861196fd48b1b4f45f86f122715e413
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 10 18:21:50 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 10 18:27:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd18e07

toolchain.eclass: advertise fortran support for >=gcc-4.2+

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 99643eafdd0..a3081c38bac 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -147,11 +147,13 @@ tc_has_feature() {
 }
 
 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
-   IUSE+=" altivec debug +cxx +fortran +nptl" TC_FEATURES+=(fortran nptl)
+   IUSE+=" altivec debug +cxx +nptl" TC_FEATURES+=(nptl)
[[ -n ${PIE_VER} ]] && IUSE+=" nopie"
[[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
[[ -n ${D_VER}   ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
+   # fortran support appeared in 4.1, but 4.1 needs outdated mpfr
+   tc_version_is_at_least 4.2 && IUSE+=" +fortran" TC_FEATURES+=(fortran)
tc_version_is_at_least 3 && IUSE+=" doc hardened multilib objc"
tc_version_is_between 3 7 && IUSE+=" awt gcj" TC_FEATURES+=(gcj)
tc_version_is_at_least 3.3 && IUSE+=" pgo"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Sergei Trofimovich
commit: 8b05e4a7a96c7e62d4d8e98e2a1d0f32af4e3cca
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Nov  9 13:52:15 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov  9 13:54:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b05e4a7

toolchain-binutils.eclass: add RESTRICT="!test? ( test )"

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain-binutils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0b691d82276..303eeb4092f 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -99,6 +99,9 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
sys-devel/flex
virtual/yacc"
+
+RESTRICT="!test? ( test )"
+
 if is_cross ; then
# The build assumes the host has libiberty and such when cross-compiling
# its build tools.  We should probably make binutils itself build a 
local



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-10 Thread Sergei Trofimovich
commit: e10485c43714c1d2bb4e241c29f60ac56c45b75b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Aug 23 20:46:22 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Nov  9 13:59:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10485c4

autotools.eclass: drop outdated sys-devel/gettext blocker

All  gentoo.org>
Signed-off-by: Thomas Deutschmann  gentoo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/autotools.eclass | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 9143aa454d0..9df0e1b9366 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -109,10 +109,7 @@ if [[ -n ${WANT_LIBTOOL} ]] ; then
export WANT_LIBTOOL
 fi
 
-# Force people (nicely) to upgrade to a newer version of gettext as
-# older ones are known to be crappy.  #496454
-AUTOTOOLS_DEPEND="!

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-06 Thread Sergei Trofimovich
commit: ebf183727b8469b7ab63ed682a2ac185c6c7f963
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Nov  6 23:21:41 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov  6 23:29:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf18372

toolchain.eclass: restore RESTRICT=strip on  gmail.com
Closes: https://bugs.gentoo.org/699446
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 5f8fd446c61..99643eafdd0 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -30,16 +30,6 @@ case ${EAPI:-0} in
*) die "I don't speak EAPI ${EAPI}." ;;
 esac
 
-tc_supports_dostrip() {
-   case ${EAPI:-0} in
-   5*|6) return 1 ;;
-   7) return 0 ;;
-   *) die "Update apply_patches() for ${EAPI}." ;;
-   esac
-}
-
-tc_supports_dostrip || RESTRICT="strip" # cross-compilers need controlled 
stripping
-
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
src_compile src_test src_install pkg_postinst pkg_postrm
 
@@ -140,6 +130,16 @@ fi
 IUSE="test vanilla +nls"
 RESTRICT="!test? ( test )"
 
+tc_supports_dostrip() {
+   case ${EAPI:-0} in
+   5*|6) return 1 ;;
+   7) return 0 ;;
+   *) die "Update apply_patches() for ${EAPI}." ;;
+   esac
+}
+
+tc_supports_dostrip || RESTRICT+=" strip" # cross-compilers need controlled 
stripping
+
 TC_FEATURES=()
 
 tc_has_feature() {



[gentoo-commits] repo/gentoo:master commit in: eclass/tests/

2019-11-06 Thread Sergei Trofimovich
commit: 8f02136721af40dd89a09101504750fb28f8142e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Nov  6 22:40:18 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov  6 22:44:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f021367

eclass/tests/toolchain-funcs.sh add test for 'tc-cpp-is-true()'

With patch from bug #698912 reverted we observe failures as:
 * Testing tc-cpp-is-true (gcc, defined) ...  [ ok ]
 * Testing tc-cpp-is-true (gcc, not defined) ...  [ ok ]
 * Testing tc-cpp-is-true (gcc, defined on -ggdb3) ...[ !! ]
 * Testing tc-cpp-is-true (clang, defined) ...[ !! ]
 * Testing tc-cpp-is-true (clang, not defined) ...[ ok ]
 * Testing tc-cpp-is-true (clang, defined on -ggdb3) ...  [ !! ]

Closes: https://bugs.gentoo.org/698912
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/tests/toolchain-funcs.sh | 24 
 1 file changed, 24 insertions(+)

diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh
index bcf57f78201..79ba6fa407b 100755
--- a/eclass/tests/toolchain-funcs.sh
+++ b/eclass/tests/toolchain-funcs.sh
@@ -172,4 +172,28 @@ if type -P pathcc &>/dev/null; then
tend $?
 fi
 
+for compiler in gcc clang; do
+   if type -P ${compielr} &>/dev/null; then
+   tbegin "tc-cpp-is-true ($compiler, defined)"
+   (
+   export CC=${compiler}
+   tc-cpp-is-true "defined(SOME_DEFINED_SYMBOL)" 
-DSOME_DEFINED_SYMBOL
+   )
+   tend $?
+   tbegin "tc-cpp-is-true ($compiler, not defined)"
+   (
+   export CC=${compiler}
+   ! tc-cpp-is-true "defined(SOME_UNDEFINED_SYMBOL)"
+   )
+   tend $?
+
+   tbegin "tc-cpp-is-true ($compiler, defined on -ggdb3)"
+   (
+   export CC=${compiler}
+   tc-cpp-is-true "defined(SOME_DEFINED_SYMBOL)" 
-DSOME_DEFINED_SYMBOL -ggdb3
+   )
+   tend $?
+   fi
+done
+
 texit



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-06 Thread Sergei Trofimovich
commit: 3ef6b9da7bb04afd77e1bc5db011b02d658a
Author: Mattias Nissler  chromium  org>
AuthorDate: Mon Nov  4 10:11:20 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov  6 22:44:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef6b333

toolchain-funcs.eclass: fix tc-cpp-is-true() to work with clang

Clang's preprocessor likes to output a leading newline, which makes
the comparison always fail. GCC generates additional output with certain
flags (e.g. -ggdb3) as well. Hence, switch the test to trigger a
preprocessor error when the condition is not true and examine the exit
code.

Bug: https://bugs.gentoo.org/698912

Signed-off-by: Mattias Nissler  chromium.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain-funcs.eclass | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index e358d484417..1bc6cbbc108 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -207,14 +207,13 @@ tc-cpp-is-true() {
local CONDITION=${1}
shift
 
-   local RESULT=$($(tc-getTARGET_CPP) "${@}" -P - <<-EOF 2>/dev/null
-   #if ${CONDITION}
-   true
-   #endif
-   EOF
-   )
-
-   [[ ${RESULT} == true ]]
+   $(tc-getTARGET_CPP) "${@}" -P - <<-EOF >/dev/null 2>&1
+   #if ${CONDITION}
+   true
+   #else
+   #error false
+   #endif
+   EOF
 }
 
 # @FUNCTION: tc-detect-is-softfloat



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-04 Thread Mikle Kolyada
commit: 01236a48a5ce46cb417eb55ad177c2d3552eaeb4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  4 17:51:29 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  4 17:51:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01236a48

texlive-common.eclass: code cleanup

Signed-off-by: Mikle Kolyada  gentoo.org>

 eclass/texlive-common.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index e9a2eee65bd..593e8855871 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -6,7 +6,7 @@
 # t...@gentoo.org
 # @AUTHOR:
 # Original Author: Alexis Ballier 
-# @SUPPORTED_EAPIS: 3 4 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Provide various functions used by both texlive-core and texlive 
modules
 # @DESCRIPTION:
 # Purpose: Provide various functions used by both texlive-core and texlive
@@ -15,7 +15,7 @@
 # Note that this eclass *must* not assume the presence of any standard tex tool
 
 case "${EAPI:-0}" in
-   0|1|2)
+   0|1|2|3|4|5|6)
die "EAPI='${EAPI}' is not supported anymore"
;;
*)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-04 Thread Mikle Kolyada
commit: 41a08abd3d38f05509245a82d65d7503de8e3661
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  4 17:32:17 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  4 17:42:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a08abd

texlive-module.eclass: code cleanup

Signed-off-by: Mikle Kolyada  gentoo.org>

 eclass/texlive-module.eclass | 58 
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index bd338ee625c..52b26cdca4d 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -6,7 +6,7 @@
 # t...@gentoo.org
 # @AUTHOR:
 # Original Author: Alexis Ballier 
-# @SUPPORTED_EAPIS: 3 4 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Provide generic install functions so that modular texlive's texmf 
ebuild will only have to inherit this eclass
 # @DESCRIPTION:
 # Purpose: Provide generic install functions so that modular texlive's texmf 
ebuilds will
@@ -24,7 +24,7 @@
 # bash array.
 
 # @ECLASS-VARIABLE: TEXLIVE_MODULE_CONTENTS
-# @REQUIRED 
+# @REQUIRED
 # @DESCRIPTION:
 # The list of packages that will be installed. This variable will be expanded 
to
 # SRC_URI:
@@ -68,17 +68,10 @@
 # Information to display about the package.
 # e.g. for enabling/disabling a feature
 
-# @ECLASS-VARIABLE: PATCHES
-# @DESCRIPTION:
-# Array variable specifying any patches to be applied.
-
 case "${EAPI:-0}" in
-   0|1|2)
+   0|1|2|3|4|5|6)
die "EAPI='${EAPI}' is not supported anymore"
;;
-   3|4|5)
-   inherit texlive-common eutils
-   ;;
*)
inherit texlive-common
;;
@@ -92,19 +85,12 @@ IUSE="source"
 
 # Starting from TeX Live 2009, upstream provides .tar.xz modules.
 PKGEXT=tar.xz
-case "${EAPI:-0}" in
-   0|1|2|3|4|5|6)
-   DEPEND="${COMMON_DEPEND}
-   app-arch/xz-utils"
-   ;;
-   *)
-   # We do not need anything from SYSROOT:
-   #   Everything is built from the texlive install in /
-   #   Generated files are noarch
-   BDEPEND="${COMMON_DEPEND}
-   app-arch/xz-utils"
-   ;;
-esac
+
+# We do not need anything from SYSROOT:
+#   Everything is built from the texlive install in /
+#   Generated files are noarch
+BDEPEND="${COMMON_DEPEND}
+   app-arch/xz-utils"
 
 for i in ${TEXLIVE_MODULE_CONTENTS}; do
SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
@@ -164,22 +150,6 @@ texlive-module_src_unpack() {
done
 }
 
-# @FUNCTION: texlive-module_src_prepare
-# @DESCRIPTION:
-# Apply patches from the PATCHES array and user patches, if any.
-
-texlive-module_src_prepare() {
-   case "${EAPI:-0}" in
-   0|1|2|3|4|5)
-   [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}"
-   epatch_user
-   ;;
-   *)
-   die "texlive-module_src_prepare is not to be used in 
EAPI ${EAPI}"
-   ;;
-   esac
-}
-
 # @FUNCTION: texlive-module_add_format
 # @DESCRIPTION:
 # Creates/appends to a format.${PN}.cnf file for fmtutil.
@@ -429,12 +399,4 @@ texlive-module_pkg_postrm() {
etexmf-update
 }
 
-case "${EAPI:-0}" in
-   0|1|2|3|4|5)
-   EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install 
\
-   pkg_postinst pkg_postrm
-   ;;
-   *)
-   EXPORT_FUNCTIONS src_unpack src_compile src_install 
pkg_postinst pkg_postrm
-   ;;
-esac
+EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-04 Thread Michał Górny
commit: c88ede9340bfa2adb02261135379b5531c9e3603
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov  4 09:04:35 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov  4 09:05:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88ede93

ruby-ng.eclass: Add RESTRICT="!test? ( test )"

Signed-off-by: Michał Górny  gentoo.org>

 eclass/ruby-ng.eclass | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index dd9d3f2418c..db701d81f4f 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -234,7 +234,10 @@ ruby_add_rdepend() {
4|5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
*) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
esac
-   has test "$IUSE" || IUSE="${IUSE} test"
+   if ! has test "$IUSE"; then
+   IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
+   fi
 }
 
 # @FUNCTION: ruby_add_bdepend



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-04 Thread Michał Górny
commit: 15dbbdbb3dd7312a90c1f2d09c727453d20ca702
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov  4 08:13:21 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov  4 08:35:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15dbbdbb

ruby-fakegem.eclass: Add RESTRICT="!test? ( test )"

Signed-off-by: Michał Górny  gentoo.org>

 eclass/ruby-fakegem.eclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index e600b02b964..d0956082f81 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -155,20 +155,24 @@ esac
 case ${RUBY_FAKEGEM_RECIPE_TEST} in
rake)
IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
ruby_add_bdepend "test? ( dev-ruby/rake )"
;;
rspec)
IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
# Also require a new enough rspec-core version that installs the
# rspec-2 wrapper.
ruby_add_bdepend "test? ( dev-ruby/rspec:2 
>=dev-ruby/rspec-core-2.14.8-r2 )"
;;
rspec3)
IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
;;
cucumber)
IUSE+=" test"
+   RESTRICT+=" !test? ( test )"
ruby_add_bdepend "test? ( dev-util/cucumber )"
;;
*)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-03 Thread Michał Górny
commit: da1a589d7815d02836d66075aa6f5f4fc39bc12e
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  1 17:34:37 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  3 11:46:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1a589d

llvm.org.eclass: New eclass to help maintaining LLVM

llvm.org eclass is meant to provide helper routines for maintaining
LLVM packages.  It takes care of covering the differences between
release, prerelease and git ebuilds in a unified API.  This will make
maintenance much easier.

Initially, the eclass takes care of fetching and unpacking the archives.
Later on, I will work on moving some more common stuff there.

Signed-off-by: Michał Górny  gentoo.org>

 eclass/llvm.org.eclass | 198 +
 1 file changed, 198 insertions(+)

diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass
new file mode 100644
index 000..5a704c1d980
--- /dev/null
+++ b/eclass/llvm.org.eclass
@@ -0,0 +1,198 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: llvm.org.eclass
+# @MAINTAINER:
+# Michał Górny 
+# @AUTHOR:
+# Michał Górny 
+# @BLURB: Common bits for fetching & unpacking llvm.org projects
+# @DESCRIPTION:
+# The llvm.org eclass provides common code to fetch and unpack parts
+# of the llvm.org project tree.  It takes care of handling both git
+# checkouts and source tarballs, making it possible to unify the code
+# of live and release ebuilds and effectively reduce the work needed
+# to package new releases/RCs/branches.
+#
+# In order to use this eclass, the ebuild needs to declare
+# LLVM_COMPONENTS and then call llvm.org_set_globals.  If tests require
+# additional components, they need to be listed in LLVM_TEST_COMPONENTS.
+# The eclass exports an implementation of src_unpack() phase.
+#
+# Example:
+# @CODE
+# inherit llvm.org
+#
+# LLVM_COMPONENTS=( lld )
+# LLVM_TEST_COMPONENTS=( llvm/utils/lit )
+# llvm.org_set_globals
+# @CODE
+
+case "${EAPI:-0}" in
+   7)
+   ;;
+   *)
+   die "Unsupported EAPI=${EAPI} for ${ECLASS}"
+   ;;
+esac
+
+
+# == internal control bits ==
+
+# @ECLASS-VARIABLE: _LLVM_MASTER_MAJOR
+# @INTERNAL
+# @DESCRIPTION:
+# The major version of current LLVM trunk.  Used to determine
+# the correct branch to use.
+_LLVM_MASTER_MAJOR=10
+
+# @ECLASS-VARIABLE: _LLVM_SOURCE_TYPE
+# @INTERNAL
+# @DESCRIPTION:
+# Source type to use: 'git' or 'tar'.
+if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then
+   if [[ ${PV} == *. ]]; then
+   _LLVM_SOURCE_TYPE=git
+   else
+   _LLVM_SOURCE_TYPE=tar
+   fi
+fi
+
+[[ ${_LLVM_SOURCE_TYPE} == git ]] && inherit git-r3
+
+[[ ${PV} == ${_LLVM_MASTER_MAJOR}.* && ${_LLVM_SOURCE_TYPE} == tar ]] &&
+   die "${ECLASS}: Release ebuild for master branch?!"
+
+
+# == control variables ==
+
+# @ECLASS-VARIABLE: LLVM_COMPONENTS
+# @REQUIRED
+# @DESCRIPTION:
+# List of components needed unconditionally.  Specified as bash array
+# with paths relative to llvm-project git.  Automatically translated
+# for tarball releases.
+#
+# The first path specified is used to construct default S.
+
+# @ECLASS-VARIABLE: LLVM_TEST_COMPONENTS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of additional components needed for tests.
+
+
+# == global scope logic ==
+
+# @FUNCTION: _llvm.org_get_archives
+# @USAGE: 
+# @INTERNAL
+# @DESCRIPTION:
+# Set 'archives' array to list of unique archive filenames
+# for components passed as parameters.
+_llvm.org_get_archives() {
+   local c
+   archives=()
+
+   for c; do
+   local cn=${c%%/*}
+   case ${cn} in
+   clang) cn=cfe;;
+   esac
+
+   local a=${cn}-${PV}.src.tar.xz
+   has "${a}" "${archives[@]}" || archives+=( "${a}" )
+   done
+}
+
+# @FUNCTION: llvm.org_set_globals
+# @DESCRIPTION:
+# Set global variables.  This must be called after setting LLVM_*
+# variables used by the eclass.
+llvm.org_set_globals() {
+   if [[ $(declare -p LLVM_COMPONENTS) != "declare -a"* ]]; then
+   die 'LLVM_COMPONENTS must be an array.'
+   fi
+   if declare -p LLVM_TEST_COMPONENTS &>/dev/null; then
+   if [[ $(declare -p LLVM_TEST_COMPONENTS) != "declare -a"* ]]; 
then
+   die 'LLVM_TEST_COMPONENTS must be an array.'
+   fi
+   fi
+
+   if [[ ${_LLVM_SOURCE_TYPE} == git ]]; then
+   EGIT_REPO_URI="https://github.com/llvm/llvm-project.git;
+
+   [[ ${PV} != ${_LLVM_MASTER_MAJOR}.* ]] &&
+   EGIT_BRANCH="release/${PV%%.*}.x"
+   elif [[ ${_LLVM_SOURCE_TYPE} == tar ]]; then
+   local a archives=()
+   _llvm.org_get_archives "${LLVM_COMPONENTS[@]}"
+   for a in "${archives[@]}"; do
+   SRC_URI+="
+  

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-03 Thread Michał Górny
commit: c5c1c0c5296e681389f5ae537784a31f35fd78e9
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  3 08:58:36 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  3 09:29:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c1c0c5

myspell.eclass: Remove last rited eclass

Signed-off-by: Michał Górny  gentoo.org>

 eclass/myspell.eclass | 259 --
 1 file changed, 259 deletions(-)

diff --git a/eclass/myspell.eclass b/eclass/myspell.eclass
deleted file mode 100644
index af639b00e06..000
--- a/eclass/myspell.eclass
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Author: Kevin F. Quinn 
-# Packages: app-dicts/myspell-*
-# Maintainer: maintainer-nee...@gentoo.org
-
-# @DEAD
-# Replaced by myspell-r2.eclass. Removal in 14 days.
-
-inherit multilib
-
-EXPORT_FUNCTIONS src_install pkg_preinst pkg_postinst
-
-IUSE=""
-
-SLOT="0"
-
-# tar, gzip, bzip2 are included in the base profile, but not unzip
-DEPEND="app-arch/unzip"
-
-# Dictionaries don't have any runtime dependencies
-# Myspell dictionaries can be used by hunspell, openoffice and others
-RDEPEND=""
-
-# The destination directory for myspell dictionaries
-MYSPELL_DICTBASE="/usr/share/myspell"
-
-# Legacy variable for dictionaries installed before eselect-oodict existed
-# so has to remain for binpkg support.  This variable is unmaintained -
-# if you have a problem with it, emerge app-eselect/eselect-oodict.
-# The location for openoffice softlinks
-MYSPELL_OOOBASE="/usr/lib/openoffice/share/dict/ooo"
-
-
-# set array "fields" to the elements of $1, separated by $2.
-# This saves having to muck about with IFS all over the place.
-set_fields() {
-   local old_IFS
-   old_IFS="${IFS}"
-   IFS=$2
-   fields=($1)
-   IFS="${old_IFS}"
-}
-
-# language is the second element of the ebuild name
-# myspell--
-get_myspell_lang() {
-   local fields
-   set_fields "${P}" "-"
-   echo ${fields[1]}
-}
-
-get_myspell_suffixes() {
-   case $1 in
-   DICT) echo ".aff .dic" ;;
-   HYPH) echo ".dic" ;;
-   THES) echo ".dat .idx" ;;
-   esac
-}
-
-# OOo dictionary files are held on the mirrors, rather than
-# being fetched direct from the OOo site as upstream doesn't
-# change the name when they rebuild the dictionaries.
-# -.zip becomes myspell---version.zip
-get_myspell_ooo_uri() {
-   local files fields newfile filestem srcfile dict uris
-   files=()
-   uris=""
-   for dict in \
-   "${MYSPELL_SPELLING_DICTIONARIES[@]}" \
-   "${MYSPELL_HYPHENATION_DICTIONARIES[@]}" \
-   "${MYSPELL_THESAURUS_DICTIONARIES[@]}"; do
-   set_fields "${dict}" ","
-   newfile=${fields[4]// }
-   for file in "${files[@]}"; do
-   [[ ${file} == ${newfile} ]] && continue 2
-   done
-   filestem=${newfile/.zip}
-   files=("${files[@]}" "${newfile}")
-   srcfile="myspell-${filestem}-${PV}.zip"
-   [[ -z ${uris} ]] &&
-   uris="mirror://gentoo/${srcfile}" ||
-   uris="${uris} mirror://gentoo/${srcfile}"
-   done
-   echo "${uris}"
-}
-
-
-[[ -z ${SRC_URI} ]] && SRC_URI=$(get_myspell_ooo_uri)
-
-# Format of dictionary.lst files (from OOo standard
-# dictionary.lst file):
-#
-# List of All Dictionaries to be Loaded by OpenOffice
-# ---
-# Each Entry in the list have the following space delimited fields
-#
-# Field 0: Entry Type "DICT" - spellchecking dictionary
-# "HYPH" - hyphenation dictionary
-# "THES" - thesaurus files
-#
-# Field 1: Language code from Locale "en" or "de" or "pt" ...
-#
-# Field 2: Country Code from Locale "US" or "GB" or "PT"
-#
-# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US"
-#  (do not add extensions to the name)
-
-# Format of MYSPELL_[SPELLING|HYPHENATION|THESAURUS]_DICTIONARIES:
-#
-# Field 0: Language code
-# Field 1: Country code
-# Field 2: Root name of dictionary files
-# Field 3: Description
-# Field 4: Archive filename
-#
-# This format is from the available.lst, hyphavail.lst and
-# thesavail.lst files on the openoffice.org repository.
-
-myspell_src_install() {
-   local filen fields entry dictlst
-   cd "${WORKDIR}"
-   # Install the dictionary, hyphenation and thesaurus files.
-   # Create dictionary.lst. file containing the parts of
-   # OOo's dictionary.lst file for this language, indicating
-   # which dictionaries are relevant for each country variant
-   # of the language.
-   insinto ${MYSPELL_DICTBASE}
-   dictlst="dictionary.lst.$(get_myspell_lang)"
-   echo "# Autogenerated by 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-02 Thread Jeroen Roovers
commit: eef4adae086d90ca8f277307b740ac5b98ebee35
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Nov  2 13:41:54 2019 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Nov  2 13:44:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef4adae

eclass/nvidia-driver.eclass: Set RESTRICT="bindist mirror test"

Signed-off-by: Jeroen Roovers  gentoo.org>

 eclass/nvidia-driver.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass
index 482c62c012f..a8631947748 100644
--- a/eclass/nvidia-driver.eclass
+++ b/eclass/nvidia-driver.eclass
@@ -14,6 +14,7 @@
 inherit readme.gentoo-r1 versionator
 
 DEPEND="sys-apps/pciutils"
+RESTRICT="bindist mirror test"
 
 # Variables for readme.gentoo.eclass:
 DISABLE_AUTOFORMATTING="yes"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-11-01 Thread Michał Górny
commit: 3a8167567e4f7f938da9c34ca0a02ea2eac8de65
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Oct 23 10:08:27 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Nov  1 13:15:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a816756

python-utils-r1.eclass: Fix python_optimize to take all of sys.path

Make sure to append NUL to every path in sys.path, rather than using
it as a separator between output entries.  This fixes a bug when
the last path entry was silently discarded, and the function stopped
working with PyPy as a result.

Signed-off-by: Michał Górny  gentoo.org>

 eclass/python-utils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index f8f51ecb694..549dd5f2e56 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -692,7 +692,7 @@ python_optimize() {
if [[ ${f} == /* && -d ${D%/}${f} ]]; then
set -- "${D%/}${f}" "${@}"
fi
-   done < <("${PYTHON}" -c 'import sys; 
print("\0".join(sys.path))' || die)
+   done < <("${PYTHON}" -c 'import sys; print("".join(x + "\0" for 
x in sys.path))' || die)
 
debug-print "${FUNCNAME}: using sys.path: ${*/%/;}"
fi



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-30 Thread Miroslav Šulc
commit: 8cb182d6a7c9a6f75df73e64f15d34e077271405
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 30 20:25:00 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 30 20:27:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cb182d6

eclass/java-{ant,utils}: updated for new javatoolkit layout

Bug: https://bugs.gentoo.org/627440
Signed-off-by: Miroslav Šulc  gentoo.org>

 eclass/java-ant-2.eclass   | 15 ++-
 eclass/java-utils-2.eclass |  9 ++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 1fd4feb3913..5be76953edd 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -224,8 +224,13 @@ java-ant_bsfix_files() {
files+=( -f "${file}" )
done
 
-   local 
rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
-   local 
rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"
+   if [ -e "${EPREFIX}/usr/libexec/javatoolkit" ]; then
+   local 
rewriter3="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-3.py"
+   local 
rewriter4="${EPREFIX}/usr/libexec/javatoolkit/build-xml-rewrite"
+   else
+   local 
rewriter3="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-3.py"
+   local 
rewriter4="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/build-xml-rewrite"
+   fi
 
if [[ -x ${rewriter4} && ${JAVA_ANT_ENCODING} ]]; then
[[ ${JAVA_ANT_REWRITE_CLASSPATH} ]] && local gcp="-g"
@@ -375,11 +380,11 @@ java-ant_ignore-system-classes() {
 # @DESCRIPTION:
 # Run the right xml-rewrite binary with the given arguments
 java-ant_xml-rewrite() {
-   local gen2="${EPREFIX}/usr/bin/xml-rewrite-2.py"
local 
gen2_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
+   local gen2_2="${EPREFIX}/usr/libexec/javatoolkit/xml-rewrite-2.py"
# gen1 is deprecated
-   if [[ -x "${gen2}" ]]; then
-   ${gen2} "${@}" || die "${gen2} failed"
+   if [[ -x "${gen2_2}" ]]; then
+   ${gen2_2} "${@}" || die "${gen2_2} failed"
elif [[ -x "${gen2_1}" ]]; then
${gen2_1} "${@}" || die "${gen2_1} failed"
else

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 4f7eb0356fc..e32cb572f14 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -2729,10 +2729,13 @@ java-pkg_jar-list() {
 java-pkg_verify-classes() {
#$(find ${D} -type f -name '*.jar' -o -name '*.class')
 
-   local version_verify="/usr/bin/class-version-verify.py"
+   local 
version_verify_1="${EPREFIX}/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
+   local 
version_verify_2="${EPREFIX}/usr/libexec/javatoolkit/class-version-verify.py"
 
-   if [[ ! -x "${version_verify}" ]]; then
-   
version_verify="/usr/$(get_libdir)/javatoolkit/bin/class-version-verify.py"
+   if [[ -x "${version_verify_1}" ]]; then
+   local version_verify=${version_verify_1}
+   else
+   local version_verify=${version_verify_2}
fi
 
if [[ ! -x "${version_verify}" ]]; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-27 Thread Sergei Trofimovich
commit: d2f7c8c1e90dd39818c8a810c57c9b15f96ffbe0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Oct 27 20:15:41 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 27 20:16:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f7c8c1

toolchain.eclass: set SLOT=${GCCMAJOR} for gcc-10*

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7e88900737a..d2bfa6ab2f1 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -186,7 +186,13 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
tc_version_is_at_least 9.1 && IUSE+=" lto"
 fi
 
-SLOT="${GCC_CONFIG_VER}"
+if tc_version_is_at_least 10; then
+   # Note: currently we pull in prereleases, snapshots and
+   # git versions into the same SLOT.
+   SLOT="${GCCMAJOR}"
+else
+   SLOT="${GCC_CONFIG_VER}"
+fi
 
 #>> DEPEND <<
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-26 Thread Sergei Trofimovich
commit: 5277d012d4d21640d82ba9c82748d8b63523804c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 26 16:33:17 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 26 16:36:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5277d012

toolchain.eclass: filter out -mstackrealign, bug #688580

-mstackrealign breaks stack unwinding via _Unwind_RaiseException
in libgcc_s.so.1. Not clear why exactly. Probably by breaking
unwinding information during realignment.

The change works it around by dropping -mstackrealign when building gcc.

Reported-by: Erik
Bug: https://bugs.gentoo.org/688580
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b1ba774ea0c..7e88900737a 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1547,6 +1547,13 @@ gcc_do_filter_flags() {
filter-flags -Wstack-protector
fi
 
+   if tc_version_is_between 6 8 ; then
+   # -mstackrealign triggers crashes in exception throwing
+   # at least on ada: bug #688580
+   # The reason is unknown. Drop the flag for now.
+   filter-flags -mstackrealign
+   fi
+
if tc_version_is_at_least 3.4 ; then
case $(tc-arch) in
amd64|x86)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-26 Thread Michał Górny
commit: d7a10431af22429c2a828165cfc154e375f958ba
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 26 06:39:40 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 26 06:39:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7a10431

texlive-module.eclass: Fix eclassdoc

Signed-off-by: Michał Górny  gentoo.org>

 eclass/texlive-module.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 62620170dd1..bd338ee625c 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -63,8 +63,8 @@
 # needed app-text/texlive-core.
 
 # @ECLASS-VARIABLE: TL_MODULE_INFORMATION
-# @DESCRIPTION:
 # @DEFAULT_UNSET
+# @DESCRIPTION:
 # Information to display about the package.
 # e.g. for enabling/disabling a feature
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-23 Thread Andreas K. Hüttel
commit: 2ee91907af6936531ebf1689bf60adbfc6ebd511
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Oct 23 12:39:14 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Wed Oct 23 12:43:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee91907

perl-app.eclass: mark @DEAD

Bug: https://bugs.gentoo.org/637836
Bug: https://bugs.gentoo.org/239510
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 eclass/perl-app.eclass | 9 +
 1 file changed, 9 insertions(+)

diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
index 074902294e5..3fb897917c6 100644
--- a/eclass/perl-app.eclass
+++ b/eclass/perl-app.eclass
@@ -1,6 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
+# This eclass is dead and all its consumers have been removed from
+# the tree.
+# Please use perl-module.eclass if you need phase functions, and
+# perl-functions.eclass if you don't.
+# In overlays, perl-app.eclass usage can be replaced by
+# perl-module.eclass without further changes.
+# Bug 637836.  Removal in 14 days.
+
 # Author: Michael Cummings 
 # Maintained by the Perl herd 
 # @SUPPORTED_EAPIS: 5



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-22 Thread Ulrich Müller
commit: 185332a98dda51df9818c43566c90277e0efc3fc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Oct 22 13:25:26 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Oct 22 13:25:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185332a9

bzr.eclass: Still used by app-emacs/vm.

Signed-off-by: Ulrich Müller  gentoo.org>

 eclass/bzr.eclass | 4 
 1 file changed, 4 deletions(-)

diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index b87de75ab1a..cd19f22e11a 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -1,10 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# @DEAD
-# No consumers in tree anymore, bzr is dead and py2 only
-# and will go away in the future.  Removal in 30 days.
-
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
 # Ulrich Müller 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-22 Thread Ulrich Müller
commit: 320fcf034f5e860454e0d2a28ed405c5b843c60c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Oct 22 13:27:13 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Oct 22 13:27:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320fcf03

bzr.eclass: Add die statements.

... to make the QA lead happy.

Signed-off-by: Ulrich Müller  gentoo.org>

 eclass/bzr.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index cd19f22e11a..fc1de9dc9cc 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -197,7 +197,7 @@ bzr_update() {
|| die "${EBZR}: can't chdir to ${branch_dir}"
${EBZR_UPDATE_CMD} ${EBZR_OPTIONS} "${repo_uri}" \
|| die "${EBZR}: can't pull from ${repo_uri}"
-   popd > /dev/null
+   popd > /dev/null || die "${EBZR}: popd failed"
fi
 }
 
@@ -278,7 +278,7 @@ bzr_fetch() {
einfo \
"revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in 
${EBZR_UNPACK_DIR}"
 
-   popd > /dev/null
+   popd > /dev/null || die "${EBZR}: popd failed"
 }
 
 # @FUNCTION: bzr_src_unpack



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-22 Thread David Seifert
commit: 8009cd5ac3b832ee654980381cc4256f4aca0225
Author: David Seifert  gentoo  org>
AuthorDate: Tue Oct 22 11:00:35 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Oct 22 11:00:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8009cd5a

bzr.eclass: Last rite

Signed-off-by: David Seifert  gentoo.org>

 eclass/bzr.eclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass
index 598a0f87fe6..b87de75ab1a 100644
--- a/eclass/bzr.eclass
+++ b/eclass/bzr.eclass
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-#
+
+# @DEAD
+# No consumers in tree anymore, bzr is dead and py2 only
+# and will go away in the future.  Removal in 30 days.
+
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
 # Ulrich Müller 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-21 Thread Andreas Sturmlechner
commit: 6d1ea18157c45fb93756378a38318a3f6e1a7967
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 21 11:11:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 21 11:18:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1ea181

qt5-build.eclass: qt5_regenerate_global_configs: use `cp` instead of `mv`

Thanks-to: Lars Wendler  gentoo.org>
Bug: https://bugs.gentoo.org/698174
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/qt5-build.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2e5a15d930a..2bee3a3fae4 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -816,7 +816,7 @@ qt5_regenerate_global_configs() {
-execdir cat '{}' + | sort -u > "${T}"/gentoo-qconfig.h
 
[[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is 
empty"
-   mv -f "${T}"/gentoo-qconfig.h 
"${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
+   cp "${T}"/gentoo-qconfig.h 
"${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \
|| eerror "Failed to install new gentoo-qconfig.h"
 
einfo "Updating QT_CONFIG in qconfig.pri"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-21 Thread Alfredo Tupone
commit: f3337cee38d12d44fc90c8ae494090a853902bb9
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Mon Oct 21 06:52:22 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Mon Oct 21 06:52:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3337cee

ada.eclass: add export of GNAT

Signed-off-by: Alfredo Tupone  gentoo.org>

 eclass/ada.eclass | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index dad3d9acce8..361ffb65cd1 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -355,7 +355,7 @@ ada_wrapper_setup() {
mkdir -p "${workdir}"/bin || die
 
local GCC GNATMAKE GNATLS GNATBIND GNATCHOP GNATPREP
-   ada_export "${impl}" GCC GNATMAKE GNATLS GNATCHOP GNATBIND 
GNATPREP
+   ada_export "${impl}" GCC GNAT GNATMAKE GNATLS GNATCHOP GNATBIND 
GNATPREP
 
# Ada compiler
cat > "${workdir}/bin/gcc" <<-_EOF_ || die
@@ -388,6 +388,11 @@ ada_wrapper_setup() {
exec "${GNATPREP}" "\${@}"
_EOF_
chmod a+x "${workdir}/bin/gnatprep" || die
+   cat > "${workdir}/bin/gnat" <<-_EOF_ || die
+   #!/bin/sh
+   exec "${GNAT}" "\${@}"
+   _EOF_
+   chmod a+x "${workdir}/bin/gnat" || die
fi
 
# Now, set the environment.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-20 Thread Sergei Trofimovich
commit: 88de02402ee10a414bc14359562783477f74b273
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 22:07:37 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 20 08:16:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88de0240

toolchain.eclass: switch to git-r3 for live ebuilds

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 43cacd81326..b1ba774ea0c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -9,16 +9,16 @@ HOMEPAGE="https://gcc.gnu.org/;
 
 inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils 
toolchain-funcs prefix
 
-if [[ ${PV} == *_pre* ]] ; then
+if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
# naming style:
-   # gcc-4.7.1_pre -> gcc-4_7-branch
+   # gcc-10.1.0_pre -> gcc-10-branch
#  Note that the micro version is required or lots of stuff will break.
#  To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before
#  inheriting this eclass.
-   EGIT_BRANCH="${PN}-${PV%.?_pre}-branch"
+   EGIT_BRANCH="${PN}-${PV%.?.?_pre}-branch"
EGIT_BRANCH=${EGIT_BRANCH//./_}
-   inherit git-2
+   inherit git-r3
 fi
 
 FEATURES=${FEATURES/multilib-strict/}
@@ -260,7 +260,9 @@ PDEPEND=">=sys-devel/gcc-config-1.7"
 # Set the source directory depending on whether we're using
 # a prerelease, snapshot, or release tarball.
 S=$(
-   if [[ -n ${PRERELEASE} ]] ; then
+   if [[ ${PV} == ** ]]; then
+   echo ${EGIT_CHECKOUT_DIR}
+   elif [[ -n ${PRERELEASE} ]] ; then
echo ${WORKDIR}/gcc-${PRERELEASE}
elif [[ -n ${SNAPSHOT} ]] ; then
echo ${WORKDIR}/gcc-${SNAPSHOT}
@@ -437,7 +439,7 @@ toolchain_pkg_setup() {
 
 toolchain_src_unpack() {
if [[ ${PV} == ** ]]; then
-   git-2_src_unpack
+   git-r3_src_unpack
else
gcc_quick_unpack
fi



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-20 Thread Michał Górny
commit: 11ad57148d0ef2adaec44970cca9563369d085ad
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 20 07:10:53 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 20 07:16:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ad5714

distutils-r1.eclass: Add new pypy path to addpredict

Closes: https://bugs.gentoo.org/698024
Signed-off-by: Michał Górny  gentoo.org>

 eclass/distutils-r1.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7c56a0c8a13..d3eb8f22ead 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -547,6 +547,8 @@ distutils-r1_python_install() {
# failures if some packages haven't compiled their modules yet.
addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}"
+   addpredict /usr/lib/pypy2.7
+   addpredict /usr/lib/pypy3.6
addpredict /usr/lib/portage/pym
addpredict /usr/local # bug 498232
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: bd758f25a82460f6e7011314f9fb7923864e9e1e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 12:54:48 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd758f25

toolchain.eclass: isolate 'epatch' into 'tc_apply_patches'

tc_apply_patches applies all patches and patchsets.
Will ease eventual migration to EAPI=7.

While at it dropped use of EPATCH_SUFFIX.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 43 +++
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ec196db072d..32483555b05 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -501,6 +501,21 @@ gcc_quick_unpack() {
 
 #>> src_prepare <<
 
+# 'epatch' is not available in EAPI=7. Abstract away patchset application
+# until we eventually get all gcc ebuilds on EAPI=7 or later.
+tc_apply_patches() {
+   [[ ${#@} -lt 2 ]] && die "usage: tc_apply_patches  
"
+
+   einfo "$1"; shift
+
+   case ${EAPI:-0} in
+   # Note: even for EAPI=6 we used 'epatch' semantics. To avoid
+   # breaking existing ebuilds use 'eapply' only in EAPI=7 or 
later.
+   5*|6) epatch "$@" ;;
+   *) die "Update apply_patches() for ${EAPI}." ;;
+   esac
+}
+
 toolchain_src_prepare() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
cd "${S}"
@@ -604,7 +619,9 @@ toolchain_src_prepare() {
sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828
 
# Prevent new texinfo from breaking old versions (see #198182, #464008)
-   tc_version_is_at_least 4.1 && epatch 
"${FILESDIR}"/gcc-configure-texinfo.patch
+   if tc_version_is_at_least 4.1; then
+   tc_apply_patches "Remove texinfo (bug #198182, bug ##464008)" 
"${FILESDIR}"/gcc-configure-texinfo.patch
+   fi
 
if [[ -x contrib/gcc_update ]] ; then
einfo "Touching generated files"
@@ -615,24 +632,14 @@ toolchain_src_prepare() {
fi
 }
 
-guess_patch_type_in_dir() {
-   [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
-   && EPATCH_SUFFIX="patch.bz2" \
-   || EPATCH_SUFFIX="patch"
-}
-
 do_gcc_gentoo_patches() {
if ! use vanilla ; then
if [[ -n ${PATCH_VER} ]] ; then
-   guess_patch_type_in_dir "${WORKDIR}"/patch
-   EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
-   epatch "${WORKDIR}"/patch
+   tc_apply_patches "Applying Gentoo patches ..." 
"${WORKDIR}"/patch/*.patch
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} 
p${PATCH_VER}"
fi
if [[ -n ${UCLIBC_VER} ]] ; then
-   guess_patch_type_in_dir "${WORKDIR}"/uclibc
-   EPATCH_MULTI_MSG="Applying uClibc patches ..." \
-   epatch "${WORKDIR}"/uclibc
+   tc_apply_patches "Applying uClibc patches ..." 
"${WORKDIR}"/uclibc/*.patch
fi
fi
 }
@@ -641,7 +648,7 @@ do_gcc_HTB_patches() {
use_if_iuse boundschecking || return 0
 
# modify the bounds checking patch with a regression patch
-   epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
+   tc_apply_patches "Bounds checking patch" 
"${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, 
HTB-${HTB_GCC_VER}-${HTB_VER}"
 }
 
@@ -649,9 +656,7 @@ do_gcc_PIE_patches() {
want_pie || return 0
use vanilla && return 0
 
-   guess_patch_type_in_dir "${WORKDIR}"/piepatch/
-   EPATCH_MULTI_MSG="Applying pie patches ..." \
-   epatch "${WORKDIR}"/piepatch/
+   tc_apply_patches "Applying pie patches ..." 
"${WORKDIR}"/piepatch/*.patch
 
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
 }
@@ -663,9 +668,7 @@ do_gcc_CYGWINPORTS_patches() {
local p d="${WORKDIR}/gcc-${CYGWINPORTS_GITREV}"
# readarray -t is available since bash-4.4 only, #690686
local patches=( $(sed -e '1,/PATCH_URI="/d;/"/,$d' < 
"${d}"/gcc.cygport) )
-   for p in ${patches[*]}; do
-   epatch "${d}/${p}"
-   done
+   tc_apply_patches "Applying cygwin port patches ..." ${patches[*]}
 }
 
 # configure to build with the hardened GCC specs as the default



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: cd38a4bf6a3a966d4066645279dbbe118823368f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 21:10:52 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd38a4bf

toolchain.eclass: enable selective stipping for EAPI=7

Before the change we stripped no binaries or object files
for gcc on any EAPI.

After the change we strip all native binaries, libraries
and object files (only on EAPI=7).

Non-native binaries (cross-compiler case) is skipped by
means of 'dostrip -x'.

Bug: https://bugs.gentoo.org/686512
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index fe8944833a9..43cacd81326 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -6,7 +6,6 @@
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/;
-RESTRICT="strip" # cross-compilers need controlled stripping
 
 inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils 
toolchain-funcs prefix
 
@@ -30,6 +29,17 @@ case ${EAPI:-0} in
7) ;;
*) die "I don't speak EAPI ${EAPI}." ;;
 esac
+
+tc_supports_dostrip() {
+   case ${EAPI:-0} in
+   5*|6) return 1 ;;
+   7) return 0 ;;
+   *) die "Update apply_patches() for ${EAPI}." ;;
+   esac
+}
+
+tc_supports_dostrip || RESTRICT="strip" # cross-compilers need controlled 
stripping
+
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
src_compile src_test src_install pkg_postinst pkg_postrm
 
@@ -1852,15 +1862,17 @@ toolchain_src_install() {
fi
fi
 
-   # TODO(bug #686512): implement stripping (we use RESTRICT=strip)
-   # As gcc installs object files both build against ${CHOST} and 
${CTARGET}
-   # we will ned to run stripping using different tools:
+   # As gcc installs object files built against bost ${CHOST} and 
${CTARGET}
+   # ideally we will need to strip them using different tools:
# Using ${CHOST} tools:
#  - "${D}${BINPATH}"
#  - (for is_crosscompile) "${D}${HOSTLIBPATH}"
#  - "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
# Using ${CTARGET} tools:
#  - "${D}${LIBPATH}"
+   # As dostrip does not specify host to override ${CHOST} tools just skip
+   # non-native binary stripping.
+   is_crosscompile && tc_supports_dostrip && dostrip -x "${LIBPATH}"
 
cd "${S}"
if is_crosscompile; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: 1d684f1e6c6f212a2a92e1e90de6a66f33d28f9d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 18:56:59 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d684f1e

toolchain.eclass: add bug references to comments

No functional changes.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 6f70d806100..aec5ba4314c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -358,7 +358,6 @@ get_gcc_src_uri() {
[[ -n ${PATCH_VER} ]] && \
GCC_SRC_URI+=" $(gentoo_urls 
gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
 
-   # strawberry pie, Cappuccino and a Gauloises (it's a good thing)
[[ -n ${PIE_VER} ]] && \

PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
@@ -625,6 +624,7 @@ toolchain_src_prepare() {
tc_apply_patches "Remove texinfo (bug #198182, bug ##464008)" 
"${FILESDIR}"/gcc-configure-texinfo.patch
fi
 
+   # >=gcc-4
if [[ -x contrib/gcc_update ]] ; then
einfo "Touching generated files"
./contrib/gcc_update --touch | \
@@ -675,11 +675,10 @@ do_gcc_CYGWINPORTS_patches() {
 
 # configure to build with the hardened GCC specs as the default
 make_gcc_hard() {
-
local gcc_hard_flags=""
 
# If we use gcc-6 or newer with pie enable to compile older gcc we need 
to pass -no-pie
-   # to stage1; bug 618908
+   # to stage1; bug #618908
if ! tc_version_is_at_least 6.0 && [[ $(gcc-major-version) -ge 6 ]] ; 
then
einfo "Disabling PIE in stage1 (only) ..."
sed -i -e "/^STAGE1_LDFLAGS/ s/$/ -no-pie/" "${S}"/Makefile.in 
|| die
@@ -694,7 +693,10 @@ make_gcc_hard() {
einfo "Updating gcc to use automatic SSP building ..."
fi
if use_if_iuse hardened ; then
-   # Will add some optimatizion as default.
+   # Will add some hardened options as default, like:
+   # -fstack-clash-protection
+   # -z now
+   # see *_all_extra-options.patch gcc patches.
gcc_hard_flags+=" -DEXTRA_OPTIONS"
# rebrand to make bug reports easier

BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
@@ -946,9 +948,9 @@ toolchain_src_configure() {
tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions 
)
 
# Use the default ("release") checking because upstream usually neglects
-   # to test "disabled" so it has a history of breaking. #317217
+   # to test "disabled" so it has a history of breaking. bug #317217
if tc_version_is_at_least 3.4 && in_iuse debug ; then
-   # The "release" keyword is new to 4.0. #551636
+   # The "release" keyword is new to 4.0. bug #551636
local off=$(tc_version_is_at_least 4.0 && echo release || echo 
no)
confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug 
yes ${off})}" )
fi
@@ -966,12 +968,12 @@ toolchain_src_configure() {
 
# allow gcc to search for clock funcs in the main C lib.
# if it can't find them, then tough cookies -- we aren't
-   # going to link in -lrt to all C++ apps.  #411681
+   # going to link in -lrt to all C++ apps. bug #411681
if tc_version_is_at_least 4.4 && is_cxx ; then
confgcc+=( --enable-libstdcxx-time )
fi
 
-   # Build compiler using LTO
+   # Build compiler itself using LTO
if tc_version_is_at_least 9.1 && use_if_iuse lto ; then
confgcc+=( --with-build-config=bootstrap-lto )
fi
@@ -984,7 +986,9 @@ toolchain_src_configure() {
# The jit language requires this.
is_jit && confgcc+=( --enable-host-shared )
 
-   # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942
+   # build-id was disabled for file collisions: bug #526144
+   #
+   # # Turn on the -Wl,--build-id flag by default for ELF targets. bug 
#525942
# # This helps with locating debug files.
# case ${CTARGET} in
# *-linux-*|*-elf|*-eabi)
@@ -1025,10 +1029,12 @@ toolchain_src_configure() {
*-klibc) needed_libc=klibc;;
*-musl*) needed_libc=musl;;
*-uclibc*)
+   # Enable shared library support only on targets
+   # that support it: bug #291870
if ! echo '#include ' | \
 

[gentoo-commits] repo/gentoo:master commit in: eclass/, sys-devel/gcc/files/

2019-10-19 Thread Sergei Trofimovich
commit: dfcb2b58bf94dc20eed8aa9780fc64df70710b6e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 18:55:57 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcb2b58

toolchain.eclass: port to EAPI=7

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 6 --
 sys-devel/gcc/files/gcc-configure-texinfo.patch | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 32483555b05..6f70d806100 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Maintainer: Toolchain Ninjas 
-# @SUPPORTED_EAPIS: 5 6
+# @SUPPORTED_EAPIS: 5 6 7
 
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/;
@@ -27,6 +27,7 @@ FEATURES=${FEATURES/multilib-strict/}
 case ${EAPI:-0} in
0|1|2|3|4*) die "Need to upgrade to at least EAPI=5" ;;
5*|6) inherit eapi7-ver ;;
+   7) ;;
*) die "I don't speak EAPI ${EAPI}." ;;
 esac
 EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure \
@@ -512,6 +513,7 @@ tc_apply_patches() {
# Note: even for EAPI=6 we used 'epatch' semantics. To avoid
# breaking existing ebuilds use 'eapply' only in EAPI=7 or 
later.
5*|6) epatch "$@" ;;
+   7) eapply "$@" ;;
*) die "Update apply_patches() for ${EAPI}." ;;
esac
 }
@@ -527,7 +529,7 @@ toolchain_src_prepare() {
 
case ${EAPI:-0} in
5*) epatch_user;;
-   6) eapply_user ;;
+   6|7) eapply_user ;;
*) die "Update toolchain_src_prepare() for ${EAPI}." ;;
esac
 

diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch 
b/sys-devel/gcc/files/gcc-configure-texinfo.patch
index ddc098ddbd5..99e90998a46 100644
--- a/sys-devel/gcc/files/gcc-configure-texinfo.patch
+++ b/sys-devel/gcc/files/gcc-configure-texinfo.patch
@@ -4,8 +4,8 @@ that it violates the cheesy version grep.
 
 http://bugs.gentoo.org/198182
 
 configure
-+++ configure
+--- a/configure
 b/configure
 @@ -3573,6 +3573,6 @@
:
  else



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: b540ee3a734750265d5ca4a463a97a5d508ca3ff
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 19:53:16 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b540ee3a

toolchain.eclass: drop support for deprecated mingw-runtime

Bug: https://bugs.gentoo.org/584858
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index aec5ba4314c..fe8944833a9 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1014,7 +1014,7 @@ toolchain_src_configure() {
# disable a bunch of features or gcc goes boom
local needed_libc=""
case ${CTARGET} in
-   *-linux) needed_libc=no-fucking-clue;;
+   *-linux) needed_libc=error-unknown-libc;;
*-dietlibc)  needed_libc=dietlibc;;
*-elf|*-eabi)
needed_libc=newlib
@@ -1042,7 +1042,6 @@ toolchain_src_configure() {
*-cygwin)needed_libc=cygwin;;
x86_64-*-mingw*|\
*-w64-mingw*)needed_libc=mingw64-runtime;;
-   mingw*|*-mingw*) needed_libc=mingw-runtime;;
avr) confgcc+=( --enable-shared 
--disable-threads );;
esac
if [[ -n ${needed_libc} ]] ; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: c41f3cee36633d1e425d611ed63e3f35e0aaaeb4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 11:42:41 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41f3cee

toolchain.eclass: drop PIE patch support for  gentoo.org>

 eclass/toolchain.eclass | 20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 0c0378d9a7e..ec196db072d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -649,23 +649,9 @@ do_gcc_PIE_patches() {
want_pie || return 0
use vanilla && return 0
 
-   if tc_version_is_at_least 4.3.2 ; then
-   guess_patch_type_in_dir "${WORKDIR}"/piepatch/
-   EPATCH_MULTI_MSG="Applying pie patches ..." \
-   epatch "${WORKDIR}"/piepatch/
-   else
-   guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
-
-   # corrects startfile/endfile selection and shared/static/pie 
flag usage
-   EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
-   epatch "${WORKDIR}"/piepatch/upstream
-   # adds non-default pie support (rs6000)
-   EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
-   epatch "${WORKDIR}"/piepatch/nondef
-   # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is 
defined
-   EPATCH_MULTI_MSG="Applying default pie patches ..." \
-   epatch "${WORKDIR}"/piepatch/def
-   fi
+   guess_patch_type_in_dir "${WORKDIR}"/piepatch/
+   EPATCH_MULTI_MSG="Applying pie patches ..." \
+   epatch "${WORKDIR}"/piepatch/
 
BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
 }



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: 31a0fb70672120064f20394066f97760b7209578
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 10:58:07 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a0fb70

toolchain.eclass: clarify use case of GCC_A_FAKEIT

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d2de666120e..d26a12a024b 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -454,6 +454,8 @@ gcc_quick_unpack() {
export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
 
+   # Injection point for more tarballs. dev-lang/gnat-gpl uses
+   # 'GCC_A_FAKEIT' to specify it's own source and binary tarballs.
if [[ -n ${GCC_A_FAKEIT} ]] ; then
unpack ${GCC_A_FAKEIT}
elif [[ -n ${PRERELEASE} ]] ; then



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: b42557d9b8b7055eb199bd769ab7787da7a069b7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 11:23:57 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42557d9

toolchain-glibc.eclass: drop support for 'BRANCH_UPDATE'

BRANCH_UPDATE needs explicit tarball creation. Live ebuilds
suit better for tracking upstream development.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain-glibc.eclass | 12 
 1 file changed, 12 deletions(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 30781fed777..87704c5bb5a 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -416,7 +416,6 @@ just_headers() {
 glibc_banner() {
local b="Gentoo ${PVR}"
[[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}"
-   [[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}"
[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
echo "${b}"
 }
@@ -740,17 +739,6 @@ toolchain-glibc_src_unpack() {
 }
 
 toolchain-glibc_src_prepare() {
-   # XXX: We should do the branchupdate, before extracting the manpages and
-   # infopages else it does not help much (mtimes change if there is a 
change
-   # to them with branchupdate)
-   if [[ -n ${BRANCH_UPDATE} ]] ; then
-   epatch 
"${DISTDIR}"/glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
-   # Snapshot date patch
-   einfo "Patching version to display snapshot date ..."
-   sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" 
version.h
-   fi
-
# tag, glibc is it
if ! version_is_at_least 2.17 ; then
[[ -e csu/Banner ]] && die "need new banner location"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-19 Thread Sergei Trofimovich
commit: e6d87e5e333e77ffc69cbf14d2c0e8f923a5d6c8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 10:06:55 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d87e5e

toolchain.eclass: move gentoo patches into own helper

Cleanup. No functional change.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain.eclass | 30 +-
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index bc7d7b1c260..d2de666120e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -522,19 +522,7 @@ toolchain_src_prepare() {
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
cd "${S}"
 
-   if ! use vanilla ; then
-   if [[ -n ${PATCH_VER} ]] ; then
-   guess_patch_type_in_dir "${WORKDIR}"/patch
-   EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
-   epatch "${WORKDIR}"/patch
-   BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} 
p${PATCH_VER}"
-   fi
-   if [[ -n ${UCLIBC_VER} ]] ; then
-   guess_patch_type_in_dir "${WORKDIR}"/uclibc
-   EPATCH_MULTI_MSG="Applying uClibc patches ..." \
-   epatch "${WORKDIR}"/uclibc
-   fi
-   fi
+   do_gcc_gentoo_patches
do_gcc_HTB_patches
do_gcc_PIE_patches
do_gcc_CYGWINPORTS_patches
@@ -650,6 +638,22 @@ guess_patch_type_in_dir() {
|| EPATCH_SUFFIX="patch"
 }
 
+do_gcc_gentoo_patches() {
+   if ! use vanilla ; then
+   if [[ -n ${PATCH_VER} ]] ; then
+   guess_patch_type_in_dir "${WORKDIR}"/patch
+   EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
+   epatch "${WORKDIR}"/patch
+   BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} 
p${PATCH_VER}"
+   fi
+   if [[ -n ${UCLIBC_VER} ]] ; then
+   guess_patch_type_in_dir "${WORKDIR}"/uclibc
+   EPATCH_MULTI_MSG="Applying uClibc patches ..." \
+   epatch "${WORKDIR}"/uclibc
+   fi
+   fi
+}
+
 do_gcc_HTB_patches() {
use_if_iuse boundschecking || return 0
 



[gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/

2019-10-19 Thread Sergei Trofimovich
commit: 7603aa1fbbe1079e2e011548895f27b7ef82ca36
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 19 11:15:39 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 19 21:20:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7603aa1f

toolchain.eclass: drop support for 'BRANCH_UPDATE'

BRANCH_UPDATE needs explicit tarball creation. Live ebuilds
or weekly snapshots suit better for tracking upstream development.

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/tests/toolchain.sh |  1 -
 eclass/toolchain.eclass   | 24 
 2 files changed, 25 deletions(-)

diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh
index ec225356856..2c09f2238d7 100755
--- a/eclass/tests/toolchain.sh
+++ b/eclass/tests/toolchain.sh
@@ -168,7 +168,6 @@ test_var_assert GCC_BRANCH_VER  7.3
 test_var_assert GCCMAJOR7
 test_var_assert GCCMINOR3
 test_var_assert GCCMICRO0
-test_var_assert BRANCH_UPDATE   ''
 test_var_assert GCC_CONFIG_VER  7.3.0
 test_var_assert PREFIX  /usr
 

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d26a12a024b..0c0378d9a7e 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -67,8 +67,6 @@ GCC_BRANCH_VER=$(ver_cut 1-2 ${GCC_PV})
 GCCMAJOR=$(ver_cut 1 ${GCC_PV})
 GCCMINOR=$(ver_cut 2 ${GCC_PV})
 GCCMICRO=$(ver_cut 3 ${GCC_PV})
-[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \
-   BRANCH_UPDATE=$(ver_cut 4 ${GCC_PV})
 
 # According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
 # ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
@@ -282,14 +280,6 @@ gentoo_urls() {
 #  the ebuild has a _pre suffix, this variable is ignored 
and the
 #  prerelease tarball is used instead.
 #
-#  BRANCH_UPDATE
-#  If set, this variable signals that we should be using 
the main
-#  release tarball (determined by ebuild version) and 
applying a
-#  CVS branch update patch against it. The location of 
this branch
-#  update patch is assumed to be in 
${GENTOO_TOOLCHAIN_BASE_URI}.
-#  Just like with SNAPSHOT, this variable is ignored if 
the ebuild
-#  has a _pre suffix.
-#
 #  PATCH_VER
 #  PATCH_GCC_VER
 #  This should be set to the version of the gentoo patch 
tarball.
@@ -360,9 +350,6 @@ get_gcc_src_uri() {
else

GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
fi
-   # we want all branch updates to be against the main release
-   [[ -n ${BRANCH_UPDATE} ]] && \
-   GCC_SRC_URI+=" $(gentoo_urls 
gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
fi
 
[[ -n ${UCLIBC_VER} ]] && \
@@ -472,12 +459,6 @@ gcc_quick_unpack() {
else
unpack gcc-${GCC_RELEASE_VER}.tar.bz2
fi
-   # We want branch updates to be against a release tarball
-   if [[ -n ${BRANCH_UPDATE} ]] ; then
-   pushd "${S}" > /dev/null
-   epatch 
"${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
-   popd > /dev/null
-   fi
fi
 
if [[ -n ${D_VER} ]] && use d ; then
@@ -826,7 +807,6 @@ gcc_version_patch() {
tc_version_is_at_least 4.3 && return 0
 
local version_string=${GCC_CONFIG_VER}
-   [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}"
 
einfo "patching gcc version: ${version_string} 
(${BRANDING_GCC_PKGVERSION})"
 
@@ -2290,10 +2270,6 @@ toolchain_pkg_postrm() {
if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
fix_libtool_files.sh ${GCC_RELEASE_VER}
-   if [[ -n ${BRANCH_UPDATE} ]] ; then
-   einfo "Running 'fix_libtool_files.sh 
${GCC_RELEASE_VER}-${BRANCH_UPDATE}'"
-   fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
-   fi
fi
 
return 0



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-18 Thread David Seifert
commit: a3b5170218b0b26bb4ec8ce83dfa926dde23ab98
Author: David Seifert  gentoo  org>
AuthorDate: Fri Oct 18 12:25:45 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Oct 18 12:25:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b51702

myspell.eclass: Last rite

Signed-off-by: David Seifert  gentoo.org>

 eclass/myspell.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/myspell.eclass b/eclass/myspell.eclass
index 52838421299..af639b00e06 100644
--- a/eclass/myspell.eclass
+++ b/eclass/myspell.eclass
@@ -5,6 +5,9 @@
 # Packages: app-dicts/myspell-*
 # Maintainer: maintainer-nee...@gentoo.org
 
+# @DEAD
+# Replaced by myspell-r2.eclass. Removal in 14 days.
+
 inherit multilib
 
 EXPORT_FUNCTIONS src_install pkg_preinst pkg_postinst



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas K. Hüttel
commit: 4dc13c8786ecf1dd8d14efeb20f19ce21e1f489e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Oct 17 03:43:31 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Oct 17 03:43:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc13c87

perl-module.eclass: fix eclassdoc warnings, bug 637838

Closes: https://bugs.gentoo.org/637838
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 eclass/perl-module.eclass | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index e1fb97df326..7a839bc7288 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -134,25 +134,29 @@ esac
 LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}"
 
 # @ECLASS-VARIABLE: DIST_NAME
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) This variable provides a way to override PN for the 
calculation of S,
-# SRC_URI, and HOMEPAGE. Defaults to PN.
+# SRC_URI, and HOMEPAGE. If unset, defaults to PN.
 
 # @ECLASS-VARIABLE: DIST_VERSION
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) This variable provides a way to override PV for the 
calculation of S and SRC_URI.
-# Use it to provide the non-normalized, upstream version number. Defaults to 
PV.
+# Use it to provide the non-normalized, upstream version number. If unset, 
defaults to PV.
 # Named MODULE_VERSION in EAPI=5.
 
 # @ECLASS-VARIABLE: DIST_A_EXT
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) This variable provides a way to override the distfile 
extension for the calculation of
-# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5.
+# SRC_URI. If unset, defaults to tar.gz. Named MODULE_A_EXT in EAPI=5.
 
 # @ECLASS-VARIABLE: DIST_A
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) This variable provides a way to override the distfile 
name for the calculation of
-# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named 
MODULE_A in EAPI=5.
+# SRC_URI. If unset, defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} 
Named MODULE_A in EAPI=5.
 
 # @ECLASS-VARIABLE: DIST_AUTHOR
 # @DEFAULT_UNSET
@@ -340,9 +344,10 @@ perl-module_src_compile() {
 }
 
 # @ECLASS-VARIABLE: DIST_TEST
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # (EAPI=6 and later) Variable that controls if tests are run in the test phase
-# at all, and if yes under which conditions. Defaults to "do parallel"
+# at all, and if yes under which conditions. If unset, defaults to "do 
parallel"
 # If neither "do" nor "parallel" is recognized, tests are skipped.
 # (In EAPI=5 the variable is called SRC_TEST, defaults to "skip", and
 # recognizes fewer options.)



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: f88ba4c6d062917ce5459ca8bd57d6722f32303b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 16 09:10:10 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 09:23:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88ba4c6

kde5-functions.eclass: KDE Plasma 5.17.0 depends on KF-5.63.0 minimum

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1ce5a044613..652ed06b7be 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,6 +37,7 @@ case ${CATEGORY} in
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
;;
kde-plasma)
+   [[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0}
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
;;
 esac



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 7904250a8c8de4afbbe147a769dcf55d55065d30
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 16 09:08:44 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 09:23:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7904250a

kde5-functions.eclass: Drop obsolete KDE Plasma 5.15.5 min deps

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 4 
 1 file changed, 4 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 1e3685d6739..1ce5a044613 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -37,10 +37,6 @@ case ${CATEGORY} in
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
;;
kde-plasma)
-   if [[ ${PV} = 5.15.5 ]]; then
-   : ${FRAMEWORKS_MINIMAL:=5.57.0}
-   : ${QT_MINIMAL:=5.11.1}
-   fi
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=}
;;
 esac



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 6e81cf122526cf466ae853c041c8bc00e4d651d3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 14 14:47:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 09:23:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e81cf12

kde5.eclass: Drop EAPI-6 support

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5.eclass | 27 ---
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index db9fc4427c7..e446e02592b 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
 # k...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Support eclass for packages that follow KDE packaging conventions.
 # @DESCRIPTION:
 # This eclass is intended to streamline the creation of ebuilds for packages
@@ -34,10 +34,6 @@ _KDE5_ECLASS=1
 
 inherit cmake-utils flag-o-matic kde5-functions virtualx xdg
 
-case ${EAPI} in
-   6) inherit eapi7-ver eutils gnome2-utils ;;
-esac
-
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
inherit git-r3
 fi
@@ -257,10 +253,6 @@ case ${KDE_SELINUX_MODULE} in
;;
 esac
 
-case ${EAPI} in
-   6) DEPEND+=" ${BDEPEND}" ;;
-esac
-
 DEPEND+=" ${COMMONDEPEND}"
 RDEPEND+=" ${COMMONDEPEND}"
 unset COMMONDEPEND
@@ -619,9 +611,9 @@ kde5_src_configure() {
cmakeargs+=(
# install mkspecs in the same directory as qt stuff
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+   # move handbook outside of doc dir, bug 667138
+   -DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help"
)
-   # move handbook outside of doc dir for at least two QA 
warnings, bug 667138
-   [[ ${EAPI} != 6 ]] && cmakeargs+=( 
-DKDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help" )
fi
 
# allow the ebuild to override what we set here
@@ -674,22 +666,11 @@ kde5_src_test() {
 
 # @FUNCTION: kde5_src_install
 # @DESCRIPTION:
-# Wrapper for cmake-utils_src_install with extra logic to avoid compressing
-# certain types of files. For example, khelpcenter is not able to read
-# compressed handbooks.
+# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra.
 kde5_src_install() {
debug-print-function ${FUNCNAME} "$@"
 
cmake-utils_src_install
-
-   if [[ ${EAPI} = 6 ]]; then
-   # We don't want /usr/share/doc/HTML to be compressed,
-   # because then khelpcenter can't find the docs
-   #todo: clean up trailing slash check when EAPI <7 is removed
-   if [[ -d ${ED%/}/usr/share/doc/HTML ]]; then
-   docompress -x /usr/share/doc/HTML
-   fi
-   fi
 }
 
 # @FUNCTION: kde5_pkg_preinst



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 9b08a69cc380a1a11ae077e1b909dbf7f4779192
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 14 14:48:48 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 09:23:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b08a69c

kde5-functions.eclass: Drop EAPI-6 support

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5-functions.eclass | 48 +---
 1 file changed, 1 insertion(+), 47 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 377f741cb28..1e3685d6739 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # k...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms
@@ -19,7 +19,6 @@ inherit toolchain-funcs
 
 case ${EAPI} in
7) ;;
-   6) inherit eapi7-ver ;;
*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
@@ -252,10 +251,6 @@ add_qt_dep() {
 
if [[ -z ${version} ]]; then
version=${QT_MINIMAL}
-   if [[ ${1} = qtwebkit ]]; then
-   version=5.9.1
-   [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed 
for 'qtwebkit' in EAPI 7 and later"
-   fi
fi
if [[ -z ${slot} ]]; then
slot="5"
@@ -264,47 +259,6 @@ add_qt_dep() {
_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
-# @FUNCTION: get_kde_version [version]
-# @DESCRIPTION:
-# Translates an ebuild version into a major.minor KDE release version, taking
-# into account KDE's prerelease versioning scheme.
-# For example, get_kde_version 17.07.80 will return "17.08".
-# If the version equals , "live" is returned.
-# If no version is specified, ${PV} is used.
-get_kde_version() {
-   [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
-   local ver=${1:-${PV}}
-   local major=$(ver_cut 1 ${ver})
-   local minor=$(ver_cut 2 ${ver})
-   local micro=$(ver_cut 3 ${ver})
-   if [[ ${ver} ==  ]]; then
-   echo live
-   else
-   (( micro < 50 )) && echo ${major}.${minor} || echo 
${major}.$((minor + 1))
-   fi
-}
-
-# @FUNCTION: kde_l10n2lingua
-# @USAGE: ...
-# @INTERNAL
-# @DESCRIPTION:
-# Output KDE lingua flag name(s) (without prefix(es)) appropriate for
-# given l10n(s).
-kde_l10n2lingua() {
-   [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later"
-   local l
-   for l; do
-   case ${l} in
-   ca-valencia) echo ca@valencia;;
-   sr-ijekavsk) echo sr@ijekavian;;
-   sr-Latn-ijekavsk) echo sr@ijekavianlatin;;
-   sr-Latn) echo sr@latin;;
-   uz-Cyrl) echo uz@cyrillic;;
-   *) echo "${l/-/_}";;
-   esac
-   done
-}
-
 # @FUNCTION: punt_bogus_dep
 # @USAGE:  
 # @DESCRIPTION:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 7b014fad815b9e0dd27c01bcae3895eddc5f08f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 14 17:04:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 09:23:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b014fad

kde5.eclass: Simplify KDE_DESIGNERPLUGIN BDEPENDs

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/kde5.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index e446e02592b..ee1d3b35aa8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -203,10 +203,10 @@ case ${KDE_DESIGNERPLUGIN} in
false)  ;;
*)
IUSE+=" designer"
-   if [[ ${CATEGORY} = kde-frameworks ]]; then
-   BDEPEND+=" designer? ( $(add_qt_dep designer) )"
-   else
+   if [[ ${CATEGORY} = kde-apps && ${PV} = 19.0[48]* ]]; then
BDEPEND+=" designer? ( $(add_frameworks_dep 
kdesignerplugin) )"
+   else
+   BDEPEND+=" designer? ( $(add_qt_dep designer) )"
fi
 esac
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 3a6d02f463136bcb222738bc096115cdb121a53c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  7 06:26:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 08:44:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6d02f4

font.eclass: Port to EAPI-7

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/font.eclass | 75 +++---
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/eclass/font.eclass b/eclass/font.eclass
index 1570bf3f6e1..18dcb3f14b4 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -4,16 +4,15 @@
 # @ECLASS: font.eclass
 # @MAINTAINER:
 # fo...@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
 # @BLURB: Eclass to make font installation uniform
 
 case ${EAPI:-0} in
-   0|1|2|3|4|5|6) ;;
-   *) die "EAPI ${EAPI} is not supported by font.eclass." ;;
+   0|1|2|3|4|5|6) inherit eutils ;;
+   7) ;;
+   *) die "EAPI ${EAPI} is not supported by font.eclass." ;;
 esac
 
-inherit eutils
-
 EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
 
 # @ECLASS-VARIABLE: FONT_SUFFIX
@@ -67,15 +66,15 @@ fi
 # Generate Xorg font files (mkfontscale/mkfontdir).
 font_xfont_config() {
local dir_name
-   if has X ${IUSE//+} && use X ; then
+   if in_iuse X && use X ; then
dir_name="${1:-${FONT_PN}}"
ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}"
-   rm -f 
"${ED}${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir}
-   mkfontscale "${ED}${FONTDIR}/${1//${S}/}"
+   rm -f 
"${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir}
+   mkfontscale "${ED%/}/${FONTDIR}/${1//${S}/}"
mkfontdir \
-e ${EPREFIX}/usr/share/fonts/encodings \
-e ${EPREFIX}/usr/share/fonts/encodings/large \
-   "${ED}${FONTDIR}/${1//${S}/}"
+   "${ED%/}/${FONTDIR}/${1//${S}/}"
eend $?
if [[ -e fonts.alias ]] ; then
doins fonts.alias
@@ -105,7 +104,7 @@ font_cleanup_dirs() {
local d f g generated candidate otherfile
 
ebegin "Cleaning up font directories"
-   find -L "${EROOT}"usr/share/fonts/ -type d -print0 | while read -d 
$'\0' d; do
+   find -L "${EROOT%/}"/usr/share/fonts/ -type d -print0 | while read -d 
$'\0' d; do
candidate=false
otherfile=false
for f in "${d}"/*; do
@@ -162,7 +161,7 @@ font_pkg_setup() {
 
# make sure we get no collisions
# setup is not the nicest place, but preinst doesn't cut it
-   [[ -e "${EROOT}/${FONTDIR}/fonts.cache-1" ]] && rm -f 
"${EROOT}/${FONTDIR}/fonts.cache-1"
+   [[ -e "${EROOT%/}/${FONTDIR}/fonts.cache-1" ]] && rm -f 
"${EROOT%/}/${FONTDIR}/fonts.cache-1"
 }
 
 # @FUNCTION: font_src_install
@@ -204,36 +203,47 @@ font_src_install() {
done
 }
 
+# @FUNCTION: _update_fontcache
+# @DESCRIPTION:
+# Updates fontcache if !prefix and media-libs/fontconfig installed
+_update_fontcache() {
+   # unreadable font files = fontconfig segfaults
+   find "${EROOT%/}"/usr/share/fonts/ -type f '!' -perm 0644 \
+   -exec chmod -v 0644 2>/dev/null {} + || die "failed to fix font 
files perms"
+
+   if [[ -z ${ROOT%/} ]] ; then
+   if has_version media-libs/fontconfig ; then
+   ebegin "Updating global fontcache"
+   fc-cache -fs
+   if ! eend $? ; then
+   die "failed to update global fontcache"
+   fi
+   else
+   einfo "Skipping fontcache update (media-libs/fontconfig 
not installed)"
+   fi
+   else
+   einfo "Skipping fontcache update (ROOT != /)"
+   fi
+}
+
 # @FUNCTION: font_pkg_postinst
 # @DESCRIPTION:
 # The font pkg_postinst function.
 font_pkg_postinst() {
-   # unreadable font files = fontconfig segfaults
-   find "${EROOT}"usr/share/fonts/ -type f '!' -perm 0644 -print0 \
-   | xargs -0 chmod -v 0644 2>/dev/null
-
if [[ -n ${FONT_CONF[@]} ]]; then
local conffile
-   echo
elog "The following fontconfig configuration files have been 
installed:"
elog
for conffile in "${FONT_CONF[@]}"; do
-   if [[ -e ${EROOT}etc/fonts/conf.avail/$(basename 
${conffile}) ]]; then
-   elog "  $(basename ${conffile})"
+   if [[ -e 
"${EROOT%/}"/etc/fonts/conf.avail/${conffile##*/} ]]; then
+   elog "  ${conffile##*/}"
fi
done
elog
elog "Use 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: f943229b458f44a2d3e0733f3fd89c8ee59af160
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  7 06:28:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 08:44:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f943229b

font.eclass: Move while to primary shell

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/font.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/font.eclass b/eclass/font.eclass
index f77f62291df..70162100284 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -106,7 +106,7 @@ font_cleanup_dirs() {
local d f g generated candidate otherfile
 
ebegin "Cleaning up font directories"
-   find -L "${EROOT%/}"/usr/share/fonts/ -type d -print0 | while read -d 
$'\0' d; do
+   while read -d $'\0' -r; do
candidate=false
otherfile=false
for f in "${d}"/*; do
@@ -141,7 +141,7 @@ font_cleanup_dirs() {
# if there's nothing left remove the directory
find "${d}" -maxdepth 0 -type d -empty -delete || 
eerror "failed to purge ${d}"
fi
-   done
+   done < <(find -L "${EROOT%/}"/usr/share/fonts/ -type d -print0)
eend 0
 }
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 9b36399e1d4f4382a2de18d611b31612001a6c3f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct 15 21:02:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 08:44:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b36399e

font.eclass: font_cleanup_dirs: Use `has` instead of `for`

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/font.eclass | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/eclass/font.eclass b/eclass/font.eclass
index 70162100284..76c20549ea6 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -113,13 +113,11 @@ font_cleanup_dirs() {
generated=false
# make sure this is a file and not a subdir
[[ -e ${f} || -L ${f} ]] || continue
-   for g in ${genfiles}; do
-   if [[ ${f##*/} == ${g} ]]; then
-   # this is a generated file
-   generated=true
-   break
-   fi
-   done
+   if has ${f##*/} ${genfiles}; then
+   # this is a generated file
+   generated=true
+   break
+   fi
# if the file is a generated file then we know this is 
a font dir (as
# opposed to something like encodings or util) and a 
candidate for
# removal.  if it's not generated then it's an 
"otherfile".



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-16 Thread Andreas Sturmlechner
commit: 678696c203795311ce8756b04a2c1cbfefab49d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct  7 06:27:31 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 16 08:44:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678696c2

font.eclass: Add error handling where applicable

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 eclass/font.eclass | 35 ---
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/eclass/font.eclass b/eclass/font.eclass
index 18dcb3f14b4..f77f62291df 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -68,16 +68,16 @@ font_xfont_config() {
local dir_name
if in_iuse X && use X ; then
dir_name="${1:-${FONT_PN}}"
-   ebegin "Creating fonts.scale & fonts.dir in ${dir_name##*/}"
-   rm -f 
"${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir}
-   mkfontscale "${ED%/}/${FONTDIR}/${1//${S}/}"
+   rm -f 
"${ED%/}/${FONTDIR}/${1//${S}/}"/{fonts.{dir,scale},encodings.dir} \
+   || die "failed to prepare ${FONTDIR}/${1//${S}/}"
+   einfo "Creating fonts.scale & fonts.dir in ${dir_name##*/}"
+   mkfontscale "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed 
to create fonts.scale"
mkfontdir \
-e ${EPREFIX}/usr/share/fonts/encodings \
-e ${EPREFIX}/usr/share/fonts/encodings/large \
-   "${ED%/}/${FONTDIR}/${1//${S}/}"
-   eend $?
-   if [[ -e fonts.alias ]] ; then
-   doins fonts.alias
+   "${ED%/}/${FONTDIR}/${1//${S}/}" || eerror "failed to 
create fonts.dir"
+   if [[ -e fonts.alias ]]; then
+   doins fonts.alias || die "failed to install 
fonts.alias" # TODO old EAPI cleanup
fi
fi
 }
@@ -90,7 +90,9 @@ font_fontconfig() {
if [[ -n ${FONT_CONF[@]} ]]; then
insinto /etc/fonts/conf.avail/
for conffile in "${FONT_CONF[@]}"; do
-   [[ -e  ${conffile} ]] && doins ${conffile}
+   if [[ -e  ${conffile} ]]; then
+   doins ${conffile} || die "failed to install 
conf file" # TODO old EAPI cleanup
+   fi
done
fi
 }
@@ -132,11 +134,12 @@ font_cleanup_dirs() {
# media-fonts/font-alias. any other fonts.alias files 
will have
# already been unmerged with their packages.
for g in ${genfiles}; do
-   [[ ${g} != fonts.alias && ( -e ${d}/${g} || -L 
${d}/${g} ) ]] \
-   && rm "${d}"/${g}
+   if [[ ${g} != fonts.alias && ( -e ${d}/${g} || 
-L ${d}/${g} ) ]] ; then
+   rm "${d}"/${g} || eerror "failed to 
remove ${d}/${g}"
+   fi
done
# if there's nothing left remove the directory
-   find "${d}" -maxdepth 0 -type d -empty -exec rmdir '{}' 
\;
+   find "${d}" -maxdepth 0 -type d -empty -delete || 
eerror "failed to purge ${d}"
fi
done
eend 0
@@ -161,7 +164,9 @@ font_pkg_setup() {
 
# make sure we get no collisions
# setup is not the nicest place, but preinst doesn't cut it
-   [[ -e "${EROOT%/}/${FONTDIR}/fonts.cache-1" ]] && rm -f 
"${EROOT%/}/${FONTDIR}/fonts.cache-1"
+   if [[ -e "${EROOT%/}/${FONTDIR}/fonts.cache-1" ]] ; then
+   rm "${EROOT%/}/${FONTDIR}/fonts.cache-1" || die "failed to 
remove fonts.cache-1"
+   fi
 }
 
 # @FUNCTION: font_src_install
@@ -178,7 +183,7 @@ font_src_install() {
pushd "${dir}" > /dev/null
insinto "${FONTDIR}/${dir//${S}/}"
for suffix in ${FONT_SUFFIX}; do
-   doins *.${suffix}
+   doins *.${suffix} || die "font installation 
failed" # TODO old EAPI cleanup
done
font_xfont_config "${dir}"
popd > /dev/null
@@ -187,7 +192,7 @@ font_src_install() {
pushd "${FONT_S}" > /dev/null
insinto "${FONTDIR}"
for suffix in ${FONT_SUFFIX}; do
-   doins *.${suffix}
+   doins *.${suffix} || die "font installation failed" # 
TODO old EAPI cleanup
done
font_xfont_config
popd > /dev/null
@@ -195,7 +200,7 @@ font_src_install() {
 
font_fontconfig
 
-   [[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ; 
}
+   [[ -n ${DOCS} ]] && { dodoc 

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-12 Thread Sergei Trofimovich
commit: d7bc808a406129ec4f59a2a8f02d37bc087cf0d4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 12 19:46:49 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 12 20:03:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7bc808a

toolchain-glibc.eclass: allow glibc dongrade on I_ALLOW_TO_BREAK_MY_SYSTEM

Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain-glibc.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 4aa06db5529..30781fed777 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -516,7 +516,7 @@ toolchain-glibc_pkg_pretend() {
if has_version ">${CATEGORY}/${P}-r1" ; then
eerror "Sanity check to keep you from breaking your 
system:"
eerror " Downgrading glibc is not supported and a sure 
way to destruction"
-   die "aborting to save your system"
+   [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die 
"Aborting to save your system."
fi
 
if ! glibc_run_test '#include \nint main(){return 
getpwuid(0)==0;}\n'



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-12 Thread Mike Pagano
commit: 1787aa2ba1834192c3be90863bfacd348ae888d7
Author: Mike Pagano  gentoo  org>
AuthorDate: Sat Oct 12 19:02:21 2019 +
Commit: Mike Pagano  gentoo  org>
CommitDate: Sat Oct 12 19:04:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1787aa2b

kernel-2.eclass: Move genpatches uri from /space/distfiles-local to devspace

Co-authored-by: Thomas Deutschmann  gentoo.org>

Signed-off-by: Mike Pagano  gentoo.org>

 eclass/kernel-2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index c5f35cd3e31..62e6c23e15c 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -295,7 +295,7 @@ handle_genpatches() {
UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
debug-print "genpatches tarball: $tarball"
fi
-   GENPATCHES_URI+=" 
${use_cond_start}mirror://gentoo/${tarball}${use_cond_end}"
+   GENPATCHES_URI+=" ${use_cond_start}$(echo 
https://dev.gentoo.org/~{mpagano,whissi}/dist/genpatches/${tarball})${use_cond_end}"
done
 }
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-12 Thread Michał Górny
commit: 65f7d700ed33f3cd560642f59a6956e908984bf1
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Oct 12 12:08:53 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct 12 12:12:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f7d700

bsdmk.eclass: Drop to maintainer-needed

Signed-off-by: Michał Górny  gentoo.org>

 eclass/bsdmk.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/bsdmk.eclass b/eclass/bsdmk.eclass
index 4286a36b745..ab91b0e4a97 100644
--- a/eclass/bsdmk.eclass
+++ b/eclass/bsdmk.eclass
@@ -3,7 +3,7 @@
 
 # @ECLASS: bsdmk.eclass
 # @MAINTAINER:
-# b...@gentoo.org
+# maintainer-nee...@gentoo.org
 # @BLURB: Some functions for BSDmake
 
 inherit toolchain-funcs portability flag-o-matic



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-11 Thread Michał Górny
commit: ff2610c61b3779f5dbe48b269014aba0905f
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:52:43 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:52:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2610c6

freebsd.eclass: Last rite

Signed-off-by: Michał Górny  gentoo.org>

 eclass/freebsd.eclass | 5 +
 1 file changed, 5 insertions(+)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 420312b5083..baebf439159 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -1,5 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
+# @DEAD
+# FreeBSD project is dead, and all consumers are gone.
+# Bug #683284.  Removal in 14 days.
+
 #
 # @MAINTAINER:
 # maintainer-nee...@gentoo.org



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-11 Thread Michał Górny
commit: 658d8a6c16ebec28275add0f1833c05a8b0e9a9c
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 11 15:29:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 11 15:29:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658d8a6c

acct-*.eclass: Remove *-fbsd keywords

Signed-off-by: Michał Górny  gentoo.org>

 eclass/acct-group.eclass | 2 +-
 eclass/acct-user.eclass  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index 99919789b2c..0b943454a92 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -75,7 +75,7 @@ readonly ACCT_GROUP_NAME
 # << Boilerplate ebuild variables >>
 : ${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"}
 : ${SLOT:=0}
-: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 
sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris}
+: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 
sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}
 S=${WORKDIR}
 
 

diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index c2e643332cc..be6b3dd3e60 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -115,7 +115,7 @@ readonly ACCT_USER_NAME
 # << Boilerplate ebuild variables >>
 : ${DESCRIPTION:="System user: ${ACCT_USER_NAME}"}
 : ${SLOT:=0}
-: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 
sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris}
+: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 
sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}
 S=${WORKDIR}
 
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-11 Thread Joonas Niilola
commit: db98bb5730e3efc1d315155fe8d461f3ed3cab09
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 10 13:11:02 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 11 14:16:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db98bb57

qmail eclass: drop now unused reference to user eclass

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index b4be80efbb2..b6ef483aa82 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -6,7 +6,7 @@
 # qmail-b...@gentoo.org
 # @BLURB: common qmail functions
 
-inherit flag-o-matic toolchain-funcs fixheadtails user
+inherit flag-o-matic toolchain-funcs fixheadtails
 
 # hardcoded paths
 QMAIL_HOME="/var/qmail"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-05 Thread Michał Górny
commit: 405d19628f2508a61c3606109429b87e7b41ce39
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 06:50:15 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  5 18:55:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=405d1962

toolchain-binutils.eclass: Inline mirror://kernel

Signed-off-by: Michał Górny  gentoo.org>

 eclass/toolchain-binutils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index d15afb8531e..0b691d82276 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -57,7 +57,7 @@ case ${BTYPE} in

SRC_URI="ftp://gcc.gnu.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2

ftp://sourceware.org/pub/binutils/snapshots/binutils-${BVER}.tar.bz2; ;;
hjlu)
-   
SRC_URI="mirror://kernel/linux/devel/binutils/binutils-${BVER}.tar."
+   
SRC_URI="https://www.kernel.org/pub/linux/devel/binutils/binutils-${BVER}.tar.;
version_is_at_least 2.21.51.0.5 && SRC_URI+="xz" || 
SRC_URI+="bz2" ;;
rel) SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.bz2" ;;
 esac



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-05 Thread Michał Górny
commit: 94148840cac04ad2f65cac2d58032e37aa9e4cac
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 06:50:05 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  5 18:55:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94148840

kernel-2.eclass: Inline mirror://kernel

Signed-off-by: Michał Górny  gentoo.org>

 eclass/kernel-2.eclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 784b3929d43..c5f35cd3e31 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -371,17 +371,17 @@ detect_version() {
 
# at this point 031412, Linus is putting all 3.x kernels in a
# 3.x directory, may need to revisit when 4.x is released
-   KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
+   
KERNEL_BASE_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.x;
 
[[ -n "${K_LONGTERM}" ]] &&

KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
else
-   #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
-   
#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+   
#KERNEL_BASE_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.0;
+   
#KERNEL_BASE_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR};
if [[ ${KV_MAJOR} -ge 3 ]]; then
-   
KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
+   
KERNEL_BASE_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.x;
else
-   
KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+   
KERNEL_BASE_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR};
fi
 
[[ -n "${K_LONGTERM}" ]] &&



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-05 Thread Michał Górny
commit: 68ddfc10a19328a72693649debacae674f27d161
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 09:53:13 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Oct  5 06:54:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ddfc10

ruby-fakegem.eclass: Inline mirror://rubygems

Signed-off-by: Michał Górny  gentoo.org>

 eclass/ruby-fakegem.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index f75e1669b0c..e600b02b964 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -176,7 +176,7 @@ case ${RUBY_FAKEGEM_RECIPE_TEST} in
;;
 esac
 
-SRC_URI="mirror://rubygems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${RUBY_FAKEGEM_SUFFIX:+-${RUBY_FAKEGEM_SUFFIX}}.gem"
+SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${RUBY_FAKEGEM_SUFFIX:+-${RUBY_FAKEGEM_SUFFIX}}.gem;
 
 ruby_add_bdepend virtual/rubygems
 ruby_add_rdepend virtual/rubygems



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-02 Thread William Hubbs
commit: 1c763dc038d371b30099f8bf2067756a5ce8e537
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Oct  2 18:20:09 2019 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  2 18:20:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c763dc0

go-module.eclass: only show warning for new packages

Signed-off-by: William Hubbs  gentoo.org>

 eclass/go-module.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
index e6152966911..9c11959fdf8 100644
--- a/eclass/go-module.eclass
+++ b/eclass/go-module.eclass
@@ -165,6 +165,7 @@ go-module_live_vendor() {
 # Display a warning about security updates for Go programs.
 go-module_pkg_postinst() {
debug-print-function ${FUNCNAME} "$@"
+   [[ -n ${REPLACING_VERSIONS} ]] && return 0
ewarn "${PN} is written in the Go programming language."
ewarn "Since this language is statically linked, security"
ewarn "updates will be handled in individual packages and will be"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-01 Thread Joonas Niilola
commit: 6d96b6370d602b1465d8beecaf0ae11fbb14dbe2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct  1 14:50:58 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct  1 16:10:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d96b637

qmail.eclass: do not install SYSDEPS

This is the list of platform specific headers, and only used in an instruction
to report success to the author. Since the headers are not installed this list
can go away, too.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 2030004380c..b4be80efbb2 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -206,7 +206,7 @@ qmail_man_install() {
into /usr
doman *.[1578]
dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \
-   SENDMAIL* SYSDEPS TEST* THANKS* THOUGHTS UPGRADE VERSION*
+   SENDMAIL* TEST* THANKS* THOUGHTS UPGRADE VERSION*
 
declare -F qmail_man_install_hook >/dev/null && \
qmail_man_install_hook



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-01 Thread Jason Zaman
commit: ca6797c76af979e8e863494ae00546ed820c25e7
Author: Jason Zaman  gentoo  org>
AuthorDate: Tue Oct  1 14:29:15 2019 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Tue Oct  1 14:51:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6797c7

bazel.eclass: fix info message order

The src and dst were swapped.

Signed-off-by: Jason Zaman  gentoo.org>

 eclass/bazel.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index 4eacb75776e..7c5f92977ba 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -193,7 +193,7 @@ bazel_load_distfiles() {
elif [[ ${rename} -eq 1 ]]; then
# Make sure the distfile is used
if [[ "${A}" == *"${word}"* ]]; then
-   echo "Copying ${file} to bazel distdir as 
${word}"
+   echo "Copying ${word} to bazel distdir as 
${file}"
ln -s "${DISTDIR}/${word}" 
"${T}/bazel-distdir/${file}" || die
fi
rename=0



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-10-01 Thread Joonas Niilola
commit: 625f3a5b3e894871b3387622dfbd3b30111c4b2a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Sep 28 11:27:44 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct  1 06:13:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625f3a5b

qmail.eclass: update documentation to install

-TODO are development notes, and are e.g. removed in notqmail entirely
-the SENDMAIL file has been renamed to SENDMAIL.md in notqmail

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13074
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 158cf1607cf..2030004380c 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -206,8 +206,7 @@ qmail_man_install() {
into /usr
doman *.[1578]
dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \
-   SENDMAIL SYSDEPS TEST* THANKS* THOUGHTS TODO* \
-   UPGRADE VERSION*
+   SENDMAIL* SYSDEPS TEST* THANKS* THOUGHTS UPGRADE VERSION*
 
declare -F qmail_man_install_hook >/dev/null && \
qmail_man_install_hook



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-30 Thread William Hubbs
commit: d6385200b27bc5fcce3826fc31aecc51bcb1e19c
Author: William Hubbs  gentoo  org>
AuthorDate: Mon Sep 30 22:17:26 2019 +
Commit: William Hubbs  gentoo  org>
CommitDate: Mon Sep 30 22:19:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6385200

go-module.eclass: new eclass for go modules

This eclass includes the basic settings and src_unpack/pkg_postinst
functions for software written in the Go programming language that uses
Go modules.

Signed-off-by: William Hubbs  gentoo.org>

 eclass/go-module.eclass | 177 
 1 file changed, 177 insertions(+)

diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
new file mode 100644
index 000..e6152966911
--- /dev/null
+++ b/eclass/go-module.eclass
@@ -0,0 +1,177 @@
+# Copyright 2019 Gentoo authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: go-module.eclass
+# @MAINTAINER:
+# William Hubbs 
+# @SUPPORTED_EAPIS: 7
+# @BLURB: basic eclass for building software written as go modules
+# @DESCRIPTION:
+# This eclass provides basic settings and functions
+# needed by all software written in the go programming language that uses
+# go modules.
+#
+# You will know the software you are packaging uses modules because
+# it will have files named go.sum and go.mod in its top-level source
+# directory. If it does not have these files, use the golang-* eclasses.
+#
+# If it has these files and a directory named vendor in its top-level
+# source directory, you only need to inherit the eclass since upstream
+# is vendoring the dependencies.
+#
+# If it does not have a vendor directory, you should use the EGO_VENDOR
+# variable and the go-module_vendor_uris function as shown in the
+# example below to handle dependencies.
+#
+# Since Go programs are statically linked, it is important that your ebuild's
+# LICENSE= setting includes the licenses of all statically linked
+# dependencies. So please make sure it is accurate.
+#
+# @EXAMPLE:
+#
+# @CODE
+#
+# inherit go-module
+#
+# EGO_VENDOR=(
+#  "github.com/xenolf/lego 6cac0ea7d8b28c889f709ec7fa92e92b82f490dd"
+# "golang.org/x/crypto 453249f01cfeb54c3d549ddb75ff152ca243f9d8 
github.com/golang/crypto"
+# )
+#
+# SRC_URI="https://github.com/example/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+# $(go-module_vendor_uris)"
+#
+# @CODE
+
+case ${EAPI:-0} in
+   7) ;;
+   *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
+esac
+
+if [[ -z ${_GO_MODULE} ]]; then
+
+_GO_MODULE=1
+
+BDEPEND=">=dev-lang/go-1.12"
+
+# Force go to build in module mode.
+# In this mode the GOPATH environment variable is ignored.
+# this will become the default in the future.
+export GO111MODULE=on
+
+# The following go flags should be used for all builds.
+# -mod=vendor stopps downloading of dependencies from the internet.
+# -v prints the names of packages as they are compiled
+# -x prints commands as they are executed
+export GOFLAGS="-mod=vendor -v -x"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+# Go packages should not be stripped with strip(1).
+RESTRICT="strip"
+
+EXPORT_FUNCTIONS src_unpack pkg_postinst
+
+# @ECLASS-VARIABLE: EGO_VENDOR
+# @DESCRIPTION:
+# This variable contains a list of vendored packages.
+# The items of this array are strings that contain the
+# import path and the git commit hash for a vendored package.
+# If the import path does not start with github.com, the third argument
+# can be used to point to a github repository.
+
+# @FUNCTION: go-module_vendor_uris
+# @DESCRIPTION:
+# Convert the information in EGO_VENDOR to a format suitable for
+# SRC_URI.
+# A call to this function should be added to SRC_URI in your ebuild if
+# the upstream package does not include vendored dependencies.
+go-module_vendor_uris() {
+   local hash import line repo x
+   for line in "${EGO_VENDOR[@]}"; do
+   read -r import hash repo x <<< "${line}"
+   if [[ -n $x ]]; then
+   eerror "Trailing information in EGO_VENDOR in 
${P}.ebuild"
+   eerror "${line}"
+   eerror "Trailing information is: \"$x\""
+   die "Invalid EGO_VENDOR format"
+   fi
+   : "${repo:=${import}}"
+   echo "https://${repo}/archive/${hash}.tar.gz -> 
${repo//\//-}-${hash}.tar.gz"
+   done
+}
+
+# @FUNCTION: go-module_src_unpack
+# @DESCRIPTION:
+# Extract all archives in ${a} which are not nentioned in ${EGO_VENDOR}
+# to their usual locations then extract all archives mentioned in
+# ${EGO_VENDOR} to ${S}/vendor.
+go-module_src_unpack() {
+   debug-print-function ${FUNCNAME} "$@"
+   local f hash import line repo tarball vendor_tarballs x
+   vendor_tarballs=()
+   for line in "${EGO_VENDOR[@]}"; do
+   read -r import hash repo x <<< "${line}"
+   if [[ -n $x ]]; then
+

[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-30 Thread Sergei Trofimovich
commit: 60328373651331a8d1beab33f4a499e0b3ad61d7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep 30 08:52:04 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep 30 09:00:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60328373

flag-o-matic.eclass: fix test-flag-PROG() for CC="gcc -m64"

bug #695706 added compiler validation via 'type -p ${CC}', but that
does not take into account possible options present in ${CC} itself:

  $ type -P x86_64-pc-linux-gnu-gcc -m64; echo $?
  /usr/lib/ccache/bin/x86_64-pc-linux-gnu-gcc
  1

  $ type -P x86_64-pc-linux-gnu-gcc ; echo $?
  /usr/lib/ccache/bin/x86_64-pc-linux-gnu-gcc
  0

The change picks first argument (binary name) and validates only that.

Reported-by: Pavol Cupka
Closes: https://bugs.gentoo.org/695888
Bug: https://bugs.gentoo.org/show_bug.cgi?id=695706
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/flag-o-matic.eclass | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 89b259cc222..f882b09d621 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -436,11 +436,13 @@ test-flag-PROG() {
[[ -z ${comp} || -z $1 ]] && return 1
 
# verify selected compiler exists before using it
-   comp=$(tc-get${comp})
-   type -p ${comp} >/dev/null || return 1
+   comp=($(tc-get${comp}))
+   # 'comp' can already contain compiler options.
+   # 'type' needs a binary name
+   type -p ${comp[0]} >/dev/null || return 1
 
local cmdline=(
-   ${comp}
+   "${comp[@]}"
# Clang will warn about unknown gcc flags but exit 0.
# Need -Werror to force it to exit non-zero.
-Werror



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-27 Thread Miroslav Šulc
commit: 9b4dab751e60b6d9e85d683f4f344194e0cd70b7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 27 09:41:30 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 27 09:47:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4dab75

eclass/ant-tasks.eclass: added support for multiple deps

Signed-off-by: Miroslav Šulc  gentoo.org>

 eclass/ant-tasks.eclass | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 309df084d15..04c6fb5b7d6 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -54,7 +54,9 @@ ANT_TASK_NAME="${PN#ant-}"
 # @DESCRIPTION:
 # Specifies JAVA_PKG_NAME (PN{-SLOT} used with java-pkg_jar-from) of the 
package
 # that this one depends on. Defaults to the name of ant task, ebuild can
-# override it before inheriting this eclass.
+# override it before inheriting this eclass. In case there is more than one
+# dependency, the variable can be specified as bash array with multiple 
strings,
+# one for each dependency.
 ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
 
 # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
@@ -105,7 +107,7 @@ S="${WORKDIR}/${MY_P}"
 # base: performs the unpack, build.xml replacement and symlinks ant.jar from
 #  ant-core
 #
-# jar-dep: symlinks the jar file(s) from dependency package
+# jar-dep: symlinks the jar file(s) from dependency package(s)
 ant-tasks_src_unpack() {
[[ -z "${1}" ]] && ant-tasks_src_unpack all
 
@@ -129,9 +131,11 @@ ant-tasks_src_unpack() {
# ant.jar to build against
java-pkg_jar-from --build-only ant-core 
ant.jar;;
jar-dep)
-   # get jar from the dependency package
+   # get jar from the dependency package(s)
if [[ -n "${ANT_TASK_DEPNAME}" ]]; then
-   java-pkg_jar-from ${ANT_TASK_DEPNAME}
+   for depname in 
"${ANT_TASK_DEPNAME[@]}"; do
+   java-pkg_jar-from ${depname}
+   done
fi;;
all)
ant-tasks_src_unpack base jar-dep;;



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-27 Thread Tim Harder
commit: cab160d3c614472e20f145e65a2d7f72bdf615b7
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Sep 27 06:58:01 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Sep 27 09:10:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cab160d3

flag-o-matic.eclass: test-flag-PROG(): verify selected compiler exists

Before trying to use it. Fixes stricter phase running done by pkgcore
which explicitly dies when encountering unknown commands.

Closes: https://bugs.gentoo.org/695706

Signed-off-by: Tim Harder  gentoo.org>

 eclass/flag-o-matic.eclass | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 3b32bd9d631..89b259cc222 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -435,8 +435,12 @@ test-flag-PROG() {
 
[[ -z ${comp} || -z $1 ]] && return 1
 
+   # verify selected compiler exists before using it
+   comp=$(tc-get${comp})
+   type -p ${comp} >/dev/null || return 1
+
local cmdline=(
-   $(tc-get${comp})
+   ${comp}
# Clang will warn about unknown gcc flags but exit 0.
# Need -Werror to force it to exit non-zero.
-Werror



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-25 Thread Sergei Trofimovich
commit: cdb645361e3e3f20bb6f1250ada03e802285ffc3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 25 07:19:16 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 25 08:04:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb64536

toolchain-glibc.eclass: drop prepallstrip, bug #587296

This effectively reverts https://bugs.gentoo.org/46186.
Modern gdb can inspect threads without debugging symbols
in libpthread/libthread_db.

Reported-by: Michał Górny
Bug: https://bugs.gentoo.org/587296
Bug: https://bugs.gentoo.org/46186
Signed-off-by: Sergei Trofimovich  gentoo.org>

 eclass/toolchain-glibc.eclass | 18 --
 1 file changed, 18 deletions(-)

diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index 81d494c6fd5..4aa06db5529 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -1395,23 +1395,6 @@ toolchain-glibc_headers_install() {
dosym usr/include $(alt_prefix)/sys-include
 }
 
-src_strip() {
-   # gdb is lame and requires some debugging information to remain in
-   # libpthread, so we need to strip it by hand.  libthread_db makes no
-   # sense stripped as it is only used when debugging.
-   local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || 
echo "lib{pthread,thread_db}")
-   env \
-   -uRESTRICT \
-   CHOST=${CTARGET} \
-   STRIP_MASK="/*/{,tls/}${pthread}*" \
-   prepallstrip
-   # if user has stripping enabled and does not have split debug turned on,
-   # then leave the debugging sections in libpthread.
-   if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
-   ${STRIP:-${CTARGET}-strip} --strip-debug 
"${ED}"/*/libpthread-*.so
-   fi
-}
-
 toolchain-glibc_src_install() {
if just_headers ; then
export ABI=default
@@ -1420,7 +1403,6 @@ toolchain-glibc_src_install() {
fi
 
foreach_abi toolchain-glibc_do_src_install
-   src_strip
 }
 
 # Simple test to make sure our new glibc isn't completely broken.



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-23 Thread Michał Górny
commit: 3088353783305df24afc3a852eb43d871b6cf451
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 23 16:11:23 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 23 16:11:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30883537

games-mods.eclass: Actually add RESTRICT=bindist this time

Signed-off-by: Michał Górny  gentoo.org>

 eclass/games-mods.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass
index 9b3e3485738..bbc9423154d 100644
--- a/eclass/games-mods.eclass
+++ b/eclass/games-mods.eclass
@@ -133,7 +133,7 @@ DESCRIPTION="${GAME_NAME} ${MOD_NAME} - ${MOD_DESC}"
 
 SLOT="0"
 IUSE="dedicated opengl"
-RESTRICT="mirror strip"
+RESTRICT="bindist mirror strip"
 
 DEPEND="app-arch/unzip"
 RDEPEND="dedicated? ( $(games-mods_get_rdepend --ded) )



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-23 Thread Michał Górny
commit: 1aaf379f67adea16cfe051ca3902a798b7349e37
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 23 14:22:13 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 23 14:23:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aaf379f

games-mods.eclass: Add RESTRICT="bindist"

Signed-off-by: Michał Górny  gentoo.org>

 eclass/games-mods.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/games-mods.eclass b/eclass/games-mods.eclass
index f2e4a25841f..9b3e3485738 100644
--- a/eclass/games-mods.eclass
+++ b/eclass/games-mods.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Variables to specify in an ebuild which uses this eclass:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-23 Thread Joonas Niilola
commit: c5a32969519ae2907264995006e4d1d429d00cf2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Sep 23 12:34:10 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Sep 23 12:34:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a32969

font.eclass: add README.md to dodoc list

Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/font.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/font.eclass b/eclass/font.eclass
index 5f3e15eafc5..1570bf3f6e1 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -199,7 +199,7 @@ font_src_install() {
[[ -n ${DOCS} ]] && { dodoc ${DOCS} || die "docs installation failed" ; 
}
 
# install common docs
-   for commondoc in COPYRIGHT README{,.txt} NEWS AUTHORS BUGS ChangeLog 
FONTLOG.txt; do
+   for commondoc in COPYRIGHT README{,.md,.txt} NEWS AUTHORS BUGS 
ChangeLog FONTLOG.txt; do
[[ -s ${commondoc} ]] && dodoc ${commondoc}
done
 }



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-21 Thread Joonas Niilola
commit: 63425a92fdbb4d64901316665e50589142776a6c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Sep  9 19:36:52 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 21 14:49:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63425a92

eclass/qmail: drop qmail_create_users

All ebuilds that were calling this depend on acct-users now.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12898
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass | 14 --
 1 file changed, 14 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 429a0251353..158cf1607cf 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -105,20 +105,6 @@ qmail_set_cc() {
sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i 
make-makelib.sh
 }
 
-# @FUNCTION: qmail_create_users
-# @DESCRIPTION:
-# Keep qmail users in sync across ebuilds
-qmail_create_users() {
-   einfo "Creating qmail users"
-   enewuser alias 200 -1  "${QMAIL_HOME}"/alias 200
-   enewuser qmaild 201 -1 "${QMAIL_HOME}" 200
-   enewuser qmaill 202 -1 "${QMAIL_HOME}" 200
-   enewuser qmailp 203 -1 "${QMAIL_HOME}" 200
-   enewuser qmailq 204 -1 "${QMAIL_HOME}" 201
-   enewuser qmailr 205 -1 "${QMAIL_HOME}" 201
-   enewuser qmails 206 -1 "${QMAIL_HOME}" 201
-}
-
 genqmail_src_unpack() {
cd "${WORKDIR}"
[[ -n ${GENQMAIL_PV} ]] && unpack "${GENQMAIL_F}"



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-21 Thread Joonas Niilola
commit: 22d3664854eebe40015d56ef2475678329a9ec77
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Sep  8 19:40:09 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 21 14:49:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d36648

eclass/qmail: drop qmail_create_groups

All ebuilds that were calling this directly or indirectly depend on acct-group
now.

Closes: https://bugs.gentoo.org/533184
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 8dd3ae99043..429a0251353 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -105,21 +105,10 @@ qmail_set_cc() {
sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i 
make-makelib.sh
 }
 
-# @FUNCTION: qmail_create_groups
-# @DESCRIPTION:
-# Keep qmail groups in sync across ebuilds
-qmail_create_groups() {
-   einfo "Creating qmail groups"
-   enewgroup nofiles 200
-   enewgroup qmail 201
-}
-
 # @FUNCTION: qmail_create_users
 # @DESCRIPTION:
 # Keep qmail users in sync across ebuilds
 qmail_create_users() {
-   qmail_create_groups
-
einfo "Creating qmail users"
enewuser alias 200 -1  "${QMAIL_HOME}"/alias 200
enewuser qmaild 201 -1 "${QMAIL_HOME}" 200



[gentoo-commits] repo/gentoo:master commit in: eclass/, www-client/firefox/

2019-09-21 Thread Thomas Deutschmann
commit: 11dfd033459deeac330320ec5e52197769b53599
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep 21 13:00:15 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep 21 13:04:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11dfd033

www-client/firefox: allow LLVM 9.x

Signed-off-by: Thomas Deutschmann  gentoo.org>

 eclass/mozconfig-v6.60.eclass|  8 
 www-client/firefox/firefox-60.8.0.ebuild |  2 +-
 www-client/firefox/firefox-60.9.0.ebuild |  2 +-
 www-client/firefox/firefox-68.1.0.ebuild | 11 ++-
 www-client/firefox/firefox-69.0.1.ebuild | 11 ++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 2a6e0e07bb6..ae83ebd6c31 100644
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -159,6 +159,14 @@ DEPEND="app-arch/zip
>=sys-devel/binutils-2.30
sys-apps/findutils
|| (
+   (
+   sys-devel/clang:9
+   !clang? ( sys-devel/llvm:9 )
+   clang? (
+   =sys-devel/lld-9*
+   sys-devel/llvm:9[gold]
+   )
+   )
(
sys-devel/clang:8
!clang? ( sys-devel/llvm:8 )

diff --git a/www-client/firefox/firefox-60.8.0.ebuild 
b/www-client/firefox/firefox-60.8.0.ebuild
index 26d72d83b61..55b73e4e2b9 100644
--- a/www-client/firefox/firefox-60.8.0.ebuild
+++ b/www-client/firefox/firefox-60.8.0.ebuild
@@ -35,7 +35,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases;
 
 MOZCONFIG_OPTIONAL_WIFI=1
 
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2

diff --git a/www-client/firefox/firefox-60.9.0.ebuild 
b/www-client/firefox/firefox-60.9.0.ebuild
index 19831e39cc8..47b80028876 100644
--- a/www-client/firefox/firefox-60.9.0.ebuild
+++ b/www-client/firefox/firefox-60.9.0.ebuild
@@ -34,7 +34,7 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases;
 
 MOZCONFIG_OPTIONAL_WIFI=1
 
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2

diff --git a/www-client/firefox/firefox-68.1.0.ebuild 
b/www-client/firefox/firefox-68.1.0.ebuild
index d2ca2f5da56..4cf11539cb4 100644
--- a/www-client/firefox/firefox-68.1.0.ebuild
+++ b/www-client/firefox/firefox-68.1.0.ebuild
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> 
$P.tar.xz"
 fi
 
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
@@ -125,6 +125,15 @@ DEPEND="${CDEPEND}
>=sys-devel/binutils-2.30
sys-apps/findutils
|| (
+   (
+   sys-devel/clang:9
+   !clang? ( sys-devel/llvm:9 )
+   clang? (
+   =sys-devel/lld-9*
+   sys-devel/llvm:9[gold]
+   pgo? ( 
=sys-libs/compiler-rt-sanitizers-9*[profile] )
+   )
+   )
(
sys-devel/clang:8
!clang? ( sys-devel/llvm:8 )

diff --git a/www-client/firefox/firefox-69.0.1.ebuild 
b/www-client/firefox/firefox-69.0.1.ebuild
index 52dfab5d47d..1bdcc49ef7f 100644
--- a/www-client/firefox/firefox-69.0.1.ebuild
+++ b/www-client/firefox/firefox-69.0.1.ebuild
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> 
$P.tar.xz"
 fi
 
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=9
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
@@ -127,6 +127,15 @@ DEPEND="${CDEPEND}
>=sys-devel/binutils-2.30
sys-apps/findutils
|| (
+   (
+   sys-devel/clang:9
+   !clang? ( sys-devel/llvm:9 )
+   clang? (
+   =sys-devel/lld-9*
+   sys-devel/llvm:9[gold]
+   pgo? ( 
=sys-libs/compiler-rt-sanitizers-9*[profile] )
+   )
+   )
(
sys-devel/clang:8
!clang? ( sys-devel/llvm:8 )



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-20 Thread Brian Evans
commit: 807c50548fe64456d6b7373cb1091675faaa0501
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 20 13:01:49 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Sep 20 13:01:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807c5054

eclass: php-ext-source-r3 - Add support for building with PHP 7.4+

Signed-off-by: Brian Evans  gentoo.org>

 eclass/php-ext-source-r3.eclass | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 5ef879a2be2..385bdb9dae0 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -15,7 +15,8 @@ inherit autotools
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 
 case ${EAPI:-0} in
-   6|7) ;;
+   6) inherit eapi7-ver ;;
+   7) ;;
*)
die "${ECLASS} is not compatible with EAPI=${EAPI}"
 esac
@@ -183,10 +184,18 @@ php-ext-source-r3_phpize() {
# WANT_AUTOMAKE (see bugs #329071 and #549268).
autotools_run_tool "${PHPIZE}"
 
-   # Force libtoolize to run and regenerate autotools files (bug
-   # #220519).
-   rm aclocal.m4 || die "failed to remove aclocal.m4"
-   eautoreconf
+   # PHP >=7.4 no longer works with eautoreconf
+   if ver_test $PHP_CURRENTSLOT -ge 7.4 ; then
+   rm -fr aclocal.m4 autom4te.cache config.cache \
+   configure main/php_config.h.in || die
+   eautoconf --force
+   eautoheader
+   else
+   # Force libtoolize to run and regenerate autotools 
files (bug
+   # #220519).
+   rm aclocal.m4 || die "failed to remove aclocal.m4"
+   eautoreconf
+   fi
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-18 Thread Alfredo Tupone
commit: cea1a6b71819800630abacd686497056e8b25c56
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Wed Sep 18 07:07:58 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Wed Sep 18 07:08:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea1a6b7

ada.eclass: add export of GNATBIND GNATLS GNATMAKE

Signed-off-by: Alfredo Tupone  gentoo.org>

 eclass/ada.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 763ce92056e..dad3d9acce8 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -411,7 +411,7 @@ ada_setup() {
if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then
# Only one supported implementation, enable it 
explicitly
-   ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV GNAT
+   ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV 
GNAT GNATBIND GNATLS GNATMAKE
ada_wrapper_setup
fi
else
@@ -427,7 +427,7 @@ ada_setup() {
die "More than one implementation in 
ADA_TARGET."
fi
 
-   ada_export "${impl}" EADA GCC_PV GNAT
+   ada_export "${impl}" EADA GCC_PV GNAT GNATBIND 
GNATLS GNATMAKE
ada_wrapper_setup
fi
done



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-17 Thread Alfredo Tupone
commit: 9ed226fa5c2394948ac9b3c6518a470f43c42814
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Tue Sep 17 07:33:57 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Sep 17 07:33:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed226fa

ada.eclass: add export of GNAT

Signed-off-by: Alfredo Tupone  gentoo.org>

 eclass/ada.eclass | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index aae30562074..763ce92056e 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -222,6 +222,10 @@ ada_export() {
export GCC_PV=${gcc_pv}
debug-print "${FUNCNAME}: GCC_PV = ${GCC_PV}"
;;
+   GNAT)
+   export GNAT=${EPREFIX}/usr/bin/gnat-${gcc_pv}
+   debug-print "${FUNCNAME}: GNAT = ${GNAT}"
+   ;;
GNATBIND)
export 
GNATBIND=${EPREFIX}/usr/bin/gnatbind-${gcc_pv}
debug-print "${FUNCNAME}: GNATBIND = 
${GNATBIND}"
@@ -407,7 +411,7 @@ ada_setup() {
if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then
# Only one supported implementation, enable it 
explicitly
-   ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV
+   ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV GNAT
ada_wrapper_setup
fi
else
@@ -423,7 +427,7 @@ ada_setup() {
die "More than one implementation in 
ADA_TARGET."
fi
 
-   ada_export "${impl}" EADA GCC GCC_PV GNATMAKE
+   ada_export "${impl}" EADA GCC_PV GNAT
ada_wrapper_setup
fi
done



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-17 Thread Alfredo Tupone
commit: 8849f02180c192f0a876a828f878cd56f43c9800
Author: Tupone Alfredo  gentoo  org>
AuthorDate: Tue Sep 17 06:50:41 2019 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Tue Sep 17 06:52:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8849f021

ada.eclass: fix mispelling of ada_target

Signed-off-by: Alfredo Tupone  gentoo.org>

 eclass/ada.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 65d5e082967..aae30562074 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -405,7 +405,7 @@ ada_setup() {
unset EADA
 
if [[ ${#_ADA_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-   if use "ada_targets_${_ADA_SUPPORTED_IMPLS[0]}"; then
+   if use "ada_target_${_ADA_SUPPORTED_IMPLS[0]}"; then
# Only one supported implementation, enable it 
explicitly
ada_export "${_ADA_SUPPORTED_IMPLS[0]}" EADA GCC_PV
ada_wrapper_setup



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-16 Thread Ben Kohler
commit: ea28d69e556837f60d4962dd2c24b51aef97735d
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Sep 16 16:39:25 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Sep 16 16:39:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea28d69e

common-lisp-3.eclass: fix various @USAGE inconsistencies

Signed-off-by: Ben Kohler  gentoo.org>

 eclass/common-lisp-3.eclass | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass
index ae229491025..65ad5a58a34 100644
--- a/eclass/common-lisp-3.eclass
+++ b/eclass/common-lisp-3.eclass
@@ -75,6 +75,7 @@ common-lisp-install-one-source() {
 }
 
 # @FUNCTION: lisp-file-p
+# @USAGE: 
 # @DESCRIPTION:
 # Returns true if ${1} is lisp source file.
 lisp-file-p() {
@@ -84,6 +85,7 @@ lisp-file-p() {
 }
 
 # @FUNCTION: common-lisp-get-fpredicate
+# @USAGE: 
 # @DESCRIPTION:
 # Outputs the corresponding predicate to check files of type ${1}.
 common-lisp-get-fpredicate() {
@@ -98,7 +100,7 @@ common-lisp-get-fpredicate() {
 }
 
 # @FUNCTION: common-lisp-install-sources
-# @USAGE: common-lisp-install-sources path [...]
+# @USAGE:  [...]
 # @DESCRIPTION:
 # Recursively install lisp sources of type ${2} if ${1} is -t or
 # Lisp by default. When given a directory, it will be recursively
@@ -126,6 +128,7 @@ common-lisp-install-sources() {
 }
 
 # @FUNCTION: common-lisp-install-one-asdf
+# @USAGE: 
 # @DESCRIPTION:
 # Installs ${1} asdf file in CLSOURCEROOT/CLPACKAGE and symlinks it in
 # CLSYSTEMROOT.
@@ -140,7 +143,7 @@ common-lisp-install-one-asdf() {
 }
 
 # @FUNCTION: common-lisp-install-asdf
-# @USAGE: common-lisp-install-asdf path [...]
+# @USAGE:  [...]
 # @DESCRIPTION:
 # Installs all ASDF files and creates symlinks in CLSYSTEMROOT.
 # When given a directory, it will be recursively scanned for ASDF
@@ -167,7 +170,6 @@ common-lisp-3_src_install() {
 }
 
 # @FUNCTION: common-lisp-find-lisp-impl
-# @USAGE: common-lisp-find-lisp-impl
 # @DESCRIPTION:
 # Outputs an installed Common Lisp implementation. Transverses
 # CLIMPLEMENTATIONS to find it.
@@ -179,7 +181,7 @@ common-lisp-find-lisp-impl() {
 }
 
 # @FUNCTION: common-lisp-export-impl-args
-# @USAGE: common-lisp-export-impl-args 
+# @USAGE: 
 # @DESCRIPTION:
 # Export a few variables containing the switches necessary
 # to make the CL implementation perform basic functions:



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-16 Thread Ben Kohler
commit: 565ca0c4c90e59463c01fe6921f2af0ac9ce33fc
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Sep 16 13:51:26 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Sep 16 13:51:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565ca0c4

qmail.eclass: minor @USAGE fix

Signed-off-by: Ben Kohler  gentoo.org>

 eclass/qmail.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 150b6c00aab..8dd3ae99043 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -69,7 +69,7 @@ dospp() {
 }
 
 # @FUNCTION: dosupervise
-# @USAGE: dosupervise  [ ]
+# @USAGE:  [ ]
 # @DESCRIPTION:
 # Install runfiles for services and logging to supervise directory
 dosupervise() {



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-16 Thread Ben Kohler
commit: 04ddac6e55be4d2faa21e83696cbac3825c57d27
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Sep 16 13:46:13 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Sep 16 13:46:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ddac6e

ruby-fakegem.eclass: fix misspelled function name & minor @USAGE syntax

Signed-off-by: Ben Kohler  gentoo.org>

 eclass/ruby-fakegem.eclass | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index a6a7654f9e6..f75e1669b0c 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -207,7 +207,7 @@ ruby_fakegem_gemsdir() {
 }
 
 # @FUNCTION: ruby_fakegem_doins
-# @USAGE: file [file...]
+# @USAGE:  [file...]
 # @DESCRIPTION:
 # Installs the specified file(s) into the gems directory.
 ruby_fakegem_doins() {
@@ -217,8 +217,8 @@ ruby_fakegem_doins() {
) || die "failed $0 $@"
 }
 
-# @FUNCTION: ruby_fakegem_newsins
-# @USAGE: file filename
+# @FUNCTION: ruby_fakegem_newins
+# @USAGE:  
 # @DESCRIPTION:
 # Installs the specified file into the gems directory using the provided 
filename.
 ruby_fakegem_newins() {
@@ -262,7 +262,7 @@ ruby_fakegem_install_gemspec() {
 }
 
 # @FUNCTION: ruby_fakegem_gemspec_gemspec
-# @USAGE: gemspec-input gemspec-output
+# @USAGE:  
 # @DESCRIPTION:
 # Generates an installable version of the specification indicated by
 # RUBY_FAKEGEM_GEMSPEC. This file is eval'ed to produce a final specification
@@ -272,7 +272,7 @@ ruby_fakegem_gemspec_gemspec() {
 }
 
 # @FUNCTION: ruby_fakegem_metadata_gemspec
-# @USAGE: gemspec-metadata gemspec-output
+# @USAGE:  
 # @DESCRIPTION:
 # Generates an installable version of the specification indicated by
 # the metadata distributed by the gem itself. This is similar to how
@@ -282,7 +282,7 @@ ruby_fakegem_metadata_gemspec() {
 }
 
 # @FUNCTION: ruby_fakegem_genspec
-# @USAGE: output-gemspec
+# @USAGE: 
 # @DESCRIPTION:
 # Generates a gemspec for the package and places it into the "specifications"
 # directory of RubyGems.
@@ -327,7 +327,7 @@ EOF
 }
 
 # @FUNCTION: ruby_fakegem_binwrapper
-# @USAGE: command [path] [content]
+# @USAGE:  [path] [content]
 # @DESCRIPTION:
 # Creates a new binary wrapper for a command installed by the RubyGem.
 # path defaults to /usr/bin/$command content is optional and can be used



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-15 Thread Michał Górny
commit: 2ff21ea8e3ca3d334bb3e34aeaa61c99c0cda2a3
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 15 17:31:25 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 15 17:31:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff21ea8

autotools-utils.eclass: Update @SUPPORTED_EAPIS

Signed-off-by: Michał Górny  gentoo.org>

 eclass/autotools-utils.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 0addf76a92f..06c79fd652a 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -5,7 +5,7 @@
 # @MAINTAINER:
 # Maciej Mrozowski 
 # Michał Górny 
-# @SUPPORTED_EAPIS: 2 3 4 5
+# @SUPPORTED_EAPIS: 4 5
 # @BLURB: common ebuild functions for autotools-based packages
 # @DESCRIPTION:
 # autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-15 Thread Michał Górny
commit: ccad3cd2c6fa16c2522e179b4ae62015ab6e5a1d
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 15 17:25:29 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 15 17:25:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccad3cd2

savedconfig.eclass: define @SUPPORTED_EAPIS

Signed-off-by: Michał Górny  gentoo.org>

 eclass/savedconfig.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index b2be715630a..dab2283fe0f 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: savedconfig.eclass
 # @MAINTAINER:
 # base-sys...@gentoo.org
+# @SUPPORTED_EAPIS: 5 6 7
 # @BLURB: common API for saving/restoring complex configuration files
 # @DESCRIPTION:
 # It is not uncommon to come across a package which has a very fine



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-15 Thread Michał Górny
commit: 10a36d30fb18a1c9b6b782fd3d26f8be92f565da
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 15 17:19:31 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 15 17:19:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a36d30

ant-tasks.eclass: Add @SUPPORTED_EAPIS

Signed-off-by: Michał Górny  gentoo.org>

 eclass/ant-tasks.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 84e65765795..309df084d15 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -6,6 +6,7 @@
 # j...@gentoo.org
 # @AUTHOR:
 # Vlastimil Babka 
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Eclass for building dev-java/ant-* packages
 # @DESCRIPTION:
 # This eclass provides functionality and default ebuild variables for building



[gentoo-commits] repo/gentoo:master commit in: eclass/

2019-09-15 Thread Michał Górny
commit: 971836b71b0062499cc4ac065fbf82af086832cc
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Sep 15 17:21:24 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 15 17:21:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971836b7

bazel.eclass: Add @SUPPORTED_EAPIS

Signed-off-by: Michał Górny  gentoo.org>

 eclass/bazel.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index ce80ea185e9..4eacb75776e 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Jason Zaman
+# Copyright 1999-2019 Jason Zaman
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: bazel.eclass
@@ -6,6 +6,7 @@
 # Jason Zaman 
 # @AUTHOR:
 # Jason Zaman 
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Utility functions for packages using Bazel Build
 # @DESCRIPTION:
 # A utility eclass providing functions to run the Bazel Build system.



  1   2   3   4   5   6   7   8   9   10   >