diff --git a/1 b/1 deleted file mode 100644 index 80c3c4f29..000000000 --- a/1 +++ /dev/null @@ -1,6 +0,0 @@ -To git@git.calculate.ru:/dev/overlay - ! [rejected] master -> master (non-fast-forward) -error: failed to push some refs to 'git@git.calculate.ru:/dev/overlay' -To prevent you from losing history, non-fast-forward updates were rejected -Merge the remote changes (e.g. 'git pull') before pushing again. See the -'Note about fast-forwards' section of 'git push --help' for details. diff --git a/app-misc/cl-tools-meta/ChangeLog b/app-misc/cl-tools-meta/ChangeLog index 581a210d6..bd7b76ade 100644 --- a/app-misc/cl-tools-meta/ChangeLog +++ b/app-misc/cl-tools-meta/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for app-misc/cl-tools-meta -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 Jan 2011; Трацевский Александр + cl-tools-meta-11.0-r3.ebuild: + Added app-misc/screen for CMC + *cl-tools-meta-11.0-r3 (30 Nov 2010) 30 Nov 2010; Alexander Tratsevskiy (L'autre) diff --git a/app-misc/cl-tools-meta/Manifest b/app-misc/cl-tools-meta/Manifest index 1490fcc20..4773956aa 100644 --- a/app-misc/cl-tools-meta/Manifest +++ b/app-misc/cl-tools-meta/Manifest @@ -1,2 +1,2 @@ -EBUILD cl-tools-meta-11.0-r3.ebuild 2784 RMD160 a83ca22e16744a2f3d6bde63d7c448b493bdb0e6 SHA1 5e1d75d3881dc73bca58da37770b17e071dca27c SHA256 7b3cd9401ab5fd74b7e018c09bf884b6e1bef4f68831859e3040179cf3b048b9 -MISC ChangeLog 682 RMD160 56dad0b54f233cb3fd77359fa00ad7dc8232c8b6 SHA1 bebbbd641ae34548ba19137a3198e92e3e206879 SHA256 41568d65acd795d0aed73ea5d187e843a98023ae5dfaf0f62c3a21a0a73d7d80 +EBUILD cl-tools-meta-11.0-r3.ebuild 2833 RMD160 3e0251159c2b5baff6aa9e43f460aae03374b165 SHA1 eee3c220ad095b83ce8d14399cf709006cf90e86 SHA256 a21e3e85e4221ec52e2eafa568caa197c53a5835acddad70951b5012625a8287 +MISC ChangeLog 820 RMD160 17d62e275cc8509d9020d915f15417501b1016a5 SHA1 c5b113dffb8a11c9ede6a2879989ddddd686c43e SHA256 bd6527d3fd3ced764cc9e45f2961d4e6f9c57db3d9c6747c51b94d43f9d1fe88 diff --git a/app-misc/cl-tools-meta/cl-tools-meta-11.0-r3.ebuild b/app-misc/cl-tools-meta/cl-tools-meta-11.0-r3.ebuild index 254def406..548f92579 100644 --- a/app-misc/cl-tools-meta/cl-tools-meta-11.0-r3.ebuild +++ b/app-misc/cl-tools-meta/cl-tools-meta-11.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -11,7 +11,7 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="cdistro_CLS cdistro_desktop cdistro_CLD cdistro_CLDG cdistro_CLDX cdistro_CDS" +IUSE="cdistro_CDS cdistro_desktop cdistro_CLD cdistro_CLDG cdistro_CLDX cdistro_CLS cdistro_CMC" RDEPEND="${RDEPEND} cdistro_desktop? ( @@ -127,6 +127,9 @@ RDEPEND="${RDEPEND} cdistro_CLS? ( virtual/dhcpc ) + cdistro_CMC? ( + app-misc/screen + ) " # Archive