* [gentoo-commits] gentoo-x86 commit in sys-apps/net-tools: net-tools-9999.ebuild net-tools-1.60_p20130513023548.ebuild ChangeLog
@ 2013-05-13 16:29 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-13 16:29 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/13 16:29:38
Modified: net-tools-9999.ebuild ChangeLog
Added: net-tools-1.60_p20130513023548.ebuild
Log:
Version bump w/cleaned up selinux support #469224 by Sven Vermeulen.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.4 sys-apps/net-tools/net-tools-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?r1=1.3&r2=1.4
Index: net-tools-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- net-tools-9999.ebuild 23 Jul 2012 01:12:43 -0000 1.3
+++ net-tools-9999.ebuild 13 May 2013 16:29:38 -0000 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.3 2012/07/23 01:12:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.4 2013/05/13 16:29:38 vapier Exp $
EAPI="3"
@@ -22,10 +22,12 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="nls old-output static"
+IUSE="nls old-output selinux static"
-RDEPEND=""
+RDEPEND="!<sys-apps/openrc-0.9.9.3
+ selinux? ( sys-libs/libselinux )"
DEPEND="${RDEPEND}
+ selinux? ( virtual/pkgconfig )
app-arch/xz-utils"
maint_pkg_create() {
@@ -34,14 +36,10 @@
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="nt/" master | tar xf - -C "${T}"
+ git archive --prefix="${p}/" master | tar xf - -C "${T}"
pushd "${T}" >/dev/null
- pushd nt >/dev/null
- sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
- emake dist >/dev/null
- popd >/dev/null
- zcat ${p}.tar.gz | xz > ${p}.tar.xz
- rm -f ${p}.tar.gz
+ sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
+ tar cf - ${p}/ | xz > ${p}.tar.xz
popd >/dev/null
local patches="${p}-patches-${PATCH_VER:-1}"
@@ -78,6 +76,8 @@
set_opt I18N use nls
set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
+ set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
+ set_opt SELINUX use selinux
if use static ; then
append-flags -static
append-ldflags -static
1.137 sys-apps/net-tools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?r1=1.136&r2=1.137
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- ChangeLog 17 Feb 2013 23:44:34 -0000 1.136
+++ ChangeLog 13 May 2013 16:29:38 -0000 1.137
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/net-tools
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.136 2013/02/17 23:44:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.137 2013/05/13 16:29:38 vapier Exp $
+
+*net-tools-1.60_p20130513023548 (13 May 2013)
+
+ 13 May 2013; Mike Frysinger <vapier@gentoo.org>
+ +net-tools-1.60_p20130513023548.ebuild, net-tools-9999.ebuild:
+ Version bump w/cleaned up selinux support #469224 by Sven Vermeulen.
17 Feb 2013; Zac Medico <zmedico@gentoo.org>
net-tools-1.60_p20120127084908.ebuild:
1.1 sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild?rev=1.1&content-type=text/plain
Index: net-tools-1.60_p20130513023548.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.1 2013/05/13 16:29:38 vapier Exp $
EAPI="3"
inherit flag-o-matic toolchain-funcs eutils
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
inherit git-2
KEYWORDS=""
else
PATCH_VER="1"
SRC_URI="mirror://gentoo/${P}.tar.xz
mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Standard Linux networking tools"
HOMEPAGE="http://net-tools.sourceforge.net/"
LICENSE="GPL-2"
SLOT="0"
IUSE="nls old-output selinux static"
RDEPEND="!<sys-apps/openrc-0.9.9.3
selinux? ( sys-libs/libselinux )"
DEPEND="${RDEPEND}
selinux? ( virtual/pkgconfig )
app-arch/xz-utils"
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
sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
tar cf - ${p}/ | xz > ${p}.tar.xz
popd >/dev/null
local patches="${p}-patches-${PATCH_VER:-1}"
local d="${T}/${patches}"
mkdir "${d}"
git format-patch -o "${d}" master..gentoo > /dev/null
echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
rm -rf "${d}"
du -b "${T}"/*.tar.xz
}
pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
set_opt() {
local opt=$1 ans
shift
ans=$("$@" && echo y || echo n)
einfo "Setting option ${opt} to ${ans}"
sed -i \
-e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
config.in || die
}
src_prepare() {
if [[ -n ${PATCH_VER} ]] ; then
use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
fi
}
src_configure() {
set_opt I18N use nls
set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
set_opt SELINUX use selinux
if use static ; then
append-flags -static
append-ldflags -static
fi
tc-export AR CC
yes "" | ./configure.sh config.in || die
}
src_install() {
emake DESTDIR="${ED}" install || die
dodoc README README.ipv6 TODO
}
pkg_postinst() {
einfo "etherwake and such have been split into net-misc/ethercard-diag"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/net-tools: net-tools-9999.ebuild net-tools-1.60_p20130513023548.ebuild ChangeLog
@ 2014-04-07 20:11 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2014-04-07 20:11 UTC (permalink / raw
To: gentoo-commits
vapier 14/04/07 20:11:30
Modified: net-tools-9999.ebuild
net-tools-1.60_p20130513023548.ebuild ChangeLog
Log:
Delete KEYWORDS from live git paths to avoid confusing ekeyword.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.6 sys-apps/net-tools/net-tools-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild?r1=1.5&r2=1.6
Index: net-tools-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- net-tools-9999.ebuild 18 Jan 2014 03:28:51 -0000 1.5
+++ net-tools-9999.ebuild 7 Apr 2014 20:11:30 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.5 2014/01/18 03:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.6 2014/04/07 20:11:30 vapier Exp $
EAPI="3"
@@ -9,7 +9,6 @@
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
inherit git-2
- KEYWORDS=""
else
PATCH_VER="1"
SRC_URI="mirror://gentoo/${P}.tar.xz
1.5 sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild?r1=1.4&r2=1.5
Index: net-tools-1.60_p20130513023548.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- net-tools-1.60_p20130513023548.ebuild 7 Apr 2014 19:44:59 -0000 1.4
+++ net-tools-1.60_p20130513023548.ebuild 7 Apr 2014 20:11:30 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.4 2014/04/07 19:44:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.5 2014/04/07 20:11:30 vapier Exp $
EAPI="3"
@@ -9,7 +9,6 @@
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
inherit git-2
- KEYWORDS="arm hppa"
else
PATCH_VER="1"
SRC_URI="mirror://gentoo/${P}.tar.xz
1.141 sys-apps/net-tools/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/net-tools/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 7 Apr 2014 19:44:59 -0000 1.140
+++ ChangeLog 7 Apr 2014 20:11:30 -0000 1.141
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/net-tools
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.140 2014/04/07 19:44:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.141 2014/04/07 20:11:30 vapier Exp $
+
+ 07 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+ net-tools-1.60_p20130513023548.ebuild, net-tools-9999.ebuild:
+ Delete KEYWORDS from live git paths to avoid confusing ekeyword.
07 Apr 2014; Markus Meier <maekke@gentoo.org>
net-tools-1.60_p20130513023548.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-07 20:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-13 16:29 [gentoo-commits] gentoo-x86 commit in sys-apps/net-tools: net-tools-9999.ebuild net-tools-1.60_p20130513023548.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2014-04-07 20:11 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox