| 1 |
commit: 395da09f2069f9b8af7e56b7a3a85f2aefd47693 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 26 11:03:41 2019 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 26 11:03:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395da09f |
| 7 |
|
| 8 |
app-misc/geneweb: Fix DeprecatedInsinto and NonexistentBlocker |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
| 11 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/geneweb-6.08-parallellbuild.patch | 45 +++++++++++++++++++--- |
| 14 |
app-misc/geneweb/geneweb-6.08-r1.ebuild | 7 ++-- |
| 15 |
2 files changed, 42 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch |
| 18 |
index 71cfab667fc..552660102ea 100644 |
| 19 |
--- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch |
| 20 |
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
---- geneweb-6.08/wserver/Makefile.old 2017-01-09 21:15:00.328750224 +0100 |
| 23 |
-+++ geneweb-6.08/wserver/Makefile 2017-01-09 21:15:16.825751748 +0100 |
| 24 |
+--- a/wserver/Makefile 2017-01-09 21:15:00.328750224 +0100 |
| 25 |
++++ b/wserver/Makefile 2017-01-09 21:15:16.825751748 +0100 |
| 26 |
@@ -11,6 +11,8 @@ |
| 27 |
camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml |
| 28 |
ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo |
| 29 |
@@ -9,8 +9,8 @@ |
| 30 |
depend: |
| 31 |
TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend |
| 32 |
|
| 33 |
---- geneweb-6.08/src/.depend.old 2017-01-09 21:36:25.644868941 +0100 |
| 34 |
-+++ geneweb-6.08/src/.depend 2017-01-09 21:37:04.994872576 +0100 |
| 35 |
+--- a/src/.depend 2017-01-09 21:36:25.644868941 +0100 |
| 36 |
++++ b/src/.depend 2017-01-09 21:37:04.994872576 +0100 |
| 37 |
@@ -39,7 +39,7 @@ |
| 38 |
check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx |
| 39 |
compilation.cmo: def.cmi util.cmi |
| 40 |
@@ -20,8 +20,21 @@ |
| 41 |
consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi |
| 42 |
consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi |
| 43 |
consang.cmi: def.cmi gwdb.cmi |
| 44 |
-@@ -311,7 +311,7 @@ |
| 45 |
- num.cmi perso.cmi ../wserver/wserver.cmi |
| 46 |
+@@ -162,7 +162,7 @@ |
| 47 |
+ mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx |
| 48 |
+ history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \ |
| 49 |
+ gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \ |
| 50 |
+- history_diff.cmi ../wserver/wserver.cmi history.cmi |
| 51 |
++ history_diff.cmo ../wserver/wserver.cmi history.cmi |
| 52 |
+ history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \ |
| 53 |
+ gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \ |
| 54 |
+ history_diff.cmx ../wserver/wserver.cmx history.cmi |
| 55 |
+@@ -308,10 +308,10 @@ |
| 56 |
+ ../wserver/wserver.cmx |
| 57 |
+ searchName.cmo: adef.cmi buff.cmo checkItem.cmi config.cmi date.cmi def.cmi \ |
| 58 |
+ gutil.cmi gwdb.cmi hutil.cmi mutil.cmi name.cmi util.cmi \ |
| 59 |
+- num.cmi perso.cmi ../wserver/wserver.cmi |
| 60 |
++ num.cmi perso.cmi ../wserver/wserver.cmi some.cmo |
| 61 |
searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \ |
| 62 |
gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \ |
| 63 |
- num.cmx perso.cmx ../wserver/wserver.cmx |
| 64 |
@@ -29,3 +42,23 @@ |
| 65 |
secure.cmo: secure.cmi |
| 66 |
secure.cmx: secure.cmi |
| 67 |
select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi |
| 68 |
+--- a/ged2gwb/.depend 2019-12-26 11:46:53.540446131 +0100 |
| 69 |
++++ b/ged2gwb/.depend 2019-12-26 11:48:08.833224914 +0100 |
| 70 |
+@@ -1,7 +1,7 @@ |
| 71 |
+ ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \ |
| 72 |
+ ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \ |
| 73 |
+ ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \ |
| 74 |
+- ../src/name.cmi ../src/secure.cmi ./utf8.cmi |
| 75 |
++ ../src/name.cmi ../src/secure.cmi ./utf8.cmo |
| 76 |
+ ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ |
| 77 |
+ ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \ |
| 78 |
+ ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \ |
| 79 |
+@@ -10,7 +10,7 @@ |
| 80 |
+ ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \ |
| 81 |
+ ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \ |
| 82 |
+ ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \ |
| 83 |
+- ../src/secure.cmi ./utf8.cmi |
| 84 |
++ ../src/secure.cmi ./utf8.cmo |
| 85 |
+ ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ |
| 86 |
+ ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \ |
| 87 |
+ ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \ |
| 88 |
|
| 89 |
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild |
| 90 |
index 692c89bf09e..55528f55866 100644 |
| 91 |
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild |
| 92 |
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild |
| 93 |
@@ -17,8 +17,7 @@ RESTRICT="strip" |
| 94 |
|
| 95 |
RDEPEND="dev-lang/ocaml[ocamlopt?] |
| 96 |
dev-ml/camlp5[ocamlopt?]" |
| 97 |
-DEPEND="${RDEPEND} |
| 98 |
- !net-p2p/ghostwhitecrab" |
| 99 |
+DEPEND="${RDEPEND}" |
| 100 |
|
| 101 |
PATCHES=( |
| 102 |
"${WORKDIR}"/${P}-ocaml-4.patch |
| 103 |
@@ -59,8 +58,8 @@ src_install() { |
| 104 |
doman man/* |
| 105 |
|
| 106 |
# Install doc |
| 107 |
- insinto /usr/share/doc/${PF}/contrib |
| 108 |
- doins -r contrib/{gwdiff,misc} |
| 109 |
+ dodoc -r contrib |
| 110 |
+ docompress -x /usr/share/doc/${PF}/contrib |
| 111 |
|
| 112 |
newinitd "${FILESDIR}/geneweb.initd" geneweb |
| 113 |
newconfd "${FILESDIR}/geneweb.confd" geneweb |
Archives