diff options
Diffstat (limited to 'dev-libs/icetray')
| -rw-r--r-- | dev-libs/icetray/Manifest | 16 | ||||
| -rw-r--r-- | dev-libs/icetray/icetray-0.1.5.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/icetray/icetray-0.1.6.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/icetray/icetray-0.1.7.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/icetray/icetray-0.1.7.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/icetray/icetray-0.1.7.3.ebuild | 2 |
6 files changed, 10 insertions, 16 deletions
diff --git a/dev-libs/icetray/Manifest b/dev-libs/icetray/Manifest index 827b05f..03da4a9 100644 --- a/dev-libs/icetray/Manifest +++ b/dev-libs/icetray/Manifest @@ -2,15 +2,9 @@ DIST icetray-0.1.5.tar.xz 11704 BLAKE2B 171b246712952544edb964c89937fc7480c01d57 DIST icetray-0.1.6.tar.xz 14144 BLAKE2B c62cde11d1540fef5eca2f92e35fa678fda2596dd4e4469d734cc45249dfd5bf2f801d850f68a0f96f0f1baee0cb19645251e74cecbb68dad879f535cc59cd34 SHA512 185d62dff1752d92d634f29f94290070f603fedd113ce1719d6a49f9b57ac1b7413ed19d3c2901d72a73e41662c2579a850c551644b6982f33a5444a7598d1b0 DIST icetray-0.1.7.1.tar.xz 15080 BLAKE2B 1c6c8e2bfbb916b5daa8f46f4045fa2811276228a578048f785b96a94ce4eb86ed670eab20313a2d66982f5d633a4913a04701f0d1218d7fcd26b3f093906a38 SHA512 436c582335dda390c097c789972d6fda29ffc2875b24dfbeed685b507c2914984b8ea69e65a37a8b5f89612feaaeeeff6fde37a9e11b0a6993f709d1c73968e0 DIST icetray-0.1.7.2.tar.xz 15088 BLAKE2B dea0b92be6711905d2b727523b3d8f4ec3982babad95e1fa70989235cfb562d87c13df163b33fb300f039c6698943d9c721dd2f916c4b0fade8d9760d4143f75 SHA512 457bf845779fe22aa0aaf462a6beee0205e22e8373c90a90c5391585c5a701bb182f222ac6a1cfe1569f7749f9c275cadc7fbb218aff1ce8c056f6655d20ba06 -<<<<<<< Updated upstream -======= DIST icetray-0.1.7.3.tar.xz 15088 BLAKE2B b9d0afcad34b775408e93784036c00c076c82672fb37bdeadda65f79d1ba249361fac28b24aa001537d11e69378a348e6ecbb6719c75cd98cf693c0fcce2904d SHA512 da1264c3e1d85b39d36310366b893e299c339ca897639b759e36d78efab6e68dfe1455b7cd9493432673927660094ebf0d79a881b097f4e6cf039344aa15b889 ->>>>>>> Stashed changes -EBUILD icetray-0.1.5.ebuild 768 BLAKE2B 5875a9e6c0f5036eb5c9c2532006f18d1b2ee0c64e7983cc54b1e737cd74a63da4e276489e3107dad421e667ff00998b3dfc9001a2ad53ca3ad837eb3a0b36cd SHA512 a7ef4c044ab40f65e2286189e214ee8cac8fa0c76ac0bd3d46bcac34c713e45a40d65e3ad9f1ce9f759a20e3293f7012715b652211776e2daebcc09004a0bd1e -EBUILD icetray-0.1.6.ebuild 788 BLAKE2B f5bf2c832c0d74589271489175e51b61ca8375f29b3dbf9774b9284273b28aa3effb2f458f0ed8b0034a37481f69de2315280af4f4a2416af192f72ecfff9e22 SHA512 7c44938b0d77a51a56acd91c3d8021f1fc5ca88eb0efad658691a97fdf852cfd9ef6c559d9b835a678a2f98f08537d451ca56cab8dd794550d9bb1fca5cdcb1d -EBUILD icetray-0.1.7.1.ebuild 788 BLAKE2B f5bf2c832c0d74589271489175e51b61ca8375f29b3dbf9774b9284273b28aa3effb2f458f0ed8b0034a37481f69de2315280af4f4a2416af192f72ecfff9e22 SHA512 7c44938b0d77a51a56acd91c3d8021f1fc5ca88eb0efad658691a97fdf852cfd9ef6c559d9b835a678a2f98f08537d451ca56cab8dd794550d9bb1fca5cdcb1d -EBUILD icetray-0.1.7.2.ebuild 788 BLAKE2B f5bf2c832c0d74589271489175e51b61ca8375f29b3dbf9774b9284273b28aa3effb2f458f0ed8b0034a37481f69de2315280af4f4a2416af192f72ecfff9e22 SHA512 7c44938b0d77a51a56acd91c3d8021f1fc5ca88eb0efad658691a97fdf852cfd9ef6c559d9b835a678a2f98f08537d451ca56cab8dd794550d9bb1fca5cdcb1d -<<<<<<< Updated upstream -======= -EBUILD icetray-0.1.7.3.ebuild 788 BLAKE2B 89f144d2874e4a23159c4ecaea11eef058f0e5f9adca8b7c92187133dbd94d1a725b26067f66ee6acc8dc842127e629de98e2603c710f97b013d75c734209c7f SHA512 5f4f984ab5842e99598803ad116a45b6d02d128ee1f548ddcf98ff73dd56ccecb322e8e7471fef8bd7c2534202959435d7e3a935dbefe19e86bdee6b08b761f9 ->>>>>>> Stashed changes +EBUILD icetray-0.1.5.ebuild 774 BLAKE2B 9cdf91a0a0fa2d34f5d1169fc83f8bb4ab8465f79a96cd94c20e48c5f2af6ffa9f9c671c856f9d14ad69631e6cc0fe7f2a7965cd155d7ec4e41f6304c4570111 SHA512 3101499dc27e16bc2c0c4495744399b7896c0614f767e0716b145ea684bb9c6ddb97b5bd4b59e7d5353c424fc857065baa0f7b061d9c081b5b0c5a9fb6254cd5 +EBUILD icetray-0.1.6.ebuild 794 BLAKE2B a04fe5811948e40324d4f3854746c605ea2d604da0fe5a5a5525305159671308d028b505c1d9e64504d6e53cb6d89e6626c4aea62b83b49fee60369a4306b057 SHA512 871d5341a5bfa0d60c1df69412428654ceeb703c647f1a32cf04e378059e797d968987fc1204838cd7961e130abff57becb9553cbaa95c087277c32e8aa79d34 +EBUILD icetray-0.1.7.1.ebuild 794 BLAKE2B a04fe5811948e40324d4f3854746c605ea2d604da0fe5a5a5525305159671308d028b505c1d9e64504d6e53cb6d89e6626c4aea62b83b49fee60369a4306b057 SHA512 871d5341a5bfa0d60c1df69412428654ceeb703c647f1a32cf04e378059e797d968987fc1204838cd7961e130abff57becb9553cbaa95c087277c32e8aa79d34 +EBUILD icetray-0.1.7.2.ebuild 794 BLAKE2B a04fe5811948e40324d4f3854746c605ea2d604da0fe5a5a5525305159671308d028b505c1d9e64504d6e53cb6d89e6626c4aea62b83b49fee60369a4306b057 SHA512 871d5341a5bfa0d60c1df69412428654ceeb703c647f1a32cf04e378059e797d968987fc1204838cd7961e130abff57becb9553cbaa95c087277c32e8aa79d34 +EBUILD icetray-0.1.7.3.ebuild 794 BLAKE2B 7b769f8293270ee37ed1ba9ce42ffb2e171947d5b742b792c0b7a1d45f46cdc7ef5d2bbc9b38714bfacd2452a20c1f3364fad08d147235acb16eb890e23879fb SHA512 1f0cd238eda889698d917f7c2f61e912d970ce93ef4406c9da818c2ce3393cbd92267133f841d8fcc83805209ffa3ac78935aa47d9bbffba895adc1cce3e6538 diff --git a/dev-libs/icetray/icetray-0.1.5.ebuild b/dev-libs/icetray/icetray-0.1.5.ebuild index c25b315..b118fe5 100644 --- a/dev-libs/icetray/icetray-0.1.5.ebuild +++ b/dev-libs/icetray/icetray-0.1.5.ebuild @@ -13,7 +13,7 @@ IUSE="ut tools" RDEPEND=" dev-libs/boost - dev-libs/Ice + =dev-libs/Ice-3.6* >=dev-libs/libdbpp-1.1.2:= >=dev-libs/libadhocutil-0.3.3:= dev-cpp/slicer:=[db] diff --git a/dev-libs/icetray/icetray-0.1.6.ebuild b/dev-libs/icetray/icetray-0.1.6.ebuild index ea15a75..d3e4428 100644 --- a/dev-libs/icetray/icetray-0.1.6.ebuild +++ b/dev-libs/icetray/icetray-0.1.6.ebuild @@ -13,7 +13,7 @@ IUSE="ut tools" RDEPEND=" dev-libs/boost - dev-libs/Ice + =dev-libs/Ice-3.6* >=dev-libs/libdbpp-1.1.2:= >=dev-libs/libadhocutil-0.3.3:= dev-cpp/slicer:=[db] diff --git a/dev-libs/icetray/icetray-0.1.7.1.ebuild b/dev-libs/icetray/icetray-0.1.7.1.ebuild index ea15a75..d3e4428 100644 --- a/dev-libs/icetray/icetray-0.1.7.1.ebuild +++ b/dev-libs/icetray/icetray-0.1.7.1.ebuild @@ -13,7 +13,7 @@ IUSE="ut tools" RDEPEND=" dev-libs/boost - dev-libs/Ice + =dev-libs/Ice-3.6* >=dev-libs/libdbpp-1.1.2:= >=dev-libs/libadhocutil-0.3.3:= dev-cpp/slicer:=[db] diff --git a/dev-libs/icetray/icetray-0.1.7.2.ebuild b/dev-libs/icetray/icetray-0.1.7.2.ebuild index ea15a75..d3e4428 100644 --- a/dev-libs/icetray/icetray-0.1.7.2.ebuild +++ b/dev-libs/icetray/icetray-0.1.7.2.ebuild @@ -13,7 +13,7 @@ IUSE="ut tools" RDEPEND=" dev-libs/boost - dev-libs/Ice + =dev-libs/Ice-3.6* >=dev-libs/libdbpp-1.1.2:= >=dev-libs/libadhocutil-0.3.3:= dev-cpp/slicer:=[db] diff --git a/dev-libs/icetray/icetray-0.1.7.3.ebuild b/dev-libs/icetray/icetray-0.1.7.3.ebuild index 7176dcc..d958bec 100644 --- a/dev-libs/icetray/icetray-0.1.7.3.ebuild +++ b/dev-libs/icetray/icetray-0.1.7.3.ebuild @@ -13,7 +13,7 @@ IUSE="ut tools" RDEPEND=" dev-libs/boost - dev-libs/Ice + =dev-libs/Ice-3.6* >=dev-libs/libdbpp-1.1.4:= >=dev-libs/libadhocutil-0.3.3:= dev-cpp/slicer:=[db] |