Use the new database format for amd64

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

3 files changed, 92 insertions, 5 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index cce2a5f44af1..91841fe73539 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2013/04/12 09:13:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.22 2013/04/16 06:43:00 tupone Exp $
+
+*geneweb-6.02-r1 (16 Apr 2013)
+
+  16 Apr 2013; Alfredo Tupone <tupone@gentoo.org> +geneweb-6.02-r1.ebuild:
+  Use the new database format for amd64
 
 *geneweb-6.02 (12 Apr 2013)
 
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 5519937497f7..5e5347015443 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -12,13 +12,14 @@ AUX geneweb.initd 539 SHA256 d1f301e1fa8c12e974a43dde6fe35ae3c3dec7169c5f6d9f577
 DIST geneweb-5.02.tgz 1419164 SHA256 8be9ce98883043d5e6e1e473e3bb3c2c18920cd6ad60192e859101f472385704 SHA512 6f7ab8b5592b84a1c832c32353e0da772bb704a23dd6305fc7ea12353a4faa65462b18e4554c2b55e7698a26e72a6788639691b3d0fa98041eddb48e92102c5a WHIRLPOOL a11a9cc7c2e9fdd9e54fb90c7cf63f11cb73538fc7a42d705b57184e0af9808dda0b388f1d0025b2b1c21c855ff3daa0c19c1e0b5ef3c9e5c9264e0672ddd48e
 DIST gw-6.02-src.tgz 2734846 SHA256 534ac93f5c7d5667dd57bf4765f847836228fe92ed1b793a74997c71005127d4 SHA512 fd1f194295299db3886499c62519c823305c39d07f8da5dca0f40c4447192ed7e9c6b7ac68665d9c09811a6cbbe268c3fb5f0bda8aeb74a054f610c2c4d5f02e WHIRLPOOL 37c40974259d82e5e8f9756e3b962726566c1384fe605ee2d599830c251af669210b871b567a7948f001f8bc8623e16b373700eb448fcf22fdf79daf68597293
 EBUILD geneweb-5.02.ebuild 2323 SHA256 de4610d306d48bed76091e4d969eef25bda324b0a98c0bcc399580aca4771b71 SHA512 9b07e20e210ca2c76ae468c4afc084a7c7525302a10b5e776bc946ceae26d6bbfbe4276767e823caa52b5898a402d0a8f7b01b41129eba18a8304b449e236698 WHIRLPOOL 3330f02aa910a3e07c395c219d2310c933c0d13a714ce144bb92a6c89d8aa23399e602aca4a64f5362ea7a2f34beba250809f9cae2363737f50c97e91e3324d8
+EBUILD geneweb-6.02-r1.ebuild 2124 SHA256 abf1dda74c336a3e8f5b831df12c5d32bb8e8cec20fbfdfa6a5b59cd5bdc3d74 SHA512 14bc9b6a2f298a39638508f69783aac9d5a46c02f17d3c818fccdcd67e98a3b42d0a3448f09730e1f786697c6ef05fef2e9004b5f82d97bc6fb2fabe3f998552 WHIRLPOOL c7d9e45084d70c3642c10c49f9d6fc5524b60e93d7904e730e8944a79ef8ede891d60efee8bbd4209161f623d3055b9dc94afc6c0c2f6b1db26bab08807898f9
 EBUILD geneweb-6.02.ebuild 1908 SHA256 c6fae351fb192c056e7cdc608b6101099fbdc73d7b6552c218c8e271fe69d37a SHA512 6b7c464841912288878d283baadfcd1c12aec8550abae01913de28e4ac2c500b57ca23efc4521f71f5e426c8727dc1bdf232ae49179f7d4e744557102b49c04b WHIRLPOOL 2bfc3efcd22672aae5d56b0451a909983d06467d2df5c05cfadbd2d7d7c7dc6a5adf97e253b15a81c348779f408e715a06a72f1902c79a904f5b7dfc9cffff68
-MISC ChangeLog 3572 SHA256 22e59cd838e3e56427be37d6290afb0b31395d27bd38175163048a6bfedb82c1 SHA512 eda2fedd358d4b1c156f6ce72331ffb0dcb1e77e031a2f8d0fb6916e1b27da40677296f85ddbb58addc999d7623266e1a58fcc62ead2fe53345f8de4b42b5fb5 WHIRLPOOL 46f679e5d2d3c736c7f31f2b6ceee2340febe6132f2e126f5caaa168a4181989fadbf2e34a33f8f7506d4985d0e22e00668035db50dff20da910eba8c7945559
+MISC ChangeLog 3720 SHA256 edf51648e06138e1d78864448904e46673c6c249a226281f6d1a190107cf0624 SHA512 01c0656f8d0dad6ee89a093eae6f0196946ad78416495ab05f0dd7acca9460adf21d856290981b38855c86bacd8b4c48ae040d41ff7e9fe2d03186d17e049b39 WHIRLPOOL 52cc5bb684fb1142971a1940105381f25d8005a06bd42584cf98f05ced5bf970430fd26bea2d0a5740533cd0a217fd487bebde14b16182cf602b8fe48941aebe
 MISC metadata.xml 663 SHA256 3fbb6788d796221795bb8ed0cfbe45d19d0dc6eec5bdc2a3c22b5420bbb4a6b3 SHA512 9ceb72e3306f5bf8cd56d2e67d741c5cf929dad48263d07e935f1d19300d72bfe5207eabcc032c8d83aefe9c90fff9776394419daf862dad7ad0412853272e84 WHIRLPOOL 38f10127a943cf62e39307c7692284146f58fd620c535449c6aedcf21fc50e98df9b3f0c1c15fdc567ed7596794821ef5f70f5aacff69be645f8c1cfd31e1caa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFn0JsACgkQIY77eQFFFC3FLwCgv4rQ7pz8HP2srR/Yud/AjMHV
-cH4AoKOt9y5zNpkJ4Lk/Zm9pNxFKn0UN
-=wx04
+iEYEAREIAAYFAlFs8vkACgkQIY77eQFFFC1SHQCfZXyQvQD+FHbKDh8aWdvcgMQ9
+H64AoOUTaBFS91h5DOZdFbawmdeU+esB
+=Yxh6
 -----END PGP SIGNATURE-----
diff --git a/app-misc/geneweb/geneweb-6.02-r1.ebuild b/app-misc/geneweb/geneweb-6.02-r1.ebuild
new file mode 100644
index 000000000000..b72f16b466ae
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.02-r1.ebuild
@@ -0,0 +1,81 @@
+# 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.02-r1.ebuild,v 1.1 2013/04/16 06:43:00 tupone Exp $
+
+EAPI=4
+inherit eutils user
+
+MY_PN=gw
+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/126/${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}/${MY_P}-src
+
+src_prepare() {
+	esvn_clean
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-parallellbuild.patch
+	cp tools/Makefile.inc.unix tools/Makefile.inc
+}
+
+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() {
+	make distrib
+	cd distribution/gw
+	# Install doc
+	dodoc CHANGES.txt
+	# Install binaries
+	dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb gwb2ged gwsetup
+	insinto /usr/lib/${PN}
+	doins -r gwtp_tmp/*
+	dodoc a.gwf
+	insinto /usr/share/${PN}
+	doins -r css 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)"
+}