diff options
Diffstat (limited to 'app-backup')
65 files changed, 649 insertions, 3017 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz Binary files differindex 51217bdd7c13..a1e2d4f2d740 100644 --- a/app-backup/Manifest.gz +++ b/app-backup/Manifest.gz diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest index bed171621ffe..8226846d15db 100644 --- a/app-backup/backupninja/Manifest +++ b/app-backup/backupninja/Manifest @@ -1,3 +1,5 @@ DIST backupninja-1.0.1.tar.gz 167991 BLAKE2B 736ded9f562e894ec74e78afb9677f61889c18310b5aabe76dab7aafd550653281fc8641b416c022d49062261d67f8e6ed2aeef9c9b7054b3538c5be983bf424 SHA512 24b898526c1efa91cde6b1a0f0f7c0820c7db5b11ea36f458b45a91e94adfc77636421d7ad2245c196999886a06a3be43253e52654bc07423b1ac5571275c580 +DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87 EBUILD backupninja-1.0.1-r1.ebuild 605 BLAKE2B 2c657be45da26c37910991398a4a791ad0a8e76f466eb88caac0168b2a4b8373de5ca6ebfa850c3ca0d746c0517f9004dd2f683ff307f00544eb4938df50635b SHA512 42dac334eb042c714b93cfd2ac40cfcb079fd78366a431050f8025b51064165f9c9bb3b99cdf86c62f2288d0dcfa399d76819260906033a8479588136f3c46fa -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 +EBUILD backupninja-1.1.0.ebuild 544 BLAKE2B 5c5ec0a32fc86227043f3498590d30755e04344fe67826f66cd806be3d2177f191fdcb4eacc2eb3e93fa630ec475f9da6b505ddaf44f945ef27787107e95667e SHA512 381808fc77876e947e5cea089bdd2e6d8035f2a9fe46e202024ad0d6cb924db4901be5d8a231bc47b2e6bdafb705af776ab5a7f9c26d28b484b073cbce67f508 +MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8 diff --git a/app-backup/backupninja/backupninja-1.1.0.ebuild b/app-backup/backupninja/backupninja-1.1.0.ebuild new file mode 100644 index 000000000000..8e1721c97849 --- /dev/null +++ b/app-backup/backupninja/backupninja-1.1.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="lightweight, extensible meta-backup system" +HOMEPAGE="https://0xacab.org/riseuplabs/backupninja" +SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-util/dialog" +DEPEND="" + +S="${WORKDIR}/${PN}-${PN}_upstream-${PV}" + +src_configure() { + econf --localstatedir=/var #578614 +} diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml index 6f49eba8f496..435234188908 100644 --- a/app-backup/backupninja/metadata.xml +++ b/app-backup/backupninja/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> +<maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> +</maintainer> </pkgmetadata> diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest index 7a3d97476406..7450980606b7 100644 --- a/app-backup/bacula/Manifest +++ b/app-backup/bacula/Manifest @@ -4,34 +4,20 @@ 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.0.6/bacula-9.0.6-libressl26.patch 2318 BLAKE2B 6d918bbf3eb0af17b3d1ccc5fe70788de21aed8823178a36dc04ada1198fef99425bf0af55d86bfff8342ba7df635e05e813548d3469cf51edb1c813836f45c3 SHA512 c6d7a386a89eaeaa3281cfe4bc2d8c48a84762d4a6e01d1f327110efeada0168261d03b3ab1183fffa5456975ff475b12b286f360d7001cf459f0a10be6ba8be -AUX 9.0.6/bacula-9.0.6-libressl27.patch 429 BLAKE2B 0342617198722981b1efa335bdd856e0eaa139cc9628520c43c6d8e33f2c312ec536b16821a2e7d704189e341a55e7f1b33508ee28db4482f748f4a0fdf2503e SHA512 527f280d5d4ecbbbb419d535f1c1ef6cbd7c429a6e8e375cd9365eea914fa136b60282d1a00ad4fa1dca58afc3bb915a51bf8e1b888feb52d5ed0b0b308bb208 AUX 9.0.8/bacula-9.0.8-fix-static.patch 3705 BLAKE2B 5aef2b819608538d6fd360577b873cb1d7da459417fa03c05c007abe322e848429eb1b1d620d194f430233e3a9b72bd909f7ee6288b6f0c45dc0297c6b00f85f SHA512 4453a491c2b5a19e8f1e19e6e44e22032e0e626003bc871417d4e189abc29c0617d5079fd7a40b1ea6e94fd65d99e44098fef69543e036cb426cf87276fd0510 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.4.1/bacula-9.4.1_sql.patch 641 BLAKE2B 6abc90634e57c12d3a4377f7e356857e78bb00ff0f72f34a6551529ae7d9f498589545dc58df423ed6a5ad03186512bdb92c0ffddaa036a155f95bc58ff2f872 SHA512 407665e3bf41c64a064435ce05d6cae5f35d51cc41714600acc8e7f28cb9c239168bdfe0e797b6f3676d1dc08acb903c17226199dca2ea1d347d8c8289a0e44e +AUX 9.6.3/bacula-9.6.3-fix-static.patch 3731 BLAKE2B 0fe8e289a9ef38f79d4b2dacb5503a245e5fb871771b4fce800d9196de3ccce3edf596e013ee313f19fe3f575ff4a23a1bc97decb38d4dff08e2ac38a154f610 SHA512 ec1004d63df94eb9854c7c8ab8699645ac58051c02b99152224f2274767b2a329231fa0b8bf399545c4b9e7263b303a96c1e3401308a37d857ab2480fc3c5290 AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27198d6bbfdbe2bf4d4e157eb6685f2cac79a8de1e4d24d9c4eb25f9d64b1b956162718fe09633018c4 SHA512 85ed5317313721a7b3776a257c204e0ac45a5221c6bd0b5886944cbd1e4829fe146e7af52cdc604cbf5e3d8722c955da40cbf989dc9ea7466653c98bf8c7cfdf -AUX bacula-dir.initd 505 BLAKE2B 385c24291c0a0108baf441d078054f70fd0346dfe4b6de7a236f9c1e7a4416b895c73075509dfcc03d1b58760668ca1fc5415033188f9dcb3acceea7f5e1044a SHA512 de0003d6c873ecf9609a6e1838772a29555b4e5e251369035746ede296f4b0f1c85dcbe8822d526d6a5489ba0921a8566f7f2b963682fddb3560f6f7e817c40a AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f -AUX bacula-fd.initd 430 BLAKE2B f16aff397175de0f58dd0569dbc77f90a5d923dfeb22c5cbf360ca3e818e93c49f3568864ff18d84b1ed282bd5faa517c4130e179fb0aa939eb48fe34f838108 SHA512 e6bad66d11c3c82ba32e052bb2040205c4e1c5994c8dadc09a6235b9c2e5e3c49ea33ef9a9a76d3bcec0054488a14350f9963590c1834b15023735138adad48d AUX bacula-fix-manpages.patch 7252 BLAKE2B 42a2743bfb6f99c932b3babf71c70bec099671c66ca390d3ca298e367dfe9332a95c2034aaa7849644069028d69ddb45c246fccb7b4b6dc18e17488a1cc88062 SHA512 00dbadb6d156fb11f71b3aa96f0b77f1e57a7d6d5412451f9b39690df0348c3758b5be2c73307d9e71630ea6a92565803c6305e40c2a84863d1a9e70820997a5 AUX bacula-fix-sonames.patch 1041 BLAKE2B 9b2b91cf3c281c1899bf545f02b4a48723bcba05f0305e531bdefb0ca822e805979e67d1d2f5ac949248d1e976126236d31c885d4e911e78c24d4ed013c9792f SHA512 0b7a78915ff789988c9fa2bc8fcfcd3d76d3cb8350720134563ece63a97162db273c7d61eee45365c4de8b94b409a3cd4576d6b0239853c2a0d3a9dc8ebf888f AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d -AUX bacula-sd.initd 437 BLAKE2B f3c86121dae447807e32e7966372c710728fe1747177738df0ce36235b1b05d5d5291bebb66cec6544e6941bb6b0269631d06ed4cdfb8159aba09a96aa54b6e5 SHA512 50603d6d5d5df95ac1752ecc7c3a48a0a5f42eca6c5af390a4f1af084861dbbcfa5d476d3f24ec473fd9b225f6ac78f3542e26cce5d499289d1ec44e22c5682f AUX newscripts/bacula-dir.initd 318 BLAKE2B f482ce3c49ff8106244b62946ab8bc4ab14d32f3b5442e9d803f5f372c8e2ae73760b497800161f075f1c40da2d385871a77f5aa774dc85d950cd1863860b70d SHA512 aa6fddd67237f6f16e89e04290bc3540a87fe8ebaba9c641a3277d0d2f627cadf49dffb032a0fe5c77ab8983f4d67891b643279bad0a2aa9de5a86e6d64f196a AUX newscripts/bacula-fd.initd 253 BLAKE2B 38b87d2868f7cc0afb3270f81445832bdf876d20919bf3f5a779595507e50185457464371878b3e18293302a0c1016bce3aca7e432837397bde64a0e6188be8a SHA512 8230bde8cbfdf2fc4892fb90891a85e36b2be42e4f2ea2140248f08f22bcfe3f1d8c3b419347a9b40143c3f2b4c75d7834cbadb3ed8b8372462580ffcf268bf7 AUX newscripts/bacula-sd.initd 252 BLAKE2B c27f6635ca72c96fc74d1d27c252934ca516cf768a5fec5e043a19d14e7fa67ccfbd6bbbf5da8ee6b718ca7f232565b23216f8ef3adc372681ea4f6bf763f46e SHA512 f4e1252d3e106ebd842cb23c6994cbe29e48e07cff15726479628d1cc5695bd45a0102652203316efcf8a3b3454ad2ca08ee7c6a673880064d15f96c43c395d4 -DIST bacula-9.0.8.tar.gz 4475511 BLAKE2B be321a2a215cc2b127423cf8d103303957c7064ba4453f0da8b82b3c23a38d45df7ee0e434da8a010911976812b23886fcf366d0dee9f1880c0f14fa641c1937 SHA512 4041525f594e23bfb231ea182a680899020347dd26e1d7f6d05c9f97aac8000a1bbeb9acaf2f73b283616fe03caf38fbb335b0e65e6a18e0322ca64da6f98e64 -DIST bacula-9.2.2.tar.gz 4115575 BLAKE2B affc6efa3543836690e3d89eb37faa2d5066344308dc29a22c491374f04a2fd00bedb57a869d0bcf8a0f58d806bc9f9b9381330c22984ddb4d5acd97b757d2c8 SHA512 390ac0ad205c3694fe02c6842740b188bde0be469d0a9b89388d3f75746c7cca6a536a2386e06a5069c84863f28dae3449250ff71e63b9ff14e8f7b074df1708 -DIST bacula-9.4.1.tar.gz 4162956 BLAKE2B f3fdd2ab64dc4fe50210d83a80ce16f36996f6d23bb67326e8bcee97ae9fd83b2dc8a96eabcd86c522c5e1ca5b8923110e97c03be953427a5c5f59140fdea332 SHA512 5e05a939c5f457a121879a6108ce2ac6403dde556b415af4e5013e4f100cf4d878f3d468fd680fa1633a4c8d6ce3d7a6ed351a1600ef780166cd4be9b70191ee -DIST bacula-9.4.2.tar.gz 4163642 BLAKE2B 5b12b44749186fbcd0da4eb97fca304cc8a0152cff87dd9dcf7058452a853a8a58208537496978a213067691cecaa5626e21d3a94438981e12f028a6157d3fb8 SHA512 f8c8f4c788ced1ab846e02656a0a1d9d1b65fe57ae0b888780167ac7e9272e8ca624ef5c41bd44a7454cf518c8e451c2201970b3e4862a99b4290a377da40b0d -DIST bacula-9.4.3.tar.gz 4167892 BLAKE2B 058d51fa62f7a37ccb19d91c33589dd2d2a52ee2d17e82c5b5ce7b9f80f36ead81cd6cb4fafcfc269f4202a2a9f989106ade72efd673f89693f155c0f4a0b336 SHA512 042bf1b974ff60b054bd4a16ce93cd1d93b89d0b743f340c00cc4636922e1e25a38d97dc140bf5842859b3694736df2a812801747ced678610f8583e14ea5e81 DIST bacula-9.4.4.tar.gz 4159759 BLAKE2B 29628626a9654369ea1633878c16ff8af48bf568ccd54c140c5b9c1e9df7fb988296f4d6f0119a4904827790f7c8881cd7207c9f4b9355bfbc1395a12f24a9c3 SHA512 f973c9ab8ee9867962645b1a1388b494fd402c990be8128b892e043e16361bff2fc08ec43e2c8c9bebeae9c94afd3fdbc04a610b35f99e7dd054ed1ad2c04b31 -EBUILD bacula-9.0.8-r1.ebuild 12579 BLAKE2B 291423e776b89449f0e3ed7a809893e1924cbb5fd7a4b431fd8d6ae7b704a87bf2e8d09bbcec080ca7ba2c11415b614216b67d18bca8c1177585221ab51cad4c SHA512 5ddfa68fcfa5f97457009865f418f38ff7eaa40bf15eeedc7b8f65798d447292ce2408b5ab88a12908b946692a1e2610b330b228ffc0523fc503acd202455f28 -EBUILD bacula-9.2.2-r2.ebuild 12564 BLAKE2B a6ce352c3612b865b4fc0ed330db677edfbbee4f1de5b0c3f92b457ee06411889165aa86ac0fc9ebe14c0540f1150b7d83e46bd1ffe92ad44525af0ab36b3827 SHA512 bd948ad5d1eaa44191e585cd8822a341b530e410eb856f4d81cb1f04dc934ee27697deee723ac1fc31383fc21d903b92aa4820f2c3e811585dc9cd3f518ae414 -EBUILD bacula-9.4.1-r2.ebuild 12682 BLAKE2B bda6a4cbad87ecda53ffc160bbdb0395314a2b3b106e4b4eb786348f5b84be09163bc05531dc287ad222563eab38582c6f70143877448699e7851fcbb89ca5fe SHA512 e17cfadeaf91ff97bf74d302d0b8dcb66152f66e26e60571961360411aed6e6b4560d443bafc3a50152f9cf15df2fd41f6e04b76ca5b6b942f889878a2fe6718 -EBUILD bacula-9.4.2-r1.ebuild 12576 BLAKE2B 2cfd6eed33c3ecb01a571d674544fcebf2337553ae9d0d60160c00b74ef4481312e0bd6965a1cc27dd7960805a3e4d622e5c0e53eff6cad1de3d724978fe006d SHA512 47b424f5c8729169339054fa405ddf99a65e846fcd58028ed4cd34f743c1ef6b2839c671a77cb941669b6cc65f19958a73b7e88cc949e886b6fd68eb91ef3196 -EBUILD bacula-9.4.3-r1.ebuild 12576 BLAKE2B 2cfd6eed33c3ecb01a571d674544fcebf2337553ae9d0d60160c00b74ef4481312e0bd6965a1cc27dd7960805a3e4d622e5c0e53eff6cad1de3d724978fe006d SHA512 47b424f5c8729169339054fa405ddf99a65e846fcd58028ed4cd34f743c1ef6b2839c671a77cb941669b6cc65f19958a73b7e88cc949e886b6fd68eb91ef3196 -EBUILD bacula-9.4.4-r1.ebuild 12576 BLAKE2B 2cfd6eed33c3ecb01a571d674544fcebf2337553ae9d0d60160c00b74ef4481312e0bd6965a1cc27dd7960805a3e4d622e5c0e53eff6cad1de3d724978fe006d SHA512 47b424f5c8729169339054fa405ddf99a65e846fcd58028ed4cd34f743c1ef6b2839c671a77cb941669b6cc65f19958a73b7e88cc949e886b6fd68eb91ef3196 +DIST bacula-9.6.3.tar.gz 4246447 BLAKE2B c591fcd5a6c3a79b52cf778f7719ad59f35bfdf99293abb4f6e9c701c0d545125734721a926f071056433d7a9801c40c546f4a73770f5d0fea9fc33c334bcd93 SHA512 8ee14311945ff04c4d3ca736725e2187bcf3e9e0a3093df215c8651bd6a7b07792edea4912ba84189ee79df614c1e99a4333ce173163cfc7efb536dad582106f EBUILD bacula-9.4.4-r2.ebuild 12298 BLAKE2B bbb89cabb538ea1fde82056773d6f0463915b3a087006082ae083d6ef2f7b0250231e8c55dc6f8595a7c4fd58d82cf00c123ba2e6a362f20b2d41a200883afc6 SHA512 a699eb6220dd921b275ac5b660291548e5e57c0ca48ae8bc8b587e63cd002781218b85316916268dbd35cb29d7f2c476c76f5b08e3ad57206ccd84ed7d609ee3 +EBUILD bacula-9.6.3.ebuild 12216 BLAKE2B e0e04979c5856f7832e67527472190c0ceff0840defdcf7a277e723cc3029bdd96264cd5cf682ce50b8b63e1732912cbbcc3aaa8fdef5871e11fff31c93bd99f SHA512 723d00d6dc36f1b7ca51cd959d882d7fa54734be1faf75ce8390e25f8300210aa342bff28a3079459a53332c4abc99f47dda9bb125d8298d9442fc8fceff69e6 MISC metadata.xml 696 BLAKE2B 9a24744f1035e27017f140768b70ab4406e80e1eec452968cfa82e7686876d359ac7a90f9c5998356fc9b4170b9132842d3295877cfa6740d6f1d42e804afbcf SHA512 dcf03b8409574b0e4fb43fefc1f24f7ebc096ff04d79beef0bd31714b233f324bec87387cad8f3eb5c08ab972feae82a32702718aaef39255eec07e6e0352875 diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild deleted file mode 100644 index 952cb1667a9a..000000000000 --- a/app-backup/bacula/bacula-9.0.8-r1.ebuild +++ /dev/null @@ -1,434 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit qmake-utils desktop systemd user libtool - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="https://www.bacula.org/" -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 examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X" - -DEPEND=" - dev-libs/gmp:0 - !bacula-clientonly? ( - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( dev-db/mysql-connector-c:= ) - sqlite? ( dev-db/sqlite:3 ) - !bacula-nodir? ( virtual/mta ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - readline? ( sys-libs/readline:0 ) - static? ( - acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - ) - !static? ( - acl? ( virtual/acl ) - sys-libs/zlib - dev-libs/lzo - sys-libs/ncurses:= - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - )" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - sys-block/mtx - app-arch/mt-st - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) - static? ( bacula-clientonly )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - #XOR and !bacula-clientonly controlled by REQUIRED_USE - use mysql && export mydbtype="mysql" - use postgres && export mydbtype="postgresql" - use sqlite && export mydbtype="sqlite3" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466688 drop deprecated categories from Desktop file - sed -i -e 's/Application;//' scripts/bat.desktop.in || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # drop automatic install of unneeded documentation (for bug 356499) - eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch - - # bug #310087 - eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch - - # bug #311161 - eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch - - # bat needs to respect LDFLAGS and CFLAGS - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch - - # bug #328701 - eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch - - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" - - # do not strip binaries - sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die - sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - - eapply_user - - # Fix systemd unit files: - # bug 497748 - sed -i -e '/Requires/d' platforms/systemd/*.service.in || die - sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die - # bug 504370 - sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die - # bug 584442 and 504368 - sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die - - # build 'bat' for Qt5 - export QMAKE="$(qt5_get_bindir)"/qmake - - # adapt to >=Qt-5.9 (see bug #644566) - # qmake needs an existing target file to generate install instructions - sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ - src/qt-console/bat.pro.in || die - mkdir src/qt-console/.libs || die - touch src/qt-console/.libs/bat || die - chmod 755 src/qt-console/.libs/bat || die - - # fix wrong 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.0.6/${PN}-9.0.6-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch - fi - - # fix bundled libtool (bug 466696) - # But first move directory with M4 macros out of the way. - # It is only needed by autoconf and gives errors during elibtoolize. - mv autoconf/libtool autoconf/libtool1 || die - elibtoolize -} - -src_configure() { - local myconf='' - - if use bacula-clientonly; then - myconf="${myconf} \ - $(use_enable bacula-clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - else - myconf="${myconf} \ - $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored)" - # bug #311099 - # database support needed by dir-only *and* sd-only - # build as well (for building bscan, btape, etc.) - myconf="${myconf} - --with-${mydbtype}" - if use mysql; then - myconf="${myconf} \ - --disable-batch-insert" - else - myconf="${myconf} \ - --enable-batch-insert" - fi - fi - - # do not build bat if 'static' clientonly - if ! use bacula-clientonly || ! use static; then - myconf="${myconf} \ - $(use_enable qt5 bat)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable !readline conio) \ - $(use_enable readline) \ - $(use_with readline readline /usr) \ - $(use_with ssl openssl) \ - $(use_enable ipv6) \ - $(use_enable acl) \ - $(use_with tcpd tcp-wrappers)" - - econf \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/bacula \ - --with-subsys-dir=/var/lock/subsys \ - --with-working-dir=/var/lib/bacula \ - --with-logdir=/var/lib/bacula \ - --with-scriptdir=/usr/libexec/bacula \ - --with-systemd=$(systemd_get_systemunitdir) \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=root \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=bacula \ - --enable-smartalloc \ - --disable-afs \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - doicon scripts/bacula.png - - # install bat icon and desktop file when enabled - # (for some reason ./configure doesn't pick this up) - if use qt5 && ! use static ; then - doicon src/qt-console/images/bat_icon.png - domenu scripts/bat.desktop - fi - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} - - # rename statically linked apps - if use bacula-clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bacula-fd bacula-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use bacula-clientonly; then - # the database update scripts - diropts -m0750 - insinto /usr/libexec/bacula/updatedb - insopts -m0754 - doins "${S}"/updatedb/* - fperms 0640 /usr/libexec/bacula/updatedb/README - - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bacula - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /usr/share/logwatch/scripts/services - dodir /usr/share/logwatch/scripts/shared - dodir /etc/logwatch/conf/logfiles - dodir /etc/logwatch/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - if ! use qt5; then - rm -vf "${D}"/usr/share/man/man1/bat.1* - fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* - if use bacula-clientonly || use bacula-nodir; then - rm -vf "${D}"/usr/share/man/man8/bacula-dir.8* - rm -vf "${D}"/usr/share/man/man8/dbcheck.8* - rm -vf "${D}"/usr/share/man/man1/bsmtp.1* - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/share/man/man8/bacula-sd.8* - rm -vf "${D}"/usr/share/man/man8/bcopy.8* - rm -vf "${D}"/usr/share/man/man8/bextract.8* - rm -vf "${D}"/usr/share/man/man8/bls.8* - rm -vf "${D}"/usr/share/man/man8/bscan.8* - rm -vf "${D}"/usr/share/man/man8/btape.8* - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - dodoc ChangeLog ReleaseNotes SUPPORT - - # install examples (bug #457504) - if use examples; then - docinto examples/ - dodoc -r examples/* - fi - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bacula.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bacula_ft.vim - fi - - # setup init scripts - myscripts="bacula-fd" - if ! use bacula-clientonly; then - if ! use bacula-nodir; then - myscripts="${myscripts} bacula-dir" - fi - if ! use bacula-nosd; then - myscripts="${myscripts} bacula-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependancy for the director init script - case "${script}" in - bacula-dir) - case "${mydbtype}" in - sqlite3) - # sqlite databases don't have a daemon - sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die - ;; - *) - # all other databases have daemons - sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die - ;; - esac - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bacula - - # make sure bacula group can execute bacula libexec scripts - fowners -R root:bacula /usr/libexec/bacula -} - -pkg_postinst() { - if use bacula-clientonly; then - fowners root:bacula /var/lib/bacula - else - fowners bacula:bacula /var/lib/bacula - fi - - if ! use bacula-clientonly && ! use bacula-nodir; then - einfo - einfo "If this is a new install, you must create the ${mydbtype} databases with:" - einfo " /usr/libexec/bacula/create_${mydbtype}_database" - einfo " /usr/libexec/bacula/make_${mydbtype}_tables" - einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" - einfo - - ewarn "ATTENTION!" - ewarn "The format of the database may have changed." - ewarn "If you just upgraded from a version below 9.0.0 you must run" - ewarn "'update_bacula_tables' now." - ewarn "Make sure to have a backup of your catalog before." - ewarn - fi - - if use sqlite; then - einfo - einfo "Be aware that Bacula does not officially support SQLite database anymore." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" - einfo "you have to enable 'USE=qt5'." - einfo -} diff --git a/app-backup/bacula/bacula-9.2.2-r2.ebuild b/app-backup/bacula/bacula-9.2.2-r2.ebuild deleted file mode 100644 index 7137d55ca7b7..000000000000 --- a/app-backup/bacula/bacula-9.2.2-r2.ebuild +++ /dev/null @@ -1,434 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="https://www.bacula.org/" -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" - -DEPEND=" - !bacula-clientonly? ( - !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - sqlite? ( dev-db/sqlite:3 ) - ) - dev-libs/gmp:0 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - readline? ( sys-libs/readline:0 ) - static? ( - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - 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] ) - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - app-arch/mt-st - sys-block/mtx - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -REQUIRED_USE=" - !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) - static? ( bacula-clientonly ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - #XOR and !bacula-clientonly controlled by REQUIRED_USE - use mysql && export mydbtype="mysql" - use postgres && export mydbtype="postgresql" - use sqlite && export mydbtype="sqlite3" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466688 drop deprecated categories from Desktop file - sed -i -e 's/Application;//' scripts/bat.desktop.in || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # drop automatic install of unneeded documentation (for bug 356499) - eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch - - # bug #310087 - eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch - - # bug #311161 - eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch - - # bat needs to respect LDFLAGS and CFLAGS - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch - - # bug #328701 - eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch - - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" - - # do not strip binaries - sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die - sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - - eapply_user - - # Fix systemd unit files: - # bug 497748 - sed -i -e '/Requires/d' platforms/systemd/*.service.in || die - sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die - # bug 504370 - sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die - # bug 584442 and 504368 - sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die - - # build 'bat' for Qt5 - export QMAKE="$(qt5_get_bindir)"/qmake - - # adapt to >=Qt-5.9 (see bug #644566) - # qmake needs an existing target file to generate install instructions - sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ - src/qt-console/bat.pro.in || die - mkdir src/qt-console/.libs || die - touch src/qt-console/.libs/bat || die - chmod 755 src/qt-console/.libs/bat || die - - # fix wrong 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.0.6/${PN}-9.0.6-libressl26.patch - else - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-libressl27.patch - fi - - # Don't let program instal man pages directly - rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in" - eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch" - - # fix bundled libtool (bug 466696) - # But first move directory with M4 macros out of the way. - # It is only needed by autoconf and gives errors during elibtoolize. - mv autoconf/libtool autoconf/libtool1 || die - elibtoolize -} - -src_configure() { - local myconf='' - - if use bacula-clientonly; then - myconf="${myconf} \ - $(use_enable bacula-clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - else - myconf="${myconf} \ - $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored)" - # bug #311099 - # database support needed by dir-only *and* sd-only - # build as well (for building bscan, btape, etc.) - myconf="${myconf} - --with-${mydbtype}" - fi - - # do not build bat if 'static' clientonly - if ! use bacula-clientonly || ! use static; then - myconf="${myconf} \ - $(use_enable qt5 bat)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable batch-insert) \ - $(use_enable !readline conio) \ - $(use_enable readline) \ - $(use_with readline readline /usr) \ - $(use_with ssl openssl) \ - $(use_enable ipv6) \ - $(use_enable acl) \ - $(use_with tcpd tcp-wrappers)" - - econf \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/bacula \ - --with-archivedir=/var/lib/bacula/tmp \ - --with-subsys-dir=/var/lock/subsys \ - --with-working-dir=/var/lib/bacula \ - --with-logdir=/var/lib/bacula \ - --with-scriptdir=/usr/libexec/bacula \ - --with-systemd=$(systemd_get_systemunitdir) \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=root \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=bacula \ - --enable-smartalloc \ - --disable-afs \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - doicon scripts/bacula.png - - # install bat icon and desktop file when enabled - # (for some reason ./configure doesn't pick this up) - if use qt5 && ! use static ; then - doicon src/qt-console/images/bat_icon.png - domenu scripts/bat.desktop - fi - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} - - # rename statically linked apps - if use bacula-clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bacula-fd bacula-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use bacula-clientonly; then - # the database update scripts - diropts -m0750 - insinto /usr/libexec/bacula/updatedb - insopts -m0754 - doins "${S}"/updatedb/* - fperms 0640 /usr/libexec/bacula/updatedb/README - - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bacula - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /usr/share/logwatch/scripts/services - dodir /usr/share/logwatch/scripts/shared - dodir /etc/logwatch/conf/logfiles - dodir /etc/logwatch/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - # Install all man pages - doman "${S}"/manpages/* - - if ! use qt5; then - rm -vf "${D}"/usr/share/man/man1/bat.1* - fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* - - if use bacula-clientonly || use bacula-nodir ; then - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - dodoc ChangeLog ReleaseNotes SUPPORT - - # install examples (bug #457504) - if use examples; then - docinto examples/ - dodoc -r examples/* - fi - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bacula.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bacula_ft.vim - fi - - # setup init scripts - myscripts="bacula-fd" - if ! use bacula-clientonly; then - if ! use bacula-nodir; then - myscripts="${myscripts} bacula-dir" - fi - if ! use bacula-nosd; then - myscripts="${myscripts} bacula-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependancy for the director init script - case "${script}" in - bacula-dir) - case "${mydbtype}" in - sqlite3) - # sqlite databases don't have a daemon - sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die - ;; - *) - # all other databases have daemons - sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die - ;; - esac - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bacula - - # make sure bacula group can execute bacula libexec scripts - fowners -R root:bacula /usr/libexec/bacula -} - -pkg_postinst() { - if use bacula-clientonly; then - fowners root:bacula /var/lib/bacula - else - fowners bacula:bacula /var/lib/bacula - fi - - if ! use bacula-clientonly && ! use bacula-nodir; then - einfo - einfo "If this is a new install, you must create the ${mydbtype} databases with:" - einfo " /usr/libexec/bacula/create_${mydbtype}_database" - einfo " /usr/libexec/bacula/make_${mydbtype}_tables" - einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" - einfo - - ewarn "ATTENTION!" - ewarn "The format of the database may have changed." - ewarn "If you just upgraded from a version below 9.0.0 you must run" - ewarn "'update_bacula_tables' now." - ewarn "Make sure to have a backup of your catalog before." - ewarn - fi - - if use sqlite; then - einfo - einfo "Be aware that Bacula does not officially support SQLite database anymore." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" - einfo "you have to enable 'USE=qt5'." - einfo - einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" - einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." -} diff --git a/app-backup/bacula/bacula-9.4.1-r2.ebuild b/app-backup/bacula/bacula-9.4.1-r2.ebuild deleted file mode 100644 index 1833beec7e75..000000000000 --- a/app-backup/bacula/bacula-9.4.1-r2.ebuild +++ /dev/null @@ -1,438 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="https://www.bacula.org/" -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" - -DEPEND=" - !bacula-clientonly? ( - !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - sqlite? ( dev-db/sqlite:3 ) - ) - dev-libs/gmp:0 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - readline? ( sys-libs/readline:0 ) - static? ( - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - 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] ) - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - app-arch/mt-st - sys-block/mtx - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -REQUIRED_USE=" - !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) - static? ( bacula-clientonly ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - #XOR and !bacula-clientonly controlled by REQUIRED_USE - use mysql && export mydbtype="mysql" - use postgres && export mydbtype="postgresql" - use sqlite && export mydbtype="sqlite3" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466688 drop deprecated categories from Desktop file - sed -i -e 's/Application;//' scripts/bat.desktop.in || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # drop automatic install of unneeded documentation (for bug 356499) - eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch - - # bug #310087 - eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch - - # bug #311161 - eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch - - # bat needs to respect LDFLAGS and CFLAGS - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch - - # bug #328701 - eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch - - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" - - # do not strip binaries - sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die - sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - - eapply_user - - # Fix systemd unit files: - # bug 497748 - sed -i -e '/Requires/d' platforms/systemd/*.service.in || die - sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die - # bug 504370 - sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die - # bug 584442 and 504368 - sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die - - # build 'bat' for Qt5 - export QMAKE="$(qt5_get_bindir)"/qmake - - # adapt to >=Qt-5.9 (see bug #644566) - # qmake needs an existing target file to generate install instructions - sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ - src/qt-console/bat.pro.in || die - mkdir src/qt-console/.libs || die - 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 - - # Fix an integer overflow (Thanks Ph. Stracchino) - eapply -p1 "${FILESDIR}"/9.4.1/${PN}-9.4.1_sql.patch - - # Don't let program install man pages directly - rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in" - eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch" - - # fix bundled libtool (bug 466696) - # But first move directory with M4 macros out of the way. - # It is only needed by autoconf and gives errors during elibtoolize. - mv autoconf/libtool autoconf/libtool1 || die - elibtoolize -} - -src_configure() { - local myconf='' - - if use bacula-clientonly; then - myconf="${myconf} \ - $(use_enable bacula-clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - else - myconf="${myconf} \ - $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored)" - # bug #311099 - # database support needed by dir-only *and* sd-only - # build as well (for building bscan, btape, etc.) - myconf="${myconf} - --with-${mydbtype}" - fi - - # do not build bat if 'static' clientonly - if ! use bacula-clientonly || ! use static; then - myconf="${myconf} \ - $(use_enable qt5 bat)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable batch-insert) \ - $(use_enable !readline conio) \ - $(use_enable readline) \ - $(use_with readline readline /usr) \ - $(use_with ssl openssl) \ - $(use_enable ipv6) \ - $(use_enable acl) \ - $(use_with tcpd tcp-wrappers)" - - econf \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/bacula \ - --with-archivedir=/var/lib/bacula/tmp \ - --with-subsys-dir=/var/lock/subsys \ - --with-working-dir=/var/lib/bacula \ - --with-logdir=/var/lib/bacula \ - --with-scriptdir=/usr/libexec/bacula \ - --with-systemd=$(systemd_get_systemunitdir) \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=root \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=bacula \ - --enable-smartalloc \ - --disable-afs \ - --without-s3 \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - doicon scripts/bacula.png - - # install bat icon and desktop file when enabled - # (for some reason ./configure doesn't pick this up) - if use qt5 && ! use static ; then - doicon src/qt-console/images/bat_icon.png - domenu scripts/bat.desktop - fi - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} - - # rename statically linked apps - if use bacula-clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bacula-fd bacula-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use bacula-clientonly; then - # the database update scripts - diropts -m0750 - insinto /usr/libexec/bacula/updatedb - insopts -m0754 - doins "${S}"/updatedb/* - fperms 0640 /usr/libexec/bacula/updatedb/README - - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bacula - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /usr/share/logwatch/scripts/services - dodir /usr/share/logwatch/scripts/shared - dodir /etc/logwatch/conf/logfiles - dodir /etc/logwatch/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - # Install all man pages - doman "${S}"/manpages/* - - if ! use qt5; then - rm -vf "${D}"/usr/share/man/man1/bat.1* - fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* - - if use bacula-clientonly || use bacula-nodir ; then - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - dodoc ChangeLog ReleaseNotes SUPPORT - - # install examples (bug #457504) - if use examples; then - docinto examples/ - dodoc -r examples/* - fi - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bacula.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bacula_ft.vim - fi - - # setup init scripts - myscripts="bacula-fd" - if ! use bacula-clientonly; then - if ! use bacula-nodir; then - myscripts="${myscripts} bacula-dir" - fi - if ! use bacula-nosd; then - myscripts="${myscripts} bacula-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependancy for the director init script - case "${script}" in - bacula-dir) - case "${mydbtype}" in - sqlite3) - # sqlite databases don't have a daemon - sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die - ;; - *) - # all other databases have daemons - sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die - ;; - esac - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bacula - - # make sure bacula group can execute bacula libexec scripts - fowners -R root:bacula /usr/libexec/bacula -} - -pkg_postinst() { - if use bacula-clientonly; then - fowners root:bacula /var/lib/bacula - else - fowners bacula:bacula /var/lib/bacula - fi - - if ! use bacula-clientonly && ! use bacula-nodir; then - einfo - einfo "If this is a new install, you must create the ${mydbtype} databases with:" - einfo " /usr/libexec/bacula/create_${mydbtype}_database" - einfo " /usr/libexec/bacula/make_${mydbtype}_tables" - einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" - einfo - - ewarn "ATTENTION!" - ewarn "The format of the database may have changed." - ewarn "If you just upgraded from a version below 9.0.0 you must run" - ewarn "'update_bacula_tables' now." - ewarn "Make sure to have a backup of your catalog before." - ewarn - fi - - if use sqlite; then - einfo - einfo "Be aware that Bacula does not officially support SQLite database anymore." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" - einfo "you have to enable 'USE=qt5'." - einfo - einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" - einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." -} diff --git a/app-backup/bacula/bacula-9.4.2-r1.ebuild b/app-backup/bacula/bacula-9.4.2-r1.ebuild deleted file mode 100644 index c2f2b3eb4f7f..000000000000 --- a/app-backup/bacula/bacula-9.4.2-r1.ebuild +++ /dev/null @@ -1,435 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="https://www.bacula.org/" -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" - -DEPEND=" - !bacula-clientonly? ( - !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - sqlite? ( dev-db/sqlite:3 ) - ) - dev-libs/gmp:0 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - readline? ( sys-libs/readline:0 ) - static? ( - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - 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] ) - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - app-arch/mt-st - sys-block/mtx - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -REQUIRED_USE=" - !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) - static? ( bacula-clientonly ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - #XOR and !bacula-clientonly controlled by REQUIRED_USE - use mysql && export mydbtype="mysql" - use postgres && export mydbtype="postgresql" - use sqlite && export mydbtype="sqlite3" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466688 drop deprecated categories from Desktop file - sed -i -e 's/Application;//' scripts/bat.desktop.in || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # drop automatic install of unneeded documentation (for bug 356499) - eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch - - # bug #310087 - eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch - - # bug #311161 - eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch - - # bat needs to respect LDFLAGS and CFLAGS - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch - - # bug #328701 - eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch - - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" - - # do not strip binaries - sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die - sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - - eapply_user - - # Fix systemd unit files: - # bug 497748 - sed -i -e '/Requires/d' platforms/systemd/*.service.in || die - sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die - # bug 504370 - sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die - # bug 584442 and 504368 - sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die - - # build 'bat' for Qt5 - export QMAKE="$(qt5_get_bindir)"/qmake - - # adapt to >=Qt-5.9 (see bug #644566) - # qmake needs an existing target file to generate install instructions - sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ - src/qt-console/bat.pro.in || die - mkdir src/qt-console/.libs || die - 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 - rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in" - eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch" - - # fix bundled libtool (bug 466696) - # But first move directory with M4 macros out of the way. - # It is only needed by autoconf and gives errors during elibtoolize. - mv autoconf/libtool autoconf/libtool1 || die - elibtoolize -} - -src_configure() { - local myconf='' - - if use bacula-clientonly; then - myconf="${myconf} \ - $(use_enable bacula-clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - else - myconf="${myconf} \ - $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored)" - # bug #311099 - # database support needed by dir-only *and* sd-only - # build as well (for building bscan, btape, etc.) - myconf="${myconf} - --with-${mydbtype}" - fi - - # do not build bat if 'static' clientonly - if ! use bacula-clientonly || ! use static; then - myconf="${myconf} \ - $(use_enable qt5 bat)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable batch-insert) \ - $(use_enable !readline conio) \ - $(use_enable readline) \ - $(use_with readline readline /usr) \ - $(use_with ssl openssl) \ - $(use_enable ipv6) \ - $(use_enable acl) \ - $(use_with tcpd tcp-wrappers)" - - econf \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/bacula \ - --with-archivedir=/var/lib/bacula/tmp \ - --with-subsys-dir=/var/lock/subsys \ - --with-working-dir=/var/lib/bacula \ - --with-logdir=/var/lib/bacula \ - --with-scriptdir=/usr/libexec/bacula \ - --with-systemd=$(systemd_get_systemunitdir) \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=root \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=bacula \ - --enable-smartalloc \ - --disable-afs \ - --without-s3 \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - doicon scripts/bacula.png - - # install bat icon and desktop file when enabled - # (for some reason ./configure doesn't pick this up) - if use qt5 && ! use static ; then - doicon src/qt-console/images/bat_icon.png - domenu scripts/bat.desktop - fi - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} - - # rename statically linked apps - if use bacula-clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bacula-fd bacula-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use bacula-clientonly; then - # the database update scripts - diropts -m0750 - insinto /usr/libexec/bacula/updatedb - insopts -m0754 - doins "${S}"/updatedb/* - fperms 0640 /usr/libexec/bacula/updatedb/README - - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bacula - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /usr/share/logwatch/scripts/services - dodir /usr/share/logwatch/scripts/shared - dodir /etc/logwatch/conf/logfiles - dodir /etc/logwatch/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - # Install all man pages - doman "${S}"/manpages/* - - if ! use qt5; then - rm -vf "${D}"/usr/share/man/man1/bat.1* - fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* - - if use bacula-clientonly || use bacula-nodir ; then - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - dodoc ChangeLog ReleaseNotes SUPPORT - - # install examples (bug #457504) - if use examples; then - docinto examples/ - dodoc -r examples/* - fi - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bacula.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bacula_ft.vim - fi - - # setup init scripts - myscripts="bacula-fd" - if ! use bacula-clientonly; then - if ! use bacula-nodir; then - myscripts="${myscripts} bacula-dir" - fi - if ! use bacula-nosd; then - myscripts="${myscripts} bacula-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependancy for the director init script - case "${script}" in - bacula-dir) - case "${mydbtype}" in - sqlite3) - # sqlite databases don't have a daemon - sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die - ;; - *) - # all other databases have daemons - sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die - ;; - esac - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bacula - - # make sure bacula group can execute bacula libexec scripts - fowners -R root:bacula /usr/libexec/bacula -} - -pkg_postinst() { - if use bacula-clientonly; then - fowners root:bacula /var/lib/bacula - else - fowners bacula:bacula /var/lib/bacula - fi - - if ! use bacula-clientonly && ! use bacula-nodir; then - einfo - einfo "If this is a new install, you must create the ${mydbtype} databases with:" - einfo " /usr/libexec/bacula/create_${mydbtype}_database" - einfo " /usr/libexec/bacula/make_${mydbtype}_tables" - einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" - einfo - - ewarn "ATTENTION!" - ewarn "The format of the database may have changed." - ewarn "If you just upgraded from a version below 9.0.0 you must run" - ewarn "'update_bacula_tables' now." - ewarn "Make sure to have a backup of your catalog before." - ewarn - fi - - if use sqlite; then - einfo - einfo "Be aware that Bacula does not officially support SQLite database anymore." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" - einfo "you have to enable 'USE=qt5'." - einfo - einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" - einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." -} diff --git a/app-backup/bacula/bacula-9.4.4-r1.ebuild b/app-backup/bacula/bacula-9.4.4-r1.ebuild deleted file mode 100644 index c2f2b3eb4f7f..000000000000 --- a/app-backup/bacula/bacula-9.4.4-r1.ebuild +++ /dev/null @@ -1,435 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop libtool qmake-utils systemd user - -MY_PV=${PV/_beta/-b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="https://www.bacula.org/" -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" - -DEPEND=" - !bacula-clientonly? ( - !bacula-nodir? ( virtual/mta ) - postgres? ( dev-db/postgresql:=[threads] ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - sqlite? ( dev-db/sqlite:3 ) - ) - dev-libs/gmp:0 - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtsvg:5 - x11-libs/qwt:6 - ) - logwatch? ( sys-apps/logwatch ) - readline? ( sys-libs/readline:0 ) - static? ( - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - 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] ) - ) - ) - !static? ( - dev-libs/lzo - sys-libs/ncurses:= - sys-libs/zlib - acl? ( virtual/acl ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -RDEPEND="${DEPEND} - !bacula-clientonly? ( - !bacula-nosd? ( - app-arch/mt-st - sys-block/mtx - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) -" - -REQUIRED_USE=" - !bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) - static? ( bacula-clientonly ) -" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - #XOR and !bacula-clientonly controlled by REQUIRED_USE - use mysql && export mydbtype="mysql" - use postgres && export mydbtype="postgresql" - use sqlite && export mydbtype="sqlite3" - - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if use bacula-clientonly && use static && use qt5; then - ewarn - ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." - ewarn - fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bacula/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466688 drop deprecated categories from Desktop file - sed -i -e 's/Application;//' scripts/bat.desktop.in || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # drop automatic install of unneeded documentation (for bug 356499) - eapply -p0 "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch - - # bug #310087 - eapply "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch - - # bug #311161 - eapply -p0 "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch - - # bat needs to respect LDFLAGS and CFLAGS - eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch - - # bug #328701 - eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch - - # fix soname in libbaccat.so bug #602952 - eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" - - # do not strip binaries - sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die - sed -i -e "s/strip /# strip /" src/console/Makefile.in || die - - # fix file not found error during make depend - eapply -p0 "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch - - eapply_user - - # Fix systemd unit files: - # bug 497748 - sed -i -e '/Requires/d' platforms/systemd/*.service.in || die - sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die - # bug 504370 - sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die - # bug 584442 and 504368 - sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die - - # build 'bat' for Qt5 - export QMAKE="$(qt5_get_bindir)"/qmake - - # adapt to >=Qt-5.9 (see bug #644566) - # qmake needs an existing target file to generate install instructions - sed -i -e 's#bins.files = bat#bins.files = .libs/bat#g' \ - src/qt-console/bat.pro.in || die - mkdir src/qt-console/.libs || die - 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 - rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in" - eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch" - - # fix bundled libtool (bug 466696) - # But first move directory with M4 macros out of the way. - # It is only needed by autoconf and gives errors during elibtoolize. - mv autoconf/libtool autoconf/libtool1 || die - elibtoolize -} - -src_configure() { - local myconf='' - - if use bacula-clientonly; then - myconf="${myconf} \ - $(use_enable bacula-clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - else - myconf="${myconf} \ - $(use_enable !bacula-nodir build-dird) \ - $(use_enable !bacula-nosd build-stored)" - # bug #311099 - # database support needed by dir-only *and* sd-only - # build as well (for building bscan, btape, etc.) - myconf="${myconf} - --with-${mydbtype}" - fi - - # do not build bat if 'static' clientonly - if ! use bacula-clientonly || ! use static; then - myconf="${myconf} \ - $(use_enable qt5 bat)" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable batch-insert) \ - $(use_enable !readline conio) \ - $(use_enable readline) \ - $(use_with readline readline /usr) \ - $(use_with ssl openssl) \ - $(use_enable ipv6) \ - $(use_enable acl) \ - $(use_with tcpd tcp-wrappers)" - - econf \ - --with-pid-dir=/var/run \ - --sysconfdir=/etc/bacula \ - --with-archivedir=/var/lib/bacula/tmp \ - --with-subsys-dir=/var/lock/subsys \ - --with-working-dir=/var/lib/bacula \ - --with-logdir=/var/lib/bacula \ - --with-scriptdir=/usr/libexec/bacula \ - --with-systemd=$(systemd_get_systemunitdir) \ - --with-dir-user=bacula \ - --with-dir-group=bacula \ - --with-sd-user=root \ - --with-sd-group=bacula \ - --with-fd-user=root \ - --with-fd-group=bacula \ - --enable-smartalloc \ - --disable-afs \ - --without-s3 \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - doicon scripts/bacula.png - - # install bat icon and desktop file when enabled - # (for some reason ./configure doesn't pick this up) - if use qt5 && ! use static ; then - doicon src/qt-console/images/bat_icon.png - domenu scripts/bat.desktop - fi - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql} - - # rename statically linked apps - if use bacula-clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bacula-fd bacula-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use bacula-clientonly; then - # the database update scripts - diropts -m0750 - insinto /usr/libexec/bacula/updatedb - insopts -m0754 - doins "${S}"/updatedb/* - fperms 0640 /usr/libexec/bacula/updatedb/README - - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bacula - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /usr/share/logwatch/scripts/services - dodir /usr/share/logwatch/scripts/shared - dodir /etc/logwatch/conf/logfiles - dodir /etc/logwatch/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - # Install all man pages - doman "${S}"/manpages/* - - if ! use qt5; then - rm -vf "${D}"/usr/share/man/man1/bat.1* - fi - rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1* - - if use bacula-clientonly || use bacula-nodir ; then - rm -vf "${D}"/usr/libexec/bacula/create_*_database - rm -vf "${D}"/usr/libexec/bacula/drop_*_database - rm -vf "${D}"/usr/libexec/bacula/make_*_tables - rm -vf "${D}"/usr/libexec/bacula/update_*_tables - rm -vf "${D}"/usr/libexec/bacula/drop_*_tables - rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges - rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup - fi - if use bacula-clientonly || use bacula-nosd; then - rm -vf "${D}"/usr/libexec/bacula/disk-changer - rm -vf "${D}"/usr/libexec/bacula/mtx-changer - rm -vf "${D}"/usr/libexec/bacula/dvd-handler - fi - - # documentation - dodoc ChangeLog ReleaseNotes SUPPORT - - # install examples (bug #457504) - if use examples; then - docinto examples/ - dodoc -r examples/* - fi - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bacula.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bacula_ft.vim - fi - - # setup init scripts - myscripts="bacula-fd" - if ! use bacula-clientonly; then - if ! use bacula-nodir; then - myscripts="${myscripts} bacula-dir" - fi - if ! use bacula-nosd; then - myscripts="${myscripts} bacula-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependancy for the director init script - case "${script}" in - bacula-dir) - case "${mydbtype}" in - sqlite3) - # sqlite databases don't have a daemon - sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die - ;; - *) - # all other databases have daemons - sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die - ;; - esac - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bacula - - # make sure bacula group can execute bacula libexec scripts - fowners -R root:bacula /usr/libexec/bacula -} - -pkg_postinst() { - if use bacula-clientonly; then - fowners root:bacula /var/lib/bacula - else - fowners bacula:bacula /var/lib/bacula - fi - - if ! use bacula-clientonly && ! use bacula-nodir; then - einfo - einfo "If this is a new install, you must create the ${mydbtype} databases with:" - einfo " /usr/libexec/bacula/create_${mydbtype}_database" - einfo " /usr/libexec/bacula/make_${mydbtype}_tables" - einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges" - einfo - - ewarn "ATTENTION!" - ewarn "The format of the database may have changed." - ewarn "If you just upgraded from a version below 9.0.0 you must run" - ewarn "'update_bacula_tables' now." - ewarn "Make sure to have a backup of your catalog before." - ewarn - fi - - if use sqlite; then - einfo - einfo "Be aware that Bacula does not officially support SQLite database anymore." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed. To compile 'bat'" - einfo "you have to enable 'USE=qt5'." - einfo - einfo "/var/lib/bacula/tmp was configured for archivedir. This dir will be used during" - einfo "restores, so be sure to set it to an appropriate in dir in the bacula config." -} diff --git a/app-backup/bacula/bacula-9.4.3-r1.ebuild b/app-backup/bacula/bacula-9.6.3.ebuild index c2f2b3eb4f7f..604e97d35a89 100644 --- a/app-backup/bacula/bacula-9.4.3-r1.ebuild +++ b/app-backup/bacula/bacula-9.6.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit desktop libtool qmake-utils systemd user +inherit desktop libtool qmake-utils systemd MY_PV=${PV/_beta/-b} MY_P=${PN}-${MY_PV} @@ -38,7 +38,7 @@ DEPEND=" dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] sys-libs/zlib[static-libs] - acl? ( virtual/acl[static-libs] ) + acl? ( virtual/acl[static-libs(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) @@ -57,6 +57,8 @@ DEPEND=" tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) " RDEPEND="${DEPEND} + acct-user/bacula + acct-group/bacula !bacula-clientonly? ( !bacula-nosd? ( app-arch/mt-st @@ -79,30 +81,11 @@ pkg_setup() { use postgres && export mydbtype="postgresql" use sqlite && export mydbtype="sqlite3" - # create the daemon group and user - if [ -z "$(egetent group bacula 2>/dev/null)" ]; then - enewgroup bacula - einfo - einfo "The group 'bacula' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - if use bacula-clientonly && use static && use qt5; then ewarn ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt5' useflag." ewarn fi - - if ! use bacula-clientonly; then - if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then - enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bacula' has been created. Please see the bacula manual" - einfo "for information about running bacula as a non-root user." - einfo - fi - fi } src_prepare() { @@ -139,7 +122,7 @@ src_prepare() { # bug #328701 eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch - eapply -p0 "${FILESDIR}"/9.0.8/${PN}-9.0.8-fix-static.patch + eapply -p0 "${FILESDIR}"/9.6.3/${P}-fix-static.patch # fix soname in libbaccat.so bug #602952 eapply -p0 "${FILESDIR}/bacula-fix-sonames.patch" @@ -183,8 +166,7 @@ src_prepare() { fi # Don't let program install man pages directly - rm "${S}"/manpages/Makefile.in || die "Unable to remove man pages Makefile.in" - eapply -p1 "${FILESDIR}/bacula-fix-manpages.patch" + sed -i -e 's/ manpages//' Makefile.in || die # fix bundled libtool (bug 466696) # But first move directory with M4 macros out of the way. @@ -309,7 +291,7 @@ src_install() { fi # Install all man pages - doman "${S}"/manpages/* + doman "${S}"/manpages/*.[18] if ! use qt5; then rm -vf "${D}"/usr/share/man/man1/bat.1* @@ -404,6 +386,14 @@ pkg_postinst() { fowners bacula:bacula /var/lib/bacula fi + einfo + einfo "A group 'bacula' has been created. Any users you add to this" + einfo "group have access to files created by the daemons." + einfo + einfo "A user 'bacula' has been created. Please see the bacula manual" + einfo "for information about running bacula as a non-root user." + einfo + if ! use bacula-clientonly && ! use bacula-nodir; then einfo einfo "If this is a new install, you must create the ${mydbtype} databases with:" diff --git a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch deleted file mode 100644 index 3df4285c2e2e..000000000000 --- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl26.patch +++ /dev/null @@ -1,62 +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 (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#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/openssl.c.orig 2018-02-16 08:36:24.092583000 -0600 -+++ src/lib/openssl.c 2018-02-16 08:37:23.795454000 -0600 -@@ -69,7 +69,7 @@ - } - } - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - /* Array of mutexes for use with OpenSSL static locking */ - static pthread_mutex_t *mutexes; - -@@ -263,7 +263,7 @@ - { - int stat = 0; - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - if ((stat = openssl_init_threads()) != 0) { - berrno be; - Jmsg1(NULL, M_ABORT, 0, -@@ -310,7 +310,7 @@ - Jmsg0(NULL, M_ERROR, 0, _("Failed to save OpenSSL PRNG\n")); - } - --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ) - openssl_cleanup_threads(); - - /* Free libssl and libcrypto error strings */ ---- 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.0.6/bacula-9.0.6-libressl27.patch b/app-backup/bacula/files/9.0.6/bacula-9.0.6-libressl27.patch deleted file mode 100644 index b87f4b13f9f8..000000000000 --- a/app-backup/bacula/files/9.0.6/bacula-9.0.6-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 (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if ( (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ) - DEFINE_STACK_OF(SignerInfo); - DEFINE_STACK_OF(RecipientInfo); - #else diff --git a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch b/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch deleted file mode 100644 index b2b7c4863d2a..000000000000 --- a/app-backup/bacula/files/9.4.1/bacula-9.4.1_sql.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bacula-9.4.1.orig/src/cats/sql_update.c 2018-12-16 05:30:25.000000000 -0500 -+++ bacula-9.4.1/src/cats/sql_update.c 2018-12-31 12:58:09.107874630 -0500 -@@ -375,7 +375,7 @@ - "LabelType=%d,StorageId=%s,PoolId=%s,VolRetention=%s,VolUseDuration=%s," - "MaxVolJobs=%d,MaxVolFiles=%d,Enabled=%d,LocationId=%s," - "ScratchPoolId=%s,RecyclePoolId=%s,RecycleCount=%d,Recycle=%d," -- "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%d" -+ "ActionOnPurge=%d,CacheRetention=%s,EndBlock=%u" - " WHERE VolumeName='%s'", - mr->VolJobs, mr->VolFiles, mr->VolBlocks, - edit_uint64(mr->VolBytes, ed1), diff --git a/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch b/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch new file mode 100644 index 000000000000..1f32cd224f01 --- /dev/null +++ b/app-backup/bacula/files/9.6.3/bacula-9.6.3-fix-static.patch @@ -0,0 +1,63 @@ +--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200 ++++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200 +@@ -24,6 +24,7 @@ + CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@ + CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@ + JSONOBJS = bbconsjson.o console_conf.o ++ZLIBS=@ZLIBS@ + + # these are the objects that are changed by the .configure process + EXTRAOBJS = @OBJLIST@ +@@ -50,18 +51,18 @@ + + bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + + static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \ +- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \ +- $(OPENSSL_LIBS) ++ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \ ++ $(OPENSSL_LIBS) $(LIBS) + strip $@ + + +--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200 ++++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200 +@@ -69,19 +69,19 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) $(IOKITLIBS) + + bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \ +- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \ ++ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS) + strip $@ + + Makefile: $(srcdir)/Makefile.in $(topdir)/config.status diff --git a/app-backup/bacula/files/bacula-dir.initd b/app-backup/bacula/files/bacula-dir.initd deleted file mode 100644 index 0601ca56e2c4..000000000000 --- a/app-backup/bacula/files/bacula-dir.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - if [ "${LOCAL_DB}" -eq 1 ]; then - need "%database%" - fi - use dns bacula-fd bacula-sd -} - -start() { - ebegin "Starting bacula director" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-dir \ - -- ${DIR_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula director" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula-dir.*.pid - eend $? -} diff --git a/app-backup/bacula/files/bacula-fd.initd b/app-backup/bacula/files/bacula-fd.initd deleted file mode 100644 index 1cc636edbf9c..000000000000 --- a/app-backup/bacula/files/bacula-fd.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use dns -} - -start() { - ebegin "Starting bacula file daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-fd \ - -- ${FD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula file daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula-fd.*.pid - eend $? -} diff --git a/app-backup/bacula/files/bacula-sd.initd b/app-backup/bacula/files/bacula-sd.initd deleted file mode 100644 index a18840242efa..000000000000 --- a/app-backup/bacula/files/bacula-sd.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use dns -} - -start() { - ebegin "Starting bacula storage daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/bacula-sd \ - -- ${SD_OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping bacula storage daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/bacula-sd.*.pid - eend $? -} diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest index 8e6eb6abf0a9..364bf991d6a9 100644 --- a/app-backup/bareos/Manifest +++ b/app-backup/bareos/Manifest @@ -15,11 +15,9 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c AUX bareos-sd.confd-16 361 BLAKE2B 3c5feb7e6615db5395f2895ed4ea3e0745c4da0ca68cbdd6c899da0be63db0a7ee561aa44404490ef227a08fe5f339c337fd4eadf43a384741d3071ef4332772 SHA512 1cd7a0a6b16d95db4ac39a4858caf0df35b3cd68e6ed87dff687c48008e4f31597e8510ac6a2e1442a80dec7e5608341832b55d3e2ae96793f203fd95700da22 AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e2808eeaa94b20d4cfb4a705b53d06880f5b5c50b96162ea4d6cb23160b6e31ec34889b867c3aad09e1 SHA512 e094df3f44ed39207129bb86020b223037acc7bda408a69711b68376d1044dbe67001370395dd4442df6b4e78e92dc5125dd14dad6c4826716df2084fbd45916 AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d -DIST bareos-16.2.7.tar.gz 4282998 BLAKE2B 9101a49d1178e0bcc4843cc4472a2082827a7bd7595389c0fa3699d36651ca70fce674509eeaddc8f806a5df1dba6afc89c05be183e7561e013d23bd157ef294 SHA512 028f38dd77fed5e3af6ee50aa44cb2f82349bd38e40eadebc552a95100166291ae0c68073daa2513919da330c66bb54a3050f1d99cbf3b5354f2450a789f6c00 DIST bareos-17.2.6.tar.gz 4181984 BLAKE2B a1666b38626228ebf00f6a42f1a5b74c78c26a7178fa5333c9c8fb24ccfda146d20c35d35cbe43b6f53ba1b0ce1dd9b8ad30309997689c39493b51a0db9f5c9b SHA512 5f5ac8cfe028c97fa3120e149f1eb029406b74530517bf6e21574bd726e26c6b78740977635b45cbc2232fda0ee28f1b4338d91a8fa0a86ba05209cce82cd0b2 DIST bareos-17.2.7.tar.gz 4184028 BLAKE2B dc817ca3b21ea13d9dbd1e3c5691e09bc3adff535e0032e1fbcfff8d07b96b2bf21976f020d778dd16137e51283c2a3dcab78dbe28f7fb6f3a60d43938f6b770 SHA512 254eddacb067ef7e82b7a54bdfcbffd5cfa033fa045f697c7e5b5c28dd064b5e1ce9f6aa946282c60f59972beae0b1b7901882b77c3f71cf16efdd73934135cc DIST bareos-18.2.6.tar.gz 9991951 BLAKE2B 9fdaf852e748f0c01d06e2fd72351e7b9bf18e8fea92307fb85437441b4ce504f9c6ddbd42cd2185b6dc08158502a7db581bef662c2bd84c86c885d6b89eebba SHA512 b6618173a803db4cfc3fe7edfe8c9e4e4128195f44383cd7df5b9866da4290686ed7cb42499edec957a5d9ab8bbd92d26258ce58f13fba84fb569167956768c3 -EBUILD bareos-16.2.7-r1.ebuild 11298 BLAKE2B c156741f1da8f2ca759cde0bc02ec6ea7f1825e2f7f30345d68cbf0e9543211ef0f68058aed1941d44bf9f86e427f219d0e18bea2ae4fa42e803d9d89333e1b8 SHA512 541cff42d6af0ac5a7887856b35cef2da0065dd260794fc196d906c01c8775bac560fcb3b03a0b04ed63a8724fd1776934ada2aa59372144dc88b49fb293eb15 EBUILD bareos-17.2.6.ebuild 11114 BLAKE2B 05f45ef2a79e4f950d0a9886bf81d24144bd956d831cf1f1c9d3b306137557987697f10ebc22729154f69ee461b6895a4da7c0f7bceb766addcda2017f336e6f SHA512 469f5ce243207a9edc109a96c9989448415d03a9325a43e9b82fc433a036d5adad3c396c0ce203a775ea4b4a6daeaf83d1a20a64178079cab88ff5d395f7c303 EBUILD bareos-17.2.7-r1.ebuild 11128 BLAKE2B f6eb077f70294012b46b7443b4305f9ca45c4950814259a98462a4da28957b418557608f39a9b49e15a892b838e78f51ee6c2a836b006d22f6e7e4df32f18ada SHA512 1b4dca43eacadc11d5bc272290f66743cb430a942d3cb9ec4edf66577f3f5c80715008e5b2090e4930ac214dca697ef60ba198e16ab72cead1768441a4585ec6 EBUILD bareos-18.2.6.ebuild 11998 BLAKE2B 25e45d8312ae7134536c0a23388f7e6285b720f67a283c5def9b701f008cfa744682a61f82a5286205f59c12179b8dd83f920273f65f4a022793eb04141b4f8a SHA512 9fa8945e4713f0f2cbd1726edca024e681dd91c30dcbd56e94351deaeb45c5a6793e0e8cb7075eff27900ee8e98e4287e89133fd63d8bcff4b30e896dfbcbcb2 diff --git a/app-backup/bareos/bareos-16.2.7-r1.ebuild b/app-backup/bareos/bareos-16.2.7-r1.ebuild deleted file mode 100644 index abcf5bd35bcd..000000000000 --- a/app-backup/bareos/bareos-16.2.7-r1.ebuild +++ /dev/null @@ -1,397 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" - -inherit eutils multilib python-single-r1 user - -DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="http://www.bareos.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="mirror" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl - logwatch mysql ndmp postgres python rados rados-striper readline scsi-crypto - sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax" -REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" - -DEPEND=" - !app-backup/bacula - cephfs? ( sys-cluster/ceph ) - rados? ( sys-cluster/ceph ) - rados-striper? ( >=sys-cluster/ceph-0.94.2 ) - glusterfs? ( sys-cluster/glusterfs ) - lmdb? ( dev-db/lmdb ) - dev-libs/gmp:0 - !clientonly? ( - postgres? ( dev-db/postgresql:*[threads] ) - mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) - director? ( - virtual/mta - jansson? ( dev-libs/jansson ) - ) - ) - fastlz? ( dev-libs/bareos-fastlzlib ) - logwatch? ( sys-apps/logwatch ) - tcpd? ( sys-apps/tcp-wrappers ) - readline? ( sys-libs/readline:0 ) - static? ( - acl? ( virtual/acl[static-libs] ) - sys-libs/zlib[static-libs] - dev-libs/lzo[static-libs] - sys-libs/ncurses:=[static-libs] - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs] ) - libressl? ( dev-libs/libressl:0=[static-libs] ) - ) - gnutls? ( net-libs/gnutls[static-libs] ) - ) - ) - !static? ( - acl? ( virtual/acl ) - dev-libs/lzo - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - gnutls? ( net-libs/gnutls ) - ) - sys-libs/ncurses:= - sys-libs/zlib - ) - python? ( ${PYTHON_DEPS} ) - " -RDEPEND="${DEPEND} - !clientonly? ( - storage-daemon? ( - sys-block/mtx - app-arch/mt-st - ) - ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -REQUIRED_USE="static? ( clientonly ) - python? ( ${PYTHON_REQUIRED_USE} )" - -S=${WORKDIR}/${PN}-Release-${PV} - -pkg_setup() { - use mysql && export mydbtypes+="mysql" - use postgres && export mydbtypes+=" postgresql" - use sqlite && export mydbtypes+=" sqlite" - - # create the daemon group and user - if [ -z "$(egetent group bareos 2>/dev/null)" ]; then - enewgroup bareos - einfo - einfo "The group 'bareos' has been created. Any users you add to this" - einfo "group have access to files created by the daemons." - einfo - fi - - if ! use clientonly; then - if [ -z "$(egetent passwd bareos 2>/dev/null)" ]; then - enewuser bareos -1 -1 /var/lib/bareos bareos,disk,tape,cdrom,cdrw - einfo - einfo "The user 'bareos' has been created. Please see the bareos manual" - einfo "for information about running bareos as a non-root user." - einfo - fi - fi - - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # adjusts default configuration files for several binaries - # to /etc/bareos/<config> instead of ./<config> - pushd src >&/dev/null || die - for f in console/console.c dird/dird.c filed/filed.c \ - stored/bcopy.c stored/bextract.c stored/bls.c \ - stored/bscan.c stored/btape.c stored/stored.c \ - qt-console/main.cpp; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die - - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die - - # stop build for errors in subdirs - epatch "${FILESDIR}"/${PN}-12.4.5-Makefile.patch - - # bat needs to respect LDFLAGS - epatch "${FILESDIR}"/${PN}-12.4.5-bat-ldflags.patch - - # do not strip binaries - for d in filed console dird stored; do - sed -i -e "s/strip /# strip /" src/$d/Makefile.in || die - done -} - -src_configure() { - local myconf='' - - addpredict /var/lib/logrotate.status - - if use clientonly; then - myconf="${myconf} \ - $(use_enable clientonly client-only) \ - $(use_enable !static libtool) \ - $(use_enable static static-cons) \ - $(use_enable static static-fd)" - fi - - # do not build bat and traymonitor if 'static' clientonly - if ! use clientonly || ! use static; then - myconf="${myconf} \ - --disable-bat \ - --disable-traymonitor" - fi - - myconf="${myconf} \ - $(use_with X x) \ - $(use_enable acl) \ - $(use_enable ipv6) \ - $(use_enable ndmp) \ - $(use_enable readline) \ - $(use_enable !readline conio) \ - $(use_enable scsi-crypto) \ - $(use_enable sql-pooling) \ - $(use_with fastlz) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with python) \ - $(use_with readline) \ - $(use_with sqlite sqlite3) \ - $(use sqlite || echo "--without-sqlite3") \ - $(use_with ssl openssl) \ - $(use_with tcpd tcp-wrappers) \ - $(use_enable lmdb) \ - $(use_with glusterfs) \ - $(use_with rados) \ - $(use_with rados-striper) \ - $(use_with cephfs) \ - $(use_with jansson) \ - " - - econf \ - --libdir=/usr/$(get_libdir) \ - --docdir=/usr/share/doc/${PF} \ - --htmldir=/usr/share/doc/${PF}/html \ - --with-pid-dir=/run/bareos \ - --with-subsys-dir=/run/lock/subsys \ - --with-working-dir=/var/lib/bareos \ - --with-logdir=/var/log/bareos \ - --with-scriptdir=/usr/libexec/bareos \ - --with-plugindir=/usr/$(get_libdir)/${PN}/plugin \ - --with-backenddir=/usr/$(get_libdir)/${PN}/backend \ - --with-dir-user=bareos \ - --with-dir-group=bareos \ - --with-sd-user=root \ - --with-sd-group=bareos \ - --with-fd-user=root \ - --with-fd-group=bareos \ - --with-sbin-perm=0755 \ - --with-systemd \ - --enable-dynamic-cats-backends \ - --enable-dynamic-storage-backends \ - --enable-batch-insert \ - --disable-afs \ - --host=${CHOST} \ - ${myconf} -} - -src_compile() { - # workaround for build failing with high -j values - # if ndmp is enabled - use ndmp && MAKEOPTS="$MAKEOPTS -j1" - - # Make build log verbose (bug #447806) - emake NO_ECHO="" -} - -src_install() { - emake DESTDIR="${D}" install - newicon src/images/bareos_logo_shadow.png bareos.png - - # remove some scripts we don't need at all - rm -f "${D}"/usr/libexec/bareos/{bareos,bareos-ctl-dir,bareos-ctl-fd,bareos-ctl-sd,startmysql,stopmysql} - rm -f "${D}"/usr/sbin/bareos - - # remove upstream init scripts - rm -f "${D}"/etc/init.d/bareos-* - - # rename statically linked apps - if use clientonly && use static ; then - pushd "${D}"/usr/sbin || die - mv static-bareos-fd bareos-fd || die - mv static-bconsole bconsole || die - popd || die - fi - - # extra files which 'make install' doesn't cover - if ! use clientonly; then - # the logrotate configuration - # (now unconditional wrt bug #258187) - diropts -m0755 - insinto /etc/logrotate.d - insopts -m0644 - newins "${S}"/scripts/logrotate bareos - - # the logwatch scripts - if use logwatch; then - diropts -m0750 - dodir /etc/log.d/scripts/services - dodir /etc/log.d/scripts/shared - dodir /etc/log.d/conf/logfiles - dodir /etc/log.d/conf/services - pushd "${S}"/scripts/logwatch >&/dev/null || die - emake DESTDIR="${D}" install - popd >&/dev/null || die - fi - fi - - rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* - rm -vf "${D}"/usr/share/man/man1/bat.1* - - if use clientonly || ! use director; then - rm -vf "${D}"/usr/share/man/man8/bareos-dir.8* - rm -vf "${D}"/usr/share/man/man8/bareos-dbcheck.8* - rm -vf "${D}"/usr/share/man/man1/bsmtp.1* - rm -vf "${D}"/usr/share/man/man8/bwild.8* - rm -vf "${D}"/usr/share/man/man8/bregex.8* - rm -vf "${D}"/usr/share/man/man8/bpluginfo.8* - rm -vf "${D}"/usr/libexec/bareos/create_*_database - rm -vf "${D}"/usr/libexec/bareos/drop_*_database - rm -vf "${D}"/usr/libexec/bareos/make_*_tables - rm -vf "${D}"/usr/libexec/bareos/update_*_tables - rm -vf "${D}"/usr/libexec/bareos/drop_*_tables - rm -vf "${D}"/usr/libexec/bareos/grant_*_privileges - rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup - fi - if use clientonly || ! use storage-daemon; then - rm -vf "${D}"/usr/share/man/man8/bareos-sd.8* - rm -vf "${D}"/usr/share/man/man8/bcopy.8* - rm -vf "${D}"/usr/share/man/man8/bextract.8* - rm -vf "${D}"/usr/share/man/man8/bls.8* - rm -vf "${D}"/usr/share/man/man8/bscan.8* - rm -vf "${D}"/usr/share/man/man8/btape.8* - rm -vf "${D}"/usr/libexec/bareos/disk-changer - rm -vf "${D}"/usr/libexec/bareos/mtx-changer - rm -vf "${D}"/usr/libexec/bareos/dvd-handler - rm -vf "${D}"/etc/bareos/mtx-changer.conf - fi - if ! use scsi-crypto; then - rm -vf "${D}"/usr/share/man/man8/bscrypto.8* - fi - rm -vf "${D}"/usr/share/man/man1/bareos-tray-monitor.1* - - # documentation - dodoc README.md - use ndmp && dodoc README.NDMP - use scsi-crypto && dodoc README.scsicrypto - - # vim-files - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins scripts/bareos.vim - insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bareos_ft.vim - fi - - # setup init scripts - myscripts="bareos-fd" - if ! use clientonly; then - if use director; then - myscripts="${myscripts} bareos-dir" - fi - if use storage-daemon; then - myscripts="${myscripts} bareos-sd" - fi - fi - for script in ${myscripts}; do - # copy over init script and config to a temporary location - # so we can modify them as needed - cp "${FILESDIR}/${script}".confd-16 "${T}/${script}".confd || die "failed to copy ${script}.confd" - cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd" - - # now set the database dependency for the director init script - case "${script}" in - bareos-dir) - sed -i -e "s:%databasetypes%:${mydbtypes}:" "${T}/${script}".confd || die - ;; - *) - ;; - esac - - # install init script and config - newinitd "${T}/${script}".initd "${script}" - newconfd "${T}/${script}".confd "${script}" - done - - # make sure the working directory exists - diropts -m0750 - keepdir /var/lib/bareos - - # make sure bareos group can execute bareos libexec scripts - fowners -R root:bareos /usr/libexec/bareos -} - -pkg_postinst() { - if use clientonly; then - fowners root:bareos /var/lib/bareos - else - fowners bareos:bareos /var/lib/bareos - fi - - if ! use clientonly && use director; then - einfo - einfo "If this is a new install, you must create the databases with:" - if use postgres; then - einfo - einfo "For postgresql:" - einfo " su postgres -c '/usr/libexec/bareos/create_bareos_database postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/make_bareos_tables postgresql'" - einfo " su postgres -c '/usr/libexec/bareos/grant_bareos_privileges postgresql'" - fi - if use mysql; then - einfo - einfo "For mysql:" - einfo - einfo " Make sure root has direct access to your mysql server. You may want to" - einfo " create a /root/.my.cnf file with" - einfo " [client]" - einfo " user=root" - einfo " password=YourPasswordForAccessingMysqlAsRoot" - einfo " before running:" - einfo " /usr/libexec/bareos/create_bareos_database mysql" - einfo " /usr/libexec/bareos/make_bareos_tables mysql" - einfo " /usr/libexec/bareos/grant_bareos_privileges mysql" - fi - einfo - fi - - if use sqlite; then - einfo - einfo "Be aware that Bareos does not officially support SQLite database." - einfo "Best use it only for a client-only installation. See Bug #445540." - einfo - einfo "It is strongly recommended to use either postgresql or mysql as" - einfo "catalog database backend." - einfo - fi - - einfo "Please note that 'bconsole' will always be installed." - einfo -} diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest index ecc53d63b3e6..3ba7e5461fe6 100644 --- a/app-backup/borgbackup/Manifest +++ b/app-backup/borgbackup/Manifest @@ -1,4 +1,8 @@ +AUX borgbackup-1.1.11-unbundle-msgpack.patch 4540 BLAKE2B 7b1da72db127c03f8ab78008b58db122f3257e44d6cd4abd41bb45d333280fe0ac6373fa02eba423b714f760562e76b6ec6433ce4057b50c79ce3d4b4213e8ee SHA512 24f42a0d60266896901f7a37037c1ebce088e82bb46c8077b64fc44e9ee4a4dd96fa6efe91fa4d6d967829c8cf58ed8a0877200b73c76dd4047eeaf3dc1d1bdb DIST borgbackup-1.1.10.tar.gz 3610011 BLAKE2B 9c13d89a0441b5403019ed24b2f36fd55f4d133219b68802b79c76f5086324f4a249124a89c67049fecbadb78d5dae64b007ed6c53a579c115ce248db3e83054 SHA512 9315335208f10427e3105e10819817d15fd05171479252903bd51eaacb016bc3ff792d505b9203ce0b9b41ec350472bdb9a23b0128e7fe156aaa47c1608451c0 +DIST borgbackup-1.1.11.tar.gz 3718055 BLAKE2B ea03d538bd7936cc12705f73c3f8e63dc28167f1930e84bdd04fc13bcc34c2b9f35e7e6ed945ba20b647dbdefe12c66c04645414c7efc974e53a312e3dff6991 SHA512 cf629f31d38d27ce6350670ff27b4937f2f30eddf9e0cd9209cd9d57a4ffa653f5a291ea1e1c79614dd2c08bcf5c50bc3e4e0f222e0d3cd1bbfb2d756b4a4573 EBUILD borgbackup-1.1.10-r1.ebuild 1166 BLAKE2B ae27cdf2189b79b8f92b81fae737864cf1060760794309bdd8b2b7e58b8145f543540018846c2389fe67da3a8f2dc03358c58643883547e0a095a9dc57183156 SHA512 b73ff4cb83104d0b1f262ec6c663d7282f9508538d901e8956705326419fb5eba2019ad914015f15b9fa228885f42409aa8a11a1f22fe214eb847839d73f8364 -EBUILD borgbackup-9999.ebuild 1189 BLAKE2B 9feb65668e744f9731af3a4336f95b3d19a8e9dab8fa34250d2304e4ae1a1c8575da83fd6194849abd0b436d7c44d2084368460fbe4f11aff84307f5c45fd91e SHA512 a042d878db9bde0efb0d6ab6029217fe32a5061653d1112a6d9354d2440e4a8f21f5f44008e6732f4ed57365f43505d0e49c7a61051aa40bc94989881856f052 +EBUILD borgbackup-1.1.11-r1.ebuild 1165 BLAKE2B 3f60fbeb5a6f9006ab18e289ec4a3ff93d97260d9e17aea0dbf50f23a30392d67f47ad4c287199750de76ab8148ea8b78817668b5374f6c6c2f82e330d2f03f4 SHA512 a986e0948aae26c29f11548bb6791c19f8688ad7d30b6ba7c6b1b1d467c9d9aabc10e3cf7f6a81ed3324d8eaf47326e18ef39d194410e8c5be6cd4cf55eb4616 +EBUILD borgbackup-1.1.11-r2.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2 +EBUILD borgbackup-9999.ebuild 975 BLAKE2B 4300ceaebb5548624c6c49784235c636b20cc927b526fb06aa0b06536a2834992bbc4ee94b0af07ff3e0c018093b2ca58f12617ea45389982961a755ead97616 SHA512 b76d3c4072c0eb2a3f58ba2df9cdf96b0fed5194a658249bb56967b47d4f556ee8b3826245d7aff0cdbecbd540684eb57041d10dcb814f6e3848928d60dd74a2 MISC metadata.xml 493 BLAKE2B 12d2d6c21e4a6edb732f6a78bb0f0ef3a1df88f16ce69e1044df6deb8ce6153769a0272b77ce1a43fc86a32dc1025ccad44b010df0bb726dff3871b7f0aec12a SHA512 4cb8700e921c7437de83273fe6573f179cb7186b7ec62125e076d0be7ad47a9db497548c673f8e7790d19fad74a2afd3248b37ea98ce1500674264154ebf9a17 diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild new file mode 100644 index 000000000000..822bb8bafab7 --- /dev/null +++ b/app-backup/borgbackup/borgbackup-1.1.11-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/borg.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" +HOMEPAGE="https://borgbackup.readthedocs.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="libressl" + +# Unfortunately we have a file conflict with app-office/borg, bug #580402 +RDEPEND=" + !!app-office/borg + app-arch/lz4 + virtual/acl + dev-python/llfuse[${PYTHON_USEDEP}] + ~dev-python/msgpack-0.5.6[${PYTHON_USEDEP}] + dev-python/pyzmq[${PYTHON_USEDEP}] + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) +" + +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + ${RDEPEND} +" + +python_prepare_all() { + rm -rf src/borg/algorithms/msgpack + eapply "${FILESDIR}"/${P}-unbundle-msgpack.patch + distutils-r1_python_prepare_all +} + +src_install() { + distutils-r1_src_install + doman docs/man/* +} diff --git a/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild new file mode 100644 index 000000000000..3b9d5248820c --- /dev/null +++ b/app-backup/borgbackup/borgbackup-1.1.11-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/${PN}/borg.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Deduplicating backup program with compression and authenticated encryption" +HOMEPAGE="https://borgbackup.readthedocs.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="libressl" + +# Unfortunately we have a file conflict with app-office/borg, bug #580402 +RDEPEND=" + !!app-office/borg + app-arch/lz4 + virtual/acl + dev-python/llfuse[${PYTHON_USEDEP}] + dev-python/pyzmq[${PYTHON_USEDEP}] + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) +" + +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + ${RDEPEND} +" + +src_install() { + distutils-r1_src_install + doman docs/man/* +} diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild index b326c5264e41..3b9d5248820c 100644 --- a/app-backup/borgbackup/borgbackup-9999.ebuild +++ b/app-backup/borgbackup/borgbackup-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7} ) inherit distutils-r1 @@ -28,7 +28,6 @@ RDEPEND=" app-arch/lz4 virtual/acl dev-python/llfuse[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] dev-python/pyzmq[${PYTHON_USEDEP}] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) @@ -40,14 +39,6 @@ DEPEND=" ${RDEPEND} " -BDEPEND="dev-python/pkgconfig" - -python_prepare_all() { - # allow use of new (renamed) msgpack - sed -i "s|'msgpack-python.*',||g" setup.py || die - distutils-r1_python_prepare_all -} - src_install() { distutils-r1_src_install doman docs/man/* diff --git a/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch b/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch new file mode 100644 index 000000000000..85b612af2370 --- /dev/null +++ b/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch @@ -0,0 +1,110 @@ +diff -Naur borgbackup-1.1.11.orig/setup.cfg borgbackup-1.1.11/setup.cfg +--- borgbackup-1.1.11.orig/setup.cfg 2020-03-07 18:44:15.000000000 -0500 ++++ borgbackup-1.1.11/setup.cfg 2020-03-11 10:28:25.168481822 -0400 +@@ -6,7 +6,7 @@ + F401,F405,F811, + W504 + max-line-length = 255 +-exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py,src/borg/algorithms/msgpack ++exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py + + [egg_info] + tag_build = +diff -Naur borgbackup-1.1.11.orig/setup.py borgbackup-1.1.11/setup.py +--- borgbackup-1.1.11.orig/setup.py 2020-03-07 18:32:06.000000000 -0500 ++++ borgbackup-1.1.11/setup.py 2020-03-11 10:28:15.568759338 -0400 +@@ -25,8 +25,6 @@ + # True: use the shared libb2 from the system, False: use the bundled blake2 code + prefer_system_libb2 = True + +-# prefer_system_msgpack is another option, but you need to set it in src/borg/helpers.py. +- + min_python = (3, 4) + my_python = sys.version_info + +@@ -79,8 +77,6 @@ + platform_syncfilerange_source = 'src/borg/platform/syncfilerange.pyx' + platform_darwin_source = 'src/borg/platform/darwin.pyx' + platform_freebsd_source = 'src/borg/platform/freebsd.pyx' +-msgpack_packer_source = 'src/borg/algorithms/msgpack/_packer.pyx' +-msgpack_unpacker_source = 'src/borg/algorithms/msgpack/_unpacker.pyx' + + cython_c_sources = [ + # these .pyx will get compiled to .c +@@ -98,12 +94,6 @@ + platform_darwin_source, + ] + +-cython_cpp_sources = [ +- # these .pyx will get compiled to .cpp +- msgpack_packer_source, +- msgpack_unpacker_source, +-] +- + try: + from Cython.Distutils import build_ext + import Cython.Compiler.Main as cython_compiler +@@ -133,8 +123,6 @@ + 'src/borg/platform/syncfilerange.c', + 'src/borg/platform/freebsd.c', + 'src/borg/platform/darwin.c', +- 'src/borg/algorithms/msgpack/_packer.cpp', +- 'src/borg/algorithms/msgpack/_unpacker.cpp', + ]) + super().make_distribution() + +@@ -155,14 +143,12 @@ + platform_freebsd_source = platform_freebsd_source.replace('.pyx', '.c') + platform_darwin_source = platform_darwin_source.replace('.pyx', '.c') + +- msgpack_packer_source = msgpack_packer_source.replace('.pyx', '.cpp') +- msgpack_unpacker_source = msgpack_unpacker_source.replace('.pyx', '.cpp') + + from distutils.command.build_ext import build_ext + if not on_rtd and not all(os.path.exists(path) for path in [ + compress_source, crypto_ll_source, chunker_source, hashindex_source, item_source, checksums_source, + platform_posix_source, platform_linux_source, platform_syncfilerange_source, platform_freebsd_source, platform_darwin_source, +- msgpack_packer_source, msgpack_unpacker_source]): ++ ]): + raise ImportError('The GIT version of Borg needs Cython. Install Cython or use a released version.') + + +@@ -805,26 +791,7 @@ + system_prefix=libb2_prefix, system=libb2_system, + **crypto_ext_kwargs) + +- msgpack_endian = '__BIG_ENDIAN__' if (sys.byteorder == 'big') else '__LITTLE_ENDIAN__' +- msgpack_macros = [(msgpack_endian, '1')] +- msgpack_packer_ext_kwargs = dict( +- sources=[msgpack_packer_source], +- include_dirs=include_dirs, +- library_dirs=library_dirs, +- define_macros=msgpack_macros, +- language='c++', +- ) +- msgpack_unpacker_ext_kwargs = dict( +- sources=[msgpack_unpacker_source], +- include_dirs=include_dirs, +- library_dirs=library_dirs, +- define_macros=msgpack_macros, +- language='c++', +- ) +- + ext_modules += [ +- Extension('borg.algorithms.msgpack._packer', **msgpack_packer_ext_kwargs), +- Extension('borg.algorithms.msgpack._unpacker', **msgpack_unpacker_ext_kwargs), + Extension('borg.compress', **compress_ext_kwargs), + Extension('borg.crypto.low_level', **crypto_ext_kwargs), + Extension('borg.hashindex', [hashindex_source]), +diff -Naur borgbackup-1.1.11.orig/src/borg/helpers.py borgbackup-1.1.11/src/borg/helpers.py +--- borgbackup-1.1.11.orig/src/borg/helpers.py 2020-03-07 18:32:06.000000000 -0500 ++++ borgbackup-1.1.11/src/borg/helpers.py 2020-03-11 10:28:42.519980213 -0400 +@@ -55,7 +55,7 @@ + # any feedback related to issues caused by this will be ignored. + # - especially, it is known that msgpack 0.6.x does NOT work for borg 1.1.x. + +-prefer_system_msgpack = False ++prefer_system_msgpack = True + + try: + if prefer_system_msgpack: diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest new file mode 100644 index 000000000000..eb887c25b095 --- /dev/null +++ b/app-backup/borgmatic/Manifest @@ -0,0 +1,6 @@ +AUX borgmatic-1.5.1-no_test_coverage.patch 284 BLAKE2B 91e041cb2d3d15b65c47075b0524e6e2a60631702eb10243da79b8051504e33476e6f8d61a3d9a172302b9859a01afb0d640a502cc95f69e45024a8fdb5ebc53 SHA512 1604d425f4c3267a41449f5d05675634f365d0be0630b49812e87d13ebc4ee78e01259f2371afbf2150b5b1203676e20c50c1613be24e0fa39df635d229f80bc +AUX borgmatic-1.5.1-systemd_service_bin_path.patch 446 BLAKE2B bad832573f35e832e5a111a12d6c61cf2e2b1111e91252923e841ae5ec6661ed4f1c4d1e4cc94fe31887d8ee0b2a54aac7d79f8bd0e6f27a2e89f1ff0484c091 SHA512 299791d5079522270954a6742669f3031c0d6164ad7037387dad7f7dccebbe20b83f21f1e30ee61915c2703a370ba9987ab66989c4a99c1706ddf2b17bc2c718 +DIST borgmatic-1.5.1.tar.gz 67401 BLAKE2B c11f4b9f9acc7d7bf4e482953968dbaabc33f1513ec8f20868518bca22ffcafee90569c06ec603be919d47d724dd4a3a904e44fbb40c2309d8cb78e9277b5cc7 SHA512 9ded9bd5d6db866d196fedee88737f3d3eef6cb0e61c5f55ac543602c4429adcb57608d7f6c798edfd6ac1ecd14aadd9a88fdf94ef1f0eab4c26a9d2a29c5e38 +EBUILD borgmatic-1.5.1-r1.ebuild 1873 BLAKE2B f55f268e70e90a7ccdedfd03ff4a3577adbca5a61ad60db4a4f40089dbfc35b2b56581b042609f7a9c662d8c7ad31b4bf8426aa2a83deefeb6028db491bd7146 SHA512 e20d608e96ea7e04567d680a1332842b21361833f206a7cac5c352861c02d96a84505d302f0c17c40a28ba4dead9b1e1cb7b9e7248bed9543c88e6dda9a4cae1 +EBUILD borgmatic-1.5.1.ebuild 1715 BLAKE2B b192f98ec20435f2d9e6e4e2dee76d5f2819b2aba661cebde5fb2223e092e22082a32925336d023ff6460edcb891e128c5117a1770c305ce430d0c727d9f570e SHA512 76b841403a2ca739ec65952e0974962f12d0e912e9b8e417ff7a5c27519827ebf154a09cfc5ec15fbc6133a25454e555a11cadc07c0be15d8b86aa00ccc307e2 +MISC metadata.xml 365 BLAKE2B 6fceb22a831c0ee0669e3545737da7a6fe778e9b188fba0c72f8e70988404ad444b2b75cd7e6001012cd2226d5f6f7a7096b3f837de905e559e94badf649d412 SHA512 72be8c3e4d69e9c33307d20b3ec2b05b134787fde7e015fa70f0dbea365163f235f21490500d68fe19b771528f813cf3257d1df175d5d009f6e9414ba5ea4db1 diff --git a/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild b/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild new file mode 100644 index 000000000000..d5b11aab9bb1 --- /dev/null +++ b/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +DISTUTILS_USE_SETUPTOOLS="rdepend" +inherit distutils-r1 systemd + +DESCRIPTION="Automatically create, prune and verify backups with borgbackup" +HOMEPAGE="https://torsion.org/borgmatic/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="${PYTHON_DEPS} + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + <dev-python/ruamel-yaml-0.17.0"[${PYTHON_USEDEP}] +RDEPEND="${DEPEND} + app-backup/borgbackup" +BDEPEND="test? ( + ${DEPEND} + dev-python/flexmock[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.1-systemd_service_bin_path.patch + "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch +) + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # Unlike the other two test files in integration/commands, which use the + # relevant modules' respective APIs, test_borgmatic.py tries to call the + # 'borgmatic' executable - which has not even been created by now. + # Seeing as the only test run from this file as of 2020-03-25 is the + # parsing of contents of 'borgmatic --version', just skip it for now. + rm -f "${S}"/tests/integration/commands/test_borgmatic.py +} + +src_install() { + distutils-r1_src_install + systemd_dounit sample/systemd/borgmatic.{service,timer} + keepdir /etc/borgmatic +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To generate a sample configuration file, run:" + elog " generate-borgmatic-config" + else + elog "To upgrade your configuration file to the current version, run:" + elog " upgrade-borgmatic-config" + fi + elog + elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units." +} diff --git a/app-backup/borgmatic/borgmatic-1.5.1.ebuild b/app-backup/borgmatic/borgmatic-1.5.1.ebuild new file mode 100644 index 000000000000..754e0f063c96 --- /dev/null +++ b/app-backup/borgmatic/borgmatic-1.5.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +DISTUTILS_USE_SETUPTOOLS="rdepend" +inherit distutils-r1 + +DESCRIPTION="Automatically create, prune and verify backups with borgbackup" +HOMEPAGE="https://torsion.org/borgmatic/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="${PYTHON_DEPS} + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/pykwalify-1.6.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + <dev-python/ruamel-yaml-0.17.0"[${PYTHON_USEDEP}] +RDEPEND="${DEPEND} + app-backup/borgbackup" +BDEPEND="test? ( + ${DEPEND} + dev-python/flexmock[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch +) + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + # Unlike the other two test files in integration/commands, which use the + # relevant modules' respective APIs, test_borgmatic.py tries to call the + # 'borgmatic' executable - which has not even been created by now. + # Seeing as the only test run from this file as of 2020-03-25 is the + # parsing of contents of 'borgmatic --version', just skip it for now. + rm -f "${S}"/tests/integration/commands/test_borgmatic.py +} + +src_install() { + distutils-r1_src_install + keepdir /etc/borgmatic + # TODO: install systemd units (and explain them in postinst); need patching +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To generate a sample configuration file, run:" + elog " generate-borgmatic-config" + else + elog "To upgrade your configuration file to the current version, run:" + elog " upgrade-borgmatic-config" + fi +} diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch new file mode 100644 index 000000000000..28562398a407 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.5.1-no_test_coverage.patch @@ -0,0 +1,11 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -3,7 +3,7 @@ + + [tool:pytest] + testpaths = tests +-addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end ++addopts = --ignore=tests/end-to-end + filterwarnings = + ignore:Coverage disabled.*:pytest.PytestWarning + diff --git a/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch new file mode 100644 index 000000000000..90e94ac1f558 --- /dev/null +++ b/app-backup/borgmatic/files/borgmatic-1.5.1-systemd_service_bin_path.patch @@ -0,0 +1,8 @@ +--- a/sample/systemd/borgmatic.service ++++ b/sample/systemd/borgmatic.service +@@ -21,4 +21,4 @@ + + # Delay start to prevent backups running during boot. + ExecStartPre=sleep 1m +-ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /root/.local/bin/borgmatic --syslog-verbosity 1 ++ExecStart=systemd-inhibit --who="borgmatic" --why="Prevent interrupting scheduled backup" /usr/bin/borgmatic --syslog-verbosity 1 diff --git a/app-backup/borgmatic/metadata.xml b/app-backup/borgmatic/metadata.xml new file mode 100644 index 000000000000..e69f4b798a41 --- /dev/null +++ b/app-backup/borgmatic/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"> + <email>marecki@gentoo.org</email> + <name>Marek Szuba</name> +</maintainer> +<upstream> + <remote-id type="github">witten/borgmatic</remote-id> + <remote-id type="pypi">borgmatic</remote-id> +</upstream> +</pkgmetadata> diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest index d916152b6856..14f04474438d 100644 --- a/app-backup/burp/Manifest +++ b/app-backup/burp/Manifest @@ -4,6 +4,6 @@ AUX burp-2.1.20-protocol1_by_default.patch 943 BLAKE2B 430c1c13deabab35731f2610d AUX burp.initd 1083 BLAKE2B ae26457422dcb3b80400b78faf930e0df86b9873ffc8665281ef3fc3d42249e23a97555f9ce67d13a94565d0f3f61a7f4fd5c71300e7988b9d666f220122e0f1 SHA512 dc06be1e5433973f6bbabd86671ea20f12bf57d91871b4664bd7fbae32a561967f139b99674ac93a3a9ec56380e090500c118b45917f884b69395e3f03f9a311 AUX burp.service 193 BLAKE2B fa9a00f32999834afaf84db9d28f2e8b65688e784e32f78bc019069649c50b4c17f1cc48db3b0a62e2e269db801182321e5daccc169eaa560677bd3ff52b5ffe SHA512 5ccb7fc0535d15afca1afe21b3bb937f53203b8a893730a2745e88a5effb1add73c0f109c3419e22244def1bf978378889d47953e68586a7da8909286ccf5dcd DIST burp-2.2.18.tar.gz 632805 BLAKE2B 6106aa4bd96db035ad5893c2fe314537e620a67519295fdf99efaf2c5a639bedd15b4c8d95caa3daa3072dfac28a1ba7fd7bb4f949d9ea2b70bd13060a22f2c6 SHA512 beb14c61ace6d61b98a10fc4e6709eec9722e28990de862eef6a75984f9fbd0f903c5fe64d20ed84c95528a9889bc22618ba6d2318318cf5d515b35688db0a4d -EBUILD burp-2.2.18-r1.ebuild 2834 BLAKE2B 43c82ad416be2cfa689f037d0c61dec3fd88e752f2697653e348f57a2875af09292ad46f4bac9c7d0f7d45e7c4d6c37b47c38a70635df881b7be8b540357e976 SHA512 012a20f640b6999d91e47aec6d85da3cf9146b826a91f4f06a450a229eb7b1ba6c02a52983b919b531386faf34750c2c75fe44c39797d5362a440ff2072d26d2 +EBUILD burp-2.2.18-r1.ebuild 2832 BLAKE2B 91c0da9f9e456cde5b62dbe114efecc42aa9af1ac38c6e5bb0eac0c8b8aa8f6c454cd8d318b4cf27c039c3848d40c386d544b79e0a863b4b24f9dde41275eba2 SHA512 bb31a0f602f8bbaa50968a3085d84625711dc0d7f53ccd7f4216d8e1009b59da824d266729d0e2ac54ad0b02468146f770dcc45162a5dac950c35e503967ff5f EBUILD burp-2.2.18.ebuild 2874 BLAKE2B f6c253a5adfc5e945a9f9b8e919556c124fd0205b269409680f3ba3b7aed79ff420859ab574fb69e2364071232fd87eeacdf73263c9401bfc617284b40be9d29 SHA512 7b4b21657a6cc4abb6bee9bd2e86160e7620cc4df4ab9e42c502b26df265eed89c7da2fa7f10a26c80b7913f7261e754e9802f1842589f59f1491ed9f9a33477 MISC metadata.xml 684 BLAKE2B 3b4511a62d65ec23ef3b1311f57d703154f08e8d82d189a5ea0b555b5d7d686c54365d2992b85c6e5dffa0ee93f7331367925766ea1bfe349446c23d73dba392 SHA512 3752a2b8e2fb49d44d8fe431768ab1b4bc9995099e9bbe4f957677b39ca038a75874bfb0781b1cd1bd4bd79186c0994f2ce5654921a58c9645ffd6dc553f3c9f diff --git a/app-backup/burp/burp-2.2.18-r1.ebuild b/app-backup/burp/burp-2.2.18-r1.ebuild index 14448982e6d5..7c633b85f4bf 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-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="acl ipv6 libressl test xattr" RESTRICT="!test? ( test )" diff --git a/app-backup/buttersink/Manifest b/app-backup/buttersink/Manifest index 415d4d80f00e..e295de17d08f 100644 --- a/app-backup/buttersink/Manifest +++ b/app-backup/buttersink/Manifest @@ -1,4 +1,4 @@ DIST buttersink-0.6.8.tar.gz 51784 BLAKE2B 3f18716bcc55aee99bbb73e8a1928c29cb28a782966aded60b019673e0336f342e4d76aff827f9bd7f39713fe9cadcd89f5f81438a86d8867a8b1ac0a57f3957 SHA512 52898140d983bcc6776497504191f0c1c727b24fa9543f5a5997a54ced26301ca492518094ca8770fce8064bc99dc6d3f6760e986eb66f08a758985a7a85ffff -EBUILD buttersink-0.6.8.ebuild 1238 BLAKE2B 862f8095e60c89caba1e80fbae4e467b79934f9fb83b6f054c33d02bcbc99a5b681ffd0e6b0aaadfc063c8aeda4e9279db526b01a49754701b68c75e4dc6b0c9 SHA512 54096f54a676daf712bcf29c1aaa3310bbd73f142f8ba0af3a222317ce4c18249cdc0c89eb5aa733053188d56f0b48c32a6555fac635ed07b88e1209deadd2ce -EBUILD buttersink-9999.ebuild 1238 BLAKE2B 862f8095e60c89caba1e80fbae4e467b79934f9fb83b6f054c33d02bcbc99a5b681ffd0e6b0aaadfc063c8aeda4e9279db526b01a49754701b68c75e4dc6b0c9 SHA512 54096f54a676daf712bcf29c1aaa3310bbd73f142f8ba0af3a222317ce4c18249cdc0c89eb5aa733053188d56f0b48c32a6555fac635ed07b88e1209deadd2ce -MISC metadata.xml 385 BLAKE2B 4baa41b64c2ad94077d2ce5c752c8a42cd4eb54911dfa9c5715c4270530ab7b1648953924b37dfad712e92ffba17c313d5defe9108255abb87b71f7f33814183 SHA512 0a067465c740e3cc79c58e9204024edfadefa0c88ddae3e5cd05776c953388d9493bbe6292cbd0cff739f102993154c970af91b06387424254c8eccdeeee2022 +EBUILD buttersink-0.6.8.ebuild 1176 BLAKE2B 077b1152cb5a76bcdb47af389d111b26e891bce4ce04555baa8089ddb94dadfa2c6d97d48192d1224a97c8e066ce4209bc8842b67ad9d19a48ccf51e59f1ec9e SHA512 bff705b33354831a6651f0f896d678f149513eaa1df573a86a8bc31da985c1103a2e9dca2056d412b8f02f16036c25f34915a109fa6642a3ffa298a067a36797 +EBUILD buttersink-9999.ebuild 1176 BLAKE2B 077b1152cb5a76bcdb47af389d111b26e891bce4ce04555baa8089ddb94dadfa2c6d97d48192d1224a97c8e066ce4209bc8842b67ad9d19a48ccf51e59f1ec9e SHA512 bff705b33354831a6651f0f896d678f149513eaa1df573a86a8bc31da985c1103a2e9dca2056d412b8f02f16036c25f34915a109fa6642a3ffa298a067a36797 +MISC metadata.xml 309 BLAKE2B 456da08d3049e264e34bf2d501682da0832532645b20e1f2e99cf2af7ff7bd83fd9896f14bbdd92c6cbd086ec9d14d5bdf44fee2ccb754ad06d424ee56f369c7 SHA512 ebce2896caed92f85977588965fb29a4fa27a209ddf72d5944815f43c8d0b32ceb227c3e5401abf219c16e8bef768130ebc89f362acec57499911a091dfcf9e8 diff --git a/app-backup/buttersink/buttersink-0.6.8.ebuild b/app-backup/buttersink/buttersink-0.6.8.ebuild index 998f4d7a31d8..03a17692e5da 100644 --- a/app-backup/buttersink/buttersink-0.6.8.ebuild +++ b/app-backup/buttersink/buttersink-0.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/AmesCornish/buttersink" LICENSE="GPL-3" SLOT=0 -IUSE="test" # local tests would require root and cause sandbox issues with btrfs subvolume # operations, and network tests would require an SSH server with root login to @@ -33,8 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/crcmod[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] sys-fs/btrfs-progs" -DEPEND="${RDEPEND} - test? ( dev-python/flake8[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND}" python_prepare_all() { if [[ ${PV} == 9999 ]] ; then diff --git a/app-backup/buttersink/buttersink-9999.ebuild b/app-backup/buttersink/buttersink-9999.ebuild index 998f4d7a31d8..03a17692e5da 100644 --- a/app-backup/buttersink/buttersink-9999.ebuild +++ b/app-backup/buttersink/buttersink-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/AmesCornish/buttersink" LICENSE="GPL-3" SLOT=0 -IUSE="test" # local tests would require root and cause sandbox issues with btrfs subvolume # operations, and network tests would require an SSH server with root login to @@ -33,8 +32,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/crcmod[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] sys-fs/btrfs-progs" -DEPEND="${RDEPEND} - test? ( dev-python/flake8[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND}" python_prepare_all() { if [[ ${PV} == 9999 ]] ; then diff --git a/app-backup/buttersink/metadata.xml b/app-backup/buttersink/metadata.xml index d80abca98b5f..84753a2bfbad 100644 --- a/app-backup/buttersink/metadata.xml +++ b/app-backup/buttersink/metadata.xml @@ -7,5 +7,4 @@ <maintainer type="project"> <email>proxy-maint@gentoo.org</email> </maintainer> - <longdescription>rsync-like utility for btrfs snapshots</longdescription> </pkgmetadata> diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest index 6a73377921c0..d9e99dfaabc1 100644 --- a/app-backup/dar/Manifest +++ b/app-backup/dar/Manifest @@ -1,9 +1,9 @@ DIST dar-2.5.11.tar.gz 1891928 BLAKE2B 536cccca2533f7ddbc8b95972fe00e9c87a404481e6afbd7aa3634c00598403c18950eb876aefe71a818c3bf4df75bff5f3904dc69bd1d75880f6c8a349911a5 SHA512 36b90218a34ac7f41ce9ca0a2167cfb2fd243b23b8e84350153e8804f0faabf87291b4e4b061533bcb0ca079f087c074eeaa12a54ee8084dd386a072ac503847 DIST dar-2.5.18.tar.gz 1931746 BLAKE2B 3d47665a1ab955ab9467d8f10a686565c549e1be57e77a9bcf65f1ea25c9b70d6d148d4b9dc35112b3ca74f9df05505c74e3a7eaa211b6a8b466308121206a2f SHA512 cde787bb4c3a3a1014efdb5e437b963d762eb87c512e1de1d60471035c535965e03adb5f75abc2bc95633bb6fb61226027d836a87fc903995e3a27a540632e69 -DIST dar-2.6.4.tar.gz 2110571 BLAKE2B 769fd08d72e3a33066749ea8c93cd7eec8091796343f27eb991e751843ccad440afe5e24e54e148865da64764d465e1a4a057005a80f9dcf103f0c960c295669 SHA512 ba78936e645cc06f94e64bf0e288398ee522b4be6c3501f9b21d7038d7a66a083386c7520aaaddd265de68937d017dcb2fd87bf06f3e2a91f444f3307b4c15b9 DIST dar-2.6.5.tar.gz 2104866 BLAKE2B c31e06abb384d03d0180d3dd99067916de96286838a1aef8748ae6119651ac142388633c7946d0c7864f41a42c555ac79b0811af7594c5d6370fb9c30b975bc9 SHA512 e646ac51c5c140ca3e573a4e63ba47af6fcf19c0aeaa0d4791dd7e781478c8981cd31e1a2418d2f1fd8ab92f2c9812f3b712bc0fcbbcdfbd131c8937100a4790 +DIST dar-2.6.9.tar.gz 2137419 BLAKE2B 647dbd272832dabd8c6255ebc27040dceb428d7ea807146c5c4eabb7095eb7c57010a11a5bc3dfa73aa299c627e5230be9560ca5246b7591ed9705dac17181cd SHA512 9ee4624fa1cfa0e523653e3dca032a8b7ac200b3318ba21869c19a9102dd11a923c979e5186591011161a2ed07f3c7668b572620b3be197d4bfaea903c259151 EBUILD dar-2.5.11.ebuild 2407 BLAKE2B f71b6baf86b3cbbf9d4f5f994efa72f400ef71ace22b42aabdd5b7ecf2171a4d9c7e73824fe1a29d45ebeca984761b53768cd2787331f16a63c2dd19709cb012 SHA512 8e050813809be8c1ca94aecbe0906c88758e85f6065d8472bad3e89304701eeb53f16d573a5ac546227bb8c2e3e87121491d7b27785b9231739e6959168c0b93 EBUILD dar-2.5.18.ebuild 2398 BLAKE2B da4f12e9a5a975303cc0801c1081bc2742454b8f0fc2ee3f059bee3cdd1c1fbefc10765c9f83cd48c512e1bc634b93612aaf91498e73e37a71580d02373216ab SHA512 4da51e445dc0fe62d0f615b652fb53d3699a942bc1371616a9cd9f52a1bab61fbf5d5397bacac3d8ce1cae24554feff56b3392dcc6fe23564f9eadd4725b85dc -EBUILD dar-2.6.4.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88 EBUILD dar-2.6.5.ebuild 2572 BLAKE2B e1059c669c9cf569cad16f5d53492e4c9ab396173b51bead7f0a0e3529809bcb4a5a6f9ab8f2872f1c836405da011bc71ed8cbeeeef5ad1bfa202f287de4c9f4 SHA512 59144b0755ebe5e88147c4c0276f85c63893ff49a926ec904d50e0c74cd2d3c8139454877bb4d2143bc9d5370ea93fe302da8d3b0c2d05897cd98a9e6f8d0d88 +EBUILD dar-2.6.9.ebuild 2599 BLAKE2B c23775fb216e9491460528e7bfc87dbafb1937c12417d8ff059948f12b5fdf6c6f92b8dbe597c566aefebc2b875b6ab2d7e97cd22de9c3c5c5653cf342de181b SHA512 002c0a42a2af1254c2fe2bd72f13b289f4de9bc04c5a30872b7f405b1dbff699ef5a339238f41d75d5da5604c799757bde9e3190926601f0c4966ce6ab936091 MISC metadata.xml 887 BLAKE2B 7fc6c15d3f725d59a115a839feb6d138b806e1f0e168c6e726e83c9f0185c46cbf869284e17872a376ce52f515fc0446134b5f3a449a578a33c10154876fa1f5 SHA512 9210de7c2f273c52c39555e2db525b1bdaa58c44d22deab887d1bf96e42ac9e8f32545461c7129d4673ced220a6445ddda68c6c2733e5660fcad05e98db56817 diff --git a/app-backup/dar/dar-2.6.4.ebuild b/app-backup/dar/dar-2.6.9.ebuild index b348f760a97d..607253da2b02 100644 --- a/app-backup/dar/dar-2.6.4.ebuild +++ b/app-backup/dar/dar-2.6.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,6 +66,7 @@ src_configure() { # Do _not_ use $(use_enable) until you have verified that the # logic has been fixed by upstream. local myconf=( + --disable-python-binding --disable-upx $(usex curl '' --disable-libcurl-linking) $(usex dar32 --enable-mode=32 '') diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest index 6d22016e8445..69037a2aaa99 100644 --- a/app-backup/duplicity/Manifest +++ b/app-backup/duplicity/Manifest @@ -1,11 +1,11 @@ -AUX duplicity-0.6.24-skip-test.patch 477 BLAKE2B f4f55a8f7634005c965f79cc6cd2998965fe142b5f3312bd5b90881c33de75e3e532885408af71479b0045001987c6f3adb6fac6432336d2e721a3f850945ad4 SHA512 37f7f3cc774ad15301449c580f23347fbc1cd4fe6903e641abe2497242c0a9d31152a59d886c87a84fbcf0e9b390eb0a5652d63d0367f73529465c927ee30933 AUX duplicity-0.8.09-fix-docs.patch 549 BLAKE2B 57e20c1f65918e548941ce56969a9a22620bb69577ca1c0168149f28203f0d1068fd6676ade5ef153069823070e033791b4a4e517e79a11d9b33a30f6444c174 SHA512 0ba8e5f02e5e873835ac418d312694ea6b699fc15a2b09828aaa0e2b75bb499d0b054799c619d1bd8bafc97e042eb12e6a64a3c0298158cbc7c2dcd30216f4a2 -DIST duplicity-0.7.10.tar.gz 1543523 BLAKE2B a38c5310d6949d36f74620ef617f790943284d7219168e0e49ed13834ab72f5c0d057ef59454e58a25be3a9e28d9627d60c007aab373e150afca08248d79aab6 SHA512 d04273384749c88d0a4f46bc1dcdcbb945ec1a78fb21064f12f0ca6c92cc73ad36fc3149461dbe0a660cd752a1147b2fa5d2b4056a5414c7790747eb5983e0bd -DIST duplicity-0.7.12.tar.gz 1552442 BLAKE2B 4a7d0609748bffa147994a4abdb88bc0d62905c1423dc91caa4b8e5bb0c5953e26df72f647697685cfa3caed3741658d00d1a2b62b8c47bb1ac61da8973df9ca SHA512 8a532e7bb548c170184666a0ba2b41a15f3002c14edd64b1b1eb4df862647fc6dfde797d6ecf38e326d7c160c31ff521baf351e520835495e1d0e2ddbdb19f0f -DIST duplicity-0.7.19.tar.gz 1727321 BLAKE2B 6441a2ce777b3b08c52ede8602a73080be372dec1c1788441c7e7135533aeeb3be48012db4bdfc2a78c7ca23d368637ccc7aa0f0361369ac9f42c00a1541e023 SHA512 26d1724a635c368e04f2a94f974ef6962c52b23345db59af3343e7221295caa0215ae119fff6ab44daa4622236683eb9d3dae742bf0d4cf08c02e3f63071001b +AUX duplicity-0.8.11.1596-fix-docs.patch 665 BLAKE2B f664af2867546957fafdf717b792ebc8e4d75fdd6451d7c252284107f8fcd4029d2815ffa21c622738226885e396b25a1f2485f44a15275e0a8b0b248ea27735 SHA512 4ce3d557c5ef3e32f9032cc10285b8059800b8d0f57e46ebcb0fc85a1da361b0475303ba94f8e4a25a70cb27b506de477d7657fbfe0b77d80646a3025bcd8bb2 +AUX duplicity-0.8.12.1612-fix-docs.patch 665 BLAKE2B 5a82b97397d63153df54b0bdfc62e2896980fd665b91cacff92aefd143b23ea662b6d0ee0cd6251938a41a83e3046d027bf4bfffed1e90cbec1240d2ff0c9b95 SHA512 20b2827e72b441f15d9abfb63f0415758f83b82f3669e104b6b9d9db4d3d00401defe42d9c24415197795535049f280ef6b7c74a15c55e4ce61837d85b7eed4d DIST duplicity-0.8.09.tar.gz 1856764 BLAKE2B b5d0dd3270c237694000dc36a65a4293c43264edf933a195692d2847d008a898d5cf95c0b21b285503023ef8885278485cebabc2d2b7094ae65e13d277c80e5a SHA512 e4045a1c1adbf0927ee5325f02b79e7c0b38034080be4b563f20f1af593c8c1943a772fe7f212730e60f7c7cee93756426fe769a62050d42651fd1af7f6ba50a -EBUILD duplicity-0.7.10.ebuild 1267 BLAKE2B cdd85dc1c3e0aa64c95f74f24ff7001856b455505ae51e1fa6f2a3abcc22ee1fabcabc28c9b3295f8aab1b710e9c4562e6014614a335c71971920ca4f83b70d6 SHA512 0d54e0a7573eb24f9a5d687605dea86db8ea341a64a3a1c3b9c6e633ea41e126d9ca73709e49f6c40b73aef1cea27b8ba964194010fd0ed28b0204c1ff658355 -EBUILD duplicity-0.7.12.ebuild 1273 BLAKE2B a50c92e242971f614628e35f7a5aae330da3135b90cef0f6c9aea6a757b25754786b2d77b5ef1fce553b23a73a3a53b537250ede4dc5efd6dcf5c60fd9dc0a45 SHA512 ed81b75b9f407f33dd75450bcde00b94a5dc17ab6cb51808fef872d4d4d19b29f676aef440ba69b24835e1eab5e2b69196b8d8deb983f36916863be12b099cc7 -EBUILD duplicity-0.7.19.ebuild 1268 BLAKE2B dc3546c00b5d333b9675d8d75bdfdb7ed5043f7909bc814be17b3f49328facd92d75aa30aaddcd50a6630327a85e0d5d1c5434282dafd3aa0045279130272d28 SHA512 e7b5ce1870df96a4a0a5fe0e4a78057afdea70966a478d5156a48254d6b6fbe2ff77b770919e870e0bb36984e724b97548d78a58ddf1bf8e7c01a86a5aebb1d6 -EBUILD duplicity-0.8.09-r1.ebuild 1145 BLAKE2B 273578315aaba146baedf841470888715b6558ea5c8bf999d91587a21cfc3450f423d4ec61b03985dc298f051c82131003649cf596b3dfbf5743f8bcac59cc57 SHA512 280efb11daad97dbf694487ee264f51b8c504ba81039b25da4601614315d77abb076906c35f8d2f0fdee483750f283476bd946bc51cc1bd7bfad9bcc923659ae -MISC metadata.xml 539 BLAKE2B d83188c2a48a4ef03912a7fe8ca40700797a0d46a3f646292b03b328104b7bb6669729ce82330c40cb4935df26f8171c460630029e41b4013b6eaefeeb258fd5 SHA512 4d82d8f4096c2791e79a1dbb6652783d3a773d7a96c1e8726e00fc8c570c011908ba24370c4c751c30a16bf8e977e3d6fe26d011950cf9d5bd8277c4a0471b76 +DIST duplicity-0.8.11.1596.tar.gz 1872223 BLAKE2B ad3ee2536731d1a6e8fb3fd87bb69b8ce8b43bb90688fe957cfb2718ad44f57db98c3aec4805356a7d44bea681f6ec9603aa082dbf86e58684fbe8000d1676b5 SHA512 67940d73d8213559ba88ec21e1326aca0dd065888cbf2e3c68f0f515ba9246100fd6e6d0bd1f12cb678702559f2266b7905931506d2ff6fe6fd35c673593479b +DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951 +EBUILD duplicity-0.8.09-r1.ebuild 1134 BLAKE2B 04496a663087d1a1e068c42d2037df9920d3d628ec1e9ebd45113f36a8c92103a293fab7875e386742c69f1bd9d0c076db13b85b4721048d9fc7bd45e9d4520d SHA512 dc7ef2f8e721b890265a0f17e62139e2918cf6b5722f38725868cfe740c440fbbf3cb13b33e5ff9a5c11416a59b0f6b4a031a19fb03a65161ce76d5d7611d9cb +EBUILD duplicity-0.8.11.1596-r1.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed +EBUILD duplicity-0.8.11.1596.ebuild 1145 BLAKE2B a8d81c55738f9321e39f1a3676d3d2acb7f08115893bcf5f1da5dad6cff6de0b99d0358b18877682b7e4586380a8addc8c4766452a974259e40cc6dcf538c957 SHA512 61da41a243dc4db5304c2239da604d05b7ad8081e7273af0b94fe1ad566ffc7e848d4e8cb7a542dbf746b88205c9bba71dcc5509714d7eff79e6b71dcdfc4228 +EBUILD duplicity-0.8.12.1612.ebuild 1155 BLAKE2B 4360d7633807de24ded7afe502d596679d7b0d133a76cfd4db4fea269f36a587edf278fd206b13feaf3d67a1b80b43f1d918b4c9e77b4697d0dcf02220e8b95a SHA512 53fe3958a2c400f5f9cacf5462caa678232fc69eb4ef0bac82a3008e775b3e2ddc44f8c375cd37587d8aac6fb79314d434d1209725f3f669be2820b4fd2a9aed +MISC metadata.xml 440 BLAKE2B 1fdef6e6e4835b9d663576f20d9d26f7ca5cb75a42bf5835cc2b059aa95790929c7dbc186b083857ac3019f678c8bd960a7d9ae8e994124ba2b504bd20e9c83c SHA512 a5082caa1b6c4d7de1de0fa130400cc02a601c99a7c877c781b4dcae45ebfde22f348c51bba405fbc72b2adfcdf1e3c60500346ac20fa1d507a7ecaa7d0f8a9a diff --git a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild b/app-backup/duplicity/duplicity-0.8.09-r1.ebuild index cac2c9cd8ba0..6507cb77f9b0 100644 --- a/app-backup/duplicity/duplicity-0.8.09-r1.ebuild +++ b/app-backup/duplicity/duplicity-0.8.09-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_6 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 @@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/${PV}/+download/ LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="s3 test" CDEPEND=" diff --git a/app-backup/duplicity/duplicity-0.7.19.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild index ba996e73ba79..3f789257f08d 100644 --- a/app-backup/duplicity/duplicity-0.7.19.ebuild +++ b/app-backup/duplicity/duplicity-0.8.11.1596-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 python3_7 ) inherit distutils-r1 DESCRIPTION="Secure backup system using gnupg to encrypt data" HOMEPAGE="http://www.nongnu.org/duplicity/" -SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/${PV}/+download/${P}.tar.gz" +SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -30,19 +30,15 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND} dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] s3? ( dev-python/boto[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" +RESTRICT="test" -python_prepare_all() { - # workaround until failing test is fixed - local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch ) - - distutils-r1_python_prepare_all - - sed -i "s/'COPYING',//" setup.py || die -} +PATCHES=( + "${FILESDIR}/${P}-fix-docs.patch" +) python_test() { esetup.py test diff --git a/app-backup/duplicity/duplicity-0.7.10.ebuild b/app-backup/duplicity/duplicity-0.8.11.1596.ebuild index d686f7ae3a5b..f9ce35aa9879 100644 --- a/app-backup/duplicity/duplicity-0.7.10.ebuild +++ b/app-backup/duplicity/duplicity-0.8.11.1596.ebuild @@ -1,47 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 versionator +inherit distutils-r1 DESCRIPTION="Secure backup system using gnupg to encrypt data" HOMEPAGE="http://www.nongnu.org/duplicity/" -SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-series/${PV}/+download/${P}.tar.gz" +SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="s3 test" CDEPEND=" net-libs/librsync app-crypt/gnupg - dev-python/lockfile + dev-python/fasteners[${PYTHON_USEDEP}] " DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( + app-arch/par2cmdline dev-python/mock[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] ) " RDEPEND="${CDEPEND} dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] s3? ( dev-python/boto[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" +RESTRICT="test" -python_prepare_all() { - # workaround until failing test is fixed - local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch ) - - distutils-r1_python_prepare_all - - sed -i "s/'COPYING',//" setup.py || die -} +PATCHES=( + "${FILESDIR}/${P}-fix-docs.patch" +) python_test() { esetup.py test diff --git a/app-backup/duplicity/duplicity-0.7.12.ebuild b/app-backup/duplicity/duplicity-0.8.12.1612.ebuild index f23738bd29bc..3f789257f08d 100644 --- a/app-backup/duplicity/duplicity-0.7.12.ebuild +++ b/app-backup/duplicity/duplicity-0.8.12.1612.ebuild @@ -1,47 +1,44 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 ) -inherit distutils-r1 versionator +inherit distutils-r1 DESCRIPTION="Secure backup system using gnupg to encrypt data" HOMEPAGE="http://www.nongnu.org/duplicity/" -SRC_URI="https://code.launchpad.net/${PN}/$(get_version_component_range 1-2)-series/${PV}/+download/${P}.tar.gz" +SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="s3 test" CDEPEND=" net-libs/librsync app-crypt/gnupg - dev-python/lockfile + dev-python/fasteners[${PYTHON_USEDEP}] " DEPEND="${CDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] test? ( + app-arch/par2cmdline dev-python/mock[${PYTHON_USEDEP}] dev-python/pexpect[${PYTHON_USEDEP}] ) " RDEPEND="${CDEPEND} dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/future[${PYTHON_USEDEP}] s3? ( dev-python/boto[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" +RESTRICT="test" -python_prepare_all() { - # workaround until failing test is fixed - local PATCHES=( "${FILESDIR}"/${PN}-0.6.24-skip-test.patch ) - - distutils-r1_python_prepare_all - - sed -i "s/'COPYING',//" setup.py || die -} +PATCHES=( + "${FILESDIR}/${P}-fix-docs.patch" +) python_test() { esetup.py test diff --git a/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch b/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch deleted file mode 100644 index ef6d959685be..000000000000 --- a/app-backup/duplicity/files/duplicity-0.6.24-skip-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- duplicity-0.6.24/testing/functional/test_final.py -+++ duplicity-0.6.24/testing/functional/test_final.py -@@ -156,6 +156,7 @@ - self.run_duplicity(options=["remove-older-than", "50000", "--force", self.backend_url]) - self.assertEqual(self.get_backend_files(), second_chain) - -+ @unittest.skip('skip failing test') - def test_piped_password(self): - """Make sure that prompting for a password works""" - self.set_environ("PASSPHRASE", None) diff --git a/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch new file mode 100644 index 000000000000..6b8c710f3160 --- /dev/null +++ b/app-backup/duplicity/files/duplicity-0.8.11.1596-fix-docs.patch @@ -0,0 +1,21 @@ +--- duplicity-0.8.11.1596/setup.py 2020-03-05 09:18:42.532941503 -0500 ++++ duplicity-0.8.11.1596/setup.py 2020-03-05 09:20:10.612061492 -0500 +@@ -88,18 +88,6 @@ + u'bin/rdiffdir.1' + ] + ), +- (u'share/doc/duplicity-%s' % version_string, +- [ +- u'AUTHORS', +- u'CHANGELOG', +- u'Changelog.GNU', +- u'COPYING', +- u'README', +- u'README-LOG', +- u'README-REPO', +- u'README-TESTING', +- ], +- ), + ] + + if not os.environ.get(u'READTHEDOCS') == u'True': diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch new file mode 100644 index 000000000000..0cd64d6dc36e --- /dev/null +++ b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs.patch @@ -0,0 +1,21 @@ +--- duplicity-0.8.12.1612/setup.py 2020-03-05 09:18:42.532941503 -0500 ++++ duplicity-0.8.12.1612/setup.py 2020-03-05 09:20:10.612061492 -0500 +@@ -88,18 +88,6 @@ + u'bin/rdiffdir.1' + ] + ), +- (u'share/doc/duplicity-%s' % version_string, +- [ +- u'AUTHORS', +- u'CHANGELOG', +- u'Changelog.GNU', +- u'COPYING', +- u'README', +- u'README-LOG', +- u'README-REPO', +- u'README-TESTING', +- ], +- ), + ] + + if not os.environ.get(u'READTHEDOCS') == u'True': diff --git a/app-backup/duplicity/metadata.xml b/app-backup/duplicity/metadata.xml index 82d5a255de7a..c94fa8002b08 100644 --- a/app-backup/duplicity/metadata.xml +++ b/app-backup/duplicity/metadata.xml @@ -9,7 +9,6 @@ <email>gentoo@seichter.de</email> <name>Ralph Seichter</name> </maintainer> - <longdescription>Encrypted bandwidth-efficient backup using the rsync algorithm</longdescription> <use> <flag name="s3">Support for backing up to the Amazon S3 system</flag> </use> diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest index 52eeccf38c42..f47377cc4e2c 100644 --- a/app-backup/mkstage4/Manifest +++ b/app-backup/mkstage4/Manifest @@ -1,6 +1,8 @@ DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5 DIST mkstage4-0.2.tar.gz 15998 BLAKE2B 47ce4335ea5dd9cc0defb2897912ce3169e1ef23d03435ed7500a33f26e5646b1b97aebcac286a93e631f11c491cb076831d62c7b565493458c0882e6f359b94 SHA512 31b77782e6b79db1cb1db7baf30a2bd96e828861a9085b257d554d0991ea16299c3cc9a6e3fa2af5738aeb3ffbd040f6627af3510ccb8fd744b59658acc2dd55 +DIST mkstage4-0.3.tar.gz 18648 BLAKE2B 3a881bc1ec14f5c9795d49306966b586c30a8b415542fb500b5a2af7735008832ebc64f0a166ea4e2fdb48a555bd789b352784f1b05118116ae3f634937beed6 SHA512 6971bf4b43a2fdef0b54802b010c99e95caf896c8e109c54f5a6beb4db1714ea5639e0859ba3f958eed92b9fc6a3bb613bb82de440729e71e53543d60549d2db EBUILD mkstage4-0.1.ebuild 459 BLAKE2B 7bfa3edfb99837f99eec51dee1e70fc6754097c01e05afae9cae5721fecc285d3c8d503769062a60f28d631e3d709ef0b6495e70d0134da861507ba335a5ac97 SHA512 2568f56448c7a430a4df279550821c55ad50b5f46bd7b17d1188e411393949c557cab846975d09f1c4fbf09896408e0c34dad4df53ba0e2d6045575532b0b05d EBUILD mkstage4-0.2.ebuild 455 BLAKE2B 0e9e34ff5bfbead88fe060303276b55c6ad47544d702ab5c4517cedd7baaf9c6d1e08e1c28298b26dbe5664ea88dd10bba00bf8efc42b4cbf4837b26ba370ba8 SHA512 5de5cd34bbaa7070d4ac5d9d1cec1e2ba35c8def577f7b02f3250980dcdab9d29e0c72605ce7d058fac6c707517a32b489d8000f0fefb8821ef58562cd1f23d6 -EBUILD mkstage4-9999.ebuild 440 BLAKE2B 9663bbe0c3a0bbf346fb91345a647ec2d9597f4890f625424ba8efbbad4a2835233590cca543ef68763ed6b4e8d416ac0e36e8a736084902488b6191f1864b31 SHA512 ce683de171866c996a6d3ae269cd3e74adc11203bc42d03f15e79935ee3315dc8c4795fc36ebdabfe4329b1ffadc93ea9ba680bf890b2b43d5fa24d9357f079a -MISC metadata.xml 707 BLAKE2B 03820bb993e66eae180233f519ace9f0eb69fa4dc9e6202967a54f87931d104d0d1c67f4c00256ebb969712347b4e49384fc7a12003772ea8f5e96bcefdda574 SHA512 a3271d39d05e3c63a703bfe268b1094545cd3900cf0e04fa196d1c611bbb2376fed3c7b61f7626810d794eb0cce8b2bf73c380b81b79e0ff91cfcfec3e34025e +EBUILD mkstage4-0.3.ebuild 564 BLAKE2B 04c3f8d12d73b68f5dcbc19403f3cf7c26d29e1ac4dc7f183bf0e150ceb7265c0d24b5da31a121d53b00e80389245037263f524c706d8d665cc9a9e0b5657c02 SHA512 1a53dff6acf100669b0fa9b6be0e9ba4b07a2028238891de1baf7bd80d52bf28ca58b26f61139adab004018c0275d855c12aac536fc43334069393677cc8bf4d +EBUILD mkstage4-9999.ebuild 451 BLAKE2B 01273d1052e60c4b045b26cb5c58601a3827adeb8fffe1cb5d5244d83b8b6b677c75aa51e3ad2f6e8dafc4dee06f48acc17dda9e21ec03c9c7a5edea34c2d00f SHA512 996089d35c4b30da90eb0cea6fc86129c0b4026aba4f71a6703feedce65a02e91502efcda4d160b35ede0630a6c03f40f1784a08673a8c7c64188b5a1522b882 +MISC metadata.xml 723 BLAKE2B 68327c14b493100c8f30920cb710b31653cf4cec43c8b71e95f3abd57dcc78fa336ff3fed5061c2c739d86a30e2b90b33777eb45551796591f3d9626c57697c5 SHA512 b431a94221da5e2569ae66541961e493a812135e056c659c642352be355903bc2ad1acc46aebe0d11ec3b86c969fab8134df9efdf0da10f3199cbf3390da1bae diff --git a/app-backup/mkstage4/metadata.xml b/app-backup/mkstage4/metadata.xml index 352e903207e7..48c9ac6ebccd 100644 --- a/app-backup/mkstage4/metadata.xml +++ b/app-backup/mkstage4/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>horea.christ@gmail.com</email> + <email>chr@chymera.eu</email> <name>Horea Christian</name> </maintainer> <maintainer type="project"> @@ -10,10 +10,10 @@ <name>Proxy Maintainers</name> </maintainer> <longdescription lang="en"> - This is a bash script to create stage 4 tarballs either for the - running system, or a system at a specified mount point. It is - highly parameterized allowing the exclusion of sensitive user - data. + This is a bash script which can create stage 4 tarballs either + for the running system, or a system at a specified mount point. + It is highly parameterized allowing among other things the + exclusion of sensitive user data. </longdescription> <upstream> <remote-id type="github">TheChymera/mkstage4</remote-id> diff --git a/app-backup/mkstage4/mkstage4-0.3.ebuild b/app-backup/mkstage4/mkstage4-0.3.ebuild new file mode 100644 index 000000000000..34da72a2c4b5 --- /dev/null +++ b/app-backup/mkstage4/mkstage4-0.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs" +HOMEPAGE="https://github.com/TheChymera/mkstage4" +SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-util/bats )" +RDEPEND=" + app-shells/bash + app-arch/tar +" + +src_install() { + newbin mkstage4.sh mkstage4 + einstalldocs +} + +src_test() { + bats tests/* || die +} diff --git a/app-backup/mkstage4/mkstage4-9999.ebuild b/app-backup/mkstage4/mkstage4-9999.ebuild index 6cb479448e6a..cd989859f11f 100644 --- a/app-backup/mkstage4/mkstage4-9999.ebuild +++ b/app-backup/mkstage4/mkstage4-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 @@ -20,4 +20,5 @@ RDEPEND="app-shells/bash src_install() { newbin mkstage4.sh mkstage4 + einstalldocs } diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest index 502be0034fd6..ec20e7337171 100644 --- a/app-backup/rdiff-backup/Manifest +++ b/app-backup/rdiff-backup/Manifest @@ -1,10 +1,8 @@ AUX rdiff-backup-1.3.3-librsync-1.0.0.patch 498 BLAKE2B b9af390ffa1f6061301f923f21fcb047c213c442f211570602f7cb3dbc8bc30d29a877bcb99a95c500257fd838ea3514b5cd985ab8d94e2ebc4b453adb8587d9 SHA512 2749fc3f5e187d8bc7874ddb7e185ebb17a0ad77e44e12d3f02a10de7ca5acea568321ce7262e45433732a0b532702e674564cc83d8987b0e339e28f7468395f AUX rdiff-backup-1.3.3-no-docs.patch 573 BLAKE2B 0463ddf18f4e626879a7b2f4c330219c93305305c1dd6106586aa7b309221680515ad70c4e14cc1ee038c450c5292ea4f6459bd2cde347910898fa18197af822 SHA512 94d19500e09496322fdb1a5188321283da7e31d315ef860abdcf19a086c50c7d866cc4cbb525e456a9cdf2563d052f3d5466c5f482910d23ac07841a24e23f7f -AUX rdiff-backup-1.4.0-no-docs.patch 906 BLAKE2B 7acb8dbcc99302e9b473efed71460c3032ca025f27e97f64cc8bc2564166f4f966650ef8c84bd63a91ca8c6a0a83288d6dbb1d2dbaa5c920fb8c6136bc5dfd44 SHA512 9607cf169b8ea7126662ef330911df216bc53a0efcfc2b21f4c8efd1c89db64cab1f51b205d7a51067dd682539a2bc33d890b70ee8ab0537387ff8adb0c246ea +AUX rdiff-backup-2.0.0-no-docs.patch 942 BLAKE2B e9aff4e4d9d4e8fe42745ed0a8eebabcf5683d7dce16a149db67bcdc7307bd2efe8c65668ca2bf2fd5b8dc3f6712bad874c0f4e6e47cd39e0374cb9972fd0317 SHA512 b5e453bdec77602e242436770fa610b85426939bd1625f560ebaee20bfd20b788ab54eefd2461fae62190d72c708487866ae06a1524ec1bbd7327c52522c921b DIST rdiff-backup-1.3.3.tar.gz 198412 BLAKE2B 95141b64ecb3442b2a420e3e2f4325a80bc4e3949e920f3fb04d8d7e69cd20b2809d230a5f9f6af6958f47689d73cf9fdc2d95134d41a5a9d0d6037ee87cf96e SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280 -DIST rdiff-backup-1.4.0b0.tar.gz 280675 BLAKE2B f729d7c4db08e32ca02a303afd7b88028efaba50e7dc9da20bac1e94835cd929c7277a73fb1f614d6acdf3ff72c96698bf6ca1a36c64c426649230f3f917ffe0 SHA512 50d3ca8ea155c9c001bf0284d8142757f8d12c4b9ef99b4ace43978c625dd6ddb06b04d2f91d0804a445c5ffcfef0dc1e1742a45d51731a728bde054cf3642f9 -DIST rdiff-backup-1.9.1b0.tar.gz 318549 BLAKE2B 726b3aec733861cbba45d3d3b13302c52d3e09fdf9f5a1912145b5af4503cc804ea1cf19bdb88c92ea77ad64c0a836bae470e0f4d672cc71eeef15fb00157678 SHA512 48dd4126ba13ebc1fda1a6855279d3d54c8c79571a2d8117a0204b37521aeb802e65e9d242c9ba6c360a196125da419c1bf36f95f5b73ceb39a8ba5f5dee0f2a -EBUILD rdiff-backup-1.3.3-r3.ebuild 883 BLAKE2B a9ce5cc37b7bcc233d4901eba44ae9d296969c5e55a5d11ae4e09f10876c09568b76c8a8c65fa31b00817acde7dd4e8adaade4feda48b37b75e4ccbc0eea650f SHA512 fac816a9b9f59cb6e549aa2086972963577fd4babb8bc8c18785c034e513c1008867a001d15cefa97cf95ac7efb87d9789cfb5872e25b77a9f6a4cf3389c27c8 -EBUILD rdiff-backup-1.4.0_beta.ebuild 905 BLAKE2B 5a6f8c9b1989bf64f8d1bcfc98394f47858e109b5e7519b844b4250eb454c80f237b1ef8ab36ef6323e4d0282e90807bf56d31e3de061da5f5cc5825770ae84f SHA512 1fc6ce115dbc7b4023a7f3ab109096e999be046f83f5e4a42940ec74fba37eeac3bdf515ac3c6fdb0f6b6dc0621631855ba9fd5fa7ecbe55d69e38a39de96e49 -EBUILD rdiff-backup-1.9.1_beta.ebuild 901 BLAKE2B c36fcd05d605c382f3df468e1c3af28c0cb96069a18d82ea6c4f3ccd5e1e89f20815d526c54454ac9fdbdb164fc6d04f56f13d86f008cf6d3066d32afeeec213 SHA512 5e2882b3e7f908dc0b257eb0ad0fcdd8e0e22212fed66346c06debec2c5c70358c3705663c94fdac07ed85867149853a0bef50579fc5d4e70f1c472ce2e86fd6 +DIST rdiff-backup-2.0.0.tar.gz 408352 BLAKE2B c2a7ae90ea147398d648142e20761e3caf4f08948dcd0a3de22254a13857d3e99cb2801c83084dd13dd84764cebc7651b42a70a788553c67925521e2ed123953 SHA512 0bf06d4eefffd41e86224d798e6ac6852ca0fd356be73d651ffaf63c37aaa043a6d22f8025619ab4a86e54f6e98e61f445ab68a6f87f4f2f48e635507ea110ec +EBUILD rdiff-backup-1.3.3-r3.ebuild 879 BLAKE2B 80a2b02bd30860e07010f7fdfa44587045cf980c9f16950212117e1791d86e70a22f7c1bf6da9aecfecd61a2895f7ddbd07607666c2dcb595899cd593fe85fac SHA512 b104e0bc85fd1eae58e0b06c4793d1ad694baa202c5ade3d0a70874dad773fa76693608b5d7d26808abbeae6f63a6f3e670c82a57ba2fe73213d0f36ba91becf +EBUILD rdiff-backup-2.0.0.ebuild 891 BLAKE2B 7990c253df50f530f515252116b1d72806134631c687dad76785babaabc2fef750cb9ec1ff124179d03f3f04b1965d28dcce193b30395ba23da9295e370ac8b1 SHA512 52dc74292414c8c9e9217fb2ba5acf23dc85f345a1265ab35608169a2abc2d0e439382aa96fec7e4b5226db6fbd7451af964ffaf9e63ae2361b216f24893308b MISC metadata.xml 343 BLAKE2B c6de896c88011a54dd0bfc6abc3e5089419684a562ff231458a018a5179eec77e4b4ddeb69bf43b9659d330f0b1ce6102491bd84cda91a306f20913c7c5c98d6 SHA512 1b17e9542a47825d31dea5ebf2b61f091c1abb3f1cd318954693c1d9e1f03afc063890787167a411ab9c5d7108f173878578462bbffd3bceb2229160c23d49db diff --git a/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch index 2d2ecb3ed0b0..bbac52538303 100644 --- a/app-backup/rdiff-backup/files/rdiff-backup-1.4.0-no-docs.patch +++ b/app-backup/rdiff-backup/files/rdiff-backup-2.0.0-no-docs.patch @@ -1,7 +1,7 @@ -diff -Naur rdiff-backup-1.4.0b0.orig/setup.py rdiff-backup-1.4.0b0/setup.py ---- rdiff-backup-1.4.0b0.orig/setup.py 2019-11-22 22:34:17.000000000 +0100 -+++ rdiff-backup-1.4.0b0/setup.py 2019-11-29 18:24:40.251407907 +0100 -@@ -152,18 +152,6 @@ +diff -Naur rdiff-backup-2.0.0.orig/setup.py rdiff-backup-2.0.0/setup.py +--- rdiff-backup-2.0.0.orig/setup.py 2020-03-15 08:25:32.000000000 +0100 ++++ rdiff-backup-2.0.0/setup.py 2020-03-18 20:36:48.579570457 +0100 +@@ -194,19 +194,6 @@ scripts=["src/rdiff-backup", "src/rdiff-backup-statistics"], data_files=[ ("share/man/man1", ["build/rdiff-backup.1", "build/rdiff-backup-statistics.1"]), @@ -15,6 +15,7 @@ diff -Naur rdiff-backup-1.4.0b0.orig/setup.py rdiff-backup-1.4.0b0/setup.py - "docs/examples.md", - "docs/DEVELOP.md", - "docs/Windows-README.md", +- "docs/Windows-DEVELOP.md", - ], - ), ("share/bash-completion/completions", ["tools/bash-completion/rdiff-backup"]), diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild index 5f5650978ca8..07a46592840d 100644 --- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="examples" DEPEND=" diff --git a/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild deleted file mode 100644 index 6ddfec209fa7..000000000000 --- a/app-backup/rdiff-backup/rdiff-backup-1.4.0_beta.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -UPSTREAM_PV=$(ver_rs 3 '.') - -DESCRIPTION="Local/remote mirroring+incremental backup" -HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" -SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV/_/.}/${P/_beta/b0}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="examples" - -DEPEND=">=net-libs/librsync-1.0:0=" -RDEPEND="${DEPEND} - dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-1.4.0-no-docs.patch" -) - -S=${WORKDIR}/${P/_beta/b0} - -python_install_all() { - local DOCS=( docs/FAQ.md ) - use examples && DOCS+=( docs/examples.md ) - distutils-r1_python_install_all -} diff --git a/app-backup/rdiff-backup/rdiff-backup-1.9.1_beta.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild index aede25854c73..43f0e6566f9c 100644 --- a/app-backup/rdiff-backup/rdiff-backup-1.9.1_beta.ebuild +++ b/app-backup/rdiff-backup/rdiff-backup-2.0.0.ebuild @@ -6,28 +6,25 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 -MY_PV=${PV/_beta/b0} - DESCRIPTION="Local/remote mirroring+incremental backup" HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup" -SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz" +SRC_URI="https://github.com/rdiff-backup/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="examples" -DEPEND=">=net-libs/librsync-1.0:0=" -RDEPEND="${DEPEND} - dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}] + >=net-libs/librsync-1.0:0=" +RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}] + dev-python/pyxattr[${PYTHON_USEDEP}] + >=net-libs/librsync-1.0:0=" PATCHES=( - "${FILESDIR}/${PN}-1.4.0-no-docs.patch" + "${FILESDIR}/${PN}-2.0.0-no-docs.patch" ) -S=${WORKDIR}/${PN}-${MY_PV} - python_install_all() { local DOCS=( docs/FAQ.md ) use examples && DOCS+=( docs/examples.md ) diff --git a/app-backup/tob/Manifest b/app-backup/tob/Manifest deleted file mode 100644 index 923f95930ed8..000000000000 --- a/app-backup/tob/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX tob-0.26-nice.patch 248 BLAKE2B e49a1245525cd4d2920584a4225eeedaf2186642d6d8c05ec6acb768749aa106f7f547b9211802c877f853a0fe216c06fef4782293a528b3efee6d1bf4be65dd SHA512 5d6cf1434a0ab3f3818748a302d4be78f9a8b71b68a8f641484fb5181c69c561d2fae84a0507b6bd5e124c2df8974985dd1fe9e439b6d4fc622bfff3f4a34868 -AUX tob-0.26-no-maketemp-warn.diff 386 BLAKE2B 9f147fd5b59d7ee861f5d8c6d8d41d2bd1335cafd1ff70712897f4349b63d781b26f2788ad65ec313d2039a4826207a25197ad1ef081a4b00f21f0b9decc1a89 SHA512 4c91ee5bf9b6dcbc9076481e527da2660a15c7bc20d4105fa3d89aafae3062fa73b4f0041f71a74ff15fe727ccdab36b324fe99974cf3d0dff424c9928b72b30 -AUX tob-0.26-scsi-tape.diff 406 BLAKE2B 152f04f712716b81ab968909ee5594646b0ad3d913f03e374d52edb49ed1abeb426cd33d4e4e72ed098e9406039c031b1907b34d2e5edad9ace7409d7a949303 SHA512 fa0f6852ebbd1c293dbfea32be81fae370d55fa5bb42596f7cff6f970d12e55667f15a56f5e40db581a64d24704fa47ad5e66e18a402a0cfdeeaa89e5a7ce0a8 -DIST tob-0.26.tgz 107711 BLAKE2B 2de8f95816b8cf3721d70ba24544f4f137a4711e9ec88f1927e3195b21cf4c8f20f399faaf314c559b0c18ae72b05ffe9ed69c54c197b0ce1a4005f2311c7110 SHA512 4c570388d3dff6c240a36492c05f7248a5efd527235b45238731db4972ed3fd10b8e3e5632768f16214bafef5e27d7796ada253ce9e3cfb71d182d1c9516b9cd -EBUILD tob-0.26-r2.ebuild 731 BLAKE2B e091f0bfa88636df1c6169f553b9911669cb32c80e81a3167e006e5d68fb6bb646393830b2a325813de65b70a1c98eaab5fe679118c5bf25bcaa6046ed859b1a SHA512 cf1d4320190c4208546996494804ce7264bb0f46c6f28b30ec3900500d5bd22cee7a13a2fc9befbbc4f1d5ece9063eda0f1100316893513efaa32b2b305149a5 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-backup/tob/files/tob-0.26-nice.patch b/app-backup/tob/files/tob-0.26-nice.patch deleted file mode 100644 index d488a27a19cd..000000000000 --- a/app-backup/tob/files/tob-0.26-nice.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tob.old 2005-02-13 17:46:00.000000000 -0500 -+++ tob 2005-02-13 17:35:43.000000000 -0500 -@@ -314,7 +314,7 @@ - fi - - if [ "$NICEFIND" = "yes" ] ; then -- nicefindcmd="nice -19" -+ nicefindcmd="nice -n 19" - else - nicefindcmd="" - fi diff --git a/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff b/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff deleted file mode 100644 index af346d111353..000000000000 --- a/app-backup/tob/files/tob-0.26-no-maketemp-warn.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -u tob-0.26/tob tob-0.26.new/tob ---- tob-0.26/tob 2003-12-22 01:25:17.000000000 +0100 -+++ tob-0.26.new/tob 2004-03-20 10:30:09.916597016 +0100 -@@ -61,7 +61,7 @@ - ## 16 May 1998 - ## - ## Smartened up by Stephen van Egmond <svanegmond@tinyplanet.ca> 2003/10/30 --MKTEMP=`which maketemp`; -+MKTEMP=`which maketemp 2> /dev/null`; - if [ ! -x "$MKTEMP" ]; then - MKTEMP=`which mktemp`; - fi diff --git a/app-backup/tob/files/tob-0.26-scsi-tape.diff b/app-backup/tob/files/tob-0.26-scsi-tape.diff deleted file mode 100644 index 4628d8a8f417..000000000000 --- a/app-backup/tob/files/tob-0.26-scsi-tape.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur tob-0.26/tob /tmp/tob-0.26/tob ---- a/tob-0.26/tob 2005-02-27 22:46:15.701964928 +0100 -+++ b/tob-0.26/tob 2005-02-27 22:45:41.091226560 +0100 -@@ -219,8 +219,6 @@ - if [ -d "$BACKUPDEV" ]; then - BACKUPDIR=$BACKUPDEV - BACKUPDEV="${BACKUPDIR}/${VOLUMENAME}_${DATE}_${TYPE}.${EXT}" -- else -- BACKUPDIR="/var/lib/tob" - fi - - # check that relevant environment vars are set diff --git a/app-backup/tob/metadata.xml b/app-backup/tob/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/app-backup/tob/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-backup/tob/tob-0.26-r2.ebuild b/app-backup/tob/tob-0.26-r2.ebuild deleted file mode 100644 index c6c3a196f6e6..000000000000 --- a/app-backup/tob/tob-0.26-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils vcs-clean - -DESCRIPTION="A general driver for making and maintaining backups" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="" - -RDEPEND="app-arch/afio" -DEPEND="" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-no-maketemp-warn.diff \ - "${FILESDIR}"/${P}-nice.patch \ - "${FILESDIR}"/${P}-scsi-tape.diff - ecvs_clean -} - -src_install() { - dosbin tob - dodir /var/lib/tob - insinto /etc/tob - doins tob.rc - insinto /etc/tob/volumes - doins example.* - - dodoc -r README contrib/tobconv doc sample-rc - doman tob.8 -} diff --git a/app-backup/zbackup/Manifest b/app-backup/zbackup/Manifest index 59c4dd882fd0..cbb93d132faf 100644 --- a/app-backup/zbackup/Manifest +++ b/app-backup/zbackup/Manifest @@ -2,5 +2,5 @@ AUX zbackup-1.4.4-tartool.patch 277 BLAKE2B 612cf1a5b6faf753829a859582ccd9cc7410 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-r1.ebuild 773 BLAKE2B e3736ff92beb0847675549bbb6504278b06c002f3fecf005725439c8f3bedff8eb41cd3498c974e3dd4f727a5d9f78542525f619e03071bb1fe86fe8a4047c43 SHA512 992cdd5eee2c7ccf264617f6c42069db7a4eedcc33f99f0c579b6110e68e7f8188f6b7689b70dd0d027858f202a2683b892a07ba278aa9006cd91ba9439f2de9 -EBUILD zbackup-9999.ebuild 776 BLAKE2B b54cadd2af1da601fdd9aff31468b9294c2461eb086ff5be4d24d03d1d42035b51f79a66f29f9d464b66b162760b7c650c1b27ed70bce819fe247011e0d89765 SHA512 a83157f48f1457114527b38f28a7f74159b7173d5f3891aed6d5fdd9f98ddcfd08dc5c0196c74321c2841f52af138dcdbd35cba3959c297399507ac99868ae3d +EBUILD zbackup-9999.ebuild 773 BLAKE2B fe7a2ed4469bf7cb0227f25c58ae05ebfcf9488588d4b346a62c95ac92cc88c5cb2361316f182e7c1b5f6b159bd0ed5dcc83b36a6239d81babbd897e08cdc194 SHA512 8e233f2acac824bbeb07b13c5a19607dfba9a9d087427e72a6b64fc9c536785ea78c9cfdbdd33eb765585eba38d37f98e98b3ab37f688a7f1b2cdd366e436017 MISC metadata.xml 868 BLAKE2B 2ca9b107e5d3351ff15030e11d7da82a1b029fcdbcd24c6e0d67bd63b173fe7403c6642b11022253ba735fe70ba085c276dcfbf5dfd01e56d8c91be8144ee82d SHA512 d452d2e94449e05f0d2f99d223587560380999c7afd1396e3c7e3ed8a3792d4abd0bb717d078053cec0cd397df4cb2cf00949b24ab407fc966705bfe6911b524 diff --git a/app-backup/zbackup/zbackup-9999.ebuild b/app-backup/zbackup/zbackup-9999.ebuild index 7b648c0e2b3f..864251576a57 100644 --- a/app-backup/zbackup/zbackup-9999.ebuild +++ b/app-backup/zbackup/zbackup-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ IUSE="libressl tartool" DEPEND="app-arch/lzma dev-libs/lzo:2 dev-libs/protobuf:0= - sys-libs/libunwind:7 + sys-libs/libunwind:0 sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )" |