diff --git a/app-admin/customrescuecd-x86/Manifest b/app-admin/customrescuecd-x86/Manifest new file mode 100644 index 0000000000..047efe18f1 --- /dev/null +++ b/app-admin/customrescuecd-x86/Manifest @@ -0,0 +1 @@ +DIST CUSTOMRESCUECD-x86-0.3.1.iso 1426063360 BLAKE2B 8116b657aed9f5fb9ac0d56f6284bc45a4e050ad7e84cd4cb7c5217b07c9151c82776589aefa3c030cf766106bca7948d48cde2055c408c4e32ea081297b6117 SHA512 3aa0d2ab54920a19046fc1038313e01a99287301b06f25b1346c54d680c4ca2395e9c9010b3299cdc94a0198ec0f63209d09a1d086243e3b82216e7f4d63e0e6 diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild new file mode 100644 index 0000000000..4c3a5f629c --- /dev/null +++ b/app-admin/customrescuecd-x86/customrescuecd-x86-0.3.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="CUSTOMRESCUECD-x86" +DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo" +HOMEPAGE="https://sourceforge.net/projects/customrescuecd" +SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso" + +LICENSE="GPL-3" +SLOT="${PV}" +KEYWORDS="~x86" +RESTRICT="bindist mirror" + +S=${WORKDIR} + +src_unpack() { :; } + +src_install() { + insinto "/usr/share/${PN%-*}" + doins "${DISTDIR}/${MY_P}-${PV}.iso" +} + +pkg_postinst() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # no version newer than ours? we're the newest! + if ! has_version ">${CATEGORY}/${PF}"; then + ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die + fi +} + +pkg_postrm() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # if there is no version newer than ours installed + if ! has_version ">${CATEGORY}/${PF}"; then + # and we are truly and completely uninstalled... + if [[ ! ${REPLACED_BY_VERSION} ]]; then + # then find an older version to set the symlink to + local newest_version=$(best_version "<${CATEGORY}/${PF}") + + if [[ ${newest_version} ]]; then + # update the symlink + ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die + else + # last version removed? clean up the symlink + rm -v "${f}" || die + # and the parent directory + rmdir "${f%/*}" || die + fi + fi + fi +} diff --git a/app-admin/customrescuecd-x86/metadata.xml b/app-admin/customrescuecd-x86/metadata.xml new file mode 100644 index 0000000000..002f90c3a1 --- /dev/null +++ b/app-admin/customrescuecd-x86/metadata.xml @@ -0,0 +1,12 @@ + + + + + andrea.postiglione@gmail.com + Andrea Postiglione + + + + customrescuecd + + diff --git a/app-admin/customrescuecd-x86_64/Manifest b/app-admin/customrescuecd-x86_64/Manifest new file mode 100644 index 0000000000..3a08f60554 --- /dev/null +++ b/app-admin/customrescuecd-x86_64/Manifest @@ -0,0 +1 @@ +DIST CUSTOMRESCUECD-x86_64-0.10.3.iso 1537474560 BLAKE2B d4812074013323d8372bd71bea1c81cbe8cb88e0cf87dd1ec7c4373a1c4f4023cfec383ea3327cb75aa903021d929ac7a29290a2a9a7a75857c591827af7a148 SHA512 1092dc85a82c1f17c362b19e91d36602debaab7d52a98945ebb494f9d8bec03fb07b16649c7401233a060ce95905c3f9259107c2eb9f80bd63d759740754105e diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild new file mode 100644 index 0000000000..96d32df69b --- /dev/null +++ b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.10.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="CUSTOMRESCUECD-x86_64" +DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo" +HOMEPAGE="https://sourceforge.net/projects/customrescuecd" +SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso" + +LICENSE="GPL-3" +SLOT="${PV}" +KEYWORDS="~amd64" +RESTRICT="bindist mirror" + +S=${WORKDIR} + +src_unpack() { :; } + +src_install() { + insinto "/usr/share/${PN%-*}" + doins "${DISTDIR}/${MY_P}-${PV}.iso" +} + +pkg_postinst() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # no version newer than ours? we're the newest! + if ! has_version ">${CATEGORY}/${PF}"; then + ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die + fi +} + +pkg_postrm() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # if there is no version newer than ours installed + if ! has_version ">${CATEGORY}/${PF}"; then + # and we are truly and completely uninstalled... + if [[ ! ${REPLACED_BY_VERSION} ]]; then + # then find an older version to set the symlink to + local newest_version=$(best_version "<${CATEGORY}/${PF}") + + if [[ ${newest_version} ]]; then + # update the symlink + ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die + else + # last version removed? clean up the symlink + rm -v "${f}" || die + # and the parent directory + rmdir "${f%/*}" || die + fi + fi + fi +} diff --git a/app-admin/customrescuecd-x86_64/metadata.xml b/app-admin/customrescuecd-x86_64/metadata.xml new file mode 100644 index 0000000000..002f90c3a1 --- /dev/null +++ b/app-admin/customrescuecd-x86_64/metadata.xml @@ -0,0 +1,12 @@ + + + + + andrea.postiglione@gmail.com + Andrea Postiglione + + + + customrescuecd + + diff --git a/dev-embedded/rauc/Manifest b/dev-embedded/rauc/Manifest index 502637aa65..6e64fb69ec 100644 --- a/dev-embedded/rauc/Manifest +++ b/dev-embedded/rauc/Manifest @@ -1 +1 @@ -DIST rauc-1.3.tar.xz 1336420 BLAKE2B 79d8cc081b7871a7c4cf7eee47c042cb57723c60dad0cfefcb194048fe1c9a52261e1ef037f397ec80e7c1f1690fd34e4ce44a2d7cb427a5a48632760215e48b SHA512 044f679f81c0af58d5620a16c3a0fd7bc8ae50dccc403dd26f201735e0d7488e485b84ac38329b5f091648ae1173088a4e14976f6d28ef185a07daed82cc5b65 +DIST rauc-1.4.tar.xz 807676 BLAKE2B e8dc46daf861c4ff5e80ac5af08eb03afb071b313dce38cbc127205f24c2f25793f51812c95ae4a0d914ea4cfec257ee06e3776b78b20488a6a33edd9b08e5c0 SHA512 6ac572d396cae609060ff4a7d2a26f5b8ed839504e76628f47388b1dac93ad1794114a9c105c5a9eb070478f9bd1b6f2cd6aeb5e84c64fdce4d7cbe30bb9ea31 diff --git a/dev-embedded/rauc/files/rauc-1.3-tests.patch b/dev-embedded/rauc/files/rauc-1.3-tests.patch deleted file mode 100644 index 1fed6324c8..0000000000 --- a/dev-embedded/rauc/files/rauc-1.3-tests.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2c5300478b288ef8aa627280cca691312ac75a9e Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Fri, 1 May 2020 13:25:51 +0200 -Subject: [PATCH] tests: Disable failing tests - -Some tests are failing inside portage. Disable them. - -Signed-off-by: Kurt Kanzenbach ---- - Makefile.am | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4d9a0687aec2..7ddc38e836a1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -139,15 +139,10 @@ check_PROGRAMS = \ - test/update_handler.test \ - test/utils.test \ - test/install.test \ -- test/service.test \ - test/bundle.test \ - test/progress.test \ - test/slot.test - --if WANT_NETWORK --check_PROGRAMS += test/network.test --endif -- - noinst_PROGRAMS = test/fakerand - - test_fakerand_SOURCES = test/fakerand.c -@@ -201,10 +196,6 @@ test_context_test_LDADD = librauctest.la - test_manifest_test_SOURCES = test/manifest.c - test_manifest_test_LDADD = librauctest.la - --test_service_test_CFLAGS = $(AM_CFLAGS) -DTEST_SERVICES=\""$(abs_top_builddir)"\" --test_service_test_SOURCES = test/service.c rauc-installer-generated.h --test_service_test_LDADD = librauctest.la -- - test_signature_test_SOURCES = test/signature.c - test_signature_test_LDADD = librauctest.la - -@@ -217,9 +208,6 @@ test_utils_test_LDADD = librauctest.la - test_install_test_SOURCES = test/install.c - test_install_test_LDADD = librauctest.la - --test_network_test_SOURCES = test/network.c --test_network_test_LDADD = librauctest.la -- - test_progress_test_SOURCES = test/progress.c - test_progress_test_LDADD = librauctest.la - --- -2.26.2 - diff --git a/dev-embedded/rauc/files/rauc-1.4-tests.patch b/dev-embedded/rauc/files/rauc-1.4-tests.patch new file mode 100644 index 0000000000..fda7fc8b8e --- /dev/null +++ b/dev-embedded/rauc/files/rauc-1.4-tests.patch @@ -0,0 +1,40 @@ +From 0b0cbdd4e376b60a2974c502c100395a381249e8 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Sat, 15 Aug 2020 08:45:21 +0200 +Subject: [PATCH] tests: Disable network tests + +The network tests won't work within portage. Disable them. + +Signed-off-by: Kurt Kanzenbach +--- + Makefile.am | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index efe55792fabb..2c6d8080e992 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -150,10 +150,6 @@ check_PROGRAMS = \ + test/progress.test \ + test/slot.test + +-if WANT_NETWORK +-check_PROGRAMS += test/network.test +-endif +- + if WANT_JSON + check_PROGRAMS += test/boot_switch.test + endif +@@ -233,9 +229,6 @@ test_utils_test_LDADD = librauctest.la + test_install_test_SOURCES = test/install.c + test_install_test_LDADD = librauctest.la + +-test_network_test_SOURCES = test/network.c +-test_network_test_LDADD = librauctest.la +- + test_progress_test_SOURCES = test/progress.c + test_progress_test_LDADD = librauctest.la + +-- +2.26.2 + diff --git a/dev-embedded/rauc/rauc-1.3.ebuild b/dev-embedded/rauc/rauc-1.4.ebuild similarity index 100% rename from dev-embedded/rauc/rauc-1.3.ebuild rename to dev-embedded/rauc/rauc-1.4.ebuild diff --git a/net-im/nheko/nheko-0.7.1.ebuild b/net-im/nheko/nheko-0.7.1.ebuild index e5dcde9094..43287ca35b 100644 --- a/net-im/nheko/nheko-0.7.1.ebuild +++ b/net-im/nheko/nheko-0.7.1.ebuild @@ -28,13 +28,13 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-qt/linguist-tools:5 dev-libs/spdlog " +BDEPEND="dev-qt/linguist-tools:5" src_prepare() { cmake_src_prepare - xdg_src_prepare + xdg_environment_reset # TODO: Unbundle SingleApplication, blurhash and cpp-httplib. } diff --git a/net-im/nheko/nheko-0.7.2.ebuild b/net-im/nheko/nheko-0.7.2.ebuild index 54b3b78fe0..e6ce8bd16b 100644 --- a/net-im/nheko/nheko-0.7.2.ebuild +++ b/net-im/nheko/nheko-0.7.2.ebuild @@ -28,13 +28,13 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - dev-qt/linguist-tools:5 dev-libs/spdlog " +BDEPEND="dev-qt/linguist-tools:5" src_prepare() { cmake_src_prepare - xdg_src_prepare + xdg_environment_reset # TODO: Unbundle SingleApplication, blurhash and cpp-httplib. } diff --git a/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild b/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild new file mode 100644 index 0000000000..7c076161bc --- /dev/null +++ b/sys-boot/customrescuecd-x86-grub/customrescuecd-x86-grub-0.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Grub menu entries for the .iso image of customrescuecd" +HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="~x86" + +S=${WORKDIR} + +RDEPEND="app-admin/customrescuecd-x86 + sys-boot/grub" + +src_install() { + exeinto /etc/grub.d + newexe "${FILESDIR}"/customrescuecd.grub 39_customrescuecd + + insinto /etc/default + newins "${FILESDIR}"/customrescuecd.default customrescuecd +} + +pkg_postinst() { + elog "To add the menu entries for customrescuecd to grub, you should now run" + elog " grub-mkconfig -o /boot/grub/grub.cfg" + elog "You can set custom bootoptions in /etc/default/customrescuecd" +} diff --git a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default new file mode 100644 index 0000000000..ce093e352f --- /dev/null +++ b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.default @@ -0,0 +1,7 @@ +Here you can set custom bootoptions for the CustomRescueCD +# +# You can add for example in a space separated list: +# copytoram: causes the iso file to be fully loaded into memory +# this requires 1.5G of memory to cache everything +# +CRCD_BOOTOPTIONS="" diff --git a/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub new file mode 100644 index 0000000000..7c5965d8c2 --- /dev/null +++ b/sys-boot/customrescuecd-x86-grub/files/customrescuecd.grub @@ -0,0 +1,43 @@ +#!/bin/sh +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +. /usr/share/grub/grub-mkconfig_lib + +if [ -r /etc/default/customrescuecd ] ; then + . /etc/default/customrescuecd +fi + +# srcd = path of newest link to iso of customrescuecd, created by the ebuild +# of customrescuecd-x86 + +crcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso" + +longname="CustomRescueCD" +bootops=")" + +if [ ! -z "${CRCD_BOOTOPTIONS}" ]; then + bootops=" with bootoptions)" +fi + +if [ -f "${crcd}" ]; then + + device=$(${grub_probe} --target=device "${crcd}") + path=$(make_system_path_relative_to_its_root "${crcd}") + grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) + + gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 + onstr=$(gettext_printf "(on %s)" "${device}") + + cat << EOF +submenu "${longname}" --class submenu { + menuentry "${longname} (32bit standard${bootops}" --class rescue { +${grub_string} + set isofile=${path} + loopback loop \${isofile} + linux (loop)/boot/x86/customrescue32 ${CRCD_BOOTOPTIONS} customisobasedir=customresccd customisolabel=CRC32 vga=791 net.ifnames=0 + } +} +EOF + +fi diff --git a/sys-boot/customrescuecd-x86-grub/metadata.xml b/sys-boot/customrescuecd-x86-grub/metadata.xml new file mode 100644 index 0000000000..17e7a0a646 --- /dev/null +++ b/sys-boot/customrescuecd-x86-grub/metadata.xml @@ -0,0 +1,12 @@ + + + + + andrea.postiglione@gmail.com + Andrea Postiglione + + + This package adds menu entries in GRUB for the CustomRescueCD. You can + add custom bootoptions for CustomRescueCD in a special config file. + + diff --git a/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild b/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild new file mode 100644 index 0000000000..2cbc487ce0 --- /dev/null +++ b/sys-boot/customrescuecd-x86_64-grub/customrescuecd-x86_64-grub-0.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Grub menu entries for the .iso image of customrescuecd" +HOMEPAGE="https://sourceforge.net/projects/customrescuecd/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="~amd64" + +S=${WORKDIR} + +RDEPEND="app-admin/customrescuecd-x86_64 + sys-boot/grub" + +src_install() { + exeinto /etc/grub.d + newexe "${FILESDIR}"/customrescuecd.grub 39_customrescuecd + + insinto /etc/default + newins "${FILESDIR}"/customrescuecd.default customrescuecd +} + +pkg_postinst() { + elog "To add the menu entries for customrescuecd to grub, you should now run" + elog " grub-mkconfig -o /boot/grub/grub.cfg" + elog "You can set custom bootoptions in /etc/default/customrescuecd" +} diff --git a/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.default b/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.default new file mode 100644 index 0000000000..4392c3337a --- /dev/null +++ b/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.default @@ -0,0 +1,7 @@ +Here you can set custom bootoptions for the CustomRescueCD +# +# You can add for example in a space separated list: +# copytoram: causes the iso file to be fully loaded into memory +# this requires 1.5GB of memory to cache everything + +CRCD_BOOTOPTIONS="" diff --git a/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.grub b/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.grub new file mode 100644 index 0000000000..5087ebdf79 --- /dev/null +++ b/sys-boot/customrescuecd-x86_64-grub/files/customrescuecd.grub @@ -0,0 +1,43 @@ +#!/bin/sh +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +. /usr/share/grub/grub-mkconfig_lib + +if [ -r /etc/default/customrescuecd ] ; then + . /etc/default/customrescuecd +fi + +# crcd = path of newest link to iso of customrescuecd, created by the ebuild +# of customrescuecd-x86_64 + +crcd="/usr/share/systemrescuecd/systemrescuecd-x86_64-newest.iso" + +longname="CustomRescueCD" +bootops=")" + +if [ ! -z "${CRCD_BOOTOPTIONS}" ]; then + bootops=" with bootoptions)" +fi + +if [ -f "${crcd}" ]; then + + device=$(${grub_probe} --target=device "${crcd}") + path=$(make_system_path_relative_to_its_root "${crcd}") + grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) + + gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 + onstr=$(gettext_printf "(on %s)" "${device}") + + cat << EOF +submenu "${longname}" --class submenu { + menuentry "${longname} (64bit ${bootops}" --class rescue { +${grub_string} + set isofile=${path} + loopback loop \${isofile} + linux (loop)/boot/x86_64/customrescue64 ${CRCD_BOOTOPTIONS} customisobasedir=customresccd customisolabel=CRC64 vga=791 net.ifnames=0 + } +} +EOF + +fi diff --git a/sys-boot/customrescuecd-x86_64-grub/metadata.xml b/sys-boot/customrescuecd-x86_64-grub/metadata.xml new file mode 100644 index 0000000000..17e7a0a646 --- /dev/null +++ b/sys-boot/customrescuecd-x86_64-grub/metadata.xml @@ -0,0 +1,12 @@ + + + + + andrea.postiglione@gmail.com + Andrea Postiglione + + + This package adds menu entries in GRUB for the CustomRescueCD. You can + add custom bootoptions for CustomRescueCD in a special config file. + + diff --git a/sys-libs/nss-tls/nss-tls-1.0.ebuild b/sys-libs/nss-tls/nss-tls-1.0.ebuild index 0c7ea1e8fc..fb386f91d0 100644 --- a/sys-libs/nss-tls/nss-tls-1.0.ebuild +++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild @@ -22,10 +22,6 @@ BDEPEND="${DEPEND} dev-util/meson dev-util/ninja" -QA_PRESTRIPPED="/usr/bin/tlslookup - /usr/lib64/libnss_tls.so.2 - /usr/sbin/nss-tlsd" - src_prepare() { default sed -e "s/@0@\/run\/nss-tls/\/var\/run\/nss-tls/" -i "${S}"/meson.build || die @@ -34,7 +30,6 @@ src_prepare() { src_configure() { local emesonargs=( --buildtype=release - -Dstrip=true ) meson_src_configure } diff --git a/sys-libs/nss-tls/nss-tls-9999.ebuild b/sys-libs/nss-tls/nss-tls-9999.ebuild index cbce9741bb..ac8fe9ce46 100644 --- a/sys-libs/nss-tls/nss-tls-9999.ebuild +++ b/sys-libs/nss-tls/nss-tls-9999.ebuild @@ -22,10 +22,6 @@ BDEPEND="${DEPEND} dev-util/meson dev-util/ninja" -QA_PRESTRIPPED="/usr/bin/tlslookup - /usr/lib64/libnss_tls.so.2 - /usr/sbin/nss-tlsd" - EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git" EGIT_BRANCH="master" @@ -37,7 +33,6 @@ src_prepare() { src_configure() { local emesonargs=( --buildtype=release - -Dstrip=true ) meson_src_configure }