gentoo resync : 27.03.2018

5 files changed, 4 insertions, 191 deletions

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index d1d1dfdb8bf5..39eb1045a1fc 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,13 +1,8 @@
-AUX geneweb-6.07-gentoo.patch 781 BLAKE2B 624c73a1b15decda98f980fcf8f799068bf8c3d68742ed35aa6b42262472f9ba7be824cd9ed7e28990d767da3116ce31bde2da4a843abf5da47bc993395686ca SHA512 21408c7a4eba583242d751da6c688c2f175bb81fabac92644c936acd9bde5a9322e21f21306af7f53c261432f941e149219c045f21afab4401da98d7a004d69e
-AUX geneweb-6.07-parallellbuild.patch 2823 BLAKE2B 3830d92f05d1968de9aa311b04dd51e4f59ec21c8b539faa63653d3e259b5e454a9a963156bb811dfb8ee9545d8fcff9d7b038fe6830aa5170f0263827698a5b SHA512 0eced445bff368ebe4f5b8a09653cdc4444c3ae956aeade9b64728136d9334b1cee18e891273308b64ecf819c9ef0937be82b15ee0a9c739ba2c19967f5e2934
 AUX geneweb-6.08-parallellbuild.patch 1264 BLAKE2B fa7e9a94705ce2bf439888b2e64f889a69e29b6897c46e40f4d86c3d6d56d2fc9ab2790b0514b7e52dce93c0774fe3f006d889f3ed4a02342e8694c4e8b95a7d SHA512 2912f591f0c771b9bc039871416bd74364fe4a0c17200ea191033a3d12c4de4e088ddd24829ef07acb918e0f8be91671112ae7ebe0593b96a66945b6c18ecedf
 AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
-DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 BLAKE2B 38cebdd34860cb92e9b7320c8b0fba4631c2ab6d6f30d7649f6eabc345cc4604426c37baa94fe614988facd97fed7b2e07360175fec6ce0b86b5ff79d4874750 SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227
 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-DIST gw-6.07-src.tgz 1855016 BLAKE2B 9ba23961607b399a1d731e163605744f79136af40a51a61cd80f2af04a3c3d388fdc3444c33c740e0c6b4137df0cbfd6145759c50c7c8a7d04b472a5d4505a17 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d
-EBUILD geneweb-6.07.ebuild 2093 BLAKE2B cdb90d602a2f09f0796e9b528560156fbcbfdd6ed54d4fd7f486b26930e5591bfbbbc8a68da81ed9e2070bc943d3218b2f383238883f553608ffea49566f01c9 SHA512 d99d8e7982507a8bf5e693b68661ac295aec991319735300ee5368fa95d4d047aff0ea4306c655f4b92bd72a5a482172f3e20b5a43e45523e275744ce5bc0a24
-EBUILD geneweb-6.08-r1.ebuild 2001 BLAKE2B 8b4d49cb745377212b0ccf7d46e11c3c3370bc69447d42cdc9173b866ce54a816a254fa81439bc7caddda93bc9bffa2e9eeb5b90cd2ec0e1a4be0ea0e89f3cac SHA512 d7473dab32d1725b2f22faad0ca1997b11d41154fd1a7a336b0e84c4e1fd0a3c230dca334a2b7d771543665ba4748382c319654d3634b4f934a18470f713b0e0
+EBUILD geneweb-6.08-r1.ebuild 1986 BLAKE2B 34a9392c6d53cb0c67e76cad2289e92331df30ac812ac028639190a9054e44072929364a1331fc8899065b55ab121414701028500cb3493afe28e8add1588d81 SHA512 802d057ee7a16db7a5060a0388b3d7e5efcb8116f28734f6499756650eb9795ef226bdee6f17514c9435a05d2987636c65b898387222b4083b907c137704cda8
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch b/app-misc/geneweb/files/geneweb-6.07-gentoo.patch
deleted file mode 100644
index a7cdff7a44c5..000000000000
--- a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- setup/setup.ml.old	2007-08-07 19:25:13.000000000 +0200
-+++ 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 "";
- 
---- tools/Makefile.inc.unix.old	2008-04-23 15:22:50.000000000 +0200
-+++ tools/Makefile.inc.unix	2008-04-23 15:23:04.000000000 +0200
-@@ -5,11 +5,11 @@
- CAMLP5F=-DUNIX
- CAMLP5D=+camlp5
- LIBUNIX=-cclib -lunix
--OCAMLC=ocamlc.opt -warn-error A
--OCAMLOPT=ocamlopt.opt -warn-error A
-+OCAMLC=ocamlc.opt
-+OCAMLOPT=ocamlopt.opt
- OCAMLI=
- OCAMLD=
--STRIP=strip
-+STRIP=true
- RM=/bin/rm -f
- EXE=
- STATIC=-ccopt -static
diff --git a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
deleted file mode 100644
index cb1a5b0125e9..000000000000
--- a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- wserver/Makefile.old	2011-03-11 13:47:04.000000000 +0100
-+++ wserver/Makefile	2011-03-11 13:47:20.000000000 +0100
-@@ -4,8 +4,10 @@
- 
- OBJS=wserver.cmo
- 
--all:: pa_macro5.cmo $(OBJS)
-+all:: pa_macro5.cmo
-+	$(MAKE) $(OBJS)
--opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx)
-+opt:: pa_macro5.cmo
-+	$(MAKE) $(OBJS:.cmo=.cmx)
- 
- pa_macro5.cmo: pa_macro5.ml
- 	camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
---- src/Makefile.old	2013-04-18 21:29:52.727049806 +0200
-+++ src/Makefile	2013-04-18 21:30:58.838414496 +0200
-@@ -153,6 +153,8 @@
- 	) | \
- 	sort | uniq | grep -v '^$$' > i18n
- 
-+config.cmi: gwdb.cmi
-+
- always:
- 
- depend:
---- src/.depend.old	2014-07-17 09:18:26.882149121 +0200
-+++ src/.depend	2014-07-17 09:19:07.981770328 +0200
-@@ -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 
---- ged2gwb/.depend.old	2014-07-17 09:23:02.119612299 +0200
-+++ ged2gwb/.depend	2014-07-17 09:23:53.987134380 +0200
-@@ -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 \
---- Makefile.old	2014-10-30 08:36:50.308668062 +0100
-+++ Makefile	2014-10-30 08:37:13.204451602 +0100
-@@ -65,7 +65,7 @@
- 
- distrib: new_distrib wrappers
- 
--wrappers:
-+wrappers: new_distrib
- 	if test "$(CAMLP5F)" = "-DWIN95"; then \
- 	  echo -ne 'setlocal enableextensions\r\n' > $(DESTDIR)/gwd.bat; \
- 	  echo -ne 'md bases\r\n' >> $(DESTDIR)/gwd.bat; \
diff --git a/app-misc/geneweb/geneweb-6.07.ebuild b/app-misc/geneweb/geneweb-6.07.ebuild
deleted file mode 100644
index 77ac63d3ce37..000000000000
--- a/app-misc/geneweb/geneweb-6.07.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-MY_PN=gw
-MY_PV=${PV/./-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
-SRC_URI="http://opensource.geneanet.org/attachments/download/240/${MY_P}-src.tgz
-	mirror://gentoo/${P}-reduce-utf8.ml.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
-	dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}
-	!net-p2p/ghostwhitecrab"
-
-S=${WORKDIR}/gw-${PV}-src
-
-src_prepare() {
-	esvn_clean
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-parallellbuild.patch \
-		../${P}-reduce-utf8.ml.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...
-		export STRIP_MASK="*/bin/*"
-	fi
-}
-
-src_install() {
-	dodoc ICHANGES
-	emake distrib
-	# 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
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/{gwdiff,misc}
-
-	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 "(usiing the current package)"
-}
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
index fd05d1690573..7c3a88555903 100644
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
+RESTRICT="strip"
 
 RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/camlp5[ocamlopt?]"
@@ -31,7 +32,6 @@ src_compile() {
 		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...
-		export STRIP_MASK="*/bin/*"
 	fi
 }