From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- sys-apps/Manifest.gz | Bin 49994 -> 49831 bytes sys-apps/dmidecode/Manifest | 2 + sys-apps/dmidecode/dmidecode-3.2.ebuild | 43 ++++ sys-apps/hwids/Manifest | 2 + sys-apps/hwids/hwids-20180917.ebuild | 92 +++++++ sys-apps/less/Manifest | 10 +- sys-apps/less/less-529.ebuild | 42 ---- sys-apps/less/less-534.ebuild | 44 ---- sys-apps/less/less-535.ebuild | 44 ---- sys-apps/less/less-537.ebuild | 44 ++++ sys-apps/less/less-538.ebuild | 44 ++++ sys-apps/nix/Manifest | 4 +- sys-apps/nix/nix-2.1.1.ebuild | 135 ---------- sys-apps/nix/nix-2.1.2.ebuild | 135 ++++++++++ sys-apps/paludis/Manifest | 4 - sys-apps/paludis/metadata.xml | 17 -- sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild | 148 ----------- sys-apps/paludis/paludis-9999.ebuild | 145 ----------- sys-apps/portage/Manifest | 8 +- sys-apps/portage/portage-2.3.24-r1.ebuild | 278 --------------------- sys-apps/portage/portage-2.3.40-r1.ebuild | 2 +- sys-apps/portage/portage-2.3.48.ebuild | 264 ------------------- sys-apps/portage/portage-2.3.49.ebuild | 2 +- sys-apps/rescan-scsi-bus/Manifest | 2 +- .../rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild | 5 +- sys-apps/rng-tools/Manifest | 3 + .../rng-tools-6.4-jitterentropy-linking-fix.patch | 36 +++ sys-apps/rng-tools/rng-tools-6.4.ebuild | 69 +++++ sys-apps/sg3_utils/Manifest | 4 +- sys-apps/sg3_utils/sg3_utils-1.43.ebuild | 44 ---- sys-apps/sg3_utils/sg3_utils-1.44.ebuild | 3 +- sys-apps/smc-sum-driver/Manifest | 2 +- .../smc-sum-driver-1.6.0.20151201-r1.ebuild | 39 --- .../smc-sum-driver-1.6.0.20151201-r2.ebuild | 39 +++ 34 files changed, 525 insertions(+), 1230 deletions(-) create mode 100644 sys-apps/dmidecode/dmidecode-3.2.ebuild create mode 100644 sys-apps/hwids/hwids-20180917.ebuild delete mode 100644 sys-apps/less/less-529.ebuild delete mode 100644 sys-apps/less/less-534.ebuild delete mode 100644 sys-apps/less/less-535.ebuild create mode 100644 sys-apps/less/less-537.ebuild create mode 100644 sys-apps/less/less-538.ebuild delete mode 100644 sys-apps/nix/nix-2.1.1.ebuild create mode 100644 sys-apps/nix/nix-2.1.2.ebuild delete mode 100644 sys-apps/paludis/Manifest delete mode 100644 sys-apps/paludis/metadata.xml delete mode 100644 sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild delete mode 100644 sys-apps/paludis/paludis-9999.ebuild delete mode 100644 sys-apps/portage/portage-2.3.24-r1.ebuild delete mode 100644 sys-apps/portage/portage-2.3.48.ebuild create mode 100644 sys-apps/rng-tools/files/rng-tools-6.4-jitterentropy-linking-fix.patch create mode 100644 sys-apps/rng-tools/rng-tools-6.4.ebuild delete mode 100644 sys-apps/sg3_utils/sg3_utils-1.43.ebuild delete mode 100644 sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild create mode 100644 sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 82727bd890b8..256ba742ed2e 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest index 66cab1a4f04d..0e1cf328e573 100644 --- a/sys-apps/dmidecode/Manifest +++ b/sys-apps/dmidecode/Manifest @@ -1,3 +1,5 @@ DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9 +DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18 EBUILD dmidecode-3.1.ebuild 1144 BLAKE2B 2aae4c52c90d409639e8317795a8a5cb6c82f29b391fe1ce5fde0a11ffafb426119d0be8fb9208d77311396f032286b8c763cb1e90e89ce137cf5fdb5b80c84b SHA512 f039310d57092eaba3fd1a3ec7ebfe8e195c96e64808789fa8bbf7c7425365d6e6fcec535f5dfdb7b5bd7a0b530f4f0a7b95e12b37237c0f85219a3968476f25 +EBUILD dmidecode-3.2.ebuild 1153 BLAKE2B ca2d6d254d0145908a1f6660485e8f63a7a5a34cb85c57be5adf64098d8932179b38e3c1f1cbd6c330fb01c1b5438d5985f787ce672d8c4e8196f8c1f6b629c4 SHA512 8f20264455a2126c785e175e3084f03657514e4e50d9fcf29f283bd94973fa689ec71000fe20d2a391fb8fe97913762622ba8cf4e35380071ce9f51c98a6d0aa MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild new file mode 100644 index 000000000000..3d98eebf5a00 --- /dev/null +++ b/sys-apps/dmidecode/dmidecode-3.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="DMI (Desktop Management Interface) table related utilities" +HOMEPAGE="https://www.nongnu.org/dmidecode/" +SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-dmidecode )" +DEPEND="" + +src_prepare() { + default + sed -i \ + -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^docdir/s:dmidecode:${PF}:" \ + -e '/^PROGRAMS !=/d' \ + Makefile || die +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" +} + +pkg_postinst() { + if [[ ${CHOST} == *-solaris* ]] ; then + einfo "dmidecode needs root privileges to read /dev/xsvc" + einfo "To make dmidecode useful, either run as root, or chown and setuid the binary." + einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar" + einfo "information without requiring root privileges." + fi +} diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest index 90f71276dcb4..3cd7db1bdad6 100644 --- a/sys-apps/hwids/Manifest +++ b/sys-apps/hwids/Manifest @@ -3,10 +3,12 @@ DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898 DIST hwids-20180518.tar.gz 3150553 BLAKE2B e7d1be88349d04dac09e44bba728d1b371be66628d0143a5ab9d98f9ac5ce14bc21c272bdc93e88cb2af8f640f2f5d0497be8a33a136bcb8e69112a998be3827 SHA512 5a8e65b226026b59008c714df79309a888f728198ac5ab71c5908b69a1fd5365a0834afab0e38423affbda59ded04b662a09dc544b4d96695671f562aa0c5ec1 +DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9 EBUILD hwids-20170328.ebuild 1431 BLAKE2B 873074354502395c480a8f7310effae4d913ff00bd6b4dafb38c8aa9129238452c6f30592da124c4bc0af86a1abfd76ef58c0dbd6c99d3a901a0297be3a803bd SHA512 357aff1def6de26ae5eb2d07446c581b6279017f1750650bde113036ea2b87fd8be693e3f7cddbbf072bc598a30cc0183d1946db5c363a8e7fb203cf5f4ff1ca EBUILD hwids-20170715.ebuild 1444 BLAKE2B 1dff1651fd4cb03de461c1a7db918213dff62d3832aafe5cc0452a7c728b114b96e39a241c3ce08873f78f4a40e813f5608b7b746d93b63d23a5881cb9517581 SHA512 9b412d8745b387af89821ca49157d6d12a30e2aef98da70be6324ed4496f39981c00c909611f59644ac318463b92eed9a6b7e6b1cc6677c618b515ca96e9e4ce EBUILD hwids-20171003.ebuild 1695 BLAKE2B 51e64ebb329c3fb66f2dcc91587b0c750b1567068dad99bcaac93758969e5a72c29a60a6c0d131791ea00690d3ffbdf16595fc934741444d39633ac87357de6c SHA512 94a79ebedc06e023e54028574eff4de27799f903e1de85d77fd15fc053fed9ed153b2256d86490c024ad17da5d8d227e3290a5a34daea8b7d8ba334f4884111a EBUILD hwids-20180315.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441 EBUILD hwids-20180518.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441 +EBUILD hwids-20180917.ebuild 1739 BLAKE2B 774592745f7a53d2177c4eb07f0fe4a658245c1faea0c574c79cb8dd363818ef4c2b2c468c1c548f23797f25dbbb3dcfa8409296e2c38f4d5376187b98672629 SHA512 e8d07c70b55ad7cba1296e16597e89d48cdad928926e7497726457d25a880ddbe2f4220bf6b6a08989706a554bd2db8edfc6fded203f9dc69dc8334b03ab7441 EBUILD hwids-99999999.ebuild 1739 BLAKE2B e985f2d9d336c2bdd107b7402638b36bb095f705b68ccf23afc83847b9f7c0c56262e9e81b627309fd3e7b334b033d22a65f9224e7c144fa369dce0d1aba2f89 SHA512 e953085bc62d2d5beeb80b42fdbe6c7ec721d904789488e1754c2bb1504eb18bef7995f710c6d70045261c2b0b3d5e872ba6de835d31dfef7b4d272ab14853d8 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c diff --git a/sys-apps/hwids/hwids-20180917.ebuild b/sys-apps/hwids/hwids-20180917.ebuild new file mode 100644 index 000000000000..b853ba3cb8b6 --- /dev/null +++ b/sys-apps/hwids/hwids-20180917.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit udev + +DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases" +HOMEPAGE="https://github.com/gentoo/hwids" +if [[ ${PV} == "99999999" ]]; then + PYTHON_COMPAT=( python3_6 ) + inherit git-r3 python-any-r1 + EGIT_REPO_URI="${HOMEPAGE}.git" +else + SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +fi + +LICENSE="|| ( GPL-2 BSD ) public-domain" +SLOT="0" +IUSE="+net +pci +udev +usb" + +DEPEND="" +RDEPEND=" + udev? ( virtual/udev ) + ! - - - - mgorny@gentoo.org - Michał Górny - - - Enable binary package support. Adds dependency upon - app-arch/libarchive - Use a less boring colourscheme than the default - Enable cave search --index. Requires - dev-db/sqlite. - Build xml things for metadata.xml and GLSA support - (needs dev-libs/libxml2). - - diff --git a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild deleted file mode 100644 index b4cf05b00236..000000000000 --- a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -RUBY_VER=2.3 - -inherit bash-completion-r1 cmake-utils python-single-r1 user - -MY_P=paludis-57881321fa3d5d82a9260db54afd608fd61dd533 -DESCRIPTION="paludis, the other package mangler" -HOMEPAGE="http://paludis.exherbo.org/" -SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz" - -IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml" -LICENSE="GPL-2 vim" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86" - -COMMON_DEPEND=" - >=app-admin/eselect-1.2.13 - >=app-shells/bash-3.2:0 - dev-libs/libpcre:=[cxx] - sys-apps/file:= - pbins? ( >=app-arch/libarchive-3.1.2:= ) - python? ( - ${PYTHON_DEPS} - =dev-db/sqlite-3:= ) - xml? ( >=dev-libs/libxml2-2.6:= )" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=app-text/asciidoc-8.6.3 - app-text/htmltidy - app-text/xmlto - >=sys-devel/gcc-4.7 - doc? ( - app-doc/doxygen - python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] ) - ) - virtual/pkgconfig - test? ( >=dev-cpp/gtest-1.6.0-r1 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/sandbox" - -PDEPEND="app-eselect/eselect-package-manager" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( ruby_targets_ruby${RUBY_VER/./} )" -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${MY_P} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if id paludisbuild >/dev/null 2>/dev/null ; then - if ! groups paludisbuild | grep --quiet '\' ; then - eerror "The 'paludisbuild' user is now expected to be a member of the" - eerror "'tty' group. You should add the user to this group before" - eerror "upgrading Paludis." - die "Please add paludisbuild to tty group" - fi - fi - fi -} - -pkg_setup() { - enewgroup "paludisbuild" - enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty" - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Fix the script shebang on Ruby scripts. - # https://bugs.gentoo.org/show_bug.cgi?id=439372#c2 - sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_GTEST=$(usex test) - -DENABLE_PBINS=$(usex pbins) - -DENABLE_PYTHON=$(usex python) - -DENABLE_PYTHON_DOCS=$(usex doc) # USE=python implicit - -DENABLE_RUBY=$(usex ruby) - -DENABLE_RUBY_DOCS=$(usex doc) # USE=ruby implicit - -DENABLE_SEARCH_INDEX=$(usex search-index) - -DENABLE_VIM=ON - -DENABLE_XML=$(usex xml) - - -DPALUDIS_COLOUR_PINK=$(usex pink) - -DRUBY_VERSION=${RUBY_VER} - -DPALUDIS_ENVIRONMENTS=all - -DPALUDIS_DEFAULT_DISTRIBUTION=gentoo - -DPALUDIS_CLIENTS=all - -DCONFIG_FRAMEWORK=eselect - - # GNUInstallDirs - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobashcomp bash-completion/cave - - insinto /usr/share/zsh/site-functions - doins zsh-completion/_cave -} - -src_test() { - # Work around Portage bugs - local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks" - local -x BASH_ENV=/dev/null - - if [[ ${EUID} == 0 ]] ; then - # hate - local -x PALUDIS_REDUCED_UID=0 - local -x PALUDIS_REDUCED_GID=0 - fi - - cmake-utils_src_test -} - -pkg_postinst() { - local pm - if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then - pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" ) - fi - - if [[ ${pm} != paludis ]] ; then - elog "If you are using paludis or cave as your primary package manager," - elog "you should consider running:" - elog " eselect package-manager set paludis" - fi -} diff --git a/sys-apps/paludis/paludis-9999.ebuild b/sys-apps/paludis/paludis-9999.ebuild deleted file mode 100644 index cecf2cc4dee7..000000000000 --- a/sys-apps/paludis/paludis-9999.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://git.exherbo.org/git/paludis/paludis.git" -PYTHON_COMPAT=( python2_7 ) -RUBY_VER=2.3 - -inherit bash-completion-r1 cmake-utils git-r3 python-single-r1 user - -DESCRIPTION="paludis, the other package mangler" -HOMEPAGE="http://paludis.exherbo.org/" -SRC_URI="" - -IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml" -LICENSE="GPL-2 vim" -SLOT="0" -KEYWORDS="" - -COMMON_DEPEND=" - >=app-admin/eselect-1.2.13 - >=app-shells/bash-3.2:0 - dev-libs/libpcre:=[cxx] - sys-apps/file:= - pbins? ( >=app-arch/libarchive-3.1.2:= ) - python? ( - ${PYTHON_DEPS} - >=dev-libs/boost-1.41.0:=[python,${PYTHON_USEDEP}] ) - ruby? ( dev-lang/ruby:${RUBY_VER} ) - search-index? ( >=dev-db/sqlite-3:= ) - xml? ( >=dev-libs/libxml2-2.6:= )" - -DEPEND="${COMMON_DEPEND} - >=app-text/asciidoc-8.6.3 - app-text/htmltidy - app-text/xmlto - >=sys-devel/gcc-4.7 - doc? ( - app-doc/doxygen - python? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] ) - ) - virtual/pkgconfig - test? ( >=dev-cpp/gtest-1.6.0-r1 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/sandbox" - -PDEPEND="app-eselect/eselect-package-manager" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( ruby_targets_ruby${RUBY_VER/./} )" -RESTRICT="!test? ( test )" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != buildonly ]]; then - if id paludisbuild >/dev/null 2>/dev/null ; then - if ! groups paludisbuild | grep --quiet '\' ; then - eerror "The 'paludisbuild' user is now expected to be a member of the" - eerror "'tty' group. You should add the user to this group before" - eerror "upgrading Paludis." - die "Please add paludisbuild to tty group" - fi - fi - fi -} - -pkg_setup() { - enewgroup "paludisbuild" - enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty" - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Fix the script shebang on Ruby scripts. - # https://bugs.gentoo.org/show_bug.cgi?id=439372#c2 - sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DOXYGEN=$(usex doc) - -DENABLE_GTEST=$(usex test) - -DENABLE_PBINS=$(usex pbins) - -DENABLE_PYTHON=$(usex python) - -DENABLE_PYTHON_DOCS=$(usex doc) # USE=python implicit - -DENABLE_RUBY=$(usex ruby) - -DENABLE_RUBY_DOCS=$(usex doc) # USE=ruby implicit - -DENABLE_SEARCH_INDEX=$(usex search-index) - -DENABLE_VIM=ON - -DENABLE_XML=$(usex xml) - - -DPALUDIS_COLOUR_PINK=$(usex pink) - -DRUBY_VERSION=${RUBY_VER} - -DPALUDIS_ENVIRONMENTS=all - -DPALUDIS_DEFAULT_DISTRIBUTION=gentoo - -DPALUDIS_CLIENTS=all - -DCONFIG_FRAMEWORK=eselect - - # GNUInstallDirs - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - dobashcomp bash-completion/cave - - insinto /usr/share/zsh/site-functions - doins zsh-completion/_cave -} - -src_test() { - # Work around Portage bugs - local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks" - local -x BASH_ENV=/dev/null - - if [[ ${EUID} == 0 ]] ; then - # hate - local -x PALUDIS_REDUCED_UID=0 - local -x PALUDIS_REDUCED_GID=0 - fi - - cmake-utils_src_test -} - -pkg_postinst() { - local pm - if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then - pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" ) - fi - - if [[ ${pm} != paludis ]] ; then - elog "If you are using paludis or cave as your primary package manager," - elog "you should consider running:" - elog " eselect package-manager set paludis" - fi -} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index a42cb1069ef0..f44e87349551 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,16 +1,12 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c -DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5 -DIST portage-2.3.48.tar.bz2 1010013 BLAKE2B caa314508dc54255e4829b31cd9b943f901458a9521a1270cfd559f624f39b16e7e8dd9ca8e8c0d8ff387c1322cdf896df0f69f55f693fdbfd3817ed3bea9835 SHA512 255132364daafd47462efa5fea2fa5cb87df3458f2e5da025e5fee35531d78b9581bc9daaa9e78e01730f271e7e8844405a963bbaf739a532699d68760184498 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 -EBUILD portage-2.3.24-r1.ebuild 8997 BLAKE2B 66941bf2ca4330b0fa230833f6460044d8063b177fe537192125a6170f6861a1c6182a1ce25efc2c22d04cf76c7ab2c48e8c332120afb7f191a78be065df93dc SHA512 eafc67c5df88075390151a28e1cd9e89bb2ab85d9e2c3cb5dc02ef3cae93d91aaea219c642dd8a59b3ab8d8e06614524dc116459c311b957bed7f4c2c848362d -EBUILD portage-2.3.40-r1.ebuild 9676 BLAKE2B 143c477c2089c9cd8ab1df8a377cd6c5c65869027744a9fe82acacabd10d74011694772c46983b54d3f222ed0ae2bfb3449e8b899e6b1f3c1a8a06867d51d27a SHA512 4c5c837f5f546cfcb95afd9b1000d65575a3d3ff03d43161e83c2c5b905adec30808b75d58714db091e069cd08f71735964b3373261254a3c445fb236c250053 -EBUILD portage-2.3.48.ebuild 8687 BLAKE2B 012b80d23a446732def3256defbe42f2d3fd32a18a71d76658054b63c96a6eaa5d94339ac273d0a3bcf5852994a0c5fd36771b2e94880dd1afd52ecaca789fc8 SHA512 b57b6c07281afb445705a2dfd3a07b92c8a030ec2acb5d66f7474331bb6ece2c6a23dca2c015b9f201919c922b58536bdee0c63f666b4792d9fee6cee8d05346 -EBUILD portage-2.3.49.ebuild 8687 BLAKE2B 012b80d23a446732def3256defbe42f2d3fd32a18a71d76658054b63c96a6eaa5d94339ac273d0a3bcf5852994a0c5fd36771b2e94880dd1afd52ecaca789fc8 SHA512 b57b6c07281afb445705a2dfd3a07b92c8a030ec2acb5d66f7474331bb6ece2c6a23dca2c015b9f201919c922b58536bdee0c63f666b4792d9fee6cee8d05346 +EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1 +EBUILD portage-2.3.49.ebuild 8680 BLAKE2B af9781e1d7426bab076dc01541101e358ef53aba04d2397d1ce69ccfe5d99507eec568aa3c430772028208429999440cee80ee1b43d6b1199d767634a1e67e9d SHA512 d51b594b74dea47d295cc31ae6befcf3777b56a50ced3a8f5a08c234379a78c3d26f7421d64071f26af29c72390fa7a7cd10949e978ceeb75081aa87d4c660c2 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c EBUILD portage-9999.ebuild 8553 BLAKE2B 3341e4fe3dd6601a1a5c94a166910f61bdb9bf860fdcd7bdf725bb0e424b016800a58cae1c547cabd70604d7b4b1a3ef11535afa875a75203e1911c42f8f920d SHA512 de3bee0495126b35c22947a238c57fa6b92eb9b553f540f6617f12cb4861f1f5e9ab611548a4660e87612bc2dee8f1f5c1e38de207fa67ea9617d89858d9ff54 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild deleted file mode 100644 index 2ce6dbe9b0ec..000000000000 --- a/sys-apps/portage/portage-2.3.24-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_4 python3_5 python3_6 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 systemd - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd" -SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) - rsync-verify? ( - >=app-portage/gemato-10 - app-crypt/gentoo-keys - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !> cnf/make.globals || die - fi - - if use native-extensions; then - printf "[build_ext]\nportage-ext-modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i pym/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi - - if has_version ">=${CATEGORY}/${PN}-2.3.1" && \ - has_version "<${CATEGORY}/${PN}-2.3.3"; then - SYNC_DEPTH_UPGRADE=true - else - SYNC_DEPTH_UPGRADE=false - fi -} - -pkg_postinst() { - if ${SYNC_DEPTH_UPGRADE}; then - ewarn "Please note that this release no longer respects sync-depth for" - ewarn "git repositories. There have been too many problems and" - ewarn "performance issues. See bugs 552814, 559008" - fi -} diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild index 718b2c5c9df1..a13a4a8b0add 100644 --- a/sys-apps/portage/portage-2.3.40-r1.ebuild +++ b/sys-apps/portage/portage-2.3.40-r1.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd" SLOT="0" IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" diff --git a/sys-apps/portage/portage-2.3.48.ebuild b/sys-apps/portage/portage-2.3.48.ebuild deleted file mode 100644 index 9963e46ec945..000000000000 --- a/sys-apps/portage/portage-2.3.48.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_4 python3_5 python3_6 python3_7 - python2_7 -) -PYTHON_REQ_USE='bzip2(+),threads(+)' - -inherit distutils-r1 systemd - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" -SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -# app-portage/gemato goes without PYTHON_USEDEP since we're calling -# the executable. -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ - python{2_7,3_4,3_5} pypy) - rsync-verify? ( - >=app-portage/gemato-14[${PYTHON_USEDEP}] - >=app-crypt/openpgp-keys-gentoo-release-20180706 - >=app-crypt/gnupg-2.2.4-r2[ssl(-)] - ) - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_musl? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !> cnf/make.globals || die - fi - - if use native-extensions; then - printf "[build_ext]\nportage-ext-modules=true\n" >> \ - setup.cfg || die - fi - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i lib/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if use build || ! use rsync-verify; then - sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \ - -i cnf/repos.conf || die "sed failed" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i lib/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - if use prefix-guest ; then - sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ - -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ - -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \ - -i cnf/repos.conf || die "sed failed" - fi - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( - install_docbook - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi -} diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild index 9963e46ec945..ab0aa47554de 100644 --- a/sys-apps/portage/portage-2.3.49.ebuild +++ b/sys-apps/portage/portage-2.3.49.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd" SLOT="0" IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest index 7bb0c9795201..dbe22d5fb772 100644 --- a/sys-apps/rescan-scsi-bus/Manifest +++ b/sys-apps/rescan-scsi-bus/Manifest @@ -1,3 +1,3 @@ DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733 -EBUILD rescan-scsi-bus-1.57-r1.ebuild 845 BLAKE2B 367a33189960de0a4e3f369418ed2400090632995bdca8a675a0583ca028beb89947e3aa6d88a229e5526898d480c86f19ff15ba0cfc766bbe697d7c8e85f6cb SHA512 62336d8916be4ea8e25dff3bcd87a5c33d4da7e6a82331b77160502b0301d6a9d436f6068c3cbfc87ecf2a4e18e36a7977b938649839834d912999b21ebbce17 +EBUILD rescan-scsi-bus-1.57-r1.ebuild 855 BLAKE2B f9dab83869ab3ad356353b13c17ca497aa18580617201121b0bb2b6e4cad8b7a334c43f1e268195a6e69aaaf564cce85b31f4049d3cf773c7dfb742659888d18 SHA512 41cf5d0ed89043baf6f9a677a373cdcde0c40c0e16af69f69c813c8855e084b5918551f80260f86666d05446400c093d28e480ed229b4d31ca0f522cb1454c84 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild index 00c6f7a6d415..060cbbd64cdd 100644 --- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild +++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild @@ -1,9 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=6 DESCRIPTION="Script to rescan the SCSI bus without rebooting" HOMEPAGE="http://www.garloff.de/kurt/linux/" @@ -16,6 +14,7 @@ SLOT="0" KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" RDEPEND=">=sys-apps/sg3_utils-1.24 + +Date: Wed, 19 Sep 2018 16:45:37 -0400 +Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system + +--- + Makefile.am | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fa8ecca..abc759a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,9 +2,7 @@ + ## Toplevel Makefile.am for rng-tools + ## + if JITTER +- JSUBDIR = jitterentropy-library +- JSUBLIB = ./jitterentropy-library/libjitterentropy.a +- AM_CPPFLAGS = -I./jitterentropy-library ++ jitterentropy_LIBS = -ljitterentropy + endif + + SUBDIRS = contrib tests $(JSUBDIR) +@@ -33,7 +31,7 @@ if JITTER + rngd_SOURCES += rngd_jitter.c + endif + +-rngd_LDADD = librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS) ++rngd_LDADD = librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS} $(PTHREAD_LIBS) + + rngd_CFLAGS = ${libxml2_CFLAGS} ${openssl_CFLAGS} $(PTHREAD_CFLAGS) + rngd_LDFLAGS = $(PTHREAD_CFLAGS) +-- +2.19.0 + diff --git a/sys-apps/rng-tools/rng-tools-6.4.ebuild b/sys-apps/rng-tools/rng-tools-6.4.ebuild new file mode 100644 index 000000000000..6c2cc7c69abc --- /dev/null +++ b/sys-apps/rng-tools/rng-tools-6.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools systemd toolchain-funcs + +DESCRIPTION="Daemon to use hardware random number generators" +HOMEPAGE="https://github.com/nhorman/rng-tools" +SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" +IUSE="jitterentropy nistbeacon selinux" + +DEPEND="dev-libs/libgcrypt:0 + dev-libs/libgpg-error + sys-fs/sysfsutils + jitterentropy? ( + app-crypt/jitterentropy:= + ) + nistbeacon? ( + net-misc/curl[ssl] + dev-libs/libxml2:2= + dev-libs/openssl:0= + ) +" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-rngd )" +DEPEND="${DEPEND} + nistbeacon? ( + virtual/pkgconfig + ) +" + +PATCHES=( + "${FILESDIR}"/test-for-argp.patch + "${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962 + "${FILESDIR}"/${PN}-6.4-jitterentropy-linking-fix.patch +) + +src_prepare() { + echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die + default + + mv README.md README || die + + if use jitterentropy; then + # Fool the build system into thinking that + # jitterentropy source code exists + touch "${S}"/jitterentropy-library/Makefile || die + fi + eautoreconf + + sed -i '/^AR /d' Makefile.in || die + tc-export AR +} + +src_configure() { + econf $(use_with nistbeacon) +} + +src_install() { + default + newinitd "${FILESDIR}"/rngd-initd-6 rngd + newconfd "${FILESDIR}"/rngd-confd-4.1 rngd + systemd_dounit "${FILESDIR}"/rngd.service +} diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest index d1c1e1457f9d..9c1d7e021765 100644 --- a/sys-apps/sg3_utils/Manifest +++ b/sys-apps/sg3_utils/Manifest @@ -1,9 +1,7 @@ AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad -DIST sg3_utils-1.43.tar.gz 1180760 BLAKE2B 20475d974f9f4c0f275499a63f921b587df76e1b8addcd5201fd5db95e100eb0b4c8c97aba7e9651ae069c43e30cd7b780643212307dec6d53e5b91cd2c653e8 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d EBUILD sg3_utils-1.42.ebuild 1030 BLAKE2B 7086604cc7f4e6ccbea214d7bbb9e66d1d07146d1cca14220dfc358ded7cfb4bd8f54b2f6fc49a082a2fbbb162ff3494b3bdb3a254448fb5e2db5b76018ca5c1 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59 -EBUILD sg3_utils-1.43.ebuild 1082 BLAKE2B 3fd661d203baa20ab824cfff31d60d5f3aa004c99e514b5182931c353f38f32a2948dded981637f85a7baf79c002e4df56768a1a3f0d630d2a5cdf45fddde761 SHA512 ebb7d708d91268e3e23b54a07060e8a351f97a32815821212872cc6645a8da06c5f558ea37c036e70b579bfcad03e7423e283f4d6e11445e2f1b7d6cfe8a44ff -EBUILD sg3_utils-1.44.ebuild 1076 BLAKE2B 3b917030f5363a698efd36e3060f42935b7755259e0315fed930d861e54ad98f3e4b451c1a220b8aa1c63bd6a343861f9e773e31c1b122d7f7f5ac260651147e SHA512 db18c2fc70c535d6431f318e4dcaaec7a31c3eb66659bb553b0359f96f70ee3a5a7157fc58ac3783d3a5b396592942495e84164952255f2eb7ea3824f8a136be +EBUILD sg3_utils-1.44.ebuild 1059 BLAKE2B 3142f90ed68830e64aa4c75c1b57afa1fdf360c4bb7b0053fb0df8ebf4806d6e1000df683075f49f9615166a8aba71a856b04964383ef0935f3423527feee8aa SHA512 1ee8606d54fe680c151bd6bf8299854caee899215aad564951be3092544b196b40ac814c4a6a597b041a0d9f585b36c8c9ea039bcc98979f66574470020f9823 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/sg3_utils/sg3_utils-1.43.ebuild b/sys-apps/sg3_utils/sg3_utils-1.43.ebuild deleted file mode 100644 index 78f997750df5..000000000000 --- a/sys-apps/sg3_utils/sg3_utils-1.43.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -DESCRIPTION="Apps for querying the sg SCSI interface" -HOMEPAGE="http://sg.danny.cz/sg/" -SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static-libs" - -DEPEND="sys-devel/libtool" -RDEPEND="" -PDEPEND=">=sys-apps/rescan-scsi-bus-1.24" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236 - epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236 -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - dodoc COVERAGE doc/README examples/*.txt - newdoc scripts/README README.scripts - - # Better fix for bug 231089; some packages look for sgutils2 - local path lib - path="/usr/$(get_libdir)" - for lib in "${ED}"${path}/libsgutils2.*; do - lib=${lib##*/} - dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}" - done - - prune_libtool_files -} diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild index d98714db0ff7..9967e7f36175 100644 --- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild +++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild @@ -16,8 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa IUSE="static-libs" DEPEND="sys-devel/libtool" -RDEPEND="" -PDEPEND=">=sys-apps/rescan-scsi-bus-1.24" +RDEPEND="!sys-apps/rescan-scsi-bus" PATCHES=( "${FILESDIR}"/${PN}-1.26-stdint.patch #580236 diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest index 533a39afb4c0..a3743b577261 100644 --- a/sys-apps/smc-sum-driver/Manifest +++ b/sys-apps/smc-sum-driver/Manifest @@ -1,4 +1,4 @@ AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625 -EBUILD smc-sum-driver-1.6.0.20151201-r1.ebuild 854 BLAKE2B 1272340d41d5f6f2a9b00e15448481fe864287a8c16073e443b738420cd86f8aec21f3769df04d3e6e3228a6823932180c530b2cd657c12843b39ba9a28dd3c4 SHA512 e8d2463374e985c464f82d64b41a0a6aab337e20ad33021c627b63f70701256964a00e44186814fa1dd13e1ee93fa13670c2bd633b0297649f0084933b111f9e +EBUILD smc-sum-driver-1.6.0.20151201-r2.ebuild 854 BLAKE2B 1272340d41d5f6f2a9b00e15448481fe864287a8c16073e443b738420cd86f8aec21f3769df04d3e6e3228a6823932180c530b2cd657c12843b39ba9a28dd3c4 SHA512 e8d2463374e985c464f82d64b41a0a6aab337e20ad33021c627b63f70701256964a00e44186814fa1dd13e1ee93fa13670c2bd633b0297649f0084933b111f9e MISC metadata.xml 602 BLAKE2B 6bb453de4cd9a7cd7f52648c2994ac056bb756a8851659bd4075341e5d97a6cd81d056ef54cd4315ae25d6821ac684bafaee12d7928d7a998724e87af57cf05f SHA512 27d229c5f3ea94fb7098f4659edf321b048ecdba0624a41cfc53cec5b3d3c975914fc599494ebb03ae5dc8ea29993a23e90a9b7be76505cb7dcdf8ab1e3d9b5e diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild deleted file mode 100644 index 825bec7d32ea..000000000000 --- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod - -MY_DATE="$(ver_cut 4)" -MY_PN="${PN//-/_}" -MY_PV="$(ver_cut 1-3)" -MY_P="${MY_PN/smc_/}_V${MY_PV}" - -DESCRIPTION="Supermicro Update Manager (SUM) kernel module" -HOMEPAGE="https://www.supermicro.com" -SRC_URI="${MY_P}_${MY_DATE}.tar.gz" - -KEYWORDS="-* ~amd64 ~x86" -LICENSE="supermicro" -SLOT="0" - -RESTRICT="bindist fetch mirror" - -S="${WORKDIR}"/${MY_P}/Linux - -BUILD_TARGETS="default" -MODULE_NAMES="sum_bios(misc:${S})" - -pkg_nofetch() { - elog "Please contact the Supermicro support at support@supermicro.com," - elog "in order to obtain a copy of ${A}" - elog "and place it in your DISTDIR directory." -} - -src_prepare() { - # Install new Makefile to respect users CFLAGS and LDFLAGS - cp "${FILESDIR}"/makefile Makefile - - default -} diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild new file mode 100644 index 000000000000..825bec7d32ea --- /dev/null +++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod + +MY_DATE="$(ver_cut 4)" +MY_PN="${PN//-/_}" +MY_PV="$(ver_cut 1-3)" +MY_P="${MY_PN/smc_/}_V${MY_PV}" + +DESCRIPTION="Supermicro Update Manager (SUM) kernel module" +HOMEPAGE="https://www.supermicro.com" +SRC_URI="${MY_P}_${MY_DATE}.tar.gz" + +KEYWORDS="-* ~amd64 ~x86" +LICENSE="supermicro" +SLOT="0" + +RESTRICT="bindist fetch mirror" + +S="${WORKDIR}"/${MY_P}/Linux + +BUILD_TARGETS="default" +MODULE_NAMES="sum_bios(misc:${S})" + +pkg_nofetch() { + elog "Please contact the Supermicro support at support@supermicro.com," + elog "in order to obtain a copy of ${A}" + elog "and place it in your DISTDIR directory." +} + +src_prepare() { + # Install new Makefile to respect users CFLAGS and LDFLAGS + cp "${FILESDIR}"/makefile Makefile + + default +} -- cgit v1.2.3