[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2021-04-27 Thread Andreas Sturmlechner
commit: 1e7efa77984fe1641798e4bb079c59faf7499a49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 27 14:40:14 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 27 15:09:24 2021 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=1e7efa77

distutils.eclass: Drop unused eclass

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

 eclass/distutils.eclass | 599 
 1 file changed, 599 deletions(-)

diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
deleted file mode 100644
index 9e0b0b51..
--- a/eclass/distutils.eclass
+++ /dev/null
@@ -1,599 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2017-03-18.
-
-# @ECLASS: distutils.eclass
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @BLURB: Eclass for packages with build systems using Distutils
-# @DESCRIPTION:
-# The distutils eclass defines phase functions for packages with build systems 
using Distutils.
-#
-# This eclass is DEPRECATED. Please use distutils-r1 instead.
-
-if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
-   inherit python
-fi
-
-inherit multilib
-
-case "${EAPI:-0}" in
-   6)
-   die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
-   ;;
-   0|1)
-   EXPORT_FUNCTIONS src_unpack src_compile src_install 
pkg_postinst pkg_postrm
-   ;;
-   *)
-   EXPORT_FUNCTIONS src_prepare src_compile src_install 
pkg_postinst pkg_postrm
-   ;;
-esac
-
-if [[ -z "$(declare -p PYTHON_DEPEND 2> /dev/null)" ]]; then
-   DEPEND="dev-lang/python"
-   RDEPEND="${DEPEND}"
-fi
-
-   if has "${EAPI:-0}" 0 1 && [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
-   ewarn
-   ewarn "\"${EBUILD}\":"
-   ewarn "Deprecation Warning: Usage of distutils.eclass in 
packages supporting installation"
-   ewarn "for multiple Python ABIs in EAPI <=1 is deprecated."
-   ewarn "The ebuild should to be fixed. Please report a bug, if 
it has not been already reported."
-   ewarn
-   elif has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
-   ewarn
-   ewarn "\"${EBUILD}\":"
-   ewarn "Deprecation Warning: Usage of distutils.eclass in 
packages not supporting installation"
-   ewarn "for multiple Python ABIs in EAPI <=2 is deprecated."
-   ewarn "The ebuild should to be fixed. Please report a bug, if 
it has not been already reported."
-   ewarn
-   fi
-
-# 'python' variable is deprecated. Use PYTHON() instead.
-if has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
-   python="python"
-else
-   python="die"
-fi
-
-# @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES
-# @DESCRIPTION:
-# Set this to use separate source directories for each enabled version of 
Python.
-
-# @ECLASS-VARIABLE: DISTUTILS_SETUP_FILES
-# @DESCRIPTION:
-# Array of paths to setup files.
-# Syntax:
-#   [current_working_directory|]path_to_setup_file
-
-# @ECLASS-VARIABLE: DISTUTILS_GLOBAL_OPTIONS
-# @DESCRIPTION:
-# Array of global options passed to setup files.
-# Syntax in EAPI <4:
-#   global_option
-# Syntax in EAPI >=4:
-#   Python_ABI_pattern global_option
-
-# @ECLASS-VARIABLE: DISTUTILS_SRC_TEST
-# @DESCRIPTION:
-# Type of test command used by distutils_src_test().
-# IUSE and DEPEND are automatically adjusted, unless 
DISTUTILS_DISABLE_TEST_DEPENDENCY is set.
-# Valid values:
-#   setup.py
-#   nosetests
-#   py.test
-#   trial [arguments]
-
-# @ECLASS-VARIABLE: DISTUTILS_DISABLE_TEST_DEPENDENCY
-# @DESCRIPTION:
-# Disable modification of IUSE and DEPEND caused by setting of 
DISTUTILS_SRC_TEST.
-
-if [[ -n "${DISTUTILS_SRC_TEST}" && ! "${DISTUTILS_SRC_TEST}" =~ 
^(setup\.py|nosetests|py\.test|trial(\ .*)?)$ ]]; then
-   die "'DISTUTILS_SRC_TEST' variable has unsupported value 
'${DISTUTILS_SRC_TEST}'"
-fi
-
-if [[ -z "${DISTUTILS_DISABLE_TEST_DEPENDENCY}" ]]; then
-   if [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
-   IUSE="test"
-   DEPEND+="${DEPEND:+ }test? ( dev-python/nose )"
-   elif [[ "${DISTUTILS_SRC_TEST}" == "py.test" ]]; then
-   IUSE="test"
-   DEPEND+="${DEPEND:+ }test? ( dev-python/pytest )"
-   # trial requires an argument, which is usually equal to "${PN}".
-   elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then
-   IUSE="test"
-   DEPEND+="${DEPEND:+ }test? ( dev-python/twisted-core )"
-   fi
-fi
-
-if [[ -n "${DISTUTILS_SRC_TEST}" ]]; then
-   EXPORT_FUNCTIONS src_test
-fi
-
-# Scheduled for deletion on 2011-06-01.
-if [[ -n "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" ]]; then
-   eerror "Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\") instead of 

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2021-04-27 Thread Andreas Sturmlechner
commit: 338dea7d22df497b7cba8a1b13f1f30ae6ac9b84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 27 14:40:31 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 27 15:09:24 2021 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=338dea7d

python.eclass: Drop unused eclass

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

 eclass/python.eclass | 3167 --
 1 file changed, 3167 deletions(-)

diff --git a/eclass/python.eclass b/eclass/python.eclass
deleted file mode 100644
index 718c040a..
--- a/eclass/python.eclass
+++ /dev/null
@@ -1,3167 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# Removal on 2017-03-21.
-
-# @ECLASS: python.eclass
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @BLURB: Eclass for Python packages
-# @DESCRIPTION:
-# The python eclass contains miscellaneous, useful functions for Python 
packages.
-#
-# This eclass is DEPRECATED. Please use python-r1, python-single-r1
-# or python-any-r1 instead.
-
-if [[ ${EAPI} == 6 ]]; then
-   die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
-fi
-
-if [[ ${_PYTHON_UTILS_R1} ]]; then
-   die 'python.eclass can not be used with python-r1 suite eclasses.'
-fi
-
-# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
-if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
-   inherit multilib
-fi
-
-# Export pkg_setup every time to avoid issues with eclass inheritance order.
-if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n 
"${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
-   EXPORT_FUNCTIONS pkg_setup
-fi
-
-# Avoid processing this eclass more than once.
-if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
-_PYTHON_ECLASS_INHERITED="1"
-
-if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
-   die "API of python.eclass in EAPI=\"${EAPI}\" not established"
-fi
-
-# Please do not add any new versions of Python here! Instead, please
-# focus on converting packages to use the new eclasses.
-
-_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
-_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3)
-_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython 2.7-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8 2.7-pypy-1.9 
2.7-pypy-2.0)
-_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} 
${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} 
${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
-
-# 

-# = HANDLING OF METADATA 
=
-# 

-
-_PYTHON_ABI_PATTERN_REGEX="([[:alnum:]]|\.|-|\*|\[|\])+"
-
-_python_check_python_abi_matching() {
-   local pattern patterns patterns_list="0" PYTHON_ABI
-
-   while (($#)); do
-   case "$1" in
-   --patterns-list)
-   patterns_list="1"
-   ;;
-   --)
-   shift
-   break
-   ;;
-   -*)
-   die "${FUNCNAME}(): Unrecognized option '$1'"
-   ;;
-   *)
-   break
-   ;;
-   esac
-   shift
-   done
-
-   if [[ "$#" -ne 2 ]]; then
-   die "${FUNCNAME}() requires 2 arguments"
-   fi
-
-   PYTHON_ABI="$1"
-
-   if [[ "${patterns_list}" == "0" ]]; then
-   pattern="$2"
-
-   if [[ "${pattern}" == *"-cpython" ]]; then
-   [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && 
"${PYTHON_ABI}" == ${pattern%-cpython} ]]
-   elif [[ "${pattern}" == *"-jython" ]]; then
-   [[ "${PYTHON_ABI}" == ${pattern} ]]
-   elif [[ "${pattern}" == *"-pypy-"* ]]; then
-   [[ "${PYTHON_ABI}" == ${pattern} ]]
-   else
-   if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ 
]]; then
-   [[ "${PYTHON_ABI}" == ${pattern} ]]
-   elif [[ "${PYTHON_ABI}" =~ 
^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
-   [[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
-   elif [[ "${PYTHON_ABI}" =~ 
^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
-   [[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
-   else
-   die "${FUNCNAME}(): Unrecognized Python ABI 
'${PYTHON_ABI}'"
-   fi
-   fi
-   

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-12-07 Thread Andreas Sturmlechner
commit: 1f5df4ea9a033075140bf03eab94489dc44f5b2c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  7 20:38:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  7 20:52:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=1f5df4ea

qt4-r2.eclass: Remove unused eclass

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

 eclass/qt4-r2.eclass | 139 ---
 1 file changed, 139 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
deleted file mode 100644
index d8a72529..
--- a/eclass/qt4-r2.eclass
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: qt4-r2.eclass
-# @MAINTAINER:
-# q...@gentoo.org
-# @BLURB: Eclass for Qt4-based packages, second edition.
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful when
-# dealing with packages using Qt4 libraries. Supports only EAPIs
-# 2, 3, 4, and 5. Use qmake-utils.eclass in EAPI 6 and later.
-
-case ${EAPI} in
-   2|3|4|5) : ;;
-   6) die "qt4-r2.eclass is banned in EAPI 6 and later" ;;
-   *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
-esac
-
-inherit base eutils qmake-utils
-
-export XDG_CONFIG_HOME="${T}"
-
-# @ECLASS-VARIABLE: DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dodoc command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: DOCS=( ChangeLog README "${WORKDIR}/doc_folder/" )
-
-# @ECLASS-VARIABLE: HTML_DOCS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array containing documents passed to dohtml command.
-# Paths can be absolute or relative to ${S}.
-#
-# Example: HTML_DOCS=( "doc/document.html" "${WORKDIR}/html_folder/" )
-
-# @ECLASS-VARIABLE: LANGS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# In case your Qt4 application provides various translations, use this variable
-# to specify them in order to populate "linguas_*" IUSE automatically. Make 
sure
-# that you set this variable before inheriting qt4-r2 eclass.
-#
-# Example: LANGS="de el it ja"
-for x in ${LANGS}; do
-   IUSE+=" linguas_${x}"
-done
-
-# @ECLASS-VARIABLE: LANGSLONG
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Same as LANGS, but this variable is for LINGUAS that must be in long format.
-# Remember to set this variable before inheriting qt4-r2 eclass.
-# Look at ${PORTDIR}/profiles/desc/linguas.desc for details.
-#
-# Example: LANGSLONG="en_GB ru_RU"
-for x in ${LANGSLONG}; do
-   IUSE+=" linguas_${x%_*}"
-done
-unset x
-
-# @ECLASS-VARIABLE: PATCHES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Array variable containing all the patches to be applied. This variable
-# is expected to be defined in the global scope of ebuilds. Make sure to
-# specify the full path. This variable is used in src_prepare phase.
-#
-# Example:
-# @CODE
-# PATCHES=(
-#  "${FILESDIR}/mypatch.patch"
-#  "${FILESDIR}/mypatch2.patch"
-# )
-# @CODE
-
-# @FUNCTION: qt4-r2_src_unpack
-# @DESCRIPTION:
-# Default src_unpack function for packages that depend on qt4. If you have to
-# override src_unpack in your ebuild (probably you don't need to), call
-# qt4-r2_src_unpack in it.
-qt4-r2_src_unpack() {
-   debug-print-function $FUNCNAME "$@"
-
-   base_src_unpack "$@"
-}
-
-# @FUNCTION: qt4-r2_src_prepare
-# @DESCRIPTION:
-# Default src_prepare function for packages that depend on qt4. If you have to
-# override src_prepare in your ebuild, you should call qt4-r2_src_prepare in 
it,
-# otherwise autopatcher will not work!
-qt4-r2_src_prepare() {
-   debug-print-function $FUNCNAME "$@"
-
-   base_src_prepare "$@"
-}
-
-# @FUNCTION: qt4-r2_src_configure
-# @DESCRIPTION:
-# Default src_configure function for packages that depend on qt4. If you have 
to
-# override src_configure in your ebuild, call qt4-r2_src_configure in it.
-qt4-r2_src_configure() {
-   debug-print-function $FUNCNAME "$@"
-
-   local project_file=$(qmake-utils_find_pro_file)
-
-   if [[ -n ${project_file} ]]; then
-   eqmake4 "${project_file}"
-   else
-   base_src_configure "$@"
-   fi
-}
-
-# @FUNCTION: qt4-r2_src_compile
-# @DESCRIPTION:
-# Default src_compile function for packages that depend on qt4. If you have to
-# override src_compile in your ebuild (probably you don't need to), call
-# qt4-r2_src_compile in it.
-qt4-r2_src_compile() {
-   debug-print-function $FUNCNAME "$@"
-
-   base_src_compile "$@"
-}
-
-# @FUNCTION: qt4-r2_src_install
-# @DESCRIPTION:
-# Default src_install function for qt4-based packages. Installs compiled code,
-# and documentation (via DOCS and HTML_DOCS variables).
-qt4-r2_src_install() {
-   debug-print-function $FUNCNAME "$@"
-
-   base_src_install INSTALL_ROOT="${D}" "$@"
-   einstalldocs
-}
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-11-29 Thread Andreas Sturmlechner
commit: 942b00d6540855fb49858f2d983ce5c6b5535b14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 30 02:15:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 30 02:19:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=942b00d6

poppler.eclass: Remove unused eclass

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

 eclass/poppler.eclass | 197 --
 1 file changed, 197 deletions(-)

diff --git a/eclass/poppler.eclass b/eclass/poppler.eclass
deleted file mode 100644
index 5ca760e1..
--- a/eclass/poppler.eclass
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/poppler.eclass,v 1.6 
2010/01/03 19:10:49 scarabeus Exp $
-
-# @ECLASS: poppler.eclass
-# @MAINTAINER:
-# Peter Alfredsen 
-# @BLURB: Reduces code duplication in the modularized poppler ebuilds.
-# @DESCRIPTION:
-# Provides an easy template for making modularized poppler-based ebuilds.
-
-inherit base multilib libtool
-
-has 2 ${EAPI} || DEPEND="EAPI-TOO-OLD"
-
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
-
-RDEPEND="
-   !app-text/poppler
-   !app-text/poppler-bindings
-   "
-DEPEND="
-   virtual/pkgconfig
-   userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-   "
-
-
-# @ECLASS-VARIABLE: HOMEPAGE
-# @DESCRIPTION:
-# Default HOMEPAGE
-HOMEPAGE="http://poppler.freedesktop.org/;
-
-# @ECLASS-VARIABLE: SRC_URI
-# @DESCRIPTION:
-# Default SRC_URI
-SRC_URI="http://poppler.freedesktop.org/poppler-${PV}.tar.gz;
-
-# @ECLASS-VARIABLE: S
-# @DESCRIPTION:
-# Default working directory
-S=${WORKDIR}/poppler-${PV}
-
-# @ECLASS-VARIABLE: POPPLER_MODULE
-# @DESCRIPTION:
-# The name of the poppler module. Must be set by the ebuild before inheriting
-# the poppler eclass.
-POPPLER_MODULE=${POPPLER_MODULE}
-
-# @ECLASS-VARIABLE: POPPLER_MODULE_S
-# @DESCRIPTION:
-# The working directory of the poppler module.
-POPPLER_MODULE_S=${S}/${POPPLER_MODULE}
-
-# @FUNCTION: pkg_check_modules_override
-# @USAGE:  [package1] [package2]
-# @DESCRIPTION:
-# Will export the appropriate variables to override PKG_CHECK_MODULES autoconf
-# macros, with the string " " by default. If packages are specified, they will
-# be looked up with pkg-config and the appropriate LIBS and CFLAGS substituted.
-# LIBS and CFLAGS can also be specified per-package with the following syntax:
-# @CODE
-# package=LIBS%CFLAGS
-# @CODE
-# = and % have no effect unless both are specified.
-# Here is an example:
-# @CODE
-#  pkg_check_modules_override GASH "gtk+-2.0=-jule%" gobject-2.0
-# @CODE
-# The above example will do:
-# @CODE
-#  export GASH_CFLAGS+=" -jule"
-#  export GASH_LIBS+=" "
-#  export GASH_CFLAGS+=" $(pkg-config --cflags gobject-2.0)"
-#  export GASH_LIBS+=" $(pkg-config --libs gobject-2.0)"
-# @CODE
-#
-# NOTE: If a package is not found, the string " " will be inserted in place of
-# _CFLAGS  and _LIBS
-pkg_check_modules_override() {
-   local package
-   local group="${1}"
-   local packages="${*:2}"
-   export ${group}_CFLAGS=" "
-   export ${group}_LIBS=" "
-
-   if [[ ${#@} -lt 1 ]]
-   then
-   eerror "${FUNCNAME[0]} requires at least one parameter: GROUP"
-   eerror "PKG_CHECK_MODULES(GROUP, package1 package2 etc)"
-   die "${FUNCNAME[0]} requires at least one parameter: GROUP"
-   fi
-
-   for package in $packages
-   do
-   if [[ ${package/=} != ${package} && ${package/\%} != ${package} 
]]
-   then
-   package_cflag_libs=${package##*=}
-   export ${group}_CFLAGS+=" ${package_cflag_libs%%\%*}"
-   export ${group}_LIBS+=" ${package_cflag_libs##*\%}"
-   else
-   if pkg-config --exists $package
-   then
-   export ${group}_CFLAGS+=" $(pkg-config --cflags 
$package)"
-   export ${group}_LIBS+=" $(pkg-config --libs 
$package)"
-   else
-   export ${group}_CFLAGS+=" "
-   export ${group}_LIBS+=" "
-   fi
-   fi
-   done
-}
-# @FUNCTION: poppler_src_unpack
-# @USAGE:
-# @DESCRIPTION:
-# Runs unpack ${A}
-poppler_src_unpack() {
-   unpack ${A}
-}
-
-# @FUNCTION: poppler_src_prepare
-# @USAGE:
-# @DESCRIPTION:
-# Runs autopatch from base.eclass.
-# Uses sed to replace libpoppler.la references with -lpoppler
-poppler_src_prepare() {
-   base_src_prepare
-   sed -i  \
-   -e 's#$(top_builddir)/poppler/libpoppler.la#-lpoppler#' \
-   $(find . -type f -name 'Makefile.in') || die "Failed to sed 
proper lib into Makefile.am"
-   elibtoolize
-}
-
-# 

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-11-29 Thread Andreas Sturmlechner
commit: 8122eeeaf6dc061b64eb41f64ebfcce1e3a2a6db
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 30 02:15:58 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 30 02:19:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=8122eeea

sgml-catalog.eclass: Remove unused eclass

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

 eclass/sgml-catalog.eclass | 106 -
 1 file changed, 106 deletions(-)

diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass
deleted file mode 100644
index 17940767..
--- a/eclass/sgml-catalog.eclass
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# All consumers are gone.  Removal in 14 days
-
-# @ECLASS: sgml-catalog.eclass
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @AUTHOR:
-# Author Matthew Turk 
-# @BLURB: Functions for installing SGML catalogs
-
-case ${EAPI:-0} in
-   0|1|2|3|4|5) inherit base ;;
-   *) ;;
-esac
-
-DEPEND=">=app-text/sgml-common-0.6.3-r2"
-
-# @ECLASS-VARIABLE: SGML_TOINSTALL
-# @DESCRIPTION:
-# An array of catalogs, arranged in pairs.
-# Each pair consists of a centralized catalog followed by an ordinary catalog.
-SGML_TOINSTALL=()
-
-# @FUNCTION: sgml-catalog_cat_include
-# @USAGE:  
-# @DESCRIPTION:
-# Appends a catalog pair to the SGML_TOINSTALL array.
-sgml-catalog_cat_include() {
-   debug-print function $FUNCNAME $*
-   SGML_TOINSTALL+=("$1" "$2")
-}
-
-# @FUNCTION: sgml-catalog_cat_doinstall
-# @USAGE:  
-# @DESCRIPTION:
-# Adds an ordinary catalog to a centralized catalog.
-sgml-catalog_cat_doinstall() {
-   debug-print function $FUNCNAME $*
-   has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-   "${EPREFIX}"/usr/bin/install-catalog --add "${EPREFIX}$1" 
"${EPREFIX}$2" &>/dev/null
-}
-
-# @FUNCTION: sgml-catalog_cat_doremove
-# @USAGE:  
-# @DESCRIPTION:
-# Removes an ordinary catalog from a centralized catalog.
-sgml-catalog_cat_doremove() {
-   debug-print function $FUNCNAME $*
-   has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-   "${EPREFIX}"/usr/bin/install-catalog --remove "${EPREFIX}$1" 
"${EPREFIX}$2" &>/dev/null
-}
-
-sgml-catalog_pkg_postinst() {
-   debug-print function $FUNCNAME $*
-   has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-
-   set -- "${SGML_TOINSTALL[@]}"
-
-   while (( $# )); do
-   if [[ ! -e "${EPREFIX}$2" ]]; then
-   ewarn "${EPREFIX}$2 doesn't appear to exist, although 
it ought to!"
-   shift 2
-   continue
-   fi
-   einfo "Now adding ${EPREFIX}$2 to ${EPREFIX}$1 and 
${EPREFIX}/etc/sgml/catalog"
-   sgml-catalog_cat_doinstall "$1" "$2"
-   shift 2
-   done
-   sgml-catalog_cleanup
-}
-
-sgml-catalog_pkg_prerm() {
-   sgml-catalog_cleanup
-}
-
-sgml-catalog_pkg_postrm() {
-   debug-print function $FUNCNAME $*
-   has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-
-   set -- "${SGML_TOINSTALL[@]}"
-
-   while (( $# )); do
-   einfo "Now removing ${EPREFIX}$2 from ${EPREFIX}$1 and 
${EPREFIX}/etc/sgml/catalog"
-   sgml-catalog_cat_doremove "$1" "$2"
-   shift 2
-   done
-}
-
-sgml-catalog_cleanup() {
-   has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-   if [ -e "${EPREFIX}/usr/bin/gensgmlenv" ]
-   then
-   einfo Regenerating SGML environment variables ...
-   gensgmlenv
-   grep -v export "${EPREFIX}/etc/sgml/sgml.env" > 
"${EPREFIX}/etc/env.d/93sgmltools-lite"
-   fi
-}
-
-sgml-catalog_src_compile() {
-   return
-}
-
-EXPORT_FUNCTIONS pkg_postrm pkg_postinst src_compile pkg_prerm



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-11-29 Thread Andreas Sturmlechner
commit: bafbcc93354e2648f1853fdb0659025fdcafe000
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 30 02:15:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 30 02:19:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=bafbcc93

qt3.eclass: Remove unused eclass

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

 eclass/qt3.eclass | 141 --
 1 file changed, 141 deletions(-)

diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass
deleted file mode 100644
index cd59f8e3..
--- a/eclass/qt3.eclass
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 2005-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.41 2009/05/17 
15:17:03 hwoarang Exp $
-
-# @ECLASS: qt3.eclass
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @BLURB: Eclass for Qt3 packages
-# @DESCRIPTION:
-# This eclass contains various functions that may be useful
-# when dealing with packages using Qt3 libraries.
-
-inherit toolchain-funcs versionator eutils
-
-QTPKG="dev-qt/qt-"
-QT3MAJORVERSIONS="3.3 3.2 3.1 3.0"
-QT3VERSIONS="3.3.8b-r1 3.3.8b 3.3.8-r4 3.3.8-r3 3.3.8-r2 3.3.8-r1 3.3.8 
3.3.6-r5 3.3.6-r4 3.3.6-r3 3.3.6-r2 3.3.6-r1 3.3.6 3.3.5-r1 3.3.5 3.3.4-r9 
3.3.4-r8 3.3.4-r7 3.3.4-r6 3.3.4-r5 3.3.4-r4 3.3.4-r3 3.3.4-r2 3.3.4-r1 3.3.4 
3.3.3-r3 3.3.3-r2 3.3.3-r1 3.3.3 3.3.2 3.3.1-r2 3.3.1-r1 3.3.1 3.3.0-r1 3.3.0 
3.2.3-r1 3.2.3 3.2.2-r1 3.2.2 3.2.1-r2 3.2.1-r1 3.2.1 3.2.0 3.1.2-r4 3.1.2-r3 
3.1.2-r2 3.1.2-r1 3.1.2 3.1.1-r2 3.1.1-r1 3.1.1 3.1.0-r3 3.1.0-r2 3.1.0-r1 
3.1.0"
-
-if [[ -z "${QTDIR}" ]]; then
-   export QTDIR="/usr/qt/3"
-fi
-
-addwrite "${QTDIR}/etc/settings"
-addpredict "${QTDIR}/etc/settings"
-
-# @FUNCTION: qt_min_version
-# @USAGE: [minimum version]
-# @DESCRIPTION:
-# This function is deprecated. Use slot dependencies instead.
-qt_min_version() {
-   local list=$(qt_min_version_list "$@")
-   ewarn "${CATEGORY}/${PF}: qt_min_version() is deprecated. Use slot 
dependencies instead."
-   if [[ ${list%% *} == "${list}" ]]; then
-   echo "${list}"
-   else
-   echo "|| ( ${list} )"
-   fi
-}
-
-qt_min_version_list() {
-   local MINVER="$1"
-   local VERSIONS=""
-
-   case "${MINVER}" in
-   3|3.0|3.0.0) VERSIONS="=${QTPKG}3*";;
-   3.1|3.1.0|3.2|3.2.0|3.3|3.3.0)
-   for x in ${QT3MAJORVERSIONS}; do
-   if $(version_is_at_least "${MINVER}" "${x}"); 
then
-   VERSIONS="${VERSIONS} =${QTPKG}${x}*"
-   fi
-   done
-   ;;
-   3*)
-   for x in ${QT3VERSIONS}; do
-   if $(version_is_at_least "${MINVER}" "${x}"); 
then
-   VERSIONS="${VERSIONS} =${QTPKG}${x}"
-   fi
-   done
-   ;;
-   *) VERSIONS="=${QTPKG}3*";;
-   esac
-
-   echo ${VERSIONS}
-}
-
-# @FUNCTION: eqmake3
-# @USAGE: [.pro file] [additional parameters to qmake]
-# @MAINTAINER:
-# Przemyslaw Maciag 
-# Davide Pesavento 
-# @DESCRIPTION:
-# Runs qmake on the specified .pro file (defaults to
-# ${PN}.pro if eqmake3 was called with no argument).
-# Additional parameters are passed unmodified to qmake.
-eqmake3() {
-   local LOGFILE="${T}/qmake-$$.out"
-   local projprofile="${1}"
-   [[ -z ${projprofile} ]] && projprofile="${PN}.pro"
-   shift 1
-
-   ebegin "Processing qmake ${projprofile}"
-
-   # file exists?
-   if [[ ! -f ${projprofile} ]]; then
-   echo
-   eerror "Project .pro file \"${projprofile}\" does not exist"
-   eerror "qmake cannot handle non-existing .pro files"
-   echo
-   eerror "This shouldn't happen - please send a bug report to 
bugs.gentoo.org"
-   echo
-   die "Project file not found in ${PN} sources"
-   fi
-
-   echo >> ${LOGFILE}
-   echo "**  qmake ${projprofile}  **" >> ${LOGFILE}
-   echo >> ${LOGFILE}
-
-   # some standard config options
-   local configoptplus="CONFIG += no_fixpath"
-   local configoptminus="CONFIG -="
-   if has debug ${IUSE} && use debug; then
-   configoptplus="${configoptplus} debug"
-   configoptminus="${configoptminus} release"
-   else
-   configoptplus="${configoptplus} release"
-   configoptminus="${configoptminus} debug"
-   fi
-
-   ${QTDIR}/bin/qmake ${projprofile} \
-   QTDIR=${QTDIR} \
-   QMAKE=${QTDIR}/bin/qmake \
-   QMAKE_CC=$(tc-getCC) \
-   QMAKE_CXX=$(tc-getCXX) \
-   QMAKE_LINK=$(tc-getCXX) \
-   

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-11-29 Thread Andreas Sturmlechner
commit: 6f225f0386aded38ad9217f03f234d7d5738480c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 30 02:14:42 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 30 02:19:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6f225f03

kde*eclass: Cleanup KDE3 era

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

 eclass/kde-functions.eclass | 672 
 eclass/kde-meta.eclass  | 463 --
 eclass/kde.eclass   | 614 
 3 files changed, 1749 deletions(-)

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
deleted file mode 100644
index 32ada14b..
--- a/eclass/kde-functions.eclass
+++ /dev/null
@@ -1,672 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @ECLASS: kde-functions.eclass
-# @MAINTAINER:
-# k...@gentoo.org
-# Original author Dan Armak 
-#
-# @BLURB: This contains everything except things that modify ebuild variables 
and
-# @DESCRIPTION:
-# This contains everything except things that modify ebuild variables
-# and functions (e.g. $P, src_compile() etc.)
-
-inherit qt3 eutils
-
-# map of the monolithic->split ebuild derivation; used to build deps describing
-# the relationships between them
-KDE_DERIVATION_MAP='
-kde-apps/kdeaccessibility kde-base/kbstateapplet
-kde-apps/kdeaccessibility kde-base/kdeaccessibility-iconthemes
-kde-apps/kdeaccessibility kde-apps/kmag
-kde-apps/kdeaccessibility kde-apps/kmousetool
-kde-apps/kdeaccessibility kde-apps/kmouth
-kde-apps/kdeaccessibility kde-base/kttsd
-kde-apps/kdeaccessibility kde-base/ksayit
-kde-base/kdeaddons kde-base/atlantikdesigner
-kde-base/kdeaddons kde-base/kaddressbook-plugins
-kde-base/kdeaddons kde-base/kate-plugins
-kde-base/kdeaddons kde-base/kdeaddons-docs-konq-plugins
-kde-base/kdeaddons kde-base/kdeaddons-kfile-plugins
-kde-base/kdeaddons kde-base/kicker-applets
-kde-base/kdeaddons kde-base/knewsticker-scripts
-kde-base/kdeaddons kde-apps/konq-plugins
-kde-base/kdeaddons kde-base/konqueror-akregator
-kde-base/kdeaddons kde-base/ksig
-kde-base/kdeaddons kde-base/noatun-plugins
-kde-base/kdeaddons kde-base/renamedlg-audio
-kde-base/kdeaddons kde-base/renamedlg-images
-kde-base/kdeadmin kde-apps/kcron
-kde-base/kdeadmin kde-base/kdat
-kde-base/kdeadmin kde-base/kdeadmin-kfile-plugins
-kde-base/kdeadmin kde-base/knetworkconf
-kde-base/kdeadmin kde-base/kpackage
-kde-base/kdeadmin kde-base/ksysv
-kde-base/kdeadmin kde-apps/kuser
-kde-base/kdeadmin kde-base/lilo-config
-kde-base/kdeadmin kde-base/secpolicy
-kde-base/kdeartwork kde-apps/kdeartwork-emoticons
-kde-base/kdeartwork kde-base/kdeartwork-icewm-themes
-kde-base/kdeartwork kde-apps/kdeartwork-iconthemes
-kde-base/kdeartwork kde-apps/kdeartwork-kscreensaver
-kde-base/kdeartwork kde-base/kdeartwork-kwin-styles
-kde-base/kdeartwork kde-base/kdeartwork-kworldclock
-kde-base/kdeartwork kde-base/kdeartwork-kworldwatch
-kde-base/kdeartwork kde-base/kdeartwork-sounds
-kde-base/kdeartwork kde-apps/kdeartwork-styles
-kde-base/kdeartwork kde-apps/kdeartwork-wallpapers
-kde-base/kdebase kde-plasma/drkonqi
-kde-base/kdebase kde-base/kappfinder
-kde-base/kdebase kde-apps/kate
-kde-base/kdebase kde-base/kcheckpass
-kde-base/kdebase kde-base/kcminit
-kde-base/kdebase kde-apps/kcontrol
-kde-base/kdebase kde-base/kdcop
-kde-base/kdebase kde-apps/kdebase-data
-kde-base/kdebase kde-apps/kdebase-kioslaves
-kde-base/kdebase kde-base/kdebase-startkde
-kde-base/kdebase kde-base/kdebugdialog
-kde-base/kdebase kde-apps/kdepasswd
-kde-base/kdebase kde-base/kdeprint
-kde-base/kdebase kde-base/kdesktop
-kde-base/kdebase kde-apps/kdesu
-kde-base/kdebase kde-apps/kdialog
-kde-base/kdebase kde-base/kdm
-kde-base/kdebase kde-apps/kfind
-kde-base/kdebase kde-apps/khelpcenter
-kde-base/kdebase kde-base/khotkeys
-kde-base/kdebase kde-base/kicker
-kde-base/kdebase kde-base/klipper
-kde-base/kdebase kde-base/kmenuedit
-kde-base/kdebase kde-apps/knetattach
-kde-base/kdebase kde-apps/konqueror
-kde-base/kdebase kde-apps/konsole
-kde-base/kdebase kde-base/kpager
-kde-base/kdebase kde-base/kpersonalizer
-kde-base/kdebase kde-apps/kreadconfig
-kde-base/kdebase kde-plasma/kscreensaver
-kde-base/kdebase kde-base/ksmserver
-kde-base/kdebase kde-base/ksplashml
-kde-base/kdebase kde-apps/kstart
-kde-base/kdebase kde-base/ksysguard
-kde-base/kdebase kde-base/ksystraycmd
-kde-base/kdebase kde-base/ktip
-kde-base/kdebase kde-base/kwin
-kde-base/kdebase kde-base/kxkb
-kde-base/kdebase kde-apps/libkonq
-kde-base/kdebase kde-apps/nsplugins
-kde-base/kdebindings kde-base/dcopc
-kde-base/kdebindings kde-base/dcopjava
-kde-base/kdebindings kde-base/dcopperl
-kde-base/kdebindings kde-base/dcoppython
-kde-base/kdebindings kde-base/kalyptus
-kde-base/kdebindings kde-base/kdejava
-kde-base/kdebindings kde-base/kjsembed
-kde-base/kdebindings kde-base/korundum

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-11-29 Thread Andreas Sturmlechner
commit: 6d7881369e19832193b6cb62474e75ddc2aff764
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 30 02:15:46 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 30 02:19:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6d788136

perl-app.eclass: Remove unused eclass

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

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

diff --git a/eclass/perl-app.eclass b/eclass/perl-app.eclass
deleted file mode 100644
index e0131cca..
--- a/eclass/perl-app.eclass
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 
-# @MAINTAINER:
-# kde-sunset overlay maintainers
-# @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] proj/kde-sunset:master commit in: eclass/, profiles/updates/, kde-apps/kdepim-meta/, kde-apps/kjots/, ...

2020-09-20 Thread Andreas Sturmlechner
commit: 010a9cb1eb44f0ba22d8d1253979581f34a95e6d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 20 11:11:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 20 11:11:03 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=010a9cb1

kde-apps/kjots: pkgmove to app-text/kjots

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

 {kde-apps => app-text}/kjots/ChangeLog  |  0
 app-text/kjots/kjots-3.5.10.ebuild  | 17 +
 .../kjots/kjots-4.14.11_pre20160611.ebuild  |  6 +-
 {kde-apps => app-text}/kjots/metadata.xml   |  0
 eclass/kde-functions.eclass |  2 +-
 .../kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild  |  2 +-
 kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild  |  4 +++-
 kde-apps/kjots/kjots-3.5.10.ebuild  | 11 ---
 profiles/updates/3Q-2020|  1 +
 9 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/kde-apps/kjots/ChangeLog b/app-text/kjots/ChangeLog
similarity index 100%
rename from kde-apps/kjots/ChangeLog
rename to app-text/kjots/ChangeLog

diff --git a/app-text/kjots/kjots-3.5.10.ebuild 
b/app-text/kjots/kjots-3.5.10.ebuild
new file mode 100644
index ..9c46c4ab
--- /dev/null
+++ b/app-text/kjots/kjots-3.5.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="1"
+
+KDE_MINIMAL="${PV}"
+KDEBASE=true
+KMNAME=kdeutils
+inherit kde-meta eutils
+
+DESCRIPTION="Note taking utility by KDE"
+SRC_URI="mirror://kde/Attic/stable/${PV}/src/${KMNAME}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+IUSE="debug kdehiddenvisibility"

diff --git a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild 
b/app-text/kjots/kjots-4.14.11_pre20160611.ebuild
similarity index 70%
rename from kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
rename to app-text/kjots/kjots-4.14.11_pre20160611.ebuild
index e286af8f..747060be 100644
--- a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
+++ b/app-text/kjots/kjots-4.14.11_pre20160611.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 KDE_HANDBOOK="optional"
+KDE_MINIMAL="${PV}"
 KMNAME="kdepim"
 inherit kde4-meta
 
 DESCRIPTION="Note taking utility by KDE"
 HOMEPAGE="https://www.kde.org/applications/utilities/kjots/;
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${KMNAME}-${PV}.tar.xz;
 
+LICENSE="GPL-2"
+SLOT=4/$(get_version_component_range 1-2)
 KEYWORDS="amd64 x86"
 IUSE="debug"
 

diff --git a/kde-apps/kjots/metadata.xml b/app-text/kjots/metadata.xml
similarity index 100%
rename from kde-apps/kjots/metadata.xml
rename to app-text/kjots/metadata.xml

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index f5b9ae4a..7f13bf43 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -291,7 +291,7 @@ kde-base/kdeutils kde-base/kedit
 kde-base/kdeutils kde-apps/kfloppy
 kde-base/kdeutils kde-apps/kgpg
 kde-base/kdeutils kde-base/khexedit
-kde-base/kdeutils kde-apps/kjots
+kde-base/kdeutils app-text/kjots
 kde-base/kdeutils kde-base/klaptopdaemon
 kde-base/kdeutils kde-base/kmilo
 kde-base/kdeutils kde-base/kregexpeditor

diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
index b5420b26..42e4fb2e 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=kde-apps/kalarm-4.14.11_pre20160611:4
>=kde-apps/kdepim-kresources-4.14.11_pre20160611:4
>=kde-apps/kdepim-runtime-4.14.11_pre20160211:4
-   >=kde-apps/kjots-4.14.11_pre20160611:4
+   >=app-text/kjots-4.14.11_pre20160611:4
>=kde-apps/kleopatra-4.14.11_pre20160611:4
>=kde-apps/kmail-4.14.11_pre20160611:4
>=kde-apps/knode-4.14.11_pre20160611:4

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild 
b/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
index dcac20f0..f2d1030a 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-3.5.10.ebuild
@@ -3,7 +3,9 @@
 # $Header: 
/var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.5.10.ebuild,v 
1.7 2009/07/12 11:48:21 armin76 Exp $
 
 EAPI="1"
+
 inherit kde-functions
+
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="http://www.kde.org/;
 
@@ -22,7 +24,7 @@ RDEPEND="
>=kde-apps/kfloppy-${PV}:${SLOT}
crypt? ( >=kde-apps/kgpg-${PV}:${SLOT} )
>=kde-base/khexedit-${PV}:${SLOT}
-   >=kde-apps/kjots-${PV}:${SLOT}
+   

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-09-20 Thread Andreas Sturmlechner
commit: 61ba5fa8fd86062875c384b1100c897bd69a8925
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 20 11:15:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 20 11:15:31 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=61ba5fa8

kde4-base.eclass, kde4-meta.eclass: Drop use of use_if_iuse

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

 eclass/kde4-base.eclass | 2 +-
 eclass/kde4-meta.eclass | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b13eb71a..32da6eeb 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -779,7 +779,7 @@ kde4-base_src_configure() {
# Build tests in src_test only, where we override this value
local cmakeargs=(-DKDE4_BUILD_TESTS=OFF)
 
-   if use_if_iuse debug; then
+   if in_iuse debug && use debug; then
# Set "real" debug mode
CMAKE_KDE_BUILD_TYPE="Debugfull"
else

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 7b67a63c..e6543231 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -253,7 +253,7 @@ kde4-meta_create_extractlists() {
 
# Add default handbook locations
# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 
4.4.5.
-   if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z 
${KMNOMODULE} ]]; then
+   if [[ $(get_kde_version) < 4.5 ]] && in_iuse handbook && use handbook 
&& [[ -z ${KMNOMODULE} ]]; then
# We use the basename of $KMMODULE because $KMMODULE can contain
# the path to the module subdirectory.
KMEXTRA_NONFATAL+="
@@ -302,7 +302,7 @@ kde4-meta_create_extractlists() {
CTestCustom.cmake
kdepim-version.h.cmake
kdepim-version.h"
-   if use_if_iuse kontact; then
+   if in_iuse kontact && use kontact; then
KMEXTRA+="
kontact/plugins/${PLUGINNAME:-${PN}}/"
fi
@@ -528,7 +528,7 @@ kde4-meta_change_cmakelists() {
-e 
's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1)
 # &/' \
-i CMakeLists.txt || die "failed to disable 
hardcoded checks"
# Disable broken or redundant build logic
-   if use_if_iuse kontact || [[ ${PN} = kontact ]]; then
+   if in_iuse kontact && use kontact || [[ ${PN} = kontact 
]]; then
sed -e 
's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \
-e 
's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1)
 # &/' \
-i kontact/plugins/CMakeLists.txt || 
die 'failed to override build logic'



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-25 Thread Andreas Sturmlechner
commit: 856b4c1716e9aa8977b7fa0e5a0037fb83a2cac1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 24 19:38:15 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 25 14:52:58 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=856b4c17

kde4-base.eclass: Re-add 4.13.3 SRC_URI for kde-plasma/kactivitymanagerd

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

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

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 92e8164e..b13eb71a 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -495,9 +495,12 @@ _calculate_src_uri() {
4.11.22)
# Part of 15.08.0 actually, sigh. Not 
stable for next release!

SRC_URI="mirror://kde/Attic/applications/15.08.0/src/${_kmname_pv}.tar.xz" ;;
+   4.13.3)
+   # kde-plasma/kactivitymanagerd
+   
SRC_URI="mirror://kde/Attic/${PV}/src/${_kmname_pv}.tar.xz" ;;
4.14.3)
# Last SC release
-   
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
+   
SRC_URI="mirror://kde/Attic/${PV}/src/${_kmname_pv}.tar.xz" ;;
4.14.10)
# Part of 15.04.3 actually, sigh. Used 
by last version of KDE PIM 4.

SRC_URI="mirror://kde/Attic/applications/15.04.3/src/${_kmname_pv}.tar.xz" ;;



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-25 Thread Andreas Sturmlechner
commit: f21fdf41091eb03a10dce8e7491b6f7a78196a49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug 24 17:56:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 25 14:44:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=f21fdf41

kde4-base.eclass: Fix MissingTestRestrict if CPPUNIT_REQUIRED=optional

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

 eclass/kde4-base.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index d8e922ec..92e8164e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -339,6 +339,7 @@ case ${CPPUNIT_REQUIRED} in
optional)
IUSE+=" test"
DEPEND+=" test? ( ${cppuintdepend} )"
+   RESTRICT+=" !test? ( test )"
;;
*) ;;
 esac



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-23 Thread Andreas Sturmlechner
commit: c5f5858e6ed8800f1b44d3a24296a66b3e79527e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 23 16:25:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 23 19:05:30 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c5f5858e

kde.eclass, kde-functions.eclass: Properly fix KDEBASE to address the eloquent 
remark in 7ba60b69

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

 eclass/kde-functions.eclass | 17 ++---
 eclass/kde.eclass   |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index b9137fa2..9c9506db 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -387,7 +387,7 @@ need-kde() {
else
x_DEPEND="${DEPEND}"
fi
-   if [[ -n "${KDEBASE}" ]]; then
+   if [[ "${KDEBASE}" == "true" ]]; then
# If we're a kde-base package, we need at least our own version 
of kdelibs.
# Note: we only set RDEPEND if it is already set, otherwise
# we break packages relying on portage copying RDEPEND from 
DEPEND.
@@ -404,7 +404,7 @@ need-kde() {
qtver-from-kdever ${KDEVER}
need-qt ${selected_version}
 
-   if [[ -n "${KDEBASE}" ]]; then
+   if [[ "${KDEBASE}" == "true" ]]; then
SLOT="$KDEMAJORVER.$KDEMINORVER"
else
: ${SLOT="0"}
@@ -457,7 +457,7 @@ set-kdedir() {
if [[ -n "$KDEPREFIX" ]]; then
export PREFIX="$KDEPREFIX"
else
-   if  [[ -z "$KDEBASE" ]]; then
+   if  [[ -z ${KDEBASE} || ${KDEBASE} != "true" ]]; then
PREFIX="/usr/kde/3.5"
else
case $KDEMAJORVER.$KDEMINORVER in
@@ -472,7 +472,7 @@ set-kdedir() {
if [[ -n "$KDELIBSDIR" ]]; then
export KDEDIR="$KDELIBSDIR"
else
-   if [[ -z "$KDEBASE" ]]; then
+   if  [[ -z ${KDEBASE} || ${KDEBASE} != "true" ]]; then
# find the latest kdelibs installed
for x in /usr/kde/{svn,3.5} "${PREFIX}" \
"${KDE3LIBSDIR}" "${KDELIBSDIR}" "${KDE3DIR}" 
"${KDEDIR}" /usr/kde/*; do
@@ -662,9 +662,12 @@ postprocess_desktop_entries() {
validate_desktop_entries "${PREFIX}"/share/applications
 }
 
-# is this a kde-base ebuid? CYKER - KLUDGE KLUDGE KLUDGE FUCK YOU kde-apps
+# is this ebuild part of the KDE SC? kde-base/ or kde-apps/ are only hints
 if [[ "${CATEGORY}" == "kde-base" || "${CATEGORY}" == "kde-apps" ]]; then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
-   export KDEBASE="true"
-   export KDEREVISION
+   KDEBASE=${KDEBASE:=true}
+   if [[ ${KDEBASE} == "true" ]]; then
+   export KDEBASE
+   export KDEREVISION
+   fi
 fi

diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index c0c636c4..8bf71e2a 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -173,7 +173,7 @@ kde_src_prepare() {
for f in "${PATCHDIR}"/${p}-${PV}-*{diff,patch}; do
[[ -e ${f} ]] && PATCHES+=("${f}")
done
-   if [[ -n "${KDEBASE}" ]]; then
+   if [[ "${KDEBASE}" == "true" ]]; then
for f in 
"${PATCHDIR}"/${p}-${SLOT}-*{diff,patch}; do
[[ -e ${f} ]] && PATCHES+=("${f}")
done
@@ -563,7 +563,7 @@ kde_src_install() {
shift
done
 
-   if [[ -n ${KDEBASE} && "${PN}" != "arts" && -d 
"${D}"/usr/share/doc/${PF} ]]; then
+   if [[ ${KDEBASE} == "true" && "${PN}" != "arts" && -d 
"${D}"/usr/share/doc/${PF} ]]; then
# work around bug #97196
dodir /usr/share/doc/kde && \
mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ 
|| \



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-16 Thread Andreas Sturmlechner
commit: 3536f21f5579e9493e240036d73fea26ed7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 16 18:50:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 16 18:50:35 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=3536

cmake-utils.eclass: Inherit ninja-utils only in >=EAPI-7

It's kind of a hack, but there's no use for this in kde-sunset overlay anyway.

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

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 30c6016b..989b1c5c 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -112,7 +112,7 @@ case ${EAPI} in
*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
+inherit toolchain-funcs flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
[3456])
@@ -121,6 +121,7 @@ case ${EAPI} in
;;
*)
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+   inherit ninja-utils
;;
 esac
 



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-13 Thread Andreas Sturmlechner
commit: 49be5a235d747e4655ea591025048153f9328b5f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 13 12:29:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 14:47:42 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=49be5a23

qt4-build-multilib.eclass: Drop dev-qt/qtchooser dependency

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

 eclass/qt4-build-multilib.eclass | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 83fb54a9..b044a7d6 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -53,9 +53,6 @@ DEPEND="
dev-lang/perl
virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
-RDEPEND="
-   dev-qt/qtchooser
-"
 
 
 # src_{configure,compile,test,install} are inherited from multilib-minimal



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-13 Thread Andreas Sturmlechner
commit: 3962316389a3fad321922fa8238fbf51cee7bddb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 13 12:34:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 14:47:42 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=39623163

qt4-build-multilib.eclass: Drop all traces of IUSE=aqua

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

 eclass/qt4-build-multilib.eclass | 91 +++-
 1 file changed, 5 insertions(+), 86 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index b044a7d6..3cf33cf9 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -45,7 +45,7 @@ EGIT_REPO_URI=(
 [[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
 
 if [[ ${PN} != qttranslations ]]; then
-   IUSE="aqua debug pch"
+   IUSE="debug pch"
[[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
 fi
 
@@ -231,20 +231,6 @@ qt4-build-multilib_src_prepare() {
mkspecs/$(qt4_get_mkspec)/qmake.conf \
|| die "sed QMAKE_(LIB|INC)DIR failed"
 
-   if use_if_iuse aqua; then
-   sed -i \
-   -e '/^CONFIG/s:app_bundle::' \
-   -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname 
absolute_library_soname:' \
-   mkspecs/$(qt4_get_mkspec)/qmake.conf \
-   || die "sed failed (aqua)"
-
-   # we are crazy and build cocoa + qt3support
-   if { ! in_iuse qt3support || use qt3support; } && [[ 
${CHOST##*-darwin} -ge 9 ]]; then
-   sed -i -e "/case \"\$PLATFORM,\$CFG_MAC_COCOA\" 
in/,/;;/ s|CFG_QT3SUPPORT=\"no\"|CFG_QT3SUPPORT=\"yes\"|" \
-   configure || die "sed failed (cocoa + 
qt3support)"
-   fi
-   fi
-
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib 
crippled (by design)
sed -i \
@@ -400,19 +386,6 @@ qt4_multilib_src_configure() {
$([[ ${CHOST} != *-solaris* ]] && echo -reduce-relocations)
)
 
-   if use_if_iuse aqua; then
-   if [[ ${CHOST##*-darwin} -ge 9 ]]; then
-   conf+=(
-   # on (snow) leopard use the new (frameworked) 
cocoa code
-   -cocoa -framework
-   # add hint for the framework location
-   -F"${QT4_LIBDIR}"
-   )
-   else
-   conf+=(-no-framework)
-   fi
-   fi
-
conf+=(
# module-specific options
"${myconf[@]}"
@@ -483,23 +456,14 @@ qt4_multilib_src_install() {
fi
 
qt4_install_module_qconfigs
-   qt4_symlink_framework_headers
 }
 
 qt4_multilib_src_install_all() {
if [[ ${PN} == qtcore ]]; then
# include gentoo-qconfig.h at the beginning of 
Qt{,Core}/qconfig.h
-   if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
-   sed -i -e '1i #include 
\n' \
-   
"${D}${QT4_LIBDIR}"/QtCore.framework/Headers/qconfig.h \
-   || die "sed failed (qconfig.h)"
-   dosym "${QT4_HEADERDIR#${EPREFIX}}"/Gentoo \
-   
"${QT4_LIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
-   else
-   sed -i -e '1i #include \n' \
-   "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
-   || die "sed failed (qconfig.h)"
-   fi
+   sed -i -e '1i #include \n' \
+   "${D}${QT4_HEADERDIR}"/Qt{,Core}/qconfig.h \
+   || die "sed failed (qconfig.h)"
 
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
@@ -736,49 +700,6 @@ qt4_regenerate_global_qconfigs() {
fi
 }
 
-# @FUNCTION: qt4_symlink_framework_headers
-# @DESCRIPTION:
-# On OS X we need to add some symlinks when frameworks are being
-# used, to avoid complications with some more or less stupid packages.
-qt4_symlink_framework_headers() {
-   if use_if_iuse aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-   local frw dest f h rdir
-   # Some packages tend to include 
-   dodir "${QT4_HEADERDIR#${EPREFIX}}"/Qt
-
-   # Fake normal headers when frameworks are installed... eases 
life later
-   # on, make sure we use relative links though, as some ebuilds 
assume
-   # these dirs exist in src_install to add additional files
-   f=${QT4_HEADERDIR}
-   h=${QT4_LIBDIR}
-   while [[ -n ${f} && ${f%%/*} == ${h%%/*} ]] ; do
-  

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-13 Thread Andreas Sturmlechner
commit: f789c5dc0e4b5a248710360f6a18e965cc7bd364
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 13 13:22:18 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 14:47:42 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=f789c5dc

qt4-build-multilib.eclass: Drop virtual/pkgconfig multilib usedep

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

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

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 3cf33cf9..e426f8d4 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -51,7 +51,7 @@ fi
 
 DEPEND="
dev-lang/perl
-   virtual/pkgconfig[${MULTILIB_USEDEP}]
+   virtual/pkgconfig
 "
 
 



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2020-08-13 Thread Andreas Sturmlechner
commit: c79645f0d1db37885a1ad59696996504dffbdda1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 13 12:04:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 12:04:26 2020 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c79645f0

qt4-build-multilib.eclass: Update Qt4 SRC_URI, moved to upstream archives

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

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

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 7666936b..83fb54a9 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -32,7 +32,7 @@ case ${PV} in
# official stable release
QT4_BUILD_TYPE="release"
MY_P=qt-everywhere-opensource-src-${PV/_/-}
-   
SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
+   
SRC_URI="http://download.qt.io/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
S=${WORKDIR}/${MY_P}
;;
 esac



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-09-12 Thread Andreas Sturmlechner
commit: ffedd275d6bf9b9a3c9ff18c564d9f15b9b4b89e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 20:40:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 20:40:11 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=ffedd275

Import distutils.eclass, python.eclass from Gentoo ebuild repo

 eclass/distutils.eclass |  599 +
 eclass/python.eclass| 3167 +++
 2 files changed, 3766 insertions(+)

diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
new file mode 100644
index 000..9e0b0b5
--- /dev/null
+++ b/eclass/distutils.eclass
@@ -0,0 +1,599 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @DEAD
+# Removal on 2017-03-18.
+
+# @ECLASS: distutils.eclass
+# @MAINTAINER:
+# kde-sunset overlay maintainers
+# @BLURB: Eclass for packages with build systems using Distutils
+# @DESCRIPTION:
+# The distutils eclass defines phase functions for packages with build systems 
using Distutils.
+#
+# This eclass is DEPRECATED. Please use distutils-r1 instead.
+
+if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
+   inherit python
+fi
+
+inherit multilib
+
+case "${EAPI:-0}" in
+   6)
+   die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
+   ;;
+   0|1)
+   EXPORT_FUNCTIONS src_unpack src_compile src_install 
pkg_postinst pkg_postrm
+   ;;
+   *)
+   EXPORT_FUNCTIONS src_prepare src_compile src_install 
pkg_postinst pkg_postrm
+   ;;
+esac
+
+if [[ -z "$(declare -p PYTHON_DEPEND 2> /dev/null)" ]]; then
+   DEPEND="dev-lang/python"
+   RDEPEND="${DEPEND}"
+fi
+
+   if has "${EAPI:-0}" 0 1 && [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
+   ewarn
+   ewarn "\"${EBUILD}\":"
+   ewarn "Deprecation Warning: Usage of distutils.eclass in 
packages supporting installation"
+   ewarn "for multiple Python ABIs in EAPI <=1 is deprecated."
+   ewarn "The ebuild should to be fixed. Please report a bug, if 
it has not been already reported."
+   ewarn
+   elif has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
+   ewarn
+   ewarn "\"${EBUILD}\":"
+   ewarn "Deprecation Warning: Usage of distutils.eclass in 
packages not supporting installation"
+   ewarn "for multiple Python ABIs in EAPI <=2 is deprecated."
+   ewarn "The ebuild should to be fixed. Please report a bug, if 
it has not been already reported."
+   ewarn
+   fi
+
+# 'python' variable is deprecated. Use PYTHON() instead.
+if has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
+   python="python"
+else
+   python="die"
+fi
+
+# @ECLASS-VARIABLE: DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES
+# @DESCRIPTION:
+# Set this to use separate source directories for each enabled version of 
Python.
+
+# @ECLASS-VARIABLE: DISTUTILS_SETUP_FILES
+# @DESCRIPTION:
+# Array of paths to setup files.
+# Syntax:
+#   [current_working_directory|]path_to_setup_file
+
+# @ECLASS-VARIABLE: DISTUTILS_GLOBAL_OPTIONS
+# @DESCRIPTION:
+# Array of global options passed to setup files.
+# Syntax in EAPI <4:
+#   global_option
+# Syntax in EAPI >=4:
+#   Python_ABI_pattern global_option
+
+# @ECLASS-VARIABLE: DISTUTILS_SRC_TEST
+# @DESCRIPTION:
+# Type of test command used by distutils_src_test().
+# IUSE and DEPEND are automatically adjusted, unless 
DISTUTILS_DISABLE_TEST_DEPENDENCY is set.
+# Valid values:
+#   setup.py
+#   nosetests
+#   py.test
+#   trial [arguments]
+
+# @ECLASS-VARIABLE: DISTUTILS_DISABLE_TEST_DEPENDENCY
+# @DESCRIPTION:
+# Disable modification of IUSE and DEPEND caused by setting of 
DISTUTILS_SRC_TEST.
+
+if [[ -n "${DISTUTILS_SRC_TEST}" && ! "${DISTUTILS_SRC_TEST}" =~ 
^(setup\.py|nosetests|py\.test|trial(\ .*)?)$ ]]; then
+   die "'DISTUTILS_SRC_TEST' variable has unsupported value 
'${DISTUTILS_SRC_TEST}'"
+fi
+
+if [[ -z "${DISTUTILS_DISABLE_TEST_DEPENDENCY}" ]]; then
+   if [[ "${DISTUTILS_SRC_TEST}" == "nosetests" ]]; then
+   IUSE="test"
+   DEPEND+="${DEPEND:+ }test? ( dev-python/nose )"
+   elif [[ "${DISTUTILS_SRC_TEST}" == "py.test" ]]; then
+   IUSE="test"
+   DEPEND+="${DEPEND:+ }test? ( dev-python/pytest )"
+   # trial requires an argument, which is usually equal to "${PN}".
+   elif [[ "${DISTUTILS_SRC_TEST}" =~ ^trial(\ .*)?$ ]]; then
+   IUSE="test"
+   DEPEND+="${DEPEND:+ }test? ( dev-python/twisted-core )"
+   fi
+fi
+
+if [[ -n "${DISTUTILS_SRC_TEST}" ]]; then
+   EXPORT_FUNCTIONS src_test
+fi
+
+# Scheduled for deletion on 2011-06-01.
+if [[ -n "${DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS}" ]]; then
+   eerror "Use PYTHON_NONVERSIONED_EXECUTABLES=(\".*\") 

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-06-30 Thread Andreas Sturmlechner
commit: b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Jun 30 08:23:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 30 08:45:02 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b0c6bf7a

kde4-base.eclass: Remove kdelibs conditionals, no longer inherits kde4-base

 eclass/kde4-base.eclass | 46 --
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 5a9a49c..d8e922e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -360,25 +360,23 @@ kdecommondepend="
 "
 unset qtcoreuse
 
-if [[ ${PN} != kdelibs ]]; then
-   [[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
-   kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
-   if [[ ${KDEBASE} = kdevelop ]]; then
-   if [[ ${PN} != kdevplatform ]]; then
-   # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
-   # @DESCRIPTION:
-   # Specifies whether kdevplatform is required. Possible 
values are 'always' (default) and 'never'.
-   # Applies to KDEBASE=kdevelop only.
-   KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
-   case ${KDEVPLATFORM_REQUIRED} in
-   always)
-   kdecommondepend+="
-   
>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
-   "
-   ;;
-   *) ;;
-   esac
-   fi
+[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
+kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
+if [[ ${KDEBASE} = kdevelop ]]; then
+   if [[ ${PN} != kdevplatform ]]; then
+   # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
+   # @DESCRIPTION:
+   # Specifies whether kdevplatform is required. Possible values 
are 'always' (default) and 'never'.
+   # Applies to KDEBASE=kdevelop only.
+   KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
+   case ${KDEVPLATFORM_REQUIRED} in
+   always)
+   kdecommondepend+="
+   
>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
+   "
+   ;;
+   *) ;;
+   esac
fi
 fi
 unset kdelibsuse
@@ -421,12 +419,12 @@ kdehandbookrdepend="
 case ${KDE_HANDBOOK} in
always)
kdedepend+=" ${kdehandbookdepend}"
-   [[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
+   kderdepend+=" ${kdehandbookrdepend}"
;;
optional)
IUSE+=" +handbook"
kdedepend+=" handbook? ( ${kdehandbookdepend} )"
-   [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( 
${kdehandbookrdepend} )"
+   kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
;;
*) ;;
 esac
@@ -720,10 +718,9 @@ kde4-base_src_prepare() {
 
# Enable/disable handbooks for kde4-base packages
# kde4-l10n inherits kde4-base but is metapackage, so no check for doc
-   # kdelibs inherits kde4-base but handle installing the handbook itself
if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
if [[ ${KDEBASE} == kde-base ]]; then
-   if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && 
${PN} != kdelibs ]] && use !handbook; then
+   if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n ]] && 
use !handbook; then
# documentation in kde4-functions
: ${KDE_DOC_DIRS:=doc}
local dir
@@ -786,9 +783,6 @@ kde4-base_src_configure() {
append-cppflags -DQT_NO_DEBUG
fi
 
-   # Set distribution name
-   [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
-
# Here we set the install prefix
tc-is-cross-compiler || 
cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")
 



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-06-30 Thread Andreas Sturmlechner
commit: a5d29b4cb629ce203481511a7c134dc8f46629dd
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Jun 30 08:29:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 30 08:45:02 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=a5d29b4c

qmake-utils.eclass: Import from Gentoo ebuild repository

 eclass/qmake-utils.eclass | 327 ++
 1 file changed, 327 insertions(+)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
new file mode 100644
index 000..0ebd732
--- /dev/null
+++ b/eclass/qmake-utils.eclass
@@ -0,0 +1,327 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: qmake-utils.eclass
+# @AUTHOR:
+# Davide Pesavento 
+# @BLURB: Common functions for qmake-based packages.
+# @DESCRIPTION:
+# Utility eclass providing wrapper functions for Qt4 and Qt5 qmake.
+#
+# This eclass does not set any metadata variables nor export any phase
+# functions. It can be inherited safely.
+
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
+_QMAKE_UTILS_ECLASS=1
+
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit estack toolchain-funcs
+
+# @FUNCTION: qt4_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 binaries are installed.
+# EPREFIX is already prepended to the returned path.
+qt4_get_bindir() {
+   [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+   has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
+   local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
+   if [[ -d ${qtbindir} ]]; then
+   echo ${qtbindir}
+   else
+   echo ${EPREFIX}/usr/bin
+   fi
+}
+
+# @FUNCTION: qt4_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 headers are installed.
+qt4_get_headerdir() {
+   [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+   echo /usr/include/qt4
+}
+
+# @FUNCTION: qt4_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 libraries are installed.
+qt4_get_libdir() {
+   [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+   echo /usr/$(get_libdir)/qt4
+}
+
+# @FUNCTION: qt4_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 mkspecs are installed.
+qt4_get_mkspecsdir() {
+   [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+   echo /usr/share/qt4/mkspecs
+}
+
+# @FUNCTION: qt4_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 plugins are installed.
+qt4_get_plugindir() {
+   [[ ${EAPI:-0} == [0123456] ]] || die "${FUNCNAME[1]} is banned in EAPI 
7 and later"
+   echo $(qt4_get_libdir)/plugins
+}
+
+# @FUNCTION: qt5_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 binaries are installed.
+# EPREFIX is already prepended to the returned path.
+qt5_get_bindir() {
+   has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
+   echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
+}
+
+# @FUNCTION: qt5_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 headers are installed.
+qt5_get_headerdir() {
+   echo /usr/include/qt5
+}
+
+# @FUNCTION: qt5_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 libraries are installed.
+qt5_get_libdir() {
+   echo /usr/$(get_libdir)
+}
+
+# @FUNCTION: qt5_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 mkspecs are installed.
+qt5_get_mkspecsdir() {
+   echo $(qt5_get_libdir)/qt5/mkspecs
+}
+
+# @FUNCTION: qt5_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 plugins are installed.
+qt5_get_plugindir() {
+   echo $(qt5_get_libdir)/qt5/plugins
+}
+
+# @FUNCTION: qmake-utils_find_pro_file
+# @RETURN: zero or one qmake .pro file names
+# @INTERNAL
+# @DESCRIPTION:
+# Outputs a project file name that can be passed to eqmake.
+#   0 *.pro files found --> outputs null string;
+#   1 *.pro file found --> outputs its name;
+#   2 or more *.pro files found --> if "${PN}.pro" or
+#   "$(basename ${S}).pro" are there, outputs one of them.
+qmake-utils_find_pro_file() {
+   local dir_name=$(basename "${S}")
+
+   # set nullglob to avoid expanding *.pro to the literal
+   # string "*.pro" when there are no matching files
+   eshopts_push -s nullglob
+   local pro_files=(*.pro)
+   eshopts_pop
+
+   case ${#pro_files[@]} in
+   0)
+   : ;;
+   1)
+   echo "${pro_files}"
+   ;;
+   *)
+   for pro_file in "${pro_files[@]}"; do
+   if [[ ${pro_file%.pro} == ${dir_name} || 
${pro_file%.pro} == ${PN} ]]; then
+   echo "${pro_file}"
+   break
+   fi
+   done
+   ;;
+   esac
+}
+
+# @VARIABLE: EQMAKE4_EXCLUDE
+# @DEFAULT_UNSET
+# 

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-06-20 Thread Andreas Sturmlechner
commit: 78cf8a9e18791e95796c5c2c87106644fdc9953e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 20 11:35:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 20 11:35:32 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=78cf8a9e

kde.eclass: Transition deps to x11-base/xorg-proto

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

diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 2019a28..c0c636c 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -67,8 +67,7 @@ DEPEND="sys-devel/make
 if [[ ${CATEGORY} != "kde-base" ]] || [[ ${CATEGORY} == "kde-base" &&  
${PV##*.} -lt 10 ]] ; then
DEPEND="${DEPEND}
x11-libs/libXt
-   x11-proto/xf86vidmodeproto
-   xinerama? ( x11-proto/xineramaproto )"
+   x11-base/xorg-proto"
RDEPEND="xinerama? ( x11-libs/libXinerama )"
IUSE="${IUSE} xinerama"
 else



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-05-31 Thread Andreas Sturmlechner
commit: e95bc6041cf9940cfecef2ffe5ed28dcd988a12c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 31 20:31:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 31 20:31:11 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=e95bc604

qt4*eclass: Import from Gentoo ebuild repository

 eclass/qt4-build-multilib.eclass | 847 +++
 eclass/qt4-r2.eclass | 139 +++
 2 files changed, 986 insertions(+)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
new file mode 100644
index 000..7666936
--- /dev/null
+++ b/eclass/qt4-build-multilib.eclass
@@ -0,0 +1,847 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: qt4-build-multilib.eclass
+# @MAINTAINER:
+# q...@gentoo.org
+# @AUTHOR:
+# Davide Pesavento 
+# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
+# @DESCRIPTION:
+# This eclass contains various functions that are used when building Qt4.
+# Requires EAPI 5.
+
+case ${EAPI} in
+   5)  : ;;
+   *)  die "qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0}" ;;
+esac
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
+
+HOMEPAGE="https://www.qt.io/;
+LICENSE="|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3"
+SLOT="4"
+
+case ${PV} in
+   4.?.)
+   # git stable branch
+   QT4_BUILD_TYPE="live"
+   EGIT_BRANCH=${PV%.}
+   ;;
+   *)
+   # official stable release
+   QT4_BUILD_TYPE="release"
+   MY_P=qt-everywhere-opensource-src-${PV/_/-}
+   
SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
+   S=${WORKDIR}/${MY_P}
+   ;;
+esac
+
+EGIT_REPO_URI=(
+   "git://code.qt.io/qt/qt.git"
+   "https://code.qt.io/git/qt/qt.git;
+   "https://github.com/qtproject/qt.git;
+)
+[[ ${QT4_BUILD_TYPE} == live ]] && inherit git-r3
+
+if [[ ${PN} != qttranslations ]]; then
+   IUSE="aqua debug pch"
+   [[ ${PN} != qtxmlpatterns ]] && IUSE+=" +exceptions"
+fi
+
+DEPEND="
+   dev-lang/perl
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+   dev-qt/qtchooser
+"
+
+
+# src_{configure,compile,test,install} are inherited from multilib-minimal
+EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
+
+multilib_src_configure()   { qt4_multilib_src_configure; }
+multilib_src_compile() { qt4_multilib_src_compile; }
+multilib_src_test(){ qt4_multilib_src_test; }
+multilib_src_install() { qt4_multilib_src_install; }
+multilib_src_install_all() { qt4_multilib_src_install_all; }
+
+
+# @ECLASS-VARIABLE: PATCHES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Array variable containing all the patches to be applied. This variable
+# is expected to be defined in the global scope of ebuilds. Make sure to
+# specify the full path. This variable is used in src_prepare phase.
+#
+# Example:
+# @CODE
+#  PATCHES=(
+#  "${FILESDIR}/mypatch.patch"
+#  "${FILESDIR}/mypatch2.patch"
+#  )
+# @CODE
+
+# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Space-separated list of directories that will be configured,
+# compiled, and installed. All paths must be relative to ${S}.
+
+# @ECLASS-VARIABLE: QCONFIG_ADD
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of options that must be added to QT_CONFIG in qconfig.pri
+
+# @ECLASS-VARIABLE: QCONFIG_REMOVE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of options that must be removed from QT_CONFIG in qconfig.pri
+
+# @ECLASS-VARIABLE: QCONFIG_DEFINE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# List of macros that must be defined in QtCore/qconfig.h
+
+
+##  Phase functions  ##
+
+# @FUNCTION: qt4-build-multilib_src_unpack
+# @DESCRIPTION:
+# Unpacks the sources.
+qt4-build-multilib_src_unpack() {
+   if tc-is-gcc; then
+   if [[ $(gcc-major-version) -lt 4 ]] || \
+  [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 
]]; then
+   ewarn
+   ewarn "Using a GCC version lower than 4.4 is not 
supported"
+   ewarn
+   fi
+   fi
+
+   if [[ ${PN} == qtwebkit ]]; then
+   eshopts_push -s extglob
+   if is-flagq '-g?(gdb)?([1-9])'; then
+   ewarn
+   ewarn "You have enabled debug info (probably have -g or 
-ggdb in your CFLAGS/CXXFLAGS)."
+   ewarn "You may experience really long compilation times 
and/or increased memory usage."
+   ewarn "If compilation fails, please try removing 
-g/-ggdb before reporting a bug."
+   ewarn "For more info check out 
https://bugs.gentoo.org/307861;
+   ewarn
+ 

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-05-31 Thread Andreas Sturmlechner
commit: 22c71e550e6e12a20663047f8a80ac3bdf7ef3d5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 31 17:57:09 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 31 18:29:54 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=22c71e55

kde4-functions-extra.eclass: Drop invalid aqua conditional

 eclass/kde4-functions-extra.eclass | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-functions-extra.eclass 
b/eclass/kde4-functions-extra.eclass
index 168bf43..a6ad847 100644
--- a/eclass/kde4-functions-extra.eclass
+++ b/eclass/kde4-functions-extra.eclass
@@ -31,7 +31,11 @@ add_kdeplasma_dep() {
debug-print-function ${FUNCNAME} "$@"
 
local ver
+   local use=${2}
 
+   if [[ -n ${use} ]] ; then
+   use="[${use}]"
+   fi
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -49,9 +53,7 @@ add_kdeplasma_dep() {
 
[[ -z ${1} ]] && die "Missing parameter"
 
-   #FIXME
-   # Drop aqua= from kf5 packages
-   echo " >=kde-plasma/${1}-${ver}:4[aqua=${2:+,${2}}]"
+   echo " >=kde-plasma/${1}-${ver}:4${use}"
 }
 
 # @FUNCTION: add_kdeframeworks_dep
@@ -67,7 +69,11 @@ add_kdeframeworks_dep() {
debug-print-function ${FUNCNAME} "$@"
 
local ver
+   local use=${2}
 
+   if [[ -n ${use} ]] ; then
+   use="[${use}]"
+   fi
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -85,9 +91,7 @@ add_kdeframeworks_dep() {
 
[[ -z ${1} ]] && die "Missing parameter"
 
-   #FIXME
-   # Drop aqua= from kf5 packages
-   echo " >=kde-frameworks/${1}-${ver}:4[aqua=${2:+,${2}}]"
+   echo " >=kde-frameworks/${1}-${ver}:4${use}"
 }
 
 fi



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-05-31 Thread Andreas Sturmlechner
commit: 064e397e494f0c7e96e2af79ae0da8a5604f5b1d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 31 17:57:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 31 18:29:54 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=064e397e

kde4-meta-pkg.eclass: Drop obsolete USE=aqua

 eclass/kde4-meta-pkg.eclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
index 7f74338..c403137 100644
--- a/eclass/kde4-meta-pkg.eclass
+++ b/eclass/kde4-meta-pkg.eclass
@@ -20,7 +20,6 @@ inherit kde4-functions
 HOMEPAGE="https://www.kde.org/;
 
 LICENSE="metapackage"
-IUSE="aqua"
 
 SLOT=4
 



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-05-03 Thread Andreas Sturmlechner
commit: c84b751be40952ca568887c2cdab41153b436a6e
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 27 06:14:19 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May  3 12:28:05 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c84b751b

kde4-base.eclass: Transition deps to x11-base/xorg-proto

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

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index a10dd0e..5a9a49c 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -387,7 +387,7 @@ kdedepend="
dev-util/automoc
virtual/pkgconfig
>=x11-libs/libXtst-1.1.0
-   x11-proto/xf86vidmodeproto
+   x11-base/xorg-proto
 "
 
 kderdepend=""



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-04-10 Thread Andreas Sturmlechner
commit: aa002ff2b1d20df6e834840ba118c73af5f6db07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 10 13:31:58 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 13:31:58 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=aa002ff2

kde4*eclass: Drop maintainers to kde-sunset

 eclass/kde4-base.eclass  | 2 +-
 eclass/kde4-functions.eclass | 2 +-
 eclass/kde4-meta.eclass  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 8abade2..a10dd0e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -5,7 +5,7 @@
 # Removal on 2018-05-03.
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
-# k...@gentoo.org
+# kde-sunset overlay maintainers
 # @BLURB: This eclass provides functions for kde 4.X ebuilds
 # @DESCRIPTION:
 # The kde4-base.eclass provides support for building KDE4 based ebuilds

diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 98f972c..35ff15d 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -5,7 +5,7 @@
 # Removal on 2018-05-03.
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
-# k...@gentoo.org
+# kde-sunset overlay maintainers
 # @BLURB: Common ebuild functions for KDE 4 packages
 # @DESCRIPTION:
 # This eclass contains all functions shared by the different eclasses,

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 88d9ef8..7b67a63 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -5,7 +5,7 @@
 # Removal on 2018-03-06.
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
-# k...@gentoo.org
+# kde-sunset overlay maintainers
 # @BLURB: Eclass for writing "split" KDE packages.
 # @DESCRIPTION:
 # This eclass provides all necessary functions for writing split KDE ebuilds.



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2018-04-05 Thread Andreas Sturmlechner
commit: 6a6c6d087d85efc0acddae97a0bff1e2c0e1c456
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Apr  6 00:52:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  6 00:52:56 2018 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=6a6c6d08

kde4-{base,functions,meta}.eclass: Import from Gentoo ebuild repository

 eclass/kde4-base.eclass  | 963 +++
 eclass/kde4-functions.eclass | 431 +++
 eclass/kde4-meta.eclass  | 631 
 3 files changed, 2025 insertions(+)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
new file mode 100644
index 000..8abade2
--- /dev/null
+++ b/eclass/kde4-base.eclass
@@ -0,0 +1,963 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @DEAD
+# Removal on 2018-05-03.
+# @ECLASS: kde4-base.eclass
+# @MAINTAINER:
+# k...@gentoo.org
+# @BLURB: This eclass provides functions for kde 4.X ebuilds
+# @DESCRIPTION:
+# The kde4-base.eclass provides support for building KDE4 based ebuilds
+# and KDE4 applications.
+#
+# NOTE: KDE 4 ebuilds currently support EAPI 5. This will be
+# reviewed over time as new EAPI versions are approved.
+
+if [[ -z ${_KDE4_BASE_ECLASS} ]]; then
+_KDE4_BASE_ECLASS=1
+
+# @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: VIRTUALDBUS_TEST
+# @DESCRIPTION:
+# If defined, launch and use a private dbus session during src_test.
+
+# @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 kde4-functions toolchain-funcs flag-o-matic gnome2-utils virtualx 
versionator eutils multilib xdg-utils
+
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
+   case ${KDE_SCM} in
+   svn) inherit subversion ;;
+   git) inherit git-r3 ;;
+   esac
+fi
+
+# @ECLASS-VARIABLE: CMAKE_REQUIRED
+# @DESCRIPTION:
+# Specify if cmake buildsystem is being used. Possible values are 'always' and 
'never'.
+# Please note that if it's set to 'never' you need to explicitly override 
following phases:
+# src_configure, src_compile, src_test and src_install.
+# Defaults to 'always'.
+: ${CMAKE_REQUIRED:=always}
+if [[ ${CMAKE_REQUIRED} = always ]]; then
+   buildsystem_eclass="cmake-utils"
+   export_fns="src_configure src_compile src_test src_install"
+fi
+
+# @ECLASS-VARIABLE: KDE_MINIMAL
+# @DESCRIPTION:
+# This variable is used when KDE_REQUIRED is set, to specify required KDE 
minimal
+# version for apps to work. Currently defaults to 4.4
+# One may override this variable to raise version requirements.
+# Note that it is fixed to ${PV} for kde-base packages.
+KDE_MINIMAL="${KDE_MINIMAL:-4.4}"
+
+# Set slot for KDEBASE known packages
+case ${KDEBASE} in
+   kde-base)
+   SLOT=4/$(get_version_component_range 1-2)
+   KDE_MINIMAL="${PV}"
+   ;;
+   kdevelop)
+   if [[ ${KDE_BUILD_TYPE} = live ]]; then
+   # @ECLASS-VARIABLE: KDEVELOP_VERSION
+   # @DESCRIPTION:
+   # Specifies KDevelop version. Default is 4.0.0 for 
tagged packages and  for live packages.
+   # Applies to KDEBASE=kdevelop only.
+   KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.}"
+   # @ECLASS-VARIABLE: KDEVPLATFORM_VERSION
+   # @DESCRIPTION:
+   # Specifies KDevplatform version. Default is 1.0.0 for 
tagged packages and  for live packages.
+   # Applies to KDEBASE=kdevelop only.
+   KDEVPLATFORM_VERSION="${KDEVPLATFORM_VERSION:-4.}"
+   else
+   case ${PN} in
+   kdevelop)
+   KDEVELOP_VERSION=${PV}
+   
KDEVPLATFORM_VERSION="$(($(get_major_version)-3)).$(get_after_major_version)"
+   ;;
+   kdevplatform|kdevelop-php*|kdevelop-python)
+   
KDEVELOP_VERSION="$(($(get_major_version)+3)).$(get_after_major_version)"
+   KDEVPLATFORM_VERSION=${PV}
+   ;;
+   *)
+   
KDEVELOP_VERSION="${KDEVELOP_VERSION:-4.0.0}"
+   

[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2016-12-17 Thread Johannes Huber
commit: 3ffebd61d682e34ce36213bdaa25085da1aca842
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Dec 17 19:07:34 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Dec 17 19:07:34 2016 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=3ffebd61

kde-functions.eclass: cervisia 3.5 is in cat kde-base

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

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index d92bbac..39e0058 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -258,7 +258,7 @@ kde-base/kdepim kde-base/libkpimidentities
 kde-base/kdepim kde-base/libksieve
 kde-base/kdepim kde-base/mimelib
 kde-base/kdepim kde-base/networkstatus
-kde-base/kdesdk kde-apps/cervisia
+kde-base/kdesdk kde-base/cervisia
 kde-base/kdesdk kde-apps/kapptemplate
 kde-base/kdesdk kde-base/kbabel
 kde-base/kdesdk kde-base/kbugbuster



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2016-08-03 Thread Johannes Huber
commit: 72dc9df3c713b3a993de7a3bae2d3780f8fd02a4
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Aug  3 20:17:48 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Aug  3 20:17:48 2016 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=72dc9df3

kde4-meta-pkg.eclass: Import from gentoo main tree

 eclass/kde4-meta-pkg.eclass | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
new file mode 100644
index 000..7f74338
--- /dev/null
+++ b/eclass/kde4-meta-pkg.eclass
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# DEPRECATED
+# This eclass is deprecated. Superseded by kde5-meta-pkg.eclass.
+
+# @ECLASS: kde4-meta-pkg.eclass
+# @MAINTAINER:
+# k...@gentoo.org
+# @BLURB: This eclass contains boilerplate for kde 4.X meta packages
+# @DESCRIPTION:
+# This eclass should only be used for defining meta packages for KDE4.
+
+if [[ -z ${_KDE4_META_PKG_ECLASS} ]]; then
+_KDE4_META_PKG_ECLASS=1
+
+inherit kde4-functions
+
+HOMEPAGE="https://www.kde.org/;
+
+LICENSE="metapackage"
+IUSE="aqua"
+
+SLOT=4
+
+fi



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2016-04-24 Thread Lars Wendler
commit: 2dc399cee52a1d4a17dc46b988f5e8d0d7d6dd7d
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Apr 24 07:06:53 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Apr 24 07:06:53 2016 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=2dc399ce

eclass/kde.eclass: Fixed build with latest autoconf-archive.

Signed-off-by: Lars Wendler  gentoo.org>

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

diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index d156766..d57d047 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -235,6 +235,13 @@ kde_src_prepare() {
ln -s "${WORKDIR}/admin" "${KDE_S}/admin" || die "Unable to 
symlink the new admin/ directory"
eend 0
fi
+
+   # >=autoconf-archive-2016.03.20 tries to include
+   # ax_cxx_compile_stdcxx.m4 which these old kde packages seek in ${S}.
+   # Create a symlink so we don't break the build.
+   if [[ -f "/usr/share/aclocal/ax_cxx_compile_stdcxx.m4" ]] ; then
+   ln -s /usr/share/aclocal/ax_cxx_compile_stdcxx.m4 "${S}" || die
+   fi
 }
 
 # @FUNCTION: kde_src_configure



[gentoo-commits] proj/kde-sunset:master commit in: eclass/

2015-04-28 Thread Ian Stakenvicius
commit: c5c6c5ef1d2358984fc233d10ebb388873c59e2d
Author: Ian Stakenvicius axs AT gentoo DOT org
AuthorDate: Tue Apr 28 19:14:43 2015 +
Commit: Ian Stakenvicius axs AT gentoo DOT org
CommitDate: Tue Apr 28 19:15:51 2015 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=c5c6c5ef

Ensured EXPORT_FUNCTIONS works for EAPI3-5 in kde{,-meta}.eclass

Signed-off-by: Ian Stakenvicius axs AT gentoo.org

 eclass/kde-meta.eclass | 2 +-
 eclass/kde.eclass  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index 884ee05..570efd6 100644
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.eclass
@@ -459,5 +459,5 @@ kde-meta_src_install() {
 }
 case ${EAPI:-0} in
0|1) EXPORT_FUNCTIONS src_unpack src_compile src_install;;
-   2) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile 
src_install;;
+   2|3|4|5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure 
src_compile src_install;;
 esac

diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index eb89f30..eb99669 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -604,5 +604,5 @@ kde_pkg_postrm() {
 
 case ${EAPI:-0} in
0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install 
pkg_postinst pkg_postrm pkg_preinst;;
-   2) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure 
src_compile src_install pkg_postinst pkg_postrm pkg_preinst;;
+   2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare 
src_configure src_compile src_install pkg_postinst pkg_postrm pkg_preinst;;
 esac