make deps more logical, add prefix support wrt #430952 by heroxbd

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 21 insertions, 10 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index 9fa4b6d495d0..2fe533ae7224 100644
--- a/sys-apps/etckeeper/ChangeLog
+++ b/sys-apps/etckeeper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/etckeeper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.6 2012/07/24 21:18:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.7 2012/08/11 16:05:37 hasufell Exp $
+
+  11 Aug 2012; Julian Ospald <hasufell@gentoo.org> +files/99etckeeper,
+  etckeeper-0.63.ebuild:
+  make deps more logical, add prefix support wrt #430952 by heroxbd
 
   24 Jul 2012; Markos Chandras <hwoarang@gentoo.org> etckeeper-0.63.ebuild:
   Stable on amd64 wrt bug #427656
diff --git a/sys-apps/etckeeper/etckeeper-0.63.ebuild b/sys-apps/etckeeper/etckeeper-0.63.ebuild
index 06f699a22d51..9008dea42377 100644
--- a/sys-apps/etckeeper/etckeeper-0.63.ebuild
+++ b/sys-apps/etckeeper/etckeeper-0.63.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v 1.9 2012/07/24 21:18:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-0.63.ebuild,v 1.10 2012/08/11 16:05:37 hasufell Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="bazaar? 2:2.6"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
 
-inherit eutils bash-completion-r1 python
+inherit eutils bash-completion-r1 prefix python
 
 DESCRIPTION="A collection of tools to let /etc be stored in a repository"
 HOMEPAGE="http://kitenet.net/~joey/code/etckeeper/"
@@ -16,18 +16,17 @@ SRC_URI="http://git.kitenet.net/?p=${PN}.git;a=snapshot;h=refs/tags/${PV};sf=tgz
 
 LICENSE="GPL-2"
 IUSE="bazaar"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 
 VCS_DEPEND="
 	dev-vcs/git
 	dev-vcs/mercurial
-	dev-vcs/darcs
-	dev-vcs/bzr"
+	dev-vcs/darcs"
 DEPEND="bazaar? ( dev-vcs/bzr )"
 RDEPEND="${DEPEND}
 	app-portage/portage-utils
-	|| ( ${VCS_DEPEND} )"
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
 
 src_prepare(){
 	epatch "${FILESDIR}"/${P}-gentoo.patch
@@ -38,23 +37,30 @@ src_compile() {
 }
 
 src_install(){
-	default
+	emake DESTDIR="${ED}" install
 
 	bzr_install() {
-		$(PYTHON) ./etckeeper-bzr/__init__.py install --root="${D}" ||
+		$(PYTHON) ./${PN}-bzr/__init__.py install --root="${ED}" ||
 			die "bzr support installation failed!"
 	}
 	use bazaar && python_execute_function bzr_install
 
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED}"/etc/env.d/99${PN}
+	fi
+
 	newbashcomp bash_completion ${PN}
+	dodoc README TODO
 	docinto examples
 	dodoc "${FILESDIR}"/bashrc
 }
 
 pkg_postinst(){
 	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
 	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you additionally need to enable 'bazaar' useflag."
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
 	elog
 	elog "You may want to adjust your /etc/portage/bashrc"
 	elog "see the example file in /usr/share/doc/${P}/examples"
diff --git a/sys-apps/etckeeper/files/99etckeeper b/sys-apps/etckeeper/files/99etckeeper
new file mode 100644
index 000000000000..9848af2d7713
--- /dev/null
+++ b/sys-apps/etckeeper/files/99etckeeper
@@ -0,0 +1 @@
+ETCKEEPER_CONF_DIR="@GENTOO_PORTAGE_EPREFIX@/etc/etckeeper"