From 2049dcd9a28b37585189f9ab977a3805e0b55533 Mon Sep 17 00:00:00 2001 From: serg-sg Date: Wed, 22 Nov 2023 16:39:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20ebuild=20=D0=B4=D0=BB=D1=8F=20rustdesk-bin=20dth?= =?UTF-8?q?cbb=201.2.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net-misc/rustdesk-bin/Manifest | 3 - .../rustdesk-bin/rustdesk-bin-1.1.9.ebuild | 114 ----------------- .../rustdesk-bin/rustdesk-bin-1.2.1.ebuild | 117 ------------------ .../rustdesk-bin/rustdesk-bin-1.2.2.ebuild | 117 ------------------ ...r3.ebuild => rustdesk-bin-1.2.3-r5.ebuild} | 30 +++-- 5 files changed, 18 insertions(+), 363 deletions(-) delete mode 100644 net-misc/rustdesk-bin/rustdesk-bin-1.1.9.ebuild delete mode 100644 net-misc/rustdesk-bin/rustdesk-bin-1.2.1.ebuild delete mode 100644 net-misc/rustdesk-bin/rustdesk-bin-1.2.2.ebuild rename net-misc/rustdesk-bin/{rustdesk-bin-1.2.3-r3.ebuild => rustdesk-bin-1.2.3-r5.ebuild} (75%) diff --git a/net-misc/rustdesk-bin/Manifest b/net-misc/rustdesk-bin/Manifest index 4002dfc..389502d 100644 --- a/net-misc/rustdesk-bin/Manifest +++ b/net-misc/rustdesk-bin/Manifest @@ -1,4 +1 @@ -DIST rustdesk-1.1.9.deb 6203088 BLAKE2B a4aa2547db9bb70d20f8f2509eedcb2c9ead4b78edd3fe5fc1108bb531b8857dba5a5eb9a37ccbecbd3f1a568fb3ad6d921271d4b2447394d6b4d0802e2d359f SHA512 31cd368a6f22ac55de82ca0b3da12d53c633a84157ad3194c04935199c854e241ae47c9f2d733c7b96b246f93099685a822d05dbccba53a7e78d8155db30dd3b -DIST rustdesk-1.2.1-x86_64.deb 17807720 BLAKE2B 1f621beb7ca5419f71140bfd1b73d90b0a0c457882c6670c3999b87a50257944f9ce2a6ca931b8678a7f87ce3303ebb91c75033801d39878f119aabe08db17bf SHA512 1dee74abc6bf8897b2c24d9c4366f388e49b15dce6bc4440e9fa6b7fcece15230d3c2866e65855508ef57164ca9913c242fcc8d5f183bf5b6b2b1ecd572c5717 -DIST rustdesk-1.2.2-x86_64.deb 17912876 BLAKE2B 9b2396a1eab94a35752d8ddab84d9e5acd43343b83bbcc4d4ef4d057ae57d59af9c331dbb84b91d9795bd2fe5ffc30d586e0614c39d498a5859280c1ab865e20 SHA512 a5168072b4c52f3167f33215c57597c975fca61bea6186090d2c51988aba775f31378987c1ce9c7932a156503e318ec7b8373b9e57b637d5501e6dfc9c414398 DIST rustdesk-1.2.3-x86_64.deb 18726924 BLAKE2B 597be8939f899ba4643b1c256f34b22179606be4b63cade67fd5ff3f5bd400f32584c0ba6c8908517ff921d714452c86993ab2a2ee31a462e679de6317ece949 SHA512 51681768c5c4094dbbf9e9e465e8bb01ddc4a6664bd0061e5ebddb056ffae0d3e21b470d699d02e59333af60b30f34ebdc9829e0251ccab337542b548a908992 diff --git a/net-misc/rustdesk-bin/rustdesk-bin-1.1.9.ebuild b/net-misc/rustdesk-bin/rustdesk-bin-1.1.9.ebuild deleted file mode 100644 index 48f8385..0000000 --- a/net-misc/rustdesk-bin/rustdesk-bin-1.1.9.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit desktop xdg unpacker - -MY_PN=${PN/-bin} - -DESCRIPTION="A remote control software." -HOMEPAGE="https://rustdesk.com/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.deb" - -LICENSE="" -SLOT="0" -KEYWORDS="~amd64" - -# Зависимости для запуска этой программы -RDEPEND=" - !net-misc/rustdesk - dev-lang/python - net-misc/curl - media-libs/alsa-lib - media-sound/pulseaudio - sys-apps/systemd-utils - x11-libs/gtk+:3 - x11-libs/libxcb - x11-misc/xdotool - x11-libs/libXfixes -" -RESTRICT="bindist mirror strip" - -S=${WORKDIR} -#MY_P="rustdesk" - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - mv * "${D}" || die - - # Добавление службы rustdesk - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - - if [ "systemd" == "${INITSYS}" ]; then - mkdir -p ${D}/usr/lib/systemd/system - cp ${D}/usr/share/${MY_PN}/files/systemd/${MY_PN}.service ${D}/usr/lib/systemd/system/${MY_PN}.service - else - mkdir -p ${D}/etc/init.d/ - - echo '#!/sbin/openrc-run - -name="RustDesk" -description="RustDesk Daemon Service" -supervisor="supervise-daemon" -command="/usr/bin/rustdesk" -command_args="--service" -command_user="root" -pidfile="/run/rudesktop" - -depend() { - after xdm - need net -}' > ${D}/etc/init.d/${MY_PN} - - # Исправление прав на запуск службы - chmod +x ${D}/etc/init.d/${MY_PN} - - fi - - # Исправление ярлыка для меню Пуск - sed -i -E -e 's/^Type=Application/Type=Application\nCategories=Network/' ${D}/usr/share/applications/${MY_PN}.desktop -} - -pkg_preinst() { - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - service ${MY_PN} stop || true - - if [ -e /etc/systemd/system/${MY_PN}.service ]; then - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service - fi - else - rc-service ${MY_PN} stop - fi -} - -pkg_postinst() { - # Добавление и запуск службы в автозагрузку - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl daemon-reload - systemctl enable ${MY_PN} - systemctl start ${MY_PN} - else - rc-update add ${MY_PN} default - /etc/init.d/${MY_PN} start - fi -} - -pkg_prerm() { - # Останавливаем службу и убираем из автозагрузки - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl stop ${MY_PN} || true - systemctl disable ${MY_PN} || true - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN} - else - rc-update delete ${MY_PN} - rc-service ${MY_PN} stop - rm -f /etc/init.d/${MY_PN} || die - fi -} diff --git a/net-misc/rustdesk-bin/rustdesk-bin-1.2.1.ebuild b/net-misc/rustdesk-bin/rustdesk-bin-1.2.1.ebuild deleted file mode 100644 index 539c6b2..0000000 --- a/net-misc/rustdesk-bin/rustdesk-bin-1.2.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit desktop xdg unpacker - -MY_PN=${PN/-bin} - -DESCRIPTION="A remote control software." -HOMEPAGE="https://rustdesk.com/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}-x86_64.deb" -LICENSE="" -SLOT="0" -KEYWORDS="~amd64" - -# Зависимости для запуска этой программы -RDEPEND=" - !net-misc/rustdesk - dev-lang/python - dev-libs/libappindicator - net-misc/curl - media-libs/alsa-lib - media-libs/gstreamer - media-libs/gst-plugins-base - media-libs/libva[X] - sys-apps/systemd-utils - sys-libs/pam - x11-libs/gtk+:3 - x11-libs/libxcb - x11-libs/libvdpau - x11-libs/libXfixes - x11-misc/xdotool - -" -RESTRICT="bindist mirror strip" - -S=${WORKDIR} - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - mv * "${D}" || die - - ln -s /usr/lib/rustdesk/${MY_PN} ${D}/usr/bin/${MY_PN} - - # Добавление службы rustdesk - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - - if [ "systemd" == "${INITSYS}" ]; then - mkdir -p ${D}/usr/lib/systemd/system - cp ${D}/usr/share/${MY_PN}/files/systemd/${MY_PN}.service ${D}/usr/lib/systemd/system/${MY_PN}.service - else - mkdir -p ${D}/etc/init.d/ - - echo '#!/sbin/openrc-run - -name="RustDesk" -description="RustDesk Daemon Service" -supervisor="supervise-daemon" -command="/usr/bin/rustdesk" -command_args="--service" -command_user="root" -pidfile="/run/rudesktop" - -depend() { - after xdm - need net -}' > ${D}/etc/init.d/${MY_PN} - - # Исправление прав на запуск службы - chmod +x ${D}/etc/init.d/${MY_PN} - - fi -} - -pkg_preinst() { - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - service ${MY_PN} stop || true - - if [ -e /etc/systemd/system/${MY_PN}.service ]; then - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service - fi - else - rc-service ${MY_PN} stop - fi -} - -pkg_postinst() { - # Добавление службы в автозагрузку и его запуск - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl daemon-reload - systemctl enable ${MY_PN} - systemctl start ${MY_PN} - else - rc-update add ${MY_PN} default - /etc/init.d/${MY_PN} start - fi -} - -pkg_prerm() { - # Останавливаем службу и убираем из автозагрузки - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl stop ${MY_PN} || true - systemctl disable ${MY_PN} || true - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN} - else - rc-update delete ${MY_PN} - rc-service ${MY_PN} stop - rm -f /etc/init.d/${MY_PN} || die - fi -} diff --git a/net-misc/rustdesk-bin/rustdesk-bin-1.2.2.ebuild b/net-misc/rustdesk-bin/rustdesk-bin-1.2.2.ebuild deleted file mode 100644 index 539c6b2..0000000 --- a/net-misc/rustdesk-bin/rustdesk-bin-1.2.2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit desktop xdg unpacker - -MY_PN=${PN/-bin} - -DESCRIPTION="A remote control software." -HOMEPAGE="https://rustdesk.com/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}-x86_64.deb" -LICENSE="" -SLOT="0" -KEYWORDS="~amd64" - -# Зависимости для запуска этой программы -RDEPEND=" - !net-misc/rustdesk - dev-lang/python - dev-libs/libappindicator - net-misc/curl - media-libs/alsa-lib - media-libs/gstreamer - media-libs/gst-plugins-base - media-libs/libva[X] - sys-apps/systemd-utils - sys-libs/pam - x11-libs/gtk+:3 - x11-libs/libxcb - x11-libs/libvdpau - x11-libs/libXfixes - x11-misc/xdotool - -" -RESTRICT="bindist mirror strip" - -S=${WORKDIR} - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - mv * "${D}" || die - - ln -s /usr/lib/rustdesk/${MY_PN} ${D}/usr/bin/${MY_PN} - - # Добавление службы rustdesk - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - - if [ "systemd" == "${INITSYS}" ]; then - mkdir -p ${D}/usr/lib/systemd/system - cp ${D}/usr/share/${MY_PN}/files/systemd/${MY_PN}.service ${D}/usr/lib/systemd/system/${MY_PN}.service - else - mkdir -p ${D}/etc/init.d/ - - echo '#!/sbin/openrc-run - -name="RustDesk" -description="RustDesk Daemon Service" -supervisor="supervise-daemon" -command="/usr/bin/rustdesk" -command_args="--service" -command_user="root" -pidfile="/run/rudesktop" - -depend() { - after xdm - need net -}' > ${D}/etc/init.d/${MY_PN} - - # Исправление прав на запуск службы - chmod +x ${D}/etc/init.d/${MY_PN} - - fi -} - -pkg_preinst() { - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - service ${MY_PN} stop || true - - if [ -e /etc/systemd/system/${MY_PN}.service ]; then - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service - fi - else - rc-service ${MY_PN} stop - fi -} - -pkg_postinst() { - # Добавление службы в автозагрузку и его запуск - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl daemon-reload - systemctl enable ${MY_PN} - systemctl start ${MY_PN} - else - rc-update add ${MY_PN} default - /etc/init.d/${MY_PN} start - fi -} - -pkg_prerm() { - # Останавливаем службу и убираем из автозагрузки - INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') - if [ "systemd" == "${INITSYS}" ]; then - systemctl stop ${MY_PN} || true - systemctl disable ${MY_PN} || true - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN} - else - rc-update delete ${MY_PN} - rc-service ${MY_PN} stop - rm -f /etc/init.d/${MY_PN} || die - fi -} diff --git a/net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r3.ebuild b/net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r5.ebuild similarity index 75% rename from net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r3.ebuild rename to net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r5.ebuild index 89ef5dc..f8e1c2a 100644 --- a/net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r3.ebuild +++ b/net-misc/rustdesk-bin/rustdesk-bin-1.2.3-r5.ebuild @@ -3,14 +3,15 @@ EAPI="8" -inherit desktop xdg unpacker +PYTHON_COMPAT=( python3_{10..12} ) +inherit xdg unpacker python-r1 MY_PN=${PN/-bin} DESCRIPTION="A remote control software." HOMEPAGE="https://rustdesk.com/" SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}-x86_64.deb" -LICENSE="" +LICENSE="ISC" SLOT="0" KEYWORDS="~amd64" @@ -31,8 +32,11 @@ RDEPEND=" x11-libs/libvdpau x11-libs/libXfixes x11-misc/xdotool - + ${PYTHON_DEPS} " + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + RESTRICT="bindist mirror strip" S=${WORKDIR} @@ -44,16 +48,16 @@ src_unpack() { src_install() { mv * "${D}" || die - ln -s /usr/lib/rustdesk/${MY_PN} ${D}/usr/bin/${MY_PN} + ln -s "/usr/lib/rustdesk/${MY_PN}" "${D}/usr/bin/${MY_PN}" # Добавление службы rustdesk INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') if [ "systemd" == "${INITSYS}" ]; then - mkdir -p ${D}/usr/lib/systemd/system - cp ${D}/usr/share/${MY_PN}/files/systemd/${MY_PN}.service ${D}/usr/lib/systemd/system/${MY_PN}.service + mkdir -p "${D}/usr/lib/systemd/system" + cp "${D}/usr/share/${MY_PN}/files/systemd/${MY_PN}.service" "${D}/usr/lib/systemd/system/${MY_PN}.service" else - mkdir -p ${D}/etc/init.d/ + mkdir -p "${D}/etc/init.d/" echo '#!/sbin/openrc-run @@ -68,10 +72,10 @@ pidfile="/run/rudesktop" depend() { after display-manager need net -}' > ${D}/etc/init.d/${MY_PN} +}' > "${D}/etc/init.d/${MY_PN}" # Исправление прав на запуск службы - chmod +x ${D}/etc/init.d/${MY_PN} + chmod +x "${D}/etc/init.d/${MY_PN}" fi } @@ -82,7 +86,8 @@ pkg_preinst() { service ${MY_PN} stop || true if [ -e /etc/systemd/system/${MY_PN}.service ]; then - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service + rm -f "/etc/systemd/system/${MY_PN}.service" "/usr/lib/systemd/system/${MY_PN}.service" \ + "/usr/lib/systemd/user/${MY_PN}.service" fi else rc-service ${MY_PN} stop @@ -108,10 +113,11 @@ pkg_prerm() { if [ "systemd" == "${INITSYS}" ]; then systemctl stop ${MY_PN} || true systemctl disable ${MY_PN} || true - rm -f /etc/systemd/system/${MY_PN}.service /usr/lib/systemd/system/${MY_PN}.service /usr/lib/systemd/user/${MY_PN}.service /etc/sudoers.d/${MY_PN} + rm -f "/etc/systemd/system/${MY_PN}.service" "/usr/lib/systemd/system/${MY_PN}.service" \ + "/usr/lib/systemd/user/${MY_PN}.service" "/etc/sudoers.d/${MY_PN}" else rc-update delete ${MY_PN} rc-service ${MY_PN} stop - rm -f /etc/init.d/${MY_PN} || die + rm -f "/etc/init.d/${MY_PN}" || die fi }