summaryrefslogtreecommitdiff
path: root/dev-libs
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/Manifest.gzbin89433 -> 89402 bytes
-rw-r--r--dev-libs/aws-c-event-stream/Manifest4
-rw-r--r--dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild4
-rw-r--r--dev-libs/efl/Manifest5
-rw-r--r--dev-libs/efl/efl-1.22.5.ebuild1
-rw-r--r--dev-libs/expat/Manifest4
-rw-r--r--dev-libs/expat/expat-2.2.8.ebuild4
-rw-r--r--dev-libs/libffi/Manifest4
-rw-r--r--dev-libs/libffi/libffi-3.3_rc0.ebuild4
-rw-r--r--dev-libs/libvterm/Manifest9
-rw-r--r--dev-libs/libvterm/libvterm-0.1.ebuild42
-rw-r--r--dev-libs/libvterm/metadata.xml3
-rw-r--r--dev-libs/libxmlb/Manifest3
-rw-r--r--dev-libs/nspr/Manifest4
-rw-r--r--dev-libs/nspr/nspr-4.22.ebuild4
-rw-r--r--dev-libs/nss/Manifest4
-rw-r--r--dev-libs/nss/nss-3.46.ebuild4
-rw-r--r--dev-libs/rlottie/Manifest4
-rw-r--r--dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild4
19 files changed, 110 insertions, 1 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2e6e9369f6fb..f2b824cbd602 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index ae58822175df..03cf92de0495 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,8 @@
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 b45aa6f30db9..dd367d2e10ac 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,10 +15,14 @@ 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
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index fa8aa782fb12..09c3fe5ed709 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,10 @@
DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
DIST efl-1.22.5.tar.xz 71358856 BLAKE2B d1b9c8263608bca61760adb129eb5ad3d507caaa2d4e03847d9c06c99494d6dcaa0756368f700fde64d15dd33147a1f58f5391164902c1f9f586ef7307b14510 SHA512 87d10ab244778fc8452ea85cbf698a6b0ccd065964941f7c04d073cf7db9632b09d7956d86bd5c4e9fa102efceb1057269322e84504c70ee5f740176cd4bb26f
+<<<<<<< HEAD
+EBUILD efl-1.22.2.ebuild 6877 BLAKE2B 5569c1e68c66b5bf103f71e526eadd1ea58ead7e37d2cfa367a557bbfbfa3e0764a81338ee8f046a988984540c0a875b79097f62661fe567dfea7df7fb723cb6 SHA512 c1bb384fc318c85a7cefe6cd68c0f776f7319ff80c98389907e373f1880c00c1ce1f50befe097c207c227da87978e19c5031b590e0773ea395395f7c5a271369
+EBUILD efl-1.22.5.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f
+=======
EBUILD efl-1.22.2.ebuild 6917 BLAKE2B e72f02cdd98c2b951dc29df62c53d2b4d964466a7e77e0612503649c2176bfb7c462e4f9442ad71337b008e143e04e199401573996b06dce37e26ac3640834b5 SHA512 85f8cf01985e23021383937b402097f9f4c2439398c3b4bab96ef031a620bdc8af54e2f3bc8bb87dda1e94b204a5f48c6d6738d73c5238e718bb1ee82e20b172
EBUILD efl-1.22.5.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759
+>>>>>>> next
MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4
diff --git a/dev-libs/efl/efl-1.22.5.ebuild b/dev-libs/efl/efl-1.22.5.ebuild
index 5af4a6a9437b..2da0160a9808 100644
--- a/dev-libs/efl/efl-1.22.5.ebuild
+++ b/dev-libs/efl/efl-1.22.5.ebuild
@@ -121,7 +121,6 @@ RDEPEND="
x11-libs/libXrender
virtual/opengl
)
- wayland? ( x11-libs/libxkbcommon[X] )
)
xine? ( media-libs/xine-lib )
xpm? ( x11-libs/libXpm )
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 77f068c49612..8583c829f980 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,5 +3,9 @@ DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab
DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
EBUILD expat-2.2.6.ebuild 2496 BLAKE2B 62a7621cad6cd7f5fab49320a6ad0221a5813495378da71e56c745f773b8aae512e1c6c543ac732ae1305a52c8330cbc68aea6b1284c40597fd9d7b58ae96911 SHA512 e72be5b7ef4176b6717858b7a0fee719cf924baa4c320c68425270e0d827bc9ef3d5bea5b466a8a01c854ea347e7b11e69b4216d28ed2b70f69db57921d316dd
EBUILD expat-2.2.7.ebuild 2514 BLAKE2B 5e143de91fff2676a2162b1da379bb0f2931e5d16558cb0799af7cd171e6459bedf5865c12e318b3f50a9f65486e6a1d907c20c72f6247cc21869e92dea46ec7 SHA512 c80e08e274a162b0b220dc099c50ee6aadfb4b183f941cfe1787bd2d8fa2b0c06ef11ad469c5b8076c46bab20f671a906490a542c397f3681919b8887cc14b4e
+<<<<<<< HEAD
+EBUILD expat-2.2.8.ebuild 2534 BLAKE2B 381e377ccd7bc672c0ec6047021530e88a87f4aa6eec39b32fc2287f85c4988b37f85149ca18b3b870b0800e1f147e796c10b077a18380d0c5535a89afb957f9 SHA512 410b5404dc17d7908f1026cff5bd189be35d926bcb6d0dda16c0e7f82a747ac53d714e293b58dd1abb44c8cb0ab1d55277fdd3afde23439ddf543539b15f90e6
+=======
EBUILD expat-2.2.8.ebuild 2533 BLAKE2B 8d333d67242445f8f7646a0f3dd3d5cfb416fb8a49fe7c950bcfe6e2e05f6a0c92f474c44c1f0e245efa89cac19d5bac372a2523adf50fcb1fa189887107b4dc SHA512 25b73400be33b37c86544a11dab59e5cacb692a2b36d1c07d4f47008ea758b7e8f6d3826e90468517c6cd20a6d3b925cf00d2691a3cc829faa5c8f3c940cb5df
+>>>>>>> next
MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
index ec0b4ffe159e..beab95c6e5e3 100644
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ b/dev-libs/expat/expat-2.2.8.ebuild
@@ -11,7 +11,11 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
LICENSE="MIT"
SLOT="0"
+<<<<<<< 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 ~x86-winnt"
+=======
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 ~x86-winnt"
+>>>>>>> next
IUSE="elibc_FreeBSD examples static-libs unicode"
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 9a2dcf911dfd..430dace65eb6 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -14,5 +14,9 @@ EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c
EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
EBUILD libffi-3.2.1-r3.ebuild 2380 BLAKE2B bfad9eae814e06536a2d6bedc8d746fb57d0746a4324fe6ed6474c7cec772b0b5e52cab4889a022489cbb3dc3a6dc368086462f8cde048ad0abfe102d2a05021 SHA512 03f7403c11b9b5395ff6ca0b57639a5c5a897372af9e9e638dd8d902dc35afdb5bb4615cc8408820853e79097d9350ea6794cfdd809e219418a4f675c2df4707
EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
+<<<<<<< HEAD
+EBUILD libffi-3.3_rc0.ebuild 2108 BLAKE2B a56dfde1ab20a6e7c327db771abb78ccd67d43710b3cc347ce0fe42fbbb1cd2d014cefac6afe8a29894111f819c639907d7388c025072af3b563e7d4ae53d410 SHA512 23cf7b84ee253a8e86125f51f6ee6ab2c63c9120526a139b486f665a50cdacc9c674a3894972278835ff63b2a522d58b156d594aeecea645241501c089fbecca
+=======
EBUILD libffi-3.3_rc0.ebuild 2106 BLAKE2B 116e6e9d949b4103862727966ec48a18c002e3b676803cd99f4c3776915f520cfa1ed07903b5a039a497afbec90bdd6b580b028c95c0bdc2a64b9fa361a8b500 SHA512 8d88a86081c88caa9fd938560a84c2d29c27155be261517c0dc0e787d9886360145086bd3c8d16d9c7f5b2e5929aaf27ba92403cadb9ae3bf08bea6d966cd495
+>>>>>>> next
MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index d8ea7270da3a..a9cdaa09a785 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,7 +13,11 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
LICENSE="MIT"
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
IUSE="debug pax_kernel static-libs test"
RDEPEND=""
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 07144af3a2b5..5552b7511623 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,5 +1,14 @@
DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
+<<<<<<< HEAD
+DIST libvterm-0.1.tar.gz 69960 BLAKE2B 27849727b8fec8b807c151a035286f3f4ee0464995271771da190b270a4b6c4d4258f5635e4a14418d6ff3fae981f30d2c9bdeb5c7b3f0ca74eed3a99642e354 SHA512 35317b6998764336edca6a4a011714f87853996a43dbd907d9a73013d9169f9ff39fbeaa405fd0504830b302518ead1f9b6c00fdfc46ae8f7e51cff1a5464dc7
+EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644
+EBUILD libvterm-0.0_pre20171004.ebuild 765 BLAKE2B 36262c4dd36157dccd571bf3218573fb802a04e71061676b8f8aec4238bfbd54950e555e234cb5f100461ee196befc584c69b9d5b705a4c8740f109047380e2c SHA512 d6fa75efa138639ade62b6d3ec37e0e1d6a36e8ac5273e7a4c0f12cb4bd29feae154b637c5559e5e5fd7088f2358a2d76e8d2b3c871d2495022568b9d25c7146
+EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
+EBUILD libvterm-0.1.ebuild 938 BLAKE2B 3871580b8a9784efab338f07096629d772e9c61d8d090846566894880852969441cad50813803ddfe7f47d0e6bebefad754646b98d62fa6391157a7a4e8d7d3a SHA512 b06bdb65695c90d54778b8875f8c46e89c18feea2fcadc09adf76d5bf826af249839d5db6cd4457b4b2e095be346dcd71caa982f4f2e70c1233902b14541f228
+MISC metadata.xml 361 BLAKE2B 136d9b4f9d9a69c7bbd32343e71208ba7a128e33038899b9369ed5440935f8d171589aef9902e15260cde2d989c8dc3d9eb11432e7383e33cab83d79eefa41c7 SHA512 cc0e766d31c2b6ca0eb1816403d0d73d187986ffb40c0b9d677d9f40037d3f0e6cba5f08401eea8929cb5affed0b3f1c99cf0a6f8aa026e7b339665327483c9d
+=======
DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
+>>>>>>> next
diff --git a/dev-libs/libvterm/libvterm-0.1.ebuild b/dev-libs/libvterm/libvterm-0.1.ebuild
new file mode 100644
index 000000000000..7109c9ce4426
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://launchpad.net/${PN}/trunk/v${PV}/+download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+BDEPEND="
+ dev-lang/perl
+ sys-devel/libtool
+ virtual/pkgconfig
+"
+DEPEND=""
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_prepare() {
+ default
+ # Remove broken test
+ rm "t/63screen_resize.test" || die
+}
+
+src_compile() {
+ append-cflags -fPIC
+ emake VERBOSE=1 PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake \
+ VERBOSE=1 \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" install
+ find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+}
diff --git a/dev-libs/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
index 119029816579..e6fc33367084 100644
--- a/dev-libs/libvterm/metadata.xml
+++ b/dev-libs/libvterm/metadata.xml
@@ -6,10 +6,13 @@
<name>Bernardo Meurer</name>
</maintainer>
<maintainer type="project">
+<<<<<<< HEAD
+=======
<email>proxy-maint@gentoo.org</email>
<name>Gentoo Proxy Maintainers Project</name>
</maintainer>
<maintainer type="project">
+>>>>>>> next
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index b410815859e5..3fee8dee0640 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -4,6 +4,9 @@ DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f
DIST libxmlb-0.1.8.tar.gz 85945 BLAKE2B 4d17aaf4e5ed3001a4db24e7ca220cba3fc14ee446b127b65b545fab997c7c31835b57b0dd9d23da74200d774e3986558e7618789f42d1e95c0734fa5bb6e098 SHA512 4109f171da4622429d18afdb9ae183a64f89e0b92df285efae5736017970f877a92391876969c20894184c6d5df96390ccd46be1d1087882a5461476c39e433a
EBUILD libxmlb-0.1.10.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
EBUILD libxmlb-0.1.11.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f
+<<<<<<< HEAD
+=======
EBUILD libxmlb-0.1.12.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f
+>>>>>>> next
EBUILD libxmlb-0.1.8.ebuild 901 BLAKE2B 62fa0a3128f0f46cf26ca2ad705f18bc528c9646db2021518ad62616b31a1103fec0fe4d71916c96751b630e392b34b7c70d1626d333f06f747f8ca3a3d2150d SHA512 533a364552f01625add7cf7cecfbf839c7aac8e93d6096ab94f2d3ca847cc6ed5cd15cf777c5ec9ce876c2016df33b1bf18733be67e39e05a8fa4596489adb51
MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 2fd110638e0a..d89379995b7c 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -10,5 +10,9 @@ DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cad
DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
+<<<<<<< HEAD
+EBUILD nspr-4.22.ebuild 3888 BLAKE2B 995a072499af5e0b947f4a8ee3e28af65359f666981e5b2ff242922a3511d6818786c6272ba54776102f4b2c0c404ba7a0c6d060ff56d9ceac7308d2f8d93c39 SHA512 94bf0bb6ff18f339bbeb8e130b5d135bab539fe0c2586b0e68e346d14fe8cd883d097444211922291a4f0d72a86eb4f9c4c23f304a63d76be6925d77172c4ce4
+=======
EBUILD nspr-4.22.ebuild 3887 BLAKE2B b437b0b5870026275731224ddd2e1af368caf48deb4cec30467f3232e6b91267e439121dd54423b5c424ec5427898842006258ad84d589bfad79e5d623f17b84 SHA512 2613310f6e3fb741468297a884d3ade0da92c33b092100695dca5f3b80ad3de6ff5441881f50924cff6af87cc750034ecf6e731d18b2ba4ff58c84d9356c25fd
+>>>>>>> next
MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index a2dcc1d15a8d..a76257f19ee2 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.ebuild
@@ -13,7 +13,11 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
+<<<<<<< HEAD
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+=======
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+>>>>>>> next
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index e3340e8d422e..2b9863c39fe6 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,5 +10,9 @@ DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a941944
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
EBUILD nss-3.40.1-r1.ebuild 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
+<<<<<<< HEAD
+EBUILD nss-3.46.ebuild 9479 BLAKE2B 1a97bcd13b5876f8f2e1856831a303107728ffa54383ef5e8dd83b754cd3e4d0a8ad4aa3318e83d73b97212c7ab58cbe80d6fd99c3c6a96c866ba5facc7a696c SHA512 7b7df99a2897afae6f0860bf8a33598ed46bddfba7ef9cddbf7ac5913a59612af99e80212cb41e30651aa86a50a0c5f07cbafa259e496ed0fdfc099c56133da6
+=======
EBUILD nss-3.46.ebuild 9478 BLAKE2B ce357178071d9b93eb2e9838ff8870332bdc4790b1f016d5b54ff6b4df62e2293f5fb5a866f61df1e70f7847bc4dcea3b3767b868801908daed4b4d324e462a1 SHA512 53689f8bc455f6256302a8941813bf7ef4e6e7d8b8cb27aff1df19b55cbefc461706eca7e97f1a56ce7701a0d760064cc821e73b32b609fab1f050b72d65d6c4
+>>>>>>> next
MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
index 83757c5a353c..82194713c45e 100644
--- a/dev-libs/nss/nss-3.46.ebuild
+++ b/dev-libs/nss/nss-3.46.ebuild
@@ -19,7 +19,11 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
+<<<<<<< HEAD
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+=======
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+>>>>>>> next
IUSE="cacert +nss-pem utils"
CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/rlottie/Manifest b/dev-libs/rlottie/Manifest
index 38b43422dc4b..af0834de785b 100644
--- a/dev-libs/rlottie/Manifest
+++ b/dev-libs/rlottie/Manifest
@@ -1,3 +1,7 @@
DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed
+<<<<<<< HEAD
+EBUILD rlottie-0.0.1_pre20190920.ebuild 770 BLAKE2B 7d5f3d0524d229d83c8d235c07fb3b075936cdb5358a4690645de10ecdfb9cf646c39ed3a4a1ca2bde1c794ec6f765f44305a903833beee931165afbc021706d SHA512 e20d113e017d1eff974438a21da357a2d3ac04e01b527f3b14f7f8a2e27ece11126c02282e6a88ed7d20d20beedeb33418652bdd78c24b5f8bfd5f7fe0f6c423
+=======
EBUILD rlottie-0.0.1_pre20190920.ebuild 787 BLAKE2B 9c04e9b288dd3d812847bcd7b199fd8bb914e282c198011896eaf1736fc387b3b6736f0cf45d95d87b1a2644340a4c4171b345388fd3d4fbc630e2d6928ca04f SHA512 cdd841c441cfd93432323195515adfdcb79ed6945400e76ccbadbbab9ff456058d47dcacbda3a33091a5af84556cf36011efd974d87d4615643563365c3b71a1
+>>>>>>> next
MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
index db0b6fcd2236..e7c6b6951e12 100644
--- a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
+++ b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
@@ -13,7 +13,11 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.
LICENSE="BSD FTL LGPL-2.1 MIT"
SLOT="0"
+<<<<<<< HEAD
+KEYWORDS="~amd64 ~x86"
+=======
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+>>>>>>> next
IUSE="test"
RESTRICT="!test? ( test )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 12:08:14 +0000