Version bump to 6.06

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0145142D)

4 files changed, 169 insertions, 1 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index e2c1914a06b5..57b1114aaae6 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/geneweb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.23 2013/04/16 17:27:41 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.24 2013/04/19 06:08:47 tupone Exp $
+
+*geneweb-6.06 (19 Apr 2013)
+
+  19 Apr 2013; Alfredo Tupone <tupone@gentoo.org> +geneweb-6.06.ebuild,
+  +files/geneweb-6.06-gentoo.patch, +files/geneweb-6.06-parallellbuild.patch:
+  Version bump to 6.06
 
   16 Apr 2013; Tupone Alfredo <tupone@gentoo.org> -geneweb-6.02.ebuild,
   -files/geneweb-6.02-amd64.patch:
diff --git a/app-misc/geneweb/files/geneweb-6.06-gentoo.patch b/app-misc/geneweb/files/geneweb-6.06-gentoo.patch
new file mode 100644
index 000000000000..9a2e275dd526
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.06-gentoo.patch
@@ -0,0 +1,56 @@
+--- 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
+--- Makefile.old	2013-04-18 22:13:39.285809438 +0200
++++ Makefile	2013-04-18 22:14:10.073514138 +0200
+@@ -18,7 +18,6 @@
+ 	cd gwb2ged; $(MAKE) all
+ 	cd setup; $(MAKE) all
+ 	cd gwtp; $(MAKE) all
+-	cd gui; $(MAKE) all
+ 
+ opt::
+ 	cd wserver; $(MAKE) opt
+@@ -28,7 +27,6 @@
+ 	cd gwb2ged; $(MAKE) opt
+ 	cd setup; $(MAKE) opt
+ 	cd gwtp; $(MAKE) opt
+-	cd gui; $(MAKE) opt
+ 
+ install:
+ 	mkdir -p $(PREFIX)/bin
+@@ -111,7 +109,6 @@
+ 	cp setup/lang/lexicon.txt $(DESTDIR)/gw/setup/lang/.
+ 	cp setup/gwsetup $(DESTDIR)/gw/gwsetup$(EXE)
+ 	cp gui/gw/gui_lex.txt $(DESTDIR)/gw/.
+-	cp gui/gui $(DESTDIR)/gw/gui$(EXE)
+ 	cp LICENSE $(DESTDIR)/LICENSE.txt
+ 	cp etc/START.htm $(DESTDIR)/.
+ 	cp CHANGES $(DESTDIR)/CHANGES.txt
diff --git a/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch
new file mode 100644
index 000000000000..a1b5fe742a17
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.06-parallellbuild.patch
@@ -0,0 +1,23 @@
+--- wserver/Makefile.old	2011-03-11 13:47:04.000000000 +0100
++++ wserver/Makefile	2011-03-11 13:47:20.000000000 +0100
+@@ -5,7 +5,8 @@
+ OBJS=wserver.cmo
+ 
+ all:: pa_macro5.cmo $(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:
diff --git a/app-misc/geneweb/geneweb-6.06.ebuild b/app-misc/geneweb/geneweb-6.06.ebuild
new file mode 100644
index 000000000000..eb9fd1cc2e11
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.06.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-6.06.ebuild,v 1.1 2013/04/19 06:08:47 tupone Exp $
+
+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/211/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+	dev-ml/camlp5"
+DEPEND="${RDEPEND}
+	!net-p2p/ghostwhitecrab"
+
+S=${WORKDIR}/gw-${PV}-src
+
+src_prepare() {
+	esvn_clean
+	epatch "${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
+	make 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)"
+}