fix gcc-3.3 patch for selinux

4 files changed, 30 insertions, 8 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index f456ec0c654a..47cf6d940d40 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.21 2003/07/13 13:03:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.22 2003/07/13 20:13:17 azarah Exp $
+
+  13 Jul 2003; Martin Schlemmer <azarah@gentoo.org> pam-login-3.11-r1.ebuild,
+  files/pam-login-3.11-selinux-gcc33.patch:
+  Fix gcc-3.3 patch to play nice with selinux.
 
 *pam-login-3.11-r1 (13 Jul 2003)
 
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index ceee0d1c8cf1..0d8282e6cc13 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,10 +1,10 @@
-MD5 212f9168648a58eb44a3b27ff7a70c4a ChangeLog 2849
+MD5 e68fe79b7f77345775364aaeb4c7f58a ChangeLog 3019
 MD5 cad011cbd985a979f997fcc4d8bd304c pam-login-3.6-r1.ebuild 1833
 MD5 b04418a06d1f88d40e33887a0a19ba82 pam-login-3.6-r2.ebuild 1939
 MD5 5739c21cb2f366c515850e7ee5b97eb8 pam-login-3.7.ebuild 1985
 MD5 80ca224367493f43b14bdf6a6087ec0c pam-login-3.10.ebuild 1993
 MD5 41238d6b3d0166553560500661be140c pam-login-3.11.ebuild 2294
-MD5 260506f937521a280aca8b0028fdda64 pam-login-3.11-r1.ebuild 2414
+MD5 d934ef1683b46e059e73a563120edc70 pam-login-3.11-r1.ebuild 2533
 MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r1 66
 MD5 918ba376dc33a5a1c9f9b0bd048b484b files/digest-pam-login-3.6-r2 66
 MD5 7febd6315d85fcd5196b602732789573 files/digest-pam-login-3.7 66
@@ -15,3 +15,4 @@ MD5 a5e9be8a38e1b8f784d3cf558cff7a6b files/digest-pam-login-3.10 67
 MD5 bcf75778be1a620e99fcaf5d2c55a504 files/pam-login-3.11-selinux.diff 8237
 MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
 MD5 387e811b73906d5f0e5d4417cccfed0e files/digest-pam-login-3.11-r1 67
+MD5 e1f2854245d68582c0913c5d6ac9cd66 files/pam-login-3.11-selinux-gcc33.patch 512
diff --git a/sys-apps/pam-login/files/pam-login-3.11-selinux-gcc33.patch b/sys-apps/pam-login/files/pam-login-3.11-selinux-gcc33.patch
new file mode 100644
index 000000000000..587d04d6ebf6
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.11-selinux-gcc33.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2003-05-25 10:06:01.000000000 +1000
++++ configure	2003-05-25 10:43:21.000000000 +1000
+@@ -1689,7 +1689,7 @@
+ fi
+ 
+ 
+-EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Winline -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef "
++EXTRA_CFLAGS="-W -Wall -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wstrict-prototypes -Wundef"
+ # -Wpointer-arith
+ 
+ ac_ext=c
diff --git a/sys-apps/pam-login/pam-login-3.11-r1.ebuild b/sys-apps/pam-login/pam-login-3.11-r1.ebuild
index 9daee2366a26..180df685915d 100644
--- a/sys-apps/pam-login/pam-login-3.11-r1.ebuild
+++ b/sys-apps/pam-login/pam-login-3.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.11-r1.ebuild,v 1.1 2003/07/13 13:03:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.11-r1.ebuild,v 1.2 2003/07/13 20:13:17 azarah Exp $
 
 
 inherit gnuconfig
@@ -31,11 +31,17 @@ src_unpack() {
 
 	cd ${S}
 
-	# Do not warn on inlining for gcc-3.3, bug #21213
-	epatch ${FILESDIR}/${P}-gcc33.patch
+	if use selinux
+	then
+		# Patches for selinux
+		epatch ${FILESDIR}/${P}-selinux.diff
 
-	# Patches for selinux
-	use selinux && epatch ${FILESDIR}/${P}-selinux.diff
+		# Do not warn on inlining for gcc-3.3, bug #21213
+		epatch ${FILESDIR}/${P}-selinux-gcc33.patch
+	else
+		# Do not warn on inlining for gcc-3.3, bug #21213
+		epatch ${FILESDIR}/${P}-gcc33.patch
+	fi
 }
 
 src_compile() {