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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 12 insertions, 62 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/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