1 |
commit: 72890bd4747315287c0b4cb137eeaafd76fd4141 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 24 23:19:31 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 23:19:31 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=72890bd4 |
7 |
|
8 |
sys-apps/net-tools: stabilize latest, bug #566752 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
sys-apps/net-tools/Manifest | 5 +- |
13 |
.../net-tools-1.60_p20130513023548-r99.ebuild | 97 ---------------------- |
14 |
.../net-tools-1.60_p20141019041918-r99.ebuild | 2 +- |
15 |
3 files changed, 2 insertions(+), 102 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest |
18 |
index 29ff411..7519cc1 100644 |
19 |
--- a/sys-apps/net-tools/Manifest |
20 |
+++ b/sys-apps/net-tools/Manifest |
21 |
@@ -1,8 +1,5 @@ |
22 |
AUX net-tools-fix-header-assumptions.patch 3462 SHA256 bea5145e5a69bcea835bcb9a71cadcef55651b253c6e4552f007e37e16d60a1a SHA512 e14293a16d0111cb50f205d4a861f94b9525ce75311f8e3aeed1231ffc877d4d2715074d64419c72473c27cb4c2535ad4af17f911dc7ece71d2e941bce44297a WHIRLPOOL f6b378db90711d82d55cda0ee1903b32102f97854897236562f69a42470d7288ab7bbb4b166927086b758b237c1d091d7b1f392d1e798de06d875b6b0e293433 |
23 |
-DIST net-tools-1.60_p20130513023548-patches-1.tar.xz 3352 SHA256 926240c304e20a0ab966c3d278703a6ef8e7833a54aaf636598854450bd01f4e SHA512 6dd3eef6469a18581a98fc91f424b418f3875cd0eff86724d6bdbacca1b83d1229a567a184b82e0187d01a428ea6be933d53090796b5c7d301009b2e211c4531 WHIRLPOOL fb638e122f85e95fda35b77336fbb5d4f6e89c5f5a5b76d759bd08f53eb0741feb9c7221940b836e0e7f5c60bd312d99d823c3af89340d6e254f1be96e34d2ce |
24 |
-DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa |
25 |
DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190 |
26 |
DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec |
27 |
-EBUILD net-tools-1.60_p20130513023548-r99.ebuild 2777 SHA256 7c74e71ea16d2821e6f3f369183cb430c91a0073379cf050ed8f4590f57b271a SHA512 990d3c30fe158c9a205ede566a87d948e9065d93b85f9a17c129aa44d33fd03a55f579378e4c671f642a70893ac237cc089d51a479a4d55a74e549c1006c29d6 WHIRLPOOL c52b338672edd287f07aa613c13a21970fc035f825b60c2d9c5d8fa617cadb49de4f5c370393aec05719d73256cf35841f0b11677f0293e901869a7833885c87 |
28 |
-EBUILD net-tools-1.60_p20141019041918-r99.ebuild 2781 SHA256 18d3b66d1f921fc7ab3cf778dfc6c731927bf39560feb8728c105aeeec9dd20b SHA512 a09b4ec16ae85656721df67ebfeda57bb6b9d49abde9a4e2840ccce0e6f931ff571adaa271bcb9863356f794c222fa738232670c621ec68e6c4a4ab9b5d19754 WHIRLPOOL 291d46d3c17f95e89ea1b6e9385c23dc81b7b4b6bd997cb14db05b9230849ec3efaaae33be46625d50aac131d04ba2f84463f6a1620d3e4380eaaa175435e8f8 |
29 |
+EBUILD net-tools-1.60_p20141019041918-r99.ebuild 2777 SHA256 af0e18135db329fe0a9aeab44d2a4ceff21e0f7b272eaf6d3592a980c6375c2d SHA512 4761dde76acbc92115039434535099241ef609c4ba0ed560049cf9c1b0363f8bab10f129f42f18de4e57ecf0a2250c5e587bc10aec156848625b1c763415fd6a WHIRLPOOL d6567d21d6541a6b8c64de48c5038191c4e04581058e3fc2359dd16e7827fa25b22c15cb6cb06afcf465869113546f320bdda8f5834176474dc771653440312a |
30 |
MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc |
31 |
|
32 |
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild |
33 |
deleted file mode 100644 |
34 |
index b453df8..0000000 |
35 |
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,97 +0,0 @@ |
38 |
-# Copyright 1999-2014 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.6 2014/04/07 20:12:31 vapier Exp $ |
41 |
- |
42 |
-EAPI="3" |
43 |
- |
44 |
-inherit flag-o-matic toolchain-funcs eutils |
45 |
- |
46 |
-if [[ ${PV} == "9999" ]] ; then |
47 |
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" |
48 |
- inherit git-2 |
49 |
-else |
50 |
- PATCH_VER="1" |
51 |
- SRC_URI="mirror://gentoo/${P}.tar.xz |
52 |
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz" |
53 |
- KEYWORDS="amd64 arm ~mips ppc x86" |
54 |
-fi |
55 |
- |
56 |
-DESCRIPTION="Standard Linux networking tools" |
57 |
-HOMEPAGE="http://net-tools.sourceforge.net/" |
58 |
- |
59 |
-LICENSE="GPL-2" |
60 |
-SLOT="0" |
61 |
-IUSE="nls old-output selinux static" |
62 |
- |
63 |
-RDEPEND="!<sys-apps/openrc-0.9.9.3 |
64 |
- selinux? ( sys-libs/libselinux )" |
65 |
-DEPEND="${RDEPEND} |
66 |
- selinux? ( virtual/pkgconfig ) |
67 |
- app-arch/xz-utils" |
68 |
- |
69 |
-maint_pkg_create() { |
70 |
- cd /usr/local/src/net-tools |
71 |
- #git-update |
72 |
- local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S) |
73 |
- local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60} |
74 |
- local p="${PN}-${pv}" |
75 |
- git archive --prefix="${p}/" master | tar xf - -C "${T}" |
76 |
- pushd "${T}" >/dev/null |
77 |
- sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die |
78 |
- tar cf - ${p}/ | xz > ${p}.tar.xz |
79 |
- popd >/dev/null |
80 |
- |
81 |
- local patches="${p}-patches-${PATCH_VER:-1}" |
82 |
- local d="${T}/${patches}" |
83 |
- mkdir "${d}" |
84 |
- git format-patch -o "${d}" master..gentoo > /dev/null |
85 |
- echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README |
86 |
- tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz |
87 |
- rm -rf "${d}" |
88 |
- |
89 |
- du -b "${T}"/*.tar.xz |
90 |
-} |
91 |
- |
92 |
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; } |
93 |
- |
94 |
-set_opt() { |
95 |
- local opt=$1 ans |
96 |
- shift |
97 |
- ans=$("$@" && echo y || echo n) |
98 |
- einfo "Setting option ${opt} to ${ans}" |
99 |
- sed -i \ |
100 |
- -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \ |
101 |
- config.in || die |
102 |
-} |
103 |
- |
104 |
-src_prepare() { |
105 |
- epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch |
106 |
- if [[ -n ${PATCH_VER} ]] ; then |
107 |
- use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch" |
108 |
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER} |
109 |
- fi |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- set_opt I18N use nls |
114 |
- set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6' |
115 |
- set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5' |
116 |
- set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6' |
117 |
- set_opt HAVE_AFECONET 0 |
118 |
- set_opt SELINUX use selinux |
119 |
- if use static ; then |
120 |
- append-flags -static |
121 |
- append-ldflags -static |
122 |
- fi |
123 |
- tc-export AR CC |
124 |
- yes "" | ./configure.sh config.in || die |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- emake DESTDIR="${ED}" install || die |
129 |
- dodoc README README.ipv6 TODO |
130 |
-} |
131 |
- |
132 |
-pkg_postinst() { |
133 |
- einfo "etherwake and such have been split into net-misc/ethercard-diag" |
134 |
-} |
135 |
|
136 |
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild |
137 |
index 529d30e..20ff3b4 100644 |
138 |
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild |
139 |
+++ b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild |
140 |
@@ -13,7 +13,7 @@ else |
141 |
PATCH_VER="1" |
142 |
SRC_URI="mirror://gentoo/${P}.tar.xz |
143 |
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz" |
144 |
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" |
145 |
+ KEYWORDS="amd64 arm ~mips ppc x86" |
146 |
fi |
147 |
|
148 |
DESCRIPTION="Standard Linux networking tools" |