summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/Manifest.gzbin49335 -> 49361 bytes
-rw-r--r--sys-apps/accountsservice/Manifest2
-rw-r--r--sys-apps/accountsservice/accountsservice-0.6.55.ebuild2
-rw-r--r--sys-apps/bolt/Manifest2
-rw-r--r--sys-apps/bolt/bolt-0.9.ebuild41
-rw-r--r--sys-apps/dbus/Manifest2
-rw-r--r--sys-apps/dbus/dbus-1.12.20.ebuild272
-rw-r--r--sys-apps/exa/Manifest2
-rw-r--r--sys-apps/exa/exa-0.9.0-r1.ebuild (renamed from sys-apps/exa/exa-0.9.0.ebuild)11
-rw-r--r--sys-apps/flashrom/Manifest2
-rw-r--r--sys-apps/flashrom/flashrom-0.9.8.ebuild155
-rw-r--r--sys-apps/fwupd/Manifest8
-rw-r--r--sys-apps/fwupd/fwupd-1.3.10.ebuild9
-rw-r--r--sys-apps/fwupd/fwupd-1.3.11.ebuild9
-rw-r--r--sys-apps/fwupd/fwupd-1.4.2.ebuild9
-rw-r--r--sys-apps/fwupd/fwupd-1.4.4.ebuild9
-rw-r--r--sys-apps/haveged/Manifest4
-rw-r--r--sys-apps/haveged/haveged-1.9.13.ebuild (renamed from sys-apps/haveged/haveged-1.9.12.ebuild)0
-rw-r--r--sys-apps/help2man/Manifest6
-rw-r--r--sys-apps/help2man/help2man-1.47.14.ebuild41
-rw-r--r--sys-apps/help2man/help2man-1.47.16.ebuild (renamed from sys-apps/help2man/help2man-1.47.13.ebuild)0
-rw-r--r--sys-apps/iucode_tool/Manifest10
-rw-r--r--sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild15
-rw-r--r--sys-apps/iucode_tool/iucode_tool-2.2.ebuild15
-rw-r--r--sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild (renamed from sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild)4
-rw-r--r--sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild15
-rw-r--r--sys-apps/iucode_tool/iucode_tool-2.3.ebuild15
-rw-r--r--sys-apps/less/Manifest4
-rw-r--r--sys-apps/less/less-563.ebuild (renamed from sys-apps/less/less-561.ebuild)0
-rw-r--r--sys-apps/opal-utils/Manifest2
-rw-r--r--sys-apps/opal-utils/opal-utils-6.6.2.ebuild96
-rw-r--r--sys-apps/policycoreutils/Manifest6
-rw-r--r--sys-apps/policycoreutils/policycoreutils-2.9.ebuild2
-rw-r--r--sys-apps/policycoreutils/policycoreutils-3.0.ebuild2
-rw-r--r--sys-apps/policycoreutils/policycoreutils-9999.ebuild2
-rw-r--r--sys-apps/selinux-python/Manifest6
-rw-r--r--sys-apps/selinux-python/selinux-python-2.9.ebuild2
-rw-r--r--sys-apps/selinux-python/selinux-python-3.0.ebuild2
-rw-r--r--sys-apps/selinux-python/selinux-python-9999.ebuild2
-rw-r--r--sys-apps/util-linux/Manifest2
-rw-r--r--sys-apps/util-linux/util-linux-2.35.2.ebuild2
-rw-r--r--sys-apps/x86info/Manifest11
-rw-r--r--sys-apps/x86info/files/1.21-pic.patch14
-rw-r--r--sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch12
-rw-r--r--sys-apps/x86info/files/x86info-1.30-fix-build-system.patch12
-rw-r--r--sys-apps/x86info/files/x86info-1.30-makefile.patch72
-rw-r--r--sys-apps/x86info/files/x86info-1.30-pic.patch (renamed from sys-apps/x86info/files/x86info-1.24-pic.patch)8
-rw-r--r--sys-apps/x86info/x86info-1.30-r1.ebuild72
-rw-r--r--sys-apps/x86info/x86info-1.30.ebuild72
-rw-r--r--sys-apps/x86info/x86info-1.30_p20190617.ebuild18
50 files changed, 563 insertions, 518 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bd51a38e0338..450c1fd01ae3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
Binary files differ
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index b4099f920dbd..00aa8776e144 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
-EBUILD accountsservice-0.6.55.ebuild 1773 BLAKE2B 3a2cb1891170494b531740577bccd987bcb98236a0178a0ad8e6030f3159fccd07dd51b5032ba64a238166941ff2b8046ae3b6de1137893e7f2bbdee9c19232a SHA512 65e9f962aff10e586ba6c8db8945c7df48733145d2c0d88c5904ff7e011968e3a8912351be9002444bc7363032b17374b7fd3fe31c1ef1435b4ea7bee5c40680
+EBUILD accountsservice-0.6.55.ebuild 1772 BLAKE2B 90eaf26e8b8fad4567f04cbec7282b5459e15a3062e1f11fc88c051901b364cd1c6e327078c2da3e83cf1edc76ec830a8185aa3af2323420e8879bb763e918df SHA512 396b1ecf75a5fdbfa3cb0c1dd7821aabf64ffb48fa525ce6ae7615c873c5b87c4e368b073b4ae5d2345ff78d24d5ff1100fe0cbf9af331c33494f3515e9ab7ad
MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 78a9dca8f4b9..594f51a3a774 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index bdcf0d2ad960..dc8b5ad88f5e 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,4 +1,6 @@
DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
+DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
DIST bolt-210-r2.patch 369 BLAKE2B 2ee8b084d8a89fac361e434fddaac50a1c10fd412b450dbe496d263d07cbd9961c33b84b04ae8296154ad16c01f6c3ba6599b48649d54c4ceb77d52797eddb53 SHA512 e66787ab18acb9924903ab92bf878e48b4aed39ea6aa18d874121316cb0452a00358a4adde1e7bbd903d682a6a001e20fd573af782db25d6c54b18ffafd29329
EBUILD bolt-0.8-r1.ebuild 1035 BLAKE2B 86674fb1f2b2c59cdf07d60cb9671cadd9bbd6da0ce20ea559b4f2c545414580f032d6aec687890244388e1b877095930df7cbcc4e69cf814f5196766fc1775f SHA512 0aae5be42f2062a68723542aeaff86e74ad34f488338034b2c9398fd04ff03c49de4eff2f5c43231bdc31bff47d6a11a46a47299c428a7a2d689d934190332fe
+EBUILD bolt-0.9.ebuild 870 BLAKE2B 323048debaab00c3dcc587bd33023cf4b3073aaacf99d5c43fa044d0beab2a99df81f740d1a6ff929d8b5e79e7f1bbf21ddb64c191d098ee8a421852b1b22550 SHA512 be8f347b7bb3e99797b80bc06c26bfb0b05fb3e7f17fd18c3da38a7eb2b10a4f7bb6d539cc13740c33e50d87746469f327f4de4d5e0dfd58ba78a960e66cff88
MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9.ebuild b/sys-apps/bolt/bolt-0.9.ebuild
new file mode 100644
index 000000000000..f9decd2321f0
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc systemd"
+
+DEPEND="
+ >=dev-libs/glib-2.56.0:2
+ dev-util/glib-utils
+ virtual/libudev
+ virtual/udev
+ dev-util/umockdev
+ sys-auth/polkit[introspection]
+ systemd? ( sys-apps/systemd )
+ doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local emesonargs=(
+ -Dman=$(usex doc true false)
+ --sysconfdir=/etc
+ --localstatedir=/var
+ --sharedstatedir=/var/lib
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ keepdir /var/lib/boltd
+}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 9ac5f8222606..841b97686938 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,6 +4,8 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
+DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
EBUILD dbus-1.12.16.ebuild 7239 BLAKE2B 23b3cbdf703d8afda87a03a8ef88d4ceff4f2d3544ec78174db9e1d0b8ee78ca52dd0aa687b830973842dcdc6b3c1362391c256d9acf5008b557969f9efe4a1c SHA512 ef8d1065d99cb9750b0d4145440d65d461794a448c35eaf2325bceffcf590a47783c89b7c65983c2ee66d05632a269dd7e1a580601df9c19128b30d3dfab5b71
EBUILD dbus-1.12.18.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
+EBUILD dbus-1.12.20.ebuild 7248 BLAKE2B 53ecfcf48317d5ed87dc705e0c5a9ad31417a213c72ee2661f44232ac48949229a01f49c133b9a27dc8848e35c37541567247ec3f3d51c0bc0467276354d0433 SHA512 44098299f0d461a2a04bf62fe123cbbd7dd52176dc896bbeb422924557f78f44a075007c04260107c68de004215ee60ac5bec61f25dc15dae49dab8181c66627
MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.20.ebuild b/sys-apps/dbus/dbus-1.12.20.ebuild
new file mode 100644
index 000000000000..3b9952f62bb9
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.20.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
+
+LICENSE="|| ( AFL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+ acct-user/messagebus
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.4
+ sys-devel/autoconf-archive
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+ >=dev-libs/expat-2.1.0
+ elogind? ( sys-auth/elogind )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXt
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/expat
+ test? (
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40:2
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-user/messagebus
+ selinux? ( sec-policy/selinux-dbus )
+"
+
+DOC_CONTENTS="
+ Some applications require a session bus in addition to the system
+ bus. Please see \`man dbus-launch\` for more information.
+"
+
+# out of sources build dir for make check
+TBD="${WORKDIR}/${P}-tests-build"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-enable-elogind.patch"
+ "${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+
+ if use kernel_linux; then
+ CONFIG_CHECK="~EPOLL"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Tests were restricted because of this
+ sed -i \
+ -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+ -e '/"dispatch"/d' \
+ bus/test-main.c || die
+
+ default
+
+ if [[ ${CHOST} == *-solaris* ]]; then
+ # fix standards conflict, due to gcc being c99 by default nowadays
+ sed -i \
+ -e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+ configure.ac || die
+ fi
+
+ # required for bug 263909, cross-compile so don't remove eautoreconf
+ eautoreconf
+}
+
+src_configure() {
+ local rundir=$(usex kernel_linux /run /var/run)
+ sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+ > "${T}"/dbus.initd || die
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local docconf myconf testconf
+
+ # so we can get backtraces from apps
+ case ${CHOST} in
+ *-mingw*)
+ # error: unrecognized command line option '-rdynamic' wrt #488036
+ ;;
+ *)
+ append-flags -rdynamic
+ ;;
+ esac
+
+ # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
+ # not on an SELinux profile.
+ myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_enable static-libs static)
+ $(use_enable debug verbose-mode)
+ --disable-asserts
+ --disable-checks
+ $(use_enable selinux)
+ $(use_enable selinux libaudit)
+ --disable-apparmor
+ $(use_enable kernel_linux inotify)
+ $(use_enable kernel_FreeBSD kqueue)
+ $(use_enable elogind)
+ $(use_enable systemd)
+ $(use_enable user-session)
+ --disable-embedded-tests
+ --disable-modular-tests
+ $(use_enable debug stats)
+ --with-session-socket-dir="${EPREFIX}"/tmp
+ --with-system-pid-file="${EPREFIX}${rundir}"/dbus.pid
+ --with-system-socket="${EPREFIX}${rundir}"/dbus/system_bus_socket
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ --with-dbus-user=messagebus
+ $(use_with X x)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=(
+ --enable-launchd
+ --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
+ )
+ fi
+
+ if multilib_is_native_abi; then
+ docconf=(
+ --enable-xml-docs
+ $(use_enable doc doxygen-docs)
+ )
+ else
+ docconf=(
+ --disable-xml-docs
+ --disable-doxygen-docs
+ )
+ myconf+=(
+ --disable-daemon
+ --disable-selinux
+ --disable-libaudit
+ --disable-elogind
+ --disable-systemd
+ --without-x
+ )
+ fi
+
+ einfo "Running configure in ${BUILD_DIR}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
+
+ if multilib_is_native_abi && use test; then
+ mkdir "${TBD}" || die
+ cd "${TBD}" || die
+ testconf=(
+ $(use_enable test asserts)
+ $(use_enable test checks)
+ $(use_enable test embedded-tests)
+ $(use_enable test stats)
+ $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+ )
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ # after the compile, it uses a selinuxfs interface to
+ # check if the SELinux policy has the right support
+ use selinux && addwrite /selinux/access
+
+ einfo "Running make in ${BUILD_DIR}"
+ emake
+
+ if use test; then
+ einfo "Running make in ${TBD}"
+ emake -C "${TBD}"
+ fi
+ else
+ emake -C dbus libdbus-1.la
+ fi
+}
+
+src_test() {
+ DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C dbus \
+ install-libLTLIBRARIES install-dbusincludeHEADERS \
+ install-nodist_dbusarchincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ newinitd "${T}"/dbus.initd dbus
+
+ if use X; then
+ # dbus X session script (#77504)
+ # turns out to only work for GDM (and startx). has been merged into
+ # other desktop (kdm and such scripts)
+ exeinto /etc/X11/xinit/xinitrc.d
+ doexe "${FILESDIR}"/80-dbus
+ fi
+
+ # needs to exist for dbus sessions to launch
+ keepdir /usr/share/dbus-1/services
+ keepdir /etc/dbus-1/{session,system}.d
+ # machine-id symlink from pkg_postinst()
+ keepdir /var/lib/dbus
+ # let the init script create the /var/run/dbus directory
+ rm -rf "${ED}"/var/run
+
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO
+ readme.gentoo_create_doc
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
+ # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
+ # dependencies with hardcoded paths (although the known ones got fixed already)
+ dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
+ ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ local plist="org.freedesktop.dbus-session.plist"
+ elog
+ elog
+ elog "For MacOS/Darwin we now ship launchd support for dbus."
+ elog "This enables autolaunch of dbus at session login and makes"
+ elog "dbus usable under MacOS/Darwin."
+ elog
+ elog "The launchd plist file ${plist} has been"
+ elog "installed in ${EPREFIX}/Library/LaunchAgents."
+ elog "For it to be used, you will have to do all of the following:"
+ elog " + cd ~/Library/LaunchAgents"
+ elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
+ elog " + logout and log back in"
+ elog
+ elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
+ elog "specified and refused to start otherwise, then export the"
+ elog "the following to your environment:"
+ elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
+ fi
+}
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index 10a3ee61319b..c50ad30e9fad 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -62,5 +62,5 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
-EBUILD exa-0.9.0.ebuild 1961 BLAKE2B e9aad1fd5a2a62d7dee9fac1abd580d0cec3bcb0e628451ab7dabbc31d7a7d2e61c512726eaac0c56294bfb1195dfcebecb667a784505335a5f28303a90a0464 SHA512 dac7a2b2cdc6f68e253589ec567b87d8ca35a52948eb303eb5e2e4c9fab7cdcf95c2dbaeb910d3308fe32312ab7eba7c7b7ebc9f5d34deca8e93640d68db5bc9
+EBUILD exa-0.9.0-r1.ebuild 2036 BLAKE2B 5344785f721a35548a99edfba4ff6fd3ad679a3eb57c9b94a0d10aea6b37744e0cf47a7ff4026d1e2eb4d07a8c9228800fb1fdaeba13b99733220d6e467abaed SHA512 4ac3694ebbc396f806d9b7b195a1a1fae0a0848d3794249c0830c71b37ef4d9212cd5e7a3e084114b90214be89401c925de440edd782873501e3d41f5be1ac9c
MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/exa-0.9.0.ebuild b/sys-apps/exa/exa-0.9.0-r1.ebuild
index 4be36c085f50..01d6850ecc92 100644
--- a/sys-apps/exa/exa-0.9.0.ebuild
+++ b/sys-apps/exa/exa-0.9.0-r1.ebuild
@@ -81,20 +81,17 @@ SLOT="0"
KEYWORDS="amd64 ~ppc64 ~x86"
IUSE="+git"
-DEPEND="
- git? (
- dev-libs/libgit2:=
- net-libs/http-parser:=
- )
-"
-
+DEPEND="git? ( dev-libs/libgit2:= )"
RDEPEND="${DEPEND}"
+# some tests fail on tmpfs/zfs/btrfs
RESTRICT="test"
QA_FLAGS_IGNORED="/usr/bin/exa"
src_compile() {
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
cargo_src_compile $(usex git "" --no-default-features)
}
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 3b2b3737927e..273304be8e7b 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,4 @@
-DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-0.9.8.ebuild b/sys-apps/flashrom/flashrom-0.9.8.ebuild
deleted file mode 100644
index 11d55eafa946..000000000000
--- a/sys-apps/flashrom/flashrom-0.9.8.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
- inherit git-r3
-else
- SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
- atahpt
- +atavia
- +buspirate-spi
- dediprog
- +drkaiser
- +dummy
- +ft2232-spi
- +gfxnvidia
- +internal
- +it8212
- +linux-spi
- mstarddc-spi
- +nic3com
- +nicintel
- +nicintel-eeprom
- +nicintel-spi
- nicnatsemi
- +nicrealtek
- +ogp-spi
- +pickit2-spi
- +pony-spi
- +rayer-spi
- +satamv
- +satasii
- +serprog
- +usbblaster-spi
-"
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
- atahpt? ( sys-apps/pciutils[static-libs(+)] )
- atavia? ( sys-apps/pciutils[static-libs(+)] )
- dediprog? ( virtual/libusb:0[static-libs(+)] )
- drkaiser? ( sys-apps/pciutils[static-libs(+)] )
- ft2232-spi? ( dev-embedded/libftdi:0[static-libs(+)] )
- gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
- internal? ( sys-apps/pciutils[static-libs(+)] )
- it8212? ( sys-apps/pciutils[static-libs(+)] )
- nic3com? ( sys-apps/pciutils[static-libs(+)] )
- nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
- nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
- nicintel? ( sys-apps/pciutils[static-libs(+)] )
- nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
- nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
- ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
- pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
- rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
- satamv? ( sys-apps/pciutils[static-libs(+)] )
- satasii? ( sys-apps/pciutils[static-libs(+)] )
- usbblaster-spi? ( dev-embedded/libftdi:0[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-_flashrom_enable() {
- local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
- args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
- local u
- for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_prepare() {
- sed -i \
- -e 's:pkg-config:$(PKG_CONFIG):' \
- Makefile || die
-
- default
-}
-
-src_compile() {
- # Help keep things in sync.
- local sprogs=$(echo $(
- grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
- LC_ALL=C sort -u | \
- sed 's:^CONFIG_::' | \
- tr '[:upper:]_' '[:lower:]-'))
- local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
- if [[ ${sprogs} != "${eprogs}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "IUSE set to: ${eprogs}"
- eerror "flashrom.c : ${sprogs}"
- die "sync IUSE to the list of source programmers"
- fi
-
- # Turn USE flags into CONFIG_xxx settings.
- local args=()
- flashrom_enable ${eprogs}
- _flashrom_enable wiki PRINT_WIKI
- _flashrom_enable static STATIC
-
- # You have to specify at least one programmer, and if you specify more than
- # one programmer you have to include either dummy or internal in the list.
- # We pick dummy as the default because internal requires libpci.
- if ! use internal && ! use dummy ; then
- if [[ ${#args[@]} -ne 1 ]] ; then
- ewarn "You have to specify at least one programmer, and if you specify"
- ewarn "more than one programmer, you have to enable either dummy or"
- ewarn "internal as well. 'dummy' will be the default now."
- args+=( CONFIG_DUMMY=yes )
- fi
- fi
-
- tc-export AR CC PKG_CONFIG RANLIB
- emake WARNERROR=no "${args[@]}"
-}
-
-src_test() {
- if [[ -d tests ]] ; then
- pushd tests >/dev/null
- ./tests.py || die
- popd >/dev/null
- fi
-}
-
-src_install() {
- dosbin flashrom
- doman flashrom.8
- dodoc ChangeLog README Documentation/*.txt
-
- if use tools ; then
- if use amd64 ; then
- dosbin util/ich_descriptors_tool/ich_descriptors_tool
- elif use x86 ; then
- dosbin util/ich_descriptors_tool/ich_descriptors_tool
- fi
- fi
-}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cebbda26948a..b4d0a5994f0d 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,8 +7,8 @@ DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c
DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
-EBUILD fwupd-1.3.10.ebuild 4186 BLAKE2B 287319be4161408025db0307c6356e76e596cf6ef01ce2b3db932b30f288ac181faf43afdc8222be6fa69816ec15a4f8dbac56879575bcb761e56c5d89063163 SHA512 22a425094094484874f363c078143e1a3400415dab5e62f84d6d5b64d259c31811de5b08355275dbdcd3675a0fcc3a41b3245712a5a231c4fb9f133223306363
-EBUILD fwupd-1.3.11.ebuild 4188 BLAKE2B 10fcb95d9ddd6158b33be98a772db66e857ff34c06d71592dc894ea6b2308c28c0f2af71ee3135b4b12d5aa25fb1c9fd7a66646e3eca427309f5b402374a3a03 SHA512 0e24ebd628dd7f48a90cd6d745ededaddf4bbdf29e6e3df5406ba92280cb5818debbb72fdaf1af71e55aac1143512077769cc4e15d76e301c0dd3276fab28faf
-EBUILD fwupd-1.4.2.ebuild 4071 BLAKE2B 972cd1aadcc8db1deeca41be037437139eafb2c02d7b0c62a0d1d2576034ccbbb50f0ffc0bdd0572bdbe3c33d8fecebcdf300ec5c203b56eaae4debe08a4d907 SHA512 fcbb325424a6fbbe5a026b5e760456172af0a1ef2eee13018af03d088923b5497f9240e32bd91c082341532c0ce249b4b5760e122f2955f772fab1e9e0721402
-EBUILD fwupd-1.4.4.ebuild 4100 BLAKE2B 31c1c95fa28b6d94584282f2f7f6b14cd6e98ef7af4ced6e171237c5f9a8d99abfb9092ccaffa1941bb108bfc2589a2acb067ba32a1de0a5ae76182a8575a0c4 SHA512 369cb4c232c3cc6e2056ad91572aba9a7758985d5cb4d1d1edf7902fc4cff06aef2d21b7d7c698b4225457b76aa24faf81cd9daf0be8f078b4c29f06fe2ef6c4
+EBUILD fwupd-1.3.10.ebuild 4243 BLAKE2B f63442887f7a35f5f05685d6dbadcde090b7675d779f6c52948185869f350da9b2f9c4eba30aa4beea665f205118a5ae05d8e70b5f9df8dfaba5f934320f54c4 SHA512 11bcc863f703c3b088048c8eacf76c8884bdb1f3d26185401bab429f749bc7cddc2ac95a60fa25e84d62c973e868bbbd0f1f5c8aa3f50a5ced7b126c74b0dd93
+EBUILD fwupd-1.3.11.ebuild 4245 BLAKE2B 75efc10a9e44325023bfe1d6fb592212706bedefe8ec280037f72d8bb795c5390487f37ef041e1826ebe17e13ff94c1b9730314150bedbde44177f79747480bb SHA512 3b382666d78b12041c741fae3f98bee7e86419d71fea4aa0373921cf360caa93f2aee6c17cfbcada993b115f15c65d9d315807302dd881de9e8cf6b547eaa786
+EBUILD fwupd-1.4.2.ebuild 4128 BLAKE2B ace5e8027fd34eacf1b00a0cf590d7798648eb58294ff6bfe207855ad61da7d2b11bb16f8fec2d96741c53c551ea4c5a45d300defc387d512a287c796973eba2 SHA512 94f38bdf066856e532a96075cdddf0411b3d908d7081555963c66f50770dcd73c49444c24c40ff4e16a83caed9fe8318ca3528e616a379067a73933f99ba5def
+EBUILD fwupd-1.4.4.ebuild 4157 BLAKE2B ea26874d1710453706f9c1b9a841a6be3dad35a77db919593917769704883dc2fb575dd49bd00b0a959711f378262ab824f50abd4d4d98519c1884b97e433b6c SHA512 805ea1460d6ed6d655e9bce86c41866241c41217eb4f197d69e4e71088da724fe2164114d059a0a7074d9b9c083dc15a1780523a4f18f0a0937ab71a85ac939e
MISC metadata.xml 1282 BLAKE2B 1c24fd3a7c2fce83628937b30dad0a9144bfcef23688ec0ef26e61bcb82252bd0ac8d339c179ea6ff22d7f4578dfc4484d87c5f1508216bf8898b6ad6de720f3 SHA512 96ee8309fc1c3cdee219428aff411e0c68f2702488f202f749a49ec51307ca604e27cbf131908b477afc9d10ee045e53f4511369bd5fd601894e507be398ad73
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index d7daed583481..a2f37ba6f6b0 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -35,7 +35,7 @@ BDEPEND="$(vala_depend)
net-libs/gnutls[tools]
)
"
-DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/libarchive:=
dev-db/sqlite
@@ -84,10 +84,15 @@ DEPEND="${PYTHON_DEPS}
# Block sci-chemistry/chemical-mime-data for bug #701900
RDEPEND="
!<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
+ ${CDEPEND}
sys-apps/dbus
"
+DEPEND="
+ ${CDEPEND}
+ x11-libs/pango[introspection]
+"
+
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
index a16b4f0ace07..660c7a1e2280 100644
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild
@@ -35,7 +35,7 @@ BDEPEND="$(vala_depend)
net-libs/gnutls[tools]
)
"
-DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/libarchive:=
dev-db/sqlite
@@ -84,10 +84,15 @@ DEPEND="${PYTHON_DEPS}
# Block sci-chemistry/chemical-mime-data for bug #701900
RDEPEND="
!<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
+ ${CDEPEND}
sys-apps/dbus
"
+DEPEND="
+ ${CDEPEND}
+ x11-libs/pango[introspection]
+"
+
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
diff --git a/sys-apps/fwupd/fwupd-1.4.2.ebuild b/sys-apps/fwupd/fwupd-1.4.2.ebuild
index 78788fa23ce6..3ee2fcebdfb6 100644
--- a/sys-apps/fwupd/fwupd-1.4.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.2.ebuild
@@ -35,7 +35,7 @@ BDEPEND="$(vala_depend)
net-libs/gnutls[tools]
)
"
-DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/libarchive:=
dev-db/sqlite
@@ -80,10 +80,15 @@ DEPEND="${PYTHON_DEPS}
# Block sci-chemistry/chemical-mime-data for bug #701900
RDEPEND="
!<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
+ ${CDEPEND}
sys-apps/dbus
"
+DEPEND="
+ ${CDEPEND}
+ x11-libs/pango[introspection]
+"
+
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
diff --git a/sys-apps/fwupd/fwupd-1.4.4.ebuild b/sys-apps/fwupd/fwupd-1.4.4.ebuild
index 5ad09f23bf88..96c9a88bdd6a 100644
--- a/sys-apps/fwupd/fwupd-1.4.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.4.ebuild
@@ -35,7 +35,7 @@ BDEPEND="$(vala_depend)
net-libs/gnutls[tools]
)
"
-DEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
>=app-arch/gcab-1.0
app-arch/libarchive:=
dev-db/sqlite
@@ -80,10 +80,15 @@ DEPEND="${PYTHON_DEPS}
# Block sci-chemistry/chemical-mime-data for bug #701900
RDEPEND="
!<sci-chemistry/chemical-mime-data-0.1.94-r4
- ${DEPEND}
+ ${CDEPEND}
sys-apps/dbus
"
+DEPEND="
+ ${CDEPEND}
+ x11-libs/pango[introspection]
+"
+
PATCHES=(
"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 054f997dea36..2be8628cfaf6 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,10 +3,10 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.12.tar.gz 495503 BLAKE2B 1fc775ced82980b4b657cf5626a0a88e1de3471ab06638832ed58da4d74e41f10ba7f95cf2c3e04e4cdf19014b41b8c11f690b74c139a235c8ec1159896552ec SHA512 8165cb45ca25ca3d1f6ee303eca47f28006fb4c221bdaea5b0b09b1a712362a41d340e64102ec468a1c8272c096cb416513e6cc98bc70cfd359bdcd481422c9b
+DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.12.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
+EBUILD haveged-1.9.13.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
EBUILD haveged-1.9.8c.ebuild 1007 BLAKE2B 17ea013ddb1531b3890c510404467204545b38feedc14b46eabe5ea6bee101012610acfd389823023c403c87e082be5ef778549551da134cca69ccea6284743c SHA512 3280473cbc0efc70ad1b0ff942cec564481c77768025153d94377a377ed463a2d0e29513a0b7381bb192e0c20f98e0874a5f48145d440ccd13eab07cc5ec4f26
MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.12.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild
index c439fda13266..c439fda13266 100644
--- a/sys-apps/haveged/haveged-1.9.12.ebuild
+++ b/sys-apps/haveged/haveged-1.9.13.ebuild
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index e00248bd4b02..a89b1cfcac39 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,10 +1,8 @@
AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
-DIST help2man-1.47.13.tar.xz 202480 BLAKE2B 0c9e854a29ab563b7bc86d4873b2669c82bbd9226d3940ddf60fcbf8bfc48197013c7cde5b55e47e6463d26e1b3512a24bb9591a77009f47992b2a3df9bde198 SHA512 7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a
-DIST help2man-1.47.14.tar.xz 202732 BLAKE2B 73d84774618e44d77d609f1ac562065f651c5ba5ab13d700c8ccdd5abcfda229f89067babceb6fec327663fce744748419ee7204defdcfcc7b631b0720bf00fa SHA512 f3ff59e83e89ff0ed2bf863557c41f25ba79b0398f82cd0e7df459f3c3d2832a48047ff401a5556c3d7d722e48956393a4b70f61e79368a7621621e1834db862
DIST help2man-1.47.15.tar.xz 202776 BLAKE2B 3f06bc254fc8e0e8884d9b8bd63b53f23ea4f9a9e1d16f7f7f2ba83ee052f35a85489ffad7b59bb41277ef68b22caa35790513115d5af43fb09cc8d5cdf4ebb0 SHA512 2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad
+DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B b19c59b3453733e9d1eb6a88ba2a62d526c975222c1a2d4ea58c0d1a5bfb3aa3a39f943aa99c3ae18a65213b640f1d52de90bbb820eb5c39d079b3d2ce9e6198 SHA512 8798779819277de34b892a71395504cee115c1310dbab921a2fe4866967e16d0f40f34e5b13a31496b69b462bd5b944fd1470dd87b425fc21fdbec8372b1a38c
-EBUILD help2man-1.47.13.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
-EBUILD help2man-1.47.14.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
EBUILD help2man-1.47.15.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
+EBUILD help2man-1.47.16.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.14.ebuild b/sys-apps/help2man/help2man-1.47.14.ebuild
deleted file mode 100644
index 79ed067d1855..000000000000
--- a/sys-apps/help2man/help2man-1.47.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GNU utility to convert program --help output to a man page"
-HOMEPAGE="https://www.gnu.org/software/help2man/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="dev-lang/perl
- nls? ( dev-perl/Locale-gettext )"
-DEPEND="${RDEPEND}"
-
-DOCS=( debian/changelog NEWS README THANKS ) #385753
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.46.1-linguas.patch
-)
-
-src_prepare() {
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i \
- -e 's/-shared/-bundle/' \
- Makefile.in || die
- fi
- default
-}
-
-src_configure() {
- # Disable gettext requirement as the release includes the gmo files #555018
- local myeconfargs=(
- ac_cv_path_MSGFMT=$(type -P false)
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/help2man/help2man-1.47.13.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 79ed067d1855..79ed067d1855 100644
--- a/sys-apps/help2man/help2man-1.47.13.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 0de512888ce7..2dc84bc8ba05 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -1,11 +1,3 @@
-DIST iucode-tool_2.1.1.tar.xz 143204 BLAKE2B a7f24e76a30d0325c73cc6f6835dc20330e64f409dead85dfe42d676298ebc87b90b21749423a6f90864a5482bb77f0467c229f1c7022513a55fe1ad78676ce5 SHA512 07ebf1919a997e7270d9c53f0287f53975253eb53e678f30bfc55acefc6fba7a51c6a4edbdcdbba88a7643ecbcba6acd0c93847d6d1648659789af37c9c59cd7
-DIST iucode-tool_2.1.2.tar.xz 143352 BLAKE2B 4556403d1a25b1230e8a83532aa33a1d808578a542bc864b814d271b97781cc402684509a72caf165daa99c4964104636fb5f2f68f49dcb1c8d44208f2f8da03 SHA512 f1af71843160500fb9c0b56bffdb1d3db09acf42f6c0a84a5d5311eedfe809f9ac27f89bf1778cab8261d3a540cfe62f3698a45c76be76e7f40179b9c49050e0
-DIST iucode-tool_2.2.tar.xz 149896 BLAKE2B c8289541b5a1550e4eaca2dc347cfd78f04cc723c9e7ca995feb1bd8ef8130db1c595613f66ffa22487fefe20a45e51268d989cc24694e6cc1a07012a564ac68 SHA512 edb5969c1e00480e537cddc49d7cbb190ce70e6f0c44d9c40a481038bfa048fade1b454a7f4eef3048cc204ee303758fe76222f9c9fb9b407ed463ee0ccdd429
DIST iucode-tool_2.3.1.tar.xz 153380 BLAKE2B 30dfc28e1dd4e0241cb7cfeb18bba746bb85c341a1627e21a5db4965271c26fcfe33f036c2008207bc9fa6c2f32bf2b857e78c9bf23739817d5c5c487d6010cb SHA512 2c7f72eaf509f9daa482ec5f8eb86a45ac9fa84fa856678fdf9ad056e19532e3734e04656d9dbebbd3a774d69f4c861c1340bbe67b1c6c60d61135705980e7d6
-DIST iucode-tool_2.3.tar.xz 153220 BLAKE2B 4d4fddd1c479172a2bc13c4f45a9be13caf66c5ea396fe7b91df29f5ab12e8d07df0bf5d994c23fe5e9001e585a018549e210ac4669d3bcbde7913adc8aab54d SHA512 8cdbc2970d964c11e9178ef38897f88aaf770b70ad5bd4d91fa6164665b1a4e8be7aa2a4b3d7781e55c298ed9e46be0f278ffc1010feee0bd4745486edfa87fc
-EBUILD iucode_tool-2.1.1.ebuild 428 BLAKE2B 995744378da3c9bba27f340859ad1bd800a40c1dd418091336d49661ca1d03520616466d0f3ad6e058acd2ad9218ed353653891aea0a17bda84beb655deb48a9 SHA512 62d09ae12e31934b7f37181327e3da5bf9d8cf9a0296fdc25ec832fde2555e7d78f7bd409fbcef0fd69da360b4b5f14fd5f221a8a675e66c5e6a294f14bcb0bd
-EBUILD iucode_tool-2.1.2.ebuild 430 BLAKE2B 6cc756dba5a614cd5a89f6f05312730c939e23b39352dead0535213c805fd2c7ed3e12b598ef8f2045fa9527b9db2333fc3a3a0fb7c07fdccc73adc3fdac7a8b SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa
-EBUILD iucode_tool-2.2.ebuild 430 BLAKE2B 6cc756dba5a614cd5a89f6f05312730c939e23b39352dead0535213c805fd2c7ed3e12b598ef8f2045fa9527b9db2333fc3a3a0fb7c07fdccc73adc3fdac7a8b SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa
-EBUILD iucode_tool-2.3.1.ebuild 428 BLAKE2B 5bf11d74d2b714618df74d6da6bae265e3e454c15af8b3b926beebda7a86b71dbb5625a59bcf9533efbdfb30955d3e6ce43b3ab0d2b2f17cf3cccd4a541c94e8 SHA512 9d7579dd088ae02304d9752267ec88e32d72a100b33bdd02484e173aedacb3e668790193ba84afd9bbef03c31e1c3c44202ebc7f627cabcbeef838d0cd727701
-EBUILD iucode_tool-2.3.ebuild 430 BLAKE2B da114bbda28a9a44c2675c43f3a122c575af3ce9c1b3ce6014e345676e5f6b9bb95817426d2eb62e8cd7c56a2ad3b86a4a807ffb4d4ef374b238d84995832c1c SHA512 457f93c88e1a7df27639d808c6c4f0f6756a6196009add95ea2cb514ef21a47f5ce017d9765b8b503ff5c8517495ea4bbad8c22ad54a2cac61313fa9b92e499d
+EBUILD iucode_tool-2.3.1-r1.ebuild 425 BLAKE2B 6095ad603d5cd2340db5c23aac6c1ae0fc16d4c4617151e8b70717c47a4ad4dc1d8d83bb4bee4261b16d49b1c58d000b56bc3ff6f540e22462fc2463a02c6d01 SHA512 0fa65c955d746f9cc7725c38093a92d536cf1a176f4ebbd60306c722c5bc4eca22b1d154eaded3d69f816891b82e30dffa80cd2ad8997f9bc58d6bc24b824dc2
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
deleted file mode 100644
index dcfaa908e494..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
deleted file mode 100644
index dcfaa908e494..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
index b3d85fc2e5da..cdaff636c174 100644
--- a/sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild
+++ b/sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
HOMEPAGE="https://gitlab.com/iucode-tool/"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
deleted file mode 100644
index 7800c285d171..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/iucode_tool/iucode_tool-2.3.ebuild b/sys-apps/iucode_tool/iucode_tool-2.3.ebuild
deleted file mode 100644
index c7682ec00783..000000000000
--- a/sys-apps/iucode_tool/iucode_tool-2.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
-HOMEPAGE="https://gitlab.com/iucode-tool/"
-SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index b65df2beef70..0aad2b9a6858 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,9 @@
AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
AUX lesspipe.sh 8044 BLAKE2B 9ea7f314c852dee57f9745ee04f4d0779c2e22a138ee9ef479199cc5838cc5edfb08a1a1408ce12f1cf668e4b563abba24fa4ea2ea4abaa1c85a2d3cc3ed608a SHA512 e8b406127f3af3a4c3f9f37c4f165e334311a8da251c5a686b6bfbc24c2cbb202f27aaca5c7b426cc29036b48d944e6be5cbec2839e6e2712aaeb16c5d4522e6
DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
-DIST less-561.tar.gz 335311 BLAKE2B a319b835d8151a5cd69a6b9ea75455231bd822bf2312cbaa5214f8508ba2bbba2d80e3d383adb771e6c5ffa21f86e0e5c2aa999a828b340d3b3ddbd3adb9fe59 SHA512 b06cd8013a7774ae3492ba1c80b94f6aab8c07d4694bb3f474187a9aef369eab81c1e3e5d33bcdca305be155a9c8292e65d062354111c6de8cecd174d5a8a667
DIST less-562.tar.gz 335444 BLAKE2B 4830673d17594aea7424ee88b82bc2e073275a77ed39c067c032a0b79b0d15f8c0d97f98381a57192e985054cd04b3a824ef6c3e6ef796885a9677681a4cb109 SHA512 c9a0f43da0fcdb515e5d4f56a666fa7c8b12d52fd5a1cd4f6cc5f79133376400b0ef24a206c0cf5fd3558fba9a8055f219038bad8c3dadf0504ea96c419c4573
+DIST less-563.tar.gz 335508 BLAKE2B 813e54b9a115600e4f20009ccad3708efc64ab4ee940aa3624e968045557bbfef6ace49b791f4b9efff86bf43df9fe2a04a160e76718396e0dae17f0bdaa62fb SHA512 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
EBUILD less-551.ebuild 1392 BLAKE2B a81cb5c09b972404d6893a020f18c6f6ed592d28423d7ddb691dfdda3b7f241bb520a420e45e6557c374695cad57ab52c3193f9098c4a9a4b67e80911c3dbf35 SHA512 68e995a4a03c032ee2d1a183326050610e56f081cf7a7f2e71921caa149449f2f1eaafc3319dbd9ca71a0e22f589101c8bbcb9aa317c928c5457e3ae86514d46
-EBUILD less-561.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
EBUILD less-562.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
+EBUILD less-563.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
MISC metadata.xml 327 BLAKE2B 581c56f3073ebd542d8edf73fca5effb7cacd1eb3778b427e9b5fae6ce174931240f957be61951d2233feeb899e5eb08317f9d05f223532b532dd2467856d101 SHA512 dd40867f5f419a029deca5f613b89651fbc6fc71fdd9bf18600f063358295de781390037a1b2c0d28cfc8f65b56e71e9923f231a16a672dc8bc1284104462b95
diff --git a/sys-apps/less/less-561.ebuild b/sys-apps/less/less-563.ebuild
index 375e2585ca5b..375e2585ca5b 100644
--- a/sys-apps/less/less-561.ebuild
+++ b/sys-apps/less/less-563.ebuild
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 4157ceb0dfbf..647637d49278 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -2,8 +2,10 @@ AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f8246
AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
DIST opal-utils-6.6.1.tar.gz 2121660 BLAKE2B 29ee388e75d86cba346d48834840bde22e6c38404b1dc3544fe7a2c64d584fed95aff8755bcadfba7f3753a764a120d31daa2d8f32e4a4298b65babc44a08193 SHA512 b460de30aa76b1c2bc66b636b995e32abc8554b3a7d8ac5b71401d7f07d999d5b4ca4328a6bbaa9c7c82c237b0e6be5557c9d13f4bbba5c7f625888aaf9cb65e
+DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
DIST opal-utils-6.6.tar.gz 2119590 BLAKE2B 3c2b0b77fdaa22f075afe1d7205865b76e45e865c8799372ab61dbd272015ecb1343a32c185d6bd5fb323723a2c5aded1fead2ae0fb34ae6e97e17f5e15af6a6 SHA512 23ae61266253a5382f4d873492e89523cc26a32dfb43438e5becece88f5af4f0bc4ec756208603653f430b3382c42980a8c92dc0c1ba3e2b13831ade1eb14a27
EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
EBUILD opal-utils-6.6.1.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
+EBUILD opal-utils-6.6.2.ebuild 2609 BLAKE2B 7cf2daad9b0665af219f5dbb965f54f9a87b2a1a7cc5a3c0a38bf9ea4376e945f0a2e6fcc56e55c960e66f2be428b0988dc2b9443bad692ff852036cd2e66201 SHA512 36e0b7ad0a114781c972f3826b838b155a7789060f265441d0029337c533e24ed68e06c0f9151766923d2f09f9a25243d5ac70172c1b0266d3dd9a311cb88455
EBUILD opal-utils-6.6.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
new file mode 100644
index 000000000000..dc2a1f85fa2d
--- /dev/null
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="OPAL firmware utilities"
+HOMEPAGE="https://github.com/open-power/skiboot"
+SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="doc? (
+ $(python_gen_any_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ ')
+)"
+
+CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
+ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
+ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
+ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
+
+S="${WORKDIR}/skiboot-${PV}"
+
+python_check_deps() {
+ has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
+ sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
+}
+
+src_configure() {
+ tc-export CC LD
+ export OPAL_PRD_VERSION="${PV}"
+ export GARD_VERSION="${PV}"
+ export PFLASH_VERSION="${PV}"
+ export XSCOM_VERSION="${PV}"
+ export FFSPART_VERSION="${PV}"
+}
+
+src_compile() {
+ emake V=1 -C external/opal-prd
+ emake V=1 -C external/gard
+ emake V=1 -C external/pflash
+ emake V=1 -C external/xscom-utils
+ emake V=1 -C external/ffspart
+
+ use doc && emake V=1 -C doc html
+}
+
+src_install() {
+ emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
+ dosbin external/ffspart/ffspart
+
+ newinitd "${FILESDIR}"/opal-prd.initd opal-prd
+ newconfd "${FILESDIR}"/opal-prd.confd opal-prd
+
+ systemd_dounit external/opal-prd/opal-prd.service
+
+ if use doc; then
+ rm -r doc/_build/html/_sources || die
+ local HTML_DOCS=( doc/_build/html/. )
+ fi
+ einstalldocs
+}
+
+src_test() {
+ emake V=1 -C external/opal-prd test
+ emake V=1 -C external/gard check
+ # this test is fragile and fails because of filename path
+ rm external/pflash/test/tests/01-info || die
+ emake V=1 -C external/pflash check
+ emake V=1 -C external/ffspart check
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 18f6f727fdd4..76c1fe07edeb 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,7 +2,7 @@ AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3
DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
DIST policycoreutils-3.0.tar.gz 2818089 BLAKE2B 6e4aa6d6eecf809efaefccbfa16c44050242d129f496594763aacbb9aaeca23d92b27d30a6f9ae0e49513adc0a1bd58499253eb9ffc003547387c04aa643b462 SHA512 d8d25db48c1caef69228e87d7ebb2c0f075e44e4ff6bf18a26af341d948b81375b33945128cd0410ffebc64ca478fd19a207295189c716c95e6a3c586e9f053d
DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
-EBUILD policycoreutils-2.9.ebuild 4872 BLAKE2B 719cd695da8f32790c1a45ae10059ccfb88145993feb7425f607511e5f7a58f30777f90d1b5ffaa59fbfb1a070de4dcbe0c3bbd24c88e5bc91519198b44c5ae8 SHA512 ca64aebeef0c5f2b515d73e08de6eb767bc07b3e4d60b01020af8457c36f5ce4dc5b838d499ad70552f8b472abcc94c40a013b475630de4291ac5af70b5fc80e
-EBUILD policycoreutils-3.0.ebuild 4750 BLAKE2B eb49bea263e29e524d8a5a6284a42a6836a4136b05bba315bb3c8a4ef67875c0690e93a3ed90e37eaf4bbf88e8358e635c0ece67b9d852f426e78acc6c630290 SHA512 ad571f712198c4908ab8432d1206675941c23e65f69d29f4aeb79817795962688c5199fafed1bb75d0c622461596935d1969496dd914df3e68afd24d6058885e
-EBUILD policycoreutils-9999.ebuild 4752 BLAKE2B d4c931737d942b87da3b1904f2ca128086e3dbd3c7034fad271a77b1d18e89d588ecb590aa24c1700d84763d9d556bce3726460621829a02b0de9d3921cb0fd5 SHA512 f710f3c53d3cce5cd06e5ddd93d217116b3befbc370f89fa179a7fccc11286b9646f95743b52fa507eacaa5403acb32b169922dc75533f47a20d2ccbe69d7a4c
+EBUILD policycoreutils-2.9.ebuild 4875 BLAKE2B 2b97a2f7563e4e3474898b77ea0bac1c301ce1f6cddb3841e863e9f9fca6ed566221b012c53099e7b035c0d705a8f1fe67cbee88201c30aff7bc6f126aaa6899 SHA512 d967b6d20255f0983cbebead02302e14b4a7f8dfab70a079d82d38a3d8255b673ba56583a211d3cc60c2674d8d6a9c275d34a9572b1f6595e14fd0de19ad75a5
+EBUILD policycoreutils-3.0.ebuild 4753 BLAKE2B 3238ceb29eec9166041462b3dd6ea8d91c54d130733033fa5d4a7f1e53a903645f25399d359e31ef1b4e713e5fa68b5ddf07f83cf57a4de7a32d122958891d7d SHA512 60a11fe6afae58bcaecc640671bd3adc55bcb100b463c0931e91d387236320692b8b878a685e413f9728308f5de903aec44a6548db6283740854461e5d700a67
+EBUILD policycoreutils-9999.ebuild 4755 BLAKE2B 872ad4311452b99400e6c9553610e7b1d482ed9489dcddf2fe0d31522eadb75dcce75a46c59d9099b0b7171f7cd698d69d414f591ec4786d5b8ee4f6e202ea24 SHA512 54800d0cf4ac8fb58d669383117f000ec64e06f477ed9323d90f3fa5808d46f7da33e390fbf5c70a487599d2464a33349b356071a0321c84851cc5327cabe5b8
MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
index 39f49dc57c8f..dbce840c6b63 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.9.ebuild
@@ -42,7 +42,7 @@ SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
>=sys-libs/libcap-1.10-r10:=
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
diff --git a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
index e8f010e5f5b4..5ec0f0d71bf6 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.0.ebuild
@@ -42,7 +42,7 @@ SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
>=sys-libs/libcap-1.10-r10:=
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 4cd4c8e967f2..d083c5232207 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -42,7 +42,7 @@ SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
>=sys-libs/libcap-1.10-r10:=
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+),${PYTHON_USEDEP}]
sys-libs/libcap-ng:=
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 0c4895eee2bf..e7e6c7fd3544 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067ddaf71394a0a143a096d5708c5e7caa468b12826965c02af0b994f35d26c573187bf67c8d1ce75f5e8a31a1fb0fc6562 SHA512 743df60a643477465e4355880c56813ea8539415ea7c9631fb9b7cd7969a37cce572a6a94b785065d92baf9d7b6c753daa5d2f9709df7c9203c7effba46d58f2
-EBUILD selinux-python-2.9.ebuild 2549 BLAKE2B 7d8d8c87a667c1e1e906c4f4ddbccb07135529036d381f27e48fa0ad7f9018b1d416834699d05fcd1ade903c55c6d9594b9279324622b489e34431afaaa18796 SHA512 c7ea15dade62ff124b1d234b2ead9014005f9058b752350f88a704cdcbcf9d2d7e2af738a15faddbe0983243d2c33e3bb32436df5069f68fb2ecabae08f775e3
-EBUILD selinux-python-3.0.ebuild 2555 BLAKE2B a063f05d697ac6588b5180c1e30c3ba2c21078b543a6bd88aabf35b7e98d6a1295f9195982d3b48f0f31b50125272727bb1e40a3ec5b4bff642f4314affd6309 SHA512 7c81aef7c1a97deb01951c28c62514fdebaefeff195bdfab4fd6df7cb12f493e7653113a6039caa675c74046158640666bd37317296a8d198ca7edfa3c2f68c7
-EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 26e35a0d84c264c0dc746cef6c2b442f56a376e0f22eead89aadcecb232874134a42d0f2bf92851cfed568479f0e26d8b37d0396a3eca824441cafae548b7429 SHA512 dd23617e8d8ca765f133a52cc1bc2f46f36a4a8b3b53c91b7357f4a994da03f6f255263f6c1ae8f1026cefabd499be63ec2804d90aca16ba09c6d5d33d54fca3
+EBUILD selinux-python-2.9.ebuild 2552 BLAKE2B c3a46c9b484dd134426ee1cfecdcd0caedefa0d02cb1071789ca62c7a2ad860c12f770bd8130ed25f660b70e352ca2c65b062ee6bf9ac2b185e651ccfd44e861 SHA512 2d896bb07f08d2def9eceebfaf0aad8fa27e3041ca44e04c3e936502d9323b48a0d8c89c5611ea9885c90d90a9c0823f3c8786bec5520857b20ad4f18461fe61
+EBUILD selinux-python-3.0.ebuild 2558 BLAKE2B c390f92149cd44b5443867439f64d0e71b75c9614e7d3115008b57b04d0307dfc36fa4c4a43ca725a9b5a723c12091c9496257dc0f4c31908a52c922a943c348 SHA512 5c4533c9bf0545c13881c7b2f4281c4e3e14498f4e5def1285843b0464d232e6f6bdaaf49cbd9b3ffd3b72e07f03659d56405e2431b5f195dd27f592c42aff61
+EBUILD selinux-python-9999.ebuild 2560 BLAKE2B bbf5adc0ed2aee052b003637a072182881c17b4562103af1638b2a28b67060e6a21e8c488460d7d971788cf4179b4725a1282641328b5a468a1d404b1839c655 SHA512 783a681a82848bc966b93ce127c39d06cd62692073282a43d633dedd95a448837f109274574b73ef2b5baa1559b60ecef4d89edb7014640622c9002f2f3e7a16
MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-2.9.ebuild b/sys-apps/selinux-python/selinux-python-2.9.ebuild
index f3280a473536..411c26e363e7 100644
--- a/sys-apps/selinux-python/selinux-python-2.9.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.9.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2"
SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
dev-python/ipy[${PYTHON_USEDEP}]
diff --git a/sys-apps/selinux-python/selinux-python-3.0.ebuild b/sys-apps/selinux-python/selinux-python-3.0.ebuild
index a81fd6060d76..96deaf538c58 100644
--- a/sys-apps/selinux-python/selinux-python-3.0.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.0.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2"
SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
dev-python/ipy[${PYTHON_USEDEP}]
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index fa000d4f1a30..011db20a0085 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2"
SLOT="0"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
- >=sys-libs/libsemanage-${SEMNG_VER}:=[python]
+ >=sys-libs/libsemanage-${SEMNG_VER}:=[python(+)]
>=sys-libs/libsepol-${SEPOL_VER}:=
>=app-admin/setools-4.2.0[${PYTHON_USEDEP}]
dev-python/ipy[${PYTHON_USEDEP}]
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3cda1993d8a7..9dec8a43ad8b 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,7 +12,7 @@ DIST util-linux-2.36-rc1.tar.xz 5183900 BLAKE2B 5bdb0dd03835fc3e46585192aaf7320e
EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8900 BLAKE2B fdbf9a40dc517a3cef5442503afe0655195a4100f369f1dc4b8600d13496ac1922d7458b028235a271494a94ff701d7de5bda3deec4a124425554f24599c0896 SHA512 770befe33e7066f36f9e0ef860da2b3b64f5f56b9405fae22fadf2f56585e7f58d26054e41b4b66adc2ba227667389f64e1414ff11800e775302ffefeade72f6
+EBUILD util-linux-2.35.2.ebuild 8898 BLAKE2B 8dfc5420167557be40ab8cc6570a847689af2f7aa9c26fbee34684970922e58fe49eb4d551a2918887e7c9d756d98a7aec81fde60240e43a4c9072c67b285329 SHA512 b302f3c8cb38ac8adfde110c17989d7f5ba9dc54e9cf89b0b5c9628b1835017c2d963f0bc34bec7d7195c9d06abdba36d087bffa301c58d65d749b6fc38b876b
EBUILD util-linux-2.36_rc1.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index 00b2ddfd8773..f4a7cb79bb8a 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
[[ "${PV}" = *_rc* ]] || \
- 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"
SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index c7d7e566b654..81645b2a3fbb 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,11 +1,6 @@
-AUX 1.21-pic.patch 538 BLAKE2B 98869b7f97ef786a6a8c72277416722d815ffeb562f756f730886dd5dd07f9c03b7d53626be507d23854ecdc5a4d89391effe0084265dd0bfb78b80b11dc86bc SHA512 cee450649d775b682cbed101036f58b6c277417533202919c93df2802e06eaf7337399bf0ef68806f1b5c282589772c63ae46a65dd8d1f754d4691cd4062bd5c
-AUX x86info-1.24-pic.patch 577 BLAKE2B c552b1e35109107b8b368929240deb0acb84c09f12d60acb67646a947386a1b7cd532da79c2e7ff97104526327d625f917f2ee51275977de41b2743f1d386bcf SHA512 72d476c4fdc0eef30dfaa585ab4344081da1c441289d917cd01612bc0d7f1b31f8c26510c86c89fbb9d79d4526ae6a1ad413f98fb8aa005d9fc729f80fb99e2a
-AUX x86info-1.29-parallel-make-cleanup.patch 330 BLAKE2B 77d0b528bd5a5dae91442ae6e2ee5e5c6d397ae82e0b35f89e5f441319907e3ca9e83c79fcdcf2964cf7b0b96cd2c5cfa94536e4d5002665771876c158b0943f SHA512 c13035a4487d36c5949fab22aed6b61db70c4ff304849ac5345656ec56e7d90c8636ea25180db7ec5b73881d3602acae3bc0936148a3bc25f8d64f4c1d97d454
-AUX x86info-1.30-fix-build-system.patch 268 BLAKE2B a1f57d38ea3836b51eef4ed6b6516ac8a3e1350496e5550a2070d8b7f1a8e6b15c5af664d2c45062ea347168edf882ee2ddafa976beaa8688b19c33ae4ac3b0c SHA512 80f7b0773737b83c35a8dc59aa1f844edf73c93ee89d8fceeed3eb69cf757b79d42e9e0acfea061c1e7f7f4c38b953dbc0943dda874c62db7b63102394f8f6ea
+AUX x86info-1.30-makefile.patch 1939 BLAKE2B aadfe68d30fb12a71435e4ceb708cc69280c47d32e92d7ce0e95ca12199fe728bdbf2d3edfe4c296cf25a972df26e39355c0dd12a79cd4b1d8dc3c5680c4f6e9 SHA512 57ff52a78747abd75016b4b61a21e859c0b5023d5402d2025c7bd93e3a9511d291938da1c688e1eb60f912db64800140423d1e5ca19c159fc2d9c94dc97bc693
+AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4
AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
-DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
-EBUILD x86info-1.30-r1.ebuild 1738 BLAKE2B f809a7f512452242dfb9580026f1adf61ba57337ed46ad9614e007d2be67ba2782f359378d3d67842fb437158c488db0349d1ac01d3fa57d1c9f656fb8e450ba SHA512 34b59d22cbe750be756adef44dbd79feedc59aa6921550cc1fca9a4662fedf781b6c619d25eef8a15468efe945e30ee5931ed15198f50eaffbe5edb2a0772660
-EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f
-EBUILD x86info-1.30_p20190617.ebuild 1856 BLAKE2B e4bca9efb1259b4eb475306dbf9cab3fe1399fc7b89061de4a65d0eec595f4fa20d7d476edb5ef4bfd05a644fa03f21aae1710dcbdcaa9819ce31ee24d3c7ce4 SHA512 c5e7aa9c9233d40b1be7290f67fd48c2af3b342851e4727f95caaa48de4da4617b799ea5c951128fb4dbf5f087ca8347ef0e58a56fb0fecd8720c829a524afc3
+EBUILD x86info-1.30_p20190617.ebuild 1779 BLAKE2B 79d83ac17a9d7c5d98b363bc6e941a334560b2b9ecc167dabf062b470528ac203dd0a2a4706403a5fe54234cfef4438dfbe6a075baf029e65b47b13f35ea7075 SHA512 07c9d015cb4232c433724f161b2b2455a7040692a4e0926962cc3eb792680957432e4260e2e7f5d46d609a51d468ebac2a57f0447d80e63613214e3f4feb709d
MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch
deleted file mode 100644
index 7bf89240c2c0..000000000000
--- a/sys-apps/x86info/files/1.21-pic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/bench/benchmarks.c
-+++ b/bench/benchmarks.c
-@@ -19,7 +19,10 @@
- #ifdef __linux__
- TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80");
- #endif
-- TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
-+ TIME(asm volatile("movl %%ebx,%%edi\n"
-+ "cpuid\n"
-+ "movl %%edi,%%ebx\n"
-+ : : :"%eax", "%edx", "%ecx", "%edi"), "cpuid");
-
- TIME(asm volatile("addl $1,0(%esp)"), "addl");
- TIME(asm volatile("lock ; addl $1,0(%esp)"), "locked add");
diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
deleted file mode 100644
index a9cec0397fac..000000000000
--- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,8 @@
- LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
-
- %.h: %.regs scripts/createheader.py
-- python scripts/createheader.py $< `basename $< .regs` >$@
-+ $(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
-+ mv $@.tmp $@
-
- LSMSR_SRC = \
- lsmsr.c \
diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
deleted file mode 100644
index 21034d99edc5..000000000000
--- a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1,5 @@
- VERSION=1.30
-
--CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls
--LDFLAGS = -Wl,-z,relro,-z,now
--CC = gcc
--
- SHELL = /bin/sh
-
- all: x86info test lsmsr
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch
new file mode 100644
index 000000000000..9e1768d68958
--- /dev/null
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -0,0 +1,72 @@
+--- a/lsmsr/Makefile
++++ b/lsmsr/Makefile
+@@ -40,7 +40,8 @@
+ generic_msr.h
+
+ %.h: %.regs createheader.py
+- @python createheader.py $< `basename $< .regs` >$@
++ $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++ mv $@.tmp $@
+
+ LSMSR_SRC = \
+ lsmsr.c \
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@
+
+ CFLAGS = -DVERSION="$(VERSION)"
+
+-CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
++CFLAGS += -Wall -W -I. -Iinclude
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
+@@ -18,7 +18,7 @@
+ CFLAGS += -Wswitch-enum
+ CFLAGS += -Wundef
+ CFLAGS += -Wwrite-strings
+-CFLAGS += $(shell pkg-config --cflags libpci)
++CFLAGS += $(shell $$PKG_CONFIG --cflags libpci)
+
+ # gcc specific
+ ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
+@@ -33,20 +33,8 @@
+ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
+ CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2)
+ DEVEL := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l)
+-CFLAGS += $(shell if [ $(CPP_MAJOR) -eq 6 -a $(CPP_MINOR) -ge 3 -a $(DEVEL) -eq 1 ] ; then echo "-Werror"; else echo ""; fi)
+
+-LDFLAGS = -Wl,-z,relro,-z,now
+-LDFLAGS += $(shell pkg-config --libs libpci)
+-
+-ifeq ($(CC),"")
+-CC = gcc
+-endif
+-
+-ifdef STATIC_LIBPCI
+-LIBPCI = -Wl,-Bstatic -lpci -Wl,-Bdynamic -lz
+-else
+-LIBPCI = -lpci
+-endif
++LIBS += $(shell $$PKG_CONFIG --libs libpci)
+
+ SHELL = /bin/sh
+
+@@ -68,15 +56,14 @@
+ $(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
+
+ x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
+- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \
+- $(LIBPCI)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) $(LIBS)
+
+ DEPDIR= .deps
+ -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d)
+ df = $(DEPDIR)/$(*D)/$(*F)
+
+ %.o : %.c
+- $(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ @mkdir -p $(DEPDIR)/$(*D)
+ @$(CC) -MM $(CFLAGS) $*.c > $(df).d
+ @mv -f $(df).d $(df).d.tmp
diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.30-pic.patch
index b4098c5c68c2..6288846b48b7 100644
--- a/sys-apps/x86info/files/x86info-1.24-pic.patch
+++ b/sys-apps/x86info/files/x86info-1.30-pic.patch
@@ -1,10 +1,8 @@
-http://bugs.gentoo.org/270388
-
--- a/cpuid.c
+++ b/cpuid.c
-@@ -62,12 +62,28 @@
- sched_setaffinity(getpid(), sizeof(set), &set);
- }
+@@ -25,12 +25,28 @@
+
+ bind_cpu(cpunr);
+#ifdef __PIC__
+ /* GCC on i386 bitches if you clobber ebx. So hide it behind
diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild b/sys-apps/x86info/x86info-1.30-r1.ebuild
deleted file mode 100644
index 5a09ba8a8e78..000000000000
--- a/sys-apps/x86info/x86info-1.30-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{4..8} )
-
-inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
-
-DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
-SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils:="
-DEPEND="
- ${PYTHON_DEPS}
- ${RDEPEND}"
-
-CONFIG_CHECK="~MTRR ~X86_CPUID"
-
-PATCHES=(
- "${FILESDIR}"/1.21-pic.patch
- "${FILESDIR}"/${PN}-1.24-pic.patch #270388
- "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
- "${FILESDIR}"/${PN}-1.30-fix-build-system.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # These flags taken from the 1.29 ebuild
- append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
- -Wdeclaration-after-statement -Wredundant-decls
- append-ldflags -Wl,-z,relro,-z,now
-
- tc-export CC
-}
-
-src_compile() {
- emake x86info lsmsr
-}
-
-src_install() {
- dobin x86info lsmsr
-
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
-
- einstalldocs
- doman x86info.1 lsmsr.8
-
- dodoc -r results
-}
-
-pkg_preinst() {
- if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
- elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
- mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
- fi
- if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
- elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
- mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
- fi
-}
diff --git a/sys-apps/x86info/x86info-1.30.ebuild b/sys-apps/x86info/x86info-1.30.ebuild
deleted file mode 100644
index 358f453ebbbe..000000000000
--- a/sys-apps/x86info/x86info-1.30.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
-
-DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
-HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
-SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils:="
-DEPEND="
- ${PYTHON_DEPS}
- ${RDEPEND}"
-
-CONFIG_CHECK="~MTRR ~X86_CPUID"
-
-PATCHES=(
- "${FILESDIR}"/1.21-pic.patch
- "${FILESDIR}"/${PN}-1.24-pic.patch #270388
- "${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
- "${FILESDIR}"/${PN}-1.30-fix-build-system.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # These flags taken from the 1.29 ebuild
- append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
- -Wdeclaration-after-statement -Wredundant-decls
- append-ldflags -Wl,-z,relro,-z,now
-
- tc-export CC
-}
-
-src_compile() {
- emake x86info lsmsr
-}
-
-src_install() {
- dobin x86info lsmsr
-
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
-
- einstalldocs
- doman x86info.1 lsmsr.8
-
- dodoc -r results
-}
-
-pkg_preinst() {
- if [[ -a "${EROOT%/}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info ]]; then
- elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
- mv "${EROOT%/}"/etc/{modules,modprobe}.d/x86info
- fi
- if [[ -a "${EROOT%/}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT%/}"/etc/modprobe.d/x86info.conf ]]; then
- elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
- mv "${EROOT%/}"/etc/modprobe.d/x86info{,.conf}
- fi
-}
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
index d8a3b48dfadf..e19af2dd09ea 100644
--- a/sys-apps/x86info/x86info-1.30_p20190617.ebuild
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4..8} )
+PYTHON_COMPAT=( python3_{6..8} )
inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
@@ -16,21 +16,19 @@ SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
RDEPEND="sys-apps/pciutils:="
-DEPEND="
+DEPEND="${RDEPEND}"
+BDEPEND="
${PYTHON_DEPS}
- ${RDEPEND}"
+ virtual/pkgconfig"
CONFIG_CHECK="~MTRR ~X86_CPUID"
S="${WORKDIR}/${PN}-${COMMIT}"
PATCHES=(
- #"${FILESDIR}"/1.21-pic.patch
- "${FILESDIR}"/${PN}-1.24-pic.patch #270388
- #"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
- #"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+ "${FILESDIR}"/${PN}-1.30-pic.patch #270388
+ "${FILESDIR}"/${PN}-1.30-makefile.patch
)
pkg_setup() {
@@ -44,7 +42,7 @@ src_configure() {
-Wdeclaration-after-statement -Wredundant-decls
append-ldflags -Wl,-z,relro,-z,now
- tc-export CC
+ tc-export CC PKG_CONFIG
}
src_compile() {