From dc45b83b28fb83e9659492066e347b8dc60bc9e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2018 12:30:23 +0000 Subject: gentoo resync 04.02.2018 --- sys-apps/Manifest.gz | Bin 48481 -> 48494 bytes sys-apps/ack/Manifest | 2 + sys-apps/ack/ack-2.22.ebuild | 27 +++++++++ sys-apps/baobab/Manifest | 2 - sys-apps/baobab/baobab-3.22.1.ebuild | 36 ------------ sys-apps/gnome-disk-utility/Manifest | 2 - .../gnome-disk-utility-3.22.1.ebuild | 45 --------------- sys-apps/moreutils/Manifest | 4 +- sys-apps/moreutils/moreutils-0.60-r1.ebuild | 64 --------------------- sys-apps/moreutils/moreutils-0.62.ebuild | 64 +++++++++++++++++++++ sys-apps/portage/Manifest | 6 +- sys-apps/portage/metadata.xml | 1 + sys-apps/portage/portage-2.3.24.ebuild | 9 ++- sys-apps/portage/portage-9999.ebuild | 9 ++- 14 files changed, 115 insertions(+), 156 deletions(-) create mode 100644 sys-apps/ack/ack-2.22.ebuild delete mode 100644 sys-apps/baobab/baobab-3.22.1.ebuild delete mode 100644 sys-apps/gnome-disk-utility/gnome-disk-utility-3.22.1.ebuild delete mode 100644 sys-apps/moreutils/moreutils-0.60-r1.ebuild create mode 100644 sys-apps/moreutils/moreutils-0.62.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 76837d975bb7..ac867a4eafbc 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest index ffc5cf20be86..dbdc60d9ecbe 100644 --- a/sys-apps/ack/Manifest +++ b/sys-apps/ack/Manifest @@ -1,4 +1,6 @@ AUX ack-2.14-gentoo.patch 431 BLAKE2B 61a7313811afc88f3289609998902d03de0b11b0b01c95e5be5a656995909584f46fd844d4e3befdad22ac83f16d66a04b1f8e53abb92a75ab3e185c8013bcd4 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b DIST ack-2.18.tar.gz 232279 BLAKE2B dc7c347eee2be367a2b1bd4839719661f1c0de68bd3fcb3512c68cb5c42e09e8208712e7e3c57b418a00c961a933574a0c09c7f107fe43a4f96efeae21fbc8d8 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5 +DIST ack-2.22.tar.gz 250275 BLAKE2B 52cafe63b6f4aa50feb3a8d68141662fbbec7a73d31b2f06d3d63c7efb9ba681214ac20fbfd299f680d4e3758eaed8b4b9b3cd697f38977f2e0657a90dc0478a SHA512 d0073c424d861f2cfdc2ce8c0dfa149620803b4c30adb6c6f4f8896277ac89bb6d97d3e8e9bdfd1202f95808bd387b2e3a8353a3e7d204cdd61eb9cafde48303 EBUILD ack-2.18-r1.ebuild 776 BLAKE2B ccd1290eedd9cd29692386364406ebac8202c2584cd35579dfecf4e1c21fb60c201ea6bfa9aefe19ad0fa0b57c1f483dccda6c66a5a72d1f2e57f3570ac6de6c SHA512 25979e6b277a49c9b087b987ccc14192d53f9f55ed7efbd55a491f14c2219f7fdeb0ed805e835ea58c893277ea35cc5f43f0974f65454e6fed352c570b468ffe +EBUILD ack-2.22.ebuild 778 BLAKE2B 56b352c5f7d0ad66432f7bdd241b90bd9ce262d7501639793e267576e5e3747deb73ef8af5aae0cd522769040fc52ca310efeb8b6d9a603c7092335ee50035c9 SHA512 ff81502cb1783bb173909ac3b729fd252b7c6fba7f8218ad951feaa2a9c97e47aca615394c82d40f338dcc9fc5de4ebb591042572862618ad1e2d2990f8fed1a MISC metadata.xml 1725 BLAKE2B 7787caf338ec9ba64acce9d2fcb542279db07d0c19001073e65a3904ac313b62d0f1fcf5df1445a86f4aeacb8563b7f179d077fda31514db4454c50a81599341 SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f diff --git a/sys-apps/ack/ack-2.22.ebuild b/sys-apps/ack/ack-2.22.ebuild new file mode 100644 index 000000000000..3e28da27b33c --- /dev/null +++ b/sys-apps/ack/ack-2.22.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +DIST_AUTHOR=PETDANCE +inherit perl-module + +DESCRIPTION="ack is a tool like grep, optimized for programmers" +HOMEPAGE="https://beyondgrep.com/ ${HOMEPAGE}" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="test" + +RDEPEND=">=dev-perl/File-Next-1.160.0" +DEPEND="${RDEPEND} + test? ( dev-perl/IO-Tty )" + +PATCHES=( "${FILESDIR}"/${PN}-2.14-gentoo.patch ) + +src_test() { + # Tests fail when run in parallel and if dev-perl/IO-Tty is installed + # which enables interactive tests that need to read from stdin. If IO-Tty + # is not installed the related tests are skipped. + MAKEOPTS+=" -j1" perl-module_src_test +} diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index 46a63ee9f838..e8d711b32c9c 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,5 +1,3 @@ -DIST baobab-3.22.1.tar.xz 947932 BLAKE2B 820c483964ef44d9ce557253128030044f456986e4c71bc0c2e64436290fd2b9e4aeadb1cb717179de68064faf80df5deaeced91d535eb5ae084abeb897b62fd SHA512 6fae974ef79dc9b61269cc07fcdb4f6d8f043cf3eb8239c2408a7ccb1445800c1beda85da8ae9e0da1a39604e4896a6aab0ab04391286df20c20783d208c6c36 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17 -EBUILD baobab-3.22.1.ebuild 826 BLAKE2B f6eb457e87e64cda16727b3a3f1a54e404f4c0e44102205a0456d0112dfe5346bcacf21fb7738a77ccd862673146250c7ae4bce29e296d5150ee04244ddfca56 SHA512 9f7237475393c82e795a34f2e52bc7104b0200d435643ab54eeca2bde42c059282fbb224c4aa655bda6ffa66dd2c910ce9e5e3519a5c11cea0037443b5424690 EBUILD baobab-3.24.0.ebuild 826 BLAKE2B 2710c2b9102a30500cdf8e27dbc22be0145c293f615be673ff41a634f82f61bc76e9ae17fba1aab1c8a4acb918e2d03471563ffc5fb4468683d312d3a6cd2e23 SHA512 c617bd4aa3327aebd0c9576b6921b38dc309bed6cd7dfa339a8293c261109bbafb5092f9db6da6c1ba575eb1dbceb32be0f2a982c0b4f47a0abf1e67d062f7b9 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/sys-apps/baobab/baobab-3.22.1.ebuild b/sys-apps/baobab/baobab-3.22.1.ebuild deleted file mode 100644 index 25b752e2597a..000000000000 --- a/sys-apps/baobab/baobab-3.22.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Disk usage browser for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="0" -IUSE="" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - >=dev-libs/glib-2.40:2[dbus] - >=x11-libs/gtk+-3.19.1:3 -" -RDEPEND="${COMMON_DEPEND} - gnome-base/gsettings-desktop-schemas - x11-themes/adwaita-icon-theme - ! Build html API documentation with epydoc. + Enable features required for Gentoo ebuild development. Use inter-process communication between portage and running ebuilds. diff --git a/sys-apps/portage/portage-2.3.24.ebuild b/sys-apps/portage/portage-2.3.24.ebuild index 8e5bc50d4eb2..8de39be77589 100644 --- a/sys-apps/portage/portage-2.3.24.ebuild +++ b/sys-apps/portage/portage-2.3.24.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" SLOT="0" -IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr" +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 @@ -94,6 +94,13 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i pym/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + fi + if use native-extensions; then printf "[build_ext]\nportage-ext-modules=true\n" >> \ setup.cfg || die diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 43c081296c77..52fca1f4c12d 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr" +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 @@ -93,6 +93,13 @@ pkg_setup() { python_prepare_all() { distutils-r1_python_prepare_all + if use gentoo-dev; then + einfo "Disabling --dynamic-deps by default for gentoo-dev..." + sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \ + -i pym/_emerge/create_depgraph_params.py || \ + die "failed to patch create_depgraph_params.py" + fi + if use native-extensions; then printf "[build_ext]\nportage-ext-modules=true\n" >> \ setup.cfg || die -- cgit v1.2.3