diff options
Diffstat (limited to 'dev-libs/aws-c-event-stream')
| -rw-r--r-- | dev-libs/aws-c-event-stream/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest index 03cf92de0495..ae58822175df 100644 --- a/dev-libs/aws-c-event-stream/Manifest +++ b/dev-libs/aws-c-event-stream/Manifest @@ -1,8 +1,4 @@ AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9 -<<<<<<< HEAD -EBUILD aws-c-event-stream-0.1.3.ebuild 622 BLAKE2B 4c109ef9a79998f5d8e56402b6fd1ecc67cef7a724b64c4e1c0964d0757737afc85043e53d28a08a8ce5b7568cb835e2edd695763859659ef76f74f885486ec9 SHA512 561e3d02bf6799f095c3d21d52e58a42ad7b4c53fe4717b39da1839d78a37efee491596d3382150ad0c55e4325c99e220e09ac6f8c86e6aa731198ea73b7d49e -======= EBUILD aws-c-event-stream-0.1.3.ebuild 649 BLAKE2B 6180176ac83ab02e6ae800686b8445b2439ed8499b95eb68fbfa8ca876f5423f57fb90da039810fe3a2a16be00a006a8ecdc6a387d4e29ca0327dcf96ebef796 SHA512 c54ba3465d9220d7f163e7c3140426f38e2583b558d45b6669661c350c0610aa2af5d45bbcdfa67fd4e78a653067555ebbf9662cc897f9c6b827d0e267394c95 ->>>>>>> next MISC metadata.xml 360 BLAKE2B c3adf10e8868a7699a1c7798e4221cff255e9505062692d7db7b733e9d5cf7b568183a294c9e0e7b125e9a6c0d848d370a43ed6cd32e498eab4adfe1c46e7abb SHA512 571bbdb2968c5b6f49dcf41e7706775f2bab9302eef8795f9ccbd51922436161af01b17857370bc49960cb1f40a670ca759ff76381e92f7cd18ee51b9361f10e diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild index dd367d2e10ac..b45aa6f30db9 100644 --- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild +++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild @@ -15,14 +15,10 @@ KEYWORDS="~amd64 ~x86" IUSE="test" -<<<<<<< HEAD -DEPEND="dev-libs/aws-c-common" -======= DEPEND=" dev-libs/aws-c-common dev-libs/aws-checksums " ->>>>>>> next PATCHES=( "${FILESDIR}"/${PV}-add_missing_cmake_install_prefix.patch |