1 |
commit: eb8750476cb74179f39e08123acc52130aaccb96 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 24 14:54:12 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 24 14:55:40 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb875047 |
7 |
|
8 |
sys-apps/net-tools: version bump |
9 |
|
10 |
sys-apps/net-tools/Manifest | 1 + |
11 |
...et-tools-9999.ebuild => net-tools-1.60_p20151124144947.ebuild} | 8 ++++++-- |
12 |
sys-apps/net-tools/net-tools-9999.ebuild | 8 ++++++-- |
13 |
3 files changed, 13 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest |
16 |
index b700121..3d12c4a 100644 |
17 |
--- a/sys-apps/net-tools/Manifest |
18 |
+++ b/sys-apps/net-tools/Manifest |
19 |
@@ -3,3 +3,4 @@ DIST net-tools-1.60_p20130513023548-patches-2.tar.xz 14780 SHA256 4eba8545c64db6 |
20 |
DIST net-tools-1.60_p20130513023548.tar.xz 196684 SHA256 e4f47c0736c5d73853f3bbfd30bec1922465f7a2b5bce25e5067774bac1d716d SHA512 d01404ac461f93fbd304f6c67a8dcc642b833f3653b97a5c2ecf3774bfef8489d6aa5631dbefe432a6675e2ce20e88ce1b9888a9ec055198076970505afd1f1b WHIRLPOOL 24e5917bb790d683507d9406213e0ee0ca94c36fcca469ff0ab7fa4c30517cb29a4cfafb98fdedf3a4ba94baa3f66da48ae3a2f359e522b9d42e6e1c599772fa |
21 |
DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190 |
22 |
DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec |
23 |
+DIST net-tools-1.60_p20151124144947.tar.xz 227044 SHA256 fd771419c735ac43b27584594595e9bf8ee708aaf9948a44696ce9aa955e887d SHA512 0118af976ebc45edfd301c666fbf934c1fca1fd09396b6e3d09a8f9810809f7b765d6b3329044da5fccf96574b15b04fdedbaeac8e76e9811c0e87f53eff6530 WHIRLPOOL 33e1de04bc53ba16edc964b4f4b9393fbc2f474c423d73b565eb5449dfdb866edd275a16c08c25bd7eacbf8dff761e20f5eb13abd15c6af0062b6439fe439c5f |
24 |
|
25 |
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild |
26 |
similarity index 91% |
27 |
copy from sys-apps/net-tools/net-tools-9999.ebuild |
28 |
copy to sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild |
29 |
index 5dfa98d..40970a4 100644 |
30 |
--- a/sys-apps/net-tools/net-tools-9999.ebuild |
31 |
+++ b/sys-apps/net-tools/net-tools-1.60_p20151124144947.ebuild |
32 |
@@ -2,12 +2,12 @@ |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
# $Id$ |
35 |
|
36 |
-EAPI="4" |
37 |
+EAPI="5" |
38 |
|
39 |
inherit flag-o-matic toolchain-funcs |
40 |
|
41 |
if [[ ${PV} == "9999" ]] ; then |
42 |
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" |
43 |
+ EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code" |
44 |
inherit git-2 |
45 |
else |
46 |
SRC_URI="mirror://gentoo/${P}.tar.xz" |
47 |
@@ -26,6 +26,9 @@ RDEPEND="!<sys-apps/openrc-0.9.9.3 |
48 |
DEPEND="${RDEPEND} |
49 |
selinux? ( virtual/pkgconfig ) |
50 |
app-arch/xz-utils" |
51 |
+if [[ ${PV} == "9999" ]]; then |
52 |
+ DEPEND+=" nls? ( sys-devel/gettext )" |
53 |
+fi |
54 |
|
55 |
maint_pkg_create() { |
56 |
cd /usr/local/src/net-tools |
57 |
@@ -35,6 +38,7 @@ maint_pkg_create() { |
58 |
local p="${PN}-${pv}" |
59 |
git archive --prefix="${p}/" master | tar xf - -C "${T}" |
60 |
pushd "${T}" >/dev/null |
61 |
+ emake -C "${p}/po" dist |
62 |
sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die |
63 |
tar cf - ${p}/ | xz > ${p}.tar.xz |
64 |
popd >/dev/null |
65 |
|
66 |
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild |
67 |
index 5dfa98d..40970a4 100644 |
68 |
--- a/sys-apps/net-tools/net-tools-9999.ebuild |
69 |
+++ b/sys-apps/net-tools/net-tools-9999.ebuild |
70 |
@@ -2,12 +2,12 @@ |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
# $Id$ |
73 |
|
74 |
-EAPI="4" |
75 |
+EAPI="5" |
76 |
|
77 |
inherit flag-o-matic toolchain-funcs |
78 |
|
79 |
if [[ ${PV} == "9999" ]] ; then |
80 |
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools" |
81 |
+ EGIT_REPO_URI="git://git.code.sf.net/p/net-tools/code" |
82 |
inherit git-2 |
83 |
else |
84 |
SRC_URI="mirror://gentoo/${P}.tar.xz" |
85 |
@@ -26,6 +26,9 @@ RDEPEND="!<sys-apps/openrc-0.9.9.3 |
86 |
DEPEND="${RDEPEND} |
87 |
selinux? ( virtual/pkgconfig ) |
88 |
app-arch/xz-utils" |
89 |
+if [[ ${PV} == "9999" ]]; then |
90 |
+ DEPEND+=" nls? ( sys-devel/gettext )" |
91 |
+fi |
92 |
|
93 |
maint_pkg_create() { |
94 |
cd /usr/local/src/net-tools |
95 |
@@ -35,6 +38,7 @@ maint_pkg_create() { |
96 |
local p="${PN}-${pv}" |
97 |
git archive --prefix="${p}/" master | tar xf - -C "${T}" |
98 |
pushd "${T}" >/dev/null |
99 |
+ emake -C "${p}/po" dist |
100 |
sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die |
101 |
tar cf - ${p}/ | xz > ${p}.tar.xz |
102 |
popd >/dev/null |