gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 159 deletions

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 2a43ded2e802..c02bcb6fd8ea 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -3,10 +3,6 @@ AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da572
 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-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
-DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-EBUILD geneweb-6.08-r1.ebuild 1958 BLAKE2B 70ac814ce345ac8e26461c82551323f56d8331644977454f704a774f9b84ad76560ec2f6943c16271cf81cef4925f616d8125f26557714436b77a815c51e2c38 SHA512 2b992d10ea2307d2b2bb68b28133844874bfe8481427b549d8e404f84f5ea4b2ed8dc35d158af656b113ca8787babf1f0c2d126c95216c1662deb7f71b4de951
-EBUILD geneweb-6.08-r2.ebuild 1946 BLAKE2B 84a5c4cf29cabbb0e1d3573c4aa5739fbd80dd3df47fb813475837e1671f654dc1cffe7f76573de856212500be85dd6e1faab594f0df332fe3bed0d9e3bc9234 SHA512 8cd06829353ca61ad95af45bdd32076c642710cbc63509aea8c431055c44715923515bf3a3389ea1d84a3bdae9e54c78361332da284d35bd617d5643ddcab955
-EBUILD geneweb-6.08.01.ebuild 1944 BLAKE2B e64434246bdb46be17deefd645bf87083b1a135454d756baea8d005be7cf7192bab0f0aea4113baa1cfcb9221f5d10a6fd0949e097128ff4718a521c5b31ea5f SHA512 0fb8792267d569b0e29ed0399d8076ba4f118f659010e25871496b06537a67d0f886176528883c172a7bdbd34dcbaa7e435e3f0fcb3ce797f9b5cdbed1442f2d
+EBUILD geneweb-6.08.01.ebuild 1942 BLAKE2B 60180823289970e8bfe1e739a93494d0726d535e6e1063bd04c9587522fbcda7e6fa01ffa166c8a70c45d3e2f4d7daee17e836ca4acbc58745a434e8dae03f11 SHA512 3f37020d226d86397844987bdfb45b6c478ee6710ea230f905f3e0311c3267cfb164af90234556e613caf5e6e9d35512364c141e61c9fe313bb4697effb76ee3
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
deleted file mode 100644
index 55528f558666..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="https://github.com/geneanet/geneweb"
-SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-RESTRICT="strip"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
-	dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-ocaml-4.patch
-	"${FILESDIR}"/${PF}-gentoo.patch
-	"${FILESDIR}"/${P}-parallellbuild.patch )
-
-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() {
-	enewuser geneweb "" "/bin/bash" /var/lib/geneweb
-	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-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
deleted file mode 100644
index a962e673485d..000000000000
--- a/app-misc/geneweb/geneweb-6.08-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="https://github.com/geneanet/geneweb"
-SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.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}"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-ocaml-4.patch
-	"${FILESDIR}"/${P}-r1-gentoo.patch
-	"${FILESDIR}"/${P}-parallellbuild.patch )
-
-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-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild
index 70389b658f0a..d3f5624aba46 100644
--- a/app-misc/geneweb/geneweb-6.08.01.ebuild
+++ b/app-misc/geneweb/geneweb-6.08.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 RESTRICT="strip"