Merge branch 'develop' of git.calculate-linux.org:/calculate/calculate-overlay into develop

mhiretskiy
Ваше Имя 4 years ago
commit 11988392ad

@ -0,0 +1 @@
DIST pyinotify-0.9.6.tar.gz 60998 BLAKE2B 7fb55cfe5b2c02682b5842d95859a58f218ab591a4eee689b707e804c6fe8cde4cc1fb3dfbf54a044ff743deefa0ee5551bc6e27ca4dda1c608218a6c24597b2 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<herd>maintainer-wanted</herd>
</maintainer>
</pkgmetadata>

@ -0,0 +1,36 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
MY_PN=pyinotify
MY_P=$MY_PN-$PV
DESCRIPTION="Python module used for monitoring filesystems events"
HOMEPAGE="
http://trac.dbzteam.org/pyinotify
https://pypi.org/project/pyinotify/
https://github.com/seb-m/pyinotify/"
SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
RESTRICT="test"
RDEPEND="
!dev-python/${MY_PN}[python_targets_python2_7]
"
S="${WORKDIR}/${MY_PN}-${PV}"
python_install_all() {
distutils-r1_python_install_all
rm -r ${D}/usr/share
}

@ -228,6 +228,7 @@ RDEPEND="
dev-python/dbus-python2
media-gfx/imagemagick[jpeg]
dev-python/PyQt5-python2
dev-python/pyinotify-python2
)
dbus? (

@ -1,3 +0,0 @@
AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
EBUILD avidemux-plugins-2.7.4-r1.ebuild 4225 BLAKE2B cb708b89c9eca201e17e04db27da9c5e081813fa3d37af0cfd2e2378d8593930640d3abb233342c289633fb77ab78caf5c54ac9bff252dc872fd9160b350f00f SHA512 d8de926fd6480103d9ff2086acbe1653b9c48e66f1d767142f9faa7fdfdd90fce931503d6702543fa4ea54a7a224f7d1f0a496f69357b005c294fb329a187f54

@ -1,161 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
PYTHON_COMPAT=( python3_7 )
inherit cmake python-single-r1
DESCRIPTION="Plugins for the video editor media-video/avidemux"
HOMEPAGE="http://fixounet.free.fr/avidemux"
SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.7"
IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
dev-lang/spidermonkey:0=
dev-libs/libxml2:2
media-libs/a52dec
media-libs/libass:0=
media-libs/libmad
media-libs/libmp4v2
media-libs/libpng:0=
virtual/libiconv
aac? (
media-libs/faac
media-libs/faad2
)
aften? ( media-libs/aften )
alsa? ( media-libs/alsa-lib )
amr? ( media-libs/opencore-amr )
dcaenc? ( media-sound/dcaenc )
dts? ( media-libs/libdca )
fdk? ( media-libs/fdk-aac:0= )
fontconfig? ( media-libs/fontconfig:1.0 )
fribidi? ( dev-libs/fribidi )
jack? (
media-sound/jack-audio-connection-kit
libsamplerate? ( media-libs/libsamplerate )
)
lame? ( media-sound/lame )
nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
opus? ( media-libs/opus )
pulseaudio? ( media-sound/pulseaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
truetype? ( media-libs/freetype:2 )
twolame? ( media-sound/twolame )
vorbis? ( media-libs/libvorbis )
vpx? ( media-libs/libvpx:0= )
x264? ( media-libs/x264:0= )
x265? ( media-libs/x265:0= )
xv? (
x11-libs/libX11
x11-libs/libXext
x11-libs/libXv
)
xvid? ( media-libs/xvid )
"
DEPEND="${COMMON_DEPEND}
oss? ( virtual/os-headers )
"
RDEPEND="${COMMON_DEPEND}
!<media-libs/avidemux-plugins-${PV}
"
S="${WORKDIR}/avidemux2-${PV}"
PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
src_prepare() {
default
# Don't reapply PATCHES during cmake_src_prepare
unset PATCHES
processes="buildPluginsCommon:avidemux_plugins
buildPluginsCLI:avidemux_plugins"
use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
for process in ${processes} ; do
CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
done
}
src_configure() {
# See bug 432322.
use x86 && replace-flags -O0 -O1
for process in ${processes} ; do
local build="${WORKDIR}/${P}_build/${process%%:*}"
local mycmakeargs=(
-DAVIDEMUX_SOURCE_DIR='${S}'
-DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
-DFAAC="$(usex aac)"
-DFAAD="$(usex aac)"
-DALSA="$(usex alsa)"
-DAFTEN="$(usex aften)"
-DDCAENC="$(usex dcaenc)"
-DFDK_AAC="$(usex fdk)"
-DOPENCORE_AMRWB="$(usex amr)"
-DOPENCORE_AMRNB="$(usex amr)"
-DLIBDCA="$(usex dts)"
-DFONTCONFIG="$(usex fontconfig)"
-DJACK="$(usex jack)"
-DLAME="$(usex lame)"
-DNVENC="$(usex nvenc)"
-DOPENGL="$(usex opengl)"
-DOPUS="$(usex opus)"
-DOSS="$(usex oss)"
-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
-DQT4=OFF
-DFREETYPE2="$(usex truetype)"
-DTWOLAME="$(usex twolame)"
-DX264="$(usex x264)"
-DX265="$(usex x265)"
-DXVIDEO="$(usex xv)"
-DXVID="$(usex xvid)"
-DVDPAU="$(usex vdpau)"
-DVORBIS="$(usex vorbis)"
-DLIBVORBIS="$(usex vorbis)"
-DVPXDEC="$(usex vpx)"
-DUSE_EXTERNAL_LIBA52=yes
-DUSE_EXTERNAL_LIBASS=yes
-DUSE_EXTERNAL_LIBMAD=yes
-DUSE_EXTERNAL_LIBMP4V2=yes
)
use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
done
}
src_compile() {
for process in ${processes} ; do
local build="${WORKDIR}/${P}_build/${process%%:*}"
BUILD_DIR="${build}" cmake_src_compile
done
}
src_install() {
for process in ${processes} ; do
local build="${WORKDIR}/${P}_build/${process%%:*}"
BUILD_DIR="${build}" cmake_src_install
done
}

@ -1,20 +0,0 @@
--- a/cmake/admCheckAudioDeviceLibs.cmake
+++ b/cmake/admCheckAudioDeviceLibs.cmake
@@ -158,6 +158,7 @@
MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
MESSAGE(STATUS "*****************************")
+ IF (PULSEAUDIOSIMPLE)
IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
# in cache already
SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
@@ -191,6 +192,9 @@
MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
+ ELSE (PULSEAUDIOSIMPLE)
+ MESSAGE("${MSG_DISABLE_OPTION}")
+ ENDIF (PULSEAUDIOSIMPLE)
ELSE (UNIX AND NOT APPLE)
SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
ENDIF (UNIX AND NOT APPLE)

@ -35,4 +35,3 @@
~net-wireless/rtl8814au-20201020 amd64
~net-wireless/rtl8821ce-20200617 amd64
~net-wireless/rtl8821cu-20200617 amd64
~www-apps/gitea-1.12.4 amd64

@ -1,11 +1,11 @@
<gnome-extra/cinnamon-4.5 amd64
<gnome-extra/cinnamon-control-center-4.5 amd64
<gnome-extra/cinnamon-desktop-4.5 amd64
<gnome-extra/cinnamon-menus-4.5 amd64
<gnome-extra/cinnamon-screensaver-4.5 amd64
<gnome-extra/cinnamon-session-4.5 amd64
<gnome-extra/cinnamon-settings-daemon-4.5 amd64
<gnome-extra/cinnamon-translations-4.5 amd64
<gnome-extra/cjs-4.5 amd64
<gnome-extra/nemo-4.5 amd64
<x11-wm/muffin-4.5 amd64
<gnome-extra/cinnamon-4.7 amd64
<gnome-extra/cinnamon-control-center-4.7 amd64
<gnome-extra/cinnamon-desktop-4.7 amd64
<gnome-extra/cinnamon-menus-4.7 amd64
<gnome-extra/cinnamon-screensaver-4.7 amd64
<gnome-extra/cinnamon-session-4.7 amd64
<gnome-extra/cinnamon-settings-daemon-4.7 amd64
<gnome-extra/cinnamon-translations-4.7 amd64
<gnome-extra/cjs-4.7 amd64
<gnome-extra/nemo-4.7 amd64
<x11-wm/muffin-4.7 amd64

@ -1,5 +1,4 @@
~app-admin/ansible-base-2.10.2 amd64
~app-admin/conkyforecast-2.24 amd64
~app-admin/ansible-base-2.10.3 amd64
~app-arch/unar-1.10.7 amd64
~app-dicts/myspell-ru-20180627 amd64
~app-dicts/stardict-cdict-en-zh-big5-2.4.2 amd64
@ -22,27 +21,24 @@
~app-dicts/stardict-xdict-zh-en-gb-2.4.2 amd64
~app-doc/gimp-help-2.10.0 amd64
~app-editors/notepadqq-2.0.0_beta amd64
~app-editors/sublime-text-3_p3211 amd64
~app-editors/xemacs-21.5.34 amd64
~app-emulation/aqemu-0.9.2 amd64
~app-emulation/gallium-nine-standalone-0.7 amd64
~app-emulation/open-vm-tools-11.2.0_p16938113 amd64
~app-emulation/playonlinux-4.3.4 amd64
<app-emulation/wine-staging-9999 amd64
~app-i18n/man-pages-ru-4.16.2383.2383.20180422 amd64
~app-i18n/man-pages-ru-5.03.2390.2390.20191017 amd64
~app-i18n/nabi-1.0.0 amd64
~app-misc/anki-2.1.15 amd64
~app-misc/rox-filer-2.11 amd64
~app-misc/tmux-3.1b amd64
~app-mobilephone/adb-sync-0_p20181127 amd64
~app-mobilephone/adb-sync-0_p20190101 amd64
~app-mobilephone/qtadb-0.8.1 amd64
~app-office/calligra-3.2.1 amd64
~app-officeext/languagetool-5.0 amd64
~app-office/kexi-3.2.0 amd64
~app-office/moneydance-2020.2.1929 amd64
~app-text/calibre-4.21.0 amd64
~app-text/coolreader-3.2.39 amd64
~app-text/fbless-0.2.3 amd64
~app-text/kchmviewer-7.7 amd64
~app-text/calibre-5.4.2 amd64
~app-text/coolreader-3.2.50 amd64
~app-vim/vim-tmux-3.0.0 amd64
~dev-java/ant-eclipse-ecj-4.5.1 amd64
~dev-java/eclipse-ecj-4.5.1 amd64
@ -52,63 +48,50 @@
~dev-qt/qt-creator-4.12.3 amd64
~dev-util/android-sdk-update-manager-24.4.1 amd64
~dev-util/android-studio-4.1.0.19.201.6858069 amd64
~dev-util/eric-18.03 amd64
~dev-util/nvidia-cuda-toolkit-10.2.89 amd64
~dev-util/nvidia-cuda-toolkit-11.1.0 amd64
dev-util/pycharm-community amd64
dev-util/pycharm-professional amd64
~lxde-base/lxde-meta-0.5.5 amd64
~mail-client/claws-mail-3.17.7 amd64
~mail-client/geary-3.36.2 amd64
~mail-client/claws-mail-3.17.8 amd64
~mail-client/geary-3.36.3.1 amd64
~mail-client/sylpheed-3.7.0 amd64
~mail-client/trojita-0.7 amd64
~media-gfx/blender-2.90.1 amd64
~media-gfx/darktable-3.2.1 amd64
~media-gfx/gimp-2.10.22 amd64
~media-gfx/inkscape-1.0 amd64
~media-gfx/krita-4.2.9 amd64
~media-gfx/nomacs-3.12 amd64
~media-gfx/inkscape-1.0.1 amd64
~media-gfx/krita-4.4.1 amd64
~media-gfx/opencsg-1.4.2 amd64
~media-gfx/openexr_viewers-2.3.0 amd64
~media-gfx/pencil-0.6.4 amd64
~media-gfx/pencil-0.6.5 amd64
~media-gfx/qimgv-0.9.1 amd64
~media-gfx/viewnior-1.7 amd64
~media-libs/avidemux-core-2.7.4 amd64
~media-libs/avidemux-plugins-2.7.4 amd64
~media-libs/dav1d-0.7.1 amd64
~media-libs/libopenshot-0.2.4 amd64
~media-libs/libopenshot-audio-0.1.9 amd64
~media-libs/avidemux-core-2.7.6 amd64
~media-libs/avidemux-plugins-2.7.6 amd64
~media-libs/dav1d-0.8.0 amd64
~media-libs/libopenshot-0.2.5 amd64
~media-libs/libopenshot-audio-0.2.0 amd64
~media-libs/opencolorio-1.1.1 amd64
~media-plugins/audacious-plugins-4.0.3 amd64
~media-plugins/qmmp-plugin-pack-1.4.0 amd64
~media-sound/audacious-4.0.3 amd64
~media-sound/bluez-alsa-2.1.0 amd64
~media-sound/bluez-alsa-3.0.0 amd64
~media-sound/clementine-1.4.0_rc1 amd64
~media-sound/gmtp-1.3.11 amd64
~media-sound/gpodder-3.10.5 amd64
~media-sound/lxmusic-0.4.7 amd64
~media-sound/mumble-1.3.0 amd64
~media-sound/picard-2.3.1 amd64
~media-sound/potamus-16 amd64
~media-sound/potamus-17 amd64
~media-sound/qastools-0.21.0 amd64
~media-sound/qmmp-1.4.1 amd64
~media-sound/tomahawk-0.9.0_pre20181030 amd64
~media-sound/volumeicon-0.5.1 amd64
~media-video/avidemux-2.7.4 amd64
~media-video/avidemux-2.7.6 amd64
~media-video/handbrake-1.3.3 amd64
~media-video/kmplayer-0.12.0b amd64
~media-video/movit-1.6.2 amd64
~media-video/mplayer-1.3.0 amd64
~media-video/nvidia-video-codec-8.2.16 amd64
~media-video/obs-studio-25.0.8 amd64
~media-video/openshot-2.5.0 amd64
~media-video/openshot-2.5.1 amd64
~media-video/parole-1.0.5 amd64
~media-video/shotcut-20.07.11 amd64
~media-video/shotcut-20.10.31 amd64
~media-video/simplescreenrecorder-0.4.2 amd64
~media-video/smplayer-20.6.0 amd64
~net-analyzer/nmap-7.80 amd64
~net-analyzer/squid-graph-3.2 amd64
~net-firewall/nftables-0.9.4 amd64
~net-firewall/sanewall-1.1.6 amd64
~net-firewall/ufw-0.36 amd64
~net-fs/netatalk-3.1.12 amd64
@ -125,57 +108,53 @@ net-im/telegram-desktop-bin amd64
~net-im/vacuum-1.3.0_pre20180105 amd64
net-im/zoom amd64
~net-irc/hexchat-2.14.3 amd64
~net-libs/libbloom-1.5 amd64
~net-libs/libbloom-1.6 amd64
~net-libs/libcork-0.15.0 amd64
~net-libs/libcorkipset-1.1.1.20150311_p8 amd64
~net-misc/cmst-2020.05.09 amd64
~net-misc/cmst-2020.11.01 amd64
~net-misc/connman-gtk-1.1.1 amd64
~net-misc/connman-notify-0_pre20191003 amd64
~net-misc/minidlna-1.2.1 amd64
~net-misc/nextcloud-client-3.0.2 amd64
~net-misc/nextcloud-client-3.0.3 amd64
~net-misc/owncloud-client-2.6.3.14058 amd64
~net-misc/yandex-disk-0.1.5.978_p1 amd64
~net-nds/shelldap-1.5.1 amd64
~net-news/liferea-1.12.7 amd64
~net-print/epson-inkjet-printer-escpr-1.7.2 amd64
~net-news/liferea-1.12.9 amd64
~net-print/foo2zjs-20200221 amd64
~net-print/foomatic-db-4.0.20190226 amd64
~net-print/foomatic-db-engine-4.0.12 amd64
~net-print/foomatic-db-ppds-4.0.20190226 amd64
~net-print/gutenprint-5.3.3 amd64
~net-print/hplip-3.20.6 amd64
~net-print/hplip-plugin-3.20.6 amd64
~net-proxy/shadowsocks-libev-3.3.4 amd64
~net-print/hplip-3.20.9 amd64
~net-print/hplip-plugin-3.20.9 amd64
~net-proxy/shadowsocks-libev-3.3.5 amd64
~net-vpn/networkmanager-l2tp-1.8.2 amd64
~net-wireless/blueman-2.1.3 amd64
~net-wireless/broadcom-sta-6.30.223.271 amd64
~sci-electronics/kicad-5.1.6 amd64
~sci-electronics/kicad-footprints-5.1.6 amd64
~sci-electronics/kicad-i18n-5.1.6 amd64
~sci-electronics/kicad-meta-5.1.6 amd64
~sci-electronics/kicad-packages3d-5.1.6 amd64
~sci-electronics/kicad-symbols-5.1.6 amd64
~sci-electronics/kicad-templates-5.1.6 amd64
~sci-electronics/kicad-5.1.8 amd64
~sci-electronics/kicad-footprints-5.1.8 amd64
~sci-electronics/kicad-i18n-5.1.8 amd64
~sci-electronics/kicad-meta-5.1.8 amd64
~sci-electronics/kicad-packages3d-5.1.8 amd64
~sci-electronics/kicad-symbols-5.1.8 amd64
~sci-electronics/kicad-templates-5.1.8 amd64
~sci-electronics/ngspice-31 amd64
~sys-apps/collectl-4.3.1 amd64
~sys-apps/ethtool-5.8 amd64
~sys-apps/ethtool-5.9 amd64
sys-apps/inxi amd64
~sys-apps/iproute2-5.8.0 amd64
~sys-auth/fingerprint-gui-1.09 amd64
~sys-apps/iproute2-5.9.0 amd64
~sys-auth/thinkfinger-0.3 amd64
~sys-block/gparted-1.1.0 amd64
~sys-cluster/cluster-glue-1.0.12 amd64
~sys-cluster/ceph-14.2.13 amd64
~sys-cluster/cluster-glue-1.0.12 amd64
~sys-devel/prelink-20151030 amd64
~sys-firmware/b43-firmware-5.100.138 amd64
~sys-fs/bees-0.6.1 amd64
~sys-fs/btrfs-progs-5.7 amd64
~sys-fs/xfsprogs-5.8.0 amd64
~sys-fs/btrfs-progs-5.9 amd64
~sys-fs/xfsprogs-5.9.0 amd64
~sys-kernel/linux-headers-5.4 amd64
~sys-power/cpupower-5.4 amd64
~sys-process/atop-2.5.0 amd64
~sys-process/htop-2.2.0 amd64
~sys-process/htop-3.0.2 amd64
~sys-process/nmon-16m amd64
~www-apps/gitea-1.12.6 amd64
~www-client/falkon-3.1.0 amd64
~www-client/firefox-83.0 amd64
~www-client/luakit-2.2.1 amd64
@ -184,29 +163,26 @@ www-client/opera amd64
www-client/opera-beta amd64
www-client/opera-developer amd64
~www-client/otter-1.0.01 amd64
~www-client/qutebrowser-1.10.1 amd64
~www-client/qutebrowser-1.14.0 amd64
www-plugins/chrome-binary-plugins:stable amd64
~www-plugins/google-talkplugin-5.41.3.0 amd64
~x11-apps/copyq-3.10.0 amd64
~x11-misc/bumblebee-3.2.1_p20170130 amd64
~x11-apps/copyq-3.13.0 amd64
~x11-misc/cdm-0.7 amd64
~x11-misc/openbox-menu-0.8.0 amd64
~x11-misc/qlipper-5.1.2 amd64
~x11-misc/qxkb-0.5.1_pre20190821 amd64
~x11-misc/screengrab-2.0.0 amd64
~x11-misc/screengrab-2.1.0 amd64
~x11-misc/shutter-0.94.3_p20200621 amd64
~x11-misc/snixembed-0.2.2 amd64
~x11-misc/snixembed-0.3.0 amd64
~x11-misc/spacefm-1.0.6 amd64
~x11-misc/sunflower-0.4_p20200716 amd64
~x11-misc/sw-notify-send-1.2.1 amd64
~x11-misc/x11vnc-0.9.16 amd64
~x11-misc/xdg-utils-1.1.3 amd64
~x11-plugins/pidgin-bot-sentry-1.3.0 amd64
~x11-plugins/pidgin-gpg-0.9.3 amd64
~x11-plugins/pidgin-indicator-1.0 amd64
~x11-plugins/pidgin-led-notification-0.1 amd64
~x11-plugins/pidgin-mpris-0.2.6 amd64
~x11-terms/qterminal-0.14.1 amd64
~x11-themes/mate-themes-meta-3 amd64
~x11-themes/pidgin-penguins-smileys-1.0 amd64
~x11-themes/smplayer-skins-15.2.0 amd64

@ -1,17 +1,12 @@
~app-accessibility/caribou-0.4.21 amd64
~app-accessibility/speech-dispatcher-0.8.7 amd64
~app-admin/ansible-2.9.13 amd64
~app-admin/clustershell-1.8.3 amd64
~app-admin/denyhosts-3.0 amd64
~app-admin/elektra-0.8.20 amd64
~app-admin/needrestart-3.4 amd64
~app-admin/reportmagic-2.21 amd64
~app-admin/restart-services-0.15.2 amd64
~app-admin/socklog-2.1.0 amd64
~app-admin/watchfolder-0.3.3 amd64
~app-admin/webapp-config-1.55 amd64
~app-arch/bloscpack-0.16.0 amd64
~app-arch/ipkg-utils-1.7.050831 amd64
~app-arch/lcab-1.0_beta12 amd64
~app-arch/lzlib-1.11 amd64
~app-arch/lzma-9.20 amd64
@ -21,10 +16,7 @@
~app-arch/vimball-0.5.1 amd64
~app-backup/amanda-3.5.1 amd64
~app-backup/attic-0.16 amd64
~app-backup/borgbackup-1.1.9 amd64
~app-backup/borgweb-0.2.0 amd64
~app-backup/btrbk-0.27.0 amd64
~app-backup/bup-0.29.2 amd64
~app-backup/cdbackup-0.7.1 amd64
~app-backup/cpdup-1.18 amd64
~app-backup/hdup-2.0.14 amd64
@ -33,16 +25,12 @@
~app-backup/mylvmbackup-0.14 amd64
~app-backup/pdumpfs-1.3 amd64
~app-backup/rdedup-1.0.2 amd64
~app-backup/rdiff-backup-1.3.3 amd64
~app-backup/rdumpfs-0.1 amd64
~app-backup/rdup-1.1.15 amd64
~app-backup/rear-2.4 amd64
~app-backup/restic-0.9.5 amd64
~app-backup/simplebackup-1.8.1 amd64
~app-backup/snapper-0.8.7 amd64
~app-backup/tarsnap-1.0.39 amd64
~app-backup/tob-0.26 amd64
~app-backup/tsm-7.1.8.0 amd64
~app-backup/untangle-https-backup-0.0.10 amd64
~app-backup/vzdump-1.2 amd64
~app-backup/zbackup-1.4.4 amd64
@ -51,11 +39,9 @@
~app-crypt/acme-sh-2.8.7 amd64
~app-crypt/acr38u-1.7.11 amd64
~app-crypt/aescrypt-3.0.6b amd64
~app-crypt/af_alg-0.0.1 amd64
~app-crypt/asedriveiiie-serial-3.5 amd64
~app-crypt/asedriveiiie-usb-3.5 amd64
~app-crypt/asekey-3.7 amd64
~app-crypt/bestcrypt-2.0.14 amd64
~app-crypt/bsign-0.4.5 amd64
~app-crypt/cardpeek-0.7.2 amd64
~app-crypt/cfssl-1.3.2 amd64
@ -365,7 +351,7 @@
~app-misc/cadubi-1.3 amd64
~app-misc/carbon-c-relay-3.5 amd64
~app-misc/cbview-0.06 amd64
~app-misc/ckb-0.2.9 amd64
~app-misc/ckb-0.4.2 amd64
~app-misc/ckermit-9.0.302 amd64
~app-misc/crunch-3.6 amd64
~app-misc/dateutils-0.4.3 amd64
@ -620,7 +606,6 @@
~dev-libs/libindicator-12.10.1 amd64
~dev-libs/libkpass-6 amd64
~dev-libs/libplatform-2.1.0.1 amd64
~dev-libs/libqtxdg-3.3.1 amd64
~dev-libs/libsecp256k1-0.0.0_pre20151118 amd64
~dev-libs/libsodium-1.0.16 amd64
~dev-libs/libtecla-1.6.3 amd64
@ -747,7 +732,6 @@
~mail-filter/spampd-2.42 amd64
~mail-mta/netqmail-1.06 amd64
~media-gfx/farbfeld-4 amd64
~media-gfx/fontforge-20190317 amd64
~media-gfx/geeqie-1.4 amd64
~media-gfx/gnome-raw-thumbnailer-3.0.0 amd64
~media-gfx/imagemagick-6.9.11.34 amd64
@ -1142,7 +1126,6 @@ net-vpn/wireguard-tools amd64
~x11-libs/libtinynotify-0.2.1 amd64
~x11-libs/libtinynotify-cli-1.2.1 amd64
~x11-libs/libtinynotify-systemwide-0.1 amd64
~x11-libs/qtermwidget-0.14.1 amd64
~x11-libs/xapps-1.8.9 amd64
~x11-misc/accessx-0951 amd64
~x11-misc/bbacpi-0.1.5 amd64

@ -1,20 +1,19 @@
~games-action/0verkill-0.16 amd64
~games-action/abuse-0.9_p20181213 amd64
~games-action/armagetronad-0.2.8.3.3 amd64
~games-action/atanks-6.4 amd64
~games-action/atanks-6.5 amd64
~games-action/barrage-1.0.4 amd64
~games-action/battalion-1.4b amd64
~games-action/beathazardultra-20130308 amd64
~games-action/bomberclone-0.11.9 amd64
~games-action/brutal-legend-20130615 amd64
~games-action/bzflag-2.4.18 amd64
~games-action/bzflag-2.4.20 amd64
~games-action/chromium-bsu-0.9.15.1 amd64
~games-action/d1x-rebirth-0.58.1 amd64
~games-action/deathchase3d-0.9 amd64
~games-action/descent1-demodata-1.4 amd64
~games-action/descent2-demodata-1.0 amd64
~games-action/descent3-demo-1.4.0a amd64
~games-action/extreme-tuxracer-0.7.4 amd64
~games-action/extreme-tuxracer-0.7.5 amd64
~games-action/fakk2-1.02 amd64
~games-action/formido-1.0.1 amd64
~games-action/garden-1.0.9 amd64
@ -32,21 +31,17 @@
~games-action/maelstrom-3.0.6 amd64
~games-action/minetest-5.3.0 amd64
~games-action/moon-buggy-1.0.51 amd64
~games-action/mutantstorm-demo-1.33 amd64
~games-action/nighthawk-2.2 amd64
~games-action/noiz2sa-0.51a amd64
~games-action/openastromenace-1.3.2 amd64
~games-action/openclonk-7.0 amd64
~games-action/orbital-eunuchs-sniper-1.30 amd64
~games-action/powermanga-0.93.1 amd64
~games-action/rrootage-0.23a amd64
~games-action/rune-1.07 amd64
~games-action/shootingstar-1.2.0 amd64
~games-action/snipes-1.0.4 amd64
~games-action/solar2-1.10 amd64
~games-action/spacearyarya-kxl-1.0.2 amd64
~games-action/super-hexagon-20160217 amd64
~games-action/supertuxkart-1.1 amd64
~games-action/supertuxkart-1.2 amd64
~games-action/swordandsworcery-1.02 amd64
~games-action/teeworlds-0.7.5 amd64
~games-action/towbowl-tactics-0.5 amd64
@ -125,7 +120,7 @@
~games-arcade/retrobattle-1.0.0 amd64
~games-arcade/ri-li-2.0.1 amd64
~games-arcade/rockdodger-0.6.0a amd64
~games-arcade/rocksndiamonds-4.1.0.0 amd64
~games-arcade/rocksndiamonds-4.1.4.1 amd64
~games-arcade/sable-1.0 amd64
~games-arcade/sdb-1.0.2 amd64
~games-arcade/sdlroids-1.3.4 amd64
@ -165,15 +160,13 @@
~games-board/blokish-0.9.4 amd64
~games-board/camato-0.7.4 amd64
~games-board/cgoban-1.9.14 amd64
~games-board/chessx-1.4.6 amd64
~games-board/chessx-1.5.4 amd64
~games-board/cockatrice-20190304 amd64
~games-board/crafty-24.1 amd64
~games-board/domination-1.1.1.6 amd64
~games-board/eboard-1.1.1 amd64
~games-board/freedoko-0.7.16 amd64
~games-board/fruit-2.1 amd64
~games-board/gnome-hearts-0.3.1 amd64
~games-board/gnono-1.9.1 amd64
~games-board/gnubg-1.06.002 amd64
~games-board/gnuchess-book-1.02 amd64
~games-board/gnushogi-1.4.1 amd64
@ -185,7 +178,6 @@
~games-board/maitretarot-0.1.98 amd64
~games-board/megamek-0.34.10 amd64
~games-board/mt_dolphin_ia-0.1.98 amd64
~games-board/mt_gtk_client-0.1.98 amd64
~games-board/openyahtzee-1.9.3 amd64
~games-board/pasang-emas-3.1.0 amd64
~games-board/peg-e-1.2.8 amd64
@ -194,10 +186,7 @@
~games-board/pokerth-1.1.2 amd64
~games-board/scid-4.6.2 amd64
~games-board/simsu-1.3.9 amd64
~games-board/sirius-0.8.0 amd64
~games-board/sjeng-11.2_p8_p1 amd64
~games-board/spider-1.2_p4 amd64
~games-board/teg-0.11.2 amd64
~games-board/tetzle-2.1.3 amd64
~games-board/xboard-4.9.1 amd64
~games-board/xfreecell-1.0.5b amd64
@ -210,19 +199,17 @@
~games-emulation/advancescan-1.16 amd64
~games-emulation/atari800-4.2.0 amd64
~games-emulation/desmume-0.9.11 amd64
~games-emulation/dosbox-staging-0.75.2 amd64
~games-emulation/emutos-0.9.12 amd64
~games-emulation/fakenes-0.5.8 amd64
~games-emulation/fbzx-2.10.0 amd64
~games-emulation/fbzx-3.0.0 amd64
~games-emulation/fceux-2.2.3 amd64
~games-emulation/gambatte-0.5.0_p20131102 amd64
~games-emulation/gcube-0.4 amd64
~games-emulation/generator-0.35_p4 amd64
~games-emulation/gens-2.15.5 amd64
~games-emulation/gngb-20060309 amd64
~games-emulation/gnuboy-1.0.3 amd64
~games-emulation/hatari-2.2.1 amd64
~games-emulation/higan-106 amd64
~games-emulation/higan-106_p1 amd64
~games-emulation/m64py-0.2.5 amd64
~games-emulation/mamory-0.2.25 amd64
~games-emulation/mastergear-bin-4.5 amd64
@ -237,20 +224,18 @@
~games-emulation/mupen64plus-video-rice-2.5.9 amd64
~games-emulation/nestopia-1.47_p20170105 amd64
~games-emulation/nestra-0.66 amd64
~games-emulation/openmsx-0.14.0 amd64
~games-emulation/snes9x-1.59.2 amd64
~games-emulation/snes9x-1.60 amd64
~games-emulation/vbam-2.1.4 amd64
~games-emulation/vgba-4.8 amd64
~games-emulation/zinc-1.1 amd64
~games-emulation/zsnes-1.51 amd64
~games-engines/gargoyle-2011.1 amd64
~games-engines/gemrb-0.8.3 amd64
~games-engines/love-11.1 amd64
~games-engines/love-11.3 amd64
~games-engines/nazghul-0.7.1 amd64
~games-engines/openxcom-1.0.0_p20180317 amd64
~games-engines/residualvm-0.3.1 amd64
~games-engines/scummvm-2.1.2 amd64
~games-engines/scummvm-tools-2.1.0 amd64
~games-engines/scummvm-2.2.0 amd64
~games-engines/scummvm-tools-2.2.0 amd64
~games-engines/solarus-1.3.1 amd64
~games-engines/xzip-1.8.2 amd64
~games-engines/zoom-1.1.5 amd64
@ -277,13 +262,11 @@
~games-fps/turtlearena-0.6.1 amd64
~games-fps/ut2003-demo-2206 amd64
~games-fps/wolfgl-0.93 amd64
~games-kids/childsplay-0.90.2 amd64
~games-kids/gcompris-0.97 amd64
~games-kids/gmult-8.0 amd64
~games-kids/lletters-0.1.95 amd64
~games-kids/memonix-1.6 amd64
~games-kids/tuxmath-2.0.3 amd64
~games-kids/tuxmathscrabble-0.8.1 amd64
~games-kids/tuxtype-1.8.3 amd64
~games-misc/asr-manpages-1.3_rc6 amd64
~games-misc/bsd-games-2.17 amd64
@ -296,7 +279,6 @@
~games-misc/fortune-mod-cs-1.6.9 amd64
~games-misc/fortune-mod-flashrider-1.10 amd64
~games-misc/fortune-mod-fvl-20030120 amd64
~games-misc/fortune-mod-humorixfortunes-1.4 amd64
~games-misc/fortune-mod-it-1.99 amd64
~games-misc/fortune-mod-kernelcookies-9 amd64
~games-misc/fortune-mod-mormon-1.1.0 amd64
@ -331,7 +313,6 @@
~games-mud/gmudix-1.0 amd64
~games-mud/gnome-mud-0.11.2 amd64
~games-mud/kildclient-3.0.1 amd64
~games-mud/lyntin-4.2 amd64
~games-mud/mudix-4.3 amd64
~games-mud/powwow-1.2.16 amd64
~games-mud/tintin-2.01.8 amd64
@ -363,7 +344,6 @@
~games-puzzle/gnurobbo-0.68 amd64
~games-puzzle/gottet-1.1.9 amd64
~games-puzzle/greedy-0.2.0 amd64
~games-puzzle/gtetrinet-0.7.11 amd64
~games-puzzle/gtkballs-3.1.5 amd64
~games-puzzle/gweled-0.9.1 amd64
~games-puzzle/hangman-0.9.2 amd64

@ -1,23 +1,27 @@
~dev-util/lxqt-build-tools-0.6.0 amd64
<lxqt-base/liblxqt-0.15 amd64
<lxqt-base/liblxqt-mount-0.15 amd64
<lxqt-base/lxqt-about-0.15 amd64
<lxqt-base/lxqt-admin-0.15 amd64
<lxqt-base/lxqt-common-0.15 amd64
<lxqt-base/lxqt-config-0.15 amd64
<lxqt-base/lxqt-globalkeys-0.15 amd64
<lxqt-base/lxqt-l10n-0.15 amd64
<lxqt-base/lxqt-meta-0.15 amd64
<lxqt-base/lxqt-notificationd-0.15 amd64
<lxqt-base/lxqt-openssh-askpass-0.15 amd64
<lxqt-base/lxqt-panel-0.15 amd64
<lxqt-base/lxqt-policykit-0.15 amd64
<lxqt-base/lxqt-powermanagement-0.15 amd64
<lxqt-base/lxqt-qtplugin-0.15 amd64
<lxqt-base/lxqt-runner-0.15 amd64
<lxqt-base/lxqt-session-0.15 amd64
<lxqt-base/lxqt-sudo-0.15 amd64
<x11-libs/libfm-qt-0.15 amd64
<x11-misc/obconf-qt-0.15.0 amd64
<x11-misc/pcmanfm-qt-0.15 amd64
<x11-themes/lxqt-themes-0.15 amd64
~app-arch/lxqt-archiver-0.3.0 amd64
~dev-libs/libqtxdg-3.6.0 amd64
~dev-util/lxqt-build-tools-0.8.0 amd64
<lxqt-base/liblxqt-0.17 amd64
<lxqt-base/liblxqt-mount-0.17 amd64
<lxqt-base/lxqt-about-0.17 amd64
<lxqt-base/lxqt-admin-0.17 amd64
<lxqt-base/lxqt-common-0.17 amd64
<lxqt-base/lxqt-config-0.17 amd64
<lxqt-base/lxqt-globalkeys-0.17 amd64
<lxqt-base/lxqt-l10n-0.17 amd64
<lxqt-base/lxqt-meta-0.17 amd64
<lxqt-base/lxqt-notificationd-0.17 amd64
<lxqt-base/lxqt-openssh-askpass-0.17 amd64
<lxqt-base/lxqt-panel-0.17 amd64
<lxqt-base/lxqt-policykit-0.17 amd64
<lxqt-base/lxqt-powermanagement-0.17 amd64
<lxqt-base/lxqt-qtplugin-0.17 amd64
<lxqt-base/lxqt-runner-0.17 amd64
<lxqt-base/lxqt-session-0.17 amd64
<lxqt-base/lxqt-sudo-0.17 amd64
<x11-libs/libfm-qt-0.17 amd64
<x11-libs/qtermwidget-0.17 amd64
<x11-misc/obconf-qt-0.17.0 amd64
<x11-misc/pcmanfm-qt-0.17 amd64
<x11-terms/qterminal-0.17 amd64
<x11-themes/lxqt-themes-0.17 amd64

@ -44,12 +44,18 @@ clean_contents_mark() {
# mark: package updating
mark_update_package() {
touch "/var/lib/calculate/-merge-$PN--${SLOT/\/*}-$PPID"
if [[ -d /var/lib/calculate ]]
then
touch "/var/lib/calculate/-merge-$PN--${SLOT/\/*}-$PPID"
fi
}
# save services runlevels
save_runlevels() {
find /etc/runlevels/{default,boot,sysinit,shutdown} >/var/lib/calculate/-runlevels-$PN
if [[ -d /var/lib/calculate ]]
then
find /etc/runlevels/{default,boot,sysinit,shutdown} >/var/lib/calculate/-runlevels-$PN
fi
}
# dispatching unmerge or update package
@ -84,7 +90,10 @@ pkg_postrm_unmerge() {
# save contents file for correct package updating by cl-core-setup
pkg_postrm_update() {
cp /var/db/pkg/${CATEGORY}/${PF}/CONTENTS /var/lib/calculate/-CONTENTS-$PN
if [[ -d /var/lib/calculate ]]
then
cp /var/db/pkg/${CATEGORY}/${PF}/CONTENTS /var/lib/calculate/-CONTENTS-$PN
fi
}
pre_pkg_postrm() {

@ -1,33 +1,51 @@
# Calculate format=kde path=/usr/share/plymouth/themes/calculate
# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)>=0.9.5
[Plymouth Theme]
Name=Calculate
Description=Simple theme that shows progressbar, image and text for shutdown
Description=Calculate spinner theme
ModuleName=calculate
[calculate]
ImageDir=/usr/share/plymouth/themes/calculate
BootBackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
BootBackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
ShutdownBackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
ShutdownBackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
!ShutdownProgressbarColor=
!BootProgressbarColor=
[boot-up]
BackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
BackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==background#
BootImage=/usr/share/plymouth/themes/calculate/boot
WatermarkImage=/usr/share/plymouth/themes/calculate/boot
#ini#
#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==logo#
BootImage=/usr/share/plymouth/themes/calculate/boot.png
WatermarkImage=/usr/share/plymouth/themes/calculate/boot.png
#ini#
#?ini(theme.splash-silent-picture)==||exists(#-ini(theme.splash-silent-picture)-#)==#
!BootImage=
!WatermarkImage
#ini#
[shutdown]
BackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
BackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
#ini#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown.png
#ini#
#?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
!WatermarkImage=
#ini#
TitleColor=0x#-ini(theme.splash-shutdown-text-color)-#
Title=S h u t t i n g d o w n
[reboot]
BackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
BackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
#ini#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown.png
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown.png
#ini#
#?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
!ShutdownImage=
!WatermarkImage=
#ini#
ShutdownTextColor=0x#-ini(theme.splash-shutdown-text-color)-#
TitleColor=0x#-ini(theme.splash-shutdown-text-color)-#
Title=S h u t t i n g d o w n

@ -0,0 +1,33 @@
# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)<0.9.5 name=calculate.plymouth
[Plymouth Theme]
Name=Calculate
Description=Simple theme that shows progressbar, image and text for shutdown
ModuleName=calculate
[calculate]
ImageDir=/usr/share/plymouth/themes/calculate
BootBackgroundStartColor=0x#-ini(theme.splash-silent-background-color-begin)-#
BootBackgroundEndColor=0x#-ini(theme.splash-silent-background-color-end)-#
ShutdownBackgroundStartColor=0x#-ini(theme.splash-shutdown-background-color-begin)-#
ShutdownBackgroundEndColor=0x#-ini(theme.splash-shutdown-background-color-end)-#
!ShutdownProgressbarColor=
!BootProgressbarColor=
#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==background#
BootImage=/usr/share/plymouth/themes/calculate/boot
#ini#
#?ini(theme.splash-silent-picture)!=&&ini(theme.splash-silent-type)==logo#
BootImage=/usr/share/plymouth/themes/calculate/boot.png
#ini#
#?ini(theme.splash-silent-picture)==||exists(#-ini(theme.splash-silent-picture)-#)==#
!BootImage=
#ini#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==background#
ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown
#ini#
#?ini(theme.splash-shutdown-picture)!=&&ini(theme.splash-shutdown-type)==logo#
ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown.png
#ini#
#?ini(theme.splash-shutdown-picture)==||exists(#-ini(theme.splash-shutdown-picture)-#)==#
!ShutdownImage=
#ini#
ShutdownTextColor=0x#-ini(theme.splash-shutdown-text-color)-#

@ -1,12 +1,26 @@
# Calculate format=kde path=/usr/share/plymouth/themes/calculate
# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)>=0.9.5 name=calculate.plymouth
[calculate]
Font=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*16/1080,km)-#
TitleFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#
[shutdown]
#?os_install_locale_lang==ru_RU#
ShutdownText=З а в е р ш е н и е р а б о т ы
Title=З а в е р ш е н и е р а б о т ы
#os_install_locale_lang#
#?os_install_locale_lang==fr_FR#
ShutdownText=A r r ê t e n c o u r s
Title=A r r ê t e n c o u r s
#os_install_locale_lang#
#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
ShutdownText=S h u t t i n g d o w n
Title=S h u t t i n g d o w n
#os_install_locale_lang#
[reboot]
#?os_install_locale_lang==ru_RU#
Title=З а в е р ш е н и е р а б о т ы
#os_install_locale_lang#
#?os_install_locale_lang==fr_FR#
Title=A r r ê t e n c o u r s
#os_install_locale_lang#
#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
Title=S h u t t i n g d o w n
#os_install_locale_lang#
ShutdownFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#

@ -0,0 +1,12 @@
# Calculate format=kde path=/usr/share/plymouth/themes/calculate pkg(sys-boot/plymouth-calculate-plugin)<0.9.5 name=calculate.plymouth
[calculate]
#?os_install_locale_lang==ru_RU#
ShutdownText=З а в е р ш е н и е р а б о т ы
#os_install_locale_lang#
#?os_install_locale_lang==fr_FR#
ShutdownText=A r r ê t e n c o u r s
#os_install_locale_lang#
#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
ShutdownText=S h u t t i n g d o w n
#os_install_locale_lang#
ShutdownFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,yres*20/1080,km)-#

@ -0,0 +1,188 @@
# Calculate format=diff merge(sys-boot/plymouth)<0.9.5
commit 4ec46d8b9a1fdd4eb791013bae98e4ca34b412de
Author: Mir Calculate <support@calculate.ru>
Date: Wed Feb 13 15:35:50 2019 +0300
Изменён порядок инициализации framebuffer для plymouth
Добавлена переменная конфигурационного файла
FBDeviceTimeout, по истечении которого plymouth будет ожидать не только DRM
устройства, но и framebuffer. По истечении DeviceTimeout plymouth будет
запущен для text mode.
diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 55248ac..4350324 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -39,12 +39,14 @@
#include "ply-hashtable.h"
#include "ply-list.h"
#include "ply-utils.h"
+#include <math.h>
#define SUBSYSTEM_DRM "drm"
#define SUBSYSTEM_FRAME_BUFFER "graphics"
#ifdef HAVE_UDEV
static void create_devices_from_udev (ply_device_manager_t *manager);
+static void create_fb_devices_from_udev (ply_device_manager_t *manager);
#endif
static bool create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
@@ -81,6 +83,7 @@ struct _ply_device_manager
uint32_t paused : 1;
uint32_t device_timeout_elapsed : 1;
+ uint32_t fb_device_timeout_elapsed : 1;
};
static void
@@ -361,7 +364,12 @@ on_udev_event (ply_device_manager_t *manager)
ply_trace ("ignoring since we're already using text splash for local console");
else
create_devices_for_udev_device (manager, device);
- } else {
+ } else if (manager->fb_device_timeout_elapsed && strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0){
+ if (manager->local_console_managed && manager->local_console_is_text)
+ ply_trace ("ignoring since we're already using text splash for local console");
+ else
+ create_devices_for_udev_device (manager, device);
+ } else {
ply_trace ("ignoring since we only handle subsystem %s devices after timeout", subsystem);
}
} else if (strcmp (action, "remove") == 0) {
@@ -539,6 +547,9 @@ ply_device_manager_free (ply_device_manager_t *manager)
ply_event_loop_stop_watching_for_timeout (manager->loop,
(ply_event_loop_timeout_handler_t)
create_devices_from_udev, manager);
+ ply_event_loop_stop_watching_for_timeout (manager->loop,
+ (ply_event_loop_timeout_handler_t)
+ create_fb_devices_from_udev, manager);
if (manager->udev_monitor != NULL)
udev_monitor_unref (manager->udev_monitor);
@@ -838,6 +849,24 @@ create_devices_from_udev (ply_device_manager_t *manager)
ply_trace ("Creating non-graphical devices, since there's no suitable graphics hardware");
create_non_graphical_devices (manager);
}
+
+static void
+create_fb_devices_from_udev (ply_device_manager_t *manager)
+{
+ bool found_drm_device, found_fb_device;
+
+ manager->fb_device_timeout_elapsed = true;
+
+ if (manager->paused) {
+ ply_trace ("create_fb_devices_from_udev timeout elapsed while paused, deferring execution");
+ return;
+ }
+
+ ply_trace ("Timeout elapsed, looking for framebuffer devices from udev");
+
+ found_drm_device = create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
+ found_fb_device = create_devices_for_subsystem (manager, SUBSYSTEM_FRAME_BUFFER);
+}
#endif
static void
@@ -851,6 +880,7 @@ create_fallback_devices (ply_device_manager_t *manager)
void
ply_device_manager_watch_devices (ply_device_manager_t *manager,
+ double fb_device_timeout,
double device_timeout,
ply_keyboard_added_handler_t keyboard_added_handler,
ply_keyboard_removed_handler_t keyboard_removed_handler,
@@ -870,6 +900,9 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
manager->text_display_removed_handler = text_display_removed_handler;
manager->event_handler_data = data;
+ if (isnan (fb_device_timeout))
+ fb_device_timeout = 5;
+
/* Try to create devices for each serial device right away, if possible
*/
done_with_initial_devices_setup = create_devices_from_terminals (manager);
@@ -892,6 +925,10 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
#ifdef HAVE_UDEV
watch_for_udev_events (manager);
create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
+ ply_event_loop_watch_for_timeout (manager->loop,
+ fb_device_timeout,
+ (ply_event_loop_timeout_handler_t)
+ create_fb_devices_from_udev, manager);
ply_event_loop_watch_for_timeout (manager->loop,
device_timeout,
(ply_event_loop_timeout_handler_t)
@@ -1035,6 +1072,10 @@ ply_device_manager_unpause (ply_device_manager_t *manager)
ply_trace ("ply_device_manager_unpause() called, resuming watching for udev events");
manager->paused = false;
#ifdef HAVE_UDEV
+ if (manager->fb_device_timeout_elapsed) {
+ ply_trace ("ply_device_manager_unpause(): timeout elapsed while paused, looking for framebuffer udev devices");
+ create_fb_devices_from_udev (manager);
+ }
if (manager->device_timeout_elapsed) {
ply_trace ("ply_device_manager_unpause(): timeout elapsed while paused, looking for udev devices");
create_devices_from_udev (manager);
diff --git a/src/libply-splash-core/ply-device-manager.h b/src/libply-splash-core/ply-device-manager.h
index 389b636..37198a2 100644
--- a/src/libply-splash-core/ply-device-manager.h
+++ b/src/libply-splash-core/ply-device-manager.h
@@ -47,6 +47,7 @@ typedef void (* ply_text_display_removed_handler_t) (void *, ply_text_display_t
ply_device_manager_t *ply_device_manager_new (const char *default_tty,
ply_device_manager_flags_t flags);
void ply_device_manager_watch_devices (ply_device_manager_t *manager,
+ double fb_device_timeout,
double device_timeout,
ply_keyboard_added_handler_t keyboard_added_handler,
ply_keyboard_removed_handler_t keyboard_removed_handler,
diff --git a/src/main.c b/src/main.c
index ddc1883..f8f980c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,6 +103,7 @@ typedef struct
double start_time;
double splash_delay;
double device_timeout;
+ double fb_device_timeout;
uint32_t no_boot_log : 1;
uint32_t showing_details : 1;
@@ -340,6 +341,19 @@ load_settings (state_t *state,
}
}
+ if (isnan (state->fb_device_timeout)) {
+ char *timeout_string;
+
+ timeout_string = ply_key_file_get_value (key_file, "Daemon", "FBDeviceTimeout");
+
+ if (timeout_string != NULL) {
+ state->fb_device_timeout = atof (timeout_string);
+ ply_trace ("Framebuffer device timeout is set to %lf", state->fb_device_timeout);
+
+ free (timeout_string);
+ }
+ }
+
scale_string = ply_key_file_get_value (key_file, "Daemon", "DeviceScale");
if (scale_string != NULL) {
@@ -1100,6 +1114,7 @@ load_devices (state_t *state,
state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
ply_device_manager_watch_devices (state->device_manager,
+ state->fb_device_timeout,
state->device_timeout,
(ply_keyboard_added_handler_t)
on_keyboard_added,
@@ -2269,6 +2284,7 @@ main (int argc,
state.progress = ply_progress_new ();
state.splash_delay = NAN;
state.device_timeout = NAN;
+ state.fb_device_timeout = NAN;
ply_progress_load_cache (state.progress,
get_cache_file_for_mode (state.mode));

@ -1,17 +1,6 @@
# Calculate format=diff
commit 4ec46d8b9a1fdd4eb791013bae98e4ca34b412de
Author: Mir Calculate <support@calculate.ru>
Date: Wed Feb 13 15:35:50 2019 +0300
Изменён порядок инициализации framebuffer для plymouth
Добавлена переменная конфигурационного файла
FBDeviceTimeout, по истечении которого plymouth будет ожидать не только DRM
устройства, но и framebuffer. По истечении DeviceTimeout plymouth будет
запущен для text mode.
# Calculate format=diff merge(sys-boot/plymouth)>=0.9.5
diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 55248ac..4350324 100644
index f65d731..954a241 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -39,12 +39,14 @@
@ -29,29 +18,29 @@ index 55248ac..4350324 100644
#endif
static bool create_devices_for_terminal_and_renderer_type (ply_device_manager_t *manager,
@@ -81,6 +83,7 @@ struct _ply_device_manager
@@ -84,6 +86,7 @@ struct _ply_device_manager
uint32_t paused : 1;
uint32_t device_timeout_elapsed : 1;
+ uint32_t fb_device_timeout_elapsed : 1;
+ uint32_t fb_device_timeout_elapsed : 1;
uint32_t found_drm_device : 1;
uint32_t found_fb_device : 1;
};
static void
@@ -361,7 +364,12 @@ on_udev_event (ply_device_manager_t *manager)
@@ -442,7 +445,12 @@ on_udev_event (ply_device_manager_t *manager)
ply_trace ("ignoring since we're already using text splash for local console");
else
create_devices_for_udev_device (manager, device);
on_drm_udev_add_or_change (manager, action, device);
- } else {
+ } else if (manager->fb_device_timeout_elapsed && strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0){
+ if (manager->local_console_managed && manager->local_console_is_text)
+ ply_trace ("ignoring since we're already using text splash for local console");
+ else
+ create_devices_for_udev_device (manager, device);
+ on_drm_udev_add_or_change (manager, action, device);
+ } else {
ply_trace ("ignoring since we only handle subsystem %s devices after timeout", subsystem);
}
} else if (strcmp (action, "remove") == 0) {
@@ -539,6 +547,9 @@ ply_device_manager_free (ply_device_manager_t *manager)
@@ -620,6 +628,9 @@ ply_device_manager_free (ply_device_manager_t *manager)
ply_event_loop_stop_watching_for_timeout (manager->loop,
(ply_event_loop_timeout_handler_t)
create_devices_from_udev, manager);
@ -61,7 +50,7 @@ index 55248ac..4350324 100644
if (manager->udev_monitor != NULL)
udev_monitor_unref (manager->udev_monitor);
@@ -838,6 +849,24 @@ create_devices_from_udev (ply_device_manager_t *manager)
@@ -917,6 +928,22 @@ create_devices_from_udev (ply_device_manager_t *manager)
ply_trace ("Creating non-graphical devices, since there's no suitable graphics hardware");
create_non_graphical_devices (manager);
}
@ -69,8 +58,6 @@ index 55248ac..4350324 100644
+static void
+create_fb_devices_from_udev (ply_device_manager_t *manager)
+{
+ bool found_drm_device, found_fb_device;
+
+ manager->fb_device_timeout_elapsed = true;
+
+ if (manager->paused) {
@ -80,31 +67,31 @@ index 55248ac..4350324 100644
+
+ ply_trace ("Timeout elapsed, looking for framebuffer devices from udev");
+
+ found_drm_device = create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
+ found_fb_device = create_devices_for_subsystem (manager, SUBSYSTEM_FRAME_BUFFER);
+ create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
+ create_devices_for_subsystem (manager, SUBSYSTEM_FRAME_BUFFER);
+}
#endif
static void
@@ -851,6 +880,7 @@ create_fallback_devices (ply_device_manager_t *manager)
@@ -930,6 +957,7 @@ create_fallback_devices (ply_device_manager_t *manager)
void
ply_device_manager_watch_devices (ply_device_manager_t *manager,
+ double fb_device_timeout,
+ double fb_device_timeout,
double device_timeout,
ply_keyboard_added_handler_t keyboard_added_handler,
ply_keyboard_removed_handler_t keyboard_removed_handler,
@@ -870,6 +900,9 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
@@ -949,6 +977,9 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
manager->text_display_removed_handler = text_display_removed_handler;
manager->event_handler_data = data;
+ if (isnan (fb_device_timeout))
+ fb_device_timeout = 5;
+ if (isnan (fb_device_timeout))
+ fb_device_timeout = 5;
+
/* Try to create devices for each serial device right away, if possible
*/
done_with_initial_devices_setup = create_devices_from_terminals (manager);
@@ -892,6 +925,10 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
@@ -971,6 +1002,10 @@ ply_device_manager_watch_devices (ply_device_manager_t *manager,
#ifdef HAVE_UDEV
watch_for_udev_events (manager);
create_devices_for_subsystem (manager, SUBSYSTEM_DRM);
@ -115,12 +102,12 @@ index 55248ac..4350324 100644
ply_event_loop_watch_for_timeout (manager->loop,
device_timeout,
(ply_event_loop_timeout_handler_t)
@@ -1035,6 +1072,10 @@ ply_device_manager_unpause (ply_device_manager_t *manager)
@@ -1114,6 +1149,10 @@ ply_device_manager_unpause (ply_device_manager_t *manager)
ply_trace ("ply_device_manager_unpause() called, resuming watching for udev events");
manager->paused = false;
#ifdef HAVE_UDEV
+ if (manager->fb_device_timeout_elapsed) {
+ ply_trace ("ply_device_manager_unpause(): timeout elapsed while paused, looking for framebuffer udev devices");
+ ply_trace ("ply_device_manager_unpause(): timeout elapsed while paused, looking for udev devices");
+ create_fb_devices_from_udev (manager);
+ }
if (manager->device_timeout_elapsed) {
@ -139,10 +126,10 @@ index 389b636..37198a2 100644
ply_keyboard_added_handler_t keyboard_added_handler,
ply_keyboard_removed_handler_t keyboard_removed_handler,
diff --git a/src/main.c b/src/main.c
index ddc1883..f8f980c 100644
index 850c3b0..13c9272 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,6 +103,7 @@ typedef struct
@@ -97,6 +97,7 @@ typedef struct
double start_time;
double splash_delay;
double device_timeout;
@ -150,7 +137,7 @@ index ddc1883..f8f980c 100644
uint32_t no_boot_log : 1;
uint32_t showing_details : 1;
@@ -340,6 +341,19 @@ load_settings (state_t *state,
@@ -317,6 +318,19 @@ load_settings (state_t *state,
}
}
@ -170,7 +157,7 @@ index ddc1883..f8f980c 100644
scale_string = ply_key_file_get_value (key_file, "Daemon", "DeviceScale");
if (scale_string != NULL) {
@@ -1100,6 +1114,7 @@ load_devices (state_t *state,
@@ -1096,6 +1110,7 @@ load_devices (state_t *state,
state->local_console_terminal = ply_device_manager_get_default_terminal (state->device_manager);
ply_device_manager_watch_devices (state->device_manager,
@ -178,7 +165,7 @@ index ddc1883..f8f980c 100644
state->device_timeout,
(ply_keyboard_added_handler_t)
on_keyboard_added,
@@ -2269,6 +2284,7 @@ main (int argc,
@@ -2244,6 +2259,7 @@ main (int argc,
state.progress = ply_progress_new ();
state.splash_delay = NAN;
state.device_timeout = NAN;

@ -0,0 +1,23 @@
# Calculate format=diff merge(sys-boot/plymouth)<0.9.5
commit c0e512de2352611112c5476e0032514e2b2d713c
Author: Mir Calculate <support@calculate.ru>
Date: Tue Feb 19 12:17:41 2019 +0300
Добавлена возможность указать запуск splash только для shutdown
diff --git a/src/main.c b/src/main.c
index f8f980c..c702c10 100644
--- a/src/main.c
+++ b/src/main.c
@@ -916,6 +916,11 @@ plymouth_should_show_default_splash (state_t *state)
return true;
}
+ if (ply_kernel_command_line_has_argument ("splash=shutdown") && state->mode == PLY_MODE_SHUTDOWN) {
+ ply_trace ("using default splash because kernel command line has option \"splash=shutdown\"");
+ return true;
+ }
+
if (ply_kernel_command_line_has_argument ("splash=silent")) {
ply_trace ("using default splash because kernel command line has option \"splash=silent\"");
return true;

@ -1,4 +1,4 @@
# Calculate format=diff
# Calculate format=diff pkg(sys-boot/plymouth)>=0.9.5
commit c0e512de2352611112c5476e0032514e2b2d713c
Author: Mir Calculate <support@calculate.ru>
Date: Tue Feb 19 12:17:41 2019 +0300
@ -13,7 +13,7 @@ index f8f980c..c702c10 100644
return true;
}
+ if (ply_kernel_command_line_has_argument ("splash=shutdown") && state->mode == PLY_MODE_SHUTDOWN) {
+ if (ply_kernel_command_line_has_argument ("splash=shutdown") && state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN) {
+ ply_trace ("using default splash because kernel command line has option \"splash=shutdown\"");
+ return true;
+ }

@ -1 +1,2 @@
DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9

@ -0,0 +1,74 @@
[Plymouth Theme]
Name=Calculate
Description=Calculate spinner theme
ModuleName=calculate
[calculate]
Font=DroidSans 12
TitleFont=DroidSans 30
ImageDir=/usr/share/plymouth/themes/calculate
DialogHorizontalAlignment=.5
DialogVerticalAlignment=.382
TitleHorizontalAlignment=.5
TitleVerticalAlignment=.5
HorizontalAlignment=.5
VerticalAlignment=.5
WatermarkHorizontalAlignment=.5
WatermarkVerticalAlignment=.5
Transition=none
TransitionDuration=0.0
BackgroundStartColor=0x000000
BackgroundEndColor=0x000000
ProgressBarBackgroundColor=0x606060
ProgressBarForegroundColor=0xffffff
DialogClearsFirmwareBackground=true
MessageBelowAnimation=true
[boot-up]
UseEndAnimation=false
UseFirmwareBackground=false
VerticalAlignmentType=below_watermark
VerticalAlignment=.0
WatermarkImage=/usr/share/plymouth/themes/calculate/boot.png
[shutdown]
UseEndAnimation=false
UseFirmwareBackground=false
Title=Shutdown...
TitleColor=0xaaaaaa
VerticalAlignment=.0
VerticalAlignmentType=below_title
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
[reboot]
UseEndAnimation=false
UseFirmwareBackground=false
Title=Reboot...
TitleColor=0xaaaaaa
VerticalAlignment=.0
VerticalAlignmentType=below_title
WatermarkImage=/usr/share/plymouth/themes/calculate/.shutdown
[updates]
UseFirmwareBackground=false
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Installing Updates...
SubTitle=Do not turn off your computer
[system-upgrade]
UseFirmwareBackground=false
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading System...
SubTitle=Do not turn off your computer
[firmware-upgrade]
UseFirmwareBackground=false
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading Firmware...
SubTitle=Do not turn off your computer

File diff suppressed because it is too large Load Diff

@ -0,0 +1,98 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
MY_P=plymouth-${PV}
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
else
SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${MY_P}.tar.xz"
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
fi
inherit autotools readme.gentoo-r1 systemd toolchain-funcs
DESCRIPTION="Calculate plugin for plymouth"
HOMEPAGE="https://www.calculate-linux.org"
LICENSE="GPL-2"
SLOT="0"
IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs +udev"
CDEPEND="
~sys-boot/${MY_P}[debug?,udev?,gtk?,libkms?,pango?,split-usr?,static-libs?]
"
DEPEND="${CDEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
virtual/pkgconfig
"
RDEPEND="${CDEPEND}
virtual/udev
!<sys-kernel/dracut-0.37-r3
"
PATCHES=(
"${FILESDIR}"/0.9.3-glibc-sysmacros.patch
)
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
cp ${FILESDIR}/0.9.5-plugin.c ${S}/src/plugins/splash/two-step/plugin.c
sed -i 's/two-step/calculate/g' ${S}/src/plugins/splash/two-step/Makefile.*
sed -i 's/two_step/calculate/g' ${S}/src/plugins/splash/two-step/Makefile.*
eautoreconf
}
src_configure() {
local myconf=(
--with-system-root-install=no
--localstatedir=/var
--without-rhgb-compat-link
--enable-documentation
--enable-systemd-integration
--with-systemdunitdir="$(systemd_get_systemunitdir)"
$(use_enable !static-libs shared)
$(use_enable static-libs static)
$(use_enable debug tracing)
$(use_enable gtk gtk)
$(use_enable libkms drm)
$(use_enable pango)
$(use_enable udev)
)
econf "${myconf[@]}"
}
src_compile() {
cd src/libply
emake
cd ../libply-splash-core
emake
cd ../libply-splash-graphics
emake
cd ../plugins/splash/two-step
emake
}
src_install() {
cd ${S}/src/plugins/splash/two-step
emake DESTDIR="${D}" install
cd ${S}/themes/spinfinity
insinto /usr/share/plymouth/themes/calculate
doins box.png bullet.png entry.png lock.png
cd ${S}/themes/spinner
doins throbber-00*.png
newins ${FILESDIR}/0.9.5-calculate.plymouth calculate.plymouth
}

@ -1 +0,0 @@
DIST gitea-1.12.4.tar.gz 135170598 BLAKE2B 5db5bda4b2a9ea94b97e2ea59416cb6a2f95d53cdd9804d4d38686413134b00935b859ab5d14883f0e9238472108b96d66e6c6f77cafb5eb9c505fd945abc97b SHA512 6d28cd1fca4332c12b2b9485775289cd86b450bb9072c6c200b1d7cc4e5ac439f5d5a39cb788228f8712a0e73990ff9f4b326ca1d8fa90bc0691c50925e1a8f1

@ -1,13 +0,0 @@
diff --git a/vendor/modules.txt b/vendor/modules.txt
index efbc866..1c34104 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
# mvdan.cc/xurls/v2 v2.1.0
## explicit
mvdan.cc/xurls/v2
+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
+## explicit
# strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
## explicit
strk.kbt.io/projects/go/libravatar

@ -1,14 +0,0 @@
# Gitea configuration
GITEA_CONF="/etc/gitea/app.ini"
# Gitea user
GITEA_USER="git"
# Gitea group
GITEA_GROUP="git"
# Gitea working directory
GITEA_WORK_DIR="/var/lib/gitea"
# Gitea custom directory
GITEA_CUSTOM="${GITEA_WORK_DIR}/custom"

@ -1,22 +0,0 @@
#!/sbin/openrc-run
# Copyright 2016-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Gitea, a self-hosted Git service"
: ${GITEA_CONF:=/etc/gitea/app.ini}
: ${GITEA_USER:=git}
: ${GITEA_GROUP:=git}
: ${GITEA_WORK_DIR:=/var/lib/gitea}
: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom}
command="/usr/bin/gitea web"
command_args="--config ${GITEA_CONF}"
command_background="true"
command_user="${GITEA_USER}:${GITEA_GROUP}"
error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
pidfile="/run/${RC_SVCNAME}.pid"
required_files="${GITEA_CONF}"
start_stop_daemon_args="-d ${GITEA_WORK_DIR}"
start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_WORK_DIR=${GITEA_WORK_DIR}"
start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_CUSTOM=${GITEA_CUSTOM}"

@ -1,34 +0,0 @@
[Unit]
Description=Gitea service
Documentation=https://docs.gitea.io/
AssertPathIsDirectory=/var/lib/gitea
AssertPathIsReadWrite=/var/lib/gitea
After=network.target
Requires=network.target
After=mysqld.service
After=postgresql-9.3.service
After=postgresql-9.4.service
After=postgresql-9.5.service
After=postgresql-9.6.service
After=postgresql-10.service
After=postgresql-11.service
After=postgresql-12.service
After=memcached.service
After=redis.service
[Service]
User=git
Group=git
Environment="GITEA_WORK_DIR=/var/lib/gitea" "GITEA_CUSTOM=/var/lib/gitea/custom"
WorkingDirectory=/var/lib/gitea
ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
Restart=always
PrivateTmp=true
Nice=5
[Install]
WantedBy=multi-user.target

@ -1,126 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit fcaps go-module tmpfiles systemd
MY_PV="${PV/_rc/-rc}"
DESCRIPTION="A painless self-hosted Git service"
HOMEPAGE="https://gitea.io"
if [[ ${PV} != 9999* ]] ; then
SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64"
S="${WORKDIR}"
else
EGIT_REPO_URI="https://github.com/go-gitea/gitea"
inherit git-r3
S="${WORKDIR}/${P}"
fi
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
IUSE="+acct build-client pam sqlite"
BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
COMMON_DEPEND="
acct? (
acct-group/git
acct-user/git[gitea] )
pam? ( sys-libs/pam )"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
dev-vcs/git"
DOCS=(
custom/conf/app.ini.sample CONTRIBUTING.md README.md
)
FILECAPS=(
cap_net_bind_service+ep usr/bin/gitea
)
PATCHES=(
"${FILESDIR}/1.12-fix-vendoring.patch"
)
src_prepare() {
default
local sedcmds=(
-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-e "s#^MODE = console#MODE = file#"
-e "s#^LEVEL = Trace#LEVEL = Info#"
-e "s#^LOG_SQL = true#LOG_SQL = false#"
-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-e "s#^APP_ID =#;APP_ID =#"
-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
)
sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
if use sqlite ; then
sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
fi
einfo "Remove tests which are known to fail with network-sandbox enabled."
rm ./modules/migrations/github_test.go || die
einfo "Remove tests which depend on gitea git-repo."
rm ./modules/git/blob_test.go || die
rm ./modules/git/repo_test.go || die
# Remove already build assets (like frontend part)
use build-client && emake clean-all
}
src_compile() {
local gitea_tags=(
bindata
$(usev pam)
$(usex sqlite 'sqlite sqlite_unlock_notify' '')
)
local gitea_settings=(
"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
)
local makeenv=(
TAGS="${gitea_tags[@]}"
LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
)
[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
if use build-client; then
# -j1 as Makefile doesn't handle dependancy correctly, and is not
# useful as golang compiler don't use this info.
env "${makeenv[@]}" emake -j1 build
else
env "${makeenv[@]}" emake backend
fi
}
src_install() {
dobin gitea
einstalldocs
newconfd "${FILESDIR}/gitea.confd-r1" gitea
newinitd "${FILESDIR}/gitea.initd-r3" gitea
newtmpfiles - gitea.conf <<-EOF
d /run/gitea 0755 git git
EOF
systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
insinto /etc/gitea
newins custom/conf/app.ini.sample app.ini
if use acct ; then
fowners root:git /etc/gitea/{,app.ini}
fperms g+w,o-rwx /etc/gitea/{,app.ini}
diropts -m0750 -o git -g git
keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
keepdir /var/log/gitea
fi
}

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>nemunaire@nemunai.re</email>
<name>Pierre-Olivier Mercier</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">go-gitea/gitea</remote-id>
</upstream>
<use>
<flag name="acct">User and group management via acct-*/git packages</flag>
<flag name="build-client">Build the client code, instead of using a precompiled one</flag>
</use>
</pkgmetadata>
Loading…
Cancel
Save