selinux code is now integrated

diff --git a/app-admin/logrotate/ChangeLog b/app-admin/logrotate/ChangeLog
index 3233dd1ec914845766020a8bdec5afe406e1523d..c77ca6a1546012956a8fd3cfec7f9193f9c1f596 100644 (file)
--- a/app-admin/logrotate/ChangeLog
+++ b/app-admin/logrotate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/logrotate
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.32 2005/01/01 11:08:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/ChangeLog,v 1.33 2005/01/02 03:56:46 pebenito Exp $
+
+  01 Jan 2005; Chris PeBenito <pebenito@gentoo.org> logrotate-3.7.ebuild:
+  SELinux code is now integrated in 3.7.  Adjust ebuild accordingly.
 
 *logrotate-3.7 (31 Dec 2004)
 

diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 6924bdcfc7c04a7bf2f8930f962bd655cfa432f9..b93b5660df13828d9146392b802c35823355e742 100644 (file)
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,6 +1,6 @@
-MD5 75ab91a56c2135673706aafe849327ba ChangeLog 4402
+MD5 c91000d75cded213bc6dc76306f5e24c ChangeLog 4544
 MD5 67f6426c285df9fc96384c47d68ae3a6 logrotate-3.6.5-r1.ebuild 1730
-MD5 485f0b8785511b790da557cbde49895d logrotate-3.7.ebuild 1733
+MD5 098cc168fade54d752abb4316bf4860f logrotate-3.7.ebuild 1679
 MD5 36f3868207e982d53335b6d9aa2c68f5 metadata.xml 305
 MD5 bdf48119e016d4ee8b829da9e83959bf files/digest-logrotate-3.6.5-r1 71
 MD5 ef1405c48d23249f97330709d1d2a093 files/logrotate-3.6.5-selinux.diff.bz2 1440

diff --git a/app-admin/logrotate/logrotate-3.7.ebuild b/app-admin/logrotate/logrotate-3.7.ebuild
index 3f8689102ba9f3b0f11b2df13f9096855bc72188..05308d59de8dc838de7b25462bafe3628a9c080a 100644 (file)
--- a/app-admin/logrotate/logrotate-3.7.ebuild
+++ b/app-admin/logrotate/logrotate-3.7.ebuild
@@ -1,10 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.ebuild,v 1.2 2005/01/01 11:08:57 eradicator Exp $
-
-inherit eutils
-
-SELINUX_PATCH="logrotate-3.6.5-selinux.diff.bz2"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.7.ebuild,v 1.3 2005/01/02 03:56:46 pebenito Exp $
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
@@ -26,8 +22,6 @@ RDEPEND="${DEPEND}
 src_unpack() {
        unpack ${PN}_${PV}.orig.tar.gz
 
-       use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
        sed -i \
                -e "s:CFLAGS += -g:CFLAGS += -g ${CFLAGS}:" \
                -e "/CVSROOT =/d" \
@@ -39,7 +33,9 @@ src_unpack() {
 }
 
 src_compile() {
-       emake || die "emake failed"
+       local myconf
+       useq selinux && myconf='WITH_SELINUX=yes'
+       emake ${myconf} || die "emake failed"
 }
 
 src_install() {