diff options
Diffstat (limited to 'sys-apps/net-tools')
-rw-r--r-- | sys-apps/net-tools/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild | 5 | ||||
-rw-r--r-- | sys-apps/net-tools/net-tools-2.10.ebuild (renamed from sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild) | 44 | ||||
-rw-r--r-- | sys-apps/net-tools/net-tools-9999.ebuild | 38 |
4 files changed, 27 insertions, 68 deletions
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest index b7ce7e44183a..dac3313b7040 100644 --- a/sys-apps/net-tools/Manifest +++ b/sys-apps/net-tools/Manifest @@ -1,7 +1,7 @@ AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445 -DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb -EBUILD net-tools-1.60_p20161110235919.ebuild 2545 BLAKE2B 14cedeec32fb214a5b27a51f99241d4f54686bf7df550ad7a9582bbe67418516058a1303eb2f3c9159e81f338acd73ebc837de690727a8a7ce117263bf521416 SHA512 c5d7e0b32edf23ae687e16be8357f8f4d48bac7b82f4c735f362e69b1550a011c7dd892b762da999ad5861091390b4d3b00de81d6741a967c58c376107f6b555 -EBUILD net-tools-1.60_p20180626073013.ebuild 2477 BLAKE2B f48bf52d678801b5632282ad44569c7eb2739e3723d01f30216ba5c0f4e6dbc8e1f084792913a3169296ede6cb7f68bdf2b8e2ca0cfe8d67f3c336242dad58ce SHA512 546baea120075e22422cb4ff6914178afc87ef2ea9e8cc7f1c7d1aafce91c2edc3f0a0699f4840d3e9e7782c9444cdb4d9897f9e54b65860eb337b3540638c8a -EBUILD net-tools-9999.ebuild 2485 BLAKE2B c7f7c12a1d9d46d4afd4d86bd7bfc50dc7f59f0b215d123f4d3a5689425a95dea2d4791be2fcac8b3bff0ca4496c1a15ead3ac19590190ffbaa85aa693dfb4a9 SHA512 9c4b5f1ae7010f035ebc427a5ec3b33707fa913b8377e5168960eb0af2247592c92656b2fd14243e8784560f2aa46825bc3fc8961cb58435929516581ba177d8 +DIST net-tools-2.10.tar.xz 229616 BLAKE2B 0d11a5c12f6447282c65ee74428c1b9f6da9fd6d26ca558813d002fac8a4f03fd25a26231a5f4e45f88d821e9a8281e3be1fea4a832bd09afbc2239634a1c25d SHA512 aa8f631772da6c16b165065fc5929a206504f2dce19e74a4ffc680f09b40f3a9180bd4bbeaac67e0b32693358b01383bae4fbfcb6061180c130e9e0801d536bf +EBUILD net-tools-1.60_p20180626073013.ebuild 2450 BLAKE2B bf0d8623306be59d53c0b475e053a2a2905de64c4488b8940080fda7c667d46bc2309daa450b654fbe719b2df1af8096101039b4658da84ff08494923f5ec71b SHA512 5b8917dd63904c5c9a66e8cd856a551b6dcc8e25a662ddd693dd12c2f87cdc4d02d9b20bb684a7b0237edd85873475718533df9de6f4191a308e9deb4a7cddd9 +EBUILD net-tools-2.10.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e +EBUILD net-tools-9999.ebuild 1923 BLAKE2B 16912890591ac8db71923c955330d8f96839ff2fbe9c9c5b495924f95e9b4fac9ecb9d4e6fab7aaea6ac592e51776e1912392189f7728383deeeddb8fb1a495c SHA512 e875bfadb197f9249637f2891cd45be68dd512ac7eefc381d5a360e0bee3e53b29acc82e07670d18fdbec9fae24e4be80b3f790d1133482560d2d0b56979351e MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037 diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild index 97bc2e7a04e1..b6f687b457f3 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild +++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -29,8 +29,7 @@ if [[ ${PV} == "9999" ]]; then DEPEND+=" nls? ( sys-devel/gettext )" fi RDEPEND+=" - hostname? ( !sys-apps/coreutils[hostname] ) - !<sys-apps/openrc-0.9.9.3" + hostname? ( !sys-apps/coreutils[hostname] )" maint_pkg_create() { cd /usr/local/src/net-tools diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild index 56b1c2da8654..96f533d8a695 100644 --- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild +++ b/sys-apps/net-tools/net-tools-2.10.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="7" inherit flag-o-matic toolchain-funcs @@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code" inherit git-r3 else - SRC_URI="mirror://gentoo/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Standard Linux networking tools" @@ -21,34 +21,16 @@ SLOT="0" IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static" REQUIRED_USE="nis? ( hostname )" -RDEPEND="selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} +DEPEND="selinux? ( sys-libs/libselinux )" +RDEPEND="${DEPEND} + hostname? ( !sys-apps/coreutils[hostname] )" +BDEPEND=" selinux? ( virtual/pkgconfig ) - app-arch/xz-utils" + app-arch/xz-utils +" if [[ ${PV} == "9999" ]]; then - DEPEND+=" nls? ( sys-devel/gettext )" + BDEPEND+=" nls? ( sys-devel/gettext )" fi -RDEPEND+=" - hostname? ( !sys-apps/coreutils[hostname] ) - !<sys-apps/openrc-0.9.9.3" - -maint_pkg_create() { - cd /usr/local/src/net-tools - #git-update - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) - local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} - local p="${PN}-${pv}" - git archive --prefix="${p}/" master | tar xf - -C "${T}" - pushd "${T}" >/dev/null - emake -C "${p}/po" dist - sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die - tar cf - ${p}/ | xz > ${p}.tar.xz - popd >/dev/null - - du -b "${T}"/*.tar.xz -} - -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } set_opt() { local opt=$1 ans @@ -60,10 +42,6 @@ set_opt() { config.in || die } -src_prepare() { - epatch "${FILESDIR}/${P}-fix-building-w-older-linux-headers.patch" -} - src_configure() { # Clear out env vars from the user. #599602 unset BASEDIR BINDIR SBINDIR diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild index 1fd92a62a67f..96f533d8a695 100644 --- a/sys-apps/net-tools/net-tools-9999.ebuild +++ b/sys-apps/net-tools/net-tools-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" inherit flag-o-matic toolchain-funcs @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.code.sf.net/p/net-tools/code" inherit git-r3 else - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi @@ -21,34 +21,16 @@ SLOT="0" IUSE="+arp +hostname ipv6 nis nls plipconfig selinux slattach static" REQUIRED_USE="nis? ( hostname )" -RDEPEND="selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} +DEPEND="selinux? ( sys-libs/libselinux )" +RDEPEND="${DEPEND} + hostname? ( !sys-apps/coreutils[hostname] )" +BDEPEND=" selinux? ( virtual/pkgconfig ) - app-arch/xz-utils" + app-arch/xz-utils +" if [[ ${PV} == "9999" ]]; then - DEPEND+=" nls? ( sys-devel/gettext )" + BDEPEND+=" nls? ( sys-devel/gettext )" fi -RDEPEND+=" - hostname? ( !sys-apps/coreutils[hostname] ) - !<sys-apps/openrc-0.9.9.3" - -maint_pkg_create() { - cd /usr/local/src/net-tools - #git-update - local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) - local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} - local p="${PN}-${pv}" - git archive --prefix="${p}/" master | tar xf - -C "${T}" - pushd "${T}" >/dev/null - emake -C "${p}/po" dist - sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die - tar --exclude-vcs cf - ${p}/ | xz > ${p}.tar.xz - popd >/dev/null - - du -b "${T}"/*.tar.xz -} - -pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } set_opt() { local opt=$1 ans |