gentoo resync : 25.09.2021

5 files changed, 2 insertions, 195 deletions

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 39097b1eb031..229ebf6b2a36 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,9 +1,5 @@
-AUX geneweb-6.08-parallellbuild.patch 3166 BLAKE2B 3dd6874e194947f98be325ba0125f5d7a91798e9262e7fea2df434277c2300c1e96df70c463d166750c6fad9f6f43b2aa9735b6934f7718328fbd77a1311f9e8 SHA512 baa9790ea22e6c4f29c8fd496228296fee178a78b2539a37cda69750d7a20d0921722893343084efebe3fc3f3f84403e0db8e068fd4e8bdc49f5c81c2f25f907
-AUX geneweb-6.08.01-gentoo.patch 865 BLAKE2B 25fc6d494997de4cd053757d0e18df4cefd677c959b3ce6edb5ef2bfbb896e6db637327add130ffcf8fdda06b69465ec211f6fea23c59b5b3e86af7d2752c030 SHA512 a258145e5d0eca1a286ac425039ba3ddae838a2820c9dd6d3537e65a959298b9a75ef1f32737ff5286a5f76849076830ad08ccb6ec0977f43ea322a19c9d159a
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
-DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
-EBUILD geneweb-6.08.01.ebuild 2193 BLAKE2B fbd1b8f71b4c1e1e33956659b08f5e4ea441a8266dae4b65103721520851e2a6eaa0f5c9d8a35d261a4677d1b1d88c939064fcc933e1e0952202c880ab251b1b SHA512 8c2c767970c1f6bcf9824ce5b4003e6452ada10a2c31b49f707a1aa9c8bff2323141065e553e3e07efef4a66568997769a6643ffb535748f1446832b1dbbbab0
-EBUILD geneweb-7.0.0-r2.ebuild 1814 BLAKE2B f45752415e65a57e849833a406babcd1af3684b2d0f6091f0ed2a0d41dbe1f3d4ad4dcf28fbd3cdb24575bec090a8bf6287cbed710f1cea62475e1c7679fce68 SHA512 108e16e5f6862d97c901b79ac723e9ea77a06100882ae1ad9e73ca190d672d43d4c4cbd55026f18033f5a27d5f41d254278570ca48aa1c35a4544a41b47734c1
+EBUILD geneweb-7.0.0-r2.ebuild 1812 BLAKE2B 9429e6b583ba623170136caa894445b3769ccc6a736ae38b9f4000f863e4646a2a85b385da171e091e23b28201b9d5b60bf84721b1479e712c9a0068e58fc0d4 SHA512 9df0d06cc98007923a895e9c7af6f5ec21bc5527a99c6fecb4e070e6358947a5db2518a9cf23d523a5b414391a63495e5328a3ea99a4184bc3b396c82cbbdef1
 MISC metadata.xml 653 BLAKE2B eb1a56a2d9653f3dfaa2d22e6e3515f371d0d2f0d8a7fcf645ece5cb9d3c475703dc5c78379522264a3164606246368e1be056b915123aa7fbb9d111807d319f SHA512 923b0b1debec0cc57ce0b5616b187b54f20ad1dd151eda62bce5f12c2f1767f40f236118224e1ff92bd8894e09d5628313ce391220d60ac903240bdf15cda3ef
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
deleted file mode 100644
index 552660102eaf..000000000000
--- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/wserver/Makefile	2017-01-09 21:15:00.328750224 +0100
-+++ b/wserver/Makefile	2017-01-09 21:15:16.825751748 +0100
-@@ -11,6 +11,8 @@
- 	camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
- 	ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo
- 
-+wserver.cmi: pa_macro5.cmo
-+
- depend:
- 	TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
- 
---- a/src/.depend	2017-01-09 21:36:25.644868941 +0100
-+++ b/src/.depend	2017-01-09 21:37:04.994872576 +0100
-@@ -39,7 +39,7 @@
- check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx
- compilation.cmo: def.cmi util.cmi
- compilation.cmx: def.cmi util.cmx
--config.cmi: def.cmi
-+config.cmi: def.cmi gwdb.cmi
- consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi
- consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi
- consang.cmi: def.cmi gwdb.cmi
-@@ -162,7 +162,7 @@
-     mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx
- history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
-     gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
--    history_diff.cmi ../wserver/wserver.cmi history.cmi
-+    history_diff.cmo ../wserver/wserver.cmi history.cmi
- history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
-     gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
-     history_diff.cmx ../wserver/wserver.cmx history.cmi
-@@ -308,10 +308,10 @@
-     ../wserver/wserver.cmx
- searchName.cmo: adef.cmi buff.cmo checkItem.cmi config.cmi date.cmi def.cmi \
-     gutil.cmi gwdb.cmi hutil.cmi mutil.cmi name.cmi util.cmi \
--    num.cmi perso.cmi ../wserver/wserver.cmi
-+    num.cmi perso.cmi ../wserver/wserver.cmi some.cmo
- searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \
-     gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \
--    num.cmx perso.cmx ../wserver/wserver.cmx
-+    num.cmx perso.cmx ../wserver/wserver.cmx some.cmo
- secure.cmo: secure.cmi
- secure.cmx: secure.cmi
- select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi
---- a/ged2gwb/.depend	2019-12-26 11:46:53.540446131 +0100
-+++ b/ged2gwb/.depend	2019-12-26 11:48:08.833224914 +0100
-@@ -1,7 +1,7 @@
- ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
-     ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
-     ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
--    ../src/name.cmi ../src/secure.cmi ./utf8.cmi
-+    ../src/name.cmi ../src/secure.cmi ./utf8.cmo
- ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
-     ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
-     ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
-@@ -10,7 +10,7 @@
-     ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
-     ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
-     ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
--    ../src/secure.cmi ./utf8.cmi
-+    ../src/secure.cmi ./utf8.cmo
- ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
-     ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
-     ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
diff --git a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
deleted file mode 100644
index 0226a05904a6..000000000000
--- a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/setup/setup.ml	2007-08-07 19:25:13.000000000 +0200
-+++ b/setup/setup.ml	2007-08-07 19:24:59.000000000 +0200
-@@ -5,8 +5,8 @@
- 
- value port = ref 2316;
- value default_lang = ref "en";
--value setup_dir = ref ".";
--value bin_dir = ref "";
-+value setup_dir = ref "/usr/share/geneweb";
-+value bin_dir = ref "/usr/bin";
- value lang_param = ref "";
- value only_file = ref "";
- 
---- a/tools/Makefile.inc.unix	2017-03-06 08:15:45.334667626 +0100
-+++ b/tools/Makefile.inc.unix	2017-03-06 08:16:10.162223399 +0100
-@@ -6,11 +6,11 @@
- CAMLP5F=-DUNIX
- CAMLP5D=+camlp5
- LIBUNIX=-cclib -lunix
--OCAMLC=ocamlc.opt -w -3 -warn-error +a-52 -safe-string
--OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52 -safe-string
-+OCAMLC=ocamlc.opt -w -3 -safe-string
-+OCAMLOPT=ocamlopt.opt -w -3 -safe-string
- OCAMLI=
- OCAMLD=
--STRIP=strip
-+STRIP=true
- RM=/bin/rm -f
- EXE=
- STATIC=-ccopt -static
diff --git a/app-misc/geneweb/geneweb-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild
deleted file mode 100644
index 42101ffcab7d..000000000000
--- a/app-misc/geneweb/geneweb-6.08.01.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-GITID=9641e494cd85fb1b7baba32412d120da38234ba2
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="https://github.com/geneanet/geneweb"
-SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-RESTRICT="strip"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
-	dev-ml/camlp5[ocamlopt?]
-	acct-user/geneweb
-	acct-group/geneweb"
-DEPEND="${RDEPEND}"
-
-QA_FLAGS_IGNORED=(
-	/usr/bin/gwb2ged
-	/usr/bin/update_nldb
-	/usr/bin/consang
-	/usr/bin/gwd
-	/usr/bin/gwsetup
-	/usr/bin/ged2gwb2
-	/usr/bin/gwc
-	/usr/bin/ged2gwb
-	/usr/bin/check_base
-	/usr/bin/gwu
-	/usr/bin/gwc1
-	/usr/bin/gwc2
-	/usr/lib/geneweb/gwtp
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${PN}-6.08-parallellbuild.patch )
-
-S="${WORKDIR}"/${PN}-${GITID}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
-		# If using bytecode we dont want to strip the binary as it would remove
-		# the bytecode and only leave ocamlrun...
-	fi
-}
-
-src_install() {
-	dodoc ICHANGES
-	emake new_distrib
-	emake wrappers
-	# Install doc
-	cd distribution
-	dodoc CHANGES.txt
-	# Install binaries
-	cd gw
-	dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
-	insinto /usr/lib/${PN}
-	doins -r gwtp_tmp/*
-	dodoc a.gwf
-	insinto /usr/share/${PN}
-	doins -r etc images lang setup gwd.arg only.txt
-
-	cd ../..
-
-	# Install binaries
-	dobin src/check_base
-	# Install manpages
-	doman man/*
-
-	# Install doc
-	dodoc -r contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-
-	newinitd "${FILESDIR}/geneweb.initd" geneweb
-	newconfd "${FILESDIR}/geneweb.confd" geneweb
-}
-
-pkg_postinst() {
-	einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
-	einfo "instructions on the README in that directory to use it"
-	einfo "For 64 bits architecture you need to rebuild the database"
-	einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
-	einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
-	einfo "(using the current package)"
-}
diff --git a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
index 128db7e7151a..5215b8968136 100644
--- a/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="strip !test? ( test )"