From: Anthony G. Basile <blueness@gentoo.org>
Date: Sat, 7 May 2016 14:32:10 +0000 (-0400)
Subject: app-text/xapian-omega: clean up the phases a bit
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f8e1ee065b2ab82c2a8aa84d3ed8139b3637996;p=gentoo.git

app-text/xapian-omega: clean up the phases a bit

Package-Manager: portage-2.2.26
---

diff --git a/app-text/xapian-omega/xapian-omega-1.2.23-r1.ebuild b/app-text/xapian-omega/xapian-omega-1.2.23-r1.ebuild
index 9b20f4056c67..1c2bada62079 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.23-r1.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.23-r1.ebuild
@@ -20,16 +20,14 @@ DEPEND="dev-libs/xapian:0/1.2.22
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-}
-
 src_install () {
 	emake DESTDIR="${D}" install
 
 	#move docs to /usr/share/doc/${PF}.
 	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
 
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
 	doenvd "${T}"/20xapian-omega
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild b/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
index 0ec1697bd188..85772bb1e0bd 100644
--- a/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
@@ -20,13 +20,11 @@ DEPEND="dev-libs/xapian:0/1.3.6
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-}
-
 src_install () {
 	emake DESTDIR="${D}" install
 
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
 	doenvd "${T}"/20xapian-omega
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO