Block conflicting package net-p2p/ghostwhitecrab. Bug #248154

Package-Manager: portage-2.1.4.5

3 files changed, 101 insertions, 12 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index ca166845837c..5b1170ea4db5 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/geneweb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.8 2008/11/22 15:18:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.9 2008/11/25 08:30:50 tupone Exp $
+
+*geneweb-5.01-r2 (25 Nov 2008)
+
+  25 Nov 2008; Alfredo Tupone <tupone@gentoo.org> +geneweb-5.01-r2.ebuild:
+  Block conflicting package net-p2p/ghostwhitecrab.
+  Bug #248154 by <flameeyes@gentoo.org>
 
   22 Nov 2008; Markus Meier <maekke@gentoo.org> geneweb-5.01-r1.ebuild:
   x86 stable, bug #247170
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 988f1a265f7b..cee0696930e7 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX geneweb-5.00-gentoo.patch 376 RMD160 474477fbae0816168f42ea2ee31a15895a776b50 SHA1 f4a09ed22849f9160a54c66dfb2afd8112396b51 SHA256 119255b891a9b8241321a496e1ee779d599a32318c13bb8803185ddea69cdf36
 AUX geneweb-5.01-gentoo.patch 648 RMD160 40a92608cf99934be66c9b54233305b502c73d4c SHA1 7e3d54f07f9fd2feb9687cfac55a135fabeb2193 SHA256 cd6663d6266aa5e1b19029c07fc94ac79bac4d777cb17bea2ad70e839a22d388
 AUX geneweb.confd 67 RMD160 4de8a9e76c426dc7435d197bef470ea369be3b1d SHA1 a20103555d17633fc08dfc442e746d4fe117867b SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1
@@ -9,13 +6,7 @@ DIST geneweb-5.00.tgz 1379144 RMD160 11e0c02292802155dd6af57548cd5bdf95296d74 SH
 DIST geneweb-5.01.tgz 1388008 RMD160 75507bb35df74b92becc8514c9ad82c8f4ef886e SHA1 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e SHA256 dcc6b2ea4659e8dc816ab3ea573d9177bdd83597c36d8628f9ce1dbc30a28e6c
 EBUILD geneweb-5.00.ebuild 1764 RMD160 4eec073ed711bc22f9a1910c7556e66515c24529 SHA1 67b2afdf03f225078de86c077820de675c2b4c2d SHA256 9c37455509f08c72441197d08323622019c9ea32c528b58a2a8b9d72335bccf4
 EBUILD geneweb-5.01-r1.ebuild 2584 RMD160 9ecbfc1284ab2dc180c9cc9fd5025a50c7794fe6 SHA1 d331a06d1c398738e61c1c6ff6b49ef5a504353b SHA256 b51d34a87ecbfc8f6fb7f18415a05d22a6cbd6197b0773618e23c8771b0ce393
+EBUILD geneweb-5.01-r2.ebuild 2612 RMD160 9b3737da346036627ca5c6089be25145affd45d6 SHA1 5239fb2288b2ddb73a17153ff501bfff9ea4a7ac SHA256 e886c370a58b5f9cf1ba5657085372426382e00fb13499fd755aaf725d5b6719
 EBUILD geneweb-5.01.ebuild 2521 RMD160 d3ba122c87138aa536e7ae76b55564538dbad3d4 SHA1 1a8c256c42ba26f203da4875bf71bbff41e892bc SHA256 15a4540bae2b434feebf6c082957ed51e457e4d86ace3adae805df89c15cf437
-MISC ChangeLog 1454 RMD160 01cc9887a9a135267ec606d9288354d13f7d7933 SHA1 6d8b20d43102c9c1fc41812d3daec7b304faf5a3 SHA256 f8816618a9bcb427a7dc3e9c3afdd9eed39ac05f35940cdaa584452e3205b9d1
+MISC ChangeLog 1654 RMD160 1340d1c8d0ea25821cfea04e9bf5dc0487dd1821 SHA1 3ee425690a632fe8e024ef0a7e1d64e6dcc28130 SHA256 5120259a9ba5269de762c585e955d056ff825598c375d5f26c72181cbc5039c1
 MISC metadata.xml 684 RMD160 5c80e490f6819d158bd3815482669ec6be63b535 SHA1 eae296c03121fb46e2eb2616147489d7249aa412 SHA256 36faaf48c73c074357d736ae887d64f49e0f43de0917ff1a765858eace2572d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkoIt4ACgkQkKaRLQcq0GKPFgCfWGVyMhIDm4a1w7KkiT1P3WmF
-XfQAn1CEP+XoCnIM8Mvf64I4nFhvNLUn
-=an5n
------END PGP SIGNATURE-----
diff --git a/app-misc/geneweb/geneweb-5.01-r2.ebuild b/app-misc/geneweb/geneweb-5.01-r2.ebuild
new file mode 100644
index 000000000000..706cc02463b4
--- /dev/null
+++ b/app-misc/geneweb/geneweb-5.01-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.01-r2.ebuild,v 1.1 2008/11/25 08:30:50 tupone Exp $
+
+inherit eutils
+
+EAPI="1"
+
+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"
+
+DEPEND="dev-lang/ocaml
+	dev-ml/camlp5
+	!net-p2p/ghostwhitecrab "
+
+pkg_setup() {
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt
+	then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.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() {
+	econf
+	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"
+}