diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-15 21:44:55 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2017-08-15 21:48:45 +0100 |
commit | 2ff41903de4585810d809022e7529d21bf0555c1 (patch) | |
tree | 57ba2843c8384d8d37f459175519f1db46ce286a /dev-libs | |
parent | Purge old, fix install paths adhocutil (diff) | |
download | portage-2ff41903de4585810d809022e7529d21bf0555c1.tar.bz2 portage-2ff41903de4585810d809022e7529d21bf0555c1.tar.xz portage-2ff41903de4585810d809022e7529d21bf0555c1.zip |
Purge old, fix install paths icetray, bump for log flush fix
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/icetray/Manifest | 16 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.1.ebuild | 42 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.2.ebuild | 42 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.3.ebuild | 42 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.4.ebuild | 42 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.5.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.6.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.7.1.ebuild | 6 | ||||
-rw-r--r-- | dev-libs/icetray/icetray-0.1.7.2.ebuild | 38 |
9 files changed, 51 insertions, 193 deletions
diff --git a/dev-libs/icetray/Manifest b/dev-libs/icetray/Manifest index c248e5e..bfe17d3 100644 --- a/dev-libs/icetray/Manifest +++ b/dev-libs/icetray/Manifest @@ -1,14 +1,8 @@ -DIST icetray-0.1.1.tar.bz2 6292 SHA256 5cf43526c79d8487fe72da8bcbff7723fe614feeaf7a1ca356f257db5b7925d6 SHA512 efab7458aa56158bcf13d657b2b1a1d52acf0e06cbd714251a1d13181e1e028356bdf1eda4808f621d4f90b74185874d9876e80a1af0b56e360335fa3cc3e3b5 WHIRLPOOL 3c95ccdb80ce981555abe776a72ab2fabe2653df2d292a81753edd9f558296a74553b388c7a251f14ee5c1053186b2814dad7d54f531567c2090dc771c973bf2 -DIST icetray-0.1.2.tar.bz2 6398 SHA256 cdd0d99753b63c164b7ca47aa1ec36f51dc3ad0de97d7689c40310bfdb59c730 SHA512 fd7c8684d0508615a83ce824d238d51dbb6601d1cc6179f9440ed28e23f3080f1643233b686e03ad3dcfa5418e139d6cb7e7112fb809e771bd4804235a6a85cc WHIRLPOOL 6c29cb90b589238bd3d9b5bcbc8de64f769f20bdf837c3826aea5f2ef5caa017e3260f8bde656a4dc7bba8ee931a22ea47a5c38bd9a4156454527f4628afa467 -DIST icetray-0.1.3.tar.bz2 7592 SHA256 e63a1795c5d237087cee7b3eaf4f7a7aa9fd7333d62b123f246971c6cc96a7f4 SHA512 54ea199f728c6ff8a2fc9a4be4dd2552dc117e4c67c126df2ef54b985d8983c8dc73179718be2933335527754c393c895400edbf07141411a4940df463086fac WHIRLPOOL de9a6a1c9d3364dbc3deea3becbdc726923c0d8a4ef9c3fc97450ea6d64a5e2a42496fc0a8fde356b13173e8e42f30dbaaaf73155c04fa7986b8073576f293fc -DIST icetray-0.1.4.tar.xz 8048 SHA256 341e5e0ad528d96924b0ca7c70a440ddc79de404e9c0835a5eeeb59bdc947406 SHA512 b1179a67d291783eb0c45dc7a73ad3f6195dc39d06e9aabd5dff30666b4a901cd5dddbeb5254d3276e11645c0a30a010ec919ca78477adeed27188a333473cde WHIRLPOOL a9a42b10964025bc02c269f7298aa767d848664f6f47cc10bf1a691532c34bbcbeb66d3bdf29f6aa87c6317ca6254b54f4b2f953e229d765c4a1a4ae5aa9e391 DIST icetray-0.1.5.tar.xz 11704 SHA256 c0e4651f094084afc8361cb813edc9c8ee64a0c08e21a2e1d29ad4bca86b7525 SHA512 382f236f691244efa299e2579b429ca83a010080211992359ba993cc4cfc481aa47a9da4230509c46f60e577eaf0a79ee5a97c33334933500268d84beb89b6da WHIRLPOOL 1a9e1566e466705f0ee95030dd04f0afec4e8914ee982b8494b53a9e6311d9daa0c469996c2a401a6e06558fab38ec1437457fc2ea8e380f16159191871fb649 DIST icetray-0.1.6.tar.xz 14144 SHA256 be525075e10b93afcc1932ca0640fbbc731bfeda2ec3c8595a5f9c872b05f1b5 SHA512 185d62dff1752d92d634f29f94290070f603fedd113ce1719d6a49f9b57ac1b7413ed19d3c2901d72a73e41662c2579a850c551644b6982f33a5444a7598d1b0 WHIRLPOOL 9031f9c40724f03a9f9cfec386019936d9c888ff49780e0421ab6ab022468ea2ba6fb1c7e57f6b4dc8c26671309911bb2c74962036728f2969110895458236dc DIST icetray-0.1.7.1.tar.xz 15080 SHA256 ff56f81276953d70e00db874616f55f9eeb6dbdccfbac7061e0b51eed595546d SHA512 436c582335dda390c097c789972d6fda29ffc2875b24dfbeed685b507c2914984b8ea69e65a37a8b5f89612feaaeeeff6fde37a9e11b0a6993f709d1c73968e0 WHIRLPOOL 0c1eeb0833bbdc139a9abece0ebab3ed804246357917ef7acb28472735e26b5a4318890561dc752b832476441afb910350ce8324d6e4ddbe791076c75912cf05 -EBUILD icetray-0.1.1.ebuild 1038 SHA256 7526fc1631a3cad34f601307d34a0619eeb723631c1750a1e801afad1289d5f5 SHA512 6b8ced4b862d7fa723628449ae8344360153863a019f14aa2c20bbcc7d22d0850bb092c8a73c0d672ad495a77cb45935983436432e92ce861fe5396f7b4b1ef5 WHIRLPOOL b7fb38f0c329feda410585fe1fe890901a67fd1d3a82ea92761a6f2fbe8fd65af5f3d39e2f9aea25725cc8d3c4c4be8fc154e841b3b0125f5ae669c0a673539f -EBUILD icetray-0.1.2.ebuild 1044 SHA256 42cc1dd2f2c06983ca221cdacd776dfe96916275f4ba1396660796a830a156f7 SHA512 6f20e46de678da9d617beeda95fcbb7575f14e741d82974c3b6cebeb6c11ea06d284fa281bf7c77764d1b90100a5ebdd10aea4c8a6b3949eab015156cda4d8fe WHIRLPOOL 24557b5e6a3f5cf3f570243d68281705cc6a7893391a838d44657a5bf4cca9d50bbf32ac7590bd741413e300ea1881f29b877a541eb3bc3fd6899c34a6198b92 -EBUILD icetray-0.1.3.ebuild 1046 SHA256 cc698a42fadaa9337ef05cde8bea101a282a925bd53b60424c4fee7e888830d3 SHA512 a79f766f5f2bd050d789a118727143a93b6f4d5ebe50e281dd4dded991f3bc14df2074ce96c76077da5002f84f63264d8d4bee23ff088ff3565001c311f0572f WHIRLPOOL be5f1892be36e121352810173847c9063015a596ff3791dfcce729ee477bbf042e27a149508329484ff23de185a819f2b871fb480ed89441ba0d04ca38338b66 -EBUILD icetray-0.1.4.ebuild 1056 SHA256 863ac904b2a72997c6a7fc2f93adf0b08d1eca40976163c5480b702167b32394 SHA512 1cab74d99b3bb3a271b5bdec2eb89bc28aa64c59d8a57320129a5f6695257ccbf3cafb30b1fb7753a2e0696a0be78c667de694e8fcce196f858d8d60be80559e WHIRLPOOL 41777e4f403afbf40e3735454b111b450df2cb7394678b7e3b36c8762dddbd1d0ce9afcc7ea644ebf85f04456114ab87ab03be5e97efa7058c4b1a6fbad44492 -EBUILD icetray-0.1.5.ebuild 843 SHA256 68378558305b45345cf7b27d59f7834e39080ccc3076e1df4ddd240e054640b5 SHA512 a6f65916e86db38599487ebe40ab23a34c5caabb59bd33c6e871cb686024e7a08d2b9cd74e8acbd34f00f9a79a37dbdabf46b6fd7208782b6486b9c0325c4b9b WHIRLPOOL 919c91d5686a2bc78d68c7d1bbbf54b318f107211c8984c0e0cfbaca518e073485de8a1c698a8dbba14c2ed6588c3c9171e88aa473af8b19fb2318a8681ce8ac -EBUILD icetray-0.1.6.ebuild 863 SHA256 cfd0dccfd138a2d2b4ae918f168422598717fa0296a41e0f08bb761317cec356 SHA512 4d0d455c551a99f4ca6668e5250f08964de625bdeeb8a6545385484d3cdfc1f150612eccc13247a1849230b9d12275fdf9164501d8b0d8044a73667221102d93 WHIRLPOOL 4124a4ed9f8fc162ad998a145eb4130c6215f12abd709a7d4c0f82d50c978bc164149ac0ceeefc7b7f36ca881dc2ce735b0f867f83cc7fe35707c9e2bb32980b -EBUILD icetray-0.1.7.1.ebuild 849 SHA256 451d488a032953088292d36a3310b5cb1e6476b3c458440e00864f12513df2cd SHA512 e3ad8f162dfea2d06912cb63de7322054dfd818901677b120adc305190cb488e3e7c4f2a2b74f98f3f6e6c1e89a2a7096b3704b361b19d7296ac7d8706204964 WHIRLPOOL 094d28e6f1fa0dbcdbf7c010e47beb57d1ed34df055ab63311d2070be11e7bec1fb3147f28ef4b6b20e177763d6c75ab394d5340ab4f44dc586d9bf525cad11a +DIST icetray-0.1.7.2.tar.xz 15088 SHA256 73fe902a04380214a318dad0a4a07617af47fb63af8e7e5183827d76553ce1b5 SHA512 457bf845779fe22aa0aaf462a6beee0205e22e8373c90a90c5391585c5a701bb182f222ac6a1cfe1569f7749f9c275cadc7fbb218aff1ce8c056f6655d20ba06 WHIRLPOOL f1500146d6632de0724365b2a935abc7e9fe5d28a8198b752d7b1ea36a1930e98c213e31141648f18e64772a1b7e0e948216f13b2bdc3e8a97ce66699d1eb493 +EBUILD icetray-0.1.5.ebuild 767 SHA256 1eeeae4a7dd62dda802c7f23a3745917e84715ca30f072ac9c9a5cc73389dbe2 SHA512 74ab74f6fa35b03f9f9431ac9b6a529e1fe79a8b6af81eb858443711fd0276a8d1da326d02be9a1dd9ef183fcbeebd415a99bdc8ca2bc644d9222b71823df726 WHIRLPOOL 8b2c818cfe6130cacc27be078b3bfac909eecb41527266cd1217a62b617dab7d55a89eab15cfe17e0b2ea969cfd7e955c093b06a1e1e3a3ae4c55cb86bb31db8 +EBUILD icetray-0.1.6.ebuild 787 SHA256 9a32e603bbc2219195b30086b1f0d50d73b902b431106f8ec8acab689809c9be SHA512 07e3072194f67ed34019e4254a66bfc6607804f745b5ae4093f1bacbd5e19cec5f393c9993012eccc3502eaa6fbffe2ab6c561259aacdcdc5b16720516a230c7 WHIRLPOOL a60299b0d22a8c918e91515c9f091476f0db64b9667d0c8ef568d0729572d959745fdbf55293f916b927d9679aec7ef8fbf45544cc6003dfaf750a3d9b748414 +EBUILD icetray-0.1.7.1.ebuild 787 SHA256 9a32e603bbc2219195b30086b1f0d50d73b902b431106f8ec8acab689809c9be SHA512 07e3072194f67ed34019e4254a66bfc6607804f745b5ae4093f1bacbd5e19cec5f393c9993012eccc3502eaa6fbffe2ab6c561259aacdcdc5b16720516a230c7 WHIRLPOOL a60299b0d22a8c918e91515c9f091476f0db64b9667d0c8ef568d0729572d959745fdbf55293f916b927d9679aec7ef8fbf45544cc6003dfaf750a3d9b748414 +EBUILD icetray-0.1.7.2.ebuild 787 SHA256 9a32e603bbc2219195b30086b1f0d50d73b902b431106f8ec8acab689809c9be SHA512 07e3072194f67ed34019e4254a66bfc6607804f745b5ae4093f1bacbd5e19cec5f393c9993012eccc3502eaa6fbffe2ab6c561259aacdcdc5b16720516a230c7 WHIRLPOOL a60299b0d22a8c918e91515c9f091476f0db64b9667d0c8ef568d0729572d959745fdbf55293f916b927d9679aec7ef8fbf45544cc6003dfaf750a3d9b748414 diff --git a/dev-libs/icetray/icetray-0.1.1.ebuild b/dev-libs/icetray/icetray-0.1.1.ebuild deleted file mode 100644 index 0ca2771..0000000 --- a/dev-libs/icetray/icetray-0.1.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -EAPI=5 - -DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services" -HOMEPAGE="http://icetray.randomdan.homeip.net/" -SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2" - -LICENSE="GPL" -SLOT="0/b8" -KEYWORDS="~amd64 ~x86" -IUSE="ut tools" - -RDEPEND=" - dev-libs/boost - dev-libs/Ice - dev-libs/libdbpp:= - >=dev-libs/libadhocutil-0.3.3:= - dev-cpp/slicer:=[db] - tools? ( dev-util/boost-build ) -" -DEPEND=" - ${RDEPEND} - dev-util/boost-build -" - -src_prepare() { - sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam -} - -src_compile() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray $(use ut && echo dryice) -q || die -} - -src_install() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray//install-main \ - $(use tools && echo tool//install-tools) -q \ - $(use ut && echo dryice//install-dryice) -q \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die -} - diff --git a/dev-libs/icetray/icetray-0.1.2.ebuild b/dev-libs/icetray/icetray-0.1.2.ebuild deleted file mode 100644 index b64f401..0000000 --- a/dev-libs/icetray/icetray-0.1.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -EAPI=5 - -DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services" -HOMEPAGE="http://icetray.randomdan.homeip.net/" -SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2" - -LICENSE="GPL" -SLOT="0/b8" -KEYWORDS="~amd64 ~x86" -IUSE="ut tools" - -RDEPEND=" - dev-libs/boost - dev-libs/Ice - >=dev-libs/libdbpp-1.1:= - >=dev-libs/libadhocutil-0.3.3:= - dev-cpp/slicer:=[db] - tools? ( dev-util/boost-build ) -" -DEPEND=" - ${RDEPEND} - dev-util/boost-build -" - -src_prepare() { - sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam -} - -src_compile() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray $(use ut && echo dryice) -q || die -} - -src_install() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray//install-main \ - $(use tools && echo tool//install-tools) -q \ - $(use ut && echo dryice//install-dryice) -q \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die -} - diff --git a/dev-libs/icetray/icetray-0.1.3.ebuild b/dev-libs/icetray/icetray-0.1.3.ebuild deleted file mode 100644 index 4031c75..0000000 --- a/dev-libs/icetray/icetray-0.1.3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -EAPI=5 - -DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services" -HOMEPAGE="http://icetray.randomdan.homeip.net/" -SRC_URI="http://releases.randomdan.homeip.net/git/${P}.tar.bz2" - -LICENSE="GPL" -SLOT="0/b8" -KEYWORDS="~amd64 ~x86" -IUSE="ut tools" - -RDEPEND=" - dev-libs/boost - dev-libs/Ice - >=dev-libs/libdbpp-1.1.2:= - >=dev-libs/libadhocutil-0.3.3:= - dev-cpp/slicer:=[db] - tools? ( dev-util/boost-build ) -" -DEPEND=" - ${RDEPEND} - dev-util/boost-build -" - -src_prepare() { - sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam -} - -src_compile() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray $(use ut && echo dryice) -q || die -} - -src_install() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray//install-main \ - $(use tools && echo tool//install-tools) -q \ - $(use ut && echo dryice//install-dryice) -q \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die -} - diff --git a/dev-libs/icetray/icetray-0.1.4.ebuild b/dev-libs/icetray/icetray-0.1.4.ebuild deleted file mode 100644 index 0afbaf2..0000000 --- a/dev-libs/icetray/icetray-0.1.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -EAPI=5 - -DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services" -HOMEPAGE="http://icetray.randomdan.homeip.net/" -SRC_URI="http://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz" - -LICENSE="GPL" -SLOT="0/b8" -KEYWORDS="~amd64 ~x86" -IUSE="ut tools" - -RDEPEND=" - dev-libs/boost - dev-libs/Ice - >=dev-libs/libdbpp-1.1.2:= - >=dev-libs/libadhocutil-0.3.3:= - dev-cpp/slicer:=[db] - tools? ( dev-util/boost-build ) -" -DEPEND=" - ${RDEPEND} - dev-util/boost-build -" - -src_prepare() { - sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam -} - -src_compile() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray $(use ut && echo dryice) -q || die -} - -src_install() { - cd ${S}/icetray || die - setarch $(uname -m) -RL bjam ${BJAMOPTS} variant=release icetray//install-main \ - $(use tools && echo tool//install-tools) -q \ - $(use ut && echo dryice//install-dryice) -q \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die -} - diff --git a/dev-libs/icetray/icetray-0.1.5.ebuild b/dev-libs/icetray/icetray-0.1.5.ebuild index cd4739b..6468b15 100644 --- a/dev-libs/icetray/icetray-0.1.5.ebuild +++ b/dev-libs/icetray/icetray-0.1.5.ebuild @@ -25,14 +25,12 @@ DEPEND=" " src_compile() { - bjambuild icetray/icetray icetray/tool $(use ut && echo icetray/dryice) -q || die + bjambuild icetray/icetray icetray/tool $(use ut && echo icetray/dryice) -q } src_install() { - bjambuild icetray/icetray//install-main \ + bjaminstall icetray/icetray//install-main \ $(use tools && echo icetray/tool//install-tools) -q \ - $(use ut && echo icetray/dryice//install-dryice) -q \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die + $(use ut && echo icetray/dryice//install-dryice) -q } diff --git a/dev-libs/icetray/icetray-0.1.6.ebuild b/dev-libs/icetray/icetray-0.1.6.ebuild index 52d9dd8..37e4820 100644 --- a/dev-libs/icetray/icetray-0.1.6.ebuild +++ b/dev-libs/icetray/icetray-0.1.6.ebuild @@ -27,14 +27,12 @@ DEPEND=" src_compile() { bjambuild icetray/icetray \ $(use tools && echo icetray/tool) \ - $(use ut && echo icetray/dryice) || die + $(use ut && echo icetray/dryice) } src_install() { - bjambuild icetray/icetray//install-main \ + bjaminstall icetray/icetray//install-main \ $(use tools && echo icetray/tool//install-tools) \ - $(use ut && echo icetray/dryice//install-dryice) \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray || die + $(use ut && echo icetray/dryice//install-dryice) } diff --git a/dev-libs/icetray/icetray-0.1.7.1.ebuild b/dev-libs/icetray/icetray-0.1.7.1.ebuild index 022f8a2..37e4820 100644 --- a/dev-libs/icetray/icetray-0.1.7.1.ebuild +++ b/dev-libs/icetray/icetray-0.1.7.1.ebuild @@ -31,10 +31,8 @@ src_compile() { } src_install() { - bjambuild icetray/icetray//install-main \ + bjaminstall icetray/icetray//install-main \ $(use tools && echo icetray/tool//install-tools) \ - $(use ut && echo icetray/dryice//install-dryice) \ - --prefix=${D}/usr \ - --includedir=${D}/usr/include/icetray + $(use ut && echo icetray/dryice//install-dryice) } diff --git a/dev-libs/icetray/icetray-0.1.7.2.ebuild b/dev-libs/icetray/icetray-0.1.7.2.ebuild new file mode 100644 index 0000000..37e4820 --- /dev/null +++ b/dev-libs/icetray/icetray-0.1.7.2.ebuild @@ -0,0 +1,38 @@ +EAPI=5 + +inherit bjam + +DESCRIPTION="IceTray and DryIce for bootstrapping and dry running IceBox services" +HOMEPAGE="http://icetray.randomdan.homeip.net/" +SRC_URI="http://git.randomdan.homeip.net/repo/${PN}/snapshot/${P}.tar.xz" + +LICENSE="GPL" +SLOT="0/b9" +KEYWORDS="~amd64 ~x86" +IUSE="ut tools" + +RDEPEND=" + dev-libs/boost + dev-libs/Ice + >=dev-libs/libdbpp-1.1.2:= + >=dev-libs/libadhocutil-0.3.3:= + dev-cpp/slicer:=[db] + tools? ( dev-util/boost-build ) +" +DEPEND=" + ${RDEPEND} + dev-util/boost-build +" + +src_compile() { + bjambuild icetray/icetray \ + $(use tools && echo icetray/tool) \ + $(use ut && echo icetray/dryice) +} + +src_install() { + bjaminstall icetray/icetray//install-main \ + $(use tools && echo icetray/tool//install-tools) \ + $(use ut && echo icetray/dryice//install-dryice) +} + |