From 259d367fe72a00148a7e9ac4510539b41449189f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sun, 15 Dec 2024 23:32:04 +0100 Subject: [PATCH 1/2] Add duplicati-bin 2.1.0.2 beta, hopefully finally restoring the GUI! Signed-off-by: Manuel Friedli --- app-backup/duplicati-bin/Manifest | 2 + .../duplicati-bin-2.1.0.2_beta20241129.ebuild | 45 +++++++++++++++++++ .../duplicati-bin-2.1.0.2_beta20241129 | 11 +++++ 3 files changed, 58 insertions(+) create mode 100644 app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild create mode 100644 metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 diff --git a/app-backup/duplicati-bin/Manifest b/app-backup/duplicati-bin/Manifest index 50da889..017f663 100644 --- a/app-backup/duplicati-bin/Manifest +++ b/app-backup/duplicati-bin/Manifest @@ -1,5 +1,7 @@ AUX 001-duplicati-bin-2.0.5.1_beta20200118-bash-path.patch 1046 BLAKE2B da4e78ccaa255b53043d28f582b715b92dbf5c2e31b06776d874fcd924fae8c3e4fbef3d0ab5135719e6a80677f1f59050acc73c13121a070d32e9665dcfb052 SHA512 fdf21ee4f7247d6a6a1ad086ecd4ed5829c940c97fb5d0deba512612727743f11329cae29c45ee19711022ed402e5933ea8068d13eb04cdc65aa495a9115cdb4 DIST duplicati-bin-2.0.8.1_beta20240507.rpm 30119517 BLAKE2B d915d41b1e1f64f303b964a4a269041e0c5357127de64f9333bd9ed44509e96f1a656161d7c16105f66cfaf1db27fb1762820f76529171e9822acc4a7bed08d5 SHA512 91e9867bdd81d76b15a90f9a723f5e24ff3c86e2cbf5619fd6608854b6cd24503f251bc76c4266ca498e216370a358a57d09a306c522cbba37fbd6008c8ad962 +DIST duplicati-bin-2.1.0.2_beta20241129.zip 80618224 BLAKE2B 8bf594861660481790c838062d82fa42e146bcc839611664b330cea278438267b55282dd97f207e2103c559ce768133afdef8b8d2472f7529376eca70ab963f5 SHA512 308d7544e1eda7246ebbf7304d360b933bea83655b0ef1564f43daaf4e39f5dfcc8cea08acab19db4dfcfd500474bda77f2ab61d12018d26a4462cc447a9c990 EBUILD duplicati-bin-2.0.8.1_beta20240507.ebuild 1087 BLAKE2B 5721284a6429d399deae034432be75b2a5135d9cc217d1e3c32d42a3f2d6fad04cc8c1eaf8b63851169fb1e711276cdd58e2984fef777bc1fd3a6cdf46be9e2b SHA512 56bce8533436559c15497c8dc3ccada38172e2eebd493e4632d585c1fa8dd8ca0944b5181c780a9ef7dc524d6e94f9419fc7bcc71e65ab9c950f6d2d2b795d5d +EBUILD duplicati-bin-2.1.0.2_beta20241129.ebuild 1262 BLAKE2B bef0761a906f91c2854bcf2114f8bd9f06b5c9b5e6eff6fc3a11534271faa1cae878795dc86d24a20d4661ecd26b520f526732fba21b3554c8c2dfd21f850ce5 SHA512 f391d60936c503caa89d5890d7234fbd325f36d484e3878ddb49b1e21e4e66725d369920099c57f8f5604b8d9f1f1462e9cecd38eb3984a6fb762a1450e0c4e3 MISC ChangeLog 2725 BLAKE2B 5d65b12d806af6aa06c8b49d6abfdfbb96b7ff7840331b62b55a989248512caa5606fb445a41418db9110eaf8753c24f22055ba564f12c36096940b1e92ddeee SHA512 db38804e12d3ce40dbd0bf17c26ce01b0fffa5494c0cdc266d9b9fc41762abb4b407618d863c5fb401b95727688e9ba836b1b619e7a5239a10bbce4ec58e4b56 MISC metadata.xml 333 BLAKE2B 062c64e55f224750f62336cfc0c639f64d6e53e0a27ca4b08dd583925bb8fdc4e37a831ed4641b0dc3318e9241eaddf2cd4e5454451dc61d5a467469bd0c835d SHA512 4760985f2d129d5139d192ceec710a2da34cb06a5ae0d83a6566d62ddb5072d7aa2b3222befe65e68cf1c693f262ac20fcd0d98a8ee7bb872ebfdd1999113148 diff --git a/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild b/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild new file mode 100644 index 0000000..a39286a --- /dev/null +++ b/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="duplicati" +MY_PV="2.1.0.2" +MY_BUILDTYPE="beta" +MY_BUILDDATE="2024-11-29" + +MY_BASE_PV="${MY_PV}_${MY_BUILDTYPE}" + +MY_PV_1="v${MY_BASE_PV}_${MY_BUILDDATE}" +MY_PV_2="${MY_PN}-${MY_BASE_PV}_${MY_BUILDDATE}" +MY_P="${MY_PN}-${MY_BASE_PV}_${MY_BUILDDATE}-linux-x64-gui" + +DESCRIPTION="A backup client that securely stores encrypted, incremental, compressed backups." +HOMEPAGE="https://www.duplicati.com/" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${MY_PV_1}/${MY_P}.zip -> ${P}.zip" + +S="${WORKDIR}" +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="strip" + +BDEPEND="app-arch/unzip" + +src_install() { + mv "${S}/${MY_P}" "${S}/duplicati" + dodir /opt/duplicati + insinto /opt + doins -r "${S}/duplicati" + exeinto /opt/duplicati + + my_executables=( duplicati duplicati-aescrypt duplicati-autoupdater duplicati-backend-tester \ + duplicati-backend-tool duplicati-cli duplicati-recovery-tool duplicati-secret-tool \ + duplicati-server duplicati-server-util duplicati-service duplicati-snapshots ) + + for f in ${my_executables[@]} ; do + doexe "${S}/duplicati/${f}" + dosym "../../opt/duplicati/${f}" "${EPREFIX}/usr/bin/${f}" + done +} diff --git a/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 b/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 new file mode 100644 index 0000000..8d09b0f --- /dev/null +++ b/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 @@ -0,0 +1,11 @@ +BDEPEND=app-arch/unzip +DEFINED_PHASES=install +DESCRIPTION=A backup client that securely stores encrypted, incremental, compressed backups. +EAPI=8 +HOMEPAGE=https://www.duplicati.com/ +KEYWORDS=~amd64 +LICENSE=LGPL-2 +RESTRICT=strip +SLOT=0 +SRC_URI=https://github.com/duplicati/duplicati/releases/download/v2.1.0.2_beta_2024-11-29/duplicati-2.1.0.2_beta_2024-11-29-linux-x64-gui.zip -> duplicati-bin-2.1.0.2_beta20241129.zip +_md5_=f17ddc3c5723d946db13bc8a5eb1a059 From 3b8912938ec287df6304cf179c582f288f46a67d Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 16 Dec 2024 00:01:05 +0100 Subject: [PATCH 2/2] Clean up ebuild. Signed-off-by: Manuel Friedli --- app-backup/duplicati-bin/Manifest | 2 +- .../duplicati-bin-2.1.0.2_beta20241129.ebuild | 47 ++++++++++++------- .../duplicati-bin-2.1.0.2_beta20241129 | 2 +- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/app-backup/duplicati-bin/Manifest b/app-backup/duplicati-bin/Manifest index 017f663..db50355 100644 --- a/app-backup/duplicati-bin/Manifest +++ b/app-backup/duplicati-bin/Manifest @@ -2,6 +2,6 @@ AUX 001-duplicati-bin-2.0.5.1_beta20200118-bash-path.patch 1046 BLAKE2B da4e78cc DIST duplicati-bin-2.0.8.1_beta20240507.rpm 30119517 BLAKE2B d915d41b1e1f64f303b964a4a269041e0c5357127de64f9333bd9ed44509e96f1a656161d7c16105f66cfaf1db27fb1762820f76529171e9822acc4a7bed08d5 SHA512 91e9867bdd81d76b15a90f9a723f5e24ff3c86e2cbf5619fd6608854b6cd24503f251bc76c4266ca498e216370a358a57d09a306c522cbba37fbd6008c8ad962 DIST duplicati-bin-2.1.0.2_beta20241129.zip 80618224 BLAKE2B 8bf594861660481790c838062d82fa42e146bcc839611664b330cea278438267b55282dd97f207e2103c559ce768133afdef8b8d2472f7529376eca70ab963f5 SHA512 308d7544e1eda7246ebbf7304d360b933bea83655b0ef1564f43daaf4e39f5dfcc8cea08acab19db4dfcfd500474bda77f2ab61d12018d26a4462cc447a9c990 EBUILD duplicati-bin-2.0.8.1_beta20240507.ebuild 1087 BLAKE2B 5721284a6429d399deae034432be75b2a5135d9cc217d1e3c32d42a3f2d6fad04cc8c1eaf8b63851169fb1e711276cdd58e2984fef777bc1fd3a6cdf46be9e2b SHA512 56bce8533436559c15497c8dc3ccada38172e2eebd493e4632d585c1fa8dd8ca0944b5181c780a9ef7dc524d6e94f9419fc7bcc71e65ab9c950f6d2d2b795d5d -EBUILD duplicati-bin-2.1.0.2_beta20241129.ebuild 1262 BLAKE2B bef0761a906f91c2854bcf2114f8bd9f06b5c9b5e6eff6fc3a11534271faa1cae878795dc86d24a20d4661ecd26b520f526732fba21b3554c8c2dfd21f850ce5 SHA512 f391d60936c503caa89d5890d7234fbd325f36d484e3878ddb49b1e21e4e66725d369920099c57f8f5604b8d9f1f1462e9cecd38eb3984a6fb762a1450e0c4e3 +EBUILD duplicati-bin-2.1.0.2_beta20241129.ebuild 1500 BLAKE2B dbff50c6fe409723f44dc6223c34142636ab8abb98742cd0879ca300747dee7d8bcf59630cf91c3e93f4b29b40c65fdd66c50aaadedae92122b2bcc77ed1c0d0 SHA512 e15a2797e4ee29c75a271a4f1385edbea669ca716d7b9198d3ed300c70b65f0420b65be3f4379ab092a906bb5df7bc005bee8862977c26717f76cb6a6441def8 MISC ChangeLog 2725 BLAKE2B 5d65b12d806af6aa06c8b49d6abfdfbb96b7ff7840331b62b55a989248512caa5606fb445a41418db9110eaf8753c24f22055ba564f12c36096940b1e92ddeee SHA512 db38804e12d3ce40dbd0bf17c26ce01b0fffa5494c0cdc266d9b9fc41762abb4b407618d863c5fb401b95727688e9ba836b1b619e7a5239a10bbce4ec58e4b56 MISC metadata.xml 333 BLAKE2B 062c64e55f224750f62336cfc0c639f64d6e53e0a27ca4b08dd583925bb8fdc4e37a831ed4641b0dc3318e9241eaddf2cd4e5454451dc61d5a467469bd0c835d SHA512 4760985f2d129d5139d192ceec710a2da34cb06a5ae0d83a6566d62ddb5072d7aa2b3222befe65e68cf1c693f262ac20fcd0d98a8ee7bb872ebfdd1999113148 diff --git a/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild b/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild index a39286a..e2e60fe 100644 --- a/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild +++ b/app-backup/duplicati-bin/duplicati-bin-2.1.0.2_beta20241129.ebuild @@ -3,20 +3,29 @@ EAPI=8 +# ex. 2.1.0.2 +MY_MAIN_PV="$(ver_cut 1-4)" +# ex. beta +MY_BUILDTYPE="$(ver_cut 5)" +# ex. 20241129 +MY_BUILDDATE="$(ver_cut 6)" + +# ex. 2024 +MY_YEAR="${MY_BUILDDATE:0:4}" +# ex. 11 +MY_MONTH="${MY_BUILDDATE:4:2}" +# ex. 29 +MY_DAY="${MY_BUILDDATE:6:2}" + MY_PN="duplicati" -MY_PV="2.1.0.2" -MY_BUILDTYPE="beta" -MY_BUILDDATE="2024-11-29" - -MY_BASE_PV="${MY_PV}_${MY_BUILDTYPE}" - -MY_PV_1="v${MY_BASE_PV}_${MY_BUILDDATE}" -MY_PV_2="${MY_PN}-${MY_BASE_PV}_${MY_BUILDDATE}" -MY_P="${MY_PN}-${MY_BASE_PV}_${MY_BUILDDATE}-linux-x64-gui" +# ex. 2.1.0.2_beta_2024-11-29 +MY_PV="${MY_MAIN_PV}_${MY_BUILDTYPE}_${MY_YEAR}-${MY_MONTH}-${MY_DAY}" +# ex. duplicati-2.1.0.2_beta_2024-11-29-linux-x64-gui +MY_P="${MY_PN}-${MY_PV}-linux-x64-gui" DESCRIPTION="A backup client that securely stores encrypted, incremental, compressed backups." HOMEPAGE="https://www.duplicati.com/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${MY_PV_1}/${MY_P}.zip -> ${P}.zip" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/v${MY_PV}/${MY_P}.zip -> ${P}.zip" S="${WORKDIR}" LICENSE="LGPL-2" @@ -28,18 +37,24 @@ RESTRICT="strip" BDEPEND="app-arch/unzip" src_install() { - mv "${S}/${MY_P}" "${S}/duplicati" - dodir /opt/duplicati + my_source="${S}/duplicati" + my_target="/opt/duplicati" + + mv "${S}/${MY_P}" "${my_source}" + + dodir "${my_target}" + insinto /opt - doins -r "${S}/duplicati" - exeinto /opt/duplicati + doins -r "${my_source}" + + exeinto "${my_target}" my_executables=( duplicati duplicati-aescrypt duplicati-autoupdater duplicati-backend-tester \ duplicati-backend-tool duplicati-cli duplicati-recovery-tool duplicati-secret-tool \ duplicati-server duplicati-server-util duplicati-service duplicati-snapshots ) for f in ${my_executables[@]} ; do - doexe "${S}/duplicati/${f}" - dosym "../../opt/duplicati/${f}" "${EPREFIX}/usr/bin/${f}" + doexe "${my_source}/${f}" + dosym "../..${my_target}/${f}" "${EPREFIX}/usr/bin/${f}" done } diff --git a/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 b/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 index 8d09b0f..b08cd37 100644 --- a/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 +++ b/metadata/md5-cache/app-backup/duplicati-bin-2.1.0.2_beta20241129 @@ -8,4 +8,4 @@ LICENSE=LGPL-2 RESTRICT=strip SLOT=0 SRC_URI=https://github.com/duplicati/duplicati/releases/download/v2.1.0.2_beta_2024-11-29/duplicati-2.1.0.2_beta_2024-11-29-linux-x64-gui.zip -> duplicati-bin-2.1.0.2_beta20241129.zip -_md5_=f17ddc3c5723d946db13bc8a5eb1a059 +_md5_=af669c9b48dd346d73eb423485842839