Cleanup due bug #96436

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 19 insertions, 142 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/Manifest b/dev-vcs/monotone/Manifest
index 50ac31360225..133461289f4f 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50monotone-gentoo.el 1217 SHA256 bfd32a5f57abd47bd6bc35ce27c2a31dfd1c1f7517d869fc0bca6b715d8ea259 SHA512 c76f92fcf0f99dc9a419db1e8679a5854d015aa93046ad86aba10828a4b4651a3494f16d594faef74ce4cbf93f1e45cd99883ff777cf4d730a7f9e4a63f6b0e9 WHIRLPOOL 6be072c8f54418773776a1572324a66271866f474d25a72fab2e79894314e1624229a2479e960140c36ac188bd07d3e84e57829a2544bc3fbc317db56c7c2702
 AUX hooks.lua 154 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326 SHA512 1244786898087edfe5c11493081c38d498c5ed275449b040caf4b9fbd1b3c15d238246c3d9c62cbfb5d0dd5f9a9ebac12a50ce6471fc245ede5c5e944bdb88e2 WHIRLPOOL 8d539f2aa64a85353da5653ec6987a7915a4eed0bea1f44a4b7bfac7c62e702f04ac94010309c8a5a8cc9040c733f9d42aab0c95edc3bd56549a91e2609f218c
 AUX monotone-0.36.initd 2464 SHA256 c561618b38e7efce2a175bc166f1b4dfb9fcbb87ccb61e3df02f8dc9b7e615f2 SHA512 62d239a1d00d959c9834c601ecbc798796d6148a49992f98b795983eb687909eb497d2b6160d4aee74a74eee53452fe3cddeeb3093972a2590379b02ff5bf390 WHIRLPOOL 7e21a82b2438276f420fe998d5529f17e9921114ea9b3f7178c0ab53d54b5a091270b9b0dac0bc30b0b82349cb8c856204492e68a7509b470acf88bc317174b1
@@ -10,7 +13,13 @@ AUX write-permissions 32 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa
 DIST monotone-0.99.1.tar.gz 4940291 SHA256 204ebb12f36599ac4c105ae5bf45edd7da13a4e57dc45f31789634fc8c2b30a1 SHA512 b49ceda252fe593a6626d88e3c769a22c8b741462261c898f217ae08e2506ba0e349ccead3a1caa032aa7843e5d35298ea28b74439fc8166b7944c80995118a2 WHIRLPOOL 678a04866ec2f276d755a9d88692b9b825e67815ee5206b9b63726a9220f8a4278af4f6625fabfa03d5d9eb359416dfb238280f8db392eeafbf2a6dd9d6889f6
 DIST monotone-1.0.tar.bz2 3588074 SHA256 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc SHA512 85f5a015ee3f7a924e16b7f20974cadd18bd6aaf2815eca0da42689373fc654c661051ce6981ec473f9eac7f9796cfed3431f0cfe16d1cbe0b0b625302ef3e77 WHIRLPOOL c0379f4e37fc6dc8f47caf4b548f7ef124cdf3f7a87fccb3a4cc6d160bcff4092a4d9636d71558120c9e28ef072bcf5dd23d6e116ad49abb6c99a9886d1747df
 EBUILD monotone-0.99.1-r1.ebuild 3364 SHA256 7342df34e01a5314ae19d31c93025f34ca676577873565e0e39a41323b453abd SHA512 ed691786cb52985dd57cd23f6ad64837431902adf8a3dc5a8bee7513d17e9dd1eb6485f14085cc1305b3a3ccf5068d4215710619a941be5943bf1c8a0547eef9 WHIRLPOOL 031c6a73b7bf3c2fb2ead46d93dd173dfe979b0f0527211d441becd441f68d93c2814af841a9d109c9ecfa4b1f3f85901fb2d247decd7a8bffb3571df3e29738
-EBUILD monotone-1.0-r2.ebuild 3662 SHA256 0dbf53385a15fc471b71941f4b22ca818477c4c33ff806401e18c6f79b956908 SHA512 1160437a4299d4309f67fd3649e91728a8c11563e7c36984379a933355aa665f95a8ebdd0d9d18f4c87235b7a7bfd79c361ac13ce4b7ff22dfb266e5e57cda7d WHIRLPOOL 029a8829e3b4dd91eaf5ffdf35a93e53eb996bf97218cd3891ddb6719a6f13cf1cb4d614a76bd05e1bfe2a7683b29f0ea89e8b0bde7d96cae4aba9ae39e532e3
 EBUILD monotone-1.0-r3.ebuild 3361 SHA256 cc6720c95c898348e2716d089dfa7eb8dc0723afdb2ece43b9acde9d5f4dc21a SHA512 6efc69452e3db98c62ade60524cc8005ea5873af6201f68b38d24f02e3b92a70320c7f6f2e7e1efbf0d9dc9f2e4f5b9fff4f571852ee19d8bc90eee21d7c1f1a WHIRLPOOL de8dbdf09ffede168825114385788d2078b03b35dac604985f7ce7ec1fc98f425cf55bc1a229b9c9d7681d670a53aed37a5410b7f6692bc5f1ed469f1cfbf793
-MISC ChangeLog 15428 SHA256 1cc544e1a9c08ad82555b6aea3fb66132911e8e6b86725cf23139dcea7359449 SHA512 38a1965fc94e6261f55096a738752ec6d08e95a355c9a7ab924608047e25ec8b648596ddf4522f2503911c13118a53ef7bc5ec6e7059e2c0f45b52d34d2ed0c2 WHIRLPOOL eee1f53955f424e52f4a67b177309a473658031f7437d0c5bb9df074e854dd3c42883ff39bc8173631acab9dcd99ed87d1da87e5c2f6b2086e9599ee9419be3c
-MISC metadata.xml 991 SHA256 ffedc0e4cff4495d7569eeba2ef0938a5d0c6b655e7c941326d22353af88ffb0 SHA512 0427d4bac5748052c8b826a1cdbf1347da3cfbbbdcd18207c5dc932f0ad11b194645cbb2c1d48c08c7d25e00d110628e8308961325dc654ab71d1870936b5245 WHIRLPOOL 318b1828d533efcffa48568a738e0945b69fdbb96a503dadabbb4ecb6d15cf4d6976980f141e93c44841652072de94987ac507ab7b38ec7ea3b2f775517a8fee
+MISC ChangeLog 15538 SHA256 c24dcbd57cb3ffaeda8d33f1e88bcf421e070dd1ed5ba407e7db9d7c022b50a4 SHA512 2a9142d43a100ed0cfd5eb2bce372b4d8f1761d20ecff37cc21256d5fa30e656772811ca03c95f97574b0d6867a431e3ef093a0a95f13dc7c89ec73c0da99d09 WHIRLPOOL 477410c3671fdce47e5b4889423fd8759f37a1f04cd0a467246962ddb4008122ac0950c51b05251ba193d86687afdd4d84f99b3a0dc8673d7752699c8b5ca971
+MISC metadata.xml 931 SHA256 ccdef0fbdd5b80153d94cf72c025ae221a51bd14a4dc3b38a40468c28d0b72dc SHA512 260bcea0df75eade475421241de560d22ead3775f45e6d9e96ed56afb21e7faf05614a060ea6c3c6028e66f5e7a0ce059ec8ff0f334a0476c28701c3f2b91fea WHIRLPOOL ef9356aed0b0e4941d4c3d16919d3a056305e2b6ff85c68204774e0560d3c81e0301de7c5be7d47728392fc60cd246d5a04bdf6f230ecb365ec09b42df94cf7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEffgcACgkQCaWpQKGI+9QCPQCdFTrNGkyrqs7RzouVn29OU/Vo
+MnMAnRTh7K7UdkqId5X0HZvzcwa1wJSz
+=sBNC
+-----END PGP SIGNATURE-----
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
-}