parent
5f4a708a08
commit
3172fcac13
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
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.21"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# some bugfix
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.21-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 126f263..3da2a6a 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -1632,51 +1632,54 @@ class cl_assemble(color_print):
|
||||
self.clVars.Get('cl_assemble_pkgdir'))
|
||||
dbPkg = pathJoin(chrootPath, 'var/db/pkg')
|
||||
|
||||
- if not path.exists(dbPkg):
|
||||
- os.makedirs(dbPkg)
|
||||
- if not path.exists(pkgDir):
|
||||
- os.makedirs(pkgDir)
|
||||
- if path.exists(dbPkg) and path.exists(pkgDir):
|
||||
- # get pkg list from distro
|
||||
- pkgList = \
|
||||
- reduce(lambda x,y:x+y,
|
||||
- map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z),
|
||||
- os.listdir(path.join(dbPkg,x))),
|
||||
- os.listdir(dbPkg)),[])
|
||||
- # get binary packages
|
||||
- binList = \
|
||||
- reduce(lambda x,y:x+y,
|
||||
- map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:],
|
||||
- os.listdir(path.join(x))),
|
||||
- filter(lambda x:path.isdir(x),
|
||||
- map(lambda x:path.join(pkgDir,x),
|
||||
- os.listdir(pkgDir)))),[])
|
||||
-
|
||||
- # remove files which in binary and not in db/pkg
|
||||
- map(lambda x:os.unlink(x),
|
||||
- map(lambda x:pathJoin(pkgDir,x),
|
||||
- list(set(binList)-set(pkgList))))
|
||||
-
|
||||
- # remove empty directories
|
||||
- map(lambda x:os.rmdir(x),
|
||||
- filter(lambda x:path.isdir(x) and not os.listdir(x),
|
||||
- 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)
|
||||
+ try:
|
||||
+ if not path.exists(dbPkg):
|
||||
+ os.makedirs(dbPkg)
|
||||
+ if not path.exists(pkgDir):
|
||||
+ os.makedirs(pkgDir)
|
||||
+ if path.exists(dbPkg) and path.exists(pkgDir):
|
||||
+ # get pkg list from distro
|
||||
+ pkgList = \
|
||||
+ reduce(lambda x,y:x+y,
|
||||
+ map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z),
|
||||
+ os.listdir(path.join(dbPkg,x))),
|
||||
+ os.listdir(dbPkg)),[])
|
||||
+ # get binary packages
|
||||
+ binList = \
|
||||
+ reduce(lambda x,y:x+y,
|
||||
+ map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:],
|
||||
+ os.listdir(path.join(x))),
|
||||
+ filter(lambda x:path.isdir(x),
|
||||
+ map(lambda x:path.join(pkgDir,x),
|
||||
+ os.listdir(pkgDir)))),[])
|
||||
+
|
||||
+ # remove files which in binary and not in db/pkg
|
||||
+ map(lambda x:os.unlink(x),
|
||||
+ map(lambda x:pathJoin(pkgDir,x),
|
||||
+ list(set(binList)-set(pkgList))))
|
||||
+
|
||||
+ # remove empty directories
|
||||
+ map(lambda x:os.rmdir(x),
|
||||
+ filter(lambda x:path.isdir(x) and not os.listdir(x),
|
||||
+ 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)
|
||||
+ except OSError,e:
|
||||
+ raise AssembleError(str(e))
|
||||
return True
|
||||
|
||||
def createMaskList(self,chrootdir,filename):
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update translate for install
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.21-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
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-templates-2.2.21
|
||||
~sys-apps/calculate-lib-2.2.21
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# some bugfix
|
||||
epatch "${FILESDIR}/calculate-install-2.2.21-r2.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,155 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index 1ad6e8d..b6ad94a 100755
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -66,7 +66,8 @@ install_video_driver()
|
||||
|
||||
# create user guest if system has not non-root user
|
||||
create_nonroot_user() {
|
||||
- if [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] &&
|
||||
+ if which cl-desktop &>/dev/null &&
|
||||
+ [[ -z $(variable_value cl_migrate_user | sed -r "s/[][,']|root//g") ]] &&
|
||||
[[ `variable_value os_install_linux_system` != "server" ]]
|
||||
then
|
||||
# passwd of non root user
|
||||
@@ -83,16 +84,19 @@ create_nonroot_user() {
|
||||
|
||||
# create/update all user profile
|
||||
configure_users() {
|
||||
- for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g")
|
||||
- do
|
||||
- cl-desktop $user
|
||||
- done
|
||||
+ if which cl-desktop &>/dev/null
|
||||
+ then
|
||||
+ for user in $(variable_value cl_migrate_user | sed -r "s/[][,']//g")
|
||||
+ do
|
||||
+ cl-desktop $user
|
||||
+ done
|
||||
+ fi
|
||||
}
|
||||
|
||||
start() {
|
||||
install_video_driver
|
||||
- LANG=C /usr/bin/cl-install --startup
|
||||
LANG=C create_nonroot_user
|
||||
+ LANG=C /usr/bin/cl-install --startup
|
||||
LANG=C configure_users
|
||||
|
||||
/usr/sbin/env-update
|
||||
diff --git pym/cl_distr.py pym/cl_distr.py
|
||||
index 057e50d..b8775ad 100644
|
||||
--- pym/cl_distr.py
|
||||
+++ pym/cl_distr.py
|
||||
@@ -136,7 +136,7 @@ class DistributiveRepository:
|
||||
"""Get info from content"""
|
||||
origfilename = filename
|
||||
if filename in DistributiveRepository.contentCache:
|
||||
- return DistributiveRepository.contentCache[filename]
|
||||
+ return DistributiveRepository.contentCache[filename].copy()
|
||||
varsShare = self.varsShare
|
||||
distr = None
|
||||
# may be directory is isodir (directory which contains iso image)
|
||||
@@ -184,7 +184,7 @@ class DistributiveRepository:
|
||||
if distr:
|
||||
distr.close()
|
||||
DistributiveRepository.contentCache[origfilename] = d
|
||||
- return d
|
||||
+ return d.copy()
|
||||
|
||||
def _getdistrinfo(self,filename):
|
||||
"""Get information by distributive"""
|
||||
@@ -729,6 +729,7 @@ class PartitionDistributive(Distributive):
|
||||
'jfs':'/sbin/mkfs.jfs %s -f %s',
|
||||
'reiserfs':'/sbin/mkfs.reiserfs %s -f %s',
|
||||
'btrfs':'/sbin/mkfs.btrfs %s %s',
|
||||
+ 'nilfs2':'/sbin/mkfs.nilfs2 %s %s',
|
||||
'xfs':'/sbin/mkfs.xfs %s -f %s',
|
||||
'vfat':'/usr/sbin/mkfs.vfat %s -F 32 %s',
|
||||
'ntfs-3g':'/usr/sbin/mkfs.ntfs %s -FQ %s',
|
||||
@@ -739,6 +740,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext3':'-L %s',
|
||||
'ext4':'-L %s',
|
||||
'btrfs':'-L %s',
|
||||
+ 'nilfs2':'-L %s',
|
||||
'jfs':'-L %s',
|
||||
'reiserfs':'-l %s',
|
||||
'xfs':'-L %s',
|
||||
@@ -752,6 +754,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext4' : '83',
|
||||
'reiserfs' : '83',
|
||||
'btrfs' : '83',
|
||||
+ 'nilfs2' : '83',
|
||||
'jfs' : '83',
|
||||
'xfs' : '83',
|
||||
'vfat' : '0b',
|
||||
@@ -763,6 +766,7 @@ class PartitionDistributive(Distributive):
|
||||
'ext4' : '0700',
|
||||
'reiserfs' : '0700',
|
||||
'btrfs' : '0700',
|
||||
+ 'nilfs2' : '0700',
|
||||
'jfs' : '0700',
|
||||
'xfs' : '0700',
|
||||
'vfat' : '0700',
|
||||
diff --git pym/cl_install.py pym/cl_install.py
|
||||
index 4f83b51..2358f7f 100644
|
||||
--- pym/cl_install.py
|
||||
+++ pym/cl_install.py
|
||||
@@ -305,6 +305,10 @@ class convertDictOpt:
|
||||
"pair":{},
|
||||
"incompatible":[],
|
||||
"makefs":"/sbin/mkfs.btrfs"},
|
||||
+ "nilfs2":{"options":[],
|
||||
+ "pair":{},
|
||||
+ "incompatible":[],
|
||||
+ "makefs":"/sbin/mkfs.nilfs2"},
|
||||
"jfs":{"options":[],
|
||||
"pair":{},
|
||||
"incompatible":[],
|
||||
@@ -1634,10 +1638,10 @@ class cl_install(color_print, SignalInterrupt):
|
||||
_("Legacy grub not support boot from raid or lvm without"
|
||||
" separate /boot partition"))
|
||||
return False
|
||||
- if bootDiskFormat == "btrfs":
|
||||
+ if bootDiskFormat in ("btrfs","nilfs2"):
|
||||
self.printERROR(
|
||||
- _("Legacy grub not support boot from btrfs without"
|
||||
- " separate /boot partition"))
|
||||
+ _("Legacy grub not support boot from %s without"
|
||||
+ " separate /boot partition")%bootDiskFormat)
|
||||
return False
|
||||
return True
|
||||
|
||||
diff --git pym/cl_install_cmd.py pym/cl_install_cmd.py
|
||||
index 3cfa6dd..8ef2078 100644
|
||||
--- pym/cl_install_cmd.py
|
||||
+++ pym/cl_install_cmd.py
|
||||
@@ -508,3 +508,15 @@ class install_cmd(share_cmd):
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
+
|
||||
+ def parse_args(self, args=None, values=None):
|
||||
+ """
|
||||
+ Preparse for catch non option --live
|
||||
+ """
|
||||
+ rargs = self.optobj._get_args(args)
|
||||
+ if rargs:
|
||||
+ for arg in rargs:
|
||||
+ if arg == "--live":
|
||||
+ self.optobj.error(_("option %s:") %"--live" +\
|
||||
+ " " + _("option is depricated, use '--startup' option"))
|
||||
+ return self.optobj.parse_args(args,values)
|
||||
diff --git scripts/cl-install scripts/cl-install
|
||||
index 441f504..e8e572d 100644
|
||||
--- scripts/cl-install
|
||||
+++ scripts/cl-install
|
||||
@@ -32,7 +32,7 @@ if __name__ == "__main__":
|
||||
install = install_cmd()
|
||||
install.logicObj.initVars()
|
||||
# set lang
|
||||
- ret = install.optobj.parse_args()
|
||||
+ ret = install.parse_args()
|
||||
if ret is False:
|
||||
sys.exit(1)
|
||||
options, args = ret
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
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-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/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for bugfix
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.21-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git pym/cl_template.py pym/cl_template.py
|
||||
index 66a2634..f282401 100644
|
||||
--- pym/cl_template.py
|
||||
+++ pym/cl_template.py
|
||||
@@ -2506,7 +2506,7 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction):
|
||||
self.pathConfigIni = os.path.join(self.homeDir, ".calculate")
|
||||
self.modeConfigIni = 0640
|
||||
else:
|
||||
- self.pathConfigIni = pathJoin(self._baseDir,'/etc/calculate')
|
||||
+ self.pathConfigIni = pathJoin(self._chrootDir,'/etc/calculate')
|
||||
self.modeConfigIni = 0644
|
||||
self.fileConfigIni = os.path.join(self.pathConfigIni,"ini.env")
|
||||
# Словарь времен модификации env файлов
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit 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="~sys-apps/calculate-lib-2.2.21"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# bugfixs
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.21-r1.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
diff --git desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals
|
||||
index 4015931..150bd84 100644
|
||||
--- desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals
|
||||
+++ desktop/desktop/20-kde-4.6/.kde4/share/config/kdeglobals
|
||||
@@ -5,15 +5,7 @@ emoticonsTheme=KMess-Cartoon
|
||||
|
||||
#Fonts
|
||||
[General]
|
||||
-#?pkg(www-client/chromium)!=#
|
||||
-BrowserApplication[$e]=file:///usr/share/applications/chromium-chromium.desktop
|
||||
-#pkg#
|
||||
-#?pkg(www-client/firefox)!=&&pkg(www-client/chromium)==#
|
||||
-BrowserApplication[$e]=file:///home/#-ur_login-#/.local/share/applications/mozilla-firefox.desktop
|
||||
-#pkg#
|
||||
-#?pkg(www-client/firefox)==&&pkg(www-client/chromium)==#
|
||||
-BrowserApplication[$e]=file:///usr/share/applications/kde4/konqbrowser.desktop
|
||||
-#pkg#
|
||||
+BrowserApplication[$e]=file:///usr/share/applications/calculate-browser.desktop
|
||||
XftHintStyle=hintmedium
|
||||
#?pkg(media-fonts/droid)!=#
|
||||
desktopFont=Droid Sans,10,-1,5,50,0,0,0,0,0
|
||||
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
index 5f21119..a0bc2a5 100644
|
||||
--- install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-2.4.desktop
|
||||
@@ -1,4 +1,4 @@
|
||||
-# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4
|
||||
+# Calculate format=kde link=/usr/share/applications/audacious2.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=2.4&&pkg(media-sound/audacious)<3.0
|
||||
|
||||
# Update info
|
||||
#-ini(desktop.audioplayer, audacious)-#
|
||||
diff --git install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop
|
||||
new file mode 100644
|
||||
index 0000000..6387c9e
|
||||
--- /dev/null
|
||||
+++ install/1merge/Desktop/400-AudioPlayer/audacious/calculate/audacious-3.0.desktop
|
||||
@@ -0,0 +1,9 @@
|
||||
+# Calculate format=kde link=/usr/share/applications/audacious.desktop name=calculate-audioplayer.desktop mirror pkg(media-sound/audacious)>=3.0
|
||||
+
|
||||
+# Update info
|
||||
+#-ini(desktop.audioplayer, audacious)-#
|
||||
+
|
||||
+# Hide icon
|
||||
+[Desktop Entry]
|
||||
+OnlyShowIn=X-NeverShowThis;
|
||||
+
|
||||
diff --git install/1merge/calculate-desktop/.calculate_directory install/1merge/calculate-desktop/.calculate_directory
|
||||
new file mode 100644
|
||||
index 0000000..437bd6a
|
||||
--- /dev/null
|
||||
+++ install/1merge/calculate-desktop/.calculate_directory
|
||||
@@ -0,0 +1,2 @@
|
||||
+# Calculate belong()!=&&cl_chroot_status==off&&pkg(sys-apps/calculate-desktop)!= name=etc path=/usr name=bin
|
||||
+
|
||||
diff --git install/1merge/calculate-desktop/xautologin install/1merge/calculate-desktop/xautologin
|
||||
new file mode 100644
|
||||
index 0000000..5387eb1
|
||||
--- /dev/null
|
||||
+++ install/1merge/calculate-desktop/xautologin
|
||||
@@ -0,0 +1,8 @@
|
||||
+# Calculate chmod=0755
|
||||
+#!/bin/bash
|
||||
+#?list(cl_migrate_user,1)!=#
|
||||
+export USER=#-list(cl_migrate_user,1)-#
|
||||
+/usr/share/calculate/xdm/xdm --login
|
||||
+su - #-list(cl_migrate_user,1)-# -c "/bin/bash -lc startx"
|
||||
+/usr/share/calculate/xdm/xdm --logout
|
||||
+#list#
|
||||
diff --git install/1merge/xorg-server/conf.d/xdm install/1merge/xorg-server/conf.d/xdm
|
||||
index eb21521..d6f5cdf 100644
|
||||
--- install/1merge/xorg-server/conf.d/xdm
|
||||
+++ install/1merge/xorg-server/conf.d/xdm
|
||||
@@ -1,12 +1,15 @@
|
||||
# Calculate comment=#
|
||||
|
||||
CHECKVT=7
|
||||
-#?pkg(kde-base/kdm)!=#
|
||||
+#?os_install_root_type==livecd||os_install_linux_shortname==CMC#
|
||||
+DISPLAYMANAGER="xautologin"
|
||||
+#os_install_root_type#
|
||||
+#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(kde-base/kdm)!=#
|
||||
DISPLAYMANAGER="kdm"
|
||||
-#pkg#
|
||||
-#?pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
|
||||
+#os_install_root_type#
|
||||
+#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(gnome-base/gdm)!=&&pkg(kde-base/kdm)==#
|
||||
DISPLAYMANAGER="gdm"
|
||||
-#pkg#
|
||||
-#?pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
|
||||
+#os_install_root_type#
|
||||
+#?os_install_root_type!=livecd&&os_install_linux_shortname!=CMC&&pkg(x11-misc/slim)!=&&pkg(kde-base/kdm)==&&pkg(gnome-base/gdm)==#
|
||||
DISPLAYMANAGER="slim"
|
||||
-#pkg#
|
||||
+#os_install_root_type#
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_client
|
||||
cl_desktop
|
||||
cl_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.21-r2
|
||||
=sys-apps/calculate-templates-2.2.21-r1
|
||||
=sys-apps/calculate-lib-2.2.21-r1
|
||||
=sys-apps/calculate-i18n-2.2.21-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.21-r1 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.21 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.21 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.21 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.21 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue