diff options
10 files changed, 167 insertions, 89 deletions
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild index d5e4cec20bf8..88d34677f297 100644 --- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild +++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild @@ -19,6 +19,12 @@ DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" +PATCHES=( + "${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch + "${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch + "${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch +) + multilib_src_configure() { ECONF_SOURCE="${S}" econf } diff --git a/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch new file mode 100644 index 000000000000..62e436c7c92a --- /dev/null +++ b/dev-libs/ding-libs/files/0000-INI-Fix-detection-of-error-messages.patch @@ -0,0 +1,47 @@ +From 72c19bd018b107ecf5a80963b433e9922f7243fd Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik <lslebodn@redhat.com> +Date: Wed, 3 Jan 2018 18:03:44 +0100 +Subject: [PATCH] INI: Fix detection of error messages +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +libc on BSD returns different error messages. + +Reviewed-by: Michal Židek <mzidek@redhat.com> +--- + ini/ini_validators_ut_check.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c +index fa7105a..9ecde75 100644 +--- a/ini/ini_validators_ut_check.c ++++ b/ini/ini_validators_ut_check.c +@@ -607,6 +607,12 @@ START_TEST(test_ini_allowed_options_wrong_regex) + "[rule/options_for_foo]: Cannot compile regular expression " + "from option 'section_re'. " + "Error: 'Unmatched [ or [^'"); ++ if (ret != 0) { ++ ret = strcmp(errmsg, ++ "[rule/options_for_foo]: Cannot compile regular expression " ++ "from option 'section_re'. " ++ "Error: 'brackets ([ ]) not balanced'"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +@@ -1028,6 +1034,11 @@ START_TEST(test_ini_allowed_sections_wrong_regex) + ret = strcmp(errmsg, + "[rule/section_list]: Validator failed to use regex " + "[^foo\\(*$]:[Unmatched ( or \\(]"); ++ if (ret !=0) { ++ ret = strcmp(errmsg, ++ "[rule/section_list]: Validator failed to use regex " ++ "[^foo\\(*$]:[parentheses not balanced]"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +-- +2.21.0 + diff --git a/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch new file mode 100644 index 000000000000..a9ca8e9edc2b --- /dev/null +++ b/dev-libs/ding-libs/files/0001-path_utils_ut-allow-single-as-well.patch @@ -0,0 +1,36 @@ +From 4236e323e8ab4f13770e1ac9e94666b304b693fb Mon Sep 17 00:00:00 2001 +From: Henrik Riomar <henrik.riomar@gmail.com> +Date: Tue, 24 Jul 2018 21:59:36 +0000 +Subject: [PATCH 1/2] path_utils_ut: allow single / as well +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_266 + Multiple successive slashes are considered to be the same as one slash. + +When running the tests on a musl libc system + get_dirname(p, PATH_MAX, "//foo//") +actually results in a / and not // + +Reviewed-by: Michal Židek <mzidek@redhat.com> +--- + path_utils/path_utils_ut.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/path_utils/path_utils_ut.c b/path_utils/path_utils_ut.c +index 27c99b6..061abfb 100644 +--- a/path_utils/path_utils_ut.c ++++ b/path_utils/path_utils_ut.c +@@ -62,7 +62,7 @@ START_TEST(test_dirname) + fail_unless_str_equal(p, "//foo"); + + fail_unless(get_dirname(p, PATH_MAX, "//foo//") == SUCCESS); +- fail_unless_str_equal(p, "//"); ++ fail_unless(!strcmp(p, "/") || !strcmp(p, "//")); + + fail_unless(get_dirname(p, PATH_MAX, "foo//bar") == SUCCESS); + fail_unless_str_equal(p, "foo"); +-- +2.21.0 + diff --git a/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch new file mode 100644 index 000000000000..0524a128d620 --- /dev/null +++ b/dev-libs/ding-libs/files/0002-validators_ut_check-Fix-fail-with-new-glibc.patch @@ -0,0 +1,49 @@ +From 9f9a3ded23cc2bb917468939b745cc498cec523a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C5=BDidek?= <mzidek@redhat.com> +Date: Wed, 1 Aug 2018 17:48:10 +0200 +Subject: [PATCH 2/2] validators_ut_check: Fix fail with new glibc + +Error message was slightly change from previous version +of glibc which caused fails in validators unit tests. + +Reviewed-by: Jakub Hrozek <jhrozek@redhat.com> +--- + ini/ini_validators_ut_check.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/ini/ini_validators_ut_check.c b/ini/ini_validators_ut_check.c +index 9ecde75..3af8551 100644 +--- a/ini/ini_validators_ut_check.c ++++ b/ini/ini_validators_ut_check.c +@@ -602,6 +602,8 @@ START_TEST(test_ini_allowed_options_wrong_regex) + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + ++ /* Different versions of libc produce slightly different error strings ++ * in this case. For simplicity compare against all of them. */ + errmsg = ini_errobj_get_msg(errobj); + ret = strcmp(errmsg, + "[rule/options_for_foo]: Cannot compile regular expression " +@@ -609,10 +611,17 @@ START_TEST(test_ini_allowed_options_wrong_regex) + "Error: 'Unmatched [ or [^'"); + if (ret != 0) { + ret = strcmp(errmsg, +- "[rule/options_for_foo]: Cannot compile regular expression " +- "from option 'section_re'. " ++ "[rule/options_for_foo]: Cannot compile regular " ++ "expression from option 'section_re'. " + "Error: 'brackets ([ ]) not balanced'"); + } ++ ++ if (ret != 0) { ++ ret = strcmp(errmsg, ++ "[rule/options_for_foo]: Cannot compile regular " ++ "expression from option 'section_re'. " ++ "Error: 'Unmatched [, [^, [:, [., or [='"); ++ } + fail_unless(ret == 0, "Got msg: [%s]", errmsg); + ini_errobj_next(errobj); + +-- +2.21.0 + diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest index c2adb1b90e2b..65d94a9871b3 100644 --- a/media-sound/soundconverter/Manifest +++ b/media-sound/soundconverter/Manifest @@ -1,2 +1 @@ -DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92 diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild deleted file mode 100644 index 58d2ba6e2c78..000000000000 --- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{5,6} ) - -inherit gnome2 python-single-r1 - -DESCRIPTION="A simple audiofile converter application for the GNOME environment" -HOMEPAGE="https://soundconverter.org/" -MY_PV="${PV/_/-}" -SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="aac flac libnotify mp3 ogg opus vorbis" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-libs/gobject-introspection:= - x11-libs/gtk+:3[introspection] - media-libs/gstreamer:1.0[introspection] -" - -# gst-plugins-meta for any decoders, USE flags for specific encoders used by code -# List in soundconverter/gstreamer.py -# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional -RDEPEND="${COMMON_DEPEND} - x11-libs/pango[introspection] - dev-python/gst-python:1.0[${PYTHON_USEDEP}] - libnotify? ( x11-libs/libnotify[introspection] ) - - media-libs/gst-plugins-base:1.0[vorbis?,ogg?] - media-plugins/gst-plugins-meta:1.0 - flac? ( media-plugins/gst-plugins-flac:1.0 ) - media-libs/gst-plugins-good:1.0 - mp3? ( - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-ugly:1.0 - media-plugins/gst-plugins-lame:1.0 - ) - aac? ( media-plugins/gst-plugins-faac:1.0 ) - opus? ( media-plugins/gst-plugins-opus:1.0 ) -" -DEPEND="${COMMON_DEPEND} - dev-util/intltool - sys-devel/gettext -" - -RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails - -src_prepare() { - python_fix_shebang . - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python -} diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild index 468271629f24..1e5bcc40f69b 100644 --- a/sci-libs/hdf5/hdf5-1.10.5.ebuild +++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P LICENSE="NCSA-HDF" SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="cxx debug examples fortran +hl mpi static-libs szip threads zlib" REQUIRED_USE=" diff --git a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild index aee768144050..ed7bc463cb38 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20190514.ebuild @@ -6,12 +6,11 @@ inherit savedconfig if [[ ${PV} == 99999999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" else GIT_COMMIT="711d3297bac870af42088a467459a0634c1970ca" SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86" fi DESCRIPTION="Linux firmware files" @@ -25,17 +24,10 @@ SLOT="0" IUSE="+redistributable savedconfig unknown-license" RESTRICT="binchecks strip unknown-license? ( bindist )" -REQUIRED_USE="unknown-license? ( redistributable )" RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] - unknown-license? ( - !sys-firmware/alsa-firmware[alsa_cards_korg1212] - !sys-firmware/alsa-firmware[alsa_cards_maestro3] - !sys-firmware/alsa-firmware[alsa_cards_sb16] - !sys-firmware/alsa-firmware[alsa_cards_ymfpci] - ) !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] @@ -69,7 +61,14 @@ RDEPEND="!savedconfig? ( !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) + unknown-license? ( + !sys-firmware/alsa-firmware[alsa_cards_korg1212] + !sys-firmware/alsa-firmware[alsa_cards_maestro3] + !sys-firmware/alsa-firmware[alsa_cards_sb16] + !sys-firmware/alsa-firmware[alsa_cards_ymfpci] + ) )" + #add anything else that collides to this src_unpack() { @@ -229,15 +228,18 @@ src_prepare() { rm -r ${source_files[@]} || die if use !unknown-license; then - # remove files in the unknown_license blacklist + # remove files in unknown_license rm "${unknown_license[@]}" || die fi if use !redistributable; then - # remove files _not_ in the free_software whitelist + # remove files _not_ in the free_software or unknown_license lists + # everything else is confirmed (or assumed) to be redistributable + # based on upstream acceptance policy local file remove=() while IFS= read -d "" -r file; do - has "${file#./}" "${free_software[@]}" || remove+=("${file}") + has "${file#./}" "${free_software[@]}" "${unknown_license[@]}" \ + || remove+=("${file}") done < <(find * ! -type d -print0 || die) printf "%s\0" "${remove[@]}" | xargs -0 rm || die fi diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index e6e8cd053eca..f9f30c6799ac 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -6,7 +6,6 @@ inherit savedconfig if [[ ${PV} == 99999999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" else GIT_COMMIT="" @@ -25,17 +24,10 @@ SLOT="0" IUSE="+redistributable savedconfig unknown-license" RESTRICT="binchecks strip unknown-license? ( bindist )" -REQUIRED_USE="unknown-license? ( redistributable )" RDEPEND="!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] - unknown-license? ( - !sys-firmware/alsa-firmware[alsa_cards_korg1212] - !sys-firmware/alsa-firmware[alsa_cards_maestro3] - !sys-firmware/alsa-firmware[alsa_cards_sb16] - !sys-firmware/alsa-firmware[alsa_cards_ymfpci] - ) !media-tv/cx18-firmware !<sys-firmware/ivtv-firmware-20080701-r1 !media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx] @@ -69,7 +61,14 @@ RDEPEND="!savedconfig? ( !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/radeon-ucode ) + unknown-license? ( + !sys-firmware/alsa-firmware[alsa_cards_korg1212] + !sys-firmware/alsa-firmware[alsa_cards_maestro3] + !sys-firmware/alsa-firmware[alsa_cards_sb16] + !sys-firmware/alsa-firmware[alsa_cards_ymfpci] + ) )" + #add anything else that collides to this src_unpack() { @@ -229,15 +228,18 @@ src_prepare() { rm -r ${source_files[@]} || die if use !unknown-license; then - # remove files in the unknown_license blacklist + # remove files in unknown_license rm "${unknown_license[@]}" || die fi if use !redistributable; then - # remove files _not_ in the free_software whitelist + # remove files _not_ in the free_software or unknown_license lists + # everything else is confirmed (or assumed) to be redistributable + # based on upstream acceptance policy local file remove=() while IFS= read -d "" -r file; do - has "${file#./}" "${free_software[@]}" || remove+=("${file}") + has "${file#./}" "${free_software[@]}" "${unknown_license[@]}" \ + || remove+=("${file}") done < <(find * ! -type d -print0 || die) printf "%s\0" "${remove[@]}" | xargs -0 rm || die fi diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild index e870ff076573..33c4ec2a3342 100644 --- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild +++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="X C-language Bindings sample implementations" HOMEPAGE="https://xcb.freedesktop.org/" SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" IUSE="test" RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |