diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-10-29 16:15:59 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-10-29 16:15:59 +0000 |
| commit | 92ac285b63e69c0b717d47db665938a44ae20e78 (patch) | |
| tree | 08921ec0c1b1e5303a59e2d530b4567ec60efa01 /app-misc/timestamp | |
| parent | Version bump, bug #237816, remove old (diff) | |
| download | historical-92ac285b63e69c0b717d47db665938a44ae20e78.tar.gz historical-92ac285b63e69c0b717d47db665938a44ae20e78.tar.bz2 historical-92ac285b63e69c0b717d47db665938a44ae20e78.zip | |
timestamp and sys-apps/moreutils have collisions, added blocker, bug #244653, thank Joost Ruis for report.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686
Diffstat (limited to 'app-misc/timestamp')
| -rw-r--r-- | app-misc/timestamp/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/timestamp/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/timestamp/timestamp-1.1.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app-misc/timestamp/ChangeLog b/app-misc/timestamp/ChangeLog index ae69064bb628..8a84934a05c5 100644 --- a/app-misc/timestamp/ChangeLog +++ b/app-misc/timestamp/ChangeLog @@ -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. diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest index 2e080d5d5695..42adf96f2f8d 100644 --- a/app-misc/timestamp/Manifest +++ b/app-misc/timestamp/Manifest @@ -1,4 +1,4 @@ DIST timestamp-1.1.tar.gz 61578 RMD160 d6853e8b438c80e049697ce8530e5dff49c6a812 SHA1 9a5fadf793dab21070c4404c15a994fc73194171 SHA256 8bb39d7db691f995ddb4cb4320a9ca1c3c793ade6bb419e3b280b3e69c26ce70 -EBUILD timestamp-1.1.ebuild 582 RMD160 9a9af64d252399553bb7972199bc949950a61192 SHA1 920a2778921a1343f330e91adc35431a06b2cdbe SHA256 58beef6539a7296a2983adc903a4b513cfa5ee69831477030d71e4d93a13b684 -MISC ChangeLog 889 RMD160 bf7bce45977be6016a09197456cec6564e706219 SHA1 05eb61656dd683353c06cd1051759a24777761b9 SHA256 ff8799d5dd6b722200aa701b9b895955bc953420f1c3b2d569ab082d2601edab +EBUILD timestamp-1.1.ebuild 587 RMD160 204496a213da2299a2205285b96274d8c1c5f86f SHA1 c6bffccfc7209214c5a905c79229c6217bb94a86 SHA256 a298ec36cdbe26214a75d706be094117d29e9e94f898bcddd50dfb6ef30b290d +MISC ChangeLog 1065 RMD160 d47d4834e8d936d48e5a1dd75bd0fa4ea78630b1 SHA1 258b8a2d2d89b0e4358ffb0fe7eee947ec46d4e0 SHA256 493085a6d51feb50c7ed91c43031f24ca75ed795b1238d38305064e403eb3ae5 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd diff --git a/app-misc/timestamp/timestamp-1.1.ebuild b/app-misc/timestamp/timestamp-1.1.ebuild index 1de9cafd43b1..53e1c472e9f4 100644 --- a/app-misc/timestamp/timestamp-1.1.ebuild +++ b/app-misc/timestamp/timestamp-1.1.ebuild @@ -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 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="" -DEPEND="virtual/libc" +DEPEND="!sys-apps/moreutils" src_install() { make DESTDIR="${D}" install || die "make install failed" |