* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/
@ 2017-03-06 17:58 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2017-03-06 17:58 UTC (permalink / raw
To: gentoo-commits
commit: f504245827d373795cb6707aa003d67613df5e4c
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 08:07:30 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 17:58:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5042458
app-misc/geneweb: patched for dev-lang/ocaml-4
Package-Manager: portage-2.3.3
app-misc/geneweb/Manifest | 1 +
.../geneweb/files/geneweb-6.08-r1-gentoo.patch | 30 +++++++++
app-misc/geneweb/geneweb-6.08-r1.ebuild | 76 ++++++++++++++++++++++
3 files changed, 107 insertions(+)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 5061eee10cb..176d630d121 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,3 +1,4 @@
DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 SHA256 cc5b7d30333e8c7b187b83106189b5e63a7d423c2e500b77b5d087cd8cd239fa SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 WHIRLPOOL 75e30b8ef19803dcc6f391fc798c2bb4d4e4fa685d0d5d060dcb1a9ad676a45f5016fef2e6306019876d0d30d662ee3f67f361267a2829b2ce679836c573104c
+DIST geneweb-6.08-ocaml-4.patch.gz 22259 SHA256 11d5f5ceb30b734d4475d26f3e5aafd49337185d81bee354f13691f82d627073 SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def WHIRLPOOL b5f25b93487a08339bea1c1709b214497ef23388fb5dc2e1d5fcacf7defbe92ca8e5d865142eacb62895240539193ed301fe329e84690fe63d4b630bded01534
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-r1-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
new file mode 100644
index 00000000000..e5a43be720e
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-r1-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 2017-03-06 08:15:45.334667626 +0100
++++ geneweb-6.08/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
+-OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52
++OCAMLC=ocamlc.opt -w -3
++OCAMLOPT=ocamlopt.opt -w -3
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
new file mode 100644
index 00000000000..63e73b5dc7c
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="http://opensource.geneanet.org/projects/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
+ http://dev.gentoo.org/~tupone/${P}-ocaml-4.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"
+
+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...
+ 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] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/
@ 2017-03-06 18:03 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2017-03-06 18:03 UTC (permalink / raw
To: gentoo-commits
commit: d617c7ac0a6c51cb1f52d56e9d411e98d524790e
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 18:03:09 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 18:03:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d617c7ac
app-misc/geneweb: remove 6.08 (for ocaml-3 version)
Package-Manager: portage-2.3.3
app-misc/geneweb/files/geneweb-6.08-gentoo.patch | 30 ----------
app-misc/geneweb/geneweb-6.08.ebuild | 74 ------------------------
2 files changed, 104 deletions(-)
diff --git a/app-misc/geneweb/files/geneweb-6.08-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
deleted file mode 100644
index 6e33da85a8e..00000000000
--- a/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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/geneweb-6.08.ebuild b/app-misc/geneweb/geneweb-6.08.ebuild
deleted file mode 100644
index 800269025fa..00000000000
--- a/app-misc/geneweb/geneweb-6.08.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="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] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/
@ 2021-09-18 16:51 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-09-18 16:51 UTC (permalink / raw
To: gentoo-commits
commit: f35d01c4ad9b4f753eb74570beefbc37ecf7c8fc
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 16:24:40 2021 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 16:50:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35d01c4
app-misc/geneweb: remove old version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
app-misc/geneweb/Manifest | 1 -
.../files/geneweb-6.08-parallellbuild.patch | 64 ---------------
.../geneweb/files/geneweb-6.08.01-gentoo.patch | 30 -------
app-misc/geneweb/geneweb-6.08.01.ebuild | 95 ----------------------
4 files changed, 190 deletions(-)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 83f801df455..0004dbb0e0f 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,2 +1 @@
-DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
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 552660102ea..00000000000
--- 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 0226a05904a..00000000000
--- 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 42101ffcab7..00000000000
--- 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)"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/
@ 2023-03-13 19:57 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2023-03-13 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 743de4500bb8459dc125aed847790eab7264720d
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 13 19:55:55 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar 13 19:56:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=743de450
app-misc/geneweb: add 7.0.0_p1
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
app-misc/geneweb/Manifest | 1 +
.../geneweb/files/geneweb-7.0.0_p1-gentoo.patch | 35 +++++++++
app-misc/geneweb/files/geneweb.initd-r1 | 19 +++++
app-misc/geneweb/geneweb-7.0.0_p1.ebuild | 86 ++++++++++++++++++++++
4 files changed, 141 insertions(+)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 0004dbb0e0f2..3655f8daabfb 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1 +1,2 @@
+DIST Geneweb-1eaac340.tar.gz 14741729 BLAKE2B 828857f48175dc0e2af8162dde7b38548e1b9131dfe9acae9b7e8f9940866f27868a1efcfc4c08bdec0fda4789d8b8c87310ba2625cd4f3ba9bc557aaf274bf3 SHA512 ee3effc9b444c05547218b79242db0eb5a56f2ca00b67fcc9937c2395aeb7cbd4dd3524e8b774799e7fb87453ee77d53bc64edb930a1902be6896f8f8d6caa24
DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
diff --git a/app-misc/geneweb/files/geneweb-7.0.0_p1-gentoo.patch b/app-misc/geneweb/files/geneweb-7.0.0_p1-gentoo.patch
new file mode 100644
index 000000000000..58d306f6282d
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.0_p1-gentoo.patch
@@ -0,0 +1,35 @@
+diff --git a/bin/gwrepl/mk_data.ml b/bin/gwrepl/mk_data.ml
+index b2a808b65..e497a238c 100644
+--- a/bin/gwrepl/mk_data.ml
++++ b/bin/gwrepl/mk_data.ml
+@@ -42,7 +42,7 @@ let partition_map p l =
+ Printf.fprintf out "\n#endif\n"
+
+ let () =
+- let opam_swich_prefix = Sys.getenv "OPAM_SWITCH_PREFIX" in
++ let opam_swich_prefix = "/usr" in
+ let opam_swich_prefix_lib = opam_swich_prefix // "lib" in
+
+ let dune_root, root, ( directories0, files0 ) =
+@@ -157,7 +157,7 @@ let () =
+ List.iter aux [ "ocaml" // "stublibs" // "dllcamlstr.so"
+ ; "ocaml" // "stublibs" // "dllunix.so"
+ ] ;
+- if_sosa_zarith out (fun () -> aux ("stublibs" // "dllzarith.so")) ;
++ if_sosa_zarith out (fun () -> aux ("ocaml" // "stublibs" // "dllzarith.so")) ;
+ end ;
+ Printf.fprintf out {||];;|}
+ end ;
+diff --git a/test/dune.in b/test/dune.in
+index ef891bbce..ac2a2b9e1 100644
+--- a/test/dune.in
++++ b/test/dune.in
+@@ -7,7 +7,7 @@
+
+ (executable
+ (name test)
+- (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show oUnit stdlib-shims)
++ (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show ounit2 stdlib-shims)
+ (preprocess (pps ppx_deriving.show))
+ (modules
+ test
diff --git a/app-misc/geneweb/files/geneweb.initd-r1 b/app-misc/geneweb/files/geneweb.initd-r1
new file mode 100644
index 000000000000..d01c1cc27911
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting geneweb server"
+ start-stop-daemon -S -u geneweb -x /usr/bin/geneweb.gwd -- -bd /var/lib/geneweb -lang $LANG -log /var/log/geneweb.log -daemon
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping geneweb server"
+ start-stop-daemon -K -u geneweb -x /usr/bin/geneweb.gwd
+ eend $?
+}
diff --git a/app-misc/geneweb/geneweb-7.0.0_p1.ebuild b/app-misc/geneweb/geneweb-7.0.0_p1.ebuild
new file mode 100644
index 000000000000..a57bf577da4b
--- /dev/null
+++ b/app-misc/geneweb/geneweb-7.0.0_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+TagId=Geneweb-1eaac340
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneweb/geneweb"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${TagId}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="strip
+ !test? ( test )"
+
+DEPEND="
+ dev-ml/re:=
+ dev-ml/uutf:=
+ dev-ml/uunf:=
+ dev-ml/uucp:=
+ dev-ml/unidecode:=
+ dev-ml/calendars:=
+ dev-ml/zarith:=
+ dev-ml/markup:=
+ dev-ml/jingoo:=
+ >=dev-ml/camlp5-8:=[ocamlopt?]
+ dev-ml/ppx_import:=
+ dev-ml/ppx_blob:=
+ acct-user/geneweb
+ acct-group/geneweb
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-ml/cppo
+ test? ( dev-ml/ounit2 )"
+
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}"/${PN}-${TagId}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/opam_swich_prefix_lib/s|\"lib|\"$(get_libdir)|" \
+ bin/gwrepl/mk_data.ml \
+ || die
+}
+
+src_configure() {
+ ocaml ./configure.ml --sosa-zarith || die
+}
+
+src_compile() {
+ emake distrib
+}
+
+src_install() {
+ dune_src_install
+ rm "${D}"/usr/share/doc/${PF}/geneweb/LICENSE || die
+ mv "${D}"/usr/share/doc/${PF}/geneweb/* "${D}"/usr/share/doc/${PF}/ || die
+
+ dodoc ICHANGES etc/README.txt etc/a.gwf
+
+ # Install manpages
+ doman man/*
+
+ cd distribution/gw
+ insinto /usr/share/${PN}
+ doins -r etc images lang setup gwd.arg
+
+ newinitd "${FILESDIR}/geneweb.initd-r1" geneweb
+ newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+ einfo "If you come from an old version you need to rebuild the database"
+ einfo "\"geneweb.gwu foo -o foo.gw \" will save the database (use the previous"
+ einfo "version to do that). \"geneweb.gwc foo.gw -o bar \" will restore it "
+ einfo "(using the current package)"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/
@ 2024-06-03 19:55 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2024-06-03 19:55 UTC (permalink / raw
To: gentoo-commits
commit: d1ecae9db7ce91a9682721d3e5de44720d4e23a1
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 19:54:32 2024 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 19:54:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ecae9d
app-misc/geneweb: add 7.0.1_alpha2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
app-misc/geneweb/Manifest | 1 +
.../files/geneweb-7.0.1_alpha2-gentoo.patch | 35 ++++++++
app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild | 92 ++++++++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 3655f8daabfb..f5361ac22131 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,2 +1,3 @@
DIST Geneweb-1eaac340.tar.gz 14741729 BLAKE2B 828857f48175dc0e2af8162dde7b38548e1b9131dfe9acae9b7e8f9940866f27868a1efcfc4c08bdec0fda4789d8b8c87310ba2625cd4f3ba9bc557aaf274bf3 SHA512 ee3effc9b444c05547218b79242db0eb5a56f2ca00b67fcc9937c2395aeb7cbd4dd3524e8b774799e7fb87453ee77d53bc64edb930a1902be6896f8f8d6caa24
DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
+DIST geneweb-7.0.1_alpha2.tar.gz 14960087 BLAKE2B 46950389b3e0591daa4dd3672d7b133166df805ab091ac344fba32dd46c1c13c48d523dcd3fab0fcbf7d5f113eed9b4998fe52a20b3b85a5f67be0ff0bc676dc SHA512 454552bf6fec9ac5ba20caeae85d0df821c651c56521ebbdaace3c199a764436d3538cc7fd0e0abc71519d78e00cbef8696f5d5c5f7c6bdf61014b7a85800d74
diff --git a/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch
new file mode 100644
index 000000000000..2d1d663895df
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch
@@ -0,0 +1,35 @@
+diff --git a/bin/gwrepl/mk_data.ml b/bin/gwrepl/mk_data.ml
+index b2a808b65..e497a238c 100644
+--- a/bin/gwrepl/mk_data.ml
++++ b/bin/gwrepl/mk_data.ml
+@@ -46,7 +46,7 @@
+ Printf.fprintf out "\n#endif\n"
+
+ let () =
+- let opam_swich_prefix = Sys.getenv "OPAM_SWITCH_PREFIX" in
++ let opam_swich_prefix = "/usr" in
+ let opam_swich_prefix_lib = opam_swich_prefix // "lib" in
+
+ let dune_root, root, (directories0, files0) =
+@@ -185,7 +185,7 @@
+ "ocaml" // "stublibs" // "dllcamlstr.so";
+ "ocaml" // "stublibs" // "dllunix.so";
+ ];
+- if_sosa_zarith out (fun () -> aux ("stublibs" // "dllzarith.so")));
++ if_sosa_zarith out (fun () -> aux ("ocaml" // "stublibs" // "dllzarith.so")));
+ Printf.fprintf out {||];;|};
+ let b = Buffer.create 1024 in
+ let aux =
+diff --git a/test/dune.in b/test/dune.in
+index ef891bbce..ac2a2b9e1 100644
+--- a/test/dune.in
++++ b/test/dune.in
+@@ -7,7 +7,7 @@
+
+ (executable
+ (name test)
+- (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show oUnit stdlib-shims)
++ (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show ounit2 stdlib-shims)
+ (preprocess (pps ppx_deriving.show))
+ (modules
+ test
diff --git a/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild b/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild
new file mode 100644
index 000000000000..da9946d6eb59
--- /dev/null
+++ b/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+MYPV=${PV/_/-}
+
+TagId=Geneweb-1eaac340
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneweb/geneweb"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${MYPV}.tar.gz
+ -> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${MYPV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="strip
+ !test? ( test )"
+
+DEPEND="
+ acct-group/geneweb
+ acct-user/geneweb
+ dev-ml/calendars:=
+ >=dev-ml/camlp5-8:=[ocamlopt?]
+ dev-ml/camlp-streams:=
+ dev-ml/jingoo:=
+ dev-ml/markup:=
+ dev-ml/num:=
+ dev-ml/ppx_blob:=
+ dev-ml/ppx_deriving:=
+ dev-ml/ppx_import:=
+ dev-ml/re:=
+ dev-ml/stdlib-shims
+ dev-ml/unidecode:=
+ dev-ml/uucp:=
+ dev-ml/uunf:=
+ dev-ml/uutf:=
+ dev-ml/zarith:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-ml/cppo
+ >=dev-ml/dune-2.9
+ dev-ml/findlib
+ test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/opam_swich_prefix_lib/s|\"lib|\"$(get_libdir)|" \
+ bin/gwrepl/mk_data.ml \
+ || die
+}
+
+src_configure() {
+ ocaml ./configure.ml --sosa-zarith || die
+}
+
+src_compile() {
+ emake distrib
+}
+
+src_install() {
+ dune_src_install
+ rm "${D}"/usr/share/doc/${PF}/geneweb/LICENSE || die
+ mv "${D}"/usr/share/doc/${PF}/geneweb/* "${D}"/usr/share/doc/${PF}/ || die
+
+ dodoc ICHANGES etc/README.txt etc/a.gwf
+
+ # Install manpages
+ doman man/*
+
+ cd distribution/gw
+ insinto /usr/share/${PN}
+ doins -r etc images lang setup gwd.arg
+
+ newinitd "${FILESDIR}/geneweb.initd-r1" geneweb
+ newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+ einfo "If you come from an old version you need to rebuild the database"
+ einfo "\"geneweb.gwu foo -o foo.gw \" will save the database (use the previous"
+ einfo "version to do that). \"geneweb.gwc foo.gw -o bar \" will restore it "
+ einfo "(using the current package)"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-03 19:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-06 17:58 [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2017-03-06 18:03 Alfredo Tupone
2021-09-18 16:51 Alfredo Tupone
2023-03-13 19:57 Alfredo Tupone
2024-06-03 19:55 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox