Install docs, accidentally dropped during multilib conversion, drop old revisions

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 23 insertions, 82 deletions

diff --git a/dev-util/cppunit/ChangeLog b/dev-util/cppunit/ChangeLog
index 0e9f31e5649f..07faeeb6bd97 100644
--- a/dev-util/cppunit/ChangeLog
+++ b/dev-util/cppunit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cppunit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.92 2014/06/07 11:53:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/ChangeLog,v 1.93 2014/07/06 21:07:00 pinkbyte Exp $
+
+*cppunit-1.13.2-r2 (06 Jul 2014)
+
+  06 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -cppunit-1.13.2.ebuild,
+  -cppunit-1.13.2-r1.ebuild, +cppunit-1.13.2-r2.ebuild, cppunit-9999.ebuild:
+  Install docs, accidentally dropped during multilib conversion, drop old
+  revisions
 
 *cppunit-1.13.2-r1 (07 Jun 2014)
 
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 534d37674add..f88dd3f5f21d 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -4,27 +4,18 @@ Hash: SHA256
 DIST cppunit-1.13.1.tar.gz 841334 SHA256 d5b9f3ffc9f1634d75b20b54f48c02e0817bca6afa1d5160b244889d6bff8e0f SHA512 3b588dd0ed35eca1dec1a7dcf21da40307b1da26d8e29a26a2fcb16cd4ba7e4dfdf58b6c3d537af2ad127c418b11ba62a1168312abb200d5aab8cb8475766a9d WHIRLPOOL 412bf0c5fe4437b694b89845f7ef29a564e4072890d4f5bacb657abbdc518e322b5db351f1ad123af403eef8a823439fdb1b2086c3e4c151076489c077d280d7
 DIST cppunit-1.13.2.tar.gz 953596 SHA256 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f SHA512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd WHIRLPOOL 13a76b2b4e999e46e90ab56a5b40e1a3fd4e42f15c083b6b5beb8e0d476a3d5162cafa6c906c931d9877a8ebc544077ab66712f2d8920238951b36862bcc949d
 EBUILD cppunit-1.13.1.ebuild 1636 SHA256 b14b67027554cef39fc65185f58128aaac20cdcc6360affa1798f1fc901d89e5 SHA512 8f819a9f63c91de60048148c9a2ca8b685e7ead5c27be74a334cd5bf3da27da28f0512f89d246e25946398c758362b1494221ac8d5c07fdf4f838717cb6d23db WHIRLPOOL fd1667ecc979c7017e8a32980b4404d1da363a2bf8c212e5004d6d268b8648886789cc5900d15cdfd9f7a8f56ec9f659618574ec27150cdbd052a6282332dd0b
-EBUILD cppunit-1.13.2-r1.ebuild 1833 SHA256 e2504ca277d8deb0bf619dfd90509e98accd3ac868aee35eaf080146f5c101e7 SHA512 94842658c6d82b1e7e3000ff82d50f5e1093cbec60c69668ec8f947fbe3880cf6f5444243c4f753890c6baba58818d462aa60807e1de62f4b53a37e2b2b91000 WHIRLPOOL 9730fb7deae6f6fc15275bdb2700bcdbc9e797004a6d58ba344faea32bd9769b23919da5528e56e74a713ee5c682496ddffd68e2f821e8c805d1a2248e99bf34
-EBUILD cppunit-1.13.2.ebuild 1646 SHA256 f729a5bf677d36c6d558b555028c925acb391e8712ef99a6a8508d4d6b9a329e SHA512 d2912ce7da038c670bf1ef5b21e8d9ad3a1e91b55d3ea47a0d9d3288822fb26a777d814d31b4e5b513307d169ff9e4a34906d1d350dc75afe478efed0d708e49 WHIRLPOOL 7145e9cbd45d58c8d4986340b520417b6221e1aaf049cd7896151a1b5263b24060552cb7908f4664c73f9bc6cd36220e6fd4b73ff574e5bc83ed3b4f4437d8a4
-EBUILD cppunit-9999.ebuild 1828 SHA256 eb4ebb587591dc64dabd1ac336ac8df5d3907ce25cba3bf794c26d25262adc20 SHA512 bf3b9985ef75ce3e32e0c58b156dc1e7b5e045ca8530d59818834134825c1cce3ea523e7e80b7a46d4b193d3f98e88e5f47e5fd6fda5630740284e1a3fdf4957 WHIRLPOOL 8579d04600c03f8ae79adec593c3207faab31afad885ffb4eb5e487412e4ab06383d41b7a1e1d878c275708da4baba49e6bbba95cb9e4df5398cfb9a5f5119fb
-MISC ChangeLog 11932 SHA256 f90d70574a66d0259d4b2838a62de83b379ce6a2b2523640c94b47b3236490b0 SHA512 2dc3e9d265c8391c2994d8fcdcfb48eaf5f77f0e284e1817b2eae9d1caca5aa8b1c54533cdf269860986c5ad6bbd9cfe1433cbf0eb3e47fcd928744debdf2028 WHIRLPOOL 53c61a50747702c5a0d7fecbb10ba80982b9994a61aba0fabc6e08106ce8741288b82c96d2f2a914f20799825ad67de9b31a2d50431f470698378151b6f9b16c
+EBUILD cppunit-1.13.2-r2.ebuild 1849 SHA256 13bdc1badbae8a1e574238a17dd20a547a559c08951be6164c90b720f3ee3653 SHA512 cd72b48d3bec8e0a8b77420d842945a1a5a857bf29f7bb98b640d08216fc3f7aaf561223b16009358b4f010d9c22c437073bd37129c05e05993b9d3846c9678e WHIRLPOOL 3e1d5c80806cb0f91c4a065fca7e07753ce5ad2dc8271a16bffe0589c0a8198fa85832b00fda1ba278bbae9fad6331124788ca2cacabbd6898265b2861849717
+EBUILD cppunit-9999.ebuild 1844 SHA256 a7f8e4ea151473bdc801ed8439fb84f8ebfe3e5bafabcab5af120a0d13d38968 SHA512 f27be82004181c9a418c13a52d0174ad09130635c345029da8054c88165a0325856b2af897a7b4568c41e2c149cbe137c7fb28a51fd80abe5651f45b0be51a2b WHIRLPOOL c1a85c40e055267580c8bc9cb61cff24815e655955397944f5359ae2225606040f434a37e8013c8076f64ca8ed5ba00a53ae38d12a1ef76f5b6f485129af14fd
+MISC ChangeLog 12206 SHA256 4a29b5e00baa5ad6e17387dc427c494f5e7d0af464730b4553200d8b7bccc981 SHA512 2954244b4ed4c5e30a75e6eae65107ca502dd7201eb94b1c28b86b34a0d50dfcd1f795b954046539b76786a8f93d785752b9feb6cf83f1b23133a89b32f35141 WHIRLPOOL e27d3d0623dfe4a9e2868a3e95956fdd2854f020baf6baf0bc9eba373f0b02a8d747bf1691e28498a32bce9cddc946d1f16e0dfe2acf076e1e7c79b7271f3560
 MISC metadata.xml 156 SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f SHA512 e91dd7187a03a5b11f6d23d0d620c7a0326c8b3631599d616c9bd4aaf5f7901fdf8405a86bae896ecbad57afcbc9f3515a067f78817d06de4a426d5a07e7cf75 WHIRLPOOL e7838d8e96cb2762d53f85ddc28d8034cd19c2ec76c5d5356d21e2508539b7dca9e8e2ed636731eb578aa9f914a6710f165e321aa3a321a4f622cf2624e38808
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTkv1RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEGcQALjNf1j8LX8tD6QCVoCUblAx
-OIwW3ZU16yU/C0CabE4eK6RBmz4F5KEGhAvZ8f3/wul/j9dNns/qKoFw0r3n3OR0
-s6aa+oOCE9Ex1r3sPIP5YyVfH1QCvH5Fp3PPLwQiZCCr6CNfpDB2GUsheEhjsbm6
-UxgZuKEPiGYHaD57+6z0xXcoWNylyFySw31y2p1GmI+e64us78T9Ntt2bbtMylYv
-YeKRoKc5ld6Wvi74pgfwTwvOCdYrYy3EpoXmsGtF5UUOXMrKr7i6OWngZmmBfwT8
-tEthVzvU45keNukGswxH55G77F3nkrFj/ZUY2jPRDG9W654RE2ykfMoWa3OjRU6B
-9UPoSX60UPeMEZkaPtEhBQ9csU7aGoyJ4s8foKs1nIlJ9G4EgBw9r+QQAmcO6bde
-n83OwB0HFkkhkr2giMDXVKy6ity5ibgWdgu+CjayWBrowr0++MG7J44pYaErd4Nk
-1Oa4aein3l2UsrEoRAAhib/Jb6WeSjS7tfuswOIQowDqPNlJmdtn+jHvHdPq4rPI
-+i91w6bXubtaTVwVxwKjL3eSVvXhWPf2sLCc0RJgakXoxb9f3MF1MS0rwax5O8FD
-IvpB0zoWDHLRXT5HlVWYyMcRnqZeMtkrZ6EoCS8TIaDjjTxDzlgKHA8//4GERHid
-NPpuYdtS6PeBHEtH+fJo
-=hZbA
+iQEcBAEBCAAGBQJTubp2AAoJECo/aRed926786sH/3TXHrPpbE6wE3i842Gzff9Z
+Yo6wWFI/EwdWjhjgK23V1o0ZTuHR6Tr/0fMJ0fhf+Y/2TKLCfLodDx8ANwAosO57
+y29NjYPUKIlHm1ulNSvWNdqBJTWHAn5TleGxV/55unco9fk7KIdEeqIpKrUe9mfQ
+SespyDsiTJZwr5QPYPBUXN/zfDisNvbpyuQbNFZZTj5pZEvqrWEOVydceEJDgWlM
+Pfa/UP1ywBM+3NkDZlumhqFKO0TtLpbaFIwa3wF/kHYRmI1HsY2U1hZqlYu/Uzfk
+NAQWRDOtIF2DriI/LYVDYpiBzLd3E0O2kdd8MyCiKW7KYPLodX7tQ1wM5goaCcQ=
+=JtCF
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cppunit/cppunit-1.13.2-r1.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
index 6f07f6b9bb11..3daf344315f8 100644
--- a/dev-util/cppunit/cppunit-1.13.2-r1.ebuild
+++ b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r1.ebuild,v 1.1 2014/06/07 11:53:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2-r2.ebuild,v 1.1 2014/07/06 21:07:00 pinkbyte Exp $
 
 EAPI=5
 
@@ -56,6 +56,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
 	prune_libtool_files --all
 
 	if use examples ; then
diff --git a/dev-util/cppunit/cppunit-1.13.2.ebuild b/dev-util/cppunit/cppunit-1.13.2.ebuild
deleted file mode 100644
index f67158fe8f8b..000000000000
--- a/dev-util/cppunit/cppunit-1.13.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-1.13.2.ebuild,v 1.1 2013/11/15 09:16:19 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/libreoffice/cppunit"
-[[ ${PV} = 9999 ]] && inherit git-2 autotools
-inherit eutils flag-o-matic
-
-DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/graphviz
-	)"
-
-DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# Anything else than -O0 breaks on alpha
-	use alpha && replace-flags "-O?" -O0
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc dot) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	if use examples ; then
-		find examples -iname "*.o" -delete
-		insinto /usr/share/${PN}
-		doins -r examples
-	fi
-}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
index a0869bd26c96..9a9d791a9ff6 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild,v 1.7 2014/06/07 11:53:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cppunit/cppunit-9999.ebuild,v 1.8 2014/07/06 21:07:00 pinkbyte Exp $
 
 EAPI=5
 
@@ -56,6 +56,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
+	einstalldocs
 	prune_libtool_files --all
 
 	if use examples ; then