diff options
71 files changed, 497 insertions, 344 deletions
diff --git a/dev-erlang/base64url/metadata.xml b/dev-erlang/base64url/metadata.xml index 79c7806a55ab..866c3203a324 100644 --- a/dev-erlang/base64url/metadata.xml +++ b/dev-erlang/base64url/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/cache_tab/metadata.xml b/dev-erlang/cache_tab/metadata.xml index da7e6bbbf4e9..85df7b9cadd3 100644 --- a/dev-erlang/cache_tab/metadata.xml +++ b/dev-erlang/cache_tab/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <longdescription lang="en"> diff --git a/dev-erlang/eimp/metadata.xml b/dev-erlang/eimp/metadata.xml index b06cdac151aa..66011c53a5c0 100644 --- a/dev-erlang/eimp/metadata.xml +++ b/dev-erlang/eimp/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/epam/metadata.xml b/dev-erlang/epam/metadata.xml index a9b652440b41..be9498d2a76a 100644 --- a/dev-erlang/epam/metadata.xml +++ b/dev-erlang/epam/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/eredis/metadata.xml b/dev-erlang/eredis/metadata.xml index c692b14f5506..74fd2361a31f 100644 --- a/dev-erlang/eredis/metadata.xml +++ b/dev-erlang/eredis/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/esip/metadata.xml b/dev-erlang/esip/metadata.xml index cb493f98ebc0..ff769db22dff 100644 --- a/dev-erlang/esip/metadata.xml +++ b/dev-erlang/esip/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/ezlib/metadata.xml b/dev-erlang/ezlib/metadata.xml index 73a339c9fe47..ebf7f0a0fbd9 100644 --- a/dev-erlang/ezlib/metadata.xml +++ b/dev-erlang/ezlib/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/fast_tls/metadata.xml b/dev-erlang/fast_tls/metadata.xml index 3fc3485d6800..82c53241ef6a 100644 --- a/dev-erlang/fast_tls/metadata.xml +++ b/dev-erlang/fast_tls/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/fast_xml/metadata.xml b/dev-erlang/fast_xml/metadata.xml index 6cb8a8b96bc6..ca110500a3bd 100644 --- a/dev-erlang/fast_xml/metadata.xml +++ b/dev-erlang/fast_xml/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/fast_yaml/metadata.xml b/dev-erlang/fast_yaml/metadata.xml index f42ec4b7f472..6e6470bce3f4 100644 --- a/dev-erlang/fast_yaml/metadata.xml +++ b/dev-erlang/fast_yaml/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/goldrush/metadata.xml b/dev-erlang/goldrush/metadata.xml index fedf07abdaa3..c0eed44ec262 100644 --- a/dev-erlang/goldrush/metadata.xml +++ b/dev-erlang/goldrush/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/idna/metadata.xml b/dev-erlang/idna/metadata.xml index 7d0a22a4d4fe..4943424ae150 100644 --- a/dev-erlang/idna/metadata.xml +++ b/dev-erlang/idna/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/jiffy/metadata.xml b/dev-erlang/jiffy/metadata.xml index 586629b67fdd..075bdfe392f7 100644 --- a/dev-erlang/jiffy/metadata.xml +++ b/dev-erlang/jiffy/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/jose/metadata.xml b/dev-erlang/jose/metadata.xml index e45558cdb344..35919dc10c53 100644 --- a/dev-erlang/jose/metadata.xml +++ b/dev-erlang/jose/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/lager/metadata.xml b/dev-erlang/lager/metadata.xml index d882506cd3fe..bc8b377b4fc5 100644 --- a/dev-erlang/lager/metadata.xml +++ b/dev-erlang/lager/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <longdescription lang="en"> diff --git a/dev-erlang/luerl/metadata.xml b/dev-erlang/luerl/metadata.xml index 06fe3a2647cc..f91f6e18cf3c 100644 --- a/dev-erlang/luerl/metadata.xml +++ b/dev-erlang/luerl/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/meck/metadata.xml b/dev-erlang/meck/metadata.xml index 690e0258268f..acaca2d2fef4 100644 --- a/dev-erlang/meck/metadata.xml +++ b/dev-erlang/meck/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/mqtree/metadata.xml b/dev-erlang/mqtree/metadata.xml index dd68e81a9893..7ecfb120dd7f 100644 --- a/dev-erlang/mqtree/metadata.xml +++ b/dev-erlang/mqtree/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/p1_mysql/metadata.xml b/dev-erlang/p1_mysql/metadata.xml index 0049acefd592..4e19f53d8a4a 100644 --- a/dev-erlang/p1_mysql/metadata.xml +++ b/dev-erlang/p1_mysql/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/p1_oauth2/metadata.xml b/dev-erlang/p1_oauth2/metadata.xml index 1b02d2184446..44f18bb2b73c 100644 --- a/dev-erlang/p1_oauth2/metadata.xml +++ b/dev-erlang/p1_oauth2/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/p1_pgsql/metadata.xml b/dev-erlang/p1_pgsql/metadata.xml index 46d3616d86a0..e1d73b1abd30 100644 --- a/dev-erlang/p1_pgsql/metadata.xml +++ b/dev-erlang/p1_pgsql/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/p1_utils/metadata.xml b/dev-erlang/p1_utils/metadata.xml index f79a26d3c09d..ae3174ba25e7 100644 --- a/dev-erlang/p1_utils/metadata.xml +++ b/dev-erlang/p1_utils/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <longdescription lang="en"> diff --git a/dev-erlang/pkix/metadata.xml b/dev-erlang/pkix/metadata.xml index e244a5a49223..f555f65ecb78 100644 --- a/dev-erlang/pkix/metadata.xml +++ b/dev-erlang/pkix/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/proper/metadata.xml b/dev-erlang/proper/metadata.xml index 78dcc547afb3..0ad5806f6914 100644 --- a/dev-erlang/proper/metadata.xml +++ b/dev-erlang/proper/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/sqlite3/metadata.xml b/dev-erlang/sqlite3/metadata.xml index b0c0d90381f4..120c0cf1dd4d 100644 --- a/dev-erlang/sqlite3/metadata.xml +++ b/dev-erlang/sqlite3/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/stringprep/metadata.xml b/dev-erlang/stringprep/metadata.xml index dd5c3bd734bb..aecad4f5260d 100644 --- a/dev-erlang/stringprep/metadata.xml +++ b/dev-erlang/stringprep/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <longdescription lang="en"> diff --git a/dev-erlang/stun/metadata.xml b/dev-erlang/stun/metadata.xml index 3ec44fca17a9..086142171705 100644 --- a/dev-erlang/stun/metadata.xml +++ b/dev-erlang/stun/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/xmpp/metadata.xml b/dev-erlang/xmpp/metadata.xml index ecb028955e8d..e870b89083fd 100644 --- a/dev-erlang/xmpp/metadata.xml +++ b/dev-erlang/xmpp/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-erlang/yconf/metadata.xml b/dev-erlang/yconf/metadata.xml index d33dedda8842..9c843c8f055f 100644 --- a/dev-erlang/yconf/metadata.xml +++ b/dev-erlang/yconf/metadata.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="project"> <email>ejabberd@gentoo.org</email> </maintainer> <upstream> diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index a34afde25353..611ca7c5adad 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -2,3 +2,4 @@ DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd DIST swipl-8.1.14.tar.gz 10772544 BLAKE2B d272b6cd5a096d6422a2afc7fe27354c3c0e45462580e05c85916b604b28566d6f454fff1cf72c4194194fdea2577c0c73c9c9e556322eee4d904e079e5a5bd7 SHA512 360c18af7e53c85f33bfa1afbe19f99c6afbe72e8f86436dfc034485f92dd60d1fa1320826438532bd84f842ccba730826efefecdc4fdbae0d2f71bc590c4ae5 DIST swipl-8.1.15.tar.gz 10786301 BLAKE2B e79795f92e269dfc9b8150d63cfac946285a4a433ae2d4445b381ac37fe5bfb9df2f9d1fe48b3531c430a792d74414fdb0219b2ec14b75a974639246402e67fa SHA512 97d2873acb5c5a9806e6c8a99633a093a62cb3f6c693b42265a97d9c3bb0d44b286627a2a962ba031c99be6a19f5a63eada831b625deb8e22dc9423136788f2e DIST swipl-8.1.16.tar.gz 10793960 BLAKE2B 4c353fe4b839e50e47c2e063ed38913fb4271fb51974bf88f745769fa8f39e2c731bf687d3f3b8531d0dc31fe7f50e82d24f2f27e7a68cfcbbdb5a6b68f9c347 SHA512 f62b8e3fdead3273e3cb6a58a3087c012dca6c8cc7ede239ad833a59641ded4c275e2b8820b719c6f335b2730bab75ac70df09fba743e8d7d20567dc6b79ac60 +DIST swipl-8.1.17.tar.gz 10858037 BLAKE2B 69d6528e250dfd780c17bd87c2d79f2923a4ed413d44a5b1f77ca28c2077d8000dc991058fe47a7aaaa6310cf015049980463005d53294a71ba610e43b67b0dd SHA512 42a5a529e1ed935501e87cab28ab5b6d3a18283027bb801a7e3d66d41342fe6ee74de70fe9e8a341f360ab145d0a2e49d8937cb661cfec52f9105c4cf06dc735 diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild new file mode 100644 index 000000000000..8b822e794107 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild index c21800f30138..7f5420b9dea6 100644 --- a/dev-python/attrs/attrs-19.3.0.ebuild +++ b/dev-python/attrs/attrs-19.3.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND=" dev-python/zope-interface[${PYTHON_USEDEP}]" diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild index a9de582f3904..d4bf62bd622a 100644 --- a/dev-python/backports/backports-1.0.ebuild +++ b/dev-python/backports/backports-1.0.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit distutils-r1 diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild index 75d446076b66..e02bc5f8163f 100644 --- a/dev-python/functools32/functools32-3.2.3.ebuild +++ b/dev-python/functools32/functools32-3.2.3.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 diff --git a/dev-python/hypothesis/hypothesis-4.47.5.ebuild b/dev-python/hypothesis/hypothesis-4.47.5.ebuild index 3def9e851218..770694de7897 100644 --- a/dev-python/hypothesis/hypothesis-4.47.5.ebuild +++ b/dev-python/hypothesis/hypothesis-4.47.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild index 956f9fc47cda..fb7d99ad0efe 100644 --- a/dev-python/pbr/pbr-5.1.1.ebuild +++ b/dev-python/pbr/pbr-5.1.1.ebuild @@ -37,7 +37,9 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_5,3_6})] + $(python_gen_cond_dep ' + >=dev-python/stestr-2.1.0[${PYTHON_USEDEP}] + ' python{2_7,3_5,3_6}) >=dev-python/coverage-4.0[${PYTHON_USEDEP}] !~dev-python/coverage-4.4[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] diff --git a/dev-python/psutil/psutil-5.6.7.ebuild b/dev-python/psutil/psutil-5.6.7.ebuild index 4d56ce828c32..35ea4c888d6f 100644 --- a/dev-python/psutil/psutil-5.6.7.ebuild +++ b/dev-python/psutil/psutil-5.6.7.ebuild @@ -39,3 +39,9 @@ python_test() { TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/__main__.py || die "tests failed with ${EPYTHON}" } + +python_compile() { + # force -j1 to avoid .o linking race conditions + local MAKEOPTS=-j1 + distutils-r1_python_compile +} diff --git a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild index be8d2e2c6014..f1887be46558 100644 --- a/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild +++ b/dev-python/ptyprocess/ptyprocess-0.5.2.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 ) inherit distutils-r1 diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild index 41541677e930..13393f067ff7 100644 --- a/dev-python/pygments/pygments-2.4.2.ebuild +++ b/dev-python/pygments/pygments-2.4.2.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy pypy3 ) inherit distutils-r1 bash-completion-r1 @@ -11,7 +12,7 @@ MY_PN="Pygments" MY_P="${MY_PN}-${PV}" DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/" +HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" @@ -21,8 +22,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} +DEPEND=" test? ( dev-python/nose[${PYTHON_USEDEP}] virtual/ttf-fonts diff --git a/dev-python/regex/regex-2019.11.1.ebuild b/dev-python/regex/regex-2019.11.1.ebuild index 6b42bd5991f0..5fb1e5270dad 100644 --- a/dev-python/regex/regex-2019.11.1.ebuild +++ b/dev-python/regex/regex-2019.11.1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} ) inherit distutils-r1 flag-o-matic diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 544e144408b9..e2ae22df030f 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -1,5 +1,3 @@ DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c DIST setuptools-41.5.1.zip 851097 BLAKE2B 2411db77cffb24190c1510c7fab623ae0fb2a248994eae01e1a79427d35d8bf6a2f065de0d95dc11105df0bb42962a57c914486b48dc91115ec32e4dbcbc059d SHA512 eb6e944c80448873f8970477aaf474e75879e2b81b91fdc7a308670fed231d52880c3be3452e7ed3f094f20d4afe54b1db24ec4d98845ed47ee5e71dbf66261d -DIST setuptools-42.0.0.zip 852125 BLAKE2B b3cbba2eb97f7d6d0bb1a1d582c927680ada8d4589c4a196886f95cddd5b8c8b14fb5f0a2397ab7bcdc4ddd5fe6d4eddfab53bf9f43e0781a666f3d88efb8117 SHA512 d430605f8da3820b8d902d339b63bc382b9ec1bb0187385f792226bdfa8c191634df69881e1c43ffa8900599307d0ba202cfcb2d30df12d061f8220b9eae854a -DIST setuptools-42.0.1.zip 852264 BLAKE2B fac352a9d87245655f8183a8037552d454441ca5d18be60986d3d7883472a8be6af83614cb73896b76a251eadb09c1a67db9789ddbc5beb1dd9c3e1ddadd671a SHA512 d8eea952dc3cd925ddf3aaf059e9042dcb2684fd841446d92f309fcf8ad1869a380784d137006ca1b46ee539b4e1867e5b61eae80553295897df702966447232 DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35 diff --git a/dev-python/setuptools/setuptools-42.0.0.ebuild b/dev-python/setuptools/setuptools-42.0.0.ebuild deleted file mode 100644 index 8c33401e75bd..000000000000 --- a/dev-python/setuptools/setuptools-42.0.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/pypa/setuptools.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) -BDEPEND=" - app-arch/unzip - test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -PATCHES=( - # fix regression introduced by reinventing deprecated 'imp' - # https://github.com/pypa/setuptools/pull/1905 - "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch -) - -python_prepare_all() { - if [[ ${PV} == "9999" ]]; then - python_setup - ${EPYTHON} bootstrap.py || die - fi - - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 42.0.0 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-42.0.1.ebuild b/dev-python/setuptools/setuptools-42.0.1.ebuild deleted file mode 100644 index 58369bab16cb..000000000000 --- a/dev-python/setuptools/setuptools-42.0.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) -PYTHON_REQ_USE="xml(+)" - -inherit distutils-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/pypa/setuptools.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/" - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -# Temporary hack to avoid py38 keywording hell. Please remove when -# the test deps all have py38. Also setuptools' test pass with py38, -# so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) -BDEPEND=" - app-arch/unzip - test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - ) -" -PDEPEND=" - >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -PATCHES=( - # fix regression introduced by reinventing deprecated 'imp' - # https://github.com/pypa/setuptools/pull/1905 - "${FILESDIR}"/setuptools-42.0.0-imp-fix.patch -) - -python_prepare_all() { - if [[ ${PV} == "9999" ]]; then - python_setup - ${EPYTHON} bootstrap.py || die - fi - - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - if [[ ${EPYTHON} == python3.8 ]]; then - if [[ ${PV} != 42.0.1 ]]; then - eerror "Please disable py38 hacks and test locally, then update this." - die "Python 3.8 support untested for ${PV}" - fi - einfo "Skipping testing on ${EPYTHON} due to unkeyworded deps" - return - fi - - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild b/dev-python/setuptools/setuptools-42.0.2.ebuild index 98b924808219..4a4fdf1ae704 100644 --- a/dev-python/setuptools/setuptools-42.0.2.ebuild +++ b/dev-python/setuptools/setuptools-42.0.2.ebuild @@ -27,17 +27,18 @@ RESTRICT="!test? ( test )" # Temporary hack to avoid py38 keywording hell. Please remove when # the test deps all have py38. Also setuptools' test pass with py38, # so you need to hack them all in locally before bumping and test. -TEST_USEDEP=$(python_gen_usedep python2_7 python3_{5,6,7} pypy{,3}) BDEPEND=" app-arch/unzip test? ( - dev-python/mock[${TEST_USEDEP}] - dev-python/pip[${TEST_USEDEP}] - >=dev-python/pytest-3.7.0[${TEST_USEDEP}] - dev-python/pytest-fixture-config[${TEST_USEDEP}] - dev-python/pytest-virtualenv[${TEST_USEDEP}] - dev-python/wheel[${TEST_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}] + dev-python/pytest-fixture-config[${PYTHON_USEDEP}] + dev-python/pytest-virtualenv[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] + ' python2_7 python3_{5,6,7} pypy{,3}) ) " PDEPEND=" diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild index 4515f1964935..c1cb67664e4f 100644 --- a/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild +++ b/dev-python/snowballstemmer/snowballstemmer-1.2.1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy pypy3 ) inherit distutils-r1 diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest index d9524e321fb4..044123e69391 100644 --- a/dev-python/tld/Manifest +++ b/dev-python/tld/Manifest @@ -1,3 +1,3 @@ DIST tld-0.10.tar.gz 1072577 BLAKE2B b4fbd245e16e905a4dd40980c376cb52a3ec21581e25b09ae07d66799c922eb31964bfbbdffbb7e28437ba094500d32d9f34e6f7214ed530222e598bbefd28f1 SHA512 8fc993d9a8457e0130d576eeb9bccef0bac8246f428ade466f46cee6dca509985157d28ba260dfd027f9f7f6abcb6b7ff3157b2846f05fe94e9c415021ca5488 -DIST tld-0.11.1.tar.gz 1342605 BLAKE2B 839f64e958d85b7b87053a6cb7e55903f6ebda67fbbba81364bd51421c37c113feba72ab9813255948e30cd29fc7ee5a0dcff93eafee135fb4bb59f2f2136a96 SHA512 02853e8123609debd2e6038b851e9d94dbfb06c959a8aa8ef827a25003b1997fd4560d1e00ffeddf0593ba24fce44fc58c895441e72dd05d4443f4fad201aa60 +DIST tld-0.11.8.tar.gz 1344244 BLAKE2B 37c485cbb4067db78e68c07b5c68ad8ef67026b30dcc683dd2af9e468ef9bef3b2d7684c7d1a311c1867336e615af4d817ea204511701a0aae28b9bfc3c0d5fb SHA512 d36f5a13ef871f54b654df3a136416e4fde8552ccbec8a398f51ae391672f9ce3e5e9d5a7b7e3b5714e800116dd9db9c1080dcbed5f8d801d20930a70e4e64e4 DIST tld-0.9.7.tar.gz 912360 BLAKE2B be5373040a689fc4d8831c85fb9da29070978c6ea6a7c279caf9dace80c3171ad414861f2558bcdd3ae0f15cba33e577f40869c536611a14eeafc4c1265fdcc4 SHA512 45a42f0c9ffe18912c33c26f30eda33117efd37688cfadbdb05514e22249d0c371629cb29a1d2eb4bce49efdb5d45bab3438f1b6e0dddef905b7ec6ad4fd99e5 diff --git a/dev-python/tld/tld-0.11.1.ebuild b/dev-python/tld/tld-0.11.8.ebuild index 69a5552112df..4ea3d4e0326b 100644 --- a/dev-python/tld/tld-0.11.1.ebuild +++ b/dev-python/tld/tld-0.11.8.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) inherit distutils-r1 diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild index 45fecefe1811..1f8f348b6b03 100644 --- a/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild +++ b/dev-python/wcwidth/wcwidth-0.1.7-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" diff --git a/eclass/fox.eclass b/eclass/fox.eclass index 529f5a258953..0964025d2d8e 100644 --- a/eclass/fox.eclass +++ b/eclass/fox.eclass @@ -1,6 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# @DEAD +# All consumers were last rited. Removal in 30 days. + # @ECLASS: fox.eclass # @MAINTAINER: # maintainer-needed@gentoo.org diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index 58c1691a2fe2..d83dce4bc3a2 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1 +1,2 @@ DIST imv-2.1.3.tar.gz 27664 BLAKE2B f873863d897161675b4cfbcc3c4136eebd0176317f30d656dd4c7a92615c926d1a0410d6c80283bb3a25055f3a9b710fa0763ffb86ff63ed1dd919ad3f0dfe8c SHA512 0ecdaad9b4518c2107a14969cf9348542c2ef88707be7b2b5eed435915292687d63e4ebd29cb42297cbc3dfee408ec29fd019ad6ae4f0cd789753aad84aa8128 +DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28 diff --git a/media-gfx/imv/imv-4.0.1.ebuild b/media-gfx/imv/imv-4.0.1.ebuild new file mode 100644 index 000000000000..6dfc034c43a6 --- /dev/null +++ b/media-gfx/imv/imv-4.0.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs xdg-utils + +DESCRIPTION="Minimal image viewer designed for tiling window manager users" +HOMEPAGE="https://github.com/eXeC64/imv" +SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +freeimage jpeg png svg test tiff wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( X wayland ) +" + +RDEPEND=" + !sys-apps/renameutils + media-libs/fontconfig + media-libs/libsdl2 + media-libs/sdl2-ttf + X? ( + x11-libs/pango + x11-libs/libX11 + ) + freeimage? ( media-libs/freeimage ) + jpeg? ( media-libs/libjpeg-turbo ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff ) + wayland? ( dev-libs/wayland ) +" +BDEPEND=" + app-text/asciidoc + test? ( dev-util/cmocka ) +" +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die +} + +src_configure() { + tc-export PKG_CONFIG + local WINDOWS + if use X; then + if ! use wayland; then + WINDOWS=x11 + else + WINDOWS=all + fi + else + if use wayland; then + WINDOWS=wayland + fi + fi + + BACKENDS=( + BACKEND_FREEIMAGE=$(usex freeimage) + BACKEND_JPEG=$(usex jpeg) + BACKEND_LIBPNG=$(usex png) + BACKEND_LIBRSVG=$(usex svg) + BACKEND_LIBTIFF=$(usex tiff) + WINDOWS=${WINDOWS} + ) +} + +src_compile() { + emake ${BACKENDS[@]} +} + +src_install() { + emake ${BACKENDS[@]} DESTDIR="${D}" install +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 275366fe87f1..927a92ad3595 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -1,30 +1,83 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit xdg-utils git-r3 +EAPI=7 +inherit git-r3 toolchain-funcs xdg-utils DESCRIPTION="Minimal image viewer designed for tiling window manager users" HOMEPAGE="https://github.com/eXeC64/imv" -EGIT_REPO_URI="https://github.com/eXeC64/imv.git" +EGIT_REPO_URI="https://github.com/eXeC64/imv" LICENSE="GPL-2+" SLOT="0" KEYWORDS="" -IUSE="test" +IUSE="X +freeimage jpeg png svg test tiff wayland" RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( X wayland ) +" RDEPEND=" !sys-apps/renameutils media-libs/fontconfig media-libs/libsdl2 media-libs/sdl2-ttf - media-libs/freeimage + X? ( + x11-libs/pango + x11-libs/libX11 + ) + freeimage? ( media-libs/freeimage ) + jpeg? ( media-libs/libjpeg-turbo ) + png? ( media-libs/libpng ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff ) + wayland? ( dev-libs/wayland ) +" +BDEPEND=" + app-text/asciidoc + test? ( dev-util/cmocka ) " +DEPEND=" + ${RDEPEND} +" + +src_prepare() { + default + sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die +} -DEPEND="${RDEPEND} - test? ( dev-util/cmocka )" +src_configure() { + tc-export PKG_CONFIG + local WINDOWS + if use X; then + if ! use wayland; then + WINDOWS=x11 + else + WINDOWS=all + fi + else + if use wayland; then + WINDOWS=wayland + fi + fi + + BACKENDS=( + BACKEND_FREEIMAGE=$(usex freeimage) + BACKEND_JPEG=$(usex jpeg) + BACKEND_LIBPNG=$(usex png) + BACKEND_LIBRSVG=$(usex svg) + BACKEND_LIBTIFF=$(usex tiff) + WINDOWS=${WINDOWS} + ) +} + +src_compile() { + emake ${BACKENDS[@]} +} + +src_install() { + emake ${BACKENDS[@]} DESTDIR="${D}" install +} pkg_postinst() { xdg_desktop_database_update diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index 457f62f9ff76..edeb0befd84a 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> +<maintainer type='person'><email>jer@gentoo.org</email></maintainer> +<use> +<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag> +</use> <upstream> <remote-id type="github">eXeC64/imv</remote-id> </upstream> diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest index a872528467de..0b485fc52a99 100644 --- a/media-gfx/scour/Manifest +++ b/media-gfx/scour/Manifest @@ -1,3 +1 @@ -DIST scour-0.35.tar.gz 80981 BLAKE2B 6cf0eba35a9deadf44534d3e8370187ec7b7655e9dc31f25b5bf465fee7482eb18ee985b0702c7fa8cb5db89cb1579186fee1c43b890ba4c74f4e86cd793927a SHA512 9a09d862d66e21a63744401a44f517eef268288408556e3541218713ee8c5b5c0414ab03ac61d5d2fdbd2f01fa3276793b17f110d44cdec1c53c7b7dee16afc0 -DIST scour-0.36.tar.gz 91575 BLAKE2B be65b751151cf939601b6c0dec0613d13be6367f761fc8d7201bd58f2a3475858740be0d972446e2727852b79b1197b82d217b51dd3ae41c0bada10d53d462b7 SHA512 8593f46a0e36fe220f5ce6dd85696172435712491cd1a6983c12054965ce96eeb2a52be0877f8fa6967444817abfc353f9a00f1d8d676cbd6651cfd33a0790f7 DIST scour-0.37.tar.gz 95478 BLAKE2B f3037b691b110f84266c742ac1212a8069e0ac1260f818610dfecc7ee64a257d9e0772c7c675e4062286cf4b719fe48782c416a0cb85a136ea315b22da58c460 SHA512 ffc9bd33eec038126d781dac50c89e4275d0d5e14ec2b2247a7727af91ac2ffe5522c69b5386f75df67a0b88f8ed62cb6a2ad47d600e55b123d937ba33e9e501 diff --git a/media-gfx/scour/scour-0.35-r1.ebuild b/media-gfx/scour/scour-0.35-r1.ebuild deleted file mode 100644 index 47e1066ec112..000000000000 --- a/media-gfx/scour/scour-0.35-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -inherit distutils-r1 - -DESCRIPTION="Take an SVG file and produce a cleaner and more concise file" -HOMEPAGE="http://www.codedread.com/scour/" -SRC_URI="https://github.com/codedread/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -python_test() { - "${EPYTHON}" testscour.py -v || die "Tests fail with ${EPYTHON}" -} diff --git a/media-gfx/scour/scour-0.36.ebuild b/media-gfx/scour/scour-0.36.ebuild deleted file mode 100644 index 0ce936f07ef5..000000000000 --- a/media-gfx/scour/scour-0.36.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -inherit distutils-r1 - -DESCRIPTION="Take an SVG file and produce a cleaner and more concise file" -HOMEPAGE="https://github.com/scour-project/scour" -SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -python_test() { - "${EPYTHON}" testscour.py -v || die "Tests fail with ${EPYTHON}" -} diff --git a/media-libs/libgig/libgig-4.2.0.ebuild b/media-libs/libgig/libgig-4.2.0.ebuild index ee4a39704c59..2ccb3fcaa142 100644 --- a/media-libs/libgig/libgig-4.2.0.ebuild +++ b/media-libs/libgig/libgig-4.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc ~x86" IUSE="doc" RDEPEND=" diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest index d6768c3c56d9..4c531bb5b732 100644 --- a/media-plugins/calf/Manifest +++ b/media-plugins/calf/Manifest @@ -1 +1,2 @@ DIST calf-0.90.1.tar.gz 15872959 BLAKE2B 5d2d9e77ea600690814e503a0af0fcbc413b7a21496271add0ea3b1e83f3dc2d56b0df249447a861884422ac5b159befe2632c232fed4721cc7e0e7ac45f12b1 SHA512 48e5489fd3e1dd43ff520b3653597dea6903c60adcdd0462ac2ce4db6f35e2355a0386f8a29066b301dd9c3190f8f836a61d12f37cfc3a4fea3170947cec03ff +DIST calf-0.90.3.tar.gz 15908050 BLAKE2B b3fff0232f6e0c70987108c5e12a47c606394acf010f1223275aa76472498cfda8e9ae82ccc6eae870225c05935a2c832817d8b1f9ade3f6c0ebc84aedfbfd33 SHA512 328a49f7c031e58b786bc1db5fa180f663d7910b2dfc781bccb2f3e0e2ab4158a1f62de96ef0b9e44cbedf778aaaedfb99a12b47dccddab739bf279001b3a1d7 diff --git a/media-plugins/calf/calf-0.90.3.ebuild b/media-plugins/calf/calf-0.90.3.ebuild new file mode 100644 index 000000000000..e8aaa6330d72 --- /dev/null +++ b/media-plugins/calf/calf-0.90.3.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools xdg + +DESCRIPTION="A set of open source instruments and effects for digital audio workstations" +HOMEPAGE="http://calf-studio-gear.org/" + +if [[ "${PV}" = "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git" +else + SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs" + +REQUIRED_USE="jack? ( gtk )" + +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + media-sound/fluidsynth:= + gtk? ( + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + x11-libs/pango + ) + jack? ( virtual/jack ) + lash? ( media-sound/lash ) + lv2? ( media-libs/lv2 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.90.1-no-automagic.patch" + "${FILESDIR}/${PN}-0.90.1-htmldir.patch" + "${FILESDIR}/${PN}-0.90.1-desktop.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --prefix="${EPREFIX}"/usr + --without-obsolete-check + $(use_enable experimental) + $(use_enable gtk gui) + $(use_enable jack) + $(use_with lash) + $(use_with lv2 lv2) + $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") + $(use_enable static-libs static) + $(use_enable cpu_flags_x86_sse sse) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + mv "${ED}"/usr/share/bash-completion/completions/calf \ + "${ED}"/usr/share/bash-completion/completions/calfjackhost +} diff --git a/media-sound/csound/csound-6.13.0.ebuild b/media-sound/csound/csound-6.13.0.ebuild index fc723946ca35..bee79ef48771 100644 --- a/media-sound/csound/csound-6.13.0.ebuild +++ b/media-sound/csound/csound-6.13.0.ebuild @@ -31,7 +31,7 @@ SLOT="0" # java doesn't work atm as it needs to have some variables specified to work, see src_configure # mp3 doesnt work as media-sound/lame does not install cmake file IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples -fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio +fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" @@ -71,6 +71,7 @@ CDEPEND=" ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) + hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) @@ -121,47 +122,46 @@ src_prepare() { src_configure() { local mycmakeargs=( - #-DBUILD_BELA=OFF - #-DBUILD_BUCHLA_OPCODES=ON + -DBUILD_BELA=OFF + -DBUILD_BUCHLA_OPCODES=ON -DBUILD_CHUA_OPCODES=$(usex chua) -DBUILD_CSBEATS=$(usex beats) - #-DBUILD_CUDA_OPCODES=OFF + -DBUILD_CUDA_OPCODES=OFF -DBUILD_CXX_INTERFACE=$(usex cxx) -DBUILD_DSSI_OPCODES=$(usex dssi) - #-DBUILD_EMUGENS_OPCODES=ON - #-DBUILD_EXCITER_OPCODES=ON + -DBUILD_EMUGENS_OPCODES=ON + -DBUILD_EXCITER_OPCODES=ON -DBUILD_FAUST_OPCODES=OFF -DBUILD_FLUID_OPCODES=$(usex fluidsynth) - #-DBUILD_FRAMEBUFFER_OPCODES=ON - #-DBUILD_HDF5_OPCODES=ON + -DBUILD_FRAMEBUFFER_OPCODES=ON + -DBUILD_HDF5_OPCODES=$(usex hdf5) -DBUILD_IMAGE_OPCODES=$(usex image) -DBUILD_JACK_OPCODES=$(usex jack) -DBUILD_JAVA_INTERFACE=OFF -DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear) -DBUILD_LUA_INTERFACE=$(usex lua) - -DBUILD_MP3OUT_OPCODE=OFF -DBUILD_MULTI_CORE=$(usex threads) - #-DBUULD_OPENCL_OPCODES=OFF + -DBUILD_OPENCL_OPCODES=OFF -DBUILD_OSC_OPCODES=$(usex osc) -DBUILD_P5GLOVE_OPCODES=OFF - #-DBUILD_PADSYNTH_OPCODES=ON - #-DBUILD_PLATEREV_OPCODES=ON - #-DBUILD_PVSGENDY_OPCODE=OFF + -DBUILD_PADSYNTH_OPCODES=ON + -DBUILD_PLATEREV_OPCODES=ON + -DBUILD_PVSGENDY_OPCODE=OFF -DBUILD_PYTHON_INTERFACE=$(usex python) -DBUILD_PYTHON_OPCODES=$(usex python) -DBUILD_RELEASE=ON -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 - #-DBUILD_SELECT_OPCODE=ON - #-DBUILD_SERIAL_OPCODES=ON + -DBUILD_SELECT_OPCODE=ON + -DBUILD_SERIAL_OPCODES=ON -DBUILD_SHARED_LIBS=ON - #-DBUILD_STACK_OPCODES=ON + -DBUILD_STACK_OPCODES=ON -DBUILD_STATIC_LIBRARY=$(usex static-libs) -DBUILD_STATIC_LIBRARY=$(usex test) -DBUILD_STK_OPCODES=$(usex stk) -DBUILD_TESTS=$(usex test) -DBUILD_UTILITIES=$(usex utils) -DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard) - #-DBUILD_VST4CS_OPCODES=OFF + -DBUILD_VST4CS_OPCODES=OFF -DBUILD_WEBSOCKET_OPCODE=$(usex websocket) -DBUILD_WIIMOTE_OPCODES=OFF -DBUILD_WINSOUND=OFF @@ -180,8 +180,8 @@ src_configure() { -DUSE_FLTK=$(usex fltk) -DUSE_GETTEXT=$(usex nls) -DUSE_GIT_COMMIT=ON - #_DUSE_IPMIDI=ON - #-DUSE_LRINT=ON + _DUSE_IPMIDI=ON + -DUSE_LRINT=ON -DUSE_JACK=$(usex jack) -DUSE_PORTAUDIO=$(usex portaudio) -DUSE_PORTMIDI=$(usex portmidi) @@ -199,16 +199,20 @@ src_configure() { # set the library that we want to use if use lua ; then - local package + local libdir + local libname if use luajit ; then - package="luajit" + libdir=$(pkg-config --variable=libdir luajit) + libname=$(pkg-config --variable=libname luajit) else - package="lua" + libdir=$(pkg-config --variable=libdir lua) + libname=$(pkg-config --variable=libname lua) + [[ -z "${libname}" ]] && libname="lua" fi mycmakeargs+=( - -DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so" + -DLUA_LIBRARY="${libdir}/lib${libname}.so" ) fi diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index 84567ca2d8d8..d6e3677445f6 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -31,7 +31,7 @@ SLOT="0" # java doesn't work atm as it needs to have some variables specified to work, see src_configure # mp3 doesnt work as media-sound/lame does not install cmake file IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples -fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio +fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" @@ -71,6 +71,7 @@ CDEPEND=" ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) + hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) @@ -121,19 +122,19 @@ src_prepare() { src_configure() { local mycmakeargs=( - #-DBUILD_BELA=OFF - #-DBUILD_BUCHLA_OPCODES=ON + -DBUILD_BELA=OFF + -DBUILD_BUCHLA_OPCODES=ON -DBUILD_CHUA_OPCODES=$(usex chua) -DBUILD_CSBEATS=$(usex beats) - #-DBUILD_CUDA_OPCODES=OFF + -DBUILD_CUDA_OPCODES=OFF -DBUILD_CXX_INTERFACE=$(usex cxx) -DBUILD_DSSI_OPCODES=$(usex dssi) - #-DBUILD_EMUGENS_OPCODES=ON - #-DBUILD_EXCITER_OPCODES=ON + -DBUILD_EMUGENS_OPCODES=ON + -DBUILD_EXCITER_OPCODES=ON -DBUILD_FAUST_OPCODES=OFF -DBUILD_FLUID_OPCODES=$(usex fluidsynth) - #-DBUILD_FRAMEBUFFER_OPCODES=ON - #-DBUILD_HDF5_OPCODES=ON + -DBUILD_FRAMEBUFFER_OPCODES=ON + -DBUILD_HDF5_OPCODES=$(usex hdf5) -DBUILD_IMAGE_OPCODES=$(usex image) -DBUILD_JACK_OPCODES=$(usex jack) -DBUILD_JAVA_INTERFACE=OFF @@ -141,27 +142,27 @@ src_configure() { -DBUILD_LUA_INTERFACE=$(usex lua) -DBUILD_MP3OUT_OPCODE=OFF -DBUILD_MULTI_CORE=$(usex threads) - #-DBUULD_OPENCL_OPCODES=OFF + -DBUILD_OPENCL_OPCODES=OFF -DBUILD_OSC_OPCODES=$(usex osc) -DBUILD_P5GLOVE_OPCODES=OFF - #-DBUILD_PADSYNTH_OPCODES=ON - #-DBUILD_PLATEREV_OPCODES=ON - #-DBUILD_PVSGENDY_OPCODE=OFF + -DBUILD_PADSYNTH_OPCODES=ON + -DBUILD_PLATEREV_OPCODES=ON + -DBUILD_PVSGENDY_OPCODE=OFF -DBUILD_PYTHON_INTERFACE=$(usex python) -DBUILD_PYTHON_OPCODES=$(usex python) -DBUILD_RELEASE=ON -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148 - #-DBUILD_SELECT_OPCODE=ON - #-DBUILD_SERIAL_OPCODES=ON + -DBUILD_SELECT_OPCODE=ON + -DBUILD_SERIAL_OPCODES=ON -DBUILD_SHARED_LIBS=ON - #-DBUILD_STACK_OPCODES=ON + -DBUILD_STACK_OPCODES=ON -DBUILD_STATIC_LIBRARY=$(usex static-libs) -DBUILD_STATIC_LIBRARY=$(usex test) -DBUILD_STK_OPCODES=$(usex stk) -DBUILD_TESTS=$(usex test) -DBUILD_UTILITIES=$(usex utils) -DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard) - #-DBUILD_VST4CS_OPCODES=OFF + -DBUILD_VST4CS_OPCODES=OFF -DBUILD_WEBSOCKET_OPCODE=$(usex websocket) -DBUILD_WIIMOTE_OPCODES=OFF -DBUILD_WINSOUND=OFF @@ -180,8 +181,8 @@ src_configure() { -DUSE_FLTK=$(usex fltk) -DUSE_GETTEXT=$(usex nls) -DUSE_GIT_COMMIT=ON - #_DUSE_IPMIDI=ON - #-DUSE_LRINT=ON + _DUSE_IPMIDI=ON + -DUSE_LRINT=ON -DUSE_JACK=$(usex jack) -DUSE_PORTAUDIO=$(usex portaudio) -DUSE_PORTMIDI=$(usex portmidi) @@ -199,16 +200,20 @@ src_configure() { # set the library that we want to use if use lua ; then - local package + local libdir + local libname if use luajit ; then - package="luajit" + libdir=$(pkg-config --variable=libdir luajit) + libname=$(pkg-config --variable=libname luajit) else - package="lua" + libdir=$(pkg-config --variable=libdir lua) + libname=$(pkg-config --variable=libname lua) + [[ -z "${libname}" ]] && libname="lua" fi mycmakeargs+=( - -DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so" + -DLUA_LIBRARY="${libdir}/lib${libname}.so" ) fi diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild index 0a060c062b8d..966ad8a9da59 100644 --- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild +++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" BDEPEND=" diff --git a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild index 0bde237a6cdf..3361f3661694 100644 --- a/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild +++ b/media-sound/linuxsampler/linuxsampler-2.1.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="alsa doc jack lv2 sf2 sqlite" REQUIRED_USE="|| ( alsa jack )" diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild index 4a59d0b57e01..ab5a0073a2c5 100644 --- a/media-sound/qsampler/qsampler-0.5.6.ebuild +++ b/media-sound/qsampler/qsampler-0.5.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="debug +libgig" COMMON_DEPEND=" diff --git a/net-libs/ntirpc/ntirpc-1.7.1.ebuild b/net-libs/ntirpc/ntirpc-1.7.1.ebuild index 07720adb2490..888c3fea1167 100644 --- a/net-libs/ntirpc/ntirpc-1.7.1.ebuild +++ b/net-libs/ntirpc/ntirpc-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -7,7 +7,7 @@ inherit cmake-multilib DESCRIPTION="Transport Independent RPC library for nfs-ganesha" HOMEPAGE="https://github.com/nfs-ganesha/ntirpc" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-libs/ntirpc/ntirpc-1.7.4.ebuild b/net-libs/ntirpc/ntirpc-1.7.4.ebuild index a6136e935816..97b6f9397aba 100644 --- a/net-libs/ntirpc/ntirpc-1.7.4.ebuild +++ b/net-libs/ntirpc/ntirpc-1.7.4.ebuild @@ -7,7 +7,7 @@ inherit cmake-multilib DESCRIPTION="Transport Independent RPC library for nfs-ganesha" HOMEPAGE="https://github.com/nfs-ganesha/ntirpc" -SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/nfs-ganesha/ntirpc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 20afd26681ea..5fda0fc8ecb1 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,6 +6,13 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michał Górny <mgorny@gentoo.org> (2019-12-16) +# Requires old x11-libs/fox:1.6 slot. +dev-games/openscenegraph fox +dev-libs/hidapi fox +sci-mathematics/gsl-shell fox +sys-libs/gwenhywfar fox + # Ulrich Müller <ulm@gentoo.org> (2019-12-11) # Depends on last-rited app-i18n/man-pages-da. sys-apps/man-pages l10n_da diff --git a/profiles/package.mask b/profiles/package.mask index 14c7d315e961..cccac2aceaac 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,26 @@ #--- END OF EXAMPLES --- +# Michał Górny <mgorny@gentoo.org> (2019-12-16) +# All of FOX Toolkit packages are unmaintained. The library was last +# bumped in Jan 2016, and is pending bump since. Other packages are +# even more behind. Including media-sound/gogglesmm as the only revdep. +# Removal in 30 days. Bug #703088. +app-editors/adie +dev-util/reswrap +media-sound/gogglesmm +sci-calculators/calculator +x11-libs/fox +x11-misc/pathfinder +x11-misc/shutterbug + +# Michał Górny <mgorny@gentoo.org> (2019-12-16) +# Old slot of unmaintained x11-libs/fox. Last touched in 2015, pending +# bump since. x11-misc/xfe is the only revdep. +# Removal in 30 days. Bug #703084. +x11-libs/fox:1.6 +x11-misc/xfe + # Michał Górny <mgorny@gentoo.org> (2019-12-15) # Live ebuild only. Not touched since 2012. Unsurprisingly, # the included patch no longer applies. Actually, there's diff --git a/x11-misc/picom/metadata.xml b/x11-misc/picom/metadata.xml index 1cda4a2c157c..4cd1bd6f8bcb 100644 --- a/x11-misc/picom/metadata.xml +++ b/x11-misc/picom/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="config-file">Enable config file support</flag> + <flag name="doc">Build documentation and man pages (requires <pkg>app-text/asciidoc</pkg>)</flag> <flag name="drm">Enable support for using drm for vsync</flag> <flag name="opengl">Enable features that require opengl (opengl backend, and opengl vsync methods)</flag> </use> diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5.ebuild index 5c07720ed5f7..e65767f61e79 100644 --- a/x11-misc/picom/picom-7.5.ebuild +++ b/x11-misc/picom/picom-7.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+config-file dbus doc +drm opengl pcre" +IUSE="+config-file dbus +doc +drm opengl pcre" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index 2141a6126a2d..4199214e6c56 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.ebuild @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git" LICENSE="MPL-2.0 MIT" SLOT="0" KEYWORDS="" -IUSE="+config-file dbus doc +drm opengl pcre" +IUSE="+config-file dbus +doc +drm opengl pcre" RDEPEND="dev-libs/libev dev-libs/uthash |