Rename ebuild that had a broken timestamp.

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 22 insertions, 11 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index e95a1190a482..703b09e9bae3 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/net-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.119 2011/11/21 20:34:49 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.120 2012/01/04 21:17:41 vapier Exp $
+
+*net-tools-1.60_p20111120203157 (04 Jan 2012)
+
+  04 Jan 2012; Mike Frysinger <vapier@gentoo.org>
+  +net-tools-1.60_p20111120203157.ebuild,
+  -net-tools-1.60_p201111202031570500.ebuild, net-tools-9999.ebuild:
+  Rename ebuild that had a broken timestamp.
 
 *net-tools-9999 (21 Nov 2011)
 *net-tools-1.60_p201111202031570500 (21 Nov 2011)
diff --git a/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild b/sys-apps/net-tools/net-tools-1.60_p20111120203157.ebuild
index 8eb769560d00..a2d6e7e452de 100644
--- a/sys-apps/net-tools/net-tools-1.60_p201111202031570500.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20111120203157.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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_p201111202031570500.ebuild,v 1.1 2011/11/21 20:34:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20111120203157.ebuild,v 1.1 2012/01/04 21:17:41 vapier Exp $
 
 EAPI="3"
 
 inherit flag-o-matic toolchain-funcs eutils
 
+# original release had a timestamp screwup
+MY_P="${P}0500"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URL="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"
+	SRC_URI="mirror://gentoo/${MY_P}.tar.xz
+		mirror://gentoo/${MY_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
 
@@ -28,6 +30,8 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
+S=${WORKDIR}/${MY_P}
+
 maint_pkg_create() {
 	cd /usr/local/src/net-tools/git
 	#git-update
@@ -70,7 +74,7 @@ set_opt() {
 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}
+		EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${MY_P}-patches-${PATCH_VER}
 	fi
 }
 
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index 61595a858ff7..7a533a51e972 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.1 2011/11/21 20:34:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-9999.ebuild,v 1.2 2012/01/04 21:17:41 vapier Exp $
 
 EAPI="3"
 
@@ -29,9 +29,9 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
 maint_pkg_create() {
-	cd /usr/local/src/net-tools/git
+	cd /usr/local/src/net-tools
 	#git-update
-	local stamp=$(git log -n1 --pretty=format:%ai master | sed -e 's:[- :]::g' -e 's:+.*::')
+	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}"