calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Fix worknetwork manager

Browse Source
atratsevskiy
Хирецкий Михаил 11 years ago
parent 2d34b96a02
commit c6dacf1edc
8 changed files with 87 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
profiles/templates/3.1/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager
Unescape View File

@ -1 +1 @@
# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_conf==networkmanager
# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_conf==networkmanager protected

2
profiles/templates/3.1/3_ac_install_live/1-live/net-misc/networkmanager/default/NetworkManager.remove
Unescape View File

@ -1 +1 @@
# Calculate name=NetworkManager append=remove os_install_net_conf!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!=
# Calculate name=NetworkManager append=remove os_install_net_conf!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!= protected

8
profiles/templates/3.1/6_ac_update_sync/revision/07
Unescape View File

@ -0,0 +1,8 @@
# Calculate ini(update.rev)<7 exec=/bin/bash
#-ini(update.rev,7)-#
test -f /var/db/pkg/net-misc/networkmanager-0*/CONTENTS &&
sed -i /default\\/NetworkManager/d /var/db/pkg/net-misc/networkmanager-0*/CONTENTS
exit 0

2
sys-apps/calculate-lib/Manifest
Unescape View File

@ -4,6 +4,7 @@ AUX calculate-lib-2.1.11-fix_xpath.patch 329 SHA256 9e5674cd5fccea9c2242eb2ffaa8
AUX calculate-lib-2.2.30-fix_squash.patch 740 SHA256 227414840d4f94dc48879071264329fe153f5b21725582c0863b41cde0b8cdcc SHA512 0a115492fa10635095198c198e04e01c7b7a6fd5dd25f1408ce8670215871e0ea7ba15956eed37d96bec405a1b4cddb0672aee32e4d9987f79fe5efbc350dc67 WHIRLPOOL 4e72aa0fd6dd2e0f44e6557d3c99c23be4ee6af24128061ca407cedfc84b192a15448f0537a828974a25b9977f9585e4eba966c6a5335e6252c8b454e5528fca
AUX calculate-lib-3.1.1-r1.patch 768 SHA256 9f3310af82834e7ab13c5f2490eabf4831e301d492529572648fc3b0ad7d4848 SHA512 b2c7b58c4a7d14e2eeae4f5447f533c1d4952a942cc9e08ab8d3eeac116066e8c0f933a4a38371411f564ca6cfba540b864e7c1b1db0a8060a9535165b1e79f3 WHIRLPOOL 4ac7a91d978fb52316993d3b59e244591bc93b55b1af014966ee5692af7f2e982a700dcfc127353b87f0984a2fbeac3cef3d0ffdcdf24b3f53e5001218c7d627
AUX calculate-lib-3.1.2-r1.patch 1128 SHA256 a527535f0a4f2ad11a581e4d9e96b9d20cc6298ba172847d6913d48441940224 SHA512 a8b2db8165e7503ca4e001f7ab16776e30d260b7328760855693fb8236473f681efbf3671401def774c7b9a9bf2e642e85ffde405da5d0a7fa70ae50f6278d23 WHIRLPOOL 84c52097a855d51409750b4e87f0279297bcc206eb01c593598cd8ec7c191182ec627d5cba9428b1a8b3880eb04ee9aa9e8c0356dbab485af1976e37dbe3f34f
AUX calculate-lib-3.1.3-r1.patch 541 SHA256 172e9dd4ed633507c0f63d63a59a386b3606a5c91ba186446f72554973c75c7a SHA512 86a00541fb27a2c8e69ab835c5599706ea1af2f8847586a237f5d713835be430fc6dac5cdc13d0c51149920bbb8bbe223b16916c7f99e6c068305d5883a85a2d WHIRLPOOL 884148cf53e113bb375b1dcaf23a1e792e6655e9a0d4657017b8e93c26d8bb7f718b1c1c93070e25692e5e65ae76a5409ee49e8c167d7c11549d7071523861cd
AUX calculate-lib-3.1.3_alpha1-r1.patch 13055 SHA256 6216c7c04873752b7600fffe44e5038ea879373ebced66a02ec0fe31e2c917c6 SHA512 22c5fa427a5ac01e1add1ef835f6aa726192ca8aeffba8f64bd672a03c8f70c1b314035e347004d9d436d0d180e7a397801d7265ae6f9326e35d9a2ecd04a44f WHIRLPOOL 3a797914d934ab089e37aa82a50c921c3065aaa69ac1ae29d01cfeb68f52da6b7314552f23c5bbca468eb4e938ab8e9b725ab8981ee40053c48b7311de94ffb0
AUX calculate-lib-3.1.3_alpha2-r1.patch 1875 SHA256 35c90a86233ebba723803b04115ef38dbd9e3919907dbea120aa90da6450f74a SHA512 ff29fceaf4d671bdb9087e0a240f142f50c574d5c60e2fa583e5249da3fe69a92cbf49330a589350439f7a99109b6f1cb7dfbfc07c9776620b3ab3f1d94f98ae WHIRLPOOL 8eef41fad6a0e7b2b02a5b9198d3f78ab84cf1dab365838e2b2d7d0be82fd0623833c407131ac0843eacb905f4347df31bbef065397adf4b8b4416cb1250c581
AUX calculate-lib-3.1.3_beta1-r1.patch 2790 SHA256 c4484dd1cfab42e26a1d72fb272bbd68ac0c102c09c1a21f2affa9a96a653720 SHA512 18f40b1dbcbcbda9e53101bb9910e65e5d255846c0dc59e04b48d656d26bffe787756cf83145dd5ac98326c28926e89fb511d671557db58be36a66ca32eb0188 WHIRLPOOL 3f8c7c3c46cd8b523043064d414f975a525889d0caefd7120e2b50df36d5a3fb52c4f6d6d64253a34cb90aa28ad334cbd130393f39485076fd099deb5bfc941f
@ -26,6 +27,7 @@ EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a
EBUILD calculate-lib-3.1.1-r1.ebuild 823 SHA256 bf68f0425e9bdc49cde3ab9aa2b5c00519204167e7527dc596e1beb6a941c986 SHA512 a457cf63f361f3f8fb0362264f6f5517ae90857b3f93fd475b3ac5404170cf9c02f09bda56c2f38ae5975154f8b278f9ed161c2b0a2aecdd846f1a061ff3c4db WHIRLPOOL 8987f93cac00184dd028600d27a9698fbcf75c67ec3085f281e3dbe7030d7fbd42a17d8245f55873b023eca1b3aba25921ec1b3b40bfd8e792da2d54363f33db
EBUILD calculate-lib-3.1.2-r1.ebuild 824 SHA256 1acb96956cbc3529a6097a303131dc13bdd0bf7c7f72142299b393815e1c2713 SHA512 47ec8f6884cdb0b84d6407360410929093a551e6be99a8c956398a1447c79f3147c8bd87844caad5112dc8df34159f5650bc1308228e4b42468f4171f82539e3 WHIRLPOOL 283a32c594ca7ec5d5a40dbbc95c325bbd31a0c748ef72bc7e25d2d643525e3aa04bf8be2e256ed8bdbebd87e122e7f9f15a7abaa655d6222e1b71af49af1ee0
EBUILD calculate-lib-3.1.2.ebuild 690 SHA256 3bd21cbec14f6815642f44234e640f488155f8ad59dbbb22b55a3537dcc1d7ec SHA512 f27f79c7410dd0295bda295080d511b299dd6fd4ebe2058b26e6d6f0dcd029e118dd79849bd3da0260a56cd4b91d4ef649027c158d85d976fc440a9cae0dc12e WHIRLPOOL db749b32ef5a72ed4c9d3476d494f28d3ceb10a215567cf46e23e49063bee9b8e1a2512a25d5006198f8e88fb106ce7da421565dfe6f5f4320f34db033c78513
EBUILD calculate-lib-3.1.3-r1.ebuild 823 SHA256 5aff6894339d3568af6f5955ceea7b228e8adf79176a2075e5425b8890f58625 SHA512 3b8fd8a0fc101d1e15feebd1c937152ba523141fbc01427a46995a21db41b4f3c6eb5803fc09dba411663cf590eeb52747e065980578346bb3c06f074c756431 WHIRLPOOL 7b83a2b8b5867be2a24a8242c8fc60ba83a49a12ca2d6ea7affe2e8ba96b3b6cb79cf9b0d790a7a43f86c6f9f2759ec4aef9071cc6f3df288a2957b4ef46876c
EBUILD calculate-lib-3.1.3.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
EBUILD calculate-lib-3.1.3_alpha1-r1.ebuild 821 SHA256 d570c8307c595e374d1997846ea5cb75266e6f560cc6f6554e0b58bd8370a50b SHA512 705422d60f52445c418df545298d4eaa1772b90acaf110c836aff30eb5168528c9a770e210721d4993eac9554913a84a9fd8b44af46becc13fbbee13fd9e9fc0 WHIRLPOOL a63b6a1349a7d3bcdbe8b19f23a34e105868e0eb73b12eb190d16610fd494870ee89f0f88b29b09c4ba3b5bb238c7f75cc8f01c2e267d5cf8ad9b99a6042b8c8
EBUILD calculate-lib-3.1.3_alpha1.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d

35
sys-apps/calculate-lib/calculate-lib-3.1.3-r1.ebuild
Unescape View File

@ -0,0 +1,35 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
DESCRIPTION="The library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.3-r1.patch"
}

13
sys-apps/calculate-lib/files/calculate-lib-3.1.3-r1.patch
Unescape View File

@ -0,0 +1,13 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index c42dfbb..cda5c00 100644
--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
@@ -5457,6 +5457,8 @@ gettext -d cl_template "$*"
return ([], False)
if not objHeadNew.body.strip():
preReturn(pathProg)
+ if "protected" in objHeadNew.params:
+ self.protectedFiles += applyFiles
return (applyFiles, False)
else:
applyFiles = [pathOldFile]

1
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -7,6 +7,7 @@ EBUILD calculate-utilities-3.1.1-r3.ebuild 761 SHA256 70e0fb66ae382253295eeb211b
EBUILD calculate-utilities-3.1.2-r1.ebuild 752 SHA256 2d88a32c9495937509e324a930c88825eba34336cbca87ab1cf8ebf07a58350d SHA512 919e0bd0254584162a2513d9e75804a1cc0dd17fd72cf11286f3c189639ef75e485bf08238784e36694287928bfb051e45d6a775f04cb2ca677036c6d39650e4 WHIRLPOOL b1adfddd8262bc31118da837b6f52e686ac75f548c43f05e89f57e7bf138a15c5683170aefc49d60b5e4aa63941f1ffc2b0c59c67ac869dbd949bf8eb7fe0ee6
EBUILD calculate-utilities-3.1.2.ebuild 749 SHA256 23558c58cc6efdda2a0b7321557d0ca2d8afbe6415b466c83c601a860b003ff6 SHA512 9d21e5bccb2a61da8f737657333c47453efe2b253eada64447f1081a043b07883bac2889391b2247f72de171c0dc0cafaffa9e75cd134612707d6a9e45503cc5 WHIRLPOOL e3d63c00b7c1a69cd2919760ff467cea67296fd84af99f470a876f7d98144c10c09ccea29b920684f9eb7adf14e1f67091e0c367aea082375fcf206ebae81634
EBUILD calculate-utilities-3.1.3-r1.ebuild 752 SHA256 ad41b57372837da9dfe7faa07b43c91a2ce9761a5e4d1726ae1afa8d3d20b78b SHA512 2e74ec0943853381cf938ab9248bb0603799f03f5fed7f56c744acd48374373fa71ef464f21210e7fa3df0e2ac038949d3dbfbdcbf85f7241106efe6a99da89b WHIRLPOOL b2764cbb616a114d72d5d494c780bc50d33a2cb2ce4b7eef8ca6e003b8da2c9a7060844b379b47d648b344baccf781853481fdf7162531fb6fdd57dc0cb19fcd
EBUILD calculate-utilities-3.1.3-r2.ebuild 755 SHA256 2a5d9cf19d120fcd63a28da1d65c0a3ec3631375aff9f20fba9504883bde05dc SHA512 10882d64f38eab9e8aca542d9988a473799b54d244722013d83692930ce78c49d0e467e53db27b5b4750a37c77c653f8d895f7a1d10148576b7c05f21beb34e7 WHIRLPOOL a4133aace231607afc063c776c1ed9939c14c9047b06221fef1c7fd37aa3a583ee6e3392a05bdc85dd3d98c36155fee99020a0c9cbd5655fc5b1eefcf15435b5
EBUILD calculate-utilities-3.1.3.ebuild 749 SHA256 ea5509536141215632bbea7f9e967437cf0362c3bb7c839f61bbf04f1498dc81 SHA512 d59b948931a7160e4aa1191a892d5eef24148b2fe99826aae09fa254a3ec4187226a599018a62464abb48ee54d1865d9c2fbcfceec0c3ae037acc808358e8c7e WHIRLPOOL fcb9fad7f5d41c956cc371ccad2bda946f905d4e21f0d7aa83c819ddd756f267c10cceaf5b88f371ad2095c7c08b38d001c49c98c89b9e3c1831be3049a28c30
EBUILD calculate-utilities-3.1.3_alpha1-r1.ebuild 818 SHA256 9381052d8609547b849322555d695c96661792a6e8106a9cbf17e69b158ec1a0 SHA512 ad74b7a70bfea421b5d28a50b30c2367e77bc42de55a1375cd9776f1a3f19c0a324e715c759ccf3509eb3634e95e1bbce40aabcf2791fb872adb3cecae4eed4f WHIRLPOOL 357adffc40512951f5a9a50ee4a47544a8e0ba622dbfd528332004e8c4f8999e4fd50c68de0bf5c42a6af54af688a24f94cb09510b8cea3a35b8245efbb0e579
EBUILD calculate-utilities-3.1.3_alpha1.ebuild 803 SHA256 7ef89ba267b68943d2f00e4b36d58aa43bacdbd2c41c46199fd29a7781ba4ff7 SHA512 afebbd3b0f55d94c941586309a325909e256f331e86b8f71698a97d3dc956d3354a81d0e09ae0f794c06078164bf1a89640dc50192560459b412952c8366d1b8 WHIRLPOOL dad73afc7addffd0bd6dc63fd85be1efd23ec41b31ff98e3bd60d9d58a1a6cd522ee9c0c8ebdcfea8e54b63b0696a7e80c62365208328900c3946661233d1373

26
sys-apps/calculate-utilities/calculate-utilities-3.1.3-r2.ebuild
Unescape View File

@ -0,0 +1,26 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.3-r1
=sys-apps/calculate-i18n-3.1.3
=sys-apps/calculate-lib-3.1.3-r1
=sys-apps/calculate-core-3.1.3
=sys-apps/calculate-update-3.1.3
cl_client? ( =sys-apps/calculate-client-3.1.3 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.3 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3 )
cl_console? ( =sys-apps/calculate-console-3.1.3 )
"
Write Preview
Loading…
Cancel
Save