From 05b8b0e0af1d72e51a3ee61522941bf7605cd01c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Jul 2020 14:05:23 +0100 Subject: gentoo resync : 04.07.2020 --- sys-apps/Manifest.gz | Bin 49335 -> 49361 bytes sys-apps/accountsservice/Manifest | 2 +- .../accountsservice/accountsservice-0.6.55.ebuild | 2 +- sys-apps/bolt/Manifest | 2 + sys-apps/bolt/bolt-0.9.ebuild | 41 ++++ sys-apps/dbus/Manifest | 2 + sys-apps/dbus/dbus-1.12.20.ebuild | 272 +++++++++++++++++++++ sys-apps/exa/Manifest | 2 +- sys-apps/exa/exa-0.9.0-r1.ebuild | 110 +++++++++ sys-apps/exa/exa-0.9.0.ebuild | 113 --------- sys-apps/flashrom/Manifest | 2 - sys-apps/flashrom/flashrom-0.9.8.ebuild | 155 ------------ sys-apps/fwupd/Manifest | 8 +- sys-apps/fwupd/fwupd-1.3.10.ebuild | 9 +- sys-apps/fwupd/fwupd-1.3.11.ebuild | 9 +- sys-apps/fwupd/fwupd-1.4.2.ebuild | 9 +- sys-apps/fwupd/fwupd-1.4.4.ebuild | 9 +- sys-apps/haveged/Manifest | 4 +- sys-apps/haveged/haveged-1.9.12.ebuild | 41 ---- sys-apps/haveged/haveged-1.9.13.ebuild | 41 ++++ sys-apps/help2man/Manifest | 6 +- sys-apps/help2man/help2man-1.47.13.ebuild | 41 ---- sys-apps/help2man/help2man-1.47.14.ebuild | 41 ---- sys-apps/help2man/help2man-1.47.16.ebuild | 41 ++++ sys-apps/iucode_tool/Manifest | 10 +- sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild | 15 -- sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild | 15 -- sys-apps/iucode_tool/iucode_tool-2.2.ebuild | 15 -- sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild | 15 ++ sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild | 15 -- sys-apps/iucode_tool/iucode_tool-2.3.ebuild | 15 -- sys-apps/less/Manifest | 4 +- sys-apps/less/less-561.ebuild | 44 ---- sys-apps/less/less-563.ebuild | 44 ++++ sys-apps/opal-utils/Manifest | 2 + sys-apps/opal-utils/opal-utils-6.6.2.ebuild | 96 ++++++++ sys-apps/policycoreutils/Manifest | 6 +- .../policycoreutils/policycoreutils-2.9.ebuild | 2 +- .../policycoreutils/policycoreutils-3.0.ebuild | 2 +- .../policycoreutils/policycoreutils-9999.ebuild | 2 +- sys-apps/selinux-python/Manifest | 6 +- sys-apps/selinux-python/selinux-python-2.9.ebuild | 2 +- sys-apps/selinux-python/selinux-python-3.0.ebuild | 2 +- sys-apps/selinux-python/selinux-python-9999.ebuild | 2 +- sys-apps/util-linux/Manifest | 2 +- sys-apps/util-linux/util-linux-2.35.2.ebuild | 2 +- sys-apps/x86info/Manifest | 11 +- sys-apps/x86info/files/1.21-pic.patch | 14 -- sys-apps/x86info/files/x86info-1.24-pic.patch | 33 --- .../files/x86info-1.29-parallel-make-cleanup.patch | 12 - .../files/x86info-1.30-fix-build-system.patch | 12 - sys-apps/x86info/files/x86info-1.30-makefile.patch | 72 ++++++ sys-apps/x86info/files/x86info-1.30-pic.patch | 31 +++ sys-apps/x86info/x86info-1.30-r1.ebuild | 72 ------ sys-apps/x86info/x86info-1.30.ebuild | 72 ------ sys-apps/x86info/x86info-1.30_p20190617.ebuild | 18 +- 56 files changed, 836 insertions(+), 791 deletions(-) create mode 100644 sys-apps/bolt/bolt-0.9.ebuild create mode 100644 sys-apps/dbus/dbus-1.12.20.ebuild create mode 100644 sys-apps/exa/exa-0.9.0-r1.ebuild delete mode 100644 sys-apps/exa/exa-0.9.0.ebuild delete mode 100644 sys-apps/flashrom/flashrom-0.9.8.ebuild delete mode 100644 sys-apps/haveged/haveged-1.9.12.ebuild create mode 100644 sys-apps/haveged/haveged-1.9.13.ebuild delete mode 100644 sys-apps/help2man/help2man-1.47.13.ebuild delete mode 100644 sys-apps/help2man/help2man-1.47.14.ebuild create mode 100644 sys-apps/help2man/help2man-1.47.16.ebuild delete mode 100644 sys-apps/iucode_tool/iucode_tool-2.1.1.ebuild delete mode 100644 sys-apps/iucode_tool/iucode_tool-2.1.2.ebuild delete mode 100644 sys-apps/iucode_tool/iucode_tool-2.2.ebuild create mode 100644 sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild delete mode 100644 sys-apps/iucode_tool/iucode_tool-2.3.1.ebuild delete mode 100644 sys-apps/iucode_tool/iucode_tool-2.3.ebuild delete mode 100644 sys-apps/less/less-561.ebuild create mode 100644 sys-apps/less/less-563.ebuild create mode 100644 sys-apps/opal-utils/opal-utils-6.6.2.ebuild delete mode 100644 sys-apps/x86info/files/1.21-pic.patch delete mode 100644 sys-apps/x86info/files/x86info-1.24-pic.patch delete mode 100644 sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch delete mode 100644 sys-apps/x86info/files/x86info-1.30-fix-build-system.patch create mode 100644 sys-apps/x86info/files/x86info-1.30-makefile.patch create mode 100644 sys-apps/x86info/files/x86info-1.30-pic.patch delete mode 100644 sys-apps/x86info/x86info-1.30-r1.ebuild delete mode 100644 sys-apps/x86info/x86info-1.30.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index bd51a38e0338..450c1fd01ae3 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz 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-r1.ebuild b/sys-apps/exa/exa-0.9.0-r1.ebuild new file mode 100644 index 000000000000..01d6850ecc92 --- /dev/null +++ b/sys-apps/exa/exa-0.9.0-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" +aho-corasick-0.7.3 +ansi_term-0.12.0 +atty-0.2.11 +autocfg-0.1.4 +bitflags-1.0.4 +byteorder-1.3.2 +cc-1.0.35 +cfg-if-0.1.7 +datetime-0.4.7 +env_logger-0.6.1 +exa-0.9.0 +git2-0.9.1 +glob-0.3.0 +humantime-1.2.0 +idna-0.1.5 +iso8601-0.1.1 +kernel32-sys-0.2.2 +lazy_static-1.3.0 +libc-0.2.51 +libgit2-sys-0.8.1 +libz-sys-1.0.25 +locale-0.2.2 +log-0.4.6 +matches-0.1.8 +memchr-2.2.0 +natord-1.0.9 +nom-1.2.4 +num-traits-0.1.43 +num-traits-0.2.6 +num_cpus-1.10.0 +number_prefix-0.3.0 +openssl-src-111.3.0+1.1.1c +openssl-sys-0.9.47 +pad-0.1.5 +percent-encoding-1.0.1 +pkg-config-0.3.14 +quick-error-1.2.2 +redox_syscall-0.1.54 +redox_termios-0.1.1 +regex-1.1.6 +regex-syntax-0.6.6 +scoped_threadpool-0.1.9 +smallvec-0.6.9 +term_grid-0.1.7 +term_size-0.3.1 +termcolor-1.0.4 +termion-1.5.1 +thread_local-0.3.6 +ucd-util-0.1.3 +unicode-bidi-0.3.4 +unicode-normalization-0.1.8 +unicode-width-0.1.5 +url-1.7.2 +users-0.9.1 +utf8-ranges-1.0.2 +vcpkg-0.2.6 +winapi-0.2.8 +winapi-0.3.7 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.2 +winapi-x86_64-pc-windows-gnu-0.4.0 +wincolor-1.0.1 +zoneinfo_compiled-0.4.8 +" + +inherit bash-completion-r1 cargo + +DESCRIPTION="A modern replacement for 'ls' written in Rust" +HOMEPAGE="https://the.exa.website/" +SRC_URI="$(cargo_crate_uris ${CRATES})" + +LICENSE="Apache-2.0 MIT Unlicense" +SLOT="0" +KEYWORDS="amd64 ~ppc64 ~x86" +IUSE="+git" + +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) +} + +src_install() { + cargo_src_install $(usex git "" --no-default-features) + + newbashcomp contrib/completions.bash exa + + insinto /usr/share/zsh/site-functions + newins contrib/completions.zsh _exa + + insinto /usr/share/fish/vendor_completions.d + newins contrib/completions.fish exa.fish + + doman contrib/man/* +} diff --git a/sys-apps/exa/exa-0.9.0.ebuild b/sys-apps/exa/exa-0.9.0.ebuild deleted file mode 100644 index 4be36c085f50..000000000000 --- a/sys-apps/exa/exa-0.9.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -aho-corasick-0.7.3 -ansi_term-0.12.0 -atty-0.2.11 -autocfg-0.1.4 -bitflags-1.0.4 -byteorder-1.3.2 -cc-1.0.35 -cfg-if-0.1.7 -datetime-0.4.7 -env_logger-0.6.1 -exa-0.9.0 -git2-0.9.1 -glob-0.3.0 -humantime-1.2.0 -idna-0.1.5 -iso8601-0.1.1 -kernel32-sys-0.2.2 -lazy_static-1.3.0 -libc-0.2.51 -libgit2-sys-0.8.1 -libz-sys-1.0.25 -locale-0.2.2 -log-0.4.6 -matches-0.1.8 -memchr-2.2.0 -natord-1.0.9 -nom-1.2.4 -num-traits-0.1.43 -num-traits-0.2.6 -num_cpus-1.10.0 -number_prefix-0.3.0 -openssl-src-111.3.0+1.1.1c -openssl-sys-0.9.47 -pad-0.1.5 -percent-encoding-1.0.1 -pkg-config-0.3.14 -quick-error-1.2.2 -redox_syscall-0.1.54 -redox_termios-0.1.1 -regex-1.1.6 -regex-syntax-0.6.6 -scoped_threadpool-0.1.9 -smallvec-0.6.9 -term_grid-0.1.7 -term_size-0.3.1 -termcolor-1.0.4 -termion-1.5.1 -thread_local-0.3.6 -ucd-util-0.1.3 -unicode-bidi-0.3.4 -unicode-normalization-0.1.8 -unicode-width-0.1.5 -url-1.7.2 -users-0.9.1 -utf8-ranges-1.0.2 -vcpkg-0.2.6 -winapi-0.2.8 -winapi-0.3.7 -winapi-build-0.1.1 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.2 -winapi-x86_64-pc-windows-gnu-0.4.0 -wincolor-1.0.1 -zoneinfo_compiled-0.4.8 -" - -inherit bash-completion-r1 cargo - -DESCRIPTION="A modern replacement for 'ls' written in Rust" -HOMEPAGE="https://the.exa.website/" -SRC_URI="$(cargo_crate_uris ${CRATES})" - -LICENSE="Apache-2.0 MIT Unlicense" -SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" -IUSE="+git" - -DEPEND=" - git? ( - dev-libs/libgit2:= - net-libs/http-parser:= - ) -" - -RDEPEND="${DEPEND}" - -RESTRICT="test" - -QA_FLAGS_IGNORED="/usr/bin/exa" - -src_compile() { - cargo_src_compile $(usex git "" --no-default-features) -} - -src_install() { - cargo_src_install $(usex git "" --no-default-features) - - newbashcomp contrib/completions.bash exa - - insinto /usr/share/zsh/site-functions - newins contrib/completions.zsh _exa - - insinto /usr/share/fish/vendor_completions.d - newins contrib/completions.fish exa.fish - - doman contrib/man/* -} 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=" !=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=" !=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=" !=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=" !$@ -+ $(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.30-pic.patch b/sys-apps/x86info/files/x86info-1.30-pic.patch new file mode 100644 index 000000000000..6288846b48b7 --- /dev/null +++ b/sys-apps/x86info/files/x86info-1.30-pic.patch @@ -0,0 +1,31 @@ +--- a/cpuid.c ++++ b/cpuid.c +@@ -25,12 +25,28 @@ + + bind_cpu(cpunr); + ++#ifdef __PIC__ ++ /* GCC on i386 bitches if you clobber ebx. So hide it behind ++ * gcc's back. */ ++ asm( ++ "movl %%ebx,%%edi\n" ++ "cpuid\n" ++ "movl %%ebx,%1\n" ++ "movl %%edi,%%ebx\n" ++ : "=a" (a), ++ "=m" (b), ++ "+c" (c), ++ "=d" (d) ++ : "0" ((unsigned int)idx) ++ : "edi"); ++#else + asm("cpuid" + : "=a" (a), + "=b" (b), + "+c" (c), + "=d" (d) + : "0" ((unsigned int)idx)); ++#endif + + if (eax!=NULL) + *eax = a; 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() { -- cgit v1.2.3