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 9b20f4056c6760b89b8cde050eddf002d0b7f460..1c2bada62079f9bcbc7cf08cf61248067fb10556 100644 (file)
--- 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 0ec1697bd188d449d71339fc962f9ce34ea97d9f..85772bb1e0bdd857e1e209d6e59398f655fc54b7 100644 (file)
--- 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