Version bump to 5.02

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

5 files changed, 136 insertions, 3 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 7f057e616c19..9138b1ad7af5 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/geneweb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.12 2010/11/11 08:37:26 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.13 2011/03/11 12:55:01 tupone Exp $
+
+*geneweb-5.02 (11 Mar 2011)
+
+  11 Mar 2011; Alfredo Tupone <tupone@gentoo.org> +geneweb-5.02.ebuild,
+  +files/geneweb-5.02-gentoo.patch,
+  +files/geneweb-5.02-parallellbuild.patch:
+  Version bump to 5.02
 
   11 Nov 2010; Alfredo Tupone <tupone@gentoo.org>
   files/geneweb-5.01-gentoo.patch:
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index d0677b349e68..cd28dd67217c 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,7 +1,11 @@
 AUX geneweb-5.01-gentoo.patch 781 RMD160 08685f5705220be0109ad6bd34d1cef646d3caf7 SHA1 67d237ffc2d0c3493bc81c4aecaa393b86c2d92d SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545
+AUX geneweb-5.02-gentoo.patch 781 RMD160 08685f5705220be0109ad6bd34d1cef646d3caf7 SHA1 67d237ffc2d0c3493bc81c4aecaa393b86c2d92d SHA256 350e51a521ccac1790b5fc901b9ba51c2f884d16063ae7520cc4f7d2545a4545
+AUX geneweb-5.02-parallellbuild.patch 368 RMD160 71e529b9b69d5619cb5f13dd9857e00384ddaf07 SHA1 370045d1391942ef13f2bc3b269f091f495a1687 SHA256 1f2c2c95b25c25f22566662e0463131e37775c43504df0d224a8b4cfe0e7d071
 AUX geneweb.confd 67 RMD160 4de8a9e76c426dc7435d197bef470ea369be3b1d SHA1 a20103555d17633fc08dfc442e746d4fe117867b SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1
 AUX geneweb.initd 539 RMD160 7598ae2d7b6a168a61942919b5e960732fa157fc SHA1 b660d4a2823cb8cab1bc476c1ca043af5a0a764a SHA256 b8542f690d933f6fa844cce3e74eec3d625a92e8bd825a8c71b2097b61b60973
 DIST geneweb-5.01.tgz 1388008 RMD160 75507bb35df74b92becc8514c9ad82c8f4ef886e SHA1 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e SHA256 dcc6b2ea4659e8dc816ab3ea573d9177bdd83597c36d8628f9ce1dbc30a28e6c
+DIST geneweb-5.02.tgz 1419164 RMD160 fd284630e11957cf1265bfce9207e46d449a83ec SHA1 e040496b3ce106cc7a508360cd0e4268bcb3e7b1 SHA256 8be9ce98883043d5e6e1e473e3bb3c2c18920cd6ad60192e859101f472385704
 EBUILD geneweb-5.01-r1.ebuild 2250 RMD160 8ad5c91171d2002c3212661e5f00355c63d05d95 SHA1 ac21cd20862dc25b387bfaa987cfa164d291f827 SHA256 64f1ab7e7ce1e4ec7acdeed1d91059e0e88867e7fdf524b3c48a01b7977f2a88
-MISC ChangeLog 2122 RMD160 a7d560ae943096df80ff75dc25eb6d3ab7cdacdc SHA1 b1276871e475dd7f678db00e838371fbf5e5738b SHA256 46aca075c329b99c983929ecfbb16e051b9f78df9ca90eba85af12040e0f3aea
+EBUILD geneweb-5.02.ebuild 2290 RMD160 08eb3ca52d8c1339809d2c08949dd84bcdfdcf9c SHA1 027fd7abaf99ed009503add3c14113c1362d3d3e SHA256 df4f740c0108e8f1387f7044911e61aa97046c55e58ea96c1f6b0251bd8c5153
+MISC ChangeLog 2327 RMD160 2fa1ebc45e14c6c40265014729177ffafc451356 SHA1 9f4e7a7fb410db671aa2b39c5659c39bca5027f4 SHA256 40ccf7163d450817863291e81ce1bae407d1e26f1c0b76fa940a19a097491231
 MISC metadata.xml 684 RMD160 5c80e490f6819d158bd3815482669ec6be63b535 SHA1 eae296c03121fb46e2eb2616147489d7249aa412 SHA256 36faaf48c73c074357d736ae887d64f49e0f43de0917ff1a765858eace2572d8
diff --git a/app-misc/geneweb/files/geneweb-5.02-gentoo.patch b/app-misc/geneweb/files/geneweb-5.02-gentoo.patch
new file mode 100644
index 000000000000..a7cdff7a44c5
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-5.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-5.02-parallellbuild.patch b/app-misc/geneweb/files/geneweb-5.02-parallellbuild.patch
new file mode 100644
index 000000000000..a1307b9b4872
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-5.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-5.02.ebuild b/app-misc/geneweb/geneweb-5.02.ebuild
new file mode 100644
index 000000000000..d7c14abc931b
--- /dev/null
+++ b/app-misc/geneweb/geneweb-5.02.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.02.ebuild,v 1.1 2011/03/11 12:55:01 tupone Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Genealogy software program with a Web interface."
+HOMEPAGE="http://cristal.inria.fr/~ddr/GeneWeb/"
+SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/${PN}/Src/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+	dev-ml/camlp5"
+DEPEND="${RDEPEND}
+	!net-p2p/ghostwhitecrab"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-parallellbuild.patch
+	sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		setup/setup.ml || die "Failed sed for gentoo path"
+	rm -f contrib/gwdiff/.{cvsignore,depend}
+}
+
+src_compile() {
+	if use ocamlopt; then
+		emake || die "Compiling native code executables failed"
+	else
+		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out \
+			|| die "Compiling byte code executables failed"
+		# 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 || die "Failed making distrib"
+	cd distribution/gw
+	# Install doc
+	dodoc CHANGES.txt
+	# Install binaries
+	dobin gwc gwc2 consang gwd gwu update_nldb ged2gwb gwb2ged gwsetup \
+		|| die "Failed installing binaries"
+	insinto /usr/lib/${PN}
+	doins -r gwtp_tmp/* || die "Failed installing CGI program"
+	dodoc a.gwf
+	dohtml -r doc/*
+	insinto /usr/share/${PN}
+	doins -r etc images lang setup gwd.arg only.txt\
+		|| die "Failed installing data"
+
+	cd ../..
+
+	# Install binaries
+	dobin src/check_base \
+		|| die "Failed installing check_base binaries"
+	# Install manpages
+	doman man/* || die "Failed installing man pages"
+
+	# Install doc
+	dodoc ICHANGES
+	insinto /usr/share/doc/${PF}/contrib
+	doins -r contrib/{gwdiff,misc,templ} \
+		|| die "Failed installing contributions"
+
+	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"
+}