Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

7 files changed, 18 insertions, 18 deletions

diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 42c85f9ec89c..12ab0c200197 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -4,11 +4,11 @@ DIST grive-0.5.1_pre20160114.tar.gz 162888 BLAKE2B 49c163625c8c7fff33e66f823ff4f
 DIST grive-0.5.1_pre20160706.tar.gz 163646 BLAKE2B 04a9352c33fe713dbbc2b5f9381b0982a6cc3b9e3f5ef6dd36ccec25878e317ed8bb214e449ff0161962cba1318dc4641187ae605844c749bcfcc164f5afc2d5 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52
 DIST grive-0.5.1_pre20161004.tar.gz 163085 BLAKE2B a9f450a4e32f3299922f5e26456370f7f3fd8e4922d7dba5d58e6076ed8bfc0152427510d33c58d90ab2427b534b4f4fbbf913061fac937f2c8af1e0b2367c40 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
-EBUILD grive-0.4.0_pre20150905-r1.ebuild 757 BLAKE2B 6cde3a7107cb87b4f83bbef9cdfdfe0ef4b546d702d8bb090c01351e4e7945df1e0922fe3dcdc1eac24ec787049c65312f964d19b920190cb862a1fd1fa238f2 SHA512 04405f22f6fd0974e06911f807cb9b2d07f026cdca49efbdae6f382507a802a665da8e7892fb0b0d51120849bf55e3e28ccb1046a4234a2e4a7c0dda4da1ef91
-EBUILD grive-0.4.0_pre20150905.ebuild 730 BLAKE2B a8d2d3bb89eab9fc25b183ff795f42820071094d154d2b2166525db8442b9f360185ee718db995fbe4d891fcd617da31b4268442bf388fe795c4018944e145a2 SHA512 56614f95a73bbaa3fbd9e16eba3d0acc06a9afeda7c8b30501183c5fd44fbf1b16c7ba6236fc4f580bfdae8da182f55e2d50b1d95b0374a4626b7401a1c9e3a3
-EBUILD grive-0.4.0_pre20151011.ebuild 757 BLAKE2B 0dc7861261e2226f53b16d4733a6e8e7ba2dce39348a826519d6c1b33ab5ead0f5b75cab2974f31e202f79c83276e3f00a391ab7cae9022bc5d6bad4e05dd25d SHA512 9c82af5c69d2e668e7a00b9142d867ae32dba67de5f300acaf649ffd6662fd3707c08cad579feb111c997f7d87a0af41d39f73998aebdcc43ae3cc351ace8d52
-EBUILD grive-0.5.1_pre20160114.ebuild 757 BLAKE2B 845a649df6946c8cb6f5df6b8d56a8567cb1ff5e0571bf62445ad338b5594c44eaa7a9efcfdc99efc047d950e866257d1a2e103ec67cd7cd32b9e0cab19e9272 SHA512 6df633cbbf8619c06bdfac65865ef8a1f210cfa38de358cae55d2920ce7bb48821976cfaf04f080a280916d52e55f214e76f378c292a02c50bb40ed06a2780ce
-EBUILD grive-0.5.1_pre20160706.ebuild 813 BLAKE2B c929879692b6d64a9ba94a86328e13177fcf9832f7964d848c1889fc0c19b18807c35e8b054b3d614918e4017031ec2bed9beca70dc633e7660d6790b1c56acb SHA512 be0fcedbe5843d13a696024822b1ae0b54d7c1e0779f66f366ea7700b5cead43a97feb7e31c5ad7773319cde1a9d513e7b7e2398a10857b680393042f7fe14f9
-EBUILD grive-0.5.1_pre20161004.ebuild 813 BLAKE2B ae45cdb3667199e44e7daf883011849549ab5970f2c70901bb7280d9161cb8bcb36cf08e65853cf0352253ee861e56ac0e722dedfbb481dbd48cd7c00c21aeb2 SHA512 e6dc360c9891f239b5e51db71b16079989f9300a961b43f8d897f01ce8024523a5ff32785a643694ca85b6b6b31ef724851b97c211a1566d39ea410572499f49
+EBUILD grive-0.4.0_pre20150905-r1.ebuild 756 BLAKE2B fc81fb971c8db7e61400c782e0ee6cd88be6061df059892133f225e8bdd7c1a127eae0b2d96f4cb950deb1a9711567308a793770d272e274c3d3428f541f3274 SHA512 42f1338b6ff0290c6f2c3ff2c415790dbef5200edfdf11e349a1a4113375c1a59aa270a22d86c449c6fecccf5ca2b066557c733b418816a79ec3a78e59ba34d6
+EBUILD grive-0.4.0_pre20150905.ebuild 729 BLAKE2B 136dd90da79b8aed26bfd0d02cfd5946ca6036b05be1fbe1c6cdecb805ae8bca5fc76e29279fd8aa956ef92fcb90e18deef0789c92fe4de2fe8216aed904ea75 SHA512 2bb48709a5ef707789bb8ee82eb146c467b11569b55fb420ee5fb6bb1227e306ad8a443c8ba69065e6e645d81b7457d61cf1ba4d0f8c7b55965db962a095854f
+EBUILD grive-0.4.0_pre20151011.ebuild 756 BLAKE2B 8b230e348ff9b312579d947e87e0d3ee961e5886283c92cc6ac066658706fad4ca84b92edd1e0ca053fb1a6fdb8001240eb51f8b0603491bd30b2eb2229b7b23 SHA512 e5a8a365d6df018fb8d17b86becf6a00816518a81ead442148d49b6f937b3fac96f9dc5865846dba788b662f104142278312f88e4e4be72084700150451223ab
+EBUILD grive-0.5.1_pre20160114.ebuild 756 BLAKE2B 153f8c6993eb041c53ad54bc1aee77418b6855953014592f5d2a6d58d108bf4ef687e575409d432d5b2b4b0acdba619e7eefd9e36615ce62ceb5191fbf3886ca SHA512 93784b777dfbd9614856b9ead55cedf7dc3ef216cdf6533a22b82b9b9e28d634a173f33482a929e42c303d13e1390c9468007110a5dc7aa5c51dd30308a396c6
+EBUILD grive-0.5.1_pre20160706.ebuild 812 BLAKE2B 032fab05b513ed69625ef23be2eee0a086fe7ba452cf3fdf512c9a734b880bf60c7cb7174c03aa555e77a3a03c161603ffdc632d8f5133f8d9769d8563328bb8 SHA512 c352c56b885251e3e7d0243ebfa23dd5945dd57b010e277c595f9ac93657cde1ccddcc3cddabf9356433cedc47b47b861906133fea3a3b5985c8d6125cffd161
+EBUILD grive-0.5.1_pre20161004.ebuild 812 BLAKE2B 2c277402936d52ae18951526ca66760acfd834795e026cc64bb4a9c5d00d08cef4bbc716759839f5cc5407b1cced4c017523b8e36423c405ca3961cc7e0d12db SHA512 7b0dab16186ed93f95dfedf9f9ab04aef9bb0a259843e178fc8d83f47f8cbae0d45fa98d246cd39394a4612ce9a47b7e6e53de5cef31209d67feb144eb1496cf
 EBUILD grive-0.5.1_pre20171005.ebuild 813 BLAKE2B 9de64618d8ca394c204334c603befa1b74338d61247c16820c21af0685cfd8ed8439942d857c7e878c404a3fbb55594cfb8effcb7f4cf1bd97f388ee3e9140a3 SHA512 8efff2dace77362f70f1c5c1ff9d51ac23da448301bca844b670183982f733c599a2ff9e1f09f2f0be0f86894e8458f3efa05c9e49a1843031153cde8e01bb7d
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
index a371012753c7..3aa16d50332e 100644
--- a/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20150905-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
diff --git a/net-misc/grive/grive-0.4.0_pre20150905.ebuild b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
index 0c2271c2d939..941ca8119a87 100644
--- a/net-misc/grive/grive-0.4.0_pre20150905.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20150905.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="5dc7028c8aebb26d35ed31c4b07ac180cc1887c9"
diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
index 53516923c8b6..1546398dab75 100644
--- a/net-misc/grive/grive-0.4.0_pre20151011.ebuild
+++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251"
diff --git a/net-misc/grive/grive-0.5.1_pre20160114.ebuild b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
index c60351f4ddab..9e85ba1529d6 100644
--- a/net-misc/grive/grive-0.5.1_pre20160114.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20160114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="cfb8ff08b300d1fa57e12cdc85f724e3e25c906d"
diff --git a/net-misc/grive/grive-0.5.1_pre20160706.ebuild b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
index 7e7ac90236b5..bd19981b730b 100644
--- a/net-misc/grive/grive-0.5.1_pre20160706.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20160706.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="457d84974592ed3f123622b12f2a7a748cbc0668"
diff --git a/net-misc/grive/grive-0.5.1_pre20161004.ebuild b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
index 76c1a3633a94..5990f75e9ceb 100644
--- a/net-misc/grive/grive-0.5.1_pre20161004.ebuild
+++ b/net-misc/grive/grive-0.5.1_pre20161004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit cmake-utils
 
 if [[ ${PV} = *9999 ]]; then
+	inherit git-2
 	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
-	inherit git-r3
 else
 	inherit vcs-snapshot
 	COMMIT="7bbb01c3014cc996ec24a7e5c0684f24b604b735"