summaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
Diffstat (limited to 'virtual')
-rw-r--r--virtual/cargo/Manifest1
-rw-r--r--virtual/cargo/cargo-1.38.0.ebuild17
-rw-r--r--virtual/libffi/Manifest4
-rw-r--r--virtual/libffi/libffi-3.3_rc0.ebuild4
-rw-r--r--virtual/rust/Manifest1
-rw-r--r--virtual/rust/rust-1.38.0.ebuild15
6 files changed, 42 insertions, 0 deletions
diff --git a/virtual/cargo/Manifest b/virtual/cargo/Manifest
index e5faf83c03d3..de5ef5e4df77 100644
--- a/virtual/cargo/Manifest
+++ b/virtual/cargo/Manifest
@@ -2,4 +2,5 @@ EBUILD cargo-1.34.2.ebuild 305 BLAKE2B 40efab792d11fc3359d03a1c05673f7a7b31d270d
EBUILD cargo-1.35.0.ebuild 306 BLAKE2B 8d84cd18f500d5507106c824119af4c6a60171d225190d3db7e35b807de7965fc53587380ef35c5ff89a3e5d07c3cd7cd2b54abdcf530598d7a0b63d0fa57e5d SHA512 0e27700dbfc5a3921934af8dc9d058c1d7eff0df2d1c35665606938e84e807c3983c4a3c61d7e253fb68ef45e04c3706bd229793d254d40057b9b3196b55d618
EBUILD cargo-1.36.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
EBUILD cargo-1.37.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
+EBUILD cargo-1.38.0.ebuild 307 BLAKE2B 022d840c705307aa791561f239d351deb368e0bbc050fc8d616bc5f13596fb09640f25e846a3562bab9300c6bf735f14795b5ebd421bcc8e5ba1fcf9b4ea303b SHA512 736642b466b5ebc8d87dbdef5096776acc1fb68c9f8b94b3518056a2b2e16307c28c9d1a35935ed48a71b4ab85b6e26ceacdabab1cf44e45bf917de8f3b94bda
MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/cargo/cargo-1.38.0.ebuild b/virtual/cargo/cargo-1.38.0.ebuild
new file mode 100644
index 000000000000..5e7370192922
--- /dev/null
+++ b/virtual/cargo/cargo-1.38.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Package manager for Rust"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="|| (
+ =dev-lang/rust-${PV}*
+ =dev-lang/rust-bin-${PV}*
+ )"
diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index d47b6d78b600..90612b7122df 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,5 +1,9 @@
EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8
EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df
+<<<<<<< HEAD
EBUILD libffi-3.3_rc0.ebuild 716 BLAKE2B 04cbe11690a0db5e5d857f06ba10e8d4cab169b5ab846eb52d3161ff6ce1ba6e94f38d8e2886374057988cf812731f3018d9d6e745f2b354464a04fe12c57430 SHA512 c955a86ea696f7da5920824e98fb83231395dae6258b0d05adfa421f56d3c057b68890fc0cb216fb23c0b8038a0b45b8f43898489342ad55ceee733b7b7f73fa
+=======
+EBUILD libffi-3.3_rc0.ebuild 714 BLAKE2B 32c0be2aded325b77a03faa04bf061322bc54a1a501f2c13048b0b5c1e80bdd70c65320067521d4077febed399a539644d8fddd3b1cbd781fe69ddb49bfbcfdc SHA512 e27dffbe1c3281de3aa44de04e9b57827d17572960facb0a963224e0ab24808f4d6de8c85d7753343b68b6811e02c2333df3bb8bf583f5bd30289ae5fc3f9459
+>>>>>>> next
MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/virtual/libffi/libffi-3.3_rc0.ebuild b/virtual/libffi/libffi-3.3_rc0.ebuild
index 318019a4b057..42ada5056389 100644
--- a/virtual/libffi/libffi-3.3_rc0.ebuild
+++ b/virtual/libffi/libffi-3.3_rc0.ebuild
@@ -10,6 +10,10 @@ inherit multilib-build
DESCRIPTION="A virtual for the Foreign Function Interface implementation"
SLOT="0/7" # SONAME=libffi.so.7
+<<<<<<< HEAD
KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+=======
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+>>>>>>> next
RDEPEND=">=dev-libs/libffi-3.3_rc0:0/7[${MULTILIB_USEDEP}]"
diff --git a/virtual/rust/Manifest b/virtual/rust/Manifest
index 8dc4efde7982..628747a6f425 100644
--- a/virtual/rust/Manifest
+++ b/virtual/rust/Manifest
@@ -2,4 +2,5 @@ EBUILD rust-1.34.2.ebuild 318 BLAKE2B 484372f5834a46bc23531352da32675c0e08079b33
EBUILD rust-1.35.0.ebuild 319 BLAKE2B e89cbce85745bbeac3ac5ef4b944de4e4799aef0f1ffa647f05bdcd1b6f6a3dd25ecb7ceee86537f396c44fcf7823a63996d1939fb3ae4a172effa092431f660 SHA512 80d33e755c9a597264680b2f6f9642ce0de57af355c93cd17df317edfd17b437aea45b33e0a60f0f4bc5387eb1300ea00ba9b65b260b8e4823654dcd4515cd64
EBUILD rust-1.36.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
EBUILD rust-1.37.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
+EBUILD rust-1.38.0.ebuild 320 BLAKE2B b1e807e0cbc7c4fda2e9ad8597c5d83009193cec9f130493998d0c5e3b267b342fe7d188ec7a5fa63b323916c40154f1273e9447b30f4dbc4385a58f271387e3 SHA512 9bed0818497d426fb37b2643cb4d876f1f918eaf7bfb90a2e17b11e276c4b06704dbc393590b2d1adf163b7110e9fb3f27e87ff325aaa34e08327c787f5d4b08
MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/virtual/rust/rust-1.38.0.ebuild b/virtual/rust/rust-1.38.0.ebuild
new file mode 100644
index 000000000000..75f822399482
--- /dev/null
+++ b/virtual/rust/rust-1.38.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Rust language compiler"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND=""
+RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"