diff options
Diffstat (limited to 'app-backup')
36 files changed, 166 insertions, 177 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz Binary files differindex 3b08c25b9e7c..30e428a08467 100644 --- a/app-backup/Manifest.gz +++ b/app-backup/Manifest.gz diff --git a/app-backup/attic/Manifest b/app-backup/attic/Manifest index eacaf4361bda..8a55a558a448 100644 --- a/app-backup/attic/Manifest +++ b/app-backup/attic/Manifest @@ -1,4 +1,4 @@ DIST attic-0.16.tar.gz 87985 BLAKE2B cc801d8e3b28f6041c053f368c1d5ab00b1b419928d6a84647da7dccb7fb46b477898249873e90ba15c721468c09ae243d450fc978fe8cc3947b2c2e035f2aae SHA512 16139cd93bff59414cc1ce3fd68e2dd0aed4937a20bd1003880961ad2e239a1e982fd0d4f6b791165464213b88dea6ccd8e5e59d2087809be2e1bfdfd3b3186c -EBUILD attic-0.16-r1.ebuild 923 BLAKE2B 72eb2f0221725a4569f1201ae1e5225ca26083d64dad933257287bea4efd107c017c44133ec7d1c22e9dead55ca4fb2ede59878143303f7c7775b8807f5ff3ff SHA512 71e63a9d2fe5ace2fc4dbb5f8a9a02b61636c8417423ba5af7e91b60e97825a52f49ff70ceda9ba63928ea11381126616f589ae9d7c1d116400ce2aa2db90f67 -EBUILD attic-9999.ebuild 923 BLAKE2B 72eb2f0221725a4569f1201ae1e5225ca26083d64dad933257287bea4efd107c017c44133ec7d1c22e9dead55ca4fb2ede59878143303f7c7775b8807f5ff3ff SHA512 71e63a9d2fe5ace2fc4dbb5f8a9a02b61636c8417423ba5af7e91b60e97825a52f49ff70ceda9ba63928ea11381126616f589ae9d7c1d116400ce2aa2db90f67 +EBUILD attic-0.16-r1.ebuild 856 BLAKE2B c3070175c58b134956109b2fba3df0ef80278d282f8d236089a233e8f3ce202674dd56d4a5c491309e474e51b63d5d00482f0518ef2dd11cef2c85d1b7282530 SHA512 b69742a8c3a38a45bddfdcd26d6b4329657f958e3790f033916ebd3d67e3e68fb0d93b79363bbbdbbc4fab8108097da0b9ffd484d3a0259dd5d904c90520ba98 +EBUILD attic-9999.ebuild 856 BLAKE2B c3070175c58b134956109b2fba3df0ef80278d282f8d236089a233e8f3ce202674dd56d4a5c491309e474e51b63d5d00482f0518ef2dd11cef2c85d1b7282530 SHA512 b69742a8c3a38a45bddfdcd26d6b4329657f958e3790f033916ebd3d67e3e68fb0d93b79363bbbdbbc4fab8108097da0b9ffd484d3a0259dd5d904c90520ba98 MISC metadata.xml 328 BLAKE2B 4b8c33c80a1e860ec347a8735aad642c9dc441f87b20c588dde534be6d4f9b6981a07314f0643769537ce946f1397eee20801d381c2632d5c98a1d6db12a00cd SHA512 2c24d7eaef0da74758f5726e2b88d2dc11db8a2ea3999abee9305c5e66b236b50d56034d5fae9a7b1d9caa98c7fa3aa54dd06d5279b3a636532010130e40f36a diff --git a/app-backup/attic/attic-0.16-r1.ebuild b/app-backup/attic/attic-0.16-r1.ebuild index 4fa4def16abf..7d7c173b276f 100644 --- a/app-backup/attic/attic-0.16-r1.ebuild +++ b/app-backup/attic/attic-0.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,12 +20,10 @@ HOMEPAGE="https://attic-backup.org/" LICENSE="BSD" SLOT="0" -IUSE="libressl" RDEPEND=" dev-python/msgpack[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= dev-python/llfuse[${PYTHON_USEDEP}]" DEPEND=" diff --git a/app-backup/attic/attic-9999.ebuild b/app-backup/attic/attic-9999.ebuild index 4fa4def16abf..7d7c173b276f 100644 --- a/app-backup/attic/attic-9999.ebuild +++ b/app-backup/attic/attic-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,12 +20,10 @@ HOMEPAGE="https://attic-backup.org/" LICENSE="BSD" SLOT="0" -IUSE="libressl" RDEPEND=" dev-python/msgpack[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= dev-python/llfuse[${PYTHON_USEDEP}]" DEPEND=" diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest index 58db55b71a36..c72d56715269 100644 --- a/app-backup/backuppc/Manifest +++ b/app-backup/backuppc/Manifest @@ -5,8 +5,8 @@ AUX 3.3.0/02-fix-config.pl-formatting.patch 3904 BLAKE2B 27e5d220124bb5ca1a909d3 AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1908 BLAKE2B e26b4c9dcda7416f09516dc5b2e4ea7b6a690d00ef60f5a8bd34090d8178074e560a486b00435593a9da832db0d70bedf6d48f2f8c93928b55b96dd2041deebe SHA512 d9fe509d59b3c0f0fab265dd1eab2da7d499fd5e9838e04f413b56d4e116337f8781815e3ac9c2ab0dd8e103ce49fa78a398ebf7e1b2475d0b7c869d468ddf2e AUX 99_backuppc.conf 718 BLAKE2B 3075731b3bd580e9e9f864391d8a65716f43826d801bdf95082dc2168120419346b09322292eecf9de0bac6708dcba606347142238a65f11676ec553ca278b75 SHA512 cb68dfbb635564740428850ea3f026ebc0b8e22b2bca52640b2f367e5487fa205b00ec82e4e192b311e2886686b81f9ea52de54886994c6cce1cd154937fa0ee AUX backuppc-3.3.1-perl522.patch 611 BLAKE2B a363952b76c8514ceeb31ae71b134ad37004422eeb905bf243aa86dc85795782066d9ee3aca266b7bbe62308bf421f7e6c5c006f2cff2182f4d56dba8eb3c063 SHA512 c7425c9eec316049b02226be02bcaefc6204016a7d0da876cab2094a5f1572ba42195dc0395ad42755b7dfbe11e28bcef59c04e85821e3b8e7ce428966f418bd -AUX backuppc-3.3.1-perl526.patch 973 BLAKE2B 5853a89c016406d7202bc9f3ab20b9af9466b0081f958126cec2890bd6bde60d8134629a61929fa7e16b8056bb590f0bd973a62a7862e2432ec2d73862e5687b SHA512 ce5a9fc93656c6759c3afb900f68f7482b11916860a16c8e05db9432585618e942a092274a1dcdfde4cee94d39fe72f614443107e233ce1fb702c8a2fc2d999e +AUX backuppc-3.3.1-perl526.patch 907 BLAKE2B 80da3a7d9710c8ef55fac9e11859604584d1d2909dbd36201a206e96624aceb4ff362292914fda7bd5d513a27bbf338f6476ee2a49914fd06a449077318a71f7 SHA512 b697d756659f80d665d7c57132a44aa97411617988220e93360e6f3cc9c3b03059ecc4326fb6fa4016e55b4641694299122b8ca224ab1048986e5f29156b849f AUX backuppc.service 231 BLAKE2B 948543a9fc9accff40868e930680c4eb9c0ff89c291254091c8f48b788b1eacf6ba6aba317fd39d2958e8af2efd7194cbe26d3674ee055e8401c591ac27e2fa5 SHA512 9a7cb7ac7da2851cfaf90fafe082800fbac34a5a40a9f6aed1ea817b6f9aeb5be60cb3cfb35c263997c2ac1d22f3384752a23f44158572a9efc8f2c48e99c969 DIST BackupPC-3.3.1.tar.gz 556461 BLAKE2B 91477196506291fb542a266aca4182ad727758ccf8379c135dcd5147d42b5f1f58d094473430fee64f67e0fc75e077fdf92bfcdaf2313dd53480737666746160 SHA512 b6bb9de3103c5062098d80755055b7461ae9133a4a46a66b3d0af89d081086571694db1898e7d85880defa15b030bad522812116ae5361c0fbde90b877d139c6 -EBUILD backuppc-3.3.1-r6.ebuild 5433 BLAKE2B 5dcb07f3f8b57f9b7db9992a21cffb61f4ef96ca176bbd8183c18b5c3082db17445962766fbba8adae1c7a2040d20e21d511ac1b72cef885b676a4c76c32c75d SHA512 62a43139f30493eccc164d63ff9304acca9539b314e9f100fac73ada0b4568d63c6d3d5de647ff09659cd5735fe0150110f94f79b025a7600d2a67621d84f1b8 +EBUILD backuppc-3.3.1-r6.ebuild 5434 BLAKE2B ae7decc2ce0a09f964d0a449c78cb44adeb3081846c4533e7373a1748983bad6aabf68d6747a488337aedb10030539b35b8fbd63d969a4abd78ddb7958c55d0f SHA512 189a6d83cbb86201ba36f017a855ecfd86f1f2ee23b230a5ae8646de404f23bb1d584ca72ea0735c1d6ad8216120325056309288a39ac3eca12c88b2a9d3f4f2 MISC metadata.xml 245 BLAKE2B 60b89e1b22df8b9bf236255a9563dea8017b658ba02811b0826ec33790245fbba9332bcfef37cfe1a0dfc5c15de494f7b6eab4b6fbc0f92c6b3c9bec34c2f5c3 SHA512 4129c00f4fd37b4c2e051df35c98105ee97b74bc2a8af78e97f2cbc4c97d14740456fc01ed2ab5c6df3bab10a17ce1728de9e4b83cfee393a8841e8933232877 diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild index 97bacafc0e0d..5d45affdb88d 100644 --- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild +++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild @@ -25,14 +25,14 @@ DEPEND=" dev-lang/perl " -# The CGI modules are handled in $RDEPEND. +# The CGI modules are handled in ${RDEPEND}. APACHE_MODULES="apache2_modules_alias," # RedirectMatch APACHE_MODULES+="apache2_modules_authn_core," # AuthType APACHE_MODULES+="apache2_modules_authz_core," # Require APACHE_MODULES+="apache2_modules_authz_host," # Require host APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user -# Older versions of mod_perl think they're compatibile with apache-2.4, +# Older versions of mod_perl think they're compatible with apache-2.4, # so we require the new one explicitly. RDEPEND=" ${DEPEND} diff --git a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch index ec7b9a63d06f..0569e42a496f 100644 --- a/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch +++ b/app-backup/backuppc/files/backuppc-3.3.1-perl526.patch @@ -1,6 +1,6 @@ -diff -ruN BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm BackupPC-3.3.1/lib/BackupPC/Lib.pm ---- a/BackupPC-3.3.1.orig/lib/BackupPC/Lib.pm 2015-01-12 01:19:53.000000000 +0100 -+++ b/BackupPC-3.3.1/lib/BackupPC/Lib.pm 2017-07-08 00:31:52.100003197 +0200 +diff -ruN a/lib/BackupPC/Lib.pm a/lib/BackupPC/Lib.pm +--- a/lib/BackupPC/Lib.pm 2015-01-12 01:19:53.000000000 +0100 ++++ b/lib/BackupPC/Lib.pm 2017-07-08 00:31:52.100003197 +0200 @@ -1261,7 +1261,7 @@ # # Replace scalar variables first diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index cdea82ffd79d..c990a8d8e450 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -4,8 +4,6 @@ AUX 7.0.2/bacula-7.0.2-depend.patch 599 BLAKE2B be676329434260e65f7dcbefbfa8d9a0 AUX 7.2.0/bacula-7.2.0-doc.patch 435 BLAKE2B 65d528b337f9a3e2eaf456b6dad37ddc59bc1a3f6e54208899346a6bc285fe2b19a464b39cc0c9439c4266baf98c1b3a06afd235b3ee7c88373d3c890163e01a SHA512 27d2839658e3471487dce023c806261e5b5d03212f12eab75885b9b61eb22e57c96e85c07a5f81c812974963904ab81b6ce15abf5381647bd2188abd14139b34 AUX 9.0.2/bacula-9.0.2-lib-search-path.patch 1431 BLAKE2B f04bbf695a926424092dd974994967eefcd48407f2de43b9e94bff25403e66f4a49cde08d667e3b5fc4fb9f8d273a786c3422325db3f589278d16f136d4a9a0c SHA512 3863102d2f8db4158dede306b07297da6550bbad1c77aea49a75de412a7f4630216ef2ae28fc51ffa8d8f9c373510e58982f28e32fdbb142a3551eef7f112b7d AUX 9.0.6/bacula-9.0.6-bat-pro.patch 667 BLAKE2B b8987c244025f029a182d6b44f30e0e0a6835b9f6cadb6b43b2b55ea33113e20c20b6a367d965ea12358597e9807c79846e45571b31f9b66dc3ad83265fed4e7 SHA512 d521759cad65ef73fb674cd6b58f9540ef6e86842bcd45ece4730f71a408076b38faea2088bf6f2993fed9a88d727ff2ff8c3e3619e27fcaa1d5afe4506640cf -AUX 9.4.0/bacula-9.4.0-libressl26.patch 1354 BLAKE2B b5d22a50e702a239aedd803c6f390572892124370c916887b166e263f1f3aae32fede777ba580e0a32401a58dc5ce10f6d5942e8764b5bf5d3abe1b9ae7c287c SHA512 3ae42c7c4e58e8e04cb444cb07399648f6962100b9f17146385c807fd5a5890f5f5b873bb790c5918be6a97bdfb7baa980798fe04f6adffbb1648fd4fa63c1fc -AUX 9.4.0/bacula-9.4.0-libressl27.patch 414 BLAKE2B 29c2720cd05bd5d4ddc57db61e2729744efa4ac03985995b552b2570144dbb968d7e2f91c9a8ae01fe2286483555b72b72eea5110ab364fdf6203141ee9aadd3 SHA512 8f2ea8c552c0080eb56c2e39de78779567156c8198adc2ec775fa3282b01749b8c2b113123265fee88ade2c21c5819a0d8e4c0bda6a409ee5fee2d7352e2e3d6 AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290 AUX bacula-9.6.x-fix-race-condition.patch 657 BLAKE2B 8d5230145144a9ae737793b54f2075421e13fc9d391266fd2c976c867ba70806377ac9c64634a3e0ddd937d4287129e5ac1d714f891ac774f25ea41fd89c3b25 SHA512 ef8ff994c5184faa7a853321628e232242e57651a54857fb524bf24b012e39ab36d3367e2e59d4b17095140733ff6f4dcf3bb40b4a7cfb3a650edbbf2d79dc98 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf @@ -18,7 +16,7 @@ AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516c DIST bacula-9.6.5.tar.gz 4252526 BLAKE2B 48bfc9f45db10949fb4d7396c2ca15ed17dad3bd6ab9c6ab5cd0b3a80d1df0d37868a8671c2ead9b00fe89da91d43e945ca2818016f09502aff1a2fd3a5d455d SHA512 4018e242b2131c2416cd16ae3530c9c848dc8e88dd6532136c699a50fcbf39a574ffec8ef13bc5d7a9673d057b51cf1d1be80667e89abe0e18ec79d04b0edd70 DIST bacula-9.6.6.tar.gz 4253303 BLAKE2B 131353e24265f64dd3c4e0632bee93d2a170d3ed88626ab80f1804e7a218eb86c5ac7507f4a4fe5ef7d4472a1c90ef0f45e1a6ad0a4a65a1fa8f1a8f63287e3f SHA512 1b669bbf1e54f40e0426603601a4751c42101985de901f951a68add7644971d48615b3089c65fafd444c762c3d82b67cafdcae9636e8a19af8fd94ae631c315a DIST bacula-9.6.7.tar.gz 4168102 BLAKE2B 8f5d5cbe8c3ce62105624138e9dfbb9f19eb0721bb2e377c07ef2cd3d4a8442641b4758b00b3050d2352dde31205658963782d2bec3e87242dac7b4b6a4d659c SHA512 27551faa2e4b13c6c2b9a2500f1253dfa5ee84929013491a7bf512d965d655c5af78b08201090474bc9b29827ca0a5c1c5a23a55712a1f739f37de75449cfd4d -EBUILD bacula-9.6.5.ebuild 12502 BLAKE2B e8fca58c9aecd84da6a156a6c59584808dbdf100590bd38f41cd66bf4d67ff410404df0bac9f0966a1462e37d82258789152ae8565601b75f7b0d110766a7d64 SHA512 8ceb86a5891f6ee92876ee5d019fe22a719d60a4661caa2e664c0eb25e519fc51231f739977ed595fabb44c9a8ecf5da18a8068b90977da7f81b2a0eb5c42e23 -EBUILD bacula-9.6.6.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55 -EBUILD bacula-9.6.7.ebuild 12505 BLAKE2B 2ef4888fa482355f3cdb74dcc9372d151754ecdf6e6da6e6850c04da66481199cca0dc7be0dfaa2ac70ce8137e79692a3312ce7894f0d721564147a6b10c784f SHA512 9242b3eb45b6908b947dfc40e33a78307dd2d3b420146628f55eb2262cdda990b7b43ee70165154b50498cc0b8755267bf57c323f6e384b5b6a99c25f7a87b55 +EBUILD bacula-9.6.5.ebuild 12072 BLAKE2B 4e8db8adee0c9a29ffbbb873cf8089b0291e693b0f461339d376a0c1e18c5fd0cff9c06569d492f5e08562dd7d7d8372639dd2b27cd8b700f2fcc29dac8d34c8 SHA512 8b2ee720023b762944690b51fc504e00a9cc61ea6bdc57efbf6afeebe625c9ed076765f744fc6a03fc46386bc61bb3de50db65defefa136a4f89f5dee56ca8db +EBUILD bacula-9.6.6.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908 +EBUILD bacula-9.6.7.ebuild 12075 BLAKE2B 51314b17c6a5f8ee40266f651f5c76c826bab5860977e2392eed9cf48ec7e2d9c6867ae128710757522edf0b935233cef06b841aaeb5645b31351470a5773f57 SHA512 2f7ebbd951410ae5d1cfd0dabf6476365170962de4b4179144f697fd44770543f2af82c729b246c51d21ab3b6e5a16c25ffda2dfb2aea36cd07c4a4d82789908 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875 diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild index 13290a4abf99..d9cbcaee1838 100644 --- a/app-backup/bacula/bacula-9.6.5.ebuild +++ b/app-backup/bacula/bacula-9.6.5.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( @@ -40,8 +40,7 @@ DEPEND=" sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) ) !static? ( @@ -50,8 +49,7 @@ DEPEND=" sys-libs/zlib acl? ( virtual/acl ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) @@ -156,15 +154,6 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die - # fix handling of libressl version - # needs separate handling for <libressl-2.7 and >=libressl2.7 - # (see bug #655520) - if has_version "<dev-libs/libressl-2.7"; then - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch - fi - # Don't let program install man pages directly sed -i -e 's/ manpages//' Makefile.in || die diff --git a/app-backup/bacula/bacula-9.6.6.ebuild b/app-backup/bacula/bacula-9.6.6.ebuild index aaffa58674b0..d527ca5224e4 100644 --- a/app-backup/bacula/bacula-9.6.6.ebuild +++ b/app-backup/bacula/bacula-9.6.6.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( @@ -40,8 +40,7 @@ DEPEND=" sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) ) !static? ( @@ -50,8 +49,7 @@ DEPEND=" sys-libs/zlib acl? ( virtual/acl ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) @@ -156,15 +154,6 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die - # fix handling of libressl version - # needs separate handling for <libressl-2.7 and >=libressl2.7 - # (see bug #655520) - if has_version "<dev-libs/libressl-2.7"; then - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch - fi - # Don't let program install man pages directly sed -i -e 's/ manpages//' Makefile.in || die diff --git a/app-backup/bacula/bacula-9.6.7.ebuild b/app-backup/bacula/bacula-9.6.7.ebuild index aaffa58674b0..d527ca5224e4 100644 --- a/app-backup/bacula/bacula-9.6.7.ebuild +++ b/app-backup/bacula/bacula-9.6.7.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" +IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" DEPEND=" !bacula-clientonly? ( @@ -40,8 +40,7 @@ DEPEND=" sys-libs/zlib[static-libs] acl? ( virtual/acl[static-libs(+)] ) ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) ) !static? ( @@ -50,8 +49,7 @@ DEPEND=" sys-libs/zlib acl? ( virtual/acl ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) @@ -156,15 +154,6 @@ src_prepare() { touch src/qt-console/.libs/bat || die chmod 755 src/qt-console/.libs/bat || die - # fix handling of libressl version - # needs separate handling for <libressl-2.7 and >=libressl2.7 - # (see bug #655520) - if has_version "<dev-libs/libressl-2.7"; then - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.4.0/${PN}-9.4.0-libressl27.patch - fi - # Don't let program install man pages directly sed -i -e 's/ manpages//' Makefile.in || die diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch deleted file mode 100644 index ea7fa0bb7a3d..000000000000 --- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl26.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 -+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 -@@ -195,7 +195,7 @@ - IMPLEMENT_ASN1_FUNCTIONS(SignatureData) - IMPLEMENT_ASN1_FUNCTIONS(CryptoData) - --#if defined(DEFINE_STACK_OF) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) - DEFINE_STACK_OF(SignerInfo); - DEFINE_STACK_OF(RecipientInfo); - #else ---- src/lib/openssl-compat.h.orig 2018-02-02 15:26:04.182557000 -0600 -+++ src/lib/openssl-compat.h 2018-02-02 15:27:50.229100000 -0600 -@@ -1,7 +1,7 @@ - #ifndef __OPENSSL_COPMAT__H__ - #define __OPENSSL_COPMAT__H__ - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - static inline int EVP_PKEY_up_ref(EVP_PKEY *pkey) - { - CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); ---- src/lib/tls.c.orig 2017-11-21 18:37:16.000000000 +0100 -+++ src/lib/tls.c 2018-04-16 20:00:54.082000000 +0200 -@@ -116,7 +116,7 @@ - ctx = (TLS_CONTEXT *)malloc(sizeof(TLS_CONTEXT)); - - /* Allocate our OpenSSL TLS Context */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - /* Allows SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols */ - ctx->openssl = SSL_CTX_new(TLS_method()); - diff --git a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch b/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch deleted file mode 100644 index 3ce61be59252..000000000000 --- a/app-backup/bacula/files/9.4.0/bacula-9.4.0-libressl27.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/crypto.c.orig 2018-02-02 15:34:39.420489000 -0600 -+++ src/lib/crypto.c 2018-02-02 15:35:44.000524000 -0600 -@@ -195,7 +195,7 @@ - IMPLEMENT_ASN1_FUNCTIONS(SignatureData) - IMPLEMENT_ASN1_FUNCTIONS(CryptoData) - --#if defined(DEFINE_STACK_OF) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) - DEFINE_STACK_OF(SignerInfo); - DEFINE_STACK_OF(RecipientInfo); - #else diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest index ad1a12ea7098..c871862a7299 100644 --- a/app-backup/bareos/Manifest +++ b/app-backup/bareos/Manifest @@ -17,7 +17,7 @@ AUX tmpfiles.d-bareos.conf 35 BLAKE2B b670a9951d736618456644aacb28fbd2784c640efd DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2 DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e -EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5 -EBUILD bareos-18.2.10.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc -EBUILD bareos-19.2.9.ebuild 11050 BLAKE2B 0bdb494f6b9b80e5708a19aee86cffc73f090e79f613e01941af4296354a011a2fe04477ad5e785d718a95f33a08d7019b8a422aee2b75fae78800f6bd07383d SHA512 528a8e404f77395c1d71c75bf35c6029247c6d12aa301a2a206d76ee35f48d93cf1d981454cfa57394925da74cbcf236870512ff907c0a85fef6aa8206ee9517 +EBUILD bareos-17.2.10.ebuild 10243 BLAKE2B fd52bf443eab0b6b6f6610fced73f14f43ded6c13b5010b32a986129e20433b57bbdf33bbe1e365ad0cfd6dc2c9ec98ac15a065c83f66d17968464a9bce9f961 SHA512 a2c9dc80ae3894a22cc0c3c4769b8a4d680a807a2531c2807a25184f229661b2a6f5afcd87827966e239bfac78484275c0c95b4e1444d8aea2f90dc39458c569 +EBUILD bareos-18.2.10.ebuild 11298 BLAKE2B 4df50a376a19f744188b8742f2ee0c4d4e559b02392caea1b1de7c4c1180b06e4ea5ac93e2610538a803ba00c0092bdd04016f790000fd2f9bd92acf364ff0c6 SHA512 0809bb8ece48e8cbdd30a8145fba6474c3291f7aff4197a7e221c6b94f9f9e5d3ba3272f9e0c83da01562071ecc85b9cd6be012bc6e47409b21d6788cc1a0828 +EBUILD bareos-19.2.9.ebuild 10924 BLAKE2B 7ed3781f4bd5e27455dca9485d6fe2cdf28d1fdec7b6f38e6fcd7430481359cf10e5f6be3f27986f556aff55cff20f1bab3a55597c09a1e902793232db7f4e2e SHA512 e6c06012495478d0b8140bf979637d52da60fd3b1e6289e1f5d56741679dac272c40394137bf3b988cef105141b302ee3fa290908b71b3926527721db213113a MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872 diff --git a/app-backup/bareos/bareos-17.2.10.ebuild b/app-backup/bareos/bareos-17.2.10.ebuild index f4a2b487a99f..bcf92fecb1cb 100644 --- a/app-backup/bareos/bareos-17.2.10.ebuild +++ b/app-backup/bareos/bareos-17.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ RESTRICT="mirror" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl +IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax" REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" @@ -48,8 +48,7 @@ DEPEND=" sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) @@ -59,8 +58,7 @@ DEPEND=" dev-libs/lzo ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) diff --git a/app-backup/bareos/bareos-18.2.10.ebuild b/app-backup/bareos/bareos-18.2.10.ebuild index cf1622b6e1ad..9f8f8def1767 100644 --- a/app-backup/bareos/bareos-18.2.10.ebuild +++ b/app-backup/bareos/bareos-18.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -16,7 +16,7 @@ RESTRICT="mirror" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl +IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb logwatch mysql ndmp +postgres rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax" REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" @@ -51,8 +51,7 @@ DEPEND=" sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) gnutls? ( net-libs/gnutls[static-libs] ) ) @@ -62,8 +61,7 @@ DEPEND=" dev-libs/lzo ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) diff --git a/app-backup/bareos/bareos-19.2.9.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild index 7487d9136008..e2d48fb23962 100644 --- a/app-backup/bareos/bareos-19.2.9.ebuild +++ b/app-backup/bareos/bareos-19.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ RESTRICT="mirror" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl +IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb logwatch mysql ndmp +postgres readline scsi-crypto sqlite static +storage-daemon systemd tcpd vim-syntax xattr" @@ -49,14 +49,12 @@ DEPEND=" sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) + dev-libs/openssl:0=[static-libs] ) !static? ( acl? ( virtual/acl ) dev-libs/lzo - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/ncurses:= sys-libs/zlib ) diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest index c186816c5a69..9a85db9bc225 100644 --- a/app-backup/borgbackup/Manifest +++ b/app-backup/borgbackup/Manifest @@ -1,6 +1,6 @@ DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa1c95d08418a43c176146243d83cf07b3033707ab5423eeb097e92bb31cf016f65fc3738ebff1bb8c704a54c6e8dd12 SHA512 db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3 DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d89d025b1b3434c5d270539d1fc4aec92b52a750ab1079911e53478411f91c92be4f053c09289b1e38285caa03453f17 SHA512 9cdfe794329821c784461382633fd29f7f9b3cc6ef9e7fa2463ed178efd64ea367e56d49128d88b86bd516d36971282207ec173735ecb4eabc4ec7b4604ed773 -EBUILD borgbackup-1.1.15.ebuild 956 BLAKE2B a79d33cea40d25c63eb62b7bbba0f27b16d229e5caa45f164c9f605923d453f0e670fa9c9c2523ff389ba987f2b45053999922de0a50a9542ac2af7734be3805 SHA512 0a2d8610382a4a34b5a21a24738ff8a48c282b78cd19f6397ff705cea3b5c9f450d58ace334451275572e222bf2aec57d6e0860c946edfcf5d8b8e8f0cdcd853 -EBUILD borgbackup-1.1.16.ebuild 958 BLAKE2B 48d84aa0219bb67035d9901104d5b71ee62249ef739605f5835a6f7751bff64fa76bb3fc3ef86f23edd4fd66afcb5fee8c25ba2ce70843099822595cba8a861e SHA512 34eeef4485f6b646aedff16e2b6a676e9c8795b0069dcd361644a8254b83c1d847c8a289fa8d6942431ac079deb507da9c6eea695e5aeab05fbb2868a0c7a18b -EBUILD borgbackup-9999.ebuild 946 BLAKE2B 6173e891ff31cf2682aaf813daab17485b0017c8585c029cc96a229b4085683021baf05d7fe46b47737f71dac8b30e7b0523b5cda3c6d2150acfbb44012aa7a7 SHA512 14e55850b506e5357c0ea423f94125355d560ed107f40d4e6fbc796cba412dfc4195582649250458b2ade2d9257ecb6ff2e2f2a0f94b7cca2b1a9c0246596c2e +EBUILD borgbackup-1.1.15.ebuild 889 BLAKE2B 2001a4a954881ff588aa07a493e3f009c04a837ea923a30965a602d0e005bbd0996273970576b02e74ce2f124e26f5d9edf4edae9bba049fe2cf5677ca427244 SHA512 61099e4da538df64f2b0c72bd12c826705d588f532d49da1d7d5f0dc89c3c671c112a80a8f56719b93c740a68ba876c67cc8ad880566ed5f0a5b46fcf6cf46c0 +EBUILD borgbackup-1.1.16.ebuild 891 BLAKE2B 4f7317ef7595904b14ad1f749d4afc4d5e33504e228c38d6c3230a5c0821d4d362050ec2cb6f99608250e9d4bf58d21a3d3f0babfc006e7472ada99a9fb83e3f SHA512 1ff37be8920cd1ad8788aeb5a99918d7810f4168752a8b850e97862dcf39dbac4095e4fb9f4cc1e27eeb041d474ffe463dcce772d32577687cff422acef88030 +EBUILD borgbackup-9999.ebuild 879 BLAKE2B 6a77c7a7e7630b8af11b0a471216b71be0cf803d5f6eb5366b7c007f24bb4a63f898e9efe24d97dfaeab9c53d81899051c29a01cd6bf43adf89832c7c9e145d5 SHA512 45c56065c9cdf51f03ccfa86bfd5cb0b6ae2508e922b822b418d57dc3555f65882080730e687b5de68fa48b4a2863ebb98891e4ea6174caabe790f40b2e0f489 MISC metadata.xml 493 BLAKE2B 7c8c3f7dafce95377347ff7392fd80580f0bc9afb05654795ba86ab20bc54054395a46eaa172cd61ef1084a023cc26bfa9c835e9d73f921f842c03e668bcb6a6 SHA512 00aa284252b1ce793b4176f7eb1255984670924b3dc6ee75867d5a947761a3db7d3b917f412629edbe146b3d22050a4383afa8af4f017ebe68728d1b5575a473 diff --git a/app-backup/borgbackup/borgbackup-1.1.15.ebuild b/app-backup/borgbackup/borgbackup-1.1.15.ebuild index 756672758369..1bb0d493d255 100644 --- a/app-backup/borgbackup/borgbackup-1.1.15.ebuild +++ b/app-backup/borgbackup/borgbackup-1.1.15.ebuild @@ -20,7 +20,6 @@ HOMEPAGE="https://borgbackup.readthedocs.io/" LICENSE="BSD" SLOT="0" -IUSE="libressl" # Unfortunately we have a file conflict with app-office/borg, bug #580402 RDEPEND=" @@ -28,8 +27,7 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND=" diff --git a/app-backup/borgbackup/borgbackup-1.1.16.ebuild b/app-backup/borgbackup/borgbackup-1.1.16.ebuild index a85b2a0012cf..f99714f10048 100644 --- a/app-backup/borgbackup/borgbackup-1.1.16.ebuild +++ b/app-backup/borgbackup/borgbackup-1.1.16.ebuild @@ -20,7 +20,6 @@ HOMEPAGE="https://borgbackup.readthedocs.io/" LICENSE="BSD" SLOT="0" -IUSE="libressl" # Unfortunately we have a file conflict with app-office/borg, bug #580402 RDEPEND=" @@ -28,8 +27,7 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND=" diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild index 19b329975d8b..53a69141dbd4 100644 --- a/app-backup/borgbackup/borgbackup-9999.ebuild +++ b/app-backup/borgbackup/borgbackup-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,6 @@ HOMEPAGE="https://borgbackup.readthedocs.io/" LICENSE="BSD" SLOT="0" -IUSE="libressl" # Unfortunately we have a file conflict with app-office/borg, bug #580402 RDEPEND=" @@ -28,8 +27,7 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= " DEPEND=" diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest index 7c51ad0bad7d..6a9ca6200df3 100644 --- a/app-backup/burp/Manifest +++ b/app-backup/burp/Manifest @@ -5,6 +5,6 @@ AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d DIST burp-2.3.36.tar.gz 619564 BLAKE2B 8f30fb8808c8a3167467ef0bcdc84cd7c2e885ee6a8aa285d96f9187aeb33eacb90fefe382ddb74bbabcfefde6faa9ac6125e3bf4a6eb9778b650e74e812991d SHA512 48b852aca8ccf0abd696b9434cb83c0447845192096d0f3f0c032c328dcc20314faf68db94fa14da72692327432b78eb3680e83b1e892dd30c9aa2f340838ee3 -EBUILD burp-2.2.18-r1.ebuild 2832 BLAKE2B 91c0da9f9e456cde5b62dbe114efecc42aa9af1ac38c6e5bb0eac0c8b8aa8f6c454cd8d318b4cf27c039c3848d40c386d544b79e0a863b4b24f9dde41275eba2 SHA512 bb31a0f602f8bbaa50968a3085d84625711dc0d7f53ccd7f4216d8e1009b59da824d266729d0e2ac54ad0b02468146f770dcc45162a5dac950c35e503967ff5f -EBUILD burp-2.3.36.ebuild 3205 BLAKE2B 5dbac3c78cd16a6da6e65b2f57849c0e4e4792c1d208a7be1fac30264cac9985510611877bf62108489b649927f7e07223c33a9073129214f5b2fda0f069b2e4 SHA512 e214fa7397b8aae84211c510a61fe54804eba7490a5e5c04de95036e590df080cb77c1a6edfc8fbf5944f655f6d3174ae0b543e0115a58669754ec3ffb12e9f9 +EBUILD burp-2.2.18-r1.ebuild 2772 BLAKE2B 2057b4ca33ed84a585c72331530d9a005c27e2984b881ddc901772c235c13e99ed5c85ea43242f1239f57266b8732b0a9430b36ed6f693a6c5b2c43369d4c4bb SHA512 c94c2fc785841b59426e14bca60d6043564a00e32d246da19fde038a53dd776e0e50baf9920f8c2301d06f5d1134340403ce4ebce4acdefb489c6de0d1d47098 +EBUILD burp-2.3.36.ebuild 3145 BLAKE2B cd081eec0f83ea620fb3df808498ba171ced19196f96227ea13bf7fe70501ef1f0cdfa1b96bb1e638e3aa228714a3b11bf928050cccf13e902de2bc4fe783d79 SHA512 2c705b0ab512ee4fc0a90dab06cc8af6ea275c612c8c3915ae865e7d62562cfc49743b4542dbc59421a21128022096f49fd00fc69f6cd0dac5664bfaa24d0730 MISC metadata.xml 606 BLAKE2B b308037e2ad18ba69c0e85815c6e9036441759b790d8c32df0e1f09ceeac707db0ef5623e5a1caf0bb314366fa123ebb6a5ec4ec53a196ec3326d0eec42dbab4 SHA512 8a3b20deaa3129bb695dbece9431354d554a64ecbfa025b7a87d7d84cf2431f09650fdc203ec67d3d7d44a4eb4157a0093ee49a395e4c931a450f0a094fc368b diff --git a/app-backup/burp/burp-2.2.18-r1.ebuild b/app-backup/burp/burp-2.2.18-r1.ebuild index 7c633b85f4bf..198aa059230c 100644 --- a/app-backup/burp/burp-2.2.18-r1.ebuild +++ b/app-backup/burp/burp-2.2.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="acl ipv6 libressl test xattr" +IUSE="acl ipv6 test xattr" RESTRICT="!test? ( test )" @@ -22,8 +22,7 @@ CDEPEND=" acct-group/burp net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr )" DEPEND="${CDEPEND} diff --git a/app-backup/burp/burp-2.3.36.ebuild b/app-backup/burp/burp-2.3.36.ebuild index a72b5a23100f..bea45d6bcc62 100644 --- a/app-backup/burp/burp-2.3.36.ebuild +++ b/app-backup/burp/burp-2.3.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="acl ipv6 libressl test xattr" +IUSE="acl ipv6 test xattr" RESTRICT="!test? ( test )" @@ -22,8 +22,7 @@ CDEPEND=" acct-group/burp net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= acl? ( sys-apps/acl ) xattr? ( sys-apps/attr )" DEPEND="${CDEPEND} diff --git a/app-backup/deja-dup/Manifest b/app-backup/deja-dup/Manifest new file mode 100644 index 000000000000..18360977ce71 --- /dev/null +++ b/app-backup/deja-dup/Manifest @@ -0,0 +1,3 @@ +DIST deja-dup-42.7.tar.bz2 1384797 BLAKE2B f462df835039606b721d935e086e51ee27e861baa1fbc5836bb79952c838921cf5f28d439465451c5259bc2c77fa9cb839488c8b0196c6d176e32d9e42180539 SHA512 80c57fe75635346cf2597195e7f7b76e2562aaa6900e78fbfb7ad6ada9c268df36d4e16aa7ca522e1570987f5826586e1cab5fecb7d5ba90e34a23a349b47a74 +EBUILD deja-dup-42.7.ebuild 1054 BLAKE2B 62e25df12f269508e54780de326a047cea6c77871e69568755d5d38bc3c4b3aa73daeed4faaa8cef471ecd5567d8c9fb2cf03799d3d677ae6b7759d9369efe41 SHA512 f9b7faeb1435a611e9a013bd37a1e7913ac27564785a2afb94b4e87c4544572e2385dc6b549107b1190d50feec551fe7775bc3652d40660fd7134721ef7700a5 +MISC metadata.xml 1196 BLAKE2B 8dc19ef11655294c5a708e72243b81b60abc4b31dbfec4a2f414c9935bdc77cdc2c74364489781c6b357b04a1bdc9634a69e537808ae1a4c297003f2b5569613 SHA512 9569a06abda95896b3ae4e6a5990c41ae3c1a60d7ad39ea99383f61e6e3ff3908cb9f49183961ada04b8bda997b45cc1d4a05355284a88e51207d659a670ab6f diff --git a/app-backup/deja-dup/deja-dup-42.7.ebuild b/app-backup/deja-dup/deja-dup-42.7.ebuild new file mode 100644 index 000000000000..379d6a0cd948 --- /dev/null +++ b/app-backup/deja-dup/deja-dup-42.7.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson gnome2-utils vala xdg + +DESCRIPTION="Simple backup tool using duplicity back-end" +HOMEPAGE="https://wiki.gnome.org/Apps/DejaDup" +SRC_URI="https://gitlab.gnome.org/World/deja-dup/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + $(vala_depend) + dev-util/intltool + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig + test? ( dev-libs/appstream-glib ) +" + +DEPEND=" + >=app-backup/duplicity-0.7.14 + >=app-crypt/libsecret-0.18.6[vala] + >=dev-libs/glib-2.64:2[dbus] + >=dev-libs/json-glib-1.2 + dev-libs/libgpg-error + >=gui-libs/libhandy-1.0 + >=net-libs/libsoup-2.48 + >=x11-libs/gtk+-3.22:3 + >=x11-libs/libnotify-0.7 +" + +RDEPEND="${DEPEND} + gnome-base/dconf + gnome-base/gvfs[fuse] +" + +src_prepare() { + default + vala_src_prepare +} + +pkg_postinst() { + gnome2_schemas_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_icon_cache_update +} diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml new file mode 100644 index 000000000000..07c33c86cae2 --- /dev/null +++ b/app-backup/deja-dup/metadata.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <name>Oz Tiram</name> + <email>oz.tiram@gmail.com</email> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + Déjà Dup is a simple backup tool. It hides the complexity of backing up the + Right Way (encrypted, off-site, and regular) and uses + duplicity as the backend. + + Support for local, remote, or cloud backup locations such as Google Drive + Securely encrypts and compresses your data + Incrementally backs up, letting you restore from any particular backup + Schedules regular backups + Integrates well into your GNOME desktop + + Déjà Dup focuses on ease of use and personal, accidental data loss. + If you need a full system backup or an archival program, you may prefer other + backup apps. + </longdescription> + <upstream> + <remote-id type="gitlab">https://gitlab.gnome.org/World/deja-dup</remote-id> + <bugs-to>https://gitlab.gnome.org/World/deja-dup/issues</bugs-to> + </upstream> +</pkgmetadata> diff --git a/app-backup/rear/Manifest b/app-backup/rear/Manifest index 2283082fa598..8e06b918d557 100644 --- a/app-backup/rear/Manifest +++ b/app-backup/rear/Manifest @@ -1,6 +1,6 @@ AUX rear-2.6-Makefile.patch 879 BLAKE2B 60db156e4ac420f6d370b65c4a32b503f0ad958f1f2d3e698fe24248ebfeb94ccada049f580b6099385ad39ce57d06a3d4fbf30fa4372d85b7df57281de8f15c SHA512 8d1e3329b768b153124ebbebd0d70ecac19fababaad92d7789474709f785f74adaea3665d8f1889c344e03f58552616a16b71f541a8077c7b41adcbd9fa54c75 DIST rear-2.4.tar.gz 611731 BLAKE2B f7cb6955302e0be6178393a678f050729b827f822df91d28245655d414892f225e25125f7e3bfad080e139ddc9c728121894b4ebde48c4dff2a8071fb4a5d46e SHA512 8a20c0ffd913b1b4c27f6125c1ca31404daaceccb2bfff7932f1ea402806657252afc3f6719c75dcab2de18b7975f83544dac92f43a742654f90494454d7c088 DIST rear-2.6.tar.gz 750866 BLAKE2B de803951c040bb85d4659fc81ffb9264b2771a45675aca4eb0a6318201802475014c2b760415ac61ab734286f5e1e84b0c858df166b9be356384a243a7badb78 SHA512 0b6deac8f1b4adc3bcfcd19e82b5e5719df1c1c2347e3dde9bb47b6086856ebf5d08e485b876633190bb6f92a0e1c567bb65a30554205a32eec4b929e5815a6c -EBUILD rear-2.4.ebuild 845 BLAKE2B 4b0b46b7e0bac21849b77d41da8a442377a006fbebe868a53dcf2aaca4dde192ad5b95700112b800a3b55cb631901ffa32522be4dd094db87c8702f68ee4bbe3 SHA512 bd11af749e16c4c65ccf87a0f059c9c5b389b23b74ae6792b07b7667ad38198b3904357b4fa6597b18fce7405c43435b1c646e03111654fe7c474b7d32f5b68c -EBUILD rear-2.6.ebuild 1359 BLAKE2B 630d1ba04da06a1352cda7bfc5eb8027ad5655bd03b9d3f5451eb7f447fb7ba4c77fac455523cb5af66c0edc2184e0f422815a63c4f007df6e30558a0514d447 SHA512 8c98558d1469b76c077558a06bd725ef26a098dc1ee2b92d0b0f0217af6c4c46b02d4ca2e5b259d6f27ab974cff034bea82d53bd073b78f7b692a3fc3a1f5b31 +EBUILD rear-2.4.ebuild 785 BLAKE2B cedaea205ce24d6b5817577975bd907d063675311a4f5a13dfa03df5dd9aafcc21b3ed3d84bccf8f935b7ab5bb58ddfe65f8f31f36bd3d1aa71b2d41c1918c4c SHA512 1c23e4a14b27e3257af940453334b268ba6ab9887491bc05161efd35351d44bb6b9389be7158bf685b2fef5439ad104212e5fa5882685d9842d15739bdf5ac3c +EBUILD rear-2.6.ebuild 1341 BLAKE2B 9225b61b38ca9bfd84143bce96c1d31bdee68e771a34c33a066667645fe75bdac16d259d3391e5e425d68307bd3905bbadf46d3fa2a9ba29c58671c3cfba8f8f SHA512 99ecd0c4ab1b17606947f5b199055b09c5f71777954498a963f8407d8d35cf6060e944e0c03dc205c686039e100b8d3a8051aa41fb616182762aec33008b45d8 MISC metadata.xml 1044 BLAKE2B a7156b29cf1f9d05fdad1241e28e3df0c1c0a1f2a1711e9be7bc5bbaa47c2f2609c8ab4e011923b448c26694d4d8e873f348e25a2956df2a4668150e99f018e2 SHA512 179009d5a749f9acb028b11339ce825592faaddc65441591a37f9fde202042199e6e557f0c7110332c87835e80f64f22a6b5d4e0282b9cf164e02e2a99c81864 diff --git a/app-backup/rear/rear-2.4.ebuild b/app-backup/rear/rear-2.4.ebuild index 498e7a6f47ab..2ba393ff7e79 100644 --- a/app-backup/rear/rear-2.4.ebuild +++ b/app-backup/rear/rear-2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="libressl udev samba" +IUSE="udev samba" RDEPEND=" app-cdr/cdrtools @@ -24,8 +24,7 @@ RDEPEND=" sys-apps/util-linux sys-block/parted sys-boot/syslinux - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= samba? ( net-fs/cifs-utils ) udev? ( virtual/udev ) " diff --git a/app-backup/rear/rear-2.6.ebuild b/app-backup/rear/rear-2.6.ebuild index f01f863c512f..aab95996cc8f 100644 --- a/app-backup/rear/rear-2.6.ebuild +++ b/app-backup/rear/rear-2.6.ebuild @@ -56,5 +56,5 @@ pkg_postinst() { fi optfeature "saving backups on smb/cifs servers" net-fs/cifs-utils - optfeature "encrypting backups" dev-libs/openssl dev-libs/libressl + optfeature "encrypting backups" dev-libs/openssl } diff --git a/app-backup/tarsnap/Manifest b/app-backup/tarsnap/Manifest index ef0f6c16ecb6..9c456c967465 100644 --- a/app-backup/tarsnap/Manifest +++ b/app-backup/tarsnap/Manifest @@ -1,6 +1,6 @@ AUX tarsnap-1.0.39-respect-AR.patch 302 BLAKE2B e03e8b6787697bfab6ef2974cfc248f38eb398512d2e516c8089c676f78c83b390f117a338cacd4d7ef01a2ec13a52bb73210f8b9300b97d9e2ef82391d3bbf1 SHA512 0f35e836abc7e376e9a5fd5e618064667b3ba4415e8280e09b6a9a894ec531bed6ce301d89a6d55dfa14dfb27e98f7d5c53e5b3a7b7cd84fbe9807229c0d5ff1 DIST tarsnap-autoconf-1.0.37.tgz 629450 BLAKE2B 440858098c5c3f2be6fb6b1473ab4fade158203162c04fbc4c2e051f443c7ce3246ab0701e117bccb436b8f1f022e986ec67f653a3c34b9c36da99ca85d73bc8 SHA512 050053f2109b74cda16511cf35ab2c11e0470ba745c661d254b7c17efde9e629830d519896b343dbd4f48ee739dfef47b724eb5e2e78c3e7dbc4ae018a536a5f DIST tarsnap-autoconf-1.0.39.tgz 641089 BLAKE2B 4da7fa75c2a6df3186fac4f39a511532ae866c287a2bdc8dcc22049b53fcc903305f84fae9258793bc0c7a47b208d0bf2995143ee7b4296a35b4ca41d65d9a09 SHA512 dec8a72144a3a7fd42b006933c904b812894ca9fe2c57ecc4fbba817b9b49c8f15517530a00b0c3a9897e3182b4d9aee525334537806a9c4f7308086678fa2b4 -EBUILD tarsnap-1.0.37.ebuild 927 BLAKE2B e04c236550c9ecf356e9742584e1f15c255058df521276b37d4989e66b25c0551ab24e820963f8a7fdd82695c504f03ada3f241b0aa1ed6e01eae061dfc61072 SHA512 6193ff9f8fc4bcb2ac0f8aabe56c4edf9a7af5545c74f00df6a439666be44d42990089e7b5d366cbf07eec2102c84a4ee80fbac9a671fcca593f3d05ceae5246 -EBUILD tarsnap-1.0.39.ebuild 1041 BLAKE2B e3ab54027656b51a1e4868cec705fe0f49e7eaad520cf60899ff9e9bcc034671e40f990a57b4246ea50b6a2113885d7c5d2f3df39114b7a311033f8322931bcb SHA512 32d77381b40089df819d062901705e96ef4effb41d896bc8f0c31f994ab2221e249f58b9c11ec393570c6dc6eb82708006d66ad518a6cc431bc59774a876eaff +EBUILD tarsnap-1.0.37.ebuild 864 BLAKE2B e6a2825be94571f20a53d58b20a2caa8b93d98ade4c8e860086c72b40f7660f197956f7ba98766820404b32d44c64a7bb66520b4e73befac26bcbcc40f909290 SHA512 58cc437364ca3b2129354eafa8308fa66980e4cd77e5445000bc0a0dc7f8b3f88ed69daab524436c993166d31c96d10b83899e30ff78d7e58914b2567bc22f7d +EBUILD tarsnap-1.0.39.ebuild 981 BLAKE2B 7c9b7922f45d17e2bceb48667b2aa11b776393d4c203b09d4679969740c88a53a89de5fc5b986165b5f026848f25d19e40b9da0f07999d3d4d69574188ba7b5f SHA512 7a5624d44ce32d3af76354c1c79ac5e00b13ab22a00b70d947201e70dfd35c024bc012379e74ea2473dd16caa63600312f7ca53174fcf816f7d850a62eb8dfa6 MISC metadata.xml 269 BLAKE2B 846219f06712943539be1908eed5ae369ce69b724f910897e6f3757ed0a9650bb7f350e6eb083de4cfe55f11d7b7f9fab6f259172c664cf06888391818c790e7 SHA512 48f5508e9d9d2287d2d842e27ade7b707141c67b4558c4481fcc9cbd8280ca791a9629881fd1ce6a9a1defd26ff81d40ccbd0655c395a2e899be48c93051a714 diff --git a/app-backup/tarsnap/tarsnap-1.0.37.ebuild b/app-backup/tarsnap/tarsnap-1.0.37.ebuild index 537b94cdf769..129029b4b85a 100644 --- a/app-backup/tarsnap/tarsnap-1.0.37.ebuild +++ b/app-backup/tarsnap/tarsnap-1.0.37.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,11 +12,10 @@ SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" LICENSE="tarsnap" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl bzip2 libressl lzma xattr" +IUSE="acl bzip2 lzma xattr" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) diff --git a/app-backup/tarsnap/tarsnap-1.0.39.ebuild b/app-backup/tarsnap/tarsnap-1.0.39.ebuild index 2d6ba5fde749..90b4f5c9a52a 100644 --- a/app-backup/tarsnap/tarsnap-1.0.39.ebuild +++ b/app-backup/tarsnap/tarsnap-1.0.39.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,11 +12,10 @@ SRC_URI="https://www.tarsnap.com/download/${PN}-autoconf-${PV}.tgz" LICENSE="tarsnap" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl bzip2 libressl lzma xattr" +IUSE="acl bzip2 lzma xattr" RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= sys-libs/e2fsprogs-libs sys-libs/zlib acl? ( sys-apps/acl ) diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest index 71eca267a410..ca0b3f1846ac 100644 --- a/app-backup/zbackup/Manifest +++ b/app-backup/zbackup/Manifest @@ -1,6 +1,6 @@ AUX zbackup-1.4.4-tartool.patch 277 BLAKE2B 612cf1a5b6faf753829a859582ccd9cc741028f6a14a85d1a7465c218ae7044519f13d9266e70c270d5f33a65846fcc3f747c53847fdc34fc3f3c2cac9488f48 SHA512 79a7c9e7a929b5b9ed2cb472e96c21a4db9e369590744be4e84335ae428273a9d1c2f28a57f09f571ee99af0c6274e535b25f7494f0dc8c4d2c391428a064d8a AUX zbackup-9999-tartool.patch 283 BLAKE2B 227d8a478ab9bdb67208a493b1f06225e3ecf7a6595ba4a41be1d8647df4a7a46645421ce9dd6b7fa5f9af191bbc73ca16cce6a31ea040bd3cf9bd4065c0c142 SHA512 53724bf11c6219e494a77090de34105eb87732a6f6b671bb950ac3d86d8c188544b25e06bd49b9df00cfd471e7de976a37ec8ce60dbbc55dd4ba0d0e21e3d61c DIST zbackup-1.4.4.tar.gz 87118 BLAKE2B b51727dfdd756109498acbfe19c9bbe541856a5424f86e664a124cd4042f81a42cd48f14542fbf278444666ce20539fdb6571cce8aeacfcafac9a44c3ee6e789 SHA512 96f0984be71e521b2a188448bb2801996701be6e96b1dac4672cabc9f6bcb6631fdb8d03f5dde4bbdbb0050d9bd1409d468fcba15f93730d69e6c55271aba575 -EBUILD zbackup-1.4.4-r2.ebuild 738 BLAKE2B 133f13eb20790b893d59ea9d18f71b38d9074eb2546f9a7bf2dda3297e7078f4148642b0273b4b4dfe64321afe9eb75cfbf3f90f73247c6d4075390e7c22cc20 SHA512 9caab4dba755b62513abc646e48831ffa0e71c440a51c27b13cf12b638e203a1d37691b021ce5b7e4e9dc71605e031efe22962e6f6b704694d200a48c29a9c7e -EBUILD zbackup-9999.ebuild 741 BLAKE2B 7a8d5a598999d6a527dbf170ae5c83cc71650c3ddba8baac8c0749e8ac78711f94e35410c1699ecf27dcf61593c704c4132b0a17dbf78702d19a2739d11f6b28 SHA512 d08869691bd1495af5994b41acabed901aa29719c74192e8ed3e4161544ca5deb22cc26d790ec5ea62e6614b15d66baf403c97f247b685558af6fc099ffad929 +EBUILD zbackup-1.4.4-r2.ebuild 678 BLAKE2B 7448bbfd31013723b003e18a25d44e313417ac8d68940e04ed821fafc51947502bd8aae4bdf40e7301205ff211f48aaebe0b2bb48350b1b87c12a8c0064138a9 SHA512 a5609738b43a5186c06bf9c1026860b434c76f6407aaa048a322c474ab508a4b1f31bcb89357ee431cc4ace8b84fd38987360cdbe71b593991d5a80f9e05f3f8 +EBUILD zbackup-9999.ebuild 681 BLAKE2B c0e36979b653872996c4f49747f08dac411c2a714e9898e839b8d141476b1eeecff58e422d060cb88ed7d65cb7e857ee8e6a9e3fa0aba9fa85fdc84ceb7dadb6 SHA512 0b0d1d8e000b5d3b094035d90e761ad20ad0e31369c0e809eb4d6fccff4a3b73f86d4ca20112362fed54938f4fb69a37e0f77c36ae9132736d7229cbe84c1943 MISC metadata.xml 898 BLAKE2B 4e71695daff097301482ae9598551223b6c3f70f112529a6c4b775ea5f287c64d65c6927b9c57fd4cd9b453b09bcd348fcbbb4526f1bfeb60c53c1a12d02d634 SHA512 d101d6d3c304f69a58162bb6a5b00f6c2361ba0ad97775dd6c25b6c6ba77d59f4f1d82bf8d8146481000753069cc3e9b4df150b146a2fbc2713f568dd1d842d7 diff --git a/app-backup/zbackup/zbackup-1.4.4-r2.ebuild b/app-backup/zbackup/zbackup-1.4.4-r2.ebuild index 94426b77ed33..6067533065b7 100644 --- a/app-backup/zbackup/zbackup-1.4.4-r2.ebuild +++ b/app-backup/zbackup/zbackup-1.4.4-r2.ebuild @@ -12,14 +12,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="libressl tartool" +IUSE="tartool" DEPEND="app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" + dev-libs/openssl:0=" RDEPEND="${DEPEND}" # Add tartool build diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild index 3a15bb4c1138..063a9cdec688 100644 --- a/app-backup/zbackup/zbackup-9999.ebuild +++ b/app-backup/zbackup/zbackup-9999.ebuild @@ -13,15 +13,14 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" KEYWORDS="" -IUSE="libressl tartool" +IUSE="tartool" DEPEND="app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= sys-libs/libunwind:= sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" + dev-libs/openssl:0=" RDEPEND="${DEPEND}" # Add tartool build |