diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
| commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
| tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-backup | |
| parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) | |
gentoo resync : 14.05.2020
Diffstat (limited to 'app-backup')
37 files changed, 288 insertions, 506 deletions
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz Binary files differindex 2aeaa14a3958..fbc02ff6ce70 100644 --- a/app-backup/Manifest.gz +++ b/app-backup/Manifest.gz diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest index 364bf991d6a9..e86b92969a1d 100644 --- a/app-backup/bareos/Manifest +++ b/app-backup/bareos/Manifest @@ -1,5 +1,3 @@ -AUX bareos-12.4.5-Makefile.patch 924 BLAKE2B ea4e413f5e1ddb5d23aa030e5d7a4e96b23cd987fc86d2958c5275994198f8aa3705b5554e545440f31cfaed45283e34a08aa4e27087d81edc192d1e9884d63f SHA512 f1b5da39d01f6b00851810c6a0cbcda9ac0561fb165054f6f2c4540943b41af9d524a6a8aca1ae87d55fa8624aecf44c3c0db03c2d7c22690a84c16994289eed -AUX bareos-12.4.5-bat-ldflags.patch 389 BLAKE2B 9e1d80037755eba2ae47951aa1e603ac3bac1b26f1cbc0681730ab7ba08846f4670989c517bfe02a6b869b880456e992d3e40fd0d7488d63494a547a902c3c24 SHA512 811fd6ffc2a1c4aeef3afd9001fd2bf01c70ef3f75ed6949ec6b064a9e6ce7a4893ffe464e5c9c67e33fdf92e00b0601500930165891b70d403d31a2ee347434 AUX bareos-cmake-gentoo.patch 516 BLAKE2B 685734517fc166413250782ed35445761b19efd9b7ffedb8436a71f5aea84e38633c61318c914169d3ea40daf0c45e3fe229136cdb1a98dc087cd56b91a4b1d2 SHA512 c0d89844a66f851f556e00faf42e85157c744f1547b37d95f5dd0c58a0ab62fb60a8aead87546ea37f5f9d0eb247a3e1a715d042aafe9b422a3eefe37518b743 AUX bareos-cmake-rados.patch 718 BLAKE2B be3c5822a122fb9d6a5bdd6cb388e3edbb59c6e2aafb9e16991bf0c62ab2dbdf0757de88382318bbd9f6b0fb7d48de11c9d0cd6ab276b6fb6c4f61f8b756237a SHA512 46b6ced3bcdf7e6a72029803a60775cfc06b2313004214dfe7d7ffa64f954fb80cb93f7374b967b33b4035aac8fce4412f13833aa57a83e4ce98c503f147918e AUX bareos-cmake-symlink-default-db-backend.patch 779 BLAKE2B edb161632215ed8bdc75cae27d54f603787d5f3cbfcf19e180cb7234f661c35527c24dfef38b7c455fd28a46539eae94d157c4777549381c0db64c5fe531d35d SHA512 f5c07d611b7e9f5dc85e0e1440b5bcf43f80a6a6a3b7aead0b88a7a924c9cc8c42bad016d81a0ad55baecc5888e850a516bc86b52a65ddf460c3059fe7f299ee @@ -15,10 +13,10 @@ 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-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-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 -MISC metadata.xml 1440 BLAKE2B 588672b8975b109eb293f8a251ea5745cbcdab83acac5b1efb3318e2b06eeecfb48114974fd0854fc98480a8607ef7603e0882a2c74d3a301023cdafc67348ff SHA512 b76bc10f031dc5ab0abd71980706a3beebfb50a8e7d273bdfbf85124309ba98ab4542d6e273691a8105c8c5a078b3886d891131a79c587ab62f361e7bba7b5b7 +DIST bareos-17.2.9.tar.gz 4190637 BLAKE2B 266627ac023695971acc5d730765c08ddde673ba75398547687d5f2ccbfb7c440221b8c0a617bc6a3b0d2089cd22604ebe838decc65ce3c1f7ae5cdb99833118 SHA512 ac40f867d495aa64693a209dbfceb55f22425a2079dc000dabd8c6ffce79b1a2578bc0110970a6aace7c3e039c7110d1d395c31b372c0d3e5f18b43e682a70a9 +DIST bareos-18.2.8.tar.gz 10552800 BLAKE2B c13aabbb7f450c1c9c02f39b130d34057cfc4cec590c68acde5d3592d0f238c0e52bf3acbb55e697610252b3f6bd528c2e87ea09c83aba02f303d144a62b44b2 SHA512 61c9155a02ec0f3a21e06db4f5701dabb25411219d98940b50912c16ac38ec007584a7ef9728f2f12acf2823339a25eba3c9b34a6fa9e625a1d2d0778653b860 +DIST bareos-19.2.7.tar.gz 12602338 BLAKE2B 31fa9c9966b22913c2af6eaa6c6f704396d353341878817a574388925f35b437331b057b2a147a8217502f9198b39539d2fa68c4047e191dc918123c0f674a7d SHA512 cb467846a41d42a469704d48c3a1b03ebf5fdc71b9268c1e438e46b86073d55993dfd9bf26242db593db8b1814009c060fd65122d434bad2986c24613f6865c6 +EBUILD bareos-17.2.9.ebuild 10551 BLAKE2B df36eaf96f8dbec36101d7dbc736502eaaeca8faf36b0c1dbf7624d031ae0835b5eaad7968ffc94402299ed4d72ebb921e7e16c862b7dd2e67b998a537063308 SHA512 e9052e3e59405361b129e99b163820559e71987b6452fb7936620679f805ba37494bca8bd55bffe45cd7e44958b2559fce3fb50f11cd8f95ce144680ede9a486 +EBUILD bareos-18.2.8.ebuild 11438 BLAKE2B 719291b1a95fe1aa6d602f88c8d71c0a94c7d77bdd0e3313632cb7701d2cb876f072830bcb515a2ef9c39be33b7e843a867510b48b976e51599a889e118b8aea SHA512 1abe95715a635c349c92eda1b695a9e15a5965aeb6eb471591497808c9e51cfd25158b65c98f9677261a7e1c137cf86fe89203296ce6ba7132ec395f36debf7c +EBUILD bareos-19.2.7.ebuild 10787 BLAKE2B a1672ef75bba19ef60ca8b3392a4213574d8513ce6ceadf6bf8cd0e83e775bea9250e0c2f5aef3045018c66806818ed6b545ed1fc5c8dde445db23fe0982fc4a SHA512 ea2bd88ea61a71e18283f132928445aee016812021633a94233b04a99e6e64cdc0253d3490ba2fe95b41f929f250b293d7c4479159eefee107116a04ff5bf217 +MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872 diff --git a/app-backup/bareos/bareos-17.2.7-r1.ebuild b/app-backup/bareos/bareos-17.2.9.ebuild index 625e9459f113..aa5473acd458 100644 --- a/app-backup/bareos/bareos-17.2.7-r1.ebuild +++ b/app-backup/bareos/bareos-17.2.9.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -inherit eutils multilib python-single-r1 systemd user +inherit python-single-r1 systemd DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="http://www.bareos.org/" @@ -23,6 +23,7 @@ REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" DEPEND=" !app-backup/bacula + acct-group/${PN} cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) @@ -30,6 +31,7 @@ DEPEND=" lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( + acct-user/${PN} postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) @@ -88,26 +90,6 @@ 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 } diff --git a/app-backup/bareos/bareos-18.2.6.ebuild b/app-backup/bareos/bareos-18.2.8.ebuild index 62f70274ab04..4bf0b6c7c3b7 100644 --- a/app-backup/bareos/bareos-18.2.6.ebuild +++ b/app-backup/bareos/bareos-18.2.8.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="6" +EAPI="7" PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="threads" -CMAKE_WARN_UNUSED_CLI=yes +CMAKE_WARN_UNUSED_CLI=no #CMAKE_REMOVE_MODULES=yes -inherit eutils multilib python-single-r1 systemd user cmake-utils +inherit python-single-r1 systemd cmake-utils DESCRIPTION="Featureful client/server network backup suite" HOMEPAGE="http://www.bareos.org/" @@ -25,6 +25,7 @@ REQUIRED_USE="!clientonly? ( || ( mysql postgres sqlite ) )" DEPEND=" !app-backup/bacula + acct-group/${PN} cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) @@ -32,6 +33,7 @@ DEPEND=" lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( + acct-user/${PN} postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) @@ -87,25 +89,6 @@ REQUIRED_USE="static? ( clientonly ) S=${WORKDIR}/${PN}-Release-${PV} pkg_setup() { - # 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,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 } @@ -120,13 +103,13 @@ src_prepare() { || die "sed on MyCatalog.conf.in failed" popd >&/dev/null || die - epatch "${FILESDIR}/bareos-cmake-rados.patch" + eapply -p0 "${FILESDIR}/bareos-cmake-rados.patch" # fix gentoo version detection - epatch "${FILESDIR}/bareos-cmake-gentoo.patch" + eapply -p0 "${FILESDIR}/bareos-cmake-gentoo.patch" # fix missing DESTDIR in symlink creation - epatch "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch" + eapply -p2 "${FILESDIR}/bareos-cmake-symlink-default-db-backend.patch" eapply_user diff --git a/app-backup/bareos/bareos-17.2.6.ebuild b/app-backup/bareos/bareos-19.2.7.ebuild index 487c29eb98ef..cb87707808ea 100644 --- a/app-backup/bareos/bareos-17.2.6.ebuild +++ b/app-backup/bareos/bareos-19.2.7.ebuild @@ -1,35 +1,38 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" +CMAKE_WARN_UNUSED_CLI=no +#CMAKE_REMOVE_MODULES=yes -inherit eutils multilib python-single-r1 systemd user +inherit python-any-r1 systemd cmake-utils DESCRIPTION="Featureful client/server network backup suite" -HOMEPAGE="http://www.bareos.org/" +HOMEPAGE="https://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 ) )" +IUSE="X acl ceph clientonly +director glusterfs ipv6 jansson lmdb libressl + logwatch mysql ndmp +postgres readline scsi-crypto + sqlite static +storage-daemon systemd tcpd vim-syntax xattr" +# get cmake variables from core/cmake/BareosSetVariableDefaults.cmake DEPEND=" !app-backup/bacula - cephfs? ( sys-cluster/ceph ) - rados? ( sys-cluster/ceph ) - rados-striper? ( >=sys-cluster/ceph-0.94.2 ) + acct-group/${PN} + !x86? ( + ceph? ( sys-cluster/ceph ) + ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( + acct-user/${PN} postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) @@ -38,7 +41,6 @@ DEPEND=" jansson? ( dev-libs/jansson ) ) ) - fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) @@ -47,28 +49,17 @@ DEPEND=" 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] ) - ) + !libressl? ( dev-libs/openssl:0=[static-libs] ) + libressl? ( dev-libs/libressl:0=[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 ) - ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:= sys-libs/zlib ) - python? ( ${PYTHON_DEPS} ) " RDEPEND="${DEPEND} !clientonly? ( @@ -77,141 +68,112 @@ RDEPEND="${DEPEND} app-arch/mt-st ) ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + " +BDEPEND="${PYTHON_DEPS}" -REQUIRED_USE="static? ( clientonly ) - python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + !clientonly? ( || ( mysql postgres sqlite ) ) + static? ( clientonly ) + x86? ( !ceph ) +" 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; do - sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bareos/|g' "${f}" \ - || die "sed on ${f} failed" - done - popd >&/dev/null || die + use mysql && export mydbtypes+=( mysql ) + use postgres && export mydbtypes+=( postgresql ) + use sqlite && export mydbtypes+=( sqlite ) # enables default database driver in catalog - pushd src/defaultconfigs/bareos-dir.d/catalog >&/dev/null || die - sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE/d' MyCatalog.conf.in \ + pushd core/src/defaultconfigs >&/dev/null || die + sed -i -e 's/#dbdriver/dbdriver/' -e '/XXX_REPLACE_WITH_DATABASE_DRIVER_XXX/d' $(grep -rl XXX_REPLACE_WITH_DATABASE_DRIVER_XXX) \ || die "sed on MyCatalog.conf.in failed" popd >&/dev/null || die - # bug 466690 Use CXXFLAGS instead of CFLAGS - sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die + # fix gentoo version detection + eapply -p0 "${FILESDIR}/${PN}-cmake-gentoo.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 + # fix missing DESTDIR in symlink creation + sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt" - eapply_user + CMAKE_USE_DIR="$S/core" + cmake-utils_src_prepare } src_configure() { - local myconf='' + local mycmakeargs=() + + CMAKE_USE_DIR="$S/core" - addpredict /var/lib/logrotate.status + pushd core/platforms >&/dev/null || die + cmake_comment_add_subdirectory '${DISTNAME}' + popd >&/dev/null || die 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)" + mycmakeargs+=( + -Dclient-only=ON + -Dstatic-cons=$(usex static) + -Dstatic-fd=$(usex static) + ) 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 \ - --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 \ - --with-db-password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` \ - --enable-dynamic-cats-backends \ - --enable-dynamic-storage-backends \ - --enable-batch-insert \ - --disable-afs \ - --host=${CHOST} \ - ${myconf} -} + for useflag in acl ipv6 ndmp scsi-crypto \ + systemd mysql lmdb; do + mycmakeargs+=( -D$useflag=$(usex $useflag) ) + done + + mycmakeargs+=( + -DDEFAULT_DB_TYPE=${mydbtypes[0]} + -Darchivedir=/var/lib/bareos/storage + -Dbackenddir=/usr/$(get_libdir)/${PN}/backend + -Dbasename="`hostname -s`" + -Dbatch-insert=yes + -Dbsrdir=/var/lib/bareos/bsr + -Dconfdir=/etc/bareos + -Dcoverage=yes + -Ddb_password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1` + -Ddir-group=bareos + -Ddir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Ddir-user=bareos + -Ddocdir=/usr/share/doc/${PF} + -Ddynamic-cats-backends=yes + -Ddynamic-storage-backends=yes + -Dfd-group=bareos + -Dfd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dfd-user=root + -Dhost=${CHOST} + -Dhostname="`hostname -s`" + -Dhtmldir=/usr/share/doc/${PF}/html + -Dlibdir=/usr/$(get_libdir) + -Dlogdir=/var/log/bareos + -Dmandir=/usr/share/man + -Dmon-dir-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-fd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmon-sd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dmysql=$(usex mysql) + -Dopenssl=yes + -Dpiddir=/run/bareos + -Dplugindir=/usr/$(get_libdir)/${PN}/plugin + -Dpostgresql=$(usex postgres) + -Dsbin-perm=0755 + -Dsbindir=/usr/sbin + -Dscriptdir=/usr/libexec/bareos + -Dsd-group=bareos + -Dsd-password="`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1`" + -Dsd-user=root + -Dsqlite3=$(usex sqlite) + -Dsubsysdir=/run/lock/subsys + -Dsysconfdir=/etc + -Dworkingdir=/var/lib/bareos + -Dx=$(usex X) + ) -src_compile() { - # Make build log verbose (bug #447806) - emake NO_ECHO="" + cmake-utils_src_configure } src_install() { - emake DESTDIR="${D}" install - newicon src/images/bareos_logo_shadow.png bareos.png + cmake-utils_src_install # 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} @@ -235,7 +197,7 @@ src_install() { diropts -m0755 insinto /etc/logrotate.d insopts -m0644 - newins "${S}"/scripts/logrotate bareos + newins "${S}"/core/scripts/logrotate bareos # the logwatch scripts if use logwatch; then @@ -244,14 +206,29 @@ src_install() { 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 + pushd "${S}"/core/scripts/logwatch >&/dev/null || die + + into /etc/log.d/scripts/services + dobin bareos + + into /etc/log.d/scripts/shared + dobin applybareosdate + + insinto /etc/log.d/conf/logfiles + newins logfile.bareos.conf bareos.conf + + insinto /etc/log.d/conf/services + newins services.bareos.conf bareos.conf + popd >&/dev/null || die fi fi rm -vf "${D}"/usr/share/man/man1/bareos-bwxconsole.1* if use clientonly || ! use director; then + if use systemd; then + rm -vf "${D}"/lib/systemd/system/bareos-dir.service + fi 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* @@ -267,6 +244,9 @@ src_install() { rm -vf "${D}"/usr/libexec/bareos/*_catalog_backup fi if use clientonly || ! use storage-daemon; then + if use systemd; then + rm -vf "${D}"/lib/systemd/system/bareos-sd.service + fi 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* @@ -284,37 +264,39 @@ src_install() { # documentation dodoc README.md - use ndmp && dodoc README.NDMP - use scsi-crypto && dodoc README.scsicrypto + dodoc core/README.configsubdirectories + use glusterfs dodoc core/README.glusterfs + use ndmp && dodoc core/README.NDMP + use scsi-crypto && dodoc core/README.scsicrypto # vim-files if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax - doins scripts/bareos.vim + doins core/scripts/bareos.vim insinto /usr/share/vim/vimfiles/ftdetect - newins scripts/filetype.vim bareos_ft.vim + newins core/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" + myscripts+=" bareos-dir" fi if use storage-daemon; then - myscripts="${myscripts} bareos-sd" + 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}".confd "${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 + sed -i -e "s:%databasetypes%:${mydbtypes[*]}:" "${T}/${script}".confd || die ;; *) ;; @@ -326,13 +308,21 @@ src_install() { done # install systemd unit files - use director && systemd_dounit "${FILESDIR}"/bareos-dir.service - use storage-daemon && systemd_dounit "${FILESDIR}"/bareos-sd.service - systemd_dounit "${FILESDIR}"/bareos-fd.service + if use systemd; then + if ! use clientonly; then + use director && systemd_dounit core/platforms/systemd/bareos-dir.service + use storage-daemon && systemd_dounit core/platforms/systemd/bareos-sd.service + fi + systemd_dounit core/platforms/systemd/bareos-fd.service + fi # make sure the working directory exists diropts -m0750 keepdir /var/lib/bareos + keepdir /var/lib/bareos/storage + + diropts -m0755 + keepdir /var/log/bareos # make sure bareos group can execute bareos libexec scripts fowners -R root:bareos /usr/libexec/bareos diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch deleted file mode 100644 index 3cdee15d4db7..000000000000 --- a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -# stop build if there are errors in subdirs ---- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000 -+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000 -@@ -44,9 +44,8 @@ - - all: Makefile - @for I in ${all_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \ - done - - depend: -@@ -55,9 +54,8 @@ - - bacula-fd: Makefile - @for I in ${fd_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \ - done - - #------------------------------------------------------------------------- diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch deleted file mode 100644 index 94d8fb60120e..000000000000 --- a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -# bat needs to respect LDFLAGS ---- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000 -+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000 -@@ -26,6 +26,7 @@ - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += .libs/* bat -+QMAKE_LFLAGS += @LDFLAGS@ - - qwt { - INCLUDEPATH += @QWT_INC@ diff --git a/app-backup/bareos/metadata.xml b/app-backup/bareos/metadata.xml index 4f7694434a3e..bc44d44732b3 100644 --- a/app-backup/bareos/metadata.xml +++ b/app-backup/bareos/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="cephfs">Enable cephfs storage backend</flag> + <flag name="ceph">Enable ceph support</flag> <flag name="clientonly">Only install file-daemon (client)</flag> <flag name="director">Install director</flag> <flag name="fastlz">Enable support vor lz4, lz4hc and lzfast using dev-libs/bareos-fastlzlib</flag> diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest index 435391425dc4..ffa73f96c28f 100644 --- a/app-backup/borgbackup/Manifest +++ b/app-backup/borgbackup/Manifest @@ -1,4 +1,3 @@ -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 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 deleted file mode 100644 index 85b612af2370..000000000000 --- a/app-backup/borgbackup/files/borgbackup-1.1.11-unbundle-msgpack.patch +++ /dev/null @@ -1,110 +0,0 @@ -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 index 49317bdae8ad..43398301b2a1 100644 --- a/app-backup/borgmatic/Manifest +++ b/app-backup/borgmatic/Manifest @@ -1,6 +1,5 @@ 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-r2.ebuild 2139 BLAKE2B e24c54b69913fda078ca2c1233e92307d72c254168e1dc47075a23bd38902c53e6330ff848d5be403522944dee313c0d8754ebb1ae22f707e7b455acc21549b7 SHA512 758dfe7f7d9de9fbdb30839ff170716f4f4a30f10801027c4bc7bca12bfa79eecdaf7eb4fdbc0ca6a1d512fd6731d62e27a8bbe6de6ed878fe61992b731ed3e9 +EBUILD borgmatic-1.5.1-r2.ebuild 2141 BLAKE2B b0aca4c281f46466b2ab6f6ecf3f94adfd51460097e4db346c1f7d5f5461cad820e6cd16ea5ba195af041117df2dbf5c5085ef1079d449e65ce7d97a183ac3be SHA512 d238d0b9b81e5acbc790063c7d6bef904733eee70bb704ac8156593814d941b9b18191586800348f70110269e25c32648f47649e0e59faa507a2e31ed1ecd3ed 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 deleted file mode 100644 index d5b11aab9bb1..000000000000 --- a/app-backup/borgmatic/borgmatic-1.5.1-r1.ebuild +++ /dev/null @@ -1,65 +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} ) - -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-r2.ebuild b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild index 02359afde23e..a287fddbef27 100644 --- a/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild +++ b/app-backup/borgmatic/borgmatic-1.5.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS="rdepend" diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest index 67f7bf468912..473a2e244232 100644 --- a/app-backup/btrbk/Manifest +++ b/app-backup/btrbk/Manifest @@ -11,19 +11,19 @@ DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b8 DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849 DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e -EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5 +EBUILD btrbk-0.24.0-r1.ebuild 739 BLAKE2B d63dea2bd5fddb06dcfbe2f7383a5750ccf96f0f934225ae6154bb6c6c9a0d2f8d2f1bcfe59cee7a75653da9e1c516c9f9555a337604722990707c8d5fde8f1d SHA512 591d73f80ef9c4996175daca46d04ddd010530e0d810dfde0c0935f9ec46f3695389812743a8c19067eca2d6fb791b689658ae5e6b1507462c76966b191ae936 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb -EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58 -EBUILD btrbk-0.26.1.ebuild 1086 BLAKE2B fc399e327dc380f2d8a6ba0afef6ed83fbd75b44e20cd1118e1d6bf554a01c1bbd9646cdd06141c5f2c6e20a51fa6dbb4a55c547ab7b4a67e52367f8df13a5c6 SHA512 a99fbb45829357f83e361a4e22cdbc38598d6dca808d7a84bbb0ec4c043f1ccba39dffd6c0c7c902de199a44106f6fbf6ff79066fad1a5781cefdb6a9cb4ae4e -EBUILD btrbk-0.27.0.ebuild 2112 BLAKE2B 9d7a019df554a45dbac28ea1a2ac1bc5a56e850d8aed0e941919541c2d812b730a33ecb838316ddea9580bbdde9d845a62d820ad8f0b731d075ee75b7cfd7d83 SHA512 63be7d1276cca0ea0d41aa0dde3b6a64bf878aca0dfb28e8bf8f10e9ab2af5be9d59b81d3f7bd24f043cb39910a547b6240af619bd169c1201f35ad05d5a0d5f -EBUILD btrbk-0.27.1-r1.ebuild 2277 BLAKE2B ab8cc826738845d33ac143d254044338ff5043d026cb198ee3dd9dd59bec8216ca73d85139d58281153268c7fbb44657809bb7791a5cd3d59cb013607dbb69e6 SHA512 aa9c19e173f90f5e14111bd977862dc58fc73e10de0302e8acb5ff4193d420feb0ba0c4f841c193a7b6b8ee0a29e74000c92a3bed244cdc4bc333a7f0de66ae6 -EBUILD btrbk-0.27.1.ebuild 2102 BLAKE2B 1d7acf9fbc93907dbb559472f674b259a5c5fe2ec8371f8dc7bdca82e7546770a7d6f227fc8c1ecbdec3397bb8809ad7ff40e04d6235e10d9eef58a8166c16c0 SHA512 7839a057d377e4ac0fb3b7602ef2a307215329b7e4b97017c8d63543a83a30d1613f8869c66d76feb408f07b0dc89c362459befd86cb54b458ee1fb7452ad01b -EBUILD btrbk-0.27.2.ebuild 2319 BLAKE2B 56180c3685ea46964b9d4aa94f4064ba3815fcc2e9b1cff4fd6a8c220ed3dfc8473651ead17a3ffbc484a99114038c06f469937ca486b751b4d20116379bc78c SHA512 bd30e9dac79385423db045596e3d0ff24655a97c424ae66e45198360e18724ab4ba856f2634ccce1643809c6f964dd2118bed229f26276a238b8b397b9112247 -EBUILD btrbk-0.28.0.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4 -EBUILD btrbk-0.28.1.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4 -EBUILD btrbk-0.28.2.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4 -EBUILD btrbk-0.28.3.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4 -EBUILD btrbk-0.29.0.ebuild 2331 BLAKE2B b86a85018684272d61b418d4d6fe4c048a25d9622c5b64f5279d2d7efeaac5f446f3ed697d133cb729393655a155124ad36f11cc0b8c1ea43984bfe83bbc0371 SHA512 26a88ea69c785cb390dc66f47886b3b79953afef98f89fbd2855a8ab5151b213c5e93ed18a985e29752ba55ef6638b8fd9f09ec0a723005fa18433c9b42b8467 -EBUILD btrbk-0.29.1.ebuild 2331 BLAKE2B bb63b25a014de179f0819dbb467558a986d1888d0b11f66d6bedf0a54c72850f013ea2f127419bc32644aa81adba139bd220a907b1f9429d1b47edfa6dcbf7f8 SHA512 c4efc36a09e9cd25a3c928a0a0cb213d7b3d449371107ef0903dc43bba6adebbe3d64f94093d43169331b2a3f6d08af2aab431dfdf00b06bb4a266b057afb389 -EBUILD btrbk-9999.ebuild 2331 BLAKE2B b86a85018684272d61b418d4d6fe4c048a25d9622c5b64f5279d2d7efeaac5f446f3ed697d133cb729393655a155124ad36f11cc0b8c1ea43984bfe83bbc0371 SHA512 26a88ea69c785cb390dc66f47886b3b79953afef98f89fbd2855a8ab5151b213c5e93ed18a985e29752ba55ef6638b8fd9f09ec0a723005fa18433c9b42b8467 +EBUILD btrbk-0.26.0.ebuild 1062 BLAKE2B a5d7786a5d00d17f4e5b251b7b291077f276ab30617ca557b75e4dbb5a35da5396056d5f319dc09903d00f95997407ad5eaab7eb7e7ffbac47eee05f40a39eaf SHA512 644aa71c2822e4484bc62243a47ad1f415042df2b555f915e076c325b13c64fbda97bc0c3b4d098efeebd81b826f12fe1c235ba85e6b8e56d1c78c375715c247 +EBUILD btrbk-0.26.1.ebuild 1070 BLAKE2B eba4e6e20f0d00e04e743f654804c1fc0baad5cd7a0af5cd3cf4be8b146426048bd66b2c8446edbdfea08b0d7fef66ea646a28ba96691fed2d987e6e2d240c2d SHA512 f91184be03d86b94ac1205762c2cd498f7fe86919f802c8f50c75172858183a2c10b5dc9c9f4ce77aa54667baac42f7b491e21c34622fd42a95b8b25fbeee2fa +EBUILD btrbk-0.27.0.ebuild 2086 BLAKE2B 6c0b94e96b695df63a57f044cf2238ab24ea5e11849fd69cd68592c300274d4d52e0e44c22a9fd4e9663c90378c591cb44ab2bd70932e68832134989c22a0e37 SHA512 94c88b77bbf0c831e7f2aedf3e0706b98e29ee505b4ab1470a81cbc4f597ccdf46e0c27f9ace51c0659c5e3f73baf70a1d1f2cc7dc944db28770c385b7078523 +EBUILD btrbk-0.27.1-r1.ebuild 2264 BLAKE2B c91380d9f5fa7c192e2bb4bbef659737b0c2016de78cb31034fbb9dc01fad3665d903dc453398a36e28ab271b4eed454a7eb6145655801af7e1db1ea20c8969c SHA512 6342b8889162d8bb2871f66709ccc710f68da9f56ac829755b1a7085f63252fc6a1c4b7ff6c67add47994e09d1128399688f48819c774751e4b64249cc557849 +EBUILD btrbk-0.27.1.ebuild 2089 BLAKE2B 069c9bf2b1dc5789b2867fc07b47640c6689cb926d101926b77e0a1160a93d8cd3c978fefb8d1a28bca52a0dc8c0a36e26d2db4229c78238d054e8735c221674 SHA512 12cf213f9c05e14b73d213bb7294080ae363d766eb41427d6da36f796688a20abe461d15d42cf4b41785116659cd7bcedf337d564e6e6a625dd3376dd4ade5f1 +EBUILD btrbk-0.27.2.ebuild 2306 BLAKE2B 3f90c5446166ec67d46be13824b18b549d55af9cb4c952c2a27c12757acd617dd57944b73c78b85252a16a3fac67b7907835e0f2a6c4178539371e693780e25e SHA512 13f79e67d3cbd4e36adf55be72ca7e131fbe9e7c20326bc31453db418b91b0324b4365ea814ffd556cc51bd8781f3aa4c518b80a853208e2a8da9dc0cb08a74e +EBUILD btrbk-0.28.0.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24 +EBUILD btrbk-0.28.1.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24 +EBUILD btrbk-0.28.2.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24 +EBUILD btrbk-0.28.3.ebuild 2291 BLAKE2B caacd41c9fb9b43f1a60743d7455f17b103e9daca45f3850f25ba38b35c369ba090af1a5ff9cd673d8b7eb50ee971f4e30fdebed86bb69a086a9e415ffe02135 SHA512 bb525448696bf226d4c9dbe4c386ad2659f165a559a9dd6eae73a41e2cea6c1113732d802291cef8b2ef5c39e20179fb2e0cbedb7116fc1d1943b21140435a24 +EBUILD btrbk-0.29.0.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392 +EBUILD btrbk-0.29.1.ebuild 2325 BLAKE2B e3191fe3f7029d38291d531733e6ee2250aa0dcc930763ca27f1e58bee6c1d3a4e9b7d5b38b002989be72756451f86395982b5cf1388db38617e2ac3a527b20d SHA512 fcb454f017725d182d5df4fee63d7fb4e3e20f03553b4673c1c0414e4badc1c4650b9d2f969eda628c8acfea9dbe934e9d7af93263c5d84be7451353ea52ca8b +EBUILD btrbk-9999.ebuild 2318 BLAKE2B 284c2259dd56ee7469bfa9e4638be53c858d09a9b22f81a3bb00c01f643f2f817d3dd1eb1e36d79b85d9ff335c5d7eae26925bf60d7a282403132992e4263b8c SHA512 090848519b5bbd036940eaceb140115ea94c9bcdcb413f82b962fe51034cb979a596afdbea73055e5043a3b1694cd4b53f75de47d6d0e037f432c3ea20d9a392 MISC metadata.xml 1194 BLAKE2B 9fd7bc80e3334d38cc30df17375b709fea9af5b31ff48c74d3ccb65bb8b58940a1c0c0640c977f476bb13dffa357db3d6f2672b11b9ab658b67c46ce1ca8c788 SHA512 1949a2a9b14669ab67a53b3aa86dd1838c0ad4ef924a2f6729bf7a0b17c67f1db9e6094e746b710988440905b713c8938af36caffe9b9f4440c65ba72e4779ec diff --git a/app-backup/btrbk/btrbk-0.24.0-r1.ebuild b/app-backup/btrbk/btrbk-0.24.0-r1.ebuild index 8f10060231fa..93502cbb34d8 100644 --- a/app-backup/btrbk/btrbk-0.24.0-r1.ebuild +++ b/app-backup/btrbk/btrbk-0.24.0-r1.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="amd64 arm x86" diff --git a/app-backup/btrbk/btrbk-0.26.0.ebuild b/app-backup/btrbk/btrbk-0.26.0.ebuild index 8588eb6d0e34..06f23db240ff 100644 --- a/app-backup/btrbk/btrbk-0.26.0.ebuild +++ b/app-backup/btrbk/btrbk-0.26.0.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://dev.tty0.ch/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.26.1.ebuild b/app-backup/btrbk/btrbk-0.26.1.ebuild index 621ad7e2a0a0..8638d66c3081 100644 --- a/app-backup/btrbk/btrbk-0.26.1.ebuild +++ b/app-backup/btrbk/btrbk-0.26.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.27.0.ebuild b/app-backup/btrbk/btrbk-0.27.0.ebuild index 370a76118129..a9edd2bb91d7 100644 --- a/app-backup/btrbk/btrbk-0.27.0.ebuild +++ b/app-backup/btrbk/btrbk-0.27.0.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="amd64 arm x86" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="amd64 arm x86" diff --git a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild b/app-backup/btrbk/btrbk-0.27.1-r1.ebuild index e0800b810e05..57a9fcb682a9 100644 --- a/app-backup/btrbk/btrbk-0.27.1-r1.ebuild +++ b/app-backup/btrbk/btrbk-0.27.1-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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.27.1.ebuild b/app-backup/btrbk/btrbk-0.27.1.ebuild index f364036c572c..5781a69d01fc 100644 --- a/app-backup/btrbk/btrbk-0.27.1.ebuild +++ b/app-backup/btrbk/btrbk-0.27.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.27.2.ebuild b/app-backup/btrbk/btrbk-0.27.2.ebuild index b651574dfd63..327ff48d7a8d 100644 --- a/app-backup/btrbk/btrbk-0.27.2.ebuild +++ b/app-backup/btrbk/btrbk-0.27.2.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.28.0.ebuild b/app-backup/btrbk/btrbk-0.28.0.ebuild index ffd2ecb0e6f7..c649cd367ac8 100644 --- a/app-backup/btrbk/btrbk-0.28.0.ebuild +++ b/app-backup/btrbk/btrbk-0.28.0.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.28.1.ebuild b/app-backup/btrbk/btrbk-0.28.1.ebuild index ffd2ecb0e6f7..c649cd367ac8 100644 --- a/app-backup/btrbk/btrbk-0.28.1.ebuild +++ b/app-backup/btrbk/btrbk-0.28.1.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.28.2.ebuild b/app-backup/btrbk/btrbk-0.28.2.ebuild index ffd2ecb0e6f7..c649cd367ac8 100644 --- a/app-backup/btrbk/btrbk-0.28.2.ebuild +++ b/app-backup/btrbk/btrbk-0.28.2.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.28.3.ebuild b/app-backup/btrbk/btrbk-0.28.3.ebuild index ffd2ecb0e6f7..c649cd367ac8 100644 --- a/app-backup/btrbk/btrbk-0.28.3.ebuild +++ b/app-backup/btrbk/btrbk-0.28.3.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.29.0.ebuild b/app-backup/btrbk/btrbk-0.29.0.ebuild index 7b91fc51e8b7..f82156e37d50 100644 --- a/app-backup/btrbk/btrbk-0.29.0.ebuild +++ b/app-backup/btrbk/btrbk-0.29.0.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild index ad1b3ac26548..73afd3da3703 100644 --- a/app-backup/btrbk/btrbk-0.29.1.ebuild +++ b/app-backup/btrbk/btrbk-0.29.1.ebuild @@ -9,10 +9,9 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes" diff --git a/app-backup/btrbk/btrbk-9999.ebuild b/app-backup/btrbk/btrbk-9999.ebuild index 7b91fc51e8b7..f82156e37d50 100644 --- a/app-backup/btrbk/btrbk-9999.ebuild +++ b/app-backup/btrbk/btrbk-9999.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 @@ -9,7 +9,6 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/digint/btrbk.git" inherit git-r3 SRC_URI="" - KEYWORDS="" else SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz" KEYWORDS="~amd64 ~arm ~x86" diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest index 69037a2aaa99..c33005d8cda9 100644 --- a/app-backup/duplicity/Manifest +++ b/app-backup/duplicity/Manifest @@ -1,5 +1,6 @@ AUX duplicity-0.8.09-fix-docs.patch 549 BLAKE2B 57e20c1f65918e548941ce56969a9a22620bb69577ca1c0168149f28203f0d1068fd6676ade5ef153069823070e033791b4a4e517e79a11d9b33a30f6444c174 SHA512 0ba8e5f02e5e873835ac418d312694ea6b699fc15a2b09828aaa0e2b75bb499d0b054799c619d1bd8bafc97e042eb12e6a64a3c0298158cbc7c2dcd30216f4a2 AUX duplicity-0.8.11.1596-fix-docs.patch 665 BLAKE2B f664af2867546957fafdf717b792ebc8e4d75fdd6451d7c252284107f8fcd4029d2815ffa21c622738226885e396b25a1f2485f44a15275e0a8b0b248ea27735 SHA512 4ce3d557c5ef3e32f9032cc10285b8059800b8d0f57e46ebcb0fc85a1da361b0475303ba94f8e4a25a70cb27b506de477d7657fbfe0b77d80646a3025bcd8bb2 +AUX duplicity-0.8.12.1612-fix-docs-cmd.patch 859 BLAKE2B fd3e94fcd2f408a3c81b0ab3b749956dae48e540b1c826d79ba411ed24729874a60757543539610b6aed99123f3a34dbfe432663f73824325da748410ff5a0dc SHA512 4d1c6101b93ae8ee8bd3ba3203ed4c149a13c7b41e4ce11a048d378bc0ad54b2e51b2a3d7ef93c9935e980545e68425f52582f9eddeec465095ee31f40dfee71 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 DIST duplicity-0.8.11.1596.tar.gz 1872223 BLAKE2B ad3ee2536731d1a6e8fb3fd87bb69b8ce8b43bb90688fe957cfb2718ad44f57db98c3aec4805356a7d44bea681f6ec9603aa082dbf86e58684fbe8000d1676b5 SHA512 67940d73d8213559ba88ec21e1326aca0dd065888cbf2e3c68f0f515ba9246100fd6e6d0bd1f12cb678702559f2266b7905931506d2ff6fe6fd35c673593479b @@ -7,5 +8,6 @@ DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d1786 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-r1.ebuild 1157 BLAKE2B a83a4638ded58e9efa48c726b2e718d24a0dffc69dfa372bce56818059f58230e4050490efe2d9eba17c0abfd686a8c6b8c69bedcd3108d35a7e07fea173ff36 SHA512 b4f7a04ba7d1e0f56b6b335fac26efbaa448fb53714c84df34595c7126c9b49acbfe28e44bdd2e6fe240827d307f1379ebe1e2fe78fb6dbe0bbf4fe412f39898 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.12.1612-r1.ebuild b/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild new file mode 100644 index 000000000000..9bbe98ffa27a --- /dev/null +++ b/app-backup/duplicity/duplicity-0.8.12.1612-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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/$(ver_cut 1-3)/+download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="s3 test" + +CDEPEND=" + net-libs/librsync + app-crypt/gnupg + 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" + +PATCHES=( + "${FILESDIR}/${P}-fix-docs-cmd.patch" +) + +python_test() { + esetup.py test +} + +pkg_postinst() { + elog "Duplicity has many optional dependencies to support various backends." + elog "Currently it's up to you to install them as necessary." +} diff --git a/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch new file mode 100644 index 000000000000..89cd583e6bff --- /dev/null +++ b/app-backup/duplicity/files/duplicity-0.8.12.1612-fix-docs-cmd.patch @@ -0,0 +1,29 @@ +--- duplicity-0.8.12.1612/setup.py 2020-05-07 12:07:21.571865871 -0400 ++++ duplicity-0.8.12.1612/setup.py 2020-05-07 12:08:29.617846122 -0400 +@@ -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': +@@ -265,7 +253,6 @@ + ], + test_suite=u"testing", + cmdclass={ +- u"build_scripts": BSCommand, + u"install": InstallCommand, + u"test": TestCommand, + }, diff --git a/app-backup/tsm/Manifest b/app-backup/tsm/Manifest index e8b13c7b82e3..97713c202acf 100644 --- a/app-backup/tsm/Manifest +++ b/app-backup/tsm/Manifest @@ -6,6 +6,6 @@ AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed6 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92 DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984 -EBUILD tsm-7.1.8.0.ebuild 7414 BLAKE2B a4c7bb803de17e972bb470d6fcf1c53e22eeb895b5a9a9cf5e759f11fb19a2349e1b81b191276eebe852eff695c8e21dee5f1b9d8f22d6ea8cb606ffe066d3b0 SHA512 d7cc0f7fd95822302dd76daec518eb2d68842777fcfee6d62b5870e8a5597da5633b84a8cb9f6a4dd3850d955c95f986b30485e4c9a17f89e90a9369bb1953d9 -EBUILD tsm-8.1.6.0.ebuild 7415 BLAKE2B beaed12de8c8a45d48bf900bdbd056001f874f3e1d549367f362fa37bf23a964d8b985c8f72af3046014de8e2b689df336c1a84175119a80ebf1674c5ccdc804 SHA512 3d07ea73af8d11d45dfc4191c474011ec618034ab6e578c65ec7fd78518b7afb12034252748d3621d5970f36c19eb2049584d92aab88bc68370ae6ef3f1dded4 +EBUILD tsm-7.1.8.0-r1.ebuild 7363 BLAKE2B 250828bb462c55293b3ec977b07d573bf92820231cdf7b52e6d4d3d090eeb943705597ee2865d96588a2740dfb25c6681ba7a311bcefa215089077106b718f83 SHA512 ebca5a44443ee1d1655364f53194dc9c745b0f9b99c2ac27b0f9ef6f2685d08c150a641cb0c3252f251b1abd3ad7c76c567d4ff9d5540c83dcef386ca75cf8ec +EBUILD tsm-8.1.6.0.ebuild 7428 BLAKE2B d9308e428ecee65a55bdbb473f37eefbf9f1e08e211f08e308534c951a83c5ba18cb75adb7026bcb7c8242bf46046569f7dc97753e9b0e55bc477e3376494753 SHA512 73500c52e5f8939c2821bbdce16e97ccddaef5ed6502e192be348d7203c98ae1eb2f92aed7a95a6f0b15538fcf28c903ca2d0d2bb209474ec39df0020024ee61 MISC metadata.xml 398 BLAKE2B fb4d250c3bf724349ac31d66b1c43e766d4ba9b001e88b47949c6fe188a629eb1b87321ef3391d2886e9b74daf235cff0139079fd6f72b7342119542438e30e6 SHA512 bd6ec11787dd6f2ff1a59e7e1027a01b80b22256530d35d6a2fb5b3398ee641b9c778f6a8c2555b7098a199bbb1eda1a5204be53509e5eb47399dbad83798547 diff --git a/app-backup/tsm/tsm-7.1.8.0.ebuild b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild index 7f08336f18a4..df5a6de943ef 100644 --- a/app-backup/tsm/tsm-7.1.8.0.ebuild +++ b/app-backup/tsm/tsm-7.1.8.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils +inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API" HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery" @@ -50,8 +50,11 @@ ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )" done unset lang -DEPEND="" +DEPEND=" + acct-group/tsm +" RDEPEND=" + acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 @@ -62,7 +65,6 @@ RDEPEND=" S="${WORKDIR}/bacli" pkg_setup() { - enewgroup tsm DOC_CONTENTS=" Note that you have to be root to be able to use the Tivoli Storage Manager client. The dsmtca trusted agent binary does not exist anymore. @@ -193,7 +195,6 @@ src_install() { echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE} echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE} - echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE} echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die insinto "/etc/revdep-rebuild" diff --git a/app-backup/tsm/tsm-8.1.6.0.ebuild b/app-backup/tsm/tsm-8.1.6.0.ebuild index e8319f4cd21b..e440a76deaaf 100644 --- a/app-backup/tsm/tsm-8.1.6.0.ebuild +++ b/app-backup/tsm/tsm-8.1.6.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils +inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API" HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery" @@ -50,8 +50,11 @@ ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )" done unset lang -DEPEND="" +DEPEND=" + acct-group/tsm +" RDEPEND=" + acct-group/tsm dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 @@ -62,7 +65,6 @@ RDEPEND=" S="${WORKDIR}/bacli" pkg_setup() { - enewgroup tsm DOC_CONTENTS=" Note that you have to be root to be able to use the Tivoli Storage Manager client. The dsmtca trusted agent binary does not exist anymore. diff --git a/app-backup/untangle-https-backup/Manifest b/app-backup/untangle-https-backup/Manifest index 341ea9628bc6..e306afe1f1b3 100644 --- a/app-backup/untangle-https-backup/Manifest +++ b/app-backup/untangle-https-backup/Manifest @@ -1,4 +1,3 @@ DIST untangle-https-backup-0.0.10.tar.gz 16377 BLAKE2B 1c6233383e3e986bb63177b5b9f47d57631f2128da822775e0daf8a8bf6fb175f7cd1518ef18d6db116d6a12b2c697fe40e145fe41d2c98a4e12eaf76760b92a SHA512 0bd13fb0b7133bfce1c582317b4e0904e976e07f943a2dedf5f03729baebb5cd8f9aa38cc30c55f953692ed88f358d08b693bc40e89c24e329af2f5167e9247c -EBUILD untangle-https-backup-0.0.10-r1.ebuild 598 BLAKE2B 4f9e7379f072d77210f636285e342c55fc732a453f6d1f91e73d13c8d3ecb63465b655a04c84a0c44e10b3032a01d0e91dd686aa5b8c456381c632834875e873 SHA512 e78fe268ff4641b6fa99177ead4eede639924216eea419320d7f10eb0eb41afa52671367c9339240bebdad2b038158852f5019410f73678bea6e0b31b90fb3bd -EBUILD untangle-https-backup-0.0.10.ebuild 571 BLAKE2B 0b4ff0cc69978b1f6c6969eddffe33e2a79e6f24988d0129a9964a67090bbd3572f75e91dfd7f9418fd3fd5fdb0ceb55f5353fe0bd8cdf43c1787b2388ab9323 SHA512 63ad5f7da4abd8386e7d168bdc7eaa626dfdb250bf151ac503f8d78057b6b6cfab61f45b13cd8fb91826ef5d7e13a45eac13bf283e22624d9305cc6970fbf268 +EBUILD untangle-https-backup-0.0.10-r1.ebuild 597 BLAKE2B 158b0a45a985e0b27091d7b762e3b09de138fc9fb61c589bb52058adb02415f60f98df6179393e4ba518b5b0455291d4041b900b43a9d72b65524b00286eb942 SHA512 4bdb23a31cb7037c3b5068669d3125440a859b99dbdd00da328164dcb24c6bea5ef1abe83c7d5adf8d22159473a101df3dcc6440080314f48a3197c1a9e26714 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742 diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild index 16ff114854ef..5f37599f5466 100644 --- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild +++ b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" src_install() { diff --git a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10.ebuild b/app-backup/untangle-https-backup/untangle-https-backup-0.0.10.ebuild deleted file mode 100644 index 4e304c461ec9..000000000000 --- a/app-backup/untangle-https-backup/untangle-https-backup-0.0.10.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ssl(+)" -inherit distutils-r1 - -DESCRIPTION="Back up Untangle configurations via the web admin UI" -HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml" -SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -src_install() { - distutils-r1_src_install - doman "doc/man8/${PN}.8" - dodoc "doc/${PN}.example.ini" -} |