Clean up installation of html docs; drop old revision

(Portage version: -svn/cvs/Linux i686)

3 files changed, 10 insertions, 85 deletions

diff --git a/dev-util/schroot/ChangeLog b/dev-util/schroot/ChangeLog
index 175e68da0ea3..65170b1c9636 100644
--- a/dev-util/schroot/ChangeLog
+++ b/dev-util/schroot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/schroot
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.5 2009/10/02 02:52:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/ChangeLog,v 1.6 2009/10/17 02:02:58 abcd Exp $
+
+  17 Oct 2009; Jonathan Callen <abcd@gentoo.org> -schroot-1.2.3-r1.ebuild,
+  schroot-1.2.3-r2.ebuild:
+  Clean up installation of html docs; drop old revision
 
 *schroot-1.2.3-r2 (02 Oct 2009)
 
diff --git a/dev-util/schroot/schroot-1.2.3-r1.ebuild b/dev-util/schroot/schroot-1.2.3-r1.ebuild
deleted file mode 100644
index ded251254bde..000000000000
--- a/dev-util/schroot/schroot-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r1.ebuild,v 1.2 2009/09/14 08:35:25 abcd Exp $
-
-EAPI="2"
-
-inherit autotools base
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dchroot debug doc nls test"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.34.0
-	dev-libs/lockdev
-	sys-libs/pam
-"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-util/cppunit-1.10.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/debianutils
-	dchroot? ( !dev-util/dchroot )
-	nls? ( virtual/libintl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-	"${FILESDIR}/${P}-pam.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	if use test; then
-		# Fix bug where aclocal doesn't find cppunit.m4 from the system...
-		ln -s /usr/share/aclocal/cppunit.m4 m4/
-	else
-		# Don't depend on cppunit unless we are testing
-		sed -i '/AM_PATH_CPPUNIT/s/^.*$/:/' configure.ac
-	fi
-
-	export AT_M4DIR=m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable dchroot) \
-		$(use_enable dchroot dchroot-dsa) \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		--enable-shared \
-		--disable-static \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
-	newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html/sbuild
-		doins doc/sbuild/html/* || die "installation of html docs failed"
-		insinto /usr/share/doc/${PF}/html/schroot
-		doins doc/schroot/html/* || die "installation of html docs failed"
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.2.3-r2.ebuild b/dev-util/schroot/schroot-1.2.3-r2.ebuild
index 543b3ea84318..e8b752bfb1b5 100644
--- a/dev-util/schroot/schroot-1.2.3-r2.ebuild
+++ b/dev-util/schroot/schroot-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r2.ebuild,v 1.1 2009/10/02 02:52:08 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.2.3-r2.ebuild,v 1.2 2009/10/17 02:02:58 abcd Exp $
 
 EAPI="2"
 
@@ -71,10 +71,10 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
 	if use doc; then
-		insinto /usr/share/doc/${PF}/html/sbuild
-		doins doc/sbuild/html/* || die "installation of html docs failed"
-		insinto /usr/share/doc/${PF}/html/schroot
-		doins doc/schroot/html/* || die "installation of html docs failed"
+		docinto html/sbuild
+		dohtml doc/sbuild/html/* || die "installation of html docs failed"
+		docinto html/schroot
+		dohtml doc/schroot/html/* || die "installation of html docs failed"
 	fi
 
 	# Remove *.la files