Respect nostrip, add gwc2 and minor fixes

Package-Manager: portage-2.1.4.4

4 files changed, 114 insertions, 3 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 98f07d18f48b..9fd73b3cc53d 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2008/01/03 22:34:47 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.4 2008/04/23 15:58:06 tupone Exp $
+
+*geneweb-5.01-r1 (23 Apr 2008)
+
+  23 Apr 2008; <atupone@gentoo.org> files/geneweb-5.01-gentoo.patch,
+  +geneweb-5.01-r1.ebuild:
+  Respect nostrip
+  Add additional gwc2, contrib/gwdiff.
+  Put html doc in the appropriate place
 
 *geneweb-5.01 (03 Jan 2008)
 
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 7df77e674500..9f84f0b07e29 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,10 +1,11 @@
 AUX geneweb-5.00-gentoo.patch 376 RMD160 474477fbae0816168f42ea2ee31a15895a776b50 SHA1 f4a09ed22849f9160a54c66dfb2afd8112396b51 SHA256 119255b891a9b8241321a496e1ee779d599a32318c13bb8803185ddea69cdf36
-AUX geneweb-5.01-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
 AUX geneweb.initd 539 RMD160 7598ae2d7b6a168a61942919b5e960732fa157fc SHA1 b660d4a2823cb8cab1bc476c1ca043af5a0a764a SHA256 b8542f690d933f6fa844cce3e74eec3d625a92e8bd825a8c71b2097b61b60973
 DIST geneweb-5.00.tgz 1379144 RMD160 11e0c02292802155dd6af57548cd5bdf95296d74 SHA1 e15ce1dbfafb05bf568c32dbcb2eb85f14029a99 SHA256 88d2e07af61795d4247281d584144c3ac1a914f790f696581f0e1ab087b0ee74
 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 2569 RMD160 471ccf9586d999795e8e605342e8026f28e94a6e SHA1 d8dc09107284a2a2ec37486a900d55b932ab7733 SHA256 bd90efd0804fef163ce015a7eac85cf864d24690e5647610b4afcc6fa78f9e3c
 EBUILD geneweb-5.01.ebuild 2521 RMD160 d3ba122c87138aa536e7ae76b55564538dbad3d4 SHA1 1a8c256c42ba26f203da4875bf71bbff41e892bc SHA256 15a4540bae2b434feebf6c082957ed51e457e4d86ace3adae805df89c15cf437
-MISC ChangeLog 793 RMD160 db248c695dd56ddee099091affd256b04f882c4f SHA1 c1bb03f458c4219d9d133413020c8a9a5067f908 SHA256 909bd3b9c236c3536ae9acedf11bdf870572b0acd3cf80efcf1ff34c169c6c51
+MISC ChangeLog 1019 RMD160 6167a6534647f23e8d3d2420ebb2c41c77863456 SHA1 399b2a6dd09247fe37612ebea21385c076b8fd09 SHA256 35f571b41617fbd3e44f7eb6d487e165c9d576201262c476b02b8c4f5a8a01d5
 MISC metadata.xml 559 RMD160 eac709327f92e4d5bd2b113a0a8805d71c889bd9 SHA1 f986ef9f7888818851cb65dee4eb0c38efbd339e SHA256 7ac848c91324d25cdb689b7a6063e68115d9e1f4616293fb052224a826701df8
diff --git a/app-misc/geneweb/files/geneweb-5.01-gentoo.patch b/app-misc/geneweb/files/geneweb-5.01-gentoo.patch
index fa3001aec4b9..9a334ef15a1e 100644
--- a/app-misc/geneweb/files/geneweb-5.01-gentoo.patch
+++ b/app-misc/geneweb/files/geneweb-5.01-gentoo.patch
@@ -11,3 +11,14 @@
  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
+@@ -9,7 +9,7 @@
+ OCAMLOPT=ocamlopt.opt -warn-error A
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static
diff --git a/app-misc/geneweb/geneweb-5.01-r1.ebuild b/app-misc/geneweb/geneweb-5.01-r1.ebuild
new file mode 100644
index 000000000000..f3e7179d8fb9
--- /dev/null
+++ b/app-misc/geneweb/geneweb-5.01-r1.ebuild
@@ -0,0 +1,91 @@
+# 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-r1.ebuild,v 1.1 2008/04/23 15:58:06 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"
+
+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/.*
+}
+
+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"
+}