diff options
41 files changed, 436 insertions, 1206 deletions
diff --git a/dev-go/blackfriday/Manifest b/dev-go/blackfriday/Manifest deleted file mode 100644 index 0127bd756182..000000000000 --- a/dev-go/blackfriday/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST blackfriday-1.2_p20150720.tar.gz 67598 BLAKE2B 2d00c4bf8194311358467b518da8f53e6adef37196323263d1854112e452e3980960bd1ad73a4af8824810e4e6e5650f9b78e2ac4db5de376567da2a5eabfeef SHA512 5c660539e50deef488f380d0dfe9cdfdae6b01f946743b439d08f7a448bda83ac4e0dc906d19458f1760ce9cd1192d5398d0c961dd762417b4af2cf18bff1777 -DIST blackfriday-1.4.tar.gz 69438 BLAKE2B 67104f972c45c828262efa297c196afc352de9e3b13b96dd8add7694cb6e7d1a5ecde599f5276dfb8aec083fcbbc1867d13d0a3d2251cc4ecc3aa6587d4891e4 SHA512 595b0c2cef166bbebdae39bbda3987409ff3c849a3eb0de73cfeff1b9afd64b4febfaa5ed3f7ef4b8020bbecbf5dfb479e7034249c58651429b3e7e5fb5107be diff --git a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild b/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild deleted file mode 100644 index 02fbba9277fe..000000000000 --- a/dev-go/blackfriday/blackfriday-1.2_p20150720.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -EGO_PN=github.com/russross/${PN} - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="amd64 ~arm64" - EGIT_COMMIT="8cec3a8" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="a markdown processor implemented in Go" -HOMEPAGE="https://github.com/russross/blackfriday" -LICENSE="BSD-2" -SLOT="0" -IUSE="" -DEPEND="dev-go/sanitized-anchor-name" -RDEPEND="" diff --git a/dev-go/blackfriday/blackfriday-1.4.ebuild b/dev-go/blackfriday/blackfriday-1.4.ebuild deleted file mode 100644 index a9dbefcdc077..000000000000 --- a/dev-go/blackfriday/blackfriday-1.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/russross/${PN} - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~arm ~arm64" - EGIT_COMMIT="v${PV}" - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="a markdown processor implemented in Go" -HOMEPAGE="https://github.com/russross/blackfriday" -LICENSE="BSD-2" -SLOT="0" -IUSE="" -DEPEND="dev-go/sanitized-anchor-name" -RDEPEND="dev-go/sanitized-anchor-name:=" diff --git a/dev-go/blackfriday/metadata.xml b/dev-go/blackfriday/metadata.xml deleted file mode 100644 index 0a17da1ee45b..000000000000 --- a/dev-go/blackfriday/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <upstream> - <remote-id type="github">russross/blackfriday</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest deleted file mode 100644 index 7c92c68dd7db..000000000000 --- a/dev-go/go-text/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST go-text-0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189 diff --git a/dev-go/go-text/go-text-0.3.0.ebuild b/dev-go/go-text/go-text-0.3.0.ebuild deleted file mode 100644 index c590eadea63f..000000000000 --- a/dev-go/go-text/go-text-0.3.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN=golang.org/x/text/... - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~arm ~x86" - EGIT_COMMIT="v${PV}" - SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="Go text processing support" -HOMEPAGE="https://godoc.org/golang.org/x/text" -LICENSE="BSD" -SLOT="0/${PVR}" -IUSE="" -DEPEND=">=dev-go/go-tools-0_pre20180817" -RDEPEND="" - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #680946 - # Create an isolated golibdir in order to avoid an - # "use of internal package not allowed" error when - # and older version is installed. - mkdir -p "${T}/golibdir/src/golang.org/x" || die - ln -s "$(get_golibdir_gopath)/src/golang.org/x/tools" "${T}/golibdir/src/golang.org/x/tools" || die - GOPATH="${S}:${T}/golibdir" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die -} - -src_install() { - golang_install_pkgs - exeopts -m0755 -p # preserve timestamps for bug 551486 - exeinto "$(go env GOROOT)/bin" - doexe bin/* -} - -src_test() { - GOPATH="${S}:${T}/golibdir" \ - go test -v -work -x "${EGO_PN}" || die -} diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild deleted file mode 100644 index 0740869fb574..000000000000 --- a/dev-go/go-text/go-text-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_SRC=golang.org/x/text -EGO_PN=${EGO_SRC}/... - -if [[ ${PV} = *9999* ]]; then - inherit golang-vcs -else - KEYWORDS="~amd64 ~arm ~x86" - EGIT_COMMIT="v${PV}" - SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - inherit golang-vcs-snapshot -fi -inherit golang-build - -DESCRIPTION="Go text processing support" -HOMEPAGE="https://godoc.org/golang.org/x/text" -LICENSE="BSD" -SLOT="0/${PVR}" -IUSE="" -DEPEND=">=dev-go/go-tools-0_pre20180817" -RDEPEND="" - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #680946 - # Create an isolated golibdir in order to avoid an - # "use of internal package not allowed" error when - # and older version is installed. - mkdir -p "${T}/golibdir/src/golang.org/x" || die - ln -s "$(get_golibdir_gopath)/src/golang.org/x/tools" "${T}/golibdir/src/golang.org/x/tools" || die - GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die -} - -src_install() { - rm -rf "${S}/src/${EGO_SRC}/.git"* || die - golang_install_pkgs - exeopts -m0755 -p # preserve timestamps for bug 551486 - exeinto "$(go env GOROOT)/bin" - doexe bin/* -} - -src_test() { - GOPATH="${S}:${T}/golibdir" GOBIN="${S}/bin" \ - go test -v -work -x "${EGO_PN}" || die -} diff --git a/dev-go/go-text/metadata.xml b/dev-go/go-text/metadata.xml deleted file mode 100644 index 67636dcbe6a6..000000000000 --- a/dev-go/go-text/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">golang/text</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest deleted file mode 100644 index 6704e0aaaa3f..000000000000 --- a/dev-java/jrrd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced diff --git a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch deleted file mode 100644 index b211ec1f3cbe..000000000000 --- a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.am (revision 7413) -+++ b/Makefile.am (working copy) -@@ -15,7 +15,7 @@ - - .java.class: - -mkdir -p $(classdir) -- $(JAVAC) -d $(classdir) $< -+ $(JAVAC) $(JAVACFLAGS) -d $(classdir) $< - - rrd_jinterface.c: org_opennms_netmgt_rrd_rrdtool_Interface.h - diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild deleted file mode 100644 index 286cb6ffdc32..000000000000 --- a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit autotools java-pkg-2 - -DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool" - -SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz" -HOMEPAGE="http://www.opennms.org/" -KEYWORDS="amd64 x86" -LICENSE="GPL-2" - -SLOT="0" - -CDEPEND="net-analyzer/rrdtool" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6" - -PATCHES=( "${FILESDIR}/${P}-javacflags.patch" ) - -src_configure() { - econf -} - -src_compile() { - emake -j1 - use doc && ejavadoc -d javadoc $(find org -name "*.java") -} - -src_install() { - java-pkg_newjar "${S}/${PN}.jar" - java-pkg_doso .libs/*.so - use source && java-pkg_dosrc org - use doc && java-pkg_dojavadoc javadoc -} diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml deleted file mode 100644 index 3c7cf2b9bec7..000000000000 --- a/dev-java/jrrd/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">opennms</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest deleted file mode 100644 index 681ab055aa4b..000000000000 --- a/dev-java/libreadline-java/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2 diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch deleted file mode 100644 index 34a01e48ae55..000000000000 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/native/Makefile -+++ b/src/native/Makefile -@@ -69,13 +69,13 @@ all: $(T_LIBS) - lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT) - - JavaReadline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - JavaEditline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - JavaGetline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS) - ifeq (MSC,$(WIN32)) diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch deleted file mode 100644 index 9af21ba83d4b..000000000000 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/native/Makefile b/src/native/Makefile -index 679adb7..a1f2a6a 100644 ---- a/src/native/Makefile -+++ b/src/native/Makefile -@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap - ifeq (cygwin,$(WIN32)) - JavaGetline_LIBS = -lcygwin - endif --CC = gcc -+CC ?= gcc - OBJ_EXT := o - LIB_PRE := lib - LIB_EXT := so --CFLAGS=-fPIC -DPOSIX -+CFLAGS += -fPIC -DPOSIX - endif - - -@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32)) - $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \ - $(OBJECTS) -W1,-e,_readline_init@12 - else -- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ -+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ - endif - endif - diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch deleted file mode 100644 index 256cf6573da1..000000000000 --- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/native/Makefile.org 2004-09-07 16:43:16.703100016 +0200 -+++ b/src/native/Makefile 2004-09-07 16:43:28.804919625 +0200 -@@ -45,8 +45,8 @@ - CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ - else - INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) --LIBPATH = -L/usr/lib/termcap --JavaReadline_LIBS = -lreadline -ltermcap -lhistory -+LIBPATH = -+JavaReadline_LIBS = -lreadline -lncurses -lhistory - JavaEditline_LIBS = -ledit -ltermcap - ifeq (cygwin,$(WIN32)) - JavaGetline_LIBS = -lcygwin diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild deleted file mode 100644 index 7df017e7b4cf..000000000000 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 eutils - -DESCRIPTION="A JNI-wrapper to GNU Readline" -HOMEPAGE="http://java-readline.sourceforge.net/" -SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -CDEPEND="sys-libs/ncurses:0=" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -DEPEND=" - virtual/jdk:1.8 - ${CDEPEND}" - -RESTRICT="test" - -# 1: See bug #157387 reported upstream. -# 2: Respect CC CFLAGS LDFLAGS, see bugs #336302 #296741. -PATCHES=( - "${FILESDIR}/termcap-to-ncurses.patch" - "${FILESDIR}/${P}-gmake.patch" - "${FILESDIR}/${P}-respect-flags.patch" -) - -DOCS=( ChangeLog NEWS README README.1st TODO ) - -src_prepare() { - default - - # See bug #157390. - sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die -} - -src_compile() { - emake -j1 - if use doc; then - # src/org/gnu/readline/Readline.java is completely bogus and generate a - # truckload of errors. Let's call make without catching anything. :( - make -j1 apidoc - fi -} - -src_install() { - java-pkg_doso *.so - java-pkg_dojar *.jar - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc api -} diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml deleted file mode 100644 index 7b73f81973fb..000000000000 --- a/dev-java/libreadline-java/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">java-readline</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest deleted file mode 100644 index 153afbe7326f..000000000000 --- a/dev-python/hacking/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST hacking-4.1.0.tar.gz 61910 BLAKE2B 95ced5b2fbafbb890478b5ef598a836520b4d1a3f1f2a0e708aa3f3135f394aab9e1ca8eaafa9d2f9f8dfcd1043d925b0232228234021ac89d2882ad6c7918a5 SHA512 44741548b5031777b0a508255129893da63a076615dc4245fdcb2368711be0ff6e16702c12c75a7f2c6b13257e2257c58e6e95dfad6da6640ff077fbf2b507db diff --git a/dev-python/hacking/hacking-4.1.0.ebuild b/dev-python/hacking/hacking-4.1.0.ebuild deleted file mode 100644 index 300c203adc98..000000000000 --- a/dev-python/hacking/hacking-4.1.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit distutils-r1 - -DESCRIPTION="A client for the OpenStack Nova API" -HOMEPAGE="https://github.com/openstack/hacking/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}] - <dev-python/flake8-3.9.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - test? ( - >=dev-python/coverage-4.5[${PYTHON_USEDEP}] - >=dev-python/ddt-1.2.1[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.20.2[${PYTHON_USEDEP}] - >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] - >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] - >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] - >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - ${RDEPEND} - ) - doc? ( - >=dev-python/sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/openstackdocstheme-2.2.1[${PYTHON_USEDEP}] - >=dev-python/reno-3.1.0[${PYTHON_USEDEP}] - )" -DISTUTILS_IN_SOURCE_BUILD=1 - -python_compile_all() { - use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html -} - -python_test() { - stestr init || die "stestr init died" - stestr run || die "testsuite failed under ${EPYTHON}" - flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/source/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/hacking/metadata.xml b/dev-python/hacking/metadata.xml deleted file mode 100644 index 26582f8ffd63..000000000000 --- a/dev-python/hacking/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> - </maintainer> - <maintainer type="project"> - <email>openstack@gentoo.org</email> - <name>Openstack</name> - </maintainer> - <longdescription lang="en"> - hacking is a set of flake8 plugins that test and enforce - the OpenStack Style Commandments, HACKING.rst - </longdescription> - <upstream> - <remote-id type="pypi">hacking</remote-id> - <remote-id type="github">openstack/hacking</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest index 2d38fa076c4d..c8357cc23f43 100644 --- a/dev-python/installer/Manifest +++ b/dev-python/installer/Manifest @@ -1,2 +1,4 @@ DIST installer-0.4.0-py2.py3-none-any.whl.zip 451433 BLAKE2B 933b7e63b3d0306213789d493d4df112df26b432d63ecd1f8f21449520c34bd2ad542aac25069043fbb535c44f988dca927625eafd0a5a20489fc3ce2bcf84a2 SHA512 cf303bb422e329a36007b361034144a232ba021d4013bb8678dc7c326544e74ec9a3b3fe8b9d3696433dbbe90d2ce4a0ae8967fb054bd5ed49321d470be729a8 DIST installer-0.4.0.gh.tar.gz 466643 BLAKE2B 635854b3461995cda3b7afa507ca3fe35cae8210e79de0bbd46938c8f103d7840ceca8bb388c2c9533efc78150691f980c478485ee33bafe0bae6c08a6aef8c4 SHA512 13537c479bc8ead8f8b45c8e5c5182e8b1b32c2889df8015be7f517f390a9efbea6fa167e0886dfade6621a8a2d822bfd662ee0238d3d86689619ca4d5483b26 +DIST installer-0.4.0_p20220115-cli.patch 14552 BLAKE2B 6632c1472ae0a578f6c7ed0acf1bb0d89ece924626b68c0daa28d9a7d93826837adaf6b0d40f048c4f5c2986b4328ca565340137e7b7fa7f407f62ebddc70275 SHA512 f8c6369955e0bde2bff0b935c39748d02659bc6ca0341af405e2c1026cf145479ba0b908bd769cdc05f3cc920f881b894b6a5eb7ace643951e05250ec0486b80 +DIST installer-0.4.0_p20220115.gh.tar.gz 466532 BLAKE2B 6dea3f4bacb52c4983e111d420495ee157076342a823b7062c6e5b3e4d3b70e6b2e9cb024d0c7baba6f88ed70f4303ab071d1882bc9d8dd0726f82a3e406056f SHA512 fbb0d4c8642fa2cbe2fd3be2eef7044a0353f04c67ecce20aafed33a0d7877ff55872ca5ad51390ae7e02cdb7af5dbd57b662085b60d425be95da6643b061eaa diff --git a/dev-python/installer/installer-0.4.0_p20220115.ebuild b/dev-python/installer/installer-0.4.0_p20220115.ebuild new file mode 100644 index 000000000000..c6fad5e821fa --- /dev/null +++ b/dev-python/installer/installer-0.4.0_p20220115.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +EGIT_COMMIT="bf68f7b045ffc08784af03cf2433548c9ee9e8ca" +DESCRIPTION="A library for installing Python wheels" +HOMEPAGE=" + https://pypi.org/project/installer/ + https://github.com/pradyunsg/installer/ + https://installer.readthedocs.io/en/latest/ +" +SRC_URI=" + https://github.com/pradyunsg/installer/archive/${EGIT_COMMIT}.tar.gz + -> ${P}.gh.tar.gz + https://files.pythonhosted.org/packages/py2.py3/${PN::1}/${PN}/${P%_p*}-py2.py3-none-any.whl + -> ${P%_p*}-py2.py3-none-any.whl.zip + https://patch-diff.githubusercontent.com/raw/pradyunsg/installer/pull/94.diff + -> ${P}-cli.patch +" +S=${WORKDIR}/${PN}-${EGIT_COMMIT} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +# NB: newer git doesn't use mock anymore +BDEPEND=" + app-arch/unzip + test? ( + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${DISTDIR}"/${P}-cli.patch +) + +# do not use any build system to avoid circular deps +python_compile() { :; } + +python_test() { + local -x PYTHONPATH=src + epytest +} + +python_install() { + python_domodule src/installer "${WORKDIR}"/*.dist-info +} diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 7bd9baba8167..200360510f80 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -78,28 +78,60 @@ esac # to be exported. It must be run in order for the eclass functions # to function properly. +# @ECLASS-VARIABLE: DISTUTILS_USE_PEP517 +# @PRE_INHERIT +# @DEFAULT_UNSET +# @DESCRIPTION: +# Enable experimental PEP 517 mode for the specified build system. +# In this mode, the complete build and install is done +# in python_compile(), venv-style install tree is provided +# to python_test() and python_install() just merges the temporary +# install tree into real fs. +# +# The variable specifies the build system used. Currently, +# the following values are supported: +# +# - flit - flit_core backend +# +# - pdm - pdm.pep517 backend +# +# - poetry - poetry-core backend +# +# - setuptools - distutils or setuptools (incl. legacy mode) +# +# - standalone - standalone build systems without external deps +# (used for bootstrapping). +# +# The variable needs to be set before the inherit line. The eclass +# adds appropriate build-time dependencies and verifies the value. + # @ECLASS-VARIABLE: DISTUTILS_USE_SETUPTOOLS +# @DEFAULT_UNSET # @PRE_INHERIT # @DESCRIPTION: # Controls adding dev-python/setuptools dependency. The allowed values # are: # # - no -- do not add the dependency (pure distutils package) +# # - bdepend -- add it to BDEPEND (the default) +# # - rdepend -- add it to BDEPEND+RDEPEND (e.g. when using pkg_resources) +# # - pyproject.toml -- use pyproject2setuptools to install a project # using pyproject.toml (flit, poetry...) +# # - manual -- do not add the dependency and suppress the checks # (assumes you will take care of doing it correctly) # # This variable is effective only if DISTUTILS_OPTIONAL is disabled. -# It needs to be set before the inherit line. -: ${DISTUTILS_USE_SETUPTOOLS:=bdepend} +# It is available only in non-PEP517 mode. It needs to be set before +# the inherit line. if [[ ! ${_DISTUTILS_R1} ]]; then [[ ${EAPI} == 6 ]] && inherit eutils xdg-utils -inherit multiprocessing toolchain-funcs +inherit multibuild multiprocessing toolchain-funcs if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then inherit python-r1 @@ -117,25 +149,61 @@ if [[ ! ${_DISTUTILS_R1} ]]; then _distutils_set_globals() { local rdep bdep - local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]' + if [[ ${DISTUTILS_USE_PEP517} ]]; then + if [[ ${DISTUTILS_USE_SETUPTOOLS} ]]; then + die "DISTUTILS_USE_SETUPTOOLS is not used in PEP517 mode" + fi - case ${DISTUTILS_USE_SETUPTOOLS} in - no|manual) - ;; - bdepend) - bdep+=" ${setuptools_dep}" - ;; - rdepend) - bdep+=" ${setuptools_dep}" - rdep+=" ${setuptools_dep}" - ;; - pyproject.toml) - bdep+=' >=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]' - ;; - *) - die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" - ;; - esac + # installer is used to install the wheel + # tomli is used to read build-backend from pyproject.toml + bdep+=' + >=dev-python/installer-0.4.0_p20220115[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}]' + case ${DISTUTILS_USE_PEP517} in + flit) + bdep+=' + dev-python/flit_core[${PYTHON_USEDEP}]' + ;; + pdm) + bdep+=' + dev-python/pdm-pep517[${PYTHON_USEDEP}]' + ;; + poetry) + bdep+=' + dev-python/poetry-core[${PYTHON_USEDEP}]' + ;; + setuptools) + bdep+=' + >=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}]' + ;; + standalone) + ;; + *) + die "Unknown DISTUTILS_USE_PEP517=${DISTUTILS_USE_PEP517}" + ;; + esac + else + local setuptools_dep='>=dev-python/setuptools-42.0.2[${PYTHON_USEDEP}]' + + case ${DISTUTILS_USE_SETUPTOOLS:-bdepend} in + no|manual) + ;; + bdepend) + bdep+=" ${setuptools_dep}" + ;; + rdepend) + bdep+=" ${setuptools_dep}" + rdep+=" ${setuptools_dep}" + ;; + pyproject.toml) + bdep+=' >=dev-python/pyproject2setuppy-22[${PYTHON_USEDEP}]' + ;; + *) + die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}" + ;; + esac + fi if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then bdep=${bdep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}} @@ -393,6 +461,9 @@ distutils_enable_tests() { _DISTUTILS_TEST_INSTALL= case ${1} in --install) + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} --install is not implemented in PEP517 mode" + fi _DISTUTILS_TEST_INSTALL=1 shift ;; @@ -465,11 +536,15 @@ esetup.py() { _python_check_EPYTHON - [[ ${BUILD_DIR} ]] && _distutils-r1_create_setup_cfg + if [[ ${BUILD_DIR} && ! ${DISTUTILS_USE_PEP517} ]]; then + _distutils-r1_create_setup_cfg + fi local setup_py=( setup.py ) if [[ ${DISTUTILS_USE_SETUPTOOLS} == pyproject.toml ]]; then setup_py=( -m pyproject2setuppy ) + elif [[ ! -f setup.py ]]; then + setup_py=( -c "from setuptools import setup; setup()" ) fi if [[ ${EAPI} != [67] && ${mydistutilsargs[@]} ]]; then @@ -483,7 +558,7 @@ esetup.py() { "${@}" || die -n local ret=${?} - if [[ ${BUILD_DIR} ]]; then + if [[ ${BUILD_DIR} && ! ${DISTUTILS_USE_PEP517} ]]; then rm "${HOME}"/.pydistutils.cfg || die -n fi @@ -521,9 +596,17 @@ esetup.py() { # # Please note that in order to test the solution properly you need # to unmerge the package first. +# +# This function is not available in PEP517 mode. The eclass provides +# a venv-style install unconditionally therefore, and therefore it +# should no longer be necessary. distutils_install_for_testing() { debug-print-function ${FUNCNAME} "${@}" + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is not implemented in PEP517 mode" + fi + # A few notes about --via-home mode: # 1) 'install --home' is terribly broken on pypy, so we need # to override --install-lib and --install-scripts, @@ -554,14 +637,26 @@ distutils_install_for_testing() { local add_args=() if [[ ${install_method} == venv ]]; then - "${EPYTHON}" -m venv --system-site-packages --without-pip \ - "${TEST_DIR}" || die + # create a quasi-venv + mkdir -p "${TEST_DIR}"/bin || die + ln -s "${PYTHON}" "${TEST_DIR}/bin/${EPYTHON}" || die + ln -s "${EPYTHON}" "${TEST_DIR}/bin/python3" || die + ln -s "${EPYTHON}" "${TEST_DIR}/bin/python" || die + cat > "${TEST_DIR}"/pyvenv.cfg <<-EOF || die + include-system-site-packages = true + EOF # we only do the minimal necessary subset of activate script PATH=${TEST_DIR}/bin:${PATH} # unset PYTHONPATH in order to prevent BUILD_DIR from overriding # venv packages unset PYTHONPATH + + # force root-style install (note: venv adds TEST_DIR to prefixes, + # so we need to pass --root=/) + add_args=( + --root=/ + ) else local bindir=${TEST_DIR}/scripts local libdir=${TEST_DIR}/lib @@ -596,6 +691,10 @@ distutils_install_for_testing() { # Stub out ez_setup.py and distribute_setup.py to prevent packages # from trying to download a local copy of setuptools. _distutils-r1_disable_ez_setup() { + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is not implemented in PEP517 mode" + fi + local stub="def use_setuptools(*args, **kwargs): pass" if [[ -f ez_setup.py ]]; then echo "${stub}" > ez_setup.py || die @@ -610,6 +709,10 @@ _distutils-r1_disable_ez_setup() { # @DESCRIPTION: # Generate setup.py for pyproject.toml if requested. _distutils-r1_handle_pyproject_toml() { + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is not implemented in PEP517 mode" + fi + [[ ${DISTUTILS_USE_SETUPTOOLS} == manual ]] && return if [[ ! -f setup.py && -f pyproject.toml ]]; then @@ -660,8 +763,10 @@ distutils-r1_python_prepare_all() { fi fi - _distutils-r1_disable_ez_setup - _distutils-r1_handle_pyproject_toml + if [[ ! ${DISTUTILS_USE_PEP517} ]]; then + _distutils-r1_disable_ez_setup + _distutils-r1_handle_pyproject_toml + fi if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]] then @@ -678,6 +783,10 @@ distutils-r1_python_prepare_all() { # Create implementation-specific configuration file for distutils, # setting proper build-dir (and install-dir) paths. _distutils-r1_create_setup_cfg() { + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is not implemented in PEP517 mode" + fi + cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die [build] build_base = ${BUILD_DIR} @@ -705,8 +814,8 @@ _distutils-r1_create_setup_cfg() { zip_safe = False _EOF_ - # we can't refer to ${D} before src_install() if [[ ${EBUILD_PHASE} == install ]]; then + # we can't refer to ${D} before src_install() cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die # installation paths -- allow calling extra install targets @@ -718,6 +827,7 @@ _distutils-r1_create_setup_cfg() { _EOF_ if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + # this gets appended to [install] cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die install_scripts = $(python_get_scriptdir) _EOF_ @@ -732,11 +842,44 @@ _distutils-r1_create_setup_cfg() { # egg-base in esetup.py). This way, we respect whatever's in upstream # egg-info. _distutils-r1_copy_egg_info() { + if [[ ${DISTUTILS_USE_PEP517} ]]; then + die "${FUNCNAME} is not implemented in PEP517 mode" + fi + mkdir -p "${BUILD_DIR}" || die # stupid freebsd can't do 'cp -t ${BUILD_DIR} {} +' find -name '*.egg-info' -type d -exec cp -R -p {} "${BUILD_DIR}"/ ';' || die } +# @FUNCTION: _distutils-r1_backend_to_key +# @USAGE: <backend> +# @INTERNAL +# @DESCRIPTION: +# Print the DISTUTILS_USE_PEP517 value corresponding to the backend +# passed as the only argument. +_distutils-r1_backend_to_key() { + debug-print-function ${FUNCNAME} "${@}" + + local backend=${1} + case ${backend} in + flit_core.buildapi) + echo flit + ;; + pdm.pep517.api) + echo pdm + ;; + poetry.core.masonry.api) + echo poetry + ;; + setuptools.build_meta|setuptools.build_meta:__legacy__) + echo setuptools + ;; + *) + die "Unknown backend: ${backend}" + ;; + esac +} + # @FUNCTION: distutils-r1_python_compile # @USAGE: [additional-args...] # @DESCRIPTION: @@ -751,16 +894,92 @@ distutils-r1_python_compile() { _python_check_EPYTHON - _distutils-r1_copy_egg_info + # call setup.py build when using setuptools (either via PEP517 + # or in legacy mode) + if [[ ${DISTUTILS_USE_PEP517:-setuptools} == setuptools ]]; then + if [[ ! ${DISTUTILS_USE_PEP517} ]]; then + _distutils-r1_copy_egg_info + fi - # distutils is parallel-capable since py3.5 - local jobs=$(makeopts_jobs "${MAKEOPTS}" INF) - if [[ ${jobs} == INF ]]; then - local nproc=$(get_nproc) - jobs=$(( nproc + 1 )) + # distutils is parallel-capable since py3.5 + local jobs=$(makeopts_jobs "${MAKEOPTS}" INF) + if [[ ${jobs} == INF ]]; then + local nproc=$(get_nproc) + jobs=$(( nproc + 1 )) + fi + + esetup.py build -j "${jobs}" "${@}" fi - esetup.py build -j "${jobs}" "${@}" + if [[ ${DISTUTILS_USE_PEP517} ]]; then + if [[ -n ${DISTUTILS_ARGS[@]} || -n ${mydistutilsargs[@]} ]]; then + die "DISTUTILS_ARGS are not supported in PEP-517 mode" + fi + + # python likes to compile any module it sees, which triggers sandbox + # failures if some packages haven't compiled their modules yet. + addpredict "${EPREFIX}/usr/lib/${EPYTHON}" + addpredict /usr/lib/pypy3.8 + addpredict /usr/lib/portage/pym + addpredict /usr/local # bug 498232 + + local -x WHEEL_BUILD_DIR=${BUILD_DIR}/wheel + mkdir -p "${WHEEL_BUILD_DIR}" || die + + local build_backend + if [[ -f pyproject.toml ]]; then + build_backend=$("${EPYTHON}" -c 'import tomli; \ + print(tomli.load(open("pyproject.toml", "rb")) \ + ["build-system"]["build-backend"])' 2>/dev/null) + fi + if [[ -z ${build_backend} && ${DISTUTILS_USE_PEP517} == setuptools && + -f setup.py ]] + then + # use the legacy setuptools backend + build_backend=setuptools.build_meta:__legacy__ + fi + [[ -z ${build_backend} ]] && + die "Unable to obtain build-backend from pyproject.toml" + + if [[ ${DISTUTILS_USE_PEP517} != standalone ]]; then + local expected_value=$(_distutils-r1_backend_to_key "${build_backend}") + if [[ ${DISTUTILS_USE_PEP517} != ${expected_value} ]]; then + eerror "DISTUTILS_USE_PEP517 does not match pyproject.toml!" + eerror " have: DISTUTILS_USE_PEP517=${DISTUTILS_USE_PEP517}" + eerror "expected: DISTUTILS_USE_PEP517=${expected_value}" + eerror "(backend: ${build_backend})" + die "DISTUTILS_USE_PEP517 value incorrect" + fi + fi + + einfo "Building a wheel via ${build_backend}" + "${EPYTHON}" -c "import ${build_backend%:*}; \ + import os; \ + ${build_backend/:/.}.build_wheel(os.environ['WHEEL_BUILD_DIR'])" || + die "Wheel build failed" + + local wheel=( "${WHEEL_BUILD_DIR}"/*.whl ) + if [[ ${#wheel[@]} -ne 1 ]]; then + die "Incorrect number of wheels created (${#wheel[@]}): ${wheel[*]}" + fi + + local root=${BUILD_DIR}/install + # NB: --compile-bytecode does not produce the correct paths, + # and python_optimize doesn't handle being called outside D, + # so we just defer compiling until the final merge + "${EPYTHON}" -m installer -d "${root}" "${wheel}" \ + --no-compile-bytecode || + die "installer failed" + + # enable venv magic inside the install tree + mkdir -p "${root}"/usr/bin || die + ln -s "${PYTHON}" "${root}/usr/bin/${EPYTHON}" || die + ln -s "${EPYTHON}" "${root}/usr/bin/python3" || die + ln -s "${EPYTHON}" "${root}/usr/bin/python" || die + cat > "${root}"/usr/pyvenv.cfg <<-EOF || die + include-system-site-packages = true + EOF + fi } # @FUNCTION: _distutils-r1_wrap_scripts @@ -872,59 +1091,73 @@ distutils-r1_python_install() { _python_check_EPYTHON - local root=${D%/}/_${EPYTHON} - [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} - - # inline DISTUTILS_ARGS logic from esetup.py in order to make - # argv overwriting easier - local args=( - "${DISTUTILS_ARGS[@]}" - "${mydistutilsargs[@]}" - install --skip-build --root="${root}" "${args[@]}" - "${@}" - ) - local DISTUTILS_ARGS=() - local mydistutilsargs=() - - # enable compilation for the install phase. - local -x PYTHONDONTWRITEBYTECODE= - - # python likes to compile any module it sees, which triggers sandbox - # failures if some packages haven't compiled their modules yet. - addpredict "${EPREFIX}/usr/lib/${EPYTHON}" - addpredict /usr/lib/pypy3.8 - addpredict /usr/lib/portage/pym - addpredict /usr/local # bug 498232 + local scriptdir=${EPREFIX}/usr/bin + if [[ ${DISTUTILS_USE_PEP517} ]]; then + local root=${BUILD_DIR}/install + local rscriptdir=${root}$(python_get_scriptdir) + [[ -d ${rscriptdir} ]] && + die "${rscriptdir} should not exist!" + # remove venv magic + rm "${root}"/usr/{pyvenv.cfg,bin/{python,python3,${EPYTHON}}} || die + find "${root}"/usr/bin -empty -delete || die + if [[ ! ${DISTUTILS_SINGLE_IMPL} && -d ${root}/usr/bin ]]; then + mkdir -p "${rscriptdir%/*}" || die + mv "${root}/usr/bin" "${rscriptdir}" || die + fi + else + local root=${D%/}/_${EPYTHON} + [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/} + + # inline DISTUTILS_ARGS logic from esetup.py in order to make + # argv overwriting easier + local args=( + "${DISTUTILS_ARGS[@]}" + "${mydistutilsargs[@]}" + install --skip-build --root="${root}" "${args[@]}" + "${@}" + ) + local DISTUTILS_ARGS=() + local mydistutilsargs=() + + # enable compilation for the install phase. + local -x PYTHONDONTWRITEBYTECODE= + + # python likes to compile any module it sees, which triggers sandbox + # failures if some packages haven't compiled their modules yet. + addpredict "${EPREFIX}/usr/lib/${EPYTHON}" + addpredict /usr/lib/pypy3.8 + addpredict /usr/lib/portage/pym + addpredict /usr/local # bug 498232 - if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then - # user may override --install-scripts - # note: this is poor but distutils argv parsing is dumb - local scriptdir=${EPREFIX}/usr/bin - - # rewrite all the arguments - set -- "${args[@]}" - args=() - while [[ ${@} ]]; do - local a=${1} - shift + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + # user may override --install-scripts + # note: this is poor but distutils argv parsing is dumb + + # rewrite all the arguments + set -- "${args[@]}" + args=() + while [[ ${@} ]]; do + local a=${1} + shift + + case ${a} in + --install-scripts=*) + scriptdir=${a#--install-scripts=} + ;; + --install-scripts) + scriptdir=${1} + shift + ;; + *) + args+=( "${a}" ) + ;; + esac + done + fi - case ${a} in - --install-scripts=*) - scriptdir=${a#--install-scripts=} - ;; - --install-scripts) - scriptdir=${1} - shift - ;; - *) - args+=( "${a}" ) - ;; - esac - done + esetup.py "${args[@]}" fi - esetup.py "${args[@]}" - local forbidden_package_names=( examples test tests .pytest_cache .hypothesis @@ -948,8 +1181,15 @@ distutils-r1_python_install() { die "Package installs 'share' in PyPy prefix, see bug #465546." fi - if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then + if [[ ! ${DISTUTILS_SINGLE_IMPL} || ${DISTUTILS_USE_PEP517} ]]; then multibuild_merge_root "${root}" "${D%/}" + if [[ ${DISTUTILS_USE_PEP517} ]]; then + # we need to recompile everything here in order to embed + # the correct paths + python_optimize "${D%/}$(python_get_sitedir)" + fi + fi + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then _distutils-r1_wrap_scripts "${scriptdir}" fi } @@ -990,12 +1230,21 @@ distutils-r1_run_phase() { fi local BUILD_DIR=${BUILD_DIR}/build fi - local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" - # make PATH local for distutils_install_for_testing calls - # it makes little sense to let user modify PATH in per-impl phases - # and _all() already localizes it - local -x PATH=${PATH} + if [[ ${DISTUTILS_USE_PEP517} ]]; then + local -x PATH=${BUILD_DIR}/install/usr/bin:${PATH} + else + local -x PYTHONPATH="${BUILD_DIR}/lib:${PYTHONPATH}" + + # make PATH local for distutils_install_for_testing calls + # it makes little sense to let user modify PATH in per-impl phases + # and _all() already localizes it + local -x PATH=${PATH} + + # Undo the default switch in setuptools-60+ for the time being, + # to avoid replacing .egg-info file with directory in-place. + local -x SETUPTOOLS_USE_DISTUTILS="${SETUPTOOLS_USE_DISTUTILS:-stdlib}" + fi # Bug 559644 # using PYTHONPATH when the ${BUILD_DIR}/lib is not created yet might lead to diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass index 37568ebf87cc..a0941ae02ea4 100644 --- a/eclass/multibuild.eclass +++ b/eclass/multibuild.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multibuild.eclass @@ -6,25 +6,20 @@ # Michał Górny <mgorny@gentoo.org> # @AUTHOR: # Author: Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 4 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: A generic eclass for building multiple variants of packages. # @DESCRIPTION: # The multibuild eclass aims to provide a generic framework for building # multiple 'variants' of a package (e.g. multilib, Python # implementations). -case "${EAPI:-0}" in - [0-3]) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - [4-8]) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 6|7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_MULTIBUILD} ]]; then +if [[ ! ${_MULTIBUILD_ECLASS} ]]; then +_MULTIBUILD_ECLASS=1 # @ECLASS-VARIABLE: MULTIBUILD_VARIANTS # @REQUIRED @@ -137,25 +132,6 @@ multibuild_foreach_variant() { return ${ret} } -# @FUNCTION: multibuild_parallel_foreach_variant -# @USAGE: [<argv>...] -# @DESCRIPTION: -# Run the passed command repeatedly for each of the enabled package -# variants. This used to run the commands in parallel but now it's -# just a deprecated alias to multibuild_foreach_variant. -# -# The function returns 0 if all commands return 0, or the first non-zero -# exit status otherwise. However, it performs all the invocations -# nevertheless. It is preferred to call 'die' inside of the passed -# function. -multibuild_parallel_foreach_variant() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" - - multibuild_foreach_variant "${@}" -} - # @FUNCTION: multibuild_for_best_variant # @USAGE: [<argv>...] # @DESCRIPTION: @@ -172,10 +148,7 @@ multibuild_for_best_variant() { [[ ${MULTIBUILD_VARIANTS} ]] \ || die "MULTIBUILD_VARIANTS need to be set" - # bash-4.1 can't handle negative subscripts - local MULTIBUILD_VARIANTS=( - "${MULTIBUILD_VARIANTS[$(( ${#MULTIBUILD_VARIANTS[@]} - 1 ))]}" - ) + local MULTIBUILD_VARIANTS=( "${MULTIBUILD_VARIANTS[-1]}" ) multibuild_foreach_variant "${@}" } @@ -192,15 +165,10 @@ multibuild_copy_sources() { einfo "Will copy sources from ${_MULTIBUILD_INITIAL_BUILD_DIR}" - local cp_args=() - if cp --reflink=auto --version &>/dev/null; then - # enable reflinking if possible to make this faster - cp_args+=( --reflink=auto ) - fi - _multibuild_create_source_copy() { einfo "${MULTIBUILD_VARIANT}: copying to ${BUILD_DIR}" - cp -p -R "${cp_args[@]}" \ + # enable reflinking if possible to make this faster + cp -p -R --reflink=auto \ "${_MULTIBUILD_INITIAL_BUILD_DIR}" "${BUILD_DIR}" || die } @@ -234,43 +202,14 @@ run_in_build_dir() { # (the real root). Both directories have to be real, absolute paths # (i.e. including ${D}). Source root will be removed. multibuild_merge_root() { + debug-print-function ${FUNCNAME} "${@}" + local src=${1} local dest=${2} - local ret - - if use userland_BSD; then - # Most of BSD variants fail to copy broken symlinks, #447370 - # also, they do not support --version - - tar -C "${src}" -f - -c . \ - | tar -x -f - -C "${dest}" - [[ ${PIPESTATUS[*]} == '0 0' ]] - ret=${?} - else - local cp_args=() - - if cp -a --version &>/dev/null; then - cp_args+=( -a ) - else - cp_args+=( -P -R -p ) - fi - - if cp --reflink=auto --version &>/dev/null; then - # enable reflinking if possible to make this faster - cp_args+=( --reflink=auto ) - fi - - cp "${cp_args[@]}" "${src}"/. "${dest}"/ - ret=${?} - fi - - if [[ ${ret} -ne 0 ]]; then - die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed." - fi - - rm -rf "${src}" + # enable reflinking if possible to make this faster + cp -a --reflink=auto "${src}"/. "${dest}"/ || die "${MULTIBUILD_VARIANT:-(unknown)}: merging image failed" + rm -rf "${src}" || die } -_MULTIBUILD=1 fi diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 17cd7da0d189..a47e65611354 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2013-2021 Gentoo Authors +# Copyright 2013-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass @@ -6,7 +6,7 @@ # Michał Górny <mgorny@gentoo.org> # @AUTHOR: # Author: Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @PROVIDES: multibuild # @BLURB: flags and utility functions for building multilib packages # @DESCRIPTION: @@ -19,14 +19,13 @@ # to properly request multilib enabled. case ${EAPI} in - 5|6|7|8) ;; + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_MULTILIB_BUILD} ]]; then -_MULTILIB_BUILD=1 +if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then +_MULTILIB_BUILD_ECLASS=1 -[[ ${EAPI} == 5 ]] && inherit eutils inherit multibuild multilib # @ECLASS-VARIABLE: _MULTILIB_FLAGS @@ -244,23 +243,6 @@ multilib_parallel_foreach_abi() { multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" } -# @FUNCTION: multilib_for_best_abi -# @USAGE: <argv>... -# @DESCRIPTION: -# Runs the given command with setup for the 'best' (usually native) ABI. -multilib_for_best_abi() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" - - eqawarn "QA warning: multilib_for_best_abi() function is deprecated and should" - eqawarn "not be used. The multilib_is_native_abi() check may be used instead." - - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) - - multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" -} - # @FUNCTION: multilib_check_headers # @DESCRIPTION: # Check whether the header files are consistent between ABIs. @@ -583,20 +565,6 @@ multilib_is_native_abi() { [[ ${COMPLETE_MULTILIB} == yes || ${ABI} == ${DEFAULT_ABI} ]] } -# @FUNCTION: multilib_build_binaries -# @DESCRIPTION: -# Deprecated synonym for multilib_is_native_abi -multilib_build_binaries() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EAPI} == 5 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}, use multilib_is_native_abi() instead" - - eqawarn "QA warning: multilib_build_binaries is deprecated. Please use the equivalent" - eqawarn "multilib_is_native_abi function instead." - - multilib_is_native_abi "${@}" -} - # @FUNCTION: multilib_native_use_with # @USAGE: <flag> [<opt-name> [<opt-value>]] # @DESCRIPTION: diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 9a1efe2cc466..92968b6cf213 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-minimal.eclass # @MAINTAINER: # Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @PROVIDES: multilib-build # @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions # @DESCRIPTION: @@ -23,18 +23,15 @@ # # If you need generic install rules, use multilib_src_install_all function. - case ${EAPI} in - 5|6|7|8) ;; + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac - -[[ ${EAPI} == 5 ]] && inherit eutils inherit multilib-build -EXPORT_FUNCTIONS src_configure src_compile src_test src_install - +if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then +_MULTILIB_MINIMAL_ECLASS=1 multilib-minimal_src_configure() { debug-print-function ${FUNCNAME} "$@" @@ -123,3 +120,7 @@ multilib-minimal_src_install() { einstalldocs fi } + +fi + +EXPORT_FUNCTIONS src_configure src_compile src_test src_install diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 4f427713655a..f50cdd974355 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,2 +1 @@ -DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712 DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml index 8df2cebe3bd8..574ac5004315 100644 --- a/net-misc/wget/metadata.xml +++ b/net-misc/wget/metadata.xml @@ -6,7 +6,7 @@ <name>Gentoo Base System</name> </maintainer> <use> - <flag name="cookie_check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag> + <flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag> <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag> <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag> <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag> diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild deleted file mode 100644 index 2a526b27a951..000000000000 --- a/net-misc/wget/wget-1.21.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" -RESTRICT="!test? ( test )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) - idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) - metalink? ( media-libs/libmetalink ) - pcre? ( dev-libs/libpcre2[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) -" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if [[ ${CHOST} == *-darwin* ]] ; then - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00050.html - # https://lists.gnu.org/archive/html/bug-findutils/2021-01/msg00051.html - append-cppflags '-D__nonnull\(X\)=' - fi - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - local myeconfargs=( - --disable-assert - --disable-pcre - --disable-rpath - --without-included-libunistring - --without-libunistring-prefix - $(use_enable debug) - $(use_enable idn iri) - $(use_enable ipv6) - $(use_enable nls) - $(use_enable ntlm) - $(use_enable pcre pcre2) - $(use_enable ssl digest) - $(use_enable ssl opie) - $(use_with cookie_check libpsl) - $(use_with idn libidn) - $(use_with metalink) - $(use_with ssl ssl $(usex gnutls gnutls openssl)) - $(use_with uuid libuuid) - $(use_with zlib) - ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED}"/etc/wgetrc \ - "${ED}"/usr/share/man/man1/wget.1 \ - "${ED}"/usr/share/info/wget.info \ - || die -} diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild index 5ccba5ae93b2..d29f599f5169 100644 --- a/net-misc/wget/wget-1.21.2.ebuild +++ b/net-misc/wget/wget-1.21.2.ebuild @@ -14,13 +14,13 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="cookie_check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" +IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" # Force a newer libidn2 to avoid libunistring deps. #612498 LIB_DEPEND=" - cookie_check? ( net-libs/libpsl ) + cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) @@ -35,19 +35,20 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND=" ${RDEPEND} static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + nls? ( sys-devel/gettext ) test? ( ${PYTHON_DEPS} - dev-lang/perl dev-perl/HTTP-Daemon dev-perl/HTTP-Message dev-perl/IO-Socket-SSL ) " -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" DOCS=( AUTHORS MAILING-LIST NEWS README ) @@ -98,7 +99,7 @@ src_configure() { $(use_enable pcre pcre2) $(use_enable ssl digest) $(use_enable ssl opie) - $(use_with cookie_check libpsl) + $(use_with cookie-check libpsl) $(use_with idn libidn) $(use_with metalink) $(use_with ssl ssl $(usex gnutls gnutls openssl)) diff --git a/profiles/package.mask b/profiles/package.mask index 5d104049d771..d52abb941fa0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -237,11 +237,6 @@ sys-apps/hwids <dev-util/nvidia-cuda-sdk-11 <dev-util/nvidia-cuda-toolkit-11 -# Michał Górny <mgorny@gentoo.org> (2021-12-20) -# Switches from deprecated stdlib distutils to vendored distutils -# by default. Masked for testing. See tracker bug #822354. ->=dev-python/setuptools-60 - # Jonas Stein <jstein@gentoo.org> (2021-12-20) # Package is broken and obsolete. # Removal on 2022-02-01. Bug #828875. @@ -266,11 +261,6 @@ app-emulation/qemu-riscv64-bin # Package without consumers. Bug #771693 (multiple CVEs). Removal in 30 days. dev-java/jackson -# Zac Medico <zmedico@gentoo.org> (2021-12-18) -# Fails to compile and has no reverse dependencies. -# Removal in 30 days. Bug #800141 -dev-go/go-text - # Mart Raudsepp <leio@gentoo.org> (2021-12-18) # GNOME 42 mask >=gui-libs/libhandy-1.5.0 @@ -283,31 +273,6 @@ dev-go/go-text =sys-kernel/vanilla-kernel-5.14* =virtual/dist-kernel-5.14* -# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-12-18) -# Package without consumers. Bug #829517 Bug_#614480. Removal in 30 days. -dev-java/libreadline-java - -# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-12-18) -# Package without consumers. Bug_#736880. Removal in 30 days. -dev-java/jrrd - -# Michał Górny <mgorny@gentoo.org> (2021-12-17) -# Annoying package with deps pinned to old versions of packages. -# All revdeps were eliminated. -# Removal on 2022-01-16. Bug #829410. -dev-python/hacking - -# William Hubbs <williamh@gentoo.org> (2021-12-15) -# This is a go module and is included in projects directly. -# Bug #819639; masked for removal on 2022-01-15. -dev-go/blackfriday - -# Marco Scardovi <marco@scardovi.com> (2021-12-15) -# Outdated, we are the only one who still have a package for them. -# Removal in 30 days. # Bug #829216 -sys-cluster/mpe2 -sci-biology/gibbs - # Georgy Yakovlev <gyakovlev@gentoo.org> (2021-12-14) # AT&T decided to roll back community changes in March 2020 # for version 2020.x.x diff --git a/sci-biology/gibbs/Manifest b/sci-biology/gibbs/Manifest deleted file mode 100644 index 24b52453c962..000000000000 --- a/sci-biology/gibbs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gibbs-3.1.tar.gz 563300 BLAKE2B 74b97407ccdac49d19dd2fa5fe3a5384b52a3ae871f197c1212e818fb7ce2307f2d04a91cf8a1d14c82d57b6f7266bbae849091bec9e580b8d473b595a836212 SHA512 b1ffc0d0c7debaced3c3d850eb7d2c42e13358d1e7c6ff5e6be0273446edc50bd655c52c5ae904a9054d47d7a48abd54a7684534ba7681375b657ad77fb8cb52 diff --git a/sci-biology/gibbs/files/gibbs-3.1-fix-CFLAGS.patch b/sci-biology/gibbs/files/gibbs-3.1-fix-CFLAGS.patch deleted file mode 100644 index 6eaad637cfc8..000000000000 --- a/sci-biology/gibbs/files/gibbs-3.1-fix-CFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -51,7 +51,7 @@ - fi
- ])
-
--CFLAGS="$OPTFLAGS $MPIFLAGS -Wall -Werror $MACFLAG"
-+CFLAGS="$CFLAGS $OPTFLAGS $MPIFLAGS -Wall $MACFLAG"
-
- AC_PROG_CC([$COMP_LIST])
-
diff --git a/sci-biology/gibbs/gibbs-3.1.ebuild b/sci-biology/gibbs/gibbs-3.1.ebuild deleted file mode 100644 index a06d0880ee4d..000000000000 --- a/sci-biology/gibbs/gibbs-3.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Identify motifs, conserved regions, in DNA or protein sequences" -HOMEPAGE="http://bayesweb.wadsworth.org/gibbs/gibbs.html" -SRC_URI="mirror://gentoo/gibbs-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="mpi" - -DEPEND=" - mpi? ( - virtual/mpi - sys-cluster/mpe2 - )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-3.1-fix-CFLAGS.patch ) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - use mpi && export CC=mpicc - econf $(use_enable mpi) -} - -src_install() { - default - - exeinto /usr/$(get_libdir)/${PN} - doexe *.pl -} - -pkg_postinst() { - einfo "Supplementary Perl scripts for Gibbs have been installed into ${EROOT}/usr/$(get_libdir)/${PN}." - einfo "These scripts require installation of sci-biology/bioperl." -} diff --git a/sci-biology/gibbs/metadata.xml b/sci-biology/gibbs/metadata.xml deleted file mode 100644 index a0cd7b42b3ab..000000000000 --- a/sci-biology/gibbs/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-biology@gentoo.org</email> - <name>Gentoo Biology Project</name> - </maintainer> - <longdescription> - The Gibbs motif sampler stochastically examines candidate alignments - in an effort to find the best alignment as measured by the maximum - a posteriori (MAP) log-likelihood ratio. - </longdescription> -</pkgmetadata> diff --git a/sys-cluster/mpe2/Manifest b/sys-cluster/mpe2/Manifest deleted file mode 100644 index 0ea3ce5b29e9..000000000000 --- a/sys-cluster/mpe2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mpe2-1.0.6p1.tar.gz 9313216 BLAKE2B 0c04d4dc6ed6396140c1d34f2e715c38765999c812f5d04a2e1b3970ab2dfec9bc45ada49e8e2c53f46b745cf3605c508728a9e38cd73ca0cd320cc9c2ce72a4 SHA512 89aa4197aef4fdef14db032f058772c179bbb9055ad369338588a883ed9e75c825e396a1233d8dc079db605eeb1aa3a8ccd392c2df6ea0ccd89cd0433ba371b4 diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch deleted file mode 100644 index 4f2119ec69f0..000000000000 --- a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Mon, 13 Sep 2010 14:18:51 -0400 -Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes - -- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. -- Do not install libraries during the compile phase. ---- - src/slog2sdk/trace_rlog/src/Makefile.in | 19 ++++++++----------- - 1 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in -index 9b289b8..2d772e0 100644 ---- a/src/slog2sdk/trace_rlog/src/Makefile.in -+++ b/src/slog2sdk/trace_rlog/src/Makefile.in -@@ -48,7 +48,8 @@ RM = @RM@ - - JNI_INC = @JNI_INC@ - CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ --LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ - - # memory leak checker - MEMLIBS = @DEBUG_LIBS@ -@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ - - $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(libbuild_dir) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(libbuild_dir) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) -- $(LIBTOOL) --finish $(libbuild_dir) - - INSTALL_LIBSO: $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(LIBDIR) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(LIBDIR) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) -- $(LIBTOOL) --finish $(LIBDIR) - - $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) -- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) - - $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) -- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) - - clean: - @-$(RM) *.@OBJEXT@ *.lo *.la --- -1.7.1 - diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch deleted file mode 100644 index 717911ffb710..000000000000 --- a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001 -From: Justin Bronder <jsbronder@gmail.com> -Date: Mon, 13 Sep 2010 14:22:10 -0400 -Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes - -- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. -- Do not install libraries during the compile phase. ---- - src/slog2sdk/trace_sample/src/Makefile.in | 19 ++++++++----------- - 1 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in -index f716fff..8d3641a 100644 ---- a/src/slog2sdk/trace_sample/src/Makefile.in -+++ b/src/slog2sdk/trace_sample/src/Makefile.in -@@ -48,7 +48,8 @@ RM = @RM@ - - JNI_INC = @JNI_INC@ - CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ --LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -+LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ - - # memory leak checker - MEMLIBS = @DEBUG_LIBS@ -@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ - - $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(libbuild_dir) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(libbuild_dir) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) -- $(LIBTOOL) --finish $(libbuild_dir) - - INSTALL_LIBSO: $(LOBJ) - if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -export-symbols $(srcdir)/JavaTraceInput.sym \ - -rpath $(LIBDIR) ; \ - else \ -- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ -+ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ - -rpath $(LIBDIR) ; \ - fi -- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) -- $(LIBTOOL) --finish $(LIBDIR) - - $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) -- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) - - $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) -- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) -+ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) - - clean: - @-$(RM) *.@OBJEXT@ *.lo *.la --- -1.7.1 - diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml deleted file mode 100644 index f5fb83321f9e..000000000000 --- a/sys-cluster/mpe2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cluster@gentoo.org</email> - <name>Gentoo Cluster Project</name> - </maintainer> -</pkgmetadata> diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild deleted file mode 100644 index 71802728bcba..000000000000 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_NEEDED=fortran - -inherit epatch fortran-2 java-pkg-opt-2 toolchain-funcs - -MY_P=${P/_/} - -DESCRIPTION="MPI development tools" -HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm" -SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz" - -LICENSE="mpich2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug minimal fortran threads" - -COMMON_DEPEND=" - !minimal? ( - x11-libs/libXtst - x11-libs/libXi - ) - || ( - sys-cluster/openmpi[fortran?,threads?] - sys-cluster/mpich2[fortran?,threads?] - )" - -DEPEND=" - !minimal? ( >=virtual/jdk-1.6 ) - ${COMMON_DEPEND}" - -RDEPEND=" - !minimal? ( >=virtual/jre-1.6 ) - ${COMMON_DEPEND}" - -S="${WORKDIR}"/${MY_P} -MPE_IMP="" - -# README: -# This ebuild is created to handle building with both mpich2 and openmpi. -# However, without empi (in the science overlay), and some further -# conversion to use mpi.eclass, we can only handle one implementation -# at a time. I still believe it's better to have the ebuild setup -# correctly in preperation. - -pkg_setup() { - fortran-2_pkg_setup - local i - - if has_version sys-cluster/openmpi; then - MPE_IMP=openmpi - elif has_version sys-cluster/mpich2; then - MPE_IMP=mpich2 - elif has_version sys-cluster/mpich; then - MPE_IMP=mpich2 - else - die "Unknown MPI implementation" - fi - - export JFLAGS="${JFLAGS} $(java-pkg_javac-args)" - - if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - elog "Currently src_test fails on collchk with openmpi, hence" - elog "testing is disabled by default. If you would like to" - elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1" - elog "to your environment." - echo - fi - - einfo "Building with support for: sys-cluster/${MPE_IMP}" - - use minimal || java-pkg-opt-2_pkg_setup -} - -src_prepare() { - # Don't assume path contains ./ - sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die - epatch \ - "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch \ - "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch - - use minimal || java-pkg-opt-2_src_prepare -} - -src_configure() { - local c="--with-mpicc=/usr/bin/mpicc" - - if use fortran; then - c+=" --with-mpif77=/usr/bin/mpif77" - else - c+=" --disable-f77" - fi - - if use minimal; then - c+=" --enable-slog2=no --disable-rlog --disable-sample" - else - c+=" --with-java2=$(java-config --jdk-home) --enable-slog2=build" - fi - - [[ "${MPE_IMP}" == openmpi ]] && c+=" --disable-rlog --disable-sample" - - econf ${c} \ - --sysconfdir=/etc/${PN} \ - --datadir=/usr/share/${PN} \ - --with-htmldir=/usr/share/${PN} \ - --with-docdir=/usr/share/${PN} \ - --enable-collchk \ - --enable-wrappers \ - $(use_enable !minimal graphics) \ - $(use_enable threads threadlogging) \ - $(use_enable debug g) -} - -src_test() { - local rc - - cd "${S}" || die - if [[ "${MPE_IMP}" == mpich2 ]]; then - echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die - chmod 600 "${T}"/mpd.conf || die - export MPD_CONF_FILE="${T}/mpd.conf" - "${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die - elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then - echo - einfo "Skipping tests for openmpi" - echo - return 0 - fi - - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - emake -j1 \ - CC="${S}"/bin/mpecc \ - FC="${S}"/bin/mpefc \ - MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \ - CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \ - check; - rc=${?} - if [[ "${MPE_IMP}" == mpich2 ]]; then - "${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid) - fi - - return ${rc} -} - -src_install() { - # No parallel make: - # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1 - MAKEOPTS+=" -j1" - default - rm -f "${ED}"/usr/sbin/mpeuninstall || die - rm -f "${ED}"/usr/bin/*.in || die -} |