version bump as per bug #202371 - thanks to fixes from Rainer Keller and suggestions from Xake. Old version cleanout + a few QA fixes

Package-Manager: portage-2.1.4.4

9 files changed, 43 insertions, 444 deletions

diff --git a/dev-util/monotone/ChangeLog b/dev-util/monotone/ChangeLog
index c2b27a5a5398..95a793d2dc5f 100644
--- a/dev-util/monotone/ChangeLog
+++ b/dev-util/monotone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/monotone
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.50 2007/10/26 20:30:28 ulm Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/ChangeLog,v 1.51 2008/04/02 02:11:15 dragonheart Exp $
+
+*monotone-0.39 (02 Apr 2008)
+
+  02 Apr 2008; Daniel Black <dragonheart@gentoo.org> -files/monotone.initd,
+  -monotone-0.29.ebuild, -monotone-0.32.ebuild, -monotone-0.33.ebuild,
+  -monotone-0.36.ebuild, +monotone-0.39.ebuild:
+  version bump as per bug #202371 - thanks to fixes from Rainer Keller and
+  suggestions from Xake. Old version cleanout
 
 *monotone-0.36-r1 (26 Oct 2007)
 
diff --git a/dev-util/monotone/Manifest b/dev-util/monotone/Manifest
index 93f0077a7850..12e1b2d0332f 100644
--- a/dev-util/monotone/Manifest
+++ b/dev-util/monotone/Manifest
@@ -5,19 +5,13 @@ AUX monotone-0.33.initd 2296 RMD160 4932ff86c24362d6ae902f29862420496ce465c2 SHA
 AUX monotone-0.35-numeric-vocab.patch 289 RMD160 3c4681aebc40a3928f95bb6de9855477f9e9b2fd SHA1 205b4e94d6ca304cf40c868228ee1522f80bb1d2 SHA256 bce25d6c17d3bd27eb22c42c29096bf9dbbf6b58c63393716905c78b51df0471
 AUX monotone-0.36.initd 2428 RMD160 2d204941ddd0c579140f7b4c6e10fdebb276cfef SHA1 9c261d1186d9223097ddc65b1b4e6e2a8b9e0524 SHA256 a4ec58c4ab7d7f51f09b8f804dda5710e7570f3e69cabd6d9580f8bd64b85a43
 AUX monotone.confd 810 RMD160 ab6522c3efdd17f55df19b63252b52200ddf0303 SHA1 bc1729612f237ee61f54e0f8249be2f2f991b431 SHA256 90e41f54ef11ad0be47942a2d5db339a8963fbc928116c85fdb5a81710f0af70
-AUX monotone.initd 2295 RMD160 c903add5ba9f2f1d44a0adf578e8eaf74c383f5d SHA1 239e386782967e5ca8c6d45dba95c6e85fb8d7b3 SHA256 349f785b81c1d3a20d2c2703a6c301d28e126495994812ba3e068f69e63edff3
 AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b83336348987f9c6f9a46f0191adf9fa87d1b83c SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
-DIST monotone-0.29.tar.gz 4544609 RMD160 00222f51b8888e1388fe6c0a29e9168eeafcf859 SHA1 94753405fae972ded446244e2e6768a994defbd5 SHA256 9ccda631303c96a2d6101ee1cfbc320de2de0ecb4e6503b573e29933ce68512d
-DIST monotone-0.32.tar.gz 4840983 RMD160 12c7992c62ff3ec9ec1fa2462a7ec532840dc129 SHA1 22e6ee1bb761cc8670756d78827b0684902832fd SHA256 24f183ddf26e08a3a28ee365e036938ba7fffcc2e1086d3a9bd4d62580e05b70
-DIST monotone-0.33.tar.gz 4763380 RMD160 dfffcd91e5d8069c632e86d3d6055abd1aff38b5 SHA1 7d2c88083e3329662f7e8b5ef673a2bcf8350622 SHA256 21a0502ae8b888d046d889478e7a0244f4761c4162edf70ec42399d3c2911947
 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
-EBUILD monotone-0.29.ebuild 3246 RMD160 58bedff3db79821498fd998165b5a821684c8a16 SHA1 cd0b4e72b60b29047a952674ce9ced5adf93841d SHA256 f7abb50f799f0d171a3d0ac37f9717f5bb5581cceb59f88c297804f5274f85c7
-EBUILD monotone-0.32.ebuild 3250 RMD160 7a56a0bf44c97eba75fe01b74138999a476f6351 SHA1 043ec3b0e3654d7db3cabae59f0152b0b4a45be4 SHA256 941f567ac3650a4d5d8a18e015916d996a5848ef7bb48ae226bf1c2e6aba77b7
-EBUILD monotone-0.33.ebuild 3238 RMD160 40947a99fc73914a055b1196e74b3a5bc558a01f SHA1 6c831f284db0cd41ce13421db78a88502caf615e SHA256 5c23d3e3e4fe66e3595a9fef566c2a689ecf9f26458a4974643246dfe37aa4c7
-EBUILD monotone-0.35.ebuild 3313 RMD160 fb85b0a03067c7f08bc977e07ea2b23428d28fe4 SHA1 d5fa5cf2f3478b450c5ac8f58937f1dfaa9c9135 SHA256 efadd96b45b62f7e68e79fb085042be7bd314ef1d1fd656243adac9c284d45ee
-EBUILD monotone-0.36-r1.ebuild 3325 RMD160 07dd8b93900e8532b27065a319ef6b1588008e0f SHA1 89c898d328ed27c66695f17e27f63901923ae96b SHA256 e86c7ad8adbdcb0396537c6aaa5c6a2a2ad8d605928c6e9d809dae1954534d2a
-EBUILD monotone-0.36.ebuild 3211 RMD160 ff19d8b63158a325ce5295105714f0138b7e1634 SHA1 f0e38dac06cdbe8371d1265bddabb93723644a16 SHA256 10e975745f81ba9c1c5aefaefac7395f48276b35277b8bc017af6e6c0a435c18
-MISC ChangeLog 8160 RMD160 910b48e43ff0690e432aca51e6ac7fc5867724bf SHA1 28f932fcc18568a0be34e55c2a4ceccf4ac124ac SHA256 f16d1be661e73dd7d838ecfab4bc32fa9d7090770da7e07d0ce1e8c666ed80aa
+DIST monotone-0.39.tar.gz 5332200 RMD160 d559c318e18f801513a170936fb56b6e1ac41235 SHA1 b34c7e25871ddff1e30d15b733c1f3283ec16de9 SHA256 77a3e8ec29a55c73a5b600d095408201180002656b46a175d2354f768374b4ec
+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.39.ebuild 3606 RMD160 97b6bb4986407988afce6495c1b3f92dea46c86b SHA1 6c2b7c797cda5d030c030a42995f90810155c518 SHA256 a4c5ee80d3127495680754bbec4348d5de4308ceec42e633feb577632268e98c
+MISC ChangeLog 8515 RMD160 c7e252566390d76e00c3710db67ea2b0cb289d18 SHA1 48b95d7cd3141a22216470eb90a08d0e4a2e257a SHA256 9b1ad568c2b3c5d1e288a0fdf68a87ae8b40097e56093ab4e3c9c16917b2d477
 MISC metadata.xml 1024 RMD160 85108ed2778629efe1db730bcca17511c1df0acf SHA1 f51b9fba062d2a7011df881c8c907b7bfa30373c SHA256 e55ef6758ed6927c8412a7514e43e869c1304b503b7ca3e6d8311558c2413c7c
diff --git a/dev-util/monotone/files/monotone.initd b/dev-util/monotone/files/monotone.initd
deleted file mode 100755
index f31ad1c74f01..000000000000
--- a/dev-util/monotone/files/monotone.initd
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/runscript
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/files/monotone.initd,v 1.1 2006/09/04 13:33:52 dragonheart Exp $
-
-opts="import"
-
-depend() {
-	need net
-}
-
-# Substitute common default values
-MTN_KEY=${MTN_KEY:-monotone@`hostname --fqdn`}
-MTN_CONFDIR=${MTN_CONFDIR:-/etc/monotone}
-MTN_COMMON="--norc --confdir=${MTN_CONFDIR} \
-	--keydir=${MTN_KEYDIR:-/var/lib/monotone/keys} \
-	--db=${MTN_DB:-/var/lib/monotone/default.mtn} \
-	--rcfile=${MTN_CONFDIR}/hooks.lua --log=/var/log/monotone/monotone.log"
-	#--dump=$ERRORLOG
-MTN_PIDFILE="/var/run/monotone/monotone.pid"
-
-dbexists() {
-	# Create the database if it doesn't exist
-	if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then
-		ebegin "Creating monotone database"
-		start-stop-daemon --start \
-			--chuid ${MTN_USER:-monotone}:${MTN_GROUP:-monotone}  \
-			--exec /usr/bin/mtn -- ${MTN_COMMON} db init
-		eend $?
-	fi
-	if [ ! -e ${MTN_KEYDIR:-/var/lib/monotone/keys}/${MTN_KEY} ]; then
-		ebegin "Creating monotone server keypair"
-		export MTN_PWD=${RANDOM}
-		yes "${MTN_PWD}" | \
-			start-stop-daemon --start \
-			--chuid ${MTN_USER:-monotone}:${MTN_GROUP:-monotone}  \
-			--exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY}
-			
-		eend $?
-		# Update the password lua hook
-		cat > ${MTN_CONFDIR}/passphrase.lua <<EOF
--- This file is automaticaly generated by the init scripts.
--- If you want to add custom hooks, edit ${MTN_CONFDIR}/hooks.lua
--- If you want to change the settings, please edit /etc/conf.d/monotone
-
-function get_passphrase(identity)
-  if (identity == "${MTN_KEY}") then
-    return "${MTN_PWD}"
-  end
-  return false
-end
-EOF
-	fi
-}
-
-start() {
-	dbexists
-
-	ebegin "Starting monotone server"
-	start-stop-daemon --start --background \
-		--chuid ${MTN_USER:-monotone}:${MTN_GROUP:-monotone}  \
-		--exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \
-		--key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve "*"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping monotone server"
-	start-stop-daemon --stop --quiet --pidfile ${MTN_PIDFILE}
-	eend $?
-}
-
-import() {
-	dbexists
-
-	# Read packets into the database
-	einfo "Importing packets to monotone database"
-	cat | /usr/bin/mtn ${MTN_COMMON} read
-	eend $?
-}
diff --git a/dev-util/monotone/monotone-0.29.ebuild b/dev-util/monotone/monotone-0.29.ebuild
deleted file mode 100644
index 6e963526fca1..000000000000
--- a/dev-util/monotone/monotone-0.29.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.29.ebuild,v 1.12 2007/07/12 01:05:42 mr_bones_ Exp $
-
-inherit elisp-common flag-o-matic bash-completion eutils
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://www.monotone.ca"
-SRC_URI="http://www.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*
-	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() {
-	local myconf="$(use_enable nls) \
-		$(use_enable ipv6)"
-
-	# 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 ${myconf} || die "configure failed"
-	emake || die "Compilation failed"
-
-	if use doc; then
-		make html || die 'html compilation failed'
-	fi
-
-	use emacs && elisp-compile contrib/*.el
-}
-
-src_test() {
-	make 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}
-		elisp-site-file-install "${FILESDIR}"/30monotone-gentoo.el
-	fi
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
-	docinto contrib
-	dodoc contrib/*
-	newconfd "${FILESDIR}"/monotone.confd monotone
-	newinitd "${FILESDIR}"/monotone.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
-}
diff --git a/dev-util/monotone/monotone-0.32.ebuild b/dev-util/monotone/monotone-0.32.ebuild
deleted file mode 100644
index 1d8834000dc4..000000000000
--- a/dev-util/monotone/monotone-0.32.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.32.ebuild,v 1.7 2007/07/12 01:05:42 mr_bones_ Exp $
-
-inherit elisp-common flag-o-matic bash-completion eutils
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://www.monotone.ca"
-SRC_URI="http://www.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() {
-	local myconf="$(use_enable nls) \
-		$(use_enable ipv6)"
-
-	# 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 ${myconf} || die "configure failed"
-	emake || die "Compilation failed"
-
-	if use doc; then
-		make html || die 'html compilation failed'
-	fi
-
-	use emacs && elisp-compile contrib/*.el
-}
-
-src_test() {
-	make 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}
-		elisp-site-file-install "${FILESDIR}"/30monotone-gentoo.el
-	fi
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
-	docinto contrib
-	dodoc contrib/*
-	newconfd "${FILESDIR}"/monotone.confd monotone
-	newinitd "${FILESDIR}"/monotone.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
-}
diff --git a/dev-util/monotone/monotone-0.33.ebuild b/dev-util/monotone/monotone-0.33.ebuild
deleted file mode 100644
index 8fe58bbb43cf..000000000000
--- a/dev-util/monotone/monotone-0.33.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.33.ebuild,v 1.2 2007/07/12 01:05:42 mr_bones_ 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() {
-	local myconf="$(use_enable nls) \
-		$(use_enable ipv6)"
-
-	# 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 ${myconf} || die "configure failed"
-	emake || die "Compilation failed"
-
-	if use doc; then
-		make html || die 'html compilation failed'
-	fi
-
-	use emacs && elisp-compile contrib/*.el
-}
-
-src_test() {
-	make 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}
-		elisp-site-file-install "${FILESDIR}"/30monotone-gentoo.el
-	fi
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
-	docinto contrib
-	dodoc contrib/*
-	newconfd "${FILESDIR}"/monotone.confd monotone
-	newinitd "${FILESDIR}"/${P}.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
-}
diff --git a/dev-util/monotone/monotone-0.35.ebuild b/dev-util/monotone/monotone-0.35.ebuild
index f93e82881677..15206d9a5373 100644
--- a/dev-util/monotone/monotone-0.35.ebuild
+++ b/dev-util/monotone/monotone-0.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.6 2007/10/24 00:50:26 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.35.ebuild,v 1.7 2008/04/02 02:11:15 dragonheart Exp $
 
 inherit elisp-common flag-o-matic bash-completion eutils
 
@@ -72,7 +72,7 @@ src_install() {
 		elisp-site-file-install "${FILESDIR}"/30monotone-gentoo.el
 	fi
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
+	dodoc AUTHORS ChangeLog NEWS README* UPGRADE
 	docinto contrib
 	dodoc contrib/*
 	newconfd "${FILESDIR}"/monotone.confd monotone
diff --git a/dev-util/monotone/monotone-0.36-r1.ebuild b/dev-util/monotone/monotone-0.36-r1.ebuild
index 3e3c68663fc2..650fd046c431 100644
--- a/dev-util/monotone/monotone-0.36-r1.ebuild
+++ b/dev-util/monotone/monotone-0.36-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/10/26 20:30:28 ulm Exp $
+# $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
 
@@ -71,7 +71,7 @@ src_install() {
 			|| die "elisp-site-file-install failed"
 	fi
 
-	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
+	dodoc AUTHORS ChangeLog NEWS README* UPGRADE
 	docinto contrib
 	dodoc contrib/*
 	newconfd "${FILESDIR}"/monotone.confd monotone
diff --git a/dev-util/monotone/monotone-0.36.ebuild b/dev-util/monotone/monotone-0.39.ebuild
index 55b6d67b473e..74ec150042ad 100644
--- a/dev-util/monotone/monotone-0.36.ebuild
+++ b/dev-util/monotone/monotone-0.39.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.1 2007/10/07 12:34:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monotone/monotone-0.39.ebuild,v 1.1 2008/04/02 02:11:15 dragonheart Exp $
 
 inherit elisp-common flag-o-matic bash-completion eutils
 
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 
 IUSE="doc emacs ipv6 nls"
 
-RDEPEND=">=dev-libs/boost-1.33.1
+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 )"
 
@@ -28,6 +29,10 @@ pkg_setup() {
 	if [[ "$(gcc-version)" == "3.3" ]]; then
 		die 'requires >=gcc-3.4'
 	fi
+	# https://bugs.gentoo.org/show_bug.cgi?id=202371#c2
+	if ! has userpriv ${FEATURES} && has test ${FEATURES}; then
+		ewarn "No test will be performed due to lack of FEATURES=userpriv"
+	fi
 }
 
 src_compile() {
@@ -43,11 +48,18 @@ src_compile() {
 		emake html || die 'html compilation failed'
 	fi
 
-	use emacs && elisp-compile contrib/*.el
+	if use emacs; then
+		cd contrib
+		elisp-comp *.el || die "elisp-comp failed"
+	fi
 }
 
 src_test() {
-	emake check || die "self test failed"
+	if has userpriv ${FEATURES}; then
+		emake check || die "self test failed"
+	else
+		ewarn 'not tested - requires FEATURES=userpriv'
+	fi
 }
 
 src_install() {
@@ -63,11 +75,12 @@ src_install() {
 	fi
 
 	if use emacs; then
-		elisp-install ${PN} contrib/*.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/30monotone-gentoo.el
+		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 ABOUT-NLS AUTHORS ChangeLog NEWS README* UPGRADE
+	dodoc AUTHORS ChangeLog NEWS README* UPGRADE
 	docinto contrib
 	dodoc contrib/*
 	newconfd "${FILESDIR}"/monotone.confd monotone
@@ -89,7 +102,7 @@ pkg_postinst() {
 
 	elog
 	elog "For details and instructions to upgrade from previous versions,"
-	elog "please read /usr/share/doc/${PF}/UPGRADE.gz"
+	elog "please read /usr/share/doc/${PF}/UPGRADE.bz2"
 	elog
 	elog "  1. edit /etc/conf.d/monotone"
 	elog "  2. import the first keys to enable access with"