diff options
Diffstat (limited to 'sys-apps')
38 files changed, 331 insertions, 422 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex 215fa71966f6..19b861a7c002 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index 84a2780ae2f5..10d1e168b6d0 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,6 +1,8 @@ DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 DIST baselayout-2.5.tar.bz2 31368 BLAKE2B 73a939bf9a180da151804045ff0e57e4def11e9bca8f55b2b891437712877b718faaf7d6ef006161d92e853c747246b20adc7d26105832c5c3120510325cbc67 SHA512 5705740c0be47a7c76d480c1173fd69a5cfc278351f34ab0c4f54220da81617fc4755c8f61888985611f77881cc89b273775fec593915f344076fc3264ea6934 +DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b EBUILD baselayout-2.4.1-r2.ebuild 8573 BLAKE2B 1ae0257d233a4ee8a6351cd501bd3516b0c3c3a6e306d3b01fd45db29b4a932214dfe4989d23f397733eefd02c72f58bb726bdcfce975a58a0541f7fe71b4671 SHA512 cdd4f344d072851848c6e512bc3c47f1225d49b2077dbd3af45caf1f4e8d6d9d112a315b034a2237f8cf7bcadd5585cd3fc55489a085bb744130c0d37d2d7662 EBUILD baselayout-2.5-r1.ebuild 8890 BLAKE2B b4f5d135b81f21f5f2e53482fbb45fcf3e297de59d2ae2a547135de22250bd19e09b4cd0b04330864426803f54c176fe181752f90afe27366251439592e58638 SHA512 6b884773a0e854724b1e32f79c4c8c90fe0a7cf1b017efe7b0dbe60e81f2c8445c124eb3125cb41996ad4bd343d71f27e0f210b072f0fb89725a6375b5a3474d -EBUILD baselayout-9999.ebuild 8890 BLAKE2B b4f5d135b81f21f5f2e53482fbb45fcf3e297de59d2ae2a547135de22250bd19e09b4cd0b04330864426803f54c176fe181752f90afe27366251439592e58638 SHA512 6b884773a0e854724b1e32f79c4c8c90fe0a7cf1b017efe7b0dbe60e81f2c8445c124eb3125cb41996ad4bd343d71f27e0f210b072f0fb89725a6375b5a3474d +EBUILD baselayout-2.6.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd +EBUILD baselayout-9999.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1 diff --git a/sys-apps/baselayout/baselayout-2.6.ebuild b/sys-apps/baselayout/baselayout-2.6.ebuild new file mode 100644 index 000000000000..c32ab3e4495f --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.6.ebuild @@ -0,0 +1,272 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib versionator prefix + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://www.gentoo.org/" +if [[ ${PV} = 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + local def_libdir libdir libdirs + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + [ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + if use split-usr ; then + exp=( {,usr/,usr/local/}${libdir} ) + else + exp=( {usr/,usr/local/}${libdir} ) + fi + for d in "${exp[@]}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" + else + [ -h "${d}" ] && syms+=" ${d}" + fi + done + done + if [ -n "${syms}${dirs}" ] ; then + ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to" + ewarn "have these paths configured as follows:" + [ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}" + [ -n "${syms}" ] && ewarn "directories:${syms}" + ewarn "The ebuild will attempt to fix these, but only for trivial conversions." + ewarn "If things fail, you will need to manually create/move the directories." + echo + fi + + # setup symlinks and dirs where we expect them to be; do not migrate + # data ... just fall over in that case. + local prefix prefix_lst + if use split-usr ; then + prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) + else + prefix_lst=( "${EROOT}"{usr/,usr/local/} ) + fi + for prefix in "${prefix_lst[@]}"; do + if [ "${SYMLINK_LIB}" = yes ] ; then + # we need to make sure "lib" points to the native libdir + if [ -h "${prefix}lib" ] ; then + # it's already a symlink! assume it's pointing to right place ... + continue + elif [ -d "${prefix}lib" ] ; then + # "lib" is a dir, so need to convert to a symlink + ewarn "Converting ${prefix}lib from a dir to a symlink" + rm -f "${prefix}lib"/.keep + if rmdir "${prefix}lib" 2>/dev/null ; then + ln -s ${def_libdir} "${prefix}lib" || die + else + die "non-empty dir found where we needed a symlink: ${prefix}lib" + fi + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a symlink" + mkdir -p "${prefix}" || die + rm -f "${prefix}lib" || die + ln -s ${def_libdir} "${prefix}lib" || die + mkdir -p "${prefix}${def_libdir}" #423571 + fi + else + # we need to make sure "lib" is a dir + if [ -h "${prefix}lib" ] ; then + # "lib" is a symlink, so need to convert to a dir + ewarn "Converting ${prefix}lib from a symlink to a dir" + rm -f "${prefix}lib" || die + if [ -d "${prefix}lib32" ] ; then + ewarn "Migrating ${prefix}lib32 to ${prefix}lib" + mv "${prefix}lib32" "${prefix}lib" || die + else + mkdir -p "${prefix}lib" || die + fi + elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then + # make sure the old "lib" ABI location does not exist; we + # only symlinked the lib dir on systems where we moved it + # to "lib32" ... + case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. + i?86*|x86_64*|powerpc*|sparc*|s390*) + if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then + rm -f "${prefix}lib32"/.keep + if ! rmdir "${prefix}lib32" 2>/dev/null ; then + ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" + die "non-empty dir found where there should be none: ${prefix}lib32" + fi + fi + ;; + esac + else + # nothing exists, so just set it up sanely + ewarn "Initializing ${prefix}lib as a dir" + mkdir -p "${prefix}lib" || die + fi + fi + done + if ! use split-usr ; then + for libdir in ${libdirs}; do + if [[ ! -e "${EROOT}${libdir}" ]]; then + ln -s usr/"${libdir}" "${EROOT}${libdir}" + fi + done + fi +} + +pkg_preinst() { + # This is written in src_install (so it's in CONTENTS), but punt all + # pending updates to avoid user having to do etc-update (and make the + # pkg_postinst logic simpler). + rm -f "${EROOT}"/etc/._cfg????_gentoo-release + + # We need to install directories and maybe some dev nodes when building + # stages, but they cannot be in CONTENTS. + # Also, we cannot reference $S as binpkg will break so we do this. + multilib_layout + if use build ; then + if use split-usr ; then + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout + else + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge + fi + fi + rm -f "${ED}"/usr/share/${PN}/Makefile +} + +src_prepare() { + default + if use prefix; then + hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile + hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd + echo PATH=/usr/bin:/bin >> etc/env.d/99host + echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host + fi + + # handle multilib paths. do it here because we want this behavior + # regardless of the C library that you're using. we do explicitly + # list paths which the native ldconfig searches, but this isn't + # problematic as it doesn't change the resulting ld.so.cache or + # take longer to generate. similarly, listing both the native + # path and the symlinked path doesn't change the resulting cache. + local libdir ldpaths + for libdir in $(get_all_libdirs) ; do + ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" + ldpaths+=":${EPREFIX}/usr/local/${libdir}" + done + echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout + + # rc-scripts version for testing of features that *should* be present + echo "Gentoo Base System release ${PV}" > etc/gentoo-release +} + +src_install() { + emake \ + OS=$(usex kernel_FreeBSD BSD Linux) \ + DESTDIR="${ED}" \ + install + dodoc ChangeLog + + # need the makefile in pkg_preinst + insinto /usr/share/${PN} + doins Makefile +} + +pkg_postinst() { + local x + + # We installed some files to /usr/share/baselayout instead of /etc to stop + # (1) overwriting the user's settings + # (2) screwing things up when attempting to merge files + # (3) accidentally packaging up personal files with quickpkg + # If they don't exist then we install them + for x in master.passwd passwd shadow group fstab ; do + [ -e "${EROOT}etc/${x}" ] && continue + [ -e "${EROOT}usr/share/baselayout/${x}" ] || continue + cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc + done + + # Force shadow permissions to not be world-readable #260993 + for x in shadow ; do + [ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}" + done + + # Take care of the etc-update for the user + if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then + mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release + fi + + # whine about users that lack passwords #193541 + if [[ -e "${EROOT}"etc/shadow ]] ; then + local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow) + if [[ -n ${bad_users} ]] ; then + echo + ewarn "The following users lack passwords!" + ewarn ${bad_users} + fi + fi + + # whine about users with invalid shells #215698 + if [[ -e "${EROOT}"etc/passwd ]] ; then + local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort) + if [[ -n ${bad_shells} ]] ; then + echo + ewarn "The following users have non-existent shells!" + ewarn "${bad_shells}" + fi + fi + + # https://bugs.gentoo.org/361349 + if use kernel_linux; then + mkdir -p "${EROOT}"run + + local found fstype mountpoint + while read -r _ mountpoint fstype _; do + [[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1 + done < "${ROOT}"proc/mounts + [[ -z ${found} ]] && + ewarn "You should reboot now to get /run mounted with tmpfs!" + fi + + for x in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 2.4 ${x}; then + ewarn "After updating ${EROOT}etc/profile, please run" + ewarn "env-update && . /etc/profile" + fi + + if ! version_is_at_least 2.6 ${x}; then + ewarn "Please run env-update then log out and back in to" + ewarn "update your path." + fi + # clean up after 2.5 typos + # https://bugs.gentoo.org/show_bug.cgi?id=656380 + if [[ ${x} == 2.5 ]]; then + rm -fr "${EROOT}{,usr" + fi + done + + if [[ -e "${EROOT}"etc/env.d/00basic ]]; then + ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout" + ewarn "Please migrate your changes." + fi +} diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild index 866701708dc6..c32ab3e4495f 100644 --- a/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sys-apps/baselayout/baselayout-9999.ebuild @@ -254,7 +254,7 @@ pkg_postinst() { ewarn "env-update && . /etc/profile" fi - if ! version_is_at_least 2.5 ${x}; then + if ! version_is_at_least 2.6 ${x}; then ewarn "Please run env-update then log out and back in to" ewarn "update your path." fi diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest index 27f3a4a3db71..5a455949ad4b 100644 --- a/sys-apps/dbus/Manifest +++ b/sys-apps/dbus/Manifest @@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab DIST dbus-1.12.8.tar.gz 2071751 BLAKE2B 9ba26d48f34b4d328335917bbc40d5f4423a48f90b0436783a8d6d290bc8b99c54aa31d23efaf52ef90748d53e68b7c0e3ddce0f4ce26ea5369acbd57d726b84 SHA512 8177898bf2db22e5c6abff0d9ffec8f248f0d155a83b7ae906c1ce3b61d289e7ba7bef9799102e6de3ca64198c7d293dccecf92c7e8b7403c1d9b1bb86e99ea3 EBUILD dbus-1.10.18.ebuild 7378 BLAKE2B d258aceeb402a50f56a971ed97e5789b15f9c2c32b64adf0570e67fd78911813e7c3f7de8c41f43e326b120561ee27b179aed6424a7db2e438067e8a1b1233d5 SHA512 e2a689defcb78cb6fec98ec393af42c8e1b71f7ad2afe1c9fc2d039ffb7b0b3684ea13ed06f1127567dbb8b6621c0da259334070ef1e22982d75a3c9ade491eb -EBUILD dbus-1.10.24.ebuild 7386 BLAKE2B 767c81f2173c494a53e70576acab80946879adc6ed2edcf63332eb926dc2d2dfcf1c61bd606df299480cea26f66a7d5fe77c7c84bc60ed89a838d1038a8000a8 SHA512 9e7ce68ca8a1e0399bd53eb27d41b539dc6680f71c776532a955ba1ce8d6c1e3fd014b909a2ec3f78b5fd8bf9e3300487998df891938b0379c773d0868ea7cac +EBUILD dbus-1.10.24.ebuild 7385 BLAKE2B 5061ed488e5da35a5c82c1ac023671916fb5a6e68b9fb7eed26d4b74264d4c2e9e04a56a0b64c39d926a078f7e8ba1fa4d9c90fd37a42169f14b455b6c2632cc SHA512 9a39c78efa3ad1b198c0a2c95b39a761fcb1868226dffcf4fb5eb0f14a4412a62e55c0703e35f0ab7de5e14ee0ed9b70e09c46a12cc3282b7e8d30b86c825f5a EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888 EBUILD dbus-1.12.8.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738 diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild index 03027e266eeb..2221ea22ced4 100644 --- a/sys-apps/dbus/dbus-1.10.24.ebuild +++ b/sys-apps/dbus/dbus-1.10.24.ebuild @@ -12,7 +12,7 @@ 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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug doc elogind selinux static-libs systemd test user-session X" #RESTRICT="test" diff --git a/sys-apps/dchroot/Manifest b/sys-apps/dchroot/Manifest index 62d7ee36f67e..aa0eb747f104 100644 --- a/sys-apps/dchroot/Manifest +++ b/sys-apps/dchroot/Manifest @@ -1,3 +1,3 @@ DIST dchroot_0.12.1.tar.gz 20287 BLAKE2B 9353817ba93ad65dd76b21d4db5e2546480850cea51efeec1918d538c25944ee40e459af2c6c4d24c5bc80c8f8611219088962b24c32ff236f9259764ab99384 SHA512 4c0b9e30c68f7ff953a259b4d21f0fab58b6a15dd8ebf0666267879114c0fce37a9fc38d71e5047003676c1ec4211feb0d2c51aa44def81d0d5a40815fd1c600 -EBUILD dchroot-0.12.1.ebuild 755 BLAKE2B d14cc91140a2344d65de9e4f1ab0a91f4de45e9fc2cc5df3250c04cad5bf5a34fe09d06291c23cd4847e5e78ebbc2232e2331aec7a88d96c66be545f21c526ad SHA512 a687729b4b75650c52fd300bd6d5ac8f727b2f6a9fd324b2b28b118d885f50136bcd13ddcfec7bfff3f13aa73bbfe16a9931d7bbe4be784ccf232dc75a442cc8 +EBUILD dchroot-0.12.1.ebuild 681 BLAKE2B e82872abaefbfe4464eea0f0aec349dc58719ccdc585187967e637ef8d2413d209d7b5d658f195113805fbd9325ac2ed5c69b42d5823e767e5fbaaad3c9bc839 SHA512 d57e2e1ae3a0ed61064cc2f5655c9e7bec854bf5fa7d0c989a0b94192dec188ff100517a44404111087f87a7d6b06cd7a5a57d70290975b075bbe1af0d06fced MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild index 6caede8eede4..eee10e8bef06 100644 --- a/sys-apps/dchroot/dchroot-0.12.1.ebuild +++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 inherit toolchain-funcs DESCRIPTION="Utility for managing chroots for non-root users" -HOMEPAGE="http://packages.debian.org/unstable/admin/dchroot" +HOMEPAGE="https://packages.debian.org/unstable/admin/dchroot" SRC_URI="mirror://debian/pool/main/d/dchroot/dchroot_${PV}.tar.gz" LICENSE="GPL-2" @@ -18,6 +18,7 @@ DEPEND="sys-apps/help2man" RDEPEND="!dev-util/schroot[dchroot]" src_prepare() { + default sed -i \ -e '/^all:/s:$: docs:' \ -e '/^CFLAGS/s:-O2:@CFLAGS@:' \ @@ -26,10 +27,5 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README TODO + emake CC="$(tc-getCC)" } diff --git a/sys-apps/dnotify/Manifest b/sys-apps/dnotify/Manifest index 9c688ad5d70f..b3b3dba115b1 100644 --- a/sys-apps/dnotify/Manifest +++ b/sys-apps/dnotify/Manifest @@ -1,5 +1,5 @@ -AUX dnotify-0.18.0-glibc-212.patch 213 BLAKE2B b9287b062c802db003995a95f321775e51bc7d233aed2e6c8d0faed032395193a67df61ff748aae5447c2599614ed6cb2e30930b9f16ddfc54f57e9bdbe2974a SHA512 c778bab7d8db86d3d3a0d5ca91e872bcedf995285b238e7d14630eba51c7d9c05b6533d2e2c790b80f6c66a70978f14108ba78d4de6847b5963b0415f1ff23cf -AUX dnotify-0.18.0-nls.patch 248 BLAKE2B 68af9ad629037bd2763bbc3a71f996c8796ab69a03ead948aa7dc42316c3e7c8bf7338ad00fdff3762a381fd77d5727e8b86f6c4a6b6b2a707d1aed8bc3ad9d1 SHA512 afb1fdde6adb06d7cd56004b3b2c1c67f3e264c2087df32f3b99651ce308f74d6b499c3b87a00e2baac35f67ce3163445efe3a6592dd2d4d7b8ecfb2cc9394f5 +AUX dnotify-0.18.0-glibc-212.patch 217 BLAKE2B 79ba1f388c427af04cca8481d1fcf685e9a8d1b4124e2e1e61b051b568f39bbb230b1951d4d25e47925cdc2e0ffcc665aadf5c6a00e5b67f23bf11f48ba040b4 SHA512 bf32edfc97aabf5eaae1289105f0c65bd25adf60fe44ec139666265f01ed9fa7b664d12e26bcbbcd95069797b40f386276b6b730739c9900c039b432f6494db1 +AUX dnotify-0.18.0-nls.patch 247 BLAKE2B fbc019f1a7ced4d74bfef9d9109ac7e9934d8b3cb10881f3d0b42d93961961abac8faa9a43baf52729a6467a03c8966b785b38347a2285aa686e1471f10d48cd SHA512 1628ac545126cb0c3929ac97471ef9e8146d0af842b18bb4c7afe36879cafcfea6f6091ed233685b4bbc4a1ed81ac8ae55c3ba91de241e64c31412e2d8b486ef DIST dnotify-0.18.0.tar.gz 187909 BLAKE2B 35131f6a04b1bf7cb9b6461fe99e28205ed6ba39b6e660cbf9ac9c059e6339d83485848dcbb858f2a1ff0a021181f897da7322a3a0f02283f83b1649e2d6753a SHA512 5b41fcf131b3ed5e16f7003e0b9b11952b03b7e2ef27554dd40b0b3de3f9c6d2f7911a76e5c4abe079edd5596f416226a28ebd6b4a8f05c589216c2a6e16446e -EBUILD dnotify-0.18.0.ebuild 650 BLAKE2B b8dc0be196df6e39bcfdfc7c607ba3dfb8cc04c43be70b37e93e6874f5070c312d41f34a02dff585b5527ad165d8e3782ace61c5c90bd306925e8926be00ce3c SHA512 56688090590f7f5dd74b5590e18b96bf974f5aec17771ae4ee4b1de5520998d8102a31e51f706d161f427ac271eeaef554d9fd6b7e76114e528c728e79c37195 +EBUILD dnotify-0.18.0.ebuild 532 BLAKE2B cf854b8250fd5ba78b8440ec18a27432a9767517b288fa1031bc7bcc4a219ad1f57a3e5ffdc79b9cfeb578df0753e9700fc022d26525bf3da484475a8972b724 SHA512 9b2db57c5518e9a5c4c02b2f71d9124c2cdfe141c7a6bedfe4c50d65cc287bd764521b97f16f29de7ad0bd2b8d24b575c9b93fca53b3f601ece2df350914cd37 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/dnotify/dnotify-0.18.0.ebuild b/sys-apps/dnotify/dnotify-0.18.0.ebuild index 440759ad96ac..6c11fbe8b1dc 100644 --- a/sys-apps/dnotify/dnotify-0.18.0.ebuild +++ b/sys-apps/dnotify/dnotify-0.18.0.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils +EAPI=6 DESCRIPTION="Execute a command when the contents of a directory change" -HOMEPAGE="http://directory.fsf.org/project/dnotify/" +HOMEPAGE="https://directory.fsf.org/project/dnotify/" SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" @@ -16,17 +15,12 @@ IUSE="nls" RDEPEND="" DEPEND="nls? ( sys-devel/gettext )" -src_prepare() { - epatch "${FILESDIR}"/${P}-nls.patch \ - "${FILESDIR}"/${P}-glibc-212.patch -} +PATCHES=( + "${FILESDIR}/${P}-nls.patch" + "${FILESDIR}/${P}-glibc-212.patch" +) src_configure() { econf \ $(use_enable nls) } - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS TODO NEWS README -} diff --git a/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch b/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch index 6cc6e6f40092..19cd20039424 100644 --- a/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch +++ b/sys-apps/dnotify/files/dnotify-0.18.0-glibc-212.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/336649 ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -19,6 +19,7 @@ #include <config.h> diff --git a/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch b/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch index 7721ac1ee411..55400b704983 100644 --- a/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch +++ b/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch @@ -1,5 +1,5 @@ ---- src/gettext.h.orig 2006-01-27 18:23:31.000000000 +0100 -+++ src/gettext.h 2006-01-27 18:25:07.000000000 +0100 +--- a/src/gettext.h 2006-01-27 18:23:31.000000000 +0100 ++++ b/src/gettext.h 2006-01-27 18:25:07.000000000 +0100 @@ -24,6 +24,7 @@ /* Get declarations of GNU message catalog functions. */ diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest index 068af95077f8..d230e31237f1 100644 --- a/sys-apps/gentoo-systemd-integration/Manifest +++ b/sys-apps/gentoo-systemd-integration/Manifest @@ -1,4 +1,4 @@ DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52 -EBUILD gentoo-systemd-integration-7.ebuild 789 BLAKE2B 70548e7073ee54e6d5642f384d97aa680a4167dce08689fad61b826b831697945033e7c40f7233a9eb609b088268857c866f857c0340d6020640f97a4b21f3e0 SHA512 9b3c44924d7b17410b04361d0b810cdfeb5dd257456f51a0170499b9ae51ea571e43b79d3505cc254ff942cb2a2c0399dd5762389ca8706b22e31cc8ea4e8dc2 -EBUILD gentoo-systemd-integration-9999.ebuild 792 BLAKE2B c851b9979d395f5d3d458eb7f0a1237ce1b17a1f0e6538f17a039f51d6ea3dfad6cd9dbe30cd216e8f4437e4407fce5868867ee3698a928295db7d06775196af SHA512 cefd3d785b861966a977948f1095f959249f33c7ee9de9e1021026d4ec76bb9ac09311fa8c5cce19a5726d92e23bdf940b0bca91e3551755fe61848283c7eed6 +EBUILD gentoo-systemd-integration-7.ebuild 795 BLAKE2B 2c805a1b5ce121177976d0b617dca47124dff234dedfa506928eb850d5c040db89aee7b78d731535104118d074db65c634ebbe7b4e849c134e3a84307ca68671 SHA512 9c9e95d6f959f361db79972ff2eec3e3b5a07d42589d6e6756d77f937e1d5aafdd591c44fb866b361e8e67c67398acb5cdaeca37786b21d907f375d48275721e +EBUILD gentoo-systemd-integration-9999.ebuild 798 BLAKE2B 158bfac69e33f9e4a888ddc0e9d5145717845d58d0e1ef46b5fc25386450fae0cc3f8dcaca666e19d43da4399bfc1cad3eb59e3a0a120b2d2141dac3e7876deb SHA512 accb867e55abf208d58f603fc1f1a38eff01ce40ed1d169fc5b841dee86e65db4786edb20d38efb4993e58520f12a59e44acfaaee6ec04e7f3b2efced97c817c MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0 diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild index 8d77981d2977..775bca89b9b7 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit autotools git-r3 else SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86" + KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86" fi inherit systemd diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild index 1813ffb135fb..74179967eb4f 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit autotools git-r3 else SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi inherit systemd diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest index 6022d9d539f2..c6644671b8c2 100644 --- a/sys-apps/hwinfo/Manifest +++ b/sys-apps/hwinfo/Manifest @@ -1,5 +1,5 @@ DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629 DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340 -EBUILD hwinfo-21.23.ebuild 1289 BLAKE2B 192bea366a2727756ace6060fe9d5850d73d031f0b392811e2e51535d23ea04a6f7cc634317afcd985b596cc374355c1919fc73a31ab7305a9621dd97bb574a1 SHA512 41b2702c7e1e0e3320b9abba0352bfb7a3927b92ffa4a57ec8fddac605b48eac06806010228b4d0bd9f1274bec4bb7d65ee62282127be95bf36b84715676494d -EBUILD hwinfo-21.4.ebuild 1570 BLAKE2B 9927f7206038e657ecbba400ab7d0d22afab0432636abd5e0d2df53409e16de10f5002b54c0d6e95080fadc0281352a8790556bd056637a5d96fb8ab256696d9 SHA512 95c9e5a28a3e27b201ae1d7f801361dffe11c8c551d45acff7b9f7ced601fbec3572ec4f639d85ed448e84ac7fd097384a4379b48542246dfd5c446ecf2f9a3d +EBUILD hwinfo-21.23.ebuild 1290 BLAKE2B f5b4729004b3ccc2f85231163b442cefacb85f3a93a43bae0a9bd500a47771d751e85063e5612636b680e147d7b8fff351e54a235b2b17747cf387ebcd19bb6a SHA512 0fcd72e8886fe2ac537ad01675f2af870b346a157ccc2f6c3e3d8a0b09f92ec5bc9f0855ded7b486df0a8a432326c19af546407582bfd00221da54b59b19f9bc +EBUILD hwinfo-21.4.ebuild 1571 BLAKE2B c989391f8206869ec965946aedbe0a4213e82a2d6469b55e3f120eed5a17f05184b08b6cd01b6eaf0273566fa73847d7587c8713394139687bb9884c3c7c565c SHA512 ee1a7965081c515162ca40076269b18c18e0633c32db69ecb83b1b719bb348c40112a8df0fd058973bf1d7005131893e0b20015ecfbfecb4b7dfd64db763a501 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd diff --git a/sys-apps/hwinfo/hwinfo-21.23.ebuild b/sys-apps/hwinfo/hwinfo-21.23.ebuild index db0fc04cefec..0306e9299fe1 100644 --- a/sys-apps/hwinfo/hwinfo-21.23.ebuild +++ b/sys-apps/hwinfo/hwinfo-21.23.ebuild @@ -6,7 +6,7 @@ EAPI=6 inherit multilib rpm toolchain-funcs DESCRIPTION="Hardware detection tool used in SuSE Linux" -HOMEPAGE="http://www.opensuse.org/" +HOMEPAGE="https://www.opensuse.org/" SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.src.rpm" LICENSE="GPL-2" diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild index 5606bd11969c..1030cd638604 100644 --- a/sys-apps/hwinfo/hwinfo-21.4.ebuild +++ b/sys-apps/hwinfo/hwinfo-21.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit multilib rpm toolchain-funcs DESCRIPTION="hardware detection tool used in SuSE Linux" -HOMEPAGE="http://www.opensuse.org/" +HOMEPAGE="https://www.opensuse.org/" SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.src.rpm" LICENSE="GPL-2" diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest index d7a63794f2d5..d09b981cb9ef 100644 --- a/sys-apps/man/Manifest +++ b/sys-apps/man/Manifest @@ -14,5 +14,4 @@ AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce663 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b EBUILD man-1.6g-r1.ebuild 4077 BLAKE2B cec245b471219cb55352dc12df4ce2621c7fadfb27f341bc13c62559547f122a4fa6574d6c4ea3382a24ad47192a6e29fec9633e80da2cc7a29bb2d1fa986066 SHA512 0008c1744a76bef13c1388b8c06a76eff436ce79d6ade963ec45dd84e0debda12eaca4e5e718aceb0ac3f7c545cb21c3d2827f6d03121726f172ce330fe1f34a -EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild deleted file mode 100644 index eedcdcab96b3..000000000000 --- a/sys-apps/man/man-1.6g.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils toolchain-funcs user - -DESCRIPTION="Standard commands to read man pages" -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" -SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="+lzma nls selinux" - -DEPEND="nls? ( sys-devel/gettext )" -RDEPEND="|| ( >=sys-apps/groff-1.19.2-r1 app-doc/heirloom-doctools ) - !sys-apps/man-db - !<app-arch/lzma-4.63 - lzma? ( app-arch/xz-utils ) - selinux? ( sec-policy/selinux-makewhatis )" - -pkg_setup() { - enewgroup man 15 - enewuser man 13 -1 /usr/share/man man -} - -src_prepare() { - epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch - epatch "${FILESDIR}"/man-1.6-cross-compile.patch - epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315 - epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch - epatch "${FILESDIR}"/man-1.5m2-apropos.patch - epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123 - epatch "${FILESDIR}"/man-1.6e-headers.patch - epatch "${FILESDIR}"/man-1.6f-so-search-2.patch - epatch "${FILESDIR}"/man-1.6g-compress.patch #205147 - epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916 - epatch "${FILESDIR}"/man-1.6g-xz.patch #302380 - epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979 - # make sure `less` handles escape sequences #287183 - sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure -} - -echoit() { echo "$@" ; "$@" ; } -src_configure() { - strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ }) - - unset NLSPATH #175258 - - tc-export CC BUILD_CC - - local mylang= - if use nls ; then - if [[ -z ${LINGUAS} ]] ; then - mylang="all" - else - mylang="${LINGUAS// /,}" - fi - else - mylang="none" - fi - export COMPRESS - if use lzma ; then - COMPRESS=/usr/bin/xz - else - COMPRESS=/bin/bzip2 - fi - echoit \ - ./configure \ - -confdir=/etc \ - +sgid +fhs \ - +lang ${mylang} \ - || die "configure failed" -} - -src_install() { - unset NLSPATH #175258 - - emake PREFIX="${D}" install || die "make install failed" - dosym man /usr/bin/manpath - - dodoc LSM README* TODO - - # makewhatis only adds man-pages from the last 24hrs - exeinto /etc/cron.daily - newexe "${FILESDIR}"/makewhatis.cron makewhatis - - keepdir /var/cache/man - diropts -m0775 -g man - local mansects=$(grep ^MANSECT "${D}"/etc/man.conf | cut -f2-) - for x in ${mansects//:/ } ; do - keepdir /var/cache/man/cat${x} - done -} - -pkg_postinst() { - einfo "Forcing sane permissions onto ${ROOT}var/cache/man (Bug #40322)" - chown -R root:man "${ROOT}"/var/cache/man - chmod -R g+w "${ROOT}"/var/cache/man - [[ -e ${ROOT}/var/cache/man/whatis ]] \ - && chown root:0 "${ROOT}"/var/cache/man/whatis - - echo - - local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) - for f in ${files} ; do - [[ ${f} == */etc/cron.daily/makewhatis ]] && continue - [[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \ - && rm -f "${f}" - done - files=$(ls "${ROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null) - if [[ ${files/$'\n'} != ${files} ]] ; then - ewarn "You have multiple makewhatis cron files installed." - ewarn "You might want to delete all but one of these:" - ewarn ${files} - fi - - if has_version app-doc/heirloom-doctools; then - ewarn "Please note that the /etc/man.conf file installed will not" - ewarn "work with heirloom's nroff by default (yet)." - ewarn "" - ewarn "Check app-doc/heirloom-doctools elog messages for the proper" - ewarn "configuration." - fi -} diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest index 5e5c4a48ac8a..40d8530039ae 100644 --- a/sys-apps/pcmciautils/Manifest +++ b/sys-apps/pcmciautils/Manifest @@ -1,6 +1,5 @@ AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d -EBUILD pcmciautils-018_p8-r1.ebuild 1556 BLAKE2B 2bddbb297c995c8a38397db0d5e6927921e89a832ed55dbe5fe42ce48c1c76fa5f7074ebfd8bb49555caf7a2898bbfdd0f4c64c6d1b773459c2f9314fff6080e SHA512 0300814896620067aee868a14fe7442538f320a05139c9f67f3566d843a009ebac345801a4692a3a08ec9210c485c94a0c8e6492b1cb211a58d24d57acbd3323 -EBUILD pcmciautils-018_p8.ebuild 1513 BLAKE2B 04f16b0dc86e74a539aec390a58b5461b72c7993490e102bbeb958b1934668e8f6833150b7cfa86e3728e6722ba17785a2296f5b4318b21f21dde898f94a0318 SHA512 71f6ce9e540765a471c79ae5dd7b0aacf942c5f60bde01c7b99e5697360dd347045282a2daa30b26ef8851caa7be66c255e5594b2709c78d0a45f5c7c13c0fca +EBUILD pcmciautils-018_p8-r1.ebuild 1554 BLAKE2B 88e32a07afd5e4bff22c20f3f497d450bc8dc8bf51a73286092b1d2a02da19824a8db71382e04d7fdf04cd53d9618e3a8790e48ec1f89468f6e9dbe39db45947 SHA512 aa4075c313d591a0acba3a5813a88b09fa94b60019b0f4acecf70c752d2354d0b527bc64a6afdded17a43cde4ab73460ca4b54c1b8e110fbc6b43165a2c29b97 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6 diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild index 16f47c72c26a..b5f7e9942485 100644 --- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild +++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~ppc ~sh x86" +KEYWORDS="amd64 arm ppc sh x86" IUSE="debug staticsocket" RDEPEND="virtual/modutils" diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild deleted file mode 100644 index ccfdd306b052..000000000000 --- a/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit eutils flag-o-matic linux-info toolchain-funcs udev - -DEB_REV=${PV#*_p} -MY_PV=${PV%_p*} - -DESCRIPTION="PCMCIA userspace utilities for Linux" -HOMEPAGE="https://packages.qa.debian.org/pcmciautils" -SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc sh x86" -IUSE="debug staticsocket" - -RDEPEND="virtual/modutils" -DEPEND="${RDEPEND} - virtual/yacc - sys-devel/flex" - -S=${WORKDIR}/${PN}-${MY_PV} - -pkg_setup() { - CONFIG_CHECK="~PCMCIA" - linux-info_pkg_setup - - kernel_is lt 2 6 32 && ewarn "${P} requires at least kernel 2.6.32." - - mypcmciaopts=( - STARTUP=$(usex staticsocket true false) - exec_prefix=/usr - UDEV=true - DEBUG=false - STATIC=false - V=true - udevdir="$(get_udevdir)" - CC="$(tc-getCC)" - LD="$(tc-getCC)" - AR="$(tc-getAR)" - STRIP=true - RANLIB="$(tc-getRANLIB)" - OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" - DESTDIR="${D}" - ) - - use debug && append-cppflags -DDEBUG -} - -src_prepare() { - epatch \ - "${WORKDIR}"/debian/patches/no-modprobe-rules.patch \ - "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch - - sed -i \ - -e '/CFLAGS/s:-fomit-frame-pointer::' \ - -e '/dir/s:sbin:bin:g' \ - Makefile || die -} - -src_compile() { - emake "${mypcmciaopts[@]}" -} - -src_install() { - emake "${mypcmciaopts[@]}" install - - dodoc doc/*.txt -} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index b18785c9a4ce..35002ce3ca24 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -6,15 +6,15 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9 DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8 DIST portage-2.3.36.tar.bz2 992242 BLAKE2B 44b414495ab156214bfd27d10894a6b1ae020f503639f41d408670b440b5e389bd56c801138907992982db8964aaa2664e9f7f0aa99647d4eab1aa81167157ba SHA512 765bb60fce2b6b84c5fde7b19c5abeeed0ba8036ea311c7f57dfcb2ed11395cafe7bdd07a2b46adce95792f4bf9f5401643e88780c90e792a8a4e4d1f2886167 DIST portage-2.3.38.tar.bz2 993841 BLAKE2B a473d905a3caae4fc9e45486c4cbf75b10de396b40b4f84aef9012da12dab78ad14f8645bbb71adf058159dca6dacba7314d44664826c8402904d0e0e4c55e52 SHA512 e9fbfdcb5c3f4f8c001d0cd16e62c0cc7c23b92f9abca1b26f4c9e95b547e78cf126a9a7807b70beb9014514c1d32bd277bea9d0b91a7c912785b4178f77dede -DIST portage-2.3.39.tar.bz2 995385 BLAKE2B 91cfc2b48b82b971c7fa3112110a47f151459cf7a714abd81c812ac198433d5946047adb7c582887eb0026d5cbf594d15b20f261f0f01f3d8078309f07b58aa5 SHA512 71e6cb4401e2b8e778a458efa8aea21ba6b48781abaf14b37ec7e76fdcb08540a12e922d7175bcb8492c2b2e80d543f8f39ecfb2f4b48235c8ac86a8c51aa76d +DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea -EBUILD portage-2.3.31.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d -EBUILD portage-2.3.36.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d -EBUILD portage-2.3.38.ebuild 9298 BLAKE2B 4b2307614bc193b7b7100fb7895ec75cf18e3aeef18772f9083b48e870ccdcf6d8104039d7371856d26e1ebe7be856a23ae5e644533b3b560911d5aa5c2f2a50 SHA512 e7d2afb7b89a4f49c014c806e4a8f3bee4f67025eef23e64689f54f2779ff9af64fffa0501adde36890b0c1887157cc161010cda36655aeddfd583075e4f5cc7 -EBUILD portage-2.3.39.ebuild 9298 BLAKE2B 4b2307614bc193b7b7100fb7895ec75cf18e3aeef18772f9083b48e870ccdcf6d8104039d7371856d26e1ebe7be856a23ae5e644533b3b560911d5aa5c2f2a50 SHA512 e7d2afb7b89a4f49c014c806e4a8f3bee4f67025eef23e64689f54f2779ff9af64fffa0501adde36890b0c1887157cc161010cda36655aeddfd583075e4f5cc7 +EBUILD portage-2.3.31.ebuild 9300 BLAKE2B fcb1625349a2072fcaed11c2f604b26cd37134049d86a17659d7af04c23362a462ebdfdcae19df7dabbe16dd793462e2effe035a0d5602ce239ef13c28db6a9f SHA512 b0f0c9beefb02202cf32e9e36d864bbe487e4845c8edf59cc3fef05c8af28d97f576f0483e28215b4920f952d7acd2afe5becb825e9a4cc881440b72aa3eeba8 +EBUILD portage-2.3.36.ebuild 9300 BLAKE2B fcb1625349a2072fcaed11c2f604b26cd37134049d86a17659d7af04c23362a462ebdfdcae19df7dabbe16dd793462e2effe035a0d5602ce239ef13c28db6a9f SHA512 b0f0c9beefb02202cf32e9e36d864bbe487e4845c8edf59cc3fef05c8af28d97f576f0483e28215b4920f952d7acd2afe5becb825e9a4cc881440b72aa3eeba8 +EBUILD portage-2.3.38.ebuild 9316 BLAKE2B 70505ab1d0858271c22a9a7dc26571d597a4422eb7f1e01a9fb56e3336453bb6d2773506cb8448bfb45881e8bbccce1fe127b30b7b8fc127ff070f51639e04c5 SHA512 5438f516f78827a307c81d344ba53f95c2c165e81df8baa82a0821ade944f9558665cd8e9d00a0163ca80227e8d89c15b70764ec656c0f9c6bbfb835a9b33796 +EBUILD portage-2.3.40.ebuild 9447 BLAKE2B 9f44bd1d717d06d734156b0f2f1070bf160aa0d11041bb29a11ddab8aaa1abdf50b09b085e65b2a149c2a20df724588f9199bae0c602d9604931e5898a12a9d0 SHA512 c38de71d8e1447315211057c17fb0a8c2630629a6beb46016fa3f02ef06157c556e7aac7c040cf3de3711cf2433eb21bc8705451c6cc0f242738ded2fcb3708c EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb -EBUILD portage-9999.ebuild 8811 BLAKE2B 2b31ee7001e79f48f4d0e0d8ef131bec99cd2625fd95818e02606b849d4ccdc56a67377a6f4965983ce8933fdf6096a239fd1d86644c9b852e74bc934db130d1 SHA512 9b5fdc9ea17f6f7ccb3358b27a3c16736ed989601c74e69e9168ab44c215dc3ad69710e2e408b4f1d4676f1c5a19abdb93b80fd674051150882f2e5da42106ee +EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59 diff --git a/sys-apps/portage/portage-2.3.31.ebuild b/sys-apps/portage/portage-2.3.31.ebuild index 376030121e07..accf849fff4d 100644 --- a/sys-apps/portage/portage-2.3.31.ebuild +++ b/sys-apps/portage/portage-2.3.31.ebuild @@ -45,7 +45,7 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-12.1 + >=app-portage/gemato-12.1[${PYTHON_USEDEP}] app-crypt/gentoo-keys >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) diff --git a/sys-apps/portage/portage-2.3.36.ebuild b/sys-apps/portage/portage-2.3.36.ebuild index 376030121e07..accf849fff4d 100644 --- a/sys-apps/portage/portage-2.3.36.ebuild +++ b/sys-apps/portage/portage-2.3.36.ebuild @@ -45,7 +45,7 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-12.1 + >=app-portage/gemato-12.1[${PYTHON_USEDEP}] app-crypt/gentoo-keys >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) diff --git a/sys-apps/portage/portage-2.3.38.ebuild b/sys-apps/portage/portage-2.3.38.ebuild index 677674ee4de0..453c559a2ac2 100644 --- a/sys-apps/portage/portage-2.3.38.ebuild +++ b/sys-apps/portage/portage-2.3.38.ebuild @@ -45,7 +45,7 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-12.1 + >=app-portage/gemato-12.1[${PYTHON_USEDEP}] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) diff --git a/sys-apps/portage/portage-2.3.39.ebuild b/sys-apps/portage/portage-2.3.40.ebuild index 677674ee4de0..48b0a930fe71 100644 --- a/sys-apps/portage/portage-2.3.39.ebuild +++ b/sys-apps/portage/portage-2.3.40.ebuild @@ -45,7 +45,7 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-12.1 + >=app-portage/gemato-12.1[${PYTHON_USEDEP}] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) @@ -94,6 +94,10 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + # apply 4fb5ef2ce2cb + sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \ + pym/portage/util/_eventloop/EventLoop.py || die + if use gentoo-dev; then einfo "Disabling --dynamic-deps by default for gentoo-dev..." sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 88afa1be609a..b02d454312c9 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -45,7 +45,7 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \ python{2_7,3_4,3_5} pypy) rsync-verify? ( - >=app-portage/gemato-10 + >=app-portage/gemato-10[${PYTHON_USEDEP}] app-crypt/openpgp-keys-gentoo-release >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest index 0865d877d711..595ee1463aac 100644 --- a/sys-apps/setserial/Manifest +++ b/sys-apps/setserial/Manifest @@ -6,6 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645 -EBUILD setserial-2.17-r4.ebuild 1083 BLAKE2B 6c246ed10618b6c4c727409dd551a631e4f5bb6e4e6084511919ccd3e895b365598ae81eb681f52b33bdb4d64f0f48f8eef3f3b8dc1547f42aa287c7d6562664 SHA512 cc77e626fea8ca7369269f648fd61bd96969f51566ffba788123b720123e51f2e95d5405f18d4b12ded9cb7de5568553be47bcdcc8ae5f5a0db65bd3385db97a -EBUILD setserial-2.17-r5.ebuild 950 BLAKE2B 05476fa9e1c88f2804f87b47544d2a26b41add3c5ca0364970d4a299ceff5af684aab45cfebc8a389ed616298e0833895eee7d83e77daa06fb7780c3e4ae7cf1 SHA512 262e77337e085578c742cc7548e971aed5aac4c0188c29c78d8c6591a7d09025a1c35b0e6e9422b2c80b0a93e3a9df04bd89cd2287c31473944a91cf4f1d5d0a +EBUILD setserial-2.17-r5.ebuild 948 BLAKE2B 5e9db8d88951b7d1589da953bacbf49a50692892706c625e687f6af472a5c3818da807872a14b02db948ddfa9afe7b68362f2691c081c5bc0b5babc6e7fcdab8 SHA512 00c6c3bece63afa5f91973e10f36039f1a215b6c4577f9e9f9883932579fa0fde8c74ade98be106810410e791c024b102378a98d3ebb3251cc08c23857e4bb0c MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981 diff --git a/sys-apps/setserial/setserial-2.17-r4.ebuild b/sys-apps/setserial/setserial-2.17-r4.ebuild deleted file mode 100644 index bb48f5c974a1..000000000000 --- a/sys-apps/setserial/setserial-2.17-r4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs - -DESCRIPTION="Configure your serial ports with it" -HOMEPAGE="http://setserial.sourceforge.net/" -SRC_URI="ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz - ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-spelling.patch - epatch "${FILESDIR}"/${P}-manpage-updates.patch - epatch "${FILESDIR}"/${P}-headers.patch - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-hayes-esp.patch #309883 - epatch "${FILESDIR}"/${P}-darwin.patch #541536 -} - -src_compile() { - tc-export CC - econf || die - emake setserial || die -} - -src_install() { - doman setserial.8 - into / - dobin setserial || die - - insinto /etc - doins serial.conf - newinitd "${FILESDIR}"/serial-2.17-r4 serial - - dodoc README - docinto txt - dodoc Documentation/* -} diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild index 2c6f9afc8f4e..3548932db089 100644 --- a/sys-apps/setserial/setserial-2.17-r5.ebuild +++ b/sys-apps/setserial/setserial-2.17-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" PATCHES=( "${FILESDIR}"/${P}-spelling.patch diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 19746f21ca25..b92f8da86a73 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,6 +1,3 @@ -AUX 238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch 865 BLAKE2B e1f0765b2b500f34db613b6d7720e2da02c0f3346768a4053706641c61834e04a483d7ba96dabcf9935c39db3219f4871151ccb0069390afd724be9d8694c89a SHA512 eafe369e6df89cb18122273711395a0d9a624b00c7e5aa0bd872e3241129321110f76cf10fb0e98a02268c36f0bc118870706467c5b41f32eb7e3db4075fcacc -AUX 238-0002-core-do-not-free-heap-allocated-strings-8391.patch 1664 BLAKE2B 6a3f9ec23b9c28ade566cece1e0b70a5217e3e0881ba9dab6ad3e4d74bc50a0d8b1ec5ff5550da778acb63abbc5467e5690633dd509b42430ff8b485e1645a03 SHA512 1d103a6c033063a2250bb1ef7858f358f49f6ce2d599d94491054afb7808881fd338d24cf8997eafcfb5efeeb564b34c10680bde6079941f41a3ba653d71cafd -AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688 BLAKE2B 19faeab810419669a6743ebc6a3051b2f5060f6de793a3f7c9c21fce26d395dcad95f6b8aee58fe133d11e2b02e8847d1df4cde30a5dc237f615a8656f823f30 SHA512 075f7d6f20f33f5e0b07ae993853e969e0d54d0a0683302ab1ab7c4047185397f39aaa894cbe4104e75ae65f8944fb5af47e9f8adb1e66c28b152c6d6e863eff AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0 @@ -16,6 +13,6 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7b3bf7c6c56b6b02faf3c010af467d09477d7c03efbf58a9511ba4cd2cff3a1e92d0a7f793419d41fe87fb0b5d97 SHA512 ab0bb749a02f9e296d6a4dffc481616bc286127b970122d9d1337cadf3cfe40be44e9f76cf95d0f89d758ef329f4c06bb734643e40f16afca00329b71780449c -EBUILD systemd-238-r7.ebuild 13143 BLAKE2B a53d102b7007faf0c8b4d200f27dd713fd101e90061ed4e2375d61deac49899c6ed9893eb2c946b96eadb69d2c91dbf302f0b8b98b0c211275fa6323a5f7e268 SHA512 3b6df28916d99e57dcdc35438a9661362d92388a12883ba41ac1ff85d66aec06d9a71d657640ceda6899c69b0387a5a2c1fe6ed7da573125e9463116917b0718 -EBUILD systemd-9999.ebuild 13116 BLAKE2B 7a90220be1694281dbd8ed450125b1fc34dac92b464e8f41aee69a55811cd8a67e721663a11ce7cd51d182652327c56b505056e1b6eec354bf80ed5e1dab2184 SHA512 b03004fbdf6ba83eebac851793419065c389ed3a830c869edd77c7a772629aa5b076b3d1233ae46dc5ab1b407229dcb10442de46d91edc4c8a896e22812559a0 +EBUILD systemd-238-r7.ebuild 13149 BLAKE2B 0d022de012f3356c3212fa58b7a3f06850ff3a556fad82ac07e48d3da95ad3e99a7417d509c32c68ac7bf036f378e2d5e2da8922d824c1e000ddcbf7f0b7a517 SHA512 dbcdff2bc64142faec96b493057f09d1f2d60825c851e1539a5f71508c56b14f206ab59d40450df5f74b0ce05cdea4498a5649b56a6face6111a246b5ccb1f25 +EBUILD systemd-9999.ebuild 13122 BLAKE2B 478c90259a73810bef9d1c81acaa3db7a4bb9b91265ab545821622933dc61c2f7de4460b3d98a6e68967400be101db93292741d4dd116b4a0ca216db728d4e78 SHA512 061994cc6c2783e8b00049f8679592de30d608f1e95032d91150c738583f54acb2ff0e3e1f9573d1b7b50875b58ea499a2ae78eb6b87fe91ffdd84daef088acf MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1 diff --git a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch b/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch deleted file mode 100644 index c39575c62b67..000000000000 --- a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5681f772d7bc8226cb10bfc7f9fba0a29e34a54d Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 8 Mar 2018 22:19:35 +0900 -Subject: [PATCH 1/2] sd-bus: do not try to close already closed fd (#8392) - -Fixes #8376, which is introduced by 2b33ab0957f453a06b58e4bee482f2c2d4e100c1. ---- - src/libsystemd/sd-bus/bus-socket.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index b5160cff6..166fba157 100644 ---- a/src/libsystemd/sd-bus/bus-socket.c -+++ b/src/libsystemd/sd-bus/bus-socket.c -@@ -960,8 +960,6 @@ int bus_socket_exec(sd_bus *b) { - if (r == 0) { - /* Child */ - -- safe_close(s[0]); -- - if (rearrange_stdio(s[1], s[1], STDERR_FILENO) < 0) - _exit(EXIT_FAILURE); - --- -2.16.2 - diff --git a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch b/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch deleted file mode 100644 index 3ee2527f77d2..000000000000 --- a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 84c5e8010042788a03cff680592b37257b2a6de0 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Thu, 8 Mar 2018 22:21:54 +0900 -Subject: [PATCH 2/2] core: do not free heap-allocated strings (#8391) - -Fixes #8387. ---- - src/core/mount-setup.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c -index 536c17b4d..9c27972af 100644 ---- a/src/core/mount-setup.c -+++ b/src/core/mount-setup.c -@@ -248,6 +248,7 @@ int mount_setup_early(void) { - - int mount_cgroup_controllers(char ***join_controllers) { - _cleanup_set_free_free_ Set *controllers = NULL; -+ bool has_argument = !!join_controllers; - int r; - - if (!cg_is_legacy_wanted()) -@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) { - - /* Mount all available cgroup controllers that are built into the kernel. */ - -- if (!join_controllers) -+ if (!has_argument) - /* The defaults: - * mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio". - * -@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) { - - t = set_remove(controllers, *i); - if (!t) { -- free(*i); -+ if (has_argument) -+ free(*i); - continue; - } - } --- -2.16.2 - diff --git a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch b/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch deleted file mode 100644 index 693d67152ea9..000000000000 --- a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 Mon Sep 17 00:00:00 2001 -From: Filipe Brandenburger <filbranden@google.com> -Date: Thu, 15 Mar 2018 10:42:38 -0700 -Subject: [PATCH] udev/net-id: Fix check for address to keep interface names - stable (#8458) - -This was a bug inadvertently added by commit 73fc96c8ac0aa9. - -The intent of the check is to "match slot address with device by -stripping the function" (as the comment above states it), for example -match network device PCI address 0000:05:00.0 (including a .0 for -function) to PCI slot address 0000:05:00, but changing that to a streq() -call prevented the match. - -Change that to startswith(), which should both fix the bug and make the -intent of the check more clear and prevent unintentional bugs from being -introduced by future refactorings. ---- - src/udev/udev-builtin-net_id.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 36994360c7..6efa712930 100644 ---- a/src/udev/udev-builtin-net_id.c -+++ b/src/udev/udev-builtin-net_id.c -@@ -297,7 +297,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { - if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, dent->d_name) && - read_one_line_file(str, &address) >= 0) - /* match slot address with device by stripping the function */ -- if (streq(address, udev_device_get_sysname(names->pcidev))) -+ if (startswith(udev_device_get_sysname(names->pcidev), address)) - hotplug_slot = i; - - if (hotplug_slot > 0) --- -2.16.2 - diff --git a/sys-apps/systemd/systemd-238-r7.ebuild b/sys-apps/systemd/systemd-238-r7.ebuild index e65ddd901dd0..52bfc26bf58c 100644 --- a/sys-apps/systemd/systemd-238-r7.ebuild +++ b/sys-apps/systemd/systemd-238-r7.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz" - KEYWORDS="alpha amd64 ~arm arm64 ia64 ~mips ~ppc ppc64 ~sparc x86" + KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86" fi PYTHON_COMPAT=( python{3_4,3_5,3_6} ) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 8112fd15fef7..779db468b79b 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi PYTHON_COMPAT=( python{3_4,3_5,3_6} ) |