diff options
189 files changed, 6819 insertions, 1737 deletions
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild new file mode 100644 index 000000000000..d8e34044f0dc --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig + +MY_P="${P/_alpha/a}" + +DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord" +HOMEPAGE="https://sourceforge.net/projects/cdrtools/" +SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="acl caps nls unicode selinux" + +BDEPEND=" + nls? ( >=sys-devel/gettext-0.18.1.1 ) + x11-misc/makedepend +" +RDEPEND=" + acl? ( virtual/acl ) + caps? ( sys-libs/libcap ) + nls? ( virtual/libintl ) + !app-cdr/cdrkit + selinux? ( sec-policy/selinux-cdrecord ) +" +DEPEND=" + ${RDEPEND} +" + +S=${WORKDIR}/${P/_alpha[0-9][0-9]} + +FILECAPS=( + cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord -- + cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav -- + cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd +) + +cdrtools_os() { + local os="linux" + [[ ${CHOST} == *-darwin* ]] && os="mac-os10" + [[ ${CHOST} == *-freebsd* ]] && os="freebsd" + echo "${os}" +} + +src_prepare() { + default + + gnuconfig_update + + # This fixes a clash with clone() on uclibc. Upstream isn't + # going to include this so let's try to carry it forward. + # Contact me if it needs updating. Bug #486782. + # Anthony G. Basile <blueness@gentoo.org>. + use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch + + # Remove profiled make files. + find -name '*_p.mk' -delete || die "delete *_p.mk" + + # Adjusting hardcoded paths. + sed -i -e "s|opt/schily|usr|" \ + $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \ + || die "sed opt/schily" + + sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \ + || die "sed doc" + + # Respect libdir. + sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \ + $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \ + || die "sed multilib" + + # Do not install static libraries. + sed -i -e "s|include\t\t.*rules.lib||" \ + $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \ + || die "sed rules" + + # Enable verbose build. + sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \ + RULES/*.rul RULES/rules.prg RULES/rules.inc \ + || die "sed verbose rules" + + # Respect CC/CXX variables. + cd "${S}"/RULES || die + local tcCC=$(tc-getCC) + local tcCXX=$(tc-getCXX) + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ + rules1.top || die "sed rules1.top" + sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ + -e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \ + -e "/COPTOPT=/s|-O||" \ + -e 's|$(GCCOPTOPT)||' \ + cc-gcc.rul || die "sed cc-gcc.rul" + sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \ + rules.cnf || die "sed rules.cnf" + + # Schily make setup. + cd "${S}"/DEFAULTS || die + local os=$(cdrtools_os) + + sed -i \ + -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \ + -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \ + -e "s|^\(LDPATH=\).*|\1|" \ + -e "s|^\(RUNPATH=\).*|\1|" \ + -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \ + -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \ + -e "s|^\(DEFINSGRP=\).*|\1\t0|" \ + -e '/^DEFUMASK/s,002,022,g' \ + Defaults.${os} || die "sed Schily make setup" + # re DEFUMASK above: + # bug 486680: grsec TPE will block the exec if the directory is + # group-writable. This is painful with cdrtools, because it makes a bunch of + # group-writable directories during build. Change the umask on their + # creation to prevent this. +} + +ac_cv_sizeof() { + cat <<-EOF >"${T}"/test.c + #include <inttypes.h> + #include <stddef.h> + #include <stdint.h> + #include <sys/types.h> + int main () { + static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)]; + test_array [0] = 0; + return test_array [0]; + } + EOF + + local i=1 + while [[ ${i} -lt 20 ]] ; do + if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then + echo ${i} + return 0 + fi + : $(( i += 1 )) + done + return 1 +} + +src_configure() { + use acl || export ac_cv_header_sys_acl_h="no" + use caps || export ac_cv_lib_cap_cap_get_proc="no" + export ac_cv_header_pulse_pulseaudio_h="no" + export ac_cv_header_alsa_asoundlib_h="no" + export ac_cv_lib_asound_snd_pcm_open="no" + + # skip obsolete configure script + if tc-is-cross-compiler ; then + # Cache known values for targets. #486680 + + tc-export CC + local var val t types=( + char "short int" int "long int" "long long" + "unsigned char" "unsigned short int" "unsigned int" + "unsigned long int" "unsigned long long" + float double "long double" size_t ssize_t ptrdiff_t + mode_t uid_t gid_t pid_t dev_t time_t wchar_t + "char *" "unsigned char *" + ) + for t in "${types[@]}" ; do + var="ac_cv_sizeof_${t// /_}" + var=${var//[*]/p} + val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}" + export "${var}=${val}" + einfo "Computing sizeof(${t}) as ${val}" + done + # We don't have these types. + export ac_cv_sizeof___int64=0 + export ac_cv_sizeof_unsigned___int64=0 + export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t} + export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t} + export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t} + + export ac_cv_type_prototypes="yes" + export ac_cv_func_mlock{,all}="yes" + export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc) + export ac_cv_func_dtoa_r="no" + export ac_cv_func_sys_siglist{,_def}="no" + export ac_cv_func_printf_{j,ll}="yes" + export ac_cv_realloc_null="yes" + export ac_cv_no_user_malloc="no" + export ac_cv_var_timezone="yes" + export ac_cv_var___progname{,_full}="yes" + export ac_cv_fnmatch_igncase="yes" + export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes" + export ac_cv_file__usr_src_linux_include="no" + + case $(cdrtools_os) in + linux) + export ac_cv_func_bsd_{g,s}etpgrp="no" + export ac_cv_hard_symlinks="yes" + export ac_cv_link_nofollow="yes" + export ac_cv_access_e_ok="no" + + export ac_cv_dev_minor_noncontig="yes" + case ${ac_cv_sizeof_long_int} in + 4) export ac_cv_dev_minor_bits="32";; + 8) export ac_cv_dev_minor_bits="44";; + esac + + cat <<-EOF >"${T}"/test.c + struct { + char start[6]; + unsigned char x1:4; + unsigned char x2:4; + char end[5]; + } a = { + .start = {'S', 't', 'A', 'r', 'T', '_'}, + .x1 = 5, + .x2 = 4, + .end = {'_', 'e', 'N', 'd', 'X'}, + }; + EOF + ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o + if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then + export ac_cv_c_bitfields_htol="no" + elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then + export ac_cv_c_bitfields_htol="yes" + fi + ;; + esac + fi +} + +src_compile() { + if use unicode; then + local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)" + if [[ -n ${flags} ]]; then + append-flags ${flags} + else + ewarn "Your compiler does not support the options required to build" + ewarn "cdrtools with unicode in USE. unicode flag will be ignored." + fi + fi + + # If not built with -j1, "sometimes" cdda2wav will not be built. + emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ + LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" +} + +src_install() { + # If not built with -j1, "sometimes" manpages are not installed. + emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \ + LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install + + # These symlinks are for compat with cdrkit. + dosym schily /usr/include/scsilib + dosym ../scg /usr/include/schily/scg + + dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux + + cd "${S}"/cdda2wav || die + docinto cdda2wav + dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO + + cd "${S}"/mkisofs || die + docinto mkisofs + dodoc ChangeLog* TODO + + # Remove man pages related to the build system + rm -rvf "${ED}"/usr/share/man/man5 || die +} + +pkg_postinst() { + fcaps_pkg_postinst + + if [[ ${CHOST} == *-darwin* ]] ; then + einfo + einfo "Darwin/OS X use the following device names:" + einfo + einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices" + einfo + einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices" + einfo + fi +} diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 700a2c1abe08..3a200179aa25 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -748,7 +748,7 @@ src_install() { doins "${FILESDIR}/bridge.conf" cd "${S}" - dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt + dodoc MAINTAINERS docs/specs/pci-ids.txt newdoc pc-bios/README README.pc-bios # Disallow stripping of prebuilt firmware files. diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index 313fb404135d..c68b2b5c945e 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1 +1,2 @@ DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410 +DIST eselect-php-0.9.7.tar.bz2 8460 BLAKE2B 160c87d1373b10cb2bd2d48210c7382f721433fb45557d0a5336af0ea25a1a49b151bcbbcf253947e6a5018b5740e8f9f9b1a66544bd74539a4e54aeab047a74 SHA512 f6c909906228906bc75be24bdf69330db10b0ea84822a5a016a185ac2855eec34bf6cb0bdaf22f3edc331002e72c8ae56733e1ea13cf815948a7a58439240fa9 diff --git a/app-eselect/eselect-php/eselect-php-0.9.7.ebuild b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild new file mode 100644 index 000000000000..c118dbec2492 --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd autotools + +DESCRIPTION="PHP eselect module" +HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/" +SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="fpm apache2" + +# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. +RDEPEND="app-admin/eselect + apache2? ( www-servers/apache[apache2_modules_dir] )" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # We expect localstatedir to be "var"ish, not "var/lib"ish, because + # that's what PHP upstream expects. See for example the FPM + # configuration where they put logs in @localstatedir@/log. + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) +} diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild index d08d80a13212..b2c346af0251 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" +LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) -inherit cmake gnome2-utils xdg-utils +inherit cmake gnome2-utils lua-single xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -28,7 +29,9 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" -REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +REQUIRED_USE="cairo? ( X ) + lua? ( ${LUA_REQUIRED_USE} ) + pango? ( cairo )" RESTRICT="!test? ( test )" BDEPEND="dev-util/glib-utils @@ -62,7 +65,7 @@ DEPEND="dev-libs/glib:2 enchant? ( app-text/enchant:= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) - lua? ( dev-lang/lua:0= ) + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) xkb? ( @@ -78,6 +81,12 @@ PATCHES=( DOCS=(AUTHORS ChangeLog THANKS) +pkg_setup() { + if use lua; then + lua-single_pkg_setup + fi +} + src_prepare() { if [[ "${PV}" =~ (^|\.)9999$ ]]; then ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die @@ -114,6 +123,11 @@ src_configure() { -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) -DENABLE_XKB=$(usex xkb ON OFF) ) + if use lua; then + mycmakeargs+=( + -DLUA_MODULE_NAME=lua + ) + fi cmake_src_configure } diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 14ddb1d72205..76f6bdd6c634 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" +LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) -inherit cmake gnome2-utils xdg-utils +inherit cmake gnome2-utils lua-single xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -28,7 +29,9 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="" IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" -REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +REQUIRED_USE="cairo? ( X ) + lua? ( ${LUA_REQUIRED_USE} ) + pango? ( cairo )" RESTRICT="!test? ( test )" BDEPEND="dev-util/glib-utils @@ -62,7 +65,7 @@ DEPEND="dev-libs/glib:2 enchant? ( app-text/enchant:= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) - lua? ( dev-lang/lua:0= ) + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) xkb? ( @@ -72,12 +75,17 @@ DEPEND="dev-libs/glib:2 RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-4.2.9.8-enchant.patch" "${FILESDIR}/${PN}-4.2.9.8-xkb.patch" ) DOCS=(AUTHORS ChangeLog THANKS) +pkg_setup() { + if use lua; then + lua-single_pkg_setup + fi +} + src_prepare() { if [[ "${PV}" =~ (^|\.)9999$ ]]; then ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die @@ -114,6 +122,11 @@ src_configure() { -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) -DENABLE_XKB=$(usex xkb ON OFF) ) + if use lua; then + mycmakeargs+=( + -DLUA_MODULE_NAME=lua + ) + fi cmake_src_configure } diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild index 8eb5b596beb5..019c1a68d966 100644 --- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild +++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild @@ -2,21 +2,21 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" +LUA_COMPAT=(lua{5-1,5-2,5-3}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit autotools gnome2-utils python-single-r1 +inherit autotools gnome2-utils lua-single python-single-r1 DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus" HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/" -SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz -" +SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="boost lua opencc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} )" BDEPEND="dev-db/sqlite:3 virtual/pkgconfig" @@ -31,11 +31,19 @@ DEPEND="${PYTHON_DEPS} dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] ') boost? ( dev-libs/boost:= ) - lua? ( dev-lang/lua:0 ) + lua? ( ${LUA_DEPS} ) opencc? ( app-i18n/opencc:= )" RDEPEND="${DEPEND}" +pkg_setup() { + python-single-r1_pkg_setup + + if use lua; then + lua-single_pkg_setup + fi +} + src_prepare() { sed -i \ -e "/^appdatadir/s:/appdata:/metainfo:" \ diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild index f4820be6d760..2c2bec4054b7 100644 --- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild +++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild @@ -1,20 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2008-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=(python3_{6,7,8}) +LUA_COMPAT=(lua5-1) +PYTHON_COMPAT=(python3_{6,7,8,9}) -inherit autotools python-single-r1 +inherit autotools lua-single python-single-r1 DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus" -HOMEPAGE="https://github.com/ibus/ibus/wiki" +HOMEPAGE="https://github.com/ibus/ibus-pinyin" SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="boost lua nls" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} )" RDEPEND="${PYTHON_DEPS} app-i18n/pyzy @@ -24,7 +26,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] ') boost? ( dev-libs/boost ) - lua? ( =dev-lang/lua-5.1*:0= ) + lua? ( ${LUA_DEPS} ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} dev-util/intltool @@ -38,6 +40,14 @@ PATCHES=( "${FILESDIR}"/${P}-python3.patch ) +pkg_setup() { + python-single-r1_pkg_setup + + if use lua; then + lua-single_pkg_setup + fi +} + src_prepare() { default eautoreconf diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild index f7c9f747cdd6..59400fd498e3 100644 --- a/app-i18n/ibus/ibus-1.5.22.ebuild +++ b/app-i18n/ibus/ibus-1.5.22.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) VALA_MIN_API_VERSION="0.34" VALA_MAX_API_VERSION="0.48" VALA_USE_DEPEND="vapigen" diff --git a/app-portage/overlint/overlint-0.5.3-r1.ebuild b/app-portage/overlint/overlint-0.5.3-r1.ebuild deleted file mode 100644 index e43431ab544c..000000000000 --- a/app-portage/overlint/overlint-0.5.3-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="Simple tool for static analysis of overlays" -HOMEPAGE="https://cgit.gentoo.org/proj/overlint.git" -SRC_URI="http://www.hartwork.org/public/${P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]" diff --git a/app-portage/overlint/overlint-0.5.3-r2.ebuild b/app-portage/overlint/overlint-0.5.3-r2.ebuild index 38e05f8207f4..c3fe8e11d2b5 100644 --- a/app-portage/overlint/overlint-0.5.3-r2.ebuild +++ b/app-portage/overlint/overlint-0.5.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild index 3d7c75757a2a..349bbcbf25eb 100644 --- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild +++ b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit python-single-r1 diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild index 3f6a91f5fbd6..f5adb7686329 100644 --- a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild +++ b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${P}" diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest index ede73337f217..acdc250b5eb7 100644 --- a/dev-db/mycli/Manifest +++ b/dev-db/mycli/Manifest @@ -1,2 +1,3 @@ DIST mycli-1.20.1.tar.gz 265264 BLAKE2B d00b1713132609b0a5ec6e8b78785fdab5c6b4db5937bc0b9bc69ddde90ad3dc75aeb99ccf6b5e7fe5e78e9bf4819f03fb454825e5182bc5d2c44356032343d1 SHA512 82ee642b2a4c158b0e2ea275941650125e15004ec1c70b2ab90ae0825090efccb4910a14fd46bcdf795a74adba5689b46de5668447308de63d1cbbbe2e6b0e9d DIST mycli-1.21.1.tar.gz 267646 BLAKE2B e0678974949ae219236b89fbe9ebdacfee9c1efc8f92853c937150dbb841680664432e9f5c79181545df8b3321480cf784e45a83139351cc93256d26dcdd66f0 SHA512 beb3888ff8abc2a79e591516d7f0f76d0c18f186bd0dca3b4aadcf93b3045de53ac7f135553ad509273c85ea364e81df5dcadf9eacf1dbef8ceff7345aa5ed6d +DIST mycli-1.22.2_p20201026.tar.gz 269338 BLAKE2B 42f4349e65a43829691fd7fa0fa1a57968cf34ffba04156ae221d7a2713179826fc09903e45b6f05fbf05688f956a9cd95e87393179992378766b3a3a6ef9c6e SHA512 70d68d7517322b28783c324d463664c2794ba26cc78e0eee056891ce43dbce57c4dd9c13982ac2976af07ff1fa3d4552cb22bf42b9c7885c93483ba86b873636 diff --git a/dev-db/mycli/files/mycli-1.22.2_p20201026.patch b/dev-db/mycli/files/mycli-1.22.2_p20201026.patch new file mode 100644 index 000000000000..3e7c719bf396 --- /dev/null +++ b/dev-db/mycli/files/mycli-1.22.2_p20201026.patch @@ -0,0 +1,470 @@ +diff --git a/.travis.yml b/.travis.yml +index 0afb5cc..182dea7 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -12,7 +12,7 @@ matrix: + + install: + - pip install -r requirements-dev.txt +- - pip install -e . ++ - pip install --no-cache-dir -e . + - sudo rm -f /etc/mysql/conf.d/performance-schema.cnf + - sudo service mysql restart + +diff --git a/README.md b/README.md +index efe804d..d5a0687 100644 +--- a/README.md ++++ b/README.md +@@ -96,6 +96,7 @@ $ sudo apt-get install mycli # Only on debian or ubuntu + --local-infile BOOLEAN Enable/disable LOAD DATA LOCAL INFILE. + --login-path TEXT Read this path from the login file. + -e, --execute TEXT Execute command and quit. ++ --init-command TEXT SQL statement to execute after connecting. + --help Show this message and exit. + + Features +diff --git a/changelog.md b/changelog.md +index a4fea35..508c801 100644 +--- a/changelog.md ++++ b/changelog.md +@@ -1,9 +1,22 @@ ++TBD ++=== ++ ++Features: ++--------- ++ ++* Add an option `--init-command` to execute SQL after connecting (Thanks: [KITAGAWA Yasutaka]). ++ ++Bug Fixes: ++---------- ++* Fixed compatibility with sqlparse 0.4 (Thanks: [mtorromeo]). ++ + 1.22.2 + ====== + + Bug Fixes: + ---------- +-* Make the `pwd` module optional. ++ ++* Make the `pwd` module optional. + + 1.22.1 + ====== +@@ -18,6 +31,11 @@ Features: + * Add an option `--list-ssh-config` to list ssh configurations. + * Add an option `--ssh-config-path` to choose ssh configuration path. + ++Bug Fixes: ++---------- ++ ++* Fix specifying empty password with `--password=''` when config file has a password set (Thanks: [Zach DeCook]). ++ + + 1.21.1 + ====== +@@ -28,6 +46,7 @@ Bug Fixes: + + * Fix broken auto-completion for favorite queries (Thanks: [Amjith]). + * Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov]) ++* Support setting color for null value (Thanks: [laixintao]) + + 1.21.0 + ====== +@@ -768,3 +787,6 @@ Bug Fixes: + [François Pietka]: https://github.com/fpietka + [Frederic Aoustin]: https://github.com/fraoustin + [Georgy Frolov]: https://github.com/pasenor ++[Zach DeCook]: https://zachdecook.com ++[laixintao]: https://github.com/laixintao ++[mtorromeo]: https://github.com/mtorromeo +diff --git a/mycli/AUTHORS b/mycli/AUTHORS +index b3636d9..a1204b0 100644 +--- a/mycli/AUTHORS ++++ b/mycli/AUTHORS +@@ -72,6 +72,10 @@ Contributors: + * Jakub Boukal + * Takeshi D. Itoh + * laixintao ++ * Zach DeCook ++ * kevinhwang91 ++ * KITAGAWA Yasutaka ++ * Massimiliano Torromeo + + Creator: + -------- +diff --git a/mycli/clistyle.py b/mycli/clistyle.py +index c94f793..293f0f4 100644 +--- a/mycli/clistyle.py ++++ b/mycli/clistyle.py +@@ -34,6 +34,7 @@ TOKEN_TO_PROMPT_STYLE = { + Token.Output.Header: 'output.header', + Token.Output.OddRow: 'output.odd-row', + Token.Output.EvenRow: 'output.even-row', ++ Token.Output.Null: 'output.null', + Token.Prompt: 'prompt', + Token.Continuation: 'continuation', + } +diff --git a/mycli/main.py b/mycli/main.py +index 03797a0..dffd724 100755 +--- a/mycli/main.py ++++ b/mycli/main.py +@@ -98,7 +98,7 @@ class MyCli(object): + xdg_config_home = "~/.config" + system_config_files = [ + '/etc/myclirc', +- os.path.join(xdg_config_home, "mycli", "myclirc") ++ os.path.join(os.path.expanduser(xdg_config_home), "mycli", "myclirc") + ] + + default_config_file = os.path.join(PACKAGE_ROOT, 'myclirc') +@@ -152,7 +152,7 @@ class MyCli(object): + c['main'].as_bool('auto_vertical_output') + + # Write user config if system config wasn't the last config loaded. +- if c.filename not in self.system_config_files: ++ if c.filename not in self.system_config_files and not os.path.exists(myclirc): + write_default_config(self.default_config_file, myclirc) + + # audit log +@@ -363,7 +363,7 @@ class MyCli(object): + def connect(self, database='', user='', passwd='', host='', port='', + socket='', charset='', local_infile='', ssl='', + ssh_user='', ssh_host='', ssh_port='', +- ssh_password='', ssh_key_filename=''): ++ ssh_password='', ssh_key_filename='', init_command=''): + + cnf = {'database': None, + 'user': None, +@@ -396,7 +396,7 @@ class MyCli(object): + port = port or cnf['port'] + ssl = ssl or {} + +- passwd = passwd or cnf['password'] ++ passwd = passwd if isinstance(passwd, str) else cnf['password'] + charset = charset or cnf['default-character-set'] or 'utf8' + + # Favor whichever local_infile option is set. +@@ -420,7 +420,7 @@ class MyCli(object): + self.sqlexecute = SQLExecute( + database, user, passwd, host, port, socket, charset, + local_infile, ssl, ssh_user, ssh_host, ssh_port, +- ssh_password, ssh_key_filename ++ ssh_password, ssh_key_filename, init_command + ) + except OperationalError as e: + if ('Access denied for user' in e.args[1]): +@@ -429,7 +429,7 @@ class MyCli(object): + self.sqlexecute = SQLExecute( + database, user, new_passwd, host, port, socket, + charset, local_infile, ssl, ssh_user, ssh_host, +- ssh_port, ssh_password, ssh_key_filename ++ ssh_port, ssh_password, ssh_key_filename, init_command + ) + else: + raise e +@@ -1051,6 +1051,8 @@ class MyCli(object): + help='Read this path from the login file.') + @click.option('-e', '--execute', type=str, + help='Execute command and quit.') ++@click.option('--init-command', type=str, ++ help='SQL statement to execute after connecting.') + @click.argument('database', default='', nargs=1) + def cli(database, user, host, port, socket, password, dbname, + version, verbose, prompt, logfile, defaults_group_suffix, +@@ -1058,7 +1060,8 @@ def cli(database, user, host, port, socket, password, dbname, + ssl_ca, ssl_capath, ssl_cert, ssl_key, ssl_cipher, + ssl_verify_server_cert, table, csv, warn, execute, myclirc, dsn, + list_dsn, ssh_user, ssh_host, ssh_port, ssh_password, +- ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host): ++ ssh_key_filename, list_ssh_config, ssh_config_path, ssh_config_host, ++ init_command): + """A MySQL terminal client with auto-completion and syntax highlighting. + + \b +@@ -1182,7 +1185,8 @@ def cli(database, user, host, port, socket, password, dbname, + ssh_host=ssh_host, + ssh_port=ssh_port, + ssh_password=ssh_password, +- ssh_key_filename=ssh_key_filename ++ ssh_key_filename=ssh_key_filename, ++ init_command=init_command + ) + + mycli.logger.debug('Launch Params: \n' +diff --git a/mycli/myclirc b/mycli/myclirc +index 534b201..ba3ea1e 100644 +--- a/mycli/myclirc ++++ b/mycli/myclirc +@@ -111,6 +111,7 @@ bottom-toolbar.transaction.failed = 'bg:#222222 #ff005f bold' + output.header = "#00ff5f bold" + output.odd-row = "" + output.even-row = "" ++output.null = "#808080" + + # Favorite queries. + [favorite_queries] +diff --git a/mycli/packages/completion_engine.py b/mycli/packages/completion_engine.py +index 2b19c32..3cff2cc 100644 +--- a/mycli/packages/completion_engine.py ++++ b/mycli/packages/completion_engine.py +@@ -2,7 +2,6 @@ import os + import sys + import sqlparse + from sqlparse.sql import Comparison, Identifier, Where +-from sqlparse.compat import text_type + from .parseutils import last_word, extract_tables, find_prev_keyword + from .special import parse_special_command + +@@ -55,7 +54,7 @@ def suggest_type(full_text, text_before_cursor): + stmt_start, stmt_end = 0, 0 + + for statement in parsed: +- stmt_len = len(text_type(statement)) ++ stmt_len = len(str(statement)) + stmt_start, stmt_end = stmt_end, stmt_end + stmt_len + + if stmt_end >= current_pos: +diff --git a/mycli/sqlexecute.py b/mycli/sqlexecute.py +index c68af0f..7534982 100644 +--- a/mycli/sqlexecute.py ++++ b/mycli/sqlexecute.py +@@ -42,7 +42,7 @@ class SQLExecute(object): + + def __init__(self, database, user, password, host, port, socket, charset, + local_infile, ssl, ssh_user, ssh_host, ssh_port, ssh_password, +- ssh_key_filename): ++ ssh_key_filename, init_command=None): + self.dbname = database + self.user = user + self.password = password +@@ -59,12 +59,13 @@ class SQLExecute(object): + self.ssh_port = ssh_port + self.ssh_password = ssh_password + self.ssh_key_filename = ssh_key_filename ++ self.init_command = init_command + self.connect() + + def connect(self, database=None, user=None, password=None, host=None, + port=None, socket=None, charset=None, local_infile=None, + ssl=None, ssh_host=None, ssh_port=None, ssh_user=None, +- ssh_password=None, ssh_key_filename=None): ++ ssh_password=None, ssh_key_filename=None, init_command=None): + db = (database or self.dbname) + user = (user or self.user) + password = (password or self.password) +@@ -79,6 +80,7 @@ class SQLExecute(object): + ssh_port = (ssh_port or self.ssh_port) + ssh_password = (ssh_password or self.ssh_password) + ssh_key_filename = (ssh_key_filename or self.ssh_key_filename) ++ init_command = (init_command or self.init_command) + _logger.debug( + 'Connection DB Params: \n' + '\tdatabase: %r' +@@ -93,9 +95,11 @@ class SQLExecute(object): + '\tssh_host: %r' + '\tssh_port: %r' + '\tssh_password: %r' +- '\tssh_key_filename: %r', ++ '\tssh_key_filename: %r' ++ '\tinit_command: %r', + db, user, host, port, socket, charset, local_infile, ssl, +- ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename ++ ssh_user, ssh_host, ssh_port, ssh_password, ssh_key_filename, ++ init_command + ) + conv = conversions.copy() + conv.update({ +@@ -110,12 +114,16 @@ class SQLExecute(object): + if ssh_host: + defer_connect = True + ++ client_flag = pymysql.constants.CLIENT.INTERACTIVE ++ if init_command and len(list(special.split_queries(init_command))) > 1: ++ client_flag |= pymysql.constants.CLIENT.MULTI_STATEMENTS ++ + conn = pymysql.connect( + database=db, user=user, password=password, host=host, port=port, + unix_socket=socket, use_unicode=True, charset=charset, +- autocommit=True, client_flag=pymysql.constants.CLIENT.INTERACTIVE, ++ autocommit=True, client_flag=client_flag, + local_infile=local_infile, conv=conv, ssl=ssl, program_name="mycli", +- defer_connect=defer_connect ++ defer_connect=defer_connect, init_command=init_command + ) + + if ssh_host: +@@ -146,6 +154,7 @@ class SQLExecute(object): + self.socket = socket + self.charset = charset + self.ssl = ssl ++ self.init_command = init_command + # retrieve connection id + self.reset_connection_id() + +diff --git a/requirements-dev.txt b/requirements-dev.txt +index 8e206a5..7a38ed5 100644 +--- a/requirements-dev.txt ++++ b/requirements-dev.txt +@@ -3,8 +3,8 @@ pytest!=3.3.0 + pytest-cov==2.4.0 + tox + twine==1.12.1 +-behave +-pexpect ++behave>=1.2.4 ++pexpect==3.3 + coverage==5.0.4 + codecov==2.0.9 + autopep8==1.3.3 +diff --git a/setup.py b/setup.py +index 156cd1a..fbab22e 100755 +--- a/setup.py ++++ b/setup.py +@@ -24,7 +24,7 @@ install_requirements = [ + 'sqlparse>=0.3.0,<0.4.0', + 'configobj >= 5.0.5', + 'cryptography >= 1.0.0', +- 'cli_helpers[styles] > 1.1.0', ++ 'cli_helpers[styles] >= 2.0.1', + ] + + +@@ -65,7 +65,7 @@ class test(TestCommand): + def initialize_options(self): + TestCommand.initialize_options(self) + self.pytest_args = '' +- self.behave_args = '' ++ self.behave_args = '--no-capture' + + def run_tests(self): + unit_test_errno = subprocess.call( +diff --git a/test/features/environment.py b/test/features/environment.py +index 1a49dbe..cb35140 100644 +--- a/test/features/environment.py ++++ b/test/features/environment.py +@@ -16,7 +16,7 @@ def before_all(context): + os.environ['LINES'] = "100" + os.environ['COLUMNS'] = "100" + os.environ['EDITOR'] = 'ex' +- os.environ['LC_ALL'] = 'en_US.utf8' ++ os.environ['LC_ALL'] = 'en_US.UTF-8' + os.environ['PROMPT_TOOLKIT_NO_CPR'] = '1' + + test_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) +@@ -118,11 +118,12 @@ def after_scenario(context, _): + host = context.conf['host'] + dbname = context.currentdb + context.cli.expect_exact( +- '{0}@{1}:{2}> '.format( ++ '{0}@{1}:{2}>'.format( + user, host, dbname + ), + timeout=5 + ) ++ context.cli.sendcontrol('c') + context.cli.sendcontrol('d') + context.cli.expect_exact(pexpect.EOF, timeout=5) + +diff --git a/test/features/steps/crud_database.py b/test/features/steps/crud_database.py +index a0bfa53..be6dec0 100644 +--- a/test/features/steps/crud_database.py ++++ b/test/features/steps/crud_database.py +@@ -64,15 +64,13 @@ def step_see_prompt(context): + user = context.conf['user'] + host = context.conf['host'] + dbname = context.currentdb +- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format( +- user, host, dbname), timeout=5) +- context.atprompt = True ++ wrappers.wait_prompt(context, '{0}@{1}:{2}> '.format(user, host, dbname)) + + + @then('we see help output') + def step_see_help(context): + for expected_line in context.fixture_data['help_commands.txt']: +- wrappers.expect_exact(context, expected_line + '\r\n', timeout=1) ++ wrappers.expect_exact(context, expected_line, timeout=1) + + + @then('we see database created') +@@ -96,10 +94,7 @@ def step_see_db_dropped_no_default(context): + context.currentdb = None + + wrappers.expect_exact(context, 'Query OK, 0 rows affected', timeout=2) +- wrappers.expect_exact(context, '{0}@{1}:{2}> '.format( +- user, host, database), timeout=5) +- +- context.atprompt = True ++ wrappers.wait_prompt(context, '{0}@{1}:{2}>'.format(user, host, database)) + + + @then('we see database connected') +diff --git a/test/features/steps/wrappers.py b/test/features/steps/wrappers.py +index 565ca59..de833dd 100644 +--- a/test/features/steps/wrappers.py ++++ b/test/features/steps/wrappers.py +@@ -88,7 +88,7 @@ def wait_prompt(context, prompt=None): + user = context.conf['user'] + host = context.conf['host'] + dbname = context.currentdb +- prompt = '{0}@{1}:{2}> '.format( ++ prompt = '{0}@{1}:{2}>'.format( + user, host, dbname), + expect_exact(context, prompt, timeout=5) + context.atprompt = True +diff --git a/test/test_main.py b/test/test_main.py +index 3f92bd1..707c359 100644 +--- a/test/test_main.py ++++ b/test/test_main.py +@@ -492,3 +492,37 @@ def test_ssh_config(monkeypatch): + MockMyCli.connect_args["ssh_host"] == "arg_host" and \ + MockMyCli.connect_args["ssh_port"] == 3 and \ + MockMyCli.connect_args["ssh_key_filename"] == "/path/to/key" ++ ++ ++@dbtest ++def test_init_command_arg(executor): ++ init_command = "set sql_select_limit=1000" ++ sql = 'show variables like "sql_select_limit";' ++ runner = CliRunner() ++ result = runner.invoke( ++ cli, args=CLI_ARGS + ["--init-command", init_command], input=sql ++ ) ++ ++ expected = "sql_select_limit\t1000\n" ++ assert result.exit_code == 0 ++ assert expected in result.output ++ ++ ++@dbtest ++def test_init_command_multiple_arg(executor): ++ init_command = 'set sql_select_limit=2000; set max_join_size=20000' ++ sql = ( ++ 'show variables like "sql_select_limit";\n' ++ 'show variables like "max_join_size"' ++ ) ++ runner = CliRunner() ++ result = runner.invoke( ++ cli, args=CLI_ARGS + ['--init-command', init_command], input=sql ++ ) ++ ++ expected_sql_select_limit = 'sql_select_limit\t2000\n' ++ expected_max_join_size = 'max_join_size\t20000\n' ++ ++ assert result.exit_code == 0 ++ assert expected_sql_select_limit in result.output ++ assert expected_max_join_size in result.output +diff --git a/test/test_tabular_output.py b/test/test_tabular_output.py +index 7d7d000..c20c7de 100644 +--- a/test/test_tabular_output.py ++++ b/test/test_tabular_output.py +@@ -16,7 +16,7 @@ from pymysql.constants import FIELD_TYPE + @pytest.fixture + def mycli(): + cli = MyCli() +- cli.connect(None, USER, PASSWORD, HOST, PORT, None) ++ cli.connect(None, USER, PASSWORD, HOST, PORT, None, init_command=None) + return cli + + diff --git a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild new file mode 100644 index 000000000000..45cb7e841de6 --- /dev/null +++ b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +MY_PV=$(ver_cut 1-3) +S="${WORKDIR}/${PN}-${MY_PV}" + +DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting" + +HOMEPAGE="https://www.mycli.net" +SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ssh test" +RESTRICT="!test? ( test )" +RDEPEND="$(python_gen_cond_dep ' + >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}] + >=dev-python/click-7.0[${PYTHON_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] + >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}] + <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}] + >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] + <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}] + ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )') +" +DEPEND="${RDEPEND}" +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" "${FILESDIR}/mycli-1.22.2_p20201026.patch" ) + +python_test() { + pytest --capture=sys \ + --showlocals \ + --doctest-modules \ + --doctest-ignore-import-errors \ + --ignore=setup.py \ + --ignore=mycli/magic.py \ + --ignore=mycli/packages/parseutils.py \ + --ignore=test/features \ + --ignore=mycli/packages/paramiko_stub/__init__.py +} diff --git a/dev-db/mycli/mycli-9999.ebuild b/dev-db/mycli/mycli-9999.ebuild index 9fcacbc962c2..baad31d4a090 100644 --- a/dev-db/mycli/mycli-9999.ebuild +++ b/dev-db/mycli/mycli-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) DISTUTILS_SINGLE_IMPL=yes DISTUTILS_USE_SETUPTOOLS=rdepend EGIT_REPO_URI="https://github.com/dbcli/mycli.git" @@ -19,24 +19,23 @@ KEYWORDS="" IUSE="ssh test" RESTRICT="!test? ( test )" RDEPEND="$(python_gen_cond_dep ' - >=dev-python/cli_helpers-1.1.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/click-7.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/configobj-5.0.6[${PYTHON_MULTI_USEDEP}] - >=dev-python/cryptography-1.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/prompt_toolkit-3.0.0[${PYTHON_MULTI_USEDEP}] - <dev-python/prompt_toolkit-4.0.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pymysql-0.9.2[${PYTHON_MULTI_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_MULTI_USEDEP}] - <dev-python/sqlparse-0.4.0[${PYTHON_MULTI_USEDEP}] - ssh? ( dev-python/paramiko[${PYTHON_MULTI_USEDEP}] )') + >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}] + >=dev-python/click-7.0[${PYTHON_USEDEP}] + >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] + >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}] + >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}] + <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}] + >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] + <dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}] + ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )') " DEPEND="${RDEPEND}" +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )" distutils_enable_tests pytest -BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_MULTI_USEDEP}]') )" - PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" ) python_test() { @@ -47,5 +46,6 @@ python_test() { --ignore=setup.py \ --ignore=mycli/magic.py \ --ignore=mycli/packages/parseutils.py \ - --ignore=test/features + --ignore=test/features \ + --ignore=mycli/packages/paramiko_stub/__init__.py } diff --git a/dev-haskell/ghc-syb-utils/Manifest b/dev-haskell/ghc-syb-utils/Manifest deleted file mode 100644 index de0d58bff80b..000000000000 --- a/dev-haskell/ghc-syb-utils/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ghc-syb-utils-0.3.0.0.tar.gz 2895 BLAKE2B 26ee12941b9cf2a4295ef2ad2db87f918afaa25fbb781d918955d8c37a63e41295a6c4a62b9ea769803313ccb4fe20704788e0b5804922c18e8193c2abf97868 SHA512 e55cc7e830d34113eae55f89124f836390c6c8a80afce9f1b245aebc35acf1863beb9f7f0388fb22e4d1ee771c332da8f9b36d88fd89080ac50d287b2272aa3b diff --git a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild b/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild deleted file mode 100644 index 8f362de4d4fd..000000000000 --- a/dev-haskell/ghc-syb-utils/ghc-syb-utils-0.3.0.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.6.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Scrap Your Boilerplate utilities for the GHC API" -HOMEPAGE="https://github.com/DanielG/ghc-syb" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/syb-0.1.0:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10 -" diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml deleted file mode 100644 index b7878815d80d..000000000000 --- a/dev-haskell/ghc-syb-utils/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> -</pkgmetadata> diff --git a/dev-haskell/lvmlib/Manifest b/dev-haskell/lvmlib/Manifest deleted file mode 100644 index 0c3fc2b3db0f..000000000000 --- a/dev-haskell/lvmlib/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lvmlib-1.1.tar.gz 62388 BLAKE2B 9effe8b0b71ef36b3f73e792a9702d44efa5a7ed9f48f35825d75706a7dad2d5f5cac06d5941f60730c79216af5f3009110919dfa397343287e7359e702c5fbc SHA512 3f085f3ff8e53ab19de3b425c4c5a271111afcd334ec08fefd983838608ae436005c20c2d7c545650f0dd1b76d466f81661a14c8ce972df27d79a78c22023861 diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch deleted file mode 100644 index ad68d78f56e7..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-7.10.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Lvm/Asm/Data.hs b/Lvm/Asm/Data.hs -index 7939754..f3da0b7 100644 ---- a/Lvm/Asm/Data.hs -+++ b/Lvm/Asm/Data.hs -@@ -17,2 +17,3 @@ import Lvm.Core.Module - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Common/IdMap.hs b/Lvm/Common/IdMap.hs -index a50bcb6..10758e6 100644 ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -24,2 +24,3 @@ import Lvm.Common.Id - import Control.Arrow (first) -+import Prelude hiding (foldMap) - -diff --git a/Lvm/Core/Expr.hs b/Lvm/Core/Expr.hs -index 8bc50d7..935e16a 100644 ---- a/Lvm/Core/Expr.hs -+++ b/Lvm/Core/Expr.hs -@@ -17,2 +17,3 @@ import Lvm.Core.PrettyId - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Core/Module.hs b/Lvm/Core/Module.hs -index 923870e..ac52201 100644 ---- a/Lvm/Core/Module.hs -+++ b/Lvm/Core/Module.hs -@@ -24,2 +24,3 @@ import Lvm.Instr.Data - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Data.hs b/Lvm/Instr/Data.hs -index 497a690..959cb5c 100644 ---- a/Lvm/Instr/Data.hs -+++ b/Lvm/Instr/Data.hs -@@ -19,2 +19,3 @@ import Lvm.Common.Id - import Text.PrettyPrint.Leijen -+import Prelude hiding ((<$>)) - -diff --git a/Lvm/Instr/Resolve.hs b/Lvm/Instr/Resolve.hs -index 6845f74..4172a74 100644 ---- a/Lvm/Instr/Resolve.hs -+++ b/Lvm/Instr/Resolve.hs -@@ -10,2 +10,4 @@ module Lvm.Instr.Resolve (instrResolve) where - import Control.Exception (assert) -+import Control.Applicative -+import Control.Monad - import Data.Maybe -@@ -32,2 +34,6 @@ instance Functor Resolve where - -+instance Applicative Resolve where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Resolve where -diff --git a/Lvm/Read.hs b/Lvm/Read.hs -index 7137331..25797f9 100644 ---- a/Lvm/Read.hs -+++ b/Lvm/Read.hs -@@ -9,2 +9,3 @@ module Lvm.Read (lvmReadFile, lvmRead) where - -+import Control.Applicative - import Control.Monad -@@ -390,2 +391,7 @@ instance Functor (Read v) where - Result x st2 -> Result (f x) st2) -+ -+instance Applicative (Read v) where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad (Read v) where -diff --git a/Lvm/Write.hs b/Lvm/Write.hs -index 48570f8..37469bc 100644 ---- a/Lvm/Write.hs -+++ b/Lvm/Write.hs -@@ -11,2 +11,3 @@ import qualified Control.Exception as CE (assert, catch, IOException) - import Control.Monad -+import Control.Applicative - import Data.Maybe -@@ -465,2 +466,6 @@ instance Functor Emit where - -+instance Applicative Emit where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad Emit where diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch deleted file mode 100644 index 36d680794f07..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc-8.8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Lvm/Common/IdMap.hs -+++ b/Lvm/Common/IdMap.hs -@@ -121,10 +121,10 @@ unionMaps :: [IdMap a] -> IdMap a - unionMaps = foldr unionMap emptyMap - - foldMapWithId :: (Id -> a -> b -> b) -> b -> IdMap a -> b --foldMapWithId f z (IdMap m) = IntMap.foldWithKey (f . idFromInt) z m -+foldMapWithId f z (IdMap m) = IntMap.foldrWithKey (f . idFromInt) z m - - foldMap :: (a -> b -> b) -> b -> IdMap a -> b --foldMap f z (IdMap m) = IntMap.fold f z m -+foldMap f z (IdMap m) = IntMap.foldr f z m - - sizeMap :: IdMap a -> Int - sizeMap (IdMap m) = IntMap.size m diff --git a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch b/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch deleted file mode 100644 index 8f9e85402f9c..000000000000 --- a/dev-haskell/lvmlib/files/lvmlib-1.1-ghc84.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Lvm/Common/Byte.hs -+++ b/Lvm/Common/Byte.hs -@@ -19,2 +19,3 @@ import System.Exit - import System.IO -+import qualified Data.Semigroup as S - -@@ -68,2 +69,7 @@ max32 = 2^(32::Int) -1 -- Bastiaan (Todo: check) - -+instance S.Semigroup Bytes where -+ (<>) bs Nil = bs -+ (<>) Nil cs = cs -+ (<>) bs cs = Cat bs cs -+ - instance Monoid Bytes where diff --git a/dev-haskell/lvmlib/lvmlib-1.1.ebuild b/dev-haskell/lvmlib/lvmlib-1.1.ebuild deleted file mode 100644 index 7184d226bf02..000000000000 --- a/dev-haskell/lvmlib/lvmlib-1.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.4.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit eutils haskell-cabal - -DESCRIPTION="The Lazy Virtual Machine (LVM)" -HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/parsec:=[profile?] - dev-haskell/wl-pprint:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10.1.0 -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1-ghc-7.10.patch - "${FILESDIR}"/${PN}-1.1-ghc84.patch - "${FILESDIR}"/${PN}-1.1-ghc-8.8.patch -) diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml deleted file mode 100644 index 2d49cd8f1b3c..000000000000 --- a/dev-haskell/lvmlib/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - The Lazy Virtual Machine (LVM) defines a portable instruction set and file - format. It is specifically designed to execute languages with non-strict (or - lazy) semantics. This cabal package defines the core assembler (coreasm) for - compiling core programs into LVM instructions and a library. The LVM is used - as a backend for the Helium compiler. At the moment, one LVM runtime - implementation is available (written in C). More information about LVM can be - found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad. - </longdescription> -</pkgmetadata> diff --git a/dev-haskell/shuffle/Manifest b/dev-haskell/shuffle/Manifest deleted file mode 100644 index 8983bbbd48a7..000000000000 --- a/dev-haskell/shuffle/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST shuffle-0.1.3.3.tar.gz 31685 BLAKE2B 007f91bedca1cd7b7a7d40b3425f528b3e76e5636447b509bfa30ba09894267c51a759ca512a39c8c3c296765b816df28ad6952085e5135f24b6169dfab8d519 SHA512 44fcb34a3a9c251970c132c5a504aa4fe30befbc2829ff8b4f788e797c8a35373c5ed4325fb3e5d5846caf0f566b84c398f53be0c7d33d4392343e4f8655a096 diff --git a/dev-haskell/shuffle/metadata.xml b/dev-haskell/shuffle/metadata.xml deleted file mode 100644 index 10e4152273f6..000000000000 --- a/dev-haskell/shuffle/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <use> - <flag name="network-uri">Get Network.URI from the network-uri package.</flag> - </use> - <upstream> - <remote-id type="github">UU-ComputerScience/shuffle</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild b/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild deleted file mode 100644 index 8c75f97db9a5..000000000000 --- a/dev-haskell/shuffle/shuffle-0.1.3.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.4.5.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Shuffle tool for UHC" -HOMEPAGE="https://github.com/UU-ComputerScience/shuffle" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+network-uri" - -RDEPEND=">=dev-haskell/cabal-1.14:=[profile?] - >=dev-haskell/uhc-util-0.1.5.5:=[profile?] - >=dev-haskell/uuagc-0.9.40.3:=[profile?] - >=dev-haskell/uuagc-cabal-1.0.3.0:=[profile?] - >=dev-haskell/uulib-0.9:=[profile?] - >=dev-lang/ghc-7.4.1:= - network-uri? ( >=dev-haskell/network-2.6:=[profile?] - >=dev-haskell/network-uri-2.6:=[profile?] ) - !network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag network-uri network-uri) -} diff --git a/dev-haskell/uhc-light/Manifest b/dev-haskell/uhc-light/Manifest deleted file mode 100644 index d41eee427173..000000000000 --- a/dev-haskell/uhc-light/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST uhc-light-1.1.9.5.tar.gz 4546645 BLAKE2B df1d0303af2ca9b59d508582a90a490204cb6dca4c5431e130c3551017d2c066b7fe93ee323ce765f6cededa77563de4dbf29a740e15e42193383fa9928a9cd5 SHA512 1d31cf2be92689dc0fd989db158623ba36455f33dad70905063cd0849e65cd3f2b78d29a6ed7a943a371e14afc45c95dc552c5a6c64109b192b9ca57cacc7fea diff --git a/dev-haskell/uhc-light/metadata.xml b/dev-haskell/uhc-light/metadata.xml deleted file mode 100644 index cd3392e2775f..000000000000 --- a/dev-haskell/uhc-light/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <longdescription> - A 'light' variant of UHC including only an API and executables for compiling to Core representation (uhcl) and running CoreRun (uhcr). This version is just to test the infrastructure. Later versions will provide a fleshing out of the API and completion of the now rudimentary platform independent (Haskell) interpreted running etc.. - </longdescription> - <upstream> - <remote-id type="github">UU-ComputerScience/uhc</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild b/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild deleted file mode 100644 index ba85c126fd10..000000000000 --- a/dev-haskell/uhc-light/uhc-light-1.1.9.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.1.9999 - -CABAL_FEATURES="lib profile" # broken markup: haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="Part of UHC packaged as cabal/hackage installable library" -HOMEPAGE="https://github.com/UU-ComputerScience/uhc" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-haskell/fgl:=[profile?] - >=dev-haskell/hashable-1.2.4:=[profile?] <dev-haskell/hashable-1.3:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - dev-haskell/old-locale:=[profile?] - dev-haskell/primitive:=[profile?] - dev-haskell/syb:=[profile?] - >=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?] - dev-haskell/utf8-string:=[profile?] - >=dev-haskell/uulib-0.9.19:=[profile?] - dev-haskell/vector:=[profile?] - >=dev-lang/ghc-7.8.2:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 -" diff --git a/dev-haskell/uhc-util/Manifest b/dev-haskell/uhc-util/Manifest deleted file mode 100644 index 17e315af6992..000000000000 --- a/dev-haskell/uhc-util/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST uhc-util-0.1.6.7.tar.gz 113857 BLAKE2B 3115383b3951c9dbe38dfb17248c59ef0f1af4857c9479e1164c7a64983748b2e937fb7669e70fa7c0369653e038cc739d4aaf50e7552d8e91e7a3af912f7a8b SHA512 02c8ce0af2aa19f2f9870aa03822860ec6285028867c5e0d7e28fc8bc3ec57cc308d428c8a48c7aa8c78301ac68d9e0ace0721eb35d91c5ae6caf3661236efad diff --git a/dev-haskell/uhc-util/metadata.xml b/dev-haskell/uhc-util/metadata.xml deleted file mode 100644 index 4f1d9f5d6ed6..000000000000 --- a/dev-haskell/uhc-util/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <upstream> - <remote-id type="github">UU-ComputerScience/uhc-util</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild b/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild deleted file mode 100644 index 1a84fd58be83..000000000000 --- a/dev-haskell/uhc-util/uhc-util-0.1.6.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.1.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="UHC utilities" -HOMEPAGE="https://github.com/UU-ComputerScience/uhc-util" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/fclabels-2.0.3:=[profile?] - >=dev-haskell/fgl-5.4:=[profile?] - >=dev-haskell/hashable-1.2.4:=[profile?] - >=dev-haskell/logict-state-0.1.0.2:=[profile?] - >=dev-haskell/mtl-2:=[profile?] - >=dev-haskell/pqueue-1.3.1:=[profile?] - >=dev-haskell/time-compat-0.1.0.1:=[profile?] - >=dev-haskell/uulib-0.9.19:=[profile?] - >=dev-lang/ghc-7.10.2:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.4.0 -" diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest deleted file mode 100644 index 2b63862803ad..000000000000 --- a/dev-lang/helium/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST helium-1.8.1.tar.gz 774509 BLAKE2B 05e28d1140cd48925a2c4d06c5c152e06879389d666d54b0c5d7592453489f8e2bbaa8e7c20dbd9d72fe57a3f9651bffa05d156a32e0208e41ef0e78599353fa SHA512 4523d7323251354ea9f4fd0f6f5a112659119bef2fc0c790bb139cdcdf25e7f740ae4c7d584d0c93aabc3baaace8be49931808c59ad9133b81a64ae115e0f9b9 diff --git a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch deleted file mode 100644 index 43af33ecac89..000000000000 --- a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs -index 75ac077..af35093 100644 ---- a/src/Helium/Parser/LexerMonad.hs -+++ b/src/Helium/Parser/LexerMonad.hs -@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage - import Text.ParserCombinators.Parsec.Pos -+import Control.Applicative -+import Control.Monad - -@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets)) - -+instance Functor LexerMonad where -+ fmap = liftM -+ -+instance Applicative LexerMonad where -+ pure = return -+ (<*>) = ap -- defined in Control.Monad -+ - instance Monad LexerMonad where -diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -index 880ac0b..90574f0 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : OnlyResultHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -index 89e43f2..251406f 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : RepairHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -index d0b01a3..ba7ca19 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : TieBreakerHeuristics -diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -index c2e91f5..493c882 100644 ---- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -+++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE FlexibleContexts #-} - {-| Module : UnifierHeuristics -diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs -index af970dc..ee42a48 100644 ---- a/src/Helium/Syntax/UHA_Pretty.hs -+++ b/src/Helium/Syntax/UHA_Pretty.hs -@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity) - import qualified Control.Monad.Identity -+import Prelude hiding ((<$>)) - diff --git a/dev-lang/helium/helium-1.8.1.ebuild b/dev-lang/helium/helium-1.8.1.ebuild deleted file mode 100644 index 2a9fb0d552d9..000000000000 --- a/dev-lang/helium/helium-1.8.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.5.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit haskell-cabal - -DESCRIPTION="The Helium Compiler" -HOMEPAGE="https://github.com/Helium4Haskell/helium" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?] - dev-haskell/mtl:=[profile?] - dev-haskell/network:=[profile?] - dev-haskell/parsec:=[profile?] - >=dev-haskell/top-1.7:=[profile?] - dev-haskell/transformers:=[profile?] - dev-haskell/wl-pprint:=[profile?] - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.10.1.0 -" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch -} diff --git a/dev-lang/helium/metadata.xml b/dev-lang/helium/metadata.xml deleted file mode 100644 index e43c5ea15819..000000000000 --- a/dev-lang/helium/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>haskell@gentoo.org</email> - <name>Gentoo Haskell</name> - </maintainer> - <upstream> - <remote-id type="github">Helium4Haskell/helium</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild b/dev-lang/luajit/luajit-2.0.5-r2.ebuild index d9fa1d7fbc36..74a6f65701db 100644 --- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild +++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit pax-utils toolchain-funcs versionator +inherit pax-utils toolchain-funcs -MY_PV="$(get_version_component_range 1-3)" +MY_PV="$(ver_cut 1-3)" MY_P="LuaJIT-${MY_PV}" -if [[ -n $(get_version_component_range 4) ]]; then +if [[ -n $(ver_cut 4) ]]; then HOTFIX="v${PV}" HOTFIX="${HOTFIX/_p/_hotfix}.patch" fi diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild index 104a81af7aae..ff9432e778cd 100644 --- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild +++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit pax-utils toolchain-funcs versionator +inherit pax-utils toolchain-funcs -MY_PV="$(get_version_component_range 1-4)" +MY_PV="$(ver_cut 1-4)" MY_PV="${MY_PV/_beta/-beta}" MY_P="LuaJIT-${MY_PV}" diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml index 29897b942522..ef8e19ce5906 100644 --- a/dev-lang/luajit/metadata.xml +++ b/dev-lang/luajit/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> </maintainer> <use> <flag name="lua52compat"> diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 0e0a2d22d670..718e2e97bedd 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -10,3 +10,4 @@ DIST php-7.4.11.tar.xz 10302076 BLAKE2B e32e77057ddd7b12553766e30366262812d43427 DIST php-7.4.12.tar.xz 10311980 BLAKE2B 11052d59881f84d4012fa993e5969abf52d4419877bf595ba524b31f5971f623adc382f49d4f7ed75f33dcf85c903a66d88b7c983807ee5f79152314334061c5 SHA512 6c06fb74f8e479ead000b0e2e56602c217d012f1a80e47e151543c033bb5426e56aaa5e8acfcd19fd49ae14c4ca827c8e57a5b56386b20002dbc80fbd07ab04f DIST php-7.4.13.tar.xz 10319848 BLAKE2B c1da97eb605f1fc2b36190bfe92feb1fd527f4aaf1483865561a08cf990e70445f5520c8abcea7d9c6482dc47e500507644e0cd2cc756cfa99adfec0359cd795 SHA512 3525f4fd4ea6d97ed75ed8360d2a851e8577c09247ae3c6eb7e7b43265ee418297d91c1022bf5bbb64d1eecdebbbc2e0f6d42b560f584a741b475db2c6897ea7 DIST php-7.4.9.tar.xz 10289560 BLAKE2B 0fd9d82539a46f7ce58857560f5aeb4be6dfe5f5a05f8b8c55c30d6000d19408b4ecc460c9135736298cdb8312ec958ab8358110b2b265bb8c185f80b1522dc6 SHA512 6179c2d867d6775d7f41785003c36d06ce620e7746ea7e6a4d275264e814a66d465776b47b04e2926ed1228cf58f2c15cdda74faf10372435c74ede7aeb79e18 +DIST php-8.0.0.tar.xz 10726788 BLAKE2B 16c4aa075ba5dee6d47086323cd152b33dc7b62ac6b3ab6637ec386c1048e256a160d72e72cbc88450af1e84389042ebf2d644d3361c9a34879cc494d5b9b64f SHA512 65630940c95436f3e3ecb71b9f1ca15bb4118267dbda604ed1ee009d528c21a3ec21f48a15e4dd3529fe9cd2b354c211a7b4975b5de43e1f2afa6656cabe1fd0 diff --git a/dev-lang/php/php-8.0.0.ebuild b/dev-lang/php/php-8.0.0.ebuild new file mode 100644 index 000000000000..801d79b66ceb --- /dev/null +++ b/dev-lang/php/php-8.0.0.ebuild @@ -0,0 +1,747 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +WANT_AUTOMAKE="none" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/rc} +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://www.php.net/" +SRC_URI="https://www.php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug + enchant exif ffi +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +iconv imap inifile + intl iodbc ipv6 kerberos ldap ldap-sasl libedit libressl lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp + +xml xmlreader xmlwriter xpm xslt zip zlib" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + cli? ( ^^ ( readline libedit ) ) + !cli? ( ?? ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + xmlreader? ( xml ) + xmlwriter? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + qdbm? ( !gdbm ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + firebird? ( pdo ) + mssql? ( pdo ) +" + +RESTRICT="!test? ( test )" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] + >=dev-libs/libpcre2-10.30[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + coverage? ( dev-util/lcov ) + curl? ( >=net-misc/curl-7.29.0 ) + enchant? ( app-text/enchant:2 ) + ffi? ( >=dev-libs/libffi-3.0.11 ) + firebird? ( dev-db/firebird ) + gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl ) + libedit? ( dev-libs/libedit ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) + postgres? ( >=dev-db/postgresql-9.1:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + session-mm? ( dev-libs/mm ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + sodium? ( dev-libs/libsodium:= ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.9.0 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt ) + zip? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +PHP_MV="$(ver_cut 1)" + +PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "../ext/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Emulate buildconf to support cross-compilation + rm -fr aclocal.m4 autom4te.cache config.cache \ + configure main/php_config.h.in || die + eautoconf --force + eautoheader +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + $(use_enable threads zts) + ) + + our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_enable bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar) + $(use_enable coverage gcov) + $(use_enable ctype) + $(use_with curl) + $(use_enable xml dom) + $(use_with enchant) + $(use_enable exif) + $(use_with ffi) + $(use_enable fileinfo) + $(use_enable filter) + $(use_enable ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) + $(use_enable intl) + $(use_enable ipv6) + $(use_with kerberos) + $(use_with xml libxml) + $(use_enable unicode mbstring) + $(use_with ssl openssl) + $(use_enable pcntl) + $(use_enable phar) + $(use_enable pdo) + $(use_enable opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_enable simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap) + $(use_enable sockets) + $(use_with sodium) + $(use_with sqlite sqlite3) + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer) + $(use_enable xml) + $(use_enable xmlreader) + $(use_enable xmlwriter) + $(use_with xslt xsl) + $(use_with zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with tokyocabinet tcadb "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype) + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg) + $(use_with xpm) + $(use_with webp) + ) + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_enable gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl) + ) + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "${mysqllib}") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite) + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit) + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-external-pcre affects ext/pcre + # Many arches don't support pcre-jit + our_conf+=( + --with-external-pcre + --without-pcre-jit + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + local one_sapi + local sapi + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + local sapi + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="", sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + # Install the "phar" archive utility. + if use phar ; then + emake INSTALL_ROOT="${D}" install-pharcmd + dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" + fi + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + local m + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild index f6af1f7734f9..a12d45e45ebc 100644 --- a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild +++ b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild @@ -21,6 +21,11 @@ DOCS=( CHANGELOG.md ) +src_prepare() { + sed -r -e 's:-Werror[[:space:]]*::' -i CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { local -a mycmakeopts=( -DCXXOPTS_BUILD_EXAMPLES=OFF diff --git a/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch b/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch new file mode 100644 index 000000000000..6eeb4beb92b4 --- /dev/null +++ b/dev-libs/libprelude/files/libprelude-5.2.0-luabindings_liblua.patch @@ -0,0 +1,13 @@ +Compiled Lua modules must not link against liblua. + +--- a/bindings/lua/Makefile.am ++++ b/bindings/lua/Makefile.am +@@ -9,7 +9,7 @@ + + AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing + +-prelude_la_LDFLAGS = -module -avoid-version @LUA_LIBS@ ++prelude_la_LDFLAGS = -module -avoid-version + prelude_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la + prelude_la_SOURCES = prelude.cxx + preludedir = $(libdir)/lua/@LUA_VERSION@ diff --git a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild index 5f21c4225333..47127ff700b9 100644 --- a/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild +++ b/dev-libs/libprelude/libprelude-5.2.0-r10.ebuild @@ -34,7 +34,7 @@ DEPEND="${RDEPEND}" BDEPEND=">=dev-lang/swig-4.0.0 dev-util/gtk-doc-am sys-devel/flex - lua? ( dev-lang/lua:* ) + lua? ( ${LUA_DEPS} ) perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) @@ -44,6 +44,7 @@ BDEPEND=">=dev-lang/swig-4.0.0 PATCHES=( "${FILESDIR}/${PN}-4.0.0-fix-python-bindings.patch" "${FILESDIR}/${PN}-5.1.0-fix_gtkdoc_1.32.patch" + "${FILESDIR}/${PN}-5.2.0-luabindings_liblua.patch" ) src_prepare() { diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest index 3197a0391a1b..741f9c5baccc 100644 --- a/dev-libs/qtkeychain/Manifest +++ b/dev-libs/qtkeychain/Manifest @@ -1 +1,2 @@ DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6 +DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6 diff --git a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild new file mode 100644 index 000000000000..d70d621d53e4 --- /dev/null +++ b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +HOMEPAGE="https://github.com/frankosterfeld/qtkeychain" +DESCRIPTION="Qt API for storing passwords securely" + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +else + inherit git-r3 + EGIT_REPO_URI="${HOMEPAGE}.git" +fi + +LICENSE="BSD" +SLOT="0/1" +IUSE="gnome-keyring" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + gnome-keyring? ( + app-crypt/libsecret + dev-libs/glib:2 + ) +" +RDEPEND="${DEPEND}" + +DOCS=( ChangeLog ReadMe.txt ) + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT4=OFF + -DQTKEYCHAIN_STATIC=OFF + -DBUILD_TEST_APPLICATION=OFF + -DBUILD_TRANSLATIONS=ON + -DLIBSECRET_SUPPORT=$(usex gnome-keyring) + ) + + cmake_src_configure +} diff --git a/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild b/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild index 9a29c8f04503..ed7b3f9d6f58 100644 --- a/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild +++ b/dev-libs/simdjson/simdjson-0.7.0-r3.ebuild @@ -39,11 +39,19 @@ src_prepare() { } src_configure() { - local mycmakeargs=( - $(usex tools '' '-DSIMDJSON_JUST_LIBRARY=ON') - -DSIMDJSON_GOOGLE_BENCHMARKS=OFF - -DSIMDJSON_COMPETITION=OFF - ) + local -a mycmakeargs + + if use tools; then + mycmakeargs+=( + -DSIMDJSON_JUST_LIBRARY=OFF + -DSIMDJSON_GOOGLE_BENCHMARKS=OFF + -DSIMDJSON_COMPETITION=OFF + ) + else + mycmakeargs+=( + -DSIMDJSON_JUST_LIBRARY=ON + ) + fi cmake_src_configure } diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild new file mode 100644 index 000000000000..70b804cf7378 --- /dev/null +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html +# 1. Only the "Super Stable" series is released as a tarball +# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/ +# Because of this, we are following the "Super Stable" release channel + +DESCRIPTION="A lightweigt RPC library based on XML and HTTP" +HOMEPAGE="http://xmlrpc-c.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +IUSE="abyss +cgi +curl +cxx +libxml2 threads test" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="test? ( abyss curl cxx )" + +RDEPEND=" + sys-libs/ncurses:0=[${MULTILIB_USEDEP}] + sys-libs/readline:0=[${MULTILIB_USEDEP}] + curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) + libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +pkg_setup() { + use curl || ewarn "Curl support disabled: No client library will be built" +} + +src_prepare() { + sed -i \ + -e "/CFLAGS_COMMON/s|-g -O3$||" \ + -e "/CXXFLAGS_COMMON/s|-g$||" \ + common.mk || die + + default + + # Out-of-source install phase is broken + multilib_copy_sources +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf \ + --disable-libwww-client \ + --disable-wininet-client \ + --without-libwww-ssl \ + $(use_enable abyss abyss-server) \ + $(use_enable cgi cgi-server) \ + $(use_enable curl curl-client) \ + $(use_enable cxx cplusplus) \ + $(use_enable libxml2 libxml2-backend) \ + $(use_enable threads abyss-threads) +} + +multilib_src_compile() { + default_src_compile + # Tools building is broken in this release + #multilib_is_native_abi && use tools && emake -rC "${S}"/tools +} + +#multilib_src_install_all() { +# # Tools building is broken in this release +# #use tools && emake DESTDIR="${D}" -rC "${S}"/tools install +#} diff --git a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild index 0192ce2174a5..56e4db5bad1b 100644 --- a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild +++ b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="An iterator-based module for finding files" LICENSE="Artistic-2 GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild index a18ff95d221c..467867d6f62c 100644 --- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild +++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PHP_EXT_NAME="radius" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz" PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}" @@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~x86" DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)" LICENSE="BSD" SLOT="0" -IUSE="examples" +IUSE="examples test" +RESTRICT="!test? ( test )" S="${PHP_EXT_S}" RDEPEND=" - php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] ) - php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] ) - php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] ) - php_targets_php7-3? ( dev-lang/php:7.3[pcntl,sockets] ) - php_targets_php7-4? ( dev-lang/php:7.3[pcntl,sockets] ) + php_targets_php7-2? ( dev-lang/php:7.2[pcntl(-),sockets(-)] ) + php_targets_php7-3? ( dev-lang/php:7.3[pcntl(-),sockets(-)] ) + php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] ) " +DEPEND="test? ( ${RDEPEND} )" diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest new file mode 100644 index 000000000000..fadf7bacd69a --- /dev/null +++ b/dev-python/backrefs/Manifest @@ -0,0 +1 @@ +DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8 diff --git a/dev-python/backrefs/backrefs-4.5.0.ebuild b/dev-python/backrefs/backrefs-4.5.0.ebuild new file mode 100644 index 000000000000..76f334eeed6e --- /dev/null +++ b/dev-python/backrefs/backrefs-4.5.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + dev-python/mkdocs-git-revision-date-localized-plugin + ~dev-python/mkdocs_pymdownx_material_extras-1.0.7 + dev-python/mkdocs-minify-plugin + dev-python/mkdocs-material + dev-python/pyspelling +" + +inherit distutils-r1 docs + +DESCRIPTION="Wrapper around re or regex that adds additional back references" +HOMEPAGE=" + https://github.com/facelessuser/backrefs + https://pypi.org/project/backrefs +" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-vcs/git + )" + +distutils_enable_tests pytest + +python_prepare_all() { + # mkdocs-git-revision-date-localized-plugin needs git repo + if use doc; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml new file mode 100644 index 000000000000..2a6c9f9ed89d --- /dev/null +++ b/dev-python/backrefs/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/backrefs</remote-id> + <remote-id type="pypi">backrefs</remote-id> + </upstream> + <longdescription lang="en"> +Backrefs is a wrapper around Python's built-in Re and the 3rd party Regex library. Backrefs adds various additional back references (and a couple other features) that are known to some regular expression engines, but not to Python's Re and/or Regex. The supported back references actually vary depending on the regular expression engine being used as the engine may already have support for some. + </longdescription> +</pkgmetadata> diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest new file mode 100644 index 000000000000..ea2f1af7fbb1 --- /dev/null +++ b/dev-python/bracex/Manifest @@ -0,0 +1 @@ +DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13 diff --git a/dev-python/bracex/bracex-2.0.1.ebuild b/dev-python/bracex/bracex-2.0.1.ebuild new file mode 100644 index 000000000000..3219582fd350 --- /dev/null +++ b/dev-python/bracex/bracex-2.0.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + dev-python/mkdocs-git-revision-date-localized-plugin + dev-python/mkdocs-material + dev-python/mkdocs-minify-plugin + dev-python/mkdocs_pymdownx_material_extras + dev-python/pyspelling +" + +inherit distutils-r1 docs + +DESCRIPTION="Bash style brace expansion for Python" +HOMEPAGE=" + https://github.com/facelessuser/bracex + https://pypi.org/project/bracex +" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="test? ( dev-vcs/git )" + +distutils_enable_tests pytest + +python_prepare_all() { + # mkdocs-git-revision-date-localized-plugin needs git repo + if use doc; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml new file mode 100644 index 000000000000..f0d91e4ea335 --- /dev/null +++ b/dev-python/bracex/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/bracex</remote-id> + <remote-id type="pypi">bracex</remote-id> + </upstream> + <longdescription lang="en"> + Why Bracex over other solutions? + + Bracex actually follows pretty closely to how Bash processes braces. It is not a 1:1 implementation of how Bash handles braces, but generally, it follows very closely. Almost all of the test cases are run through Bash first, then our implementation is compared against the results Bash gives. There are a few cases where we have purposely deviated. For instance, we are not handling Bash's command line inputs, so we are not giving special meaning to back ticks and quotes at this time. + </longdescription> +</pkgmetadata> diff --git a/dev-python/gevent/gevent-20.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild index 0e56fd671801..b51407611f01 100644 --- a/dev-python/gevent/gevent-20.9.0.ebuild +++ b/dev-python/gevent/gevent-20.9.0.ebuild @@ -20,7 +20,7 @@ IUSE="doc examples test" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/libev-4.23:= + >=dev-libs/libev-4.31:= dev-libs/libuv:= >=net-dns/c-ares-1.12:= >=dev-python/greenlet-0.4.17 diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild index 67ca8fa0f5ed..7d7ccbe6b6ba 100644 --- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild +++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild @@ -4,7 +4,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend DOCS_BUILDER="mkdocs" diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild index 6fecc945233c..bb9630d5c055 100644 --- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild +++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild @@ -4,7 +4,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend DOCS_BUILDER="mkdocs" diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest new file mode 100644 index 000000000000..acc012c31140 --- /dev/null +++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest @@ -0,0 +1 @@ +DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml new file mode 100644 index 000000000000..bb319d114c9b --- /dev/null +++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">timvink/mkdocs-git-revision-date-localized-plugin</remote-id> + <remote-id type="pypi">mkdocs-git-revision-date-localized-plugin</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild new file mode 100644 index 000000000000..fdef23498c41 --- /dev/null +++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Display the localized date of the last git modification of a markdown file" +HOMEPAGE=" + https://github.com/timvink/mkdocs-git-revision-date-localized-plugin + https://pypi.org/project/mkdocs-git-revision-date-localized-plugin +" +SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/Babel-2.7.0[${PYTHON_USEDEP}] + dev-python/GitPython[${PYTHON_USEDEP}] + >=dev-python/mkdocs-1.0[${PYTHON_USEDEP}] +" +BDEPEND="test? ( + dev-python/click[${PYTHON_USEDEP}] + dev-python/mkdocs-material[${PYTHON_USEDEP}] + dev-vcs/git +)" + +distutils_enable_tests --install pytest + +python_prepare_all() { + # mkdocs-git-revision-date-localized-plugin's tests need git repo + if use test; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest new file mode 100644 index 000000000000..2ef134ab7d48 --- /dev/null +++ b/dev-python/mkdocs-material-extensions/Manifest @@ -0,0 +1 @@ +DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890 diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml new file mode 100644 index 000000000000..878e3e670559 --- /dev/null +++ b/dev-python/mkdocs-material-extensions/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/mkdocs-material-extensions</remote-id> + <remote-id type="pypi">mkdocs-material-extensions</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild new file mode 100644 index 000000000000..a5b3893e994b --- /dev/null +++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Extension pack for Python Markdown" +HOMEPAGE=" + https://github.com/facelessuser/mkdocs-material-extensions + https://pypi.org/project/mkdocs-material-extensions +" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# mkdocs-material depends on this package creating a circular dep +PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]" + +# we still need mkdocs-material for test, but the circular dep can be avoided +# by first emerging with FEATURES="-test" +BDEPEND="test? ( ${PDEPEND} )" + +distutils_enable_tests pytest + +python_prepare_all() { + # AssertionError: False is not true + sed -i -e 's:test_material_svg_injection:_&:' \ + tests/extensions/test_emoji.py || die + + distutils-r1_python_prepare_all +} diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest new file mode 100644 index 000000000000..d9c436bb34a6 --- /dev/null +++ b/dev-python/mkdocs-material/Manifest @@ -0,0 +1 @@ +DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6dacfa783b338cbf1a09afde6f14c85636b9f971f65863d82f9616c527c3521490c945c0d3ad3647adf69ff8e2795a1b43166 SHA512 ddca360760db8a29055bbf41b58d568943965ffe3bcce5b77fbd4af17caaaebba94f41a9dec6d1042c537054ab92eb6da41cc267ef4421d91ed69373417cde99 diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml new file mode 100644 index 000000000000..14b90ae1b176 --- /dev/null +++ b/dev-python/mkdocs-material/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> +What to expect + + Responsive design and fluid layout for all kinds of screens and devices, designed to serve your project documentation in a user-friendly way in 41 languages with optimal readability. + + Easily customizable primary and accent color, fonts, favicon and logo; straight forward localization through theme extension; integrated with Google Analytics, Disqus and GitHub. + + Well-designed search interface accessible through hotkeys (F or S), intelligent grouping of search results, search term highlighting and lazy loading. + </longdescription> + <upstream> + <remote-id type="github">squidfunk/mkdocs-material</remote-id> + <remote-id type="pypi">mkdocs-material</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild new file mode 100644 index 000000000000..cef41ffedf26 --- /dev/null +++ b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + dev-python/mkdocs-minify-plugin + dev-python/mkdocs-redirects +" + +inherit distutils-r1 docs + +DESCRIPTION="A Material Design theme for MkDocs" +HOMEPAGE=" + https://github.com/squidfunk/mkdocs-material + https://pypi.org/project/mkdocs-material +" +SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/markdown-3.2[${PYTHON_USEDEP}] + >=dev-python/mkdocs-1.1[${PYTHON_USEDEP}] + >=dev-python/pygments-2.4[${PYTHON_USEDEP}] + >=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}] + >=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}] +" diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest new file mode 100644 index 000000000000..aff01e13d939 --- /dev/null +++ b/dev-python/mkdocs-minify-plugin/Manifest @@ -0,0 +1 @@ +DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f53cfd3cacdb555777328056ca61ed80e2341da86041be32fe87a0174241e3f36f0f0d7ca43538d0a8ca7a45cc06b6b4254e3 SHA512 97d8cb1ca3b0abfa362b9f71c7f881c889eb08963519ff0a356778b446c62140edb70ec344cbf54df7990e94ef515202b567799d0426e518a1abd6c3886a4281 diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml new file mode 100644 index 000000000000..c68438d47fdb --- /dev/null +++ b/dev-python/mkdocs-minify-plugin/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">byrnereese/mkdocs-minify-plugin</remote-id> + <remote-id type="pypi">mkdocs-minify-plugin</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild new file mode 100644 index 000000000000..5f83e7011163 --- /dev/null +++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.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_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk" +HOMEPAGE=" + https://github.com/byrnereese/mkdocs-minify-plugin + https://pypi.org/project/mkdocs-minify-plugin/ +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}] + >=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}] + >=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}] +" diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest new file mode 100644 index 000000000000..dffce1a98b69 --- /dev/null +++ b/dev-python/mkdocs-redirects/Manifest @@ -0,0 +1 @@ +DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0 diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml new file mode 100644 index 000000000000..de03ad6b9f39 --- /dev/null +++ b/dev-python/mkdocs-redirects/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">datarobot/mkdocs-redirects</remote-id> + <remote-id type="pypi">mkdocs-redirects</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild new file mode 100644 index 000000000000..a273917c3f3b --- /dev/null +++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Plugin for Mkdocs page redirects" +HOMEPAGE=" + https://github.com/datarobot/mkdocs-redirects + https://pypi.org/project/mkdocs-redirects/ +" +SRC_URI="https://github.com/datarobot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}] + dev-python/twine[${PYTHON_USEDEP}] +" diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest new file mode 100644 index 000000000000..e4d3e5437408 --- /dev/null +++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest @@ -0,0 +1,2 @@ +DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d +DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml new file mode 100644 index 000000000000..4f0fe0e6ec8c --- /dev/null +++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/mkdocs_pymdownx_material_extras</remote-id> + <remote-id type="pypi">mkdocs-pymdownx-material-extras</remote-id> + </upstream> + <longdescription lang="en"> +A plugin that for MkDocs and specifically the MkDocs Material Theme. +Adds additional resources that are used in the PyMdown Extensions documentation, and other @facelessuser projects. +While this is not specifically meant for outside consumption, and was originally written for @facelessuser projects, it can be freely used if desired. +Files are copied from the pymdown-extensions project. + </longdescription> +</pkgmetadata> diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild new file mode 100644 index 000000000000..463f6ecd3f86 --- /dev/null +++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Custom alterations based on Mkdocs-Material" +HOMEPAGE=" + https://github.com/facelessuser/mkdocs_pymdownx_material_extras + https://pypi.org/project/mkdocs-pymdownx-material-extras" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}] +" diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild new file mode 100644 index 000000000000..463f6ecd3f86 --- /dev/null +++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit distutils-r1 + +DESCRIPTION="Custom alterations based on Mkdocs-Material" +HOMEPAGE=" + https://github.com/facelessuser/mkdocs_pymdownx_material_extras + https://pypi.org/project/mkdocs-pymdownx-material-extras" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}] +" diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild index 6b3a26921e63..12d44dae1d46 100644 --- a/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild +++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6-r1.ebuild @@ -60,6 +60,10 @@ python_test() { # https://github.com/giampaolo/pyftpdlib/issues/513 # https://bugs.gentoo.org/702578 pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed + # https://github.com/giampaolo/pyftpdlib/issues/543 + # https://bugs.gentoo.org/758686 + pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_idle_timeout + pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_stou_max_tries ) # Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623 TZ=UTC+1 pytest -vv ${skipped_tests[@]/#/--deselect } \ diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest new file mode 100644 index 000000000000..715d3ad0bc4a --- /dev/null +++ b/dev-python/pymdown-extensions/Manifest @@ -0,0 +1 @@ +DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9fd2f9abc881ff457d2c630befd7c094a147f4d4883088488a66c601190794c15fdfb8297a3252ba3b070412b2f18872f6126 SHA512 3f85bfe9128dcdc63cea4c2eb4d55173d697ae9d112559a74527ed64b3bd63f67eee119b81a54d0ac927bc21b6eb8411c03dc7afc77673739a81772c10ebe62a diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml new file mode 100644 index 000000000000..6b89dfe643e4 --- /dev/null +++ b/dev-python/pymdown-extensions/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/pymdown-extensions</remote-id> + <remote-id type="pypi">pymdown-extensions</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild new file mode 100644 index 000000000000..bb8e5e1c5cae --- /dev/null +++ b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + dev-python/mkdocs-git-revision-date-localized-plugin + dev-python/mkdocs-minify-plugin + dev-python/mkdocs-material + dev-python/pymdown-lexers + dev-python/pyspelling +" + +inherit distutils-r1 docs + +DESCRIPTION="Extensions for Python Markdown." +HOMEPAGE=" + https://github.com/facelessuser/pymdown-extensions + https://pypi.org/project/pymdown-extensions +" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]" + +BDEPEND="test? ( + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-vcs/git +)" + +distutils_enable_tests pytest + +python_prepare_all() { + # Fails on whitspaces + rm tests/test_syntax.py || die + + # AssertionError: False is not true + sed -i -e 's:test_no_pygments_linenums_custom_class:_&:' \ + tests/test_extensions/test_highlight.py || die + + sed -i -e 's:test_default_override:_&:' \ + tests/test_extensions/test_superfences.py || die + + sed -i -e 's:test_tabbed:_&:' \ + -e 's:test_tabbed_split:_&:' \ + tests/test_extensions/test_tabbed.py || die + + # mkdocs-git-revision-date-localized-plugin needs git repo + if use doc; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest new file mode 100644 index 000000000000..d1be47278bb9 --- /dev/null +++ b/dev-python/pymdown-lexers/Manifest @@ -0,0 +1 @@ +DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596 diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml new file mode 100644 index 000000000000..c0315f8bfff0 --- /dev/null +++ b/dev-python/pymdown-lexers/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/pymdown-lexers</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild new file mode 100644 index 000000000000..ab51a2552894 --- /dev/null +++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 + +COMMIT="fa422cb95b794157760259c5c20a1235e4a459be" + +DESCRIPTION="Additional lexers for use in Pygments" +HOMEPAGE="https://github.com/facelessuser/pymdown-lexers" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/pygments-2.0.1[${PYTHON_USEDEP}] +" + +S="${WORKDIR}/${PN}-${COMMIT}" diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest new file mode 100644 index 000000000000..b85ac18e5687 --- /dev/null +++ b/dev-python/pyspelling/Manifest @@ -0,0 +1 @@ +DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d384b9186de037b98d50d58016ded19c426caa892497ca44e309fb3db04292b890612afbe25a34f9f6b06985d3740 SHA512 2fcd225a66cb02fff10d5ca652e523a01bd0488a005dafa32ba1151fba9afe73809781501c957d6df00927baa9fb6779872973b32e2d3fe8a09306fdc4191995 diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml new file mode 100644 index 000000000000..e649e6dcff71 --- /dev/null +++ b/dev-python/pyspelling/metadata.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/pyspelling</remote-id> + </upstream> + <longdescription lang="en"> +PySpelling is a module to help with automating spell checking in a project with Aspell or +Hunspell. It is essentially a wrapper around the command line utility of these two spell +checking tools, and allows you to setup different spelling tasks for different file types. +You can apply specific and different filters and options to each task. PySpelling can also +be used in CI environments to fail the build if there are misspelled words. +Aspell and Hunspell are very good spell checking tools. Aspell particularly comes with a couple of filters, but the filters are limited in types and aren't extremely flexible. PySpelling was created to work around Aspell's and Hunspell's filtering shortcomings by creating a wrapper around them that could be extended to handle more kinds of file formats and provide more advanced filtering. If you need to filter out specific HTML tags with specific IDs or class names, PySpelling can do it. If you want to scan Python files for docstrings, but also avoid specific content within the docstring, you can do that as well. If PySpelling doesn't have a filter you need, with access to so many available Python modules, you can easily write your own. + </longdescription> +</pkgmetadata> diff --git a/dev-python/pyspelling/pyspelling-2.7.0.ebuild b/dev-python/pyspelling/pyspelling-2.7.0.ebuild new file mode 100644 index 000000000000..8aea32458614 --- /dev/null +++ b/dev-python/pyspelling/pyspelling-2.7.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +DISTUTILS_USE_SETUPTOOLS=rdepend + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + ~dev-python/mkdocs_pymdownx_material_extras-1.1.3 + dev-python/mkdocs-git-revision-date-localized-plugin + dev-python/mkdocs-minify-plugin +" + +inherit distutils-r1 docs + +DESCRIPTION="Spell checker automation tool" +HOMEPAGE="https://github.com/facelessuser/pyspelling" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + || ( app-text/aspell app-text/hunspell ) + + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/html5lib[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/soupsieve-1.8[${PYTHON_USEDEP}] + >=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}] +" + +BDEPEND="test? ( dev-vcs/git )" + +distutils_enable_tests pytest + +python_prepare_all() { + # mkdocs-git-revision-date-localized-plugin needs git repo + if use doc; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest new file mode 100644 index 000000000000..eb561b1f9514 --- /dev/null +++ b/dev-python/wcmatch/Manifest @@ -0,0 +1 @@ +DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39 diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml new file mode 100644 index 000000000000..a6af55c38820 --- /dev/null +++ b/dev-python/wcmatch/metadata.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>lssndrbarbieri@gmail.com</email> + <name>Alessandro Barbieri</name> + </maintainer> + <maintainer type="person"> + <email>andrewammerlaan@riseup.net</email> + <name>Andrew Ammerlaan</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">facelessuser/wcmatch</remote-id> + <remote-id type="pypi">wcmatch</remote-id> + </upstream> + <longdescription lang="en"> +Wildcard Match provides an enhanced fnmatch, glob, and pathlib library in order to provide +file matching and globbing that more closely follows the features found in Bash. In some +ways these libraries are similar to Python's builtin libraries as they provide a similar +interface to match, filter, and glob the file system. But they also include a number of +features found in Bash's globbing such as backslash escaping, brace expansion, extended +glob pattern groups, etc. They also add a number of new useful functions as well, such as +globmatch which functions like fnmatch, but for paths. +Wildcard Match also adds a file search utility called wcmatch that is built on top of fnmatch and globmatch. It was +originally written for Rummage, but split out into this project to be used by other +projects that may find its approach useful. +Bash is used as a guide when making decisions on behavior for fnmatch and glob. Behavior may differ from Bash version to Bash version, +but an attempt is made to keep Wildcard Match up with the latest relevant changes. With +all of this said, there may be a few corner cases in which we've intentionally chosen to +not exactly mirror Bash. If an issue is found where Wildcard Match seems to deviate in an +illogical way, we'd love to hear about it in the issue tracker. +Features +A quick overview of Wildcard Match's +Features: + Provides an interface comparable to Python's builtin in fnamtch, glob, and pathlib. + Allows for a much more configurable experience when matching or globbing with many more features. Adds support for ** in glob. + Adds support for escaping characters with \. + Add support for POSIX style character classes inside sequences: [[:alnum:]], etc. The C locale is used for byte strings and Unicode properties for Unicode strings. + Adds support for brace expansion: a{b,{c,d}} --> ab ac ad. + Adds support for expanding ~ or ~username to the appropriate user path. + Adds support for extended match patterns: @(...), +(...), *(...), ?(...), and !(...). + Adds ability to match path names via the path centric globmatch. + Provides a pathlib variant that uses Wildcard Match's glob library instead of Python's default. + Provides an alternative file crawler called wcmatch. + And more... + </longdescription> +</pkgmetadata> diff --git a/dev-python/wcmatch/wcmatch-7.1.ebuild b/dev-python/wcmatch/wcmatch-7.1.ebuild new file mode 100644 index 000000000000..4fc94a4a4728 --- /dev/null +++ b/dev-python/wcmatch/wcmatch-7.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +DOCS_BUILDER="mkdocs" +DOCS_DEPEND=" + ~dev-python/mkdocs_pymdownx_material_extras-1.0.7 + dev-python/mkdocs-material + dev-python/mkdocs-git-revision-date-localized-plugin + dev-python/mkdocs-minify-plugin + dev-python/pyspelling +" + +inherit distutils-r1 docs + +DESCRIPTION="Wildcard/glob file name matcher" +HOMEPAGE=" + https://github.com/facelessuser/wcmatch + https://pypi.org/project/wcmatch" +SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/backrefs-4.1[${PYTHON_USEDEP}] + >=dev-python/bracex-2.0[${PYTHON_USEDEP}] +" + +BDEPEND="test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-vcs/git +)" + +distutils_enable_tests pytest + +python_prepare_all() { + # no such file or dir ~homedir + sed -i -e 's:test_tilde_user:_&:' \ + tests/test_glob.py || die + + # mkdocs-git-revision-date-localized-plugin needs git repo + if use doc; then + git init || die + git config --global user.email "you@example.com" || die + git config --global user.name "Your Name" || die + git add . || die + git commit -m 'init' || die + fi + + distutils-r1_python_prepare_all +} diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest index bde623897e40..7f9ae62a88e9 100644 --- a/dev-ruby/fakefs/Manifest +++ b/dev-ruby/fakefs/Manifest @@ -2,3 +2,4 @@ DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbc DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f9e1d49c8cced034656f596ee98fc3ee4dd40cb80383d447164f11242e16a5ffb9b35ba2e28fb136e0f72a09e SHA512 61d83868a0cf4d0abf071fadc9ca21176e3ef8f2ccc781760a8b0b3e55713750d3e952482e90a87e8665163a262e8bdef8e6b2f3c423fabe696d64f356862aa4 DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d +DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692 diff --git a/dev-ruby/fakefs/fakefs-1.2.3.ebuild b/dev-ruby/fakefs/fakefs-1.2.3.ebuild new file mode 100644 index 000000000000..16d45a8ca419 --- /dev/null +++ b/dev-ruby/fakefs/fakefs-1.2.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_RECIPE_TEST="none" + +RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md" + +RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec" + +inherit ruby-fakegem eutils + +DESCRIPTION="A fake filesystem. Use it in your tests" +HOMEPAGE="https://github.com/defunkt/fakefs" +SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="" + +ruby_add_bdepend " + test? ( + >=dev-ruby/rspec-3.1:3 + >=dev-ruby/maxitest-3.6:1 + )" + +all_ruby_prepare() { + # Remove bundler + rm Gemfile || die + + # Avoid unneeded minitest-rg dependency. + sed -i -e '1igem "minitest", "~>5.5"' \ + -e '/bundler/ s:^:#:' \ + -e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die + + sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +each_ruby_test() { + RSPEC_VERSION=3 ruby-ng_rspec + ${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die +} diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest index bd3c9401e1d4..cc40b1fc8e23 100644 --- a/dev-ruby/faker/Manifest +++ b/dev-ruby/faker/Manifest @@ -2,3 +2,4 @@ DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131 DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518 +DIST faker-2.15.1.tar.gz 1213822 BLAKE2B dd627078ce1edab63a3f16a5e893c29911b9bf8d88b6d490a368ec16a633e7138124ee66d439738c4f2a8e14b6d0815611ed744d5323817873a0e13f2bddfb06 SHA512 de3721290683a86f985c2783c749be530c3306be73d929517fb54dcde2f64b124cedfa6b10c51e390a38a0b5ac81e2feb0b491c165d0bae9f017463596794fbf diff --git a/dev-ruby/faker/faker-2.15.1.ebuild b/dev-ruby/faker/faker-2.15.1.ebuild new file mode 100644 index 000000000000..9ae0563a25d2 --- /dev/null +++ b/dev-ruby/faker/faker-2.15.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_RECIPE_DOC="none" + +RUBY_FAKEGEM_GEMSPEC="faker.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers" +HOMEPAGE="https://github.com/stympy/faker" +SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="test" + +ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1" + +ruby_add_bdepend "test? ( dev-ruby/timecop )" + +all_ruby_prepare() { + sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die + sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die +} diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild index c0e8bf251f98..6bf9e35bbd9a 100644 --- a/dev-util/gtk-doc/gtk-doc-1.33.1-r1.ebuild +++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild @@ -67,7 +67,6 @@ src_configure() { local emesonargs=( $(meson_use test tests) $(meson_use doc yelp_manual) - -Dautotools_support=false ) meson_src_configure } @@ -85,6 +84,10 @@ src_install() { sed -i -e 's:^#!.*:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die python_fix_shebang "${ED}"/usr/bin/* + # Don't install this file, it's in gtk-doc-am now + rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" + rmdir "${ED}"/usr/share/aclocal || die + if use emacs; then elisp-install ${PN} tools/gtk-doc.el* elisp-site-file-install "${FILESDIR}/${SITEFILE}" diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest index a5f01b8fff19..48b0d2374dea 100644 --- a/dev-vcs/svneverever/Manifest +++ b/dev-vcs/svneverever/Manifest @@ -1,3 +1 @@ -DIST svneverever-1.3.2.tar.gz 7160 BLAKE2B 0791451740b1b08efe320488067929e856fb2cb20ee82c3dbf666e37bee1835a1e1532f12cef666668f6da1c91a42ce80080625ee0d3760c8a02786ec1995c92 SHA512 cd43f18220b6a7adde3c7f451d9177b76f1c5f42384a0bf21719bb6d2dd56c51c278b81d8275328ec0ea9c3835cebc5d79be20a72294c5e14b3c339cba60ec8b -DIST svneverever-1.4.2.tar.gz 7741 BLAKE2B f43a2e1d63065bf1f453f67d4cd4e6bc6a6f990c66eef0fd510e7f118bd84f10756a3066e3b6bc82b98155cb39be86e9139eb918a53d015fd1c79645d85a9f51 SHA512 fdf799bab23aa19861013ed40c513aece12df22051013e7110b1508fc1f4055faf32406c0c942651a31a6bd5cfecf972b64652ce5f211c41a6a144311f64124f DIST svneverever-1.5.0.tar.gz 9286 BLAKE2B 8400e202f191131b494a894b112c92f4cf5977396fa8d1c11f5e17a309159dbab2df4d84bc24c88e0dd41d306b171c1eaeb679c900e94fdb3aee542d819f43e0 SHA512 b47e367b6c180ff92f24d70efaa5fd6697e266c28d05abf2555a59a4e34a603b97d70a045163b6cd6ab786f4ec5d9f5dc59277e79d98b70770c7d2ce672f9a8d diff --git a/dev-vcs/svneverever/svneverever-1.3.2.ebuild b/dev-vcs/svneverever/svneverever-1.3.2.ebuild deleted file mode 100644 index 50dbc6439b2c..000000000000 --- a/dev-vcs/svneverever/svneverever-1.3.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="Tool collecting path entries across SVN history" -HOMEPAGE="https://github.com/hartwork/svneverever" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" diff --git a/dev-vcs/svneverever/svneverever-1.4.2.ebuild b/dev-vcs/svneverever/svneverever-1.4.2.ebuild deleted file mode 100644 index 50dbc6439b2c..000000000000 --- a/dev-vcs/svneverever/svneverever-1.4.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="Tool collecting path entries across SVN history" -HOMEPAGE="https://github.com/hartwork/svneverever" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}]" diff --git a/eclass/docs.eclass b/eclass/docs.eclass index 73c9ec99ca5c..adacae4abda6 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.eclass @@ -19,7 +19,7 @@ # to the location of the compiled documentation # # The aim of this eclass is to make it easy to add additional -# doc builders. To do this, add a <DOCS_BUILDER>-setup and +# doc builders. To do this, add a <DOCS_BUILDER>-deps and # <DOCS_BUILDER>-build function for your doc builder. # For python based doc builders you can use the # python_append_deps function to append [${PYTHON_USEDEP}] @@ -77,10 +77,6 @@ esac # Sets whether to use sphinx.ext.autodoc/mkautodoc # Defaults to 1 (True) for sphinx, and 0 (False) for mkdocs -# @ECLASS-VARIABLE: DOCS_EXTRA_ARGS -# @DESCRIPTION: -# Extra arguments to parse to the DOCS_BUILDER - # @ECLASS-VARIABLE: DOCS_OUTDIR # @DESCRIPTION: # Sets where the compiled files will be put. @@ -90,7 +86,7 @@ esac # # HTML_DOCS=( "${yourdocs}" "${DOCS_OUTDIR}/." ) # -# Defaults to ${DOCS_DIR}/_build/html +# Defaults to ${S}/_build/html # @ECLASS-VARIABLE: DOCS_CONFIG_NAME # @DESCRIPTION: @@ -122,21 +118,6 @@ case ${DOCS_BUILDER} in ;; esac -# @FUNCTION: python_check_deps -# @DESCRIPTION: -# Check if the dependencies are valid -python_check_deps() { - debug-print-function ${FUNCNAME} - use doc || return 0 - - local dep - for dep in ${CHECK_DEPS[@]}; do - has_version "${dep}[${PYTHON_USEDEP}]" || return 1 - done -} -# Save this before we start manipulating it -CHECK_DEPS=${DOCS_DEPEND} - # @FUNCTION: python_append_dep # @DESCRIPTION: # Appends [\${PYTHON_USEDEP}] to all dependencies @@ -145,10 +126,10 @@ CHECK_DEPS=${DOCS_DEPEND} python_append_deps() { debug-print-function ${FUNCNAME} - local temp=() + local temp local dep for dep in ${DOCS_DEPEND[@]}; do - temp+=(" ${dep}[\${PYTHON_USEDEP}]") + temp+=" ${dep}[\${PYTHON_USEDEP}]" done DOCS_DEPEND=${temp} } @@ -165,7 +146,8 @@ sphinx_deps() { if [[ -n "${DOCS_DEPEND}" ]]; then die "${FUNCNAME}: do not set DOCS_AUTODOC to 0 if external plugins are used" else - DOCS_DEPEND="dev-python/sphinx" + DOCS_DEPEND="$(python_gen_any_dep " + dev-python/sphinx[\${PYTHON_USEDEP}]")" fi elif [[ ${DOCS_AUTODOC} == 1 ]]; then DOCS_DEPEND="$(python_gen_any_dep " @@ -203,7 +185,7 @@ sphinx_compile() { sed -i -e 's:^intersphinx_mapping:disabled_&:' \ "${DOCS_DIR}"/conf.py || die # not all packages include the Makefile in pypi tarball - sphinx-build "${DOCS_EXTRA_ARGS}" -b html -d "${DOCS_DIR}"/_build/doctrees "${DOCS_DIR}" \ + sphinx-build -b html -d "${DOCS_OUTDIR}"/_build/doctrees "${DOCS_DIR}" \ "${DOCS_OUTDIR}" || die "${FUNCNAME}: sphinx-build failed" } @@ -244,7 +226,7 @@ mkdocs_compile() { die "${FUNCNAME}: ${mkdocsyml} not found, DOCS_DIR=${DOCS_DIR} wrong" pushd "${DOCS_DIR}" || die - mkdocs build "${DOCS_EXTRA_ARGS}" -d "${DOCS_OUTDIR}" || die "${FUNCNAME}: mkdocs build failed" + mkdocs build -d "${DOCS_OUTDIR}" || die "${FUNCNAME}: mkdocs build failed" popd || die # remove generated .gz variants @@ -283,7 +265,7 @@ doxygen_compile() { mkdir -p "${DOCS_OUTDIR}" || die pushd "${DOCS_DIR}" || die - (cat "${DOCS_CONFIG_NAME}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | doxygen - "${DOCS_EXTRA_ARGS}" || die "${FUNCNAME}: doxygen failed" + (cat "${DOCS_CONFIG_NAME}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | doxygen - || die "${FUNCNAME}: doxygen failed" popd || die } @@ -305,7 +287,7 @@ docs_compile() { : ${DOCS_DIR:="${S}"} # Where to put the compiled files? - : ${DOCS_OUTDIR:="${DOCS_DIR}/_build/html"} + : ${DOCS_OUTDIR:="${S}/_build/html"} ${DOCS_BUILDER}_compile diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 06643db0f605..8513de0af4d6 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -4,7 +4,7 @@ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: # gnome@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Auxiliary functions commonly used by Gnome packages. # @DESCRIPTION: # This eclass provides a set of auxiliary functions needed by most Gnome @@ -14,13 +14,14 @@ # * GConf schemas management # * scrollkeeper (old Gnome help system) management -[[ ${EAPI:-0} == [012345] ]] && inherit multilib +[[ ${EAPI} == 5 ]] && inherit multilib # eutils.eclass: emktemp +# toolchain-funs.eclass: tc-is-cross-compiler # xdg-utils.eclass: xdg_environment_reset, xdg_icon_cache_update -inherit eutils xdg-utils +inherit eutils toolchain-funcs xdg-utils -case "${EAPI:-0}" in - 0|1|2|3|4|5|6|7) ;; +case ${EAPI} in + 5|6|7) ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -95,7 +96,7 @@ gnome2_environment_reset() { # Ensure we don't rely on dconf/gconf while building, bug #511946 export GSETTINGS_BACKEND="memory" - if has ${EAPI:-0} 6 7; then + if has ${EAPI} 6 7; then # Try to cover the packages honoring this variable, bug #508124 export GST_INSPECT="$(type -P true)" @@ -110,7 +111,6 @@ gnome2_environment_reset() { # in the GNOME2_ECLASS_SCHEMAS environment variable. # This function should be called from pkg_preinst. gnome2_gconf_savelist() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" > /dev/null || die export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) popd > /dev/null || die @@ -122,16 +122,23 @@ gnome2_gconf_savelist() { # using gconftool-2. # This function should be called from pkg_postinst. gnome2_gconf_install() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}${GCONFTOOL_BIN}" - if [[ ! -x "${updater}" ]]; then - debug-print "${updater} is not executable" + if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then + debug-print "No GNOME 2 GConf schemas found" return fi - if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then - debug-print "No GNOME 2 GConf schemas found" + if tc-is-cross-compiler ; then + ewarn "Updating of GNOME 2 GConf schemas skipped due to cross-compilation." + ewarn "You might want to run gconftool-2 manually on the target for" + ewarn "your final image and re-run it when packages installing" + ewarn "GNOME 2 GConf schemas get upgraded or added to the image." + return + fi + + if [[ ! -x "${updater}" ]]; then + debug-print "${updater} is not executable" return fi @@ -163,16 +170,22 @@ gnome2_gconf_install() { # Removes schema files previously installed by the current ebuild from Gconf's # database. gnome2_gconf_uninstall() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}${GCONFTOOL_BIN}" - if [[ ! -x "${updater}" ]]; then - debug-print "${updater} is not executable" + if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then + debug-print "No GNOME 2 GConf schemas found" return fi - if [[ -z "${GNOME2_ECLASS_SCHEMAS}" ]]; then - debug-print "No GNOME 2 GConf schemas found" + if tc-is-cross-compiler ; then + ewarn "Removal of GNOME 2 GConf schemas skipped due to cross-compilation." + ewarn "You might want to run gconftool-2 manually on the target for" + ewarn "your final image to uninstall this package's schemas." + return + fi + + if [[ ! -x "${updater}" ]]; then + debug-print "${updater} is not executable" return fi @@ -255,7 +268,6 @@ gnome2_omf_fix() { # in the GNOME2_ECLASS_SCROLLS environment variable. # This function should be called from pkg_preinst. gnome2_scrollkeeper_savelist() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" > /dev/null || die export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null) popd > /dev/null || die @@ -266,16 +278,23 @@ gnome2_scrollkeeper_savelist() { # Updates the global scrollkeeper database. # This function should be called from pkg_postinst and pkg_postrm. gnome2_scrollkeeper_update() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}${SCROLLKEEPER_UPDATE_BIN}" - if [[ ! -x "${updater}" ]] ; then - debug-print "${updater} is not executable" + if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then + debug-print "No scroll cache to update" return fi - if [[ -z "${GNOME2_ECLASS_SCROLLS}" ]]; then - debug-print "No scroll cache to update" + if tc-is-cross-compiler ; then + ewarn "Updating of scrollkeeper database skipped due to cross-compilation." + ewarn "You might want to run scrollkeeper-update manually on the target" + ewarn "for your final image and re-run it when packages installing" + ewarn "scrollkeeper OMF files get upgraded or added to the image." + return + fi + + if [[ ! -x "${updater}" ]] ; then + debug-print "${updater} is not executable" return fi @@ -291,7 +310,6 @@ gnome2_scrollkeeper_update() { # implementations that call gnome2_schemas_update conditionally. # This function should be called from pkg_preinst. gnome2_schemas_savelist() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" > /dev/null || die export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null) popd > /dev/null || die @@ -302,9 +320,16 @@ gnome2_schemas_savelist() { # Updates GSettings schemas. # This function should be called from pkg_postinst and pkg_postrm. gnome2_schemas_update() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}${GLIB_COMPILE_SCHEMAS}" + if tc-is-cross-compiler ; then + ewarn "Updating of GSettings schemas skipped due to cross-compilation." + ewarn "You might want to run glib-compile-schemas manually on the target" + ewarn "for your final image and re-run it when packages installing" + ewarn "GSettings schemas get upgraded or added to the image." + return + fi + if [[ ! -x ${updater} ]]; then debug-print "${updater} is not executable" return @@ -321,7 +346,6 @@ gnome2_schemas_update() { # GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable. # This function should be called from pkg_preinst. gnome2_gdk_pixbuf_savelist() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" > /dev/null || die export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) popd > /dev/null || die @@ -332,20 +356,24 @@ gnome2_gdk_pixbuf_savelist() { # Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some. # This function should be called from pkg_postinst and pkg_postrm. gnome2_gdk_pixbuf_update() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders" + [[ -x ${updater} ]] || updater="${EROOT%/}/usr/bin/gdk-pixbuf-query-loaders" - if [[ ! -x ${updater} ]]; then - updater="${EROOT%/}/usr/bin/gdk-pixbuf-query-loaders" + if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then + debug-print "gdk-pixbuf loader cache does not need an update" + return fi - if [[ ! -x ${updater} ]]; then - debug-print "${updater} is not executable" + if tc-is-cross-compiler ; then + ewarn "Updating of gdk-pixbuf loader cache skipped due to cross-compilation." + ewarn "You might want to run gdk-pixbuf-query-loaders manually on the target" + ewarn "for your final image and re-run it when packages installing" + ewarn "gdk-pixbuf loaders get upgraded or added to the image." return fi - if [[ -z ${GNOME2_ECLASS_GDK_PIXBUF_LOADERS} ]]; then - debug-print "gdk-pixbuf loader cache does not need an update" + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" return fi @@ -363,7 +391,12 @@ gnome2_gdk_pixbuf_update() { # Updates gtk2 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk2() { local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0 - [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 + [[ -x ${updater} ]] || updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 + + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" + return + fi ebegin "Updating gtk2 input method module cache" GTK_IM_MODULE_FILE="${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \ @@ -376,7 +409,12 @@ gnome2_query_immodules_gtk2() { # Updates gtk3 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk3() { local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0 - [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 + [[ -x ${updater} ]] || updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 + + if [[ ! -x ${updater} ]]; then + debug-print "${updater} is not executable" + return + fi ebegin "Updating gtk3 input method module cache" GTK_IM_MODULE_FILE="${EROOT%/}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \ @@ -389,11 +427,15 @@ gnome2_query_immodules_gtk3() { # Updates glib's gio modules cache. # This function should be called from pkg_postinst and pkg_postrm. gnome2_giomodule_cache_update() { - has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" local updater="${EROOT%/}/usr/bin/${CHOST}-gio-querymodules" + [[ -x ${updater} ]] || updater="${EROOT%/}/usr/bin/gio-querymodules" - if [[ ! -x ${updater} ]]; then - updater="${EROOT%/}/usr/bin/gio-querymodules" + if tc-is-cross-compiler ; then + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + return fi if [[ ! -x ${updater} ]]; then @@ -446,8 +488,8 @@ gnome2_disable_deprecation_warning() { done } -case ${EAPI:-0} in -0|1|2|3|4|5|6) +case ${EAPI} in +5|6) # @FUNCTION: gnome2_icon_savelist # @DESCRIPTION: @@ -457,7 +499,6 @@ case ${EAPI:-0} in # gnome2_icon_cache_update conditionally. # This function should be called from pkg_preinst. gnome2_icon_savelist() { - has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" > /dev/null || die export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) popd > /dev/null || die diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 1a4ff451df32..27ea9f96c0d9 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -4,7 +4,7 @@ # @ECLASS: gnome2.eclass # @MAINTAINER: # gnome@gentoo.org -# @SUPPORTED_EAPIS: 4 5 6 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Provides phases for Gnome/Gtk+ based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the @@ -17,25 +17,19 @@ GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} [[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools -inherit eutils libtool ltprune gnome.org gnome2-utils xdg +[[ ${EAPI} == [56] ]] && inherit eutils ltprune +inherit libtool gnome.org gnome2-utils xdg -case "${EAPI:-0}" in - 4|5) +case ${EAPI:-0} in + 5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; - 6) + 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; *) die "EAPI=${EAPI} is not supported" ;; esac -# @ECLASS-VARIABLE: DOCS -# @DEFAULT_UNSET -# @DESCRIPTION: -# String containing documents passed to dodoc command for eapi4. -# In eapi5 we rely on einstalldocs (from eutils.eclass) and for newer EAPIs we -# follow PMS spec. - # @ECLASS-VARIABLE: ELTCONF # @DEFAULT_UNSET # @DESCRIPTION: @@ -48,7 +42,7 @@ ELTCONF=${ELTCONF:-""} # Extra configure opts passed to econf. # Deprecated, pass extra arguments to gnome2_src_configure. # Banned in eapi6 and newer. -if has ${EAPI:-0} 4 5; then +if has ${EAPI} 5; then G2CONF=${G2CONF:-""} fi @@ -64,7 +58,7 @@ fi # # Banned since eapi6 as upstream is moving away from this obsolete macro in favor # of autoconf-archive macros, that do not expose this issue (bug #270919) -if has ${EAPI:-0} 4 5; then +if has ${EAPI} 5; then if [[ ${GCONF_DEBUG} != "no" ]]; then IUSE="debug" fi @@ -77,27 +71,22 @@ fi # @ECLASS-VARIABLE: GNOME2_LA_PUNT # @DESCRIPTION: -# For eapi4 it sets if we should delete ALL or none of the .la files -# For eapi5 and newer it relies on prune_libtool_files (from eutils.eclass) -# for this. Available values for GNOME2_LA_PUNT: +# In EAPIs 5 and 6, it relies on prune_libtool_files (from ltprune.eclass) for +# this. Later EAPIs use find ... -delete. Available values for GNOME2_LA_PUNT: # - "no": will not clean any .la files # - "yes": will run prune_libtool_files --modules # - If it is not set, it will run prune_libtool_files -if has ${EAPI:-0} 4; then - GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} -else - GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} -fi +GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} # @FUNCTION: gnome2_src_unpack # @DESCRIPTION: # Stub function for old EAPI. gnome2_src_unpack() { - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then unpack ${A} cd "${S}" else - die "gnome2_src_unpack is banned from eapi6" + die "gnome2_src_unpack is banned since eapi6" fi } @@ -115,7 +104,7 @@ gnome2_src_prepare() { # We stop to run it from eapi6 as scrollkeeper helpers from # rarian are not running anything and, then, access violations # shouldn't occur. - has ${EAPI:-0} 4 5 && gnome2_omf_fix + has ${EAPI} 5 && gnome2_omf_fix # Disable all deprecation warnings gnome2_disable_deprecation_warning @@ -135,7 +124,7 @@ gnome2_src_prepare() { gnome2_src_configure() { # Deprecated for a long time now and banned since eapi6, see Gnome team policies if [[ -n ${G2CONF} ]] ; then - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then eqawarn "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" else die "G2CONF set, please review documentation at https://wiki.gentoo.org/wiki/Project:GNOME/Gnome_Team_Ebuild_Policies#G2CONF_and_src_configure" @@ -144,7 +133,7 @@ gnome2_src_configure() { local g2conf=() - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then if [[ ${GCONF_DEBUG} != 'no' ]] ; then if use debug ; then g2conf+=( --enable-debug=yes ) @@ -156,19 +145,14 @@ gnome2_src_configure() { fi fi - # Starting with EAPI=5, we consider packages installing gtk-doc to be - # handled by adding DEPEND="dev-util/gtk-doc-am" which provides tools to - # relink URLs in documentation to already installed documentation. - # This decision also greatly helps with constantly broken doc generation. + # We consider packages installing gtk-doc to be handled by adding + # DEPEND="dev-util/gtk-doc-am" which provides tools to relink URLs in + # documentation to already installed documentation. This decision also + # greatly helps with constantly broken doc generation. # Remember to drop 'doc' USE flag from your package if it was only used to # rebuild docs. - # Preserve old behavior for older EAPI. if grep -q "enable-gtk-doc" "${ECONF_SOURCE:-.}"/configure ; then - if has ${EAPI:-0} 4 && in_iuse doc ; then - g2conf+=( $(use_enable doc gtk-doc) ) - else - g2conf+=( --disable-gtk-doc ) - fi + g2conf+=( --disable-gtk-doc ) fi # Pass --disable-maintainer-mode when needed @@ -182,13 +166,6 @@ gnome2_src_configure() { g2conf+=( --disable-scrollkeeper ) fi - # Pass --disable-silent-rules when possible (not needed since eapi5), bug #429308 - if has ${EAPI:-0} 4; then - if grep -q "disable-silent-rules" "${ECONF_SOURCE:-.}"/configure; then - g2conf+=( --disable-silent-rules ) - fi - fi - # Pass --disable-schemas-install when possible if grep -q "disable-schemas-install" "${ECONF_SOURCE:-.}"/configure; then g2conf+=( --disable-schemas-install ) @@ -210,20 +187,20 @@ gnome2_src_configure() { fi # Pass --docdir with proper directory, bug #482646 (not needed since eapi6) - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then if grep -q "^ *--docdir=" "${ECONF_SOURCE:-.}"/configure; then g2conf+=( --docdir="${EPREFIX}"/usr/share/doc/${PF} ) fi fi # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then addwrite "$(unset HOME; echo ~)/.gnome2" else addpredict "$(unset HOME; echo ~)/.gnome2" fi - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then econf ${g2conf[@]} ${G2CONF} "$@" else econf ${g2conf[@]} "$@" @@ -234,7 +211,7 @@ gnome2_src_configure() { # @DESCRIPTION: # Only default src_compile for now gnome2_src_compile() { - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then emake else default @@ -255,7 +232,7 @@ gnome2_src_install() { # # if this is not present, scrollkeeper-update may segfault and # create bogus directories in /var/lib/ - if has ${EAPI:-0} 4 5; then + if has ${EAPI} 5; then dodir "${sk_tmp_dir}" || die "dodir failed" emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" else @@ -267,12 +244,7 @@ gnome2_src_install() { # Handle documentation as 'default' for eapi5, bug #373131 # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING # files that are really common in gnome packages (bug #573390) - if has ${EAPI:-0} 4; then - # Manual document installation - if [[ -n "${DOCS}" ]]; then - dodoc ${DOCS} || die "dodoc failed" - fi - elif has ${EAPI:-0} 5; then + if has ${EAPI} 5; then einstalldocs else local d @@ -293,20 +265,16 @@ gnome2_src_install() { rm -fr "${ED}/usr/share/applications/mimeinfo.cache" # Delete all .la files - if has ${EAPI:-0} 4; then - if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then - ebegin "Removing .la files" - if ! in_iuse static-libs || ! use static-libs ; then - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" - fi - eend - fi - else + if has ${EAPI} 5 6; then case "${GNOME2_LA_PUNT}" in yes) prune_libtool_files --modules;; no) ;; *) prune_libtool_files;; esac + else + if [[ ${GNOME2_LA_PUNT} != 'no' ]]; then + find "${ED}" -name '*.la' -delete || die + fi fi } diff --git a/games-util/sc-controller/Manifest b/games-util/sc-controller/Manifest index 319725439883..38b205222bdc 100644 --- a/games-util/sc-controller/Manifest +++ b/games-util/sc-controller/Manifest @@ -1 +1,2 @@ DIST sc-controller-0.4.8.1.tar.gz 2520167 BLAKE2B 40c8e366519ec2a6d80b31c2b342fba2664fa35f3a889e222665f8f5cd4d59dd912804f6cdf4ecd844ab94075f5f45f88a61138ac1c0cb528652c9fd9b710afa SHA512 bc57bd381c71e94c0771ecdb08f95326d0c1478e25cdf3955b71c203abe6cb78091ca977deb8a1e954b5b1b65a6df487f8b8921920b1eb672aa6f1f5554a4847 +DIST sc-controller-0.4.8.2.tar.gz 2520528 BLAKE2B 0c98e1fd49e846909ec0a78c5bbf48731de464ab79ebe3e1b0370e2a6f176e925e6f2b288c17358221b2e50be0cd783f31f05324ac585aec310967d148ce5011 SHA512 8d157e871fa519ebd3eee27dd1c0ff1afe6f79201df12578aa31f3cbc62974bd7ba47c8a097870b693a7abaacaadd1e502012c9664c0aecddbd982fa10c7f84d diff --git a/games-util/sc-controller/sc-controller-0.4.8.2.ebuild b/games-util/sc-controller/sc-controller-0.4.8.2.ebuild new file mode 100644 index 000000000000..fd7546b73bf5 --- /dev/null +++ b/games-util/sc-controller/sc-controller-0.4.8.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 xdg + +DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others" +HOMEPAGE="https://github.com/Ryochan7/sc-controller/" +SRC_URI="https://github.com/Ryochan7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2 CC0-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+udev" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject[${PYTHON_USEDEP},cairo] + dev-python/pylibacl[${PYTHON_USEDEP}] + dev-python/python-evdev[${PYTHON_USEDEP}] + ') + gnome-base/librsvg + x11-libs/gtk+:3 + udev? ( games-util/game-device-udev-rules ) +" diff --git a/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch b/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch new file mode 100644 index 000000000000..38d11316e5ef --- /dev/null +++ b/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch @@ -0,0 +1,68 @@ +From cf2364b80fa8ae844df8350cd5833d47cce235f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org> +Date: Mon, 9 Mar 2020 08:24:48 -0700 +Subject: [PATCH] Fix possible crash when downloading attachments + +Turns out we've been happily deleting network replies from the +QNetworkReply::finished(). That was never a good thing to do, but it did +not use to crash with older Qt. Now it does. + +After changing to deleteLater(), there's a window for +already-deregistered replies to generate events, therefore the assert +has to go, too, otherwise Bad Things happen: + + (gdb) bt + #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 + #1 0x00007ffff16bdcd2 in __GI_abort () at abort.c:89 + #2 0x00007ffff2400bcb in qt_message_fatal (context=..., message=<synthetic pointer>...) at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:1904 + #3 QMessageLogger::fatal (this=this@entry=0x7fffffffc990, msg=msg@entry=0x7ffff2690b10 "ASSERT: \"%s\" in file %s, line %d") at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:888 + #4 0x00007ffff23fff7c in qt_assert (assertion=assertion@entry=0x5555558451d7 "reply", file=file@entry=0x555555841a38 "/home/jkt/work/prog/trojita/src/Imap/Network/FileDownloadManager.cpp", line=line@entry=142) + at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qglobal.cpp:3247 + #5 0x00005555555da840 in Imap::Network::FileDownloadManager::onPartDataTransfered (this=0x555556a20990) + #6 0x00007ffff25f1bdf in QtPrivate::QSlotObjectBase::call (a=0x7fffffffcaa0, r=0x555556a20990, this=0x5555569f99c0) at ../../include/QtCore/../../../qtcore-5.13.9999/src/corelib/kernel/qobjectdefs_impl.h:394 + #7 QMetaObject::activate(QObject*, int, int, void**) () at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3787 + #8 0x00007ffff25f20b7 in QMetaObject::activate (sender=sender@entry=0x555556a21370, m=m@entry=0x7ffff3f96b00 <QNetworkReply::staticMetaObject>, local_signal_index=local_signal_index@entry=1, argv=argv@entry=0x0) + at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3658 + #9 0x00007ffff3d3cbf3 in QNetworkReply::finished (this=this@entry=0x555556a21370) at .moc/moc_qnetworkreply.cpp:385 + #10 0x0000555555709485 in Imap::Network::MsgPartNetworkReply::slotMyDataChanged() () at /home/jkt/work/prog/trojita/src/Imap/Network/MsgPartNetworkReply.cpp:112 + +BUG: 417697 +Reported-by: Stefan de Konink <stefan@konink.de> +Change-Id: I79f340c5a471430a14474472513d0a055c7238d6 +--- + src/Imap/Network/FileDownloadManager.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/Imap/Network/FileDownloadManager.cpp b/src/Imap/Network/FileDownloadManager.cpp +index 16b6c8df..c3f72176 100644 +--- a/src/Imap/Network/FileDownloadManager.cpp ++++ b/src/Imap/Network/FileDownloadManager.cpp +@@ -139,7 +139,9 @@ void FileDownloadManager::downloadMessage() + + void FileDownloadManager::onPartDataTransfered() + { +- Q_ASSERT(reply); ++ if (!reply) { ++ return; ++ } + if (reply->error() == QNetworkReply::NoError) { + if (!saving.open(QIODevice::WriteOnly)) { + emit transferError(saving.errorString()); +@@ -192,11 +194,11 @@ void FileDownloadManager::onCombinerTransferError(const QString &message) + + void FileDownloadManager::deleteReply(QNetworkReply *reply) + { +- if (reply == this->reply) { ++ if (reply && reply == this->reply) { + if (!saved) + onPartDataTransfered(); +- delete reply; +- this->reply = 0; ++ reply->deleteLater(); ++ this->reply = nullptr; + } + } + +-- +GitLab + diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild b/mail-client/trojita/trojita-0.7-r6.ebuild index f7b60c366360..7c1b4c0b6fac 100644 --- a/mail-client/trojita/trojita-0.7-r5.ebuild +++ b/mail-client/trojita/trojita-0.7-r6.ebuild @@ -59,6 +59,7 @@ PATCHES=( "${FILESDIR}/${P}-cmake-cxx11.patch" "${FILESDIR}/${P}-desktop-spec-namespace.patch" "${FILESDIR}/${P}-metainfo.patch" # bug 730140 + "${FILESDIR}/${P}-crash-w-attachments.patch" # KDE-Bug 417697 ) src_prepare() { diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest index 9467a56ff82f..7e3fcd07db23 100644 --- a/media-libs/liblastfm/Manifest +++ b/media-libs/liblastfm/Manifest @@ -1 +1 @@ -DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166 +DIST liblastfm-1.1.0_pre20190625.tar.gz 119348 BLAKE2B d4755d6dfe6dc8bb4c21e1f4ed94fd96165313111a553271e518ad57f08aab45980239a51416d6e99d87a86f7859c7ea04ba81fb06f6dfa61b2aa7f554935589 SHA512 ee36cc31e1f7b345e2de29ff4151acb7bbe30960bbf2528bf8eb5214a47272955efe3bd1c6e20af8dd22a4fbc510de34befdcd6c728683ae300bd45e578e5ebb diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch deleted file mode 100644 index fc0e9b8938dd..000000000000 --- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch +++ /dev/null @@ -1,302 +0,0 @@ -From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 1 Apr 2018 11:51:42 +0200 -Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing - deps - ---- - CMakeLists.txt | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index be88967..e628611 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module - # setup qt stuff - set(CMAKE_AUTOMOC ON) - --option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF) -+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF) - --if( NOT BUILD_WITH_QT4 ) -- # try Qt5 first, and prefer that if found -- find_package(Qt5Core QUIET) --endif() -+if(NOT BUILD_WITH_QT4) -+ find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG) -+ -+ if(BUILD_FINGERPRINT) -+ find_package(Qt5Sql REQUIRED CONFIG) -+ endif() - --if(Qt5Core_DIR) - set(LASTFM_LIB_VERSION_SUFFIX 5) -- message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") - include_directories(${Qt5Core_INCLUDE_DIRS}) - if(UNIX AND NOT APPLE) -- find_package(Qt5DBus REQUIRED) -+ find_package(Qt5DBus REQUIRED CONFIG) - endif() - - # macro(qt_wrap_ui) --- -2.17.0 - - -From ff32d56e5e1bd8b1f86a8e9840c778249ff19118 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 1 Apr 2018 11:56:48 +0200 -Subject: [PATCH 2/4] Make use of FeatureSummary - ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e628611..dcdfd91 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON) - - # installation dirs - include(GNUInstallDirs) -+include(FeatureSummary) - - #cmake module path - set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules") -@@ -97,3 +98,5 @@ if(BUILD_TESTS) - enable_testing() - add_subdirectory(tests) - endif() -+ -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) --- -2.17.0 - - -From 5762278b29c1ab6559dcca7a1e8fbad1d75134da Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 1 Apr 2018 12:06:48 +0200 -Subject: [PATCH 3/4] Cleanup include dirs - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcdfd91..52589b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,10 +38,10 @@ if(NOT BUILD_WITH_QT4) - endif() - - set(LASTFM_LIB_VERSION_SUFFIX 5) -- include_directories(${Qt5Core_INCLUDE_DIRS}) - if(UNIX AND NOT APPLE) - find_package(Qt5DBus REQUIRED CONFIG) - endif() -+ include_directories(Qt5::Core Qt5::Network Qt5::Xml) - - # macro(qt_wrap_ui) - # qt5_wrap_ui(${ARGN}) --- -2.17.0 - - -From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 15 Apr 2018 21:31:14 +0200 -Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules) - ---- - CMakeLists.txt | 3 -- - src/CMakeLists.txt | 63 +++++++++++++++++++--------------- - src/fingerprint/CMakeLists.txt | 20 ++++++----- - tests/lastfm_add_test.cmake | 16 +++++---- - 4 files changed, 55 insertions(+), 47 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52589b5..c8bc89d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4) - # endmacro() - else() - find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED) -- -- macro(qt5_use_modules) -- endmacro() - endif() - - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0f872fb..22ce506 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,16 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.in ${CMAKE_CURRENT_BINARY_DI - - add_definitions(${QT_DEFINITIONS}) - include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) --set(liblastfm_LIBRARIES -- ${QT_QTCORE_LIBRARY} -- ${QT_QTNETWORK_LIBRARY} -- ${QT_QTXML_LIBRARY} --) -- --list(APPEND liblastfm_QT5_MODULES -- Xml -- Network --) - - set(liblastfm_SOURCES - ws.cpp -@@ -49,15 +39,11 @@ if(WIN32) - if(NOT MINGW) - add_definitions("-D_ATL_DLL -D_CRT_SECURE_NO_WARNINGS") - -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - win/WNetworkConnectionMonitor_win.cpp - win/WmiSink.cpp - win/NdisEvents.cpp - ) -- list(APPEND liblastfm_LIBRARIES -- winhttp -- wbemuuid -- ) - endif() - endif() - -@@ -67,30 +53,51 @@ if(APPLE) - #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - #set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk") - -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - mac/MNetworkConnectionMonitor_mac.cpp - ) -- -- find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) -- find_library(COREFOUNDATION_LIBRARY CoreFoundation) -- list(APPEND liblastfm_LIBRARIES -- ${COREFOUNDATION_LIBRARY} -- ${SYSTEMCONFIGURATION_LIBRARY} -- ) - endif() - - if(UNIX AND NOT APPLE) -- list(APPEND liblastfm_SOURCES -+ set(liblastfm_SOURCES ${liblastfm_SOURCES} - linux/LNetworkConnectionMonitor_linux.cpp - ) -- list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY}) -- list(APPEND liblastfm_QT5_MODULES DBus) - endif() - - add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES}) --qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES}) - --target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES}) -+if(Qt5Core_DIR) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::Network Qt5::Xml) -+ if(UNIX AND NOT APPLE) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::DBus) -+ endif() -+else() -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ ${QT_QTCORE_LIBRARY} -+ ${QT_QTNETWORK_LIBRARY} -+ ${QT_QTXML_LIBRARY} -+ ) -+ if(UNIX AND NOT APPLE) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${QT_QTDBUS_LIBRARY}) -+ endif() -+endif() -+ -+if(WIN32 AND NOT MINGW) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ winhttp -+ wbemuuid -+ ) -+endif() -+ -+if(APPLE) -+ find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) -+ find_library(COREFOUNDATION_LIBRARY CoreFoundation) -+ target_link_libraries(${LASTFM_LIB_TARGET_NAME} -+ ${COREFOUNDATION_LIBRARY} -+ ${SYSTEMCONFIGURATION_LIBRARY} -+ ) -+endif() -+ - set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES - VERSION ${LASTFM_VERSION_STRING} - SOVERSION ${LASTFM_SOVERSION} -diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt -index 126f8d9..4a74e0d 100644 ---- a/src/fingerprint/CMakeLists.txt -+++ b/src/fingerprint/CMakeLists.txt -@@ -26,21 +26,23 @@ set(lastfm_fingerprint_HEADERS - - add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES}) - --target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} -- ${LASTFM_LIB_TARGET_NAME} -- ${QT_QTSQL_LIBRARY} -- ${QT_QTCORE_LIBRARY} -- ${LIBSAMPLERATE_LIBRARY} -- ${LIBFFTW3_LIBRARY} --) -- - set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES - COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB - VERSION ${LASTFM_VERSION_STRING} - SOVERSION ${LASTFM_SOVERSION} - ) - --qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml) -+target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} -+ ${LASTFM_LIB_TARGET_NAME} -+ ${LIBSAMPLERATE_LIBRARY} -+ ${LIBFFTW3_LIBRARY} -+) -+ -+if(Qt5Core_DIR) -+ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml) -+else() -+ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY}) -+endif() - - install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -diff --git a/tests/lastfm_add_test.cmake b/tests/lastfm_add_test.cmake -index a4a1686..2f0664d 100644 ---- a/tests/lastfm_add_test.cmake -+++ b/tests/lastfm_add_test.cmake -@@ -6,13 +6,15 @@ macro(lastfm_add_test test_class) - configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h) - add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp) - -- qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network) -- -- target_link_libraries(${LASTFM_TEST_CLASS}Test -- ${LASTFM_LIB_TARGET_NAME} -- ${QT_QTTEST_LIBRARY} -- ${QT_QTCORE_LIBRARY} -- ) -+ if(Qt5Core_DIR) -+ target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network -+ ${LASTFM_LIB_TARGET_NAME} -+ ) -+ else() -+ target_link_libraries(${LASTFM_TEST_CLASS}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} -+ ${LASTFM_LIB_TARGET_NAME} -+ ) -+ endif() - - add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test) - endmacro() --- -2.17.0 - diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild index c539e6a7b1fa..66923fd858eb 100644 --- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild +++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20190625.ebuild @@ -1,20 +1,24 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686 +COMMIT=f867df52757c569d97d9755c911ac9dec146f365 inherit cmake DESCRIPTION="Collection of libraries to integrate Last.fm services" HOMEPAGE="https://github.com/lastfm/liblastfm" SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-3" KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" SLOT="0/0" IUSE="fingerprint test" +# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9 +RESTRICT="test" + RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -26,18 +30,10 @@ RDEPEND=" sci-libs/fftw:3.0 ) " -DEPEND="${RDEPEND}" -BDEPEND=" +DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " -# 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9 -RESTRICT="test" - -S="${WORKDIR}/${PN}-${COMMIT}" - -PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) - src_configure() { # demos not working local mycmakeargs=( @@ -46,6 +42,5 @@ src_configure() { -DBUILD_FINGERPRINT=$(usex fingerprint) -DBUILD_TESTS=$(usex test) ) - cmake_src_configure } diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild index a133bbbcecbc..d8ce4b379feb 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/gpodder/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="LGPL-2.1" diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild index 0808dceb128d..a11ddaa0a213 100644 --- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild +++ b/media-sound/clementine/clementine-1.4.0_rc1.ebuild @@ -23,7 +23,7 @@ else else SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz" fi - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~arm64 x86" fi DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" diff --git a/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch b/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch new file mode 100644 index 000000000000..0bf8faf4da80 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.11.1-configure_lua_version.patch @@ -0,0 +1,47 @@ +Only look for one single version of Lua: the one pointed to by the +pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care +of the rest. + +--- a/configure.ac ++++ b/configure.ac +@@ -1676,37 +1676,10 @@ + [disable LUA scripting support (default enabled)])]) + if test "${enable_lua}" != "no" + then +- PKG_CHECK_MODULES(LUA, lua5.2, ++ PKG_CHECK_MODULES(LUA, lua, + [ have_lua=yes ], +- [ +- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) +- +- PKG_CHECK_MODULES(LUA, lua5.1, +- [ have_lua=yes ], +- [ +- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) +- PKG_CHECK_MODULES(LUA, lua >= 5.1, +- [ have_lua=yes ], +- [ +- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) +- have_lua=yes +- AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], +- [], +- [ have_lua=no ] ) +- AC_CHECK_LIB( lua5.2 , luaL_newstate, +- [LUA_LIBS="-llua5.2"], +- AC_CHECK_LIB( lua5.1 , luaL_newstate, +- [LUA_LIBS="-llua5.1"], +- AC_CHECK_LIB( lua51 , luaL_newstate, +- [LUA_LIBS="-llua51"], +- AC_CHECK_LIB( lua , luaL_newstate, +- [LUA_LIBS="-llua"], +- [ have_lua=no +- ], [-lm]) +- ))) +- ]) +- ]) +- ]) ++ [ have_lua=no ] ++ ) + if test "x${have_lua}" != "xyes" ; then + AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) + fi diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r100.ebuild new file mode 100644 index 000000000000..23ebcaad281a --- /dev/null +++ b/media-video/vlc/vlc-3.0.11.1-r100.ebuild @@ -0,0 +1,496 @@ +# Copyright 2000-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" + else + EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" + fi + inherit git-r3 +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" +fi +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast + dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac + fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate + libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc + live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses + nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp + run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib + theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X + x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx + cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) + skins? ( qt5 truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) +" +RDEPEND=" + net-dns/libidn:= + sys-libs/zlib[minizip] + virtual/libintl + virtual/opengl + a52? ( media-libs/a52dec ) + alsa? ( media-libs/alsa-lib ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + aribsub? ( media-libs/aribb24 ) + bidi? ( + dev-libs/fribidi + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz + virtual/ttf-fonts + ) + bluray? ( media-libs/libbluray:= ) + cddb? ( media-libs/libcddb ) + chromaprint? ( media-libs/chromaprint:= ) + chromecast? ( + >=dev-libs/protobuf-2.5.0:= + >=net-libs/libmicrodns-0.0.9:= + ) + dav1d? ( media-libs/dav1d:= ) + dbus? ( sys-apps/dbus ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394 + ) + dts? ( media-libs/libdca ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) + dvd? ( + >=media-libs/libdvdnav-4.9:0= + >=media-libs/libdvdread-4.9:0= + ) + faad? ( media-libs/faad2 ) + fdk? ( media-libs/fdk-aac:= ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) + flac? ( + media-libs/flac + media-libs/libogg + ) + fluidsynth? ( media-sound/fluidsynth:= ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + ) + gme? ( media-libs/game-music-emu ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + ieee1394? ( + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + jack? ( virtual/jack ) + jpeg? ( virtual/jpeg:0 ) + kate? ( media-libs/libkate ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:= + ) + libcaca? ( media-libs/libcaca ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + ) + libsamplerate? ( media-libs/libsamplerate ) + libtar? ( dev-libs/libtar ) + libtiger? ( media-libs/libtiger ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live:= ) + lua? ( ${LUA_DEPS} ) + mad? ( media-libs/libmad ) + matroska? ( + >=dev-libs/libebml-1.3.6:= + media-libs/libmatroska:= + ) + modplug? ( >=media-libs/libmodplug-0.8.9.0 ) + mp3? ( media-sound/mpg123 ) + mpeg? ( media-libs/libmpeg2 ) + mtp? ( media-libs/libmtp:= ) + musepack? ( media-sound/musepack-tools ) + ncurses? ( sys-libs/ncurses:0=[unicode] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg ) + opus? ( >=media-libs/opus-1.0.3 ) + png? ( media-libs/libpng:0= ) + projectm? ( + media-fonts/dejavu + media-libs/libprojectm + ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + sdl-image? ( media-libs/sdl-image ) + sftp? ( net-libs/libssh2 ) + shout? ( media-libs/libshout ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + ) + soxr? ( >=media-libs/soxr-0.1.2 ) + speex? ( + >=media-libs/speex-1.2.0 + media-libs/speexdsp + ) + srt? ( net-libs/srt ) + ssl? ( net-libs/gnutls:= ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + taglib? ( >=media-libs/taglib-1.9 ) + theora? ( media-libs/libtheora ) + tremor? ( media-libs/tremor ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts + !fontconfig? ( media-fonts/dejavu ) + ) + twolame? ( media-sound/twolame ) + udev? ( virtual/udev ) + upnp? ( net-libs/libupnp:=[ipv6] ) + v4l? ( media-libs/libv4l:= ) + vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + vnc? ( net-libs/libvncserver ) + vorbis? ( media-libs/libvorbis ) + vpx? ( media-libs/libvpx:= ) + wayland? ( + >=dev-libs/wayland-1.15 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( >=media-libs/x264-0.0.20190214:= ) + x265? ( media-libs/x265:= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + xdg_src_prepare # bug 608256 + + has_version 'net-libs/libupnp:1.8' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local -x BUILDCC=$(tc-getBUILD_CC) + + local myeconfargs=( + --disable-aa + --disable-optimizations + --disable-rpath + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vcd + --enable-vlc + $(use_enable a52) + $(use_enable alsa) + $(use_enable aom) + $(use_enable archive) + $(use_enable aribsub) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable chromecast microdns) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dav1d) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable mad) + $(use_enable matroska) + $(use_enable modplug mod) + $(use_enable mp3 mpg123) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable nfs) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable qt5 qt) + $(use_enable rdp freerdp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable srt) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vorbis) + $(use_enable vpx) + $(use_enable wayland) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x264 x26410b) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --with-kde-solid="${EPREFIX}"/usr/share/solid/actions + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opencv + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-schroedinger + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + --disable-wma-fixed + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 + append-cxxflags -std=c++11 + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf "${myeconfargs[@]}" + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" + "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" + ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + xdg_pkg_postinst +} + +pkg_postrm() { + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + xdg_pkg_postrm +} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 7b9bcc5e9502..2cd26034d19a 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -3,6 +3,8 @@ EAPI=7 +LUA_COMPAT=( lua5-{1..2} ) + MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" @@ -21,7 +23,7 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" fi -inherit autotools flag-o-matic toolchain-funcs virtualx xdg +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/" @@ -46,6 +48,7 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -54,6 +57,7 @@ REQUIRED_USE=" BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig + lua? ( ${LUA_DEPS} ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " @@ -142,7 +146,7 @@ RDEPEND=" linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) - lua? ( >=dev-lang/lua-5.1:0= ) + lua? ( ${LUA_DEPS} ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= @@ -226,6 +230,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index a93a385cb40e..bd6ded539cc6 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -3,6 +3,8 @@ EAPI=7 +LUA_COMPAT=( lua5-{1..2} ) + MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" @@ -21,7 +23,7 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" fi -inherit autotools flag-o-matic toolchain-funcs virtualx xdg +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/" @@ -46,6 +48,7 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -54,6 +57,7 @@ REQUIRED_USE=" BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig + lua? ( ${LUA_DEPS} ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " @@ -144,7 +148,7 @@ RDEPEND=" lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) loudness? ( >=media-libs/libebur128-1.2.4:= ) - lua? ( >=dev-lang/lua-5.1:0= ) + lua? ( ${LUA_DEPS} ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= @@ -229,6 +233,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild index 0504266762ec..fa7ddc30fd67 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild @@ -30,7 +30,7 @@ CDEPEND=" >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) - lua? ( dev-lang/lua:* ) + lua? ( dev-lang/lua:0= ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) rados? ( sys-cluster/ceph ) diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild new file mode 100644 index 000000000000..9f7abe89568f --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=true +DISTUTILS_SINGLE_IMPL=true +GENTOO_DEPEND_ON_PERL=no +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools lua perl-module distutils-r1 flag-o-matic multilib + +MY_P=${P/_/-} + +DESCRIPTION="A system to store and display time-series data" +HOMEPAGE="https://oss.oetiker.ch/rrdtool/" +SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/8.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" +RESTRICT="!test? ( test )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + lua? ( + ${LUA_REQUIRED_USE} + test? ( graph ) + )" + +CDEPEND=" + >=dev-libs/glib-2.28.7:2[static-libs(+)?] + >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] + dbi? ( dev-db/libdbi[static-libs(+)?] ) + graph? ( + >=media-libs/libpng-1.5.10:0=[static-libs(+)?] + >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] + >=x11-libs/pango-1.28 + ) + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + rados? ( sys-cluster/ceph ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND=" + ${CDEPEND} + sys-apps/groff + virtual/pkgconfig + virtual/awk + test? ( sys-devel/bc ) +" +RDEPEND=" + ${CDEPEND} +" +BDEPEND="test? ( + lua? ( ${LUA_DEPS} ) +)" +PDEPEND=" + ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) +" +PATCHES=( + "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch + "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch + "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch +) +S=${WORKDIR}/${MY_P} + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + # At the next version bump, please see if you actually still need this + # before adding versions + if ! [ -f doc/rrdrados.pod ]; then + cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod + else + die "File already exists: doc/rrdrados.pod. Remove this code!" + fi + + # bug 456810 + # no time to sleep + sed -i \ + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ + -e 's|^sleep 1$||g' \ + -e '/^dnl.*png/s|^dnl||g' \ + configure.ac || die + + # Python bindings are built/installed manually + sed -i \ + -e '/^all-local:/s| @COMP_PYTHON@||' \ + bindings/Makefile.am || die + + if ! use graph; then + sed -i \ + -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ + -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ + -e 's|graph1||g' \ + tests/Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + export rd_cv_gcc_flag__Werror=no + export rd_cv_ms_async=ok + + filter-flags -ffast-math + + export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} + + # to solve bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + # Stub configure.ac + local myconf=() + if ! use tcpd; then + myconf+=( "--disable-libwrap" ) + fi + if ! use dbi; then + myconf+=( "--disable-libdbi" ) + fi + if ! use rados; then + myconf+=( "--disable-librados" ) + fi + + # We will handle Lua bindings ourselves, upstream is not multi-impl-ready + # and their Lua-detection logic depends on having the right version of the Lua + # interpreter available at build time. + econf \ + $(use_enable graph rrd_graph) \ + $(use_enable perl perl-site-install) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable rrdcgi) \ + $(use_enable static-libs static) \ + $(use_enable tcl) \ + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ + --with-perl-options=INSTALLDIRS=vendor \ + --disable-lua \ + --disable-ruby-site-install \ + --disable-ruby \ + ${myconf[@]} +} + +lua_src_compile() { + pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" + + # We do need the cmod-dir path here, otherwise libtool complains. + # Use the real one (i.e. not within ${ED}) just in case. + emake \ + LUA_CFLAGS=$(lua_get_CFLAGS) \ + LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" + + popd +} + +src_compile() { + default + + if use lua; then + # Only copy sources now so that we do not trigger librrd compilation + # multiple times. + lua_copy_sources + + lua_foreach_impl lua_src_compile + fi + + use python && distutils-r1_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" + + LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test + + popd +} + +src_test() { + export LC_ALL=C + default + if use lua; then + lua_foreach_impl lua_src_test + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" + + # This time we must prefix the cmod-dir path with ${ED} so that make + # does not try to violate the sandbox. + emake \ + LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \ + install + + popd +} + +src_install() { + default + + if ! use doc ; then + rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use !rrdcgi ; then + # uses rrdcgi, causes invalid shebang error in Prefix, useless + # without rrdcgi installed + rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi + fi + + if use perl ; then + perl_delete_localpod + perl_delete_packlist + fi + + dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO + + find "${ED}"usr -name '*.la' -exec rm -f {} + + + keepdir /var/lib/rrdcached/journal/ + keepdir /var/lib/rrdcached/db/ + + newconfd "${FILESDIR}"/rrdcached.confd rrdcached + newinitd "${FILESDIR}"/rrdcached.init rrdcached + + use python && distutils-r1_src_install +} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild index 9d9de2a3f492..1ee76659bd70 100644 --- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild @@ -30,7 +30,7 @@ CDEPEND=" >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) - lua? ( dev-lang/lua:*[deprecated] ) + lua? ( dev-lang/lua:0=[deprecated] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) rados? ( sys-cluster/ceph ) diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index e36535c6bd43..b0b1f2df68f3 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,3 +1 @@ -DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208 -DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6 DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7 diff --git a/net-dns/nsd/nsd-4.2.4.ebuild b/net-dns/nsd/nsd-4.2.4.ebuild deleted file mode 100644 index fa42a2b9d37c..000000000000 --- a/net-dns/nsd/nsd-4.2.4.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 -MY_PV="${PV/_beta/b}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" -LICENSE="BSD" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - acct-group/nsd - acct-user/nsd - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c - ) - libevent? ( dev-libs/libevent ) - munin? ( net-analyzer/munin ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - virtual/yacc - systemd? ( virtual/pkgconfig ) -" - -PATCHES=( - # Fix the paths in the munin plugin to match our install - "${FILESDIR}"/nsd_munin_.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-largefile - --enable-pie - --enable-relro-now - --enable-tcp-fastopen - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db - --with-logfile="${EPREFIX}"/var/log/nsd.log - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state - --with-xfrdir="${EPREFIX}"/var/db/nsd - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list - --with-zonesdir="${EPREFIX}"/var/lib/nsd - $(use_enable bind8-stats) - $(use_enable bind8-stats zone-stats) - $(use_enable dnstap) - $(use_enable ipv6) - $(use_enable minimal-responses) - $(use_enable mmap) - $(use_enable nsec3) - $(use_enable ratelimit) - $(use_enable root-server) - $(use_enable runtime-checks checking) - $(use_enable systemd) - $(use_with libevent) - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - - newinitd "${FILESDIR}"/nsd.initd-r1 nsd - - # install munin plugin and config - if use munin ; then - exeinto /usr/libexec/munin/plugins - doexe contrib/nsd_munin_ - insinto /etc/munin/plugin-conf.d - newins "${FILESDIR}"/nsd.munin-conf nsd_munin - fi - - systemd_dounit "${FILESDIR}"/nsd.service - - # remove the /run directory that usually resides on tmpfs and is - # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED}"/run || die "Failed to remove /run" - - keepdir /var/db/${PN} -} - -pkg_postinst() { - # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd - - # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd -} diff --git a/net-dns/nsd/nsd-4.3.3.ebuild b/net-dns/nsd/nsd-4.3.3.ebuild deleted file mode 100644 index b6ca20a489b4..000000000000 --- a/net-dns/nsd/nsd-4.3.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 -MY_PV="${PV/_beta/b}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" -LICENSE="BSD" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - acct-group/nsd - acct-user/nsd - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c - ) - libevent? ( dev-libs/libevent ) - munin? ( net-analyzer/munin ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - virtual/yacc - systemd? ( virtual/pkgconfig ) -" - -PATCHES=( - # Fix the paths in the munin plugin to match our install - "${FILESDIR}"/nsd_munin_.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-largefile - --enable-pie - --enable-relro-now - --enable-tcp-fastopen - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db - --with-logfile="${EPREFIX}"/var/log/nsd.log - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state - --with-xfrdir="${EPREFIX}"/var/db/nsd - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list - --with-zonesdir="${EPREFIX}"/var/lib/nsd - $(use_enable bind8-stats) - $(use_enable bind8-stats zone-stats) - $(use_enable dnstap) - $(use_enable ipv6) - $(use_enable minimal-responses) - $(use_enable mmap) - $(use_enable nsec3) - $(use_enable ratelimit) - $(use_enable root-server) - $(use_enable runtime-checks checking) - $(use_enable systemd) - $(use_with libevent) - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - - newinitd "${FILESDIR}"/nsd.initd-r1 nsd - - # install munin plugin and config - if use munin ; then - exeinto /usr/libexec/munin/plugins - doexe contrib/nsd_munin_ - insinto /etc/munin/plugin-conf.d - newins "${FILESDIR}"/nsd.munin-conf nsd_munin - fi - - systemd_dounit "${FILESDIR}"/nsd.service - - # remove the /run directory that usually resides on tmpfs and is - # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED}"/run || die "Failed to remove /run" - - keepdir /var/db/${PN} -} - -pkg_postinst() { - # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd - - # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd -} diff --git a/net-dns/nsd/nsd-4.3.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild index 46801d6b5f08..1b91a3af2521 100644 --- a/net-dns/nsd/nsd-4.3.4.ebuild +++ b/net-dns/nsd/nsd-4.3.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl" S="${WORKDIR}/${MY_P}" diff --git a/net-libs/mbedtls/mbedtls-2.24.0.ebuild b/net-libs/mbedtls/mbedtls-2.24.0.ebuild index d8a0317d15fe..c7e0dce91059 100644 --- a/net-libs/mbedtls/mbedtls-2.24.0.ebuild +++ b/net-libs/mbedtls/mbedtls-2.24.0.ebuild @@ -53,6 +53,7 @@ multilib_src_configure() { -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DINSTALL_MBEDTLS_HEADERS=ON -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946 ) cmake_src_configure diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index a221518bf102..74ea1b1ddfa4 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -2,3 +2,4 @@ DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328 +DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64 diff --git a/net-misc/networkmanager/networkmanager-1.26.6.ebuild b/net-misc/networkmanager/networkmanager-1.26.6.ebuild new file mode 100644 index 000000000000..97f5b8ad96b3 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.26.6.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="NetworkManager" +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+" +SLOT="0" + +IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + || ( nss gnutls ) + ?? ( elogind systemd ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +COMMON_DEPEND=" + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + net-misc/iputils + sys-apps/util-linux[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + audit? ( sys-process/audit ) + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( net-misc/dhcpcd ) + elogind? ( >=sys-auth/elogind-219 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) + modemmanager? ( >=net-misc/modemmanager-0.7.991:0= + net-misc/mobile-broadband-provider-info ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209:0= ) + teamd? ( + dev-libs/jansson + >=net-misc/libteam-1.9 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/plugdev + || ( + net-misc/iputils[arping(+)] + net-analyzer/arping + ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + >=sys-kernel/linux-headers-3.18 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + ) +" + +PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.patch ) + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See https://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + if use connection-sharing; then + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi + linux-info_pkg_setup + fi + if use introspection || use test; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + use vala && vala_src_prepare + gnome2_src_prepare + + sed -i \ + -e 's#/usr/bin/sed#/bin/sed#' \ + data/84-nm-drivers.rules \ + || die +} + +multilib_src_configure() { + local myconf=( + --disable-more-warnings + --disable-static + --localstatedir=/var + --with-runstatedir=/run + --disable-lto + --disable-qt + --without-netconfig + --with-dbus-sys-dir=/etc/dbus-1/system.d + $(multilib_native_with nmcli) + --with-udev-dir="$(get_udevdir)" + --with-config-plugins-default=keyfile + --with-iptables=/sbin/iptables + --with-ebpf=yes + $(multilib_native_enable concheck) + --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) + --with-crypto=$(usex nss nss gnutls) + # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option + # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. + # (There is no off switch, and we do not support upower.) + # bug #747358 + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + $(multilib_native_use_with audit libaudit) + $(multilib_native_use_enable bluetooth bluez5-dun) + --without-dhcpcanon + $(use_with dhclient) + $(use_with dhcpcd) + --with-config-dhcp-default=internal + $(multilib_native_use_enable introspection) + $(use_enable json json-validation) + $(multilib_native_use_enable ppp) + --without-libpsl + $(multilib_native_use_with modemmanager modem-manager-1) + $(multilib_native_use_with ncurses nmtui) + $(multilib_native_use_with ofono) + $(multilib_native_use_enable ovs) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with resolvconf) + $(multilib_native_use_with selinux) + $(multilib_native_use_with systemd systemd-journal) + $(multilib_native_use_enable teamd teamdctl) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable vala) + --without-valgrind + $(multilib_native_use_with wifi iwd) + $(multilib_native_use_with wext) + $(multilib_native_use_enable wifi) + ) + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + ln -s "${S}/docs" docs || die + ln -s "${S}/man" man || die + fi + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + local targets=( + libnm/libnm.la + ) + emake "${targets[@]}" + fi +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx emake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + else + local targets=( + install-libLTLIBRARIES + install-libnmincludeHEADERS + install-nodist_libnmincludeHEADERS + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${targets[@]}" + fi +} + +multilib_src_install_all() { + einstalldocs + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi + + if use dhclient || use dhcpcd; then + ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" + ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" + ewarn "works for you, and you're happy with, the alternative USE flags can be" + ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" + ewarn "the main.dhcp configuration option to use one of them instead of internal." + fi +} diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest index 954eb9245e1d..25eb4f95ab8e 100644 --- a/net-print/hplip-plugin/Manifest +++ b/net-print/hplip-plugin/Manifest @@ -1,3 +1,4 @@ DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b +DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876 DIST hplip-3.20.6-plugin.run 11514108 BLAKE2B 83e2d26fb397c5c5df1fc4371bfc2798cea049965499b6f1ad5daa05b44b74f51ba9deb933b564dfa47a8d0ef79d4921c3a96b9531730317742e1c5651d7b012 SHA512 6f9e5c92e302f4068abbe9134cf7f8081fcbe98568c9b75d6a668843b76c83afd0f4fbb3d90d3ac775c719ab8e2dca5beedd887ef6d072bd8ee0eb48d42521ed DIST hplip-3.20.9-plugin.run 11515336 BLAKE2B 27686828374675412ae82a0a5be121c87dbd9ed3adb8d5f30e2f946e315140a5641fdbc60d7f952323060de7fb7bce77b21f19e0d07aa0c5c36e898732030b8b SHA512 bbb5c5768c0f1e88f960f9decff65d70942bc40d8f0443fa2e1c0507895e2e6ba7bc8e0fbec5a74b335787ac45bd3c34cf6bc4d5e544ce7c2ef0965e074a440a diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild new file mode 100644 index 000000000000..fa8335f3ab18 --- /dev/null +++ b/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit unpacker + +DESCRIPTION="Proprietary plugins and firmware for HPLIP" +HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins" +SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run" +LICENSE="hplip-plugin" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="orblite" + +RDEPEND=" + ~net-print/hplip-${PV} + virtual/udev + orblite? ( + media-gfx/sane-backends + >=sys-libs/glibc-2.26 + virtual/libusb:0 + ) +" +DEPEND="" + +S=${WORKDIR} + +HPLIP_HOME=/usr/share/hplip + +# Binary prebuilt package +QA_PREBUILT="${HPLIP_HOME}/*.so" + +# License does not allow us to redistribute the "source" package +RESTRICT="mirror" + +src_install() { + local hplip_arch + case "${ARCH}" in + amd64) hplip_arch="x86_64" ;; + arm) hplip_arch="arm32" ;; + x86) hplip_arch="x86_32" ;; + *) die "Unsupported architecture." ;; + esac + + insinto "${HPLIP_HOME}"/data/firmware + doins *.fw.gz + + for plugin in *-${hplip_arch}.so; do + local plugin_type=prnt + case "${plugin}" in + bb_orblite-*) + use orblite || continue + plugin_type=scan ;; + bb_*) + plugin_type=scan ;; + fax_*) + plugin_type=fax ;; + esac + + exeinto "${HPLIP_HOME}"/${plugin_type}/plugins + newexe ${plugin} ${plugin/-${hplip_arch}} + done + + insinto /var/lib/hp + newins - hplip.state <<-_EOF_ + [plugin] + installed = 1 + eula = 1 + version = ${PV} + _EOF_ +} diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild index a2b3455d9808..e41a6f640627 100644 --- a/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild +++ b/net-wireless/b43-fwcutter/b43-fwcutter-019.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="https://bues.ch/b43/fwcutter/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 x86" IUSE="" src_compile() { diff --git a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild index bc8b41e5efe7..486ae5d894e8 100644 --- a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild +++ b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 DESCRIPTION="Kismetdb database log helper library" diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild index c28916339f2a..51ec045ce9ba 100644 --- a/net-wireless/kismetdb/kismetdb-9999.ebuild +++ b/net-wireless/kismetdb/kismetdb-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit distutils-r1 DESCRIPTION="Kismetdb database log helper library" diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 3a62ea655f85..d019b1173523 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,10 +1,14 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Roy Bamford <neddyseagoon@gentoo.org< (2020-12-07) +# media-libs/liblastfm fails to build with tests Bug #758896 +media-sound/clementine lastfm + # Roy Bamford <neddyseagoon@gentoo.org< (2020-12-01) # hfs xfs fail build and/or tests on arm64 -# See bugs #757924 and #747181 respctively -sys-block/gparted hfs xfs +# See bug #747181 +sys-block/gparted xfs # Andreas Sturmlechner <asturm@gentoo.org> (2020-11-08) # dev-util/kdevelop-php is not keyworded, bug #751337 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index b82573b6b573..a4d6231ed7bc 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,6 +6,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-12-07) +# Waiting for unmasking of slotted Lua. +>=app-i18n/fcitx-4.2.9.8:4 lua +>=app-i18n/ibus-libpinyin-1.11.92 lua +app-i18n/ibus-pinyin lua + # Matt Turner <mattst88@gentoo.org> (2020-12-05) # Relies on gtkdoc-mktmpl which was removed from gtk-doc-1.26 # Bug #740690 diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index be1ec99403a2..ea79d69f1158 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask +# Brian Evans <grknight@gentoo.org> (2020-12-08) +# Allow packages to add php 8.0 support while waiting on its stable +php_targets_php8-0 + # Sergei Trofimovich <slyfox@gentoo.org> (2020-04-13) # dev-vcs/darcs (dev-lang/ghc) has no stable keywords. darcs diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc index 3496ec0d4679..e0fc8bcc6539 100644 --- a/profiles/desc/php_targets.desc +++ b/profiles/desc/php_targets.desc @@ -3,6 +3,7 @@ # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags +php8-0 - Build against PHP 8.0 php7-4 - Build against PHP 7.4 php7-3 - Build against PHP 7.3 php7-2 - Build against PHP 7.2 diff --git a/profiles/package.mask b/profiles/package.mask index ca43ca5ec749..fa0e2ba2882c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -313,24 +313,12 @@ net-news/quiterss # (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days. app-text/goldendict -# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-05) -# Does not compile against ghc-8.8: #754675, #611988 -# Masked for removal -dev-haskell/shuffle -dev-haskell/uhc-light -dev-haskell/uhc-util - # Michał Górny <mgorny@gentoo.org> (2020-11-15) # Fails to build. Lots of bugs filed. Not touched by maintainer # since 2018. # Removal in 30 days. Bug #721990. media-video/cinelerra -# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-03) -# Not compatible with ghc-8.8 or above: #754285 -# No revdeps. Masked for removal. -dev-haskell/ghc-syb-utils - # Aisha Tammy <gentoo@aisha.cc> (2020-11-13) # dead packages with latest releases before 2013 # these are superseded by other scikit packages @@ -449,19 +437,6 @@ dev-python/couchdb-python www-apps/liquid_feedback_frontend www-apps/webmcp -# Sergei Trofimovich <slyfox@gentoo.org> (2020-11-03) -# Hackage release does not build against gcc-8: -# https://github.com/Helium4Haskell/helium/issues/4 -# Masked for removal. Bugs: #751757, #736054 -dev-lang/helium -dev-haskell/lvmlib - -# Lars Wendler <polynomial-c@gentoo.org> (2020-10-30) -# Removed public macro definitions for TRUE and FALSE which breaks lots of -# revdeps. See tacker bug at https://bugs.gentoo.org/751919 -=dev-libs/icu-68.1 -=dev-libs/icu-layoutex-68.1 - # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-10-30) # broken acl handling, possible broken chattr handling # needs more testing @@ -591,6 +566,8 @@ gnome-base/orbit >=media-libs/libquvi-0.9.4-r100 >=media-libs/libquvi-scripts-0.9.20131130-r100 >=media-sound/aqualung-1.1-r100 +>=media-video/vlc-3.0.11.1-r100 +>=net-analyzer/rrdtool-1.7.2-r100 >=net-analyzer/suricata-6.0.1-r100 >=net-im/prosody-0.11.7-r100 >=net-im/swift-4.0.2-r100 @@ -686,6 +663,8 @@ dev-lang/vala:0.50 # Indefinitely masking until we have a solution # for this. # bug #719084 +# Furthermore, ntopng ebuilds depending directly on dev-lang/lua{,jit} +# must be migrated to lua eclasses before unmasking (bug #752777). net-analyzer/ntopng net-analyzer/pmacct net-libs/nDPI @@ -811,10 +790,6 @@ app-office/texmacs # matching genkernel work? >=sys-fs/lvm2-2.03 -# Robin H. Johnson <robbat2@gentoo.org> (2019-03-25) -# Requires >=dev-lang/lua-5.3 which is masked -sys-apps/likwid - # Andreas Sturmlechner <asturm@gentoo.org> (2018-11-25) # Masked per security vulnerability CVE-2018-14345, bug #661510 # Keeping it masked while users have unsolved issues with >0.15.0. diff --git a/profiles/prefix/darwin/macos/11.0/package.mask b/profiles/prefix/darwin/macos/11.0/package.unmask index b9d70a0400f2..ba281c130957 100644 --- a/profiles/prefix/darwin/macos/11.0/package.mask +++ b/profiles/prefix/darwin/macos/11.0/package.unmask @@ -5,5 +5,5 @@ # Unmask only working versions for Big Sur # They're currently masked in main tree # for testing. -->=sys-libs/readline-8.1 -->=app-shells/bash-5.1 +>=sys-libs/readline-8.1 +>=app-shells/bash-5.1 diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index c7176c9d1b8d..831cbe6cf8a8 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,11 +1,6 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Sam James <sam@gentoo.org> (2020-11-30) -# Builds but collides with libintl despite existing patch -# Temporary mask until investigated -=sys-devel/gettext-0.21 - # Fabian Groffen <grobian@gentoo.org> (2020-11-23) # no symbols from libopenbsd-compat =net-misc/openssh-8.3_p1-r5 diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest index 89bb054ab20e..db15b30feded 100644 --- a/sec-policy/apparmor-profiles/Manifest +++ b/sec-policy/apparmor-profiles/Manifest @@ -1,2 +1,3 @@ DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 +DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild new file mode 100644 index 000000000000..2231d39bbf24 --- /dev/null +++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="A collection of profiles for the AppArmor application security system" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="minimal" + +RESTRICT="test" + +S=${WORKDIR}/apparmor-${PV}/profiles + +src_install() { + if use minimal ; then + insinto /etc/apparmor.d + doins -r apparmor.d/{abi,abstractions,tunables} + else + default + fi +} diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild index b076054a04a2..ee0ad246b94f 100644 --- a/sys-apps/ack/ack-3.4.0.ebuild +++ b/sys-apps/ack/ack-3.4.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest index 89bb054ab20e..db15b30feded 100644 --- a/sys-apps/apparmor-utils/Manifest +++ b/sys-apps/apparmor-utils/Manifest @@ -1,2 +1,3 @@ DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 +DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild new file mode 100644 index 000000000000..7204e752028c --- /dev/null +++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +inherit eapi7-ver perl-module python-r1 toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Additional userspace utils to assist with AppArmor profile management" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="test" + +COMMON_DEPEND=" + dev-lang/perl + ~sys-libs/libapparmor-${PV} + ${PYTHON_DEPS}" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + ~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}] + ~sys-apps/apparmor-${PV} + dev-perl/Locale-gettext + dev-perl/RPC-XML + dev-perl/TermReadKey + dev-python/notify2[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long" + +S=${WORKDIR}/apparmor-${PV} + +src_prepare() { + default + + sed -i binutils/Makefile \ + -e 's/Bstatic/Bdynamic/g' || die + + sed -i utils/aa-remove-unknown \ + -e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die +} + +src_compile() { + python_setup + + pushd utils > /dev/null || die + # launches non-make subprocesses causing "make jobserver unavailable" + # error messages to appear in generated code + emake -j1 + popd > /dev/null || die + + pushd binutils > /dev/null || die + export EXTRA_CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" USE_SYSTEM=1 + popd > /dev/null || die +} + +src_install() { + pushd utils > /dev/null || die + perl_set_version + emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \ + VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install + + install_python() { + local -x PYTHONDONTWRITEBYTECODE= + "${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \ + --root="${D}" --optimize 2 + } + + python_foreach_impl install_python + python_replicate_script "${D}"/usr/bin/aa-easyprof \ + "${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined} + popd > /dev/null || die + + pushd binutils > /dev/null || die + emake install DESTDIR="${D}" USE_SYSTEM=1 + popd > /dev/null || die +} diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index 89bb054ab20e..db15b30feded 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,2 +1,3 @@ DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 +DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild new file mode 100644 index 000000000000..c857b1c46fa1 --- /dev/null +++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +RESTRICT="test" # bug 675854 + +RDEPEND="~sys-libs/libapparmor-${PV}" +DEPEND="${RDEPEND} + dev-lang/perl + sys-devel/bison + sys-devel/gettext + sys-devel/flex + doc? ( dev-tex/latex2html ) +" + +S=${WORKDIR}/apparmor-${PV}/parser + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-makefile.patch" + "${FILESDIR}/${PN}-2.11.1-dynamic-link.patch" +) + +src_prepare() { + default + + # remove warning about missing file that controls features + # we don't currently support + sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die + + # bug 634782 + sed -e "s/cpp/$(tc-getCPP) -/" \ + -i ../common/list_capabilities.sh \ + -i ../common/list_af_names.sh || die +} + +src_compile() { + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + CPP="$(tc-getCPP) -" \ + CXX="$(tc-getCXX)" \ + USE_SYSTEM=1 \ + arch manpages + use doc && emake pdf +} + +src_test() { + emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check +} + +src_install() { + emake \ + CPP="$(tc-getCPP) -" \ + DESTDIR="${D}" \ + DISTRO="unknown" \ + USE_SYSTEM=1 \ + install + + dodir /etc/apparmor.d/disable + + newinitd "${FILESDIR}/${PN}-init-1" ${PN} + systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service + + use doc && dodoc techdoc.pdf + + exeinto /usr/share/apparmor + doexe "${FILESDIR}/apparmor_load.sh" + doexe "${FILESDIR}/apparmor_unload.sh" +} diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest index af941fe105ea..3dd11da5b305 100644 --- a/sys-apps/hwids/Manifest +++ b/sys-apps/hwids/Manifest @@ -1,3 +1,4 @@ DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc +DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2 diff --git a/sys-apps/hwids/hwids-20200813.1.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild index c964e6ebfa16..13c9146d0919 100644 --- a/sys-apps/hwids/hwids-20200813.1.ebuild +++ b/sys-apps/hwids/hwids-20200813.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then EGIT_REPO_URI="https://github.com/gentoo/hwids.git" else SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" fi LICENSE="|| ( GPL-2 BSD ) public-domain" diff --git a/sys-apps/hwids/hwids-20201207.ebuild b/sys-apps/hwids/hwids-20201207.ebuild new file mode 100644 index 000000000000..fdc4a456ddd5 --- /dev/null +++ b/sys-apps/hwids/hwids-20201207.ebuild @@ -0,0 +1,89 @@ +# Copyright 2012-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit udev + +DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" +HOMEPAGE="https://github.com/gentoo/hwids" +if [[ ${PV} == 99999999 ]]; then + PYTHON_COMPAT=( python3_{6..9} ) + inherit git-r3 python-any-r1 + EGIT_REPO_URI="https://github.com/gentoo/hwids.git" +else + SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="|| ( GPL-2 BSD ) public-domain" +SLOT="0" +IUSE="+net +pci +udev +usb" + +RDEPEND=" + udev? ( virtual/udev ) +" + +if [[ ${PV} == 99999999 ]]; then + BDEPEND=" + net-misc/curl + udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') ) + " + python_check_deps() { + if use udev; then + has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" + fi + } +else + S=${WORKDIR}/hwids-${P} +fi + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == 99999999 ]]; then + git-r3_src_unpack + cd "${S}" || die + emake fetch + else + default + fi +} + +src_prepare() { + default + sed -i -e '/udevadm hwdb/d' Makefile || die +} + +_emake() { + emake \ + NET=$(usex net) \ + PCI=$(usex pci) \ + UDEV=$(usex udev) \ + USB=$(usex usb) \ + "$@" +} + +src_compile() { + if [[ ${PV} == 99999999 ]] && use udev; then + python_setup + _emake udev-hwdb + fi + _emake +} + +src_install() { + _emake install \ + DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + MISCDIR="${EPREFIX}/usr/share/misc" \ + HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \ + DESTDIR="${D}" +} + +pkg_postinst() { + if use udev; then + udevadm hwdb --update --root="${ROOT}" + fi +} diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest index 22f882da9434..16c593487b67 100644 --- a/sys-apps/likwid/Manifest +++ b/sys-apps/likwid/Manifest @@ -1,2 +1 @@ -DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2 diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild deleted file mode 100644 index 02a836a19c6d..000000000000 --- a/sys-apps/likwid/likwid-4.3.3.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -FORTRAN_NEEDED=fortran -#PYTHON_COMPAT=( python3_{6,7} ) - -# 4.3.4 will need python-single-r1 -inherit fcaps fortran-2 linux-info toolchain-funcs - -DESCRIPTION="A performance-oriented tool suite for x86 multicore environments" -HOMEPAGE="https://github.com/rrze-likwid/likwid" -SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz" - -# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be -# added to the LICENSE field. -LICENSE="GPL-3+ BSD" - -SLOT="0" -KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64 -IUSE="fortran" # ${PYTHON_REQUIRED_USE} - -# lua: -# likwid's primary functionality is driven by a set of lua scripts installed in -# /usr/bin/ -# likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or -# lua-5.3, which we use. This ebuild uses the system copy of Lua instead. -# -# hwloc: -# likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration -# for CPU probing & access -# -# Perl: -# likwid uses Perl to convert from an internal text format to ASM listings -# likwid also uses perl for some installed helper scripts -# The build system bundles some Perl modules, that are not removed at this time: -# Parse-RecDescent -# Template -# -# Python: -# Python3 is used for one helper script, filter/json, added after 4.3.3 -CDEPEND="dev-lang/perl - dev-lang/lua:5.3" - -# filter/json uses Python3 -RDEPEND="${CDEPEND}" - #${PYTHON_DEPS}" - -# Part of the build process depends on Data::Dumper -# perl-core/Data-Dumper" -DEPEND="${CDEPEND}" - -CONFIG_CHECK="~X86_MSR" - -FILECAPS=( - -M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD - -- - -M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq -) - -PATCHES=( - "${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch" - # Old patches are obsolete: - #"${FILESDIR}/${PN}-4.3.1-Makefile.patch" - #"${FILESDIR}/${PN}-4.3.1-config.mk.patch" -) - -pkg_setup() { - fortran-2_pkg_setup - #python-single-r1_pkg_setup -} - -src_prepare() { - # Ensure we build with a non executable stack - sed \ - -e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \ - -i make/include_{GCC*,CLANG}.mk \ - || die "Failed to set nonexecstack" - - # Make the install targets respect Q= for being quiet or not - # MUCH easier for debugging - sed -r \ - -e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \ - -i \ - Makefile || die "Failed to sed Makefile" - - sed -i \ - -e '/^\.NOTPARALLEL:/d' \ - Makefile \ - bench/Makefile \ - ext/hwloc/Makefile || die "Failed to re-enable parallel" - - default -} - -export_emake_opts() { - # Warning: this build system uses PREFIX in a way that differs from - # autoconf! It's more like: - # PREFIX=$(DESTDIR)$(INSTALLED_PREFIX) - # it's not 100% like that, because parts of the Makefiles are inconsistent. - # this is the same solution used in the upstream RPM specs - # these variables are uppercase so they match what's put into Make. - local INSTALLED_PREFIX=/usr - local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib' - local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable. - # TODO: support LUA_SINGLE_TARGET here later for Lua 5.2 - local LUASLOT='5.3' - # If the build is too loud, pass 'Q=@' - src_compile_opts=( - "Q=" - "INSTALLED_PREFIX=${INSTALLED_PREFIX}" - "INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}" - "INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}" - "PREFIX=${INSTALLED_PREFIX}" - "LIBPREFIX=${INSTALLED_LIBPREFIX}" - "MANPREFIX=${INSTALLED_MANPREFIX}" - "CC=$(tc-getCC)" - "ANSI_CFLAGS=${CFLAGS}" - "INSTRUMENT_BENCH=true" - "LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}" - "LUA_LIB_DIR=/usr/$(get_libdir)" - "LUA_LIB_NAME=lua${LUASLOT}" - "LUA_BIN=/usr/bin" - "FORTRAN_INTERFACE=$(usex fortran likwid.mod false)" - "FC=$(usex fortran "${FC}" false)" - "FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly - ) - src_install_opts=( - "PREFIX=${D}${INSTALLED_PREFIX}" - "LIBPREFIX=${D}${INSTALLED_LIBPREFIX}" - "MANPREFIX=${D}${INSTALLED_MANPREFIX}" - ) -} - -src_compile() { - export_emake_opts - emake \ - "${src_compile_opts[@]}" -} - -src_install() { - export_emake_opts - emake \ - "${src_compile_opts[@]}" \ - "${src_install_opts[@]}" \ - DESTDIR="${D}" \ - install - - use fortran && doheader likwid.mod - - # Fix Python filter added shortly after 4.3.3 - #python_fix_shebang "${D}"/usr/share/likwid/filter/ - - # Do NOT use 'doman'! The upstream 'make install' target does a sed as it's - # generating the final manpage to the real install dir; and the copies in - # ${S} are unmodified. - dodoc README.md CHANGELOG doc/logo.png - dodoc doc/*.txt - dodoc doc/*.md - dodoc -r doc/applications doc/archs - # Fix upstream partial doc install - rm -rf "${D}"/usr/share/likwid/docs || die - ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die -} - -pkg_preinst() { - # This is now a symlink, but used to be a plain directory - OLDDOCDIR=/usr/share/likwid/docs - if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then - einfo "Cleaning up old docdir at ${OLDDOCDIR}" - rm -rf "${OLDDOCDIR}" || die - fi -} - -pkg_postinst() { - fcaps_pkg_postinst - einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!" - einfo - ewarn "To enable users to access performance counters it is necessary to" - ewarn "change the access permissions to /dev/cpu/msr[0]* devices." - ewarn "It can be accomplished by adding the following line to file" - ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\"" - ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660" -} diff --git a/sys-auth/AusweisApp2/metadata.xml b/sys-auth/AusweisApp2/metadata.xml index 3139b2058361..ef8b97cce62b 100644 --- a/sys-auth/AusweisApp2/metadata.xml +++ b/sys-auth/AusweisApp2/metadata.xml @@ -2,14 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gentoo@pogatzki.net</email> - <name>Volkmar W. Pogatzki</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <maintainer type="person"> <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index fb24d90ec0a2..4ef1b661c341 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,6 +1,6 @@ DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755 -DIST cinder-17.0.0.tar.gz 5759659 BLAKE2B f8a2e6647e38185b962311087f06364108db4a80def2eef909e837d37adfe539f0794cc9d9b95aee88da9aeeb5a6a0fe019fc37bafb8e4ceed8dbdfaa2a7c27b SHA512 cd7b74e5da1e696bd72e8e37f2bbff7c7fe4012aa5eaae4ccc51ddfc743ac68cc9fae885063c75d199a48978e4f479cc55813f489787a84914d98521a42d7fd4 +DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626 -DIST cinder.conf.sample-17.0.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517 +DIST cinder.conf.sample-17.0.1 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517 diff --git a/sys-cluster/cinder/cinder-17.0.0.ebuild b/sys-cluster/cinder/cinder-17.0.1.ebuild index db06b542b144..db06b542b144 100644 --- a/sys-cluster/cinder/cinder-17.0.0.ebuild +++ b/sys-cluster/cinder/cinder-17.0.1.ebuild diff --git a/sys-devel/gettext/gettext-0.21.ebuild b/sys-devel/gettext/gettext-0.21.ebuild index 69f65e5140a1..ab4ea5395c5a 100644 --- a/sys-devel/gettext/gettext-0.21.ebuild +++ b/sys-devel/gettext/gettext-0.21.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == *_rc* ]] ; then S="${WORKDIR}/${P/_/-}" else SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi # Only libasprintf is under the LGPL (and libintl is in a sep package), # so put that license behind USE=cxx. diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild index a256b4cf53bb..e7c4514e2b30 100644 --- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild +++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2" LICENSE="Broadcom" SLOT="b43" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ~arm64 ppc x86" IUSE="" RESTRICT="binchecks strip bindist" diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild index 722b317a2d7c..3fe0634bc4f6 100644 --- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild +++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}. mirror://gentoo/diskdev_cmds-${PV}.patch.bz2" LICENSE="APSL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" IUSE="libressl" DEPEND=" !libressl? ( dev-libs/openssl:0= ) diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest new file mode 100644 index 000000000000..48e9c499b71c --- /dev/null +++ b/sys-kernel/raspberrypi-sources/Manifest @@ -0,0 +1 @@ +DIST raspberrypi-kernel_1.20201201-1.tar.gz 175159649 BLAKE2B 6d7f4aed5696a2640ef591438b624434efa55af96216d7bf79888486a840171d8cd64548050c10890f1e636e8b42a7c97da0562ca36e44c07c2d24325942d374 SHA512 a8427e209a639b35088f32c4efa13ebd2d0efad7ad6f8ab40fbebec3c857d1acc4947aa0ea42e1edc1f8fd687b1bf8170764c811c0c876e92f0d66c269c91489 diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild new file mode 100644 index 000000000000..de796c6696ac --- /dev/null +++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +ETYPE=sources +K_DEFCONFIG="bcmrpi_defconfig" +K_SECURITY_UNSUPPORTED=1 +EXTRAVERSION="-${PN}/-*" + +inherit kernel-2 eapi7-ver +detect_version +detect_arch + +MY_PV=$(ver_cut 4-) +MY_PV=${MY_PV/p/} +DESCRIPTION="Raspberry Pi kernel sources" +HOMEPAGE="https://github.com/raspberrypi/linux" +SRC_URI="https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.${MY_PV}-1.tar.gz" +S="${WORKDIR}/linux-raspberrypi-kernel_1.${MY_PV}-1" + +KEYWORDS="~arm ~arm64" + +src_unpack() { + default +} diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 0131d63d77c1..9ee95ce4633c 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -12,6 +12,7 @@ DIST glibc-2.31-patches-8.tar.xz 60868 BLAKE2B c641a77cab0b3e5379a6911a548483266 DIST glibc-2.31-patches-9.tar.xz 74712 BLAKE2B 62991b67de4def4cca944e8420d2f0139f88b6754c6bc81072bb321c574c1db22641857345325848e1dfb551c10758f582e4425e687a7921cdbd4e7e7923a047 SHA512 699d898e3a8ed02b04573c675f572076e8f747767bfc577a033a49cd7d9078a7a60ac325acd4bd419a93b56edf90ce067baa7578ab315e27885f1f0e13916354 DIST glibc-2.31.tar.xz 16676764 BLAKE2B 91df1792345f157265eae405185a81fd4b8ce36d4c2388f44b0d5b1ae38174ea374cbc909cd260770b9f38ea58051da13766d4fa22abf41c2d4a2493257b179b SHA512 735e4c0ef10418b6ea945ad3906585e5bbd8b282d76f2131309dce4cec6b15066a5e4a3731773ce428a819b542579c9957867bb0abf05ed2030983fca4412306 DIST glibc-2.32-patches-2.tar.xz 8588 BLAKE2B 57a85241e3270d14df0332b039a933c5a7ee4d089684d85cca564eeec2d6796735de60b628c5746858757342922d58993d6cf7187ce1d7102b2299ca2cf8513f SHA512 45bbab9e2f813f55cb4a1438dcd9365170b8facff50b11648ba6022da06c20029bb65a4b06fd906af82aa7461b7374f85105fd7eedb7915cec3f1df3779b68a3 +DIST glibc-2.32-patches-4.tar.xz 49884 BLAKE2B e7f364123d9c7b6be5f769a5be0c71afe345972d123d44797cb427667faf6c2bb27bb979a6dc949ec7cc522ccccfdaed730c44dd48251375be24f9c96dbd2aca SHA512 41548299b083e60dc3df4bad7135eba09e1f4d83ab94cf1ff0240198261338c87a228f53179bf639d04190710e2913679fa2c682fd5d3e31a1250f91e31b1683 DIST glibc-2.32.tar.xz 16744512 BLAKE2B a56b4afbb35315c5cd6dca0f62e44455dceae3e6e88a8453621f9a5394a60ddf10ca9309b2db0911830c7fd77e3faa5d94694eb94d5b2c05fc5285cef52255da SHA512 8460c155b7003e04f18dabece4ed9ad77445fa2288a7dc08e80a8fc4c418828af29e0649951bd71a54ea2ad2d4da7570aafd9bdfe4a37e9951b772b442afe50b DIST locale-gen-2.00.tar.gz 7738 BLAKE2B cde6de5ba3400aea24d0d5f1b79471f89f09fb747c8e371e38316c7ada92f967e0865f573f23cb353d82419c234724143c0aeca9eb70eb945dfc581cc7491eb1 SHA512 b609fddb9ec5e567c008841fef3390eddb5d6e7699a8271b3b8c0ade1b44b0ac2e5d1daa8b9acabf3432e3b88110b538a96f209b1ad0f9e988b7efce66606dff DIST locale-gen-2.10.tar.gz 7747 BLAKE2B 49f569c5ae5260fca128503bc6f22d6f6f1cda817920c41fdadadf1527bbb4f3eb161f79fa729830666a4673e9092f99f4685ec8fcac8ddea0b8242bca9c1f4f SHA512 e350e60d458d67638e3090711fca05af6fafac06c51b97648244549f8a0621dab7543f09dc7ad4c62392f13bdae8e5875dc6d0b6c3d83efc29d116bc2eef92db diff --git a/sys-libs/glibc/glibc-2.32-r5.ebuild b/sys-libs/glibc/glibc-2.32-r5.ebuild new file mode 100644 index 000000000000..b1f87e7e5dd9 --- /dev/null +++ b/sys-libs/glibc/glibc-2.32-r5.ebuild @@ -0,0 +1,1514 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \ + multilib systemd multiprocessing + +DESCRIPTION="GNU libc C library" +HOMEPAGE="https://www.gnu.org/software/libc/" +LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" +SLOT="2.2" + +EMULTILIB_PKG="true" + +# Gentoo patchset (ignored for live ebuilds) +PATCH_VER=4 +PATCH_DEV=slyfox + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 +else + #Drop keywords for initial testing + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="mirror://gnu/glibc/${P}.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz" + SRC_URI+=" riscv? ( https://dev.gentoo.org/~dilfridge/distfiles/backport-rv32.txz )" +fi + +RELEASE_VER=${PV} + +GCC_BOOTSTRAP_VER=20180511 + +LOCALE_GEN_VER=2.10 + +SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz" +SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )" + +IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs static-pie suid systemtap test vanilla" + +# Minimum kernel version that glibc requires +MIN_KERN_VER="3.2.0" + +# Here's how the cross-compile logic breaks down ... +# CTARGET - machine that will target the binaries +# CHOST - machine that will host the binaries +# CBUILD - machine that will build the binaries +# If CTARGET != CHOST, it means you want a libc for cross-compiling. +# If CHOST != CBUILD, it means you want to cross-compile the libc. +# CBUILD = CHOST = CTARGET - native build/install +# CBUILD != (CHOST = CTARGET) - cross-compile a native build +# (CBUILD = CHOST) != CTARGET - libc for cross-compiler +# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler +# For install paths: +# CHOST = CTARGET - install into / +# CHOST != CTARGET - install into /usr/CTARGET/ +# +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +# Note [Disable automatic stripping] +# Disabling automatic stripping for a few reasons: +# - portage's attempt to strip breaks non-native binaries at least on +# arm: bug #697428 +# - portage's attempt to strip libpthread.so.0 breaks gdb thread +# enumeration: bug #697910. This is quite subtle: +# * gdb uses glibc's libthread_db-1.0.so to enumerate threads. +# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols +# via 'ps_pglobal_lookup' symbol defined in gdb. +# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all +# known symbols in 'libpthread.so.0'. Specifically 'nptl_version' +# (unexported) is used to sanity check compatibility before enabling +# debugging. +# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint +# * normal 'strip' command trims '.symtab' +# Thus our main goal here is to prevent 'libpthread.so.0' from +# losing it's '.symtab' entries. +# As Gentoo's strip does not allow us to pass less aggressive stripping +# options and does not check the machine target we strip selectively. + +# We need a new-enough binutils/gcc to match upstream baseline. +# Also we need to make sure our binutils/gcc supports TLS, +# and that gcc already contains the hardened patches. +# Lastly, let's avoid some openssh nastiness, bug 708224, as +# convenience to our users. + +# gzip, grep, awk are needed by locale-gen, bug 740750 + +BDEPEND=" + ${PYTHON_DEPS} + >=app-misc/pax-utils-0.1.10 + sys-devel/bison + doc? ( sys-apps/texinfo ) + !compile-locales? ( + app-arch/gzip + sys-apps/grep + virtual/awk + ) +" +COMMON_DEPEND=" + gd? ( media-libs/gd:2= ) + nscd? ( selinux? ( + audit? ( sys-process/audit ) + caps? ( sys-libs/libcap ) + ) ) + suid? ( caps? ( sys-libs/libcap ) ) + selinux? ( sys-libs/libselinux ) + systemtap? ( dev-util/systemtap ) + !<net-misc/openssh-8.1_p1-r2 +" +DEPEND="${COMMON_DEPEND} + compile-locales? ( + app-arch/gzip + sys-apps/grep + virtual/awk + ) + test? ( >=net-dns/libidn2-2.3.0 ) +" +RDEPEND="${COMMON_DEPEND} + app-arch/gzip + sys-apps/grep + virtual/awk + sys-apps/gentoo-functions +" + +RESTRICT="!test? ( test )" + +if [[ ${CATEGORY} == cross-* ]] ; then + BDEPEND+=" !headers-only? ( + >=${CATEGORY}/binutils-2.24 + >=${CATEGORY}/gcc-6 + )" + [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" +else + BDEPEND+=" + >=sys-devel/binutils-2.24 + >=sys-devel/gcc-6 + " + DEPEND+=" virtual/os-headers " + RDEPEND+=" + >=net-dns/libidn2-2.3.0 + vanilla? ( !sys-libs/timezone-data ) + " + PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" +fi + +# Ignore tests whitelisted below +GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}" + +# The following tests fail due to the Gentoo build system and are thus +# executed but ignored: +XFAIL_TEST_LIST=( + # 9) Failures of unknown origin + tst-latepthread + + # buggy test, assumes /dev/ and /dev/null on a single filesystem + # 'mount --bind /dev/null /chroot/dev/null' breaks it. + # https://sourceware.org/PR25909 + tst-support_descriptors + + # Flaky test, known to fail occasionally: + # https://sourceware.org/PR19329 + # https://bugs.gentoo.org/719674#c12 + tst-stack4 +) + +# +# Small helper functions +# + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +just_headers() { + is_crosscompile && use headers-only +} + +alt_prefix() { + is_crosscompile && echo /usr/${CTARGET} +} + +# This prefix is applicable to CHOST when building against this +# glibc. It is baked into the library at configure time. +host_eprefix() { + is_crosscompile || echo "${EPREFIX}" +} + +# This prefix is applicable to CBUILD when building against this +# glibc. It determines the destination path at install time. +build_eprefix() { + is_crosscompile && echo "${EPREFIX}" +} + +# We need to be able to set alternative headers for compiling for non-native +# platform. Will also become useful for testing kernel-headers without screwing +# up the whole system. +alt_headers() { + echo ${ALT_HEADERS:=$(alt_prefix)/usr/include} +} + +alt_build_headers() { + if [[ -z ${ALT_BUILD_HEADERS} ]] ; then + ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)" + if tc-is-cross-compiler ; then + ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers) + if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then + local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h') + ALT_BUILD_HEADERS=${header_path%/linux/version.h} + fi + fi + fi + echo "${ALT_BUILD_HEADERS}" +} + +alt_libdir() { + echo $(alt_prefix)/$(get_libdir) +} +alt_usrlibdir() { + echo $(alt_prefix)/usr/$(get_libdir) +} + +builddir() { + echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1" +} + +do_compile_test() { + local ret save_cflags=${CFLAGS} + CFLAGS+=" $1" + shift + + pushd "${T}" >/dev/null + + rm -f glibc-test* + printf '%b' "$*" > glibc-test.c + + # Most of the time CC is already set, but not in early sanity checks. + nonfatal emake glibc-test CC="${CC-$(tc-getCC ${CTARGET})}" + ret=$? + + popd >/dev/null + + CFLAGS=${save_cflags} + return ${ret} +} + +do_run_test() { + local ret + + if [[ ${MERGE_TYPE} == "binary" ]] ; then + # ignore build failures when installing a binary package #324685 + do_compile_test "" "$@" 2>/dev/null || return 0 + else + if ! do_compile_test "" "$@" ; then + ewarn "Simple build failed ... assuming this is desired #324685" + return 0 + fi + fi + + pushd "${T}" >/dev/null + + ./glibc-test + ret=$? + rm -f glibc-test* + + popd >/dev/null + + return ${ret} +} + +setup_target_flags() { + # This largely mucks with compiler flags. None of which should matter + # when building up just the headers. + just_headers && return 0 + + case $(tc-arch) in + x86) + # -march needed for #185404 #199334 + # TODO: When creating the first glibc cross-compile, this test will + # always fail as it does a full link which in turn requires glibc. + # Probably also applies when changing multilib profile settings (e.g. + # enabling x86 when the profile was amd64-only previously). + # We could change main to _start and pass -nostdlib here so that we + # only test the gcc code compilation. Or we could do a compile and + # then look for the symbol via scanelf. + if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + filter-flags '-march=*' + export CFLAGS="-march=${t} ${CFLAGS}" + einfo "Auto adding -march=${t} to CFLAGS #185404" + fi + ;; + amd64) + # -march needed for #185404 #199334 + # TODO: See cross-compile issues listed above for x86. + [[ ${ABI} == x86 ]] && + if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then + local t=${CTARGET_OPT:-${CTARGET}} + t=${t%%-*} + # Normally the target is x86_64-xxx, so turn that into the -march that + # gcc actually accepts. #528708 + [[ ${t} == "x86_64" ]] && t="x86-64" + filter-flags '-march=*' + # ugly, ugly, ugly. ugly. + CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") + export CFLAGS_x86="${CFLAGS_x86} -march=${t}" + einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" + fi + ;; + mips) + # The mips abi cannot support the GNU style hashes. #233233 + filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both + ;; + ppc|ppc64) + # Many arch-specific implementations do not work on ppc with + # cache-block not equal to 128 bytes. This breaks memset: + # https://sourceware.org/PR26522 + # https://bugs.gentoo.org/737996 + # Use default -mcpu=. For ppc it means non-multiarch setup. + filter-flags '-mcpu=*' + ;; + sparc) + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + filter-flags "-fcall-used-g7" + append-flags "-fcall-used-g6" + + local cpu + case ${CTARGET} in + sparc64-*) + cpu="sparc64" + case $(get-flag mcpu) in + v9) + # We need to force at least v9a because the base build doesn't + # work with just v9. + # https://sourceware.org/bugzilla/show_bug.cgi?id=19477 + append-flags "-Wa,-xarch=v9a" + ;; + esac + ;; + sparc-*) + case $(get-flag mcpu) in + v8|supersparc|hypersparc|leon|leon3) + cpu="sparcv8" + ;; + *) + cpu="sparcv9" + ;; + esac + ;; + esac + [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}" + ;; + esac +} + +setup_flags() { + # Make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi + + # Store our CFLAGS because it's changed depending on which CTARGET + # we are building when pulling glibc on a multilib profile + CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} + CFLAGS=${CFLAGS_BASE} + CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} + CXXFLAGS=${CXXFLAGS_BASE} + ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} + ASFLAGS=${ASFLAGS_BASE} + + # Allow users to explicitly avoid flag sanitization via + # USE=custom-cflags. + if ! use custom-cflags; then + # Over-zealous CFLAGS can often cause problems. What may work for one + # person may not work for another. To avoid a large influx of bugs + # relating to failed builds, we strip most CFLAGS out to ensure as few + # problems as possible. + strip-flags + # Lock glibc at -O2; we want to be conservative here. + filter-flags '-O?' + append-flags -O2 + fi + strip-unsupported-flags + filter-flags -m32 -m64 '-mabi=*' + + # glibc aborts if rpath is set by LDFLAGS + filter-ldflags '-Wl,-rpath=*' + + # #492892 + filter-flags -frecord-gcc-switches + + unset CBUILD_OPT CTARGET_OPT + if use multilib ; then + CTARGET_OPT=$(get_abi_CTARGET) + [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) + fi + + setup_target_flags + + if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then + CBUILD_OPT=${CTARGET_OPT} + fi + + # glibc's headers disallow -O0 and fail at build time: + # include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization" + replace-flags -O0 -O1 + + filter-flags '-fstack-protector*' +} + +want_tls() { + # Archs that can use TLS (Thread Local Storage) + case $(tc-arch) in + x86) + # requires i486 or better #106556 + [[ ${CTARGET} == i[4567]86* ]] && return 0 + return 1 + ;; + esac + return 0 +} + +want__thread() { + want_tls || return 1 + + # For some reason --with-tls --with__thread is causing segfaults on sparc32. + [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 + + [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} + + # only test gcc -- can't test linking yet + tc-has-tls -c ${CTARGET} + WANT__THREAD=$? + + return ${WANT__THREAD} +} + +use_multiarch() { + # Allow user to disable runtime arch detection in multilib. + use multiarch || return 1 + # Make sure binutils is new enough to support indirect functions, + # #336792. This funky sed supports gold and bfd linkers. + local bver nver + bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') + case $(tc-arch ${CTARGET}) in + amd64|x86) nver="2.20" ;; + arm) nver="2.22" ;; + hppa) nver="2.23" ;; + ppc|ppc64) nver="2.20" ;; + # ifunc support was added in 2.23, but glibc also needs + # machinemode which is in 2.24. + s390) nver="2.24" ;; + sparc) nver="2.21" ;; + *) return 1 ;; + esac + ver_test ${bver} -ge ${nver} +} + +# Setup toolchain variables that had historically been defined in the +# profiles for these archs. +setup_env() { + # silly users + unset LD_RUN_PATH + unset LD_ASSUME_KERNEL + + if is_crosscompile || tc-is-cross-compiler ; then + multilib_env ${CTARGET_OPT:-${CTARGET}} + + if ! use multilib ; then + MULTILIB_ABIS=${DEFAULT_ABI} + else + MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} + fi + + # If the user has CFLAGS_<CTARGET> in their make.conf, use that, + # and fall back on CFLAGS. + local VAR=CFLAGS_${CTARGET//[-.]/_} + CFLAGS=${!VAR-${CFLAGS}} + einfo " $(printf '%15s' 'Manual CFLAGS:') ${CFLAGS}" + fi + + setup_flags + + export ABI=${ABI:-${DEFAULT_ABI:-default}} + + if just_headers ; then + # Avoid mixing host's CC and target's CFLAGS_${ABI}: + # At this bootstrap stage we have only binutils for + # target but not compiler yet. + einfo "Skip CC ABI injection. We can't use (cross-)compiler yet." + return 0 + fi + local VAR=CFLAGS_${ABI} + # We need to export CFLAGS with abi information in them because glibc's + # configure script checks CFLAGS for some targets (like mips). Keep + # around the original clean value to avoid appending multiple ABIs on + # top of each other. + : ${__GLIBC_CC:=$(tc-getCC ${CTARGET})} + export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" +} + +foreach_abi() { + setup_env + + local ret=0 + local abilist="" + if use multilib ; then + abilist=$(get_install_abis) + else + abilist=${DEFAULT_ABI} + fi + local -x ABI + for ABI in ${abilist:-default} ; do + setup_env + einfo "Running $1 for ABI ${ABI}" + $1 + : $(( ret |= $? )) + done + return ${ret} +} + +glibc_banner() { + local b="Gentoo ${PVR}" + [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}" + echo "${b}" +} + +# The following Kernel version handling functions are mostly copied from portage +# source. It's better not to use linux-info.eclass here since a) it adds too +# much magic, see bug 326693 for some of the arguments, and b) some of the +# functions are just not provided. + +g_get_running_KV() { + uname -r + return $? +} + +g_KV_major() { + [[ -z $1 ]] && return 1 + local KV=$@ + echo "${KV%%.*}" +} + +g_KV_minor() { + [[ -z $1 ]] && return 1 + local KV=$@ + KV=${KV#*.} + echo "${KV%%.*}" +} + +g_KV_micro() { + [[ -z $1 ]] && return 1 + local KV=$@ + KV=${KV#*.*.} + echo "${KV%%[^[:digit:]]*}" +} + +g_KV_to_int() { + [[ -z $1 ]] && return 1 + local KV_MAJOR=$(g_KV_major "$1") + local KV_MINOR=$(g_KV_minor "$1") + local KV_MICRO=$(g_KV_micro "$1") + local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO )) + + # We make version 2.2.0 the minimum version we will handle as + # a sanity check ... if its less, we fail ... + if [[ ${KV_int} -ge 131584 ]] ; then + echo "${KV_int}" + return 0 + fi + return 1 +} + +g_int_to_KV() { + local version=$1 major minor micro + major=$((version / 65536)) + minor=$(((version % 65536) / 256)) + micro=$((version % 256)) + echo ${major}.${minor}.${micro} +} + +eend_KV() { + [[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]] + eend $? +} + +get_kheader_version() { + printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \ + $(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \ + tail -n 1 +} + +# We collect all sanity checks here. Consistency is not guranteed between +# pkg_ and src_ phases, so we call this function both in pkg_pretend and in +# src_unpack. +sanity_prechecks() { + # Prevent native builds from downgrading + if [[ ${MERGE_TYPE} != "buildonly" ]] && \ + [[ -z ${ROOT} ]] && \ + [[ ${CBUILD} == ${CHOST} ]] && \ + [[ ${CHOST} == ${CTARGET} ]] ; then + + # The high rev # is to allow people to downgrade between -r# + # versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2 + # should be fine. Hopefully we never actually use a r# this + # high. + if has_version ">${CATEGORY}/${P}-r10000" ; then + eerror "Sanity check to keep you from breaking your system:" + eerror " Downgrading glibc is not supported and a sure way to destruction." + [[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system." + fi + + if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then + eerror "Your old kernel is broken. You need to update it to a newer" + eerror "version as syscall(<bignum>) will break. See bug 279260." + die "Old and broken kernel." + fi + fi + + # Users have had a chance to phase themselves, time to give em the boot + if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then + eerror "You still haven't deleted ${EROOT}/etc/locales.build." + eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher." + die "Lazy upgrader detected" + fi + + if [[ ${CTARGET} == i386-* ]] ; then + eerror "i386 CHOSTs are no longer supported." + eerror "Chances are you don't actually want/need i386." + eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml" + die "Please fix your CHOST" + fi + + if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then + ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." + ewarn "This will result in a 50% performance penalty when running with a 32bit" + ewarn "hypervisor, which is probably not what you want." + fi + + # Check for sanity of /etc/nsswitch.conf + if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then + local entry + for entry in passwd group shadow; do + if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then + eerror "Your ${EROOT}/etc/nsswitch.conf is out of date." + eerror "Please make sure you have 'files' entries for" + eerror "'passwd:', 'group:' and 'shadow:' databases." + eerror "For more details see:" + eerror " https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26" + die "nsswitch.conf has no 'files' provider in '${entry}'." + fi + done + fi + + # ABI-specific checks follow here. Hey, we have a lot more specific conditions that + # we test for... + if ! is_crosscompile ; then + if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then + ebegin "Checking that IA32 emulation is enabled in the running kernel" + echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" + local STAT + if "${CC-${CHOST}-gcc}" ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then + "${T}/check-ia32-emulation.elf32" + STAT=$? + else + # Don't fail here to allow single->multi ABI switch + # or recover from breakage like bug #646424 + ewarn "Failed to compile the ABI test. Broken host glibc?" + STAT=0 + fi + rm -f "${T}/check-ia32-emulation.elf32" + eend $STAT + [[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc." + fi + + fi + + # When we actually have to compile something... + if ! just_headers ; then + ebegin "Checking gcc for __thread support" + if ! eend $(want__thread ; echo $?) ; then + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "Please update your binutils/gcc and try again." + die "No __thread support in gcc!" + fi + + if [[ ${CTARGET} == *-linux* ]] ; then + local run_kv build_kv want_kv + + run_kv=$(g_get_running_KV) + build_kv=$(g_int_to_KV $(get_kheader_version)) + want_kv=${MIN_KERN_VER} + + if ! is_crosscompile && ! tc-is-cross-compiler ; then + # Building fails on an non-supporting kernel + ebegin "Checking running kernel version (${run_kv} >= ${want_kv})" + if ! eend_KV ${run_kv} ${want_kv} ; then + echo + eerror "You need a kernel of at least ${want_kv}!" + die "Kernel version too low!" + fi + fi + + ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" + if ! eend_KV ${build_kv} ${want_kv} ; then + echo + eerror "You need linux-headers of at least ${want_kv}!" + die "linux-headers version too low!" + fi + fi + fi +} + +# +# the phases +# + +# pkg_pretend + +pkg_pretend() { + # All the checks... + einfo "Checking general environment sanity." + sanity_prechecks +} + +pkg_setup() { + # see bug 682570 + [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup +} + +# src_unpack + +src_unpack() { + # Consistency is not guaranteed between pkg_ and src_ ... + sanity_prechecks + + use multilib && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz + + setup_env + + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patches || die + + EGIT_REPO_URI="https://sourceware.org/git/glibc.git" + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P}.tar.xz + + cd "${WORKDIR}" || die + unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz + fi + + cd "${WORKDIR}" || die + unpack locale-gen-${LOCALE_GEN_VER}.tar.gz + use riscv && unpack backport-rv32.txz +} + +src_prepare() { + local patchsetname + if ! use vanilla ; then + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${RELEASE_VER}-${PATCH_VER}" + fi + elog "Applying Gentoo Glibc Patchset ${patchsetname}" + eapply "${WORKDIR}"/patches + einfo "Done." + + if use riscv ; then + elog "Adding rv32 backport patchset for glibc-2.32 (experimental)" + eapply "${WORKDIR}"/backport-rv32 + einfo "Done." + fi + fi + + default + + gnuconfig_update + + cd "${WORKDIR}" + find . -name configure -exec touch {} + + + # move the external locale-gen to its old place + mkdir extra || die + mv locale-gen-${LOCALE_GEN_VER} extra/locale || die + + eprefixify extra/locale/locale-gen + + # Fix permissions on some of the scripts. + chmod u+x "${S}"/scripts/*.sh + + cd "${S}" +} + +glibc_do_configure() { + # Glibc does not work with gold (for various reasons) #269274. + tc-ld-disable-gold + + # CXX isnt handled by the multilib system, so if we dont unset here + # we accumulate crap across abis + unset CXX + + einfo "Configuring glibc for nptl" + + if use doc ; then + export MAKEINFO=makeinfo + else + export MAKEINFO=/dev/null + fi + + local v + for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM READELF; do + einfo " $(printf '%15s' ${v}:) ${!v}" + done + + # CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760 + # To build .S (assembly) files with the same ABI-specific flags + # upstream currently recommends adding CFLAGS to CC/CXX: + # https://sourceware.org/PR23273 + # Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS + # and breaks multiarch support. See 659030#c3 for an example. + # The glibc configure script doesn't properly use LDFLAGS all the time. + export CC="$(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS}" + einfo " $(printf '%15s' 'Manual CC:') ${CC}" + + # Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548 + export CXX="$(tc-getCXX ${CTARGET}) $(get_abi_CFLAGS) ${CFLAGS}" + + if is_crosscompile; then + # Assume worst-case bootstrap: glibc is buil first time + # when ${CTARGET}-g++ is not available yet. We avoid + # building auxiliary programs that require C++: bug #683074 + # It should not affect final result. + export libc_cv_cxx_link_ok=no + # The line above has the same effect. We set CXX explicitly + # to make build logs less confusing. + export CXX= + fi + einfo " $(printf '%15s' 'Manual CXX:') ${CXX}" + + # Always use tuple-prefixed toolchain. For non-native ABI glibc's configure + # can't detect them automatically due to ${CHOST} mismatch and fallbacks + # to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup(). + export NM="$(tc-getNM ${CTARGET})" + export READELF="$(tc-getREADELF ${CTARGET})" + einfo " $(printf '%15s' 'Manual NM:') ${NM}" + einfo " $(printf '%15s' 'Manual READELF:') ${READELF}" + + echo + + local myconf=() + + case ${CTARGET} in + m68k*) + # setjmp() is not compatible with stack protection: + # https://sourceware.org/PR24202 + myconf+=( --enable-stack-protector=no ) + ;; + powerpc-*) + # Currently gcc on powerpc32 generates invalid code for + # __builtin_return_address(0) calls. Normally programs + # don't do that but malloc hooks in glibc do: + # https://gcc.gnu.org/PR81996 + # https://bugs.gentoo.org/629054 + myconf+=( --enable-stack-protector=no ) + ;; + *) + # Use '=strong' instead of '=all' to protect only functions + # worth protecting from stack smashes. + # '=all' is also known to have a problem in IFUNC resolution + # tests: https://sourceware.org/PR25680, bug #712356. + myconf+=( --enable-stack-protector=$(usex ssp strong no) ) + ;; + esac + myconf+=( --enable-stackguard-randomization ) + + # Keep a whitelist of targets supporing IFUNC. glibc's ./configure + # is not robust enough to detect proper support: + # https://bugs.gentoo.org/641216 + # https://sourceware.org/PR22634#c0 + case $(tc-arch ${CTARGET}) in + # Keep whitelist of targets where autodetection mostly works. + amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;; + # Blacklist everywhere else + *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;; + esac + + # Enable Intel Control-flow Enforcement Technology on amd64 if requested + case ${CTARGET} in + x86_64-*) myconf+=( $(use_enable cet) ) ;; + *) ;; + esac + + [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp ) + + myconf+=( --enable-kernel=${MIN_KERN_VER} ) + + # Since SELinux support is only required for nscd, only enable it if: + # 1. USE selinux + # 2. only for the primary ABI on multilib systems + # 3. Not a crosscompile + if ! is_crosscompile && use selinux ; then + if use multilib ; then + if is_final_abi ; then + myconf+=( --with-selinux ) + else + myconf+=( --without-selinux ) + fi + else + myconf+=( --with-selinux ) + fi + else + myconf+=( --without-selinux ) + fi + + # Force a few tests where we always know the answer but + # configure is incapable of finding it. + if is_crosscompile ; then + export \ + libc_cv_c_cleanup=yes \ + libc_cv_forced_unwind=yes + fi + + myconf+=( + --without-cvs + --disable-werror + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + $(use_enable profile) + $(use_with gd) + --with-headers=$(build_eprefix)$(alt_build_headers) + --prefix="$(host_eprefix)/usr" + --sysconfdir="$(host_eprefix)/etc" + --localstatedir="$(host_eprefix)/var" + --libdir='$(prefix)'/$(get_libdir) + --mandir='$(prefix)'/share/man + --infodir='$(prefix)'/share/info + --libexecdir='$(libdir)'/misc/glibc + --with-bugurl=https://bugs.gentoo.org/ + --with-pkgversion="$(glibc_banner)" + $(use_enable crypt) + $(use_multiarch || echo --disable-multi-arch) + $(use_enable static-pie) + $(use_enable systemtap) + $(use_enable nscd) + + # locale data is arch-independent + # https://bugs.gentoo.org/753740 + libc_cv_complocaledir='${exec_prefix}/lib/locale' + + ${EXTRA_ECONF} + ) + + # We rely on sys-libs/timezone-data for timezone tools normally. + myconf+=( $(use_enable vanilla timezone-tools) ) + + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no) + ac_cv_lib_cap_cap_init=$(usex caps || echo no) + + # There is no configure option for this and we need to export it + # since the glibc build will re-run configure on itself + export libc_cv_rootsbindir="$(host_eprefix)/sbin" + export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)" + + # We take care of patching our binutils to use both hash styles, + # and many people like to force gnu hash style only, so disable + # this overriding check. #347761 + export libc_cv_hashstyle=no + + local builddir=$(builddir nptl) + mkdir -p "${builddir}" + cd "${builddir}" + set -- "${S}"/configure "${myconf[@]}" + echo "$@" + "$@" || die "failed to configure glibc" + + # ia64 static cross-compilers are a pita in so much that they + # can't produce static ELFs (as the libgcc.a is broken). so + # disable building of the programs for those targets if it + # doesn't work. + # XXX: We could turn this into a compiler test, but ia64 is + # the only one that matters, so this should be fine for now. + if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then + sed -i '1i+link-static = touch $@' config.make + fi + + # If we're trying to migrate between ABI sets, we need + # to lie and use a local copy of gcc. Like if the system + # is built with MULTILIB_ABIS="amd64 x86" but we want to + # add x32 to it, gcc/glibc don't yet support x32. + # + if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then + echo 'main(){}' > "${T}"/test.c + if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then + sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die + fi + fi +} + +glibc_headers_configure() { + export ABI=default + + local builddir=$(builddir "headers") + mkdir -p "${builddir}" + cd "${builddir}" + + # if we don't have a compiler yet, we can't really test it now ... + # hopefully they don't affect header generation, so let's hope for + # the best here ... + local v vars=( + ac_cv_header_cpuid_h=yes + libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes + libc_cv_asm_cfi_directives=yes + libc_cv_broken_visibility_attribute=no + libc_cv_c_cleanup=yes + libc_cv_compiler_powerpc64le_binary128_ok=yes + libc_cv_forced_unwind=yes + libc_cv_gcc___thread=yes + libc_cv_mlong_double_128=yes + libc_cv_mlong_double_128ibm=yes + libc_cv_ppc_machine=yes + libc_cv_ppc_rel16=yes + libc_cv_predef_fortify_source=no + libc_cv_target_power8_ok=yes + libc_cv_visibility_attribute=yes + libc_cv_z_combreloc=yes + libc_cv_z_execstack=yes + libc_cv_z_initfirst=yes + libc_cv_z_nodelete=yes + libc_cv_z_nodlopen=yes + libc_cv_z_relro=yes + libc_mips_abi=${ABI} + libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) + # These libs don't have configure flags. + ac_cv_lib_audit_audit_log_user_avc_message=no + ac_cv_lib_cap_cap_init=no + ) + + einfo "Forcing cached settings:" + for v in "${vars[@]}" ; do + einfo " ${v}" + export ${v} + done + + local headers_only_arch_CPPFLAGS=() + + # Blow away some random CC settings that screw things up. #550192 + if [[ -d ${S}/sysdeps/mips ]]; then + pushd "${S}"/sysdeps/mips >/dev/null + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die + sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die + + # Force the mips ABI to the default. This is OK because the set of + # installed headers in this phase is the same between the 3 ABIs. + # If this ever changes, this hack will break, but that's unlikely + # as glibc discourages that behavior. + # https://crbug.com/647033 + sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die + + popd >/dev/null + fi + + case ${CTARGET} in + riscv*) + # RISC-V interrogates the compiler to determine which target to + # build. If building the headers then we don't strictly need a + # RISC-V compiler, so the built-in definitions that are provided + # along with all RISC-V compiler might not exist. This causes + # glibc's RISC-V preconfigure script to blow up. Since we're just + # building the headers any value will actually work here, so just + # pick the standard one (rv64g/lp64d) to make the build scripts + # happy for now -- the headers are all the same anyway so it + # doesn't matter. + headers_only_arch_CPPFLAGS+=( + -D__riscv_xlen=64 + -D__riscv_flen=64 + -D__riscv_float_abi_double=1 + -D__riscv_atomic=1 + ) ;; + esac + + local myconf=() + myconf+=( + --disable-sanity-checks + --enable-hacker-mode + --without-cvs + --disable-werror + --enable-bind-now + --build=${CBUILD_OPT:-${CBUILD}} + --host=${CTARGET_OPT:-${CTARGET}} + --with-headers=$(build_eprefix)$(alt_build_headers) + --prefix="$(host_eprefix)/usr" + ${EXTRA_ECONF} + ) + + # Nothing is compiled here which would affect the headers for the target. + # So forcing CC/CFLAGS is sane. + local headers_only_CC=$(tc-getBUILD_CC) + local headers_only_CFLAGS="-O1 -pipe" + local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}" + local headers_only_LDFLAGS="" + set -- "${S}"/configure "${myconf[@]}" + echo \ + "CC=${headers_only_CC}" \ + "CFLAGS=${headers_only_CFLAGS}" \ + "CPPFLAGS=${headers_only_CPPFLAGS}" \ + "LDFLAGS=${headers_only_LDFLAGS}" \ + "$@" + CC=${headers_only_CC} \ + CFLAGS=${headers_only_CFLAGS} \ + CPPFLAGS=${headers_only_CPPFLAGS} \ + LDFLAGS="" \ + "$@" || die "failed to configure glibc" +} + +do_src_configure() { + if just_headers ; then + glibc_headers_configure + else + glibc_do_configure nptl + fi +} + +src_configure() { + foreach_abi do_src_configure +} + +do_src_compile() { + emake -C "$(builddir nptl)" +} + +src_compile() { + if just_headers ; then + return + fi + + foreach_abi do_src_compile +} + +glibc_src_test() { + cd "$(builddir nptl)" + + local myxfailparams="" + if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then + for myt in ${XFAIL_TEST_LIST[@]} ; do + myxfailparams+="test-xfail-${myt}=yes " + done + fi + + # sandbox does not understand unshare() and prevents + # writes to /proc/, which makes many tests fail + + SANDBOX_ON=0 LD_PRELOAD= emake ${myxfailparams} check +} + +do_src_test() { + local ret=0 + + glibc_src_test + : $(( ret |= $? )) + + return ${ret} +} + +src_test() { + if just_headers ; then + return + fi + + # Give tests more time to complete. + export TIMEOUTFACTOR=5 + + foreach_abi do_src_test || die "tests failed" +} + +run_locale_gen() { + # if the host locales.gen contains no entries, we'll install everything + local root="$1" + local inplace="" + + if [[ "${root}" == "--inplace-glibc" ]] ; then + inplace="--inplace-glibc" + root="$2" + fi + + local locale_list="${root}/etc/locale.gen" + + pushd "${ED}"/$(get_libdir) >/dev/null + + if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then + [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space" + locale_list="${root}/usr/share/i18n/SUPPORTED" + fi + + set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \ + --destdir "${root}" + echo "$@" + "$@" + + popd >/dev/null +} + +glibc_do_src_install() { + local builddir=$(builddir nptl) + cd "${builddir}" + + emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install + + # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support + # which come without headers etc. Only needed for binary packages since the + # external net-libs/libnsl has increased soversion. Keep only versioned libraries. + find "${D}" -name "libnsl.a" -delete + find "${D}" -name "libnsl.so" -delete + + # Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need + # to infer upstream version: + # '#define VERSION "2.26.90"' -> '2.26.90' + local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h) + + # Avoid stripping binaries not targeted by ${CHOST}. Or else + # ${CHOST}-strip would break binaries build for ${CTARGET}. + is_crosscompile && dostrip -x / + # gdb thread introspection relies on local libpthreas symbols. stripping breaks it + # See Note [Disable automatic stripping] + dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so + + if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then + # Move versioned .a file out of libdir to evade portage QA checks + # instead of using gen_usr_ldscript(). We fix ldscript as: + # "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..." + sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die + dodir $(alt_usrlibdir)/${P} + mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die + fi + + # We'll take care of the cache ourselves + rm -f "${ED}"/etc/ld.so.cache + + # Everything past this point just needs to be done once ... + is_final_abi || return 0 + + # Make sure the non-native interp can be found on multilib systems even + # if the main library set isn't installed into the right place. Maybe + # we should query the active gcc for info instead of hardcoding it ? + local i ldso_abi ldso_name + local ldso_abi_list=( + # x86 + amd64 /lib64/ld-linux-x86-64.so.2 + x32 /libx32/ld-linux-x32.so.2 + x86 /lib/ld-linux.so.2 + # mips + o32 /lib/ld.so.1 + n32 /lib32/ld.so.1 + n64 /lib64/ld.so.1 + # powerpc + ppc /lib/ld.so.1 + ppc64 /lib64/ld64.so.1 + # riscv + ilp32d /lib/ld-linux-riscv32-ilp32d.so.1 + ilp32 /lib/ld-linux-riscv32-ilp32.so.1 + lp64d /lib/ld-linux-riscv64-lp64d.so.1 + lp64 /lib/ld-linux-riscv64-lp64.so.1 + # s390 + s390 /lib/ld.so.1 + s390x /lib/ld64.so.1 + # sparc + sparc32 /lib/ld-linux.so.2 + sparc64 /lib64/ld-linux.so.2 + ) + case $(tc-endian) in + little) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64.so.1 + ) + ;; + big) + ldso_abi_list+=( + # arm + arm64 /lib/ld-linux-aarch64_be.so.1 + ) + ;; + esac + if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib + fi + for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do + ldso_abi=${ldso_abi_list[i]} + has ${ldso_abi} $(get_install_abis) || continue + + ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" + if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then + dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} + fi + done + + # With devpts under Linux mounted properly, we do not need the pt_chown + # binary to be setuid. This is because the default owners/perms will be + # exactly what we want. + if ! use suid ; then + find "${ED}" -name pt_chown -exec chmod -s {} + + fi + + ################################################################# + # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # + # Make sure we install some symlink hacks so that when we build + # a 2nd stage cross-compiler, gcc finds the target system + # headers correctly. See gcc/doc/gccinstall.info + if is_crosscompile ; then + # We need to make sure that /lib and /usr/lib always exists. + # gcc likes to use relative paths to get to its multilibs like + # /usr/lib/../lib64/. So while we don't install any files into + # /usr/lib/, we do need it to exist. + keepdir $(alt_prefix)/lib + keepdir $(alt_prefix)/usr/lib + + dosym usr/include $(alt_prefix)/sys-include + return 0 + fi + + # Files for Debian-style locale updating + dodir /usr/share/i18n + sed \ + -e "/^#/d" \ + -e "/SUPPORTED-LOCALES=/d" \ + -e "s: \\\\::g" -e "s:/: :g" \ + "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \ + || die "generating /usr/share/i18n/SUPPORTED failed" + cd "${WORKDIR}"/extra/locale + dosbin locale-gen + doman *.[0-8] + insinto /etc + doins locale.gen + + keepdir /usr/lib/locale + + cd "${S}" + + # Install misc network config files + insinto /etc + doins posix/gai.conf nss/nsswitch.conf + + # Gentoo-specific + newins "${FILESDIR}"/host.conf-1 host.conf + + if use nscd ; then + doins nscd/nscd.conf + + newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd + + local nscd_args=( + -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):" + ) + + sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd + + systemd_dounit nscd/nscd.service + systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf + fi + + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc + doenvd "${T}"/00glibc + + for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do + [[ -s ${d} ]] && dodoc ${d} + done + dodoc -r ChangeLog.old + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f "${ED}"/etc/localtime + + # Generate all locales if this is a native build as locale generation + if use compile-locales && ! is_crosscompile ; then + run_locale_gen --inplace-glibc "${ED}/" + sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die + fi +} + +glibc_headers_install() { + local builddir=$(builddir "headers") + cd "${builddir}" + emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers + + insinto $(alt_headers)/gnu + doins "${S}"/include/gnu/stubs.h + + # Make sure we install the sys-include symlink so that when + # we build a 2nd stage cross-compiler, gcc finds the target + # system headers correctly. See gcc/doc/gccinstall.info + dosym usr/include $(alt_prefix)/sys-include +} + +src_install() { + if just_headers ; then + export ABI=default + glibc_headers_install + return + fi + + foreach_abi glibc_do_src_install + + if ! use static-libs ; then + elog "Not installing static glibc libraries" + find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete + fi +} + +# Simple test to make sure our new glibc isn't completely broken. +# Make sure we don't test with statically built binaries since +# they will fail. Also, skip if this glibc is a cross compiler. +# +# If coreutils is built with USE=multicall, some of these files +# will just be wrapper scripts, not actual ELFs we can test. +glibc_sanity_check() { + cd / #228809 + + # We enter ${ED} so to avoid trouble if the path contains + # special characters; for instance if the path contains the + # colon character (:), then the linker will try to split it + # and look for the libraries in an unexpected place. This can + # lead to unsafe code execution if the generated prefix is + # within a world-writable directory. + # (e.g. /var/tmp/portage:${HOSTNAME}) + pushd "${ED}"/$(get_libdir) >/dev/null + + local x striptest + for x in cal date env free ls true uname uptime ; do + x=$(type -p ${x}) + [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue + striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue + case ${striptest} in + *"statically linked"*) continue;; + *"ASCII text"*) continue;; + esac + # We need to clear the locale settings as the upgrade might want + # incompatible locale data. This test is not for verifying that. + LC_ALL=C \ + ./ld-*.so --library-path . ${x} > /dev/null \ + || die "simple run test (${x}) failed" + done + + popd >/dev/null +} + +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d + + # Default /etc/hosts.conf:multi to on for systems with small dbs. + if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then + sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf + einfo "Defaulting /etc/host.conf:multi to on" + fi + + [[ -n ${ROOT} ]] && return 0 + [[ -d ${ED}/$(get_libdir) ]] || return 0 + [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check + + if [[ -L ${EROOT}/usr/lib/locale ]]; then + # Help portage migrate this to a directory + # https://bugs.gentoo.org/753740 + rm "${EROOT}"/usr/lib/locale || die + fi +} + +pkg_postinst() { + # nothing to do if just installing headers + just_headers && return + + if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then + # Generate fastloading iconv module configuration file. + "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/" + fi + + if ! is_crosscompile && [[ -z ${ROOT} ]] ; then + use compile-locales || run_locale_gen "${EROOT}/" + fi + + # Check for sanity of /etc/nsswitch.conf, take 2 + if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then + local entry + for entry in passwd group shadow; do + if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then + ewarn "" + ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been" + ewarn "removed from glibc and is now provided by the package" + ewarn " sys-auth/libnss-nis" + ewarn "Install it now to keep your NIS setup working." + ewarn "" + fi + done + fi +} diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest index 89bb054ab20e..db15b30feded 100644 --- a/sys-libs/libapparmor/Manifest +++ b/sys-libs/libapparmor/Manifest @@ -1,2 +1,3 @@ DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6 +DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687 diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild new file mode 100644 index 000000000000..9ddf4c3bbf39 --- /dev/null +++ b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_SETUPTOOLS="no" +PYTHON_COMPAT=( python3_{5,6,7,8} ) +GENTOO_DEPEND_ON_PERL="no" + +inherit autotools distutils-r1 perl-functions + +MY_PV="$(ver_cut 1-2)" + +DESCRIPTION="Library to support AppArmor userspace utilities" +HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home" +SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="doc +perl +python static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND} + sys-devel/autoconf-archive + sys-devel/bison + sys-devel/flex + doc? ( dev-lang/perl ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +S=${WORKDIR}/apparmor-${PV}/libraries/${PN} + +# depends on the package already being installed +RESTRICT="test" + +src_prepare() { + rm -r m4 || die "failed to remove bundled macros" + default + eautoreconf + use python && distutils-r1_src_prepare +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with perl) \ + $(use_with python) +} + +src_compile() { + emake -C src + emake -C include + use doc && emake -C doc + use perl && emake -C swig/perl + + if use python ; then + pushd swig/python > /dev/null + emake libapparmor_wrap.c + distutils-r1_src_compile + popd > /dev/null + fi +} + +src_install() { + emake DESTDIR="${D}" -C src install + emake DESTDIR="${D}" -C include install + use doc && emake DESTDIR="${D}" -C doc install + + if use perl ; then + emake DESTDIR="${D}" -C swig/perl install + perl_set_version + insinto "${VENDOR_ARCH}" + doins swig/perl/LibAppArmor.pm + + # bug 620886 + perl_delete_localpod + perl_fix_packlist + fi + + if use python ; then + pushd swig/python > /dev/null + distutils-r1_src_install + + python_moduleinto LibAppArmor + python_foreach_impl python_domodule LibAppArmor.py + popd > /dev/null + fi + + dodoc AUTHORS ChangeLog NEWS README + + find "${D}" -name '*.la' -delete || die +} diff --git a/virtual/httpd-php/httpd-php-8.0.ebuild b/virtual/httpd-php/httpd-php-8.0.ebuild new file mode 100644 index 000000000000..75a1a6f67174 --- /dev/null +++ b/virtual/httpd-php/httpd-php-8.0.ebuild @@ -0,0 +1,12 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="Virtual to provide PHP-enabled webservers" +SLOT="${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +RDEPEND="|| ( dev-lang/php:${SLOT}[fpm] + dev-lang/php:${SLOT}[apache2] + dev-lang/php:${SLOT}[cgi] )" diff --git a/www-apps/mediawiki/mediawiki-1.35.0.ebuild b/www-apps/mediawiki/mediawiki-1.35.0.ebuild index de660599d084..f41b4ccfb759 100644 --- a/www-apps/mediawiki/mediawiki-1.35.0.ebuild +++ b/www-apps/mediawiki/mediawiki-1.35.0.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86" IUSE="imagemagick mysql postgres +sqlite" REQUIRED_USE="|| ( mysql postgres sqlite )" -RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] +RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json(+),postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) diff --git a/www-client/chromium/chromium-89.0.4343.0.ebuild b/www-client/chromium/chromium-89.0.4343.0.ebuild index 9646590a2c98..54e890be83bf 100644 --- a/www-client/chromium/chromium-89.0.4343.0.ebuild +++ b/www-client/chromium/chromium-89.0.4343.0.ebuild @@ -138,7 +138,7 @@ else dev-libs/libxslt:= >=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= - system-icu? ( >=dev-libs/icu-67.1:= ) + system-icu? ( >=dev-libs/icu-68.1:= ) " RDEPEND+="${COMMON_DEPEND}" DEPEND+="${COMMON_DEPEND}" diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest index 81c8fe30e9c3..94a269445e5b 100644 --- a/www-client/microsoft-edge-dev/Manifest +++ b/www-client/microsoft-edge-dev/Manifest @@ -1 +1 @@ -DIST microsoft-edge-dev_88.0.705.9-1_amd64.deb 88167812 BLAKE2B cc3620ece429268e8dafdd5f2a73e2f23a6d51f0a381331cc9623805891a1211c4734dc6b5498d587a9aca52a22e56475ea36d1e4114b63d08938f667828bf20 SHA512 2afe62f5e21750919ec7931b4fb7b0e9e267a01e8388e8ad35b8449713e294a5ae743c28ce2f3c941660ebc2df8c7a6c62db8391ec101e020908a54f1df95423 +DIST microsoft-edge-dev_88.0.705.15-1_amd64.deb 87945596 BLAKE2B a770aa4edc4f11d350b7ff77dcc7d953115c815caebac5d9858f8ed5e24ec14d4f407ae3ad7f97d32f78849f024c91b75278c21eecdd8197f0c375253fcca653 SHA512 ad388d4b784e71db4f7e30f2f5ee36d3e8abcd7e2c3cac351e68d1a81476017d1c3e784fda2aaf59ec98b537d6ab3ee90aeb8e77597c3204122c6770149b427e diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild index 41108ab2bece..41108ab2bece 100644 --- a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild +++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest index 1aedca26c9cc..1f9cba32333c 100644 --- a/www-client/vivaldi-snapshot/Manifest +++ b/www-client/vivaldi-snapshot/Manifest @@ -1,8 +1,8 @@ -DIST vivaldi-snapshot_3.5.2115.63-1_amd64.deb 76791600 BLAKE2B bdd9fa9847fc12686ba35be4ea2dee457f35821a6d5fbc54c9a16db84bf1d4d9add635cb8d8d8ba43111c421902959a4126b03887a0a09bea818d08a6aa9182f SHA512 cb7dc760bccb9c821a21e4345f8cf5799456019062f2e3d2c4dce93c99a415a14d01d7a2fe0e72d3c8cf88222b23425c3ac0a2f8fe8d5e05c9724ff308a65544 -DIST vivaldi-snapshot_3.5.2115.63-1_arm64.deb 69047684 BLAKE2B 024562eb45bf181bc23bcaea90543c0d1731d3a3e2f71ac0901c119e470986ef25e99662725dec77488a9568f8c837d110a9316cb1b3a3ef333ab3bdfd4517d4 SHA512 976a24004d846ea3d665690a435e0805b8fafe0660479c9520f7dea8002c668f8881b1aeccb723d5fad8f952e87ae1c8ef23e22676e152b6c5077cfd1fdbb16e -DIST vivaldi-snapshot_3.5.2115.63-1_armhf.deb 68124956 BLAKE2B 0e0ac854f0194706fe9eabac14ccfdd0f74aa6c5addbc71ac37a81dd01bcbf95a3888097f76c3d5276eb73c3e046d16be19575e31b1d84b1aa3241444e3dcab1 SHA512 e93af0ce0386973e9b63125b2af786114f97420c86a472807e0915704c76a181b4cdf5c81895739b908b8bb522dca48ccc4dd9b03a4cac16f99fd057c6c650e7 -DIST vivaldi-snapshot_3.5.2115.63-1_i386.deb 73575640 BLAKE2B e2f4f427f38756aa5fd044cb6d83a8fa8062629338a75bf2a9861e8b3f35d1593f0777ad257422be1ebfc9b6840af36b38fce0431289d3497c4eac847f4841fd SHA512 bbdbe7931e2263052ab8d2d03c707e98f7924d4a6d38e498a8b10a65e7776d7877e0fcb335eefbf41cb537241df5276dc346e2d20090c5b91238e376172143d4 DIST vivaldi-snapshot_3.5.2115.67-1_amd64.deb 76803740 BLAKE2B cc26eb17612c6f1997ad5bfa738baf82bdc179967d2bedabfa11266f68b2752b82a97fe90a56ce65b46f8ada30a405940b40a19dfba32b4159956fe6a16fa7be SHA512 e850c15f684f5ae10f19788c89fe86747b79f89a7b40e86d027c3d3c4af5c4375105eb3485e7a1105fa44323bcfb3634f8664243846b7afa2d690397bfe1d6a4 DIST vivaldi-snapshot_3.5.2115.67-1_arm64.deb 69026260 BLAKE2B 2d8465c33b56103d1eb57d8b78c5757a9f229dedc4ac37fe851e4db0c17424e8e59ec47873ccfb9b59030f4953080eafa88225e369cc7201b6863c932102a718 SHA512 908f0ebfe33640dd4af6a9148b3bbd31ded386b56e009174e5e59c329411da582a0e3907ce24bd01bd0f45208f17ae955efd75a4bbb29b1027a164c5ab9732be DIST vivaldi-snapshot_3.5.2115.67-1_armhf.deb 68126168 BLAKE2B 1e23d2c6a03ee96c65bbb314780083296ea9a2eab7d725fead8d89291ba593b7abd4e6ee8c66c066085e6dc73c74da57e058d250727b08bb2c08ee32e85deae3 SHA512 dc7f50bb6421b0a6c13a8282b97a8ad362c7cf976a34a9de5a46c886eec53c9337563cf078779e51eaa2b27d7f329ab7beb83cbfae54046f174a860d9ebf4561 DIST vivaldi-snapshot_3.5.2115.67-1_i386.deb 73582040 BLAKE2B 4248f973271239a410d8f0baa2fffc665e710d18c606ac553af1366f075ee4955203dd54310df36243030e26ed7db763180a65b26e2bdaf0c18ee91756641813 SHA512 f5b322131bb3bfe92876660eced53de8aa435505e1ced5d8654a14bc1fbce4edbcf5f3d6a20165baf39b6e846422e31e7e52e7bde5d3937c7741496a8f8201fc +DIST vivaldi-snapshot_3.5.2115.71-1_amd64.deb 76782912 BLAKE2B 99741b49846193093b6dc2aee1cca3ba56e5be658d9c5f3260b961171267d56fd9071e9ab65a98d6ab564523e4262af72e7ff2f39067974c67ad1c3267aa0802 SHA512 34752c5cdd20a6a2b03fd70a7284d98e434004341637006eb44bda74f44fc256686dd4e8259453eab650421278de543867e7c5d254d4a70f5b81ca4a7dfa1cae +DIST vivaldi-snapshot_3.5.2115.71-1_arm64.deb 69041316 BLAKE2B 810a43a61a04c3ad6d36e2fe4b2a17a4b0b67413d06ab98e1fb903c170f6fad5ae9aa8fee01221e799fac4fc61cf29718a778487b1e7b7f7938f5d42f8402122 SHA512 48d3b68f3ae8da8355047a1ce737b3d41a0f6b9ed9fd93020c5dcf35986fd88aa9aa2979875ee7724bed3ff2d70352de0c2bd51cb64fd672e84d7759455c0b10 +DIST vivaldi-snapshot_3.5.2115.71-1_armhf.deb 68130280 BLAKE2B 24f10b5a4e82671c73b6f6d30c45011c4718e98cf4d161c09e0b557fdc2d6f9b8389f234e8f38e8fded9da1ef67ecf1c49354e1845468d2e58993cf98e2bc894 SHA512 09b8446ec1b967463d51b99b915f1d9f1755b780396cab622d38fb4ded89141b415e63818fe2c4e0bfa76f3a7b247225d2ae75ce7b1675475f65af5c68f4eb6c +DIST vivaldi-snapshot_3.5.2115.71-1_i386.deb 73583972 BLAKE2B 149905a822c037b692f48aa7b69ee3ab0b200775c7ea9803f462f98bcda230b777bbb1949383299549fc7bacd0e96bd1d6bfa38c2f300109341f184e5f5f178a SHA512 8802cb2853b79cb2deed601c3441c7198d4969904075e18a2856327a23d1384b3166b5ae1b79dfb3d0048c438bc1849cc48dff3136fed82fc35140e69eb94187 diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.63.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.71.ebuild index f69da1d681b9..f69da1d681b9 100644 --- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.63.ebuild +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.71.ebuild diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest index 8631817e1ad0..b8341cac1097 100644 --- a/www-client/vivaldi/Manifest +++ b/www-client/vivaldi/Manifest @@ -2,7 +2,7 @@ DIST vivaldi-3.4.2066.106_p1-amd64.deb 75692172 BLAKE2B 6311f405833e99652d3905c0 DIST vivaldi-3.4.2066.106_p1-arm64.deb 68074616 BLAKE2B 90677ffe9f7b76a45a686dc1953c4eccb956a438c1c5afccf8e7af2fbdf3a22b5446fb4932c309c57ada545af2844f45a4c4fb3ec9c5731c7fe6ca29ba96aa27 SHA512 a8c44bcb0643f5282de37935161dad0e0cd278ead1ea1bcd4ee7a907ab630c41e5d88bb271c4221e3e8ca87fd5de0df9a902121ed7cd7266dc9f6942eb1d4f95 DIST vivaldi-3.4.2066.106_p1-armhf.deb 67022536 BLAKE2B 5ee874dc41c484aa2130ca20a1a68b48178f7a55db1c56c010b4319448aada2c0c4e0b2d7ab36dd85d37cf4f789e25ec57679a3b6ea87c086e537025ab56199f SHA512 3fc1f20dcf7c0baa2c7a021b5e9d3480f62a04eb65697712df1481f85ef7afdc019a94e2873964ffba870bda525d5b84dbf3201a7e660428576e00c4770c067e DIST vivaldi-3.4.2066.106_p1-i386.deb 72096496 BLAKE2B 6728eaefa74d4ee061d75d510817ccd7196455bd1e1f0347c90f7528358c33c7f81bd6e46edaafd94e0da1880e633dcf0aeee795eaeee3b88497a06f3ba9533b SHA512 cac85271513bbcc4af08c5e53c2652b4ac616ce7a11b5896af1c856879cd354298243314fb3ae535d059145cd412f66177b93d9e28f63a741411e04db4030ad7 -DIST vivaldi-3.4.2066.86_p1-amd64.deb 75651984 BLAKE2B 4b5b9caac33f490066ae69453311b6de14d62a49196d7f4ee945e48ca182c242c0de3c0e7ab6fe461073615360e24201972c8a4816f001c9ae75e91d73e4d804 SHA512 98a7100880c9d267ac16a12249452b8fcf66645226b1f9a9da720032e37b8f33ccb1ece77a987472d64a1a54575f9134f67f9468a8e40388f9959b6e7bdf67b4 -DIST vivaldi-3.4.2066.86_p1-arm64.deb 68056016 BLAKE2B 4e811146ba59096b90026b09f982012e4cb3b29c66e9ecca9737a7809b4821c28ab6c65aef4a00c2a06d95b5191c1cbd931fa99aec004d8715712cffaeffbfaf SHA512 889725b266a320397f9b983216eea18863f7047cf70e0f92b39765ab3789b98a3f0206603353f78ec77874eee9d5e019dd453373e211f7f800535b2e0595d518 -DIST vivaldi-3.4.2066.86_p1-armhf.deb 66985864 BLAKE2B b1ff5408d1fe254f169ae2a93e0b41a0a4e590448206e182996e154591964453ab2e508688a3a844812353f4d78c2e9a2b58ef329e4fa4e34b6895c6f8c79b33 SHA512 6a3ccbebc62cb64bf4f4813686b7376d4dd13f0081e849524f8e995282accda6d5fed22b6e562bdf831f23cb6cfb0d6421cb6c7c0dc9ce80ccc32566a4fcbc9b -DIST vivaldi-3.4.2066.86_p1-i386.deb 72748188 BLAKE2B ac949d03e3e24dfdac9461e212ea48135d6100a1b367c02cf23e0d9b0d2fe6826fb3a3a8207570ba26deac37f916f12a49d87894668a43218a8ce64a6fe1aa04 SHA512 4604fe7797c28e81fd71403fb32214ef48d06e508070da8f613ea16afd3b8074bc65fb81f7dacdbeb71847cb2704aa5ef1eb399199affc047a22582b629d9142 +DIST vivaldi-stable_3.5.2115.73-1_amd64.deb 76802208 BLAKE2B 1421a38a20fc1c25c5e8cebe5eeddf4a991759c325675538c2fc31c2d0001a9846a31a785f8f3f508a6cabc5e52d4365feb2e0a58d60d4cf160b86fc0333eae3 SHA512 f43ac8ebe8c86e244366160bcd5c2c33d22d0cd44602eaa8a4fa512cfc255ee0cfefd6e865eb12ed0f711c182d0f4313836e865cde416890bc694c2835e21bf7 +DIST vivaldi-stable_3.5.2115.73-1_arm64.deb 69054028 BLAKE2B fc17e2d84900d101d5a716fa79990cd6501e741c2e3c80889e3b4b5c057a2ea0dad29b9b22fc71768a14ad75677666ab6755ca3babd29cd9babbf72b15b3830d SHA512 af84e3d1719cfa0f19ccae17af48c375a03e676e68be92a8ab5babb6bec3d36d6cd1ce4b13daeeffd5f0117e2614d4c1da53f5c2690c7f373003cf805b7ca99d +DIST vivaldi-stable_3.5.2115.73-1_armhf.deb 68138412 BLAKE2B 22c061ac3112d2e8f81b3b9ad0e6fb3d852245f5ba15ca24a6a914d5fe5e8216e973b22e80cb3c94812eb7b02ed7a3b165390bd7651498c9149bfee07994664b SHA512 e1997250bec3f1591000b88a3e08446a8e2d1ffea057cb5faf101e048a1adad1db5d240ee6e12d959ad8d5172de8710ef969c407363b1693b9da83cd39091799 +DIST vivaldi-stable_3.5.2115.73-1_i386.deb 73581952 BLAKE2B 4cc3bc2109056dfcfab741ebee15337fc01213379c258ade99d460ab2e0f588eb54c34ac2596f8f6bc16761e69f43132ca2a8c1e81785f79238668f44be7de22 SHA512 65a25d67ec6decfbfb57fcfaead79600d6eabe3c7278b25c9c5103648e3dfff80d36838f210076bb85cdccf7ca3f4dbc9ef764cb449e76fd8ba54f05f9ed3ed2 diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml index 3b94165dd3d1..91c75704fe9c 100644 --- a/www-client/vivaldi/metadata.xml +++ b/www-client/vivaldi/metadata.xml @@ -5,4 +5,8 @@ <email>chewi@gentoo.org</email> <name>James Le Cuirot</name> </maintainer> + <use> + <flag name="proprietary-codecs">Use system <pkg>media-video/ffmpeg</pkg> to support patent-encumbered media codecs</flag> + <flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag> + </use> </pkgmetadata> diff --git a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild deleted file mode 100644 index f807af0fd17c..000000000000 --- a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CHROMIUM_LANGS=" - af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu - fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt - lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th - tr uk vi zh-CN zh-TW -" -inherit chromium-2 multilib unpacker toolchain-funcs xdg - -#VIVALDI_BRANCH="snapshot" - -VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}" -VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}" -VIVALDI_HOME="opt/${VIVALDI_BIN}" -DESCRIPTION="A browser for our friends" -HOMEPAGE="https://vivaldi.com/" -VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_" -SRC_URI=" - amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb ) - arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb ) - arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb ) - x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb ) -" - -LICENSE="Vivaldi" -SLOT="0" -KEYWORDS="-* amd64 ~arm ~arm64 x86" -RESTRICT="bindist mirror" - -DEPEND=" - virtual/libiconv -" -RDEPEND=" - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype - media-libs/speex - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango[X] -" -QA_PREBUILT="*" -S=${WORKDIR} - -src_unpack() { - unpack_deb ${A} -} - -src_prepare() { - iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die - mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die - - sed -i \ - -e "s|${VIVALDI_BIN}|${PN}|g" \ - usr/share/applications/${VIVALDI_PN}.desktop \ - usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die - - mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die - chmod 0755 usr/share/doc/${PF} || die - - gunzip usr/share/doc/${PF}/changelog.gz || die - - rm \ - _gpgbuilder \ - etc/cron.daily/${VIVALDI_BIN} \ - || die - rmdir \ - etc/cron.daily/ \ - etc/ \ - || die - - local c d - for d in 16 22 24 32 48 64 128 256; do - mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die - cp \ - ${VIVALDI_HOME}/product_logo_${d}.png \ - usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die - done - - pushd "${VIVALDI_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - eapply_user -} - -src_install() { - rm -r usr/share/appdata || die - mv * "${D}" || die - dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} - - fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox -} diff --git a/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild new file mode 100644 index 000000000000..f69da1d681b9 --- /dev/null +++ b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CHROMIUM_LANGS=" + af + am + ar + be + bg + bn + ca + cs + da + de + de-CH + el + en-GB + en-US + eo + es + es-419 + es-PE + et + eu + fa + fi + fil + fr + fy + gd + gl + gu + he + hi + hr + hu + hy + id + io + is + it + ja + jbo + ka + kn + ko + ku + lt + lv + mk + ml + mr + ms + nb + nl + nn + pl + pt-BR + pt-PT + ro + ru + sc + sk + sl + sq + sr + sv + sw + ta + te + th + tr + uk + vi + zh-CN + zh-TW +" + +inherit chromium-2 desktop unpacker xdg + +VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}" +VIVALDI_HOME="opt/${PN}" +DESCRIPTION="A browser for our friends" +HOMEPAGE="https://vivaldi.com/" + +if [[ ${PV} = *_p* ]]; then + DEB_REV="${PV#*_p}" +else + DEB_REV=1 +fi + +VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_" +SRC_URI=" + amd64? ( ${VIVALDI_BASE_URI}amd64.deb ) + arm64? ( ${VIVALDI_BASE_URI}arm64.deb ) + arm? ( ${VIVALDI_BASE_URI}armhf.deb ) + x86? ( ${VIVALDI_BASE_URI}i386.deb ) +" + +LICENSE="Vivaldi" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +IUSE="proprietary-codecs widevine" +RESTRICT="bindist mirror" + +RDEPEND=" + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype + media-libs/speex + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXtst + x11-libs/pango[X] + proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) + widevine? ( www-plugins/chrome-binary-plugins ) +" + +QA_PREBUILT="*" +S="${WORKDIR}" + +src_unpack() { + unpack_deb ${A} +} + +src_prepare() { + # Rename docs directory to our needs. + mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die + + # Decompress the docs. + gunzip usr/share/doc/${PF}/changelog.gz || die + + # The appdata directory is deprecated. + mv usr/share/{appdata,metainfo}/ || die + + # Remove cron job for updating from Debian repos. + rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die + rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die + + # Remove scripts that will most likely break things. + rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die + + pushd ${VIVALDI_HOME}/locales > /dev/null || die + rm ja-KS.pak || die # No flag for Kansai as not in IETF list. + chromium_remove_language_paks + popd > /dev/null || die + + eapply_user +} + +src_install() { + mv */ "${D}" || die + dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} + fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox + + local logo size + for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do + size=${logo##*_} + size=${size%.*} + newicon -s "${size}" "${logo}" ${PN}.png + done + + if use proprietary-codecs; then + dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \ + /${VIVALDI_HOME}/lib/libffmpeg.so + fi + + if use widevine; then + dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \ + /${VIVALDI_HOME}/WidevineCdm + else + rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die + fi +} diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest index fbb79ae6af60..60da7a8e397c 100644 --- a/www-servers/gunicorn/Manifest +++ b/www-servers/gunicorn/Manifest @@ -1,3 +1 @@ -DIST gunicorn-19.8.1.tar.gz 415541 BLAKE2B f0eefc4ff24052320b4dfaac3fc2523487f8dbb63365a9a3c52bc411b4d8f6150f348c709cae94dc4acb45e7fda534cf462d0339abc0325230d3560f76ce3241 SHA512 7f7fcbcde20b70d3a2faad595e08a028530348895f784eddcb35f24b3d5a7955edfc5b68aac4630243798fa37d41b7e869ec0d454dc80700c2630ba2cc39afc0 -DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e2dceeb0ee5a10c8cc449e49c0252980847bfcee02633f791c05aa086b37f5b50f9fd535acee6deb8a18dd1c24f8 SHA512 4a89f963daa7afe7741a4fb9aa4f14192429ac0e9ba5672547d683475dd2f2733efeed903ec99db9d831e2b05b9ed9e583e3cfec483a1b481d897aa77373e8a3 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e diff --git a/www-servers/gunicorn/gunicorn-19.8.1.ebuild b/www-servers/gunicorn/gunicorn-19.8.1.ebuild deleted file mode 100644 index 199d85ec02d5..000000000000 --- a/www-servers/gunicorn/gunicorn-19.8.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="A WSGI HTTP Server for UNIX" -HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT PSF-2 doc? ( BSD )" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - )" - -DOCS="README.rst" - -python_prepare_all() { - sed -ie "s/..\/bin/\/usr\/bin\//" docs/Makefile || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - py.test -v || die "Testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/build/html/. ) - - distutils-r1_python_install_all -} diff --git a/www-servers/gunicorn/gunicorn-19.9.0.ebuild b/www-servers/gunicorn/gunicorn-19.9.0.ebuild deleted file mode 100644 index 7a3d0bb71655..000000000000 --- a/www-servers/gunicorn/gunicorn-19.9.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6..9} ) - -inherit distutils-r1 - -DESCRIPTION="A WSGI HTTP Server for UNIX" -HOMEPAGE="https://gunicorn.org https://pypi.org/project/gunicorn https://github.com/benoitc/gunicorn" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT PSF-2 doc? ( BSD )" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/unittest2[${PYTHON_USEDEP}] - )" - -DOCS="README.rst" - -distutils_enable_sphinx 'docs/source' --no-autodoc -distutils_enable_tests pytest - -src_prepare() { - sed -e 's:--cov=gunicorn --cov-report=xml::' -i setup.cfg || die - distutils-r1_src_prepare -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/source/_build/html/. ) - - distutils-r1_python_install_all -} diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml index 9c401ff60394..905c5784fc8f 100644 --- a/www-servers/gunicorn/metadata.xml +++ b/www-servers/gunicorn/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>rafaelmartins@gentoo.org</email> - <name>Rafael G. Martins</name> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> </maintainer> <maintainer type="project"> <email>python@gentoo.org</email> diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest index 228d7944b43b..528a205b0c9b 100644 --- a/x11-libs/gdk-pixbuf-xlib/Manifest +++ b/x11-libs/gdk-pixbuf-xlib/Manifest @@ -1 +1 @@ -DIST gdk-pixbuf-xlib-2.40.2.tar.bz2 52418 BLAKE2B 95c01aef9cafa80171e1ca2d6eb372a3d4e13bdb8d098a1da9259d6cc881494da1954936d20c24d06a38ec5258323e3fc4f6dc4cfc5a9f1ad6e50bc5861e65c6 SHA512 b9831bd1b4db8718b35ed96057496824696e311ce1661394397306ea9d544e6113aaa6865cdd1c1a250bc3617515fd81e3f45d997531507d2592fe294cbde01c +DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37 diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild index e846536da7e5..5b12a3493a54 100644 --- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild +++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild @@ -3,12 +3,11 @@ EAPI=7 -inherit meson multilib-minimal +inherit gnome.org meson multilib-minimal DESCRIPTION="Deprecated Xlib integration for GdkPixbuf" HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib" -SRC_URI="https://gitlab.gnome.org/Archive/${PN}/-/archive/${PV}/${P}.tar.bz2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2+ MPL-1.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest index abfeaec502c7..7718a8935955 100644 --- a/x11-libs/gdk-pixbuf/Manifest +++ b/x11-libs/gdk-pixbuf/Manifest @@ -1,2 +1,3 @@ DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa DIST gdk-pixbuf-2.42.0.tar.xz 6510964 BLAKE2B 1299d050620a08582cb80d3d726713a1c005de3148e6e24a425248ea85f705ee741199c8ab445e4de4c3338904bf37c7a4ff0e61fee4fb23d68a93489b972b84 SHA512 c9962d42e5bf13514091234342e259be1e06b2c4dea2936e16104a3b58f0b6837f070224c04be9541d75f5ea34d1da398f178a1eed1f9059f6429faf5c223e34 +DIST gdk-pixbuf-2.42.2.tar.xz 6514352 BLAKE2B 1230378ee1843f7a861772e708eba64d80a55379104c64b45efa35617aa6d9f0b49ea7996762d91ba1223172162b2b7c1209a53d906c1be43448163f9e230e08 SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2 diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild new file mode 100644 index 000000000000..a76260745fec --- /dev/null +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg + +DESCRIPTION="Image loading library for GTK+" +HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="gtk-doc +introspection jpeg tiff" + +# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review +DEPEND=" + >=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}] + x11-misc/shared-mime-info + >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND} + !<x11-libs/gtk+-2.90.4:3 +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.20 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + >=dev-util/meson-0.55.3 +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gdk-pixbuf-query-loaders$(get_exeext) +) + +PATCHES=( + # Do not run lowmem test on uclibc + # See https://bugzilla.gnome.org/show_bug.cgi?id=756590 + "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch +) + +src_prepare() { + xdg_src_prepare + # This will avoid polluting the pkg-config file with versioned libpng, + # which is causing problems with libpng14 -> libpng15 upgrade + # See upstream bug #667068 + # First check that the pattern is present, to catch upstream changes on bumps, + # because sed doesn't return failure code if it doesn't do any replacements + grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream" + sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + -Dpng=true + $(meson_use tiff) + $(meson_use jpeg) + -Dbuiltin_loaders=png + -Drelocatable=false + #native_windows_loaders + -Dinstalled_tests=false + -Dgio_sniffing=true + ) + if multilib_is_native_abi; then + emesonargs+=( + $(meson_use gtk-doc gtk_docs) + $(meson_feature introspection) + -Dman=true + ) + else + emesonargs+=( + -Dgtk_doc=false + -Dintrospection=disabled + -Dman=false + ) + fi + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} + +pkg_preinst() { + xdg_pkg_preinst + + multilib_pkg_preinst() { + # Make sure loaders.cache belongs to gdk-pixbuf alone + local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache" + + if [[ -e ${EROOT}/${cache} ]]; then + cp "${EROOT}"/${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst + gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + # causes segfault if set, see bug 375615 + unset __GL_NO_DSO_FINALIZER + + xdg_pkg_postinst + multilib_foreach_abi gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + xdg_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache + fi +} diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild new file mode 100644 index 000000000000..252b894c2f53 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 multilib multilib-minimal virtualx + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection +sysprof test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Upstream wants us to do their job: +# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 +RESTRICT="test" + +# FIXME: introspection data is built against system installation of gtk+:3, +# bug #???? +COMMON_DEPEND=" + >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9:= + x11-misc/shared-mime-info + + cloudprint? ( + >=net-libs/rest-0.7[${MULTILIB_USEDEP}] + >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] + ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.17 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] + media-libs/mesa[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) + test? ( + media-fonts/font-misc-misc + media-fonts/font-cursor-misc + ) + X? ( x11-base/xorg-proto ) +" +# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 +# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 + !<gnome-base/gail-1000 + !<x11-libs/vte-0.31.0:2.90 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xsl-stylesheets + dev-libs/gobject-introspection-common + dev-libs/libxslt + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.20 + virtual/pkgconfig + gtk-doc? ( + app-text/docbook-xml-dtd:4.3 + >=dev-util/gtk-doc-1.20 + ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +PATCHES=( + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch + + # Fix broken autotools logic + "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch +) + +strip_builddir() { + local rule=$1 + shift + local directory=$1 + shift + sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ + || die "Could not strip director ${directory} from build." +} + +src_prepare() { + if ! use test ; then + # don't waste time building tests + strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} + + # the tests dir needs to be build now because since commit + # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there + # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} + fi + + if ! use examples; then + # don't waste time building demos + strip_builddir SRC_SUBDIRS demos Makefile.{am,in} + strip_builddir SRC_SUBDIRS examples Makefile.{am,in} + fi + + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + $(use_enable aqua quartz-backend) + $(use_enable broadway broadway-backend) + $(use_enable cloudprint) + $(use_enable colord) + $(use_enable cups cups auto) + $(multilib_native_use_enable gtk-doc) + $(multilib_native_use_enable introspection) + $(use_enable sysprof profiler) + $(use_enable wayland wayland-backend) + $(use_enable X x11-backend) + $(use_enable X xcomposite) + $(use_enable X xdamage) + $(use_enable X xfixes) + $(use_enable X xkb) + $(use_enable X xrandr) + $(use_enable xinerama) + # cloudprovider is not packaged in Gentoo yet + --disable-cloudproviders + --disable-papi + --enable-man + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog + # need libdir here to avoid a double slash in a path that libtool doesn't + # grok so well during install (// between $EPREFIX and usr ...) + # TODO: Is this still the case? + --libdir="${EPREFIX}"/usr/$(get_libdir) + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" + ) + + if use wayland; then + myconf+=( + # Include wayland immodule into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + --with-included-immodules=wayland + ) + fi; + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + local d + for d in gdk gtk libgail-util; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die + GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.{in,commits,win32} that would get installed by default + DOCS=( AUTHORS ChangeLog NEWS README ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die + else + touch "${ED}${cache}" || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + } + multilib_foreach_abi multilib_pkg_postrm + fi +} diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild index 0eedddc69c5d..cf92719098c7 100644 --- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild +++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +XORG_DOC=doc XORG_MULTILIB=yes inherit xorg-3 diff --git a/x11-terms/rxvt-unicode/files/urxvtd.service b/x11-terms/rxvt-unicode/files/urxvtd.service new file mode 100644 index 000000000000..758e8154cee6 --- /dev/null +++ b/x11-terms/rxvt-unicode/files/urxvtd.service @@ -0,0 +1,9 @@ +[Unit] +Description=rxvt-unicode terminal daemon +Documentation=man:urxvtd + +[Service] +ExecStart=/usr/bin/urxvtd + +[Install] +WantedBy=default.target diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild index ce083fc2e2f3..4d046e664f9c 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools desktop +inherit autotools desktop systemd COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch" @@ -90,6 +90,8 @@ src_compile() { src_install() { default + systemd_douserunit "${FILESDIR}"/urxvtd.service + make_desktop_entry urxvt rxvt-unicode utilities-terminal \ "System;TerminalEmulator" } diff --git a/x11-themes/fedora-backgrounds/Manifest b/x11-themes/fedora-backgrounds/Manifest index 403fa46db14d..607215bc1ee1 100644 --- a/x11-themes/fedora-backgrounds/Manifest +++ b/x11-themes/fedora-backgrounds/Manifest @@ -4,3 +4,4 @@ DIST f29-backgrounds-29.1.3.tar.xz 170130460 BLAKE2B dc7e8e25f8d65f9de8939e0468d DIST f30-backgrounds-30.1.2.tar.xz 215810052 BLAKE2B 203a8d5213aab09de7e050fceb333092d77df99557d827930542cbe0443ff16f510b0fb66d294e63871ffb6e942e373eb9890e7eb139523b1573bc12e328e9b7 SHA512 a6b2c3d0d38a0bb76f987e85b584afe2ce8079f8667a3ef253deff12b96678f2fb92ab2f6d04770e9154dd3bb4bc0fc871d5c18da989e5fa7f9f61464d7b3322 DIST f31-backgrounds-31.0.4.tar.xz 317019080 BLAKE2B a6d3d8f1e41e5f0186ce4b4ffa052190d8422bf24db3c6fa02f1eda0d016af7cf58f8da9d1a391a8c2a46d1f1b2a21f2c889c6704a9e997262ae9a43447e55dc SHA512 77244938ef3bd3dff8d8327645373b368f10aef78cf15fa56045b3f6c76dee502a6682b4bb756e1c16f4021481f7ee2317a73273bb2e50abc729b5847db23718 DIST f32-backgrounds-32.2.2.tar.xz 162995272 BLAKE2B 6c965cdfaa672877b1be087edb6de088f90f69027a1645781d19761f49023fde383301cf658f536aab32b1886960e4f9f7e7bf7b3c82ad2cb1fecffd28664ceb SHA512 b86596ce1f7db5ea63ad8f2271e8e90fb9fff24b72cacd0b30ed75a25ecf762548b0211ff9420d35ec110945ee5fb1a244a7848483e202f98faa0a5110fcf4b5 +DIST f33-backgrounds-33.0.8.tar.xz 30354496 BLAKE2B 7f64108aafccba083bea2e3b56438c29575facccf73ea6a1dbb0a42037b63c3f6a6c3491e76fdd8116af5a6eac8fe7d7cd26955a4ff7b92d2fa6e77400484e09 SHA512 bc293b62749dd99a5066c1641b734fcbe881da3f477a82b175d324a72958d36cf60a4cceec41b4b71f001be6af8fe044eba74ffb4914dbe2cba960212d9a8d4d diff --git a/x11-themes/fedora-backgrounds/fedora-backgrounds-33.0.8.ebuild b/x11-themes/fedora-backgrounds/fedora-backgrounds-33.0.8.ebuild new file mode 100644 index 000000000000..cbd61f1779a8 --- /dev/null +++ b/x11-themes/fedora-backgrounds/fedora-backgrounds-33.0.8.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A set of default and supplemental wallpapers for Fedora" +HOMEPAGE="https://github.com/fedoradesign/backgrounds" + +MY_PN="f$(ver_cut 1)-backgrounds" +MY_P="${MY_PN}-${PV}" +SRC_URI="https://github.com/fedoradesign/backgrounds/releases/download/v${PV}/${MY_P}.tar.xz" + +# Review on each bump, files Attribution* +LICENSE="CC-BY-SA-4.0" + +KEYWORDS="~amd64 ~x86" +IUSE="" +SLOT="$(ver_cut 1)" + +RDEPEND="" +DEPEND="" +BDEPEND="" + +S="${WORKDIR}/${MY_PN}" |