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

Package-Manager: portage-2.1.5_rc6

4 files changed, 11 insertions, 121 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/Manifest b/dev-util/monotone/Manifest
index 2005ee0846c1..4fef5a9b3e43 100644
--- a/dev-util/monotone/Manifest
+++ b/dev-util/monotone/Manifest
@@ -8,12 +8,10 @@ AUX monotone.confd 810 RMD160 ab6522c3efdd17f55df19b63252b52200ddf0303 SHA1 bc17
 AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b83336348987f9c6f9a46f0191adf9fa87d1b83c SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.35.tar.gz 4857094 RMD160 91cb91fc25415f8357a57f199a5f83b8ea9293a1 SHA1 b745eee239ab198f4263493c7f79cfd1b6935127 SHA256 bbe0c5ff34f58a8af81563560e5f21408a568dfe277baa452a56f19b5b7a07de
-DIST monotone-0.36.tar.gz 4836460 RMD160 1e542073aa0f528e04653a66693a219b71f905fd SHA1 d6f5ae91dc8045624dfc0dfbca00d60fea569ac3 SHA256 99042322392ff6b7024a75935324287109fb7260d0e6b3e6aafdac9a67d0b2a4
 DIST monotone-0.39.tar.gz 5332200 RMD160 d559c318e18f801513a170936fb56b6e1ac41235 SHA1 b34c7e25871ddff1e30d15b733c1f3283ec16de9 SHA256 77a3e8ec29a55c73a5b600d095408201180002656b46a175d2354f768374b4ec
 DIST monotone-0.40.tar.gz 5366351 RMD160 142ae0723337bff0cec5701d50fdd0eb41659e6c SHA1 f1fda6b1d75a359488d09599995526e71a5ef481 SHA256 309490c8ff8b7d0d1fb5bccf762744244dbc0b5c0b8381023fa202db76ff417f
-EBUILD monotone-0.35.ebuild 3307 RMD160 0a3bff736104234e25289e5154a62b2dcf793ce2 SHA1 769ff5661a3036937bd941b8ab27e353db82f7c9 SHA256 ea7460f9214be6e893e28f0c5072fed47093e0a6fcb98446b4f713e85baa1e46
-EBUILD monotone-0.36-r1.ebuild 3323 RMD160 6a0974883a76db4b02245d1d084b7f02895b4131 SHA1 4f6b7044b13c9d1268a9cbf8449d1a903ce185d1 SHA256 1ac0255a1d0c6a5a8ad00c8c3910b1040e9631f1c0ebd312d5beda4c7496f9e4
+EBUILD monotone-0.35.ebuild 3307 RMD160 036583d39b5190b43db2f0a1daa83605ce47a508 SHA1 3dcc107edc3369c870b9ce73501a8b4838700ac4 SHA256 18963ce89d9640d13468372a490542881c7c8335f0995ca194b2a0df6731f454
 EBUILD monotone-0.39.ebuild 3657 RMD160 b8be02c5cf146eac812a5a276c5a8a3745b62e61 SHA1 b29d08a8b1f8ec9ed31bf8e4b23de4347ac495b8 SHA256 112182b080f785fb7618aac1fcadb943a9ec32e94b6224af09f34ed766570f8f
 EBUILD monotone-0.40.ebuild 3657 RMD160 970327c0c9ef55dca40272f8fa20905ab28683ec SHA1 4ff151e91cf463a183acc5bf74c5e9ada82495a8 SHA256 9f6f219c68a95f4860377815965f0a55111332bd1b23349dd9a7935c85324e3c
-MISC ChangeLog 8778 RMD160 f2ee4461fdadb3471d03471a710063b301e0186c SHA1 326a05734e1655c2e087115c9684846f8aac659e SHA256 19b5a25fa597b883b3f642e312e5772c5918244dad6ce4ebde2d9240abbddb88
+MISC ChangeLog 9026 RMD160 da589ca06d0a22889961281c212e3e1345cbf1ea SHA1 35d8b583875dafab74ee6ff0d3d88a605ed63229 SHA256 71c575fb247cc54ef880df7f7893cebd540f426a4767e6712d3a3e0ea013cfcc
 MISC metadata.xml 1024 RMD160 85108ed2778629efe1db730bcca17511c1df0acf SHA1 f51b9fba062d2a7011df881c8c907b7bfa30373c SHA256 e55ef6758ed6927c8412a7514e43e869c1304b503b7ca3e6d8311558c2413c7c
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
-}