[patch] diff of ebuild + extra files

0001-Adjust-etckeeper-for-prefix.patch (text/plain), 6.38 KB, created by Ben Longbons on 2013-01-31 22:49:25 UTC

From af896fac4c1bc4dff20dc85e5550a806d9374fc0 Mon Sep 17 00:00:00 2001
From: Ben Longbons <[e-mail]>
Date: Thu, 31 Jan 2013 14:29:07 -0800
Subject: [PATCH] Adjust etckeeper for prefix

---
 sys-apps/etckeeper/Manifest                 |    4 +++-
 sys-apps/etckeeper/etckeeper-0.63-r1.ebuild |   14 ++++++--------
 sys-apps/etckeeper/files/prefix1.patch      |   20 ++++++++++++++++++++
 sys-apps/etckeeper/files/prefix2.patch      |    9 +++++++++
 4 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 sys-apps/etckeeper/files/prefix1.patch
 create mode 100644 sys-apps/etckeeper/files/prefix2.patch

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index c1a1ec9..ab5ac23 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,5 +1,7 @@
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX etckeeper-0.63-gentoo.patch 2140 SHA256 45c79f5e6f8c7a242923acd40302c18dfeedc5a1a0e4b6c85c821b0fbf129bdb SHA512 a87980c2ef589b15d778048e47107e9e66899b10facc3143d9b507e818f59f544c784115c511882382787911c9d25a85c9ebf8de2eccae9383d0e87c5adfb150 WHIRLPOOL 95a68fd5293a1a9d6c460e694a1bcdcb4d408a96943e46e07d97f21dad2123db4a9adfceae942d202a54c97c212e6e4ee64926980a3b3e7153e88294ab94e907
+AUX prefix1.patch 485 SHA256 255f9330294e1ce5c609ba99558fbee58efcd0c1c1f3e5a459026538d43fe841 SHA512 9a75c4b69f4ca6d494ebdcb5ea9839d20e77a9b1140de6f9270bf7e95c18a29ee2c173c417c4eb41163a6d065bad1701c1120e3c050177583465738fc8fc17ec WHIRLPOOL b1fd81f8c37b6e740fa15c537893161f47638854c6087e8d059d69da149c798ca0ea51628fab7a5d5177a3667ddeadffb61eced3b3440d367b29a0903c1a3488
+AUX prefix2.patch 474 SHA256 a192dacd9ad2814d16a4913c643c2e37651fd29f0539bf3dfbeaf78a7465ac5a SHA512 1ab1807a55da2ca2600c881d432a41c4124112c76f43cc95ce6c90f53e6a06e5245b11350cdaeda37d7c4daa05038bf770b3d9a2a43e2df6105618f229b2a3fe WHIRLPOOL ea931faf0ff728d1e42e5c48fec0b9a69ab5db716135013bc0417e765f8d3ca2511e9bb76a4addcd461fd9d5fdb1ef8dff57d3779c082a78dfb698a70f4fe924
 DIST etckeeper-0.63.tar.gz 45799 SHA256 c745b1a635bc3a4d184d6547c2551a72f067addc01a766fc741e85ba2f623763 SHA512 544b2d86d55266f321936759627684418da9b4993003767fd8ed59fa44462940e0e1610717ebce9b8e185139b747e5a6c9a0fbe3e7d765f2094d46e53c312f34 WHIRLPOOL c41347719c80672299088eb72a1331141ae67123e87fa87e3cdd3c01c08462e6cd2cbe1243943b21b30620e7a117614f1fef83547ac29b3ac1bb9cdf4ccd42a2
-EBUILD etckeeper-0.63-r1.ebuild 1863 SHA256 edd6a766cdb3a5a78935c596d7ee1b90e41f6ac0445889a7b250e0f279dc74b8 SHA512 f4295cd3024722b86f07f09dc91f76fb0351dbc2e7ee9d17bf7997abc547a8b25e0ee7669190a1e643295f0cac1f4ab64b98fd0514d3fb2774c062c1875ce2eb WHIRLPOOL 3ec42fd6e47dd0b69dcc0376e6c1b24128dc41eff3b5f5909a53f8c92eb7f07b0b48775df95ce555cf97e78cd30e90ad5022c0b538f2cb16d5a5ad7d7b26152a
+EBUILD etckeeper-0.63-r1.ebuild 1901 SHA256 7fb6801dd00e504095afd422e05ddb202fd7392567bfdfbdab96f86b3e778c61 SHA512 2fd54f1d3aed80ff7213d4520a10cb7b4c03a0e0cd06620d56abfa5114470e679b7972d689acbef51dbab7ef02cd1ecf74aaa965cc2c6c9bd3e8e86344f3989d WHIRLPOOL 946e08a16a9e39388e3b94ed368dda0fcdcb0fe51967c0fcecab3da806582b2f68268ad4eb50987e3d592368bb58be709e4a0aaf85d4db0728d8877c3800adb2
diff --git a/sys-apps/etckeeper/etckeeper-0.63-r1.ebuild b/sys-apps/etckeeper/etckeeper-0.63-r1.ebuild
index 18d6bac..d905af0 100644
--- a/sys-apps/etckeeper/etckeeper-0.63-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-0.63-r1.ebuild
@@ -30,6 +30,9 @@ RDEPEND="${DEPEND}
 
 src_prepare(){
 	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/prefix1.patch
+	epatch "${FILESDIR}"/prefix2.patch
+	eprefixify etckeeper pre-install.d/10packagelist
 }
 
 src_compile() {
@@ -45,11 +48,6 @@ src_install(){
 	}
 	use bazaar && python_foreach_impl 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
@@ -67,9 +65,9 @@ pkg_postinst(){
 	elog "This ebuild just ensures at least one is installed!"
 	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/${PF}/examples"
+	elog "You may want to adjust your ${EPREFIX}/etc/portage/bashrc"
+	elog "see the example file in ${EPREFIX}/usr/share/doc/${PF}/examples"
 	elog
 	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
+	elog "${PN} init"
 }
diff --git a/sys-apps/etckeeper/files/prefix1.patch b/sys-apps/etckeeper/files/prefix1.patch
new file mode 100644
index 0000000..ce2f0cd
--- /dev/null
+++ b/sys-apps/etckeeper/files/prefix1.patch
@@ -0,0 +1,20 @@
+--- etckeeper.old	2013-01-31 13:09:47.000000000 -0800
++++ etckeeper	2013-01-31 13:11:14.000000000 -0800
+@@ -2,7 +2,7 @@
+ set -e
+ 
+ if [ -z "$ETCKEEPER_CONF_DIR" ]; then
+-	ETCKEEPER_CONF_DIR=/etc/etckeeper
++	ETCKEEPER_CONF_DIR=@GENTOO_PORTAGE_EPREFIX@/etc/etckeeper
+ fi
+ 
+ conf="$ETCKEEPER_CONF_DIR/etckeeper.conf"
+@@ -85,7 +85,7 @@
+ fi
+ 
+ if [ -z "$ETCKEEPER_DIR" ]; then
+-	ETCKEEPER_DIR=/etc
++	ETCKEEPER_DIR=@GENTOO_PORTAGE_EPREFIX@/etc
+ fi
+ cd "$ETCKEEPER_DIR"
+ export ETCKEEPER_DIR
diff --git a/sys-apps/etckeeper/files/prefix2.patch b/sys-apps/etckeeper/files/prefix2.patch
new file mode 100644
index 0000000..0b7bc2e
--- /dev/null
+++ b/sys-apps/etckeeper/files/prefix2.patch
@@ -0,0 +1,9 @@
+--- pre-install.d/10packagelist.old	2013-01-31 13:10:27.000000000 -0800
++++ pre-install.d/10packagelist	2013-01-31 13:11:23.000000000 -0800
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ # This list will be later used when committing.
+-mkdir -p /var/cache/etckeeper/
+-etckeeper list-installed > /var/cache/etckeeper/packagelist.pre-install
++mkdir -p @GENTOO_PORTAGE_EPREFIX@/var/cache/etckeeper/
++etckeeper list-installed > @GENTOO_PORTAGE_EPREFIX@/var/cache/etckeeper/packagelist.pre-install
-- 
1.7.10.4