From 5f8e1ee065b2ab82c2a8aa84d3ed8139b3637996 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 7 May 2016 10:32:10 -0400 Subject: [PATCH] app-text/xapian-omega: clean up the phases a bit Package-Manager: portage-2.2.26 --- app-text/xapian-omega/xapian-omega-1.2.23-r1.ebuild | 6 ++---- app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) 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 -- 2.26.2