Clean up installation of html docs; drop old revision

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 12 insertions, 88 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/Manifest b/dev-util/schroot/Manifest
index 77b3d7424b8e..9f085201efe4 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -4,7 +4,6 @@ AUX schroot-1.2.3-tests.patch 3731 RMD160 0cb5ccf9f4cc526c7c80fe2fc3b0faa2d3e2dd
 AUX schroot.confd 371 RMD160 d7efa36975f549304a1e8a942f6389720d1bff88 SHA1 3eaf672a13c6dd4fadd01b7c1c54bc82f71d5b93 SHA256 68efa89cd4b358c6de050ebb5b973c87ee514fe5e5d888f63aa0af85aa4736c8
 AUX schroot.initd 844 RMD160 11eca8fd477b215d5b4964b582573ce14f116d25 SHA1 fe687d49e7d80342d46767f5e5fe63eed94a805d SHA256 f0f44c9fed06438f72f58825f67316c5069d58a6dfe3e1a33d0092b4fac1fb9f
 DIST schroot_1.2.3.orig.tar.gz 25486414 RMD160 2c8c4bb92c870a6c0514df528d13f73b8f1b6d05 SHA1 1775aa19e3cb3237d8aa3cc36e3382d7e2c2919b SHA256 c3bca449abdf28b66f6aede8892ce61967b5c1d758ba567e8648ccfb0cf914ec
-EBUILD schroot-1.2.3-r1.ebuild 2038 RMD160 3dec367766dcc83cbfe529ce5ce938e5de5ba832 SHA1 6daf14c0bbd58f6b67a64acfe830f38a928071a8 SHA256 b5a8c76381dd2fca54c353d1037b6c1df5e939434c31896baffc504bbd00d214
-EBUILD schroot-1.2.3-r2.ebuild 2138 RMD160 75447c6d3d58c524feac222e8b05ab3f1c4d161e SHA1 cc080f39defdb1e16db19274c29250f0d359e632 SHA256 301db5f7e06db12e044efe600524e79670a1432ac0d07367cadd472052b7334a
-MISC ChangeLog 1171 RMD160 70f09141c91acd2faf15a858e669e29dcd3a49f9 SHA1 a711daea4773103313954f2a3c679d8f711bd711 SHA256 7f5b2a19d31e119fa1d59cc9a14b3704743daa6ebed8ed433634dfeb0b47cbd8
+EBUILD schroot-1.2.3-r2.ebuild 2098 RMD160 51990d578dc1f669619049b7d7d436d9717dfac2 SHA1 09babf9228c318c8de388fbf43eabaaf8b1ab67c SHA256 aabc9e598016a606d943c436cff65a9ed206181fcb9b8a03b69516d13e16ff85
+MISC ChangeLog 1330 RMD160 45b81af065d8242f113f89dcc54a0096ab32cf54 SHA1 cd0f29be8e0e22c768d3cce4789415815d3fd6c9 SHA256 2b744158b9c6fa4d66be9ee57644b34c6346eb70e15a5ee1a936c9fbccefe02e
 MISC metadata.xml 384 RMD160 083cf5152883690484a973130318aef0d2c4f349 SHA1 d464ac6af08d92976517ae5715e1936c408c168d SHA256 58018798cc44ed856afd8c3c0e957aae8aabf548cc716e675604acc456fc20ef
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