Don't create a new version just for a blocking

Package-Manager: portage-2.1.4.5

4 files changed, 10 insertions, 98 deletions

diff --git a/app-misc/geneweb/ChangeLog b/app-misc/geneweb/ChangeLog
index 5b1170ea4db5..2065d857bd3e 100644
--- a/app-misc/geneweb/ChangeLog
+++ b/app-misc/geneweb/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2008/11/25 08:30:50 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/ChangeLog,v 1.10 2008/12/01 09:06:55 tupone Exp $
+
+  01 Dec 2008; Alfredo Tupone <tupone@gentoo.org> geneweb-5.01-r1.ebuild,
+  -geneweb-5.01-r2.ebuild:
+  Don't create a new version just for a blocking
 
 *geneweb-5.01-r2 (25 Nov 2008)
 
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index cee0696930e7..dd4bd29a488b 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -5,8 +5,7 @@ AUX geneweb.initd 539 RMD160 7598ae2d7b6a168a61942919b5e960732fa157fc SHA1 b660d
 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 2584 RMD160 9ecbfc1284ab2dc180c9cc9fd5025a50c7794fe6 SHA1 d331a06d1c398738e61c1c6ff6b49ef5a504353b SHA256 b51d34a87ecbfc8f6fb7f18415a05d22a6cbd6197b0773618e23c8771b0ce393
-EBUILD geneweb-5.01-r2.ebuild 2612 RMD160 9b3737da346036627ca5c6089be25145affd45d6 SHA1 5239fb2288b2ddb73a17153ff501bfff9ea4a7ac SHA256 e886c370a58b5f9cf1ba5657085372426382e00fb13499fd755aaf725d5b6719
+EBUILD geneweb-5.01-r1.ebuild 2609 RMD160 d3fe8c1ac0cd990c01f412c62d8aae9a0abe0991 SHA1 d72407770b7576657362d6ca9586d647728e715a SHA256 50f5970d688d76840252107c0034fe7a7e3730f65bf8acce90a68c48c3f2204b
 EBUILD geneweb-5.01.ebuild 2521 RMD160 d3ba122c87138aa536e7ae76b55564538dbad3d4 SHA1 1a8c256c42ba26f203da4875bf71bbff41e892bc SHA256 15a4540bae2b434feebf6c082957ed51e457e4d86ace3adae805df89c15cf437
-MISC ChangeLog 1654 RMD160 1340d1c8d0ea25821cfea04e9bf5dc0487dd1821 SHA1 3ee425690a632fe8e024ef0a7e1d64e6dcc28130 SHA256 5120259a9ba5269de762c585e955d056ff825598c375d5f26c72181cbc5039c1
+MISC ChangeLog 1806 RMD160 271518584c6c6ea93f4a07969aac3d709e8825b6 SHA1 725ca3e49df6d96f4ad36cdc7c31f751353abda3 SHA256 8d418287935fd5f06e918dbc22a7a6967f16e991f0320f137df49dc0bb2e03dd
 MISC metadata.xml 684 RMD160 5c80e490f6819d158bd3815482669ec6be63b535 SHA1 eae296c03121fb46e2eb2616147489d7249aa412 SHA256 36faaf48c73c074357d736ae887d64f49e0f43de0917ff1a765858eace2572d8
diff --git a/app-misc/geneweb/geneweb-5.01-r1.ebuild b/app-misc/geneweb/geneweb-5.01-r1.ebuild
index 3690fd2e43b5..feb5d995ae22 100644
--- a/app-misc/geneweb/geneweb-5.01-r1.ebuild
+++ b/app-misc/geneweb/geneweb-5.01-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2008/11/22 15:18:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geneweb/geneweb-5.01-r1.ebuild,v 1.5 2008/12/01 09:06:55 tupone Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="dev-lang/ocaml
-	dev-ml/camlp5"
+	dev-ml/camlp5
+	!net-p2p/ghostwhitecrab"
 
 pkg_setup() {
 	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt
diff --git a/app-misc/geneweb/geneweb-5.01-r2.ebuild b/app-misc/geneweb/geneweb-5.01-r2.ebuild
deleted file mode 100644
index 706cc02463b4..000000000000
--- a/app-misc/geneweb/geneweb-5.01-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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"
-}