diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
| commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
| tree | f82923fbca262493e83dd1382e561a2fae24cc46 /dev-ruby/launchy | |
| parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
| parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'dev-ruby/launchy')
| -rw-r--r-- | dev-ruby/launchy/Manifest | 2 | ||||
| -rw-r--r-- | dev-ruby/launchy/launchy-2.5.0.ebuild | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest index 60d869b10802..fb328166fffd 100644 --- a/dev-ruby/launchy/Manifest +++ b/dev-ruby/launchy/Manifest @@ -2,5 +2,5 @@ AUX launchy-2.4.2-drop-failing-test.patch 1033 BLAKE2B 77de99bf447ca68eb16bc1030 DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a -EBUILD launchy-2.5.0.ebuild 1057 BLAKE2B 7cb6f01b97b808abbf3ca3b680aa8cb3bf8a2344c95b86fb972185e11ee33947cc211bba606aa4bea405074b6d1edcab78f6234b9351a926c438470c8934b09b SHA512 b437a05d059a005ec482789687a6706bfa8079498329aa864f5db429c00592252c75531d91ce920530a9e2e02b6b552451f7ddef3044773c6afd1f3d81a6334a +EBUILD launchy-2.5.0.ebuild 978 BLAKE2B 45ebd897a57b034d2f49051e54b947554310aff4c67a64f96d28936801aa19482e98cfa63ca69784459cb3f0cf7aefa6b1933bc000a25c363e62e92896b7d04e SHA512 9267faa4fa1a7c2e4f767794745a39558c78bf0882a7a2b62f785a7224449da5dd0d0267c5a61873b6968bfc861b70fae506ee8578f3768a3cfea29f57580472 MISC metadata.xml 339 BLAKE2B c85b0f849da61909275e94498530be54787a75c970cc607b0f6ac006f67bafeaa459c7704a92a22622e63912fb07f186e3a6e743df8e34ade2d55f56e2c63225 SHA512 bef54e2c7dcd8eb6a6e353b29380cfc53e842a729b584b6a6f6cd423651f390fb8005941c18c005bece74b3de4e68a0201b59151970badf3280e479e9f5e9ec3 diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild index f2248b932164..8cf4802c944a 100644 --- a/dev-ruby/launchy/launchy-2.5.0.ebuild +++ b/dev-ruby/launchy/launchy-2.5.0.ebuild @@ -17,8 +17,7 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="" -# File collision conflict with x11-misc/launchy, bug 545170 -ruby_add_rdepend ">=dev-ruby/addressable-2.7 !!x11-misc/launchy" +ruby_add_rdepend ">=dev-ruby/addressable-2.7" ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )" |