diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-06 04:33:52 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2020-12-06 04:33:52 +0000 |
| commit | 5e3f1e73bc153eaefc4604f6cbf6de725cd1c223 (patch) | |
| tree | 047ce1635cf919f4a4e74ecdd73eaa6c36d815f0 | |
| parent | 8d7d8a4cc6efbd1592e6ba51d14ef59dd56dfb0e (diff) | |
| download | baldeagleos-repo-5e3f1e73bc153eaefc4604f6cbf6de725cd1c223.tar.gz baldeagleos-repo-5e3f1e73bc153eaefc4604f6cbf6de725cd1c223.tar.xz baldeagleos-repo-5e3f1e73bc153eaefc4604f6cbf6de725cd1c223.zip | |
Updating liguros repo
50 files changed, 673 insertions, 766 deletions
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild index 3d34df47ac76..d5339e647caa 100644 --- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild +++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib linux-info toolchain-funcs udev systemd +inherit linux-info systemd toolchain-funcs udev DESCRIPTION="Entropy Key userspace daemon" HOMEPAGE="https://www.entropykey.co.uk/" diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild index e511482b516c..3062b9b3be0c 100644 --- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild +++ b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-1 ) -inherit multilib linux-info lua-single toolchain-funcs udev systemd +inherit linux-info lua-single systemd toolchain-funcs udev DESCRIPTION="Entropy Key userspace daemon" HOMEPAGE="https://www.entropykey.co.uk/" diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest index 275c8153b417..3bb459ae0925 100644 --- a/app-office/skrooge/Manifest +++ b/app-office/skrooge/Manifest @@ -1 +1,2 @@ DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76 +DIST skrooge-2.24.0.tar.xz 22184092 BLAKE2B 84d14fa35665fc1d5326e6212e56569f095b0a22ff2b3df752a8f456e34442edb639c2855b4f1a54cd639c2f9041e8a5e2ccfdf488876ce25dd48f0b0e0721c1 SHA512 e48ad9e657e4f15ab10db38cf1944cfe5a1fe73fa4623ec288b8749de746fc64ccc2534dc2bc7c379db0632107eba17ffc6a39e50de8e52a6800bb86b2ef234d diff --git a/app-office/skrooge/skrooge-2.24.0.ebuild b/app-office/skrooge/skrooge-2.24.0.ebuild new file mode 100644 index 000000000000..28d9e9bf3b98 --- /dev/null +++ b/app-office/skrooge/skrooge-2.24.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=5.74.0 +QTMIN=5.15.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Personal finances manager, aiming at being simple and intuitive" +HOMEPAGE="https://skrooge.org/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="activities kde ofx" + +BDEPEND=" + dev-libs/libxslt + virtual/pkgconfig +" +COMMON_DEPEND=" + >=app-crypt/qca-2.3.0:2 + dev-db/sqlcipher + dev-libs/grantlee:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtscript-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5= + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + kde? ( >=kde-frameworks/krunner-${KFMIN}:5 ) + ofx? ( dev-libs/libofx ) +" +DEPEND="${COMMON_DEPEND} + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 +" + +# hangs + installs files (also requires KF5DesignerPlugin) +RESTRICT+=" test" + +src_configure() { + local mycmakeargs=( + -DSKG_WEBENGINE=ON + -DSKG_DESIGNER=OFF + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package kde KF5Runner) + $(cmake_use_find_package ofx LibOfx) + -DSKG_BUILD_TEST=$(usex test) + ) + + ecm_src_configure +} + +src_test() { + local mycmakeargs=( + -DSKG_BUILD_TEST=ON + ) + ecm_src_test +} diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest index 2b0364166fe2..1009e00ade5e 100644 --- a/dev-lang/lua/Manifest +++ b/dev-lang/lua/Manifest @@ -2,7 +2,6 @@ DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d DIST lua-5.2.2-tests.tar.gz 76629 BLAKE2B 323eaae02ee61cfde2535d606ed704d964461c32627cb3ad4097afdc95a16a0921b9b05677c5b9b26cbff0d7d8270045e7df32a2cea0fd99a82e6aa613a0bdae SHA512 699d5703dd1d03312f1e947ca4c68d8808bb226ae01337202c2bfb3d854a9b7d9ef9746630afd1f67e9ffe2868907ce3d600a6f5324a2c798540c5373a24aac8 DIST lua-5.2.4.tar.gz 252651 BLAKE2B 6f20308d8413438f8446040e8de16274837cb55e626b98a0ae8cfe279dc8610fa2e032a2ce53ef3acda4b96a7198123cbc18eff16775f952e6dc0355fdf331b0 SHA512 cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb -DIST lua-5.3.5.tar.gz 303543 BLAKE2B 8890fa70fcfb869296bc74c754dc30621a3786d4b38dd35ef9e57ca46ee4b3df12dac1b86109be0823847499ff6b0d95de11f446c4c22de440ae3bb704e5068b SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681 DIST lua-5.4.1-tests.tar.gz 128646 BLAKE2B 2dae666e89bacf986228a33fc665bbc510e738d9f8791933f5048e4bbecaf6cd59c5e70e488d332b16960225aac3b9fae46e500f3b54856bb6aabe8cd3a5c932 SHA512 ac7cf113d96f8fe2af4f104297a70debd3bede5997627fc18db6b5d9c78ff49e05a165f5855894def5656c6dcc2d7d9ccce741c90da17698a5c714a33828f49a DIST lua-5.4.1.tar.gz 353965 BLAKE2B e5b46fcf2eb2ea9bd235793cefec2bf19f185ed51b11bc6133bda4e3639f09194378b2fd55544972ee32576751e80bba87b3b61ec3d4a0910592d6e5cb4a4c77 SHA512 49ffbe814ec41e515fc8502b6958151c6c56aa171412f0b211ad9de934be2c958c3709d49435885ddea0fa6765ed511dafb3537558950ff3b4261338214f1571 diff --git a/dev-lang/lua/files/lua-5.2-make-r1.patch b/dev-lang/lua/files/lua-5.2-make-r1.patch index a0624af9cc33..c65f799c0dcc 100644 --- a/dev-lang/lua/files/lua-5.2-make-r1.patch +++ b/dev-lang/lua/files/lua-5.2-make-r1.patch @@ -17,7 +17,7 @@ +# Use libtool for binary installs, etc. + +export V -+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++export LIBTOOL = libtool --quiet --tag=CC +# See libtool manual about how to set this + +gentoo_clean: @@ -47,7 +47,7 @@ lzio.h + -+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++export LIBTOOL = libtool --quiet --tag=CC +export LIB_VERSION = 6:1:1 + +# The following rules use libtool for compiling and linking in order to diff --git a/dev-lang/lua/files/lua-5.3-make-r1.patch b/dev-lang/lua/files/lua-5.3-make-r1.patch index b9e9051462c4..d27eb9938ea0 100644 --- a/dev-lang/lua/files/lua-5.3-make-r1.patch +++ b/dev-lang/lua/files/lua-5.3-make-r1.patch @@ -18,7 +18,7 @@ diff -uNr lua-5.3.3.orig/Makefile lua-5.3.3/Makefile +# Use libtool for binary installs, etc. + +export V -+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++export LIBTOOL = libtool --quiet --tag=CC +# See libtool manual about how to set this + +gentoo_clean: @@ -63,7 +63,7 @@ diff -uNr lua-5.3.3.orig/src/Makefile lua-5.3.3/src/Makefile # (end of Makefile) + -+export LIBTOOL = $(EROOT)usr/bin/libtool --quiet --tag=CC ++export LIBTOOL = libtool --quiet --tag=CC +export LIB_VERSION = 6:1:1 + +# The following rules use libtool for compiling and linking in order to diff --git a/dev-lang/lua/lua-5.1.5-r103.ebuild b/dev-lang/lua/lua-5.1.5-r103.ebuild deleted file mode 100644 index d702a78c0553..000000000000 --- a/dev-lang/lua/lua-5.1.5-r103.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" - -LICENSE="MIT" -SLOT="5.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static" - -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] ) - app-eselect/eselect-lua - !dev-lang/lua:0" -DEPEND="${RDEPEND} - sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" - -SAN_SLOT="${SLOT//.}" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h -) - -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch - - # use glibtool on Darwin (versus Apple libtool) - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ - Makefile src/Makefile || die - fi - - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - - # correct lua versioning - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html - - if ! use deprecated ; then - # patches from 5.1.4 still apply - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch - fi - - if ! use readline ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch - fi - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch - fi - - # A slotted Lua uses different directories for headers & names for - # libraries, and pkgconfig should reflect that. - sed -r -i \ - -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \ - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \ - "${S}"/etc/lua.pc - - # custom Makefiles - multilib_copy_sources -} - -multilib_src_configure() { - # We want packages to find our things... - sed -i \ - -e 's:/usr/local:'${EPREFIX}'/usr:' \ - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \ - etc/lua.pc src/luaconf.h || die -} - -multilib_src_compile() { - tc-export CC - myflags= - # what to link to liblua - liblibs="-lm" - liblibs="${liblibs} $(dlopen_lib)" - - # what to link to the executables - mylibs= - if use readline; then - mylibs="-lreadline" - fi - - cd src - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \ - RPATH="${EPREFIX}/usr/$(get_libdir)/" \ - LUA_LIBS="${mylibs}" \ - LIB_LIBS="${liblibs}" \ - V=$(get_version_component_range 1-2) \ - gentoo_all - - mv lua_test ../test/lua.static -} - -multilib_src_install() { - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${SLOT} gentoo_install - - insinto /usr/$(get_libdir)/pkgconfig - newins etc/lua.pc lua${SLOT}.pc -} - -multilib_src_install_all() { - dodoc HISTORY README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - - doicon etc/lua.ico - - newman doc/lua.1 lua${SLOT}.1 - newman doc/luac.1 luac${SLOT}.1 -} - -multilib_src_test() { - local positive="bisect cf echo env factorial fib fibfor hello printf sieve - sort trace-calls trace-globals" - local negative="readonly" - local test - - cd "${BUILD_DIR}" || die - for test in ${positive}; do - test/lua.static test/${test}.lua || die "test $test failed" - done - - for test in ${negative}; do - test/lua.static test/${test}.lua && die "test $test failed" - done -} diff --git a/dev-lang/lua/lua-5.1.5-r104.ebuild b/dev-lang/lua/lua-5.1.5-r104.ebuild deleted file mode 100644 index 93b81054565e..000000000000 --- a/dev-lang/lua/lua-5.1.5-r104.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib multilib-minimal portability toolchain-funcs versionator - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" - -LICENSE="MIT" -SLOT="5.1" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static" - -RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] ) - app-eselect/eselect-lua - !dev-lang/lua:0" -DEPEND="${RDEPEND} - sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" - -SAN_SLOT="${SLOT//.}" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h -) - -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch - - # use glibtool on Darwin (versus Apple libtool) - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ - Makefile src/Makefile || die - fi - - #EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - - # correct lua versioning - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html - - if ! use deprecated ; then - # patches from 5.1.4 still apply - epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch - epatch "${FILESDIR}"/${PN}-5.1.4-test.patch - fi - - if ! use readline ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch - fi - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch - fi - - # A slotted Lua uses different directories for headers & names for - # libraries, and pkgconfig should reflect that. - sed -r -i \ - -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \ - -e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \ - -e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ - -e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \ - "${S}"/etc/lua.pc - - # custom Makefiles - multilib_copy_sources -} - -multilib_src_configure() { - # We want packages to find our things... - sed -i \ - -e 's:/usr/local:'${EPREFIX}'/usr:' \ - -e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \ - etc/lua.pc src/luaconf.h || die -} - -multilib_src_compile() { - tc-export CC - myflags= - # what to link to liblua - liblibs="-lm" - liblibs="${liblibs} $(dlopen_lib)" - - # what to link to the executables - mylibs= - if use readline; then - mylibs="-lreadline" - fi - - cd src - emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \ - RPATH="${EPREFIX}/usr/$(get_libdir)/" \ - LUA_LIBS="${mylibs}" \ - LIB_LIBS="${liblibs}" \ - V=$(get_version_component_range 1-2) \ - gentoo_all - - mv lua_test ../test/lua.static -} - -multilib_src_install() { - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${SLOT} gentoo_install - - insinto /usr/$(get_libdir)/pkgconfig - newins etc/lua.pc lua${SLOT}.pc -} - -multilib_src_install_all() { - dodoc HISTORY README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - - doicon etc/lua.ico - - newman doc/lua.1 lua${SLOT}.1 - newman doc/luac.1 luac${SLOT}.1 -} - -multilib_src_test() { - local positive="bisect cf echo env factorial fib fibfor hello printf sieve - sort trace-calls trace-globals" - local negative="readonly" - local test - - cd "${BUILD_DIR}" || die - for test in ${positive}; do - test/lua.static test/${test}.lua || die "test $test failed" - done - - for test in ${negative}; do - test/lua.static test/${test}.lua && die "test $test failed" - done -} diff --git a/dev-lang/lua/lua-5.2.4-r2.ebuild b/dev-lang/lua/lua-5.2.4-r2.ebuild index 973ee693defc..68f83619268e 100644 --- a/dev-lang/lua/lua-5.2.4-r2.ebuild +++ b/dev-lang/lua/lua-5.2.4-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator +inherit autotools multilib multilib-minimal portability toolchain-funcs DESCRIPTION="A powerful light-weight programming language designed for extending applications" HOMEPAGE="https://www.lua.org/" @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="MIT" SLOT="5.2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static test test-complete" +IUSE="+deprecated readline static test test-complete" RESTRICT="!test? ( test )" RDEPEND="readline? ( sys-libs/readline:0= ) @@ -25,16 +25,17 @@ RDEPEND="readline? ( sys-libs/readline:0= ) !dev-lang/lua:0" DEPEND="${RDEPEND} sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" MULTILIB_WRAPPED_HEADERS=( /usr/include/lua${SLOT}/luaconf.h ) -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) +PATCHES=( + "${FILESDIR}/${PN}-$(ver_cut 1-2)-make-r1.patch" +) - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch +src_prepare() { + default # use glibtool on Darwin (versus Apple libtool) if [[ ${CHOST} == *-darwin* ]] ; then @@ -42,9 +43,6 @@ src_prepare() { Makefile src/Makefile || die fi - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - # correct lua versioning sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die @@ -108,7 +106,7 @@ multilib_src_compile() { RPATH="${EPREFIX}/usr/$(get_libdir)/" \ LUA_LIBS="${mylibs}" \ LIB_LIBS="${liblibs}" \ - V=$(get_version_component_range 1-2) \ + V=$(ver_cut 1-2) \ gentoo_all } @@ -129,7 +127,7 @@ multilib_src_install() { # We want packages to find our things... # A slotted Lua uses different directories for headers & names for # libraries, and pkgconfig should reflect that. - local PATCH_PV=$(get_version_component_range 1-2) + local PATCH_PV=$(ver_cut 1-2) cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die sed -r -i \ -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \ @@ -152,9 +150,9 @@ multilib_src_install() { } multilib_src_install_all() { - dodoc README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - + DOCS="README" + HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif" + einstalldocs newman doc/lua.1 lua${SLOT}.1 newman doc/luac.1 luac${SLOT}.1 } @@ -192,3 +190,11 @@ src_test() { die "Tests failed" fi } + +pkg_postinst() { + if has_version "app-editor/emacs"; then + if ! has_version "app-emacs/lua-mode"; then + einfo "Install app-emacs/lua-mode for lua support for emacs" + fi + fi +} diff --git a/dev-lang/lua/lua-5.3.5-r2.ebuild b/dev-lang/lua/lua-5.3.5-r2.ebuild deleted file mode 100644 index 188b5c0c44a9..000000000000 --- a/dev-lang/lua/lua-5.3.5-r2.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -TEST_PV="5.3.4" # no 5.3.5-specific release yet -TEST_A="${PN}-${TEST_PV}-tests.tar.gz" -PKG_A="${P}.tar.gz" -SRC_URI=" - http://www.lua.org/ftp/${PKG_A} - test? ( https://www.lua.org/tests/${TEST_A} )" - -LICENSE="MIT" -SLOT="5.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static test test-complete" -RESTRICT="!test? ( test )" - -RDEPEND="readline? ( sys-libs/readline:0= ) - app-eselect/eselect-lua - !dev-lang/lua:0" -DEPEND="${RDEPEND} - sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h -) - -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch - - # use glibtool on Darwin (versus Apple libtool) - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ - Makefile src/Makefile || die - fi - - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - - # correct lua versioning - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die - - if ! use readline ; then - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die - fi - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die - fi - - # upstream does not use libtool, but we do (see bug #336167) - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die - eautoreconf - - # custom Makefiles - multilib_copy_sources -} - -multilib_src_configure() { - sed -i \ - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - src/luaconf.h \ - || die "failed patching luaconf.h" - - econf -} - -multilib_src_compile() { - tc-export CC - - # what to link to liblua - liblibs="-lm" - liblibs="${liblibs} $(dlopen_lib)" - - # what to link to the executables - mylibs= - use readline && mylibs="-lreadline" - - cd src - - local myCFLAGS="" - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL" - - case "${CHOST}" in - *-mingw*) : ;; - *) myCFLAGS+=" -DLUA_USE_LINUX" ;; - esac - - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \ - SYSLDFLAGS="${LDFLAGS}" \ - RPATH="${EPREFIX}/usr/$(get_libdir)/" \ - LUA_LIBS="${mylibs}" \ - LIB_LIBS="${liblibs}" \ - V=$(get_version_component_range 1-2) \ - gentoo_all -} - -multilib_src_install() { - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${SLOT} gentoo_install - - case $SLOT in - 0) - LIBNAME="lua" - INCLUDEDIR_SUFFIX='' - ;; - *) LIBNAME="lua${SLOT}" - INCLUDEDIR_SUFFIX="/lua${SLOT}" - ;; - esac - - # We want packages to find our things... - # A slotted Lua uses different directories for headers & names for - # libraries, and pkgconfig should reflect that. - local PATCH_PV=$(get_version_component_range 1-2) - cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die - sed -r -i \ - -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \ - -e "s:^prefix= :prefix= ${EPREFIX}:" \ - -e "s:^V=.*:V= ${PATCH_PV}:" \ - -e "s:^R=.*:R= ${PV}:" \ - -e "s:/,lib,:/$(get_libdir):g" \ - -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \ - -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \ - "${WORKDIR}/lua.pc" || die - - insinto "/usr/$(get_libdir)/pkgconfig" - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" - # Copy Debian's symlink support: - # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19 - # FreeBSD calls the pkgconfig 'lua-5.3.pc' - # Older systems called it 'lua53.pc' - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc" - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" -} - -multilib_src_install_all() { - dodoc README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - - newman doc/lua.1 lua${SLOT}.1 - newman doc/luac.1 luac${SLOT}.1 -} - -# Makefile contains a dummy target that doesn't do tests -# but causes issues with slotted lua (bug #510360) -src_test() { - debug-print-function ${FUNCNAME} "$@" - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die - # https://www.lua.org/tests/ - # There are two sets: - # basic - # complete. - # - # The basic subset is selected by passing -e'_U=true' - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests. - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI) - use test-complete || TEST_OPTS="-e_U=true" - TEST_MARKER="${T}/test.failed" - rm -f "${TEST_MARKER}" - - # If we are failing, set the marker file, and only check it after done all ABIs - abi_src_test() { - debug-print-function ${FUNCNAME} "$@" - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" - return 0 - } - - multilib_foreach_abi abi_src_test - - if [ -e "${TEST_MARKER}" ]; then - cat "${TEST_MARKER}" - die "Tests failed" - fi -} diff --git a/dev-lang/lua/lua-5.4.1.ebuild b/dev-lang/lua/lua-5.3.6-r1.ebuild index 1a75f2cb334c..557f34da93a2 100644 --- a/dev-lang/lua/lua-5.4.1.ebuild +++ b/dev-lang/lua/lua-5.3.6-r1.ebuild @@ -2,41 +2,41 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools multilib multilib-minimal portability toolchain-funcs DESCRIPTION="A powerful light-weight programming language designed for extending applications" HOMEPAGE="https://www.lua.org/" -TEST_PV="5.4.1" -TEST_P="${PN}-${TEST_PV}-tests" +TEST_PV="5.3.4" +TEST_A="${PN}-${TEST_PV}-tests.tar.gz" +PKG_A="${P}.tar.gz" SRC_URI=" - http://www.lua.org/ftp/${P}.tar.gz - test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )" + http://www.lua.org/ftp/${PKG_A} + test? ( https://www.lua.org/tests/${TEST_A} )" LICENSE="MIT" -SLOT="5.4" +SLOT="5.3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+deprecated readline static test test-complete" +RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND="readline? ( sys-libs/readline:0= ) app-eselect/eselect-lua - readline? ( sys-libs/readline:0= ) !dev-lang/lua:0" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="sys-devel/libtool" - -RESTRICT="!test? ( test )" +DEPEND="${RDEPEND} + sys-devel/libtool" MULTILIB_WRAPPED_HEADERS=( /usr/include/lua${SLOT}/luaconf.h ) PATCHES=( - "${FILESDIR}"/lua-5.4-makefiles.patch + "${FILESDIR}/${PN}-$(ver_cut 1-2)-make-r1.patch" ) src_prepare() { default + # use glibtool on Darwin (versus Apple libtool) if [[ ${CHOST} == *-darwin* ]] ; then sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ @@ -94,7 +94,7 @@ multilib_src_compile() { cd src local myCFLAGS="" - use deprecated && myCFLAGS="-DLUA_COMPAT_5_3" + use deprecated && myCFLAGS="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2" case "${CHOST}" in *-mingw*) : ;; @@ -170,7 +170,7 @@ src_test() { # The basic subset is selected by passing -e'_U=true' # The complete set is noted to contain tests that may consume too much memory or have non-portable tests. # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI) - TEST_OPTS="$(usex test-complete '' '-e_U=true')" + use test-complete || TEST_OPTS="-e_U=true" TEST_MARKER="${T}/test.failed" rm -f "${TEST_MARKER}" @@ -193,7 +193,7 @@ src_test() { pkg_postinst() { if has_version "app-editor/emacs"; then - if ! has_version "app-emacs/emacs-mode"; then + if ! has_version "app-emacs/lua-mode"; then einfo "Install app-emacs/lua-mode for lua support for emacs" fi fi diff --git a/dev-lang/lua/lua-5.3.6.ebuild b/dev-lang/lua/lua-5.3.6.ebuild deleted file mode 100644 index 188b5c0c44a9..000000000000 --- a/dev-lang/lua/lua-5.3.6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator - -DESCRIPTION="A powerful light-weight programming language designed for extending applications" -HOMEPAGE="https://www.lua.org/" -TEST_PV="5.3.4" # no 5.3.5-specific release yet -TEST_A="${PN}-${TEST_PV}-tests.tar.gz" -PKG_A="${P}.tar.gz" -SRC_URI=" - http://www.lua.org/ftp/${PKG_A} - test? ( https://www.lua.org/tests/${TEST_A} )" - -LICENSE="MIT" -SLOT="5.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+deprecated emacs readline static test test-complete" -RESTRICT="!test? ( test )" - -RDEPEND="readline? ( sys-libs/readline:0= ) - app-eselect/eselect-lua - !dev-lang/lua:0" -DEPEND="${RDEPEND} - sys-devel/libtool" -PDEPEND="emacs? ( app-emacs/lua-mode )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/lua${SLOT}/luaconf.h -) - -src_prepare() { - local PATCH_PV=$(get_version_component_range 1-2) - - epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch - - # use glibtool on Darwin (versus Apple libtool) - if [[ ${CHOST} == *-darwin* ]] ; then - sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ - Makefile src/Makefile || die - fi - - [ -d "${FILESDIR}/${PV}" ] && \ - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch - - # correct lua versioning - sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die - - sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die - - if ! use readline ; then - sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die - fi - - # Using dynamic linked lua is not recommended for performance - # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519 - # Mainly, this is of concern if your arch is poor with GPRs, like x86 - # Note that this only affects the interpreter binary (named lua), not the lua - # compiler (built statically) nor the lua libraries (both shared and static - # are installed) - if use static ; then - sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die - fi - - # upstream does not use libtool, but we do (see bug #336167) - cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die - eautoreconf - - # custom Makefiles - multilib_copy_sources -} - -multilib_src_configure() { - sed -i \ - -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \ - -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \ - src/luaconf.h \ - || die "failed patching luaconf.h" - - econf -} - -multilib_src_compile() { - tc-export CC - - # what to link to liblua - liblibs="-lm" - liblibs="${liblibs} $(dlopen_lib)" - - # what to link to the executables - mylibs= - use readline && mylibs="-lreadline" - - cd src - - local myCFLAGS="" - use deprecated && myCFLAGS="-DLUA_COMPAT_ALL" - - case "${CHOST}" in - *-mingw*) : ;; - *) myCFLAGS+=" -DLUA_USE_LINUX" ;; - esac - - emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \ - SYSLDFLAGS="${LDFLAGS}" \ - RPATH="${EPREFIX}/usr/$(get_libdir)/" \ - LUA_LIBS="${mylibs}" \ - LIB_LIBS="${liblibs}" \ - V=$(get_version_component_range 1-2) \ - gentoo_all -} - -multilib_src_install() { - emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${SLOT} gentoo_install - - case $SLOT in - 0) - LIBNAME="lua" - INCLUDEDIR_SUFFIX='' - ;; - *) LIBNAME="lua${SLOT}" - INCLUDEDIR_SUFFIX="/lua${SLOT}" - ;; - esac - - # We want packages to find our things... - # A slotted Lua uses different directories for headers & names for - # libraries, and pkgconfig should reflect that. - local PATCH_PV=$(get_version_component_range 1-2) - cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die - sed -r -i \ - -e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \ - -e "s:^prefix= :prefix= ${EPREFIX}:" \ - -e "s:^V=.*:V= ${PATCH_PV}:" \ - -e "s:^R=.*:R= ${PV}:" \ - -e "s:/,lib,:/$(get_libdir):g" \ - -e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \ - -e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \ - "${WORKDIR}/lua.pc" || die - - insinto "/usr/$(get_libdir)/pkgconfig" - newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" - # Copy Debian's symlink support: - # https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19 - # FreeBSD calls the pkgconfig 'lua-5.3.pc' - # Older systems called it 'lua53.pc' - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc" - dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc" -} - -multilib_src_install_all() { - dodoc README - dohtml doc/*.html doc/*.png doc/*.css doc/*.gif - - newman doc/lua.1 lua${SLOT}.1 - newman doc/luac.1 luac${SLOT}.1 -} - -# Makefile contains a dummy target that doesn't do tests -# but causes issues with slotted lua (bug #510360) -src_test() { - debug-print-function ${FUNCNAME} "$@" - cd "${WORKDIR}/lua-${TEST_PV}-tests" || die - # https://www.lua.org/tests/ - # There are two sets: - # basic - # complete. - # - # The basic subset is selected by passing -e'_U=true' - # The complete set is noted to contain tests that may consume too much memory or have non-portable tests. - # attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI) - use test-complete || TEST_OPTS="-e_U=true" - TEST_MARKER="${T}/test.failed" - rm -f "${TEST_MARKER}" - - # If we are failing, set the marker file, and only check it after done all ABIs - abi_src_test() { - debug-print-function ${FUNCNAME} "$@" - TEST_LOG="${T}/test.${MULTIBUILD_ID}.log" - eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die - grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}" - return 0 - } - - multilib_foreach_abi abi_src_test - - if [ -e "${TEST_MARKER}" ]; then - cat "${TEST_MARKER}" - die "Tests failed" - fi -} diff --git a/dev-lang/lua/lua-5.4.1-r1.ebuild b/dev-lang/lua/lua-5.4.1-r1.ebuild index 9ba57847a855..d18a78747bc4 100644 --- a/dev-lang/lua/lua-5.4.1-r1.ebuild +++ b/dev-lang/lua/lua-5.4.1-r1.ebuild @@ -190,7 +190,7 @@ src_test() { pkg_postinst() { if has_version "app-editor/emacs"; then - if ! has_version "app-emacs/emacs-mode"; then + if ! has_version "app-emacs/lua-mode"; then einfo "Install app-emacs/lua-mode for lua support for emacs" fi fi diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild index c2dca084f140..aca55f796c02 100644 --- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild +++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild @@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+ GPL-2+" # check as_api_level SLOT="0/4" IUSE="apt doc +introspection qt5 test" -RESTRICT="!test? ( test )" +RESTRICT="test" # bug 691962 BDEPEND=" dev-libs/appstream-glib diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest new file mode 100644 index 000000000000..979c216d40dd --- /dev/null +++ b/dev-libs/cxxopts/Manifest @@ -0,0 +1 @@ +DIST cxxopts-2.2.1.tar.gz 89561 BLAKE2B d7fb74cff9b9381d90827fd3e3bcc7dab8b4dc100b9ff12d98ff4c73400c187c04c270d8c5a019c88e553f8c46c59eda1e5076a1aec944e7d8af5ca6de2326db SHA512 bad2928b4e06efcfa09728dd946426e4fd39715b687c0a5c7b6308dd366cb490fdd8491c9a9778242d97d5be4a383bf9d1c209efe298c6c43bb1eb9daa103f05 diff --git a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild new file mode 100644 index 000000000000..f6af1f7734f9 --- /dev/null +++ b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Lightweight C++ command line option parser" +HOMEPAGE="https://github.com/jarro2783/cxxopts" +SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DOCS=( + README.md + CHANGELOG.md +) + +src_configure() { + local -a mycmakeopts=( + -DCXXOPTS_BUILD_EXAMPLES=OFF + -DCXXOPTS_BUILD_TESTS=$(usex test 'ON' 'OFF') + -DCXXOPTS_ENABLE_INSTALL=ON + ) + cmake_src_configure +} diff --git a/dev-libs/cxxopts/metadata.xml b/dev-libs/cxxopts/metadata.xml new file mode 100644 index 000000000000..a2d4a9d82a81 --- /dev/null +++ b/dev-libs/cxxopts/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> + </maintainer> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild index 479c92bd7b29..c31fbb838b6e 100644 --- a/dev-libs/libmpack/libmpack-1.0.5.ebuild +++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild @@ -38,6 +38,10 @@ src_compile() { emake "${myemakeargs[@]}" lib-bin } +src_test() { + emake XLDFLAGS="-shared" test +} + src_install() { local myemakeargs=( "PREFIX=/usr" diff --git a/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch new file mode 100644 index 000000000000..f734a65bd891 --- /dev/null +++ b/dev-libs/simdjson/files/simdjson-0.7.0-dont-bundle-cssopts.patch @@ -0,0 +1,30 @@ +diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt +index 51ab3a31..d3d5e86e 100644 +--- a/dependencies/CMakeLists.txt ++++ b/dependencies/CMakeLists.txt +@@ -105,6 +105,3 @@ endif() + set_off(CXXOPTS_BUILD_EXAMPLES) + set_off(CXXOPTS_BUILD_TESTS) + set_off(CXXOPTS_ENABLE_INSTALL) +- +-import_dependency(cxxopts jarro2783/cxxopts 794c975) +-add_dependency(cxxopts) +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index f1a82be7..5c36d994 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -1,10 +1,7 @@ +-if(TARGET cxxopts) # we only build the tools if cxxopts is available + message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).") +- link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts) ++ link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers) + add_executable(json2json json2json.cpp) + add_executable(jsonstats jsonstats.cpp) +- add_executable(jsonpointer jsonpointer.cpp) ++ add_executable(simdjsonpointer jsonpointer.cpp) + add_executable(minify minify.cpp) +-else() +- message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.") +-endif() +\ No newline at end of file ++ install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin) diff --git a/dev-libs/simdjson/metadata.xml b/dev-libs/simdjson/metadata.xml index a2d4a9d82a81..4f385356ae58 100644 --- a/dev-libs/simdjson/metadata.xml +++ b/dev-libs/simdjson/metadata.xml @@ -5,5 +5,8 @@ <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> + <use> + <flag name="tools">Build and install extra command line tools</flag> + </use> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-libs/simdjson/simdjson-0.7.0.ebuild b/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild index e1805b6a55b0..9a29c8f04503 100644 --- a/dev-libs/simdjson/simdjson-0.7.0.ebuild +++ b/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild @@ -15,16 +15,24 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0 Boost-1.0" SLOT="0/4" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="test" +IUSE="test tools" BDEPEND=" sys-apps/file sys-apps/findutils sys-apps/grep " +DEPEND=" + tools? ( dev-libs/cxxopts:= ) +" +REQUIRED_USE="test? ( tools )" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/simdjson-0.7.0-dont-bundle-cssopts.patch" +) + src_prepare() { sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die cmake_src_prepare @@ -32,7 +40,9 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(usex test '' '-DSIMDJSON_JUST_LIBRARY=ON') + $(usex tools '' '-DSIMDJSON_JUST_LIBRARY=ON') + -DSIMDJSON_GOOGLE_BENCHMARKS=OFF + -DSIMDJSON_COMPETITION=OFF ) cmake_src_configure diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest index 380fea6a6ea3..64ab58ed51ab 100644 --- a/dev-python/cffi/Manifest +++ b/dev-python/cffi/Manifest @@ -1 +1,2 @@ DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253 +DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild new file mode 100644 index 000000000000..c33968ab9528 --- /dev/null +++ b/dev-python/cffi/cffi-1.14.4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# DO NOT ADD pypy to PYTHON_COMPAT +# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead. +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} ) + +inherit distutils-r1 toolchain-funcs + +DESCRIPTION="Foreign Function Interface for Python calling C code" +HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/libffi:=" +RDEPEND="${DEPEND} + dev-python/pycparser[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +distutils_enable_sphinx doc/source + +PATCHES=( + "${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch +) + +src_configure() { + tc-export PKG_CONFIG +} + +python_test() { + "${EPYTHON}" -c "import _cffi_backend as backend" || die + pytest -x -vv \ + --ignore testing/test_zintegration.py \ + --ignore testing/embedding \ + c/ testing/ \ + || die "Testing failed with ${EPYTHON}" +} diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest index 26713f2ebbca..93cecbab8ec4 100644 --- a/dev-python/flake8/Manifest +++ b/dev-python/flake8/Manifest @@ -1,2 +1,3 @@ DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940 +DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0 diff --git a/dev-python/flake8/flake8-3.8.4.ebuild b/dev-python/flake8/flake8-3.8.4.ebuild new file mode 100644 index 000000000000..56077c2e06ef --- /dev/null +++ b/dev-python/flake8/flake8-3.8.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} pypy3 ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe" +HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos" + +# requires.txt inc. mccabe however that creates a circular dep +RDEPEND=" + >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}] + <dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}] + >=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}] + <dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7}) +" +PDEPEND=" + >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}] + <dev-python/mccabe-0.7.0[${PYTHON_USEDEP}] +" +BDEPEND="${RDEPEND} + test? ( + ${PDEPEND} + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] + ) +" + +distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme +distutils_enable_tests --install pytest diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest index 503c3dd65644..b1ce22da1f2e 100644 --- a/dev-python/mock/Manifest +++ b/dev-python/mock/Manifest @@ -1 +1,2 @@ DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d +DIST mock-4.0.2.gh.tar.gz 79450 BLAKE2B 529d8564a8f236b428745838fbc3bfd1cfc540a5feb5527653b7d4becb6ff118056bb301cb186964570c50588b42b7be22338c8c2b844c932284fdc359648add SHA512 348b67a62d1937de1778e3030fb4940bb11c58e839d212a75924aa94ed9a993b47b04612de92f073ec3fe4af4be15468e843f70a2d94bb31edb0a4c57cb46cc6 diff --git a/dev-python/mock/mock-4.0.2.ebuild b/dev-python/mock/mock-4.0.2.ebuild new file mode 100644 index 000000000000..6ccc4f228a8e --- /dev/null +++ b/dev-python/mock/mock-4.0.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Rolling backport of unittest.mock for all Pythons" +HOMEPAGE="https://github.com/testing-cabal/mock" +SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/funcsigs[${PYTHON_USEDEP}] + ' -2) + >=dev-python/six-1.9[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]" + +python_test() { + # Upstream supports running tests only in their dream pristine + # environment. pytest doesn't work at all if mock is already + # installed. We can use plain unittest but we have to reinvent + # test filtering. + cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die + cd "${BUILD_DIR}"/lib || die + if ! python_is_python3; then + rm mock/tests/*py3* || die + fi + + # https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa + if [[ ${EPYTHON} == pypy* ]]; then + sed -i -e 's:def test_copy:def _test_copy:' \ + mock/tests/testmock.py || die + fi + + "${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGELOG.rst README.rst ) + + distutils-r1_python_install_all +} diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest index b9d34cb96799..82a64c89ab93 100644 --- a/dev-python/natsort/Manifest +++ b/dev-python/natsort/Manifest @@ -1 +1,2 @@ DIST natsort-7.0.1.tar.gz 139272 BLAKE2B 81f75df0868a0810fbc8fef5a499135b5291adde7561a1b0e6b8a94a7f5afc27cd156939119c24749b1ed6983b4a6d63cada3f4a220e785dc06986db099803ba SHA512 48bfda8a42b951287d984e38c474b71233d56a578d8bec12e657413b3cdb71dd27103acda8dca359d87efd761e775deff0775a81d8dfa18df24c364921028c2b +DIST natsort-7.1.0.tar.gz 143534 BLAKE2B 3ab6c977aca40330fac0af9e4be36d973e88d931799b3135a81daf0a475988af5cc2f9abb30ade1498aad07d9c986e514c7c8cdbbb63da195a81dded4f6f25da SHA512 41293d70c3dc2214f9dc1c123f31cd7886341ae25c6342ac49f3d53d06ba15ecd8d666f1763fe790848c93668940a81b7e7f1fe896f0b91f180ca557dd922ac3 diff --git a/dev-python/natsort/metadata.xml b/dev-python/natsort/metadata.xml index 033d7b9e333f..3c5e77c28dd9 100644 --- a/dev-python/natsort/metadata.xml +++ b/dev-python/natsort/metadata.xml @@ -5,7 +5,9 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> + <remote-id type="github">SethMMorton/natsort</remote-id> <remote-id type="pypi">natsort</remote-id> </upstream> <origin>gentoo-staging</origin> diff --git a/dev-python/natsort/natsort-7.1.0.ebuild b/dev-python/natsort/natsort-7.1.0.ebuild new file mode 100644 index 000000000000..b696148ea6e9 --- /dev/null +++ b/dev-python/natsort/natsort-7.1.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Natural sorting for Python" +HOMEPAGE="https://pypi.org/project/natsort/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" +IUSE="test" + +DEPEND="test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest index 89734b85747d..af0b297829d8 100644 --- a/dev-python/reportlab/Manifest +++ b/dev-python/reportlab/Manifest @@ -1,2 +1,3 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7 +DIST reportlab-3.5.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010 diff --git a/dev-python/reportlab/reportlab-3.5.56.ebuild b/dev-python/reportlab/reportlab-3.5.56.ebuild new file mode 100644 index 000000000000..501b89d760e6 --- /dev/null +++ b/dev-python/reportlab/reportlab-3.5.56.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Tools for generating printable PDF documents from any data source" +HOMEPAGE=" + https://www.reportlab.com/ + https://pypi.org/project/reportlab/" +SRC_URI=" + mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz + https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + media-libs/freetype + media-libs/libart_lgpl + sys-libs/zlib:=" +RDEPEND=" + ${DEPEND} + dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]" +BDEPEND=" + app-arch/unzip + test? ( ${RDEPEND} )" + +distutils_enable_sphinx docs/source + +PATCHES=( + # bug 738312, remove -L/usr/lib from link line + "${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch +) + +src_unpack() { + unpack ${P}.tar.gz + cd ${P}/src/reportlab/fonts || die + unpack pfbfer-20070710.zip +} + +python_prepare_all() { + # tests requiring Internet access + sed -i -e 's:test0:_&:' \ + tests/test_platypus_general.py \ + tests/test_platypus_images.py || die + sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + pushd tests >/dev/null || die + "${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}" + popd >/dev/null || die +} diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest index 25c4d309a5b9..5588bf0ef9b2 100644 --- a/dev-python/zstandard/Manifest +++ b/dev-python/zstandard/Manifest @@ -1,2 +1,3 @@ DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0 +DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c diff --git a/dev-python/zstandard/zstandard-0.14.1.ebuild b/dev-python/zstandard/zstandard-0.14.1.ebuild new file mode 100644 index 000000000000..bf2b3e8fc96b --- /dev/null +++ b/dev-python/zstandard/zstandard-0.14.1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Zstandard Bindings for Python" +HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )" + +distutils_enable_tests setup.py + +python_compile() { + local MAKEOPTS=-j1 + distutils-r1_python_compile +} diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest index baad77293f63..3a93a1410923 100644 --- a/games-util/steam-launcher/Manifest +++ b/games-util/steam-launcher/Manifest @@ -1 +1 @@ -DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8 +DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml deleted file mode 100644 index 907f2c278497..000000000000 --- a/games-util/steam-launcher/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>dev@kicherer.org</email> - <name>Mario Kicherer</name> - </maintainer> - <longdescription> - This ebuild installs common files for the Steam environment, - like bootstrap archive and icons, but not the client itself. - </longdescription> - <upstream> - <bugs-to>https://github.com/anyc/steam-overlay</bugs-to> - </upstream> - <use> - <flag name='steamruntime'>Use the official steam runtime libraries</flag> - </use> - <origin>steam-overlay</origin> -</pkgmetadata> diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild index 87f35fafd126..350d9e8c7d5b 100644 --- a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild +++ b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild @@ -6,16 +6,16 @@ EAPI=7 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay # or come to #gentoo-gamerlay in freenode IRC -inherit linux-info prefix xdg-utils +inherit linux-info prefix udev xdg-utils DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client" HOMEPAGE="https://steampowered.com" -SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz" +SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz" LICENSE="ValveSteamLicense MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+joystick +steamruntime +udev" +IUSE="+steamruntime" RESTRICT="bindist mirror test" RDEPEND=" @@ -27,9 +27,6 @@ RDEPEND=" x11-terms/xterm ) - joystick? ( - udev? ( games-util/game-device-udev-rules ) - ) steamruntime? ( virtual/opengl[abi_x86_32] x11-libs/libX11[abi_x86_32] @@ -89,6 +86,9 @@ src_prepare() { xdg_environment_reset default + sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \ + subprojects/steam-devices/*.rules || die + sed \ -e "s#@@PVR@@#${PVR}#g" \ -e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \ @@ -110,11 +110,14 @@ src_install() { dodoc README debian/changelog doman steam.6 + + udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules } pkg_postinst() { xdg_icon_cache_update xdg_desktop_database_update + udev_reload elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual" elog "client into your home folder. After installation, the script" diff --git a/media-gfx/digikam/digikam-7.1.0.ebuild b/media-gfx/digikam/digikam-7.1.0-r1.ebuild index 3fcf93ec3dc5..194a341e7771 100644 --- a/media-gfx/digikam/digikam-7.1.0.ebuild +++ b/media-gfx/digikam/digikam-7.1.0-r1.ebuild @@ -81,7 +81,7 @@ COMMON_DEPEND=" >=kde-frameworks/kbookmarks-${KFMIN}:5 ) mediaplayer? ( - media-libs/qtav[opengl] + media-libs/qtav[opengl(+)] media-video/ffmpeg:= ) opengl? ( diff --git a/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild new file mode 100644 index 000000000000..40952dff2ab8 --- /dev/null +++ b/media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Embedded lua scripts for libquvi" +HOMEPAGE="https://sourceforge.net/projects/quvi/" +SRC_URI="mirror://sourceforge/quvi/${P}.tar.xz" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="offensive" + +# tests fetch data from live websites +RESTRICT="test" + +RDEPEND=" + >=dev-lua/LuaBitOp-1.0.1-r1 + >=dev-lua/luaexpat-1.3.0-r1 + >=dev-lua/luajson-1.1.1 + >=dev-lua/luasocket-3.0_rc1-r2 +" + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" + +src_configure() { + econf $(use_with offensive nsfw) --with-manual +} diff --git a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild new file mode 100644 index 000000000000..f8e89c988c4b --- /dev/null +++ b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Library for parsing video download links" +HOMEPAGE="https://sourceforge.net/projects/quvi/" +SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz" + +LICENSE="AGPL-3" +SLOT="0/8" # subslot = libquvi soname version +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="examples nls static-libs" + +RDEPEND=" + >=dev-lang/lua-5.1.5-r3:0=[deprecated] + >=dev-libs/glib-2.34.3:2 + >=dev-libs/libgcrypt-1.5.3:0= + >=media-libs/libquvi-scripts-0.9.20130903 + !<media-libs/quvi-0.4.0 + >=net-libs/libproxy-0.4.11-r1 + >=net-misc/curl-7.36.0 + nls? ( >=virtual/libintl-0-r1 ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch ) + +src_configure() { + local myeconfargs=( + $(use_enable nls) + --with-manual + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + einstalldocs + use examples && dodoc -r examples + + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/qtav/qtav-1.12.0-r2.ebuild b/media-libs/qtav/qtav-1.12.0-r3.ebuild index e9b3bbd54aeb..2635466a5bf3 100644 --- a/media-libs/qtav/qtav-1.12.0-r2.ebuild +++ b/media-libs/qtav/qtav-1.12.0-r3.ebuild @@ -15,17 +15,16 @@ https://dev.gentoo.org/~johu/distfiles/${P}-capi.h-${CAPI_HASH}.xz" LICENSE="GPL-3+ LGPL-2.1+" SLOT="0/1" KEYWORDS="amd64" -IUSE="gui opengl portaudio pulseaudio vaapi" -REQUIRED_USE="gui? ( opengl )" +IUSE="gui portaudio pulseaudio vaapi" DEPEND=" dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 + dev-qt/qtopengl:5 dev-qt/qtwidgets:5 - gui? ( dev-qt/qtsql:5 ) media-video/ffmpeg:= - opengl? ( dev-qt/qtopengl:5 ) + gui? ( dev-qt/qtsql:5 ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) " @@ -50,8 +49,8 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF + -DBUILD_QT5OPENGL=ON # bug 740172 -DBUILD_PLAYERS=$(usex gui) - -DBUILD_QT5OPENGL=$(usex opengl) -DHAVE_PORTAUDIO=$(usex portaudio) -DHAVE_PULSE=$(usex pulseaudio) -DHAVE_VAAPI=$(usex vaapi) diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest index 04c9053caf98..8d32ede1a16c 100644 --- a/net-im/discord-bin/Manifest +++ b/net-im/discord-bin/Manifest @@ -1 +1 @@ -DIST discord-0.0.12.deb 68328818 BLAKE2B 3416f7f49e4894fbf03bbe61a225d79df934456205776755b77a6d3c385e379021d5af679270012e0f134850964d993165ca25bf6c33980477e0dfe7112e6b6b SHA512 79c4bc0667b1f7ee693c14356d18be36f5597c1d7740a99abdf31139d54fa2237bb0d6602511d6ba78e2e94871506758728ac43b5b301581561ae463a19229b5 +DIST discord-0.0.13.deb 70624982 BLAKE2B 210dc6f287ccf17d14cb595ad41d508b0d73285e0cb1cacd24b678377c0aa7f5bc111b5cc3a1a3054a05349b96cdd82f589b6001ceca44fbe33bf78513f83f2d SHA512 6b42039a37034f1774f9ad07c9b43dab326ee4f7915b07f976c596ec9cad166871c870145bee42bce170e724c1e99fdd91388f1a6c5f0ec434f757389f1f89e6 diff --git a/net-im/discord-bin/discord-bin-0.0.12.ebuild b/net-im/discord-bin/discord-bin-0.0.13.ebuild index b9bcb204ab0e..36719eb898c4 100644 --- a/net-im/discord-bin/discord-bin-0.0.12.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.13.ebuild @@ -54,13 +54,15 @@ S="${WORKDIR}" QA_PREBUILT=" opt/discord/${MY_BIN} opt/discord/chrome-sandbox + opt/discord/libffmpeg.so + opt/discord/libvk_swiftshader.so + opt/discord/libvulkan.so opt/discord/libEGL.so opt/discord/libGLESv2.so + opt/discord/libVkICD_mock_icd.so opt/discord/swiftshader/libEGL.so opt/discord/swiftshader/libGLESv2.so opt/discord/swiftshader/libvk_swiftshader.so - opt/discord/libVkICD_mock_icd.so - opt/discord/libffmpeg.so " CONFIG_CHECK="~USER_NS" diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild b/net-im/prosody/prosody-0.11.7-r100.ebuild index 11e70d9924be..6c88fc7967ee 100644 --- a/net-im/prosody/prosody-0.11.7-r100.ebuild +++ b/net-im/prosody/prosody-0.11.7-r100.ebuild @@ -3,7 +3,8 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} ) +LUA_COMPAT=( lua5-{1..3} ) +LUA_REQ_USE="deprecated" inherit lua-single systemd tmpfiles toolchain-funcs diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild index 89edfb06ee8f..b078fcb14b56 100644 --- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild +++ b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild @@ -4,6 +4,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{5,6,7,8,9,10} ) + PYTHON_REQ_USE="ncurses?" inherit desktop distutils-r1 gnome2-utils xdg-utils diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index c65e6461d5cd..f16238544fb9 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1 +1,2 @@ DIST gnome-remote-desktop-0.1.7.tar.xz 25636 BLAKE2B 00e389bc8887c3d43f9221a45c6c7154e4140fab560c5c568fe92f06794b736efcf2265c763d0d9d57d5343dd2f71b7a3a2c45b0466cdae608f0a609af53175d SHA512 dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed +DIST gnome-remote-desktop-0.1.8.tar.bz2 28565 BLAKE2B 8c14200eb17503eb92c7a7db51d487f17bca7616848aa8f555d2c31a5b758b500d6bbcb78a4a75cebbe0220281079848517c58813783497b463b0a771f07229b SHA512 1e433a95c303ce82782c27412c4f4456f0ecf33eb1e63b61b11f1cde68b6113a765a0f7d7871f73af8a253f1d7b3d3d4dafd36c3e5e9fa6d6c97279747f584ab diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild new file mode 100644 index 000000000000..dcbc76e70e20 --- /dev/null +++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils meson systemd xdg + +DESCRIPTION="Remote desktop daemon for GNOME using pipewire" +HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop" +SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="" + +DEPEND=" + dev-libs/glib:2 + >=media-video/pipewire-0.3.0:0/0.3 + sys-apps/systemd + net-libs/libvncserver + app-crypt/libsecret + x11-libs/libnotify +" +RDEPEND="${DEPEND} + x11-wm/mutter[screencast] +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 8e9916f1f992..57d3242a8695 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,2 +1,2 @@ -DIST qutebrowser-1.13.1.tar.gz 4027485 BLAKE2B cb19fa2baa447776e0d03128446619eeacd1049b30fcca26008e0cccb10594d1d32037643b3834297adef637328444aad33d84383bdc49307528321cfa2b846d SHA512 a3eb3845a896a88f755e4e7d336d86a8740be66ae94a8e19fb4739148ce1e66aa9fddec04df9308a51c8ef922fa28e3683bb911dd3ba7c91816c26ea92665cfd DIST qutebrowser-1.14.0.tar.gz 4144761 BLAKE2B cc220990c119904c18932b7f240e428fd36baaf42a592f8fe15e9a1b1e5506cf82291ac0365fd43c75ffa78b403cbe35616f8bd5b362a686db389f5ab7a02345 SHA512 7330b685b5852c7700738bf1063121c6cb19b190143e4b98680563ae1a6ce7affaf9691db8c3a4e3686172be7da26ce841709dbc5d31a941326d7432c857cb25 +DIST qutebrowser-1.14.1.tar.gz 4161759 BLAKE2B 5ea4d032cb8137af1ac9add9fe85b7dc0b8d9c78c838bd91b09444035f3e433d7cfd75672fbaafc1eceb2a0e1bac8f54b8419a7ff0d7c3b272d588818194a260 SHA512 2902b1f320c80601195f0a87b4cd1ce6dac7e79df82df692b08d00f1f0be449fcc7d7a855f4fc2cc5773f3b2142f508b0dfc6612778c416401f1117acc081de8 diff --git a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild index 158540dbd6c9..280770afba8c 100644 --- a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild +++ b/www-client/qutebrowser/qutebrowser-1.14.1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" dev-python/cssutils[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/pygments-2.6.1[${PYTHON_USEDEP}] + >=dev-python/pygments-2.7.2[${PYTHON_USEDEP}] dev-python/pypeg2[${PYTHON_USEDEP}] dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] dev-python/PyQtWebEngine[${PYTHON_USEDEP}] @@ -48,14 +48,28 @@ python_install_all() { doicon -s scalable icons/${PN}.svg if use scripts; then - # Install only those userscripts that have an explicit license header + insinto /usr/share/qutebrowser/userscripts/ + doins misc/userscripts/README.md exeinto /usr/share/qutebrowser/userscripts/ - doexe misc/userscripts/dmenu_qutebrowser - doexe misc/userscripts/openfeeds - doexe misc/userscripts/qute-keepass - doexe misc/userscripts/qute-pass - doexe misc/userscripts/rss - doexe misc/userscripts/tor_identity + doexe misc/userscripts/cast \ + misc/userscripts/dmenu_qutebrowser \ + misc/userscripts/format_json \ + misc/userscripts/getbib \ + misc/userscripts/open_download \ + misc/userscripts/openfeeds \ + misc/userscripts/password_fill \ + misc/userscripts/qute-bitwarden \ + misc/userscripts/qutedmenu \ + misc/userscripts/qute-keepass \ + misc/userscripts/qute-lastpass \ + misc/userscripts/qute-pass \ + misc/userscripts/readability \ + misc/userscripts/readability-js \ + misc/userscripts/ripbang \ + misc/userscripts/rss \ + misc/userscripts/taskadd \ + misc/userscripts/tor_identity \ + misc/userscripts/view_in_mpv fi distutils-r1_python_install_all |