cleaned out 0.36 version. Fixed boost depend in 0.35 (stable) so it is not a runtime depend. Thanks to gentoofan23 on irc for the prompting

(Portage version: 2.1.5_rc6)

3 files changed, 9 insertions, 117 deletions

diff --git a/dev-util/monotone/ChangeLog b/dev-util/monotone/ChangeLog
index 6886c83ed9f1..a77abb620f33 100644
--- a/dev-util/monotone/ChangeLog
+++ b/dev-util/monotone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/monotone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.53 2008/05/03 00:34:14 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.54 2008/05/03 01:01:11 dragonheart Exp $
+
+  03 May 2008; Daniel Black <dragonheart@gentoo.org> monotone-0.35.ebuild,
+  -monotone-0.36-r1.ebuild:
+  cleaned out 0.36 version. Fixed boost depend in 0.35 (stable) so it is not a
+  runtime depend. Thanks to gentoofan23 on irc for the prompting
 
 *monotone-0.40 (03 May 2008)
 
diff --git a/dev-util/monotone/monotone-0.35.ebuild b/dev-util/monotone/monotone-0.35.ebuild
index 15206d9a5373..0db6e7ce7cf2 100644
--- a/dev-util/monotone/monotone-0.35.ebuild
+++ b/dev-util/monotone/monotone-0.35.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/dev-util/monotone/monotone-0.35.ebuild,v 1.7 2008/04/02 02:11:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.35.ebuild,v 1.8 2008/05/03 01:01:11 dragonheart Exp $
 
 inherit elisp-common flag-o-matic bash-completion eutils
 
@@ -14,11 +14,11 @@ KEYWORDS="amd64 ~ia64 ppc x86"
 
 IUSE="doc emacs ipv6 nls"
 
-RDEPEND=">=dev-libs/boost-1.33.1
-	sys-libs/zlib
+RDEPEND="sys-libs/zlib
 	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.33.1
 	nls? ( >=sys-devel/gettext-0.11.5 )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/dev-util/monotone/monotone-0.36-r1.ebuild b/dev-util/monotone/monotone-0.36-r1.ebuild
deleted file mode 100644
index 650fd046c431..000000000000
--- a/dev-util/monotone/monotone-0.36-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.36-r1.ebuild,v 1.2 2008/04/02 02:11:15 dragonheart Exp $
-
-inherit elisp-common flag-o-matic bash-completion eutils
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://monotone.ca"
-SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-
-IUSE="doc emacs ipv6 nls"
-
-RDEPEND=">=dev-libs/boost-1.33.1
-	sys-libs/zlib
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	doc? ( sys-apps/texinfo )"
-
-pkg_setup() {
-	enewgroup monotone
-	enewuser monotone -1 -1 /var/lib/monotone monotone
-	if [[ "$(gcc-version)" == "3.3" ]]; then
-		die 'requires >=gcc-3.4'
-	fi
-}
-
-src_compile() {
-	# more aggressive optimizations cause trouble with the crypto library
-	strip-flags
-	append-flags $(test-flags -fno-stack-protector-all -fno-stack-protector)
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf $(use_enable nls) $(use_enable ipv6) || die "configure failed"
-	emake || die "Compilation failed"
-
-	if use doc; then
-		emake html || die 'html compilation failed'
-	fi
-
-	if use emacs; then
-		cd contrib
-		elisp-comp *.el || die "elisp-comp failed"
-	fi
-}
-
-src_test() {
-	emake check || die "self test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	mv "${D}"/usr/share/doc/"${PN}" "${D}"/usr/share/doc/"${PF}"
-
-	dobashcompletion contrib/monotone.bash_completion
-
-	if use doc; then
-		dohtml -r html/*
-		dohtml -r figures
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README* UPGRADE
-	docinto contrib
-	dodoc contrib/*
-	newconfd "${FILESDIR}"/monotone.confd monotone
-	newinitd "${FILESDIR}"/${PN}-0.36.initd monotone
-
-	insinto /etc/monotone ;
-	newins "${FILESDIR}"/hooks.lua hooks.lua
-	newins "${FILESDIR}"/read-permissions read-permissions
-	newins "${FILESDIR}"/write-permissions write-permissions
-
-	keepdir /var/lib/monotone/keys/ /var/log/monotone /var/run/monotone
-	fowners monotone:monotone /var/lib/monotone /var/lib/monotone/keys/ \
-		/var/log/monotone /var/run/monotone
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-
-	elog
-	elog "For details and instructions to upgrade from previous versions,"
-	elog "please read /usr/share/doc/${PF}/UPGRADE.gz"
-	elog
-	elog "  1. edit /etc/conf.d/monotone"
-	elog "  2. import the first keys to enable access with"
-	elog "     env HOME=\${homedir} mtn pubkey me@example.net | /etc/init.d/monotone import"
-	elog "     Thereafter, those with write permission can add other keys via"
-	elog "     netsync with 'monotone push --key-to-push=IDENT' and then IDENT"
-	elog "     can be used in the read-permission and write-permission files."
-	elog "  3. adjust permisions in /etc/monotone/read-permissions"
-	elog "                      and /etc/monotone/write-permissions"
-	elog "  4. start the daemon: /etc/init.d/monotone start"
-	elog "  5. make persistent: rc-update add monotone default"
-	elog
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}