summaryrefslogtreecommitdiff
path: root/net-misc/unison
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-29 11:22:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-10-29 11:22:34 +0000
commitbd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree3559b3e11424f5529527f2474d8a977a91ee3389 /net-misc/unison
parent8b2628ad8526c806375e7b157889e4274b70248b (diff)
gentoo resync : 29.10.2017
Diffstat (limited to 'net-misc/unison')
-rw-r--r--net-misc/unison/Manifest3
-rw-r--r--net-misc/unison/files/unison-2.48.4-Makefile-dep.patch20
-rw-r--r--net-misc/unison/unison-2.48.4.ebuild5
3 files changed, 27 insertions, 1 deletions
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 53b26a8092eb..c4ce69b9d7fb 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,4 @@
+AUX unison-2.48.4-Makefile-dep.patch 542 SHA256 4e3a9a38a7c3deb3a7d1331a3d41a4dd08f19332df9474237e19135a8da0ff8e SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394 WHIRLPOOL 8205385cf29fb013d75e94e62d9541ea4105a73de1a403cc2cb7d5752dc872de4e32b9897fd6344ac142362a17be51592fd5b9272cba78fba117ae368e7cf950
DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
@@ -5,7 +6,7 @@ DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0
DIST unison-2.48.4-manual.pdf 516093 SHA256 eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 WHIRLPOOL a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
DIST unison-2.48.4.tar.gz 1200861 SHA256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 WHIRLPOOL 73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
EBUILD unison-2.48.3.ebuild 2194 SHA256 a6555a1aabf065cfce0101802d7385f8a76589682994e8caa846f60a0c8339f0 SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7 WHIRLPOOL 6df006c0a6a76bd3551ca6a153cfdb29a512fb9ec5d47623163927638965abb7f0f46395a146cb3412fd776aa356d59d6d8fee3fa893406bf2ad15444d772aaa
-EBUILD unison-2.48.4.ebuild 2248 SHA256 809a036f8a3e1383f197d10a1978e21f025f49eeccdacd75822cea0498b63dc9 SHA512 effb9b4e782b8c168d2a5e4002db1cdddf99335d68f75c17e55d54384e41687b48b851f51a2f89b0f14bff2e6d920925a4a3f5670f0a5da6f530cea2560bceaf WHIRLPOOL 38e1308509091672b01e046d335a84b5af389c6e285eb2ec00b9a2a985bc9efedc054a18979444a9edbf60d3e6ddbcf46c784816855c1b13cde6e763e772bf8e
+EBUILD unison-2.48.4.ebuild 2330 SHA256 95f208e6ddf5c31ff8d324fbdb83b667c2e4c2bd3a963bcc2900f8b10c807266 SHA512 22857d074ba34c63342927e21b5774d6bbe4da10ff23b63e55784d056477a1c21b9b9c92a422c4623977c67e3989b072927b171cee00802797844bc03e79e2e9 WHIRLPOOL aee3d461a532ec55d4d2ad614f0fd4a39c0947db99c31f2967f41fdda84013144e926d3e5474954c5766da8a24e72e938f917fa99035c2ed3a0caee3bdaf3948
MISC ChangeLog 3687 SHA256 1f9c193957af831b7449b5ae18693fc3c77b1649b40f3c68cfec96bf0d5d27bb SHA512 33f8b1bfe50e5985ea2eb55954f67c87f480838b90440733add0bcfc8a78c7aeb654b0064084c99ea75529acb830c21558c47f752f4370cae85a5d78c7617d15 WHIRLPOOL 1a68015e6b2bdfbe155654bb2df94865778eed82a09a10fd2a7878dc77d4b1582d75058807069d7d925d5b581a21b37aad7c2f602c736dff986da6f892b563a1
MISC ChangeLog-2015 11268 SHA256 d7c0324a2251676c6453a0713a9e00536bc2be8ea0ef0f99cbf392cb03e96de6 SHA512 58044c03a0d728fb0a85b87c2e2b2794151e00699c52d51661b967b52b0b47ad281fcef717af19ade76fd63c80ffc642d3bb54a24665fbbcc72153c46dfe5d16 WHIRLPOOL 069d779860f2d062bf1ec186a9eee52fa77daa17145a7e0715baf6433663d6828c46919d50ad93ad42613a8783173d6fc854459d3b46e7d089182b9dd72d1c2f
MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
new file mode 100644
index 000000000000..f65959dfb4ac
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
@@ -0,0 +1,20 @@
+Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
+
+ The dependency is needed to compile unison
+ in parallel.
+
+Reference: https://github.com/bcpierce00/unison/pull/100
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..84fe7ad 100644
+--- a/Makefile.OCaml
++++ b/Makefile.OCaml
+@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
+ @echo "$(CAMLC): $< ---> $@"
+ $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
+
++fswatch.cmi : ubase/prefs.cmi
++
+ %.cmo: %.ml
+ @echo "$(OCAMLC): $< ---> $@"
+ $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index a1f428de517b..951e84771c95 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -30,6 +30,11 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
S="${WORKDIR}"/src
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
+ default
+}
+
src_compile() {
local myconf