Removing Old version; adding blocker for collision with dev-util/schroot, patch thanks to Zorzo Luca <lucazorzo@gmail.com> bug #298874

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 13 insertions, 38 deletions

diff --git a/sys-apps/dchroot/ChangeLog b/sys-apps/dchroot/ChangeLog
index 78148505c0f3..4ca236d1dc76 100644
--- a/sys-apps/dchroot/ChangeLog
+++ b/sys-apps/dchroot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dchroot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/ChangeLog,v 1.5 2009/11/18 16:58:35 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/ChangeLog,v 1.6 2010/01/02 18:46:36 vostorga Exp $
+
+  02 Jan 2010; Víctor Ostorga <vostorga@gentoo.org> -dchroot-0.10.ebuild,
+  dchroot-0.12.1.ebuild:
+  Removing Old version; adding blocker for collision with dev-util/schroot,
+  patch thanks to Zorzo Luca <lucazorzo@gmail.com> bug #298874
 
   18 Nov 2009; Víctor Ostorga <vostorga@gentoo.org> dchroot-0.12.1.ebuild:
   Respecting CC variable, respecting LDFLAGS, bug #293575
diff --git a/sys-apps/dchroot/dchroot-0.10.ebuild b/sys-apps/dchroot/dchroot-0.10.ebuild
deleted file mode 100644
index 22737d994aeb..000000000000
--- a/sys-apps/dchroot/dchroot-0.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/dchroot-0.10.ebuild,v 1.1 2005/02/12 02:17:16 vapier Exp $
-
-DESCRIPTION="Utility for managing chroots for non-root users"
-HOMEPAGE="http://packages.debian.org/unstable/admin/dchroot"
-SRC_URI="mirror://debian/pool/main/d/dchroot/dchroot_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/help2man"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^all:/s:$: docs:' \
-		-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
-		Makefile.in || die "sed failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc README TODO
-}
diff --git a/sys-apps/dchroot/dchroot-0.12.1.ebuild b/sys-apps/dchroot/dchroot-0.12.1.ebuild
index 181a56992b61..cba247f08730 100644
--- a/sys-apps/dchroot/dchroot-0.12.1.ebuild
+++ b/sys-apps/dchroot/dchroot-0.12.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/dchroot-0.12.1.ebuild,v 1.2 2009/11/18 16:58:35 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dchroot/dchroot-0.12.1.ebuild,v 1.3 2010/01/02 18:46:36 vostorga Exp $
+
+EAPI="2"
 
 inherit toolchain-funcs
 
@@ -14,11 +16,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-apps/help2man"
-RDEPEND=""
+RDEPEND="!dev-util/schroot[dchroot]"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e '/^all:/s:$: docs:' \
 		-e '/^CFLAGS/s:-O2:@CFLAGS@:' \
@@ -27,7 +27,6 @@ src_unpack() {
 }
 
 src_compile() {
-	econf
 	emake CC="$(tc-getCC)" || die
 }