[gentoo-commits] gentoo-x86 commit in app-misc/timestamp: timestamp-1.1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in app-misc/timestamp: timestamp-1.1.ebuild ChangeLog

[Peter Volkov (pva)]

pva         08/10/29 16:15:59

  Modified:             timestamp-1.1.ebuild ChangeLog
  Log:
  timestamp and sys-apps/moreutils have collisions, added blocker, bug #244653, thank Joost Ruis for report.
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)

Revision  Changes    Path
1.6                  app-misc/timestamp/timestamp-1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?r1=1.5&r2=1.6

Index: timestamp-1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- timestamp-1.1.ebuild	3 Sep 2006 19:56:25 -0000	1.5
+++ timestamp-1.1.ebuild	29 Oct 2008 16:15:59 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v 1.5 2006/09/03 19:56:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v 1.6 2008/10/29 16:15:59 pva Exp $
 
 DESCRIPTION="A text filtering pipe that marks each line with a timestamp"
 HOMEPAGE="http://math.smsu.edu/~erik/software.php?id=95"
@@ -11,7 +11,7 @@
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND="!sys-apps/moreutils"
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"



1.8                  app-misc/timestamp/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	19 Mar 2007 01:57:49 -0000	1.7
+++ ChangeLog	29 Oct 2008 16:15:59 -0000	1.8
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/timestamp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v 1.7 2007/03/19 01:57:49 kloeri Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v 1.8 2008/10/29 16:15:59 pva Exp $
+
+  29 Oct 2008; Peter Volkov <pva@gentoo.org> timestamp-1.1.ebuild:
+  timestamp and sys-apps/moreutils have collisions, added blocker, bug
+  #244653, thank Joost Ruis for report.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.