* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/
@ 2017-01-09 20:56 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2017-01-09 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 85807d2f2818239eb68b1d714bfd1d04d11faf9f
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 20:56:02 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 20:56:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85807d2f
app-misc/geneweb: Bump version to 6.08
Package-Manager: portage-2.3.0
app-misc/geneweb/Manifest | 1 +
app-misc/geneweb/files/geneweb-6.08-gentoo.patch | 30 +++++++++
.../files/geneweb-6.08-parallellbuild.patch | 31 +++++++++
app-misc/geneweb/geneweb-6.08.ebuild | 75 ++++++++++++++++++++++
4 files changed, 137 insertions(+)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 325a621..5061eee 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,2 +1,3 @@
DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 SHA256 cc5b7d30333e8c7b187b83106189b5e63a7d423c2e500b77b5d087cd8cd239fa SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 WHIRLPOOL 75e30b8ef19803dcc6f391fc798c2bb4d4e4fa685d0d5d060dcb1a9ad676a45f5016fef2e6306019876d0d30d662ee3f67f361267a2829b2ce679836c573104c
+DIST geneweb-6.08.tar.gz 1791450 SHA256 ba5724f8b6a4c823760642d31eaed713ac04c1000ef6f8e4a19ff748baa058bf SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835 WHIRLPOOL 81e125e5f0431f25d42ae4068708fae22341b802c68efde1d4e5494090d4644a249f41989e3a29f6ebb4a0d3c91cd35bdde996194cb4c34502bc22d75a2c8f90
DIST gw-6.07-src.tgz 1855016 SHA256 c1ecc337f8bce4d8509ca49081d098b5a44ddb6407208496e55e9a38d6bfb1f6 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d WHIRLPOOL 70305616cafcb9476814e3fe8355571611fef4eabe022afd2f3b92c3a9c9c6bc2be69a37532e4b04cc16e9ce8979abda1b103f4606a8784bf64caa0c1b9ff5e5
diff --git a/app-misc/geneweb/files/geneweb-6.08-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
new file mode 100644
index 00000000..6e33da8
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
@@ -0,0 +1,30 @@
+--- geneweb-6.08/setup/setup.ml.old 2007-08-07 19:25:13.000000000 +0200
++++ geneweb-6.08/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 "";
+
+--- geneweb-6.08/tools/Makefile.inc.unix.old 2008-04-23 15:22:50.000000000 +0200
++++ geneweb-6.08/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.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
new file mode 100644
index 00000000..71cfab6
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -0,0 +1,31 @@
+--- geneweb-6.08/wserver/Makefile.old 2017-01-09 21:15:00.328750224 +0100
++++ geneweb-6.08/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
+
+--- geneweb-6.08/src/.depend.old 2017-01-09 21:36:25.644868941 +0100
++++ geneweb-6.08/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
+@@ -311,7 +311,7 @@
+ num.cmi perso.cmi ../wserver/wserver.cmi
+ 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
diff --git a/app-misc/geneweb/geneweb-6.08.ebuild b/app-misc/geneweb/geneweb-6.08.ebuild
new file mode 100644
index 00000000..7f84cfe
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.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"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-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...
+ 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 "(using the current package)"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/
@ 2018-03-27 5:55 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2018-03-27 5:55 UTC (permalink / raw
To: gentoo-commits
commit: d18d52d52f980fef6f5927a219367b975cf49408
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 05:54:50 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 05:54:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18d52d5
app-misc/geneweb: Remove STRIP_MASK. Stable 6.08. Remove old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-misc/geneweb/Manifest | 2 -
app-misc/geneweb/files/geneweb-6.07-gentoo.patch | 30 --------
.../files/geneweb-6.07-parallellbuild.patch | 68 ------------------
app-misc/geneweb/geneweb-6.07.ebuild | 84 ----------------------
app-misc/geneweb/geneweb-6.08-r1.ebuild | 6 +-
5 files changed, 3 insertions(+), 187 deletions(-)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 5e15f834958..ce02b368b59 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,4 +1,2 @@
-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
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 a7cdff7a44c..00000000000
--- 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 cb1a5b0125e..00000000000
--- 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 77ac63d3ce3..00000000000
--- 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 fd05d169057..7c3a8855590 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
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/
@ 2019-12-26 11:03 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2019-12-26 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 395da09f2069f9b8af7e56b7a3a85f2aefd47693
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 11:03:41 2019 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 11:03:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395da09f
app-misc/geneweb: Fix DeprecatedInsinto and NonexistentBlocker
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
.../files/geneweb-6.08-parallellbuild.patch | 45 +++++++++++++++++++---
app-misc/geneweb/geneweb-6.08-r1.ebuild | 7 ++--
2 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
index 71cfab667fc..552660102ea 100644
--- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -1,5 +1,5 @@
---- geneweb-6.08/wserver/Makefile.old 2017-01-09 21:15:00.328750224 +0100
-+++ geneweb-6.08/wserver/Makefile 2017-01-09 21:15:16.825751748 +0100
+--- 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
@@ -9,8 +9,8 @@
depend:
TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
---- geneweb-6.08/src/.depend.old 2017-01-09 21:36:25.644868941 +0100
-+++ geneweb-6.08/src/.depend 2017-01-09 21:37:04.994872576 +0100
+--- 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
@@ -20,8 +20,21 @@
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
-@@ -311,7 +311,7 @@
- num.cmi perso.cmi ../wserver/wserver.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
@@ -29,3 +42,23 @@
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/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
index 692c89bf09e..55528f55866 100644
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -17,8 +17,7 @@ RESTRICT="strip"
RDEPEND="dev-lang/ocaml[ocamlopt?]
dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}
- !net-p2p/ghostwhitecrab"
+DEPEND="${RDEPEND}"
PATCHES=(
"${WORKDIR}"/${P}-ocaml-4.patch
@@ -59,8 +58,8 @@ src_install() {
doman man/*
# Install doc
- insinto /usr/share/doc/${PF}/contrib
- doins -r contrib/{gwdiff,misc}
+ dodoc -r contrib
+ docompress -x /usr/share/doc/${PF}/contrib
newinitd "${FILESDIR}/geneweb.initd" geneweb
newconfd "${FILESDIR}/geneweb.confd" geneweb
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/
@ 2020-02-12 18:15 Alfredo Tupone
0 siblings, 0 replies; 4+ messages in thread
From: Alfredo Tupone @ 2020-02-12 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 16ede39343aeead19a64b86967da3401faf66018
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 18:15:10 2020 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 18:15:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ede393
app-misc/geneweb: fix build with ocaml-4.09
Bugs: https://bugs.gentoo.org/707312
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
app-misc/geneweb/Manifest | 1 +
.../geneweb/files/geneweb-6.08.01-gentoo.patch | 30 ++++++++
app-misc/geneweb/geneweb-6.08.01.ebuild | 79 ++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index ce02b368b59..70d8a86db7c 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
new file mode 100644
index 00000000000..0226a05904a
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
@@ -0,0 +1,30 @@
+--- 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
new file mode 100644
index 00000000000..70389b658f0
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08.01.ebuild
@@ -0,0 +1,79 @@
+# 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}"
+
+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)"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-12 18:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-09 20:56 [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2018-03-27 5:55 Alfredo Tupone
2019-12-26 11:03 Alfredo Tupone
2020-02-12 18:15 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox