From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- net-mail/vpopmail/Manifest | 2 +- net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-) (limited to 'net-mail/vpopmail') diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index d45a8cac22ec..68d8d4a407da 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -12,6 +12,6 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab -EBUILD vpopmail-5.4.33-r4.ebuild 7487 BLAKE2B 4c2c98e8045f81509a0f9bb1545dacd3faa13ff3babd339fc13669bd204266be2d3e0ded6a59996660f04aacfcc4469b33cae11f3cafa092ec4a157ef74cf6eb SHA512 b7fa9a8ebda554f1fb07c83100252594093877589173f22291fb1936e32768457d4326ab11f7ca84456e09082e54217e05635d6e66105bf87b2d82398c437a3f +EBUILD vpopmail-5.4.33-r4.ebuild 7613 BLAKE2B c2da7499b508a2a9896b1ec31435b095bda6984e2d2232ee472a24c0f623fff5b36b915e2cbd8dbf14bea2c0f64266e78db54be7d423a2c0ba4eaf2e160c8925 SHA512 87f8a7ad3b266148a87dfed4a432a422469e97deb97e43aacee6bfd6e2beb9229fe40b59322d78ed099b8a45dcd9c2ce79229c3649e404b9518115040eda99ef EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465 diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild index 3cbfe467136a..fc5ea8ec4219 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild @@ -217,14 +217,16 @@ pkg_postrm() { } upgradewarning() { - ewarn - ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" - ewarn "The internal structure of the mail storage has changed for" - ewarn "consistancy with the rest of Gentoo! Please review and utilize the " - ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh" - ewarn "to upgrade your system! (It can do conversions both ways)." - ewarn "You should be able to run it right away without any changes." - ewarn + if has_version "<=net-mail/vpopmail-5.2.1-r8"; then + ewarn + ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" + ewarn "The internal structure of the mail storage has changed for" + ewarn "consistancy with the rest of Gentoo! Please review and utilize the " + ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh" + ewarn "to upgrade your system! (It can do conversions both ways)." + ewarn "You should be able to run it right away without any changes." + ewarn + fi elog elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider" @@ -232,10 +234,12 @@ upgradewarning() { elog if use mysql; then - elog - elog "If you are upgrading from 5.4.17 or older, you have to fix your" - elog "MySQL tables, please see the UPGRADE file in the documentation!" - elog + if has_version "<=net-mail/vpopmail-5.4.17"; then + elog + elog "If you are upgrading from 5.4.17 or older, you have to fix your" + elog "MySQL tables, please see the UPGRADE file in the documentation!" + elog + fi fi ewarn -- cgit v1.2.3