Merge updates from master

6 files changed, 3 insertions, 369 deletions

diff --git a/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild b/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
index 0fae01aee1f3..a84b7363f54a 100644
--- a/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
+++ b/app-portage/cfg-update/cfg-update-1.8.9-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rich0/cfg-update/archive/${PV}.tar.gz -> ${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-portage/cfg-update/cfg-update-1.8.9.ebuild b/app-portage/cfg-update/cfg-update-1.8.9.ebuild
deleted file mode 100644
index d899e6016d2b..000000000000
--- a/app-portage/cfg-update/cfg-update-1.8.9.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Easy to use GUI & CLI alternative for etc-update"
-HOMEPAGE="https://github.com/rich0/cfg-update"
-SRC_URI="https://github.com/rich0/cfg-update/tarball/${PV} -> ${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
-IUSE="X"
-
-RDEPEND="
-	dev-perl/TermReadKey
-	X? (
-		>=x11-misc/sux-1.0
-		x11-apps/xhost
-		)"
-
-S="${WORKDIR}/rich0-cfg-update-2f10786"
-
-pkg_prerm() {
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Disabling portage hook"
-		cfg-update --ebuild --disable-portage-hook
-		eend $?
-		ebegin "Disabling paludis hook"
-		cfg-update --ebuild --disable-paludis-hook
-		eend $?
-	fi
-}
-
-pkg_postrm() {
-	echo
-	ewarn "If you want to permanently remove cfg-update from your system"
-	ewarn "you should remove the index file /var/lib/cfg-update/checksum.index"
-	echo
-}
-
-src_install() {
-	dobin \
-		cfg-update emerge_with_indexing_for_cfg-update \
-		emerge_with_indexing_for_cfg-update_phphelper \
-		cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
-	insinto /usr/lib/cfg-update
-	doins cfg-update cfg-update_indexing test.tgz
-	dodoc ChangeLog
-	doman *.8
-	insinto /etc
-	doins cfg-update.conf cfg-update.hosts
-	keepdir /var/lib/cfg-update
-}
-
-pkg_postinst() {
-	if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
-		&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
-	then
-		ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
-		mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
-			"${ROOT}"/var/lib/cfg-update/checksum.index
-		eend $?
-	fi
-
-	if [[ -e "${ROOT}"/usr/bin/paludis ]]
-	then
-		echo
-		ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
-		ewarn "that you have some corrupted CONTENTS files on your system..."
-		echo
-		ewarn "Please run: cfg-update --check-packages"
-		echo
-		ewarn "The above command will check all packages installed with Paludis and"
-		ewarn "will output a list of packages that need to be re-installed with"
-		ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
-		ewarn "you risk losing your custom settings when updating configuration"
-		ewarn "files, that belong to these packages, with cfg-update!"
-		echo
-	fi
-
-	if [[ ${ROOT} == / ]]
-	then
-		ebegin "Moving backups to /var/lib/cfg-update/backups"
-		/usr/bin/cfg-update --ebuild --move-backups
-		eend $?
-	fi
-
-	echo
-	einfo "If this is a first time install, please check the configuration"
-	einfo "in /etc/cfg-update.conf before using cfg-update:"
-	echo
-	einfo "If your system does not have an X-server installed you need to"
-	einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
-	einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
-	einfo "xxdiff, beediff, kdiff3, meld (default), gtkdiff, gvimdiff, tkdiff"
-	echo
-	einfo "TIP: to maximize the chances of future automatic updates, run:"
-	einfo "cfg-update --optimize-backups"
-	echo
-}
diff --git a/dev-java/jline/files/maven-build.properties b/dev-java/jline/files/maven-build.properties
deleted file mode 100644
index 66ef7cf2840e..000000000000
--- a/dev-java/jline/files/maven-build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Sun Jan 21 15:31:06 EET 2007
-maven.build.finalName=jline-0.9.9
-maven.build.outputDir=${maven.build.dir}/classes
-maven.build.resourceDir.0=src/main/resources
-maven.build.testResourceDir.0=src/test/resources
-maven.build.testOutputDir=${maven.build.dir}/test-classes
-maven.repo.local=lib
-maven.settings.offline=false
-maven.build.dir=target
-maven.settings.interactiveMode=true
-maven.build.srcDir.0=src/main/java
-maven.build.testDir.0=src/test/java
diff --git a/dev-java/jline/files/maven-build.xml b/dev-java/jline/files/maven-build.xml
deleted file mode 100644
index 7be70998ddcc..000000000000
--- a/dev-java/jline/files/maven-build.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 1/21/07 3:31 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jline-from-maven" default="dist" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environnement properties                                         -->
-  <!-- ====================================================================== -->
-
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jline-0.9.9"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/main/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-
-  <property name="maven.settings.offline" value="true"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-  <path id="build.test.classpath">
-    <fileset dir="${maven.repo.local}">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="junit-present, compile" 
-          description="Compile the test code" 
-          if="junit.present">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.3" 
-           verbose="false" 
-           fork="false" 
-           source="1.3">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-    <copy todir="${maven.build.testOutputDir}">
-      <fileset dir="${maven.build.testResourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="junit-present, compile-tests" 
-          if="junit.present" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="junit-present" 
-          depends="test-junit-present" 
-          unless="junit.present">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Dist target                                                            -->
-  <!-- ====================================================================== -->
-
-  <target name="dist" depends="package,test" description="Package the application and run tests"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="true" 
-         ignoreerrors="true"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
-         usetimestamp="true" 
-         ignoreerrors="true"/>
-  </target>
-</project>
diff --git a/dev-python/hiredis/hiredis-2.0.0-r1.ebuild b/dev-python/hiredis/hiredis-2.0.0-r1.ebuild
deleted file mode 100644
index 02466dc119cc..000000000000
--- a/dev-python/hiredis/hiredis-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${P}-system-libs.patch
-	)
-	sed -i -e 's:description-file:description_file:' setup.cfg || die
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest -v reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/numexpr/numexpr-2.8.0.ebuild b/dev-python/numexpr/numexpr-2.8.0.ebuild
index fd9a606a6675..a456aa137930 100644
--- a/dev-python/numexpr/numexpr-2.8.0.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.0.ebuild
@@ -15,29 +15,11 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="mkl"
 
-RDEPEND="
+DEPEND="
 	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	mkl? ( sci-libs/mkl )
 "
-
-python_prepare_all() {
-	# TODO: mkl can be used but it fails for me
-	# only works with mkl in tree. newer mkl will use pkgconfig
-	if use mkl; then
-		use amd64 && local ext="_lp64"
-		cat > site.cfg <<- _EOF_ || die
-			[mkl]
-			library_dirs = ${MKLROOT}/lib/em64t
-			include_dirs = ${MKLROOT}/include
-			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
-			mkl_intel_thread, mkl_core, iomp5
-		_EOF_
-	fi
-
-	distutils-r1_python_prepare_all
-}
+RDEPEND=${DEPEND}
 
 python_test() {
 	pushd "${BUILD_DIR}"/lib >/dev/null || die