| 1 |
pva 08/10/29 16:15:59 |
| 2 |
|
| 3 |
Modified: timestamp-1.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
timestamp and sys-apps/moreutils have collisions, added blocker, bug #244653, thank Joost Ruis for report. |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 app-misc/timestamp/timestamp-1.1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: timestamp-1.1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- timestamp-1.1.ebuild 3 Sep 2006 19:56:25 -0000 1.5 |
| 22 |
+++ timestamp-1.1.ebuild 29 Oct 2008 16:15:59 -0000 1.6 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2006 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v 1.5 2006/09/03 19:56:25 blubb Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/timestamp-1.1.ebuild,v 1.6 2008/10/29 16:15:59 pva Exp $ |
| 29 |
|
| 30 |
DESCRIPTION="A text filtering pipe that marks each line with a timestamp" |
| 31 |
HOMEPAGE="http://math.smsu.edu/~erik/software.php?id=95" |
| 32 |
@@ -11,7 +11,7 @@ |
| 33 |
KEYWORDS="amd64 ~ppc x86" |
| 34 |
IUSE="" |
| 35 |
|
| 36 |
-DEPEND="virtual/libc" |
| 37 |
+DEPEND="!sys-apps/moreutils" |
| 38 |
|
| 39 |
src_install() { |
| 40 |
make DESTDIR="${D}" install || die "make install failed" |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.8 app-misc/timestamp/ChangeLog |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?rev=1.8&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?rev=1.8&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/timestamp/ChangeLog?r1=1.7&r2=1.8 |
| 49 |
|
| 50 |
Index: ChangeLog |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v |
| 53 |
retrieving revision 1.7 |
| 54 |
retrieving revision 1.8 |
| 55 |
diff -u -r1.7 -r1.8 |
| 56 |
--- ChangeLog 19 Mar 2007 01:57:49 -0000 1.7 |
| 57 |
+++ ChangeLog 29 Oct 2008 16:15:59 -0000 1.8 |
| 58 |
@@ -1,6 +1,10 @@ |
| 59 |
# ChangeLog for app-misc/timestamp |
| 60 |
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v 1.7 2007/03/19 01:57:49 kloeri Exp $ |
| 62 |
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/timestamp/ChangeLog,v 1.8 2008/10/29 16:15:59 pva Exp $ |
| 64 |
+ |
| 65 |
+ 29 Oct 2008; Peter Volkov <pva@g.o> timestamp-1.1.ebuild: |
| 66 |
+ timestamp and sys-apps/moreutils have collisions, added blocker, bug |
| 67 |
+ #244653, thank Joost Ruis for report. |
| 68 |
|
| 69 |
19 Mar 2007; Bryan Østergaard <kloeri@g.o> metadata.xml: |
| 70 |
Remove ka0ttic from metadata.xml due to retirement. |
Archives