Merge branch 'master' of git.calculate.ru:/dev/overlay

atratsevskiy
Трацевский Александр 13 years ago
commit b08247cee6

@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-install-gui-2.2.8.ebuild, -calculate-install-gui-2.2.9.ebuild,
-calculate-install-gui-2.2.10.ebuild:
Remove old.
*calculate-install-gui-2.2.11 (11 Mar 2011)
11 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,11 +1,5 @@
DIST calculate-install-gui-2.2.10.tar.bz2 154003 RMD160 ff36c2fcbd8e71f7fa843f8e1e61c1668c543d18 SHA1 076da25c4588dad2aafbcb3bbf8ae1fe1f527e92 SHA256 61099505abf58e7f851907a61fad383b0ffce4a750f3e0e967b2314371091e56
DIST calculate-install-gui-2.2.11.tar.bz2 153990 RMD160 53299d552b9e7d4fde73813286abb1491aed019c SHA1 3512afe61e919847b04159c2dd62b0ade40e3b3a SHA256 de12df6fa0a4aabf11a02ab36ce7fe462204f2c71fe1c6ee142b269852c117e0
DIST calculate-install-gui-2.2.8.tar.bz2 154102 RMD160 523dabd36fd5a681fdb38eceb5f69ffacba9801d SHA1 fd13e64ec637bc63e7309e78e25ebe3824bad5b8 SHA256 8fb5e564c0873094619f2b109a4f6c57c57c153b079cea62b3408a9ddbd583e7
DIST calculate-install-gui-2.2.9.tar.bz2 153939 RMD160 88bd2eb276b6117dc1bcab1b728014eff91dbd25 SHA1 2956a99427330c02a9b6253876675eaa3140852c SHA256 08da7d58a22219452c5ffeb8a4be11c07a7cd8d3cbd8227e6a4955412a8f8f44
EBUILD calculate-install-gui-2.2.10.ebuild 721 RMD160 5e32dd5363870c56a10205defc8aa5406a855674 SHA1 2a00c28d2209c33bf4ec5f8cc4425f404ca6e44a SHA256 f347f183700283c61641f4f111846dd7fd604c362d432709b71cb372e5384fe8
EBUILD calculate-install-gui-2.2.11.ebuild 721 RMD160 fee0f00957bf73215fbf9e3c96b1e8708b24fbfd SHA1 e8da3f437030f48465a8479d339f75fbd27c5b9c SHA256 f602dca153e483afa2f19121fc770b0c354b81d3cb5849641300080adf088455
EBUILD calculate-install-gui-2.2.8.ebuild 720 RMD160 cbe38c61ee50670d74541946e071dc3c783aabb1 SHA1 058cb5f87929ac397a7bcb89f1598e655e819a0e SHA256 cf835ee0ed0e0df84203ca60a29839e79bc8bc90a3f97593ddba884f7c39aae3
EBUILD calculate-install-gui-2.2.9.ebuild 720 RMD160 5d1c49c6210981ec755e5ac0cae3a1c82fb2f71c SHA1 637c94525f082dc9ba23c72a4fc4116951150cd4 SHA256 aae0e02d449ad5f96d8537b13137ae46af3c581993901ef63f6930e531d8b00f
EBUILD calculate-install-gui-2.2.9999.ebuild 700 RMD160 523695d636602b4c39ded773b5b28e70d169866b SHA1 31b061fd8d18bd72b0532a0da34ed516360efda5 SHA256 ec0e5c94233f4bc20aa839892d619625d560e51772f89e55a1d4c7d56501aa7a
MISC ChangeLog 12461 RMD160 58ef533927f0930935c2a96d37d9af1a2112ec18 SHA1 1e9f9f73f8f079da957ad605b365bbfc539ec6c5 SHA256 1c812126f1548f48c84be8059fcc3c1a369286d3eb2ae614e0dbf25b03c14e5f
MISC ChangeLog 12652 RMD160 8d36ff65d73b5d513f3264aa52bcad780437c187 SHA1 5bb509b2e70164613d07a96e2c732bc5cc0bb4de SHA256 4957c4afc85ffe3356c9cf12ccf42a3e9c9364241212224a83220c733f455112
MISC metadata.xml 319 RMD160 c12d856d94a4bbba48275f44c4e9a0eae1ac6f21 SHA1 cddfe781ee5b88c7f5c94d7c5f03a07e61ae3336 SHA256 2a18634b4a257808c269e8c986462b316780c4f8b9a19c7c8b733fa3310a4147

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.10
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.8
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.9
x11-libs/qtermwidget
x11-libs/qt-core"
RDEPEND="${DEPEND}"
src_configure() {
CMAKE_PREFIX_PATH=/usr cmake .
}
src_compile() {
emake || die "make failed"
}
src_install() {
emake DESTDIR="${D}" install || die 'make install failed'
dodoc README
}

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*cl-network-meta-11.3-r2 (16 Mar 2011)
16 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
-cl-network-meta-11.3-r1.ebuild, +cl-network-meta-11.3-r2.ebuild:
Add net-analyzer/vnstat for desktops
*cl-network-meta-11.3-r1 (15 Mar 2011)
15 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

@ -1,2 +1,2 @@
EBUILD cl-network-meta-11.3-r1.ebuild 1368 RMD160 2a31897e53c957001ad2da34330a537111267d6e SHA1 bd023be101868d8a968495d7b8b9afbe98df73ce SHA256 8f6fe066055521eaa799f68215ff4121e84ca1b9c94fe21f296714ccdfcd41ff
MISC ChangeLog 2082 RMD160 803980ee7308fa31827e2500daa956e6d34e3c25 SHA1 209e6b5aadfb5301b6e970f84cf169a64215f161 SHA256 a477bf0f727f650a8deb836a5df44a523c7e1b2976788de89420ce8c4e719ab0
EBUILD cl-network-meta-11.3-r2.ebuild 1390 RMD160 28a43a3a64e1b35fea6255c56682fc6c39c62925 SHA1 c9c94e61d3c810ace7592d7f89bd74fd2a6e5f0b SHA256 2827636d51f13dad651cf2b7f0a89303d7e7c9d55138d188c922305776e38861
MISC ChangeLog 2295 RMD160 dc3d70400bec4b9ab41acb4f06ad24e4df8f22d7 SHA1 f550e17863de8eb2fec4b4a9748c57239513f286 SHA256 6150aa4e00ff21f2ed998208b149bb8ad274eb69eae602f99869e93e94fc7257

@ -18,6 +18,7 @@ RDEPEND="
cdistro_desktop? (
app-text/wgetpaste
net-analyzer/nmap
net-analyzer/vnstat
net-im/skype
www-client/chromium
www-plugins/adobe-flash

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*cl-tools-meta-11.3-r2 (18 Mar 2011)
18 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
-cl-tools-meta-11.3-r1.ebuild, +cl-tools-meta-11.3-r2.ebuild:
Add USE calculate_noarch
*cl-tools-meta-11.3-r1 (12 Mar 2011)
12 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

@ -1,2 +1,2 @@
EBUILD cl-tools-meta-11.3-r1.ebuild 2905 RMD160 967aa0a14c73dda32eee608ce386e914480eb7bc SHA1 b892768a7e898a6a9e45130a942aa370ab63ac59 SHA256 4d2d28daadd056dab63ab03d0dcf4816a4a14e6952113b298f74b46d24143b07
MISC ChangeLog 2652 RMD160 cf379606ffcce9ca5feefd638e0d8595939183cc SHA1 5497aa0159377088ed9f18f71dfb05a995af6672 SHA256 da491cf99b8d1fe749fcd51a54985db5dc1d20d291ef558a4d718dc1108440c5
EBUILD cl-tools-meta-11.3-r2.ebuild 2965 RMD160 a9e2132200bad30e53667b877a54e47313730497 SHA1 baf1017cab1f7e2e340ee00cb3fbd35246b6aa84 SHA256 a9f53c175f90800f0f91f18de4b2dff27858d02fa5a07da82ed95f0f475c3921
MISC ChangeLog 2847 RMD160 0bd932afdee7204baeb030d29aaf000ac7f3e0f4 SHA1 9f08ffd76874658519cbf67b41c1b4798d89a1dc SHA256 7aba76cf2c810b4996900b99d02f87ce21126eb1ce509f34f37f75b3f9e30b3f

@ -11,7 +11,16 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="cdistro_CDS cdistro_desktop cdistro_CLD cdistro_CLDG cdistro_CLDX cdistro_CLS cdistro_CMC"
IUSE="
cdistro_CDS
cdistro_desktop
cdistro_CLD
cdistro_CLDG
cdistro_CLDX
cdistro_CLS
cdistro_CMC
calculate_noarch
"
RDEPEND="${RDEPEND}
sys-apps/ethtool
@ -140,14 +149,16 @@ RDEPEND="${RDEPEND}
# Archive
RDEPEND="${RDEPEND}
app-arch/arj
app-arch/dump
app-arch/p7zip
app-arch/rar
app-arch/unace
app-arch/unarj
app-arch/unzip
app-arch/zip
!calculate_noarch? (
app-arch/arj
app-arch/dump
app-arch/p7zip
app-arch/rar
app-arch/unace
app-arch/unarj
app-arch/unzip
app-arch/zip
)
"
# Base

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*cl-wireless-meta-11.3-r1 (16 Mar 2011)
16 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
-cl-wireless-meta-11.3.ebuild, +cl-wireless-meta-11.3-r1.ebuild:
remove bluedevil
*cl-wireless-meta-11.3 (09 Mar 2011)
09 Mar 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

@ -1,2 +1,2 @@
EBUILD cl-wireless-meta-11.3.ebuild 1011 RMD160 23b623f6fcc809d2517973f79b6ed291128e9a0e SHA1 08dcc400cb98888558207a5a4d3f457557862ea5 SHA256 63b21cabb110297102201d958f8a2932376c75580e53bf74724f9a0ad41bcb8f
MISC ChangeLog 2126 RMD160 b57eea7adb06ad5df3efbd919c2ca8bf59f02677 SHA1 2c120f1d09926a9cf218c0e71ba3dc5e8c53eca6 SHA256 c6fec99f0872194957f0ba9f33412701c36d457fbcf3c34b288db9a60528e4ae
EBUILD cl-wireless-meta-11.3-r1.ebuild 924 RMD160 2e85ef1701a0d8940ebd96ce91c7da43ff106c33 SHA1 b8f97814ecdfb5acd7991d78e62a5201d6bdb545 SHA256 1960ddb6a76280cd597a517618786d21120773e7c6639c62bff3b98e2624ff3f
MISC ChangeLog 2319 RMD160 6843ef64da38fe26ec3bd500dd17d460eeb0e45f SHA1 eea1aec226596101c909089282bbc3c65c945151 SHA256 03d58b11dca8d14d3788164442c95ffae53c04c51b1c800ce18b4eb04fcb39b8

@ -11,12 +11,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="cdistro_desktop cdistro_CLD"
#bluetooth
RDEPEND="${RDEPEND}
cdistro_CLD? ( net-wireless/bluedevil )
"
IUSE="cdistro_desktop"
# wi-fi
RDEPEND="${RDEPEND}

@ -60,6 +60,7 @@ vmlinuz_src_compile() {
cd ${S}
DEFAULT_KERNEL_SOURCE="${S}" CMD_KERNEL_DIR="${S}" cl-kernel \
--ebuild \
${CL_KERNEL_OPTS} \
--kerneldir=${S} \
--set cl_kernel_cache_path=${WORKDIR}/cache \
--set cl_kernel_temp_path=${S}/temp \

@ -601,6 +601,7 @@ media-video/transcode
media-video/vcdimager
media-video/xanim
net-analyzer/nmap
net-analyzer/vnstat
net-dialup/ppp
net-dialup/pptpclient
net-dialup/rp-pppoe

@ -96,11 +96,11 @@
=app-misc/cl-kde-meta-4.6.0-r1
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cld-meta-11.3
=app-misc/lirc-0.8.7
@ -601,6 +601,7 @@
=media-video/vcdimager-0.7.23
=media-video/xanim-2.80.1-r4
=net-analyzer/nmap-5.21-r1
=net-analyzer/vnstat-1.10
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
=net-dialup/rp-pppoe-3.8-r2
@ -677,7 +678,7 @@
=net-wireless/rtl8192se-2.6.0019.1207.2010
=net-wireless/rtl8192se-firmware-2.6.0019.1207.2010
=net-wireless/wireless-tools-29
=net-wireless/wpa_supplicant-0.7.2-r3
=net-wireless/wpa_supplicant-0.7.3-r2
=net-zope/zope-interface-3.5.3
=perl-core/ExtUtils-CBuilder-0.27.03
=perl-core/ExtUtils-ParseXS-2.22.05
@ -691,13 +692,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -874,7 +875,7 @@
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-misc/htdig-3.2.0_beta6-r3
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=www-plugins/nspluginwrapper-1.3.0
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
@ -924,7 +925,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -984,7 +987,7 @@
=x11-libs/libXxf86vm-1.1.1
=x11-libs/libdrm-2.4.23
=x11-libs/libfontenc-1.1.0
=x11-libs/libnotify-0.4.5
=x11-libs/libnotify-0.5.2
=x11-libs/libpciaccess-0.12.1
=x11-libs/libvdpau-0.4.1
=x11-libs/libxcb-1.7
@ -1016,7 +1019,7 @@
=x11-misc/makedepend-1.0.3
=x11-misc/mkxf86config-0.9.10
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-utils-1.0.2_p20100618

@ -593,6 +593,7 @@ media-video/transcode
media-video/vcdimager
media-video/xanim
net-analyzer/nmap
net-analyzer/vnstat
net-dialup/ppp
net-dialup/pptpclient
net-dialup/rp-pppoe

@ -87,11 +87,11 @@
=app-misc/cl-kde-meta-4.6.0-r1
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cld-meta-11.3
=app-misc/lirc-0.8.7
@ -587,12 +587,13 @@
=media-video/kffmpegthumbnailer-1.1.0
=media-video/mjpegtools-1.9.0-r1
=media-video/mplayer-1.0_rc4_p20101219
=media-video/recordmydesktop-0.3.8.1-r3
=media-video/recordmydesktop-0.3.8.1-r4
=media-video/smplayer-0.6.9
=media-video/transcode-1.1.5-r2
=media-video/vcdimager-0.7.23
=media-video/xanim-2.80.1-r4
=net-analyzer/nmap-5.21-r1
=net-analyzer/vnstat-1.10
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
=net-dialup/rp-pppoe-3.8-r2
@ -682,13 +683,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -865,7 +866,7 @@
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-misc/htdig-3.2.0_beta6-r3
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
=x11-apps/bitmap-1.0.5
@ -914,7 +915,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -1006,7 +1009,7 @@
=x11-misc/makedepend-1.0.3
=x11-misc/mkxf86config-0.9.10
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-utils-1.0.2_p20100618

@ -527,6 +527,7 @@ net-analyzer/gnome-netstatus
net-analyzer/gnome-nettool
net-analyzer/nmap
net-analyzer/traceroute
net-analyzer/vnstat
net-dialup/ppp
net-dialup/pptpclient
net-dialup/rp-pppoe

@ -97,11 +97,11 @@
=app-misc/cl-graphics-meta-11.3
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cldg-meta-11.3
=app-misc/livecd-tools-1.0.42
@ -527,6 +527,7 @@
=net-analyzer/gnome-nettool-2.32.0
=net-analyzer/nmap-5.21-r1
=net-analyzer/traceroute-2.0.15
=net-analyzer/vnstat-1.10
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
=net-dialup/rp-pppoe-3.8-r2
@ -616,7 +617,7 @@
=net-wireless/rtl8192se-2.6.0019.1207.2010
=net-wireless/rtl8192se-firmware-2.6.0019.1207.2010
=net-wireless/wireless-tools-29
=net-wireless/wpa_supplicant-0.7.2-r3
=net-wireless/wpa_supplicant-0.7.3-r2
=net-zope/zope-interface-3.5.3
=perl-core/ExtUtils-CBuilder-0.27.03
=perl-core/ExtUtils-ParseXS-2.22.05
@ -628,13 +629,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -808,7 +809,7 @@
=virtual/perl-libnet-1.22
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=www-plugins/nspluginwrapper-1.3.0
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
@ -859,7 +860,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -925,7 +928,7 @@
=x11-libs/libdrm-2.4.23
=x11-libs/libfontenc-1.1.0
=x11-libs/libgksu-2.0.12-r1
=x11-libs/libnotify-0.4.5
=x11-libs/libnotify-0.5.2
=x11-libs/libpciaccess-0.12.1
=x11-libs/libsexy-0.1.11-r1
=x11-libs/libvdpau-0.4.1
@ -955,9 +958,9 @@
=x11-misc/imake-1.0.4
=x11-misc/makedepend-1.0.3
=x11-misc/mkxf86config-0.9.10
=x11-misc/notification-daemon-0.4.0-r1
=x11-misc/notification-daemon-0.5.0
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-utils-1.0.2_p20100618

@ -519,6 +519,7 @@ net-analyzer/gnome-netstatus
net-analyzer/gnome-nettool
net-analyzer/nmap
net-analyzer/traceroute
net-analyzer/vnstat
net-dialup/ppp
net-dialup/pptpclient
net-dialup/rp-pppoe

@ -88,11 +88,11 @@
=app-misc/cl-graphics-meta-11.3
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cldg-meta-11.3
=app-misc/livecd-tools-1.0.42
@ -519,6 +519,7 @@
=net-analyzer/gnome-nettool-2.32.0
=net-analyzer/nmap-5.21-r1
=net-analyzer/traceroute-2.0.15
=net-analyzer/vnstat-1.10
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
=net-dialup/rp-pppoe-3.8-r2
@ -619,13 +620,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -799,7 +800,7 @@
=virtual/perl-libnet-1.22
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
=x11-apps/bitmap-1.0.5
@ -849,7 +850,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -947,7 +950,7 @@
=x11-misc/mkxf86config-0.9.10
=x11-misc/notification-daemon-0.4.0-r1
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-utils-1.0.2_p20100618

@ -127,7 +127,6 @@ app-text/djvu
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
app-text/enchant
app-text/evince
@ -356,7 +355,6 @@ media-libs/imlib2
media-libs/jasper
media-libs/jpeg
media-libs/lcms
media-libs/lcms
media-libs/libart_lgpl
media-libs/libass
media-libs/libcaca
@ -444,6 +442,7 @@ media-video/gnome-mplayer
media-video/mplayer
media-video/xanim
net-analyzer/nmap
net-analyzer/vnstat
net-dialup/gnome-ppp
net-dialup/ppp
net-dialup/pptpclient

@ -92,11 +92,11 @@
=app-misc/cl-graphics-meta-11.3
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xfce-meta-4.8
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cldx-meta-11.3
@ -127,7 +127,6 @@
=app-text/docbook-xml-dtd-4.1.2-r6
=app-text/docbook-xml-dtd-4.3-r1
=app-text/docbook-xml-dtd-4.4-r2
=app-text/docbook-xml-dtd-4.5-r1
=app-text/docbook-xsl-stylesheets-1.75.2
=app-text/enchant-1.6.0
=app-text/evince-2.32.0-r1
@ -356,7 +355,6 @@
=media-libs/jasper-1.900.1-r3
=media-libs/jpeg-8b
=media-libs/lcms-1.19
=media-libs/lcms-2.0a
=media-libs/libart_lgpl-2.3.21-r1
=media-libs/libass-0.9.11
=media-libs/libcaca-0.99_beta17
@ -444,6 +442,7 @@
=media-video/mplayer-1.0_rc4_p20101219
=media-video/xanim-2.80.1-r4
=net-analyzer/nmap-5.21-r1
=net-analyzer/vnstat-1.10
=net-dialup/gnome-ppp-0.3.23-r1
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
@ -528,7 +527,7 @@
=net-wireless/rtl8192se-2.6.0019.1207.2010
=net-wireless/rtl8192se-firmware-2.6.0019.1207.2010
=net-wireless/wireless-tools-29
=net-wireless/wpa_supplicant-0.7.2-r3
=net-wireless/wpa_supplicant-0.7.3-r2
=net-zope/zope-interface-3.5.3
=perl-core/ExtUtils-CBuilder-0.27.03
=perl-core/ExtUtils-ParseXS-2.22.05
@ -541,13 +540,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -722,7 +721,7 @@
=virtual/perl-libnet-1.22
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=www-plugins/nspluginwrapper-1.3.0
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
@ -771,7 +770,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -833,7 +834,7 @@
=x11-libs/libdrm-2.4.23
=x11-libs/libfontenc-1.1.0
=x11-libs/libgksu-2.0.12-r1
=x11-libs/libnotify-0.4.5
=x11-libs/libnotify-0.5.2
=x11-libs/libpciaccess-0.12.1
=x11-libs/libvdpau-0.4.1
=x11-libs/libwnck-2.30.6
@ -862,7 +863,7 @@
=x11-misc/makedepend-1.0.3
=x11-misc/mkxf86config-0.9.10
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-user-dirs-0.13

@ -118,7 +118,6 @@ app-text/djvu
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
app-text/enchant
app-text/evince
@ -347,7 +346,6 @@ media-libs/imlib2
media-libs/jasper
media-libs/jpeg
media-libs/lcms
media-libs/lcms
media-libs/libart_lgpl
media-libs/libass
media-libs/libcaca
@ -436,6 +434,7 @@ media-video/gnome-mplayer
media-video/mplayer
media-video/xanim
net-analyzer/nmap
net-analyzer/vnstat
net-dialup/gnome-ppp
net-dialup/ppp
net-dialup/pptpclient

@ -83,11 +83,11 @@
=app-misc/cl-graphics-meta-11.3
=app-misc/cl-multimedia-meta-11.3
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-office-meta-11.3
=app-misc/cl-printer-meta-11.3
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/cl-xfce-meta-4.8
=app-misc/cl-xorg-meta-7.4-r1
=app-misc/cldx-meta-11.3
@ -118,7 +118,6 @@
=app-text/docbook-xml-dtd-4.1.2-r6
=app-text/docbook-xml-dtd-4.3-r1
=app-text/docbook-xml-dtd-4.4-r2
=app-text/docbook-xml-dtd-4.5-r1
=app-text/docbook-xsl-stylesheets-1.75.2
=app-text/enchant-1.6.0
=app-text/evince-2.32.0-r1
@ -347,7 +346,6 @@
=media-libs/jasper-1.900.1-r3
=media-libs/jpeg-8b
=media-libs/lcms-1.19
=media-libs/lcms-2.0a
=media-libs/libart_lgpl-2.3.21-r1
=media-libs/libass-0.9.11
=media-libs/libcaca-0.99_beta17
@ -436,6 +434,7 @@
=media-video/mplayer-1.0_rc4_p20101219
=media-video/xanim-2.80.1-r4
=net-analyzer/nmap-5.21-r1
=net-analyzer/vnstat-1.10
=net-dialup/gnome-ppp-0.3.23-r1
=net-dialup/ppp-2.4.5-r1
=net-dialup/pptpclient-1.7.2-r2
@ -532,13 +531,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-client-2.2.11
=sys-apps/calculate-desktop-2.2.11
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/dbus-1.4.1
=sys-apps/debianutils-3.2.3
@ -713,7 +712,7 @@
=virtual/perl-libnet-1.22
=virtual/ttf-fonts-1
=www-client/chromium-10.0.648.133
=www-plugins/adobe-flash-10.2.152.27
=www-plugins/adobe-flash-10.2.152.27_p201011173-r2
=x11-apps/appres-1.0.3
=x11-apps/bdftopcf-1.0.3
=x11-apps/bitmap-1.0.5
@ -761,7 +760,9 @@
=x11-apps/xwud-1.0.3
=x11-base/xorg-drivers-1.9
=x11-base/xorg-server-1.9.4
=x11-drivers/nvidia-drivers-173.14.28
=x11-drivers/nvidia-drivers-260.19.36
=x11-drivers/nvidia-drivers-96.43.19
=x11-drivers/xf86-input-evdev-2.6.0
=x11-drivers/xf86-input-keyboard-1.5.0
=x11-drivers/xf86-input-mouse-1.6.0
@ -852,7 +853,7 @@
=x11-misc/makedepend-1.0.3
=x11-misc/mkxf86config-0.9.10
=x11-misc/shared-mime-info-0.80
=x11-misc/util-macros-1.11.0
=x11-misc/util-macros-1.12.0
=x11-misc/xbindkeys-1.8.4
=x11-misc/xbitmaps-1.1.1
=x11-misc/xdg-user-dirs-0.13

@ -50,7 +50,7 @@ USE="${USE} a52 aac aalib avi cddb dv encode fbcon ffmpeg flash ggi libcaca lzo
USE="${USE} libwww vhosts"
# Wireless
USE="${USE} bluetooth"
USE="${USE} bluetooth wimax"
# Window manager and speciality
USE="${USE} gtk libnotify qt3support"

@ -74,10 +74,8 @@ media-video/nvidia-settings amd64 x86
~x11-misc/xscreensaver-5.12 amd64 x86
~app-office/libreoffice-3.3.1 amd64 x86
~app-office/libreoffice-3.3.0 amd64 x86
~www-client/chromium-10.0.648.127 amd64 x86
~dev-lang/v8-3.0.12.30 amd64 x86
~dev-libs/liblinebreak-2.0 amd64 x86
~www-plugins/adobe-flash-10.2.152.27_p201011173 amd64 x86

@ -81,7 +81,6 @@ app-shells/gentoo-bashcomp
app-text/aspell
app-text/build-docbook-catalog
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
app-text/ghostscript-gpl
app-text/libpaper
@ -125,7 +124,6 @@ dev-libs/libnl
dev-libs/libpcre
dev-libs/libtasn1
dev-libs/libusb
dev-libs/libusb
dev-libs/libxml2
dev-libs/libxslt
dev-libs/mpfr
@ -218,7 +216,6 @@ media-libs/gd
media-libs/jasper
media-libs/jpeg
media-libs/lcms
media-libs/lcms
media-libs/libmng
media-libs/libpng
media-libs/openjpeg
@ -439,7 +436,6 @@ virtual/libffi
virtual/libiconv
virtual/libintl
virtual/libusb
virtual/libusb
virtual/mysql
virtual/pager
virtual/perl-Archive-Tar

@ -59,9 +59,9 @@
=app-misc/cl-base-meta-11.3
=app-misc/cl-decoration-meta-11.3-r1
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-tools-meta-11.3-r2
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/livecd-tools-1.0.42
=app-misc/mc-4.7.0.3
=app-misc/mime-types-8
@ -81,7 +81,6 @@
=app-text/aspell-0.60.6-r2
=app-text/build-docbook-catalog-1.4
=app-text/docbook-xml-dtd-4.3-r1
=app-text/docbook-xml-dtd-4.5-r1
=app-text/docbook-xsl-stylesheets-1.75.2
=app-text/ghostscript-gpl-8.71-r6
=app-text/libpaper-1.1.23
@ -125,7 +124,6 @@
=dev-libs/libpcre-8.02
=dev-libs/libtasn1-2.9-r1
=dev-libs/libusb-0.1.12-r5
=dev-libs/libusb-1.0.8
=dev-libs/libxml2-2.7.8
=dev-libs/libxslt-1.1.26-r1
=dev-libs/mpfr-2.4.2_p3
@ -218,7 +216,6 @@
=media-libs/jasper-1.900.1-r3
=media-libs/jpeg-8b
=media-libs/lcms-1.19
=media-libs/lcms-2.0a
=media-libs/libmng-1.0.10
=media-libs/libpng-1.4.5
=media-libs/openjpeg-1.3-r3
@ -296,7 +293,7 @@
=net-wireless/rtl8192se-2.6.0019.1207.2010
=net-wireless/rtl8192se-firmware-2.6.0019.1207.2010
=net-wireless/wireless-tools-29
=net-wireless/wpa_supplicant-0.7.2-r3
=net-wireless/wpa_supplicant-0.7.3-r2
=net-zope/zope-interface-3.5.3
=perl-core/CGI-3.510
=perl-core/ExtUtils-CBuilder-0.27.03
@ -313,13 +310,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.1.8-r1
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-server-2.1.13
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/debianutils-3.2.3
=sys-apps/diffutils-2.8.7-r2
@ -439,7 +436,6 @@
=virtual/libiconv-0
=virtual/libintl-0
=virtual/libusb-0
=virtual/libusb-1
=virtual/mysql-5.1
=virtual/pager-0
=virtual/perl-Archive-Tar-1.54

@ -79,7 +79,6 @@ app-shells/gentoo-bashcomp
app-text/aspell
app-text/build-docbook-catalog
app-text/docbook-xml-dtd
app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
app-text/ghostscript-gpl
app-text/libpaper
@ -123,7 +122,6 @@ dev-libs/libnl
dev-libs/libpcre
dev-libs/libtasn1
dev-libs/libusb
dev-libs/libusb
dev-libs/libxml2
dev-libs/libxslt
dev-libs/mpfr
@ -216,7 +214,6 @@ media-libs/gd
media-libs/jasper
media-libs/jpeg
media-libs/lcms
media-libs/lcms
media-libs/libmng
media-libs/libpng
media-libs/openjpeg
@ -436,7 +433,6 @@ virtual/libffi
virtual/libiconv
virtual/libintl
virtual/libusb
virtual/libusb
virtual/mysql
virtual/pager
virtual/perl-Archive-Tar

@ -57,9 +57,9 @@
=app-misc/cl-base-meta-11.3
=app-misc/cl-decoration-meta-11.3-r1
=app-misc/cl-nettools-meta-11.3
=app-misc/cl-network-meta-11.3-r1
=app-misc/cl-tools-meta-11.3-r1
=app-misc/cl-wireless-meta-11.3
=app-misc/cl-network-meta-11.3-r2
=app-misc/cl-tools-meta-11.3-r2
=app-misc/cl-wireless-meta-11.3-r1
=app-misc/livecd-tools-1.0.42
=app-misc/mc-4.7.0.3
=app-misc/mime-types-8
@ -79,7 +79,6 @@
=app-text/aspell-0.60.6-r2
=app-text/build-docbook-catalog-1.4
=app-text/docbook-xml-dtd-4.3-r1
=app-text/docbook-xml-dtd-4.5-r1
=app-text/docbook-xsl-stylesheets-1.75.2
=app-text/ghostscript-gpl-8.71-r6
=app-text/libpaper-1.1.23
@ -123,7 +122,6 @@
=dev-libs/libpcre-8.02
=dev-libs/libtasn1-2.9-r1
=dev-libs/libusb-0.1.12-r5
=dev-libs/libusb-1.0.8
=dev-libs/libxml2-2.7.8
=dev-libs/libxslt-1.1.26-r1
=dev-libs/mpfr-2.4.2_p3
@ -216,7 +214,6 @@
=media-libs/jasper-1.900.1-r3
=media-libs/jpeg-8b
=media-libs/lcms-1.19
=media-libs/lcms-2.0a
=media-libs/libmng-1.0.10
=media-libs/libpng-1.4.5
=media-libs/openjpeg-1.3-r2
@ -310,13 +307,13 @@
=sys-apps/attr-2.4.44
=sys-apps/baselayout-2.0.1-r1
=sys-apps/busybox-1.17.4
=sys-apps/calculate-builder-2.2.11
=sys-apps/calculate-builder-2.2.11-r1
=sys-apps/calculate-install-2.2.11
=sys-apps/calculate-lib-2.1.8-r1
=sys-apps/calculate-lib-2.2.11
=sys-apps/calculate-lib-2.2.11-r2
=sys-apps/calculate-server-2.1.13
=sys-apps/calculate-templates-2.2.11-r1
=sys-apps/calculate-utilities-2.2.11-r1
=sys-apps/calculate-templates-2.2.11-r5
=sys-apps/calculate-utilities-2.2.11-r8
=sys-apps/coreutils-8.7
=sys-apps/debianutils-3.2.3
=sys-apps/diffutils-2.8.7-r2
@ -436,7 +433,6 @@
=virtual/libiconv-0
=virtual/libintl-0
=virtual/libusb-0
=virtual/libusb-1
=virtual/mysql-5.1
=virtual/pager-0
=virtual/perl-Archive-Tar-1.54

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -13,6 +13,10 @@
=sys-apps/calculate-server-9999
# Under construction
=sys-kernel/calculate-sources-2.6.37.4
=sys-kernel/calculate-sources-2.6.36.4
=sys-kernel/calculate-sources-2.6.32.33
=sys-kernel/calckernel-3.4.14
#>=app-misc/cld-meta-10.9.1
#>=app-misc/cldg-meta-10.9.1
#>=app-misc/cldx-meta-10.9.1
@ -22,4 +26,3 @@
# Mask calculate-sources-2.6.32.25 for CDS
#=sys-kernel/calculate-sources-2.6.32.25

@ -0,0 +1,13 @@
diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp
index bf1d3ec..dc95afa 100644
--- a/kopete/plugins/history/historylogger.cpp
+++ b/kopete/plugins/history/historylogger.cpp
@@ -298,7 +298,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co
if ( msg.format() != Qt::PlainText )
msgNode = doc.createTextNode( msg.escapedBody() );
else
- msgNode = doc.createTextNode( Qt::escape(msg.plainBody()) );
+ msgNode = doc.createTextNode( msg.plainBody() );
docElem.appendChild( msgElem );
msgElem.appendChild( msgNode );

@ -2,6 +2,22 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-assemble-2.2.8.ebuild, -calculate-assemble-2.2.8-r1.ebuild,
-files/calculate-assemble-2.2.8-fix_assemble_from_i686.patch,
-calculate-assemble-2.2.9.ebuild, -calculate-assemble-2.2.9-r1.ebuild,
-files/calculate-assemble-2.2.9-fix_nvidia_binary.patch,
-calculate-assemble-2.2.10.ebuild, -calculate-assemble-2.2.11.ebuild,
-calculate-assemble-2.2.11-r1.ebuild:
Remove old.
*calculate-assemble-2.2.11-r2 (18 Mar 2011)
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-assemble-2.2.11-r2.ebuild,
+files/calculate-assemble-2.2.11-fix_nvidia_assembling.patch:
Update for fix nvidia-drivers assembling.
*calculate-assemble-2.2.11-r1 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,17 +1,7 @@
AUX calculate-assemble-2.2.11-fix_listdir.patch 1117 RMD160 2be19ad672eba81510b12e890c8bb73e6d0b178e SHA1 de443b4d122e9db0884682f941ff6357e4046e26 SHA256 6b72819a5e28968a899d71c22eb31ac1f1aecc14dfc33a554726707545cebcc8
AUX calculate-assemble-2.2.8-fix_assemble_from_i686.patch 564 RMD160 9579029c8828efa804b253c867c387bc5f3cc123 SHA1 1f7b8cb94b3f5050a02fca0dec6a57f83952d1a2 SHA256 16563bb2230ed29d5e22d387a0aa6bc9aba76345589eb964ace21744f759f158
AUX calculate-assemble-2.2.9-fix_nvidia_binary.patch 2223 RMD160 57de4db216c0f1b729af029f433c0d6b86e57d77 SHA1 3eea34784f576a80f7ed43d01a9d004955e3e829 SHA256 21913c5e83c162a16c9b968af549984b655cef8b260553186eda1a47e581daeb
DIST calculate-assemble-2.2.10.tar.bz2 28916 RMD160 83dee4f686e157903950e6ea05a600764bea6dab SHA1 9ddc2671e9013ba1a05869c2a017fb0c7af18e1d SHA256 5f8402183fb242c00f1ef5e9f816c73b9fb5c63757b9f25bf0f0e07e7940538b
AUX calculate-assemble-2.2.11-fix_nvidia_assembling.patch 2652 RMD160 d76c71382b024416f0ac0433144f9b5766afd20c SHA1 b3100af6f975744ec4937867e927189d71d8d473 SHA256 f7653bf48f491f80ad10d80918f9699d3b220557236c8f350683725d2bca33bb
DIST calculate-assemble-2.2.11.tar.bz2 28918 RMD160 aa2b567ff1d86159ae95857f65a3d94786f78007 SHA1 7099a6e8f4c689c341d0567091c56a7037ec58bf SHA256 7047d1a4dad511bedbccf3960f1be6f1f38cdba446bd3ade148c35af0902d27c
DIST calculate-assemble-2.2.8.tar.bz2 28792 RMD160 c3c9fb2b008d44d2105120e6ab774a4aa92312b2 SHA1 8b3aa450167e54caa4038428a5f4600f366223a0 SHA256 e0914d1f9c071f76a0b6af5fced112692d54efd70a17130516fbba9697175fcd
DIST calculate-assemble-2.2.9.tar.bz2 28937 RMD160 4ce4ef0b414f6ea0b66778083bdb440ec6c8833c SHA1 fd7383cbd7919706f7aa6b55c74e259be555d5e6 SHA256 d8feca00992c494160112c4d2fa7f8876dc90cf2525ea564eea52a4038deda0a
EBUILD calculate-assemble-2.2.10.ebuild 519 RMD160 022cc7a73b9b6bc0d9fd3245e2fbafdb51491f17 SHA1 c7eaf0525440a5b5ce2671d052a5f7906f9f61af SHA256 d2e54378deb5f423e3e75b489dd2f18286c99ab63df03081f9518d77978dfa33
EBUILD calculate-assemble-2.2.11-r1.ebuild 657 RMD160 e2057103f79d99f42bf44522b189bf69169fff67 SHA1 c67d80004e43a4803f3d5f69c4fee46587a75303 SHA256 f1f4a28c76371062367fe63cfafa3b38165b63b9b9aba98131dc7b4d463239ce
EBUILD calculate-assemble-2.2.11.ebuild 519 RMD160 ba022073998ce9704396359aaa9c2e5db19d09ff SHA1 b1ba8d9fc2fbe3b8e15fbf5a29b09a80b0d0d1d2 SHA256 05f86cc632e2e25380177540ea4f49d42a0ddbdbf9237ecf348ace29a45685d6
EBUILD calculate-assemble-2.2.8-r1.ebuild 671 RMD160 013ca72ae40f6f76dca673b3ae276341e0d2b0fe SHA1 ff17d1554cb5bf74f72b9b4b03ef154f7fb602a5 SHA256 5bd423a491e3e09e7e6883b54fda0d09a9856101c254b8d4a62761b50f086268
EBUILD calculate-assemble-2.2.8.ebuild 517 RMD160 203e424ae677c7cfea983347afb7bd1037afa9e4 SHA1 bd0f956f4efaec39010d5501e68c981d2eb2ab9f SHA256 c16f25c038039ae7d6eadd336c005f5c6893548d8f1d388e7a3365ef1a3e9c3c
EBUILD calculate-assemble-2.2.9-r1.ebuild 517 RMD160 150d0f1d68dc8f0cba54111d35d0dcf68b899b49 SHA1 caea12817a4e8a8293a9a46f933b9bf9fbbba534 SHA256 38889a77c37bd5492c35775f85fde5a0a0e00b8a458a29788b82edbd8f3e5e4d
EBUILD calculate-assemble-2.2.9.ebuild 517 RMD160 150d0f1d68dc8f0cba54111d35d0dcf68b899b49 SHA1 caea12817a4e8a8293a9a46f933b9bf9fbbba534 SHA256 38889a77c37bd5492c35775f85fde5a0a0e00b8a458a29788b82edbd8f3e5e4d
EBUILD calculate-assemble-2.2.11-r2.ebuild 763 RMD160 527e3f9456d3646b349255b381b47f56f291b425 SHA1 4df33f2bf2ba18ad3959d096968f90b34522268d SHA256 c799d24450d920970b51aee1fbb0bf9f9b989e3da119d4fe269d4e9c1c7d4113
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 e9830fc17fec7062761321a7c79d5c9f1a7dd147 SHA1 8b8ace9d0c6c34bd9fe12cd9e507ba7cc32ee9af SHA256 467968b55696273c3576f10f9845a100fd4aba2c90eaaefb9ae97d478e04e11a
MISC ChangeLog 6913 RMD160 14d6a906fbb966c76e698b07bdf9c38dcffe7505 SHA1 f0f2ad602efdb2f64017c1c451c88e170d05ed9e SHA256 3927dcfa1414bfa8c244efca078d61fdd91a6f38a3e40f85121caee5fa13576f
MISC ChangeLog 7623 RMD160 3eb90437c959aae5c00fe8ec327e343f06d1ff66 SHA1 f63d8789ca4792142b789283322bab59495562f4 SHA256 cafd651922636c8c0786be3f512c7db56b13bf68ba09c6835d2220fbd5a89d39
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943

@ -1,20 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.10
~sys-apps/calculate-templates-2.2.10"
RDEPEND="${DEPEND}"

@ -25,4 +25,7 @@ src_unpack() {
# fix bug in call listdir
epatch "${FILESDIR}/calculate-assemble-2.2.11-fix_listdir.patch"
# fix bug nvidia assembling
epatch "${FILESDIR}/calculate-assemble-2.2.11-fix_nvidia_assembling.patch"
}

@ -1,20 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.11
~sys-apps/calculate-templates-2.2.11"
RDEPEND="${DEPEND}"

@ -1,28 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.8
~sys-apps/calculate-templates-2.2.8"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix assemble from i686 system
epatch "${FILESDIR}/calculate-assemble-2.2.8-fix_assemble_from_i686.patch"
}

@ -1,20 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.8
~sys-apps/calculate-templates-2.2.8"
RDEPEND="${DEPEND}"

@ -1,20 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.9
~sys-apps/calculate-templates-2.2.9"
RDEPEND="${DEPEND}"

@ -1,20 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-builder-2.2.9
~sys-apps/calculate-templates-2.2.9"
RDEPEND="${DEPEND}"

@ -0,0 +1,64 @@
commit 379e4d501b726d4e684215986fe10a35cae3eec7
Author: Mike Hiretsky <mh@calculate.ru>
Date: Fri Mar 18 09:18:19 2011 +0300
Add all nvidia to binary and unmask list.
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index b663655..25a68fb 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -24,7 +24,8 @@ import traceback
from os import path
from cl_template import template,iniParser
from cl_utils import process,pathJoin,getRunCommands,getTupleVersion,isMount,\
- isFstabMount,childMounts,_toUNICODE,cmpVersion
+ isFstabMount,childMounts,_toUNICODE,cmpVersion, \
+ listDirectory
from subprocess import STDOUT,PIPE
from cl_print import color_print
from cl_datavars import DataVars
@@ -39,6 +40,7 @@ from server.utils import dialogYesNo
import cl_install
import cl_overriding
import random
+from shutil import copyfile
def DEBUG(msg):
if "DEBUG" in os.environ:
@@ -1520,6 +1522,17 @@ class cl_assemble(color_print):
map(lambda x:path.join(pkgDir,x),
os.listdir(pkgDir))))
+ packagesDir = 'usr/portage/packages'
+ x11_drivers = 'x11-drivers'
+ nvidiaDir = pathJoin(chrootPath, packagesDir,x11_drivers)
+
+ pkgDirX11Drivers = pathJoin(pkgDir,'x11-drivers')
+ if not path.exists(pkgDirX11Drivers):
+ os.makedirs(pkgDirX11Drivers,mode=0755)
+ map(lambda x:copyfile(pathJoin(nvidiaDir,x),
+ pathJoin(pkgDirX11Drivers,x)),
+ listDirectory(nvidiaDir))
+
self.regenPackages(chrootPath,pkgDir[len(chrootPath):])
else:
self.printByResult(skip=True)
@@ -1547,11 +1560,17 @@ class cl_assemble(color_print):
def createUnmaskList(self,chrootdir,filename):
"""Create package unmask list by chrootdir"""
pkgdir = path.join(chrootdir,'var/db/pkg')
+ x11_bindir = path.join(chrootdir,'usr/portage/packages/x11-drivers')
if not path.exists(chrootdir):
return False
try:
packageList = sorted(reduce(lambda x,y:x+map(lambda x:path.join(y,x),
os.listdir(path.join(pkgdir,y))), os.listdir(pkgdir),[]))
+ packageList = \
+ sorted(packageList+
+ map(lambda x:path.join('x11-drivers',x[:-5]),
+ filter(lambda x:x.endswith('.tbz2'),
+ listDirectory(x11_bindir))))
open(filename,'w').writelines(map(lambda x:"=%s\n"%x,packageList))
except (IOError,OSError),e:
return False

@ -1,13 +0,0 @@
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 6ca1546..2bb30c6 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -367,7 +367,7 @@ class cl_assemble(color_print):
_("Impossible to assemble %(what)s system from %(from)s")%
{'what':self.clVars.Get('os_assemble_arch_machine'),
'from':self.clVars.Get('os_arch_machine')})
- return False
+ return False
dev = self.clVars.Get('os_assemble_root_dev')
mp = isFstabMount(dev)
if mp:

@ -1,51 +0,0 @@
commit 453dcdda121338255a73f822ede9668864fb7aa6
Author: Mike Hiretsky <mh@calculate.ru>
Date: Mon Feb 14 09:49:06 2011 +0300
Fix nvidia driver prepend chech.
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
index 2e5372c..3db0695 100644
--- a/pym/cl_assemble.py
+++ b/pym/cl_assemble.py
@@ -721,13 +721,17 @@ class cl_assemble(color_print):
else:
return False
- def runChroot(self,command,raiseError=True,showProcess=False):
+ def runChroot(self,command,raiseError=True,showProcess=False,joinErr=False):
"""Run command in chroot specified by cl_assemble_path"""
try:
if showProcess:
IOval = None
else:
IOval = PIPE
+ if joinErr:
+ ERRval = STDOUT
+ else:
+ ERRval = IOval
envdict = {'CHROOT':"on"}
envdict.update(os.environ)
needAsk = self.clVars.Get('cl_assemble_ask_set') == "on"
@@ -744,10 +748,10 @@ class cl_assemble(color_print):
if buildarch == "i686":
commandLine = ["linux32"] + commandLine
if showProcess and needAsk:
- chrootCommand = process(*commandLine,stderr=IOval,
+ chrootCommand = process(*commandLine,stderr=ERRval,
stdin=None,stdout=IOval,envdict=envdict)
else:
- chrootCommand = process(*commandLine,stderr=IOval,
+ chrootCommand = process(*commandLine,stderr=ERRval,
stdout=IOval,envdict=envdict)
DEBUG(self._getCommand(chrootCommand.command))
if raiseError and chrootCommand.failed():
@@ -1420,7 +1424,7 @@ class cl_assemble(color_print):
# run verbose package emergin for get version
checkprocess = self.runChroot(
"emerge -vp \<%s-%s"%
- (pkgName,drvVer),raiseError=False)
+ (pkgName,drvVer),raiseError=False,joinErr=True)
rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
# get version from emerging nvidia-driver
nvidiaVersions = \

@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-builder-2.2.8.ebuild, -calculate-builder-2.2.9.ebuild,
-calculate-builder-2.2.10.ebuild, -calculate-builder-2.2.11.ebuild:
Remove old.
*calculate-builder-2.2.11-r1 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,13 +1,6 @@
AUX calculate-builder-2.2.11-isohybrid.patch 2456 RMD160 21d6339685dbde9027b22212563a4f7510dc6e28 SHA1 fc1bcd8f349bbc34a724d09e22d5601d0726d0be SHA256 347a74447735b2345e09b8d799fbfe54f13b846098744415bed78ac03a0dc8a2
DIST calculate-builder-2.2.10.tar.bz2 28858 RMD160 cc6a328b395bc3d693d53941259b8c42e5c1d97c SHA1 4dedaa066311600234be04dfb7ff55b3d9971f52 SHA256 621694548f4f0fd9613c1f53d7f77ffcc4bb8e884357644ed6729a8124924011
DIST calculate-builder-2.2.11.tar.bz2 28862 RMD160 50a41912e2d90e7b06e3404ee7b2a89772b90088 SHA1 484ec81ea1b5071dde1184bed3e2a4c829ef0489 SHA256 913602df30e9ab411409980691d18ddab3edd0e05f6b5933bbc1580f3ec422a4
DIST calculate-builder-2.2.8.tar.bz2 28277 RMD160 d1171b2b829a407bf0ebdeaaca6213d40fd1ff9f SHA1 efe031c8747f0385aab8ec4b24157a1f5b49ab26 SHA256 a7e71146f496298e8b32ed3c8fcf84525cfb7a002c60487ba35afa874875d2be
DIST calculate-builder-2.2.9.tar.bz2 28863 RMD160 fadd40944ca45acbfd65dbac59c2c51cf66f2dc6 SHA1 94b9e17bf46201404e7f4903d7886b2c7cb56d83 SHA256 a66f158dfe5e044769459023f1b2657be2d804069a80a8f3587db0daf5d55773
EBUILD calculate-builder-2.2.10.ebuild 593 RMD160 cc40a1369500bf9dc63efbc71c472e38c526fcb8 SHA1 efa677ca006abf9c7b02081057faf4a92f8756f5 SHA256 fb86243d37d9a7a1e3f54a6fe7c1ab228c780e42a7c1b3728153eaeee15b22f6
EBUILD calculate-builder-2.2.11-r1.ebuild 725 RMD160 a0f599048b4c7c7c982d32dc346c3fc46d386bda SHA1 0579b0c86a016362a498b443c5607010f88e9877 SHA256 6502c0089a9e84532af80e215f0a4ee090ad4b46da0c1f23f5bfe2d85a284edf
EBUILD calculate-builder-2.2.11.ebuild 593 RMD160 01db87ba1b0d19fa0c572dd70ff5aecf8cc21abb SHA1 8bcb51527f58af240e0034a8faef28fc72b94216 SHA256 6c8044c0fb0de8b4af511d4da790572d73880ba2381bdd446f7e141d1d4565bc
EBUILD calculate-builder-2.2.8.ebuild 591 RMD160 79a54526d46ee1b546fc6a465b5cd8c20dcf5605 SHA1 7fdf61be21e8554b058d44fd1d807e97e99f080f SHA256 2e51d94bc4825c824a85342bd0e7425e43ce8170f8c0efcb183f1f6bd6ca2d98
EBUILD calculate-builder-2.2.9.ebuild 591 RMD160 865e156c437fb4eec30a39dcac9d7197c5686034 SHA1 405eaf2d017c2e04ec9287f9f5c0a593de64399f SHA256 1bb310e88e2c8049bdfb896534813bd8c33a1a49b9094f17dc47f02363c04458
EBUILD calculate-builder-2.2.9999.ebuild 478 RMD160 6db2a7a0826b7d2492a0ab57057f83282427fa9c SHA1 7787dff362d8d7bb17f6a9cb2e892b9d8f3986da SHA256 f0836ca71625ca6210893fa654040928a33ba50f23ae7873ddb43431242781de
MISC ChangeLog 9944 RMD160 0a5cea7190f0bebdd3bf8c3dd32fb2912edb161a SHA1 ea35d333706876321a2c58ccb273d04fd9c9d543 SHA256 5e77262c96b8b305a603a34ad1d3cf07468635ca2a41e4e215eaae431c722500
MISC ChangeLog 10157 RMD160 4f4ff4f70a14f50c3b0e46ba1246f1d1719e093a SHA1 6b0a6077f65a30533502fbee3d86d7a48116673f SHA256 433e78d59c954c03d15d2e3c83d8a048564995aac055669354d22c2f9169f069
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.10
~sys-apps/calculate-templates-2.2.10
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.11
~sys-apps/calculate-templates-2.2.11
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.8
~sys-apps/calculate-templates-2.2.8
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

@ -1,23 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-install-2.2.9
~sys-apps/calculate-templates-2.2.9
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-client-2.2.8.ebuild, -calculate-client-2.2.9-r1.ebuild,
-calculate-client-2.2.9-r2.ebuild,
-files/calculate-client-2.2.9-exclude_trash.patch,
-calculate-client-2.2.10.ebuild:
Remove old.
*calculate-client-2.2.11 (11 Mar 2011)
11 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,13 +1,5 @@
AUX calculate-client-2.2.9-exclude_trash.patch 624 RMD160 f76e63ca219bb6373e27a162567b46aaf18ae159 SHA1 b9c0dba4c261776244e4ae1f8645847e907db27f SHA256 891121ed4554d03fd169f8ecd79be1fee5b9fb49bba862998c07067cfd8dc348
DIST calculate-client-2.2.10.tar.bz2 35135 RMD160 70d09a0a42cc28edf07de1b5314780a41d39d9fc SHA1 17ea8db0f373a864a052e6dc5d70d2609da114fc SHA256 f60e3489128b972e47bf771fe00d4bc25e792da0eb387880a2c6351371400e31
DIST calculate-client-2.2.11.tar.bz2 35089 RMD160 ac8ea01faae71f1c408bd253c32225e02c48e049 SHA1 13feb11eec43e99a90887292a410383fcdd22f49 SHA256 f678d5e48f01c864bdb6ae5c1dc684e3c1b96efe784115fb9685e4ecf0ebf669
DIST calculate-client-2.2.8.tar.bz2 35129 RMD160 bcfa1f5734ca9887f688d69ba1e786f06e39858b SHA1 6e34bb936f7d6d7502c99da0c8b24d39b480db9f SHA256 d4baa5eef6be6e5089bc88e42879c6dc9bb34b551931243d5854e9b40d315c5e
DIST calculate-client-2.2.9.tar.bz2 35132 RMD160 67521d32d903465caf6428b7ae7223ca33f2b794 SHA1 14060238b526796a8222581a0e4a2e6abeb352ec SHA256 c5f32fe956eb44826dfa4f66e27c10c4e27202a78acbd29a447dc36bd89fce52
EBUILD calculate-client-2.2.10.ebuild 1717 RMD160 760619d22c38ff33ed04a48a3b5517f734580a90 SHA1 e9ff5c87b4595e0305537e764766253a3f27430e SHA256 62c8495d412fd4c5ff9b2fa5dd9791b75e7d137b182af1097e65d62d1882f0ba
EBUILD calculate-client-2.2.11.ebuild 1717 RMD160 703218dbabb93b8453ecae89349bbc0ca0131647 SHA1 9e9e28a472abe49493b97622f4e474d4d826409f SHA256 ae9aaf8ac310f5923207d25f0102a9929b4b160f7069a7313aa4ff15d01a9fcf
EBUILD calculate-client-2.2.8.ebuild 1737 RMD160 c1537f99e4cd4f25b09099e8872deeeef2ee430f SHA1 939439e75b0f098dd205f552dfa02ca4d18b9723 SHA256 8c533832c21547443c430b33170482715474b3d1b4004b37fc551637b36889cb
EBUILD calculate-client-2.2.9-r1.ebuild 1715 RMD160 d6a2c280c172e09f5981398d1abf6e6dbc807e99 SHA1 189ff85820f0355fb58dbe56e558a3aafc3430f8 SHA256 cbf07ae79e382aeba5699ab7228ee21e59690d39ad8be21de84f2d044375987e
EBUILD calculate-client-2.2.9-r2.ebuild 1848 RMD160 62da8e0eb644d13f50119bce797df93896aec493 SHA1 3f10502120fb3c1644683de0ddd147e9f02a541b SHA256 6ded3fefeb8a3cdaf5295f1a25720f0c0d8c0744ebdf0757861e760545158061
EBUILD calculate-client-2.2.9999.ebuild 1718 RMD160 f88304830d176bde5e48389c59664fd4f810a1f3 SHA1 d4c1a942e988304a2b5dee4842932e6b360a9f65 SHA256 86a88789729dd8c68d662d62c61dbe13cfeca74a6b1e6f1c878f6cb67f60dc41
MISC ChangeLog 16572 RMD160 3c1c530c50c434eb85a1d5bd3ae379577e17ad83 SHA1 438e5e4e5bece1cc701a095cd1ca8658377193a9 SHA256 47117e012f5f785e16ba28d1867ad4a9ebf235a32e5d0fc982361933cb639454
MISC ChangeLog 16841 RMD160 02eabc82bba59ae1ba99368426e2af33851e7c3f SHA1 e342ae7a3f174fe0973959aed354ab406ffad55c SHA256 6bd7b3a3127ad6eeb5ed6ef8bfe0991afa772973c735025e07a9597c15c12a07
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2

@ -1,65 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.10
~sys-apps/calculate-lib-2.2.10
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

@ -1,66 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.8
~sys-apps/calculate-lib-2.2.8
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
>=sys-apps/hal-0.5.9
sys-apps/keyutils
sys-auth/pam_keystore
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

@ -1,65 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.9
~sys-apps/calculate-lib-2.2.9
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

@ -1,73 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of setting and storing the user account in the domain"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-desktop-2.2.9
~sys-apps/calculate-lib-2.2.9
>=dev-python/python-ldap-2.0[ssl]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
>=sys-apps/keyexec-0.1.2
sys-apps/keyutils
sys-auth/pam_keystore
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
ISUPDATE=/tmp/${PN}.ebuild.update
# for fixing bug of ebuild calculate-client-2.0.17
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport from 2.2.9
epatch "${FILESDIR}/calculate-client-2.2.9-exclude_trash.patch"
}
pkg_preinst() {
touch ${ISUPDATE}
rm -f /etc/init.d/client
# for fixing bug of ebuild calculate-client-2.0.17
mkdir -p ${OLDISUPDATEPATH}
touch ${OLDISUPDATE}
}
pkg_postinst() {
#/usr/lib/calculate-2.2/calculate-client/bin/install
rm ${ISUPDATE}
# for fixing bug of ebuild calculate-client-2.0.17
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
einfo "For configure calculate-client perform:"
einfo " cl-client --install"
}
pkg_prerm() {
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
then
:
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
fi
}

@ -1,13 +0,0 @@
diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py
index b3a7794..fb738ba 100644
--- a/pym/cl_vars_client.py
+++ b/pym/cl_vars_client.py
@@ -77,7 +77,7 @@ class Data:
".local/share/mime/mime.cache", ".gvfs",
".kde4/share/apps/nepomuk/repository/main/data", ".logout",
".Xauthority", ".thumbnails", ".mozilla/firefox/*/Cache",
- ".kde4/socket-*", ".cache/"]}
+ ".kde4/socket-*", ".cache/", ".local/share/Trash"]}
# Директории или файлы которые удаляются
# при синхронизации профиля пользователя

@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-desktop-2.2.8.ebuild, -calculate-desktop-2.2.9.ebuild,
-calculate-desktop-2.2.10.ebuild:
Remove old.
*calculate-desktop-2.2.11 (11 Mar 2011)
11 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,11 +1,5 @@
DIST calculate-desktop-2.2.10.tar.bz2 15650 RMD160 91c62d6c57fc6fe733eba2e3b9f8a05893ed2f7f SHA1 8e00c0aa08433461f60df6e9237391310a0343a0 SHA256 b8755d798703b7b4fdec8321cec2561b75f6b76c66a667a9bcd4561eb748f68b
DIST calculate-desktop-2.2.11.tar.bz2 15633 RMD160 60d35b9232b6e7acd6d0cea054ee0de6ecd2a631 SHA1 3e997661be80faa8ae39ff68169c8e0228f66bce SHA256 69d62316e2dcab7593780b55bff87d46027b49285ce025dbadcca284e2d8befe
DIST calculate-desktop-2.2.8.tar.bz2 15653 RMD160 4a69dacceba3715a132fd5398b9ecdb80dfdf994 SHA1 bbac7b9907183d71243c6654ba96e97bb98ce8cb SHA256 35b997ce3a4a05fe1c31f06901c5c09174d5ddc933a9d86bae4b0358394c8bf1
DIST calculate-desktop-2.2.9.tar.bz2 15660 RMD160 6dfda8f7b71d91534a6510b42fb2dec0e15b7944 SHA1 3ed80a896290a308aa5f5a894ee77122751c6a56 SHA256 ebdc85f97f427ed8af0d0a079183a7be30330d02689c311eefc2dcc73fa2331d
EBUILD calculate-desktop-2.2.10.ebuild 869 RMD160 bcde4e9f3c7c16c35bedec6e62dded3f6d193e64 SHA1 1b10be7a7a8094a31408d802fea77b469bd82e20 SHA256 780e7434f8b3a33c72f3535aaef16a444f444bda1b2a7b19db2dabd68ba778ba
EBUILD calculate-desktop-2.2.11.ebuild 869 RMD160 2b2f06382553ea61d575e9bda026f4a6b8bb2ea3 SHA1 645e2b90fcbd9c4eabcdb8df203cbdf57d16adc9 SHA256 956d5989901d1ff0ad879d548e83522be539c4be48dd0136e324fc02638b2d11
EBUILD calculate-desktop-2.2.8.ebuild 868 RMD160 0f444c5e4dd9ecaecaf8fe39b2327930dcdee931 SHA1 33fab28cbfd0f7dbd9b5a035426f0c62099fc344 SHA256 da00f4c71b3dc0cf92354c6e79c51dda91d508881f9e37bb6be7273d0ff133a8
EBUILD calculate-desktop-2.2.9.ebuild 868 RMD160 0139a696de67c2aade26246a5ac3499b56e4f714 SHA1 175fe5d6965ee7b6d33dffbc04e80f0bdd3d6d96 SHA256 30c2b66a61be371fd2f61665f2392559dd4b86865fd7dc30a8cc97e51cbccbc3
EBUILD calculate-desktop-2.2.9999.ebuild 1057 RMD160 3ea64ab7c3c63d250f831e58d076d0dce2d4f809 SHA1 381d8990544497841192c1562cc33a78a1cba461 SHA256 696a9915527447c6b93cfec102ec8738e5f1505f09cf7df8018d1b053b2a963a
MISC ChangeLog 11312 RMD160 481f956c09d7dcfdcdb48bb44b2ca7d5f88889fd SHA1 098fcd741aea9c0ea302256a9fd64678a2f9dd04 SHA256 7422afc9ac7d576d8eb5ea20653828aebbfd17fd28994ab4f4dbb468c0754696
MISC ChangeLog 11491 RMD160 88680ffa3b767e8dec5645de778d6d36a11ad49b SHA1 55c91cc18ea334e09e819e19cfe8c47a1e9a7ef1 SHA256 01c7ca1be9007457573a75ca6fd93f6b0daa9518da23ac0e6ad5baa86e072420
MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-lib-2.2.10
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
pkg_postinst() {
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-lib-2.2.8
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
pkg_postinst() {
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

@ -1,34 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of the desktop configuration Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="kde xfce gnome"
DEPEND="~sys-apps/calculate-lib-2.2.9
>=dev-python/python-ldap-2.0[ssl]
xfce? ( x11-misc/xdialog )
gnome? ( x11-misc/xdialog )
kde? ( kde-base/kdialog )"
RDEPEND="${DEPEND}"
pkg_postinst() {
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
einfo "For configure calculate-desktop perform:"
einfo " cl-desktop --install"
if use kde || use xfce || use gnome
then
einfo " /etc/init.d/xdm restart"
fi
}

@ -2,6 +2,17 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-install-2.2.8.ebuild, -calculate-install-2.2.8-r1.ebuild,
-calculate-install-2.2.8-r2.ebuild,
-files/calculate-install-2.2.8-fix_bind_mounts.patch,
-files/calculate-install-2.2.8-fix_initrd_optimization.patch,
-calculate-install-2.2.9.ebuild, -calculate-install-2.2.10.ebuild,
-calculate-install-2.2.10-r1.ebuild, -calculate-install-2.2.10-r2.ebuild,
-files/calculate-install-2.2.10-fix_fill_vars.patch,
-files/calculate-install-2.2.10-fix_fill_vars2.patch:
Remove old.
*calculate-install-2.2.11 (11 Mar 2011)
11 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,19 +1,5 @@
AUX calculate-install-2.2.10-fix_fill_vars.patch 1524 RMD160 d404cbf238d0c7142940212a14c5f1b041d0c7fa SHA1 33d4b9aafe8aaf735f0a13f54e4a013eb6849397 SHA256 a31a1c3440c7f95830ef39d23e64eb75a2bfde6df7edfe2a59703b9588270040
AUX calculate-install-2.2.10-fix_fill_vars2.patch 2439 RMD160 0c19540ebfe285ad6e2b7704174d83250001c9f5 SHA1 10aee14c11957399faad795d75823066e14440f4 SHA256 540962d3e33ed019a71363ddf9d2ee4b3ddd126a9495b651c968b071875960da
AUX calculate-install-2.2.8-fix_bind_mounts.patch 1464 RMD160 e34850427716de226fca2410f8af8ad880f6fa01 SHA1 88f32ee99aae389513597ee8a64f7223dbcc6352 SHA256 22285c140f9490ed0817162ae5fc26f230724088f0149bd284f32b0a52925a55
AUX calculate-install-2.2.8-fix_initrd_optimization.patch 2031 RMD160 545672e0440b81331c32fd36f7142544501bbc08 SHA1 4c80f58a8ada8a23b7b6c2b92617980a65aad2eb SHA256 3f1cb62f9d3c9f379554b6e3bb8e0f5a13abf44886ecbcb1d77d863ad876e4ee
DIST calculate-install-2.2.10.tar.bz2 64266 RMD160 6d4f247b0e215d6aa957f4323b12857ffe0868b7 SHA1 cfe4fa492ac13eb1bd34b97046980729eeca3e12 SHA256 fc1d647c56e09c604b941d09290d6cfc96e1e4ac27374b62e359fa7713385e8a
DIST calculate-install-2.2.11.tar.bz2 64863 RMD160 3073dc8e87fc19913fbda855450e61459c4b2635 SHA1 f0737af641de6b3bbd89cdba3f17e46d7b6e4735 SHA256 f38892b9e2c2d026ce015865d0afe1e00e0de4cbbe5b64a3682c0894b09dc8a4
DIST calculate-install-2.2.8.tar.bz2 63424 RMD160 60950de36d182437178ffdd7dd8110f0f15f2c3d SHA1 39f771c0dad1f55e189deefcb2e3d683ef4c4255 SHA256 aaf8e9bd268842c77e5ca0cf78d61167f5bb85cbd50c3055e05f5cec7e0f7730
DIST calculate-install-2.2.9.tar.bz2 64072 RMD160 ba1445e0d2008ce560a467c7a9fb003069aa0f21 SHA1 08a1509b18d53d2441ea2b9ad6da4de15278a6a1 SHA256 f7b816ad5ca3ada02f7d9754d729f5b90ecfcfc0b19b4c4ced3bf9b464457e10
EBUILD calculate-install-2.2.10-r1.ebuild 865 RMD160 6a22015101de0002664474ba2437003f0e3969bb SHA1 82ed7c2e1fa552b5346cf390bf467d3e178cb2b3 SHA256 147a58485b9479dd49e9af4cab7d59f1113d5ec76dfc28ec592f96a1c9bdae36
EBUILD calculate-install-2.2.10-r2.ebuild 866 RMD160 c6bfd971530a8383126824c6ac2375a90315e965 SHA1 9252cecab1132351f6229235c1621009e03fe3ac SHA256 3dd261271cf69bfb3ad8be1d9cf1308d10835643ba09374486f9a4ee4000c731
EBUILD calculate-install-2.2.10.ebuild 709 RMD160 fac2908648a517a7d8973a146b7b50a6476dd8d1 SHA1 42c4478cab3c4754939a3e44c0fc059d9501e028 SHA256 0829ebd6620b9e4e77cdaad847621a9657def8b5e019fe2664411d0fc8fb36af
EBUILD calculate-install-2.2.11.ebuild 709 RMD160 ed5a5467b2a19cdd11bb14bceaf836f77f77b435 SHA1 d0691733e68d0743bad6d36110b40cbc39b2c5c1 SHA256 7266cbd1c878f690cbe0a05fe87c458ec5e292efe852fc504936f4e9291c705a
EBUILD calculate-install-2.2.8-r1.ebuild 888 RMD160 7746cbf0286306d918ca45160b7c0bc1e3fc3ac7 SHA1 e25fd104edc700bc8762517221ac19371fda4025 SHA256 52ceb3d5fb9b5020c21ce5e4a46c10f5598cdd1590e8e3e6478ebf641c3a8b46
EBUILD calculate-install-2.2.8-r2.ebuild 991 RMD160 c8fe91746f64321953792f4d4644f5988892afcc SHA1 b01daea44d0457156c4e5cacd84d46d6e7180a25 SHA256 08c4bd5f28f304209e57ee826a5a15258534e3f9d08a65a7ef5d854eb3ebd951
EBUILD calculate-install-2.2.8.ebuild 708 RMD160 a8f5e930862aa2f606ae03aaff3f94fd58677068 SHA1 03870f8d07b3c9f8a81861dce7567e947431969a SHA256 5d427db1983a94439defca075857a2a0a031e2507f15c89bfe8e287776c61a05
EBUILD calculate-install-2.2.9.ebuild 708 RMD160 977f5ef78f8d35459dd397c18c143f67b918a937 SHA1 3d558fae4be2e260f4d17eb7c7bb69a7536f7dfc SHA256 9b3fcc957ac96ed89c8eb3c86e19feb4d681341feb11193f45e11a22decf7393
EBUILD calculate-install-2.2.9999.ebuild 540 RMD160 038eb80ed7ab1120e6305cbfe2eca480a48aa1c0 SHA1 0cc13d21f94d71f0e6bb6dce3e8abfa1f2f66a4f SHA256 7f9bd4b0b6c2fa260f2e93c78fdee24b32545dc2a98e19363f4933dcc32d3557
MISC ChangeLog 18436 RMD160 c918371fddd3b55195d4f397bbc2e6fd29cde5c8 SHA1 c4b26dcce92c3d1fe5af56275626cbdc8834de2b SHA256 f0af02f180350d412d50502d79b4808845e09eac8fa2389cbdb3d08ccf7babe7
MISC ChangeLog 18996 RMD160 69e97b2359e07f2611b64622558ce027953ed458 SHA1 8a61ccdb4a04f72cdb72e66d40aa65ab912005cf SHA256 44c8d59aebb6c69905a9d69c720970bca12f11372d6564a524e8b85df282923b
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.10
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix fill vars need for chroot assembling
epatch "${FILESDIR}/calculate-install-2.2.10-fix_fill_vars.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,39 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.10
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix fill vars need for chroot assembling
epatch "${FILESDIR}/calculate-install-2.2.10-fix_fill_vars2.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.10
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,40 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND=">=sys-apps/calculate-lib-2.2.8-r1
<sys-apps/calculate-lib-2.2.9
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix bind mount point install
epatch "${FILESDIR}/calculate-install-2.2.8-fix_bind_mounts.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,42 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND=">=sys-apps/calculate-lib-2.2.8-r1
<sys-apps/calculate-lib-2.2.9
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix bind mount point install
epatch "${FILESDIR}/calculate-install-2.2.8-fix_bind_mounts.patch"
# fix initrd optimization
epatch "${FILESDIR}/calculate-install-2.2.8-fix_initrd_optimization.patch"
}
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.8
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,31 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-lib-2.2.9
app-portage/layman
!minimal? ( sys-boot/grub
sys-apps/gdisk
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )"
RDEPEND="${DEPEND}"
pkg_postinst() {
einfo "For configure calculate-install perform:"
einfo " cl-install --install"
}

@ -1,41 +0,0 @@
diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo
index ff3daaf..9fe439a 100644
Binary files a/i18n/cl_install_ru.mo and b/i18n/cl_install_ru.mo differ
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 56120d6..f8e1e10 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -78,9 +78,8 @@ class fillVars(object, glob_attr):
"""Need perform templates for install:system"""
if self.Get('cl_assemble_prepare_action') != "":
return ""
- if self.Get('os_install_root_type') == "flash":
- return ""
- if self.Get('cl_action') == 'system':
+ if self.Get('cl_action') == 'system' and \
+ self.Get('os_install_root_type') != "flash":
return "up"
else:
return ""
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 8f5dd33..5b7d52c 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -49,8 +49,6 @@ def pop_install_errors():
defaultExit = cl_overriding.exit
defaultPrintERROR = cl_overriding.printERROR
-cl_overriding.exit = installExit
-cl_overriding.printERROR = overprintERROR
from cl_lang import lang
from cl_fill import clLocale
@@ -779,6 +777,8 @@ class cl_install(color_print, SignalInterrupt):
self.stdoutHide = None
self.stderrHide = None
Spinner().setWriteFunc(self.defaultPrint)
+ cl_overriding.exit = installExit
+ cl_overriding.printERROR = overprintERROR
def setNoColor(self):
self.color = False

@ -1,62 +0,0 @@
diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo
index ff3daaf..9fe439a 100644
Binary files a/i18n/cl_install_ru.mo and b/i18n/cl_install_ru.mo differ
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
index 56120d6..f69667c 100644
--- a/pym/cl_fill_install.py
+++ b/pym/cl_fill_install.py
@@ -69,8 +69,8 @@ class fillVars(object, glob_attr):
actionsMap = {'merge':'up',
'system':'up'}
cl_action = self.Get('cl_action')
- clRootType = self.Get('os_install_root_type')
- if cl_action == "system" and clRootType == "flash":
+ if cl_action == 'system' and \
+ self.Get('os_install_root_type') == 'flash':
return ""
return actionsMap[cl_action] if cl_action in actionsMap else ""
@@ -78,9 +78,8 @@ class fillVars(object, glob_attr):
"""Need perform templates for install:system"""
if self.Get('cl_assemble_prepare_action') != "":
return ""
- if self.Get('os_install_root_type') == "flash":
- return ""
- if self.Get('cl_action') == 'system':
+ if self.Get('cl_action') == 'system' and \
+ self.Get('os_install_root_type') != "flash":
return "up"
else:
return ""
@@ -89,8 +88,7 @@ class fillVars(object, glob_attr):
"""Need perform templates for install:flash"""
actionsMap = {'system':'up'}
clAction = self.Get('cl_action')
- clRootType = self.Get('os_install_root_type')
- if clAction == 'system' and clRootType == 'flash':
+ if clAction == 'system' and self.Get('os_install_root_type') == 'flash':
return "up"
return ""
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 8f5dd33..5b7d52c 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -49,8 +49,6 @@ def pop_install_errors():
defaultExit = cl_overriding.exit
defaultPrintERROR = cl_overriding.printERROR
-cl_overriding.exit = installExit
-cl_overriding.printERROR = overprintERROR
from cl_lang import lang
from cl_fill import clLocale
@@ -779,6 +777,8 @@ class cl_install(color_print, SignalInterrupt):
self.stdoutHide = None
self.stderrHide = None
Spinner().setWriteFunc(self.defaultPrint)
+ cl_overriding.exit = installExit
+ cl_overriding.printERROR = overprintERROR
def setNoColor(self):
self.color = False

@ -1,28 +0,0 @@
diff --git a/pym/cl_distr.py b/pym/cl_distr.py
index b16fcf5..eb9c531 100644
--- a/pym/cl_distr.py
+++ b/pym/cl_distr.py
@@ -783,7 +783,8 @@ class PartitionDistributive(Distributive):
self.getMultipartData())
dirObj = self.DirectoryObject
mdirectory = dirObj.directory
- for srcDir, destDir, fileSystem, isFormat in mulipartDataBind:
+ for srcDir, destDir, fileSystem, isFormat, partTable \
+ in mulipartDataBind:
realDestDir = pathJoin(mdirectory, destDir)
realSrcDir = pathJoin(mdirectory, srcDir)
self._mountBind(realSrcDir, realDestDir)
diff --git a/pym/cl_install.py b/pym/cl_install.py
index a9b0a9c..3c479d3 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -966,7 +966,8 @@ class cl_install(color_print, SignalInterrupt):
mountPoint=mountPoint,
fileSystem=fileSystem,
isFormat=isFormat,
- systemId=None)
+ systemId=None,
+ partitionTable=None)
if flagMultipartition:
# Set Multipartition
target.multipartition=objMultiPartitions

@ -1,38 +0,0 @@
diff --git a/pym/cl_install.py b/pym/cl_install.py
index 3c479d3..f11d31f 100644
--- a/pym/cl_install.py
+++ b/pym/cl_install.py
@@ -1751,11 +1751,20 @@ class cl_install(color_print, SignalInterrupt):
return True
def cleanInitrd(self):
+ """Clean initrd from needless modules"""
+ # get path to initrd and initrd-install in new system
+ # (/boot/initramfs-...-install,/boot/initramfs-...)
+ initrdPath = path.join(self.clVars.Get('cl_chroot_path'),
+ 'boot',self.clVars.Get('os_install_initrd'))
+ initrdInstallPath = path.join(self.clVars.Get('cl_chroot_path'),
+ 'boot',self.clVars.Get('os_install_initrd_install'))
+ # section which must contains equealent modules and kernel buildins
importantSections = ['File systems','Pseudo filesystems',
'CDROM.*Filesystems', 'DOS.*Filesystems',
'SCSI Transport']
curConfig = dict(KernelConfig().getSectionParams(*importantSections))
if not self.clVars.Get('os_install_kernel_config'):
+ copy2(initrdInstallPath,initrdPath);
return True
newConfig = KernelConfig( configFile=
path.join(self.clVars.Get('cl_chroot_path'),
@@ -1766,11 +1775,8 @@ class cl_install(color_print, SignalInterrupt):
curConfig[x[0]]=="Y",
newConfig)
if conflictOptions:
+ copy2(initrdInstallPath,initrdPath);
return True
- initrdPath = path.join(self.clVars.Get('cl_chroot_path'),
- 'boot',self.clVars.Get('os_install_initrd'))
- initrdInstallPath = path.join(self.clVars.Get('cl_chroot_path'),
- 'boot',self.clVars.Get('os_install_initrd_install'))
return InitRamFs(initrdInstallPath).cleanInitRamFs(initrdPath)
def afterCopyHDDinstall(self,targetDistr, addUsers, changePwdUsers,

@ -2,6 +2,20 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-lib-2.1.8-r1.ebuild, -calculate-lib-2.2.8.ebuild,
-calculate-lib-2.2.8-r1.ebuild, -calculate-lib-2.2.9.ebuild,
-calculate-lib-2.2.10.ebuild, -calculate-lib-2.2.11.ebuild,
-calculate-lib-2.2.11-r1.ebuild:
Remove old.
*calculate-lib-2.2.11-r2 (16 Mar 2011)
16 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-lib-2.2.11-r2.ebuild,
+files/calculate-lib-2.2.11-fix_C_locale.patch:
Update for bugfix.
*calculate-lib-2.2.11-r1 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,19 +1,12 @@
AUX calculate-lib-2.2.11-dialog_fix.patch 849 RMD160 cc13018cafddffc603718e788ea77f50882b75d9 SHA1 249f378b1037865d3f084e0e3be3b0f372a92007 SHA256 381f93dce6dae156d9ff743dce5133cc91d1a70cdd0b1fa488d77d5e43d6287b
AUX calculate-lib-2.2.11-fix_C_locale.patch 707 RMD160 a453baa97fb5044a3993c3fb966ae20956086b50 SHA1 6da63f41bead7ab6fe160f124dca32a9f25d2a33 SHA256 2d4fce242b036ccfadd6d6e759e8598c50c48f7875e4b881cbe90e91d3967373
AUX calculate-lib-2.2.8-file.patch 747 RMD160 8a1f90c822eaefac69b67aa6999a1dc8c2b51b9f SHA1 aeded1b0587785145f4e62f3e81a2726e7c4312d SHA256 45ce03a248d8bec22bbdf006ce607809761304d255467e687242f9423c8413a4
AUX lib_i18n_path.patch 1114 RMD160 6e561c46e91105f4e7686678771da21e8f3685a2 SHA1 b58e8906104b4b9d1a1bd8ecb6959767cad2d329 SHA256 2913821d3c069612485e6dd7fb0e71bc06e5061054309ad9ed6bac29eee732f2
DIST calculate-lib-2.1.8.tar.bz2 61178 RMD160 4a4ed063a9b4d3b82723f5f6eb046c97ad9fcda1 SHA1 93eb20057afff6e98c409388e1259a3ad078bb7a SHA256 ef8e315001663da7a45e69b82dc7c158fb0e10bd567efa95bf8a654ed441144a
DIST calculate-lib-2.2.10.tar.bz2 107101 RMD160 898fba4b1df5a639a8fc0c3971405453175b561f SHA1 69763b53775fb99d41e3682f8e2dbb583d2e0160 SHA256 7b582485dd141eada6e2f96fa359565f114ba0097486e263d61828aa5bd12151
DIST calculate-lib-2.2.11.tar.bz2 107398 RMD160 40692b37b48e299ef95d5074902a254b80c7d5dc SHA1 e6203efc898d9397a03adfcff9f05317fa3d1698 SHA256 f79bde4f00702231d204cec35479b7455ac05711189d537b254ef64015db530a
DIST calculate-lib-2.2.8.tar.bz2 107000 RMD160 948d9e027f7244116ff8329920695be796d52079 SHA1 7e7bc489d5ac091d05a9b9d2e603e391bcd498df SHA256 726113ddb7af113bb5047d36747b0ba6ca3eb4e8eb37aaab3259ae2e843b7896
DIST calculate-lib-2.2.9.tar.bz2 107111 RMD160 f21c8d3e5c82262fa78b256b52723862450fe421 SHA1 c73a5400f0d977321d09cded8891ca64d3ec1cc6 SHA256 7a28ccf447eb8f14a1194966a52065c3ba84d9158eeaa42228b7d89974b24ef3
EBUILD calculate-lib-2.1.8-r1.ebuild 730 RMD160 a3e9d20526f3078d1f1dc8894a3ac88a090cf968 SHA1 6bc25d2449e5f54df3675311ff5211bc00dcf907 SHA256 764f5b146cc9064de5e1c920ec88b0b91c5fb696c73c853435c7f7750b8bf0db
EBUILD calculate-lib-2.2.10.ebuild 659 RMD160 6bf71a6e491b03fa7004b4262ac1aaf1b98c0146 SHA1 e1aaa25934b34818e09b31d5c2882b62b5938c27 SHA256 922bb1fbbe56c741e6b52db280076ea6ea0ca65c7e25a9affc123c628f175c6c
EBUILD calculate-lib-2.2.11-r1.ebuild 790 RMD160 78411067872f5c699694574ca88c8e0c2a6b903f SHA1 4b9c63c4e85e76ed761e3d310e4f44edf42d2e17 SHA256 dbf4ceeb3eea90ab53f9ed024181bc2dd2bc4a86bcccebe7d5fe9692982f2619
EBUILD calculate-lib-2.2.11.ebuild 659 RMD160 5bbfbf8cb6a1a875167536d5fb9e479100693491 SHA1 1cc43efc5441fc5623ca0303733f9cf9c9df9f4d SHA256 9956424e3bce8306394566c5574f1cf97f5ce1518be0c9802c5e49453f1ab3d6
EBUILD calculate-lib-2.2.8-r1.ebuild 791 RMD160 6da62f71058eb75f572cad1689930f2c4d41a6b0 SHA1 c10a3216c348b68875840b32ebf5643c4290ab2b SHA256 ea1e44f5741fe037e6f5f200fb933fe680ca0f27f8b6e9a7a093a787e754a3c9
EBUILD calculate-lib-2.2.8.ebuild 658 RMD160 1e08d25d084eb8a60bb45b80f3f98fb2063f47db SHA1 02d3e988e9bce9ae3b0b7b69d1428f7eb667ab88 SHA256 c3b23f9dd4113dab95eeffc16dbf78fbb44b65e73da7c735536a78de76169467
EBUILD calculate-lib-2.2.9.ebuild 658 RMD160 7f696222a88d3c3f952aa60dddfbc67d9bd9f004 SHA1 cecd92452665a63c431409775041be09658636fc SHA256 484378652007048d8c91bc189db46b7c54f41d26dddc25c281b2310876ef7606
EBUILD calculate-lib-2.2.11-r2.ebuild 869 RMD160 eee9363f02d2c9dd412a1b1e8be6730567f93a13 SHA1 8c1f8e65b90bd24436e80c4f465fb80821067919 SHA256 e178b8450311d0b7b0a01cad04a154c6ecc79964f6960cafaadb343d5ebae7e3
EBUILD calculate-lib-2.2.9999.ebuild 592 RMD160 e559e7ccafdb150093a055b4f90bf33666ab796c SHA1 752fe9e05ce1380af9a44bf5e81a56dc00f36506 SHA256 f4cf5511cca3007b735cf98871ee72442c6bf677be63349058d1bb029a4b1abf
EBUILD calculate-lib-9999.ebuild 476 RMD160 e510e0aa98b7f6da9acc37197073cac0d5d6a47f SHA1 393c416fcfd77d6c05aea8932a7a1e3805aa926d SHA256 a9eee592ec352db7852e93ad33249072307051d3bda6cfdcd034ea9b96747578
MISC ChangeLog 16438 RMD160 93713e9ba5dc924e532a70d84a4f285df5b2ba94 SHA1 8a6cc898107c40648e7e73b3f95c161a0405eac4 SHA256 51f9ad8f3ce28df21e3778448b478dd5a00d031f65b4d73ceaec4904ec2b6e96
MISC ChangeLog 16943 RMD160 a499f82a3e6983590ef4b291acc63253cb4147d8 SHA1 6e3885256bb76e070047f44c076303090bb20c0e SHA256 654609cded4c9d4f157fc674b104a56e6b731f048cdb367093b437a4930e7050
MISC metadata.xml 303 RMD160 774b65ed76939d6878496ad6ef6451849bdced05 SHA1 7d08569697a290ede98c88ab59db3cdc3037bd15 SHA256 181519d9679fd9aee9a7a9806733a50728d3da0b1e0ad54f31499200f7f5c6ec

@ -1,25 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.10
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -29,4 +29,6 @@ src_unpack() {
# dialog yes/no fix patch
epatch "${FILESDIR}/calculate-lib-2.2.11-dialog_fix.patch"
# fix C locale
epatch "${FILESDIR}/calculate-lib-2.2.11-fix_C_locale.patch"
}

@ -1,25 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.11
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -1,32 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.8
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix work with sys-apps/file-5.05
epatch "${FILESDIR}/calculate-lib-2.2.8-file.patch"
}

@ -1,25 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.8
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -1,25 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="~sys-apps/calculate-templates-2.2.9
!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/file[python]"
RDEPEND="${DEPEND}"

@ -0,0 +1,19 @@
commit 1ad2a516b2522cec2d3c757dfc6eed7c8a3eee1e
Author: Mike Hiretsky <mh@calculate.ru>
Date: Wed Mar 16 11:27:32 2011 +0300
Fix locale by default.
diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index a72bc34..1d7b9b4 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -342,7 +342,7 @@ class fillVars(varsShare):
localeVal = self.getValueFromConfig('/etc/env.d/02locale','LANG')
if locale.isValueInFieldExists('locale',localeVal):
return localeVal
- if os.environ.has_key("LANG"):
+ if os.environ.has_key("LANG") and os.environ["LANG"] != "C":
return os.environ["LANG"]
return locale.getFieldByLang("locale","default")

@ -2,6 +2,45 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-calculate-templates-2.2.8.ebuild, -calculate-templates-2.2.8-r2.ebuild,
-calculate-templates-2.2.8-r3.ebuild,
-calculate-templates-2.2.8-r4.ebuild,
-files/calculate-templates-2.2.8-backport.patch,
-files/calculate-templates-2.2.8-backport_2.2.9.patch,
-files/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch,
-calculate-templates-2.2.9.ebuild, -calculate-templates-2.2.9-r1.ebuild,
-files/calculate-templates-2.2.9-backport.patch,
-calculate-templates-2.2.10.ebuild, -calculate-templates-2.2.10-r1.ebuild,
-files/calculate-templates-2.2.10-syntax_fix.patch,
-calculate-templates-2.2.11.ebuild, -calculate-templates-2.2.11-r1.ebuild,
-calculate-templates-2.2.11-r2.ebuild,
-calculate-templates-2.2.11-r3.ebuild,
-calculate-templates-2.2.11-r4.ebuild,
-files/calculate-templates-2.2.11-hide_couch.patch:
Remove old.
*calculate-templates-2.2.11-r4 (18 Mar 2011)
18 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.11-r4.ebuild,
+files/calculate-templates-2.2.11-fix_scratch.patch:
Update templates for fix scratch work.
*calculate-templates-2.2.11-r3 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.11-r3.ebuild,
+files/calculate-templates-2.2.11-hide_couch2.patch:
Update templates.
*calculate-templates-2.2.11-r2 (15 Mar 2011)
15 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-templates-2.2.11-r2.ebuild,
+files/calculate-templates-2.2.11-hide_couch.patch:
Update for hide needless icon.
*calculate-templates-2.2.11 (11 Mar 2011)
11 Mar 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,23 +1,8 @@
AUX calculate-templates-2.2.10-syntax_fix.patch 399 RMD160 a9efe29e617e4462beaf6a346955df75b98dff50 SHA1 f0927bffc644abe507af65dc65de6c979260502c SHA256 a6fd863e077efc3e191be579ae361c246ce1b498b487f802b0f73c7f18123903
AUX calculate-templates-2.2.11-fix_scratch.patch 1947 RMD160 3ab46c1ea554004d279949b238f0a8ed4084a671 SHA1 38d8d6815c10e5f77b52764f5e7841b96f98d06f SHA256 fef78c5a3b356a731dd0c4151e980c1aa3bb03b15bc24721d71a2ee6078b5e5f
AUX calculate-templates-2.2.11-hide_couch2.patch 655 RMD160 86a7f509cf3cad59ad7d036c8422836bac774bb3 SHA1 cdf3646f97690800f44e745cfd4df792fabfa4bd SHA256 607521fe6c76dd90c56e7b12810ddaac82022202053a7226dfbb6c8f6ffa7f4e
AUX calculate-templates-2.2.11-syntax_fix.patch 3135 RMD160 b5d93694234c6a433d30bb5858086aea39b281fd SHA1 be55aeb5d88738a04c599431a7e4da56f22ac5d4 SHA256 b15cdfbbf32cc9628d903d6360d6001cbb7542e3a225a8b618ada2e03d905395
AUX calculate-templates-2.2.8-backport.patch 7999 RMD160 8130243d6fa491f6ac28e3fc811b7886d9f256c9 SHA1 682fbd70f6a375df306c8790375e77aef3330e71 SHA256 2ce64f0b06529aac845e50c323f70112d14ef28c7ae9b1eadbd99cf9e2a8b65e
AUX calculate-templates-2.2.8-backport_2.2.9.patch 113871 RMD160 28b5b1c2793fac29f87c6bfb93df37b8583ceb26 SHA1 4bd2c159b3ac61bd60761b3d50dc1f612904c75a SHA256 75b5dcdd49094ac6caa9f8b4e745b41238e00476de599fe58bb90fe3f11a1bec
AUX calculate-templates-2.2.8-use_leafpad_in_CLDX.patch 4285 RMD160 46d6581be82b975bd57286eb2bbeb5f853f15ed6 SHA1 6c5b8ec293af4d58df64bf8d507271f077501f5a SHA256 cb13503900001fab2460fba0dbf4bca8e715961edeb62ef17d174784f887b017
AUX calculate-templates-2.2.9-backport.patch 1740 RMD160 8323c465bd22e95fb0a1a773353e3bcaa624d99e SHA1 49a4bf80f320a3325cd1f0cfc54ec11de8bf34e1 SHA256 512a3ee291c07607674aca7e99683031515c3dd5e70bc29395079b009367cf6c
DIST calculate-templates-2.2.10.tar.bz2 228102 RMD160 21f5206f134c5f1130f2c5673774d88a051ef86a SHA1 7d303e3b46ef8dd29fbf64f10baa47bda1a25a4f SHA256 0550db478d0041d553689226ad71db4d0a5a2cc9238d91403587a1c60a9dcd08
DIST calculate-templates-2.2.11.tar.bz2 228156 RMD160 76eba34642bde38cfcd71bc5127b91cdecd74bc8 SHA1 9ae1ce001f1369a9435c8a6deb48d651874b1287 SHA256 035f7d11976eff2bad68179b29b161164e6f7774886392b28aff6aacfbf49822
DIST calculate-templates-2.2.8.tar.bz2 224184 RMD160 4c81bce9328b16c7b27de72a662968fa0a65bc15 SHA1 15acb05ac6c2df652d8ac6ef6b445b6d2f03583f SHA256 151612ee9c142b5b597ed52f735b445f6fa07a5064efe67101f8ec399597fbbf
DIST calculate-templates-2.2.9.tar.bz2 226876 RMD160 6d41c6d182d2c507af7a59a1ad8fd864ba7175d6 SHA1 676b9cca14ce237aaa00b8e8d370e4aa4c1dfd02 SHA256 03d1022d83c0db004662e7beb01f9d197f636f9da7ecd7879a8c61549083ddd9
EBUILD calculate-templates-2.2.10-r1.ebuild 703 RMD160 e6e7ed646aa9706c1bb82a511bcef81f7d56ce8a SHA1 ba03263061423ba132e3bb36565c59b5d2fb9f34 SHA256 04a4c9da129a04003135e66c9c54fe5b7e17b1b4fcb95d3d2acbe40b0219f80e
EBUILD calculate-templates-2.2.10.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
EBUILD calculate-templates-2.2.11-r1.ebuild 703 RMD160 d14204e86f493fbabe39cdee0784e0037a94641a SHA1 6ec4923cda29aea1dab09712b2fb2333bf2e482a SHA256 1ce00dd4f72b4be0a328d06fc7e0ad2f1163556f660726befee3465c2b1f1d60
EBUILD calculate-templates-2.2.11.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
EBUILD calculate-templates-2.2.8-r2.ebuild 702 RMD160 fe73a0ae8a6202e8ae26dee434f4d0594a3bf154 SHA1 d39dca52aaf2c95e62bf7f9712eda33433ae9a07 SHA256 9d20ee8023df3a99b81d84f0eaa5ff7ff0ffc2f204d8f331d77004840d2e0a46
EBUILD calculate-templates-2.2.8-r3.ebuild 687 RMD160 a3cc51eb954b954d272050c4f2c2fc3bd0f0567a SHA1 863be21bd73dd971dc1d4fdd1a28cb12d7557133 SHA256 1f738ed52b864058e496cc3d14ffeb167080b92ea27146e258b2965004b93420
EBUILD calculate-templates-2.2.8-r4.ebuild 713 RMD160 460e9d6cbbf17d4f23c9965379de02e9f9a2e3fb SHA1 531cde6eabc2e3ddcb18db2e8f83e50fda89ad56 SHA256 02ded9a2a2d4944b94d11b6eaabf01046b4d2f5b7dc0b66e14494c842a652dad
EBUILD calculate-templates-2.2.8.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
EBUILD calculate-templates-2.2.9-r1.ebuild 693 RMD160 323f162803837ea6ffccdb5b1c34ec1f9bccb814 SHA1 846d5972efd852bbf5077e1c144dc3911e40c088 SHA256 6077ae267b3d9618a9a85b0b080b0d2e0a5bcdd807097ae4d96ed2577d204cf2
EBUILD calculate-templates-2.2.9.ebuild 561 RMD160 bd2d8a44063930c59ecba7e653da3b306c85d73a SHA1 09a164f020651097511533dd7356e05683c4ed76 SHA256 3c4a030ae75066ed0e05dc5a8ad8ddf99b2612ec0b72b8962494d81a536b055d
EBUILD calculate-templates-2.2.11-r5.ebuild 902 RMD160 6ae28a3179b342aaec547bd8be8002a2b78a43e5 SHA1 87e809ace60dcd34ea1520cf8370170e75435e0b SHA256 8627071e30b62d513b600fb35a004650f5b0df2af83326e8fec9c5f25a2905bd
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 f3863438bdc490429c0fe18ff2e885ee566c3e61 SHA1 d9baafda4369d59124caa73245d3f8ec10613382 SHA256 13edc4707924171922107591bf9dd842e350aaaac9874505e039b0a68b093e70
MISC ChangeLog 16382 RMD160 537925729cc2d06a8d6f560819a1da4ecc07888f SHA1 6decb98286a33afb5ed19dbf82a30c19963c4ef3 SHA256 9ca1aeb7764c1b16b490751befa23f9f163aeb21416c8ec83b44c2b42d250a12
MISC ChangeLog 17995 RMD160 cc220c1a7522a46b571edd058a078b933a5cafbf SHA1 3ac16dc3793e0fbf1369e71253a67f4fc7e38fd6 SHA256 44a58af66918908e798727747ebc8eb8d9adcb9d61267b3f580c83796813be7a
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch, which fix syntax bug
epatch "${FILESDIR}/calculate-templates-2.2.10-syntax_fix.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -24,6 +24,10 @@ src_unpack() {
# patch, which fix syntax bug
epatch "${FILESDIR}/calculate-templates-2.2.11-syntax_fix.patch"
# patch, hide needless icons
epatch "${FILESDIR}/calculate-templates-2.2.11-hide_couch2.patch"
# patch for fix scratch boot sync
epatch "${FILESDIR}/calculate-templates-2.2.11-fix_scratch.patch"
}
src_compile() {

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
#Use Leafpad in CLDX
epatch "${FILESDIR}/calculate-templates-2.2.8-use_leafpad_in_CLDX.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport patch
epatch "${FILESDIR}/calculate-templates-2.2.8-backport.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# patch, which update 2.2.8 to 2.2.9
epatch "${FILESDIR}/calculate-templates-2.2.8-backport_2.2.9.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,29 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

@ -1,37 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Templates for calculate utilities 2.2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=""
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# backport from 2.2.10
epatch "${FILESDIR}/calculate-templates-2.2.9-backport.patch"
}
src_compile() {
:
}
src_install() {
dodir /usr/share/calculate/templates
insinto /usr/share/calculate/templates
doins -r *
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save