Version bump to 6.02

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

6 files changed, 156 insertions, 3 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 84c53633abd7..cce2a5f44af1 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/geneweb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.20 2012/06/01 01:56:55 zmedico Exp $
+# 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 $
+
+*geneweb-6.02 (12 Apr 2013)
+
+  12 Apr 2013; Alfredo Tupone <tupone@gentoo.org> +geneweb-6.02.ebuild,
+  +files/geneweb-6.02-amd64.patch, +files/geneweb-6.02-gentoo.patch,
+  +files/geneweb-6.02-parallellbuild.patch:
+  Version bump to 6.02
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> geneweb-5.02.ebuild:
   inherit user for enewuser
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 8335a5a26f1c..5519937497f7 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,9 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX geneweb-5.02-amd64.patch 447 SHA256 b72d2102a72ac38871e12833652e1b784e898aa5e668b913c237c2e4c0de06b5 SHA512 5df916be4f339169473118cf4d81857e4de1fe8b48074aef9e63c6ed015138a7404695995e54e05da2c6e44c2e204e37cfdac64a13ff1a4f062b5698eaf8a0bf WHIRLPOOL 2ea1025ac45fc8cf1f49097c6bf58bfd536cb09682b336d99f00140e27c0ff018cb4231aeddb451f57f1c9ce81856eea3a51caccb7a9e3786b586b349d391daa
 AUX geneweb-5.02-gentoo.patch 781 SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545 SHA512 21408c7a4eba583242d751da6c688c2f175bb81fabac92644c936acd9bde5a9322e21f21306af7f53c261432f941e149219c045f21afab4401da98d7a004d69e WHIRLPOOL e74d266be237d10ca4a90ff01a9bb34f387e653a91a68ad4dc3a9d353839c969eee3e5438823c4649da2d317aa02d2d333e150d6ff98dd353eeeb1a7139d51ba
 AUX geneweb-5.02-parallellbuild.patch 368 SHA256 1f2c2c95b25c25f22566662e0463131e37775c43504df0d224a8b4cfe0e7d071 SHA512 97a3dd6268f7620a036b5a65a58bffe51f30d66f88d801125bfb7dc4729394e8ed841f1ae37d1ee15b56b99888dc2806d8ceb53e63e66ba96fe46e4c5b02b480 WHIRLPOOL c759a45071e5100da8da99bc069b8bd46b24865fcd31cb84954cf651e2c562420d9827b80c94718cabafc9669c5deffc8d02fa23264c22e96ce769379fa55545
+AUX geneweb-6.02-amd64.patch 447 SHA256 b72d2102a72ac38871e12833652e1b784e898aa5e668b913c237c2e4c0de06b5 SHA512 5df916be4f339169473118cf4d81857e4de1fe8b48074aef9e63c6ed015138a7404695995e54e05da2c6e44c2e204e37cfdac64a13ff1a4f062b5698eaf8a0bf WHIRLPOOL 2ea1025ac45fc8cf1f49097c6bf58bfd536cb09682b336d99f00140e27c0ff018cb4231aeddb451f57f1c9ce81856eea3a51caccb7a9e3786b586b349d391daa
+AUX geneweb-6.02-gentoo.patch 781 SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545 SHA512 21408c7a4eba583242d751da6c688c2f175bb81fabac92644c936acd9bde5a9322e21f21306af7f53c261432f941e149219c045f21afab4401da98d7a004d69e WHIRLPOOL e74d266be237d10ca4a90ff01a9bb34f387e653a91a68ad4dc3a9d353839c969eee3e5438823c4649da2d317aa02d2d333e150d6ff98dd353eeeb1a7139d51ba
+AUX geneweb-6.02-parallellbuild.patch 368 SHA256 1f2c2c95b25c25f22566662e0463131e37775c43504df0d224a8b4cfe0e7d071 SHA512 97a3dd6268f7620a036b5a65a58bffe51f30d66f88d801125bfb7dc4729394e8ed841f1ae37d1ee15b56b99888dc2806d8ceb53e63e66ba96fe46e4c5b02b480 WHIRLPOOL c759a45071e5100da8da99bc069b8bd46b24865fcd31cb84954cf651e2c562420d9827b80c94718cabafc9669c5deffc8d02fa23264c22e96ce769379fa55545
 AUX geneweb.confd 67 SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1 SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3 WHIRLPOOL 03be4026c4f23ebc6a73d3690318cd27616e23f31893645edae8cd257fd11b38b63feb52d2f91445ab1bef1b1ba20e609d837157c9d0102b771458d1ea1085b7
 AUX geneweb.initd 539 SHA256 d1f301e1fa8c12e974a43dde6fe35ae3c3dec7169c5f6d9f5776ee217e3b9213 SHA512 6d60b911338af71cf89b776f85d47ad1df8d07bb034a85b10081440becc8fabee9df11e87590474e5aaa2f3e16858b27b57ece93abb2aeac68c4bfa84f845759 WHIRLPOOL 185ca55744b65ffb05c9bb54af14d6a7563b246fba57fc1d025e6bc453bb9bee908fecd122ae222febb7b6ad6774f65e053ae5be22913acb413604fd45415294
 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
-MISC ChangeLog 3335 SHA256 6b406c2199e57d75bc6bf817a2ae869e93b5cd17edc306ef6baaff85e2eb5344 SHA512 e5db5bba8f38afcc243e8bbd589180edf5ecfcf95aee98647e8d416273397f76370b8bbb7c2f59d3ff1604e2211666dadce31f6291761adec9d29640465c208a WHIRLPOOL f43f1572c8ffde5672bcd4a2c2003a934373f7b0d647a31b130e79e4150681524ad87c82b930e4d4253df88ed282dc195b757e95f26dde34d390d391f579d458
+EBUILD geneweb-6.02.ebuild 1908 SHA256 c6fae351fb192c056e7cdc608b6101099fbdc73d7b6552c218c8e271fe69d37a SHA512 6b7c464841912288878d283baadfcd1c12aec8550abae01913de28e4ac2c500b57ca23efc4521f71f5e426c8727dc1bdf232ae49179f7d4e744557102b49c04b WHIRLPOOL 2bfc3efcd22672aae5d56b0451a909983d06467d2df5c05cfadbd2d7d7c7dc6a5adf97e253b15a81c348779f408e715a06a72f1902c79a904f5b7dfc9cffff68
+MISC ChangeLog 3572 SHA256 22e59cd838e3e56427be37d6290afb0b31395d27bd38175163048a6bfedb82c1 SHA512 eda2fedd358d4b1c156f6ce72331ffb0dcb1e77e031a2f8d0fb6916e1b27da40677296f85ddbb58addc999d7623266e1a58fcc62ead2fe53345f8de4b42b5fb5 WHIRLPOOL 46f679e5d2d3c736c7f31f2b6ceee2340febe6132f2e126f5caaa168a4181989fadbf2e34a33f8f7506d4985d0e22e00668035db50dff20da910eba8c7945559
 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
+-----END PGP SIGNATURE-----
diff --git a/app-misc/geneweb/files/geneweb-6.02-amd64.patch b/app-misc/geneweb/files/geneweb-6.02-amd64.patch
new file mode 100644
index 000000000000..6ca0c3197a9f
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.02-amd64.patch
@@ -0,0 +1,11 @@
+--- src/iovalue.ml.old	2011-09-29 08:55:02.000000000 +0200
++++ src/iovalue.ml	2011-09-29 08:55:42.000000000 +0200
+@@ -10,7 +10,7 @@
+    read inside a value output by output_value (no headers) must
+    match OCaml's input_value system (intern.c) *)
+ 
+-value sizeof_long = Sys.word_size / 8;
++value sizeof_long = 32 / 8;
+ value sign_extend_shift = (sizeof_long - 1) * 8 - 1;
+ value sign_extend x = (x lsl sign_extend_shift) asr sign_extend_shift;
+ 
diff --git a/app-misc/geneweb/files/geneweb-6.02-gentoo.patch b/app-misc/geneweb/files/geneweb-6.02-gentoo.patch
new file mode 100644
index 000000000000..a7cdff7a44c5
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.02-gentoo.patch
@@ -0,0 +1,30 @@
+--- 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.02-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.02-parallellbuild.patch
new file mode 100644
index 000000000000..a1307b9b4872
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.02-parallellbuild.patch
@@ -0,0 +1,12 @@
+--- 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
diff --git a/app-misc/geneweb/geneweb-6.02.ebuild b/app-misc/geneweb/geneweb-6.02.ebuild
new file mode 100644
index 000000000000..b2c899cee200
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.02.ebuild
@@ -0,0 +1,78 @@
+# 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.ebuild,v 1.1 2013/04/12 09:13:27 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}-amd64.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"
+}