Cleanup due bug #96436

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 139 deletions

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 8f29163345bb..a1fe65b01728 100644
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/monotone
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.24 2012/06/07 22:13:04 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.25 2013/02/16 12:39:34 pacho Exp $
+
+  16 Feb 2013; Pacho Ramos <pacho@gentoo.org> -monotone-1.0-r2.ebuild,
+  metadata.xml:
+  Cleanup due bug #96436
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> monotone-0.99.1-r1.ebuild,
   monotone-1.0-r2.ebuild, monotone-1.0-r3.ebuild:
@@ -414,4 +418,3 @@
   +monotone-0.15.ebuild:
   initial import as per bug #39383. Ebuild based of contributions from Peter
   Simons <simons@cryp.to> and Wojciech Milkowski <wmilkowski@gazeta.pl>.
-
diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml
index 53a4fd3841c6..ffe46506ae02 100644
--- a/dev-vcs/monotone/metadata.xml
+++ b/dev-vcs/monotone/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>proxy-maintainers</herd>
   <maintainer>
     <email>johnny@localmomentum.net</email>
     <name>Jonny</name>
 	<description>Future Maintainer</description>
   </maintainer>
-  <maintainer>
-  	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-  </maintainer>
   <longdescription>
     A free distributed version control system. It provides a simple,
     single-file transactional version store, with fully disconnected
diff --git a/dev-vcs/monotone/monotone-1.0-r2.ebuild b/dev-vcs/monotone/monotone-1.0-r2.ebuild
deleted file mode 100644
index 54c55a5a5665..000000000000
--- a/dev-vcs/monotone/monotone-1.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.3 2012/06/07 22:13:04 zmedico Exp $
-
-# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
-EAPI="4"
-inherit bash-completion elisp-common eutils toolchain-funcs user
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://monotone.ca"
-SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE="doc emacs ipv6 nls test"
-
-RDEPEND="sys-libs/zlib
-	emacs? ( virtual/emacs )
-	>=dev-libs/libpcre-7.6
-	>=dev-libs/botan-1.8.0
-	>=dev-db/sqlite-3.3.8
-	>=dev-lang/lua-5.1
-	net-dns/libidn"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.33.1
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	doc? ( sys-apps/texinfo )
-	test? ( dev-tcltk/expect
-		app-shells/bash-completion )"
-
-pkg_setup() {
-	enewgroup monotone
-	enewuser monotone -1 -1 /var/lib/monotone monotone
-}
-
-src_prepare() {
-	if [[ $(gcc-major-version) -lt "3"  ||
-		( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
-		die 'requires >=gcc-3.4'
-	fi
-	epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch"
-	epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch"
-	epatch "${FILESDIR}/monotone-1.0-glibc-2.14-file-handle.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable ipv6)
-}
-
-src_compile() {
-	emake
-
-	use doc && emake html
-
-	if use emacs; then
-		cd contrib || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_test() {
-	# Disables netsync_bind_opt test
-	# https://code.monotone.ca/p/monotone/issues/179/
-	export DISABLE_NETWORK_TESTS=true
-	if [[ ${UID} != 0 ]]; then
-		emake check
-	else
-		ewarn "Tests will fail if ran as root, skipping."
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
-
-	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
-	fi
-
-	dodoc AUTHORS NEWS README* UPGRADE
-	docinto contrib
-	docompress -x /usr/share/doc/${PF}/contrib
-	dodoc -r 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,run}/monotone
-	fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,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.bz2"
-	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
-}