gentoo resync : 06.12.2017

5 files changed, 11 insertions, 10 deletions

diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 7b916ca58c8c..85159516d9ad 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index dcb7c2a4a905..0141edf09357 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -5,7 +5,7 @@ AUX 2.00-qa-chappa-115.patch 1312 BLAKE2B a73fe10eeeac3dd651ebd6ce72a1321d73da2f
 AUX 2.00-qa.patch 409 BLAKE2B 2d74c9835079a8b62721f58d21c10071b69d9c3821ad5ecaa5397b791ba4ded5a68e08f2da23088a27654cc4a63c8b59631a297e139c8ddb98624e6bcfbeb049 SHA512 4c9107fe2db7688f925054b31748fc10db5c445fda5177babbee2fe543c834658f4b65ea3b4e18259acb809755bf4fa2408f47ee379d6006554ee7556b334a26
 DIST alpine-2.00-chappa-115-all.patch.gz 212705 SHA256 1503ae09b6a4a74828e3472c4987b48a310f817e7fd93ca385724660aa234d7f SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7 WHIRLPOOL d9fef2fb0a07acfb8ba4e5bedbc0140a09020967e52b16853907db47b1a7e35286022c2a03b1670fe377015393d22b27bfa9f12780de05bac1f3458a81f75527
 DIST alpine-2.00.tar.bz2 5222673 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 WHIRLPOOL 6c1fed63e826c12c6e39e8f79e2b33f3b85545e54c32fdbe918636086c0aaaa26073883946061a6b52df50af711b7d6bb6647a177f051afccccdbd0cf473bbc3
-DIST alpine-2.21.tar.xz 4720856 SHA256 6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438 SHA512 a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 WHIRLPOOL 54113ac1516e9f185ff4ed2841624145ec72514a8ce1d45c2907a8e5ad6b6e79ea6780d22d15a19053a69ae97cc2ef630ff8579ffe746a8b715d81a7db59a6d1
+DIST alpine-2.21.1.tar.gz 7490699 BLAKE2B f3aeafb55697701f6edda43659c9d27c7d7dab74f8e332e867f354ce555c26037f4b642af80f18db249dd7269f80bd880bc315ba4ae08ae7f63abc7998cea073 SHA512 78b47bd9e9dfc652bc407fe736d8b7526625782c332803cf01e5214a2b0a5af21736b8a2e685348913f6e2b10c80dced12081202294e9c61e3168b3a2b9657b7
 EBUILD alpine-2.00-r7.ebuild 2693 BLAKE2B 2b732fc0ac017b4a66888b92ad64d28e83007718f5d8d7e806def8f069e700bbc187ba19b0743a72de00b2698f91c7117011d2bedce31c797315fdeaf1caba8f SHA512 5135df89b3afe2df2af18a0f30908150065bc783431444b48ea19e9671ca4c52a409dd6977b47e5e8a6d60bd9a770693c0cc554ba2eccfc8cb1ae72820f2c574
-EBUILD alpine-2.21.ebuild 1959 BLAKE2B 9739d10931263e7b9ef69fd816266af92a2385ac37d8a5d2a62ed5dedd6b93cfb97c7e84c6136835f255953d03b5f99b00ed1b30e169110c958f6250f277342a SHA512 f8b0ec50d51254333ec54bab727dafb1c863859431100884b00c30a8bc574b94043996f39cd858afe32a97d8b2822e038d76c312866ac23cb3b8b2087b5f6c84
+EBUILD alpine-2.21.1.ebuild 2012 BLAKE2B 530d3f39b794defe7b004216c38e1407e6f6008618c50b3c643a05c0a7c7928bd01a82782b7f2ef0b42be76dda340bb8bc6c72c963992dc7028aa4f9cbbc1abe SHA512 c910a60644168ba872d2e6e31297f14c6a4628b9bb3b531d9eeabf0ba60d851b8ccb61ae0a025e12c2bcc0bfa512bb58b86a73b93e5e491a8a3632f5ceb383f8
 MISC metadata.xml 845 BLAKE2B 1a7529f7bbcb5464d3ea41f8fe9afdacf8ebe099a0cd109f8e4826a4538d7f2025477b0a817eff7e4c02096ad0d2083155e589ef143ef3fd7661909504ea97b8 SHA512 bd16db341dbade41763360c32ebf2d4a33111eb3b41ce43e2619c1fb184d15e9351d518316a603517e28a293f8de22308d6a6aa5f1b0c82adcb67837a3bd5773
diff --git a/mail-client/alpine/alpine-2.21.ebuild b/mail-client/alpine/alpine-2.21.1.ebuild
index 889913b3b1f8..e9150d277470 100644
--- a/mail-client/alpine/alpine-2.21.ebuild
+++ b/mail-client/alpine/alpine-2.21.1.ebuild
@@ -2,11 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs vcs-snapshot
 
 DESCRIPTION="alpine is an easy to use text-based based mail and news client"
-HOMEPAGE="http://www.washington.edu/alpine/ http://alpine.freeiz.com/alpine/ http://repo.or.cz/alpine.git/"
-SRC_URI="http://alpine.freeiz.com/alpine/release/src/${P}.tar.xz"
+HOMEPAGE="http://www.washington.edu/alpine/ http://repo.or.cz/alpine.git/"
+GIT_COMMIT="672d6838a9babf2faeb9f79267525a4ab9d20b14"
+SRC_URI="http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -62,13 +63,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 AR=$(tc-getAR)
+	emake AR=$(tc-getAR)
 }
 
 src_install() {
 	if use onlyalpine ; then
 		dobin alpine/alpine
-		doman doc/alpine.1
+		doman doc/man1/alpine.1
 	else
 		emake DESTDIR="${D}" install
 		doman doc/man1/*.1
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 94892527a921..13b7e2797492 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -4,10 +4,10 @@ DIST roundcubemail-1.2.6-complete.tar.gz 3893031 SHA256 2f5c674f41fb2c842b3e4d5d
 DIST roundcubemail-1.2.7-complete.tar.gz 3904612 SHA256 6dd7f117d1a9509a382edb9e04e52f26ff7eb19b52aa4bb6646cfb2fadde682d SHA512 545b3fe05ecfaede3d887ae71e41fc91aaaae280c71b67db9a5dcb516b5b238371327c2b1fabe87cf073cce38bc5a57b3db2592eb96d436bae280896c1f7017c WHIRLPOOL 0c43ae93034148bb87affa58d5d78115697805259f5da8a2f3ce5f29031fbef61286d8235526feef30f660145c4e3c3800209191a8647c3924a99cb0dfd19d10
 DIST roundcubemail-1.3.0.tar.gz 3104348 SHA256 a37e55a3b5f83420930ae20ef3ac6dbedb499c920bbcf3fc93a8f784f7773d21 SHA512 f3ab39cc3eec9bbcaf3d8f5d9004b0da92fe5d35b71687acc234fab5772abb92d970855716288cba10c8609532d42ddc6e791a1f7bca13de555174a37deca9c4 WHIRLPOOL a2fb856fa060a3e904cc528b73474fa64ebe4af1de6f1b2bb1c82f426143bf762d380f121902cea60ff7d00d73058786b7bb4f27ddd6f00cf798b15a0e8e8d38
 DIST roundcubemail-1.3.1-complete.tar.gz 5296647 SHA256 f071bbe84f90ba55582289dcef7b70198b81e0aedd4de8422945658bbee3da0b SHA512 79722d1213b6855af37dea4c2522eba12ded4ed430b5d96f5ba9eb851bbfbe68c406b0c5410e21e2721dfe2cf42fdc2fa825161a229f785921ebdc89221ab232 WHIRLPOOL 7df4ff8ba3e39ce217e4fea8c932707bb98dea68c7aa0a504efe56345d32afa369fcbb57fe053520cfad62a8090309113e8e4e8c2f49ff883a66cf31e0bdfd41
-DIST roundcubemail-1.3.3-complete.tar.gz 5339032 SHA256 05d9856c966c0d93accabf724e7ff2fd493bba1a57c44247ed0a2aacd617c879 SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931 WHIRLPOOL c1a75b4e90afe34a18e789f6b5ca9e0af056bd0a48fc093135c0ff028594541cfdcb167b3c0c7ef05880e39f9fa5cd45575e39aa542e707a95f951076183c42a
+DIST roundcubemail-1.3.3-complete.tar.gz 5339032 BLAKE2B bb0b595ba13947db3b0644ad5bc76fa8280ac74733e3bf02a758ffaa49fb0c2ef80005081fb1f24500fa767b57d0df59751abb098a807bc6e04b5a63de3fc1ed SHA512 1f634fbc5d0967f28a7aa990a9b23f105b93030d43927237fc9b5decabe1b959de75c7c21bdb27389ec53730378565e7f309d7c009be427c7615372634273931
 EBUILD roundcube-1.2.5.ebuild 2287 BLAKE2B 544ec8419520b61f5fbcf90b8baaf091addbbc1aaef9552b6839578650065b6dbe42909fba5ad8a9fa824cc08202298be763759d1ce29d82f66d9a6b8feba145 SHA512 466f244cb0ca5331d2efbb2405a62ccec2d72500863abaf84885f5aa9d0b1f3ee827158cb029d2e9c34f9ffac0e4d962064401a07f1337f7d056c488eeaead19
 EBUILD roundcube-1.2.6.ebuild 2291 BLAKE2B 9ad13708e037c46abfe6e80a94537341b3ed34b1ba5eace570e6e457922639b4c39ff298f3dea7393f471dc6e7206179c0862db907681cbdc7c8e6bd23786164 SHA512 075bceea29886deebaf479a5d483d2848d9defbefab82a27d7241db644b19fda5576676fb91fc6cfec01e5f8a2c802accf9cebe5884f69643bc48695e2401fa7
-EBUILD roundcube-1.2.7.ebuild 2289 BLAKE2B 1223fdf27671646b6cd4498855007da4dbf29d20083e590c429ef5cf0dfa2ca1e80fece1961f0ee380db58e85b1e715809a650ce3d640d509bd8bc8a978ec1f3 SHA512 c08b32b40bac1debbb4696e26ecb48dac734ab62166a6db3b01d86f53155b53a934e64f2f77cdb6c76a7c9b043f0d2f4a56aa85953bfa04e5c5fed66a81396a0
+EBUILD roundcube-1.2.7.ebuild 2288 BLAKE2B ef3b09f4a0d1c163d9c14602b6a727c30832424bc7e877750c1af38648aa92b752a43c40a7e3d437261ca63dc5507703e5803b5d018f515657e167de171a1f5f SHA512 4bdc130b46067ff1b2cbc5d19a8c4498e096b2b3a0958c204d5823007e36d8e63d0c68f595e175b8c705c789daf507d6219ea7e08e1c3561e4150a63181cd0d9
 EBUILD roundcube-1.3.0.ebuild 2600 BLAKE2B c24e85bbb04b08214a5e9caaa2981af20d706938a52e255aabb1cba10880ae692ebbd8c1628c15e6fb89a0995131cd37cabd2ce028ab9d1c5bdf7fd32e7478db SHA512 093d8b9632f499a9ab6cb6492abd8934f96c2f5ca7c5f141d143463b89c0cec441e5b36f808bce2e4cbef8f847463768cc75cfee3837b61d590ac3dda9ed16ca
 EBUILD roundcube-1.3.1.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
 EBUILD roundcube-1.3.3.ebuild 2386 BLAKE2B e52d50b4f7e5e2b2b7461c95ea16394d35c2990882de1282c0bed5923755b8cd72a39a3e8d3b1bcf7ecf5895359c9b79a1b441db5814d69f0a6661f926cfe28a SHA512 83e1bcfac15cf0b3e50f504c2b09fe1da309b0fea2227250c8b47248c5101b0242cdbf1bd62ac141e28e48e58dffcb16cb496e0c3feb818868498fe6bc7c5e9e
diff --git a/mail-client/roundcube/roundcube-1.2.7.ebuild b/mail-client/roundcube/roundcube-1.2.7.ebuild
index 6c759eb12b2c..049722d096bd 100644
--- a/mail-client/roundcube/roundcube-1.2.7.ebuild
+++ b/mail-client/roundcube/roundcube-1.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${PV}/${MY_P}-compl
 # roundcube is GPL-licensed, the rest of the licenses here are
 # for bundled PEAR components, googiespell and utf8.class.php
 LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-KEYWORDS="~amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 
 IUSE="enigma ldap managesieve mysql postgres sqlite ssl spell"
 REQUIRED_USE="|| ( mysql postgres sqlite )"