Rename ebuild that had a broken timestamp.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 39 insertions, 18 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/Manifest b/sys-apps/net-tools/Manifest
index 002b0b319ec8..6d84b773dade 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST net-tools-1.60_p20090728014017-patches-3.tar.lzma 12545 RMD160 9640e3ae1a5e147c74708989684a121ef4ad4632 SHA1 c9c979d0316931e339176c9aa207fb389e022618 SHA256 f592ec69354b6910319bfea4179829b9be0662a5418417780cdc7dc2cdece60e
 DIST net-tools-1.60_p20090728014017.tar.lzma 187111 RMD160 5f6f21c725cbd69f1a9609f95f98f98425fbe5c3 SHA1 c7159f7ed892cf326c0665a5720edac0b3c912f8 SHA256 bcac2d566264f52c4c35c9e1cc130d22d93e95aa49ff3a77d0cf26e4dafc6fe6
@@ -15,14 +15,24 @@ EBUILD net-tools-1.60_p20090728014017-r1.ebuild 2129 RMD160 a8193a24c57e8c64c637
 EBUILD net-tools-1.60_p20100815160931.ebuild 2161 RMD160 bd0d29e9dd8b97cc161c7f5555b4e88b102b6f2e SHA1 a291441c8df2331702a3282560c41323ae58184f SHA256 8d767dd395d4ab1fd6b02bcdff78a768824f4cc4314caad47af17fae72c5e299
 EBUILD net-tools-1.60_p20110409135728.ebuild 2255 RMD160 db4b3c05982f59f732a51125143610142d875c76 SHA1 6d3475263a73bf2043fb2e29a0ec55ff9ce44c36 SHA256 80b1c01a4484b7f2f71ac2f9f2ce4d634f694a60ec349b2648c833bcd7797aa5
 EBUILD net-tools-1.60_p20110820045617.ebuild 2285 RMD160 6d9ec56bd5a0d621740f903da785585a0104258b SHA1 2a4f7649573f8fb1bea2ab5b250ded7ebb9550c6 SHA256 0e5fe3f5cd1f4d613e6abfb1bdd91ca4e0dd1266820f79016ca8abbb700c4ad3
-EBUILD net-tools-1.60_p201111202031570500.ebuild 2615 RMD160 052a11bcf404009de9f464d5cc6278d4f6a60650 SHA1 6f97ce522bbdcc4f51ccd13c05f491bfadb5fcc4 SHA256 75d1a40870411066a5c0f978b160d1109749539f27e7c653141752ef459c20a0
-EBUILD net-tools-9999.ebuild 2595 RMD160 98afead841174e9732f245abd380945cb29395c8 SHA1 dd2ae7e0d8d70aa34386459809eaa882c3952ec0 SHA256 c752a2848f0d9548a54690d80da019df5f01c39aa815f52d42c5df02fd3c77ac
-MISC ChangeLog 18897 RMD160 c006d120e6e03ebba2b0eab52a9c0cec93c8982a SHA1 04ff3a1955f26ada58ad6f589953d026e27236d8 SHA256 676a3e2e89f6790f02d74c0ba7dc39c9fdc64fbaf6e6c75e9a527fc870c8f946
+EBUILD net-tools-1.60_p20111120203157.ebuild 2701 RMD160 84257979a6945c7229ef43799f80dedee6e38105 SHA1 dad6f7dee27845c2508745f8eeb6918b69a00a0d SHA256 bbc16f8c9638661edca133c2a096b40cf6af75c93909ea35d27752cb5cb80b65
+EBUILD net-tools-9999.ebuild 2590 RMD160 7493169771bda765782b39a94b8ce4ec26769778 SHA1 15b9fc7987374d8f9403d30b44273f6019eefb66 SHA256 075cd48c7ad1e9b5bd6a7c3f93849251853afe902947244fba92fb8378acbd0b
+MISC ChangeLog 19151 RMD160 21f3b8dc0731323ca672a731ee3283ae2d846ab3 SHA1 71ab1966b62b7216bc84e1de42aa06d66cf013f3 SHA256 42b4ee21b2d3dd2e334f71418f5803997489e9f7a307670cad1ce46c35425608
 MISC metadata.xml 283 RMD160 81fc4d8272396ca42e82bdb0c886829cee76d462 SHA1 aa3da7f4f3a7bd1f794ef04bcc42c80a84480ee2 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7KtfAACgkQaC/OocHi7JbffgD9FucYzbPYiasoC25AwRo2fO1T
-uyBGEBMmlIgPBak2FcUA/RMHnTpNoAlsqmTcU/ijkycIZ0+j1HdcXJg0K0oHnD40
-=jydE
+iQIcBAEBAgAGBQJPBMIRAAoJELEHsLL7fEFWpvAQAMUmNbx/GCBTrhdUTKQ4DPz8
+opueBqrwQwXKpaPiPK52O74c6W3vfnieG1fAZ50DHfn3BaLu1yISmX8W4+C+eUZu
+k8FpMbi368HNplvLil7QSp2NeqnVh2fmaRntj3C/YvP2SyKqUVLbhwkxam7RTnbO
+fz5nmRatAwXtPxs8UC2BMIYss8m6zvYNcFBb9e4XHp1fRZesAWAnrviztN3aqOB+
+DB8h8CxxcGjhGi2ttJKUSbYIi8l2bAXQ6aHwge8YloDogAvEmsP5dNgHXfs1x1UM
+wD6jtkIWihRdoPkkUNXzZXoRKwd+mHKOMv22DA/OnIpblQphg/zE2SnoccZXJCKr
+mtYaDThEc0+wnqCwcxjuSFxxwr7jn7G55liQ3Cjukp8GU4VOr1TxhkxakwWvU9la
+y+XiGW1zLScvf0Ch93ZtdWZ9oIZ9aNZARN6H7ThJvsofkJhEu0gnS/LtR3J6J5hU
+lOngN4iwTAr51WNjFsCY88/6oubd5frtoAil540PXYqtuEO/yyyLxiXt94d4VhMt
+0de0qTyFeizuU8TwZ76Bwh0ImqiBgcQh233qL65Ouutoy6izkWP3Y+DNt5nTfqC+
+URo03F+WsNn4nIGWjhB+3RQL8QLMWCRfAarddD8syso236ybdtay9sJTdRXA4U8/
+2xaoaj8U/42S1jd5LO3S
+=nPyU
 -----END PGP SIGNATURE-----
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}"